From 466a0cd346333ca683971bfe6c4a43a523510779 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Fri, 25 Oct 2024 21:44:19 +0200
Subject: [PATCH 001/107] Move maintainers update function from
 https://github.com/armbian/scripts

- we don't need to use PAT anymore as its within same repository
- cosmetic fixes
---
 .github/workflows/adjust-maintainers.yml | 128 +++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 .github/workflows/adjust-maintainers.yml

diff --git a/.github/workflows/adjust-maintainers.yml b/.github/workflows/adjust-maintainers.yml
new file mode 100644
index 000000000000..77b49feebace
--- /dev/null
+++ b/.github/workflows/adjust-maintainers.yml
@@ -0,0 +1,128 @@
+name: "Sync maintainers status"
+
+# Script connects to the contacts database once per hour and updates BOARD_MAINTAINER property in the board config files.
+# If there are any changes, it opens a Pull Request
+#
+# spdx-id: GPL-2.0-or-later
+# copyright-owner: @igorpecovnik
+
+# Dependencies: lftp, jq
+
+on:
+  schedule:
+    - cron: "0 * * * *"
+  workflow_dispatch:
+
+jobs:
+
+  Build:
+    name: "Maintainers sync"
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'armbian' }}
+    steps:
+
+      - name: "Checkout build repo"
+        uses: actions/checkout@v4
+        with:
+          repository: armbian/build
+          ref:  main
+          fetch-depth: 0
+          clean: false
+
+      - name: "Install SSH key for storage"
+        uses: shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.KEY_UPLOAD }}
+          known_hosts: ${{ secrets.KNOWN_HOSTS_ARMBIAN_UPLOAD }}
+          if_key_exists: replace
+
+      - name: "Install dependencies"
+        run: |
+
+          sudo apt-get -y -qq install jq
+
+      - name: "Download JSON file"
+        run: |
+
+          # download json that is prepared for this action in another cron job
+          rsync -e "ssh -p ${{ secrets.HOST_UPLOAD_PORT }}" -arvc ${{ secrets.HOST_UPLOAD_USER }}@${{ secrets.HOST_UPLOAD }}:/incoming/json/armbian_maintainers.json /tmp/
+
+      - name: "Update maintainers"
+        run: |
+
+          # reset all maintainers so we generate from scratch
+          sed -i "s/BOARD_MAINTAINER.*/BOARD_MAINTAINER=\"\"/" config/boards/*.{conf,wip,eos,tvb}
+
+          # extract values fron JSON
+          declare -A MAINTAINERS
+          {
+            # By default, bash run the pipe command in subshells
+            # which make variable can't be assigned to.
+            # And yes, lastpipe can solve it
+            # But this is better.
+            while read -r i; do
+              NAME="$(echo "$i" | jq --raw-output '.First_Name')"
+              BOARD="$(echo "$i" | jq --raw-output '.Maintaining')"
+              MAINTAINER_GITHUB="$(echo "$i" | jq --raw-output '.Github' | cut -d"/" -f4)"
+              if [[ "$BOARD" != null && "$MAINTAINER_GITHUB" != null ]]; then
+                echo "- [$NAME](https://github.com/${MAINTAINER_GITHUB})"
+                while read -r i; do
+                  echo -e "  - $i"
+                  MAINTAINERS["$i"]+="$MAINTAINER_GITHUB "
+                done < <( echo "$BOARD" | sed "s/,/\n/g" | sort -u )
+              fi
+            done < <(jq -c '.[]' /tmp/armbian_maintainers.json)
+
+            for cfg in config/boards/*.{conf,wip,csc,eos,tvb}; do
+              board_name="$(echo "${cfg##*/}" | sed -E 's/\..*//')"
+              declare -a maintainers
+              readarray -t maintainers < <(echo "${MAINTAINERS[${board_name}]}" | xargs -n1 | sort -u)
+              sed -i "s/BOARD_MAINTAINER=.*/BOARD_MAINTAINER=\"${maintainers[*]}\"/" "${cfg}"
+            done
+          } >> "$GITHUB_STEP_SUMMARY"
+
+      - name: "Mark csc for no maintainer"
+        run: |
+
+          grep BOARD_MAINTAINER=\"\" config/boards/*.{wip,conf} | cut -d":" -f1 |
+            while read -r line; do
+              if [[ "${line}" != "${line/.conf/.csc}" ]]; then
+                mv -v "$line" "${line/.conf/.csc}"
+              fi
+              if [[ "${line}" != "${line/.wip/.csc}" ]]; then
+                mv -v "$line" "${line/.wip/.csc}"
+              fi
+            done
+
+      - name: "Re-generate CODEOWNERS"
+        run: |
+
+          ./.github/generate_CODEOWNERS.sh
+
+      - name: Create Pull Request
+        id: cpr
+        uses: peter-evans/create-pull-request@v6
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: '`Automatic` board configs status synchronise'
+          signoff: false
+          branch: update-maintainers
+          delete-branch: true
+          title: '`Automatic` board configs status synchronise'
+          body: |
+            Update maintainers and board status
+
+            - synced status from the database
+            - rename to .`csc` where we don't have anyone
+
+            If you want to become a board maintainer, [adjust data here](https://www.armbian.com/update-data/).
+
+            Ref:
+              - [Board Maintainers Procedures and Guidelines](https://docs.armbian.com/Board_Maintainers_Procedures_and_Guidelines/)
+              - [Contribute](https://docs.armbian.com/Process_Contribute/)
+
+          labels: |
+            Needs review
+          #assignees: igorpecovnik
+          #reviewers: Must be org collaborator
+          draft: false

From 0bdd1eec2f8c4fc28fa3cd6c0291b49eb7822cd4 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Fri, 25 Oct 2024 22:30:15 +0200
Subject: [PATCH 002/107] Set "Need review" label to all PR's by default

---
 .github/labeler.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 7d150e7f7832..5574995b0deb 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -10,6 +10,10 @@
 #
 # Please keep the labels sorted and deduplicated.
 
+"Needs review":
+- changed-files:
+  - any-glob-to-any-file: '**'
+
 "Hardware":
 - all:
   - changed-files:

From 01c83b46390c4d51a7a22670a3c617bb336cf164 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Fri, 25 Oct 2024 22:30:55 +0200
Subject: [PATCH 003/107] Label approved pull requests with "Ready to merge"

---
 .github/workflows/pr-label-on-approved.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .github/workflows/pr-label-on-approved.yml

diff --git a/.github/workflows/pr-label-on-approved.yml b/.github/workflows/pr-label-on-approved.yml
new file mode 100644
index 000000000000..01407cbe3465
--- /dev/null
+++ b/.github/workflows/pr-label-on-approved.yml
@@ -0,0 +1,14 @@
+on: pull_request_review
+name: Label approved pull requests
+jobs:
+  labelWhenApproved:
+    name: Label when approved
+    runs-on: ubuntu-latest
+    steps:
+    - name: Label when approved
+      uses: pullreminders/label-when-approved-action@master
+      env:
+        APPROVALS: "1"
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        ADD_LABEL: "Ready to merge"
+        REMOVE_LABEL: "Needs%20review"

From 5981196f1f5f1ee38a032cd119c49904ef16b806 Mon Sep 17 00:00:00 2001
From: igorpecovnik <6281704+igorpecovnik@users.noreply.github.com>
Date: Fri, 25 Oct 2024 19:53:47 +0000
Subject: [PATCH 004/107] `Automatic` board configs status synchronise

---
 .github/CODEOWNERS                 | 4 +++-
 config/boards/clearfogpro.csc      | 2 +-
 config/boards/mba8mpxl-ras314.conf | 2 +-
 config/boards/mba8mpxl.conf        | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 430ef4cb0c4d..31832d663e45 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -21,7 +21,7 @@ config/boards/aml-s905d3-cc.wip		@Tonymac32
 config/boards/aml-s9xx-box.tvb		@SteeManMI
 config/boards/armsom-sige1.csc		@amazingfate
 config/boards/armsom-sige3.csc		@amazingfate
-config/boards/avaota-a1.conf		@chainsx
+config/boards/avaota-a1.csc		@chainsx
 config/boards/ayn-odin2.eos		@FantasyGmm
 config/boards/bananapi.conf		@DylanHP @janprunk
 config/boards/bananapicm4io.conf		@pyavitz
@@ -35,6 +35,7 @@ config/boards/bananapim64.csc		@devdotnetorg
 config/boards/bananapim7.conf		@amazingfate
 config/boards/bigtreetech-cb1.conf		@JohnTheCoolingFan
 config/boards/cherryba-m1.csc		@IsMrX
+config/boards/clearfogpro.csc		@Heisath
 config/boards/coolpi-cm5.csc		@andyshrk
 config/boards/firefly-itx-3588j.csc		@SeeleVolleri
 config/boards/fxblox-rk1.csc		@mahdichi
@@ -91,6 +92,7 @@ config/boards/odroidn2.conf		@NicoD-SBC
 config/boards/odroidxu4.conf		@joekhoobyar
 config/boards/olimex-teres-a64.conf		@Kreyren
 config/boards/onecloud.conf		@hzyitc
+config/boards/oneplus-kebab.conf		@amazingfate
 config/boards/orangepi4-lts.conf		@paolosabatino
 config/boards/orangepi4.csc		@paolosabatino
 config/boards/orangepi5-plus.conf		@alexl83 @efectn
diff --git a/config/boards/clearfogpro.csc b/config/boards/clearfogpro.csc
index 1117405fb362..c41680999dee 100644
--- a/config/boards/clearfogpro.csc
+++ b/config/boards/clearfogpro.csc
@@ -1,7 +1,7 @@
 # Marvell Armada 38x dual core 1GB/2GB RAM SoC 2xmPCIe M.2 GBE switch SFP
 BOARD_NAME="Clearfog Pro"
 BOARDFAMILY="mvebu"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="Heisath"
 BOOTCONFIG="clearfog_defconfig"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="current,edge"
diff --git a/config/boards/mba8mpxl-ras314.conf b/config/boards/mba8mpxl-ras314.conf
index 72e1b3b07015..530c40d4ad2a 100644
--- a/config/boards/mba8mpxl-ras314.conf
+++ b/config/boards/mba8mpxl-ras314.conf
@@ -1,7 +1,7 @@
 # MBa8MPxL-RAS314 with TQMa8MPxL
 BOARD_NAME="TQ8MP-RAS314"
 BOARDFAMILY="imx8m"
-BOARD_MAINTAINER="tq-schmiedel"
+BOARD_MAINTAINER="schmiedelm"
 HAS_VIDEO_OUTPUT="yes"
 ATF_PLAT="imx8mp"
 ATF_UART_BASE="0x30a60000"
diff --git a/config/boards/mba8mpxl.conf b/config/boards/mba8mpxl.conf
index 9acec0daf72e..e752074ff045 100644
--- a/config/boards/mba8mpxl.conf
+++ b/config/boards/mba8mpxl.conf
@@ -1,7 +1,7 @@
 # MBa8MPxL with TQMa8MPxL
 BOARD_NAME="MBa8MPxL"
 BOARDFAMILY="imx8m"
-BOARD_MAINTAINER="tq-schmiedel"
+BOARD_MAINTAINER="schmiedelm"
 HAS_VIDEO_OUTPUT="yes"
 ATF_PLAT="imx8mp"
 ATF_UART_BASE="0x30a60000"

From bede7c121e5bb22c17ac040994bd9c6d707cd366 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Fri, 25 Oct 2024 23:36:09 +0200
Subject: [PATCH 005/107] Limit default labelling to opened, reopened and
 synchronize PR

Also remove "Ready to merge" in case PR is changed / fresh
---
 .github/workflows/pr-auto-labeler.yml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr-auto-labeler.yml b/.github/workflows/pr-auto-labeler.yml
index c74574000ae5..c5da554aa8a2 100644
--- a/.github/workflows/pr-auto-labeler.yml
+++ b/.github/workflows/pr-auto-labeler.yml
@@ -5,9 +5,23 @@ run-name: 'Set labels - PR #${{ github.event.pull_request.number }} ("${{ github
 #
 
 on:
-  - pull_request_target
+  pull_request:
+    types: [opened, reopened, synchronize]
 
 jobs:
+  label-remove:
+    permissions:
+      contents: read # for pascalgn/size-label-action to determine modified files
+      pull-requests: write # for pascalgn/size-label-action to add labels to PRs
+    name: "Remove Ready to merge"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: PauMAVA/add-remove-label-action@v1.0.3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          add: ""
+          remove: "Ready to merge"
+
   label-category:
     permissions:
       contents: read # for actions/labeler to determine modified files

From b2e28db4604cbf3d8a46ab62e843435ede1f7b2c Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Fri, 25 Oct 2024 14:59:39 +0800
Subject: [PATCH 006/107] rockchip64-6.11: rewrite kernel patches

---
 .../general-driver-tm16xx-led-driver.patch    | 22 +++++++++----------
 .../general-hdmi-clock-fixes.patch            | 17 +++++++-------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/patch/kernel/archive/rockchip64-6.11/general-driver-tm16xx-led-driver.patch b/patch/kernel/archive/rockchip64-6.11/general-driver-tm16xx-led-driver.patch
index 9d226168d0d9..9a2b5d41f7de 100644
--- a/patch/kernel/archive/rockchip64-6.11/general-driver-tm16xx-led-driver.patch
+++ b/patch/kernel/archive/rockchip64-6.11/general-driver-tm16xx-led-driver.patch
@@ -1,22 +1,21 @@
-From b305f05351984645293a9b7b2047779f6d8fbdd2 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <paolo.sabatino@gmail.com>
 Date: Sat, 5 Oct 2024 16:07:14 +0200
-Subject: [PATCH] Add tm16xx led auxiliary display driver
+Subject: Add tm16xx led auxiliary display driver
 
 ---
  drivers/auxdisplay/Kconfig  |   10 +
  drivers/auxdisplay/Makefile |    1 +
- drivers/auxdisplay/tm16xx.c | 1167 +++++++++++++++++++++++++++++++++++
+ drivers/auxdisplay/tm16xx.c | 1167 ++++++++++
  3 files changed, 1178 insertions(+)
- create mode 100644 drivers/auxdisplay/tm16xx.c
 
 diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig
-index 64012cda4d12..3fe0088b7f1f 100644
+index 111111111111..222222222222 100644
 --- a/drivers/auxdisplay/Kconfig
 +++ b/drivers/auxdisplay/Kconfig
-@@ -183,6 +183,16 @@ config HT16K33
- 	  Say yes here to add support for Holtek HT16K33, RAM mapping 16*8
- 	  LED controller driver with keyscan.
+@@ -49,6 +49,16 @@ config HD44780
+ 	  kernel and started at boot.
+ 	  If you don't understand what all this is about, say N.
  
 +config TM16XX
 +	tristate "TM16xx/FD6xx LED controller driver and compatibles"
@@ -32,7 +31,7 @@ index 64012cda4d12..3fe0088b7f1f 100644
  	tristate "lcd2s 20x4 character display over I2C console"
  	depends on I2C
 diff --git a/drivers/auxdisplay/Makefile b/drivers/auxdisplay/Makefile
-index f5c13ed1cd4f..066f452b1e26 100644
+index 111111111111..222222222222 100644
 --- a/drivers/auxdisplay/Makefile
 +++ b/drivers/auxdisplay/Makefile
 @@ -9,6 +9,7 @@ obj-$(CONFIG_CHARLCD)		+= charlcd.o
@@ -45,7 +44,7 @@ index f5c13ed1cd4f..066f452b1e26 100644
  obj-$(CONFIG_LCD2S)		+= lcd2s.o
 diff --git a/drivers/auxdisplay/tm16xx.c b/drivers/auxdisplay/tm16xx.c
 new file mode 100644
-index 000000000000..d938b0166e74
+index 000000000000..111111111111
 --- /dev/null
 +++ b/drivers/auxdisplay/tm16xx.c
 @@ -0,0 +1,1167 @@
@@ -1217,6 +1216,5 @@ index 000000000000..d938b0166e74
 +MODULE_ALIAS("spi:tm16xx");
 +MODULE_ALIAS("i2c:tm16xx");
 -- 
-2.34.1
-
+Armbian
 
diff --git a/patch/kernel/archive/rockchip64-6.11/general-hdmi-clock-fixes.patch b/patch/kernel/archive/rockchip64-6.11/general-hdmi-clock-fixes.patch
index 3dcc832ad6a4..321c1849df07 100644
--- a/patch/kernel/archive/rockchip64-6.11/general-hdmi-clock-fixes.patch
+++ b/patch/kernel/archive/rockchip64-6.11/general-hdmi-clock-fixes.patch
@@ -7,9 +7,8 @@ Subject: hdmi timing core changes and fixes
  drivers/clk/rockchip/clk-rk3399.c           | 49 ++++++++--
  drivers/gpu/drm/bridge/synopsys/dw-hdmi.c   | 12 +--
  drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 44 ++++++++-
- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 15 ++-
  drivers/gpu/drm/rockchip/rockchip_vop_reg.c |  7 ++
- 5 files changed, 109 insertions(+), 18 deletions(-)
+ 4 files changed, 98 insertions(+), 14 deletions(-)
 
 diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c
 index 111111111111..222222222222 100644
@@ -206,7 +205,7 @@ diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockc
 index 111111111111..222222222222 100644
 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
-@@ -763,6 +763,7 @@ static const struct vop_intr rk3288_vop_intr = {
+@@ -765,6 +765,7 @@ static const struct vop_intr rk3288_vop_intr = {
  static const struct vop_data rk3288_vop = {
  	.version = VOP_VERSION(3, 1),
  	.feature = VOP_FEATURE_OUTPUT_RGB10,
@@ -214,7 +213,7 @@ index 111111111111..222222222222 100644
  	.intr = &rk3288_vop_intr,
  	.common = &rk3288_common,
  	.modeset = &rk3288_modeset,
-@@ -870,6 +871,7 @@ static const struct vop_misc rk3368_misc = {
+@@ -872,6 +873,7 @@ static const struct vop_misc rk3368_misc = {
  
  static const struct vop_data rk3368_vop = {
  	.version = VOP_VERSION(3, 2),
@@ -222,7 +221,7 @@ index 111111111111..222222222222 100644
  	.intr = &rk3368_vop_intr,
  	.common = &rk3288_common,
  	.modeset = &rk3288_modeset,
-@@ -892,6 +894,7 @@ static const struct vop_intr rk3366_vop_intr = {
+@@ -894,6 +896,7 @@ static const struct vop_intr rk3366_vop_intr = {
  
  static const struct vop_data rk3366_vop = {
  	.version = VOP_VERSION(3, 4),
@@ -230,7 +229,7 @@ index 111111111111..222222222222 100644
  	.intr = &rk3366_vop_intr,
  	.common = &rk3288_common,
  	.modeset = &rk3288_modeset,
-@@ -1045,6 +1048,7 @@ static const struct vop_afbc rk3399_vop_afbc = {
+@@ -1047,6 +1050,7 @@ static const struct vop_afbc rk3399_vop_afbc = {
  static const struct vop_data rk3399_vop_big = {
  	.version = VOP_VERSION(3, 5),
  	.feature = VOP_FEATURE_OUTPUT_RGB10,
@@ -238,7 +237,7 @@ index 111111111111..222222222222 100644
  	.intr = &rk3366_vop_intr,
  	.common = &rk3399_common,
  	.modeset = &rk3288_modeset,
-@@ -1073,6 +1077,7 @@ static const struct vop_win_yuv2yuv_data rk3399_vop_lit_win_yuv2yuv_data[] = {
+@@ -1075,6 +1079,7 @@ static const struct vop_win_yuv2yuv_data rk3399_vop_lit_win_yuv2yuv_data[] = {
  
  static const struct vop_data rk3399_vop_lit = {
  	.version = VOP_VERSION(3, 6),
@@ -246,7 +245,7 @@ index 111111111111..222222222222 100644
  	.intr = &rk3366_vop_intr,
  	.common = &rk3399_common,
  	.modeset = &rk3288_modeset,
-@@ -1095,6 +1100,7 @@ static const struct vop_win_data rk3228_vop_win_data[] = {
+@@ -1097,6 +1102,7 @@ static const struct vop_win_data rk3228_vop_win_data[] = {
  static const struct vop_data rk3228_vop = {
  	.version = VOP_VERSION(3, 7),
  	.feature = VOP_FEATURE_OUTPUT_RGB10,
@@ -254,7 +253,7 @@ index 111111111111..222222222222 100644
  	.intr = &rk3366_vop_intr,
  	.common = &rk3288_common,
  	.modeset = &rk3288_modeset,
-@@ -1167,6 +1173,7 @@ static const struct vop_win_data rk3328_vop_win_data[] = {
+@@ -1169,6 +1175,7 @@ static const struct vop_win_data rk3328_vop_win_data[] = {
  static const struct vop_data rk3328_vop = {
  	.version = VOP_VERSION(3, 8),
  	.feature = VOP_FEATURE_OUTPUT_RGB10,

From 0b3a1a06f8cc2a347c513160715fd5bc3be5dd61 Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Fri, 25 Oct 2024 15:06:42 +0800
Subject: [PATCH 007/107] rockchip64-6.11: add patch to enable uwe5622 wifi/bt
 on opi3b v1.1

---
 ...orangepi3b-add-uwe5622-wifi-bt-nodes.patch | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 patch/kernel/archive/rockchip64-6.11/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch

diff --git a/patch/kernel/archive/rockchip64-6.11/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch b/patch/kernel/archive/rockchip64-6.11/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch
new file mode 100644
index 000000000000..4e1b16044a0f
--- /dev/null
+++ b/patch/kernel/archive/rockchip64-6.11/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch
@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: amazingfate <liujianfeng1994@gmail.com>
+Date: Fri, 25 Oct 2024 14:48:47 +0800
+Subject: arch: arm64: dts: add uwe5622 wifi/bt nodes to orangepi3b v1.1
+
+---
+ arch/arm64/boot/dts/rockchip/rk3566-orangepi-3b-v1.1.dts | 17 ++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3566-orangepi-3b-v1.1.dts b/arch/arm64/boot/dts/rockchip/rk3566-orangepi-3b-v1.1.dts
+index 111111111111..222222222222 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3566-orangepi-3b-v1.1.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3566-orangepi-3b-v1.1.dts
+@@ -7,6 +7,23 @@
+ / {
+ 	model = "Xunlong Orange Pi 3B v1.1";
+ 	compatible = "xunlong,orangepi-3b-v1.1", "xunlong,orangepi-3b", "rockchip,rk3566";
++
++	sprd-mtty {
++		compatible = "sprd,mtty";
++		sprd,name = "ttyBT";
++	};
++
++	uwe-bsp {
++		compatible = "unisoc,uwe_bsp";
++		wl-reg-on = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>;
++		bt-reg-on = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
++		wl-wake-host-gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_HIGH>;
++		bt-wake-host-gpio = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
++		sdio-ext-int-gpio = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
++		data-irq;
++		blksz-512;
++		keep-power-on;
++	};
+ };
+ 
+ &pmu_io_domains {
+-- 
+Armbian
+

From be43b3b3d3dd3fed952851e69ba11e6436b465e5 Mon Sep 17 00:00:00 2001
From: Martin Schmiedel <Martin.Schmiedel@tq-group.com>
Date: Wed, 23 Oct 2024 16:11:15 +0200
Subject: [PATCH 008/107] xfce: add accountsservice

- fixes: lightdm error 'Error getting user list ...'

Signed-off-by: Martin Schmiedel <Martin.Schmiedel@tq-group.com>
---
 config/desktop/noble/environments/xfce/config_base/packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/desktop/noble/environments/xfce/config_base/packages b/config/desktop/noble/environments/xfce/config_base/packages
index 4cc45ea1e125..7dfb478db699 100644
--- a/config/desktop/noble/environments/xfce/config_base/packages
+++ b/config/desktop/noble/environments/xfce/config_base/packages
@@ -1,3 +1,4 @@
+accountsservice
 anacron
 apt-xapian-index
 blueman

From 238d027d3a396caa7d6cb876f9c6caf836dc3374 Mon Sep 17 00:00:00 2001
From: Martin Schmiedel <Martin.Schmiedel@tq-group.com>
Date: Wed, 23 Oct 2024 16:15:26 +0200
Subject: [PATCH 009/107] tqma-current.config: enable SQUASHFS_XZ

- solves "Filesystem uses "xz" compression. This is not supported"

Signed-off-by: Martin Schmiedel <Martin.Schmiedel@tq-group.com>
---
 config/kernel/linux-tqma-current.config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/kernel/linux-tqma-current.config b/config/kernel/linux-tqma-current.config
index c28ea5ef33dd..d4dec9432d83 100644
--- a/config/kernel/linux-tqma-current.config
+++ b/config/kernel/linux-tqma-current.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.3 Kernel Configuration
+# Linux/arm64 6.11.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
 CONFIG_CC_IS_GCC=y
@@ -8178,7 +8178,7 @@ CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
 CONFIG_SQUASHFS_ZLIB=y
 # CONFIG_SQUASHFS_LZ4 is not set
 # CONFIG_SQUASHFS_LZO is not set
-# CONFIG_SQUASHFS_XZ is not set
+CONFIG_SQUASHFS_XZ=y
 # CONFIG_SQUASHFS_ZSTD is not set
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set

From ff5b934b9ad142f24f253f0c09f3fbf90a298086 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Oct 2024 18:35:15 +0000
Subject: [PATCH 010/107] build(deps): bump rich from 13.9.2 to 13.9.3

Bumps [rich](https://github.com/Textualize/rich) from 13.9.2 to 13.9.3.
- [Release notes](https://github.com/Textualize/rich/releases)
- [Changelog](https://github.com/Textualize/rich/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Textualize/rich/compare/v13.9.2...v13.9.3)

---
updated-dependencies:
- dependency-name: rich
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 336c12696d5a..c081d7271037 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,6 +14,6 @@ coloredlogs == 15.0.1  # for colored logging
 PyYAML == 6.0.2        # for parsing/writing YAML
 oras == 0.1.30         # for OCI stuff in mapper-oci-update
 Jinja2 == 3.1.4        # for templating
-rich == 13.9.2         # for rich text formatting
+rich == 13.9.3         # for rich text formatting
 dtschema == 2024.9     # for checking dts files and dt bindings
 yamllint == 1.35.1     # for checking dts files and dt bindings

From 27129cfce68c4ff7198840071354f51f59b4eac3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Oct 2024 18:21:57 +0000
Subject: [PATCH 011/107] build(deps): bump peter-evans/create-pull-request
 from 6 to 7

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6 to 7.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v6...v7)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/adjust-maintainers.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/adjust-maintainers.yml b/.github/workflows/adjust-maintainers.yml
index 77b49feebace..05566492b16b 100644
--- a/.github/workflows/adjust-maintainers.yml
+++ b/.github/workflows/adjust-maintainers.yml
@@ -101,7 +101,7 @@ jobs:
 
       - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: '`Automatic` board configs status synchronise'

From 7e2bc694798e4564dca2da2dec83f338c7ff91b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Oct 2024 18:21:50 +0000
Subject: [PATCH 012/107] build(deps): bump pascalgn/size-label-action from
 0.5.4 to 0.5.5

Bumps [pascalgn/size-label-action](https://github.com/pascalgn/size-label-action) from 0.5.4 to 0.5.5.
- [Release notes](https://github.com/pascalgn/size-label-action/releases)
- [Commits](https://github.com/pascalgn/size-label-action/compare/v0.5.4...v0.5.5)

---
updated-dependencies:
- dependency-name: pascalgn/size-label-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/pr-auto-labeler.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-auto-labeler.yml b/.github/workflows/pr-auto-labeler.yml
index c5da554aa8a2..d0765980a89d 100644
--- a/.github/workflows/pr-auto-labeler.yml
+++ b/.github/workflows/pr-auto-labeler.yml
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: size-label
-        uses: "pascalgn/size-label-action@v0.5.4"
+        uses: "pascalgn/size-label-action@v0.5.5"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         with:

From a833d163a31b44900210155ef560511c33d27484 Mon Sep 17 00:00:00 2001
From: mr-toolcraft <169016260+mr-toolcraft@users.noreply.github.com>
Date: Wed, 23 Oct 2024 14:20:10 +0200
Subject: [PATCH 013/107] Create board-rock3a-0003-add-gpio-names.patch

---
 .../board-rock3a-0003-add-gpio-names.patch    | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 patch/kernel/archive/rockchip64-6.11/board-rock3a-0003-add-gpio-names.patch

diff --git a/patch/kernel/archive/rockchip64-6.11/board-rock3a-0003-add-gpio-names.patch b/patch/kernel/archive/rockchip64-6.11/board-rock3a-0003-add-gpio-names.patch
new file mode 100644
index 000000000000..89a24ffbd355
--- /dev/null
+++ b/patch/kernel/archive/rockchip64-6.11/board-rock3a-0003-add-gpio-names.patch
@@ -0,0 +1,87 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Werner <werner@armbian.com>
+Date: Wed, 23 Oct 2024 12:27:21 +0200
+Subject: add gpio names for rock-3a
+
+Signed-off-by: Werner <werner@armbian.com>
+---
+ arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 60 ++++++++++
+ 1 file changed, 60 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
+index bb9bdabf1b8e..9536f14b66d9 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
+@@ -275,10 +275,70 @@ &gmac1m1_clkinout
+ &gpu {
+        mali-supply = <&vdd_gpu>;
+        status = "okay";
+ };
+ 
++&gpio0 {
++        gpio-line-names =
++                /* GPIO0_A0 - A7 */
++                "", "", "", "", "", "", "", "",
++                /* GPIO0_B0 - B7 */
++                "", "", "", "pin-28 [GPIO0_B3]", "pin-27 [GPIO0_B4]", "pin-7 [GPIO0_B5]", "pin-16 [GPIO0_B6]", "",
++                /* GPIO0_C0 - C7 */
++                "", "pin-22 [GPIO0_C1]", "", "", "", "", "", "",
++                /* GPIO0_D0 - D7 */
++                "pin-10 [GPIO0_D0]", "pin-8 [GPIO0_D1]", "", "", "", "", "", "";
++};
++
++&gpio1 {
++        gpio-line-names =
++                /* GPIO1_A0 - A7 */
++                "pin-3 [GPIO1_A0]", "pin-5 [GPIO1_A1]", "", "", "", "", "", "",
++                /* GPIO1_B0 - B7 */
++                "", "", "", "", "", "", "", "",
++                /* GPIO1_C0 - C7 */
++                "pin-15 [GPIO0_C0]", "", "", "", "", "", "", "",
++                /* GPIO1_D0 - D7 */
++                "", "", "", "", "", "", "", "";
++};
++
++&gpio2 {
++        gpio-line-names =
++                /* GPIO2_A0 - A7 */
++                "", "", "", "", "", "", "", "",
++                /* GPIO2_B0 - B7 */
++                "", "", "", "", "", "", "", "",
++                /* GPIO2_C0 - C7 */
++                "", "", "", "", "", "", "", "",
++                /* GPIO2_D0 - D7 */
++                "", "", "", "", "", "", "", "pin-29 [GPIO2_D7]";
++};
++
++&gpio3 {
++        gpio-line-names =
++                /* GPIO3_A0 - A7 */
++                "pin-31 [GPIO3_A0]", "", "pin-36 [GPIO3_A2]", "pin-12 [GPIO3_A3]", "pin-35 [GPIO3_A4]", "pin-40 [GPIO3_A5]", "pin-38 [GPIO3_A6]", "",
++                /* GPIO3_B0 - B7 */
++                "", "", "pin-18 [GPIO3_B2]", "", "", "", "", "",
++                /* GPIO3_C0 - C7 */
++                "", "", "pin-32 [GPIO3_C2]", "pin-33 [GPIO3_C3]", "pin-11 [GPIO3_C4]", "pin-13 [GPIO3_C5]", "", "",
++                /* GPIO3_D0 - D7 */
++                "", "", "", "", "", "", "", "";
++};
++
++&gpio4 {
++        gpio-line-names =
++                /* GPIO4_A0 - A7 */
++                "", "", "", "", "", "", "", "",
++                /* GPIO4_B0 - B7 */
++                "", "", "", "", "", "", "", "",
++                /* GPIO4_C0 - C7 */
++                "", "", "pin-21 [GPIO4_C2]", "pin-19 [GPIO4_C3]", "", "pin-21 [GPIO4_C5]", "pin-24 [GPIO4_C6]", "",
++                /* GPIO4_D0 - D7 */
++                "", "pin-26 [GPIO4_D1]", "", "", "", "", "", "";
++};
++
+ &hdmi {
+        avdd-0v9-supply = <&vdda0v9_image>;
+        avdd-1v8-supply = <&vcca1v8_image>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&hdmitx_scl &hdmitx_sda &hdmitxm1_cec>;
+-- 
+Created with Armbian build tools https://github.com/armbian/build

From acd6e07281b1251df4d1a2e1b13e6f545bdf5610 Mon Sep 17 00:00:00 2001
From: mr-toolcraft <169016260+mr-toolcraft@users.noreply.github.com>
Date: Wed, 23 Oct 2024 14:20:43 +0200
Subject: [PATCH 014/107] Rename board-rock3a-usb3.patch to
 board-rock3a-0002-usb3.patch

---
 .../{board-rock3a-usb3.patch => board-rock3a-0002-usb3.patch}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename patch/kernel/archive/rockchip64-6.11/{board-rock3a-usb3.patch => board-rock3a-0002-usb3.patch} (100%)

diff --git a/patch/kernel/archive/rockchip64-6.11/board-rock3a-usb3.patch b/patch/kernel/archive/rockchip64-6.11/board-rock3a-0002-usb3.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rock3a-usb3.patch
rename to patch/kernel/archive/rockchip64-6.11/board-rock3a-0002-usb3.patch

From ac1b27308f15d5cbc100070afb94e37fc986b2eb Mon Sep 17 00:00:00 2001
From: mr-toolcraft <169016260+mr-toolcraft@users.noreply.github.com>
Date: Wed, 23 Oct 2024 14:20:51 +0200
Subject: [PATCH 015/107] Rename board-rock3a-emmc-sfc.patch to
 board-rock3a-0001-emmc-sfc.patch

---
 ...ard-rock3a-emmc-sfc.patch => board-rock3a-0001-emmc-sfc.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename patch/kernel/archive/rockchip64-6.11/{board-rock3a-emmc-sfc.patch => board-rock3a-0001-emmc-sfc.patch} (100%)

diff --git a/patch/kernel/archive/rockchip64-6.11/board-rock3a-emmc-sfc.patch b/patch/kernel/archive/rockchip64-6.11/board-rock3a-0001-emmc-sfc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rock3a-emmc-sfc.patch
rename to patch/kernel/archive/rockchip64-6.11/board-rock3a-0001-emmc-sfc.patch

From 3e6ddf5cb3e62e2df3a620442c4d26747789d0c2 Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Sun, 11 Aug 2024 14:58:03 +0200
Subject: [PATCH 016/107] board: cm3588-nas: Rename board config file to match
 its proper name

---
 config/boards/{nanopc-cm3588-nas.csc => cm3588-nas.csc} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename config/boards/{nanopc-cm3588-nas.csc => cm3588-nas.csc} (100%)

diff --git a/config/boards/nanopc-cm3588-nas.csc b/config/boards/cm3588-nas.csc
similarity index 100%
rename from config/boards/nanopc-cm3588-nas.csc
rename to config/boards/cm3588-nas.csc

From 853c8f216adfb02050dd9fc26bd1d43a3b6c1c4a Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Sun, 11 Aug 2024 15:53:21 +0200
Subject: [PATCH 017/107] board: cm3588-nas: Use mainline dts file

Also add temporary compatibility patch for existing installations,
since existing installations will look for the old dts file.
To make migration smoother, add a pointer to the new file by
including the new dts in the old one.

For migration:
Please edit your `/boot/armbianEnv.txt` as soon as possible to
use BOOT_FDT_FILE="rockchip/rk3588-friendlyelec-cm3588-nas.dtb"!
This workaround will be removed in kernel version 6.14!
---
 config/boards/cm3588-nas.csc                  |    6 +-
 .../dt/rk3588-nanopc-cm3588-nas.dts           | 1435 +----------------
 2 files changed, 7 insertions(+), 1434 deletions(-)

diff --git a/config/boards/cm3588-nas.csc b/config/boards/cm3588-nas.csc
index bff761b68b6e..5276c7bb0de3 100644
--- a/config/boards/cm3588-nas.csc
+++ b/config/boards/cm3588-nas.csc
@@ -8,10 +8,10 @@ KERNEL_TARGET="edge,current,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
-BOOT_FDT_FILE="rockchip/rk3588-nanopc-cm3588-nas.dtb"
+BOOT_FDT_FILE="rockchip/rk3588-friendlyelec-cm3588-nas.dtb"
 BOOT_SCENARIO="spl-blobs"
 
-function post_family_tweaks__nanopccm3588nas_udev_naming_audios() {
+function post_family_tweaks__cm3588_nas_udev_naming_audios() {
 	display_alert "$BOARD" "Renaming CM3588 audio interfaces to human-readable form" "info"
 
 	mkdir -p $SDCARD/etc/udev/rules.d/
@@ -27,7 +27,7 @@ function post_family_tweaks__nanopccm3588nas_udev_naming_audios() {
 
 # Output from CM3588 syslog with edge kernel 6.8: r8169 0004:41:00.0 enP4p65s0: renamed from eth0
 # Note: legacy kernel 5.10 uses driver r8125, edge kernel uses r8169 as of 6.8
-function post_family_tweaks__nanopccm3588nas_udev_naming_network_interfaces() {
+function post_family_tweaks__cm3588_nas_udev_naming_network_interfaces() {
 	display_alert "$BOARD" "Renaming CM3588 LAN interface to eth0" "info"
 
 	mkdir -p $SDCARD/etc/udev/rules.d/
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-nanopc-cm3588-nas.dts b/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-nanopc-cm3588-nas.dts
index f95c8a708aba..768fc42b6ba3 100644
--- a/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-nanopc-cm3588-nas.dts
+++ b/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-nanopc-cm3588-nas.dts
@@ -1,1436 +1,9 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2021 Rockchip Electronics Co., Ltd.
- * Copyright (c) 2023 FriendlyElec Computer Tech. Co., Ltd.
- * Copyright (c) 2023 Thomas McKahan
- * Author: ColorfulRhino
- *
- */
 
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/pinctrl/rockchip.h>
-#include <dt-bindings/soc/rockchip,vop2.h>
-#include <dt-bindings/usb/pd.h>
-#include "rk3588.dtsi"
+#include "rk3588-friendlyelec-cm3588-nas.dts"
 
-/ {
-	model = "FriendlyElec CM3588 NAS";
-	compatible = "friendlyarm,cm3588", "rockchip,rk3588";
-
-	aliases {
-		mmc0 = &sdhci;
-		mmc1 = &sdmmc;
-		// nvme0 = &nvme0;
-		// nvme1 = &nvme1;
-		// nvme2 = &nvme2;
-		// nvme3 = &nvme3;
-		// ethernet0 = &r8125_u10;
-	};
-
-	chosen {
-		stdout-path = "serial2:1500000n8";
-	};
-
-	adc_keys: adc-keys {
-		compatible = "adc-keys";
-		io-channels = <&saradc 1>;
-		io-channel-names = "buttons";
-		keyup-threshold-microvolt = <1800000>;
-		poll-interval = <100>;
-
-		button-vol-up {
-			label = "Volume Up";
-			linux,code = <KEY_VOLUMEUP>;
-			press-threshold-microvolt = <17000>;
-		};
-	};
-
-	analog-sound {
-		compatible = "simple-audio-card";
-		pinctrl-names = "default";
-		pinctrl-0 = <&headphone_detect>;
-
-		simple-audio-card,name = "realtek,rt5616-codec";
-		simple-audio-card,format = "i2s";
-		simple-audio-card,mclk-fs = <256>;
-
-		simple-audio-card,hp-det-gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_LOW>;
-
-		simple-audio-card,routing =
-			"Headphones", "HPOL",
-			"Headphones", "HPOR",
-			"MIC1", "Microphone Jack",
-			"Microphone Jack", "micbias1";
-		simple-audio-card,widgets =
-			"Headphone", "Headphones",
-			"Microphone", "Microphone Jack";
-		
-		simple-audio-card,cpu {
-			sound-dai = <&i2s0_8ch>;
-		};
-		
-		simple-audio-card,codec {
-			sound-dai = <&rt5616>;
-		};
-	};
-
-	fan: pwm-fan {
-		compatible = "pwm-fan";
-		#cooling-cells = <2>;
-		cooling-levels = <0 50 100 150 200 255>;
-		pwms = <&pwm1 0 50000 0>;
-		status = "disabled";
-	};
-
-	gpio_keys: gpio-keys {
-		compatible = "gpio-keys";
-		pinctrl-names = "default";
-		pinctrl-0 = <&key1_pin>;
-
-		button-user {
-			debounce-interval = <50>;
-			gpios = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>;
-			label = "User Button";
-			linux,code = <BTN_1>;
-			wakeup-source;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_sys: led-0 {
-			gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>;
-			label = "system-led";
-			linux,default-trigger = "heartbeat";
-			pinctrl-names = "default";
-			pinctrl-0 = <&led_sys_pin>;
-		};
-
-		led_usr: led-1 {
-			gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>;
-			label = "user-led";
-			pinctrl-names = "default";
-			pinctrl-0 = <&led_usr_pin>;
-		};
-	};
-
-	vcc_12v_dcin: vcc-12v-dcin-regulator {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc_12v_dcin";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <12000000>;
-		regulator-max-microvolt = <12000000>;
-	};
-
-	/* vcc_5v0_sys powers peripherals */
-	vcc_5v0_sys: vcc-5v0-sys-regulator {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc_5v0_sys";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		vin-supply = <&vcc_12v_dcin>;
-	};
-
-	vcc_5v0_host_20: vcc-5v0-host-20 {
-		compatible = "regulator-fixed";
-		enable-active-high;
-		gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&vcc_5v0_host20_en>;
-		regulator-name = "vcc_5v0_host_20";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		vin-supply = <&vcc_5v0_sys>;
-	};
-
-	vcc_5v0_host_30: vcc-5v0-host-30 {
-		compatible = "regulator-fixed";
-		enable-active-high;
-		gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&vcc_5v0_host30_en>;
-		regulator-name = "vcc_5v0_host_30";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		vin-supply = <&vcc_5v0_sys>;
-	};
-
-	vcc_3v3_host_32: vcc-3v3-host-32-regulator {
-		compatible = "regulator-fixed";
-		enable-active-high;
-		gpios = <&gpio3 RK_PA5 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&vcc_3v3_host32_en>;
-		regulator-name = "vcc_3v3_host_32";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		vin-supply = <&vcc_5v0_sys>;
-	};
-
-	vbus_5v0_typec: vbus-5v0-typec-regulator {
-		compatible = "regulator-fixed";
-		enable-active-high;
-		gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&typec_5v_pwr_en>;
-		regulator-name = "vbus_5v0_typec";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		vin-supply = <&vcc_5v0_sys>;
-	};
-
-	/* vcc_4v0_sys powers the RK806, RK860's */
-	vcc_4v0_sys: vcc-4v0-sys-regulator {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc_4v0_sys";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <4000000>;
-		regulator-max-microvolt = <4000000>;
-		vin-supply = <&vcc_12v_dcin>;
-	};
-
-	vcc_3v3_pcie20: vcc-3v3-pcie20-regulator {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc_3v3_pcie20";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		vin-supply = <&vcc_3v3_s3>;
-	};
-
-	vcc_3v3_pcie30: vcc-3v3-pcie30-regulator {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc_3v3_pcie30";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		vin-supply = <&vcc_5v0_sys>;
-	};
-
-	vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator {
-		compatible = "regulator-fixed";
-		gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&sd_s0_pwr>;
-		regulator-boot-on;
-		regulator-max-microvolt = <3300000>;
-		regulator-min-microvolt = <3300000>;
-		regulator-name = "vcc_3v3_sd_s0";
-		vin-supply = <&vcc_3v3_s3>;
-	};
-
-	vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc-1v1-nldo-s3";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <1100000>;
-		regulator-max-microvolt = <1100000>;
-		vin-supply = <&vcc_4v0_sys>;
-	};
-};
-
-&combphy0_ps {
-	status = "okay";
-};
-
-&combphy1_ps {
-	status = "okay";
-};
-
-&combphy2_psu {
-	status = "okay";
-};
-
-&cpu_l0 {
-	cpu-supply = <&vdd_cpu_lit_s0>;
-};
-
-&cpu_l1 {
-	cpu-supply = <&vdd_cpu_lit_s0>;
-};
-
-&cpu_l2 {
-	cpu-supply = <&vdd_cpu_lit_s0>;
-};
-
-&cpu_l3 {
-	cpu-supply = <&vdd_cpu_lit_s0>;
-};
-
-&cpu_b0 {
-	cpu-supply = <&vdd_cpu_big0_s0>;
-};
-
-&cpu_b1 {
-	cpu-supply = <&vdd_cpu_big0_s0>;
-};
-
-&cpu_b2 {
-	cpu-supply = <&vdd_cpu_big1_s0>;
-};
-
-&cpu_b3 {
-	cpu-supply = <&vdd_cpu_big1_s0>;
-};
-
-/* Properties "clock" and "clock-names" introduced by Collabora https://gitlab.collabora.com/hardware-enablement/rockchip-3588/linux/-/commit/8fff68cb7cfe1e698445896252e34f79fad41720 */
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi0>;
-	clock-names = "hdmi0_phy_pll";
-};
-
-/* Signal labels [SIGNAL_LABEL] are from the official CM3588 NAS schematic revision 2309 */
-/* Some GPIOs like USB, sdmmc or SPI-NOR are not listed here */
-&gpio0 {
-	gpio-line-names =
-		/* GPIO0 A0-A7 */
-		"", "", "", "",
-		"", "", "", "",
-		/* GPIO0 B0-B7 */
-		"", "", "", "",
-		"", "", "", "",
-		/* GPIO0 C0-C7 */
-		"", "", "", "",
-		"Pin 10 [UART0_RX_M0]", "Pin 08 [UART0_TX_M0/PWM4_M0]", "Pin 32 [PWM5_M1]", "",
-		/* GPIO0 D0-D7 */
-		"", "", "", "",
-		"IR sensor [PWM3_IR_M0]", "User Button", "", "";
-};
-
-&gpio1 {
-	gpio-line-names =
-		/* GPIO1 A0-A7 */
-		"Pin 27 [UART6_RX_M1]", "Pin 28 [UART6_TX_M1]", "", "",
-		"", "", "", "Pin 15",
-		/* GPIO1 B0-B7 */
-		"Pin 26", "Pin 21 [SPI0_MISO_M2]", "Pin 19 [SPI0_MOSI_M2/UART4_RX_M2]", "Pin 23 [SPI0_CLK_M2/UART4_TX_M2]",
-		"Pin 24 [SPI0_CS0_M2/UART7_RX_M2]", "Pin 22 [SPI0_CS1_M0/UART7_TX_M2]", "", "CSI-Pin 14 [MIPI_CAM2_CLKOUT]",
-		/* GPIO1 C0-C7 */
-		"", "", "", "",
-		"Headphone detect [HP_DET_L]", "", "", "",
-		/* GPIO1 D0-D7 */
-		"", "", "", "Fan [PWM1_M1]",
-		"", "", "Pin 05 [I2C8_SCL_M2]", "Pin 03 [I2C8_SDA_M2]";
-};
-
-&gpio2 {
-	gpio-line-names =
-		/* GPIO2 A0-A7 */
-		"", "", "", "",
-		"", "", "", "",
-		/* GPIO2 B0-B7 */
-		"", "", "", "",
-		"", "", "", "",
-		/* GPIO2 C0-C7 */
-		"", "CSI-Pin 11 [MIPI_CAM2_RESET_L]", "CSI-Pin 12 [MIPI_CAM2_PDN_L]", "",
-		"", "", "", "",
-		/* GPIO2 D0-D7 */
-		"", "", "", "",
-		"", "", "", "";
-};
-
-&gpio3 {
-	gpio-line-names =
-		/* GPIO3 A0-A7 */
-		"Pin 35 [SPI4_MISO_M1/PW M10_M0]", "Pin 38 [SPI4_MOSI_M1]", "Pin 40 [SPI4_CLK_M1/UART8_TX_M1]", "Pin 36 [SPI4_CS0_M1/UART8_RX_M1]",
-		"Pin 37 [SPI4_CS1_M1]", "", "DSI-Pin 12 [LCD_RST]", "Buzzer [PW M8_M0]",
-		/* GPIO3 B0-B7 */
-		"Pin 33 [PW M9_M0]", "DSI-Pin 10 [PW M2_M1/LCD_BL]", "Pin 07", "Pin 16",
-		"Pin 18", "Pin 29 [UART3_TX_M1/PW M12_M0]", "Pin 31 [UART3_RX_M1/PW M13_M0]", "Pin 12",
-		/* GPIO3 C0-C7 */
-		"DSI-Pin 08 [TP_INT_L]", "DSI-Pin 14 [TP_RST_L]", "Pin 11 [PWM14_M0]", "Pin 13 [PWM15_IR_M0]",
-		"", "", "", "DSI-Pin 06 [I2C5_SCL_M0_TP]",
-		/* GPIO3 D0-D7 */
-		"DSI-Pin 05 [I2C5_SDA_M0_TP]", "", "", "",
-		"", "", "", "";
-};
-
-&gpio4 {
-	gpio-line-names =
-		/* GPIO4 A0-A7 */
-		"", "", "", "",
-		"", "", "", "",
-		/* GPIO4 B0-B7 */
-		"", "", "", "",
-		"", "", "", "",
-		/* GPIO4 C0-C7 */
-		"", "", "", "",
-		"", "", "", "",
-		/* GPIO4 D0-D7 */
-		"", "", "", "",
-		"", "", "", "";
-};
-
-&gpu {
-	mali-supply = <&vdd_gpu_s0>;
-	sram-supply = <&vdd_gpu_mem_s0>;
-	status = "okay";
-};
-
-&hdmi0 {
-	// avdd-0v9-supply = 
-	// avdd-1v8-supply =
-	/* Dmesg error/warning:
-	* [  +0.000055] dwhdmi-rockchip fde80000.hdmi: Looking up avdd-0v9-supply from device tree
-	* [  +0.000011] dwhdmi-rockchip fde80000.hdmi: Looking up avdd-0v9-supply property in node /hdmi@fde80000 failed
-	* [  +0.000014] dwhdmi-rockchip fde80000.hdmi: supply avdd-0v9 not found, using dummy regulator
-	* [  +0.000080] dwhdmi-rockchip fde80000.hdmi: Looking up avdd-1v8-supply from device tree
-	* [  +0.000010] dwhdmi-rockchip fde80000.hdmi: Looking up avdd-1v8-supply property in node /hdmi@fde80000 failed
-	* [  +0.000010] dwhdmi-rockchip fde80000.hdmi: supply avdd-1v8 not found, using dummy regulator
-	* [  +0.001009] dwhdmi-rockchip fde80000.hdmi: registered ddc I2C bus driver
-	*/
-	status = "okay";
-};
-
-&hdmi0_in {
-	hdmi0_in_vp0: endpoint {
-		remote-endpoint = <&vp0_out_hdmi0>;
-	};
-};
-
-&hdptxphy_hdmi0 {
-	status = "okay";
-};
-
-// /* 4k HDMI capture controller (see rk3588.dtsi) */
-// &hdmirx_cma {
-// 	status = "okay";
-// };
-
-// &hdmirx_ctrler {
-// 	status = "okay";
-// 	hdmirx-5v-detection-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>;
-// 	pinctrl-0 = <&hdmim1_rx_cec &hdmim1_rx_hpdin &hdmim1_rx_scl &hdmim1_rx_sda &hdmirx_5v_detection>;
-// 	pinctrl-names = "default";
-// 	memory-region = <&hdmirx_cma>;
-// };
-
-&i2c0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&i2c0m2_xfer>;
-	status = "okay";
-
-	vdd_cpu_big0_s0: regulator@42 {
-		compatible = "rockchip,rk8602";
-		reg = <0x42>;
-		fcs,suspend-voltage-selector = <1>;
-		regulator-name = "vdd_cpu_big0_s0";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <550000>;
-		regulator-max-microvolt = <1050000>;
-		regulator-ramp-delay = <2300>;
-		vin-supply = <&vcc_4v0_sys>;
-
-		regulator-state-mem {
-			regulator-off-in-suspend;
-		};
-	};
-
-	vdd_cpu_big1_s0: regulator@43 {
-		compatible = "rockchip,rk8603", "rockchip,rk8602";
-		reg = <0x43>;
-		fcs,suspend-voltage-selector = <1>;
-		regulator-name = "vdd_cpu_big1_s0";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <550000>;
-		regulator-max-microvolt = <1050000>;
-		regulator-ramp-delay = <2300>;
-		vin-supply = <&vcc_4v0_sys>;
-
-		regulator-state-mem {
-			regulator-off-in-suspend;
-		};
-	};
-};
-
-&i2c2 {
-	status = "okay";
-
-	vdd_npu_s0: regulator@42 {
-		compatible = "rockchip,rk8602";
-		reg = <0x42>;
-		fcs,suspend-voltage-selector = <1>;
-		regulator-name = "vdd_npu_s0";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <550000>;
-		regulator-max-microvolt = <950000>;
-		regulator-ramp-delay = <2300>;
-		vin-supply = <&vcc_4v0_sys>;
-
-		regulator-state-mem {
-			regulator-off-in-suspend;
-		};
-	};
-};
-
-&i2c4 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&i2c4m3_xfer>;
-	status = "disabled";
-};
-
-/* Connected to MIPI-DSI0 */
-&i2c5 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&i2c5m0_xfer>;
-	status = "disabled";
-};
-
-&i2c6 {
-	clock-frequency = <200000>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&i2c6m0_xfer>;
-	status = "okay";
-
-	fusb302: typec-portc@22 {
-		compatible = "fcs,fusb302";
-		reg = <0x22>;
-		interrupt-parent = <&gpio0>;
-		interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>;
-		pinctrl-0 = <&usbc0_int>;
-		pinctrl-names = "default";
-		vbus-supply = <&vbus_5v0_typec>;
-
-		ports {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-				port@0 {
-				reg = <0>;
-				usbc0_role_sw: endpoint@0 {
-					remote-endpoint = <&dwc3_0_role_switch>;
-				};
-			};
-		};
-
-		usb_con: connector {
-			compatible = "usb-c-connector";
-			data-role = "dual";
-			label = "USB-C";
-			op-sink-microwatt = <1000000>;
-			power-role = "dual";
-			source-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)>;
-			sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
-			try-power-role = "sink";
-
-			altmodes {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				altmode@0 {
-					reg = <0>;
-					svid = <0xff01>;
-					vdo = <0xffffffff>;
-				};
-			};
-
-			ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				port@0 {
-					reg = <0>;
-					usbc0_orien_sw: endpoint {
-						remote-endpoint = <&usbdp_phy0_orientation_switch>;
-					};
-				};
-
-				port@1 {
-					reg = <1>;
-					dp_altmode_mux: endpoint {
-						remote-endpoint = <&usbdp_phy0_dp_altmode_mux>;
-					};
-				};
-			};
-		};
-	};
-
-	hym8563: rtc@51 {
-		compatible = "haoyu,hym8563";
-		reg = <0x51>;
-		#clock-cells = <0>;
-		clock-output-names = "hym8563";
-		interrupt-parent = <&gpio0>;
-		interrupts = <RK_PB0 IRQ_TYPE_LEVEL_LOW>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&hym8563_int>;
-		wakeup-source;
-	};
-};
-
-/* Connected to MIPI-CSI1 */
-&i2c7 {
-	clock-frequency = <200000>;
-	status = "okay";
-
-	rt5616: audio-codec@1b {
-		compatible = "realtek,rt5616";
-		reg = <0x1b>;
-		assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;
-		assigned-clock-rates = <12288000>;
-		clocks = <&cru I2S0_8CH_MCLKOUT>;
-		clock-names = "mclk";
-		#sound-dai-cells = <0>;
-
-		port {
-			rt5616_p0_0: endpoint {
-				remote-endpoint = <&i2s0_8ch_p0_0>;
-			};
-		};
-	};
-};
-
-/* GPIO Connector, connected to 40-pin GPIO header */
-&i2c8 {
-	pinctrl-0 = <&i2c8m2_xfer>;
-};
-
-&i2s0_8ch {
-	pinctrl-names = "default";
-	pinctrl-0 = <&i2s0_lrck
-				&i2s0_mclk
-				&i2s0_sclk
-				&i2s0_sdi0
-				&i2s0_sdo0>;
-	status = "okay";
-
-	i2s0_8ch_p0: port {
-		i2s0_8ch_p0_0: endpoint {
-			dai-format = "i2s";
-			mclk-fs = <256>;
-			remote-endpoint = <&rt5616_p0_0>;
-		};
-	};
-};
-
-&i2s5_8ch {
-	status = "okay";
-};
-
-&i2s6_8ch {
-	status = "okay";
-};
-
-&i2s7_8ch {
-	status = "okay";
-};
-
-/* Temperature sensor near the center of the SoC */
-&package_thermal {
-	polling-delay = <1000>;
-
-	trips {
-		package_hot: package_hot {
-			hysteresis = <2000>;
-			temperature = <65000>;
-			type = "active";
-		};
-	};
-
-	cooling-maps {
-		map0 {
-			cooling-device = <&fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-			trip = <&package_hot>;
-		};
-	};
-};
-
-&pcie2x1l0 { // @fe170000
-	/* 2. M.2 slot, CON14: pcie30phy port0 lane1 */
-	max-link-speed = <3>;
-	num-lanes = <1>;
-	phys = <&pcie30phy>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pcie2_0_rst>;
-	reset-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
-	vpcie3v3-supply = <&vcc_3v3_pcie30>;
-	status = "okay";
-
-	// pcie@0,0 {
-	// 	reg = <0x00200000 0 0 0 0>;
-	// 	#address-cells = <3>;
-	// 	#size-cells = <2>;
-
-	// 	nvme1: pcie@20,0 {
-	// 		reg = <0x000000 0 0 0 0>;
-	// 	};
-	// };
-};
-
-&pcie2x1l1 { // @fe180000
-	/* 4. M.2 slot, CON16: pcie30phy port1 lane1 */
-	max-link-speed = <3>;
-	num-lanes = <1>;
-	phys = <&pcie30phy>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pcie2_1_rst>;
-	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
-	vpcie3v3-supply = <&vcc_3v3_pcie30>;
-	status = "okay";
-
-	// pcie@0,0 {
-	// 	reg = <0x00300000 0 0 0 0>;
-	// 	#address-cells = <3>;
-	// 	#size-cells = <2>;
-
-	// 	nvme3: pcie@30,0 {
-	// 		reg = <0x000000 0 0 0 0>;
-	// 	};
-	// };
-};
-
-&pcie2x1l2 { // @fe190000
-	/* r8125 ethernet */
-	pinctrl-names = "default";
-	pinctrl-0 = <&pcie2_2_rst>;
-	reset-gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>;
-	vpcie3v3-supply = <&vcc_3v3_pcie20>;
-	status = "okay";
-
-	// pcie@0,0 {
-	// 	reg = <0x00400000 0 0 0 0>;
-	// 	#address-cells = <3>;
-	// 	#size-cells = <2>;
-
-	// 	r8125_u10: pcie@40,0 {
-	// 		reg = <0x000000 0 0 0 0>;
-	// 		local-mac-address = [ 00 00 00 00 00 00 ];
-	// 	};
-	// };
-};
-
-&pcie30phy {
-	/*
-	* Michal Tomek describes:
-	* The PHY offers the following mapping options:
-	* 
-	* port 0 lane 0 - always mapped to controller 0 (4L)
- 	* port 0 lane 1 - to controller 0 or 2 (1L0)
-	* port 1 lane 0 - to controller 0 or 1 (2L)
-	* port 1 lane 1 - to controller 0, 1 or 3 (1L1)
-	* 
-	* The data-lanes DT property maps these as follows:
-	* 
-	* 0 = no controller (unsupported by the HW)
- 	* 1 = 4L
-	* 2 = 2L
-	* 3 = 1L0
- 	* 4 = 1L1
-	*
-	* <1 3 2 4> = NABIBI = [3 3] = x1x1 x1x1 (bif. of both ports;
-	*/
-	data-lanes = <1 3 2 4>;
-	status = "okay";
-};
-
-&pcie3x4 { // @fe150000
-	/* 1. M.2 slot, CON13: pcie30phy port0 lane0 */
-	max-link-speed = <3>;
-	num-lanes = <1>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pcie3x4_rst>;
-	reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
-	vpcie3v3-supply = <&vcc_3v3_pcie30>;
-	status = "okay";
-
-	// pcie@0,0 {
-	// 	reg = <0x00000000 0 0 0 0>;
-	// 	#address-cells = <3>;
-	// 	#size-cells = <2>;
-
-	// 	nvme0: pcie@0,0 {
-	// 		reg = <0x000000 0 0 0 0>;
-	// 	};
-	// };
-};
-
-&pcie3x2 { // @fe160000
-	/* 3. M.2 slot, CON15: pcie30phy port1 lane0 */
-	max-link-speed = <3>;
-	num-lanes = <1>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pcie3x2_rst>;
-	reset-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
-	vpcie3v3-supply = <&vcc_3v3_pcie30>;
-	status = "okay";
-
-	// pcie@0,0 {
-	// 	reg = <0x00100000 0 0 0 0>;
-	// 	#address-cells = <3>;
-	// 	#size-cells = <2>;
-
-	// 	nvme2: pcie@10,0 {
-	// 		reg = <0x000000 0 0 0 0>;
-	// 	};
-	// };
-};
-
-&pinctrl {
-	audio {
-		headphone_detect: headphone-detect {
-			rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-	};
-
-	gpio-key {
-		key1_pin: key1-pin {
-			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
-		};
-	};
-
-	gpio-leds {
-		led_sys_pin: led-sys-pin {
-			rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-
-		led_usr_pin: led-usr-pin {
-			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-	};
-
-	hym8563 {
-		hym8563_int: hym8563-int {
-			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
-		};
-	};
-
-	pcie {
-		pcie2_0_rst: pcie2-0-rst {
-			rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-
-		pcie2_1_rst: pcie2-1-rst {
-			rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-
-		pcie2_2_rst: pcie2-2-rst {
-			rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-
-		pcie3x2_rst: pcie3x2-rst {
-			rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-
-		pcie3x4_rst: pcie3x4-rst {
-			rockchip,pins = <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-	};
-
-	sdmmc {
-		sd_s0_pwr: sd-s0-pwr {
-			rockchip,pins = <4 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
-		};
-	};
-
-	usb {
-		vcc_5v0_host20_en: vcc-5v0-host20-en {
-			rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-
-		vcc_5v0_host30_en: vcc-5v0-host30-en {
-			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-		
-		vcc_3v3_host32_en: vcc-3v3-host32-en {
-			rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-	};
-
-	usb-typec {
-		usbc0_int: usbc0-int {
-			rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;
-		};
-
-		typec_5v_pwr_en: typec-5v-pwr-en {
-			rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-	};
-};
-
-/* Connected to 5V Fan */
-&pwm1 {
-	pinctrl-0 = <&pwm1m1_pins>;
-	status = "okay";
-};
-
-/* Connected to MIPI-DSI0 */
-&pwm2 {
-	pinctrl-0 = <&pwm2m1_pins>;
-};
-
-/* GPIO Connector, connected to 40-pin GPIO header */
-&pwm5 {
-	pinctrl-0 = <&pwm5m1_pins>;
-	status = "okay";
-};
-
-/* GPIO Connector */
-&pwm8 {
-	pinctrl-0 = <&pwm8m0_pins>;
-	status = "okay";
-};
-
-/* GPIO Connector */
-&pwm9 {
-	pinctrl-0 = <&pwm9m0_pins>;
-	status = "okay";
-};
-
-&saradc {
-	vref-supply = <&avcc_1v8_s0>;
-	status = "okay";
-};
-
-/* eMMC */
-&sdhci {
-	bus-width = <8>;
-	full-pwr-cycle-in-suspend;
-	mmc-hs400-1_8v;
-	mmc-hs400-enhanced-strobe;
-	no-sd;
-	no-sdio;
-	non-removable;
-	status = "okay";
-};
-
-/* microSD card */
-&sdmmc {
-	bus-width = <4>;
-	cap-mmc-highspeed;
-	cap-sd-highspeed;
-	cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
-	disable-wp;
-	max-frequency = <150000000>;
-	no-mmc;
-	no-sdio;
-	sd-uhs-sdr104;
-	vmmc-supply = <&vcc_3v3_sd_s0>;
-	vqmmc-supply = <&vccio_sd_s0>;
-	status = "okay";
-};
-
-/* GPIO Connector */
-&spi0 {
-	num-cs = <1>;
-	pinctrl-0 = <&spi0m2_cs0 &spi0m2_pins>;
-	status = "disabled";
-};
-
-&spi2 {
-	status = "okay";
-	assigned-clocks = <&cru CLK_SPI2>;
-	assigned-clock-rates = <200000000>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>;
-	num-cs = <1>;
-
-	rk806_single: pmic@0 {
-		compatible = "rockchip,rk806";
-		reg = <0x0>;
-
-		interrupt-parent = <&gpio0>;
-		interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
-
-		pinctrl-names = "default";
-		pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>,
-			    <&rk806_dvs2_null>, <&rk806_dvs3_null>;
-		
-		spi-max-frequency = <1000000>;
-
-		system-power-controller;
-
-		vcc1-supply = <&vcc_4v0_sys>;
-		vcc2-supply = <&vcc_4v0_sys>;
-		vcc3-supply = <&vcc_4v0_sys>;
-		vcc4-supply = <&vcc_4v0_sys>;
-		vcc5-supply = <&vcc_4v0_sys>;
-		vcc6-supply = <&vcc_4v0_sys>;
-		vcc7-supply = <&vcc_4v0_sys>;
-		vcc8-supply = <&vcc_4v0_sys>;
-		vcc9-supply = <&vcc_4v0_sys>;
-		vcc10-supply = <&vcc_4v0_sys>;
-		vcc11-supply = <&vcc_2v0_pldo_s3>;
-		vcc12-supply = <&vcc_4v0_sys>;
-		vcc13-supply = <&vcc_1v1_nldo_s3>;
-		vcc14-supply = <&vcc_1v1_nldo_s3>;
-		vcca-supply = <&vcc_4v0_sys>;
-
-		gpio-controller;
-		#gpio-cells = <2>;
-
-		rk806_dvs1_null: dvs1-null-pins {
-			pins = "gpio_pwrctrl1";
-			function = "pin_fun0";
-		};
-
-		rk806_dvs2_null: dvs2-null-pins {
-			pins = "gpio_pwrctrl2";
-			function = "pin_fun0";
-		};
-
-		rk806_dvs3_null: dvs3-null-pins {
-			pins = "gpio_pwrctrl3";
-			function = "pin_fun0";
-		};
-
-		regulators {
-			vdd_gpu_s0: vdd_gpu_mem_s0: dcdc-reg1 {
-				regulator-boot-on;
-				regulator-min-microvolt = <550000>;
-				regulator-max-microvolt = <950000>;
-				regulator-ramp-delay = <12500>;
-				regulator-name = "vdd_gpu_s0";
-				regulator-enable-ramp-delay = <400>;
-
-				regulator-state-mem {
-					regulator-off-in-suspend;
-				};
-			};
-
-			vdd_cpu_lit_s0: vdd_cpu_lit_mem_s0: dcdc-reg2 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <550000>;
-				regulator-max-microvolt = <950000>;
-				regulator-ramp-delay = <12500>;
-				regulator-name = "vdd_cpu_lit_s0";
-
-				regulator-state-mem {
-					regulator-off-in-suspend;
-				};
-			};
-
-			vdd_log_s0: dcdc-reg3 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <675000>;
-				regulator-max-microvolt = <750000>;
-				regulator-ramp-delay = <12500>;
-				regulator-name = "vdd_log_s0";
-
-				regulator-state-mem {
-					regulator-off-in-suspend;
-					regulator-suspend-microvolt = <750000>;
-				};
-			};
-
-			vdd_vdenc_s0: vdd_vdenc_mem_s0: dcdc-reg4 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <550000>;
-				regulator-max-microvolt = <950000>;
-				regulator-ramp-delay = <12500>;
-				regulator-name = "vdd_vdenc_s0";
-
-				regulator-state-mem {
-					regulator-off-in-suspend;
-				};
-			};
-
-			vdd_ddr_s0: dcdc-reg5 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <675000>;
-				regulator-max-microvolt = <900000>;
-				regulator-ramp-delay = <12500>;
-				regulator-name = "vdd_ddr_s0";
-
-				regulator-state-mem {
-					regulator-off-in-suspend;
-					regulator-suspend-microvolt = <850000>;
-				};
-			};
-
-			vdd2_ddr_s3: dcdc-reg6 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-name = "vdd2_ddr_s3";
-
-				regulator-state-mem {
-					regulator-on-in-suspend;
-				};
-			};
-
-			vcc_2v0_pldo_s3: dcdc-reg7 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <2000000>;
-				regulator-max-microvolt = <2000000>;
-				regulator-ramp-delay = <12500>;
-				regulator-name = "vdd_2v0_pldo_s3";
-
-				regulator-state-mem {
-					regulator-on-in-suspend;
-					regulator-suspend-microvolt = <2000000>;
-				};
-			};
-
-			vcc_3v3_s3: dcdc-reg8 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <3300000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-name = "vcc_3v3_s3";
-
-				regulator-state-mem {
-					regulator-on-in-suspend;
-					regulator-suspend-microvolt = <3300000>;
-				};
-			};
-
-			vddq_ddr_s0: dcdc-reg9 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-name = "vddq_ddr_s0";
-
-				regulator-state-mem {
-					regulator-off-in-suspend;
-				};
-			};
-
-			vcc_1v8_s3: dcdc-reg10 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <1800000>;
-				regulator-name = "vcc_1v8_s3";
-
-				regulator-state-mem {
-					regulator-on-in-suspend;
-					regulator-suspend-microvolt = <1800000>;
-				};
-			};
-
-			avcc_1v8_s0: pldo-reg1 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <1800000>;
-				regulator-name = "avcc_1v8_s0";
-
-				regulator-state-mem {
-					regulator-off-in-suspend;
-				};
-			};
-
-			vcc_1v8_s0: pldo-reg2 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <1800000>;
-				regulator-name = "vcc_1v8_s0";
-
-				regulator-state-mem {
-					regulator-off-in-suspend;
-					regulator-suspend-microvolt = <1800000>;
-				};
-			};
-
-			avdd_1v2_s0: pldo-reg3 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <1200000>;
-				regulator-max-microvolt = <1200000>;
-				regulator-name = "avdd_1v2_s0";
-
-				regulator-state-mem {
-					regulator-off-in-suspend;
-				};
-			};
-
-			vcc_3v3_s0: pldo-reg4 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <3300000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-ramp-delay = <12500>;
-				regulator-name = "vcc_3v3_s0";
-
-				regulator-state-mem {
-					regulator-off-in-suspend;
-				};
-			};
-
-			vccio_sd_s0: pldo-reg5 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-ramp-delay = <12500>;
-				regulator-name = "vccio_sd_s0";
-
-				regulator-state-mem {
-					regulator-off-in-suspend;
-				};
-			};
-
-			pldo6_s3: pldo-reg6 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <1800000>;
-				regulator-name = "pldo6_s3";
-
-				regulator-state-mem {
-					regulator-on-in-suspend;
-					regulator-suspend-microvolt = <1800000>;
-				};
-			};
-
-			vdd_0v75_s3: nldo-reg1 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <750000>;
-				regulator-max-microvolt = <750000>;
-				regulator-name = "vdd_0v75_s3";
-
-				regulator-state-mem {
-					regulator-on-in-suspend;
-					regulator-suspend-microvolt = <750000>;
-				};
-			};
-
-			vdd_ddr_pll_s0: nldo-reg2 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <850000>;
-				regulator-max-microvolt = <850000>;
-				regulator-name = "vdd_ddr_pll_s0";
-
-				regulator-state-mem {
-					regulator-off-in-suspend;
-					regulator-suspend-microvolt = <850000>;
-				};
-			};
-
-			avdd_0v75_s0: nldo-reg3 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <750000>;
-				regulator-max-microvolt = <750000>;
-				regulator-name = "avdd_0v75_s0";
-
-				regulator-state-mem {
-					regulator-off-in-suspend;
-				};
-			};
-
-			vdd_0v85_s0: nldo-reg4 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <850000>;
-				regulator-max-microvolt = <850000>;
-				regulator-name = "vdd_0v85_s0";
-
-				regulator-state-mem {
-					regulator-off-in-suspend;
-				};
-			};
-
-			vdd_0v75_s0: nldo-reg5 {
-				regulator-always-on;
-				regulator-boot-on;
-				regulator-min-microvolt = <750000>;
-				regulator-max-microvolt = <750000>;
-				regulator-name = "vdd_0v75_s0";
-
-				regulator-state-mem {
-					regulator-off-in-suspend;
-				};
-			};
-		};
-	};
-};
-
-/* GPIO Connector, connected to 40-pin GPIO header */
-&spi4 {
-	num-cs = <1>;
-	pinctrl-0 = <&spi4m1_cs0 &spi4m1_pins>;
-	status = "disabled";
-};
-
-&tsadc {
-	status = "okay";
-};
-
-/* GPIO Connector, connected to 40-pin GPIO header */
-&uart0 {
-	pinctrl-0 = <&uart0m0_xfer>;
-	status = "disabled";
-};
-
-/* Debug UART */
-&uart2 {
-	pinctrl-0 = <&uart2m0_xfer>;
-	status = "okay";
-};
-
-/* GPIO Connector, connected to 40-pin GPIO header */
-&uart3 {
-	pinctrl-0 = <&uart3m1_xfer>;
-	status = "disabled";
-};
-
-/* GPIO Connector, connected to 40-pin GPIO header */
-&uart4 {
-	pinctrl-0 = <&uart4m2_xfer>;
-	status = "disabled";
-};
-
-/* GPIO Connector, connected to 40-pin GPIO header */
-&uart6 {
-	pinctrl-0 = <&uart6m1_xfer>;
-	status = "okay";
-};
-
-/* GPIO Connector, connected to 40-pin GPIO header */
-&uart7 {
-	pinctrl-0 = <&uart7m2_xfer>;
-	status = "disabled";
-};
-
-/* GPIO Connector, connected to 40-pin GPIO header */
-&uart8 {
-	pinctrl-0 = <&uart8m1_xfer>;
-	status = "disabled";
-};
-
-&u2phy0 {
-	status = "okay";
-};
-
-&u2phy0_otg {
-	rockchip,typec-vbus-det; /* @TODO Note: This flag is not (yet?) present in Linux 6.9 "Documentation/devicetree/bindings/phy/rockchip,inno-usb2phy.yaml" */
-	status = "okay";
-};
-
-&u2phy1 {
-	status = "okay";
-};
-
-&u2phy1_otg {
-	phy-supply = <&vcc_5v0_host_30>;
-	status = "okay";
-};
-
-&u2phy2 {
-	status = "okay";
-};
-
-&u2phy2_host {
-	phy-supply = <&vcc_5v0_host_20>;
-	status = "okay";
-};
-
-&u2phy3 {
-	status = "okay";
-};
-
-&u2phy3_host {
-	phy-supply = <&vcc_3v3_host_32>;
-	status = "okay";
-};
-
-&usb_host0_ehci {
-	status = "okay";
-};
-
-&usb_host0_ohci {
-	status = "okay";
-};
-
-&usb_host0_xhci {
-	dr_mode = "otg";
-	usb-role-switch;
-	status = "okay";
-
-	port {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		dwc3_0_role_switch: endpoint@0 {
-			reg = <0>;
-			remote-endpoint = <&usbc0_role_sw>;
-		};
-	};
-};
-
-&usb_host1_ehci {
-	status = "okay";
-};
-
-&usb_host1_ohci {
-	status = "okay";
-};
-
-/* Upper USB 3.0 port */
-&usb_host1_xhci {
-	dr_mode = "host";
-	snps,xhci-trb-ent-quirk;
-	status = "okay";
-};
-
-/* Lower USB 3.0 port */
-&usb_host2_xhci {
-	dr_mode = "host";
-	status = "okay";
-};
-
-&usbdp_phy0 {
-	orientation-switch;
-	svid = <0xff01>;
-	sbu1-dc-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>;
-	sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
-	status = "okay";
-
-	port {
-		#address-cells = <1>;
-		#size-cells = <0>;
-		usbdp_phy0_orientation_switch: endpoint@0 {
-			reg = <0>;
-			remote-endpoint = <&usbc0_orien_sw>;
-		};
-
-		usbdp_phy0_dp_altmode_mux: endpoint@1 {
-			reg = <1>;
-			remote-endpoint = <&dp_altmode_mux>;
-		};
-	};
-};
-
-&usbdp_phy1 {
-	status = "okay";
-};
-
-&vop {
-	status = "okay";
-};
-
-&vop_mmu {
-	status = "okay";
-};
-
-&vp0 {
-	vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
-		reg = <ROCKCHIP_VOP2_EP_HDMI0>;
-		remote-endpoint = <&hdmi0_in_vp0>;
-	};
-};
-
-&wdt {
-	status = "okay";
-};
+// DO NOT ADD ANYTHING TO THIS DTS!
+// This file only exists for temporary backwards compatibility for existing installations installed before 2024-10-20.
+// THIS COMPATIBILITY PATCH WILL BE DELETED in kernel 6.14, please migrate to the new dts by editing your "/boot/armbianEnv.txt"!

From 9c84397e92462267aba160fb501534e3cf29d0be Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Sun, 11 Aug 2024 15:53:54 +0200
Subject: [PATCH 018/107] board: cm3588-nas: Add HDMI support for `current`
 kernel 6.11

---
 ...60-board-cm3588-nas-Add-HDMI-support.patch | 88 +++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 patch/kernel/archive/rockchip-rk3588-6.11/1060-board-cm3588-nas-Add-HDMI-support.patch

diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1060-board-cm3588-nas-Add-HDMI-support.patch b/patch/kernel/archive/rockchip-rk3588-6.11/1060-board-cm3588-nas-Add-HDMI-support.patch
new file mode 100644
index 000000000000..e3d63945901b
--- /dev/null
+++ b/patch/kernel/archive/rockchip-rk3588-6.11/1060-board-cm3588-nas-Add-HDMI-support.patch
@@ -0,0 +1,88 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
+Date: Sun, 11 Aug 2024 15:28:03 +0200
+Subject: CM3588-NAS: Add HDMI support
+
+---
+ arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts | 47 ++++++++++
+ 1 file changed, 47 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
+index 111111111111..222222222222 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
+@@ -12,6 +12,7 @@
+ #include <dt-bindings/input/input.h>
+ #include <dt-bindings/pinctrl/rockchip.h>
+ #include <dt-bindings/usb/pd.h>
++#include <dt-bindings/soc/rockchip,vop2.h>
+ #include "rk3588-friendlyelec-cm3588.dtsi"
+ 
+ / {
+@@ -225,6 +226,12 @@ &combphy2_psu {
+ 	status = "okay";
+ };
+ 
++/* Properties "clock" and "clock-names" introduced by Collabora https://gitlab.collabora.com/hardware-enablement/rockchip-3588/linux/-/commit/8fff68cb7cfe1e698445896252e34f79fad41720 */
++&display_subsystem {
++	clocks = <&hdptxphy_hdmi0>;
++	clock-names = "hdmi0_phy_pll";
++};
++
+ /* GPIO names are in the format "Human-readable-name [SIGNAL_LABEL]" */
+ /* Signal labels match the official CM3588 NAS SDK schematic revision 2309 */
+ &gpio0 {
+@@ -307,6 +314,31 @@ &gpio4 {
+ 		"", "", "", "";
+ };
+ 
++&hdmi0 {
++	// avdd-0v9-supply = 
++	// avdd-1v8-supply =
++	/* Dmesg error/warning:
++	* [  +0.000055] dwhdmi-rockchip fde80000.hdmi: Looking up avdd-0v9-supply from device tree
++	* [  +0.000011] dwhdmi-rockchip fde80000.hdmi: Looking up avdd-0v9-supply property in node /hdmi@fde80000 failed
++	* [  +0.000014] dwhdmi-rockchip fde80000.hdmi: supply avdd-0v9 not found, using dummy regulator
++	* [  +0.000080] dwhdmi-rockchip fde80000.hdmi: Looking up avdd-1v8-supply from device tree
++	* [  +0.000010] dwhdmi-rockchip fde80000.hdmi: Looking up avdd-1v8-supply property in node /hdmi@fde80000 failed
++	* [  +0.000010] dwhdmi-rockchip fde80000.hdmi: supply avdd-1v8 not found, using dummy regulator
++	* [  +0.001009] dwhdmi-rockchip fde80000.hdmi: registered ddc I2C bus driver
++	*/
++	status = "okay";
++};
++
++&hdmi0_in {
++	hdmi0_in_vp0: endpoint {
++		remote-endpoint = <&vp0_out_hdmi0>;
++	};
++};
++
++&hdptxphy_hdmi0 {
++	status = "okay";
++};
++
+ /* Connected to MIPI-DSI0 */
+ &i2c5 {
+ 	pinctrl-names = "default";
+@@ -776,3 +808,18 @@ usbdp_phy0_dp_altmode_mux: endpoint@1 {
+ &usbdp_phy1 {
+ 	status = "okay";
+ };
++
++&vop {
++	status = "okay";
++};
++
++&vop_mmu {
++	status = "okay";
++};
++
++&vp0 {
++	vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
++		reg = <ROCKCHIP_VOP2_EP_HDMI0>;
++		remote-endpoint = <&hdmi0_in_vp0>;
++	};
++};
+-- 
+Armbian
+

From 2032f67c4a942b9af2d0e11574b30ed95e260d5d Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Tue, 13 Aug 2024 16:17:00 +0200
Subject: [PATCH 019/107] board: cm3588-nas: Use mainline U-Boot v2024.10

Support for the CM3588 NAS has been added in v2024.10-rc3.
Drop vendor U-Boot for this board completely.
---
 config/boards/cm3588-nas.csc                  |  30 ++-
 .../defconfig/nanopc_cm3588_defconfig         | 216 ----------------
 .../dt/rk3588-nanopc-cm3588.dts               | 235 ------------------
 3 files changed, 14 insertions(+), 467 deletions(-)
 delete mode 100644 patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopc_cm3588_defconfig
 delete mode 100644 patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-nanopc-cm3588.dts

diff --git a/config/boards/cm3588-nas.csc b/config/boards/cm3588-nas.csc
index 5276c7bb0de3..eb22feacd999 100644
--- a/config/boards/cm3588-nas.csc
+++ b/config/boards/cm3588-nas.csc
@@ -2,7 +2,7 @@
 BOARD_NAME="FriendlyElec CM3588 NAS"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="ColorfulRhino"
-BOOTCONFIG="nanopc_cm3588_defconfig" # Enables booting from NVMe. Vendor name, not standard, see hook below, set BOOT_SOC below to compensate
+BOOTCONFIG="cm3588-nas-rk3588_defconfig" # Mainline defconfig, enables booting from NVMe
 BOOT_SOC="rk3588"
 KERNEL_TARGET="edge,current,vendor"
 FULL_DESKTOP="yes"
@@ -36,25 +36,23 @@ function post_family_tweaks__cm3588_nas_udev_naming_network_interfaces() {
 	EOF
 }
 
-# Mainline u-boot or Kwiboo's tree
-function post_family_config_branch_edge__nanopccm3588nas_use_mainline_uboot() {
-	display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"
+# Mainline U-Boot
+function post_family_config__cm3588_nas_use_mainline_uboot() {
+	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
 
-	declare -g BOOTCONFIG="nanopc-t6-rk3588_defconfig"                    # override the default for the board/family
-	declare -g BOOTDELAY=1                                                # Wait for UART interrupt to enter UMS/RockUSB mode etc
-	declare -g BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git" # We ❤️ Kwiboo's tree
-	declare -g BOOTBRANCH="branch:rk3xxx-2024.04"                         # commit:31522fe7b3c7733313e1c5eb4e340487f6000196 as of 2024-04-01
-	declare -g BOOTPATCHDIR="v2024.04/board_${BOARD}"                     # empty; defconfig changes are done in hook below
-	declare -g BOOTDIR="u-boot-${BOARD}"                                  # do not share u-boot directory
-	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
-	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
+	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
+	declare -g BOOTBRANCH="tag:v2024.10-rc3"
+	declare -g BOOTPATCHDIR="v2024.10"
+	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
+
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
+
+	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
 
 	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
 	function write_uboot_platform() {
 		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
 	}
-
-	function write_uboot_platform_mtd() {
-		flashcp -v -p "$1/u-boot-rockchip-spi.bin" /dev/mtd0
-	}
 }
diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopc_cm3588_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopc_cm3588_defconfig
deleted file mode 100644
index 47bed0ea5316..000000000000
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopc_cm3588_defconfig
+++ /dev/null
@@ -1,216 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_ARCH_ROCKCHIP=y
-CONFIG_SPL_GPIO_SUPPORT=y
-CONFIG_SPL_LIBCOMMON_SUPPORT=y
-CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_SYS_MALLOC_F_LEN=0x80000
-CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh"
-CONFIG_ROCKCHIP_RK3588=y
-CONFIG_ROCKCHIP_USB_BOOT=y
-CONFIG_ROCKCHIP_FIT_IMAGE=y
-CONFIG_ROCKCHIP_HWID_DTB=y
-CONFIG_ROCKCHIP_VENDOR_PARTITION=y
-CONFIG_USING_KERNEL_DTB_V2=y
-CONFIG_ROCKCHIP_FIT_IMAGE_PACK=y
-CONFIG_ROCKCHIP_NEW_IDB=y
-CONFIG_LOADER_INI="RK3588MINIALL.ini"
-CONFIG_TRUST_INI="RK3588TRUST.ini"
-CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
-CONFIG_TARGET_EVB_RK3588=y
-CONFIG_SPL_LIBDISK_SUPPORT=y
-CONFIG_SPL_SPI_FLASH_SUPPORT=y
-CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_DEFAULT_DEVICE_TREE="rk3588-nanopc-cm3588"
-CONFIG_DEBUG_UART=y
-CONFIG_LOCALVERSION="-armbian"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_FIT=y
-CONFIG_FIT_IMAGE_POST_PROCESS=y
-CONFIG_FIT_HW_CRYPTO=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
-CONFIG_SPL_FIT_HW_CRYPTO=y
-# CONFIG_SPL_SYS_DCACHE_OFF is not set
-CONFIG_BOOTDELAY=0
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-# CONFIG_DISPLAY_CPUINFO is not set
-CONFIG_ANDROID_BOOTLOADER=y
-CONFIG_ANDROID_AVB=y
-CONFIG_ANDROID_BOOT_IMAGE_HASH=y
-CONFIG_SPL_BOARD_INIT=y
-# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
-# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
-CONFIG_SPL_SEPARATE_BSS=y
-CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
-CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x1
-CONFIG_SPL_MMC_WRITE=y
-CONFIG_SPL_MTD_SUPPORT=y
-CONFIG_SPL_ATF=y
-CONFIG_FASTBOOT_BUF_ADDR=0xc00800
-CONFIG_FASTBOOT_BUF_SIZE=0x04000000
-CONFIG_FASTBOOT_FLASH=y
-CONFIG_FASTBOOT_FLASH_MMC_DEV=0
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_DTIMG=y
-# CONFIG_CMD_ELF is not set
-# CONFIG_CMD_IMI is not set
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_XIMG is not set
-# CONFIG_CMD_LZMADEC is not set
-# CONFIG_CMD_UNZIP is not set
-# CONFIG_CMD_FLASH is not set
-# CONFIG_CMD_FPGA is not set
-CONFIG_CMD_GPT=y
-# CONFIG_CMD_LOADB is not set
-# CONFIG_CMD_LOADS is not set
-CONFIG_CMD_BOOT_ANDROID=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_SF=y
-CONFIG_CMD_SPI=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_USB_MASS_STORAGE=y
-# CONFIG_CMD_ITEST is not set
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_TFTPPUT=y
-CONFIG_CMD_TFTP_BOOTM=y
-CONFIG_CMD_TFTP_FLASH=y
-# CONFIG_CMD_MISC is not set
-CONFIG_CMD_MTD_BLK=y
-# CONFIG_SPL_DOS_PARTITION is not set
-# CONFIG_ISO_PARTITION is not set
-CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64
-CONFIG_SPL_OF_CONTROL=y
-CONFIG_SPL_DTB_MINIMUM=y
-CONFIG_OF_LIVE=y
-CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
-# CONFIG_NET_TFTP_VARS is not set
-CONFIG_REGMAP=y
-CONFIG_SPL_REGMAP=y
-CONFIG_SYSCON=y
-CONFIG_SPL_SYSCON=y
-# CONFIG_SARADC_ROCKCHIP is not set
-CONFIG_SARADC_ROCKCHIP_V2=y
-CONFIG_CLK=y
-CONFIG_SPL_CLK=y
-CONFIG_CLK_SCMI=y
-CONFIG_SPL_CLK_SCMI=y
-CONFIG_DM_CRYPTO=y
-CONFIG_SPL_DM_CRYPTO=y
-CONFIG_ROCKCHIP_CRYPTO_V2=y
-CONFIG_SPL_ROCKCHIP_CRYPTO_V2=y
-CONFIG_DM_RNG=y
-CONFIG_RNG_ROCKCHIP=y
-CONFIG_SCMI_FIRMWARE=y
-CONFIG_SPL_SCMI_FIRMWARE=y
-CONFIG_ROCKCHIP_GPIO=y
-CONFIG_ROCKCHIP_GPIO_V2=y
-CONFIG_SYS_I2C_ROCKCHIP=y
-CONFIG_DM_KEY=y
-CONFIG_ADC_KEY=y
-CONFIG_MISC=y
-CONFIG_SPL_MISC=y
-CONFIG_MISC_DECOMPRESS=y
-CONFIG_SPL_MISC_DECOMPRESS=y
-CONFIG_ROCKCHIP_OTP=y
-CONFIG_ROCKCHIP_HW_DECOMPRESS=y
-CONFIG_SPL_ROCKCHIP_HW_DECOMPRESS=y
-CONFIG_SPL_ROCKCHIP_SECURE_OTP=y
-CONFIG_MMC_DW=y
-CONFIG_MMC_DW_ROCKCHIP=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_SDMA=y
-CONFIG_MMC_SDHCI_ROCKCHIP=y
-CONFIG_MTD=y
-CONFIG_MTD_BLK=y
-CONFIG_MTD_DEVICE=y
-CONFIG_NAND=y
-CONFIG_MTD_SPI_NAND=y
-CONFIG_SPI_FLASH=y
-CONFIG_SF_DEFAULT_SPEED=80000000
-CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_SST=y
-CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_SPI_FLASH_XMC=y
-CONFIG_SPI_FLASH_XTX=y
-CONFIG_SPI_FLASH_MTD=y
-CONFIG_DM_ETH=y
-CONFIG_DM_ETH_PHY=y
-CONFIG_DWC_ETH_QOS=y
-CONFIG_GMAC_ROCKCHIP=y
-CONFIG_NVME=y
-CONFIG_PCI=y
-CONFIG_DM_PCI=y
-CONFIG_DM_PCI_COMPAT=y
-CONFIG_PCIE_DW_ROCKCHIP=y
-CONFIG_PHY_ROCKCHIP_INNO_USB2=y
-CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
-CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=y
-CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
-CONFIG_PINCTRL=y
-CONFIG_SPL_PINCTRL=y
-CONFIG_DM_PMIC=y
-CONFIG_PMIC_SPI_RK8XX=y
-CONFIG_REGULATOR_PWM=y
-CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_DM_REGULATOR_GPIO=y
-CONFIG_REGULATOR_RK860X=y
-CONFIG_PWM_ROCKCHIP=y
-CONFIG_RAM=y
-CONFIG_SPL_RAM=y
-CONFIG_TPL_RAM=y
-CONFIG_ROCKCHIP_SDRAM_COMMON=y
-CONFIG_ROCKCHIP_TPL_INIT_DRAM_TYPE=0
-CONFIG_DM_RESET=y
-CONFIG_SPL_DM_RESET=y
-CONFIG_SPL_RESET_ROCKCHIP=y
-CONFIG_BAUDRATE=1500000
-CONFIG_DEBUG_UART_BASE=0xFEB50000
-CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART_SHIFT=2
-CONFIG_ROCKCHIP_SPI=y
-CONFIG_ROCKCHIP_SFC=y
-CONFIG_SYSRESET=y
-CONFIG_USB=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_DWC3=y
-CONFIG_USB_XHCI_PCI=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_GENERIC=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_GENERIC=y
-CONFIG_USB_DWC3=y
-CONFIG_USB_DWC3_GADGET=y
-CONFIG_USB_DWC3_GENERIC=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
-CONFIG_USB_GADGET_VENDOR_NUM=0x2207
-CONFIG_USB_GADGET_PRODUCT_NUM=0x350a
-CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_DM_VIDEO=y
-CONFIG_DISPLAY=y
-CONFIG_DRM_ROCKCHIP=y
-CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI2=y
-CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y
-CONFIG_DRM_ROCKCHIP_SAMSUNG_MIPI_DCPHY=y
-CONFIG_USE_TINY_PRINTF=y
-CONFIG_LIB_RAND=y
-CONFIG_SPL_TINY_MEMSET=y
-CONFIG_RSA=y
-CONFIG_SPL_RSA=y
-CONFIG_RSA_N_SIZE=0x200
-CONFIG_RSA_E_SIZE=0x10
-CONFIG_RSA_C_SIZE=0x20
-CONFIG_LZ4=y
-CONFIG_ERRNO_STR=y
-# CONFIG_EFI_LOADER is not set
-CONFIG_AVB_LIBAVB=y
-CONFIG_AVB_LIBAVB_AB=y
-CONFIG_AVB_LIBAVB_ATX=y
-CONFIG_AVB_LIBAVB_USER=y
-CONFIG_RK_AVB_LIBAVB_USER=y
diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-nanopc-cm3588.dts b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-nanopc-cm3588.dts
deleted file mode 100644
index b8a8c64ee6a7..000000000000
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-nanopc-cm3588.dts
+++ /dev/null
@@ -1,235 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2021 Rockchip Electronics Co., Ltd
- *
- */
-
-/dts-v1/;
-#include <dt-bindings/input/input.h>
-#include "rk3588.dtsi"
-#include "rk3588-u-boot.dtsi"
-
-/ {
-	model = "FriendlyElec CM3588";
-	compatible = "friendlyelec,cm3588", "rockchip,rk3588";
-
-	vcc12v_dcin: vcc12v-dcin {
-		u-boot,dm-pre-reloc;
-		compatible = "regulator-fixed";
-		regulator-name = "vcc12v_dcin";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <12000000>;
-		regulator-max-microvolt = <12000000>;
-	};
-
-	vcc5v0_sys: vcc5v0-sys {
-		u-boot,dm-pre-reloc;
-		compatible = "regulator-fixed";
-		regulator-name = "vcc5v0_sys";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		vin-supply = <&vcc12v_dcin>;
-	};
-
-	vcc_5v0: vcc-5v0 {
-		u-boot,dm-pre-reloc;
-		compatible = "regulator-fixed";
-		regulator-name = "vcc_5v0";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		regulator-boot-on;
-		regulator-always-on;
-		enable-active-high;
-		gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&vcc_5v0_en>;
-		vin-supply = <&vcc5v0_sys>;
-	};
-
-	vcc5v0_host: vcc5v0-host-regulator {
-		u-boot,dm-pre-reloc;
-		compatible = "regulator-fixed";
-		regulator-name = "vcc5v0_host";
-		regulator-boot-on;
-		regulator-always-on;
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		enable-active-high;
-		gpio = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&vcc5v0_host_en>;
-		vin-supply = <&vcc5v0_sys>;
-	};
-
-	vcc3v3_pcie30: vcc3v3-pcie30 {
-		u-boot,dm-pre-reloc;
-		startup-delay-us = <50000>;
-		compatible = "regulator-fixed";
-		regulator-name = "vcc3v3_pcie30";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		vin-supply = <&vcc5v0_sys>;
-	};
-
-	led_sys: led-sys {
-		u-boot,dm-pre-reloc;
-		compatible = "regulator-fixed";
-		regulator-name = "led_sys";
-		enable-active-high;
-		gpio = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; // Turn on user led
-		regulator-boot-on;
-		regulator-always-on;
-		vin-supply = <&vcc5v0_sys>;
-	};
-};
-
-&pcie2x1l0 {
-	u-boot,dm-pre-reloc;
-	/* 2. CON14: pcie30phy port0 lane1 */
-	max-link-speed = <3>;
-	num-lanes = <1>;
-	phys = <&pcie30phy>;
-	reset-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
-	vpcie3v3-supply = <&vcc3v3_pcie30>;
-	status = "okay";
-
-	pcie@0,0 {
-		reg = <0x00200000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-
-		nvme1: pcie@20,0 {
-			reg = <0x000000 0 0 0 0>;
-		};
-	};
-};
-
-&pcie2x1l1 {
-	u-boot,dm-pre-reloc;
-	/* 4. CON16: pcie30phy port1 lane1 */
-	max-link-speed = <3>;
-	num-lanes = <1>;
-	phys = <&pcie30phy>;
-	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
-	vpcie3v3-supply = <&vcc3v3_pcie30>;
-	status = "okay";
-
-	pcie@0,0 {
-		reg = <0x00300000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-
-		nvme3: pcie@30,0 {
-			reg = <0x000000 0 0 0 0>;
-		};
-	};
-};
-
-&pcie3x4 {
-	u-boot,dm-pre-reloc;
-	/* 1. CON13: pcie30phy port0 lane0 */
-	max-link-speed = <3>;
-	num-lanes = <1>;
-	reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
-	vpcie3v3-supply = <&vcc3v3_pcie30>;
-	status = "okay";
-
-	pcie@0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-
-		nvme0: pcie@0,0 {
-			reg = <0x000000 0 0 0 0>;
-		};
-	};
-};
-
-&pcie3x2 {
-	u-boot,dm-pre-reloc;
-	/* 3. CON15: pcie30phy port1 lane0 */
-	max-link-speed = <3>;
-	num-lanes = <1>;
-	reset-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
-	vpcie3v3-supply = <&vcc3v3_pcie30>;
-	status = "okay";
-
-	pcie@0,0 {
-		reg = <0x00100000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-
-		nvme2: pcie@10,0 {
-			reg = <0x000000 0 0 0 0>;
-		};
-	};
-};
-
-&pcie30phy {
-	u-boot,dm-pre-reloc;
-	rockchip,pcie30-phymode = <PHY_MODE_PCIE_NABIBI>;
-	status = "okay";
-};
-
-&combphy0_ps {
-	u-boot,dm-pre-reloc;
-	status = "okay";
-};
-
-&combphy2_psu {
-	u-boot,dm-pre-reloc;
-	status = "okay";
-};
-
-&usb2phy0_grf {
-	status = "okay";
-	u-boot,dm-pre-reloc;
-};
-
-&u2phy0 {
-	status = "okay";
-	u-boot,dm-pre-reloc;
-};
-
-&u2phy0_otg {
-	status = "okay";
-	u-boot,dm-pre-reloc;
-};
-
-&usb2phy2_grf {
-	status = "okay";
-	u-boot,dm-pre-reloc;
-};
-
-&u2phy2 {
-	status = "okay";
-	u-boot,dm-pre-reloc;
-};
-
-&u2phy2_host {
-	status = "okay";
-	u-boot,dm-pre-reloc;
-};
-
-&pinctrl {
-	usb {
-		u-boot,dm-pre-reloc;
-		vcc5v0_host_en: vcc5v0-host-en {
-			u-boot,dm-pre-reloc;
-			rockchip,pins = <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-	};
-
-	power {
-		u-boot,dm-spl;
-		vcc_5v0_en: vcc-5v0-en {
-			u-boot,dm-spl;
-			rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-	};
-};

From 29adf3bd08c9ed7219e02a329db69b58c9beadd0 Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Sun, 20 Oct 2024 20:26:26 +0200
Subject: [PATCH 020/107] board: cm3588-nas: Bump U-Boot v2024.10-rc3 to
 v2024.10

---
 config/boards/cm3588-nas.csc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/boards/cm3588-nas.csc b/config/boards/cm3588-nas.csc
index eb22feacd999..6dd48f7af70d 100644
--- a/config/boards/cm3588-nas.csc
+++ b/config/boards/cm3588-nas.csc
@@ -42,7 +42,7 @@ function post_family_config__cm3588_nas_use_mainline_uboot() {
 
 	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.10-rc3"
+	declare -g BOOTBRANCH="tag:v2024.10"
 	declare -g BOOTPATCHDIR="v2024.10"
 	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
 

From a8e7d17e7fc5b7419f0907c780b8ad61109c6dc7 Mon Sep 17 00:00:00 2001
From: mr-toolcraft <169016260+mr-toolcraft@users.noreply.github.com>
Date: Mon, 28 Oct 2024 20:31:30 +0100
Subject: [PATCH 021/107] Radxa rock-3a - edge - add overlay to disable debug
 console (#7402)

* rock-3a: add overlay to disable debug serial console

* Update Makefile

* Update patch/kernel/archive/rockchip64-6.11/overlay/Makefile

Co-authored-by: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>

* Rename rockchip-rock-3a-disable-uart2.dtso to rockchip-rk3568-rock-3a-disable-uart2.dtso

---------

Co-authored-by: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
---
 .../kernel/archive/rockchip64-6.11/overlay/Makefile  |  3 ++-
 .../rockchip-rk3568-rock-3a-disable-uart2.dtso       | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso

diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/Makefile b/patch/kernel/archive/rockchip64-6.11/overlay/Makefile
index f6138e1eba01..47877df684f4 100644
--- a/patch/kernel/archive/rockchip64-6.11/overlay/Makefile
+++ b/patch/kernel/archive/rockchip64-6.11/overlay/Makefile
@@ -44,7 +44,8 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
 	rockchip-rk3568-hk-spi-spidev.dtbo \
 	rockchip-rk3568-hk-uart0.dtbo \
 	rockchip-rk3568-hk-uart0-rts_cts.dtbo \
-	rockchip-rk3568-hk-uart1.dtbo
+	rockchip-rk3568-hk-uart1.dtbo \
+	rockchip-rk3568-rock-3a-disable-uart2.dtbo
 
 scr-$(CONFIG_ARCH_ROCKCHIP) += \
        rockchip-fixup.scr
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso b/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso
new file mode 100644
index 000000000000..5b7421e921d6
--- /dev/null
+++ b/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+        fragment@0 {
+                target = <&uart2>;
+
+                __overlay__ {
+                        status = "disabled";
+                };
+        };
+};

From 59de6d7227f378ba56f70aff91ca64cf525a748b Mon Sep 17 00:00:00 2001
From: chainsx <chainsx@outlook.com>
Date: Thu, 24 Oct 2024 10:36:13 +0800
Subject: [PATCH 022/107] Add community support for Cyber Aib RK3588

---
 config/boards/cyber-aib-rk3588.csc            |  23 ++
 .../defconfig/rk3588-cyber-aib_defconfig      | 214 ++++++++++++++++++
 .../dt/rk3588-cyber-aib.dts                   | 160 +++++++++++++
 3 files changed, 397 insertions(+)
 create mode 100644 config/boards/cyber-aib-rk3588.csc
 create mode 100644 patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/rk3588-cyber-aib_defconfig
 create mode 100644 patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-cyber-aib.dts

diff --git a/config/boards/cyber-aib-rk3588.csc b/config/boards/cyber-aib-rk3588.csc
new file mode 100644
index 000000000000..54d4b1af9bba
--- /dev/null
+++ b/config/boards/cyber-aib-rk3588.csc
@@ -0,0 +1,23 @@
+# Rockchip RK3588 octa core 8/16GB RAM SoC 64/128GB eMMC NVMe 1x USB3 1x USB-C 2x 2.5GbE 2x HDMI
+BOARD_NAME="Cyber Aib RK3588"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER=""
+BOOTCONFIG="rk3588-cyber-aib_defconfig"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-cyber-aib.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SOC="rk3588"
+IMAGE_PARTITION_TABLE="gpt"
+
+function post_family_tweaks__cyberaib_naming_audios() {
+	display_alert "$BOARD" "Renaming cyber-aib audios" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmiin-sound", ENV{SOUND_DESCRIPTION}="HDMI-In Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+
+	return 0
+}
diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/rk3588-cyber-aib_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/rk3588-cyber-aib_defconfig
new file mode 100644
index 000000000000..3266131385ed
--- /dev/null
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/rk3588-cyber-aib_defconfig
@@ -0,0 +1,214 @@
+CONFIG_ARM=y
+CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SYS_MALLOC_F_LEN=0x80000
+CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh"
+CONFIG_ROCKCHIP_RK3588=y
+CONFIG_ROCKCHIP_FIT_IMAGE=y
+CONFIG_ROCKCHIP_HWID_DTB=y
+CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_USING_KERNEL_DTB_V2=y
+CONFIG_ROCKCHIP_FIT_IMAGE_PACK=y
+CONFIG_ROCKCHIP_NEW_IDB=y
+CONFIG_LOADER_INI="RK3588MINIALL.ini"
+CONFIG_TRUST_INI="RK3588TRUST.ini"
+CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_TARGET_EVB_RK3588=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_DEFAULT_DEVICE_TREE="rk3588-cyber-aib"
+CONFIG_DEBUG_UART=y
+CONFIG_LOCALVERSION="-linyufeng"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_FIT=y
+CONFIG_FIT_IMAGE_POST_PROCESS=y
+CONFIG_FIT_HW_CRYPTO=y
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
+CONFIG_SPL_FIT_HW_CRYPTO=y
+# CONFIG_SPL_SYS_DCACHE_OFF is not set
+CONFIG_BOOTDELAY=0
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
+# CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_ANDROID_BOOTLOADER=y
+CONFIG_ANDROID_AVB=y
+CONFIG_ANDROID_BOOT_IMAGE_HASH=y
+CONFIG_SPL_BOARD_INIT=y
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
+CONFIG_SPL_SEPARATE_BSS=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x1
+CONFIG_SPL_MMC_WRITE=y
+CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_ATF=y
+CONFIG_FASTBOOT_BUF_ADDR=0xc00800
+CONFIG_FASTBOOT_BUF_SIZE=0x04000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_DTIMG=y
+# CONFIG_CMD_ELF is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_LZMADEC is not set
+# CONFIG_CMD_UNZIP is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_CMD_GPT=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_BOOT_ANDROID=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_TFTPPUT=y
+CONFIG_CMD_TFTP_BOOTM=y
+CONFIG_CMD_TFTP_FLASH=y
+# CONFIG_CMD_MISC is not set
+CONFIG_CMD_MTD_BLK=y
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_ISO_PARTITION is not set
+CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_SPL_DTB_MINIMUM=y
+CONFIG_OF_LIVE=y
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+# CONFIG_NET_TFTP_VARS is not set
+CONFIG_REGMAP=y
+CONFIG_SPL_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_SPL_SYSCON=y
+# CONFIG_SARADC_ROCKCHIP is not set
+CONFIG_SARADC_ROCKCHIP_V2=y
+CONFIG_CLK=y
+CONFIG_SPL_CLK=y
+CONFIG_CLK_SCMI=y
+CONFIG_SPL_CLK_SCMI=y
+CONFIG_DM_CRYPTO=y
+CONFIG_SPL_DM_CRYPTO=y
+CONFIG_ROCKCHIP_CRYPTO_V2=y
+CONFIG_SPL_ROCKCHIP_CRYPTO_V2=y
+CONFIG_DM_RNG=y
+CONFIG_RNG_ROCKCHIP=y
+CONFIG_SCMI_FIRMWARE=y
+CONFIG_SPL_SCMI_FIRMWARE=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_ROCKCHIP_GPIO_V2=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_DM_KEY=y
+CONFIG_ADC_KEY=y
+CONFIG_MISC=y
+CONFIG_SPL_MISC=y
+CONFIG_MISC_DECOMPRESS=y
+CONFIG_SPL_MISC_DECOMPRESS=y
+CONFIG_ROCKCHIP_OTP=y
+CONFIG_ROCKCHIP_HW_DECOMPRESS=y
+CONFIG_SPL_ROCKCHIP_HW_DECOMPRESS=y
+CONFIG_SPL_ROCKCHIP_SECURE_OTP=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_SDMA=y
+CONFIG_MMC_SDHCI_ROCKCHIP=y
+CONFIG_MTD=y
+CONFIG_MTD_BLK=y
+CONFIG_MTD_DEVICE=y
+CONFIG_NAND=y
+CONFIG_MTD_SPI_NAND=y
+CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=80000000
+CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_FLASH_XMC=y
+CONFIG_SPI_FLASH_XTX=y
+CONFIG_SPI_FLASH_MTD=y
+CONFIG_DM_ETH=y
+CONFIG_DM_ETH_PHY=y
+CONFIG_DWC_ETH_QOS=y
+CONFIG_GMAC_ROCKCHIP=y
+CONFIG_NVME=y
+CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_DM_PCI_COMPAT=y
+CONFIG_PCIE_DW_ROCKCHIP=y
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=y
+CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
+CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
+CONFIG_DM_PMIC=y
+CONFIG_PMIC_SPI_RK8XX=y
+CONFIG_REGULATOR_PWM=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_REGULATOR_RK860X=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_RAM=y
+CONFIG_SPL_RAM=y
+CONFIG_TPL_RAM=y
+CONFIG_ROCKCHIP_SDRAM_COMMON=y
+CONFIG_ROCKCHIP_TPL_INIT_DRAM_TYPE=0
+CONFIG_DM_RESET=y
+CONFIG_SPL_DM_RESET=y
+CONFIG_SPL_RESET_ROCKCHIP=y
+CONFIG_BAUDRATE=1500000
+CONFIG_DEBUG_UART_BASE=0xFEB50000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_ROCKCHIP_SPI=y
+CONFIG_ROCKCHIP_SFC=y
+CONFIG_SYSRESET=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_XHCI_PCI=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_GENERIC=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x350a
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
+CONFIG_DRM_ROCKCHIP=y
+CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI2=y
+CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y
+CONFIG_DRM_ROCKCHIP_SAMSUNG_MIPI_DCPHY=y
+CONFIG_USE_TINY_PRINTF=y
+CONFIG_LIB_RAND=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_RSA=y
+CONFIG_SPL_RSA=y
+CONFIG_RSA_N_SIZE=0x200
+CONFIG_RSA_E_SIZE=0x10
+CONFIG_RSA_C_SIZE=0x20
+CONFIG_LZ4=y
+CONFIG_ERRNO_STR=y
+# CONFIG_EFI_LOADER is not set
+CONFIG_AVB_LIBAVB=y
+CONFIG_AVB_LIBAVB_AB=y
+CONFIG_AVB_LIBAVB_ATX=y
+CONFIG_AVB_LIBAVB_USER=y
+CONFIG_RK_AVB_LIBAVB_USER=y
+CONFIG_OPTEE_CLIENT=y
+CONFIG_OPTEE_V2=y
diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-cyber-aib.dts b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-cyber-aib.dts
new file mode 100644
index 000000000000..e63f23ded5e2
--- /dev/null
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-cyber-aib.dts
@@ -0,0 +1,160 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2022 Rockchip Electronics Co., Ltd.
+ * Copyright (c) 2024 Cyber RD Group
+ */
+
+/dts-v1/;
+#include "rk3588.dtsi"
+#include "rk3588-u-boot.dtsi"
+#include <dt-bindings/input/input.h>
+
+/ {
+	model = "Cyber 3588 AIB";
+	compatible = "cyber,cyber3588-aib", "rockchip,rk3588";
+
+	vcc12v_dcin: vcc12v-dcin {
+		u-boot,dm-pre-reloc;
+		compatible = "regulator-fixed";
+		regulator-name = "vcc12v_dcin";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+	};
+
+	vcc5v0_sys: vcc5v0-sys {
+		u-boot,dm-pre-reloc;
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc12v_dcin>;
+	};
+
+	pcie_power_en: pcie-power-en-regulator {
+		u-boot,dm-pre-reloc;
+		compatible = "regulator-fixed";
+        	regulator-name = "pcie_power_en";
+		enable-active-high;
+		gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>;
+		pinctrl-0 = <&pcie_power_h>;
+		pinctrl-names = "default";
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
+	pcie_preset_low: pcie-preset-low-regulator {
+		u-boot,dm-pre-reloc;
+		compatible = "regulator-fixed";
+        	regulator-name = "pcie_preset_low";
+		enable-active-low;
+		gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_LOW>;
+		pinctrl-0 = <&pcie_preset_l>;
+		pinctrl-names = "default";
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
+	pcie_wifi_enable: pcie-wifi-enable-regulator {
+		u-boot,dm-pre-reloc;
+		compatible = "regulator-fixed";
+        	regulator-name = "pcie_wifi_enable";
+		enable-active-low;
+		gpio = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;
+		pinctrl-0 = <&pcie_wifi_h>;
+		pinctrl-names = "default";
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
+	wwan_5g_power_en: wwan-5g-power-en {
+		u-boot,dm-pre-reloc;
+		compatible = "regulator-fixed";
+        	regulator-name = "wwan_5g_power_en";
+		enable-active-high;
+		gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
+		pinctrl-0 = <&wwan_5g_power_h>;
+		pinctrl-names = "default";
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
+	wwan_disable: wwan-disable-regulator {
+		u-boot,dm-pre-reloc;
+		compatible = "regulator-fixed";
+		regulator-name = "wwan_disable";
+		enable-active-high;
+		gpio = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>;
+		pinctrl-0 = <&wwan_disable_h>;
+		pinctrl-names = "default";
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
+	wwan_power_off: wwan-power-off-regulator {
+		u-boot,dm-pre-reloc;
+		compatible = "regulator-fixed";
+		regulator-name = "wwan_power_off";
+		enable-active-high;
+		gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
+		pinctrl-0 = <&wwan_power_off_h>;
+		pinctrl-names = "default";
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
+	gmac1_power: gmac1-power {
+		u-boot,dm-pre-reloc;
+		compatible = "regulator-fixed";
+		regulator-name = "gmac1_power";
+		enable-active-high;
+		gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
+		pinctrl-0 = <&gmac1_rgmii_pwr_en>;
+		pinctrl-names = "default";
+		regulator-boot-on;
+		regulator-always-on;
+	};
+};
+
+&pinctrl {
+	pcie {
+		pcie_power_h: pcie-power-h {
+			u-boot,dm-pre-reloc;
+			rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+		pcie_preset_l: pcie-preset-l {
+			u-boot,dm-pre-reloc;
+			rockchip,pins = <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+		pcie_wifi_h: pcie-wifi-h {
+			u-boot,dm-pre-reloc;
+			rockchip,pins = <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+	wwan-pwr {
+		wwan_5g_power_h: wwan-5g-power-h {
+			u-boot,dm-pre-reloc;
+			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		wwan_disable_h: wwan-disable-h {
+			u-boot,dm-pre-reloc;
+			rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		wwan_power_off_h: wwan-power-off-h {
+			u-boot,dm-pre-reloc;
+			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+	gmac1_rgmii {
+		gmac1_rgmii_pwr_en: gmac1-rgmii-pwr-en {
+			u-boot,dm-pre-reloc;
+			rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+};

From 8b3fb65404d1fec1b3e843de74815fadd64e1c33 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Tue, 29 Oct 2024 09:10:18 +0100
Subject: [PATCH 023/107] Bugfix: patch writing style caused breakage

For some reason added patch had spaces instead of tabs.
---
 .../board-rock3a-0003-add-gpio-names.patch    | 102 +++++++++---------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/patch/kernel/archive/rockchip64-6.11/board-rock3a-0003-add-gpio-names.patch b/patch/kernel/archive/rockchip64-6.11/board-rock3a-0003-add-gpio-names.patch
index 89a24ffbd355..60b41f85ad0e 100644
--- a/patch/kernel/archive/rockchip64-6.11/board-rock3a-0003-add-gpio-names.patch
+++ b/patch/kernel/archive/rockchip64-6.11/board-rock3a-0003-add-gpio-names.patch
@@ -14,74 +14,74 @@ index bb9bdabf1b8e..9536f14b66d9 100644
 +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
 @@ -275,10 +275,70 @@ &gmac1m1_clkinout
  &gpu {
-        mali-supply = <&vdd_gpu>;
-        status = "okay";
+ 	mali-supply = <&vdd_gpu>;
+ 	status = "okay";
  };
  
 +&gpio0 {
-+        gpio-line-names =
-+                /* GPIO0_A0 - A7 */
-+                "", "", "", "", "", "", "", "",
-+                /* GPIO0_B0 - B7 */
-+                "", "", "", "pin-28 [GPIO0_B3]", "pin-27 [GPIO0_B4]", "pin-7 [GPIO0_B5]", "pin-16 [GPIO0_B6]", "",
-+                /* GPIO0_C0 - C7 */
-+                "", "pin-22 [GPIO0_C1]", "", "", "", "", "", "",
-+                /* GPIO0_D0 - D7 */
-+                "pin-10 [GPIO0_D0]", "pin-8 [GPIO0_D1]", "", "", "", "", "", "";
++		gpio-line-names =
++				/* GPIO0_A0 - A7 */
++				"", "", "", "", "", "", "", "",
++				/* GPIO0_B0 - B7 */
++				"", "", "", "pin-28 [GPIO0_B3]", "pin-27 [GPIO0_B4]", "pin-7 [GPIO0_B5]", "pin-16 [GPIO0_B6]", "",
++				/* GPIO0_C0 - C7 */
++				"", "pin-22 [GPIO0_C1]", "", "", "", "", "", "",
++				/* GPIO0_D0 - D7 */
++				"pin-10 [GPIO0_D0]", "pin-8 [GPIO0_D1]", "", "", "", "", "", "";
 +};
 +
 +&gpio1 {
-+        gpio-line-names =
-+                /* GPIO1_A0 - A7 */
-+                "pin-3 [GPIO1_A0]", "pin-5 [GPIO1_A1]", "", "", "", "", "", "",
-+                /* GPIO1_B0 - B7 */
-+                "", "", "", "", "", "", "", "",
-+                /* GPIO1_C0 - C7 */
-+                "pin-15 [GPIO0_C0]", "", "", "", "", "", "", "",
-+                /* GPIO1_D0 - D7 */
-+                "", "", "", "", "", "", "", "";
++		gpio-line-names =
++				/* GPIO1_A0 - A7 */
++				"pin-3 [GPIO1_A0]", "pin-5 [GPIO1_A1]", "", "", "", "", "", "",
++				/* GPIO1_B0 - B7 */
++				"", "", "", "", "", "", "", "",
++				/* GPIO1_C0 - C7 */
++				"pin-15 [GPIO0_C0]", "", "", "", "", "", "", "",
++				/* GPIO1_D0 - D7 */
++				"", "", "", "", "", "", "", "";
 +};
 +
 +&gpio2 {
-+        gpio-line-names =
-+                /* GPIO2_A0 - A7 */
-+                "", "", "", "", "", "", "", "",
-+                /* GPIO2_B0 - B7 */
-+                "", "", "", "", "", "", "", "",
-+                /* GPIO2_C0 - C7 */
-+                "", "", "", "", "", "", "", "",
-+                /* GPIO2_D0 - D7 */
-+                "", "", "", "", "", "", "", "pin-29 [GPIO2_D7]";
++		gpio-line-names =
++				/* GPIO2_A0 - A7 */
++				"", "", "", "", "", "", "", "",
++				/* GPIO2_B0 - B7 */
++				"", "", "", "", "", "", "", "",
++				/* GPIO2_C0 - C7 */
++				"", "", "", "", "", "", "", "",
++				/* GPIO2_D0 - D7 */
++				"", "", "", "", "", "", "", "pin-29 [GPIO2_D7]";
 +};
 +
 +&gpio3 {
-+        gpio-line-names =
-+                /* GPIO3_A0 - A7 */
-+                "pin-31 [GPIO3_A0]", "", "pin-36 [GPIO3_A2]", "pin-12 [GPIO3_A3]", "pin-35 [GPIO3_A4]", "pin-40 [GPIO3_A5]", "pin-38 [GPIO3_A6]", "",
-+                /* GPIO3_B0 - B7 */
-+                "", "", "pin-18 [GPIO3_B2]", "", "", "", "", "",
-+                /* GPIO3_C0 - C7 */
-+                "", "", "pin-32 [GPIO3_C2]", "pin-33 [GPIO3_C3]", "pin-11 [GPIO3_C4]", "pin-13 [GPIO3_C5]", "", "",
-+                /* GPIO3_D0 - D7 */
-+                "", "", "", "", "", "", "", "";
++		gpio-line-names =
++				/* GPIO3_A0 - A7 */
++				"pin-31 [GPIO3_A0]", "", "pin-36 [GPIO3_A2]", "pin-12 [GPIO3_A3]", "pin-35 [GPIO3_A4]", "pin-40 [GPIO3_A5]", "pin-38 [GPIO3_A6]", "",
++				/* GPIO3_B0 - B7 */
++				"", "", "pin-18 [GPIO3_B2]", "", "", "", "", "",
++				/* GPIO3_C0 - C7 */
++				"", "", "pin-32 [GPIO3_C2]", "pin-33 [GPIO3_C3]", "pin-11 [GPIO3_C4]", "pin-13 [GPIO3_C5]", "", "",
++				/* GPIO3_D0 - D7 */
++				"", "", "", "", "", "", "", "";
 +};
 +
 +&gpio4 {
-+        gpio-line-names =
-+                /* GPIO4_A0 - A7 */
-+                "", "", "", "", "", "", "", "",
-+                /* GPIO4_B0 - B7 */
-+                "", "", "", "", "", "", "", "",
-+                /* GPIO4_C0 - C7 */
-+                "", "", "pin-21 [GPIO4_C2]", "pin-19 [GPIO4_C3]", "", "pin-21 [GPIO4_C5]", "pin-24 [GPIO4_C6]", "",
-+                /* GPIO4_D0 - D7 */
-+                "", "pin-26 [GPIO4_D1]", "", "", "", "", "", "";
++		gpio-line-names =
++				/* GPIO4_A0 - A7 */
++				"", "", "", "", "", "", "", "",
++				/* GPIO4_B0 - B7 */
++				"", "", "", "", "", "", "", "",
++				/* GPIO4_C0 - C7 */
++				"", "", "pin-21 [GPIO4_C2]", "pin-19 [GPIO4_C3]", "", "pin-21 [GPIO4_C5]", "pin-24 [GPIO4_C6]", "",
++				/* GPIO4_D0 - D7 */
++				"", "pin-26 [GPIO4_D1]", "", "", "", "", "", "";
 +};
 +
  &hdmi {
-        avdd-0v9-supply = <&vdda0v9_image>;
-        avdd-1v8-supply = <&vcca1v8_image>;
-        pinctrl-names = "default";
-        pinctrl-0 = <&hdmitx_scl &hdmitx_sda &hdmitxm1_cec>;
+ 	avdd-0v9-supply = <&vdda0v9_image>;
+ 	avdd-1v8-supply = <&vcca1v8_image>;
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&hdmitx_scl &hdmitx_sda &hdmitxm1_cec>;
 -- 
 Created with Armbian build tools https://github.com/armbian/build

From d355c17dc3b7f3349d1dfe919df9bc40b25e4ed3 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Thu, 31 Oct 2024 08:39:50 +0100
Subject: [PATCH 024/107] Change pull request trigger in order to get
 permissions back in order

---
 .github/workflows/pr-auto-labeler.yml      | 7 ++++---
 .github/workflows/pr-build-artifacts.yml   | 8 +++-----
 .github/workflows/pr-label-on-approved.yml | 3 ++-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/pr-auto-labeler.yml b/.github/workflows/pr-auto-labeler.yml
index d0765980a89d..fd2aa5d8de75 100644
--- a/.github/workflows/pr-auto-labeler.yml
+++ b/.github/workflows/pr-auto-labeler.yml
@@ -4,9 +4,7 @@ run-name: 'Set labels - PR #${{ github.event.pull_request.number }} ("${{ github
 # Set labels for pull requests automatically based on size (modified via job 'label-size') and file categories (modified via .github/labeler)
 #
 
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
+on: pull_request_target
 
 jobs:
   label-remove:
@@ -17,6 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: PauMAVA/add-remove-label-action@v1.0.3
+        if: ${{ github.event.action == opened || github.event.action == reopened || github.event.action == synchronize }}
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           add: ""
@@ -33,6 +32,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/labeler@v5
+        if: ${{ github.event.action == opened || github.event.action == reopened || github.event.action == synchronize }}
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
 
@@ -47,6 +47,7 @@ jobs:
     steps:
       - name: size-label
         uses: "pascalgn/size-label-action@v0.5.5"
+        if: ${{ github.event.action == opened || github.event.action == reopened || github.event.action == synchronize }}
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         with:
diff --git a/.github/workflows/pr-build-artifacts.yml b/.github/workflows/pr-build-artifacts.yml
index 3ef7c49f6d56..a4cb8f81958f 100644
--- a/.github/workflows/pr-build-artifacts.yml
+++ b/.github/workflows/pr-build-artifacts.yml
@@ -5,22 +5,20 @@ run-name: "Generate artifacts - PR #${{ github.event.pull_request.number }} - by
 # In the run name, ${{ github.actor }} shows who's privileges are used for this run.
 #
 
-on:
-  pull_request:
-    types: [opened, reopened, synchronize, labeled]
+on: pull_request_target
 
 jobs:
   Check:
     permissions:
       pull-requests: read
 
-    name: Check label and authorization
-    if: contains(github.event.pull_request.labels.*.name, 'Build')
+    name: Check label and authorization  
     runs-on: Linux
     outputs:
       member: ${{ steps.checkUserMember.outputs.isTeamMember }}
     steps:
       - uses: tspascoal/get-user-teams-membership@v3
+        if: contains(github.event.pull_request.labels.*.name, 'Build')
         id: checkUserMember
         with:
           username: ${{ github.actor }}
diff --git a/.github/workflows/pr-label-on-approved.yml b/.github/workflows/pr-label-on-approved.yml
index 01407cbe3465..07cdb390905d 100644
--- a/.github/workflows/pr-label-on-approved.yml
+++ b/.github/workflows/pr-label-on-approved.yml
@@ -1,7 +1,8 @@
-on: pull_request_review
+on: pull_request_target
 name: Label approved pull requests
 jobs:
   labelWhenApproved:
+    if: github.event.review.state == 'approved'
     name: Label when approved
     runs-on: ubuntu-latest
     steps:

From 76b36c4da51673e4820ae4c29293ad1f3a58935e Mon Sep 17 00:00:00 2001
From: aiamadeus <2789289348@qq.com>
Date: Thu, 24 Oct 2024 23:09:16 +0800
Subject: [PATCH 025/107] main-config: update ghproxy mirror address

The ghproxy mirror is more reliable than gitclone, so set it to default.
---
 lib/functions/configuration/main-config.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh
index e45a7c76b31f..d85aff8adfc8 100644
--- a/lib/functions/configuration/main-config.sh
+++ b/lib/functions/configuration/main-config.sh
@@ -186,7 +186,7 @@ function do_main_configuration() {
 		china)
 			[[ -z $USE_MAINLINE_GOOGLE_MIRROR ]] && [[ -z $MAINLINE_MIRROR ]] && MAINLINE_MIRROR=tuna
 			[[ -z $USE_GITHUB_UBOOT_MIRROR ]] && [[ -z $UBOOT_MIRROR ]] && UBOOT_MIRROR=gitee
-			[[ -z $GITHUB_MIRROR ]] && GITHUB_MIRROR=gitclone
+			[[ -z $GITHUB_MIRROR ]] && GITHUB_MIRROR=ghproxy
 			[[ -z $DOWNLOAD_MIRROR ]] && DOWNLOAD_MIRROR=china
 			;;
 		*) ;;
@@ -238,7 +238,7 @@ function do_main_configuration() {
 			declare -g -r GITHUB_SOURCE='https://hub.fastgit.xyz'
 			;;
 		ghproxy)
-			[[ -z $GHPROXY_ADDRESS ]] && GHPROXY_ADDRESS=mirror.ghproxy.com
+			[[ -z $GHPROXY_ADDRESS ]] && GHPROXY_ADDRESS=ghp.ci
 			declare -g -r GITHUB_SOURCE="https://${GHPROXY_ADDRESS}/https://github.com"
 			;;
 		gitclone)

From ef193e5a03e71160a6d0fcb7ac2f60c26d2e0824 Mon Sep 17 00:00:00 2001
From: aiamadeus <2789289348@qq.com>
Date: Sun, 27 Oct 2024 23:10:03 +0800
Subject: [PATCH 026/107] main-config: add China mirror for ghcr.io

---
 lib/functions/configuration/main-config.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh
index d85aff8adfc8..d0df1d4210da 100644
--- a/lib/functions/configuration/main-config.sh
+++ b/lib/functions/configuration/main-config.sh
@@ -188,6 +188,7 @@ function do_main_configuration() {
 			[[ -z $USE_GITHUB_UBOOT_MIRROR ]] && [[ -z $UBOOT_MIRROR ]] && UBOOT_MIRROR=gitee
 			[[ -z $GITHUB_MIRROR ]] && GITHUB_MIRROR=ghproxy
 			[[ -z $DOWNLOAD_MIRROR ]] && DOWNLOAD_MIRROR=china
+			[[ -z $GHCR_MIRROR ]] && GHCR_MIRROR=nju
 			;;
 		*) ;;
 
@@ -254,6 +255,9 @@ function do_main_configuration() {
 			GHCR_MIRROR_ADDRESS="${GHCR_MIRROR_ADDRESS:-"ghcr.dockerproxy.com"}"
 			declare -g -r GHCR_SOURCE=$GHCR_MIRROR_ADDRESS
 			;;
+		nju)
+			declare -g -r GHCR_SOURCE='ghcr.nju.edu.cn'
+			;;
 		*)
 			declare -g -r GHCR_SOURCE='ghcr.io'
 			;;

From 6954f12531a0824550e2efa1e36b11974c746c7d Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Fri, 1 Nov 2024 08:58:54 +0100
Subject: [PATCH 027/107] GHA conditions syntay fix

---
 .github/workflows/pr-auto-labeler.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pr-auto-labeler.yml b/.github/workflows/pr-auto-labeler.yml
index fd2aa5d8de75..cf1309912f1d 100644
--- a/.github/workflows/pr-auto-labeler.yml
+++ b/.github/workflows/pr-auto-labeler.yml
@@ -12,10 +12,11 @@ jobs:
       contents: read # for pascalgn/size-label-action to determine modified files
       pull-requests: write # for pascalgn/size-label-action to add labels to PRs
     name: "Remove Ready to merge"
+    if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}
     runs-on: ubuntu-latest
+
     steps:
       - uses: PauMAVA/add-remove-label-action@v1.0.3
-        if: ${{ github.event.action == opened || github.event.action == reopened || github.event.action == synchronize }}
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           add: ""
@@ -27,12 +28,12 @@ jobs:
       pull-requests: write # for actions/labeler to add labels to PRs
 
     name: "Category labels"
+    if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
       - uses: actions/labeler@v5
-        if: ${{ github.event.action == opened || github.event.action == reopened || github.event.action == synchronize }}
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
 
@@ -42,12 +43,12 @@ jobs:
       pull-requests: write # for pascalgn/size-label-action to add labels to PRs
 
     name: "Size label"
+    if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}
     runs-on: ubuntu-latest
 
     steps:
       - name: size-label
         uses: "pascalgn/size-label-action@v0.5.5"
-        if: ${{ github.event.action == opened || github.event.action == reopened || github.event.action == synchronize }}
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         with:

From 4f4d974bfeef1cdbaae1fb236a4d2b26eae2f0b5 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Fri, 1 Nov 2024 13:58:02 +0100
Subject: [PATCH 028/107] sm8250: disable broken patch due upstream changes

---
 ...msm-dpu1-use-one-active-CTL-if-it-is-available.patch.disabled} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename patch/kernel/archive/sm8250-6.11/{0012-drm-msm-dpu1-use-one-active-CTL-if-it-is-available.patch => 0012-drm-msm-dpu1-use-one-active-CTL-if-it-is-available.patch.disabled} (100%)

diff --git a/patch/kernel/archive/sm8250-6.11/0012-drm-msm-dpu1-use-one-active-CTL-if-it-is-available.patch b/patch/kernel/archive/sm8250-6.11/0012-drm-msm-dpu1-use-one-active-CTL-if-it-is-available.patch.disabled
similarity index 100%
rename from patch/kernel/archive/sm8250-6.11/0012-drm-msm-dpu1-use-one-active-CTL-if-it-is-available.patch
rename to patch/kernel/archive/sm8250-6.11/0012-drm-msm-dpu1-use-one-active-CTL-if-it-is-available.patch.disabled

From bfea91745160b0178afce9121cda20279cc1d139 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Fri, 1 Nov 2024 14:41:15 +0100
Subject: [PATCH 029/107] Remove deprecated patch

---
 ...sm-dpu-populate-has_active_ctls-in-the-catalog.patch.disabled} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename patch/kernel/archive/sm8250-6.11/{0013-drm-msm-dpu-populate-has_active_ctls-in-the-catalog.patch => 0013-drm-msm-dpu-populate-has_active_ctls-in-the-catalog.patch.disabled} (100%)

diff --git a/patch/kernel/archive/sm8250-6.11/0013-drm-msm-dpu-populate-has_active_ctls-in-the-catalog.patch b/patch/kernel/archive/sm8250-6.11/0013-drm-msm-dpu-populate-has_active_ctls-in-the-catalog.patch.disabled
similarity index 100%
rename from patch/kernel/archive/sm8250-6.11/0013-drm-msm-dpu-populate-has_active_ctls-in-the-catalog.patch
rename to patch/kernel/archive/sm8250-6.11/0013-drm-msm-dpu-populate-has_active_ctls-in-the-catalog.patch.disabled

From b451d4f3e373e1c1ff1bf11d06a9a497ca562da6 Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Sat, 2 Nov 2024 01:02:14 +0800
Subject: [PATCH 030/107] rk3576: fix booting from boot.scr

---
 config/bootscripts/boot-rk3576.cmd            | 86 +++++++++++++++++++
 config/sources/families/rk35xx.conf           |  8 +-
 ...he-error-that-the-command-source-fai.patch | 26 ++++++
 ...stent-return-type-of-command_process.patch | 35 ++++++++
 .../defconfig/armsom-cm5-io-rk3576_defconfig  |  1 -
 .../defconfig/armsom-sige5-rk3576_defconfig   |  1 -
 6 files changed, 153 insertions(+), 4 deletions(-)
 create mode 100644 config/bootscripts/boot-rk3576.cmd
 create mode 100644 patch/u-boot/legacy/u-boot-armsom-rk3576/0001-cmd-source-fix-the-error-that-the-command-source-fai.patch
 create mode 100644 patch/u-boot/legacy/u-boot-armsom-rk3576/0002-cmd-inconsistent-return-type-of-command_process.patch

diff --git a/config/bootscripts/boot-rk3576.cmd b/config/bootscripts/boot-rk3576.cmd
new file mode 100644
index 000000000000..d39734a766e4
--- /dev/null
+++ b/config/bootscripts/boot-rk3576.cmd
@@ -0,0 +1,86 @@
+# DO NOT EDIT THIS FILE
+#
+# Please edit /boot/armbianEnv.txt to set supported parameters
+#
+
+setenv load_addr "0x48000000"
+setenv overlay_error "false"
+# default values
+setenv rootdev "/dev/mmcblk0p1"
+setenv verbosity "1"
+setenv console "both"
+setenv bootlogo "false"
+setenv rootfstype "ext4"
+setenv docker_optimizations "on"
+setenv earlycon "off"
+
+test -n "${distro_bootpart}" || distro_bootpart=1
+
+echo "Boot script loaded from ${devtype} ${devnum}:${distro_bootpart}"
+
+if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}armbianEnv.txt; then
+	load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}armbianEnv.txt
+	env import -t ${load_addr} ${filesize}
+fi
+
+if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi
+
+if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
+if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS2,1500000 ${consoleargs}"; fi
+if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
+if test "${bootlogo}" = "true"; then
+	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
+else
+	setenv consoleargs "splash=verbose ${consoleargs}"
+fi
+
+# get PARTUUID of first partition on SD/eMMC the boot script was loaded from
+if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:${distro_bootpart} partuuid; fi
+
+setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
+
+if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory"; fi
+
+load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} ${prefix}uInitrd
+load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${prefix}Image
+
+load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+fdt addr ${fdt_addr_r}
+fdt resize 65536
+for overlay_file in ${overlays}; do
+	if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
+		echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
+		fdt apply ${load_addr} || setenv overlay_error "true"
+	elif load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_file}.dtbo; then
+		echo "Applying kernel provided DT overlay ${overlay_file}.dtbo"
+		fdt apply ${load_addr} || setenv overlay_error "true"
+	fi
+done
+for overlay_file in ${user_overlays}; do
+	if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
+		echo "Applying user provided DT overlay ${overlay_file}.dtbo"
+		fdt apply ${load_addr} || setenv overlay_error "true"
+	fi
+done
+if test "${overlay_error}" = "true"; then
+	echo "Error applying DT overlays, restoring original DT"
+	load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+else
+	if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then
+		load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr
+		echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
+		source ${load_addr}
+	fi
+	if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}fixup.scr; then
+		load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}fixup.scr
+		echo "Applying user provided fixup script (fixup.scr)"
+		source ${load_addr}
+	fi
+fi
+
+echo "Trying 'kaslrseed' command... Info: 'Unknown command' can be safely ignored since 'kaslrseed' does not apply to all boards."
+kaslrseed # @TODO: This gives an error (Unknown command ' kaslrseed ' - try 'help') on many devices since CONFIG_CMD_KASLRSEED is not enabled
+booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
+
+# Recompile with:
+# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
diff --git a/config/sources/families/rk35xx.conf b/config/sources/families/rk35xx.conf
index 7b2ec33e248b..c252a5cd6c59 100644
--- a/config/sources/families/rk35xx.conf
+++ b/config/sources/families/rk35xx.conf
@@ -14,11 +14,16 @@ BOOTBRANCH='branch:next-dev-v2024.03' # Always use same version as rk3588, they
 BOOTPATCHDIR="legacy/u-boot-radxa-rk35xx"
 OVERLAY_PREFIX='rk35xx'
 
+if [[ "$BOOT_SOC" == "rk3576" ]]; then
+	BOOTSCRIPT='boot-rk3576.cmd:boot.cmd'
+else
+	BOOTSCRIPT='boot-rk35xx.cmd:boot.cmd'
+fi
+
 case $BRANCH in
 
 	legacy)
 		display_alert "WARNING: 'legacy' branch" "is deprecated and slated for removal. Please switch to another branch unless you know what you're doing :)" "wrn"
-		BOOTSCRIPT='boot-rk35xx.cmd:boot.cmd'
 		BOOTDIR='u-boot-rockchip64'
 		declare -g KERNEL_MAJOR_MINOR="5.10"   # Major and minor versions of this kernel.
 		declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
@@ -28,7 +33,6 @@ case $BRANCH in
 		;;
 
 	vendor)
-		BOOTSCRIPT='boot-rk35xx.cmd:boot.cmd'
 		BOOTDIR='u-boot-rockchip64'
 		declare -g KERNEL_MAJOR_MINOR="6.1"    # Major and minor versions of this kernel.
 		declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
diff --git a/patch/u-boot/legacy/u-boot-armsom-rk3576/0001-cmd-source-fix-the-error-that-the-command-source-fai.patch b/patch/u-boot/legacy/u-boot-armsom-rk3576/0001-cmd-source-fix-the-error-that-the-command-source-fai.patch
new file mode 100644
index 000000000000..c3c313e294ef
--- /dev/null
+++ b/patch/u-boot/legacy/u-boot-armsom-rk3576/0001-cmd-source-fix-the-error-that-the-command-source-fai.patch
@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stephen <stephen@vamrs.com>
+Date: Mon, 8 Nov 2021 14:30:00 +0800
+Subject: cmd: source: fix the error that the command source failed to execute
+
+Signed-off-by: Stephen <stephen@vamrs.com>
+---
+ cmd/source.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmd/source.c b/cmd/source.c
+index 111111111111..222222222222 100644
+--- a/cmd/source.c
++++ b/cmd/source.c
+@@ -87,7 +87,7 @@ source (ulong addr, const char *fit_uname)
+ 		 * past the zero-terminated sequence of image lengths to get
+ 		 * to the actual image data
+ 		 */
+-		while (*data++ != IMAGE_PARAM_INVAL);
++		while (*data++);
+ 		break;
+ #endif
+ #if defined(CONFIG_FIT)
+-- 
+Armbian
+
diff --git a/patch/u-boot/legacy/u-boot-armsom-rk3576/0002-cmd-inconsistent-return-type-of-command_process.patch b/patch/u-boot/legacy/u-boot-armsom-rk3576/0002-cmd-inconsistent-return-type-of-command_process.patch
new file mode 100644
index 000000000000..0c2469f1c092
--- /dev/null
+++ b/patch/u-boot/legacy/u-boot-armsom-rk3576/0002-cmd-inconsistent-return-type-of-command_process.patch
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
+Date: Mon, 1 Aug 2022 15:17:49 +0200
+Subject: cmd: inconsistent return type of command_process()
+
+The declarations in the header and in the implementation must match.
+
+Reported-by: Sergei Antonov <saproj@gmail.com>
+Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
+Reviewed-by: Simon Glass <sjg@chromium.org>
+---
+ include/command.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/command.h b/include/command.h
+index 111111111111..222222222222 100644
+--- a/include/command.h
++++ b/include/command.h
+@@ -137,10 +137,10 @@ enum command_ret_t {
+  *			is left unchanged.
+  * @param ticks		If ticks is not null, this function set it to the
+  *			number of ticks the command took to complete.
+- * @return 0 if the command succeeded, 1 if it failed
++ * @return 0 if command succeeded, else non-zero (CMD_RET_...)
+  */
+-int cmd_process(int flag, int argc, char * const argv[],
+-			       int *repeatable, unsigned long *ticks);
++enum command_ret_t cmd_process(int flag, int argc, char *const argv[],
++			      int *repeatable, unsigned long *ticks);
+ 
+ void fixup_cmdtable(cmd_tbl_t *cmdtp, int size);
+ 
+-- 
+Armbian
+
diff --git a/patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-cm5-io-rk3576_defconfig b/patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-cm5-io-rk3576_defconfig
index bc85fc327d09..fa69a379cf38 100644
--- a/patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-cm5-io-rk3576_defconfig
+++ b/patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-cm5-io-rk3576_defconfig
@@ -189,7 +189,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x2207
 CONFIG_USB_GADGET_PRODUCT_NUM=0x350e
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_UFS=y
-CONFIG_ROCKCHIP_UFS=y
 CONFIG_DM_VIDEO=y
 CONFIG_DISPLAY=y
 CONFIG_DRM_ROCKCHIP=y
diff --git a/patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-sige5-rk3576_defconfig b/patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-sige5-rk3576_defconfig
index 9f08dd8eb371..73125b562a72 100644
--- a/patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-sige5-rk3576_defconfig
+++ b/patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-sige5-rk3576_defconfig
@@ -189,7 +189,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x2207
 CONFIG_USB_GADGET_PRODUCT_NUM=0x350e
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_UFS=y
-CONFIG_ROCKCHIP_UFS=y
 CONFIG_DM_VIDEO=y
 CONFIG_DISPLAY=y
 CONFIG_DRM_ROCKCHIP=y

From ac7a37ba029c38b29f46bdb8c9a05cc91ee05e45 Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Sat, 2 Nov 2024 01:02:40 +0800
Subject: [PATCH 031/107] rk3576: use boot.scr instead of extlinux

---
 config/boards/armsom-cm5-io.csc | 1 -
 config/boards/armsom-sige5.csc  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/config/boards/armsom-cm5-io.csc b/config/boards/armsom-cm5-io.csc
index d85c04d261cd..69d626cd48f3 100644
--- a/config/boards/armsom-cm5-io.csc
+++ b/config/boards/armsom-cm5-io.csc
@@ -8,7 +8,6 @@ BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3576-armsom-cm5-io.dtb"
 BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
-SRC_EXTLINUX="yes"
 BOARD_MAINTAINER=""
 
 function post_family_config_branch_vendor__armsom-cm5-io_use_vendor_uboot() {
diff --git a/config/boards/armsom-sige5.csc b/config/boards/armsom-sige5.csc
index ff2308816b96..c2ba55781dc8 100644
--- a/config/boards/armsom-sige5.csc
+++ b/config/boards/armsom-sige5.csc
@@ -8,7 +8,6 @@ BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3576-armsom-sige5.dtb"
 BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
-SRC_EXTLINUX="yes"
 BOARD_MAINTAINER=""
 
 function post_family_config_branch_vendor__armsom-sige7_use_vendor_uboot() {

From a7363f6a80402f608f13e4056f4a4e76750b624b Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Sat, 2 Nov 2024 15:05:54 +0800
Subject: [PATCH 032/107] oneplus-kebab: disable edge build

---
 config/boards/oneplus-kebab.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/boards/oneplus-kebab.conf b/config/boards/oneplus-kebab.conf
index 8cc2a2da5791..765868ed5a02 100644
--- a/config/boards/oneplus-kebab.conf
+++ b/config/boards/oneplus-kebab.conf
@@ -2,8 +2,7 @@
 declare -g BOARD_NAME="Oneplus Kebab"
 declare -g BOARD_MAINTAINER="amazingfate"
 declare -g BOARDFAMILY="sm8250"
-declare -g KERNEL_TARGET="current,edge"
-declare -g KERNEL_TEST_TARGET="edge"
+declare -g KERNEL_TARGET="current"
 declare -g EXTRAWIFI="no"
 declare -g MODULES="spi-geni-qcom"
 declare -g BOOTCONFIG="none"

From 6cf475cb906b6ec7b5fdda23d9dbc7fc0eb59e23 Mon Sep 17 00:00:00 2001
From: igorpecovnik <6281704+igorpecovnik@users.noreply.github.com>
Date: Sun, 3 Nov 2024 09:07:35 +0000
Subject: [PATCH 033/107] `Automatic` board configs status synchronise

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 31832d663e45..e8964fa6719c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -36,6 +36,7 @@ config/boards/bananapim7.conf		@amazingfate
 config/boards/bigtreetech-cb1.conf		@JohnTheCoolingFan
 config/boards/cherryba-m1.csc		@IsMrX
 config/boards/clearfogpro.csc		@Heisath
+config/boards/cm3588-nas.csc		@ColorfulRhino
 config/boards/coolpi-cm5.csc		@andyshrk
 config/boards/firefly-itx-3588j.csc		@SeeleVolleri
 config/boards/fxblox-rk1.csc		@mahdichi
@@ -71,7 +72,6 @@ config/boards/mekotronics-r58-minipc.csc		@monkaBlyat
 config/boards/mekotronics-r58x-4g.csc		@monkaBlyat
 config/boards/mekotronics-r58x.csc		@monkaBlyat
 config/boards/mixtile-blade3.csc		@rpardini
-config/boards/nanopc-cm3588-nas.csc		@ColorfulRhino
 config/boards/nanopct6-lts.conf		@SuperKali @Tonymac32
 config/boards/nanopct6.conf		@SuperKali @Tonymac32
 config/boards/nanopi-m6.conf		@efectn

From 01218eefa40b0824e27fce7ed9b797e4c4268130 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Sun, 3 Nov 2024 09:41:42 +0100
Subject: [PATCH 034/107] UX bugfix: on first run we display some warnings if
 userspace is unsupported. It broke down.

Since expanding distribution status with upgrade target, this condition stop working

Related: https://github.com/armbian/build/pull/7303
---
 packages/bsp/common/usr/lib/armbian/armbian-firstlogin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
index 0013ed9376ef..a983dc9a9870 100755
--- a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
+++ b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
@@ -11,7 +11,7 @@
 [[ -f /etc/lsb-release ]] && . /etc/lsb-release
 [[ -f /etc/os-release ]] && . /etc/os-release
 [[ -z "$DISTRIB_CODENAME" ]] && DISTRIB_CODENAME="${VERSION_CODENAME}"
-[[ -n "$DISTRIB_CODENAME" && -f /etc/armbian-distribution-status ]] && DISTRIBUTION_STATUS=$(grep "$DISTRIB_CODENAME" /etc/armbian-distribution-status | cut -d"=" -f2)
+[[ -n "$DISTRIB_CODENAME" && -f /etc/armbian-distribution-status ]] && DISTRIBUTION_STATUS=$(grep "$DISTRIB_CODENAME" /etc/armbian-distribution-status | cut -d"=" -f2 | cut -d";" -f1)
 
 . /etc/armbian-release
 

From a762360af0d6d0da6f21750c60519613fee8bba0 Mon Sep 17 00:00:00 2001
From: bmilde <bmilde@users.noreply.github.com>
Date: Wed, 30 Oct 2024 17:36:47 +0100
Subject: [PATCH 035/107] Update linux-uefi-arm64-edge.config

added bcachefs filesystem module
---
 config/kernel/linux-uefi-arm64-edge.config | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/config/kernel/linux-uefi-arm64-edge.config b/config/kernel/linux-uefi-arm64-edge.config
index 52d164603ef4..01131ad40e4b 100644
--- a/config/kernel/linux-uefi-arm64-edge.config
+++ b/config/kernel/linux-uefi-arm64-edge.config
@@ -12527,7 +12527,15 @@ CONFIG_F2FS_FS_LZ4HC=y
 CONFIG_F2FS_FS_ZSTD=y
 CONFIG_F2FS_IOSTAT=y
 # CONFIG_F2FS_UNFAIR_RWSEM is not set
-# CONFIG_BCACHEFS_FS is not set
+CONFIG_BCACHEFS_FS=m
+CONFIG_BCACHEFS_QUOTA=y
+CONFIG_BCACHEFS_ERASURE_CODING=y
+CONFIG_BCACHEFS_POSIX_ACL=y
+# CONFIG_BCACHEFS_DEBUG is not set
+# CONFIG_BCACHEFS_TESTS is not set
+# CONFIG_BCACHEFS_LOCK_TIME_STATS is not set
+# CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set
+CONFIG_BCACHEFS_SIX_OPTIMISTIC_SPIN=y
 CONFIG_ZONEFS_FS=m
 CONFIG_FS_DAX=y
 CONFIG_FS_DAX_PMD=y

From ff7fbd92896f8557b2a7c9a7e567248b5b9c3acf Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Sun, 3 Nov 2024 17:54:36 +0100
Subject: [PATCH 036/107] Execute rewrite-kernel-config to update kernel
 configs

./compile.sh rewrite-kernel-config BOARD=uefi-arm64 BRANCH=edge
./compile.sh rewrite-kernel-config BOARD=uefi-x86 BRANCH=edge
---
 config/kernel/linux-uefi-arm64-edge.config | 292 +++++++++++++++++----
 config/kernel/linux-uefi-x86-edge.config   | 243 ++++++++++++-----
 2 files changed, 412 insertions(+), 123 deletions(-)

diff --git a/config/kernel/linux-uefi-arm64-edge.config b/config/kernel/linux-uefi-arm64-edge.config
index 01131ad40e4b..de6b6eb51c00 100644
--- a/config/kernel/linux-uefi-arm64-edge.config
+++ b/config/kernel/linux-uefi-arm64-edge.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.10.10 Kernel Configuration
+# Linux/arm64 6.12.0-rc2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
 CONFIG_CC_IS_GCC=y
@@ -11,11 +11,8 @@ CONFIG_AS_VERSION=23800
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=23800
 CONFIG_LLD_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
-CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
-CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
-CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
+CONFIG_RUSTC_VERSION=0
+CONFIG_GCC_ASM_GOTO_OUTPUT_BROKEN=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=125
@@ -110,6 +107,7 @@ CONFIG_PREEMPT_VOLUNTARY_BUILD=y
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_RT is not set
 # CONFIG_PREEMPT_DYNAMIC is not set
 # CONFIG_SCHED_CORE is not set
 
@@ -177,10 +175,11 @@ CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 CONFIG_CGROUP_FAVOR_DYNMODS=y
 CONFIG_MEMCG=y
-CONFIG_MEMCG_KMEM=y
+# CONFIG_MEMCG_V1 is not set
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
+CONFIG_GROUP_SCHED_WEIGHT=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
@@ -191,6 +190,7 @@ CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
+# CONFIG_CPUSETS_V1 is not set
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
@@ -290,6 +290,7 @@ CONFIG_CRASH_DUMP=y
 # end of General setup
 
 CONFIG_ARM64=y
+CONFIG_RUSTC_SUPPORTS_ARM64=y
 CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
@@ -529,6 +530,13 @@ CONFIG_ARM64_MTE=y
 CONFIG_ARM64_EPAN=y
 # end of ARMv8.7 architectural features
 
+#
+# ARMv8.9 architectural features
+#
+CONFIG_ARM64_POE=y
+CONFIG_ARCH_PKEY_BITS=3
+# end of ARMv8.9 architectural features
+
 CONFIG_ARM64_SVE=y
 CONFIG_ARM64_SME=y
 CONFIG_ARM64_PSEUDO_NMI=y
@@ -550,6 +558,7 @@ CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
+# CONFIG_COMPRESSED_INSTALL is not set
 CONFIG_DMI=y
 # end of Boot options
 
@@ -673,6 +682,7 @@ CONFIG_ACPI_MCFG=y
 CONFIG_ACPI_CPPC_LIB=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_PLATFORM_PROFILE=m
 CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
@@ -731,7 +741,9 @@ CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
 # CONFIG_NVHE_EL2_DEBUG is not set
+# CONFIG_PTDUMP_STAGE2_DEBUGFS is not set
 CONFIG_CPU_MITIGATIONS=y
+CONFIG_ARCH_HAS_DMA_OPS=y
 
 #
 # General architecture-dependent options
@@ -827,6 +839,7 @@ CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
 CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_ARCH_SUPPORTS_RT=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
 CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
@@ -841,6 +854,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 CONFIG_HAVE_PREEMPT_DYNAMIC=y
 CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
@@ -884,10 +898,7 @@ CONFIG_MODULE_SIG_SHA512=y
 # CONFIG_MODULE_SIG_SHA3_384 is not set
 # CONFIG_MODULE_SIG_SHA3_512 is not set
 CONFIG_MODULE_SIG_HASH="sha512"
-CONFIG_MODULE_COMPRESS_NONE=y
-# CONFIG_MODULE_COMPRESS_GZIP is not set
-# CONFIG_MODULE_COMPRESS_XZ is not set
-# CONFIG_MODULE_COMPRESS_ZSTD is not set
+# CONFIG_MODULE_COMPRESS is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 # CONFIG_TRIM_UNUSED_KSYMS is not set
@@ -901,7 +912,6 @@ CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_ICQ=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
@@ -1056,11 +1066,11 @@ CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
 CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
 CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set
 # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
 CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
 CONFIG_ZBUD=y
-CONFIG_Z3FOLD=m
+# CONFIG_Z3FOLD_DEPRECATED is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -1073,6 +1083,7 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SLAB_BUCKETS=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
@@ -1096,8 +1107,9 @@ CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_MHP_MEMMAP_ON_MEMORY=y
 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SPLIT_PTE_PTLOCKS=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_SPLIT_PMD_PTLOCKS=y
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
@@ -1124,6 +1136,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 CONFIG_THP_SWAP=y
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
+CONFIG_ARCH_SUPPORTS_HUGE_PFNMAP=y
+CONFIG_ARCH_SUPPORTS_PMD_PFNMAP=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
@@ -1147,7 +1161,9 @@ CONFIG_HMM_MIRROR=y
 CONFIG_GET_FREE_REGION=y
 CONFIG_DEVICE_PRIVATE=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
-CONFIG_ARCH_USES_PG_ARCH_X=y
+CONFIG_ARCH_HAS_PKEYS=y
+CONFIG_ARCH_USES_PG_ARCH_2=y
+CONFIG_ARCH_USES_PG_ARCH_3=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
@@ -1166,6 +1182,8 @@ CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
 CONFIG_IOMMU_MM_DATA=y
 CONFIG_EXECMEM=y
+CONFIG_NUMA_MEMBLKS=y
+# CONFIG_NUMA_EMU is not set
 
 #
 # Data Access Monitoring
@@ -1182,6 +1200,7 @@ CONFIG_NET_XGRESS=y
 CONFIG_NET_REDIRECT=y
 CONFIG_SKB_DECRYPTED=y
 CONFIG_SKB_EXTENSIONS=y
+CONFIG_NET_DEVMEM=y
 
 #
 # Networking options
@@ -1747,6 +1766,7 @@ CONFIG_NET_DSA_TAG_RZN1_A5PSW=m
 CONFIG_NET_DSA_TAG_LAN9303=m
 CONFIG_NET_DSA_TAG_SJA1105=m
 CONFIG_NET_DSA_TAG_TRAILER=m
+CONFIG_NET_DSA_TAG_VSC73XX_8021Q=m
 CONFIG_NET_DSA_TAG_XRS700X=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
@@ -1956,7 +1976,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
 CONFIG_BT_HIDP=m
 CONFIG_BT_LE=y
 CONFIG_BT_LE_L2CAP_ECRED=y
@@ -1996,6 +2015,7 @@ CONFIG_BT_HCIUART_RTL=y
 CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIUART_AG6XX=y
 CONFIG_BT_HCIUART_MRVL=y
+# CONFIG_BT_HCIUART_AML is not set
 CONFIG_BT_HCIBCM203X=m
 # CONFIG_BT_HCIBCM4377 is not set
 CONFIG_BT_HCIBPA10X=m
@@ -2068,6 +2088,7 @@ CONFIG_NET_9P=m
 CONFIG_NET_9P_FD=m
 CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_9P_XEN=m
+# CONFIG_NET_9P_USBG is not set
 CONFIG_NET_9P_RDMA=m
 # CONFIG_NET_9P_DEBUG is not set
 CONFIG_CAIF=m
@@ -2173,6 +2194,7 @@ CONFIG_PCI_DOE=y
 CONFIG_PCI_ECAM=y
 CONFIG_PCI_BRIDGE_EMUL=y
 CONFIG_PCI_IOV=y
+# CONFIG_PCI_NPEM is not set
 CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
 # CONFIG_PCI_P2PDMA is not set
@@ -2209,7 +2231,6 @@ CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCIE_HISI_ERR=y
 CONFIG_PCIE_MEDIATEK=y
 CONFIG_PCIE_MEDIATEK_GEN3=m
-CONFIG_PCIE_MICROCHIP_HOST=y
 CONFIG_PCI_HYPERV_INTERFACE=m
 CONFIG_PCI_TEGRA=y
 CONFIG_PCIE_RCAR_HOST=y
@@ -2258,11 +2279,14 @@ CONFIG_PCIE_TEGRA194_EP=m
 CONFIG_PCIE_DW_PLAT=y
 CONFIG_PCIE_DW_PLAT_HOST=y
 CONFIG_PCIE_DW_PLAT_EP=y
+CONFIG_PCIE_QCOM_COMMON=y
 CONFIG_PCIE_QCOM=y
 CONFIG_PCIE_QCOM_EP=m
 # CONFIG_PCIE_RCAR_GEN4_HOST is not set
 # CONFIG_PCIE_RCAR_GEN4_EP is not set
+CONFIG_PCIE_ROCKCHIP_DW=y
 CONFIG_PCIE_ROCKCHIP_DW_HOST=y
+# CONFIG_PCIE_ROCKCHIP_DW_EP is not set
 CONFIG_PCI_KEYSTONE=y
 CONFIG_PCI_KEYSTONE_HOST=y
 CONFIG_PCI_KEYSTONE_EP=y
@@ -2274,6 +2298,13 @@ CONFIG_PCI_KEYSTONE_EP=y
 #
 # CONFIG_PCIE_MOBIVEIL_PLAT is not set
 # end of Mobiveil-based PCIe controllers
+
+#
+# PLDA-based PCIe controllers
+#
+CONFIG_PCIE_PLDA_HOST=y
+CONFIG_PCIE_MICROCHIP_HOST=y
+# end of PLDA-based PCIe controllers
 # end of PCI controller drivers
 
 #
@@ -2293,6 +2324,9 @@ CONFIG_PCI_EPF_VNTB=m
 CONFIG_PCI_SW_SWITCHTEC=m
 # end of PCI switch controller drivers
 
+CONFIG_HAVE_PWRCTL=y
+CONFIG_PCI_PWRCTL=m
+CONFIG_PCI_PWRCTL_PWRSEQ=m
 CONFIG_CXL_BUS=m
 CONFIG_CXL_PCI=m
 # CONFIG_CXL_MEM_RAW_COMMANDS is not set
@@ -2438,12 +2472,28 @@ CONFIG_PROC_EVENTS=y
 #
 CONFIG_ARM_SCMI_PROTOCOL=y
 # CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set
+# CONFIG_ARM_SCMI_DEBUG_COUNTERS is not set
+
+#
+# SCMI Transport Drivers
+#
 CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
 CONFIG_ARM_SCMI_HAVE_SHMEM=y
+CONFIG_ARM_SCMI_HAVE_MSG=y
 CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y
 CONFIG_ARM_SCMI_TRANSPORT_SMC=y
 # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set
+CONFIG_ARM_SCMI_TRANSPORT_OPTEE=m
 # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set
+# end of SCMI Transport Drivers
+
+#
+# ARM SCMI NXP i.MX Vendor Protocols
+#
+# CONFIG_IMX_SCMI_BBM_EXT is not set
+# CONFIG_IMX_SCMI_MISC_EXT is not set
+# end of ARM SCMI NXP i.MX Vendor Protocols
+
 CONFIG_ARM_SCMI_POWER_CONTROL=m
 # end of ARM System Control and Management Interface Protocol
 
@@ -2500,7 +2550,9 @@ CONFIG_ARM_PSCI_FW=y
 # Qualcomm firmware drivers
 #
 CONFIG_QCOM_SCM=y
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
+CONFIG_QCOM_TZMEM=y
+CONFIG_QCOM_TZMEM_MODE_GENERIC=y
+# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set
 # CONFIG_QCOM_QSEECOM is not set
 # end of Qualcomm firmware drivers
 
@@ -2748,12 +2800,15 @@ CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_CDROM=y
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_ZRAM=m
+# CONFIG_ZRAM_BACKEND_LZ4 is not set
+# CONFIG_ZRAM_BACKEND_LZ4HC is not set
+# CONFIG_ZRAM_BACKEND_ZSTD is not set
+# CONFIG_ZRAM_BACKEND_DEFLATE is not set
+# CONFIG_ZRAM_BACKEND_842 is not set
+CONFIG_ZRAM_BACKEND_FORCE_LZO=y
+CONFIG_ZRAM_BACKEND_LZO=y
 CONFIG_ZRAM_DEF_COMP_LZORLE=y
-# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
-# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
 # CONFIG_ZRAM_DEF_COMP_LZO is not set
-# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
-# CONFIG_ZRAM_DEF_COMP_842 is not set
 CONFIG_ZRAM_DEF_COMP="lzo-rle"
 CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y
@@ -2799,6 +2854,7 @@ CONFIG_NVME_TCP_TLS=y
 CONFIG_NVME_HOST_AUTH=y
 CONFIG_NVME_APPLE=m
 CONFIG_NVME_TARGET=m
+# CONFIG_NVME_TARGET_DEBUGFS is not set
 CONFIG_NVME_TARGET_PASSTHRU=y
 CONFIG_NVME_TARGET_LOOP=m
 CONFIG_NVME_TARGET_RDMA=m
@@ -2818,6 +2874,7 @@ CONFIG_AD525X_DPOT_I2C=m
 CONFIG_AD525X_DPOT_SPI=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_PHANTOM=m
+# CONFIG_RPMB is not set
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 CONFIG_ICS932S401=m
@@ -2844,6 +2901,7 @@ CONFIG_HISI_HIKEY_USB=m
 CONFIG_OPEN_DICE=m
 CONFIG_VCPU_STALL_DETECTOR=m
 # CONFIG_NSM is not set
+# CONFIG_MARVELL_CN10K_DPI is not set
 CONFIG_C2PORT=m
 
 #
@@ -2884,6 +2942,7 @@ CONFIG_PVPANIC=y
 CONFIG_PVPANIC_MMIO=m
 CONFIG_PVPANIC_PCI=m
 # CONFIG_GP_PCI1XXXX is not set
+# CONFIG_KEBA_CP500 is not set
 # end of Misc devices
 
 #
@@ -3186,6 +3245,7 @@ CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 # CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING is not set
+# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_PLATFORM_KEYRING is not set
 # CONFIG_DM_VERITY_FEC is not set
 CONFIG_DM_SWITCH=m
 CONFIG_DM_LOG_WRITES=m
@@ -3592,6 +3652,7 @@ CONFIG_MLX5_CORE_IPOIB=y
 CONFIG_MLX5_EN_IPSEC=y
 CONFIG_MLX5_EN_TLS=y
 CONFIG_MLX5_SW_STEERING=y
+CONFIG_MLX5_HW_STEERING=y
 CONFIG_MLX5_SF=y
 CONFIG_MLX5_SF_MANAGER=y
 # CONFIG_MLX5_DPLL is not set
@@ -3605,6 +3666,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y
 CONFIG_MLXSW_MINIMAL=m
 CONFIG_MLXFW=m
 # CONFIG_MLXBF_GIGE is not set
+CONFIG_NET_VENDOR_META=y
 CONFIG_NET_VENDOR_MICREL=y
 CONFIG_KS8842=m
 CONFIG_KS8851=m
@@ -3615,10 +3677,12 @@ CONFIG_ENC28J60=m
 # CONFIG_ENC28J60_WRITEVERIFY is not set
 CONFIG_ENCX24J600=m
 CONFIG_LAN743X=m
+# CONFIG_LAN865X is not set
 CONFIG_LAN966X_SWITCH=m
 CONFIG_LAN966X_DCB=y
 # CONFIG_SPARX5_SWITCH is not set
 CONFIG_VCAP=y
+CONFIG_FDMA=y
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH_LIB=m
 CONFIG_MSCC_OCELOT_SWITCH=m
@@ -3648,6 +3712,7 @@ CONFIG_NET_VENDOR_NVIDIA=y
 CONFIG_FORCEDETH=m
 CONFIG_NET_VENDOR_OKI=y
 CONFIG_ETHOC=m
+# CONFIG_OA_TC6 is not set
 CONFIG_NET_VENDOR_PACKET_ENGINES=y
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
@@ -3687,10 +3752,12 @@ CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
 CONFIG_R8169_LEDS=y
+# CONFIG_RTASE is not set
 CONFIG_NET_VENDOR_RENESAS=y
 CONFIG_SH_ETH=m
 CONFIG_RAVB=m
 # CONFIG_RENESAS_ETHER_SWITCH is not set
+# CONFIG_RTSN is not set
 CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
@@ -3731,6 +3798,7 @@ CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
 CONFIG_DWMAC_MEDIATEK=m
 CONFIG_DWMAC_MESON=m
+CONFIG_DWMAC_PHYTIUM=m
 CONFIG_DWMAC_QCOM_ETHQOS=m
 CONFIG_DWMAC_ROCKCHIP=m
 CONFIG_DWMAC_SOCFPGA=m
@@ -3750,6 +3818,7 @@ CONFIG_DWC_XLGMAC=m
 CONFIG_DWC_XLGMAC_PCI=m
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
+# CONFIG_TEHUTI_TN40 is not set
 CONFIG_NET_VENDOR_TI=y
 CONFIG_TI_DAVINCI_MDIO=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
@@ -3893,6 +3962,7 @@ CONFIG_CAN_M_CAN_TCAN4X5X=m
 CONFIG_CAN_PEAK_PCIEFD=m
 CONFIG_CAN_RCAR=m
 CONFIG_CAN_RCAR_CANFD=m
+# CONFIG_CAN_ROCKCHIP_CANFD is not set
 CONFIG_CAN_SJA1000=m
 CONFIG_CAN_EMS_PCI=m
 CONFIG_CAN_EMS_PCMCIA=m
@@ -4093,6 +4163,7 @@ CONFIG_ATH10K_USB=m
 CONFIG_ATH10K_SNOC=m
 # CONFIG_ATH10K_DEBUG is not set
 CONFIG_ATH10K_DEBUGFS=y
+CONFIG_ATH10K_LEDS=y
 CONFIG_ATH10K_SPECTRAL=y
 CONFIG_ATH10K_TRACING=y
 CONFIG_WCN36XX=m
@@ -4291,6 +4362,7 @@ CONFIG_RTL8188EE=m
 CONFIG_RTL8192EE=m
 CONFIG_RTL8821AE=m
 CONFIG_RTL8192CU=m
+# CONFIG_RTL8192DU is not set
 CONFIG_RTLWIFI=m
 CONFIG_RTLWIFI_PCI=m
 CONFIG_RTLWIFI_USB=m
@@ -4330,11 +4402,13 @@ CONFIG_RTW89_CORE=m
 CONFIG_RTW89_PCI=m
 CONFIG_RTW89_8851B=m
 CONFIG_RTW89_8852A=m
+CONFIG_RTW89_8852B_COMMON=m
 CONFIG_RTW89_8852B=m
 CONFIG_RTW89_8852C=m
 CONFIG_RTW89_8851BE=m
 CONFIG_RTW89_8852AE=m
 CONFIG_RTW89_8852BE=m
+# CONFIG_RTW89_8852BTE is not set
 CONFIG_RTW89_8852CE=m
 # CONFIG_RTW89_8922AE is not set
 # CONFIG_RTW89_DEBUGMSG is not set
@@ -4426,8 +4500,6 @@ CONFIG_NETDEVSIM=m
 CONFIG_NET_FAILOVER=m
 CONFIG_ISDN=y
 CONFIG_ISDN_CAPI=y
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_MISDN=m
 CONFIG_MISDN_DSP=m
 CONFIG_MISDN_L1OIP=m
@@ -4490,7 +4562,6 @@ CONFIG_KEYBOARD_MATRIX=m
 CONFIG_KEYBOARD_LM8323=m
 CONFIG_KEYBOARD_LM8333=m
 CONFIG_KEYBOARD_MAX7359=m
-CONFIG_KEYBOARD_MCS=m
 CONFIG_KEYBOARD_MPR121=m
 CONFIG_KEYBOARD_NEWTON=m
 CONFIG_KEYBOARD_TEGRA=m
@@ -4606,9 +4677,6 @@ CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
 CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
-CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
-CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
 # CONFIG_TOUCHSCREEN_CYTTSP5 is not set
 CONFIG_TOUCHSCREEN_DA9034=m
 CONFIG_TOUCHSCREEN_DA9052=m
@@ -4635,7 +4703,6 @@ CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
 CONFIG_TOUCHSCREEN_WACOM_I2C=m
 CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
 CONFIG_TOUCHSCREEN_MMS114=m
 CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
 CONFIG_TOUCHSCREEN_MSG2638=m
@@ -4970,6 +5037,7 @@ CONFIG_HW_RANDOM_CCTRNG=m
 CONFIG_HW_RANDOM_XIPHERA=m
 CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
 CONFIG_HW_RANDOM_CN10K=m
+CONFIG_HW_RANDOM_ROCKCHIP=y
 CONFIG_APPLICOM=m
 CONFIG_DEVMEM=y
 CONFIG_DEVPORT=y
@@ -5008,7 +5076,6 @@ CONFIG_XILLYBUS_OF=m
 CONFIG_I2C=y
 CONFIG_ACPI_I2C_OPREGION=y
 CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=m
 
@@ -5025,6 +5092,7 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_MUX_MLXCPLD=m
+# CONFIG_I2C_MUX_MULE is not set
 # end of Multiplexer I2C Chip support
 
 CONFIG_I2C_HELPER_AUTO=y
@@ -5166,6 +5234,7 @@ CONFIG_SPI_BUTTERFLY=m
 CONFIG_SPI_CADENCE=m
 CONFIG_SPI_CADENCE_QUADSPI=m
 CONFIG_SPI_CADENCE_XSPI=m
+# CONFIG_SPI_CH341 is not set
 CONFIG_SPI_DESIGNWARE=m
 CONFIG_SPI_DW_DMA=y
 CONFIG_SPI_DW_PCI=m
@@ -5327,6 +5396,7 @@ CONFIG_PINCTRL_CS47L35=y
 CONFIG_PINCTRL_CS47L85=y
 CONFIG_PINCTRL_CS47L90=y
 CONFIG_PINCTRL_CS47L92=y
+# CONFIG_PINCTRL_IMX_SCMI is not set
 
 #
 # MediaTek pinctrl drivers
@@ -5415,6 +5485,7 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
 CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
 CONFIG_PINCTRL_LPASS_LPI=m
 CONFIG_PINCTRL_SC7280_LPASS_LPI=m
+# CONFIG_PINCTRL_SM4250_LPASS_LPI is not set
 # CONFIG_PINCTRL_SM6115_LPASS_LPI is not set
 CONFIG_PINCTRL_SM8250_LPASS_LPI=m
 # CONFIG_PINCTRL_SM8350_LPASS_LPI is not set
@@ -5636,6 +5707,13 @@ CONFIG_GPIO_AGGREGATOR=m
 CONFIG_GPIO_SIM=m
 # end of Virtual GPIO drivers
 
+#
+# GPIO Debugging utilities
+#
+# CONFIG_GPIO_SLOPPY_LOGIC_ANALYZER is not set
+# CONFIG_GPIO_VIRTUSER is not set
+# end of GPIO Debugging utilities
+
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -5700,6 +5778,8 @@ CONFIG_SYSCON_REBOOT_MODE=m
 CONFIG_POWER_RESET_SC27XX=m
 CONFIG_NVMEM_REBOOT_MODE=m
 CONFIG_POWER_MLXBF=m
+CONFIG_POWER_SEQUENCING=m
+CONFIG_POWER_SEQUENCING_QCOM_WCN=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
@@ -5736,6 +5816,7 @@ CONFIG_BATTERY_AXP20X=m
 CONFIG_AXP20X_POWER=m
 CONFIG_BATTERY_MAX17040=m
 CONFIG_BATTERY_MAX17042=m
+# CONFIG_BATTERY_MAX1720X is not set
 CONFIG_BATTERY_MAX1721X=m
 CONFIG_BATTERY_TWL4030_MADC=m
 CONFIG_CHARGER_88PM860X=m
@@ -5784,6 +5865,7 @@ CONFIG_CHARGER_RT9455=m
 # CONFIG_CHARGER_RT9471 is not set
 CONFIG_CHARGER_CROS_USBPD=m
 CONFIG_CHARGER_CROS_PCHG=m
+CONFIG_CHARGER_CROS_CONTROL=m
 CONFIG_CHARGER_SC2731=m
 CONFIG_FUEL_GAUGE_SC27XX=m
 CONFIG_CHARGER_UCS1002=m
@@ -5829,6 +5911,7 @@ CONFIG_SENSORS_ATXP1=m
 # CONFIG_SENSORS_CHIPCAP2 is not set
 CONFIG_SENSORS_CORSAIR_CPRO=m
 CONFIG_SENSORS_CORSAIR_PSU=m
+CONFIG_SENSORS_CROS_EC=m
 CONFIG_SENSORS_DRIVETEMP=m
 CONFIG_SENSORS_DS620=m
 CONFIG_SENSORS_DS1621=m
@@ -5968,10 +6051,14 @@ CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
 # CONFIG_SENSORS_MP2856 is not set
 # CONFIG_SENSORS_MP2888 is not set
+# CONFIG_SENSORS_MP2891 is not set
 CONFIG_SENSORS_MP2975=m
+# CONFIG_SENSORS_MP2993 is not set
 # CONFIG_SENSORS_MP2975_REGULATOR is not set
 CONFIG_SENSORS_MP5023=m
+# CONFIG_SENSORS_MP5920 is not set
 # CONFIG_SENSORS_MP5990 is not set
+# CONFIG_SENSORS_MP9941 is not set
 # CONFIG_SENSORS_MPQ7932 is not set
 # CONFIG_SENSORS_MPQ8785 is not set
 # CONFIG_SENSORS_PIM4328 is not set
@@ -6015,6 +6102,7 @@ CONFIG_SENSORS_SCH5627=m
 CONFIG_SENSORS_SCH5636=m
 CONFIG_SENSORS_STTS751=m
 # CONFIG_SENSORS_SURFACE_FAN is not set
+# CONFIG_SENSORS_SURFACE_TEMP is not set
 CONFIG_SENSORS_ADC128D818=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
@@ -6023,6 +6111,7 @@ CONFIG_SENSORS_INA209=m
 CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA238=m
 CONFIG_SENSORS_INA3221=m
+# CONFIG_SENSORS_SPD5118 is not set
 CONFIG_SENSORS_TC74=m
 CONFIG_SENSORS_THMC50=m
 CONFIG_SENSORS_TMP102=m
@@ -6059,6 +6148,7 @@ CONFIG_THERMAL=y
 CONFIG_THERMAL_NETLINK=y
 CONFIG_THERMAL_STATISTICS=y
 # CONFIG_THERMAL_DEBUGFS is not set
+# CONFIG_THERMAL_CORE_TESTING is not set
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
@@ -6083,9 +6173,6 @@ CONFIG_K3_THERMAL=m
 CONFIG_MAX77620_THERMAL=m
 CONFIG_SUN8I_THERMAL=m
 CONFIG_ROCKCHIP_THERMAL=m
-CONFIG_RCAR_THERMAL=m
-CONFIG_RCAR_GEN3_THERMAL=m
-CONFIG_RZG2L_THERMAL=m
 CONFIG_ARMADA_THERMAL=y
 CONFIG_DA9062_THERMAL=m
 
@@ -6098,6 +6185,9 @@ CONFIG_MTK_THERMAL=m
 # end of Mediatek thermal drivers
 
 CONFIG_AMLOGIC_THERMAL=m
+CONFIG_RCAR_THERMAL=m
+CONFIG_RCAR_GEN3_THERMAL=m
+CONFIG_RZG2L_THERMAL=m
 
 #
 # NVIDIA Tegra thermal drivers
@@ -6235,6 +6325,7 @@ CONFIG_BCMA_DRIVER_GPIO=y
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
+# CONFIG_MFD_ADP5585 is not set
 CONFIG_MFD_ALTERA_A10SR=y
 CONFIG_MFD_ALTERA_SYSMGR=y
 CONFIG_MFD_ACT8945A=m
@@ -6289,6 +6380,7 @@ CONFIG_MFD_KEMPLD=m
 CONFIG_MFD_88PM800=m
 CONFIG_MFD_88PM805=m
 CONFIG_MFD_88PM860X=y
+# CONFIG_MFD_88PM886_PMIC is not set
 CONFIG_MFD_MAX14577=y
 # CONFIG_MFD_MAX77541 is not set
 CONFIG_MFD_MAX77620=y
@@ -6394,6 +6486,7 @@ CONFIG_MFD_WM8994=m
 CONFIG_MFD_ROHM_BD718XX=m
 CONFIG_MFD_ROHM_BD71828=m
 CONFIG_MFD_ROHM_BD957XMUF=m
+# CONFIG_MFD_ROHM_BD96801 is not set
 CONFIG_MFD_STPMIC1=m
 CONFIG_MFD_STMFX=m
 CONFIG_MFD_WCD934X=m
@@ -6401,6 +6494,8 @@ CONFIG_MFD_ATC260X=m
 CONFIG_MFD_ATC260X_I2C=m
 CONFIG_MFD_KHADAS_MCU=m
 # CONFIG_MFD_QCOM_PM8008 is not set
+# CONFIG_MFD_CS40L50_I2C is not set
+# CONFIG_MFD_CS40L50_SPI is not set
 CONFIG_MFD_VEXPRESS_SYSREG=y
 CONFIG_RAVE_SP_CORE=m
 # CONFIG_MFD_INTEL_M10_BMC_SPI is not set
@@ -6569,6 +6664,7 @@ CONFIG_REGULATOR_TPS6586X=m
 CONFIG_REGULATOR_TPS65910=m
 CONFIG_REGULATOR_TPS65912=m
 CONFIG_REGULATOR_TWL4030=m
+CONFIG_REGULATOR_RZG2L_VBCTRL=m
 CONFIG_REGULATOR_VCTRL=m
 CONFIG_REGULATOR_VEXPRESS=m
 CONFIG_REGULATOR_VQMMC_IPQ4019=m
@@ -6633,6 +6729,7 @@ CONFIG_CEC_CROS_EC=m
 CONFIG_CEC_MESON_AO=m
 CONFIG_CEC_MESON_G12A_AO=m
 CONFIG_CEC_TEGRA=m
+# CONFIG_USB_EXTRON_DA_HD_4K_PLUS_CEC is not set
 CONFIG_USB_PULSE8_CEC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # end of CEC support
@@ -6665,6 +6762,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_JPEG_HELPER=m
 CONFIG_V4L2_H264=m
 CONFIG_V4L2_VP9=m
 CONFIG_V4L2_MEM2MEM_DEV=m
@@ -6991,6 +7089,7 @@ CONFIG_VIDEO_CADENCE_CSI2TX=m
 # Chips&Media media platform drivers
 #
 # CONFIG_VIDEO_WAVE_VPU is not set
+# CONFIG_VIDEO_E5010_JPEG_ENC is not set
 
 #
 # Intel media platform drivers
@@ -7029,6 +7128,10 @@ CONFIG_VIDEO_TEGRA_VDE=m
 CONFIG_VIDEO_QCOM_CAMSS=m
 CONFIG_VIDEO_QCOM_VENUS=m
 
+#
+# Raspberry Pi media platform drivers
+#
+
 #
 # Renesas media platform drivers
 #
@@ -7077,6 +7180,7 @@ CONFIG_VIDEO_TI_CAL_MC=y
 # Verisilicon media platform drivers
 #
 CONFIG_VIDEO_HANTRO=m
+# CONFIG_VIDEO_HANTRO_HEVC_RFC is not set
 CONFIG_VIDEO_HANTRO_ROCKCHIP=y
 CONFIG_VIDEO_HANTRO_SUNXI=y
 
@@ -7150,6 +7254,8 @@ CONFIG_VIDEO_CCS_PLL=m
 # CONFIG_VIDEO_ALVIUM_CSI2 is not set
 CONFIG_VIDEO_AR0521=m
 # CONFIG_VIDEO_GC0308 is not set
+# CONFIG_VIDEO_GC05A2 is not set
+# CONFIG_VIDEO_GC08A3 is not set
 # CONFIG_VIDEO_GC2145 is not set
 CONFIG_VIDEO_HI556=m
 CONFIG_VIDEO_HI846=m
@@ -7159,6 +7265,7 @@ CONFIG_VIDEO_IMX214=m
 CONFIG_VIDEO_IMX219=m
 CONFIG_VIDEO_IMX258=m
 CONFIG_VIDEO_IMX274=m
+# CONFIG_VIDEO_IMX283 is not set
 CONFIG_VIDEO_IMX290=m
 # CONFIG_VIDEO_IMX296 is not set
 CONFIG_VIDEO_IMX319=m
@@ -7217,7 +7324,7 @@ CONFIG_VIDEO_RJ54N1=m
 CONFIG_VIDEO_S5C73M3=m
 CONFIG_VIDEO_S5K5BAF=m
 CONFIG_VIDEO_S5K6A3=m
-# CONFIG_VIDEO_ST_VGXY61 is not set
+# CONFIG_VIDEO_VGXY61 is not set
 CONFIG_VIDEO_CCS=m
 CONFIG_VIDEO_ET8EK8=m
 
@@ -7356,6 +7463,8 @@ CONFIG_VIDEO_M52790=m
 # CONFIG_VIDEO_DS90UB913 is not set
 # CONFIG_VIDEO_DS90UB953 is not set
 # CONFIG_VIDEO_DS90UB960 is not set
+# CONFIG_VIDEO_MAX96714 is not set
+# CONFIG_VIDEO_MAX96717 is not set
 # end of Video serializers and deserializers
 
 #
@@ -7615,19 +7724,22 @@ CONFIG_DRM_MIPI_DBI=m
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DEBUG_MM is not set
 CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_PANIC is not set
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_DISPLAY_HELPER=m
 CONFIG_DRM_DISPLAY_DP_AUX_BUS=m
+CONFIG_DRM_DISPLAY_HELPER=m
+CONFIG_DRM_BRIDGE_CONNECTOR=y
 # CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
 # CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_DP_HELPER=y
 CONFIG_DRM_DISPLAY_HDCP_HELPER=y
 CONFIG_DRM_DISPLAY_HDMI_HELPER=y
+CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y
 CONFIG_DRM_TTM=m
 CONFIG_DRM_EXEC=m
 CONFIG_DRM_GPUVM=m
@@ -7663,6 +7775,7 @@ CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_CIK=y
 CONFIG_DRM_AMDGPU_USERPTR=y
+# CONFIG_DRM_AMD_ISP is not set
 # CONFIG_DRM_AMDGPU_WERROR is not set
 
 #
@@ -7718,10 +7831,10 @@ CONFIG_DRM_RCAR_USE_LVDS=y
 CONFIG_DRM_RCAR_LVDS=m
 CONFIG_DRM_RCAR_USE_MIPI_DSI=y
 CONFIG_DRM_RCAR_MIPI_DSI=m
-# CONFIG_DRM_RZG2L_MIPI_DSI is not set
 CONFIG_DRM_RCAR_VSP=y
 CONFIG_DRM_RCAR_WRITEBACK=y
 # CONFIG_DRM_RZG2L_DU is not set
+# CONFIG_DRM_RZG2L_MIPI_DSI is not set
 # CONFIG_DRM_SHMOBILE is not set
 CONFIG_DRM_SUN4I=m
 CONFIG_DRM_SUN6I_DSI=m
@@ -7764,17 +7877,20 @@ CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0=m
 CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
 # CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
+# CONFIG_DRM_PANEL_BOE_TV101WUM_LL2 is not set
 CONFIG_DRM_PANEL_EBBG_FT8719=m
 CONFIG_DRM_PANEL_ELIDA_KD35T133=m
 CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 CONFIG_DRM_PANEL_DSI_CM=m
 CONFIG_DRM_PANEL_LVDS=m
+# CONFIG_DRM_PANEL_HIMAX_HX83102 is not set
 # CONFIG_DRM_PANEL_HIMAX_HX83112A is not set
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 CONFIG_DRM_PANEL_ILITEK_IL9322=m
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set
 CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
 # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
@@ -7787,6 +7903,7 @@ CONFIG_DRM_PANEL_KHADAS_TS050=m
 CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
 CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W=m
 CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829=m
+# CONFIG_DRM_PANEL_LINCOLNTECH_LCD197 is not set
 CONFIG_DRM_PANEL_LG_LB035Q02=m
 CONFIG_DRM_PANEL_LG_LG4573=m
 # CONFIG_DRM_PANEL_LG_SW43408 is not set
@@ -8095,6 +8212,7 @@ CONFIG_BACKLIGHT_ADP8870=m
 CONFIG_BACKLIGHT_88PM860X=m
 CONFIG_BACKLIGHT_PCF50633=m
 CONFIG_BACKLIGHT_AAT2870=m
+# CONFIG_BACKLIGHT_LM3509 is not set
 CONFIG_BACKLIGHT_LM3630A=m
 CONFIG_BACKLIGHT_LM3639=m
 CONFIG_BACKLIGHT_LP855X=m
@@ -8158,10 +8276,10 @@ CONFIG_SND_MAX_CARDS=32
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_PROC_FS=y
 CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
 CONFIG_SND_CTL_FAST_LOOKUP=y
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_CTL_INPUT_VALIDATION is not set
+# CONFIG_SND_UTIMER is not set
 CONFIG_SND_VMASTER=y
 CONFIG_SND_CTL_LED=m
 CONFIG_SND_SEQUENCER=m
@@ -8291,6 +8409,7 @@ CONFIG_SND_HDA_CODEC_HDMI=m
 CONFIG_SND_HDA_CODEC_CIRRUS=m
 CONFIG_SND_HDA_CODEC_CS8409=m
 CONFIG_SND_HDA_CODEC_CONEXANT=m
+# CONFIG_SND_HDA_CODEC_SENARYTECH is not set
 CONFIG_SND_HDA_CODEC_CA0110=m
 CONFIG_SND_HDA_CODEC_CA0132=m
 CONFIG_SND_HDA_CODEC_CA0132_DSP=y
@@ -8412,6 +8531,7 @@ CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_MT8192=m
 CONFIG_SND_SOC_MT8192_MT6359_RT1015_RT5682=m
 # CONFIG_SND_SOC_MT8195 is not set
+# CONFIG_SND_SOC_MT8365 is not set
 
 #
 # ASoC support for Amlogic platforms
@@ -8597,6 +8717,7 @@ CONFIG_SND_SOC_AK4375=m
 CONFIG_SND_SOC_AK4458=m
 CONFIG_SND_SOC_AK4554=m
 CONFIG_SND_SOC_AK4613=m
+# CONFIG_SND_SOC_AK4619 is not set
 CONFIG_SND_SOC_AK4642=m
 CONFIG_SND_SOC_AK5386=m
 CONFIG_SND_SOC_AK5558=m
@@ -8650,6 +8771,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
+# CONFIG_SND_SOC_CS530X_I2C is not set
 CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
@@ -8657,6 +8779,7 @@ CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES7241=m
+# CONFIG_SND_SOC_ES8311 is not set
 CONFIG_SND_SOC_ES8316=m
 # CONFIG_SND_SOC_ES8326 is not set
 CONFIG_SND_SOC_ES8328=m
@@ -8716,6 +8839,7 @@ CONFIG_SND_SOC_RT1015P=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 # CONFIG_SND_SOC_RT1318_SDW is not set
+# CONFIG_SND_SOC_RT1320_SDW is not set
 CONFIG_SND_SOC_RT5514=m
 CONFIG_SND_SOC_RT5514_SPI=m
 CONFIG_SND_SOC_RT5616=m
@@ -8798,6 +8922,7 @@ CONFIG_SND_SOC_WCD_CLASSH=m
 CONFIG_SND_SOC_WCD9335=m
 CONFIG_SND_SOC_WCD_MBHC=m
 CONFIG_SND_SOC_WCD934X=m
+# CONFIG_SND_SOC_WCD937X_SDW is not set
 CONFIG_SND_SOC_WCD938X=m
 CONFIG_SND_SOC_WCD938X_SDW=m
 # CONFIG_SND_SOC_WCD939X_SDW is not set
@@ -8836,6 +8961,7 @@ CONFIG_SND_SOC_WSA883X=m
 CONFIG_SND_SOC_ZL38060=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MT6351=m
+# CONFIG_SND_SOC_MT6357 is not set
 CONFIG_SND_SOC_MT6358=m
 CONFIG_SND_SOC_MT6359=m
 CONFIG_SND_SOC_MT6359_ACCDET=m
@@ -8910,6 +9036,7 @@ CONFIG_HID_GLORIOUS=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
 CONFIG_HID_VIVALDI_COMMON=m
+# CONFIG_HID_GOODIX_SPI is not set
 CONFIG_HID_GOOGLE_HAMMER=m
 # CONFIG_HID_GOOGLE_STADIA_FF is not set
 CONFIG_HID_VIVALDI=m
@@ -9077,7 +9204,7 @@ CONFIG_USB_MON=m
 CONFIG_USB_C67X00_HCD=m
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DBGCAP=y
-CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PCI_RENESAS=m
 CONFIG_USB_XHCI_PLATFORM=m
 CONFIG_USB_XHCI_HISTB=m
@@ -9603,7 +9730,6 @@ CONFIG_MS_BLOCK=m
 CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MEMSTICK_JMICRON_38X=m
 CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
 CONFIG_MEMSTICK_REALTEK_USB=m
 CONFIG_LEDS_EXPRESSWIRE=y
 CONFIG_NEW_LEDS=y
@@ -9623,6 +9749,7 @@ CONFIG_LEDS_BCM6328=m
 CONFIG_LEDS_BCM6358=m
 CONFIG_LEDS_CPCAP=m
 CONFIG_LEDS_CR0014114=m
+CONFIG_LEDS_CROS_EC=m
 CONFIG_LEDS_EL15203000=m
 CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_LM3532=m
@@ -9641,6 +9768,7 @@ CONFIG_LEDS_LP55XX_COMMON=m
 CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
 CONFIG_LEDS_LP5562=m
+# CONFIG_LEDS_LP5569 is not set
 CONFIG_LEDS_LP8501=m
 CONFIG_LEDS_LP8788=m
 CONFIG_LEDS_LP8860=m
@@ -9674,6 +9802,7 @@ CONFIG_LEDS_SC27XX_BLTC=m
 # LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
 #
 CONFIG_LEDS_BLINKM=m
+# CONFIG_LEDS_BLINKM_MULTICOLOR is not set
 CONFIG_LEDS_SYSCON=y
 CONFIG_LEDS_MLXREG=m
 CONFIG_LEDS_USER=m
@@ -9696,6 +9825,7 @@ CONFIG_LEDS_MT6360=m
 CONFIG_LEDS_RT4505=m
 CONFIG_LEDS_RT8515=m
 CONFIG_LEDS_SGM3140=m
+# CONFIG_LEDS_SY7802 is not set
 
 #
 # RGB LED drivers
@@ -9730,6 +9860,7 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_PATTERN=m
 CONFIG_LEDS_TRIGGER_TTY=m
+# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set
 
 #
 # Simple LED drivers
@@ -9884,6 +10015,7 @@ CONFIG_RTC_DRV_RV3028=m
 CONFIG_RTC_DRV_RV3032=m
 CONFIG_RTC_DRV_RV8803=m
 CONFIG_RTC_DRV_S5M=m
+# CONFIG_RTC_DRV_SD2405AL is not set
 CONFIG_RTC_DRV_SD3078=m
 
 #
@@ -10015,6 +10147,7 @@ CONFIG_XILINX_DMA=m
 # CONFIG_XILINX_XDMA is not set
 CONFIG_XILINX_ZYNQMP_DMA=m
 CONFIG_XILINX_ZYNQMP_DPDMA=m
+# CONFIG_AMD_QDMA is not set
 CONFIG_MTK_HSDMA=m
 CONFIG_MTK_CQDMA=m
 CONFIG_MTK_UART_APDMA=m
@@ -10109,6 +10242,7 @@ CONFIG_IRQ_BYPASS_MANAGER=y
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VMGENID=y
 CONFIG_NITRO_ENCLAVES=m
+# CONFIG_ARM_PKVM_GUEST is not set
 CONFIG_VIRTIO_ANCHOR=y
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_PCI_LIB=y
@@ -10136,6 +10270,7 @@ CONFIG_MLX5_VDPA_NET=m
 # CONFIG_MLX5_VDPA_STEERING_DEBUG is not set
 CONFIG_VP_VDPA=m
 # CONFIG_SNET_VDPA is not set
+# CONFIG_OCTEONEP_VDPA is not set
 CONFIG_VHOST_IOTLB=m
 CONFIG_VHOST_RING=m
 CONFIG_VHOST_TASK=y
@@ -10174,6 +10309,7 @@ CONFIG_XEN_GRANT_DMA_ALLOC=y
 CONFIG_SWIOTLB_XEN=y
 CONFIG_XEN_PCI_STUB=y
 CONFIG_XEN_PCIDEV_STUB=m
+# CONFIG_XEN_PCIDEV_BACKEND is not set
 CONFIG_XEN_PVCALLS_FRONTEND=m
 # CONFIG_XEN_PVCALLS_BACKEND is not set
 CONFIG_XEN_SCSI_BACKEND=m
@@ -10391,7 +10527,6 @@ CONFIG_MOST_NET=m
 CONFIG_MOST_VIDEO=m
 CONFIG_MOST_DIM2=m
 CONFIG_MOST_I2C=m
-CONFIG_KS7010=m
 CONFIG_GREYBUS_AUDIO=m
 CONFIG_GREYBUS_AUDIO_APB_CODEC=m
 CONFIG_GREYBUS_BOOTROM=m
@@ -10452,6 +10587,7 @@ CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CROS_USBPD_NOTIFY=m
 CONFIG_CHROMEOS_PRIVACY_SCREEN=m
 CONFIG_CROS_TYPEC_SWITCH=m
+# CONFIG_CZNIC_PLATFORMS is not set
 CONFIG_MELLANOX_PLATFORM=y
 CONFIG_MLXREG_HOTPLUG=m
 CONFIG_MLXREG_IO=m
@@ -10477,6 +10613,7 @@ CONFIG_SURFACE_AGGREGATOR_BUS=y
 # CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION is not set
 CONFIG_ARM64_PLATFORM_DEVICES=y
 # CONFIG_EC_ACER_ASPIRE1 is not set
+# CONFIG_EC_LENOVO_YOGA_C630 is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -10701,6 +10838,8 @@ CONFIG_COMMON_CLK_AXG=y
 CONFIG_COMMON_CLK_AXG_AUDIO=m
 # CONFIG_COMMON_CLK_A1_PLL is not set
 # CONFIG_COMMON_CLK_A1_PERIPHERALS is not set
+CONFIG_COMMON_CLK_C3_PLL=y
+CONFIG_COMMON_CLK_C3_PERIPHERALS=y
 CONFIG_COMMON_CLK_G12A=y
 CONFIG_COMMON_CLK_S4_PLL=y
 CONFIG_COMMON_CLK_S4_PERIPHERALS=y
@@ -10712,13 +10851,13 @@ CONFIG_ARMADA_AP806_SYSCON=y
 CONFIG_ARMADA_AP_CPU_CLK=y
 CONFIG_ARMADA_CP110_SYSCON=y
 CONFIG_QCOM_GDSC=y
-CONFIG_QCOM_RPMCC=y
 CONFIG_COMMON_CLK_QCOM=m
 # CONFIG_CLK_X1E80100_CAMCC is not set
 # CONFIG_CLK_X1E80100_DISPCC is not set
 # CONFIG_CLK_X1E80100_GCC is not set
 # CONFIG_CLK_X1E80100_GPUCC is not set
 # CONFIG_CLK_X1E80100_TCSRCC is not set
+# CONFIG_CLK_QCM2290_GPUCC is not set
 CONFIG_QCOM_A53PLL=m
 CONFIG_QCOM_A7PLL=m
 CONFIG_QCOM_CLK_APCS_MSM8916=m
@@ -10734,6 +10873,7 @@ CONFIG_IPQ_GCC_4019=m
 CONFIG_IPQ_GCC_6018=m
 CONFIG_IPQ_GCC_8074=m
 # CONFIG_IPQ_GCC_9574 is not set
+# CONFIG_IPQ_NSSCC_QCA8K is not set
 CONFIG_MSM_GCC_8916=m
 # CONFIG_MSM_GCC_8917 is not set
 CONFIG_MSM_GCC_8939=m
@@ -10784,14 +10924,17 @@ CONFIG_SDM_VIDEOCC_845=m
 CONFIG_SDM_DISPCC_845=m
 CONFIG_SDM_LPASSCC_845=m
 # CONFIG_SDX_GCC_75 is not set
+# CONFIG_SM_CAMCC_4450 is not set
 # CONFIG_SM_CAMCC_6350 is not set
+# CONFIG_SM_CAMCC_7150 is not set
+# CONFIG_SM_CAMCC_8150 is not set
 # CONFIG_SM_CAMCC_8250 is not set
 CONFIG_SM_CAMCC_8450=m
 # CONFIG_SM_CAMCC_8550 is not set
+# CONFIG_SM_CAMCC_8650 is not set
 CONFIG_SM_DISPCC_8250=m
 CONFIG_SM_DISPCC_6350=m
 # CONFIG_SM_DISPCC_8450 is not set
-# CONFIG_SM_DISPCC_8650 is not set
 # CONFIG_SM_GCC_4450 is not set
 # CONFIG_SM_GCC_6115 is not set
 # CONFIG_SM_GCC_6125 is not set
@@ -10804,6 +10947,7 @@ CONFIG_SM_GCC_8350=m
 CONFIG_SM_GCC_8450=m
 # CONFIG_SM_GCC_8550 is not set
 # CONFIG_SM_GCC_8650 is not set
+# CONFIG_SM_GPUCC_4450 is not set
 # CONFIG_SM_GPUCC_6115 is not set
 # CONFIG_SM_GPUCC_6125 is not set
 # CONFIG_SM_GPUCC_6375 is not set
@@ -10816,6 +10960,7 @@ CONFIG_SM_GPUCC_8350=m
 # CONFIG_SM_GPUCC_8650 is not set
 # CONFIG_SM_TCSRCC_8550 is not set
 # CONFIG_SM_TCSRCC_8650 is not set
+# CONFIG_SM_VIDEOCC_7150 is not set
 CONFIG_SM_VIDEOCC_8150=m
 CONFIG_SM_VIDEOCC_8250=m
 # CONFIG_SM_VIDEOCC_8350 is not set
@@ -10856,6 +11001,7 @@ CONFIG_CLK_RK3328=y
 CONFIG_CLK_RK3368=y
 CONFIG_CLK_RK3399=y
 CONFIG_CLK_RK3568=y
+CONFIG_CLK_RK3576=y
 CONFIG_CLK_RK3588=y
 CONFIG_CLK_INTEL_SOCFPGA=y
 CONFIG_CLK_INTEL_SOCFPGA64=y
@@ -10942,6 +11088,7 @@ CONFIG_MTK_CMDQ_MBOX=m
 CONFIG_ZYNQMP_IPI_MBOX=y
 CONFIG_SUN6I_MSGBOX=y
 CONFIG_SPRD_MBOX=m
+# CONFIG_QCOM_CPUCP_MBOX is not set
 CONFIG_QCOM_IPCC=y
 CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_API=y
@@ -10979,6 +11126,7 @@ CONFIG_ARM_SMMU_QCOM=y
 # CONFIG_ARM_SMMU_QCOM_DEBUG is not set
 CONFIG_ARM_SMMU_V3=y
 CONFIG_ARM_SMMU_V3_SVA=y
+# CONFIG_TEGRA241_CMDQV is not set
 # CONFIG_MTK_IOMMU is not set
 CONFIG_QCOM_IOMMU=y
 CONFIG_VIRTIO_IOMMU=y
@@ -11002,6 +11150,7 @@ CONFIG_QCOM_SYSMON=m
 # CONFIG_QCOM_WCNSS_PIL is not set
 CONFIG_RCAR_REMOTEPROC=m
 CONFIG_TI_K3_DSP_REMOTEPROC=m
+# CONFIG_TI_K3_M4_REMOTEPROC is not set
 CONFIG_TI_K3_R5_REMOTEPROC=m
 # CONFIG_XLNX_R5_REMOTEPROC is not set
 # end of Remoteproc drivers
@@ -11064,6 +11213,7 @@ CONFIG_QUICC_ENGINE=y
 CONFIG_UCC_SLOW=y
 CONFIG_UCC_FAST=y
 CONFIG_UCC=y
+# CONFIG_CPM_TSA is not set
 CONFIG_QE_TDM=y
 CONFIG_FSL_RCPM=y
 # end of NXP/Freescale QorIQ SoC drivers
@@ -11116,7 +11266,9 @@ CONFIG_QCOM_LLCC=m
 CONFIG_QCOM_KRYO_L2_ACCESSORS=y
 CONFIG_QCOM_MDT_LOADER=m
 CONFIG_QCOM_OCMEM=m
+CONFIG_QCOM_PD_MAPPER=m
 CONFIG_QCOM_PDR_HELPERS=m
+CONFIG_QCOM_PDR_MSG=m
 # CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set
 # CONFIG_QCOM_PMIC_GLINK is not set
 CONFIG_QCOM_QMI_HELPERS=m
@@ -11205,7 +11357,6 @@ CONFIG_OWL_PM_DOMAINS=y
 #
 # Amlogic PM Domains
 #
-CONFIG_MESON_GX_PM_DOMAINS=y
 CONFIG_MESON_EE_PM_DOMAINS=y
 CONFIG_MESON_SECURE_PM_DOMAINS=y
 # end of Amlogic PM Domains
@@ -11291,6 +11442,7 @@ CONFIG_EXTCON=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_FSA9480=m
 CONFIG_EXTCON_GPIO=m
+# CONFIG_EXTCON_LC824206XA is not set
 CONFIG_EXTCON_MAX14577=m
 CONFIG_EXTCON_MAX3355=m
 CONFIG_EXTCON_MAX77693=m
@@ -11348,6 +11500,8 @@ CONFIG_ADXL367_I2C=m
 CONFIG_ADXL372=m
 CONFIG_ADXL372_SPI=m
 CONFIG_ADXL372_I2C=m
+# CONFIG_ADXL380_SPI is not set
+# CONFIG_ADXL380_I2C is not set
 CONFIG_BMA220=m
 CONFIG_BMA400=m
 CONFIG_BMA400_I2C=m
@@ -11398,7 +11552,9 @@ CONFIG_STK8BA50=m
 # Analog to digital converters
 #
 CONFIG_AD_SIGMA_DELTA=m
+# CONFIG_AD4000 is not set
 # CONFIG_AD4130 is not set
+# CONFIG_AD4695 is not set
 CONFIG_AD7091R=m
 CONFIG_AD7091R5=m
 # CONFIG_AD7091R8 is not set
@@ -11410,6 +11566,7 @@ CONFIG_AD7280=m
 CONFIG_AD7291=m
 CONFIG_AD7292=m
 CONFIG_AD7298=m
+# CONFIG_AD7380 is not set
 CONFIG_AD7476=m
 CONFIG_AD7606=m
 CONFIG_AD7606_IFACE_PARALLEL=m
@@ -11456,12 +11613,14 @@ CONFIG_MCP320X=m
 CONFIG_MCP3422=m
 # CONFIG_MCP3564 is not set
 CONFIG_MCP3911=m
+# CONFIG_MEDIATEK_MT6359_AUXADC is not set
 CONFIG_MEDIATEK_MT6360_ADC=m
 CONFIG_MEDIATEK_MT6577_AUXADC=m
 CONFIG_MEN_Z188_ADC=m
 CONFIG_MESON_SARADC=m
 CONFIG_MP2629_ADC=m
 CONFIG_NAU7802=m
+# CONFIG_PAC1921 is not set
 # CONFIG_PAC1934 is not set
 CONFIG_PALMAS_GPADC=m
 CONFIG_QCOM_VADC_COMMON=m
@@ -11486,6 +11645,7 @@ CONFIG_TI_ADC108S102=m
 CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
+# CONFIG_TI_ADS1119 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_TI_ADS1298 is not set
@@ -11544,6 +11704,7 @@ CONFIG_BME680=m
 CONFIG_BME680_I2C=m
 CONFIG_BME680_SPI=m
 CONFIG_CCS811=m
+# CONFIG_ENS160 is not set
 CONFIG_IAQCORE=m
 CONFIG_PMS7003=m
 CONFIG_SCD30_CORE=m
@@ -11624,6 +11785,7 @@ CONFIG_DPOT_DAC=m
 CONFIG_DS4424=m
 CONFIG_LTC1660=m
 CONFIG_LTC2632=m
+# CONFIG_LTC2664 is not set
 CONFIG_M62332=m
 CONFIG_MAX517=m
 # CONFIG_MAX5522 is not set
@@ -11720,6 +11882,7 @@ CONFIG_MAX30102=m
 #
 CONFIG_AM2315=m
 CONFIG_DHT11=m
+# CONFIG_ENS210 is not set
 CONFIG_HDC100X=m
 CONFIG_HDC2010=m
 # CONFIG_HDC3020 is not set
@@ -11778,6 +11941,7 @@ CONFIG_APDS9300=m
 # CONFIG_APDS9306 is not set
 CONFIG_APDS9960=m
 CONFIG_AS73211=m
+# CONFIG_BH1745 is not set
 CONFIG_BH1750=m
 CONFIG_BH1780=m
 CONFIG_CM32181=m
@@ -11827,6 +11991,7 @@ CONFIG_US5182D=m
 CONFIG_VCNL4000=m
 CONFIG_VCNL4035=m
 CONFIG_VEML6030=m
+# CONFIG_VEML6040 is not set
 CONFIG_VEML6070=m
 # CONFIG_VEML6075 is not set
 CONFIG_VL6180=m
@@ -11935,6 +12100,7 @@ CONFIG_MS5611=m
 CONFIG_MS5611_I2C=m
 CONFIG_MS5611_SPI=m
 CONFIG_MS5637=m
+# CONFIG_SDP500 is not set
 CONFIG_IIO_ST_PRESS=m
 CONFIG_IIO_ST_PRESS_I2C=m
 CONFIG_IIO_ST_PRESS_SPI=m
@@ -11955,6 +12121,7 @@ CONFIG_AS3935=m
 # Proximity and distance sensors
 #
 CONFIG_CROS_EC_MKBP_PROXIMITY=m
+# CONFIG_HX9023S is not set
 # CONFIG_IRSD200 is not set
 CONFIG_ISL29501=m
 CONFIG_LIDAR_LITE_V2=m
@@ -11970,6 +12137,7 @@ CONFIG_SX9500=m
 CONFIG_SRF08=m
 CONFIG_VCNL3020=m
 CONFIG_VL53L0X_I2C=m
+# CONFIG_AW96103 is not set
 # end of Proximity and distance sensors
 
 #
@@ -12016,12 +12184,14 @@ CONFIG_PWM=y
 # CONFIG_PWM_APPLE is not set
 CONFIG_PWM_ATMEL_HLCDC_PWM=m
 CONFIG_PWM_ATMEL_TCB=m
+# CONFIG_PWM_AXI_PWMGEN is not set
 CONFIG_PWM_BERLIN=m
 CONFIG_PWM_CLK=m
 CONFIG_PWM_CROS_EC=m
 CONFIG_PWM_DWC_CORE=m
 CONFIG_PWM_DWC=m
 CONFIG_PWM_FSL_FTM=m
+# CONFIG_PWM_GPIO is not set
 CONFIG_PWM_HIBVT=m
 CONFIG_PWM_IQS620A=m
 CONFIG_PWM_KEEMBAY=m
@@ -12057,9 +12227,11 @@ CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3_ITS_PCI=y
+CONFIG_IRQ_MSI_LIB=y
 CONFIG_AL_FIC=y
 CONFIG_DW_APB_ICTL=y
 CONFIG_HISILICON_IRQ_MBIGEN=y
+# CONFIG_LAN966X_OIC is not set
 CONFIG_MADERA_IRQ=m
 CONFIG_RENESAS_IRQC=y
 CONFIG_RENESAS_RZG2L_IRQC=y
@@ -12103,6 +12275,7 @@ CONFIG_RESET_SUNXI=y
 CONFIG_RESET_TI_SCI=m
 CONFIG_RESET_TI_SYSCON=m
 CONFIG_RESET_TI_TPS380X=m
+CONFIG_RESET_ZYNQMP=y
 CONFIG_COMMON_RESET_HI3660=m
 CONFIG_COMMON_RESET_HI6220=m
 CONFIG_RESET_TEGRA_BPMP=y
@@ -12242,6 +12415,7 @@ CONFIG_ARM_CCI400_PMU=y
 CONFIG_ARM_CCI5xx_PMU=y
 CONFIG_ARM_CCN=y
 CONFIG_ARM_CMN=m
+# CONFIG_ARM_NI is not set
 CONFIG_ARM_PMU=y
 CONFIG_ARM_PMU_ACPI=y
 CONFIG_ARM_SMMU_V3_PMU=m
@@ -12280,6 +12454,7 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder,anbox-binder,anbox-hwbi
 # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
+CONFIG_TRACE_GPU_MEM=y
 CONFIG_LIBNVDIMM=y
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_ND_CLAIM=y
@@ -12307,6 +12482,7 @@ CONFIG_NVMEM_LAYOUTS=y
 #
 # CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
 # CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
+# CONFIG_NVMEM_LAYOUT_U_BOOT_ENV is not set
 # end of Layout Types
 
 CONFIG_NVMEM_APPLE_EFUSES=m
@@ -12408,12 +12584,16 @@ CONFIG_SLIMBUS=m
 CONFIG_SLIM_QCOM_CTRL=m
 CONFIG_SLIM_QCOM_NGD_CTRL=m
 CONFIG_INTERCONNECT=y
+# CONFIG_INTERCONNECT_MTK is not set
 CONFIG_INTERCONNECT_QCOM=y
 CONFIG_INTERCONNECT_QCOM_BCM_VOTER=m
 # CONFIG_INTERCONNECT_QCOM_MSM8909 is not set
 CONFIG_INTERCONNECT_QCOM_MSM8916=m
+# CONFIG_INTERCONNECT_QCOM_MSM8937 is not set
 CONFIG_INTERCONNECT_QCOM_MSM8939=m
+# CONFIG_INTERCONNECT_QCOM_MSM8953 is not set
 CONFIG_INTERCONNECT_QCOM_MSM8974=m
+# CONFIG_INTERCONNECT_QCOM_MSM8976 is not set
 CONFIG_INTERCONNECT_QCOM_MSM8996=m
 CONFIG_INTERCONNECT_QCOM_OSM_L3=m
 CONFIG_INTERCONNECT_QCOM_QCM2290=m
@@ -12447,6 +12627,7 @@ CONFIG_INTERCONNECT_CLK=m
 CONFIG_COUNTER=m
 CONFIG_INTERRUPT_CNT=m
 # CONFIG_TI_ECAP_CAPTURE is not set
+# CONFIG_TI_EQEP is not set
 CONFIG_MOST=m
 CONFIG_MOST_USB_HDM=m
 CONFIG_MOST_CDEV=m
@@ -12536,6 +12717,7 @@ CONFIG_BCACHEFS_POSIX_ACL=y
 # CONFIG_BCACHEFS_LOCK_TIME_STATS is not set
 # CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set
 CONFIG_BCACHEFS_SIX_OPTIMISTIC_SPIN=y
+# CONFIG_BCACHEFS_PATH_TRACEPOINTS is not set
 CONFIG_ZONEFS_FS=m
 CONFIG_FS_DAX=y
 CONFIG_FS_DAX_PMD=y
@@ -12579,9 +12761,9 @@ CONFIG_OVERLAY_FS_XINO_AUTO=y
 #
 CONFIG_NETFS_SUPPORT=m
 CONFIG_NETFS_STATS=y
+# CONFIG_NETFS_DEBUG is not set
 CONFIG_FSCACHE=y
 CONFIG_FSCACHE_STATS=y
-# CONFIG_FSCACHE_DEBUG is not set
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_ERROR_INJECTION is not set
@@ -12635,6 +12817,7 @@ CONFIG_TMPFS_INODE64=y
 CONFIG_ARCH_SUPPORTS_HUGETLBFS=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
+CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_EFIVAR_FS=y
@@ -12728,6 +12911,7 @@ CONFIG_EROFS_FS=m
 CONFIG_EROFS_FS_XATTR=y
 CONFIG_EROFS_FS_POSIX_ACL=y
 CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_BACKED_BY_FILE=y
 CONFIG_EROFS_FS_ZIP=y
 # CONFIG_EROFS_FS_ZIP_LZMA is not set
 # CONFIG_EROFS_FS_ZIP_DEFLATE is not set
@@ -12771,6 +12955,7 @@ CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
+# CONFIG_NFS_LOCALIO is not set
 CONFIG_NFS_V4_2_SSC_HELPER=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
@@ -12799,6 +12984,7 @@ CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_CIFS_SWN_UPCALL=y
 # CONFIG_CIFS_SMB_DIRECT is not set
 CONFIG_CIFS_FSCACHE=y
+# CONFIG_CIFS_COMPRESSION is not set
 CONFIG_SMB_SERVER=m
 CONFIG_SMB_SERVER_SMBDIRECT=y
 CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
@@ -12886,6 +13072,9 @@ CONFIG_ENCRYPTED_KEYS=y
 CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_PROC_MEM_ALWAYS_FORCE=y
+# CONFIG_PROC_MEM_FORCE_PTRACE is not set
+# CONFIG_PROC_MEM_NO_FORCE is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
@@ -12926,6 +13115,7 @@ CONFIG_SECURITY_YAMA=y
 CONFIG_SECURITY_SAFESETID=y
 # CONFIG_SECURITY_LOCKDOWN_LSM is not set
 # CONFIG_SECURITY_LANDLOCK is not set
+# CONFIG_SECURITY_IPE is not set
 CONFIG_INTEGRITY=y
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
@@ -13050,7 +13240,6 @@ CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECDSA=m
 CONFIG_CRYPTO_ECRDSA=m
-CONFIG_CRYPTO_SM2=m
 CONFIG_CRYPTO_CURVE25519=m
 # end of Public-key cryptography
 
@@ -13399,7 +13588,9 @@ CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_ARM64=y
 CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_RISCV=y
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_BCJ=y
 CONFIG_XZ_DEC_TEST=m
@@ -13429,7 +13620,7 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
-CONFIG_DMA_OPS=y
+CONFIG_DMA_OPS_HELPERS=y
 CONFIG_NEED_SG_DMA_FLAGS=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEED_DMA_MAP_STATE=y
@@ -13473,13 +13664,14 @@ CONFIG_CLZ_TAB=y
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
 CONFIG_SIGNATURE=y
-CONFIG_DIMLIB=m
+CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_VDSO_GETRANDOM=y
 CONFIG_FONT_SUPPORT=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
@@ -13781,7 +13973,6 @@ CONFIG_TRACE_EVENT_INJECT=y
 # CONFIG_HIST_TRIGGERS_DEBUG is not set
 # CONFIG_RV is not set
 CONFIG_SAMPLES=y
-# CONFIG_SAMPLE_AUXDISPLAY is not set
 # CONFIG_SAMPLE_TRACE_EVENTS is not set
 CONFIG_SAMPLE_TRACE_CUSTOM_EVENTS=m
 CONFIG_SAMPLE_TRACE_PRINTK=m
@@ -13800,7 +13991,6 @@ CONFIG_SAMPLE_TRACE_ARRAY=m
 # CONFIG_SAMPLE_VFIO_MDEV_MDPY is not set
 # CONFIG_SAMPLE_VFIO_MDEV_MDPY_FB is not set
 # CONFIG_SAMPLE_VFIO_MDEV_MBOCHS is not set
-# CONFIG_SAMPLE_WATCHDOG is not set
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT_MULTI=y
 CONFIG_STRICT_DEVMEM=y
@@ -13828,6 +14018,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_MIN_HEAP is not set
 CONFIG_TEST_DIV64=m
+# CONFIG_TEST_MULDIV64 is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_TEST_REF_TRACKER is not set
 # CONFIG_RBTREE_TEST is not set
@@ -13850,7 +14041,6 @@ CONFIG_TEST_DIV64=m
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_BITOPS is not set
 # CONFIG_TEST_VMALLOC is not set
-# CONFIG_TEST_USER_COPY is not set
 CONFIG_TEST_BPF=m
 CONFIG_TEST_BLACKHOLE_DEV=m
 # CONFIG_FIND_BIT_BENCHMARK is not set
diff --git a/config/kernel/linux-uefi-x86-edge.config b/config/kernel/linux-uefi-x86-edge.config
index e4cb04372f84..891528da6980 100644
--- a/config/kernel/linux-uefi-x86-edge.config
+++ b/config/kernel/linux-uefi-x86-edge.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 6.10.4 Kernel Configuration
+# Linux/x86_64 6.12.0-rc2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
 CONFIG_CC_IS_GCC=y
@@ -11,11 +11,10 @@ CONFIG_AS_VERSION=23800
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=23800
 CONFIG_LLD_VERSION=0
+CONFIG_RUSTC_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
-CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
-CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
-CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_BROKEN=y
 CONFIG_TOOLS_SUPPORT_RELR=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
@@ -130,6 +129,7 @@ CONFIG_PREEMPT_BUILD=y
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_RT is not set
 CONFIG_PREEMPT_COUNT=y
 CONFIG_PREEMPTION=y
 CONFIG_PREEMPT_DYNAMIC=y
@@ -200,10 +200,11 @@ CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-CONFIG_MEMCG_KMEM=y
+# CONFIG_MEMCG_V1 is not set
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
+CONFIG_GROUP_SCHED_WEIGHT=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 # CONFIG_RT_GROUP_SCHED is not set
@@ -214,6 +215,7 @@ CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
+# CONFIG_CPUSETS_V1 is not set
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
@@ -285,7 +287,6 @@ CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_SELFTEST is not set
 # CONFIG_KALLSYMS_ALL is not set
 CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_GUEST_PERF_EVENTS=y
@@ -433,6 +434,7 @@ CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_MC_PRIO=y
 CONFIG_X86_LOCAL_APIC=y
+CONFIG_ACPI_MADT_WAKEUP=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_MCE=y
@@ -469,7 +471,6 @@ CONFIG_AMD_MEM_ENCRYPT=y
 CONFIG_NUMA=y
 CONFIG_AMD_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
-# CONFIG_NUMA_EMU is not set
 CONFIG_NODES_SHIFT=10
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
@@ -485,11 +486,11 @@ CONFIG_MTRR_SANITIZER=y
 CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_X86_UMIP=y
 CONFIG_CC_HAS_IBT=y
 # CONFIG_X86_KERNEL_IBT is not set
 CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
+CONFIG_ARCH_PKEY_BITS=4
 CONFIG_X86_INTEL_TSX_MODE_OFF=y
 # CONFIG_X86_INTEL_TSX_MODE_ON is not set
 # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
@@ -499,7 +500,6 @@ CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 CONFIG_EFI_HANDOVER_PROTOCOL=y
 CONFIG_EFI_MIXED=y
-# CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_RUNTIME_MAP=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
@@ -559,9 +559,18 @@ CONFIG_MITIGATION_IBPB_ENTRY=y
 CONFIG_MITIGATION_IBRS_ENTRY=y
 CONFIG_MITIGATION_SRSO=y
 # CONFIG_MITIGATION_SLS is not set
-# CONFIG_MITIGATION_GDS_FORCE is not set
+CONFIG_MITIGATION_GDS=y
 CONFIG_MITIGATION_RFDS=y
 CONFIG_MITIGATION_SPECTRE_BHI=y
+CONFIG_MITIGATION_MDS=y
+CONFIG_MITIGATION_TAA=y
+CONFIG_MITIGATION_MMIO_STALE_DATA=y
+CONFIG_MITIGATION_L1TF=y
+CONFIG_MITIGATION_RETBLEED=y
+CONFIG_MITIGATION_SPECTRE_V1=y
+CONFIG_MITIGATION_SPECTRE_V2=y
+CONFIG_MITIGATION_SRBDS=y
+CONFIG_MITIGATION_SSB=y
 CONFIG_ARCH_HAS_ADD_PAGES=y
 
 #
@@ -769,6 +778,7 @@ CONFIG_HAVE_KVM_READONLY_MEM=y
 CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
 CONFIG_KVM_VFIO=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_KVM_GENERIC_PRE_FAULT_MEMORY=y
 CONFIG_KVM_COMPAT=y
 CONFIG_HAVE_KVM_IRQ_BYPASS=y
 CONFIG_HAVE_KVM_NO_POLL=y
@@ -776,7 +786,13 @@ CONFIG_KVM_XFER_TO_GUEST_WORK=y
 CONFIG_HAVE_KVM_PM_NOTIFIER=y
 CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
 CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
+CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES=y
+CONFIG_KVM_PRIVATE_MEM=y
+CONFIG_KVM_GENERIC_PRIVATE_MEM=y
+CONFIG_HAVE_KVM_ARCH_GMEM_PREPARE=y
+CONFIG_HAVE_KVM_ARCH_GMEM_INVALIDATE=y
 CONFIG_VIRTUALIZATION=y
+CONFIG_KVM_X86=m
 CONFIG_KVM=m
 # CONFIG_KVM_WERROR is not set
 # CONFIG_KVM_SW_PROTECTED_VM is not set
@@ -800,6 +816,7 @@ CONFIG_AS_VAES=y
 CONFIG_AS_VPCLMULQDQ=y
 CONFIG_AS_WRUSS=y
 CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
+CONFIG_ARCH_HAS_DMA_OPS=y
 
 #
 # General architecture-dependent options
@@ -863,6 +880,7 @@ CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
 CONFIG_MMU_GATHER_MERGE_VMAS=y
 CONFIG_MMU_LAZY_TLB_REFCOUNT=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_ARCH_HAVE_EXTRA_ELF_NOTES=y
 CONFIG_ARCH_HAS_NMI_SAFE_THIS_CPU_OPS=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
@@ -924,6 +942,7 @@ CONFIG_ISA_BUS_API=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
 CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_ARCH_SUPPORTS_RT=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
 CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
@@ -987,10 +1006,7 @@ CONFIG_MODULE_SIG_SHA256=y
 # CONFIG_MODULE_SIG_SHA3_384 is not set
 # CONFIG_MODULE_SIG_SHA3_512 is not set
 CONFIG_MODULE_SIG_HASH="sha256"
-CONFIG_MODULE_COMPRESS_NONE=y
-# CONFIG_MODULE_COMPRESS_GZIP is not set
-# CONFIG_MODULE_COMPRESS_XZ is not set
-# CONFIG_MODULE_COMPRESS_ZSTD is not set
+# CONFIG_MODULE_COMPRESS is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 # CONFIG_TRIM_UNUSED_KSYMS is not set
@@ -1004,7 +1020,6 @@ CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_ICQ=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
@@ -1106,11 +1121,11 @@ CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
 CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
 CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set
 # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
 CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
 CONFIG_ZBUD=y
-CONFIG_Z3FOLD=m
+# CONFIG_Z3FOLD_DEPRECATED is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -1123,6 +1138,7 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SLAB_BUCKETS=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
@@ -1148,8 +1164,9 @@ CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_MHP_MEMMAP_ON_MEMORY=y
 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SPLIT_PTE_PTLOCKS=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_SPLIT_PMD_PTLOCKS=y
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
@@ -1177,6 +1194,9 @@ CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 CONFIG_THP_SWAP=y
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
+CONFIG_ARCH_SUPPORTS_HUGE_PFNMAP=y
+CONFIG_ARCH_SUPPORTS_PMD_PFNMAP=y
+CONFIG_ARCH_SUPPORTS_PUD_PFNMAP=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
@@ -1200,6 +1220,7 @@ CONFIG_DEVICE_PRIVATE=y
 CONFIG_VMAP_PFN=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 CONFIG_ARCH_HAS_PKEYS=y
+CONFIG_ARCH_USES_PG_ARCH_2=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
@@ -1219,6 +1240,8 @@ CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
 CONFIG_IOMMU_MM_DATA=y
 CONFIG_EXECMEM=y
+CONFIG_NUMA_MEMBLKS=y
+# CONFIG_NUMA_EMU is not set
 
 #
 # Data Access Monitoring
@@ -1236,6 +1259,7 @@ CONFIG_NET_XGRESS=y
 CONFIG_NET_REDIRECT=y
 CONFIG_SKB_DECRYPTED=y
 CONFIG_SKB_EXTENSIONS=y
+CONFIG_NET_DEVMEM=y
 
 #
 # Networking options
@@ -1802,6 +1826,7 @@ CONFIG_NET_DSA_TAG_RZN1_A5PSW=m
 CONFIG_NET_DSA_TAG_LAN9303=m
 CONFIG_NET_DSA_TAG_SJA1105=m
 CONFIG_NET_DSA_TAG_TRAILER=m
+CONFIG_NET_DSA_TAG_VSC73XX_8021Q=m
 CONFIG_NET_DSA_TAG_XRS700X=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
@@ -2011,7 +2036,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
 CONFIG_BT_HIDP=m
 CONFIG_BT_LE=y
 CONFIG_BT_LE_L2CAP_ECRED=y
@@ -2051,6 +2075,7 @@ CONFIG_BT_HCIUART_RTL=y
 CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIUART_AG6XX=y
 CONFIG_BT_HCIUART_MRVL=y
+# CONFIG_BT_HCIUART_AML is not set
 CONFIG_BT_HCIBCM203X=m
 # CONFIG_BT_HCIBCM4377 is not set
 CONFIG_BT_HCIBPA10X=m
@@ -2122,6 +2147,7 @@ CONFIG_NET_9P=m
 CONFIG_NET_9P_FD=m
 CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_9P_XEN=m
+# CONFIG_NET_9P_USBG is not set
 CONFIG_NET_9P_RDMA=m
 # CONFIG_NET_9P_DEBUG is not set
 CONFIG_CAIF=m
@@ -2232,6 +2258,7 @@ CONFIG_PCI_ATS=y
 CONFIG_PCI_DOE=y
 CONFIG_PCI_LOCKLESS_CONFIG=y
 CONFIG_PCI_IOV=y
+# CONFIG_PCI_NPEM is not set
 CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
 # CONFIG_PCI_P2PDMA is not set
@@ -2279,6 +2306,11 @@ CONFIG_PCIE_DW_PLAT_EP=y
 # Mobiveil-based PCIe controllers
 #
 # end of Mobiveil-based PCIe controllers
+
+#
+# PLDA-based PCIe controllers
+#
+# end of PLDA-based PCIe controllers
 # end of PCI controller drivers
 
 #
@@ -2678,12 +2710,15 @@ CONFIG_BLK_DEV_FD=m
 CONFIG_CDROM=y
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_ZRAM=m
+# CONFIG_ZRAM_BACKEND_LZ4 is not set
+# CONFIG_ZRAM_BACKEND_LZ4HC is not set
+# CONFIG_ZRAM_BACKEND_ZSTD is not set
+# CONFIG_ZRAM_BACKEND_DEFLATE is not set
+# CONFIG_ZRAM_BACKEND_842 is not set
+CONFIG_ZRAM_BACKEND_FORCE_LZO=y
+CONFIG_ZRAM_BACKEND_LZO=y
 CONFIG_ZRAM_DEF_COMP_LZORLE=y
-# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
-# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
 # CONFIG_ZRAM_DEF_COMP_LZO is not set
-# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
-# CONFIG_ZRAM_DEF_COMP_842 is not set
 CONFIG_ZRAM_DEF_COMP="lzo-rle"
 CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y
@@ -2728,6 +2763,7 @@ CONFIG_NVME_TCP=m
 CONFIG_NVME_TCP_TLS=y
 CONFIG_NVME_HOST_AUTH=y
 CONFIG_NVME_TARGET=m
+# CONFIG_NVME_TARGET_DEBUGFS is not set
 CONFIG_NVME_TARGET_PASSTHRU=y
 CONFIG_NVME_TARGET_LOOP=m
 CONFIG_NVME_TARGET_RDMA=m
@@ -2748,6 +2784,7 @@ CONFIG_AD525X_DPOT_SPI=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_IBM_ASM=m
 CONFIG_PHANTOM=m
+# CONFIG_RPMB is not set
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 CONFIG_ICS932S401=m
@@ -2821,6 +2858,7 @@ CONFIG_PVPANIC=y
 CONFIG_PVPANIC_MMIO=m
 CONFIG_PVPANIC_PCI=m
 # CONFIG_GP_PCI1XXXX is not set
+# CONFIG_KEBA_CP500 is not set
 # end of Misc devices
 
 #
@@ -3119,6 +3157,7 @@ CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 # CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING is not set
+# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_PLATFORM_KEYRING is not set
 # CONFIG_DM_VERITY_FEC is not set
 CONFIG_DM_SWITCH=m
 CONFIG_DM_LOG_WRITES=m
@@ -3486,6 +3525,7 @@ CONFIG_MLX5_CORE_IPOIB=y
 CONFIG_MLX5_EN_IPSEC=y
 CONFIG_MLX5_EN_TLS=y
 CONFIG_MLX5_SW_STEERING=y
+CONFIG_MLX5_HW_STEERING=y
 CONFIG_MLX5_SF=y
 CONFIG_MLX5_SF_MANAGER=y
 # CONFIG_MLX5_DPLL is not set
@@ -3498,6 +3538,8 @@ CONFIG_MLXSW_SPECTRUM=m
 CONFIG_MLXSW_SPECTRUM_DCB=y
 CONFIG_MLXSW_MINIMAL=m
 CONFIG_MLXFW=m
+CONFIG_NET_VENDOR_META=y
+# CONFIG_FBNIC is not set
 CONFIG_NET_VENDOR_MICREL=y
 CONFIG_KS8842=m
 CONFIG_KS8851=m
@@ -3508,6 +3550,7 @@ CONFIG_ENC28J60=m
 # CONFIG_ENC28J60_WRITEVERIFY is not set
 CONFIG_ENCX24J600=m
 CONFIG_LAN743X=m
+# CONFIG_LAN865X is not set
 # CONFIG_VCAP is not set
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH_LIB=m
@@ -3538,6 +3581,7 @@ CONFIG_NET_VENDOR_NVIDIA=y
 CONFIG_FORCEDETH=m
 CONFIG_NET_VENDOR_OKI=y
 CONFIG_ETHOC=m
+# CONFIG_OA_TC6 is not set
 CONFIG_NET_VENDOR_PACKET_ENGINES=y
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
@@ -3575,6 +3619,7 @@ CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
 CONFIG_R8169_LEDS=y
+# CONFIG_RTASE is not set
 CONFIG_NET_VENDOR_RENESAS=y
 CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_ROCKER=m
@@ -3622,6 +3667,7 @@ CONFIG_DWC_XLGMAC=m
 CONFIG_DWC_XLGMAC_PCI=m
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
+# CONFIG_TEHUTI_TN40 is not set
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
 CONFIG_TLAN=m
@@ -3930,6 +3976,7 @@ CONFIG_ATH10K_SDIO=m
 CONFIG_ATH10K_USB=m
 # CONFIG_ATH10K_DEBUG is not set
 CONFIG_ATH10K_DEBUGFS=y
+CONFIG_ATH10K_LEDS=y
 CONFIG_ATH10K_SPECTRAL=y
 CONFIG_ATH10K_TRACING=y
 CONFIG_WCN36XX=m
@@ -4127,6 +4174,7 @@ CONFIG_RTL8188EE=m
 CONFIG_RTL8192EE=m
 CONFIG_RTL8821AE=m
 CONFIG_RTL8192CU=m
+# CONFIG_RTL8192DU is not set
 CONFIG_RTLWIFI=m
 CONFIG_RTLWIFI_PCI=m
 CONFIG_RTLWIFI_USB=m
@@ -4166,11 +4214,13 @@ CONFIG_RTW89_CORE=m
 CONFIG_RTW89_PCI=m
 CONFIG_RTW89_8851B=m
 CONFIG_RTW89_8852A=m
+CONFIG_RTW89_8852B_COMMON=m
 CONFIG_RTW89_8852B=m
 CONFIG_RTW89_8852C=m
 CONFIG_RTW89_8851BE=m
 CONFIG_RTW89_8852AE=m
 CONFIG_RTW89_8852BE=m
+# CONFIG_RTW89_8852BTE is not set
 CONFIG_RTW89_8852CE=m
 # CONFIG_RTW89_8922AE is not set
 # CONFIG_RTW89_DEBUGMSG is not set
@@ -4259,8 +4309,6 @@ CONFIG_NETDEVSIM=m
 CONFIG_NET_FAILOVER=m
 CONFIG_ISDN=y
 CONFIG_ISDN_CAPI=y
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_MISDN=m
 CONFIG_MISDN_DSP=m
 CONFIG_MISDN_L1OIP=m
@@ -4324,7 +4372,6 @@ CONFIG_KEYBOARD_MATRIX=m
 CONFIG_KEYBOARD_LM8323=m
 CONFIG_KEYBOARD_LM8333=m
 CONFIG_KEYBOARD_MAX7359=m
-CONFIG_KEYBOARD_MCS=m
 CONFIG_KEYBOARD_MPR121=m
 CONFIG_KEYBOARD_NEWTON=m
 CONFIG_KEYBOARD_OPENCORES=m
@@ -4432,9 +4479,6 @@ CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
 CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
-CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
-CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
 # CONFIG_TOUCHSCREEN_CYTTSP5 is not set
 CONFIG_TOUCHSCREEN_DA9034=m
 CONFIG_TOUCHSCREEN_DA9052=m
@@ -4460,7 +4504,6 @@ CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
 CONFIG_TOUCHSCREEN_WACOM_I2C=m
 CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
 CONFIG_TOUCHSCREEN_MMS114=m
 CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
 CONFIG_TOUCHSCREEN_MSG2638=m
@@ -4783,7 +4826,6 @@ CONFIG_XILLYBUS_PCIE=m
 CONFIG_I2C=y
 CONFIG_ACPI_I2C_OPREGION=y
 CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=m
 
@@ -4905,6 +4947,8 @@ CONFIG_SPI_AXI_SPI_ENGINE=m
 CONFIG_SPI_BITBANG=m
 CONFIG_SPI_BUTTERFLY=m
 CONFIG_SPI_CADENCE=m
+# CONFIG_SPI_CH341 is not set
+CONFIG_SPI_CS42L43=m
 CONFIG_SPI_DESIGNWARE=m
 CONFIG_SPI_DW_DMA=y
 CONFIG_SPI_DW_PCI=m
@@ -5002,7 +5046,7 @@ CONFIG_PINCTRL_MCP23S08_I2C=m
 CONFIG_PINCTRL_MCP23S08_SPI=m
 CONFIG_PINCTRL_MCP23S08=m
 CONFIG_PINCTRL_SX150X=y
-# CONFIG_PINCTRL_CS42L43 is not set
+CONFIG_PINCTRL_CS42L43=m
 CONFIG_PINCTRL_MADERA=m
 CONFIG_PINCTRL_CS47L15=y
 CONFIG_PINCTRL_CS47L35=y
@@ -5051,6 +5095,7 @@ CONFIG_GPIO_CDEV=y
 # CONFIG_GPIO_CDEV_V1 is not set
 CONFIG_GPIO_GENERIC=m
 CONFIG_GPIO_REGMAP=m
+CONFIG_GPIO_SWNODE_UNDEFINED=y
 CONFIG_GPIO_MAX730X=m
 CONFIG_GPIO_IDIO_16=m
 
@@ -5164,6 +5209,13 @@ CONFIG_GPIO_VIRTIO=m
 CONFIG_GPIO_SIM=m
 # end of Virtual GPIO drivers
 
+#
+# GPIO Debugging utilities
+#
+# CONFIG_GPIO_SLOPPY_LOGIC_ANALYZER is not set
+# CONFIG_GPIO_VIRTUSER is not set
+# end of GPIO Debugging utilities
+
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -5207,6 +5259,7 @@ CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_MT6323=y
 CONFIG_POWER_RESET_RESTART=y
 CONFIG_POWER_RESET_TPS65086=y
+# CONFIG_POWER_SEQUENCING is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
@@ -5243,6 +5296,7 @@ CONFIG_AXP288_CHARGER=m
 CONFIG_AXP288_FUEL_GAUGE=m
 CONFIG_BATTERY_MAX17040=m
 CONFIG_BATTERY_MAX17042=m
+# CONFIG_BATTERY_MAX1720X is not set
 CONFIG_BATTERY_MAX1721X=m
 CONFIG_BATTERY_TWL4030_MADC=m
 CONFIG_CHARGER_88PM860X=m
@@ -5283,6 +5337,7 @@ CONFIG_CHARGER_RT9455=m
 # CONFIG_CHARGER_RT9471 is not set
 CONFIG_CHARGER_CROS_USBPD=m
 CONFIG_CHARGER_CROS_PCHG=m
+CONFIG_CHARGER_CROS_CONTROL=m
 CONFIG_CHARGER_BD99954=m
 CONFIG_CHARGER_WILCO=m
 CONFIG_BATTERY_SURFACE=m
@@ -5329,6 +5384,7 @@ CONFIG_SENSORS_ATXP1=m
 # CONFIG_SENSORS_CHIPCAP2 is not set
 CONFIG_SENSORS_CORSAIR_CPRO=m
 CONFIG_SENSORS_CORSAIR_PSU=m
+CONFIG_SENSORS_CROS_EC=m
 CONFIG_SENSORS_DRIVETEMP=m
 CONFIG_SENSORS_DS620=m
 CONFIG_SENSORS_DS1621=m
@@ -5470,10 +5526,14 @@ CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
 # CONFIG_SENSORS_MP2856 is not set
 CONFIG_SENSORS_MP2888=m
+# CONFIG_SENSORS_MP2891 is not set
 CONFIG_SENSORS_MP2975=m
+# CONFIG_SENSORS_MP2993 is not set
 # CONFIG_SENSORS_MP2975_REGULATOR is not set
 CONFIG_SENSORS_MP5023=m
+# CONFIG_SENSORS_MP5920 is not set
 # CONFIG_SENSORS_MP5990 is not set
+# CONFIG_SENSORS_MP9941 is not set
 # CONFIG_SENSORS_MPQ7932 is not set
 # CONFIG_SENSORS_MPQ8785 is not set
 CONFIG_SENSORS_PIM4328=m
@@ -5517,6 +5577,7 @@ CONFIG_SENSORS_SCH5627=m
 CONFIG_SENSORS_SCH5636=m
 CONFIG_SENSORS_STTS751=m
 # CONFIG_SENSORS_SURFACE_FAN is not set
+# CONFIG_SENSORS_SURFACE_TEMP is not set
 CONFIG_SENSORS_ADC128D818=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
@@ -5525,6 +5586,7 @@ CONFIG_SENSORS_INA209=m
 CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA238=m
 CONFIG_SENSORS_INA3221=m
+# CONFIG_SENSORS_SPD5118 is not set
 CONFIG_SENSORS_TC74=m
 CONFIG_SENSORS_THMC50=m
 CONFIG_SENSORS_TMP102=m
@@ -5565,6 +5627,7 @@ CONFIG_THERMAL=y
 CONFIG_THERMAL_NETLINK=y
 CONFIG_THERMAL_STATISTICS=y
 # CONFIG_THERMAL_DEBUGFS is not set
+# CONFIG_THERMAL_CORE_TESTING is not set
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
@@ -5856,6 +5919,8 @@ CONFIG_MFD_WM8350_I2C=y
 CONFIG_MFD_WM8994=m
 CONFIG_MFD_WCD934X=m
 # CONFIG_MFD_ATC260X_I2C is not set
+# CONFIG_MFD_CS40L50_I2C is not set
+# CONFIG_MFD_CS40L50_SPI is not set
 CONFIG_RAVE_SP_CORE=m
 # CONFIG_MFD_INTEL_M10_BMC_SPI is not set
 # CONFIG_MFD_INTEL_M10_BMC_PMCI is not set
@@ -6025,6 +6090,7 @@ CONFIG_CEC_CROS_EC=m
 CONFIG_CEC_GPIO=m
 CONFIG_CEC_SECO=m
 CONFIG_CEC_SECO_RC=y
+# CONFIG_USB_EXTRON_DA_HD_4K_PLUS_CEC is not set
 CONFIG_USB_PULSE8_CEC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # end of CEC support
@@ -6416,6 +6482,10 @@ CONFIG_VIDEO_CAFE_CCIC=m
 # Qualcomm media platform drivers
 #
 
+#
+# Raspberry Pi media platform drivers
+#
+
 #
 # Renesas media platform drivers
 #
@@ -6511,6 +6581,8 @@ CONFIG_VIDEO_CCS_PLL=m
 # CONFIG_VIDEO_ALVIUM_CSI2 is not set
 CONFIG_VIDEO_AR0521=m
 # CONFIG_VIDEO_GC0308 is not set
+# CONFIG_VIDEO_GC05A2 is not set
+# CONFIG_VIDEO_GC08A3 is not set
 # CONFIG_VIDEO_GC2145 is not set
 CONFIG_VIDEO_HI556=m
 CONFIG_VIDEO_HI846=m
@@ -6520,6 +6592,7 @@ CONFIG_VIDEO_IMX214=m
 CONFIG_VIDEO_IMX219=m
 CONFIG_VIDEO_IMX258=m
 CONFIG_VIDEO_IMX274=m
+# CONFIG_VIDEO_IMX283 is not set
 CONFIG_VIDEO_IMX290=m
 # CONFIG_VIDEO_IMX296 is not set
 CONFIG_VIDEO_IMX319=m
@@ -6972,6 +7045,7 @@ CONFIG_DRM_MIPI_DBI=m
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DEBUG_MM is not set
 CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_PANIC is not set
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set
 CONFIG_DRM_FBDEV_EMULATION=y
@@ -7016,6 +7090,7 @@ CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_CIK=y
 CONFIG_DRM_AMDGPU_USERPTR=y
+# CONFIG_DRM_AMD_ISP is not set
 # CONFIG_DRM_AMDGPU_WERROR is not set
 
 #
@@ -7056,6 +7131,7 @@ CONFIG_DRM_I915_DP_TUNNEL=y
 # drm/i915 Debugging
 #
 # CONFIG_DRM_I915_WERROR is not set
+# CONFIG_DRM_I915_REPLAY_GPU_HANGS_API is not set
 # CONFIG_DRM_I915_DEBUG is not set
 # CONFIG_DRM_I915_DEBUG_MMIO is not set
 # CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
@@ -7291,6 +7367,7 @@ CONFIG_BACKLIGHT_ADP8870=m
 CONFIG_BACKLIGHT_88PM860X=m
 CONFIG_BACKLIGHT_PCF50633=m
 CONFIG_BACKLIGHT_AAT2870=m
+# CONFIG_BACKLIGHT_LM3509 is not set
 CONFIG_BACKLIGHT_LM3630A=m
 CONFIG_BACKLIGHT_LM3639=m
 CONFIG_BACKLIGHT_LP855X=m
@@ -7353,10 +7430,10 @@ CONFIG_SND_MAX_CARDS=32
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_PROC_FS=y
 CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
 CONFIG_SND_CTL_FAST_LOOKUP=y
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_CTL_INPUT_VALIDATION is not set
+# CONFIG_SND_UTIMER is not set
 CONFIG_SND_VMASTER=y
 CONFIG_SND_DMA_SGBUF=y
 CONFIG_SND_CTL_LED=m
@@ -7489,6 +7566,7 @@ CONFIG_SND_HDA_CODEC_HDMI=m
 CONFIG_SND_HDA_CODEC_CIRRUS=m
 CONFIG_SND_HDA_CODEC_CS8409=m
 CONFIG_SND_HDA_CODEC_CONEXANT=m
+# CONFIG_SND_HDA_CODEC_SENARYTECH is not set
 CONFIG_SND_HDA_CODEC_CA0110=m
 CONFIG_SND_HDA_CODEC_CA0132=m
 CONFIG_SND_HDA_CODEC_CA0132_DSP=y
@@ -7564,6 +7642,7 @@ CONFIG_SND_SOC_AMD_ACP6x=m
 CONFIG_SND_SOC_AMD_YC_MACH=m
 CONFIG_SND_AMD_ACP_CONFIG=m
 CONFIG_SND_SOC_AMD_ACP_COMMON=m
+CONFIG_SND_SOC_ACPI_AMD_MATCH=m
 CONFIG_SND_SOC_AMD_ACP_PDM=m
 CONFIG_SND_SOC_AMD_ACP_LEGACY_COMMON=m
 CONFIG_SND_SOC_AMD_ACP_I2S=m
@@ -7576,6 +7655,7 @@ CONFIG_SND_AMD_ASOC_REMBRANDT=m
 CONFIG_SND_SOC_AMD_MACH_COMMON=m
 CONFIG_SND_SOC_AMD_LEGACY_MACH=m
 CONFIG_SND_SOC_AMD_SOF_MACH=m
+# CONFIG_SND_SOC_AMD_SOF_SDW_MACH is not set
 CONFIG_SND_SOC_AMD_RPL_ACP6x=m
 CONFIG_SND_SOC_AMD_ACP63_TOPLEVEL=m
 # CONFIG_SND_SOC_AMD_PS is not set
@@ -7615,24 +7695,10 @@ CONFIG_SND_SOC_IMG_SPDIF_IN=m
 CONFIG_SND_SOC_IMG_SPDIF_OUT=m
 CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m
 CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
-CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC_INTEL_CATPT=m
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
-# CONFIG_SND_SOC_INTEL_SKYLAKE is not set
-CONFIG_SND_SOC_INTEL_SKL=m
-CONFIG_SND_SOC_INTEL_APL=m
-CONFIG_SND_SOC_INTEL_KBL=m
-CONFIG_SND_SOC_INTEL_GLK=m
-# CONFIG_SND_SOC_INTEL_CNL is not set
-# CONFIG_SND_SOC_INTEL_CFL is not set
-# CONFIG_SND_SOC_INTEL_CML_H is not set
-# CONFIG_SND_SOC_INTEL_CML_LP is not set
-CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
-CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
-CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
-CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_AVS=m
 
@@ -7685,18 +7751,7 @@ CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 # CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
-CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
-CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
-CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
-CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m
-CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
-CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
-CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
-CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
-CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
-CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
-CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
 CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
@@ -7731,6 +7786,7 @@ CONFIG_SND_SOC_SOF_AMD_RENOIR=m
 # CONFIG_SND_SOC_SOF_AMD_REMBRANDT is not set
 CONFIG_SND_SOC_SOF_ACP_PROBES=m
 # CONFIG_SND_SOC_SOF_AMD_ACP63 is not set
+# CONFIG_SND_SOC_SOF_AMD_ACP70 is not set
 CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
 CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
@@ -7759,6 +7815,8 @@ CONFIG_SND_SOC_SOF_INTEL_MTL=m
 CONFIG_SND_SOC_SOF_METEORLAKE=m
 CONFIG_SND_SOC_SOF_INTEL_LNL=m
 CONFIG_SND_SOC_SOF_LUNARLAKE=m
+CONFIG_SND_SOC_SOF_INTEL_PTL=m
+CONFIG_SND_SOC_SOF_PANTHERLAKE=m
 CONFIG_SND_SOC_SOF_HDA_COMMON=m
 CONFIG_SND_SOC_SOF_HDA_GENERIC=m
 CONFIG_SND_SOC_SOF_HDA_MLINK=m
@@ -7807,6 +7865,7 @@ CONFIG_SND_SOC_AK4375=m
 CONFIG_SND_SOC_AK4458=m
 CONFIG_SND_SOC_AK4554=m
 CONFIG_SND_SOC_AK4613=m
+# CONFIG_SND_SOC_AK4619 is not set
 CONFIG_SND_SOC_AK4642=m
 CONFIG_SND_SOC_AK5386=m
 CONFIG_SND_SOC_AK5558=m
@@ -7862,6 +7921,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
+# CONFIG_SND_SOC_CS530X_I2C is not set
 CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
@@ -7870,13 +7930,13 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES7241=m
 CONFIG_SND_SOC_ES83XX_DSM_COMMON=m
+# CONFIG_SND_SOC_ES8311 is not set
 CONFIG_SND_SOC_ES8316=m
 CONFIG_SND_SOC_ES8326=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328_SPI=m
 CONFIG_SND_SOC_GTM601=m
-CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDAC_HDA=m
 CONFIG_SND_SOC_HDA=m
 CONFIG_SND_SOC_ICS43432=m
@@ -7933,8 +7993,7 @@ CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT1318_SDW=m
-CONFIG_SND_SOC_RT5514=m
-CONFIG_SND_SOC_RT5514_SPI=m
+CONFIG_SND_SOC_RT1320_SDW=m
 CONFIG_SND_SOC_RT5616=m
 CONFIG_SND_SOC_RT5631=m
 CONFIG_SND_SOC_RT5640=m
@@ -7942,7 +8001,6 @@ CONFIG_SND_SOC_RT5645=m
 CONFIG_SND_SOC_RT5651=m
 CONFIG_SND_SOC_RT5659=m
 CONFIG_SND_SOC_RT5660=m
-CONFIG_SND_SOC_RT5663=m
 CONFIG_SND_SOC_RT5670=m
 CONFIG_SND_SOC_RT5677=m
 CONFIG_SND_SOC_RT5677_SPI=m
@@ -8017,6 +8075,7 @@ CONFIG_SND_SOC_WCD_CLASSH=m
 CONFIG_SND_SOC_WCD9335=m
 CONFIG_SND_SOC_WCD_MBHC=m
 CONFIG_SND_SOC_WCD934X=m
+# CONFIG_SND_SOC_WCD937X_SDW is not set
 CONFIG_SND_SOC_WCD938X=m
 CONFIG_SND_SOC_WCD938X_SDW=m
 # CONFIG_SND_SOC_WCD939X_SDW is not set
@@ -8055,6 +8114,7 @@ CONFIG_SND_SOC_WSA883X=m
 CONFIG_SND_SOC_ZL38060=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MT6351=m
+# CONFIG_SND_SOC_MT6357 is not set
 CONFIG_SND_SOC_MT6358=m
 CONFIG_SND_SOC_MT6660=m
 CONFIG_SND_SOC_NAU8315=m
@@ -8072,6 +8132,7 @@ CONFIG_SND_SOC_LPASS_RX_MACRO=m
 CONFIG_SND_SOC_LPASS_TX_MACRO=m
 # end of CODEC drivers
 
+CONFIG_SND_SOC_SDW_UTILS=m
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_X86=y
@@ -8126,6 +8187,7 @@ CONFIG_HID_GLORIOUS=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
 CONFIG_HID_VIVALDI_COMMON=m
+# CONFIG_HID_GOODIX_SPI is not set
 CONFIG_HID_GOOGLE_HAMMER=m
 # CONFIG_HID_GOOGLE_STADIA_FF is not set
 CONFIG_HID_VIVALDI=m
@@ -8304,7 +8366,7 @@ CONFIG_USB_MON=m
 CONFIG_USB_C67X00_HCD=m
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DBGCAP=y
-CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PCI_RENESAS=m
 CONFIG_USB_XHCI_PLATFORM=m
 CONFIG_USB_EHCI_HCD=y
@@ -8751,7 +8813,6 @@ CONFIG_MS_BLOCK=m
 CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MEMSTICK_JMICRON_38X=m
 CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
 CONFIG_MEMSTICK_REALTEK_USB=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
@@ -8766,6 +8827,7 @@ CONFIG_LEDS_88PM860X=m
 CONFIG_LEDS_APU=m
 # CONFIG_LEDS_AW200XX is not set
 # CONFIG_LEDS_CHT_WCOVE is not set
+CONFIG_LEDS_CROS_EC=m
 CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_LM3532=m
 CONFIG_LEDS_LM3533=m
@@ -8806,10 +8868,12 @@ CONFIG_LEDS_IS31FL319X=m
 # LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
 #
 CONFIG_LEDS_BLINKM=m
+# CONFIG_LEDS_BLINKM_MULTICOLOR is not set
 CONFIG_LEDS_MLXCPLD=m
 CONFIG_LEDS_MLXREG=m
 CONFIG_LEDS_USER=m
 CONFIG_LEDS_NIC78BX=m
+# CONFIG_LEDS_SPI_BYTE is not set
 CONFIG_LEDS_TI_LMU_COMMON=m
 CONFIG_LEDS_LM36274=m
 CONFIG_LEDS_TPS6105X=m
@@ -8825,6 +8889,7 @@ CONFIG_LEDS_SGM3140=m
 #
 # RGB LED drivers
 #
+# CONFIG_LEDS_KTD202X is not set
 CONFIG_LEDS_PWM_MULTICOLOR=m
 
 #
@@ -8851,6 +8916,7 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_PATTERN=m
 CONFIG_LEDS_TRIGGER_TTY=m
+# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set
 
 #
 # Simple LED drivers
@@ -9008,6 +9074,7 @@ CONFIG_RTC_DRV_EM3027=m
 CONFIG_RTC_DRV_RV3028=m
 CONFIG_RTC_DRV_RV3032=m
 CONFIG_RTC_DRV_RV8803=m
+# CONFIG_RTC_DRV_SD2405AL is not set
 CONFIG_RTC_DRV_SD3078=m
 
 #
@@ -9102,6 +9169,7 @@ CONFIG_INTEL_IOATDMA=m
 CONFIG_PLX_DMA=m
 # CONFIG_XILINX_DMA is not set
 # CONFIG_XILINX_XDMA is not set
+# CONFIG_AMD_QDMA is not set
 CONFIG_AMD_PTDMA=m
 CONFIG_QCOM_HIDMA_MGMT=m
 CONFIG_QCOM_HIDMA=m
@@ -9208,6 +9276,7 @@ CONFIG_MLX5_VDPA_NET=m
 CONFIG_VP_VDPA=m
 CONFIG_ALIBABA_ENI_VDPA=m
 # CONFIG_SNET_VDPA is not set
+# CONFIG_OCTEONEP_VDPA is not set
 CONFIG_VHOST_IOTLB=m
 CONFIG_VHOST_RING=m
 CONFIG_VHOST_TASK=y
@@ -9460,7 +9529,6 @@ CONFIG_MOST_COMPONENTS=m
 CONFIG_MOST_NET=m
 CONFIG_MOST_VIDEO=m
 CONFIG_MOST_I2C=m
-CONFIG_KS7010=m
 CONFIG_GREYBUS_AUDIO=m
 CONFIG_GREYBUS_AUDIO_APB_CODEC=m
 CONFIG_GREYBUS_BOOTROM=m
@@ -9523,6 +9591,7 @@ CONFIG_WILCO_EC=m
 CONFIG_WILCO_EC_DEBUGFS=m
 CONFIG_WILCO_EC_EVENTS=m
 CONFIG_WILCO_EC_TELEMETRY=m
+# CONFIG_CZNIC_PLATFORMS is not set
 CONFIG_MELLANOX_PLATFORM=y
 CONFIG_MLXREG_HOTPLUG=m
 CONFIG_MLXREG_IO=m
@@ -9579,6 +9648,7 @@ CONFIG_DCDBAS=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_RBU=m
 CONFIG_DELL_RBTN=m
+CONFIG_DELL_PC=m
 CONFIG_DELL_SMBIOS=m
 CONFIG_DELL_SMBIOS_WMI=y
 CONFIG_DELL_SMBIOS_SMM=y
@@ -9892,6 +9962,7 @@ CONFIG_EXTCON_GPIO=m
 CONFIG_EXTCON_INTEL_INT3496=m
 CONFIG_EXTCON_INTEL_CHT_WC=m
 CONFIG_EXTCON_INTEL_MRFLD=m
+# CONFIG_EXTCON_LC824206XA is not set
 CONFIG_EXTCON_MAX14577=m
 CONFIG_EXTCON_MAX3355=m
 CONFIG_EXTCON_MAX77693=m
@@ -9920,6 +9991,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 CONFIG_IIO_SW_DEVICE=m
 CONFIG_IIO_SW_TRIGGER=m
 CONFIG_IIO_TRIGGERED_EVENT=m
+CONFIG_IIO_BACKEND=m
 
 #
 # Accelerometers
@@ -9938,6 +10010,8 @@ CONFIG_ADXL367_I2C=m
 CONFIG_ADXL372=m
 CONFIG_ADXL372_SPI=m
 CONFIG_ADXL372_I2C=m
+# CONFIG_ADXL380_SPI is not set
+# CONFIG_ADXL380_I2C is not set
 CONFIG_BMA220=m
 CONFIG_BMA400=m
 CONFIG_BMA400_I2C=m
@@ -9989,7 +10063,9 @@ CONFIG_STK8BA50=m
 # Analog to digital converters
 #
 CONFIG_AD_SIGMA_DELTA=m
+# CONFIG_AD4000 is not set
 # CONFIG_AD4130 is not set
+# CONFIG_AD4695 is not set
 CONFIG_AD7091R=m
 CONFIG_AD7091R5=m
 # CONFIG_AD7091R8 is not set
@@ -10001,6 +10077,7 @@ CONFIG_AD7280=m
 CONFIG_AD7291=m
 CONFIG_AD7292=m
 CONFIG_AD7298=m
+# CONFIG_AD7380 is not set
 CONFIG_AD7476=m
 CONFIG_AD7606=m
 CONFIG_AD7606_IFACE_PARALLEL=m
@@ -10016,7 +10093,6 @@ CONFIG_AD7923=m
 CONFIG_AD7949=m
 CONFIG_AD799X=m
 # CONFIG_AD9467 is not set
-# CONFIG_ADI_AXI_ADC is not set
 CONFIG_AXP20X_ADC=m
 CONFIG_AXP288_ADC=m
 CONFIG_CC10001_ADC=m
@@ -10046,10 +10122,12 @@ CONFIG_MCP320X=m
 CONFIG_MCP3422=m
 # CONFIG_MCP3564 is not set
 CONFIG_MCP3911=m
+# CONFIG_MEDIATEK_MT6359_AUXADC is not set
 CONFIG_MEDIATEK_MT6360_ADC=m
 CONFIG_MEN_Z188_ADC=m
 CONFIG_MP2629_ADC=m
 CONFIG_NAU7802=m
+# CONFIG_PAC1921 is not set
 # CONFIG_PAC1934 is not set
 CONFIG_PALMAS_GPADC=m
 CONFIG_QCOM_VADC_COMMON=m
@@ -10066,6 +10144,7 @@ CONFIG_TI_ADC108S102=m
 CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
+# CONFIG_TI_ADS1119 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_TI_ADS1298 is not set
@@ -10122,6 +10201,7 @@ CONFIG_BME680=m
 CONFIG_BME680_I2C=m
 CONFIG_BME680_SPI=m
 CONFIG_CCS811=m
+# CONFIG_ENS160 is not set
 CONFIG_IAQCORE=m
 CONFIG_PMS7003=m
 CONFIG_SCD30_CORE=m
@@ -10183,7 +10263,6 @@ CONFIG_AD5593R=m
 CONFIG_AD5504=m
 CONFIG_AD5624R_SPI=m
 # CONFIG_AD9739A is not set
-# CONFIG_ADI_AXI_DAC is not set
 CONFIG_LTC2688=m
 CONFIG_AD5686=m
 CONFIG_AD5686_SPI=m
@@ -10202,6 +10281,7 @@ CONFIG_DPOT_DAC=m
 CONFIG_DS4424=m
 CONFIG_LTC1660=m
 CONFIG_LTC2632=m
+# CONFIG_LTC2664 is not set
 CONFIG_M62332=m
 CONFIG_MAX517=m
 # CONFIG_MAX5522 is not set
@@ -10298,6 +10378,7 @@ CONFIG_MAX30102=m
 #
 CONFIG_AM2315=m
 CONFIG_DHT11=m
+# CONFIG_ENS210 is not set
 CONFIG_HDC100X=m
 CONFIG_HDC2010=m
 # CONFIG_HDC3020 is not set
@@ -10358,6 +10439,7 @@ CONFIG_APDS9300=m
 # CONFIG_APDS9306 is not set
 CONFIG_APDS9960=m
 CONFIG_AS73211=m
+# CONFIG_BH1745 is not set
 CONFIG_BH1750=m
 CONFIG_BH1780=m
 CONFIG_CM32181=m
@@ -10407,6 +10489,7 @@ CONFIG_US5182D=m
 CONFIG_VCNL4000=m
 CONFIG_VCNL4035=m
 CONFIG_VEML6030=m
+# CONFIG_VEML6040 is not set
 CONFIG_VEML6070=m
 # CONFIG_VEML6075 is not set
 CONFIG_VL6180=m
@@ -10514,6 +10597,7 @@ CONFIG_MS5611=m
 CONFIG_MS5611_I2C=m
 CONFIG_MS5611_SPI=m
 CONFIG_MS5637=m
+# CONFIG_SDP500 is not set
 CONFIG_IIO_ST_PRESS=m
 CONFIG_IIO_ST_PRESS_I2C=m
 CONFIG_IIO_ST_PRESS_SPI=m
@@ -10534,6 +10618,7 @@ CONFIG_AS3935=m
 # Proximity and distance sensors
 #
 CONFIG_CROS_EC_MKBP_PROXIMITY=m
+# CONFIG_HX9023S is not set
 # CONFIG_IRSD200 is not set
 CONFIG_ISL29501=m
 CONFIG_LIDAR_LITE_V2=m
@@ -10549,6 +10634,7 @@ CONFIG_SX9500=m
 CONFIG_SRF08=m
 CONFIG_VCNL3020=m
 CONFIG_VL53L0X_I2C=m
+# CONFIG_AW96103 is not set
 # end of Proximity and distance sensors
 
 #
@@ -10599,6 +10685,7 @@ CONFIG_PWM_CRC=y
 CONFIG_PWM_CROS_EC=m
 CONFIG_PWM_DWC_CORE=m
 CONFIG_PWM_DWC=m
+# CONFIG_PWM_GPIO is not set
 CONFIG_PWM_IQS620A=m
 CONFIG_PWM_LP3943=m
 CONFIG_PWM_LPSS=y
@@ -10611,6 +10698,7 @@ CONFIG_PWM_TWL_LED=m
 #
 # IRQ chip support
 #
+# CONFIG_LAN966X_OIC is not set
 CONFIG_MADERA_IRQ=m
 # end of IRQ chip support
 
@@ -10666,6 +10754,7 @@ CONFIG_RAS=y
 CONFIG_RAS_CEC=y
 # CONFIG_RAS_CEC_DEBUG is not set
 CONFIG_AMD_ATL=m
+CONFIG_AMD_ATL_PRM=y
 CONFIG_RAS_FMPM=m
 CONFIG_USB4=m
 # CONFIG_USB4_DEBUGFS_WRITE is not set
@@ -10890,9 +10979,9 @@ CONFIG_OVERLAY_FS_XINO_AUTO=y
 #
 CONFIG_NETFS_SUPPORT=m
 CONFIG_NETFS_STATS=y
+# CONFIG_NETFS_DEBUG is not set
 CONFIG_FSCACHE=y
 CONFIG_FSCACHE_STATS=y
-# CONFIG_FSCACHE_DEBUG is not set
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_ERROR_INJECTION is not set
@@ -10949,6 +11038,7 @@ CONFIG_HUGETLBFS=y
 # CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set
 CONFIG_HUGETLB_PAGE=y
 CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y
+CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_EFIVAR_FS=y
@@ -11046,6 +11136,7 @@ CONFIG_EROFS_FS=m
 CONFIG_EROFS_FS_XATTR=y
 CONFIG_EROFS_FS_POSIX_ACL=y
 CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_BACKED_BY_FILE=y
 CONFIG_EROFS_FS_ZIP=y
 # CONFIG_EROFS_FS_ZIP_LZMA is not set
 # CONFIG_EROFS_FS_ZIP_DEFLATE is not set
@@ -11090,6 +11181,7 @@ CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
+# CONFIG_NFS_LOCALIO is not set
 CONFIG_NFS_V4_2_SSC_HELPER=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
@@ -11118,6 +11210,7 @@ CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_CIFS_SWN_UPCALL=y
 # CONFIG_CIFS_SMB_DIRECT is not set
 CONFIG_CIFS_FSCACHE=y
+# CONFIG_CIFS_COMPRESSION is not set
 CONFIG_SMB_SERVER=m
 CONFIG_SMB_SERVER_SMBDIRECT=y
 CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
@@ -11205,6 +11298,9 @@ CONFIG_ENCRYPTED_KEYS=y
 CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_PROC_MEM_ALWAYS_FORCE=y
+# CONFIG_PROC_MEM_FORCE_PTRACE is not set
+# CONFIG_PROC_MEM_NO_FORCE is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
@@ -11246,6 +11342,7 @@ CONFIG_SECURITY_YAMA=y
 CONFIG_SECURITY_SAFESETID=y
 # CONFIG_SECURITY_LOCKDOWN_LSM is not set
 CONFIG_SECURITY_LANDLOCK=y
+# CONFIG_SECURITY_IPE is not set
 CONFIG_INTEGRITY=y
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
@@ -11369,7 +11466,6 @@ CONFIG_CRYPTO_ECC=y
 CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 CONFIG_CRYPTO_ECRDSA=m
-CONFIG_CRYPTO_SM2=m
 CONFIG_CRYPTO_CURVE25519=m
 # end of Public-key cryptography
 
@@ -11680,7 +11776,9 @@ CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_ARM64=y
 CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_RISCV=y
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_BCJ=y
 CONFIG_XZ_DEC_TEST=m
@@ -11710,7 +11808,7 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
-CONFIG_DMA_OPS=y
+CONFIG_DMA_OPS_HELPERS=y
 CONFIG_NEED_SG_DMA_FLAGS=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEED_DMA_MAP_STATE=y
@@ -11735,13 +11833,14 @@ CONFIG_CLZ_TAB=y
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
 CONFIG_SIGNATURE=y
-CONFIG_DIMLIB=m
+CONFIG_DIMLIB=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_GENERIC_VDSO_TIME_NS=y
 CONFIG_GENERIC_VDSO_OVERFLOW_PROTECT=y
+CONFIG_VDSO_GETRANDOM=y
 CONFIG_FONT_SUPPORT=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
@@ -12129,6 +12228,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_MIN_HEAP is not set
 # CONFIG_TEST_DIV64 is not set
+# CONFIG_TEST_MULDIV64 is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_TEST_REF_TRACKER is not set
 # CONFIG_RBTREE_TEST is not set
@@ -12151,7 +12251,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_BITOPS is not set
 # CONFIG_TEST_VMALLOC is not set
-# CONFIG_TEST_USER_COPY is not set
 CONFIG_TEST_BPF=m
 CONFIG_TEST_BLACKHOLE_DEV=m
 # CONFIG_FIND_BIT_BENCHMARK is not set

From 544e5626968909126da72b604b8fa6d614079a40 Mon Sep 17 00:00:00 2001
From: mr-toolcraft <169016260+mr-toolcraft@users.noreply.github.com>
Date: Mon, 28 Oct 2024 13:19:58 +0100
Subject: [PATCH 037/107] switch to mainline uboot 2024.10

---
 config/boards/radxa-zero3.csc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/config/boards/radxa-zero3.csc b/config/boards/radxa-zero3.csc
index 1a462efce33e..2efe8084d8a9 100644
--- a/config/boards/radxa-zero3.csc
+++ b/config/boards/radxa-zero3.csc
@@ -32,10 +32,11 @@ function post_family_config__radxa-zero3_use_vendor_uboot() {
 	}
 }
 
-function post_family_config_branch_edge__radxa-zero3_use_kwiboo_uboot() {
+function post_family_config_branch_edge__radxa-zero3_use_mainline_uboot() {
 	BOOTCONFIG="radxa-zero-3-rk3566_defconfig"
-	BOOTSOURCE='https://github.com/Kwiboo/u-boot-rockchip.git'
-	BOOTBRANCH='branch:rk3xxx-2024.07'
+	BOOTSOURCE="https://github.com/u-boot/u-boot"
+	BOOTBRANCH="tag:v2024.10"
+	BOOTPATCHDIR="v2024.10"
 	BOOTPATCHDIR="u-boot-zero3" # Empty
 
 	UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"

From 5dd1cd63ce4a57f19abd7c96917b9659b6a16563 Mon Sep 17 00:00:00 2001
From: mr-toolcraft <169016260+mr-toolcraft@users.noreply.github.com>
Date: Tue, 29 Oct 2024 05:48:48 +0100
Subject: [PATCH 038/107] Remove duplicate `BOOTPATCHDIR`

Co-authored-by: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
---
 config/boards/radxa-zero3.csc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/boards/radxa-zero3.csc b/config/boards/radxa-zero3.csc
index 2efe8084d8a9..f0cbc950bb35 100644
--- a/config/boards/radxa-zero3.csc
+++ b/config/boards/radxa-zero3.csc
@@ -37,7 +37,6 @@ function post_family_config_branch_edge__radxa-zero3_use_mainline_uboot() {
 	BOOTSOURCE="https://github.com/u-boot/u-boot"
 	BOOTBRANCH="tag:v2024.10"
 	BOOTPATCHDIR="v2024.10"
-	BOOTPATCHDIR="u-boot-zero3" # Empty
 
 	UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
 

From 52548e408aad1b47c150ee538366418c35df91bb Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Sun, 3 Nov 2024 20:59:59 +0100
Subject: [PATCH 039/107] GitHub Actions: add log cleaner, adjust names, fix
 labelling on approve

---
 .github/workflows/build-train.yml             | 22 ---------------
 .github/workflows/clean-workflow-logs.yml     | 27 +++++++++++++++++++
 .../workflows/issue-welcome-first-time.yml    | 24 +++++++++++++++++
 .github/workflows/merge-announce.yml          |  2 +-
 .github/workflows/pr-label-on-approved.yml    |  4 +--
 .github/workflows/pr-welcome-first-time.yml   | 23 ++++++++++++++++
 ...d-board-list.yml => update-board-list.yml} |  4 +--
 7 files changed, 79 insertions(+), 27 deletions(-)
 delete mode 100644 .github/workflows/build-train.yml
 create mode 100644 .github/workflows/clean-workflow-logs.yml
 create mode 100644 .github/workflows/issue-welcome-first-time.yml
 create mode 100644 .github/workflows/pr-welcome-first-time.yml
 rename .github/workflows/{build-board-list.yml => update-board-list.yml} (75%)

diff --git a/.github/workflows/build-train.yml b/.github/workflows/build-train.yml
deleted file mode 100644
index 4f3204fbcc94..000000000000
--- a/.github/workflows/build-train.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Run Build Train on config changes
-run-name: Run build train - Pushed commit "${{ github.event.push.head_commit.message }}"
-
-on:
-  push:
-    branches:
-      - "main"
-    paths:
-      - "config/*.config"
-
-jobs:
-  build-train-dispatch:
-    name: Send dispatch
-    if: ${{ github.repository_owner == 'Armbian' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.ACCESS_TOKEN }}
-          repository: armbian/os
-          event-type: "Repository update"
diff --git a/.github/workflows/clean-workflow-logs.yml b/.github/workflows/clean-workflow-logs.yml
new file mode 100644
index 000000000000..bafb106a564b
--- /dev/null
+++ b/.github/workflows/clean-workflow-logs.yml
@@ -0,0 +1,27 @@
+name: Clean Workflow Logs
+
+on:
+  schedule:
+    - cron: "0 0 * * 1"  # Runs "At 00:00 on Monday." (see https://crontab.guru)
+
+  workflow_dispatch:
+    inputs:
+      runs_older_than:
+        description: "The amount of days old to delete"
+        default: "21"
+        required: false
+
+env:
+  SCHEDULED_RUNS_OLDER_THAN: "21"
+  SCHEDULED_RUNS_TO_KEEP: "0"
+
+jobs:
+  clean-logs:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    steps:
+      - uses: igorjs/gh-actions-clean-workflow@v6
+        with:
+          runs_older_than: ${{ github.event.inputs.runs_older_than || env.SCHEDULED_RUNS_OLDER_THAN }}
+          runs_to_keep: ${{ github.event.inputs.runs_to_keep || env.SCHEDULED_RUNS_TO_KEEP }}
diff --git a/.github/workflows/issue-welcome-first-time.yml b/.github/workflows/issue-welcome-first-time.yml
new file mode 100644
index 000000000000..16bf8e4b2d77
--- /dev/null
+++ b/.github/workflows/issue-welcome-first-time.yml
@@ -0,0 +1,24 @@
+name: "Welcome first-time issue contributor"
+
+on:
+  issues:
+    types: opened
+
+jobs:
+  welcome-first-time-contributor:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: plbstl/first-contribution@v3
+        with:
+          labels: "Good first issue"
+          issue-opened-msg: |
+            ### Hey @{fc-author} !
+
+            Looks like it's your first time interacting with Armbian here on GitHub.
+
+            Welcome and thank you for taking the time to report an issue :heart:.
+
+            Don't forget to star :star: the repo.
diff --git a/.github/workflows/merge-announce.yml b/.github/workflows/merge-announce.yml
index 7b53e680b795..97021bdcd15a 100644
--- a/.github/workflows/merge-announce.yml
+++ b/.github/workflows/merge-announce.yml
@@ -1,4 +1,4 @@
-name: push
+name: "Announce PR merge to Discord"
 
 on:
   push:
diff --git a/.github/workflows/pr-label-on-approved.yml b/.github/workflows/pr-label-on-approved.yml
index 07cdb390905d..deb8082fb7e2 100644
--- a/.github/workflows/pr-label-on-approved.yml
+++ b/.github/workflows/pr-label-on-approved.yml
@@ -1,8 +1,8 @@
-on: pull_request_target
+on: pull_request_review
 name: Label approved pull requests
 jobs:
   labelWhenApproved:
-    if: github.event.review.state == 'approved'
+    if: ${{ github.repository_owner == 'armbian' }}
     name: Label when approved
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/pr-welcome-first-time.yml b/.github/workflows/pr-welcome-first-time.yml
new file mode 100644
index 000000000000..b401c5ec5072
--- /dev/null
+++ b/.github/workflows/pr-welcome-first-time.yml
@@ -0,0 +1,23 @@
+name: "Welcome first-time PR contributor"
+
+on:
+  pull_request_target:
+    types: opened
+
+jobs:
+  welcome-first-time-contributor:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: plbstl/first-contribution@v3
+        with:
+          pr-opened-msg: |
+            ### Hey @{fc-author} !
+
+            Looks like it's your first pull reqests to Armbian codebase.
+
+            Welcome and thank you for contributing :heart: :heart: :heart:.
+
+            Don't forget to star :star: the repo.
diff --git a/.github/workflows/build-board-list.yml b/.github/workflows/update-board-list.yml
similarity index 75%
rename from .github/workflows/build-board-list.yml
rename to .github/workflows/update-board-list.yml
index 0dac92bc98e3..ed77ccd19a50 100644
--- a/.github/workflows/build-board-list.yml
+++ b/.github/workflows/update-board-list.yml
@@ -1,5 +1,5 @@
-name: Update board list at armbian/os
-run-name: Update board list at armbian/os - Pushed commit "${{ github.event.push.head_commit.message }}"
+name: Update Board Lists
+run-name: Update board list at armbian/os
 
 on:
   push:

From 68c758f4a168c24f15b6c7e1c02585122fadac72 Mon Sep 17 00:00:00 2001
From: igorpecovnik <6281704+igorpecovnik@users.noreply.github.com>
Date: Sun, 3 Nov 2024 19:34:38 +0000
Subject: [PATCH 040/107] tools: Bump `SHELLFMT_VERSION` from 3.9.0 to 3.10.0

---
 lib/tools/shellfmt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tools/shellfmt.sh b/lib/tools/shellfmt.sh
index e772560fefc9..7031759e0f22 100755
--- a/lib/tools/shellfmt.sh
+++ b/lib/tools/shellfmt.sh
@@ -7,7 +7,7 @@
 # This file is a part of the Armbian Build Framework
 # https://github.com/armbian/build/
 
-SHELLFMT_VERSION=${SHELLFMT_VERSION:-3.9.0} # https://github.com/mvdan/sh/releases/
+SHELLFMT_VERSION=${SHELLFMT_VERSION:-3.10.0} # https://github.com/mvdan/sh/releases/
 
 SRC="$(
 	cd "$(dirname "$0")/../.."

From d7a6047ceae60bca9413b97d7c57240d50633a96 Mon Sep 17 00:00:00 2001
From: Julian Sikorski <belegdol+github@gmail.com>
Date: Mon, 4 Nov 2024 08:04:54 +0000
Subject: [PATCH 041/107] Update odroidxu4-current to 6.6.59

---
 .../odroidxu4-6.6/patch-6.6.54-55.patch       | 19054 ++++++++++++++++
 .../odroidxu4-6.6/patch-6.6.55-56.patch       |   101 +
 .../odroidxu4-6.6/patch-6.6.56-57.patch       | 16701 ++++++++++++++
 .../odroidxu4-6.6/patch-6.6.57-58.patch       |  4422 ++++
 .../odroidxu4-6.6/patch-6.6.58-59.patch       | 10051 ++++++++
 5 files changed, 50329 insertions(+)
 create mode 100644 patch/kernel/archive/odroidxu4-6.6/patch-6.6.54-55.patch
 create mode 100644 patch/kernel/archive/odroidxu4-6.6/patch-6.6.55-56.patch
 create mode 100644 patch/kernel/archive/odroidxu4-6.6/patch-6.6.56-57.patch
 create mode 100644 patch/kernel/archive/odroidxu4-6.6/patch-6.6.57-58.patch
 create mode 100644 patch/kernel/archive/odroidxu4-6.6/patch-6.6.58-59.patch

diff --git a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.54-55.patch b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.54-55.patch
new file mode 100644
index 000000000000..e5fd421f282e
--- /dev/null
+++ b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.54-55.patch
@@ -0,0 +1,19054 @@
+diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
+index a7fe1138973611..d83a3f47e20074 100644
+--- a/Documentation/admin-guide/kernel-parameters.txt
++++ b/Documentation/admin-guide/kernel-parameters.txt
+@@ -4639,6 +4639,16 @@
+ 	printk.time=	Show timing data prefixed to each printk message line
+ 			Format: <bool>  (1/Y/y=enable, 0/N/n=disable)
+ 
++	proc_mem.force_override= [KNL]
++			Format: {always | ptrace | never}
++			Traditionally /proc/pid/mem allows memory permissions to be
++			overridden without restrictions. This option may be set to
++			restrict that. Can be one of:
++			- 'always': traditional behavior always allows mem overrides.
++			- 'ptrace': only allow mem overrides for active ptracers.
++			- 'never':  never allow mem overrides.
++			If not specified, default is the CONFIG_PROC_MEM_* choice.
++
+ 	processor.max_cstate=	[HW,ACPI]
+ 			Limit processor to maximum C-state
+ 			max_cstate=9 overrides any DMI blacklist limit.
+diff --git a/Documentation/arch/arm64/silicon-errata.rst b/Documentation/arch/arm64/silicon-errata.rst
+index 3084f5cf5e40db..3cf806733083c7 100644
+--- a/Documentation/arch/arm64/silicon-errata.rst
++++ b/Documentation/arch/arm64/silicon-errata.rst
+@@ -141,6 +141,8 @@ stable kernels.
+ +----------------+-----------------+-----------------+-----------------------------+
+ | ARM            | Cortex-A715     | #2645198        | ARM64_ERRATUM_2645198       |
+ +----------------+-----------------+-----------------+-----------------------------+
++| ARM            | Cortex-A715     | #3456084        | ARM64_ERRATUM_3194386       |
+++----------------+-----------------+-----------------+-----------------------------+
+ | ARM            | Cortex-A720     | #3456091        | ARM64_ERRATUM_3194386       |
+ +----------------+-----------------+-----------------+-----------------------------+
+ | ARM            | Cortex-A725     | #3456106        | ARM64_ERRATUM_3194386       |
+@@ -177,6 +179,8 @@ stable kernels.
+ +----------------+-----------------+-----------------+-----------------------------+
+ | ARM            | Neoverse-N2     | #3324339        | ARM64_ERRATUM_3194386       |
+ +----------------+-----------------+-----------------+-----------------------------+
++| ARM            | Neoverse-N3     | #3456111        | ARM64_ERRATUM_3194386       |
+++----------------+-----------------+-----------------+-----------------------------+
+ | ARM            | Neoverse-V1     | #3324341        | ARM64_ERRATUM_3194386       |
+ +----------------+-----------------+-----------------+-----------------------------+
+ | ARM            | Neoverse-V2     | #3324336        | ARM64_ERRATUM_3194386       |
+@@ -280,3 +284,5 @@ stable kernels.
+ +----------------+-----------------+-----------------+-----------------------------+
+ | Microsoft      | Azure Cobalt 100| #2253138        | ARM64_ERRATUM_2253138       |
+ +----------------+-----------------+-----------------+-----------------------------+
++| Microsoft      | Azure Cobalt 100| #3324339        | ARM64_ERRATUM_3194386       |
+++----------------+-----------------+-----------------+-----------------------------+
+diff --git a/Documentation/devicetree/bindings/net/xlnx,axi-ethernet.yaml b/Documentation/devicetree/bindings/net/xlnx,axi-ethernet.yaml
+index 1d33d80af11c3c..652d696bc9e90b 100644
+--- a/Documentation/devicetree/bindings/net/xlnx,axi-ethernet.yaml
++++ b/Documentation/devicetree/bindings/net/xlnx,axi-ethernet.yaml
+@@ -34,6 +34,7 @@ properties:
+       and length of the AXI DMA controller IO space, unless
+       axistream-connected is specified, in which case the reg
+       attribute of the node referenced by it is used.
++    minItems: 1
+     maxItems: 2
+ 
+   interrupts:
+@@ -165,7 +166,7 @@ examples:
+         clock-names = "s_axi_lite_clk", "axis_clk", "ref_clk", "mgt_clk";
+         clocks = <&axi_clk>, <&axi_clk>, <&pl_enet_ref_clk>, <&mgt_clk>;
+         phy-mode = "mii";
+-        reg = <0x00 0x40000000 0x00 0x40000>;
++        reg = <0x40000000 0x40000>;
+         xlnx,rxcsum = <0x2>;
+         xlnx,rxmem = <0x800>;
+         xlnx,txcsum = <0x2>;
+diff --git a/Makefile b/Makefile
+index 1e382bacd8eac0..6e297758842d9c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ VERSION = 6
+ PATCHLEVEL = 6
+-SUBLEVEL = 54
++SUBLEVEL = 55
+ EXTRAVERSION =
+ NAME = Hurr durr I'ma ninja sloth
+ 
+diff --git a/arch/arm/crypto/aes-ce-glue.c b/arch/arm/crypto/aes-ce-glue.c
+index b668c97663ec0c..f5b66f4cf45d96 100644
+--- a/arch/arm/crypto/aes-ce-glue.c
++++ b/arch/arm/crypto/aes-ce-glue.c
+@@ -711,7 +711,7 @@ static int __init aes_init(void)
+ 		algname = aes_algs[i].base.cra_name + 2;
+ 		drvname = aes_algs[i].base.cra_driver_name + 2;
+ 		basename = aes_algs[i].base.cra_driver_name;
+-		simd = simd_skcipher_create_compat(algname, drvname, basename);
++		simd = simd_skcipher_create_compat(aes_algs + i, algname, drvname, basename);
+ 		err = PTR_ERR(simd);
+ 		if (IS_ERR(simd))
+ 			goto unregister_simds;
+diff --git a/arch/arm/crypto/aes-neonbs-glue.c b/arch/arm/crypto/aes-neonbs-glue.c
+index f00f042ef3570e..0ca94b90bc4ec5 100644
+--- a/arch/arm/crypto/aes-neonbs-glue.c
++++ b/arch/arm/crypto/aes-neonbs-glue.c
+@@ -539,7 +539,7 @@ static int __init aes_init(void)
+ 		algname = aes_algs[i].base.cra_name + 2;
+ 		drvname = aes_algs[i].base.cra_driver_name + 2;
+ 		basename = aes_algs[i].base.cra_driver_name;
+-		simd = simd_skcipher_create_compat(algname, drvname, basename);
++		simd = simd_skcipher_create_compat(aes_algs + i, algname, drvname, basename);
+ 		err = PTR_ERR(simd);
+ 		if (IS_ERR(simd))
+ 			goto unregister_simds;
+diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
+index 5ea7b331967108..eab866d6903347 100644
+--- a/arch/arm64/Kconfig
++++ b/arch/arm64/Kconfig
+@@ -191,7 +191,8 @@ config ARM64
+ 	select HAVE_DMA_CONTIGUOUS
+ 	select HAVE_DYNAMIC_FTRACE
+ 	select HAVE_DYNAMIC_FTRACE_WITH_ARGS \
+-		if $(cc-option,-fpatchable-function-entry=2)
++		if (GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS || \
++		    CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS)
+ 	select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS \
+ 		if DYNAMIC_FTRACE_WITH_ARGS && DYNAMIC_FTRACE_WITH_CALL_OPS
+ 	select HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS \
+@@ -262,12 +263,10 @@ config CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS
+ 	def_bool CC_IS_CLANG
+ 	# https://github.com/ClangBuiltLinux/linux/issues/1507
+ 	depends on AS_IS_GNU || (AS_IS_LLVM && (LD_IS_LLD || LD_VERSION >= 23600))
+-	select HAVE_DYNAMIC_FTRACE_WITH_ARGS
+ 
+ config GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS
+ 	def_bool CC_IS_GCC
+ 	depends on $(cc-option,-fpatchable-function-entry=2)
+-	select HAVE_DYNAMIC_FTRACE_WITH_ARGS
+ 
+ config 64BIT
+ 	def_bool y
+@@ -1080,6 +1079,7 @@ config ARM64_ERRATUM_3194386
+ 	  * ARM Cortex-A78C erratum 3324346
+ 	  * ARM Cortex-A78C erratum 3324347
+ 	  * ARM Cortex-A710 erratam 3324338
++	  * ARM Cortex-A715 errartum 3456084
+ 	  * ARM Cortex-A720 erratum 3456091
+ 	  * ARM Cortex-A725 erratum 3456106
+ 	  * ARM Cortex-X1 erratum 3324344
+@@ -1090,6 +1090,7 @@ config ARM64_ERRATUM_3194386
+ 	  * ARM Cortex-X925 erratum 3324334
+ 	  * ARM Neoverse-N1 erratum 3324349
+ 	  * ARM Neoverse N2 erratum 3324339
++	  * ARM Neoverse-N3 erratum 3456111
+ 	  * ARM Neoverse-V1 erratum 3324341
+ 	  * ARM Neoverse V2 erratum 3324336
+ 	  * ARM Neoverse-V3 erratum 3312417
+diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h
+index 5a7dfeb8e8eb55..488f8e75134959 100644
+--- a/arch/arm64/include/asm/cputype.h
++++ b/arch/arm64/include/asm/cputype.h
+@@ -94,6 +94,7 @@
+ #define ARM_CPU_PART_NEOVERSE_V3	0xD84
+ #define ARM_CPU_PART_CORTEX_X925	0xD85
+ #define ARM_CPU_PART_CORTEX_A725	0xD87
++#define ARM_CPU_PART_NEOVERSE_N3	0xD8E
+ 
+ #define APM_CPU_PART_XGENE		0x000
+ #define APM_CPU_VAR_POTENZA		0x00
+@@ -176,6 +177,7 @@
+ #define MIDR_NEOVERSE_V3 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_V3)
+ #define MIDR_CORTEX_X925 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X925)
+ #define MIDR_CORTEX_A725 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A725)
++#define MIDR_NEOVERSE_N3 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N3)
+ #define MIDR_THUNDERX	MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX)
+ #define MIDR_THUNDERX_81XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_81XX)
+ #define MIDR_THUNDERX_83XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_83XX)
+diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
+index f8d94902fbb59c..463b48d0f92500 100644
+--- a/arch/arm64/kernel/cpu_errata.c
++++ b/arch/arm64/kernel/cpu_errata.c
+@@ -455,6 +455,7 @@ static const struct midr_range erratum_spec_ssbs_list[] = {
+ 	MIDR_ALL_VERSIONS(MIDR_CORTEX_A78),
+ 	MIDR_ALL_VERSIONS(MIDR_CORTEX_A78C),
+ 	MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
++	MIDR_ALL_VERSIONS(MIDR_CORTEX_A715),
+ 	MIDR_ALL_VERSIONS(MIDR_CORTEX_A720),
+ 	MIDR_ALL_VERSIONS(MIDR_CORTEX_A725),
+ 	MIDR_ALL_VERSIONS(MIDR_CORTEX_X1),
+@@ -463,8 +464,10 @@ static const struct midr_range erratum_spec_ssbs_list[] = {
+ 	MIDR_ALL_VERSIONS(MIDR_CORTEX_X3),
+ 	MIDR_ALL_VERSIONS(MIDR_CORTEX_X4),
+ 	MIDR_ALL_VERSIONS(MIDR_CORTEX_X925),
++	MIDR_ALL_VERSIONS(MIDR_MICROSOFT_AZURE_COBALT_100),
+ 	MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N1),
+ 	MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N2),
++	MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N3),
+ 	MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V1),
+ 	MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V2),
+ 	MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3),
+diff --git a/arch/loongarch/configs/loongson3_defconfig b/arch/loongarch/configs/loongson3_defconfig
+index a3b52aaa83b336..e5f70642ed2062 100644
+--- a/arch/loongarch/configs/loongson3_defconfig
++++ b/arch/loongarch/configs/loongson3_defconfig
+@@ -83,7 +83,6 @@ CONFIG_ZPOOL=y
+ CONFIG_ZSWAP=y
+ CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y
+ CONFIG_ZBUD=y
+-CONFIG_Z3FOLD=y
+ CONFIG_ZSMALLOC=m
+ # CONFIG_COMPAT_BRK is not set
+ CONFIG_MEMORY_HOTPLUG=y
+diff --git a/arch/parisc/include/asm/mman.h b/arch/parisc/include/asm/mman.h
+index 47c5a1991d1034..89b6beeda0b869 100644
+--- a/arch/parisc/include/asm/mman.h
++++ b/arch/parisc/include/asm/mman.h
+@@ -11,4 +11,18 @@ static inline bool arch_memory_deny_write_exec_supported(void)
+ }
+ #define arch_memory_deny_write_exec_supported arch_memory_deny_write_exec_supported
+ 
++static inline unsigned long arch_calc_vm_flag_bits(unsigned long flags)
++{
++	/*
++	 * The stack on parisc grows upwards, so if userspace requests memory
++	 * for a stack, mark it with VM_GROWSUP so that the stack expansion in
++	 * the fault handler will work.
++	 */
++	if (flags & MAP_STACK)
++		return VM_GROWSUP;
++
++	return 0;
++}
++#define arch_calc_vm_flag_bits(flags) arch_calc_vm_flag_bits(flags)
++
+ #endif /* __ASM_MMAN_H__ */
+diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
+index ab23e61a6f016a..ea57bcc21dc5fe 100644
+--- a/arch/parisc/kernel/entry.S
++++ b/arch/parisc/kernel/entry.S
+@@ -1051,8 +1051,7 @@ ENTRY_CFI(intr_save)		/* for os_hpmc */
+ 	STREG           %r16, PT_ISR(%r29)
+ 	STREG           %r17, PT_IOR(%r29)
+ 
+-#if 0 && defined(CONFIG_64BIT)
+-	/* Revisit when we have 64-bit code above 4Gb */
++#if defined(CONFIG_64BIT)
+ 	b,n		intr_save2
+ 
+ skip_save_ior:
+@@ -1060,8 +1059,7 @@ skip_save_ior:
+ 	 * need to adjust iasq/iaoq here in the same way we adjusted isr/ior
+ 	 * above.
+ 	 */
+-	extrd,u,*	%r8,PSW_W_BIT,1,%r1
+-	cmpib,COND(=),n	1,%r1,intr_save2
++	bb,COND(>=),n	%r8,PSW_W_BIT,intr_save2
+ 	LDREG		PT_IASQ0(%r29), %r16
+ 	LDREG		PT_IAOQ0(%r29), %r17
+ 	/* adjust iasq/iaoq */
+diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
+index 1f51aa9c8230cc..0fa81bf1466b15 100644
+--- a/arch/parisc/kernel/syscall.S
++++ b/arch/parisc/kernel/syscall.S
+@@ -243,10 +243,10 @@ linux_gateway_entry:
+ 
+ #ifdef CONFIG_64BIT
+ 	ldil	L%sys_call_table, %r1
+-	or,=	%r2,%r2,%r2
+-	addil	L%(sys_call_table64-sys_call_table), %r1
++	or,ev	%r2,%r2,%r2
++	ldil	L%sys_call_table64, %r1
+ 	ldo	R%sys_call_table(%r1), %r19
+-	or,=	%r2,%r2,%r2
++	or,ev	%r2,%r2,%r2
+ 	ldo	R%sys_call_table64(%r1), %r19
+ #else
+ 	load32	sys_call_table, %r19
+@@ -379,10 +379,10 @@ tracesys_next:
+ 	extrd,u	%r19,63,1,%r2			/* W hidden in bottom bit */
+ 
+ 	ldil	L%sys_call_table, %r1
+-	or,=	%r2,%r2,%r2
+-	addil	L%(sys_call_table64-sys_call_table), %r1
++	or,ev	%r2,%r2,%r2
++	ldil	L%sys_call_table64, %r1
+ 	ldo	R%sys_call_table(%r1), %r19
+-	or,=	%r2,%r2,%r2
++	or,ev	%r2,%r2,%r2
+ 	ldo	R%sys_call_table64(%r1), %r19
+ #else
+ 	load32	sys_call_table, %r19
+@@ -1327,6 +1327,8 @@ ENTRY(sys_call_table)
+ END(sys_call_table)
+ 
+ #ifdef CONFIG_64BIT
++#undef __SYSCALL_WITH_COMPAT
++#define __SYSCALL_WITH_COMPAT(nr, native, compat)	__SYSCALL(nr, native)
+ 	.align 8
+ ENTRY(sys_call_table64)
+ #include <asm/syscall_table_64.h>    /* 64-bit syscalls */
+diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
+index 6e7b9e8fd2251a..65e518dde2c2fe 100644
+--- a/arch/powerpc/configs/ppc64_defconfig
++++ b/arch/powerpc/configs/ppc64_defconfig
+@@ -81,7 +81,6 @@ CONFIG_MODULE_SIG_SHA512=y
+ CONFIG_PARTITION_ADVANCED=y
+ CONFIG_BINFMT_MISC=m
+ CONFIG_ZSWAP=y
+-CONFIG_Z3FOLD=y
+ CONFIG_ZSMALLOC=y
+ # CONFIG_SLAB_MERGE_DEFAULT is not set
+ CONFIG_SLAB_FREELIST_RANDOM=y
+diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h
+index a585c8e538ff0f..939daf6b695ef1 100644
+--- a/arch/powerpc/include/asm/vdso_datapage.h
++++ b/arch/powerpc/include/asm/vdso_datapage.h
+@@ -111,6 +111,21 @@ extern struct vdso_arch_data *vdso_data;
+ 	addi	\ptr, \ptr, (_vdso_datapage - 999b)@l
+ .endm
+ 
++#include <asm/asm-offsets.h>
++#include <asm/page.h>
++
++.macro get_realdatapage ptr scratch
++	get_datapage \ptr
++#ifdef CONFIG_TIME_NS
++	lwz	\scratch, VDSO_CLOCKMODE_OFFSET(\ptr)
++	xoris	\scratch, \scratch, VDSO_CLOCKMODE_TIMENS@h
++	xori	\scratch, \scratch, VDSO_CLOCKMODE_TIMENS@l
++	cntlzw	\scratch, \scratch
++	rlwinm	\scratch, \scratch, PAGE_SHIFT - 5, 1 << PAGE_SHIFT
++	add	\ptr, \ptr, \scratch
++#endif
++.endm
++
+ #endif /* __ASSEMBLY__ */
+ 
+ #endif /* __KERNEL__ */
+diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
+index 9f14d95b8b32fd..2affd30468bc4c 100644
+--- a/arch/powerpc/kernel/asm-offsets.c
++++ b/arch/powerpc/kernel/asm-offsets.c
+@@ -348,6 +348,8 @@ int main(void)
+ #else
+ 	OFFSET(CFG_SYSCALL_MAP32, vdso_arch_data, syscall_map);
+ #endif
++	OFFSET(VDSO_CLOCKMODE_OFFSET, vdso_arch_data, data[0].clock_mode);
++	DEFINE(VDSO_CLOCKMODE_TIMENS, VDSO_CLOCKMODE_TIMENS);
+ 
+ #ifdef CONFIG_BUG
+ 	DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));
+diff --git a/arch/powerpc/kernel/vdso/cacheflush.S b/arch/powerpc/kernel/vdso/cacheflush.S
+index 0085ae464dac9c..3b2479bd2f9a1d 100644
+--- a/arch/powerpc/kernel/vdso/cacheflush.S
++++ b/arch/powerpc/kernel/vdso/cacheflush.S
+@@ -30,7 +30,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE)
+ #ifdef CONFIG_PPC64
+ 	mflr	r12
+   .cfi_register lr,r12
+-	get_datapage	r10
++	get_realdatapage	r10, r11
+ 	mtlr	r12
+   .cfi_restore	lr
+ #endif
+diff --git a/arch/powerpc/kernel/vdso/datapage.S b/arch/powerpc/kernel/vdso/datapage.S
+index db8e167f01667e..2b19b6201a33a8 100644
+--- a/arch/powerpc/kernel/vdso/datapage.S
++++ b/arch/powerpc/kernel/vdso/datapage.S
+@@ -28,7 +28,7 @@ V_FUNCTION_BEGIN(__kernel_get_syscall_map)
+ 	mflr	r12
+   .cfi_register lr,r12
+ 	mr.	r4,r3
+-	get_datapage	r3
++	get_realdatapage	r3, r11
+ 	mtlr	r12
+ #ifdef __powerpc64__
+ 	addi	r3,r3,CFG_SYSCALL_MAP64
+@@ -52,7 +52,7 @@ V_FUNCTION_BEGIN(__kernel_get_tbfreq)
+   .cfi_startproc
+ 	mflr	r12
+   .cfi_register lr,r12
+-	get_datapage	r3
++	get_realdatapage	r3, r11
+ #ifndef __powerpc64__
+ 	lwz	r4,(CFG_TB_TICKS_PER_SEC + 4)(r3)
+ #endif
+diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
+index 47f8eabd1bee31..9873b916b23704 100644
+--- a/arch/powerpc/platforms/pseries/dlpar.c
++++ b/arch/powerpc/platforms/pseries/dlpar.c
+@@ -334,23 +334,6 @@ int handle_dlpar_errorlog(struct pseries_hp_errorlog *hp_elog)
+ {
+ 	int rc;
+ 
+-	/* pseries error logs are in BE format, convert to cpu type */
+-	switch (hp_elog->id_type) {
+-	case PSERIES_HP_ELOG_ID_DRC_COUNT:
+-		hp_elog->_drc_u.drc_count =
+-				be32_to_cpu(hp_elog->_drc_u.drc_count);
+-		break;
+-	case PSERIES_HP_ELOG_ID_DRC_INDEX:
+-		hp_elog->_drc_u.drc_index =
+-				be32_to_cpu(hp_elog->_drc_u.drc_index);
+-		break;
+-	case PSERIES_HP_ELOG_ID_DRC_IC:
+-		hp_elog->_drc_u.ic.count =
+-				be32_to_cpu(hp_elog->_drc_u.ic.count);
+-		hp_elog->_drc_u.ic.index =
+-				be32_to_cpu(hp_elog->_drc_u.ic.index);
+-	}
+-
+ 	switch (hp_elog->resource) {
+ 	case PSERIES_HP_ELOG_RESOURCE_MEM:
+ 		rc = dlpar_memory(hp_elog);
+diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
+index e62835a12d73fc..6838a0fcda296b 100644
+--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
++++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
+@@ -757,7 +757,7 @@ int dlpar_cpu(struct pseries_hp_errorlog *hp_elog)
+ 	u32 drc_index;
+ 	int rc;
+ 
+-	drc_index = hp_elog->_drc_u.drc_index;
++	drc_index = be32_to_cpu(hp_elog->_drc_u.drc_index);
+ 
+ 	lock_device_hotplug();
+ 
+diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
+index 4adca5b61daba8..95ff84c55cb144 100644
+--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
++++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
+@@ -811,16 +811,16 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
+ 	case PSERIES_HP_ELOG_ACTION_ADD:
+ 		switch (hp_elog->id_type) {
+ 		case PSERIES_HP_ELOG_ID_DRC_COUNT:
+-			count = hp_elog->_drc_u.drc_count;
++			count = be32_to_cpu(hp_elog->_drc_u.drc_count);
+ 			rc = dlpar_memory_add_by_count(count);
+ 			break;
+ 		case PSERIES_HP_ELOG_ID_DRC_INDEX:
+-			drc_index = hp_elog->_drc_u.drc_index;
++			drc_index = be32_to_cpu(hp_elog->_drc_u.drc_index);
+ 			rc = dlpar_memory_add_by_index(drc_index);
+ 			break;
+ 		case PSERIES_HP_ELOG_ID_DRC_IC:
+-			count = hp_elog->_drc_u.ic.count;
+-			drc_index = hp_elog->_drc_u.ic.index;
++			count = be32_to_cpu(hp_elog->_drc_u.ic.count);
++			drc_index = be32_to_cpu(hp_elog->_drc_u.ic.index);
+ 			rc = dlpar_memory_add_by_ic(count, drc_index);
+ 			break;
+ 		default:
+@@ -832,16 +832,16 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
+ 	case PSERIES_HP_ELOG_ACTION_REMOVE:
+ 		switch (hp_elog->id_type) {
+ 		case PSERIES_HP_ELOG_ID_DRC_COUNT:
+-			count = hp_elog->_drc_u.drc_count;
++			count = be32_to_cpu(hp_elog->_drc_u.drc_count);
+ 			rc = dlpar_memory_remove_by_count(count);
+ 			break;
+ 		case PSERIES_HP_ELOG_ID_DRC_INDEX:
+-			drc_index = hp_elog->_drc_u.drc_index;
++			drc_index = be32_to_cpu(hp_elog->_drc_u.drc_index);
+ 			rc = dlpar_memory_remove_by_index(drc_index);
+ 			break;
+ 		case PSERIES_HP_ELOG_ID_DRC_IC:
+-			count = hp_elog->_drc_u.ic.count;
+-			drc_index = hp_elog->_drc_u.ic.index;
++			count = be32_to_cpu(hp_elog->_drc_u.ic.count);
++			drc_index = be32_to_cpu(hp_elog->_drc_u.ic.index);
+ 			rc = dlpar_memory_remove_by_ic(count, drc_index);
+ 			break;
+ 		default:
+diff --git a/arch/powerpc/platforms/pseries/pmem.c b/arch/powerpc/platforms/pseries/pmem.c
+index 3c290b9ed01b39..0f1d45f32e4a44 100644
+--- a/arch/powerpc/platforms/pseries/pmem.c
++++ b/arch/powerpc/platforms/pseries/pmem.c
+@@ -121,7 +121,7 @@ int dlpar_hp_pmem(struct pseries_hp_errorlog *hp_elog)
+ 		return -EINVAL;
+ 	}
+ 
+-	drc_index = hp_elog->_drc_u.drc_index;
++	drc_index = be32_to_cpu(hp_elog->_drc_u.drc_index);
+ 
+ 	lock_device_hotplug();
+ 
+diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
+index fe30b24d52e189..1304992232adbe 100644
+--- a/arch/riscv/Kconfig
++++ b/arch/riscv/Kconfig
+@@ -259,6 +259,11 @@ config GENERIC_HWEIGHT
+ config FIX_EARLYCON_MEM
+ 	def_bool MMU
+ 
++config ILLEGAL_POINTER_VALUE
++	hex
++	default 0 if 32BIT
++	default 0xdead000000000000 if 64BIT
++
+ config PGTABLE_LEVELS
+ 	int
+ 	default 5 if 64BIT
+@@ -628,8 +633,7 @@ config IRQ_STACKS
+ config THREAD_SIZE_ORDER
+ 	int "Kernel stack size (in power-of-two numbers of page size)" if VMAP_STACK && EXPERT
+ 	range 0 4
+-	default 1 if 32BIT && !KASAN
+-	default 3 if 64BIT && KASAN
++	default 1 if 32BIT
+ 	default 2
+ 	help
+ 	  Specify the Pages of thread stack size (from 4KB to 64KB), which also
+diff --git a/arch/riscv/include/asm/thread_info.h b/arch/riscv/include/asm/thread_info.h
+index d18ce0113ca1f1..4fb84c2e94c650 100644
+--- a/arch/riscv/include/asm/thread_info.h
++++ b/arch/riscv/include/asm/thread_info.h
+@@ -12,7 +12,12 @@
+ #include <linux/const.h>
+ 
+ /* thread information allocation */
+-#define THREAD_SIZE_ORDER	CONFIG_THREAD_SIZE_ORDER
++#ifdef CONFIG_KASAN
++#define KASAN_STACK_ORDER	1
++#else
++#define KASAN_STACK_ORDER	0
++#endif
++#define THREAD_SIZE_ORDER	(CONFIG_THREAD_SIZE_ORDER + KASAN_STACK_ORDER)
+ #define THREAD_SIZE		(PAGE_SIZE << THREAD_SIZE_ORDER)
+ 
+ /*
+diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
+index 0ffb072be95615..0bbec1c75cd0be 100644
+--- a/arch/x86/crypto/sha256-avx2-asm.S
++++ b/arch/x86/crypto/sha256-avx2-asm.S
+@@ -592,22 +592,22 @@ SYM_TYPED_FUNC_START(sha256_transform_rorx)
+ 	leaq	K256+0*32(%rip), INP		## reuse INP as scratch reg
+ 	vpaddd	(INP, SRND), X0, XFER
+ 	vmovdqa XFER, 0*32+_XFER(%rsp, SRND)
+-	FOUR_ROUNDS_AND_SCHED	_XFER + 0*32
++	FOUR_ROUNDS_AND_SCHED	(_XFER + 0*32)
+ 
+ 	leaq	K256+1*32(%rip), INP
+ 	vpaddd	(INP, SRND), X0, XFER
+ 	vmovdqa XFER, 1*32+_XFER(%rsp, SRND)
+-	FOUR_ROUNDS_AND_SCHED	_XFER + 1*32
++	FOUR_ROUNDS_AND_SCHED	(_XFER + 1*32)
+ 
+ 	leaq	K256+2*32(%rip), INP
+ 	vpaddd	(INP, SRND), X0, XFER
+ 	vmovdqa XFER, 2*32+_XFER(%rsp, SRND)
+-	FOUR_ROUNDS_AND_SCHED	_XFER + 2*32
++	FOUR_ROUNDS_AND_SCHED	(_XFER + 2*32)
+ 
+ 	leaq	K256+3*32(%rip), INP
+ 	vpaddd	(INP, SRND), X0, XFER
+ 	vmovdqa XFER, 3*32+_XFER(%rsp, SRND)
+-	FOUR_ROUNDS_AND_SCHED	_XFER + 3*32
++	FOUR_ROUNDS_AND_SCHED	(_XFER + 3*32)
+ 
+ 	add	$4*32, SRND
+ 	cmp	$3*4*32, SRND
+@@ -618,12 +618,12 @@ SYM_TYPED_FUNC_START(sha256_transform_rorx)
+ 	leaq	K256+0*32(%rip), INP
+ 	vpaddd	(INP, SRND), X0, XFER
+ 	vmovdqa XFER, 0*32+_XFER(%rsp, SRND)
+-	DO_4ROUNDS	_XFER + 0*32
++	DO_4ROUNDS	(_XFER + 0*32)
+ 
+ 	leaq	K256+1*32(%rip), INP
+ 	vpaddd	(INP, SRND), X1, XFER
+ 	vmovdqa XFER, 1*32+_XFER(%rsp, SRND)
+-	DO_4ROUNDS	_XFER + 1*32
++	DO_4ROUNDS	(_XFER + 1*32)
+ 	add	$2*32, SRND
+ 
+ 	vmovdqa	X2, X0
+@@ -651,8 +651,8 @@ SYM_TYPED_FUNC_START(sha256_transform_rorx)
+ 	xor	SRND, SRND
+ .align 16
+ .Lloop3:
+-	DO_4ROUNDS	 _XFER + 0*32 + 16
+-	DO_4ROUNDS	 _XFER + 1*32 + 16
++	DO_4ROUNDS	(_XFER + 0*32 + 16)
++	DO_4ROUNDS	(_XFER + 1*32 + 16)
+ 	add	$2*32, SRND
+ 	cmp	$4*4*32, SRND
+ 	jb	.Lloop3
+diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
+index 8811fedc9776a2..150a365b4fbc89 100644
+--- a/arch/x86/events/core.c
++++ b/arch/x86/events/core.c
+@@ -41,6 +41,8 @@
+ #include <asm/desc.h>
+ #include <asm/ldt.h>
+ #include <asm/unwind.h>
++#include <asm/uprobes.h>
++#include <asm/ibt.h>
+ 
+ #include "perf_event.h"
+ 
+@@ -2816,6 +2818,46 @@ static unsigned long get_segment_base(unsigned int segment)
+ 	return get_desc_base(desc);
+ }
+ 
++#ifdef CONFIG_UPROBES
++/*
++ * Heuristic-based check if uprobe is installed at the function entry.
++ *
++ * Under assumption of user code being compiled with frame pointers,
++ * `push %rbp/%ebp` is a good indicator that we indeed are.
++ *
++ * Similarly, `endbr64` (assuming 64-bit mode) is also a common pattern.
++ * If we get this wrong, captured stack trace might have one extra bogus
++ * entry, but the rest of stack trace will still be meaningful.
++ */
++static bool is_uprobe_at_func_entry(struct pt_regs *regs)
++{
++	struct arch_uprobe *auprobe;
++
++	if (!current->utask)
++		return false;
++
++	auprobe = current->utask->auprobe;
++	if (!auprobe)
++		return false;
++
++	/* push %rbp/%ebp */
++	if (auprobe->insn[0] == 0x55)
++		return true;
++
++	/* endbr64 (64-bit only) */
++	if (user_64bit_mode(regs) && is_endbr(*(u32 *)auprobe->insn))
++		return true;
++
++	return false;
++}
++
++#else
++static bool is_uprobe_at_func_entry(struct pt_regs *regs)
++{
++	return false;
++}
++#endif /* CONFIG_UPROBES */
++
+ #ifdef CONFIG_IA32_EMULATION
+ 
+ #include <linux/compat.h>
+@@ -2827,6 +2869,7 @@ perf_callchain_user32(struct pt_regs *regs, struct perf_callchain_entry_ctx *ent
+ 	unsigned long ss_base, cs_base;
+ 	struct stack_frame_ia32 frame;
+ 	const struct stack_frame_ia32 __user *fp;
++	u32 ret_addr;
+ 
+ 	if (user_64bit_mode(regs))
+ 		return 0;
+@@ -2836,6 +2879,12 @@ perf_callchain_user32(struct pt_regs *regs, struct perf_callchain_entry_ctx *ent
+ 
+ 	fp = compat_ptr(ss_base + regs->bp);
+ 	pagefault_disable();
++
++	/* see perf_callchain_user() below for why we do this */
++	if (is_uprobe_at_func_entry(regs) &&
++	    !get_user(ret_addr, (const u32 __user *)regs->sp))
++		perf_callchain_store(entry, ret_addr);
++
+ 	while (entry->nr < entry->max_stack) {
+ 		if (!valid_user_frame(fp, sizeof(frame)))
+ 			break;
+@@ -2864,6 +2913,7 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs
+ {
+ 	struct stack_frame frame;
+ 	const struct stack_frame __user *fp;
++	unsigned long ret_addr;
+ 
+ 	if (perf_guest_state()) {
+ 		/* TODO: We don't support guest os callchain now */
+@@ -2887,6 +2937,19 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs
+ 		return;
+ 
+ 	pagefault_disable();
++
++	/*
++	 * If we are called from uprobe handler, and we are indeed at the very
++	 * entry to user function (which is normally a `push %rbp` instruction,
++	 * under assumption of application being compiled with frame pointers),
++	 * we should read return address from *regs->sp before proceeding
++	 * to follow frame pointers, otherwise we'll skip immediate caller
++	 * as %rbp is not yet setup.
++	 */
++	if (is_uprobe_at_func_entry(regs) &&
++	    !get_user(ret_addr, (const unsigned long __user *)regs->sp))
++		perf_callchain_store(entry, ret_addr);
++
+ 	while (entry->nr < entry->max_stack) {
+ 		if (!valid_user_frame(fp, sizeof(frame)))
+ 			break;
+diff --git a/arch/x86/include/asm/fpu/signal.h b/arch/x86/include/asm/fpu/signal.h
+index 611fa41711affd..eccc75bc9c4f3d 100644
+--- a/arch/x86/include/asm/fpu/signal.h
++++ b/arch/x86/include/asm/fpu/signal.h
+@@ -29,7 +29,7 @@ fpu__alloc_mathframe(unsigned long sp, int ia32_frame,
+ 
+ unsigned long fpu__get_fpstate_size(void);
+ 
+-extern bool copy_fpstate_to_sigframe(void __user *buf, void __user *fp, int size);
++extern bool copy_fpstate_to_sigframe(void __user *buf, void __user *fp, int size, u32 pkru);
+ extern void fpu__clear_user_states(struct fpu *fpu);
+ extern bool fpu__restore_sig(void __user *buf, int ia32_frame);
+ 
+diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h
+index 03bb950eba690f..228a42585d5c97 100644
+--- a/arch/x86/include/asm/syscall.h
++++ b/arch/x86/include/asm/syscall.h
+@@ -82,7 +82,12 @@ static inline void syscall_get_arguments(struct task_struct *task,
+ 					 struct pt_regs *regs,
+ 					 unsigned long *args)
+ {
+-	memcpy(args, &regs->bx, 6 * sizeof(args[0]));
++	args[0] = regs->bx;
++	args[1] = regs->cx;
++	args[2] = regs->dx;
++	args[3] = regs->si;
++	args[4] = regs->di;
++	args[5] = regs->bp;
+ }
+ 
+ static inline int syscall_get_arch(struct task_struct *task)
+diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
+index 00da6cf6b07dcb..d0c5325d175102 100644
+--- a/arch/x86/kernel/apic/io_apic.c
++++ b/arch/x86/kernel/apic/io_apic.c
+@@ -352,27 +352,26 @@ static void ioapic_mask_entry(int apic, int pin)
+  * shared ISA-space IRQs, so we have to support them. We are super
+  * fast in the common case, and fast for shared ISA-space IRQs.
+  */
+-static int __add_pin_to_irq_node(struct mp_chip_data *data,
+-				 int node, int apic, int pin)
++static bool add_pin_to_irq_node(struct mp_chip_data *data, int node, int apic, int pin)
+ {
+ 	struct irq_pin_list *entry;
+ 
+-	/* don't allow duplicates */
+-	for_each_irq_pin(entry, data->irq_2_pin)
++	/* Don't allow duplicates */
++	for_each_irq_pin(entry, data->irq_2_pin) {
+ 		if (entry->apic == apic && entry->pin == pin)
+-			return 0;
++			return true;
++	}
+ 
+ 	entry = kzalloc_node(sizeof(struct irq_pin_list), GFP_ATOMIC, node);
+ 	if (!entry) {
+-		pr_err("can not alloc irq_pin_list (%d,%d,%d)\n",
+-		       node, apic, pin);
+-		return -ENOMEM;
++		pr_err("Cannot allocate irq_pin_list (%d,%d,%d)\n", node, apic, pin);
++		return false;
+ 	}
++
+ 	entry->apic = apic;
+ 	entry->pin = pin;
+ 	list_add_tail(&entry->list, &data->irq_2_pin);
+-
+-	return 0;
++	return true;
+ }
+ 
+ static void __remove_pin_from_irq(struct mp_chip_data *data, int apic, int pin)
+@@ -387,13 +386,6 @@ static void __remove_pin_from_irq(struct mp_chip_data *data, int apic, int pin)
+ 		}
+ }
+ 
+-static void add_pin_to_irq_node(struct mp_chip_data *data,
+-				int node, int apic, int pin)
+-{
+-	if (__add_pin_to_irq_node(data, node, apic, pin))
+-		panic("IO-APIC: failed to add irq-pin. Can not proceed\n");
+-}
+-
+ /*
+  * Reroute an IRQ to a different pin.
+  */
+@@ -1002,8 +994,7 @@ static int alloc_isa_irq_from_domain(struct irq_domain *domain,
+ 	if (irq_data && irq_data->parent_data) {
+ 		if (!mp_check_pin_attr(irq, info))
+ 			return -EBUSY;
+-		if (__add_pin_to_irq_node(irq_data->chip_data, node, ioapic,
+-					  info->ioapic.pin))
++		if (!add_pin_to_irq_node(irq_data->chip_data, node, ioapic, info->ioapic.pin))
+ 			return -ENOMEM;
+ 	} else {
+ 		info->flags |= X86_IRQ_ALLOC_LEGACY;
+@@ -3037,10 +3028,8 @@ int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq,
+ 		return -ENOMEM;
+ 
+ 	ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, info);
+-	if (ret < 0) {
+-		kfree(data);
+-		return ret;
+-	}
++	if (ret < 0)
++		goto free_data;
+ 
+ 	INIT_LIST_HEAD(&data->irq_2_pin);
+ 	irq_data->hwirq = info->ioapic.pin;
+@@ -3049,7 +3038,10 @@ int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq,
+ 	irq_data->chip_data = data;
+ 	mp_irqdomain_get_attr(mp_pin_to_gsi(ioapic, pin), data, info);
+ 
+-	add_pin_to_irq_node(data, ioapic_alloc_attr_node(info), ioapic, pin);
++	if (!add_pin_to_irq_node(data, ioapic_alloc_attr_node(info), ioapic, pin)) {
++		ret = -ENOMEM;
++		goto free_irqs;
++	}
+ 
+ 	mp_preconfigure_entry(data);
+ 	mp_register_handler(virq, data->is_level);
+@@ -3064,6 +3056,12 @@ int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq,
+ 		    ioapic, mpc_ioapic_id(ioapic), pin, virq,
+ 		    data->is_level, data->active_low);
+ 	return 0;
++
++free_irqs:
++	irq_domain_free_irqs_parent(domain, virq, nr_irqs);
++free_data:
++	kfree(data);
++	return ret;
+ }
+ 
+ void mp_irqdomain_free(struct irq_domain *domain, unsigned int virq,
+diff --git a/arch/x86/kernel/fpu/signal.c b/arch/x86/kernel/fpu/signal.c
+index 247f2225aa9f36..2b3b9e140dd41b 100644
+--- a/arch/x86/kernel/fpu/signal.c
++++ b/arch/x86/kernel/fpu/signal.c
+@@ -156,7 +156,7 @@ static inline bool save_xstate_epilog(void __user *buf, int ia32_frame,
+ 	return !err;
+ }
+ 
+-static inline int copy_fpregs_to_sigframe(struct xregs_state __user *buf)
++static inline int copy_fpregs_to_sigframe(struct xregs_state __user *buf, u32 pkru)
+ {
+ 	if (use_xsave())
+ 		return xsave_to_user_sigframe(buf);
+@@ -185,7 +185,7 @@ static inline int copy_fpregs_to_sigframe(struct xregs_state __user *buf)
+  * For [f]xsave state, update the SW reserved fields in the [f]xsave frame
+  * indicating the absence/presence of the extended state to the user.
+  */
+-bool copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size)
++bool copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size, u32 pkru)
+ {
+ 	struct task_struct *tsk = current;
+ 	struct fpstate *fpstate = tsk->thread.fpu.fpstate;
+@@ -228,7 +228,7 @@ bool copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size)
+ 		fpregs_restore_userregs();
+ 
+ 	pagefault_disable();
+-	ret = copy_fpregs_to_sigframe(buf_fx);
++	ret = copy_fpregs_to_sigframe(buf_fx, pkru);
+ 	pagefault_enable();
+ 	fpregs_unlock();
+ 
+diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c
+index d287fe290c9ab5..2fa12d1dc67602 100644
+--- a/arch/x86/kernel/machine_kexec_64.c
++++ b/arch/x86/kernel/machine_kexec_64.c
+@@ -28,6 +28,7 @@
+ #include <asm/setup.h>
+ #include <asm/set_memory.h>
+ #include <asm/cpu.h>
++#include <asm/efi.h>
+ 
+ #ifdef CONFIG_ACPI
+ /*
+@@ -90,6 +91,8 @@ map_efi_systab(struct x86_mapping_info *info, pgd_t *level4p)
+ {
+ #ifdef CONFIG_EFI
+ 	unsigned long mstart, mend;
++	void *kaddr;
++	int ret;
+ 
+ 	if (!efi_enabled(EFI_BOOT))
+ 		return 0;
+@@ -105,6 +108,30 @@ map_efi_systab(struct x86_mapping_info *info, pgd_t *level4p)
+ 	if (!mstart)
+ 		return 0;
+ 
++	ret = kernel_ident_mapping_init(info, level4p, mstart, mend);
++	if (ret)
++		return ret;
++
++	kaddr = memremap(mstart, mend - mstart, MEMREMAP_WB);
++	if (!kaddr) {
++		pr_err("Could not map UEFI system table\n");
++		return -ENOMEM;
++	}
++
++	mstart = efi_config_table;
++
++	if (efi_enabled(EFI_64BIT)) {
++		efi_system_table_64_t *stbl = (efi_system_table_64_t *)kaddr;
++
++		mend = mstart + sizeof(efi_config_table_64_t) * stbl->nr_tables;
++	} else {
++		efi_system_table_32_t *stbl = (efi_system_table_32_t *)kaddr;
++
++		mend = mstart + sizeof(efi_config_table_32_t) * stbl->nr_tables;
++	}
++
++	memunmap(kaddr);
++
+ 	return kernel_ident_mapping_init(info, level4p, mstart, mend);
+ #endif
+ 	return 0;
+diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
+index 65fe2094da59b8..876d3b30c2c774 100644
+--- a/arch/x86/kernel/signal.c
++++ b/arch/x86/kernel/signal.c
+@@ -83,6 +83,7 @@ get_sigframe(struct ksignal *ksig, struct pt_regs *regs, size_t frame_size,
+ 	unsigned long math_size = 0;
+ 	unsigned long sp = regs->sp;
+ 	unsigned long buf_fx = 0;
++	u32 pkru = read_pkru();
+ 
+ 	/* redzone */
+ 	if (!ia32_frame)
+@@ -138,7 +139,7 @@ get_sigframe(struct ksignal *ksig, struct pt_regs *regs, size_t frame_size,
+ 	}
+ 
+ 	/* save i387 and extended state */
+-	if (!copy_fpstate_to_sigframe(*fpstate, (void __user *)buf_fx, math_size))
++	if (!copy_fpstate_to_sigframe(*fpstate, (void __user *)buf_fx, math_size, pkru))
+ 		return (void __user *)-1L;
+ 
+ 	return (void __user *)sp;
+diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
+index 23d8aaf8d9fd19..449a6ed0b8c982 100644
+--- a/arch/x86/kernel/signal_64.c
++++ b/arch/x86/kernel/signal_64.c
+@@ -260,13 +260,13 @@ SYSCALL_DEFINE0(rt_sigreturn)
+ 
+ 	set_current_blocked(&set);
+ 
+-	if (!restore_sigcontext(regs, &frame->uc.uc_mcontext, uc_flags))
++	if (restore_altstack(&frame->uc.uc_stack))
+ 		goto badframe;
+ 
+-	if (restore_signal_shadow_stack())
++	if (!restore_sigcontext(regs, &frame->uc.uc_mcontext, uc_flags))
+ 		goto badframe;
+ 
+-	if (restore_altstack(&frame->uc.uc_stack))
++	if (restore_signal_shadow_stack())
+ 		goto badframe;
+ 
+ 	return regs->ax;
+diff --git a/block/blk-iocost.c b/block/blk-iocost.c
+index 0dca77591d66c9..c3cb9c20b306cf 100644
+--- a/block/blk-iocost.c
++++ b/block/blk-iocost.c
+@@ -2076,7 +2076,7 @@ static void ioc_forgive_debts(struct ioc *ioc, u64 usage_us_sum, int nr_debtors,
+ 			      struct ioc_now *now)
+ {
+ 	struct ioc_gq *iocg;
+-	u64 dur, usage_pct, nr_cycles;
++	u64 dur, usage_pct, nr_cycles, nr_cycles_shift;
+ 
+ 	/* if no debtor, reset the cycle */
+ 	if (!nr_debtors) {
+@@ -2138,10 +2138,12 @@ static void ioc_forgive_debts(struct ioc *ioc, u64 usage_us_sum, int nr_debtors,
+ 		old_debt = iocg->abs_vdebt;
+ 		old_delay = iocg->delay;
+ 
++		nr_cycles_shift = min_t(u64, nr_cycles, BITS_PER_LONG - 1);
+ 		if (iocg->abs_vdebt)
+-			iocg->abs_vdebt = iocg->abs_vdebt >> nr_cycles ?: 1;
++			iocg->abs_vdebt = iocg->abs_vdebt >> nr_cycles_shift ?: 1;
++
+ 		if (iocg->delay)
+-			iocg->delay = iocg->delay >> nr_cycles ?: 1;
++			iocg->delay = iocg->delay >> nr_cycles_shift ?: 1;
+ 
+ 		iocg_kick_waitq(iocg, true, now);
+ 
+diff --git a/crypto/simd.c b/crypto/simd.c
+index edaa479a1ec5e5..d109866641a265 100644
+--- a/crypto/simd.c
++++ b/crypto/simd.c
+@@ -136,27 +136,19 @@ static int simd_skcipher_init(struct crypto_skcipher *tfm)
+ 	return 0;
+ }
+ 
+-struct simd_skcipher_alg *simd_skcipher_create_compat(const char *algname,
++struct simd_skcipher_alg *simd_skcipher_create_compat(struct skcipher_alg *ialg,
++						      const char *algname,
+ 						      const char *drvname,
+ 						      const char *basename)
+ {
+ 	struct simd_skcipher_alg *salg;
+-	struct crypto_skcipher *tfm;
+-	struct skcipher_alg *ialg;
+ 	struct skcipher_alg *alg;
+ 	int err;
+ 
+-	tfm = crypto_alloc_skcipher(basename, CRYPTO_ALG_INTERNAL,
+-				    CRYPTO_ALG_INTERNAL | CRYPTO_ALG_ASYNC);
+-	if (IS_ERR(tfm))
+-		return ERR_CAST(tfm);
+-
+-	ialg = crypto_skcipher_alg(tfm);
+-
+ 	salg = kzalloc(sizeof(*salg), GFP_KERNEL);
+ 	if (!salg) {
+ 		salg = ERR_PTR(-ENOMEM);
+-		goto out_put_tfm;
++		goto out;
+ 	}
+ 
+ 	salg->ialg_name = basename;
+@@ -195,30 +187,16 @@ struct simd_skcipher_alg *simd_skcipher_create_compat(const char *algname,
+ 	if (err)
+ 		goto out_free_salg;
+ 
+-out_put_tfm:
+-	crypto_free_skcipher(tfm);
++out:
+ 	return salg;
+ 
+ out_free_salg:
+ 	kfree(salg);
+ 	salg = ERR_PTR(err);
+-	goto out_put_tfm;
++	goto out;
+ }
+ EXPORT_SYMBOL_GPL(simd_skcipher_create_compat);
+ 
+-struct simd_skcipher_alg *simd_skcipher_create(const char *algname,
+-					       const char *basename)
+-{
+-	char drvname[CRYPTO_MAX_ALG_NAME];
+-
+-	if (snprintf(drvname, CRYPTO_MAX_ALG_NAME, "simd-%s", basename) >=
+-	    CRYPTO_MAX_ALG_NAME)
+-		return ERR_PTR(-ENAMETOOLONG);
+-
+-	return simd_skcipher_create_compat(algname, drvname, basename);
+-}
+-EXPORT_SYMBOL_GPL(simd_skcipher_create);
+-
+ void simd_skcipher_free(struct simd_skcipher_alg *salg)
+ {
+ 	crypto_unregister_skcipher(&salg->alg);
+@@ -246,7 +224,7 @@ int simd_register_skciphers_compat(struct skcipher_alg *algs, int count,
+ 		algname = algs[i].base.cra_name + 2;
+ 		drvname = algs[i].base.cra_driver_name + 2;
+ 		basename = algs[i].base.cra_driver_name;
+-		simd = simd_skcipher_create_compat(algname, drvname, basename);
++		simd = simd_skcipher_create_compat(algs + i, algname, drvname, basename);
+ 		err = PTR_ERR(simd);
+ 		if (IS_ERR(simd))
+ 			goto err_unregister;
+@@ -383,27 +361,19 @@ static int simd_aead_init(struct crypto_aead *tfm)
+ 	return 0;
+ }
+ 
+-struct simd_aead_alg *simd_aead_create_compat(const char *algname,
+-					      const char *drvname,
+-					      const char *basename)
++static struct simd_aead_alg *simd_aead_create_compat(struct aead_alg *ialg,
++						     const char *algname,
++						     const char *drvname,
++						     const char *basename)
+ {
+ 	struct simd_aead_alg *salg;
+-	struct crypto_aead *tfm;
+-	struct aead_alg *ialg;
+ 	struct aead_alg *alg;
+ 	int err;
+ 
+-	tfm = crypto_alloc_aead(basename, CRYPTO_ALG_INTERNAL,
+-				CRYPTO_ALG_INTERNAL | CRYPTO_ALG_ASYNC);
+-	if (IS_ERR(tfm))
+-		return ERR_CAST(tfm);
+-
+-	ialg = crypto_aead_alg(tfm);
+-
+ 	salg = kzalloc(sizeof(*salg), GFP_KERNEL);
+ 	if (!salg) {
+ 		salg = ERR_PTR(-ENOMEM);
+-		goto out_put_tfm;
++		goto out;
+ 	}
+ 
+ 	salg->ialg_name = basename;
+@@ -442,36 +412,20 @@ struct simd_aead_alg *simd_aead_create_compat(const char *algname,
+ 	if (err)
+ 		goto out_free_salg;
+ 
+-out_put_tfm:
+-	crypto_free_aead(tfm);
++out:
+ 	return salg;
+ 
+ out_free_salg:
+ 	kfree(salg);
+ 	salg = ERR_PTR(err);
+-	goto out_put_tfm;
+-}
+-EXPORT_SYMBOL_GPL(simd_aead_create_compat);
+-
+-struct simd_aead_alg *simd_aead_create(const char *algname,
+-				       const char *basename)
+-{
+-	char drvname[CRYPTO_MAX_ALG_NAME];
+-
+-	if (snprintf(drvname, CRYPTO_MAX_ALG_NAME, "simd-%s", basename) >=
+-	    CRYPTO_MAX_ALG_NAME)
+-		return ERR_PTR(-ENAMETOOLONG);
+-
+-	return simd_aead_create_compat(algname, drvname, basename);
++	goto out;
+ }
+-EXPORT_SYMBOL_GPL(simd_aead_create);
+ 
+-void simd_aead_free(struct simd_aead_alg *salg)
++static void simd_aead_free(struct simd_aead_alg *salg)
+ {
+ 	crypto_unregister_aead(&salg->alg);
+ 	kfree(salg);
+ }
+-EXPORT_SYMBOL_GPL(simd_aead_free);
+ 
+ int simd_register_aeads_compat(struct aead_alg *algs, int count,
+ 			       struct simd_aead_alg **simd_algs)
+@@ -493,7 +447,7 @@ int simd_register_aeads_compat(struct aead_alg *algs, int count,
+ 		algname = algs[i].base.cra_name + 2;
+ 		drvname = algs[i].base.cra_driver_name + 2;
+ 		basename = algs[i].base.cra_driver_name;
+-		simd = simd_aead_create_compat(algname, drvname, basename);
++		simd = simd_aead_create_compat(algs + i, algname, drvname, basename);
+ 		err = PTR_ERR(simd);
+ 		if (IS_ERR(simd))
+ 			goto err_unregister;
+diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/ivpu_fw.c
+index a277bbae78fc45..3b35d262ddd43a 100644
+--- a/drivers/accel/ivpu/ivpu_fw.c
++++ b/drivers/accel/ivpu/ivpu_fw.c
+@@ -55,6 +55,10 @@ static struct {
+ 	{ IVPU_HW_40XX, "intel/vpu/vpu_40xx_v0.0.bin" },
+ };
+ 
++/* Production fw_names from the table above */
++MODULE_FIRMWARE("intel/vpu/vpu_37xx_v0.0.bin");
++MODULE_FIRMWARE("intel/vpu/vpu_40xx_v0.0.bin");
++
+ static int ivpu_fw_request(struct ivpu_device *vdev)
+ {
+ 	int ret = -ENOENT;
+diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
+index 7a453c5ff303a9..71e25c79897628 100644
+--- a/drivers/acpi/acpi_pad.c
++++ b/drivers/acpi/acpi_pad.c
+@@ -131,8 +131,10 @@ static void exit_round_robin(unsigned int tsk_index)
+ {
+ 	struct cpumask *pad_busy_cpus = to_cpumask(pad_busy_cpus_bits);
+ 
+-	cpumask_clear_cpu(tsk_in_cpu[tsk_index], pad_busy_cpus);
+-	tsk_in_cpu[tsk_index] = -1;
++	if (tsk_in_cpu[tsk_index] != -1) {
++		cpumask_clear_cpu(tsk_in_cpu[tsk_index], pad_busy_cpus);
++		tsk_in_cpu[tsk_index] = -1;
++	}
+ }
+ 
+ static unsigned int idle_pct = 5; /* percentage */
+diff --git a/drivers/acpi/acpica/dbconvert.c b/drivers/acpi/acpica/dbconvert.c
+index 2b84ac093698a3..8dbab693204998 100644
+--- a/drivers/acpi/acpica/dbconvert.c
++++ b/drivers/acpi/acpica/dbconvert.c
+@@ -174,6 +174,8 @@ acpi_status acpi_db_convert_to_package(char *string, union acpi_object *object)
+ 	elements =
+ 	    ACPI_ALLOCATE_ZEROED(DB_DEFAULT_PKG_ELEMENTS *
+ 				 sizeof(union acpi_object));
++	if (!elements)
++		return (AE_NO_MEMORY);
+ 
+ 	this = string;
+ 	for (i = 0; i < (DB_DEFAULT_PKG_ELEMENTS - 1); i++) {
+diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c
+index 08196fa17080e2..82b1fa2d201fed 100644
+--- a/drivers/acpi/acpica/exprep.c
++++ b/drivers/acpi/acpica/exprep.c
+@@ -437,6 +437,9 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
+ 
+ 		if (info->connection_node) {
+ 			second_desc = info->connection_node->object;
++			if (second_desc == NULL) {
++				break;
++			}
+ 			if (!(second_desc->common.flags & AOPOBJ_DATA_VALID)) {
+ 				status =
+ 				    acpi_ds_get_buffer_arguments(second_desc);
+diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c
+index 422c074ed2897b..28582adfc0acaf 100644
+--- a/drivers/acpi/acpica/psargs.c
++++ b/drivers/acpi/acpica/psargs.c
+@@ -25,6 +25,8 @@ acpi_ps_get_next_package_length(struct acpi_parse_state *parser_state);
+ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
+ 						       *parser_state);
+ 
++static void acpi_ps_free_field_list(union acpi_parse_object *start);
++
+ /*******************************************************************************
+  *
+  * FUNCTION:    acpi_ps_get_next_package_length
+@@ -683,6 +685,39 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
+ 	return_PTR(field);
+ }
+ 
++/*******************************************************************************
++ *
++ * FUNCTION:    acpi_ps_free_field_list
++ *
++ * PARAMETERS:  start               - First Op in field list
++ *
++ * RETURN:      None.
++ *
++ * DESCRIPTION: Free all Op objects inside a field list.
++ *
++ ******************************************************************************/
++
++static void acpi_ps_free_field_list(union acpi_parse_object *start)
++{
++	union acpi_parse_object *cur = start;
++	union acpi_parse_object *next;
++	union acpi_parse_object *arg;
++
++	while (cur) {
++		next = cur->common.next;
++
++		/* AML_INT_CONNECTION_OP can have a single argument */
++
++		arg = acpi_ps_get_arg(cur, 0);
++		if (arg) {
++			acpi_ps_free_op(arg);
++		}
++
++		acpi_ps_free_op(cur);
++		cur = next;
++	}
++}
++
+ /*******************************************************************************
+  *
+  * FUNCTION:    acpi_ps_get_next_arg
+@@ -751,6 +786,10 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
+ 			while (parser_state->aml < parser_state->pkg_end) {
+ 				field = acpi_ps_get_next_field(parser_state);
+ 				if (!field) {
++					if (arg) {
++						acpi_ps_free_field_list(arg);
++					}
++
+ 					return_ACPI_STATUS(AE_NO_MEMORY);
+ 				}
+ 
+@@ -820,6 +859,10 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
+ 			    acpi_ps_get_next_namepath(walk_state, parser_state,
+ 						      arg,
+ 						      ACPI_NOT_METHOD_CALL);
++			if (ACPI_FAILURE(status)) {
++				acpi_ps_free_op(arg);
++				return_ACPI_STATUS(status);
++			}
+ 		} else {
+ 			/* Single complex argument, nothing returned */
+ 
+@@ -854,6 +897,10 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
+ 			    acpi_ps_get_next_namepath(walk_state, parser_state,
+ 						      arg,
+ 						      ACPI_POSSIBLE_METHOD_CALL);
++			if (ACPI_FAILURE(status)) {
++				acpi_ps_free_op(arg);
++				return_ACPI_STATUS(status);
++			}
+ 
+ 			if (arg->common.aml_opcode == AML_INT_METHODCALL_OP) {
+ 
+diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
+index 7f7ad94f22b911..e3cbaf3c3bbc15 100644
+--- a/drivers/acpi/battery.c
++++ b/drivers/acpi/battery.c
+@@ -703,28 +703,35 @@ static LIST_HEAD(acpi_battery_list);
+ static LIST_HEAD(battery_hook_list);
+ static DEFINE_MUTEX(hook_mutex);
+ 
+-static void __battery_hook_unregister(struct acpi_battery_hook *hook, int lock)
++static void battery_hook_unregister_unlocked(struct acpi_battery_hook *hook)
+ {
+ 	struct acpi_battery *battery;
++
+ 	/*
+ 	 * In order to remove a hook, we first need to
+ 	 * de-register all the batteries that are registered.
+ 	 */
+-	if (lock)
+-		mutex_lock(&hook_mutex);
+ 	list_for_each_entry(battery, &acpi_battery_list, list) {
+ 		if (!hook->remove_battery(battery->bat, hook))
+ 			power_supply_changed(battery->bat);
+ 	}
+-	list_del(&hook->list);
+-	if (lock)
+-		mutex_unlock(&hook_mutex);
++	list_del_init(&hook->list);
++
+ 	pr_info("extension unregistered: %s\n", hook->name);
+ }
+ 
+ void battery_hook_unregister(struct acpi_battery_hook *hook)
+ {
+-	__battery_hook_unregister(hook, 1);
++	mutex_lock(&hook_mutex);
++	/*
++	 * Ignore already unregistered battery hooks. This might happen
++	 * if a battery hook was previously unloaded due to an error when
++	 * adding a new battery.
++	 */
++	if (!list_empty(&hook->list))
++		battery_hook_unregister_unlocked(hook);
++
++	mutex_unlock(&hook_mutex);
+ }
+ EXPORT_SYMBOL_GPL(battery_hook_unregister);
+ 
+@@ -733,7 +740,6 @@ void battery_hook_register(struct acpi_battery_hook *hook)
+ 	struct acpi_battery *battery;
+ 
+ 	mutex_lock(&hook_mutex);
+-	INIT_LIST_HEAD(&hook->list);
+ 	list_add(&hook->list, &battery_hook_list);
+ 	/*
+ 	 * Now that the driver is registered, we need
+@@ -750,7 +756,7 @@ void battery_hook_register(struct acpi_battery_hook *hook)
+ 			 * hooks.
+ 			 */
+ 			pr_err("extension failed to load: %s", hook->name);
+-			__battery_hook_unregister(hook, 0);
++			battery_hook_unregister_unlocked(hook);
+ 			goto end;
+ 		}
+ 
+@@ -789,7 +795,7 @@ static void battery_hook_add_battery(struct acpi_battery *battery)
+ 			 */
+ 			pr_err("error in extension, unloading: %s",
+ 					hook_node->name);
+-			__battery_hook_unregister(hook_node, 0);
++			battery_hook_unregister_unlocked(hook_node);
+ 		}
+ 	}
+ 	mutex_unlock(&hook_mutex);
+@@ -822,7 +828,7 @@ static void __exit battery_hook_exit(void)
+ 	 * need to remove the hooks.
+ 	 */
+ 	list_for_each_entry_safe(hook, ptr, &battery_hook_list, list) {
+-		__battery_hook_unregister(hook, 1);
++		battery_hook_unregister(hook);
+ 	}
+ 	mutex_destroy(&hook_mutex);
+ }
+diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c
+index 28217a995f795c..7aced0b9bad7cc 100644
+--- a/drivers/acpi/cppc_acpi.c
++++ b/drivers/acpi/cppc_acpi.c
+@@ -100,6 +100,11 @@ static DEFINE_PER_CPU(struct cpc_desc *, cpc_desc_ptr);
+ 				(cpc)->cpc_entry.reg.space_id ==	\
+ 				ACPI_ADR_SPACE_PLATFORM_COMM)
+ 
++/* Check if a CPC register is in FFH */
++#define CPC_IN_FFH(cpc) ((cpc)->type == ACPI_TYPE_BUFFER &&		\
++				(cpc)->cpc_entry.reg.space_id ==	\
++				ACPI_ADR_SPACE_FIXED_HARDWARE)
++
+ /* Check if a CPC register is in SystemMemory */
+ #define CPC_IN_SYSTEM_MEMORY(cpc) ((cpc)->type == ACPI_TYPE_BUFFER &&	\
+ 				(cpc)->cpc_entry.reg.space_id ==	\
+@@ -1514,9 +1519,12 @@ int cppc_set_epp_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls, bool enable)
+ 		/* after writing CPC, transfer the ownership of PCC to platform */
+ 		ret = send_pcc_cmd(pcc_ss_id, CMD_WRITE);
+ 		up_write(&pcc_ss_data->pcc_lock);
++	} else if (osc_cpc_flexible_adr_space_confirmed &&
++		   CPC_SUPPORTED(epp_set_reg) && CPC_IN_FFH(epp_set_reg)) {
++		ret = cpc_write(cpu, epp_set_reg, perf_ctrls->energy_perf);
+ 	} else {
+ 		ret = -ENOTSUPP;
+-		pr_debug("_CPC in PCC is not supported\n");
++		pr_debug("_CPC in PCC and _CPC in FFH are not supported\n");
+ 	}
+ 
+ 	return ret;
+diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
+index 35e22a2af4e4b9..115994dfefec1e 100644
+--- a/drivers/acpi/ec.c
++++ b/drivers/acpi/ec.c
+@@ -783,6 +783,9 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec,
+ 	unsigned long tmp;
+ 	int ret = 0;
+ 
++	if (t->rdata)
++		memset(t->rdata, 0, t->rlen);
++
+ 	/* start transaction */
+ 	spin_lock_irqsave(&ec->lock, tmp);
+ 	/* Enable GPE for command processing (IBF=0/OBF=1) */
+@@ -819,8 +822,6 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t)
+ 
+ 	if (!ec || (!t) || (t->wlen && !t->wdata) || (t->rlen && !t->rdata))
+ 		return -EINVAL;
+-	if (t->rdata)
+-		memset(t->rdata, 0, t->rlen);
+ 
+ 	mutex_lock(&ec->mutex);
+ 	if (ec->global_lock) {
+@@ -847,7 +848,7 @@ static int acpi_ec_burst_enable(struct acpi_ec *ec)
+ 				.wdata = NULL, .rdata = &d,
+ 				.wlen = 0, .rlen = 1};
+ 
+-	return acpi_ec_transaction(ec, &t);
++	return acpi_ec_transaction_unlocked(ec, &t);
+ }
+ 
+ static int acpi_ec_burst_disable(struct acpi_ec *ec)
+@@ -857,7 +858,7 @@ static int acpi_ec_burst_disable(struct acpi_ec *ec)
+ 				.wlen = 0, .rlen = 0};
+ 
+ 	return (acpi_ec_read_status(ec) & ACPI_EC_FLAG_BURST) ?
+-				acpi_ec_transaction(ec, &t) : 0;
++				acpi_ec_transaction_unlocked(ec, &t) : 0;
+ }
+ 
+ static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 *data)
+@@ -873,6 +874,19 @@ static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 *data)
+ 	return result;
+ }
+ 
++static int acpi_ec_read_unlocked(struct acpi_ec *ec, u8 address, u8 *data)
++{
++	int result;
++	u8 d;
++	struct transaction t = {.command = ACPI_EC_COMMAND_READ,
++				.wdata = &address, .rdata = &d,
++				.wlen = 1, .rlen = 1};
++
++	result = acpi_ec_transaction_unlocked(ec, &t);
++	*data = d;
++	return result;
++}
++
+ static int acpi_ec_write(struct acpi_ec *ec, u8 address, u8 data)
+ {
+ 	u8 wdata[2] = { address, data };
+@@ -883,6 +897,16 @@ static int acpi_ec_write(struct acpi_ec *ec, u8 address, u8 data)
+ 	return acpi_ec_transaction(ec, &t);
+ }
+ 
++static int acpi_ec_write_unlocked(struct acpi_ec *ec, u8 address, u8 data)
++{
++	u8 wdata[2] = { address, data };
++	struct transaction t = {.command = ACPI_EC_COMMAND_WRITE,
++				.wdata = wdata, .rdata = NULL,
++				.wlen = 2, .rlen = 0};
++
++	return acpi_ec_transaction_unlocked(ec, &t);
++}
++
+ int ec_read(u8 addr, u8 *val)
+ {
+ 	int err;
+@@ -1323,6 +1347,7 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
+ 	struct acpi_ec *ec = handler_context;
+ 	int result = 0, i, bytes = bits / 8;
+ 	u8 *value = (u8 *)value64;
++	u32 glk;
+ 
+ 	if ((address > 0xFF) || !value || !handler_context)
+ 		return AE_BAD_PARAMETER;
+@@ -1330,13 +1355,25 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
+ 	if (function != ACPI_READ && function != ACPI_WRITE)
+ 		return AE_BAD_PARAMETER;
+ 
++	mutex_lock(&ec->mutex);
++
++	if (ec->global_lock) {
++		acpi_status status;
++
++		status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &glk);
++		if (ACPI_FAILURE(status)) {
++			result = -ENODEV;
++			goto unlock;
++		}
++	}
++
+ 	if (ec->busy_polling || bits > 8)
+ 		acpi_ec_burst_enable(ec);
+ 
+ 	for (i = 0; i < bytes; ++i, ++address, ++value) {
+ 		result = (function == ACPI_READ) ?
+-			acpi_ec_read(ec, address, value) :
+-			acpi_ec_write(ec, address, *value);
++			acpi_ec_read_unlocked(ec, address, value) :
++			acpi_ec_write_unlocked(ec, address, *value);
+ 		if (result < 0)
+ 			break;
+ 	}
+@@ -1344,6 +1381,12 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
+ 	if (ec->busy_polling || bits > 8)
+ 		acpi_ec_burst_disable(ec);
+ 
++	if (ec->global_lock)
++		acpi_release_global_lock(glk);
++
++unlock:
++	mutex_unlock(&ec->mutex);
++
+ 	switch (result) {
+ 	case -EINVAL:
+ 		return AE_BAD_PARAMETER;
+diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
+index 3a13b22c8d9a54..95233b413c1ac5 100644
+--- a/drivers/acpi/resource.c
++++ b/drivers/acpi/resource.c
+@@ -439,6 +439,13 @@ static const struct dmi_system_id asus_laptop[] = {
+ 			DMI_MATCH(DMI_BOARD_NAME, "S5602ZA"),
+ 		},
+ 	},
++	{
++		/* Asus Vivobook X1704VAP */
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
++			DMI_MATCH(DMI_BOARD_NAME, "X1704VAP"),
++		},
++	},
+ 	{
+ 		.ident = "Asus ExpertBook B1402CBA",
+ 		.matches = {
+@@ -502,6 +509,13 @@ static const struct dmi_system_id maingear_laptop[] = {
+ 			DMI_MATCH(DMI_PRODUCT_NAME, "MG-VCP2-15A3070T"),
+ 		}
+ 	},
++	{
++		/* Asus ExpertBook B2502CVA */
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
++			DMI_MATCH(DMI_BOARD_NAME, "B2502CVA"),
++		},
++	},
+ 	{
+ 		/* TongFang GMxXGxx/TUXEDO Polaris 15 Gen5 AMD */
+ 		.matches = {
+diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
+index 16ab2d9ef67f34..e96afb1622f95f 100644
+--- a/drivers/acpi/video_detect.c
++++ b/drivers/acpi/video_detect.c
+@@ -260,6 +260,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
+ 		DMI_MATCH(DMI_PRODUCT_NAME, "PCG-FRV35"),
+ 		},
+ 	},
++	{
++	 .callback = video_detect_force_vendor,
++	 /* Panasonic Toughbook CF-18 */
++	 .matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "Matsushita Electric Industrial"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "CF-18"),
++		},
++	},
+ 
+ 	/*
+ 	 * Toshiba models with Transflective display, these need to use
+diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
+index 549ff24a982311..4edddf6bcc1507 100644
+--- a/drivers/ata/pata_serverworks.c
++++ b/drivers/ata/pata_serverworks.c
+@@ -46,10 +46,11 @@
+ #define SVWKS_CSB5_REVISION_NEW	0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */
+ #define SVWKS_CSB6_REVISION	0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */
+ 
+-/* Seagate Barracuda ATA IV Family drives in UDMA mode 5
+- * can overrun their FIFOs when used with the CSB5 */
+-
+-static const char *csb_bad_ata100[] = {
++/*
++ * Seagate Barracuda ATA IV Family drives in UDMA mode 5
++ * can overrun their FIFOs when used with the CSB5.
++ */
++static const char * const csb_bad_ata100[] = {
+ 	"ST320011A",
+ 	"ST340016A",
+ 	"ST360021A",
+@@ -163,10 +164,11 @@ static unsigned int serverworks_osb4_filter(struct ata_device *adev, unsigned in
+  *	@adev: ATA device
+  *	@mask: Mask of proposed modes
+  *
+- *	Check the blacklist and disable UDMA5 if matched
++ *	Check the list of devices with broken UDMA5 and
++ *	disable UDMA5 if matched.
+  */
+-
+-static unsigned int serverworks_csb_filter(struct ata_device *adev, unsigned int mask)
++static unsigned int serverworks_csb_filter(struct ata_device *adev,
++					   unsigned int mask)
+ {
+ 	const char *p;
+ 	char model_num[ATA_ID_PROD_LEN + 1];
+diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
+index cc77c024828431..df095659bae0f5 100644
+--- a/drivers/ata/sata_sil.c
++++ b/drivers/ata/sata_sil.c
+@@ -128,7 +128,7 @@ static const struct pci_device_id sil_pci_tbl[] = {
+ static const struct sil_drivelist {
+ 	const char *product;
+ 	unsigned int quirk;
+-} sil_blacklist [] = {
++} sil_quirks[] = {
+ 	{ "ST320012AS",		SIL_QUIRK_MOD15WRITE },
+ 	{ "ST330013AS",		SIL_QUIRK_MOD15WRITE },
+ 	{ "ST340017AS",		SIL_QUIRK_MOD15WRITE },
+@@ -600,8 +600,8 @@ static void sil_thaw(struct ata_port *ap)
+  *	list, and apply the fixups to only the specific
+  *	devices/hosts/firmwares that need it.
+  *
+- *	20040111 - Seagate drives affected by the Mod15Write bug are blacklisted
+- *	The Maxtor quirk is in the blacklist, but I'm keeping the original
++ *	20040111 - Seagate drives affected by the Mod15Write bug are quirked
++ *	The Maxtor quirk is in sil_quirks, but I'm keeping the original
+  *	pessimistic fix for the following reasons...
+  *	- There seems to be less info on it, only one device gleaned off the
+  *	Windows	driver, maybe only one is affected.  More info would be greatly
+@@ -620,9 +620,9 @@ static void sil_dev_config(struct ata_device *dev)
+ 
+ 	ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
+ 
+-	for (n = 0; sil_blacklist[n].product; n++)
+-		if (!strcmp(sil_blacklist[n].product, model_num)) {
+-			quirks = sil_blacklist[n].quirk;
++	for (n = 0; sil_quirks[n].product; n++)
++		if (!strcmp(sil_quirks[n].product, model_num)) {
++			quirks = sil_quirks[n].quirk;
+ 			break;
+ 		}
+ 
+diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
+index cc9077b588d7e7..d1f4ddc576451a 100644
+--- a/drivers/block/aoe/aoecmd.c
++++ b/drivers/block/aoe/aoecmd.c
+@@ -361,6 +361,7 @@ ata_rw_frameinit(struct frame *f)
+ 	}
+ 
+ 	ah->cmdstat = ATA_CMD_PIO_READ | writebit | extbit;
++	dev_hold(t->ifp->nd);
+ 	skb->dev = t->ifp->nd;
+ }
+ 
+@@ -401,6 +402,8 @@ aoecmd_ata_rw(struct aoedev *d)
+ 		__skb_queue_head_init(&queue);
+ 		__skb_queue_tail(&queue, skb);
+ 		aoenet_xmit(&queue);
++	} else {
++		dev_put(f->t->ifp->nd);
+ 	}
+ 	return 1;
+ }
+@@ -483,10 +486,13 @@ resend(struct aoedev *d, struct frame *f)
+ 	memcpy(h->dst, t->addr, sizeof h->dst);
+ 	memcpy(h->src, t->ifp->nd->dev_addr, sizeof h->src);
+ 
++	dev_hold(t->ifp->nd);
+ 	skb->dev = t->ifp->nd;
+ 	skb = skb_clone(skb, GFP_ATOMIC);
+-	if (skb == NULL)
++	if (skb == NULL) {
++		dev_put(t->ifp->nd);
+ 		return;
++	}
+ 	f->sent = ktime_get();
+ 	__skb_queue_head_init(&queue);
+ 	__skb_queue_tail(&queue, skb);
+@@ -617,6 +623,8 @@ probe(struct aoetgt *t)
+ 		__skb_queue_head_init(&queue);
+ 		__skb_queue_tail(&queue, skb);
+ 		aoenet_xmit(&queue);
++	} else {
++		dev_put(f->t->ifp->nd);
+ 	}
+ }
+ 
+@@ -1395,6 +1403,7 @@ aoecmd_ata_id(struct aoedev *d)
+ 	ah->cmdstat = ATA_CMD_ID_ATA;
+ 	ah->lba3 = 0xa0;
+ 
++	dev_hold(t->ifp->nd);
+ 	skb->dev = t->ifp->nd;
+ 
+ 	d->rttavg = RTTAVG_INIT;
+@@ -1404,6 +1413,8 @@ aoecmd_ata_id(struct aoedev *d)
+ 	skb = skb_clone(skb, GFP_ATOMIC);
+ 	if (skb)
+ 		f->sent = ktime_get();
++	else
++		dev_put(t->ifp->nd);
+ 
+ 	return skb;
+ }
+diff --git a/drivers/block/loop.c b/drivers/block/loop.c
+index 552f56a84a7eb2..886c6359903779 100644
+--- a/drivers/block/loop.c
++++ b/drivers/block/loop.c
+@@ -211,13 +211,10 @@ static void __loop_update_dio(struct loop_device *lo, bool dio)
+ 	if (lo->lo_state == Lo_bound)
+ 		blk_mq_freeze_queue(lo->lo_queue);
+ 	lo->use_dio = use_dio;
+-	if (use_dio) {
+-		blk_queue_flag_clear(QUEUE_FLAG_NOMERGES, lo->lo_queue);
++	if (use_dio)
+ 		lo->lo_flags |= LO_FLAGS_DIRECT_IO;
+-	} else {
+-		blk_queue_flag_set(QUEUE_FLAG_NOMERGES, lo->lo_queue);
++	else
+ 		lo->lo_flags &= ~LO_FLAGS_DIRECT_IO;
+-	}
+ 	if (lo->lo_state == Lo_bound)
+ 		blk_mq_unfreeze_queue(lo->lo_queue);
+ }
+@@ -2038,14 +2035,6 @@ static int loop_add(int i)
+ 
+ 	blk_queue_max_hw_sectors(lo->lo_queue, BLK_DEF_MAX_SECTORS);
+ 
+-	/*
+-	 * By default, we do buffer IO, so it doesn't make sense to enable
+-	 * merge because the I/O submitted to backing file is handled page by
+-	 * page. For directio mode, merge does help to dispatch bigger request
+-	 * to underlayer disk. We will enable merge once directio is enabled.
+-	 */
+-	blk_queue_flag_set(QUEUE_FLAG_NOMERGES, lo->lo_queue);
+-
+ 	/*
+ 	 * Disable partition scanning by default. The in-kernel partition
+ 	 * scanning can be requested individually per-device during its
+diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c
+index f1b7d7fdffec84..97ed3bd9707f41 100644
+--- a/drivers/block/null_blk/main.c
++++ b/drivers/block/null_blk/main.c
+@@ -392,13 +392,25 @@ static int nullb_update_nr_hw_queues(struct nullb_device *dev,
+ static int nullb_apply_submit_queues(struct nullb_device *dev,
+ 				     unsigned int submit_queues)
+ {
+-	return nullb_update_nr_hw_queues(dev, submit_queues, dev->poll_queues);
++	int ret;
++
++	mutex_lock(&lock);
++	ret = nullb_update_nr_hw_queues(dev, submit_queues, dev->poll_queues);
++	mutex_unlock(&lock);
++
++	return ret;
+ }
+ 
+ static int nullb_apply_poll_queues(struct nullb_device *dev,
+ 				   unsigned int poll_queues)
+ {
+-	return nullb_update_nr_hw_queues(dev, dev->submit_queues, poll_queues);
++	int ret;
++
++	mutex_lock(&lock);
++	ret = nullb_update_nr_hw_queues(dev, dev->submit_queues, poll_queues);
++	mutex_unlock(&lock);
++
++	return ret;
+ }
+ 
+ NULLB_DEVICE_ATTR(size, ulong, NULL);
+@@ -444,28 +456,32 @@ static ssize_t nullb_device_power_store(struct config_item *item,
+ 	if (ret < 0)
+ 		return ret;
+ 
++	ret = count;
++	mutex_lock(&lock);
+ 	if (!dev->power && newp) {
+ 		if (test_and_set_bit(NULLB_DEV_FL_UP, &dev->flags))
+-			return count;
++			goto out;
++
+ 		ret = null_add_dev(dev);
+ 		if (ret) {
+ 			clear_bit(NULLB_DEV_FL_UP, &dev->flags);
+-			return ret;
++			goto out;
+ 		}
+ 
+ 		set_bit(NULLB_DEV_FL_CONFIGURED, &dev->flags);
+ 		dev->power = newp;
++		ret = count;
+ 	} else if (dev->power && !newp) {
+ 		if (test_and_clear_bit(NULLB_DEV_FL_UP, &dev->flags)) {
+-			mutex_lock(&lock);
+ 			dev->power = newp;
+ 			null_del_dev(dev->nullb);
+-			mutex_unlock(&lock);
+ 		}
+ 		clear_bit(NULLB_DEV_FL_CONFIGURED, &dev->flags);
+ 	}
+ 
+-	return count;
++out:
++	mutex_unlock(&lock);
++	return ret;
+ }
+ 
+ CONFIGFS_ATTR(nullb_device_, power);
+@@ -1819,7 +1835,7 @@ static void null_del_dev(struct nullb *nullb)
+ 
+ 	dev = nullb->dev;
+ 
+-	ida_simple_remove(&nullb_indexes, nullb->index);
++	ida_free(&nullb_indexes, nullb->index);
+ 
+ 	list_del_init(&nullb->list);
+ 
+@@ -2153,15 +2169,12 @@ static int null_add_dev(struct nullb_device *dev)
+ 	nullb->q->queuedata = nullb;
+ 	blk_queue_flag_set(QUEUE_FLAG_NONROT, nullb->q);
+ 
+-	mutex_lock(&lock);
+-	rv = ida_simple_get(&nullb_indexes, 0, 0, GFP_KERNEL);
+-	if (rv < 0) {
+-		mutex_unlock(&lock);
++	rv = ida_alloc(&nullb_indexes, GFP_KERNEL);
++	if (rv < 0)
+ 		goto out_cleanup_zone;
+-	}
++
+ 	nullb->index = rv;
+ 	dev->index = rv;
+-	mutex_unlock(&lock);
+ 
+ 	blk_queue_logical_block_size(nullb->q, dev->blocksize);
+ 	blk_queue_physical_block_size(nullb->q, dev->blocksize);
+@@ -2185,9 +2198,7 @@ static int null_add_dev(struct nullb_device *dev)
+ 	if (rv)
+ 		goto out_ida_free;
+ 
+-	mutex_lock(&lock);
+ 	list_add_tail(&nullb->list, &nullb_list);
+-	mutex_unlock(&lock);
+ 
+ 	pr_info("disk %s created\n", nullb->disk_name);
+ 
+@@ -2236,7 +2247,9 @@ static int null_create_dev(void)
+ 	if (!dev)
+ 		return -ENOMEM;
+ 
++	mutex_lock(&lock);
+ 	ret = null_add_dev(dev);
++	mutex_unlock(&lock);
+ 	if (ret) {
+ 		null_free_dev(dev);
+ 		return ret;
+diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
+index d76c799553aaa1..468e4165c7cc0e 100644
+--- a/drivers/bluetooth/btmrvl_sdio.c
++++ b/drivers/bluetooth/btmrvl_sdio.c
+@@ -92,7 +92,7 @@ static int btmrvl_sdio_probe_of(struct device *dev,
+ 		} else {
+ 			ret = devm_request_irq(dev, cfg->irq_bt,
+ 					       btmrvl_wake_irq_bt,
+-					       0, "bt_wake", card);
++					       IRQF_NO_AUTOEN, "bt_wake", card);
+ 			if (ret) {
+ 				dev_err(dev,
+ 					"Failed to request irq_bt %d (%d)\n",
+@@ -101,7 +101,6 @@ static int btmrvl_sdio_probe_of(struct device *dev,
+ 
+ 			/* Configure wakeup (enabled by default) */
+ 			device_init_wakeup(dev, true);
+-			disable_irq(cfg->irq_bt);
+ 		}
+ 	}
+ 
+diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
+index 277d039ecbb429..1e7c1f9db9e4b9 100644
+--- a/drivers/bluetooth/btrtl.c
++++ b/drivers/bluetooth/btrtl.c
+@@ -1285,6 +1285,7 @@ void btrtl_set_quirks(struct hci_dev *hdev, struct btrtl_device_info *btrtl_dev)
+ 			btrealtek_set_flag(hdev, REALTEK_ALT6_CONTINUOUS_TX_CHIP);
+ 
+ 		if (btrtl_dev->project_id == CHIP_ID_8852A ||
++		    btrtl_dev->project_id == CHIP_ID_8852B ||
+ 		    btrtl_dev->project_id == CHIP_ID_8852C)
+ 			set_bit(HCI_QUIRK_USE_MSFT_EXT_ADDRESS_FILTER, &hdev->quirks);
+ 
+diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
+index 0a58106207b0c3..bc53da383f855a 100644
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -537,6 +537,8 @@ static const struct usb_device_id quirks_table[] = {
+ 						     BTUSB_WIDEBAND_SPEECH },
+ 	{ USB_DEVICE(0x13d3, 0x3592), .driver_info = BTUSB_REALTEK |
+ 						     BTUSB_WIDEBAND_SPEECH },
++	{ USB_DEVICE(0x0489, 0xe122), .driver_info = BTUSB_REALTEK |
++						     BTUSB_WIDEBAND_SPEECH },
+ 
+ 	/* Realtek 8852BE Bluetooth devices */
+ 	{ USB_DEVICE(0x0cb8, 0xc559), .driver_info = BTUSB_REALTEK |
+diff --git a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c
+index 7464cf64803fd7..8b3e5f84e89a77 100644
+--- a/drivers/clk/qcom/clk-alpha-pll.c
++++ b/drivers/clk/qcom/clk-alpha-pll.c
+@@ -1638,7 +1638,7 @@ static int __alpha_pll_trion_set_rate(struct clk_hw *hw, unsigned long rate,
+ 	if (ret < 0)
+ 		return ret;
+ 
+-	regmap_write(pll->clkr.regmap, PLL_L_VAL(pll), l);
++	regmap_update_bits(pll->clkr.regmap, PLL_L_VAL(pll), LUCID_EVO_PLL_L_VAL_MASK,  l);
+ 	regmap_write(pll->clkr.regmap, PLL_ALPHA_VAL(pll), a);
+ 
+ 	/* Latch the PLL input */
+diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
+index 4c5b552b47b6a1..a556c9e77d192d 100644
+--- a/drivers/clk/qcom/clk-rpmh.c
++++ b/drivers/clk/qcom/clk-rpmh.c
+@@ -263,6 +263,8 @@ static int clk_rpmh_bcm_send_cmd(struct clk_rpmh *c, bool enable)
+ 		cmd_state = 0;
+ 	}
+ 
++	cmd_state = min(cmd_state, BCM_TCS_CMD_VOTE_MASK);
++
+ 	if (c->last_sent_aggr_state != cmd_state) {
+ 		cmd.addr = c->res_addr;
+ 		cmd.data = BCM_TCS_CMD(1, enable, 0, cmd_state);
+diff --git a/drivers/clk/qcom/dispcc-sm8250.c b/drivers/clk/qcom/dispcc-sm8250.c
+index 9a9e0852c91f23..317a7e2b50bfbc 100644
+--- a/drivers/clk/qcom/dispcc-sm8250.c
++++ b/drivers/clk/qcom/dispcc-sm8250.c
+@@ -851,6 +851,7 @@ static struct clk_branch disp_cc_mdss_dp_link1_intf_clk = {
+ 				&disp_cc_mdss_dp_link1_div_clk_src.clkr.hw,
+ 			},
+ 			.num_parents = 1,
++			.flags = CLK_SET_RATE_PARENT,
+ 			.ops = &clk_branch2_ops,
+ 		},
+ 	},
+@@ -886,6 +887,7 @@ static struct clk_branch disp_cc_mdss_dp_link_intf_clk = {
+ 				&disp_cc_mdss_dp_link_div_clk_src.clkr.hw,
+ 			},
+ 			.num_parents = 1,
++			.flags = CLK_SET_RATE_PARENT,
+ 			.ops = &clk_branch2_ops,
+ 		},
+ 	},
+@@ -1011,6 +1013,7 @@ static struct clk_branch disp_cc_mdss_mdp_lut_clk = {
+ 				&disp_cc_mdss_mdp_clk_src.clkr.hw,
+ 			},
+ 			.num_parents = 1,
++			.flags = CLK_SET_RATE_PARENT,
+ 			.ops = &clk_branch2_ops,
+ 		},
+ 	},
+diff --git a/drivers/clk/qcom/gcc-sc8180x.c b/drivers/clk/qcom/gcc-sc8180x.c
+index ae21473815596d..ec0c45881c67a7 100644
+--- a/drivers/clk/qcom/gcc-sc8180x.c
++++ b/drivers/clk/qcom/gcc-sc8180x.c
+@@ -142,6 +142,23 @@ static struct clk_alpha_pll gpll7 = {
+ 	},
+ };
+ 
++static struct clk_alpha_pll gpll9 = {
++	.offset = 0x1c000,
++	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_TRION],
++	.clkr = {
++		.enable_reg = 0x52000,
++		.enable_mask = BIT(9),
++		.hw.init = &(const struct clk_init_data) {
++			.name = "gpll9",
++			.parent_data = &(const struct clk_parent_data) {
++				.fw_name = "bi_tcxo",
++			},
++			.num_parents = 1,
++			.ops = &clk_alpha_pll_fixed_trion_ops,
++		},
++	},
++};
++
+ static const struct parent_map gcc_parent_map_0[] = {
+ 	{ P_BI_TCXO, 0 },
+ 	{ P_GPLL0_OUT_MAIN, 1 },
+@@ -241,7 +258,7 @@ static const struct parent_map gcc_parent_map_7[] = {
+ static const struct clk_parent_data gcc_parents_7[] = {
+ 	{ .fw_name = "bi_tcxo", },
+ 	{ .hw = &gpll0.clkr.hw },
+-	{ .name = "gppl9" },
++	{ .hw = &gpll9.clkr.hw },
+ 	{ .hw = &gpll4.clkr.hw },
+ 	{ .hw = &gpll0_out_even.clkr.hw },
+ };
+@@ -260,28 +277,6 @@ static const struct clk_parent_data gcc_parents_8[] = {
+ 	{ .hw = &gpll0_out_even.clkr.hw },
+ };
+ 
+-static const struct freq_tbl ftbl_gcc_cpuss_ahb_clk_src[] = {
+-	F(19200000, P_BI_TCXO, 1, 0, 0),
+-	F(50000000, P_GPLL0_OUT_MAIN, 12, 0, 0),
+-	F(100000000, P_GPLL0_OUT_MAIN, 6, 0, 0),
+-	{ }
+-};
+-
+-static struct clk_rcg2 gcc_cpuss_ahb_clk_src = {
+-	.cmd_rcgr = 0x48014,
+-	.mnd_width = 0,
+-	.hid_width = 5,
+-	.parent_map = gcc_parent_map_0,
+-	.freq_tbl = ftbl_gcc_cpuss_ahb_clk_src,
+-	.clkr.hw.init = &(struct clk_init_data){
+-		.name = "gcc_cpuss_ahb_clk_src",
+-		.parent_data = gcc_parents_0,
+-		.num_parents = ARRAY_SIZE(gcc_parents_0),
+-		.flags = CLK_SET_RATE_PARENT,
+-		.ops = &clk_rcg2_ops,
+-	},
+-};
+-
+ static const struct freq_tbl ftbl_gcc_emac_ptp_clk_src[] = {
+ 	F(19200000, P_BI_TCXO, 1, 0, 0),
+ 	F(50000000, P_GPLL0_OUT_EVEN, 6, 0, 0),
+@@ -916,7 +911,7 @@ static const struct freq_tbl ftbl_gcc_sdcc2_apps_clk_src[] = {
+ 	F(25000000, P_GPLL0_OUT_MAIN, 12, 1, 2),
+ 	F(50000000, P_GPLL0_OUT_MAIN, 12, 0, 0),
+ 	F(100000000, P_GPLL0_OUT_MAIN, 6, 0, 0),
+-	F(200000000, P_GPLL0_OUT_MAIN, 3, 0, 0),
++	F(202000000, P_GPLL9_OUT_MAIN, 4, 0, 0),
+ 	{ }
+ };
+ 
+@@ -939,9 +934,8 @@ static const struct freq_tbl ftbl_gcc_sdcc4_apps_clk_src[] = {
+ 	F(400000, P_BI_TCXO, 12, 1, 4),
+ 	F(9600000, P_BI_TCXO, 2, 0, 0),
+ 	F(19200000, P_BI_TCXO, 1, 0, 0),
+-	F(37500000, P_GPLL0_OUT_MAIN, 16, 0, 0),
+ 	F(50000000, P_GPLL0_OUT_MAIN, 12, 0, 0),
+-	F(75000000, P_GPLL0_OUT_MAIN, 8, 0, 0),
++	F(100000000, P_GPLL0_OUT_MAIN, 6, 0, 0),
+ 	{ }
+ };
+ 
+@@ -1599,25 +1593,6 @@ static struct clk_branch gcc_cfg_noc_usb3_sec_axi_clk = {
+ 	},
+ };
+ 
+-/* For CPUSS functionality the AHB clock needs to be left enabled */
+-static struct clk_branch gcc_cpuss_ahb_clk = {
+-	.halt_reg = 0x48000,
+-	.halt_check = BRANCH_HALT_VOTED,
+-	.clkr = {
+-		.enable_reg = 0x52004,
+-		.enable_mask = BIT(21),
+-		.hw.init = &(struct clk_init_data){
+-			.name = "gcc_cpuss_ahb_clk",
+-			.parent_hws = (const struct clk_hw *[]){
+-				      &gcc_cpuss_ahb_clk_src.clkr.hw
+-			},
+-			.num_parents = 1,
+-			.flags = CLK_IS_CRITICAL | CLK_SET_RATE_PARENT,
+-			.ops = &clk_branch2_ops,
+-		},
+-	},
+-};
+-
+ static struct clk_branch gcc_cpuss_rbcpr_clk = {
+ 	.halt_reg = 0x48008,
+ 	.halt_check = BRANCH_HALT,
+@@ -3150,25 +3125,6 @@ static struct clk_branch gcc_sdcc4_apps_clk = {
+ 	},
+ };
+ 
+-/* For CPUSS functionality the SYS NOC clock needs to be left enabled */
+-static struct clk_branch gcc_sys_noc_cpuss_ahb_clk = {
+-	.halt_reg = 0x4819c,
+-	.halt_check = BRANCH_HALT_VOTED,
+-	.clkr = {
+-		.enable_reg = 0x52004,
+-		.enable_mask = BIT(0),
+-		.hw.init = &(struct clk_init_data){
+-			.name = "gcc_sys_noc_cpuss_ahb_clk",
+-			.parent_hws = (const struct clk_hw *[]){
+-				      &gcc_cpuss_ahb_clk_src.clkr.hw
+-			},
+-			.num_parents = 1,
+-			.flags = CLK_IS_CRITICAL | CLK_SET_RATE_PARENT,
+-			.ops = &clk_branch2_ops,
+-		},
+-	},
+-};
+-
+ static struct clk_branch gcc_tsif_ahb_clk = {
+ 	.halt_reg = 0x36004,
+ 	.halt_check = BRANCH_HALT,
+@@ -4258,8 +4214,6 @@ static struct clk_regmap *gcc_sc8180x_clocks[] = {
+ 	[GCC_CFG_NOC_USB3_MP_AXI_CLK] = &gcc_cfg_noc_usb3_mp_axi_clk.clkr,
+ 	[GCC_CFG_NOC_USB3_PRIM_AXI_CLK] = &gcc_cfg_noc_usb3_prim_axi_clk.clkr,
+ 	[GCC_CFG_NOC_USB3_SEC_AXI_CLK] = &gcc_cfg_noc_usb3_sec_axi_clk.clkr,
+-	[GCC_CPUSS_AHB_CLK] = &gcc_cpuss_ahb_clk.clkr,
+-	[GCC_CPUSS_AHB_CLK_SRC] = &gcc_cpuss_ahb_clk_src.clkr,
+ 	[GCC_CPUSS_RBCPR_CLK] = &gcc_cpuss_rbcpr_clk.clkr,
+ 	[GCC_DDRSS_GPU_AXI_CLK] = &gcc_ddrss_gpu_axi_clk.clkr,
+ 	[GCC_DISP_HF_AXI_CLK] = &gcc_disp_hf_axi_clk.clkr,
+@@ -4396,7 +4350,6 @@ static struct clk_regmap *gcc_sc8180x_clocks[] = {
+ 	[GCC_SDCC4_AHB_CLK] = &gcc_sdcc4_ahb_clk.clkr,
+ 	[GCC_SDCC4_APPS_CLK] = &gcc_sdcc4_apps_clk.clkr,
+ 	[GCC_SDCC4_APPS_CLK_SRC] = &gcc_sdcc4_apps_clk_src.clkr,
+-	[GCC_SYS_NOC_CPUSS_AHB_CLK] = &gcc_sys_noc_cpuss_ahb_clk.clkr,
+ 	[GCC_TSIF_AHB_CLK] = &gcc_tsif_ahb_clk.clkr,
+ 	[GCC_TSIF_INACTIVITY_TIMERS_CLK] = &gcc_tsif_inactivity_timers_clk.clkr,
+ 	[GCC_TSIF_REF_CLK] = &gcc_tsif_ref_clk.clkr,
+@@ -4483,6 +4436,7 @@ static struct clk_regmap *gcc_sc8180x_clocks[] = {
+ 	[GPLL1] = &gpll1.clkr,
+ 	[GPLL4] = &gpll4.clkr,
+ 	[GPLL7] = &gpll7.clkr,
++	[GPLL9] = &gpll9.clkr,
+ };
+ 
+ static const struct qcom_reset_map gcc_sc8180x_resets[] = {
+diff --git a/drivers/clk/qcom/gcc-sm8250.c b/drivers/clk/qcom/gcc-sm8250.c
+index c6c5261264f118..272da807c6945d 100644
+--- a/drivers/clk/qcom/gcc-sm8250.c
++++ b/drivers/clk/qcom/gcc-sm8250.c
+@@ -3226,7 +3226,7 @@ static struct gdsc pcie_0_gdsc = {
+ 	.pd = {
+ 		.name = "pcie_0_gdsc",
+ 	},
+-	.pwrsts = PWRSTS_OFF_ON,
++	.pwrsts = PWRSTS_RET_ON,
+ };
+ 
+ static struct gdsc pcie_1_gdsc = {
+@@ -3234,7 +3234,7 @@ static struct gdsc pcie_1_gdsc = {
+ 	.pd = {
+ 		.name = "pcie_1_gdsc",
+ 	},
+-	.pwrsts = PWRSTS_OFF_ON,
++	.pwrsts = PWRSTS_RET_ON,
+ };
+ 
+ static struct gdsc pcie_2_gdsc = {
+@@ -3242,7 +3242,7 @@ static struct gdsc pcie_2_gdsc = {
+ 	.pd = {
+ 		.name = "pcie_2_gdsc",
+ 	},
+-	.pwrsts = PWRSTS_OFF_ON,
++	.pwrsts = PWRSTS_RET_ON,
+ };
+ 
+ static struct gdsc ufs_card_gdsc = {
+diff --git a/drivers/clk/qcom/gcc-sm8450.c b/drivers/clk/qcom/gcc-sm8450.c
+index 56354298255160..4c55df89ddca7d 100644
+--- a/drivers/clk/qcom/gcc-sm8450.c
++++ b/drivers/clk/qcom/gcc-sm8450.c
+@@ -2974,7 +2974,7 @@ static struct gdsc pcie_0_gdsc = {
+ 	.pd = {
+ 		.name = "pcie_0_gdsc",
+ 	},
+-	.pwrsts = PWRSTS_OFF_ON,
++	.pwrsts = PWRSTS_RET_ON,
+ };
+ 
+ static struct gdsc pcie_1_gdsc = {
+@@ -2982,7 +2982,7 @@ static struct gdsc pcie_1_gdsc = {
+ 	.pd = {
+ 		.name = "pcie_1_gdsc",
+ 	},
+-	.pwrsts = PWRSTS_OFF_ON,
++	.pwrsts = PWRSTS_RET_ON,
+ };
+ 
+ static struct gdsc ufs_phy_gdsc = {
+diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c
+index 4059d9365ae642..b9d6ffcb340912 100644
+--- a/drivers/clk/rockchip/clk.c
++++ b/drivers/clk/rockchip/clk.c
+@@ -433,12 +433,13 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx,
+ 				    struct rockchip_clk_branch *list,
+ 				    unsigned int nr_clk)
+ {
+-	struct clk *clk = NULL;
++	struct clk *clk;
+ 	unsigned int idx;
+ 	unsigned long flags;
+ 
+ 	for (idx = 0; idx < nr_clk; idx++, list++) {
+ 		flags = list->flags;
++		clk = NULL;
+ 
+ 		/* catch simple muxes */
+ 		switch (list->branch_type) {
+diff --git a/drivers/clk/samsung/clk-exynos7885.c b/drivers/clk/samsung/clk-exynos7885.c
+index f7d7427a558ba0..87387d4cbf48a2 100644
+--- a/drivers/clk/samsung/clk-exynos7885.c
++++ b/drivers/clk/samsung/clk-exynos7885.c
+@@ -20,7 +20,7 @@
+ #define CLKS_NR_TOP			(CLK_GOUT_FSYS_USB30DRD + 1)
+ #define CLKS_NR_CORE			(CLK_GOUT_TREX_P_CORE_PCLK_P_CORE + 1)
+ #define CLKS_NR_PERI			(CLK_GOUT_WDT1_PCLK + 1)
+-#define CLKS_NR_FSYS			(CLK_GOUT_MMC_SDIO_SDCLKIN + 1)
++#define CLKS_NR_FSYS			(CLK_MOUT_FSYS_USB30DRD_USER + 1)
+ 
+ /* ---- CMU_TOP ------------------------------------------------------------- */
+ 
+diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
+index 0ee3a04bb1022f..8a4fdf212ce0de 100644
+--- a/drivers/cpufreq/intel_pstate.c
++++ b/drivers/cpufreq/intel_pstate.c
+@@ -1632,7 +1632,7 @@ static void intel_pstate_notify_work(struct work_struct *work)
+ 	wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_STATUS, 0);
+ }
+ 
+-static DEFINE_SPINLOCK(hwp_notify_lock);
++static DEFINE_RAW_SPINLOCK(hwp_notify_lock);
+ static cpumask_t hwp_intr_enable_mask;
+ 
+ void notify_hwp_interrupt(void)
+@@ -1649,7 +1649,7 @@ void notify_hwp_interrupt(void)
+ 	if (!(value & 0x01))
+ 		return;
+ 
+-	spin_lock_irqsave(&hwp_notify_lock, flags);
++	raw_spin_lock_irqsave(&hwp_notify_lock, flags);
+ 
+ 	if (!cpumask_test_cpu(this_cpu, &hwp_intr_enable_mask))
+ 		goto ack_intr;
+@@ -1673,13 +1673,13 @@ void notify_hwp_interrupt(void)
+ 
+ 	schedule_delayed_work(&cpudata->hwp_notify_work, msecs_to_jiffies(10));
+ 
+-	spin_unlock_irqrestore(&hwp_notify_lock, flags);
++	raw_spin_unlock_irqrestore(&hwp_notify_lock, flags);
+ 
+ 	return;
+ 
+ ack_intr:
+ 	wrmsrl_safe(MSR_HWP_STATUS, 0);
+-	spin_unlock_irqrestore(&hwp_notify_lock, flags);
++	raw_spin_unlock_irqrestore(&hwp_notify_lock, flags);
+ }
+ 
+ static void intel_pstate_disable_hwp_interrupt(struct cpudata *cpudata)
+@@ -1692,10 +1692,10 @@ static void intel_pstate_disable_hwp_interrupt(struct cpudata *cpudata)
+ 	/* wrmsrl_on_cpu has to be outside spinlock as this can result in IPC */
+ 	wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_INTERRUPT, 0x00);
+ 
+-	spin_lock_irqsave(&hwp_notify_lock, flags);
++	raw_spin_lock_irqsave(&hwp_notify_lock, flags);
+ 	if (cpumask_test_and_clear_cpu(cpudata->cpu, &hwp_intr_enable_mask))
+ 		cancel_delayed_work(&cpudata->hwp_notify_work);
+-	spin_unlock_irqrestore(&hwp_notify_lock, flags);
++	raw_spin_unlock_irqrestore(&hwp_notify_lock, flags);
+ }
+ 
+ static void intel_pstate_enable_hwp_interrupt(struct cpudata *cpudata)
+@@ -1704,10 +1704,10 @@ static void intel_pstate_enable_hwp_interrupt(struct cpudata *cpudata)
+ 	if (boot_cpu_has(X86_FEATURE_HWP_NOTIFY)) {
+ 		unsigned long flags;
+ 
+-		spin_lock_irqsave(&hwp_notify_lock, flags);
++		raw_spin_lock_irqsave(&hwp_notify_lock, flags);
+ 		INIT_DELAYED_WORK(&cpudata->hwp_notify_work, intel_pstate_notify_work);
+ 		cpumask_set_cpu(cpudata->cpu, &hwp_intr_enable_mask);
+-		spin_unlock_irqrestore(&hwp_notify_lock, flags);
++		raw_spin_unlock_irqrestore(&hwp_notify_lock, flags);
+ 
+ 		/* wrmsrl_on_cpu has to be outside spinlock as this can result in IPC */
+ 		wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_INTERRUPT, 0x01);
+@@ -3136,10 +3136,10 @@ static void intel_pstate_driver_cleanup(void)
+ 			if (intel_pstate_driver == &intel_pstate)
+ 				intel_pstate_clear_update_util_hook(cpu);
+ 
+-			spin_lock(&hwp_notify_lock);
++			raw_spin_lock(&hwp_notify_lock);
+ 			kfree(all_cpu_data[cpu]);
+ 			WRITE_ONCE(all_cpu_data[cpu], NULL);
+-			spin_unlock(&hwp_notify_lock);
++			raw_spin_unlock(&hwp_notify_lock);
+ 		}
+ 	}
+ 	cpus_read_unlock();
+diff --git a/drivers/crypto/marvell/Kconfig b/drivers/crypto/marvell/Kconfig
+index a48591af12d025..78217577aa5403 100644
+--- a/drivers/crypto/marvell/Kconfig
++++ b/drivers/crypto/marvell/Kconfig
+@@ -28,6 +28,7 @@ config CRYPTO_DEV_OCTEONTX_CPT
+ 	select CRYPTO_SKCIPHER
+ 	select CRYPTO_HASH
+ 	select CRYPTO_AEAD
++	select CRYPTO_AUTHENC
+ 	select CRYPTO_DEV_MARVELL
+ 	help
+ 		This driver allows you to utilize the Marvell Cryptographic
+@@ -47,6 +48,7 @@ config CRYPTO_DEV_OCTEONTX2_CPT
+ 	select CRYPTO_SKCIPHER
+ 	select CRYPTO_HASH
+ 	select CRYPTO_AEAD
++	select CRYPTO_AUTHENC
+ 	select NET_DEVLINK
+ 	help
+ 		This driver allows you to utilize the Marvell Cryptographic
+diff --git a/drivers/crypto/marvell/octeontx/otx_cptvf_algs.c b/drivers/crypto/marvell/octeontx/otx_cptvf_algs.c
+index 1c2c870e887aab..f64b72398eced9 100644
+--- a/drivers/crypto/marvell/octeontx/otx_cptvf_algs.c
++++ b/drivers/crypto/marvell/octeontx/otx_cptvf_algs.c
+@@ -17,7 +17,6 @@
+ #include <crypto/sha2.h>
+ #include <crypto/xts.h>
+ #include <crypto/scatterwalk.h>
+-#include <linux/rtnetlink.h>
+ #include <linux/sort.h>
+ #include <linux/module.h>
+ #include "otx_cptvf.h"
+@@ -66,6 +65,8 @@ static struct cpt_device_table ae_devices = {
+ 	.count = ATOMIC_INIT(0)
+ };
+ 
++static struct otx_cpt_sdesc *alloc_sdesc(struct crypto_shash *alg);
++
+ static inline int get_se_device(struct pci_dev **pdev, int *cpu_num)
+ {
+ 	int count, ret = 0;
+@@ -515,44 +516,61 @@ static int cpt_aead_init(struct crypto_aead *tfm, u8 cipher_type, u8 mac_type)
+ 	ctx->cipher_type = cipher_type;
+ 	ctx->mac_type = mac_type;
+ 
++	switch (ctx->mac_type) {
++	case OTX_CPT_SHA1:
++		ctx->hashalg = crypto_alloc_shash("sha1", 0, 0);
++		break;
++
++	case OTX_CPT_SHA256:
++		ctx->hashalg = crypto_alloc_shash("sha256", 0, 0);
++		break;
++
++	case OTX_CPT_SHA384:
++		ctx->hashalg = crypto_alloc_shash("sha384", 0, 0);
++		break;
++
++	case OTX_CPT_SHA512:
++		ctx->hashalg = crypto_alloc_shash("sha512", 0, 0);
++		break;
++	}
++
++	if (IS_ERR(ctx->hashalg))
++		return PTR_ERR(ctx->hashalg);
++
++	crypto_aead_set_reqsize_dma(tfm, sizeof(struct otx_cpt_req_ctx));
++
++	if (!ctx->hashalg)
++		return 0;
++
+ 	/*
+ 	 * When selected cipher is NULL we use HMAC opcode instead of
+ 	 * FLEXICRYPTO opcode therefore we don't need to use HASH algorithms
+ 	 * for calculating ipad and opad
+ 	 */
+ 	if (ctx->cipher_type != OTX_CPT_CIPHER_NULL) {
+-		switch (ctx->mac_type) {
+-		case OTX_CPT_SHA1:
+-			ctx->hashalg = crypto_alloc_shash("sha1", 0,
+-							  CRYPTO_ALG_ASYNC);
+-			if (IS_ERR(ctx->hashalg))
+-				return PTR_ERR(ctx->hashalg);
+-			break;
+-
+-		case OTX_CPT_SHA256:
+-			ctx->hashalg = crypto_alloc_shash("sha256", 0,
+-							  CRYPTO_ALG_ASYNC);
+-			if (IS_ERR(ctx->hashalg))
+-				return PTR_ERR(ctx->hashalg);
+-			break;
++		int ss = crypto_shash_statesize(ctx->hashalg);
+ 
+-		case OTX_CPT_SHA384:
+-			ctx->hashalg = crypto_alloc_shash("sha384", 0,
+-							  CRYPTO_ALG_ASYNC);
+-			if (IS_ERR(ctx->hashalg))
+-				return PTR_ERR(ctx->hashalg);
+-			break;
++		ctx->ipad = kzalloc(ss, GFP_KERNEL);
++		if (!ctx->ipad) {
++			crypto_free_shash(ctx->hashalg);
++			return -ENOMEM;
++		}
+ 
+-		case OTX_CPT_SHA512:
+-			ctx->hashalg = crypto_alloc_shash("sha512", 0,
+-							  CRYPTO_ALG_ASYNC);
+-			if (IS_ERR(ctx->hashalg))
+-				return PTR_ERR(ctx->hashalg);
+-			break;
++		ctx->opad = kzalloc(ss, GFP_KERNEL);
++		if (!ctx->opad) {
++			kfree(ctx->ipad);
++			crypto_free_shash(ctx->hashalg);
++			return -ENOMEM;
+ 		}
+ 	}
+ 
+-	crypto_aead_set_reqsize_dma(tfm, sizeof(struct otx_cpt_req_ctx));
++	ctx->sdesc = alloc_sdesc(ctx->hashalg);
++	if (!ctx->sdesc) {
++		kfree(ctx->opad);
++		kfree(ctx->ipad);
++		crypto_free_shash(ctx->hashalg);
++		return -ENOMEM;
++	}
+ 
+ 	return 0;
+ }
+@@ -608,8 +626,7 @@ static void otx_cpt_aead_exit(struct crypto_aead *tfm)
+ 
+ 	kfree(ctx->ipad);
+ 	kfree(ctx->opad);
+-	if (ctx->hashalg)
+-		crypto_free_shash(ctx->hashalg);
++	crypto_free_shash(ctx->hashalg);
+ 	kfree(ctx->sdesc);
+ }
+ 
+@@ -705,7 +722,7 @@ static inline void swap_data64(void *buf, u32 len)
+ 		*dst = cpu_to_be64p(src);
+ }
+ 
+-static int copy_pad(u8 mac_type, u8 *out_pad, u8 *in_pad)
++static int swap_pad(u8 mac_type, u8 *pad)
+ {
+ 	struct sha512_state *sha512;
+ 	struct sha256_state *sha256;
+@@ -713,22 +730,19 @@ static int copy_pad(u8 mac_type, u8 *out_pad, u8 *in_pad)
+ 
+ 	switch (mac_type) {
+ 	case OTX_CPT_SHA1:
+-		sha1 = (struct sha1_state *) in_pad;
++		sha1 = (struct sha1_state *)pad;
+ 		swap_data32(sha1->state, SHA1_DIGEST_SIZE);
+-		memcpy(out_pad, &sha1->state, SHA1_DIGEST_SIZE);
+ 		break;
+ 
+ 	case OTX_CPT_SHA256:
+-		sha256 = (struct sha256_state *) in_pad;
++		sha256 = (struct sha256_state *)pad;
+ 		swap_data32(sha256->state, SHA256_DIGEST_SIZE);
+-		memcpy(out_pad, &sha256->state, SHA256_DIGEST_SIZE);
+ 		break;
+ 
+ 	case OTX_CPT_SHA384:
+ 	case OTX_CPT_SHA512:
+-		sha512 = (struct sha512_state *) in_pad;
++		sha512 = (struct sha512_state *)pad;
+ 		swap_data64(sha512->state, SHA512_DIGEST_SIZE);
+-		memcpy(out_pad, &sha512->state, SHA512_DIGEST_SIZE);
+ 		break;
+ 
+ 	default:
+@@ -738,55 +752,53 @@ static int copy_pad(u8 mac_type, u8 *out_pad, u8 *in_pad)
+ 	return 0;
+ }
+ 
+-static int aead_hmac_init(struct crypto_aead *cipher)
++static int aead_hmac_init(struct crypto_aead *cipher,
++			  struct crypto_authenc_keys *keys)
+ {
+ 	struct otx_cpt_aead_ctx *ctx = crypto_aead_ctx_dma(cipher);
+-	int state_size = crypto_shash_statesize(ctx->hashalg);
+ 	int ds = crypto_shash_digestsize(ctx->hashalg);
+ 	int bs = crypto_shash_blocksize(ctx->hashalg);
+-	int authkeylen = ctx->auth_key_len;
++	int authkeylen = keys->authkeylen;
+ 	u8 *ipad = NULL, *opad = NULL;
+-	int ret = 0, icount = 0;
++	int icount = 0;
++	int ret;
+ 
+-	ctx->sdesc = alloc_sdesc(ctx->hashalg);
+-	if (!ctx->sdesc)
+-		return -ENOMEM;
++	if (authkeylen > bs) {
++		ret = crypto_shash_digest(&ctx->sdesc->shash, keys->authkey,
++					  authkeylen, ctx->key);
++		if (ret)
++			return ret;
++		authkeylen = ds;
++	} else
++		memcpy(ctx->key, keys->authkey, authkeylen);
+ 
+-	ctx->ipad = kzalloc(bs, GFP_KERNEL);
+-	if (!ctx->ipad) {
+-		ret = -ENOMEM;
+-		goto calc_fail;
+-	}
++	ctx->enc_key_len = keys->enckeylen;
++	ctx->auth_key_len = authkeylen;
+ 
+-	ctx->opad = kzalloc(bs, GFP_KERNEL);
+-	if (!ctx->opad) {
+-		ret = -ENOMEM;
+-		goto calc_fail;
+-	}
++	if (ctx->cipher_type == OTX_CPT_CIPHER_NULL)
++		return keys->enckeylen ? -EINVAL : 0;
+ 
+-	ipad = kzalloc(state_size, GFP_KERNEL);
+-	if (!ipad) {
+-		ret = -ENOMEM;
+-		goto calc_fail;
++	switch (keys->enckeylen) {
++	case AES_KEYSIZE_128:
++		ctx->key_type = OTX_CPT_AES_128_BIT;
++		break;
++	case AES_KEYSIZE_192:
++		ctx->key_type = OTX_CPT_AES_192_BIT;
++		break;
++	case AES_KEYSIZE_256:
++		ctx->key_type = OTX_CPT_AES_256_BIT;
++		break;
++	default:
++		/* Invalid key length */
++		return -EINVAL;
+ 	}
+ 
+-	opad = kzalloc(state_size, GFP_KERNEL);
+-	if (!opad) {
+-		ret = -ENOMEM;
+-		goto calc_fail;
+-	}
++	memcpy(ctx->key + authkeylen, keys->enckey, keys->enckeylen);
+ 
+-	if (authkeylen > bs) {
+-		ret = crypto_shash_digest(&ctx->sdesc->shash, ctx->key,
+-					  authkeylen, ipad);
+-		if (ret)
+-			goto calc_fail;
+-
+-		authkeylen = ds;
+-	} else {
+-		memcpy(ipad, ctx->key, authkeylen);
+-	}
++	ipad = ctx->ipad;
++	opad = ctx->opad;
+ 
++	memcpy(ipad, ctx->key, authkeylen);
+ 	memset(ipad + authkeylen, 0, bs - authkeylen);
+ 	memcpy(opad, ipad, bs);
+ 
+@@ -804,7 +816,7 @@ static int aead_hmac_init(struct crypto_aead *cipher)
+ 	crypto_shash_init(&ctx->sdesc->shash);
+ 	crypto_shash_update(&ctx->sdesc->shash, ipad, bs);
+ 	crypto_shash_export(&ctx->sdesc->shash, ipad);
+-	ret = copy_pad(ctx->mac_type, ctx->ipad, ipad);
++	ret = swap_pad(ctx->mac_type, ipad);
+ 	if (ret)
+ 		goto calc_fail;
+ 
+@@ -812,25 +824,9 @@ static int aead_hmac_init(struct crypto_aead *cipher)
+ 	crypto_shash_init(&ctx->sdesc->shash);
+ 	crypto_shash_update(&ctx->sdesc->shash, opad, bs);
+ 	crypto_shash_export(&ctx->sdesc->shash, opad);
+-	ret = copy_pad(ctx->mac_type, ctx->opad, opad);
+-	if (ret)
+-		goto calc_fail;
+-
+-	kfree(ipad);
+-	kfree(opad);
+-
+-	return 0;
++	ret = swap_pad(ctx->mac_type, opad);
+ 
+ calc_fail:
+-	kfree(ctx->ipad);
+-	ctx->ipad = NULL;
+-	kfree(ctx->opad);
+-	ctx->opad = NULL;
+-	kfree(ipad);
+-	kfree(opad);
+-	kfree(ctx->sdesc);
+-	ctx->sdesc = NULL;
+-
+ 	return ret;
+ }
+ 
+@@ -838,57 +834,15 @@ static int otx_cpt_aead_cbc_aes_sha_setkey(struct crypto_aead *cipher,
+ 					   const unsigned char *key,
+ 					   unsigned int keylen)
+ {
+-	struct otx_cpt_aead_ctx *ctx = crypto_aead_ctx_dma(cipher);
+-	struct crypto_authenc_key_param *param;
+-	int enckeylen = 0, authkeylen = 0;
+-	struct rtattr *rta = (void *)key;
+-	int status = -EINVAL;
+-
+-	if (!RTA_OK(rta, keylen))
+-		goto badkey;
+-
+-	if (rta->rta_type != CRYPTO_AUTHENC_KEYA_PARAM)
+-		goto badkey;
+-
+-	if (RTA_PAYLOAD(rta) < sizeof(*param))
+-		goto badkey;
+-
+-	param = RTA_DATA(rta);
+-	enckeylen = be32_to_cpu(param->enckeylen);
+-	key += RTA_ALIGN(rta->rta_len);
+-	keylen -= RTA_ALIGN(rta->rta_len);
+-	if (keylen < enckeylen)
+-		goto badkey;
++	struct crypto_authenc_keys authenc_keys;
++	int status;
+ 
+-	if (keylen > OTX_CPT_MAX_KEY_SIZE)
+-		goto badkey;
+-
+-	authkeylen = keylen - enckeylen;
+-	memcpy(ctx->key, key, keylen);
+-
+-	switch (enckeylen) {
+-	case AES_KEYSIZE_128:
+-		ctx->key_type = OTX_CPT_AES_128_BIT;
+-		break;
+-	case AES_KEYSIZE_192:
+-		ctx->key_type = OTX_CPT_AES_192_BIT;
+-		break;
+-	case AES_KEYSIZE_256:
+-		ctx->key_type = OTX_CPT_AES_256_BIT;
+-		break;
+-	default:
+-		/* Invalid key length */
+-		goto badkey;
+-	}
+-
+-	ctx->enc_key_len = enckeylen;
+-	ctx->auth_key_len = authkeylen;
+-
+-	status = aead_hmac_init(cipher);
++	status = crypto_authenc_extractkeys(&authenc_keys, key, keylen);
+ 	if (status)
+ 		goto badkey;
+ 
+-	return 0;
++	status = aead_hmac_init(cipher, &authenc_keys);
++
+ badkey:
+ 	return status;
+ }
+@@ -897,36 +851,7 @@ static int otx_cpt_aead_ecb_null_sha_setkey(struct crypto_aead *cipher,
+ 					    const unsigned char *key,
+ 					    unsigned int keylen)
+ {
+-	struct otx_cpt_aead_ctx *ctx = crypto_aead_ctx_dma(cipher);
+-	struct crypto_authenc_key_param *param;
+-	struct rtattr *rta = (void *)key;
+-	int enckeylen = 0;
+-
+-	if (!RTA_OK(rta, keylen))
+-		goto badkey;
+-
+-	if (rta->rta_type != CRYPTO_AUTHENC_KEYA_PARAM)
+-		goto badkey;
+-
+-	if (RTA_PAYLOAD(rta) < sizeof(*param))
+-		goto badkey;
+-
+-	param = RTA_DATA(rta);
+-	enckeylen = be32_to_cpu(param->enckeylen);
+-	key += RTA_ALIGN(rta->rta_len);
+-	keylen -= RTA_ALIGN(rta->rta_len);
+-	if (enckeylen != 0)
+-		goto badkey;
+-
+-	if (keylen > OTX_CPT_MAX_KEY_SIZE)
+-		goto badkey;
+-
+-	memcpy(ctx->key, key, keylen);
+-	ctx->enc_key_len = enckeylen;
+-	ctx->auth_key_len = keylen;
+-	return 0;
+-badkey:
+-	return -EINVAL;
++	return otx_cpt_aead_cbc_aes_sha_setkey(cipher, key, keylen);
+ }
+ 
+ static int otx_cpt_aead_gcm_aes_setkey(struct crypto_aead *cipher,
+diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c b/drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c
+index e27ddd3c4e5581..4385d3df52b4d4 100644
+--- a/drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c
++++ b/drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c
+@@ -11,7 +11,6 @@
+ #include <crypto/xts.h>
+ #include <crypto/gcm.h>
+ #include <crypto/scatterwalk.h>
+-#include <linux/rtnetlink.h>
+ #include <linux/sort.h>
+ #include <linux/module.h>
+ #include "otx2_cptvf.h"
+@@ -54,6 +53,8 @@ static struct cpt_device_table se_devices = {
+ 	.count = ATOMIC_INIT(0)
+ };
+ 
++static struct otx2_cpt_sdesc *alloc_sdesc(struct crypto_shash *alg);
++
+ static inline int get_se_device(struct pci_dev **pdev, int *cpu_num)
+ {
+ 	int count;
+@@ -580,40 +581,56 @@ static int cpt_aead_init(struct crypto_aead *atfm, u8 cipher_type, u8 mac_type)
+ 	ctx->cipher_type = cipher_type;
+ 	ctx->mac_type = mac_type;
+ 
++	switch (ctx->mac_type) {
++	case OTX2_CPT_SHA1:
++		ctx->hashalg = crypto_alloc_shash("sha1", 0, 0);
++		break;
++
++	case OTX2_CPT_SHA256:
++		ctx->hashalg = crypto_alloc_shash("sha256", 0, 0);
++		break;
++
++	case OTX2_CPT_SHA384:
++		ctx->hashalg = crypto_alloc_shash("sha384", 0, 0);
++		break;
++
++	case OTX2_CPT_SHA512:
++		ctx->hashalg = crypto_alloc_shash("sha512", 0, 0);
++		break;
++	}
++
++	if (IS_ERR(ctx->hashalg))
++		return PTR_ERR(ctx->hashalg);
++
++	if (ctx->hashalg) {
++		ctx->sdesc = alloc_sdesc(ctx->hashalg);
++		if (!ctx->sdesc) {
++			crypto_free_shash(ctx->hashalg);
++			return -ENOMEM;
++		}
++	}
++
+ 	/*
+ 	 * When selected cipher is NULL we use HMAC opcode instead of
+ 	 * FLEXICRYPTO opcode therefore we don't need to use HASH algorithms
+ 	 * for calculating ipad and opad
+ 	 */
+-	if (ctx->cipher_type != OTX2_CPT_CIPHER_NULL) {
+-		switch (ctx->mac_type) {
+-		case OTX2_CPT_SHA1:
+-			ctx->hashalg = crypto_alloc_shash("sha1", 0,
+-							  CRYPTO_ALG_ASYNC);
+-			if (IS_ERR(ctx->hashalg))
+-				return PTR_ERR(ctx->hashalg);
+-			break;
+-
+-		case OTX2_CPT_SHA256:
+-			ctx->hashalg = crypto_alloc_shash("sha256", 0,
+-							  CRYPTO_ALG_ASYNC);
+-			if (IS_ERR(ctx->hashalg))
+-				return PTR_ERR(ctx->hashalg);
+-			break;
++	if (ctx->cipher_type != OTX2_CPT_CIPHER_NULL && ctx->hashalg) {
++		int ss = crypto_shash_statesize(ctx->hashalg);
+ 
+-		case OTX2_CPT_SHA384:
+-			ctx->hashalg = crypto_alloc_shash("sha384", 0,
+-							  CRYPTO_ALG_ASYNC);
+-			if (IS_ERR(ctx->hashalg))
+-				return PTR_ERR(ctx->hashalg);
+-			break;
++		ctx->ipad = kzalloc(ss, GFP_KERNEL);
++		if (!ctx->ipad) {
++			kfree(ctx->sdesc);
++			crypto_free_shash(ctx->hashalg);
++			return -ENOMEM;
++		}
+ 
+-		case OTX2_CPT_SHA512:
+-			ctx->hashalg = crypto_alloc_shash("sha512", 0,
+-							  CRYPTO_ALG_ASYNC);
+-			if (IS_ERR(ctx->hashalg))
+-				return PTR_ERR(ctx->hashalg);
+-			break;
++		ctx->opad = kzalloc(ss, GFP_KERNEL);
++		if (!ctx->opad) {
++			kfree(ctx->ipad);
++			kfree(ctx->sdesc);
++			crypto_free_shash(ctx->hashalg);
++			return -ENOMEM;
+ 		}
+ 	}
+ 	switch (ctx->cipher_type) {
+@@ -686,8 +703,7 @@ static void otx2_cpt_aead_exit(struct crypto_aead *tfm)
+ 
+ 	kfree(ctx->ipad);
+ 	kfree(ctx->opad);
+-	if (ctx->hashalg)
+-		crypto_free_shash(ctx->hashalg);
++	crypto_free_shash(ctx->hashalg);
+ 	kfree(ctx->sdesc);
+ 
+ 	if (ctx->fbk_cipher) {
+@@ -760,7 +776,7 @@ static inline void swap_data64(void *buf, u32 len)
+ 		cpu_to_be64s(src);
+ }
+ 
+-static int copy_pad(u8 mac_type, u8 *out_pad, u8 *in_pad)
++static int swap_pad(u8 mac_type, u8 *pad)
+ {
+ 	struct sha512_state *sha512;
+ 	struct sha256_state *sha256;
+@@ -768,22 +784,19 @@ static int copy_pad(u8 mac_type, u8 *out_pad, u8 *in_pad)
+ 
+ 	switch (mac_type) {
+ 	case OTX2_CPT_SHA1:
+-		sha1 = (struct sha1_state *) in_pad;
++		sha1 = (struct sha1_state *)pad;
+ 		swap_data32(sha1->state, SHA1_DIGEST_SIZE);
+-		memcpy(out_pad, &sha1->state, SHA1_DIGEST_SIZE);
+ 		break;
+ 
+ 	case OTX2_CPT_SHA256:
+-		sha256 = (struct sha256_state *) in_pad;
++		sha256 = (struct sha256_state *)pad;
+ 		swap_data32(sha256->state, SHA256_DIGEST_SIZE);
+-		memcpy(out_pad, &sha256->state, SHA256_DIGEST_SIZE);
+ 		break;
+ 
+ 	case OTX2_CPT_SHA384:
+ 	case OTX2_CPT_SHA512:
+-		sha512 = (struct sha512_state *) in_pad;
++		sha512 = (struct sha512_state *)pad;
+ 		swap_data64(sha512->state, SHA512_DIGEST_SIZE);
+-		memcpy(out_pad, &sha512->state, SHA512_DIGEST_SIZE);
+ 		break;
+ 
+ 	default:
+@@ -793,55 +806,54 @@ static int copy_pad(u8 mac_type, u8 *out_pad, u8 *in_pad)
+ 	return 0;
+ }
+ 
+-static int aead_hmac_init(struct crypto_aead *cipher)
++static int aead_hmac_init(struct crypto_aead *cipher,
++			  struct crypto_authenc_keys *keys)
+ {
+ 	struct otx2_cpt_aead_ctx *ctx = crypto_aead_ctx_dma(cipher);
+-	int state_size = crypto_shash_statesize(ctx->hashalg);
+ 	int ds = crypto_shash_digestsize(ctx->hashalg);
+ 	int bs = crypto_shash_blocksize(ctx->hashalg);
+-	int authkeylen = ctx->auth_key_len;
++	int authkeylen = keys->authkeylen;
+ 	u8 *ipad = NULL, *opad = NULL;
+-	int ret = 0, icount = 0;
++	int icount = 0;
++	int ret;
+ 
+-	ctx->sdesc = alloc_sdesc(ctx->hashalg);
+-	if (!ctx->sdesc)
+-		return -ENOMEM;
++	if (authkeylen > bs) {
++		ret = crypto_shash_digest(&ctx->sdesc->shash, keys->authkey,
++					  authkeylen, ctx->key);
++		if (ret)
++			goto calc_fail;
+ 
+-	ctx->ipad = kzalloc(bs, GFP_KERNEL);
+-	if (!ctx->ipad) {
+-		ret = -ENOMEM;
+-		goto calc_fail;
+-	}
++		authkeylen = ds;
++	} else
++		memcpy(ctx->key, keys->authkey, authkeylen);
+ 
+-	ctx->opad = kzalloc(bs, GFP_KERNEL);
+-	if (!ctx->opad) {
+-		ret = -ENOMEM;
+-		goto calc_fail;
+-	}
++	ctx->enc_key_len = keys->enckeylen;
++	ctx->auth_key_len = authkeylen;
+ 
+-	ipad = kzalloc(state_size, GFP_KERNEL);
+-	if (!ipad) {
+-		ret = -ENOMEM;
+-		goto calc_fail;
+-	}
++	if (ctx->cipher_type == OTX2_CPT_CIPHER_NULL)
++		return keys->enckeylen ? -EINVAL : 0;
+ 
+-	opad = kzalloc(state_size, GFP_KERNEL);
+-	if (!opad) {
+-		ret = -ENOMEM;
+-		goto calc_fail;
++	switch (keys->enckeylen) {
++	case AES_KEYSIZE_128:
++		ctx->key_type = OTX2_CPT_AES_128_BIT;
++		break;
++	case AES_KEYSIZE_192:
++		ctx->key_type = OTX2_CPT_AES_192_BIT;
++		break;
++	case AES_KEYSIZE_256:
++		ctx->key_type = OTX2_CPT_AES_256_BIT;
++		break;
++	default:
++		/* Invalid key length */
++		return -EINVAL;
+ 	}
+ 
+-	if (authkeylen > bs) {
+-		ret = crypto_shash_digest(&ctx->sdesc->shash, ctx->key,
+-					  authkeylen, ipad);
+-		if (ret)
+-			goto calc_fail;
++	memcpy(ctx->key + authkeylen, keys->enckey, keys->enckeylen);
+ 
+-		authkeylen = ds;
+-	} else {
+-		memcpy(ipad, ctx->key, authkeylen);
+-	}
++	ipad = ctx->ipad;
++	opad = ctx->opad;
+ 
++	memcpy(ipad, ctx->key, authkeylen);
+ 	memset(ipad + authkeylen, 0, bs - authkeylen);
+ 	memcpy(opad, ipad, bs);
+ 
+@@ -859,7 +871,7 @@ static int aead_hmac_init(struct crypto_aead *cipher)
+ 	crypto_shash_init(&ctx->sdesc->shash);
+ 	crypto_shash_update(&ctx->sdesc->shash, ipad, bs);
+ 	crypto_shash_export(&ctx->sdesc->shash, ipad);
+-	ret = copy_pad(ctx->mac_type, ctx->ipad, ipad);
++	ret = swap_pad(ctx->mac_type, ipad);
+ 	if (ret)
+ 		goto calc_fail;
+ 
+@@ -867,25 +879,9 @@ static int aead_hmac_init(struct crypto_aead *cipher)
+ 	crypto_shash_init(&ctx->sdesc->shash);
+ 	crypto_shash_update(&ctx->sdesc->shash, opad, bs);
+ 	crypto_shash_export(&ctx->sdesc->shash, opad);
+-	ret = copy_pad(ctx->mac_type, ctx->opad, opad);
+-	if (ret)
+-		goto calc_fail;
+-
+-	kfree(ipad);
+-	kfree(opad);
+-
+-	return 0;
++	ret = swap_pad(ctx->mac_type, opad);
+ 
+ calc_fail:
+-	kfree(ctx->ipad);
+-	ctx->ipad = NULL;
+-	kfree(ctx->opad);
+-	ctx->opad = NULL;
+-	kfree(ipad);
+-	kfree(opad);
+-	kfree(ctx->sdesc);
+-	ctx->sdesc = NULL;
+-
+ 	return ret;
+ }
+ 
+@@ -893,87 +889,17 @@ static int otx2_cpt_aead_cbc_aes_sha_setkey(struct crypto_aead *cipher,
+ 					    const unsigned char *key,
+ 					    unsigned int keylen)
+ {
+-	struct otx2_cpt_aead_ctx *ctx = crypto_aead_ctx_dma(cipher);
+-	struct crypto_authenc_key_param *param;
+-	int enckeylen = 0, authkeylen = 0;
+-	struct rtattr *rta = (void *)key;
+-
+-	if (!RTA_OK(rta, keylen))
+-		return -EINVAL;
++	struct crypto_authenc_keys authenc_keys;
+ 
+-	if (rta->rta_type != CRYPTO_AUTHENC_KEYA_PARAM)
+-		return -EINVAL;
+-
+-	if (RTA_PAYLOAD(rta) < sizeof(*param))
+-		return -EINVAL;
+-
+-	param = RTA_DATA(rta);
+-	enckeylen = be32_to_cpu(param->enckeylen);
+-	key += RTA_ALIGN(rta->rta_len);
+-	keylen -= RTA_ALIGN(rta->rta_len);
+-	if (keylen < enckeylen)
+-		return -EINVAL;
+-
+-	if (keylen > OTX2_CPT_MAX_KEY_SIZE)
+-		return -EINVAL;
+-
+-	authkeylen = keylen - enckeylen;
+-	memcpy(ctx->key, key, keylen);
+-
+-	switch (enckeylen) {
+-	case AES_KEYSIZE_128:
+-		ctx->key_type = OTX2_CPT_AES_128_BIT;
+-		break;
+-	case AES_KEYSIZE_192:
+-		ctx->key_type = OTX2_CPT_AES_192_BIT;
+-		break;
+-	case AES_KEYSIZE_256:
+-		ctx->key_type = OTX2_CPT_AES_256_BIT;
+-		break;
+-	default:
+-		/* Invalid key length */
+-		return -EINVAL;
+-	}
+-
+-	ctx->enc_key_len = enckeylen;
+-	ctx->auth_key_len = authkeylen;
+-
+-	return aead_hmac_init(cipher);
++	return crypto_authenc_extractkeys(&authenc_keys, key, keylen) ?:
++	       aead_hmac_init(cipher, &authenc_keys);
+ }
+ 
+ static int otx2_cpt_aead_ecb_null_sha_setkey(struct crypto_aead *cipher,
+ 					     const unsigned char *key,
+ 					     unsigned int keylen)
+ {
+-	struct otx2_cpt_aead_ctx *ctx = crypto_aead_ctx_dma(cipher);
+-	struct crypto_authenc_key_param *param;
+-	struct rtattr *rta = (void *)key;
+-	int enckeylen = 0;
+-
+-	if (!RTA_OK(rta, keylen))
+-		return -EINVAL;
+-
+-	if (rta->rta_type != CRYPTO_AUTHENC_KEYA_PARAM)
+-		return -EINVAL;
+-
+-	if (RTA_PAYLOAD(rta) < sizeof(*param))
+-		return -EINVAL;
+-
+-	param = RTA_DATA(rta);
+-	enckeylen = be32_to_cpu(param->enckeylen);
+-	key += RTA_ALIGN(rta->rta_len);
+-	keylen -= RTA_ALIGN(rta->rta_len);
+-	if (enckeylen != 0)
+-		return -EINVAL;
+-
+-	if (keylen > OTX2_CPT_MAX_KEY_SIZE)
+-		return -EINVAL;
+-
+-	memcpy(ctx->key, key, keylen);
+-	ctx->enc_key_len = enckeylen;
+-	ctx->auth_key_len = keylen;
+-
+-	return 0;
++	return otx2_cpt_aead_cbc_aes_sha_setkey(cipher, key, keylen);
+ }
+ 
+ static int otx2_cpt_aead_gcm_aes_setkey(struct crypto_aead *cipher,
+diff --git a/drivers/firmware/efi/unaccepted_memory.c b/drivers/firmware/efi/unaccepted_memory.c
+index 79fb687bb90f96..6c3d84d9bcc16f 100644
+--- a/drivers/firmware/efi/unaccepted_memory.c
++++ b/drivers/firmware/efi/unaccepted_memory.c
+@@ -3,6 +3,7 @@
+ #include <linux/efi.h>
+ #include <linux/memblock.h>
+ #include <linux/spinlock.h>
++#include <linux/nmi.h>
+ #include <asm/unaccepted_memory.h>
+ 
+ /* Protects unaccepted memory bitmap and accepting_list */
+@@ -148,6 +149,9 @@ void accept_memory(phys_addr_t start, phys_addr_t end)
+ 	}
+ 
+ 	list_del(&range.list);
++
++	touch_softlockup_watchdog();
++
+ 	spin_unlock_irqrestore(&unaccepted_memory_lock, flags);
+ }
+ 
+diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c
+index c1590d3aa9cb78..c3a1dc3449617f 100644
+--- a/drivers/firmware/tegra/bpmp.c
++++ b/drivers/firmware/tegra/bpmp.c
+@@ -24,12 +24,6 @@
+ #define MSG_RING	BIT(1)
+ #define TAG_SZ		32
+ 
+-static inline struct tegra_bpmp *
+-mbox_client_to_bpmp(struct mbox_client *client)
+-{
+-	return container_of(client, struct tegra_bpmp, mbox.client);
+-}
+-
+ static inline const struct tegra_bpmp_ops *
+ channel_to_ops(struct tegra_bpmp_channel *channel)
+ {
+diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
+index aa3ce8aa99dc83..75107ede3bf8f4 100644
+--- a/drivers/gpio/gpio-davinci.c
++++ b/drivers/gpio/gpio-davinci.c
+@@ -289,7 +289,7 @@ static int davinci_gpio_probe(struct platform_device *pdev)
+  * serve as EDMA event triggers.
+  */
+ 
+-static void gpio_irq_disable(struct irq_data *d)
++static void gpio_irq_mask(struct irq_data *d)
+ {
+ 	struct davinci_gpio_regs __iomem *g = irq2regs(d);
+ 	uintptr_t mask = (uintptr_t)irq_data_get_irq_handler_data(d);
+@@ -298,7 +298,7 @@ static void gpio_irq_disable(struct irq_data *d)
+ 	writel_relaxed(mask, &g->clr_rising);
+ }
+ 
+-static void gpio_irq_enable(struct irq_data *d)
++static void gpio_irq_unmask(struct irq_data *d)
+ {
+ 	struct davinci_gpio_regs __iomem *g = irq2regs(d);
+ 	uintptr_t mask = (uintptr_t)irq_data_get_irq_handler_data(d);
+@@ -324,8 +324,8 @@ static int gpio_irq_type(struct irq_data *d, unsigned trigger)
+ 
+ static struct irq_chip gpio_irqchip = {
+ 	.name		= "GPIO",
+-	.irq_enable	= gpio_irq_enable,
+-	.irq_disable	= gpio_irq_disable,
++	.irq_unmask	= gpio_irq_unmask,
++	.irq_mask	= gpio_irq_mask,
+ 	.irq_set_type	= gpio_irq_type,
+ 	.flags		= IRQCHIP_SET_TYPE_MASKED | IRQCHIP_SKIP_SET_WAKE,
+ };
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+index 25d5fda5b243e3..af6c6d89e63afb 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+@@ -335,15 +335,15 @@ int amdgpu_amdkfd_alloc_gtt_mem(struct amdgpu_device *adev, size_t size,
+ 	return r;
+ }
+ 
+-void amdgpu_amdkfd_free_gtt_mem(struct amdgpu_device *adev, void *mem_obj)
++void amdgpu_amdkfd_free_gtt_mem(struct amdgpu_device *adev, void **mem_obj)
+ {
+-	struct amdgpu_bo *bo = (struct amdgpu_bo *) mem_obj;
++	struct amdgpu_bo **bo = (struct amdgpu_bo **) mem_obj;
+ 
+-	amdgpu_bo_reserve(bo, true);
+-	amdgpu_bo_kunmap(bo);
+-	amdgpu_bo_unpin(bo);
+-	amdgpu_bo_unreserve(bo);
+-	amdgpu_bo_unref(&(bo));
++	amdgpu_bo_reserve(*bo, true);
++	amdgpu_bo_kunmap(*bo);
++	amdgpu_bo_unpin(*bo);
++	amdgpu_bo_unreserve(*bo);
++	amdgpu_bo_unref(bo);
+ }
+ 
+ int amdgpu_amdkfd_alloc_gws(struct amdgpu_device *adev, size_t size,
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
+index db5b1c6beba75b..3134e6ad81d1d4 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
+@@ -221,7 +221,7 @@ int amdgpu_amdkfd_evict_userptr(struct mmu_interval_notifier *mni,
+ int amdgpu_amdkfd_alloc_gtt_mem(struct amdgpu_device *adev, size_t size,
+ 				void **mem_obj, uint64_t *gpu_addr,
+ 				void **cpu_ptr, bool mqd_gfx9);
+-void amdgpu_amdkfd_free_gtt_mem(struct amdgpu_device *adev, void *mem_obj);
++void amdgpu_amdkfd_free_gtt_mem(struct amdgpu_device *adev, void **mem_obj);
+ int amdgpu_amdkfd_alloc_gws(struct amdgpu_device *adev, size_t size,
+ 				void **mem_obj);
+ void amdgpu_amdkfd_free_gws(struct amdgpu_device *adev, void *mem_obj);
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+index e361dc37a0890b..7abcd618e70bd1 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+@@ -263,6 +263,10 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
+ 			if (size < sizeof(struct drm_amdgpu_bo_list_in))
+ 				goto free_partial_kdata;
+ 
++			/* Only a single BO list is allowed to simplify handling. */
++			if (p->bo_list)
++				ret = -EINVAL;
++
+ 			ret = amdgpu_cs_p1_bo_handles(p, p->chunks[i].kdata);
+ 			if (ret)
+ 				goto free_partial_kdata;
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
+index 0ca51df46cc0d3..e7b053898f9e90 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
+@@ -793,8 +793,11 @@ int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *r
+ 	int r;
+ 
+ 	if (amdgpu_ras_is_supported(adev, ras_block->block)) {
+-		if (!amdgpu_persistent_edc_harvesting_supported(adev))
+-			amdgpu_ras_reset_error_status(adev, AMDGPU_RAS_BLOCK__GFX);
++		if (!amdgpu_persistent_edc_harvesting_supported(adev)) {
++			r = amdgpu_ras_reset_error_status(adev, AMDGPU_RAS_BLOCK__GFX);
++			if (r)
++				return r;
++		}
+ 
+ 		r = amdgpu_ras_block_late_init(adev, ras_block);
+ 		if (r)
+@@ -938,7 +941,10 @@ uint32_t amdgpu_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)
+ 		pr_err("critical bug! too many kiq readers\n");
+ 		goto failed_unlock;
+ 	}
+-	amdgpu_ring_alloc(ring, 32);
++	r = amdgpu_ring_alloc(ring, 32);
++	if (r)
++		goto failed_unlock;
++
+ 	amdgpu_ring_emit_rreg(ring, reg, reg_val_offs);
+ 	r = amdgpu_fence_emit_polling(ring, &seq, MAX_KIQ_REG_WAIT);
+ 	if (r)
+@@ -1004,7 +1010,10 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v)
+ 	}
+ 
+ 	spin_lock_irqsave(&kiq->ring_lock, flags);
+-	amdgpu_ring_alloc(ring, 32);
++	r = amdgpu_ring_alloc(ring, 32);
++	if (r)
++		goto failed_unlock;
++
+ 	amdgpu_ring_emit_wreg(ring, reg, v);
+ 	r = amdgpu_fence_emit_polling(ring, &seq, MAX_KIQ_REG_WAIT);
+ 	if (r)
+@@ -1040,6 +1049,7 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v)
+ 
+ failed_undo:
+ 	amdgpu_ring_undo(ring);
++failed_unlock:
+ 	spin_unlock_irqrestore(&kiq->ring_lock, flags);
+ failed_kiq_write:
+ 	dev_err(adev->dev, "failed to write reg:%x\n", reg);
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+index 58dab4f73a9a2a..5797055b1148f7 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+@@ -43,6 +43,7 @@
+ #include "amdgpu_gem.h"
+ #include "amdgpu_display.h"
+ #include "amdgpu_ras.h"
++#include "amdgpu_reset.h"
+ #include "amd_pcie.h"
+ 
+ void amdgpu_unregister_gpu_instance(struct amdgpu_device *adev)
+@@ -722,6 +723,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
+ 				    ? -EFAULT : 0;
+ 	}
+ 	case AMDGPU_INFO_READ_MMR_REG: {
++		int ret = 0;
+ 		unsigned int n, alloc_size;
+ 		uint32_t *regs;
+ 		unsigned int se_num = (info->read_mmr_reg.instance >>
+@@ -731,24 +733,37 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
+ 				   AMDGPU_INFO_MMR_SH_INDEX_SHIFT) &
+ 				  AMDGPU_INFO_MMR_SH_INDEX_MASK;
+ 
++		if (!down_read_trylock(&adev->reset_domain->sem))
++			return -ENOENT;
++
+ 		/* set full masks if the userspace set all bits
+ 		 * in the bitfields
+ 		 */
+-		if (se_num == AMDGPU_INFO_MMR_SE_INDEX_MASK)
++		if (se_num == AMDGPU_INFO_MMR_SE_INDEX_MASK) {
+ 			se_num = 0xffffffff;
+-		else if (se_num >= AMDGPU_GFX_MAX_SE)
+-			return -EINVAL;
+-		if (sh_num == AMDGPU_INFO_MMR_SH_INDEX_MASK)
++		} else if (se_num >= AMDGPU_GFX_MAX_SE) {
++			ret = -EINVAL;
++			goto out;
++		}
++
++		if (sh_num == AMDGPU_INFO_MMR_SH_INDEX_MASK) {
+ 			sh_num = 0xffffffff;
+-		else if (sh_num >= AMDGPU_GFX_MAX_SH_PER_SE)
+-			return -EINVAL;
++		} else if (sh_num >= AMDGPU_GFX_MAX_SH_PER_SE) {
++			ret = -EINVAL;
++			goto out;
++		}
+ 
+-		if (info->read_mmr_reg.count > 128)
+-			return -EINVAL;
++		if (info->read_mmr_reg.count > 128) {
++			ret = -EINVAL;
++			goto out;
++		}
+ 
+ 		regs = kmalloc_array(info->read_mmr_reg.count, sizeof(*regs), GFP_KERNEL);
+-		if (!regs)
+-			return -ENOMEM;
++		if (!regs) {
++			ret = -ENOMEM;
++			goto out;
++		}
++
+ 		alloc_size = info->read_mmr_reg.count * sizeof(*regs);
+ 
+ 		amdgpu_gfx_off_ctrl(adev, false);
+@@ -760,13 +775,17 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
+ 					      info->read_mmr_reg.dword_offset + i);
+ 				kfree(regs);
+ 				amdgpu_gfx_off_ctrl(adev, true);
+-				return -EFAULT;
++				ret = -EFAULT;
++				goto out;
+ 			}
+ 		}
+ 		amdgpu_gfx_off_ctrl(adev, true);
+ 		n = copy_to_user(out, regs, min(size, alloc_size));
+ 		kfree(regs);
+-		return n ? -EFAULT : 0;
++		ret = (n ? -EFAULT : 0);
++out:
++		up_read(&adev->reset_domain->sem);
++		return ret;
+ 	}
+ 	case AMDGPU_INFO_DEV_INFO: {
+ 		struct drm_amdgpu_info_device *dev_info;
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h
+index 9a1036aeec2a0b..9142238e7791a5 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h
+@@ -179,6 +179,6 @@ amdgpu_get_next_xcp(struct amdgpu_xcp_mgr *xcp_mgr, int *from)
+ 
+ #define for_each_xcp(xcp_mgr, xcp, i)                            \
+ 	for (i = 0, xcp = amdgpu_get_next_xcp(xcp_mgr, &i); xcp; \
+-	     xcp = amdgpu_get_next_xcp(xcp_mgr, &i))
++	     ++i, xcp = amdgpu_get_next_xcp(xcp_mgr, &i))
+ 
+ #endif
+diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+index cd594b92c61298..53c99bc6abb333 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+@@ -8748,7 +8748,9 @@ static void gfx_v10_0_ring_soft_recovery(struct amdgpu_ring *ring,
+ 	value = REG_SET_FIELD(value, SQ_CMD, MODE, 0x01);
+ 	value = REG_SET_FIELD(value, SQ_CMD, CHECK_VMID, 1);
+ 	value = REG_SET_FIELD(value, SQ_CMD, VM_ID, vmid);
++	amdgpu_gfx_rlc_enter_safe_mode(adev, 0);
+ 	WREG32_SOC15(GC, 0, mmSQ_CMD, value);
++	amdgpu_gfx_rlc_exit_safe_mode(adev, 0);
+ }
+ 
+ static void
+diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+index c813cd7b015e14..54ec9b32562c28 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+@@ -5701,7 +5701,9 @@ static void gfx_v11_0_ring_soft_recovery(struct amdgpu_ring *ring,
+ 	value = REG_SET_FIELD(value, SQ_CMD, MODE, 0x01);
+ 	value = REG_SET_FIELD(value, SQ_CMD, CHECK_VMID, 1);
+ 	value = REG_SET_FIELD(value, SQ_CMD, VM_ID, vmid);
++	amdgpu_gfx_rlc_enter_safe_mode(adev, 0);
+ 	WREG32_SOC15(GC, 0, regSQ_CMD, value);
++	amdgpu_gfx_rlc_exit_safe_mode(adev, 0);
+ }
+ 
+ static void
+diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+index 8168836a08d2ef..895060f6948f30 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+@@ -1172,6 +1172,10 @@ static const struct amdgpu_gfxoff_quirk amdgpu_gfxoff_quirk_list[] = {
+ 	{ 0x1002, 0x15dd, 0x1002, 0x15dd, 0xc6 },
+ 	/* Apple MacBook Pro (15-inch, 2019) Radeon Pro Vega 20 4 GB */
+ 	{ 0x1002, 0x69af, 0x106b, 0x019a, 0xc0 },
++	/* https://bbs.openkylin.top/t/topic/171497 */
++	{ 0x1002, 0x15d8, 0x19e5, 0x3e14, 0xc2 },
++	/* HP 705G4 DM with R5 2400G */
++	{ 0x1002, 0x15dd, 0x103c, 0x8464, 0xd6 },
+ 	{ 0, 0, 0, 0, 0 },
+ };
+ 
+@@ -5705,7 +5709,9 @@ static void gfx_v9_0_ring_soft_recovery(struct amdgpu_ring *ring, unsigned vmid)
+ 	value = REG_SET_FIELD(value, SQ_CMD, MODE, 0x01);
+ 	value = REG_SET_FIELD(value, SQ_CMD, CHECK_VMID, 1);
+ 	value = REG_SET_FIELD(value, SQ_CMD, VM_ID, vmid);
++	amdgpu_gfx_rlc_enter_safe_mode(adev, 0);
+ 	WREG32_SOC15(GC, 0, mmSQ_CMD, value);
++	amdgpu_gfx_rlc_exit_safe_mode(adev, 0);
+ }
+ 
+ static void gfx_v9_0_set_gfx_eop_interrupt_state(struct amdgpu_device *adev,
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+index 9d105302837054..19d46be6394295 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+@@ -417,7 +417,7 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p,
+ 
+ err_create_queue:
+ 	if (wptr_bo)
+-		amdgpu_amdkfd_free_gtt_mem(dev->adev, wptr_bo);
++		amdgpu_amdkfd_free_gtt_mem(dev->adev, (void **)&wptr_bo);
+ err_wptr_map_gart:
+ err_bind_process:
+ err_pdd:
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+index 0c94bdfadaabf7..9d0b0bf70ad1ea 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+@@ -838,7 +838,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
+ kfd_doorbell_error:
+ 	kfd_gtt_sa_fini(kfd);
+ kfd_gtt_sa_init_error:
+-	amdgpu_amdkfd_free_gtt_mem(kfd->adev, kfd->gtt_mem);
++	amdgpu_amdkfd_free_gtt_mem(kfd->adev, &kfd->gtt_mem);
+ alloc_gtt_mem_failure:
+ 	dev_err(kfd_device,
+ 		"device %x:%x NOT added due to errors\n",
+@@ -856,7 +856,7 @@ void kgd2kfd_device_exit(struct kfd_dev *kfd)
+ 		kfd_doorbell_fini(kfd);
+ 		ida_destroy(&kfd->doorbell_ida);
+ 		kfd_gtt_sa_fini(kfd);
+-		amdgpu_amdkfd_free_gtt_mem(kfd->adev, kfd->gtt_mem);
++		amdgpu_amdkfd_free_gtt_mem(kfd->adev, &kfd->gtt_mem);
+ 	}
+ 
+ 	kfree(kfd);
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+index 60d98301ef0418..4d9a406925e189 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+@@ -2610,7 +2610,7 @@ static void deallocate_hiq_sdma_mqd(struct kfd_node *dev,
+ {
+ 	WARN(!mqd, "No hiq sdma mqd trunk to free");
+ 
+-	amdgpu_amdkfd_free_gtt_mem(dev->adev, mqd->gtt_mem);
++	amdgpu_amdkfd_free_gtt_mem(dev->adev, &mqd->gtt_mem);
+ }
+ 
+ void device_queue_manager_uninit(struct device_queue_manager *dqm)
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
+index 447829c22295c6..4c3f379803117e 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
+@@ -223,7 +223,7 @@ void kfd_free_mqd_cp(struct mqd_manager *mm, void *mqd,
+ 	      struct kfd_mem_obj *mqd_mem_obj)
+ {
+ 	if (mqd_mem_obj->gtt_mem) {
+-		amdgpu_amdkfd_free_gtt_mem(mm->dev->adev, mqd_mem_obj->gtt_mem);
++		amdgpu_amdkfd_free_gtt_mem(mm->dev->adev, &mqd_mem_obj->gtt_mem);
+ 		kfree(mqd_mem_obj);
+ 	} else {
+ 		kfd_gtt_sa_free(mm->dev, mqd_mem_obj);
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+index d98e45aec76b45..43f520b3796700 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+@@ -1047,7 +1047,7 @@ static void kfd_process_destroy_pdds(struct kfd_process *p)
+ 
+ 		if (pdd->dev->kfd->shared_resources.enable_mes)
+ 			amdgpu_amdkfd_free_gtt_mem(pdd->dev->adev,
+-						   pdd->proc_ctx_bo);
++						   &pdd->proc_ctx_bo);
+ 		/*
+ 		 * before destroying pdd, make sure to report availability
+ 		 * for auto suspend
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
+index 8aca92624a77ea..0583af4e84fa3f 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
+@@ -199,9 +199,9 @@ static void pqm_clean_queue_resource(struct process_queue_manager *pqm,
+ 	}
+ 
+ 	if (dev->kfd->shared_resources.enable_mes) {
+-		amdgpu_amdkfd_free_gtt_mem(dev->adev, pqn->q->gang_ctx_bo);
++		amdgpu_amdkfd_free_gtt_mem(dev->adev, &pqn->q->gang_ctx_bo);
+ 		if (pqn->q->wptr_bo)
+-			amdgpu_amdkfd_free_gtt_mem(dev->adev, pqn->q->wptr_bo);
++			amdgpu_amdkfd_free_gtt_mem(dev->adev, (void **)&pqn->q->wptr_bo);
+ 	}
+ }
+ 
+@@ -982,6 +982,7 @@ int kfd_criu_restore_queue(struct kfd_process *p,
+ 		pr_debug("Queue id %d was restored successfully\n", queue_id);
+ 
+ 	kfree(q_data);
++	kfree(q_extra_data);
+ 
+ 	return ret;
+ }
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+index 7731ce7762b77d..a3f17c572bf06e 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -714,6 +714,12 @@ static void dmub_hpd_callback(struct amdgpu_device *adev,
+ 		return;
+ 	}
+ 
++	/* Skip DMUB HPD IRQ in suspend/resume. We will probe them later. */
++	if (notify->type == DMUB_NOTIFICATION_HPD && adev->in_suspend) {
++		DRM_INFO("Skip DMUB HPD IRQ callback in suspend/resume\n");
++		return;
++	}
++
+ 	link_index = notify->link_index;
+ 	link = adev->dm.dc->links[link_index];
+ 	dev = adev->dm.ddev;
+@@ -4058,7 +4064,7 @@ static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm,
+ 		int spread = caps.max_input_signal - caps.min_input_signal;
+ 
+ 		if (caps.max_input_signal > AMDGPU_DM_DEFAULT_MAX_BACKLIGHT ||
+-		    caps.min_input_signal < AMDGPU_DM_DEFAULT_MIN_BACKLIGHT ||
++		    caps.min_input_signal < 0 ||
+ 		    spread > AMDGPU_DM_DEFAULT_MAX_BACKLIGHT ||
+ 		    spread < AMDGPU_DM_MIN_SPREAD) {
+ 			DRM_DEBUG_KMS("DM: Invalid backlight caps: min=%d, max=%d\n",
+@@ -6153,12 +6159,21 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
+ 	if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT ||
+ 	    stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST ||
+ 	    stream->signal == SIGNAL_TYPE_EDP) {
++		const struct dc_edid_caps *edid_caps;
++		unsigned int disable_colorimetry = 0;
++
++		if (aconnector->dc_sink) {
++			edid_caps = &aconnector->dc_sink->edid_caps;
++			disable_colorimetry = edid_caps->panel_patch.disable_colorimetry;
++		}
++
+ 		//
+ 		// should decide stream support vsc sdp colorimetry capability
+ 		// before building vsc info packet
+ 		//
+ 		stream->use_vsc_sdp_for_colorimetry = stream->link->dpcd_caps.dpcd_rev.raw >= 0x14 &&
+-						      stream->link->dpcd_caps.dprx_feature.bits.VSC_SDP_COLORIMETRY_SUPPORTED;
++						      stream->link->dpcd_caps.dprx_feature.bits.VSC_SDP_COLORIMETRY_SUPPORTED &&
++						      !disable_colorimetry;
+ 
+ 		if (stream->out_transfer_func->tf == TRANSFER_FUNCTION_GAMMA22)
+ 			tf = TRANSFER_FUNC_GAMMA_22;
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+index fdd2d16b859f21..227a148b0f82a5 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+@@ -71,6 +71,10 @@ static void apply_edid_quirks(struct edid *edid, struct dc_edid_caps *edid_caps)
+ 		DRM_DEBUG_DRIVER("Clearing DPCD 0x317 on monitor with panel id %X\n", panel_id);
+ 		edid_caps->panel_patch.remove_sink_ext_caps = true;
+ 		break;
++	case drm_edid_encode_panel_id('S', 'D', 'C', 0x4154):
++		DRM_DEBUG_DRIVER("Disabling VSC on monitor with panel id %X\n", panel_id);
++		edid_caps->panel_patch.disable_colorimetry = true;
++		break;
+ 	default:
+ 		return;
+ 	}
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+index 7fb11445a28fa5..d390e3d62e56e3 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+@@ -1266,9 +1266,6 @@ static bool is_dsc_need_re_compute(
+ 		}
+ 	}
+ 
+-	if (new_stream_on_link_num == 0)
+-		return false;
+-
+ 	if (new_stream_on_link_num == 0)
+ 		return false;
+ 
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
+index fa9f53b3107938..d1329f20b7bd4b 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
+@@ -1281,7 +1281,8 @@ void amdgpu_dm_plane_handle_cursor_update(struct drm_plane *plane,
+ 	    adev->dm.dc->caps.color.dpp.gamma_corr)
+ 		attributes.attribute_flags.bits.ENABLE_CURSOR_DEGAMMA = 1;
+ 
+-	attributes.pitch = afb->base.pitches[0] / afb->base.format->cpp[0];
++	if (afb)
++		attributes.pitch = afb->base.pitches[0] / afb->base.format->cpp[0];
+ 
+ 	if (crtc_state->stream) {
+ 		mutex_lock(&adev->dm.dc_lock);
+diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
+index 50e643bfdfbad1..a7a6f6c5c76556 100644
+--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
+@@ -3797,7 +3797,8 @@ static void commit_planes_for_stream(struct dc *dc,
+ 	}
+ 
+ 	if ((update_type != UPDATE_TYPE_FAST) && stream->update_flags.bits.dsc_changed)
+-		if (top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable) {
++		if (top_pipe_to_program &&
++		    top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable) {
+ 			top_pipe_to_program->stream_res.tg->funcs->wait_for_state(
+ 				top_pipe_to_program->stream_res.tg,
+ 				CRTC_STATE_VACTIVE);
+@@ -4715,7 +4716,8 @@ void dc_allow_idle_optimizations(struct dc *dc, bool allow)
+ 	if (allow == dc->idle_optimizations_allowed)
+ 		return;
+ 
+-	if (dc->hwss.apply_idle_power_optimizations && dc->hwss.apply_idle_power_optimizations(dc, allow))
++	if (dc->hwss.apply_idle_power_optimizations && dc->clk_mgr != NULL &&
++	    dc->hwss.apply_idle_power_optimizations(dc, allow))
+ 		dc->idle_optimizations_allowed = allow;
+ }
+ 
+diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+index 733e445331ea50..99fcd39bb15e0d 100644
+--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+@@ -2154,6 +2154,8 @@ static bool are_stream_backends_same(
+ bool dc_is_stream_unchanged(
+ 	struct dc_stream_state *old_stream, struct dc_stream_state *stream)
+ {
++	if (!old_stream || !stream)
++		return false;
+ 
+ 	if (!are_stream_backends_same(old_stream, stream))
+ 		return false;
+@@ -2877,8 +2879,10 @@ static bool planes_changed_for_existing_stream(struct dc_state *context,
+ 		}
+ 	}
+ 
+-	if (!stream_status)
++	if (!stream_status) {
+ 		ASSERT(0);
++		return false;
++	}
+ 
+ 	for (i = 0; i < set_count; i++)
+ 		if (set[i].stream == stream)
+diff --git a/drivers/gpu/drm/amd/display/dc/dc_types.h b/drivers/gpu/drm/amd/display/dc/dc_types.h
+index cc173ecf78e0cf..6eaa02a80344bc 100644
+--- a/drivers/gpu/drm/amd/display/dc/dc_types.h
++++ b/drivers/gpu/drm/amd/display/dc/dc_types.h
+@@ -190,6 +190,7 @@ struct dc_panel_patch {
+ 	unsigned int skip_avmute;
+ 	unsigned int mst_start_top_delay;
+ 	unsigned int remove_sink_ext_caps;
++	unsigned int disable_colorimetry;
+ };
+ 
+ struct dc_edid_caps {
+diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c
+index c0372aa4ec8380..684e30f9cf8985 100644
+--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c
++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c
+@@ -571,6 +571,8 @@ bool cm_helper_translate_curve_to_degamma_hw_format(
+ 				i += increment) {
+ 			if (j == hw_points - 1)
+ 				break;
++			if (i >= TRANSFER_FUNC_POINTS)
++				return false;
+ 			rgb_resulted[j].red = output_tf->tf_pts.red[i];
+ 			rgb_resulted[j].green = output_tf->tf_pts.green[i];
+ 			rgb_resulted[j].blue = output_tf->tf_pts.blue[i];
+diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c
+index e0df9b0065f9c0..62c02adae7e76e 100644
+--- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c
++++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c
+@@ -178,6 +178,8 @@ bool cm3_helper_translate_curve_to_hw_format(
+ 				i += increment) {
+ 			if (j == hw_points - 1)
+ 				break;
++			if (i >= TRANSFER_FUNC_POINTS)
++				return false;
+ 			rgb_resulted[j].red = output_tf->tf_pts.red[i];
+ 			rgb_resulted[j].green = output_tf->tf_pts.green[i];
+ 			rgb_resulted[j].blue = output_tf->tf_pts.blue[i];
+@@ -355,6 +357,8 @@ bool cm3_helper_translate_curve_to_degamma_hw_format(
+ 				i += increment) {
+ 			if (j == hw_points - 1)
+ 				break;
++			if (i >= TRANSFER_FUNC_POINTS)
++				return false;
+ 			rgb_resulted[j].red = output_tf->tf_pts.red[i];
+ 			rgb_resulted[j].green = output_tf->tf_pts.green[i];
+ 			rgb_resulted[j].blue = output_tf->tf_pts.blue[i];
+diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c
+index 0fc9f3e3ffaefd..f603486af6e306 100644
+--- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c
++++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c
+@@ -78,7 +78,7 @@ static void calculate_ttu_cursor(struct display_mode_lib *mode_lib,
+ 
+ static unsigned int get_bytes_per_element(enum source_format_class source_format, bool is_chroma)
+ {
+-	unsigned int ret_val = 0;
++	unsigned int ret_val = 1;
+ 
+ 	if (source_format == dm_444_16) {
+ 		if (!is_chroma)
+diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c
+index 618f4b682ab1b1..9f28e4d3c664c7 100644
+--- a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c
++++ b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c
+@@ -53,7 +53,7 @@ static void calculate_ttu_cursor(
+ 
+ static unsigned int get_bytes_per_element(enum source_format_class source_format, bool is_chroma)
+ {
+-	unsigned int ret_val = 0;
++	unsigned int ret_val = 1;
+ 
+ 	if (source_format == dm_444_16) {
+ 		if (!is_chroma)
+diff --git a/drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_hpo_dp.c b/drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_hpo_dp.c
+index e1257404357b11..cec68c5dba1322 100644
+--- a/drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_hpo_dp.c
++++ b/drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_hpo_dp.c
+@@ -28,6 +28,8 @@
+ #include "dccg.h"
+ #include "clk_mgr.h"
+ 
++#define DC_LOGGER link->ctx->logger
++
+ void set_hpo_dp_throttled_vcp_size(struct pipe_ctx *pipe_ctx,
+ 		struct fixed31_32 throttled_vcp_size)
+ {
+@@ -108,6 +110,11 @@ void enable_hpo_dp_link_output(struct dc_link *link,
+ 		enum clock_source_id clock_source,
+ 		const struct dc_link_settings *link_settings)
+ {
++	if (!link_res->hpo_dp_link_enc) {
++		DC_LOG_ERROR("%s: invalid hpo_dp_link_enc\n", __func__);
++		return;
++	}
++
+ 	if (link->dc->res_pool->dccg->funcs->set_symclk32_le_root_clock_gating)
+ 		link->dc->res_pool->dccg->funcs->set_symclk32_le_root_clock_gating(
+ 				link->dc->res_pool->dccg,
+@@ -124,6 +131,11 @@ void disable_hpo_dp_link_output(struct dc_link *link,
+ 		const struct link_resource *link_res,
+ 		enum signal_type signal)
+ {
++	if (!link_res->hpo_dp_link_enc) {
++		DC_LOG_ERROR("%s: invalid hpo_dp_link_enc\n", __func__);
++		return;
++	}
++
+ 		link_res->hpo_dp_link_enc->funcs->link_disable(link_res->hpo_dp_link_enc);
+ 		link_res->hpo_dp_link_enc->funcs->disable_link_phy(
+ 				link_res->hpo_dp_link_enc, signal);
+diff --git a/drivers/gpu/drm/amd/display/dc/link/link_factory.c b/drivers/gpu/drm/amd/display/dc/link/link_factory.c
+index 33bb96f770b866..eb7c9f226af5cb 100644
+--- a/drivers/gpu/drm/amd/display/dc/link/link_factory.c
++++ b/drivers/gpu/drm/amd/display/dc/link/link_factory.c
+@@ -403,7 +403,7 @@ static void link_destruct(struct dc_link *link)
+ 	if (link->panel_cntl)
+ 		link->panel_cntl->funcs->destroy(&link->panel_cntl);
+ 
+-	if (link->link_enc) {
++	if (link->link_enc && !link->is_dig_mapping_flexible) {
+ 		/* Update link encoder resource tracking variables. These are used for
+ 		 * the dynamic assignment of link encoders to streams. Virtual links
+ 		 * are not assigned encoder resources on creation.
+diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/processpptables.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/processpptables.c
+index 5794b64507bf94..56a22575258064 100644
+--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/processpptables.c
++++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/processpptables.c
+@@ -1185,6 +1185,8 @@ static int init_overdrive_limits(struct pp_hwmgr *hwmgr,
+ 	fw_info = smu_atom_get_data_table(hwmgr->adev,
+ 			 GetIndexIntoMasterTable(DATA, FirmwareInfo),
+ 			 &size, &frev, &crev);
++	PP_ASSERT_WITH_CODE(fw_info != NULL,
++			    "Missing firmware info!", return -EINVAL);
+ 
+ 	if ((fw_info->ucTableFormatRevision == 1)
+ 	    && (le16_to_cpu(fw_info->usStructureSize) >= sizeof(ATOM_FIRMWARE_INFO_V1_4)))
+diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+index 2611afd2c1c136..ef2b6ce544d0a8 100644
+--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
++++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+@@ -1291,17 +1291,6 @@ static int adv7511_probe(struct i2c_client *i2c)
+ 
+ 	INIT_WORK(&adv7511->hpd_work, adv7511_hpd_work);
+ 
+-	if (i2c->irq) {
+-		init_waitqueue_head(&adv7511->wq);
+-
+-		ret = devm_request_threaded_irq(dev, i2c->irq, NULL,
+-						adv7511_irq_handler,
+-						IRQF_ONESHOT, dev_name(dev),
+-						adv7511);
+-		if (ret)
+-			goto err_unregister_cec;
+-	}
+-
+ 	adv7511_power_off(adv7511);
+ 
+ 	i2c_set_clientdata(i2c, adv7511);
+@@ -1325,6 +1314,17 @@ static int adv7511_probe(struct i2c_client *i2c)
+ 
+ 	adv7511_audio_init(dev, adv7511);
+ 
++	if (i2c->irq) {
++		init_waitqueue_head(&adv7511->wq);
++
++		ret = devm_request_threaded_irq(dev, i2c->irq, NULL,
++						adv7511_irq_handler,
++						IRQF_ONESHOT, dev_name(dev),
++						adv7511);
++		if (ret)
++			goto err_unregister_audio;
++	}
++
+ 	if (adv7511->type == ADV7533 || adv7511->type == ADV7535) {
+ 		ret = adv7533_attach_dsi(adv7511);
+ 		if (ret)
+diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c
+index 98d3b10c08ae19..ab03b08433f8f3 100644
+--- a/drivers/gpu/drm/drm_atomic_uapi.c
++++ b/drivers/gpu/drm/drm_atomic_uapi.c
+@@ -585,7 +585,7 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane,
+ 					&state->fb_damage_clips,
+ 					val,
+ 					-1,
+-					sizeof(struct drm_rect),
++					sizeof(struct drm_mode_rect),
+ 					&replaced);
+ 		return ret;
+ 	} else if (property == plane->scaling_filter_property) {
+diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
+index 5b93c11895bb1e..aab76334083e8a 100644
+--- a/drivers/gpu/drm/drm_print.c
++++ b/drivers/gpu/drm/drm_print.c
+@@ -100,8 +100,9 @@ void __drm_puts_coredump(struct drm_printer *p, const char *str)
+ 			copy = iterator->remain;
+ 
+ 		/* Copy out the bit of the string that we need */
+-		memcpy(iterator->data,
+-			str + (iterator->start - iterator->offset), copy);
++		if (iterator->data)
++			memcpy(iterator->data,
++			       str + (iterator->start - iterator->offset), copy);
+ 
+ 		iterator->offset = iterator->start + copy;
+ 		iterator->remain -= copy;
+@@ -110,7 +111,8 @@ void __drm_puts_coredump(struct drm_printer *p, const char *str)
+ 
+ 		len = min_t(ssize_t, strlen(str), iterator->remain);
+ 
+-		memcpy(iterator->data + pos, str, len);
++		if (iterator->data)
++			memcpy(iterator->data + pos, str, len);
+ 
+ 		iterator->offset += len;
+ 		iterator->remain -= len;
+@@ -140,8 +142,9 @@ void __drm_printfn_coredump(struct drm_printer *p, struct va_format *vaf)
+ 	if ((iterator->offset >= iterator->start) && (len < iterator->remain)) {
+ 		ssize_t pos = iterator->offset - iterator->start;
+ 
+-		snprintf(((char *) iterator->data) + pos,
+-			iterator->remain, "%pV", vaf);
++		if (iterator->data)
++			snprintf(((char *) iterator->data) + pos,
++				 iterator->remain, "%pV", vaf);
+ 
+ 		iterator->offset += len;
+ 		iterator->remain -= len;
+diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+index 9227f8146a583f..6dc097a2ac07b3 100644
+--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
++++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+@@ -1136,7 +1136,7 @@ static vm_fault_t vm_fault_ttm(struct vm_fault *vmf)
+ 		GEM_WARN_ON(!i915_ttm_cpu_maps_iomem(bo->resource));
+ 	}
+ 
+-	if (wakeref & CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND)
++	if (wakeref && CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND != 0)
+ 		intel_wakeref_auto(&to_i915(obj->base.dev)->runtime_pm.userfault_wakeref,
+ 				   msecs_to_jiffies_timeout(CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND));
+ 
+diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
+index 8f0c47e8687485..036028b8f5248d 100644
+--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
++++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
+@@ -436,8 +436,10 @@ static int ovl_adaptor_comp_init(struct device *dev, struct component_match **ma
+ 		}
+ 
+ 		comp_pdev = of_find_device_by_node(node);
+-		if (!comp_pdev)
++		if (!comp_pdev) {
++			of_node_put(node);
+ 			return -EPROBE_DEFER;
++		}
+ 
+ 		priv->ovl_adaptor_comp[id] = &comp_pdev->dev;
+ 
+diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+index 4127e2762dcd10..a2df8bd7aa940f 100644
+--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
++++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+@@ -1071,6 +1071,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
+ 	adreno_gpu->chip_id = config->chip_id;
+ 
+ 	gpu->allow_relocs = config->info->family < ADRENO_6XX_GEN1;
++	gpu->pdev = pdev;
+ 
+ 	/* Only handle the core clock when GMU is not in use (or is absent). */
+ 	if (adreno_has_gmu_wrapper(adreno_gpu) ||
+diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
+index 5c10b559a5957a..5a7541597d0ce8 100644
+--- a/drivers/gpu/drm/msm/msm_gpu.c
++++ b/drivers/gpu/drm/msm/msm_gpu.c
+@@ -927,7 +927,6 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
+ 	if (IS_ERR(gpu->gpu_cx))
+ 		gpu->gpu_cx = NULL;
+ 
+-	gpu->pdev = pdev;
+ 	platform_set_drvdata(pdev, &gpu->adreno_smmu);
+ 
+ 	msm_devfreq_init(gpu);
+diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
+index e000577a95dd75..21996b713d1c3a 100644
+--- a/drivers/gpu/drm/omapdrm/omap_drv.c
++++ b/drivers/gpu/drm/omapdrm/omap_drv.c
+@@ -695,6 +695,10 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev)
+ 	soc = soc_device_match(omapdrm_soc_devices);
+ 	priv->omaprev = soc ? (uintptr_t)soc->data : 0;
+ 	priv->wq = alloc_ordered_workqueue("omapdrm", 0);
++	if (!priv->wq) {
++		ret = -ENOMEM;
++		goto err_alloc_workqueue;
++	}
+ 
+ 	mutex_init(&priv->list_lock);
+ 	INIT_LIST_HEAD(&priv->obj_list);
+@@ -753,6 +757,7 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev)
+ 	drm_mode_config_cleanup(ddev);
+ 	omap_gem_deinit(ddev);
+ 	destroy_workqueue(priv->wq);
++err_alloc_workqueue:
+ 	omap_disconnect_pipelines(ddev);
+ 	drm_dev_put(ddev);
+ 	return ret;
+diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
+index cfeca2694d5f91..b63b6b4e9b2818 100644
+--- a/drivers/gpu/drm/radeon/r100.c
++++ b/drivers/gpu/drm/radeon/r100.c
+@@ -1015,45 +1015,65 @@ static int r100_cp_init_microcode(struct radeon_device *rdev)
+ 
+ 	DRM_DEBUG_KMS("\n");
+ 
+-	if ((rdev->family == CHIP_R100) || (rdev->family == CHIP_RV100) ||
+-	    (rdev->family == CHIP_RV200) || (rdev->family == CHIP_RS100) ||
+-	    (rdev->family == CHIP_RS200)) {
++	switch (rdev->family) {
++	case CHIP_R100:
++	case CHIP_RV100:
++	case CHIP_RV200:
++	case CHIP_RS100:
++	case CHIP_RS200:
+ 		DRM_INFO("Loading R100 Microcode\n");
+ 		fw_name = FIRMWARE_R100;
+-	} else if ((rdev->family == CHIP_R200) ||
+-		   (rdev->family == CHIP_RV250) ||
+-		   (rdev->family == CHIP_RV280) ||
+-		   (rdev->family == CHIP_RS300)) {
++		break;
++
++	case CHIP_R200:
++	case CHIP_RV250:
++	case CHIP_RV280:
++	case CHIP_RS300:
+ 		DRM_INFO("Loading R200 Microcode\n");
+ 		fw_name = FIRMWARE_R200;
+-	} else if ((rdev->family == CHIP_R300) ||
+-		   (rdev->family == CHIP_R350) ||
+-		   (rdev->family == CHIP_RV350) ||
+-		   (rdev->family == CHIP_RV380) ||
+-		   (rdev->family == CHIP_RS400) ||
+-		   (rdev->family == CHIP_RS480)) {
++		break;
++
++	case CHIP_R300:
++	case CHIP_R350:
++	case CHIP_RV350:
++	case CHIP_RV380:
++	case CHIP_RS400:
++	case CHIP_RS480:
+ 		DRM_INFO("Loading R300 Microcode\n");
+ 		fw_name = FIRMWARE_R300;
+-	} else if ((rdev->family == CHIP_R420) ||
+-		   (rdev->family == CHIP_R423) ||
+-		   (rdev->family == CHIP_RV410)) {
++		break;
++
++	case CHIP_R420:
++	case CHIP_R423:
++	case CHIP_RV410:
+ 		DRM_INFO("Loading R400 Microcode\n");
+ 		fw_name = FIRMWARE_R420;
+-	} else if ((rdev->family == CHIP_RS690) ||
+-		   (rdev->family == CHIP_RS740)) {
++		break;
++
++	case CHIP_RS690:
++	case CHIP_RS740:
+ 		DRM_INFO("Loading RS690/RS740 Microcode\n");
+ 		fw_name = FIRMWARE_RS690;
+-	} else if (rdev->family == CHIP_RS600) {
++		break;
++
++	case CHIP_RS600:
+ 		DRM_INFO("Loading RS600 Microcode\n");
+ 		fw_name = FIRMWARE_RS600;
+-	} else if ((rdev->family == CHIP_RV515) ||
+-		   (rdev->family == CHIP_R520) ||
+-		   (rdev->family == CHIP_RV530) ||
+-		   (rdev->family == CHIP_R580) ||
+-		   (rdev->family == CHIP_RV560) ||
+-		   (rdev->family == CHIP_RV570)) {
++		break;
++
++	case CHIP_RV515:
++	case CHIP_R520:
++	case CHIP_RV530:
++	case CHIP_R580:
++	case CHIP_RV560:
++	case CHIP_RV570:
+ 		DRM_INFO("Loading R500 Microcode\n");
+ 		fw_name = FIRMWARE_R520;
++		break;
++
++	default:
++		DRM_ERROR("Unsupported Radeon family %u\n", rdev->family);
++		return -EINVAL;
+ 	}
+ 
+ 	err = request_firmware(&rdev->me_fw, fw_name, rdev->dev);
+diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+index c6fbfc0baeccd4..ee72e8c6ad69bd 100644
+--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
++++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+@@ -1566,6 +1566,10 @@ static void vop_crtc_atomic_flush(struct drm_crtc *crtc,
+ 	VOP_AFBC_SET(vop, enable, s->enable_afbc);
+ 	vop_cfg_done(vop);
+ 
++	/* Ack the DMA transfer of the previous frame (RK3066). */
++	if (VOP_HAS_REG(vop, common, dma_stop))
++		VOP_REG_SET(vop, common, dma_stop, 0);
++
+ 	spin_unlock(&vop->reg_lock);
+ 
+ 	/*
+diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
+index 5f56e0597df84a..c5c716a69171a8 100644
+--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
++++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
+@@ -122,6 +122,7 @@ struct vop_common {
+ 	struct vop_reg lut_buffer_index;
+ 	struct vop_reg gate_en;
+ 	struct vop_reg mmu_en;
++	struct vop_reg dma_stop;
+ 	struct vop_reg out_mode;
+ 	struct vop_reg standby;
+ };
+diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+index 7b28050067769d..f7d0edd762b36c 100644
+--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
++++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+@@ -435,6 +435,7 @@ static const struct vop_output rk3066_output = {
+ };
+ 
+ static const struct vop_common rk3066_common = {
++	.dma_stop = VOP_REG(RK3066_SYS_CTRL0, 0x1, 0),
+ 	.standby = VOP_REG(RK3066_SYS_CTRL0, 0x1, 1),
+ 	.out_mode = VOP_REG(RK3066_DSP_CTRL0, 0xf, 0),
+ 	.cfg_done = VOP_REG(RK3066_REG_CFG_DONE, 0x1, 0),
+@@ -483,6 +484,7 @@ static const struct vop_data rk3066_vop = {
+ 	.output = &rk3066_output,
+ 	.win = rk3066_vop_win_data,
+ 	.win_size = ARRAY_SIZE(rk3066_vop_win_data),
++	.feature = VOP_FEATURE_INTERNAL_RGB,
+ 	.max_output = { 1920, 1080 },
+ };
+ 
+diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c
+index a42763e1429dc1..d3462be7493037 100644
+--- a/drivers/gpu/drm/scheduler/sched_entity.c
++++ b/drivers/gpu/drm/scheduler/sched_entity.c
+@@ -111,8 +111,10 @@ void drm_sched_entity_modify_sched(struct drm_sched_entity *entity,
+ {
+ 	WARN_ON(!num_sched_list || !sched_list);
+ 
++	spin_lock(&entity->rq_lock);
+ 	entity->sched_list = sched_list;
+ 	entity->num_sched_list = num_sched_list;
++	spin_unlock(&entity->rq_lock);
+ }
+ EXPORT_SYMBOL(drm_sched_entity_modify_sched);
+ 
+diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c
+index 4d2db079ad4ff3..e1232f74dfa537 100644
+--- a/drivers/gpu/drm/stm/drv.c
++++ b/drivers/gpu/drm/stm/drv.c
+@@ -25,6 +25,7 @@
+ #include <drm/drm_module.h>
+ #include <drm/drm_probe_helper.h>
+ #include <drm/drm_vblank.h>
++#include <drm/drm_managed.h>
+ 
+ #include "ltdc.h"
+ 
+@@ -75,7 +76,7 @@ static int drv_load(struct drm_device *ddev)
+ 
+ 	DRM_DEBUG("%s\n", __func__);
+ 
+-	ldev = devm_kzalloc(ddev->dev, sizeof(*ldev), GFP_KERNEL);
++	ldev = drmm_kzalloc(ddev, sizeof(*ldev), GFP_KERNEL);
+ 	if (!ldev)
+ 		return -ENOMEM;
+ 
+diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
+index 5aec1e58c968c2..0832b749b66e7f 100644
+--- a/drivers/gpu/drm/stm/ltdc.c
++++ b/drivers/gpu/drm/stm/ltdc.c
+@@ -36,6 +36,7 @@
+ #include <drm/drm_probe_helper.h>
+ #include <drm/drm_simple_kms_helper.h>
+ #include <drm/drm_vblank.h>
++#include <drm/drm_managed.h>
+ 
+ #include <video/videomode.h>
+ 
+@@ -1199,7 +1200,6 @@ static void ltdc_crtc_atomic_print_state(struct drm_printer *p,
+ }
+ 
+ static const struct drm_crtc_funcs ltdc_crtc_funcs = {
+-	.destroy = drm_crtc_cleanup,
+ 	.set_config = drm_atomic_helper_set_config,
+ 	.page_flip = drm_atomic_helper_page_flip,
+ 	.reset = drm_atomic_helper_crtc_reset,
+@@ -1212,7 +1212,6 @@ static const struct drm_crtc_funcs ltdc_crtc_funcs = {
+ };
+ 
+ static const struct drm_crtc_funcs ltdc_crtc_with_crc_support_funcs = {
+-	.destroy = drm_crtc_cleanup,
+ 	.set_config = drm_atomic_helper_set_config,
+ 	.page_flip = drm_atomic_helper_page_flip,
+ 	.reset = drm_atomic_helper_crtc_reset,
+@@ -1514,6 +1513,9 @@ static void ltdc_plane_atomic_disable(struct drm_plane *plane,
+ 	/* Disable layer */
+ 	regmap_write_bits(ldev->regmap, LTDC_L1CR + lofs, LXCR_LEN | LXCR_CLUTEN |  LXCR_HMEN, 0);
+ 
++	/* Reset the layer transparency to hide any related background color */
++	regmap_write_bits(ldev->regmap, LTDC_L1CACR + lofs, LXCACR_CONSTA, 0x00);
++
+ 	/* Commit shadow registers = update plane at next vblank */
+ 	if (ldev->caps.plane_reg_shadow)
+ 		regmap_write_bits(ldev->regmap, LTDC_L1RCR + lofs,
+@@ -1545,7 +1547,6 @@ static void ltdc_plane_atomic_print_state(struct drm_printer *p,
+ static const struct drm_plane_funcs ltdc_plane_funcs = {
+ 	.update_plane = drm_atomic_helper_update_plane,
+ 	.disable_plane = drm_atomic_helper_disable_plane,
+-	.destroy = drm_plane_cleanup,
+ 	.reset = drm_atomic_helper_plane_reset,
+ 	.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
+ 	.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
+@@ -1572,7 +1573,6 @@ static struct drm_plane *ltdc_plane_create(struct drm_device *ddev,
+ 	const u64 *modifiers = ltdc_format_modifiers;
+ 	u32 lofs = index * LAY_OFS;
+ 	u32 val;
+-	int ret;
+ 
+ 	/* Allocate the biggest size according to supported color formats */
+ 	formats = devm_kzalloc(dev, (ldev->caps.pix_fmt_nb +
+@@ -1615,14 +1615,10 @@ static struct drm_plane *ltdc_plane_create(struct drm_device *ddev,
+ 		}
+ 	}
+ 
+-	plane = devm_kzalloc(dev, sizeof(*plane), GFP_KERNEL);
+-	if (!plane)
+-		return NULL;
+-
+-	ret = drm_universal_plane_init(ddev, plane, possible_crtcs,
+-				       &ltdc_plane_funcs, formats, nb_fmt,
+-				       modifiers, type, NULL);
+-	if (ret < 0)
++	plane = drmm_universal_plane_alloc(ddev, struct drm_plane, dev,
++					   possible_crtcs, &ltdc_plane_funcs, formats,
++					   nb_fmt, modifiers, type, NULL);
++	if (IS_ERR(plane))
+ 		return NULL;
+ 
+ 	if (ldev->caps.ycbcr_input) {
+@@ -1645,15 +1641,6 @@ static struct drm_plane *ltdc_plane_create(struct drm_device *ddev,
+ 	return plane;
+ }
+ 
+-static void ltdc_plane_destroy_all(struct drm_device *ddev)
+-{
+-	struct drm_plane *plane, *plane_temp;
+-
+-	list_for_each_entry_safe(plane, plane_temp,
+-				 &ddev->mode_config.plane_list, head)
+-		drm_plane_cleanup(plane);
+-}
+-
+ static int ltdc_crtc_init(struct drm_device *ddev, struct drm_crtc *crtc)
+ {
+ 	struct ltdc_device *ldev = ddev->dev_private;
+@@ -1679,14 +1666,14 @@ static int ltdc_crtc_init(struct drm_device *ddev, struct drm_crtc *crtc)
+ 
+ 	/* Init CRTC according to its hardware features */
+ 	if (ldev->caps.crc)
+-		ret = drm_crtc_init_with_planes(ddev, crtc, primary, NULL,
+-						&ltdc_crtc_with_crc_support_funcs, NULL);
++		ret = drmm_crtc_init_with_planes(ddev, crtc, primary, NULL,
++						 &ltdc_crtc_with_crc_support_funcs, NULL);
+ 	else
+-		ret = drm_crtc_init_with_planes(ddev, crtc, primary, NULL,
+-						&ltdc_crtc_funcs, NULL);
++		ret = drmm_crtc_init_with_planes(ddev, crtc, primary, NULL,
++						 &ltdc_crtc_funcs, NULL);
+ 	if (ret) {
+ 		DRM_ERROR("Can not initialize CRTC\n");
+-		goto cleanup;
++		return ret;
+ 	}
+ 
+ 	drm_crtc_helper_add(crtc, &ltdc_crtc_helper_funcs);
+@@ -1700,9 +1687,8 @@ static int ltdc_crtc_init(struct drm_device *ddev, struct drm_crtc *crtc)
+ 	for (i = 1; i < ldev->caps.nb_layers; i++) {
+ 		overlay = ltdc_plane_create(ddev, DRM_PLANE_TYPE_OVERLAY, i);
+ 		if (!overlay) {
+-			ret = -ENOMEM;
+ 			DRM_ERROR("Can not create overlay plane %d\n", i);
+-			goto cleanup;
++			return -ENOMEM;
+ 		}
+ 		if (ldev->caps.dynamic_zorder)
+ 			drm_plane_create_zpos_property(overlay, i, 0, ldev->caps.nb_layers - 1);
+@@ -1715,10 +1701,6 @@ static int ltdc_crtc_init(struct drm_device *ddev, struct drm_crtc *crtc)
+ 	}
+ 
+ 	return 0;
+-
+-cleanup:
+-	ltdc_plane_destroy_all(ddev);
+-	return ret;
+ }
+ 
+ static void ltdc_encoder_disable(struct drm_encoder *encoder)
+@@ -1778,23 +1760,19 @@ static int ltdc_encoder_init(struct drm_device *ddev, struct drm_bridge *bridge)
+ 	struct drm_encoder *encoder;
+ 	int ret;
+ 
+-	encoder = devm_kzalloc(ddev->dev, sizeof(*encoder), GFP_KERNEL);
+-	if (!encoder)
+-		return -ENOMEM;
++	encoder = drmm_simple_encoder_alloc(ddev, struct drm_encoder, dev,
++					    DRM_MODE_ENCODER_DPI);
++	if (IS_ERR(encoder))
++		return PTR_ERR(encoder);
+ 
+ 	encoder->possible_crtcs = CRTC_MASK;
+ 	encoder->possible_clones = 0;	/* No cloning support */
+ 
+-	drm_simple_encoder_init(ddev, encoder, DRM_MODE_ENCODER_DPI);
+-
+ 	drm_encoder_helper_add(encoder, &ltdc_encoder_helper_funcs);
+ 
+ 	ret = drm_bridge_attach(encoder, bridge, NULL, 0);
+-	if (ret) {
+-		if (ret != -EPROBE_DEFER)
+-			drm_encoder_cleanup(encoder);
++	if (ret)
+ 		return ret;
+-	}
+ 
+ 	DRM_DEBUG_DRIVER("Bridge encoder:%d created\n", encoder->base.id);
+ 
+@@ -1964,8 +1942,7 @@ int ltdc_load(struct drm_device *ddev)
+ 			goto err;
+ 
+ 		if (panel) {
+-			bridge = drm_panel_bridge_add_typed(panel,
+-							    DRM_MODE_CONNECTOR_DPI);
++			bridge = drmm_panel_bridge_add(ddev, panel);
+ 			if (IS_ERR(bridge)) {
+ 				DRM_ERROR("panel-bridge endpoint %d\n", i);
+ 				ret = PTR_ERR(bridge);
+@@ -2047,7 +2024,7 @@ int ltdc_load(struct drm_device *ddev)
+ 		}
+ 	}
+ 
+-	crtc = devm_kzalloc(dev, sizeof(*crtc), GFP_KERNEL);
++	crtc = drmm_kzalloc(ddev, sizeof(*crtc), GFP_KERNEL);
+ 	if (!crtc) {
+ 		DRM_ERROR("Failed to allocate crtc\n");
+ 		ret = -ENOMEM;
+@@ -2074,9 +2051,6 @@ int ltdc_load(struct drm_device *ddev)
+ 
+ 	return 0;
+ err:
+-	for (i = 0; i < nb_endpoints; i++)
+-		drm_of_panel_bridge_remove(ddev->dev->of_node, 0, i);
+-
+ 	clk_disable_unprepare(ldev->pixel_clk);
+ 
+ 	return ret;
+@@ -2084,16 +2058,8 @@ int ltdc_load(struct drm_device *ddev)
+ 
+ void ltdc_unload(struct drm_device *ddev)
+ {
+-	struct device *dev = ddev->dev;
+-	int nb_endpoints, i;
+-
+ 	DRM_DEBUG_DRIVER("\n");
+ 
+-	nb_endpoints = of_graph_get_endpoint_count(dev->of_node);
+-
+-	for (i = 0; i < nb_endpoints; i++)
+-		drm_of_panel_bridge_remove(ddev->dev->of_node, 0, i);
+-
+ 	pm_runtime_disable(ddev->dev);
+ }
+ 
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index a5987fafbedde4..f2e8fb357590ff 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -411,24 +411,8 @@
+ #define USB_DEVICE_ID_TOSHIBA_CLICK_L9W	0x0401
+ #define USB_DEVICE_ID_HP_X2		0x074d
+ #define USB_DEVICE_ID_HP_X2_10_COVER	0x0755
+-#define I2C_DEVICE_ID_HP_ENVY_X360_15	0x2d05
+-#define I2C_DEVICE_ID_HP_ENVY_X360_15T_DR100	0x29CF
+-#define I2C_DEVICE_ID_HP_ENVY_X360_EU0009NV	0x2CF9
+-#define I2C_DEVICE_ID_HP_SPECTRE_X360_15	0x2817
+-#define I2C_DEVICE_ID_HP_SPECTRE_X360_13_AW0020NG  0x29DF
+-#define I2C_DEVICE_ID_ASUS_TP420IA_TOUCHSCREEN 0x2BC8
+-#define I2C_DEVICE_ID_ASUS_GV301RA_TOUCHSCREEN 0x2C82
+-#define I2C_DEVICE_ID_ASUS_UX3402_TOUCHSCREEN 0x2F2C
+-#define I2C_DEVICE_ID_ASUS_UX6404_TOUCHSCREEN 0x4116
+ #define USB_DEVICE_ID_ASUS_UX550VE_TOUCHSCREEN	0x2544
+ #define USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN	0x2706
+-#define I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN	0x261A
+-#define I2C_DEVICE_ID_SURFACE_GO2_TOUCHSCREEN	0x2A1C
+-#define I2C_DEVICE_ID_LENOVO_YOGA_C630_TOUCHSCREEN	0x279F
+-#define I2C_DEVICE_ID_HP_SPECTRE_X360_13T_AW100	0x29F5
+-#define I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V1	0x2BED
+-#define I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V2	0x2BEE
+-#define I2C_DEVICE_ID_HP_ENVY_X360_15_EU0556NG		0x2D02
+ #define I2C_DEVICE_ID_CHROMEBOOK_TROGDOR_POMPOM	0x2F81
+ 
+ #define USB_VENDOR_ID_ELECOM		0x056e
+@@ -804,6 +788,7 @@
+ #define USB_DEVICE_ID_LENOVO_X1_TAB	0x60a3
+ #define USB_DEVICE_ID_LENOVO_X1_TAB3	0x60b5
+ #define USB_DEVICE_ID_LENOVO_X12_TAB	0x60fe
++#define USB_DEVICE_ID_LENOVO_X12_TAB2	0x61ae
+ #define USB_DEVICE_ID_LENOVO_OPTICAL_USB_MOUSE_600E	0x600e
+ #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D	0x608d
+ #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6019	0x6019
+diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
+index c9094a4f281e90..fda9dce3da9980 100644
+--- a/drivers/hid/hid-input.c
++++ b/drivers/hid/hid-input.c
+@@ -373,14 +373,6 @@ static const struct hid_device_id hid_battery_quirks[] = {
+ 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH,
+ 		USB_DEVICE_ID_LOGITECH_DINOVO_EDGE_KBD),
+ 	  HID_BATTERY_QUIRK_IGNORE },
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_ASUS_TP420IA_TOUCHSCREEN),
+-	  HID_BATTERY_QUIRK_IGNORE },
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_ASUS_GV301RA_TOUCHSCREEN),
+-	  HID_BATTERY_QUIRK_IGNORE },
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_ASUS_UX3402_TOUCHSCREEN),
+-	  HID_BATTERY_QUIRK_IGNORE },
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_ASUS_UX6404_TOUCHSCREEN),
+-	  HID_BATTERY_QUIRK_IGNORE },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN),
+ 	  HID_BATTERY_QUIRK_IGNORE },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ASUS_UX550VE_TOUCHSCREEN),
+@@ -391,32 +383,13 @@ static const struct hid_device_id hid_battery_quirks[] = {
+ 	  HID_BATTERY_QUIRK_AVOID_QUERY },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_SW),
+ 	  HID_BATTERY_QUIRK_AVOID_QUERY },
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15),
+-	  HID_BATTERY_QUIRK_IGNORE },
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15T_DR100),
+-	  HID_BATTERY_QUIRK_IGNORE },
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_EU0009NV),
+-	  HID_BATTERY_QUIRK_IGNORE },
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_15),
+-	  HID_BATTERY_QUIRK_IGNORE },
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_13_AW0020NG),
+-	  HID_BATTERY_QUIRK_IGNORE },
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN),
+-	  HID_BATTERY_QUIRK_IGNORE },
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_SURFACE_GO2_TOUCHSCREEN),
+-	  HID_BATTERY_QUIRK_IGNORE },
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_LENOVO_YOGA_C630_TOUCHSCREEN),
+-	  HID_BATTERY_QUIRK_IGNORE },
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_13T_AW100),
+-	  HID_BATTERY_QUIRK_IGNORE },
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V1),
+-	  HID_BATTERY_QUIRK_IGNORE },
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V2),
+-	  HID_BATTERY_QUIRK_IGNORE },
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15_EU0556NG),
+-	  HID_BATTERY_QUIRK_IGNORE },
+ 	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_CHROMEBOOK_TROGDOR_POMPOM),
+ 	  HID_BATTERY_QUIRK_AVOID_QUERY },
++	/*
++	 * Elan I2C-HID touchscreens seem to all report a non present battery,
++	 * set HID_BATTERY_QUIRK_IGNORE for all Elan I2C-HID devices.
++	 */
++	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, HID_ANY_ID), HID_BATTERY_QUIRK_IGNORE },
+ 	{}
+ };
+ 
+diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
+index 8ef41d6e71d421..6d76463f5896f3 100644
+--- a/drivers/hid/hid-multitouch.c
++++ b/drivers/hid/hid-multitouch.c
+@@ -2116,6 +2116,12 @@ static const struct hid_device_id mt_devices[] = {
+ 			   USB_VENDOR_ID_LENOVO,
+ 			   USB_DEVICE_ID_LENOVO_X12_TAB) },
+ 
++	/* Lenovo X12 TAB Gen 2 */
++	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT_NSMU,
++		HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,
++			   USB_VENDOR_ID_LENOVO,
++			   USB_DEVICE_ID_LENOVO_X12_TAB2) },
++
+ 	/* Logitech devices */
+ 	{ .driver_data = MT_CLS_NSMU,
+ 		HID_DEVICE(BUS_BLUETOOTH, HID_GROUP_MULTITOUCH_WIN_8,
+diff --git a/drivers/hwmon/nct6775-platform.c b/drivers/hwmon/nct6775-platform.c
+index 81bf03dad6bbc5..706a662dd077d1 100644
+--- a/drivers/hwmon/nct6775-platform.c
++++ b/drivers/hwmon/nct6775-platform.c
+@@ -1269,6 +1269,7 @@ static const char * const asus_msi_boards[] = {
+ 	"EX-B760M-V5 D4",
+ 	"EX-H510M-V3",
+ 	"EX-H610M-V3 D4",
++	"G15CF",
+ 	"PRIME A620M-A",
+ 	"PRIME B560-PLUS",
+ 	"PRIME B560-PLUS AC-HES",
+diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c
+index 35f762872b8a58..58562700c85ee4 100644
+--- a/drivers/i2c/busses/i2c-designware-common.c
++++ b/drivers/i2c/busses/i2c-designware-common.c
+@@ -441,6 +441,7 @@ int i2c_dw_set_sda_hold(struct dw_i2c_dev *dev)
+ 
+ void __i2c_dw_disable(struct dw_i2c_dev *dev)
+ {
++	struct i2c_timings *t = &dev->timings;
+ 	unsigned int raw_intr_stats;
+ 	unsigned int enable;
+ 	int timeout = 100;
+@@ -453,6 +454,19 @@ void __i2c_dw_disable(struct dw_i2c_dev *dev)
+ 
+ 	abort_needed = raw_intr_stats & DW_IC_INTR_MST_ON_HOLD;
+ 	if (abort_needed) {
++		if (!(enable & DW_IC_ENABLE_ENABLE)) {
++			regmap_write(dev->map, DW_IC_ENABLE, DW_IC_ENABLE_ENABLE);
++			/*
++			 * Wait 10 times the signaling period of the highest I2C
++			 * transfer supported by the driver (for 400KHz this is
++			 * 25us) to ensure the I2C ENABLE bit is already set
++			 * as described in the DesignWare I2C databook.
++			 */
++			fsleep(DIV_ROUND_CLOSEST_ULL(10 * MICRO, t->bus_freq_hz));
++			/* Set ENABLE bit before setting ABORT */
++			enable |= DW_IC_ENABLE_ENABLE;
++		}
++
+ 		regmap_write(dev->map, DW_IC_ENABLE, enable | DW_IC_ENABLE_ABORT);
+ 		ret = regmap_read_poll_timeout(dev->map, DW_IC_ENABLE, enable,
+ 					       !(enable & DW_IC_ENABLE_ABORT), 10,
+diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h
+index ae835000fd32ae..99d8c6bbc0320d 100644
+--- a/drivers/i2c/busses/i2c-designware-core.h
++++ b/drivers/i2c/busses/i2c-designware-core.h
+@@ -109,6 +109,7 @@
+ 						 DW_IC_INTR_RX_UNDER | \
+ 						 DW_IC_INTR_RD_REQ)
+ 
++#define DW_IC_ENABLE_ENABLE			BIT(0)
+ #define DW_IC_ENABLE_ABORT			BIT(1)
+ 
+ #define DW_IC_STATUS_ACTIVITY			BIT(0)
+diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c
+index 85dbd0eb5392c5..579c668cb78a6d 100644
+--- a/drivers/i2c/busses/i2c-designware-master.c
++++ b/drivers/i2c/busses/i2c-designware-master.c
+@@ -253,6 +253,34 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev)
+ 	regmap_write(dev->map, DW_IC_INTR_MASK, DW_IC_INTR_MASTER_MASK);
+ }
+ 
++/*
++ * This function waits for the controller to be idle before disabling I2C
++ * When the controller is not in the IDLE state, the MST_ACTIVITY bit
++ * (IC_STATUS[5]) is set.
++ *
++ * Values:
++ * 0x1 (ACTIVE): Controller not idle
++ * 0x0 (IDLE): Controller is idle
++ *
++ * The function is called after completing the current transfer.
++ *
++ * Returns:
++ * False when the controller is in the IDLE state.
++ * True when the controller is in the ACTIVE state.
++ */
++static bool i2c_dw_is_controller_active(struct dw_i2c_dev *dev)
++{
++	u32 status;
++
++	regmap_read(dev->map, DW_IC_STATUS, &status);
++	if (!(status & DW_IC_STATUS_MASTER_ACTIVITY))
++		return false;
++
++	return regmap_read_poll_timeout(dev->map, DW_IC_STATUS, status,
++				       !(status & DW_IC_STATUS_MASTER_ACTIVITY),
++				       1100, 20000) != 0;
++}
++
+ static int i2c_dw_check_stopbit(struct dw_i2c_dev *dev)
+ {
+ 	u32 val;
+@@ -694,6 +722,16 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
+ 		goto done;
+ 	}
+ 
++	/*
++	 * This happens rarely (~1:500) and is hard to reproduce. Debug trace
++	 * showed that IC_STATUS had value of 0x23 when STOP_DET occurred,
++	 * if disable IC_ENABLE.ENABLE immediately that can result in
++	 * IC_RAW_INTR_STAT.MASTER_ON_HOLD holding SCL low. Check if
++	 * controller is still ACTIVE before disabling I2C.
++	 */
++	if (i2c_dw_is_controller_active(dev))
++		dev_err(dev->dev, "controller active\n");
++
+ 	/*
+ 	 * We must disable the adapter before returning and signaling the end
+ 	 * of the current transfer. Otherwise the hardware might continue
+diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c
+index d665c1c7c3274b..350f7827fbacaa 100644
+--- a/drivers/i2c/busses/i2c-qcom-geni.c
++++ b/drivers/i2c/busses/i2c-qcom-geni.c
+@@ -819,15 +819,13 @@ static int geni_i2c_probe(struct platform_device *pdev)
+ 	init_completion(&gi2c->done);
+ 	spin_lock_init(&gi2c->lock);
+ 	platform_set_drvdata(pdev, gi2c);
+-	ret = devm_request_irq(dev, gi2c->irq, geni_i2c_irq, 0,
++	ret = devm_request_irq(dev, gi2c->irq, geni_i2c_irq, IRQF_NO_AUTOEN,
+ 			       dev_name(dev), gi2c);
+ 	if (ret) {
+ 		dev_err(dev, "Request_irq failed:%d: err:%d\n",
+ 			gi2c->irq, ret);
+ 		return ret;
+ 	}
+-	/* Disable the interrupt so that the system can enter low-power mode */
+-	disable_irq(gi2c->irq);
+ 	i2c_set_adapdata(&gi2c->adap, gi2c);
+ 	gi2c->adap.dev.parent = dev;
+ 	gi2c->adap.dev.of_node = dev->of_node;
+diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
+index 887d55ae409691..b4f10ff31102b6 100644
+--- a/drivers/i2c/busses/i2c-stm32f7.c
++++ b/drivers/i2c/busses/i2c-stm32f7.c
+@@ -2394,7 +2394,7 @@ static int __maybe_unused stm32f7_i2c_runtime_suspend(struct device *dev)
+ 	struct stm32f7_i2c_dev *i2c_dev = dev_get_drvdata(dev);
+ 
+ 	if (!stm32f7_i2c_is_slave_registered(i2c_dev))
+-		clk_disable_unprepare(i2c_dev->clk);
++		clk_disable(i2c_dev->clk);
+ 
+ 	return 0;
+ }
+@@ -2405,9 +2405,9 @@ static int __maybe_unused stm32f7_i2c_runtime_resume(struct device *dev)
+ 	int ret;
+ 
+ 	if (!stm32f7_i2c_is_slave_registered(i2c_dev)) {
+-		ret = clk_prepare_enable(i2c_dev->clk);
++		ret = clk_enable(i2c_dev->clk);
+ 		if (ret) {
+-			dev_err(dev, "failed to prepare_enable clock\n");
++			dev_err(dev, "failed to enable clock\n");
+ 			return ret;
+ 		}
+ 	}
+diff --git a/drivers/i2c/busses/i2c-synquacer.c b/drivers/i2c/busses/i2c-synquacer.c
+index a73f5bb9a16456..9bb69a8ab6582e 100644
+--- a/drivers/i2c/busses/i2c-synquacer.c
++++ b/drivers/i2c/busses/i2c-synquacer.c
+@@ -138,7 +138,6 @@ struct synquacer_i2c {
+ 	int			irq;
+ 	struct device		*dev;
+ 	void __iomem		*base;
+-	struct clk		*pclk;
+ 	u32			pclkrate;
+ 	u32			speed_khz;
+ 	u32			timeout_ms;
+@@ -535,6 +534,7 @@ static const struct i2c_adapter synquacer_i2c_ops = {
+ static int synquacer_i2c_probe(struct platform_device *pdev)
+ {
+ 	struct synquacer_i2c *i2c;
++	struct clk *pclk;
+ 	u32 bus_speed;
+ 	int ret;
+ 
+@@ -550,13 +550,13 @@ static int synquacer_i2c_probe(struct platform_device *pdev)
+ 	device_property_read_u32(&pdev->dev, "socionext,pclk-rate",
+ 				 &i2c->pclkrate);
+ 
+-	i2c->pclk = devm_clk_get_enabled(&pdev->dev, "pclk");
+-	if (IS_ERR(i2c->pclk))
+-		return dev_err_probe(&pdev->dev, PTR_ERR(i2c->pclk),
++	pclk = devm_clk_get_optional_enabled(&pdev->dev, "pclk");
++	if (IS_ERR(pclk))
++		return dev_err_probe(&pdev->dev, PTR_ERR(pclk),
+ 				     "failed to get and enable clock\n");
+ 
+-	dev_dbg(&pdev->dev, "clock source %p\n", i2c->pclk);
+-	i2c->pclkrate = clk_get_rate(i2c->pclk);
++	if (pclk)
++		i2c->pclkrate = clk_get_rate(pclk);
+ 
+ 	if (i2c->pclkrate < SYNQUACER_I2C_MIN_CLK_RATE ||
+ 	    i2c->pclkrate > SYNQUACER_I2C_MAX_CLK_RATE)
+diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
+index 71391b590adaeb..1d68177241a6b3 100644
+--- a/drivers/i2c/busses/i2c-xiic.c
++++ b/drivers/i2c/busses/i2c-xiic.c
+@@ -772,14 +772,17 @@ static irqreturn_t xiic_process(int irq, void *dev_id)
+ 			goto out;
+ 		}
+ 
+-		xiic_fill_tx_fifo(i2c);
+-
+-		/* current message sent and there is space in the fifo */
+-		if (!xiic_tx_space(i2c) && xiic_tx_fifo_space(i2c) >= 2) {
++		if (xiic_tx_space(i2c)) {
++			xiic_fill_tx_fifo(i2c);
++		} else {
++			/* current message fully written */
+ 			dev_dbg(i2c->adap.dev.parent,
+ 				"%s end of message sent, nmsgs: %d\n",
+ 				__func__, i2c->nmsgs);
+-			if (i2c->nmsgs > 1) {
++			/* Don't move onto the next message until the TX FIFO empties,
++			 * to ensure that a NAK is not missed.
++			 */
++			if (i2c->nmsgs > 1 && (pend & XIIC_INTR_TX_EMPTY_MASK)) {
+ 				i2c->nmsgs--;
+ 				i2c->tx_msg++;
+ 				xfer_more = 1;
+@@ -790,11 +793,7 @@ static irqreturn_t xiic_process(int irq, void *dev_id)
+ 					"%s Got TX IRQ but no more to do...\n",
+ 					__func__);
+ 			}
+-		} else if (!xiic_tx_space(i2c) && (i2c->nmsgs == 1))
+-			/* current frame is sent and is last,
+-			 * make sure to disable tx half
+-			 */
+-			xiic_irq_dis(i2c, XIIC_INTR_TX_HALF_MASK);
++		}
+ 	}
+ 
+ 	if (pend & XIIC_INTR_BNB_MASK) {
+@@ -844,23 +843,11 @@ static int xiic_bus_busy(struct xiic_i2c *i2c)
+ 	return (sr & XIIC_SR_BUS_BUSY_MASK) ? -EBUSY : 0;
+ }
+ 
+-static int xiic_busy(struct xiic_i2c *i2c)
++static int xiic_wait_not_busy(struct xiic_i2c *i2c)
+ {
+ 	int tries = 3;
+ 	int err;
+ 
+-	if (i2c->tx_msg || i2c->rx_msg)
+-		return -EBUSY;
+-
+-	/* In single master mode bus can only be busy, when in use by this
+-	 * driver. If the register indicates bus being busy for some reason we
+-	 * should ignore it, since bus will never be released and i2c will be
+-	 * stuck forever.
+-	 */
+-	if (i2c->singlemaster) {
+-		return 0;
+-	}
+-
+ 	/* for instance if previous transfer was terminated due to TX error
+ 	 * it might be that the bus is on it's way to become available
+ 	 * give it at most 3 ms to wake
+@@ -1104,9 +1091,35 @@ static int xiic_start_xfer(struct xiic_i2c *i2c, struct i2c_msg *msgs, int num)
+ 
+ 	mutex_lock(&i2c->lock);
+ 
+-	ret = xiic_busy(i2c);
+-	if (ret)
++	if (i2c->tx_msg || i2c->rx_msg) {
++		dev_err(i2c->adap.dev.parent,
++			"cannot start a transfer while busy\n");
++		ret = -EBUSY;
+ 		goto out;
++	}
++
++	/* In single master mode bus can only be busy, when in use by this
++	 * driver. If the register indicates bus being busy for some reason we
++	 * should ignore it, since bus will never be released and i2c will be
++	 * stuck forever.
++	 */
++	if (!i2c->singlemaster) {
++		ret = xiic_wait_not_busy(i2c);
++		if (ret) {
++			/* If the bus is stuck in a busy state, such as due to spurious low
++			 * pulses on the bus causing a false start condition to be detected,
++			 * then try to recover by re-initializing the controller and check
++			 * again if the bus is still busy.
++			 */
++			dev_warn(i2c->adap.dev.parent, "I2C bus busy timeout, reinitializing\n");
++			ret = xiic_reinit(i2c);
++			if (ret)
++				goto out;
++			ret = xiic_wait_not_busy(i2c);
++			if (ret)
++				goto out;
++		}
++	}
+ 
+ 	i2c->tx_msg = msgs;
+ 	i2c->rx_msg = NULL;
+@@ -1164,10 +1177,8 @@ static int xiic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
+ 		return err;
+ 
+ 	err = xiic_start_xfer(i2c, msgs, num);
+-	if (err < 0) {
+-		dev_err(adap->dev.parent, "Error xiic_start_xfer\n");
++	if (err < 0)
+ 		goto out;
+-	}
+ 
+ 	err = wait_for_completion_timeout(&i2c->completion, XIIC_XFER_TIMEOUT);
+ 	mutex_lock(&i2c->lock);
+@@ -1326,8 +1337,8 @@ static int xiic_i2c_probe(struct platform_device *pdev)
+ 	return 0;
+ 
+ err_pm_disable:
+-	pm_runtime_set_suspended(&pdev->dev);
+ 	pm_runtime_disable(&pdev->dev);
++	pm_runtime_set_suspended(&pdev->dev);
+ 
+ 	return ret;
+ }
+diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
+index 1e873ff0a624d9..943f0021d6a2c1 100644
+--- a/drivers/i2c/i2c-core-base.c
++++ b/drivers/i2c/i2c-core-base.c
+@@ -16,6 +16,7 @@
+ #include <linux/acpi.h>
+ #include <linux/clk/clk-conf.h>
+ #include <linux/completion.h>
++#include <linux/debugfs.h>
+ #include <linux/delay.h>
+ #include <linux/err.h>
+ #include <linux/errno.h>
+@@ -67,6 +68,8 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver);
+ static DEFINE_STATIC_KEY_FALSE(i2c_trace_msg_key);
+ static bool is_registered;
+ 
++static struct dentry *i2c_debugfs_root;
++
+ int i2c_transfer_trace_reg(void)
+ {
+ 	static_branch_inc(&i2c_trace_msg_key);
+@@ -912,6 +915,27 @@ int i2c_dev_irq_from_resources(const struct resource *resources,
+ 	return 0;
+ }
+ 
++/*
++ * Serialize device instantiation in case it can be instantiated explicitly
++ * and by auto-detection
++ */
++static int i2c_lock_addr(struct i2c_adapter *adap, unsigned short addr,
++			 unsigned short flags)
++{
++	if (!(flags & I2C_CLIENT_TEN) &&
++	    test_and_set_bit(addr, adap->addrs_in_instantiation))
++		return -EBUSY;
++
++	return 0;
++}
++
++static void i2c_unlock_addr(struct i2c_adapter *adap, unsigned short addr,
++			    unsigned short flags)
++{
++	if (!(flags & I2C_CLIENT_TEN))
++		clear_bit(addr, adap->addrs_in_instantiation);
++}
++
+ /**
+  * i2c_new_client_device - instantiate an i2c device
+  * @adap: the adapter managing the device
+@@ -959,6 +983,10 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf
+ 		goto out_err_silent;
+ 	}
+ 
++	status = i2c_lock_addr(adap, client->addr, client->flags);
++	if (status)
++		goto out_err_silent;
++
+ 	/* Check for address business */
+ 	status = i2c_check_addr_busy(adap, i2c_encode_flags_to_addr(client));
+ 	if (status)
+@@ -990,6 +1018,8 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf
+ 	dev_dbg(&adap->dev, "client [%s] registered with bus id %s\n",
+ 		client->name, dev_name(&client->dev));
+ 
++	i2c_unlock_addr(adap, client->addr, client->flags);
++
+ 	return client;
+ 
+ out_remove_swnode:
+@@ -1001,6 +1031,7 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf
+ 	dev_err(&adap->dev,
+ 		"Failed to register i2c client %s at 0x%02x (%d)\n",
+ 		client->name, client->addr, status);
++	i2c_unlock_addr(adap, client->addr, client->flags);
+ out_err_silent:
+ 	if (need_put)
+ 		put_device(&client->dev);
+@@ -1523,6 +1554,8 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
+ 		goto out_list;
+ 	}
+ 
++	adap->debugfs = debugfs_create_dir(dev_name(&adap->dev), i2c_debugfs_root);
++
+ 	res = i2c_setup_smbus_alert(adap);
+ 	if (res)
+ 		goto out_reg;
+@@ -1562,6 +1595,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
+ 	return 0;
+ 
+ out_reg:
++	debugfs_remove_recursive(adap->debugfs);
+ 	init_completion(&adap->dev_released);
+ 	device_unregister(&adap->dev);
+ 	wait_for_completion(&adap->dev_released);
+@@ -1763,6 +1797,8 @@ void i2c_del_adapter(struct i2c_adapter *adap)
+ 
+ 	i2c_host_notify_irq_teardown(adap);
+ 
++	debugfs_remove_recursive(adap->debugfs);
++
+ 	/* wait until all references to the device are gone
+ 	 *
+ 	 * FIXME: This is old code and should ideally be replaced by an
+@@ -2060,6 +2096,8 @@ static int __init i2c_init(void)
+ 
+ 	is_registered = true;
+ 
++	i2c_debugfs_root = debugfs_create_dir("i2c", NULL);
++
+ #ifdef CONFIG_I2C_COMPAT
+ 	i2c_adapter_compat_class = class_compat_register("i2c-adapter");
+ 	if (!i2c_adapter_compat_class) {
+@@ -2098,6 +2136,7 @@ static void __exit i2c_exit(void)
+ #ifdef CONFIG_I2C_COMPAT
+ 	class_compat_unregister(i2c_adapter_compat_class);
+ #endif
++	debugfs_remove_recursive(i2c_debugfs_root);
+ 	bus_unregister(&i2c_bus_type);
+ 	tracepoint_synchronize_unregister();
+ }
+diff --git a/drivers/i3c/master/svc-i3c-master.c b/drivers/i3c/master/svc-i3c-master.c
+index acc937275c184c..f344f8733f8324 100644
+--- a/drivers/i3c/master/svc-i3c-master.c
++++ b/drivers/i3c/master/svc-i3c-master.c
+@@ -1697,6 +1697,7 @@ static void svc_i3c_master_remove(struct platform_device *pdev)
+ {
+ 	struct svc_i3c_master *master = platform_get_drvdata(pdev);
+ 
++	cancel_work_sync(&master->hj_work);
+ 	i3c_master_unregister(&master->base);
+ 
+ 	pm_runtime_dont_use_autosuspend(&pdev->dev);
+diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
+index 3b7984fd129d7d..3a98d6bae1b203 100644
+--- a/drivers/iio/magnetometer/ak8975.c
++++ b/drivers/iio/magnetometer/ak8975.c
+@@ -692,22 +692,8 @@ static int ak8975_start_read_axis(struct ak8975_data *data,
+ 	if (ret < 0)
+ 		return ret;
+ 
+-	/* This will be executed only for non-interrupt based waiting case */
+-	if (ret & data->def->ctrl_masks[ST1_DRDY]) {
+-		ret = i2c_smbus_read_byte_data(client,
+-					       data->def->ctrl_regs[ST2]);
+-		if (ret < 0) {
+-			dev_err(&client->dev, "Error in reading ST2\n");
+-			return ret;
+-		}
+-		if (ret & (data->def->ctrl_masks[ST2_DERR] |
+-			   data->def->ctrl_masks[ST2_HOFL])) {
+-			dev_err(&client->dev, "ST2 status error 0x%x\n", ret);
+-			return -EINVAL;
+-		}
+-	}
+-
+-	return 0;
++	/* Return with zero if the data is ready. */
++	return !data->def->ctrl_regs[ST1_DRDY];
+ }
+ 
+ /* Retrieve raw flux value for one of the x, y, or z axis.  */
+@@ -734,6 +720,20 @@ static int ak8975_read_axis(struct iio_dev *indio_dev, int index, int *val)
+ 	if (ret < 0)
+ 		goto exit;
+ 
++	/* Read out ST2 for release lock on measurment data. */
++	ret = i2c_smbus_read_byte_data(client, data->def->ctrl_regs[ST2]);
++	if (ret < 0) {
++		dev_err(&client->dev, "Error in reading ST2\n");
++		goto exit;
++	}
++
++	if (ret & (data->def->ctrl_masks[ST2_DERR] |
++		   data->def->ctrl_masks[ST2_HOFL])) {
++		dev_err(&client->dev, "ST2 status error 0x%x\n", ret);
++		ret = -EINVAL;
++		goto exit;
++	}
++
+ 	mutex_unlock(&data->lock);
+ 
+ 	pm_runtime_mark_last_busy(&data->client->dev);
+diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
+index a65630d5742f01..84f6b333c91958 100644
+--- a/drivers/iio/pressure/bmp280-core.c
++++ b/drivers/iio/pressure/bmp280-core.c
+@@ -51,7 +51,6 @@
+  */
+ enum { AC1, AC2, AC3, AC4, AC5, AC6, B1, B2, MB, MC, MD };
+ 
+-
+ enum bmp380_odr {
+ 	BMP380_ODR_200HZ,
+ 	BMP380_ODR_100HZ,
+@@ -180,18 +179,19 @@ static int bmp280_read_calib(struct bmp280_data *data)
+ 	struct bmp280_calib *calib = &data->calib.bmp280;
+ 	int ret;
+ 
+-
+ 	/* Read temperature and pressure calibration values. */
+ 	ret = regmap_bulk_read(data->regmap, BMP280_REG_COMP_TEMP_START,
+-			       data->bmp280_cal_buf, sizeof(data->bmp280_cal_buf));
++			       data->bmp280_cal_buf,
++			       sizeof(data->bmp280_cal_buf));
+ 	if (ret < 0) {
+ 		dev_err(data->dev,
+-			"failed to read temperature and pressure calibration parameters\n");
++			"failed to read calibration parameters\n");
+ 		return ret;
+ 	}
+ 
+-	/* Toss the temperature and pressure calibration data into the entropy pool */
+-	add_device_randomness(data->bmp280_cal_buf, sizeof(data->bmp280_cal_buf));
++	/* Toss calibration data into the entropy pool */
++	add_device_randomness(data->bmp280_cal_buf,
++			      sizeof(data->bmp280_cal_buf));
+ 
+ 	/* Parse temperature calibration values. */
+ 	calib->T1 = le16_to_cpu(data->bmp280_cal_buf[T1]);
+@@ -222,7 +222,7 @@ static int bme280_read_calib(struct bmp280_data *data)
+ 	/* Load shared calibration params with bmp280 first */
+ 	ret = bmp280_read_calib(data);
+ 	if  (ret < 0) {
+-		dev_err(dev, "failed to read common bmp280 calibration parameters\n");
++		dev_err(dev, "failed to read calibration parameters\n");
+ 		return ret;
+ 	}
+ 
+@@ -234,14 +234,14 @@ static int bme280_read_calib(struct bmp280_data *data)
+ 	 * Humidity data is only available on BME280.
+ 	 */
+ 
+-	ret = regmap_read(data->regmap, BMP280_REG_COMP_H1, &tmp);
++	ret = regmap_read(data->regmap, BME280_REG_COMP_H1, &tmp);
+ 	if (ret < 0) {
+ 		dev_err(dev, "failed to read H1 comp value\n");
+ 		return ret;
+ 	}
+ 	calib->H1 = tmp;
+ 
+-	ret = regmap_bulk_read(data->regmap, BMP280_REG_COMP_H2,
++	ret = regmap_bulk_read(data->regmap, BME280_REG_COMP_H2,
+ 			       &data->le16, sizeof(data->le16));
+ 	if (ret < 0) {
+ 		dev_err(dev, "failed to read H2 comp value\n");
+@@ -249,14 +249,14 @@ static int bme280_read_calib(struct bmp280_data *data)
+ 	}
+ 	calib->H2 = sign_extend32(le16_to_cpu(data->le16), 15);
+ 
+-	ret = regmap_read(data->regmap, BMP280_REG_COMP_H3, &tmp);
++	ret = regmap_read(data->regmap, BME280_REG_COMP_H3, &tmp);
+ 	if (ret < 0) {
+ 		dev_err(dev, "failed to read H3 comp value\n");
+ 		return ret;
+ 	}
+ 	calib->H3 = tmp;
+ 
+-	ret = regmap_bulk_read(data->regmap, BMP280_REG_COMP_H4,
++	ret = regmap_bulk_read(data->regmap, BME280_REG_COMP_H4,
+ 			       &data->be16, sizeof(data->be16));
+ 	if (ret < 0) {
+ 		dev_err(dev, "failed to read H4 comp value\n");
+@@ -265,15 +265,15 @@ static int bme280_read_calib(struct bmp280_data *data)
+ 	calib->H4 = sign_extend32(((be16_to_cpu(data->be16) >> 4) & 0xff0) |
+ 				  (be16_to_cpu(data->be16) & 0xf), 11);
+ 
+-	ret = regmap_bulk_read(data->regmap, BMP280_REG_COMP_H5,
++	ret = regmap_bulk_read(data->regmap, BME280_REG_COMP_H5,
+ 			       &data->le16, sizeof(data->le16));
+ 	if (ret < 0) {
+ 		dev_err(dev, "failed to read H5 comp value\n");
+ 		return ret;
+ 	}
+-	calib->H5 = sign_extend32(FIELD_GET(BMP280_COMP_H5_MASK, le16_to_cpu(data->le16)), 11);
++	calib->H5 = sign_extend32(FIELD_GET(BME280_COMP_H5_MASK, le16_to_cpu(data->le16)), 11);
+ 
+-	ret = regmap_read(data->regmap, BMP280_REG_COMP_H6, &tmp);
++	ret = regmap_read(data->regmap, BME280_REG_COMP_H6, &tmp);
+ 	if (ret < 0) {
+ 		dev_err(dev, "failed to read H6 comp value\n");
+ 		return ret;
+@@ -282,13 +282,14 @@ static int bme280_read_calib(struct bmp280_data *data)
+ 
+ 	return 0;
+ }
++
+ /*
+  * Returns humidity in percent, resolution is 0.01 percent. Output value of
+  * "47445" represents 47445/1024 = 46.333 %RH.
+  *
+  * Taken from BME280 datasheet, Section 4.2.3, "Compensation formula".
+  */
+-static u32 bmp280_compensate_humidity(struct bmp280_data *data,
++static u32 bme280_compensate_humidity(struct bmp280_data *data,
+ 				      s32 adc_humidity)
+ {
+ 	struct bmp280_calib *calib = &data->calib.bmp280;
+@@ -304,7 +305,7 @@ static u32 bmp280_compensate_humidity(struct bmp280_data *data,
+ 	var = clamp_val(var, 0, 419430400);
+ 
+ 	return var >> 12;
+-};
++}
+ 
+ /*
+  * Returns temperature in DegC, resolution is 0.01 DegC.  Output value of
+@@ -428,7 +429,7 @@ static int bmp280_read_press(struct bmp280_data *data,
+ 	return IIO_VAL_FRACTIONAL;
+ }
+ 
+-static int bmp280_read_humid(struct bmp280_data *data, int *val, int *val2)
++static int bme280_read_humid(struct bmp280_data *data, int *val, int *val2)
+ {
+ 	u32 comp_humidity;
+ 	s32 adc_humidity;
+@@ -439,7 +440,7 @@ static int bmp280_read_humid(struct bmp280_data *data, int *val, int *val2)
+ 	if (ret < 0)
+ 		return ret;
+ 
+-	ret = regmap_bulk_read(data->regmap, BMP280_REG_HUMIDITY_MSB,
++	ret = regmap_bulk_read(data->regmap, BME280_REG_HUMIDITY_MSB,
+ 			       &data->be16, sizeof(data->be16));
+ 	if (ret < 0) {
+ 		dev_err(data->dev, "failed to read humidity\n");
+@@ -452,7 +453,7 @@ static int bmp280_read_humid(struct bmp280_data *data, int *val, int *val2)
+ 		dev_err(data->dev, "reading humidity skipped\n");
+ 		return -EIO;
+ 	}
+-	comp_humidity = bmp280_compensate_humidity(data, adc_humidity);
++	comp_humidity = bme280_compensate_humidity(data, adc_humidity);
+ 
+ 	*val = comp_humidity * 1000 / 1024;
+ 
+@@ -536,8 +537,8 @@ static int bmp280_read_raw(struct iio_dev *indio_dev,
+ 	return ret;
+ }
+ 
+-static int bmp280_write_oversampling_ratio_humid(struct bmp280_data *data,
+-					       int val)
++static int bme280_write_oversampling_ratio_humid(struct bmp280_data *data,
++						 int val)
+ {
+ 	const int *avail = data->chip_info->oversampling_humid_avail;
+ 	const int n = data->chip_info->num_oversampling_humid_avail;
+@@ -562,7 +563,7 @@ static int bmp280_write_oversampling_ratio_humid(struct bmp280_data *data,
+ }
+ 
+ static int bmp280_write_oversampling_ratio_temp(struct bmp280_data *data,
+-					       int val)
++						int val)
+ {
+ 	const int *avail = data->chip_info->oversampling_temp_avail;
+ 	const int n = data->chip_info->num_oversampling_temp_avail;
+@@ -587,7 +588,7 @@ static int bmp280_write_oversampling_ratio_temp(struct bmp280_data *data,
+ }
+ 
+ static int bmp280_write_oversampling_ratio_press(struct bmp280_data *data,
+-					       int val)
++						 int val)
+ {
+ 	const int *avail = data->chip_info->oversampling_press_avail;
+ 	const int n = data->chip_info->num_oversampling_press_avail;
+@@ -680,7 +681,7 @@ static int bmp280_write_raw(struct iio_dev *indio_dev,
+ 		mutex_lock(&data->lock);
+ 		switch (chan->type) {
+ 		case IIO_HUMIDITYRELATIVE:
+-			ret = bmp280_write_oversampling_ratio_humid(data, val);
++			ret = bme280_write_oversampling_ratio_humid(data, val);
+ 			break;
+ 		case IIO_PRESSURE:
+ 			ret = bmp280_write_oversampling_ratio_press(data, val);
+@@ -771,13 +772,12 @@ static int bmp280_chip_config(struct bmp280_data *data)
+ 	int ret;
+ 
+ 	ret = regmap_write_bits(data->regmap, BMP280_REG_CTRL_MEAS,
+-				 BMP280_OSRS_TEMP_MASK |
+-				 BMP280_OSRS_PRESS_MASK |
+-				 BMP280_MODE_MASK,
+-				 osrs | BMP280_MODE_NORMAL);
++				BMP280_OSRS_TEMP_MASK |
++				BMP280_OSRS_PRESS_MASK |
++				BMP280_MODE_MASK,
++				osrs | BMP280_MODE_NORMAL);
+ 	if (ret < 0) {
+-		dev_err(data->dev,
+-			"failed to write ctrl_meas register\n");
++		dev_err(data->dev, "failed to write ctrl_meas register\n");
+ 		return ret;
+ 	}
+ 
+@@ -785,8 +785,7 @@ static int bmp280_chip_config(struct bmp280_data *data)
+ 				 BMP280_FILTER_MASK,
+ 				 BMP280_FILTER_4X);
+ 	if (ret < 0) {
+-		dev_err(data->dev,
+-			"failed to write config register\n");
++		dev_err(data->dev, "failed to write config register\n");
+ 		return ret;
+ 	}
+ 
+@@ -794,10 +793,12 @@ static int bmp280_chip_config(struct bmp280_data *data)
+ }
+ 
+ static const int bmp280_oversampling_avail[] = { 1, 2, 4, 8, 16 };
++static const u8 bmp280_chip_ids[] = { BMP280_CHIP_ID };
+ 
+ const struct bmp280_chip_info bmp280_chip_info = {
+ 	.id_reg = BMP280_REG_ID,
+-	.chip_id = BMP280_CHIP_ID,
++	.chip_id = bmp280_chip_ids,
++	.num_chip_id = ARRAY_SIZE(bmp280_chip_ids),
+ 	.regmap_config = &bmp280_regmap_config,
+ 	.start_up_time = 2000,
+ 	.channels = bmp280_channels,
+@@ -830,26 +831,28 @@ EXPORT_SYMBOL_NS(bmp280_chip_info, IIO_BMP280);
+ 
+ static int bme280_chip_config(struct bmp280_data *data)
+ {
+-	u8 osrs = FIELD_PREP(BMP280_OSRS_HUMIDITY_MASK, data->oversampling_humid + 1);
++	u8 osrs = FIELD_PREP(BME280_OSRS_HUMIDITY_MASK, data->oversampling_humid + 1);
+ 	int ret;
+ 
+ 	/*
+ 	 * Oversampling of humidity must be set before oversampling of
+ 	 * temperature/pressure is set to become effective.
+ 	 */
+-	ret = regmap_update_bits(data->regmap, BMP280_REG_CTRL_HUMIDITY,
+-				  BMP280_OSRS_HUMIDITY_MASK, osrs);
+-
++	ret = regmap_update_bits(data->regmap, BME280_REG_CTRL_HUMIDITY,
++				 BME280_OSRS_HUMIDITY_MASK, osrs);
+ 	if (ret < 0)
+ 		return ret;
+ 
+ 	return bmp280_chip_config(data);
+ }
+ 
++static const u8 bme280_chip_ids[] = { BME280_CHIP_ID };
++
+ const struct bmp280_chip_info bme280_chip_info = {
+ 	.id_reg = BMP280_REG_ID,
+-	.chip_id = BME280_CHIP_ID,
+-	.regmap_config = &bmp280_regmap_config,
++	.chip_id = bme280_chip_ids,
++	.num_chip_id = ARRAY_SIZE(bme280_chip_ids),
++	.regmap_config = &bme280_regmap_config,
+ 	.start_up_time = 2000,
+ 	.channels = bmp280_channels,
+ 	.num_channels = 3,
+@@ -864,12 +867,12 @@ const struct bmp280_chip_info bme280_chip_info = {
+ 
+ 	.oversampling_humid_avail = bmp280_oversampling_avail,
+ 	.num_oversampling_humid_avail = ARRAY_SIZE(bmp280_oversampling_avail),
+-	.oversampling_humid_default = BMP280_OSRS_HUMIDITY_16X - 1,
++	.oversampling_humid_default = BME280_OSRS_HUMIDITY_16X - 1,
+ 
+ 	.chip_config = bme280_chip_config,
+ 	.read_temp = bmp280_read_temp,
+ 	.read_press = bmp280_read_press,
+-	.read_humid = bmp280_read_humid,
++	.read_humid = bme280_read_humid,
+ 	.read_calib = bme280_read_calib,
+ };
+ EXPORT_SYMBOL_NS(bme280_chip_info, IIO_BMP280);
+@@ -920,8 +923,8 @@ static int bmp380_cmd(struct bmp280_data *data, u8 cmd)
+ }
+ 
+ /*
+- * Returns temperature in Celsius degrees, resolution is 0.01º C. Output value of
+- * "5123" equals 51.2º C. t_fine carries fine temperature as global value.
++ * Returns temperature in Celsius degrees, resolution is 0.01º C. Output value
++ * of "5123" equals 51.2º C. t_fine carries fine temperature as global value.
+  *
+  * Taken from datasheet, Section Appendix 9, "Compensation formula" and repo
+  * https://github.com/BoschSensortec/BMP3-Sensor-API.
+@@ -1063,7 +1066,8 @@ static int bmp380_read_calib(struct bmp280_data *data)
+ 
+ 	/* Read temperature and pressure calibration data */
+ 	ret = regmap_bulk_read(data->regmap, BMP380_REG_CALIB_TEMP_START,
+-			       data->bmp380_cal_buf, sizeof(data->bmp380_cal_buf));
++			       data->bmp380_cal_buf,
++			       sizeof(data->bmp380_cal_buf));
+ 	if (ret) {
+ 		dev_err(data->dev,
+ 			"failed to read temperature calibration parameters\n");
+@@ -1071,7 +1075,8 @@ static int bmp380_read_calib(struct bmp280_data *data)
+ 	}
+ 
+ 	/* Toss the temperature calibration data into the entropy pool */
+-	add_device_randomness(data->bmp380_cal_buf, sizeof(data->bmp380_cal_buf));
++	add_device_randomness(data->bmp380_cal_buf,
++			      sizeof(data->bmp380_cal_buf));
+ 
+ 	/* Parse calibration values */
+ 	calib->T1 = get_unaligned_le16(&data->bmp380_cal_buf[BMP380_T1]);
+@@ -1153,7 +1158,8 @@ static int bmp380_chip_config(struct bmp280_data *data)
+ 
+ 	/* Configure output data rate */
+ 	ret = regmap_update_bits_check(data->regmap, BMP380_REG_ODR,
+-				       BMP380_ODRS_MASK, data->sampling_freq, &aux);
++				       BMP380_ODRS_MASK, data->sampling_freq,
++				       &aux);
+ 	if (ret) {
+ 		dev_err(data->dev, "failed to write ODR selection register\n");
+ 		return ret;
+@@ -1172,12 +1178,13 @@ static int bmp380_chip_config(struct bmp280_data *data)
+ 
+ 	if (change) {
+ 		/*
+-		 * The configurations errors are detected on the fly during a measurement
+-		 * cycle. If the sampling frequency is too low, it's faster to reset
+-		 * the measurement loop than wait until the next measurement is due.
++		 * The configurations errors are detected on the fly during a
++		 * measurement cycle. If the sampling frequency is too low, it's
++		 * faster to reset the measurement loop than wait until the next
++		 * measurement is due.
+ 		 *
+-		 * Resets sensor measurement loop toggling between sleep and normal
+-		 * operating modes.
++		 * Resets sensor measurement loop toggling between sleep and
++		 * normal operating modes.
+ 		 */
+ 		ret = regmap_write_bits(data->regmap, BMP380_REG_POWER_CONTROL,
+ 					BMP380_MODE_MASK,
+@@ -1195,22 +1202,22 @@ static int bmp380_chip_config(struct bmp280_data *data)
+ 			return ret;
+ 		}
+ 		/*
+-		 * Waits for measurement before checking configuration error flag.
+-		 * Selected longest measure time indicated in section 3.9.1
+-		 * in the datasheet.
++		 * Waits for measurement before checking configuration error
++		 * flag. Selected longest measurement time, calculated from
++		 * formula in datasheet section 3.9.2 with an offset of ~+15%
++		 * as it seen as well in table 3.9.1.
+ 		 */
+-		msleep(80);
++		msleep(150);
+ 
+ 		/* Check config error flag */
+ 		ret = regmap_read(data->regmap, BMP380_REG_ERROR, &tmp);
+ 		if (ret) {
+-			dev_err(data->dev,
+-				"failed to read error register\n");
++			dev_err(data->dev, "failed to read error register\n");
+ 			return ret;
+ 		}
+ 		if (tmp & BMP380_ERR_CONF_MASK) {
+ 			dev_warn(data->dev,
+-				"sensor flagged configuration as incompatible\n");
++				 "sensor flagged configuration as incompatible\n");
+ 			return -EINVAL;
+ 		}
+ 	}
+@@ -1220,10 +1227,12 @@ static int bmp380_chip_config(struct bmp280_data *data)
+ 
+ static const int bmp380_oversampling_avail[] = { 1, 2, 4, 8, 16, 32 };
+ static const int bmp380_iir_filter_coeffs_avail[] = { 1, 2, 4, 8, 16, 32, 64, 128};
++static const u8 bmp380_chip_ids[] = { BMP380_CHIP_ID };
+ 
+ const struct bmp280_chip_info bmp380_chip_info = {
+ 	.id_reg = BMP380_REG_ID,
+-	.chip_id = BMP380_CHIP_ID,
++	.chip_id = bmp380_chip_ids,
++	.num_chip_id = ARRAY_SIZE(bmp380_chip_ids),
+ 	.regmap_config = &bmp380_regmap_config,
+ 	.start_up_time = 2000,
+ 	.channels = bmp380_channels,
+@@ -1308,9 +1317,11 @@ static int bmp580_nvm_operation(struct bmp280_data *data, bool is_write)
+ 	}
+ 
+ 	/* Start NVM operation sequence */
+-	ret = regmap_write(data->regmap, BMP580_REG_CMD, BMP580_CMD_NVM_OP_SEQ_0);
++	ret = regmap_write(data->regmap, BMP580_REG_CMD,
++			   BMP580_CMD_NVM_OP_SEQ_0);
+ 	if (ret) {
+-		dev_err(data->dev, "failed to send nvm operation's first sequence\n");
++		dev_err(data->dev,
++			"failed to send nvm operation's first sequence\n");
+ 		return ret;
+ 	}
+ 	if (is_write) {
+@@ -1318,7 +1329,8 @@ static int bmp580_nvm_operation(struct bmp280_data *data, bool is_write)
+ 		ret = regmap_write(data->regmap, BMP580_REG_CMD,
+ 				   BMP580_CMD_NVM_WRITE_SEQ_1);
+ 		if (ret) {
+-			dev_err(data->dev, "failed to send nvm write sequence\n");
++			dev_err(data->dev,
++				"failed to send nvm write sequence\n");
+ 			return ret;
+ 		}
+ 		/* Datasheet says on 4.8.1.2 it takes approximately 10ms */
+@@ -1329,7 +1341,8 @@ static int bmp580_nvm_operation(struct bmp280_data *data, bool is_write)
+ 		ret = regmap_write(data->regmap, BMP580_REG_CMD,
+ 				   BMP580_CMD_NVM_READ_SEQ_1);
+ 		if (ret) {
+-			dev_err(data->dev, "failed to send nvm read sequence\n");
++			dev_err(data->dev,
++				"failed to send nvm read sequence\n");
+ 			return ret;
+ 		}
+ 		/* Datasheet says on 4.8.1.1 it takes approximately 200us */
+@@ -1492,8 +1505,8 @@ static int bmp580_nvmem_read(void *priv, unsigned int offset, void *val,
+ 		if (ret)
+ 			goto exit;
+ 
+-		ret = regmap_bulk_read(data->regmap, BMP580_REG_NVM_DATA_LSB, &data->le16,
+-				       sizeof(data->le16));
++		ret = regmap_bulk_read(data->regmap, BMP580_REG_NVM_DATA_LSB,
++				       &data->le16, sizeof(data->le16));
+ 		if (ret) {
+ 			dev_err(data->dev, "error reading nvm data regs\n");
+ 			goto exit;
+@@ -1537,7 +1550,8 @@ static int bmp580_nvmem_write(void *priv, unsigned int offset, void *val,
+ 	while (bytes >= sizeof(*buf)) {
+ 		addr = bmp580_nvmem_addrs[offset / sizeof(*buf)];
+ 
+-		ret = regmap_write(data->regmap, BMP580_REG_NVM_ADDR, BMP580_NVM_PROG_EN |
++		ret = regmap_write(data->regmap, BMP580_REG_NVM_ADDR,
++				   BMP580_NVM_PROG_EN |
+ 				   FIELD_PREP(BMP580_NVM_ROW_ADDR_MASK, addr));
+ 		if (ret) {
+ 			dev_err(data->dev, "error writing nvm address\n");
+@@ -1545,8 +1559,8 @@ static int bmp580_nvmem_write(void *priv, unsigned int offset, void *val,
+ 		}
+ 		data->le16 = cpu_to_le16(*buf++);
+ 
+-		ret = regmap_bulk_write(data->regmap, BMP580_REG_NVM_DATA_LSB, &data->le16,
+-					sizeof(data->le16));
++		ret = regmap_bulk_write(data->regmap, BMP580_REG_NVM_DATA_LSB,
++					&data->le16, sizeof(data->le16));
+ 		if (ret) {
+ 			dev_err(data->dev, "error writing LSB NVM data regs\n");
+ 			goto exit;
+@@ -1653,7 +1667,8 @@ static int bmp580_chip_config(struct bmp280_data *data)
+ 		  BMP580_OSR_PRESS_EN;
+ 
+ 	ret = regmap_update_bits_check(data->regmap, BMP580_REG_OSR_CONFIG,
+-				       BMP580_OSR_TEMP_MASK | BMP580_OSR_PRESS_MASK |
++				       BMP580_OSR_TEMP_MASK |
++				       BMP580_OSR_PRESS_MASK |
+ 				       BMP580_OSR_PRESS_EN,
+ 				       reg_val, &aux);
+ 	if (ret) {
+@@ -1704,7 +1719,8 @@ static int bmp580_chip_config(struct bmp280_data *data)
+ 		 */
+ 		ret = regmap_read(data->regmap, BMP580_REG_EFF_OSR, &tmp);
+ 		if (ret) {
+-			dev_err(data->dev, "error reading effective OSR register\n");
++			dev_err(data->dev,
++				"error reading effective OSR register\n");
+ 			return ret;
+ 		}
+ 		if (!(tmp & BMP580_EFF_OSR_VALID_ODR)) {
+@@ -1720,10 +1736,12 @@ static int bmp580_chip_config(struct bmp280_data *data)
+ }
+ 
+ static const int bmp580_oversampling_avail[] = { 1, 2, 4, 8, 16, 32, 64, 128 };
++static const u8 bmp580_chip_ids[] = { BMP580_CHIP_ID, BMP580_CHIP_ID_ALT };
+ 
+ const struct bmp280_chip_info bmp580_chip_info = {
+ 	.id_reg = BMP580_REG_CHIP_ID,
+-	.chip_id = BMP580_CHIP_ID,
++	.chip_id = bmp580_chip_ids,
++	.num_chip_id = ARRAY_SIZE(bmp580_chip_ids),
+ 	.regmap_config = &bmp580_regmap_config,
+ 	.start_up_time = 2000,
+ 	.channels = bmp380_channels,
+@@ -1837,7 +1855,8 @@ static int bmp180_read_calib(struct bmp280_data *data)
+ 	}
+ 
+ 	/* Toss the calibration data into the entropy pool */
+-	add_device_randomness(data->bmp180_cal_buf, sizeof(data->bmp180_cal_buf));
++	add_device_randomness(data->bmp180_cal_buf,
++			      sizeof(data->bmp180_cal_buf));
+ 
+ 	calib->AC1 = be16_to_cpu(data->bmp180_cal_buf[AC1]);
+ 	calib->AC2 = be16_to_cpu(data->bmp180_cal_buf[AC2]);
+@@ -1952,8 +1971,7 @@ static u32 bmp180_compensate_press(struct bmp280_data *data, s32 adc_press)
+ 	return p + ((x1 + x2 + 3791) >> 4);
+ }
+ 
+-static int bmp180_read_press(struct bmp280_data *data,
+-			     int *val, int *val2)
++static int bmp180_read_press(struct bmp280_data *data, int *val, int *val2)
+ {
+ 	u32 comp_press;
+ 	s32 adc_press;
+@@ -1983,10 +2001,12 @@ static int bmp180_chip_config(struct bmp280_data *data)
+ 
+ static const int bmp180_oversampling_temp_avail[] = { 1 };
+ static const int bmp180_oversampling_press_avail[] = { 1, 2, 4, 8 };
++static const u8 bmp180_chip_ids[] = { BMP180_CHIP_ID };
+ 
+ const struct bmp280_chip_info bmp180_chip_info = {
+ 	.id_reg = BMP280_REG_ID,
+-	.chip_id = BMP180_CHIP_ID,
++	.chip_id = bmp180_chip_ids,
++	.num_chip_id = ARRAY_SIZE(bmp180_chip_ids),
+ 	.regmap_config = &bmp180_regmap_config,
+ 	.start_up_time = 2000,
+ 	.channels = bmp280_channels,
+@@ -2077,6 +2097,7 @@ int bmp280_common_probe(struct device *dev,
+ 	struct bmp280_data *data;
+ 	struct gpio_desc *gpiod;
+ 	unsigned int chip_id;
++	unsigned int i;
+ 	int ret;
+ 
+ 	indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
+@@ -2142,12 +2163,17 @@ int bmp280_common_probe(struct device *dev,
+ 	ret = regmap_read(regmap, data->chip_info->id_reg, &chip_id);
+ 	if (ret < 0)
+ 		return ret;
+-	if (chip_id != data->chip_info->chip_id) {
+-		dev_err(dev, "bad chip id: expected %x got %x\n",
+-			data->chip_info->chip_id, chip_id);
+-		return -EINVAL;
++
++	for (i = 0; i < data->chip_info->num_chip_id; i++) {
++		if (chip_id == data->chip_info->chip_id[i]) {
++			dev_info(dev, "0x%x is a known chip id for %s\n", chip_id, name);
++			break;
++		}
+ 	}
+ 
++	if (i == data->chip_info->num_chip_id)
++		dev_warn(dev, "bad chip id: 0x%x is not a known chip id\n", chip_id);
++
+ 	if (data->chip_info->preinit) {
+ 		ret = data->chip_info->preinit(data);
+ 		if (ret)
+@@ -2222,6 +2248,7 @@ static int bmp280_runtime_resume(struct device *dev)
+ 	ret = regulator_bulk_enable(BMP280_NUM_SUPPLIES, data->supplies);
+ 	if (ret)
+ 		return ret;
++
+ 	usleep_range(data->start_up_time, data->start_up_time + 100);
+ 	return data->chip_info->chip_config(data);
+ }
+diff --git a/drivers/iio/pressure/bmp280-regmap.c b/drivers/iio/pressure/bmp280-regmap.c
+index 3ee56720428c5d..d27d68edd90656 100644
+--- a/drivers/iio/pressure/bmp280-regmap.c
++++ b/drivers/iio/pressure/bmp280-regmap.c
+@@ -41,11 +41,23 @@ const struct regmap_config bmp180_regmap_config = {
+ };
+ EXPORT_SYMBOL_NS(bmp180_regmap_config, IIO_BMP280);
+ 
++static bool bme280_is_writeable_reg(struct device *dev, unsigned int reg)
++{
++	switch (reg) {
++	case BMP280_REG_CONFIG:
++	case BME280_REG_CTRL_HUMIDITY:
++	case BMP280_REG_CTRL_MEAS:
++	case BMP280_REG_RESET:
++		return true;
++	default:
++		return false;
++	}
++}
++
+ static bool bmp280_is_writeable_reg(struct device *dev, unsigned int reg)
+ {
+ 	switch (reg) {
+ 	case BMP280_REG_CONFIG:
+-	case BMP280_REG_CTRL_HUMIDITY:
+ 	case BMP280_REG_CTRL_MEAS:
+ 	case BMP280_REG_RESET:
+ 		return true;
+@@ -57,8 +69,6 @@ static bool bmp280_is_writeable_reg(struct device *dev, unsigned int reg)
+ static bool bmp280_is_volatile_reg(struct device *dev, unsigned int reg)
+ {
+ 	switch (reg) {
+-	case BMP280_REG_HUMIDITY_LSB:
+-	case BMP280_REG_HUMIDITY_MSB:
+ 	case BMP280_REG_TEMP_XLSB:
+ 	case BMP280_REG_TEMP_LSB:
+ 	case BMP280_REG_TEMP_MSB:
+@@ -72,6 +82,23 @@ static bool bmp280_is_volatile_reg(struct device *dev, unsigned int reg)
+ 	}
+ }
+ 
++static bool bme280_is_volatile_reg(struct device *dev, unsigned int reg)
++{
++	switch (reg) {
++	case BME280_REG_HUMIDITY_LSB:
++	case BME280_REG_HUMIDITY_MSB:
++	case BMP280_REG_TEMP_XLSB:
++	case BMP280_REG_TEMP_LSB:
++	case BMP280_REG_TEMP_MSB:
++	case BMP280_REG_PRESS_XLSB:
++	case BMP280_REG_PRESS_LSB:
++	case BMP280_REG_PRESS_MSB:
++	case BMP280_REG_STATUS:
++		return true;
++	default:
++		return false;
++	}
++}
+ static bool bmp380_is_writeable_reg(struct device *dev, unsigned int reg)
+ {
+ 	switch (reg) {
+@@ -167,7 +194,7 @@ const struct regmap_config bmp280_regmap_config = {
+ 	.reg_bits = 8,
+ 	.val_bits = 8,
+ 
+-	.max_register = BMP280_REG_HUMIDITY_LSB,
++	.max_register = BMP280_REG_TEMP_XLSB,
+ 	.cache_type = REGCACHE_RBTREE,
+ 
+ 	.writeable_reg = bmp280_is_writeable_reg,
+@@ -175,6 +202,18 @@ const struct regmap_config bmp280_regmap_config = {
+ };
+ EXPORT_SYMBOL_NS(bmp280_regmap_config, IIO_BMP280);
+ 
++const struct regmap_config bme280_regmap_config = {
++	.reg_bits = 8,
++	.val_bits = 8,
++
++	.max_register = BME280_REG_HUMIDITY_LSB,
++	.cache_type = REGCACHE_RBTREE,
++
++	.writeable_reg = bme280_is_writeable_reg,
++	.volatile_reg = bme280_is_volatile_reg,
++};
++EXPORT_SYMBOL_NS(bme280_regmap_config, IIO_BMP280);
++
+ const struct regmap_config bmp380_regmap_config = {
+ 	.reg_bits = 8,
+ 	.val_bits = 8,
+diff --git a/drivers/iio/pressure/bmp280-spi.c b/drivers/iio/pressure/bmp280-spi.c
+index 9de923228a9f4c..47122da8e716df 100644
+--- a/drivers/iio/pressure/bmp280-spi.c
++++ b/drivers/iio/pressure/bmp280-spi.c
+@@ -12,7 +12,7 @@
+ #include "bmp280.h"
+ 
+ static int bmp280_regmap_spi_write(void *context, const void *data,
+-                                   size_t count)
++				   size_t count)
+ {
+ 	struct device *dev = context;
+ 	struct spi_device *spi = to_spi_device(dev);
+@@ -29,7 +29,7 @@ static int bmp280_regmap_spi_write(void *context, const void *data,
+ }
+ 
+ static int bmp280_regmap_spi_read(void *context, const void *reg,
+-                                  size_t reg_size, void *val, size_t val_size)
++				  size_t reg_size, void *val, size_t val_size)
+ {
+ 	struct device *dev = context;
+ 	struct spi_device *spi = to_spi_device(dev);
+diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h
+index 9d9f4ce2baa6e8..b60e551b7d3185 100644
+--- a/drivers/iio/pressure/bmp280.h
++++ b/drivers/iio/pressure/bmp280.h
+@@ -192,8 +192,6 @@
+ #define BMP380_PRESS_SKIPPED		0x800000
+ 
+ /* BMP280 specific registers */
+-#define BMP280_REG_HUMIDITY_LSB		0xFE
+-#define BMP280_REG_HUMIDITY_MSB		0xFD
+ #define BMP280_REG_TEMP_XLSB		0xFC
+ #define BMP280_REG_TEMP_LSB		0xFB
+ #define BMP280_REG_TEMP_MSB		0xFA
+@@ -207,15 +205,6 @@
+ #define BMP280_REG_CONFIG		0xF5
+ #define BMP280_REG_CTRL_MEAS		0xF4
+ #define BMP280_REG_STATUS		0xF3
+-#define BMP280_REG_CTRL_HUMIDITY	0xF2
+-
+-/* Due to non linear mapping, and data sizes we can't do a bulk read */
+-#define BMP280_REG_COMP_H1		0xA1
+-#define BMP280_REG_COMP_H2		0xE1
+-#define BMP280_REG_COMP_H3		0xE3
+-#define BMP280_REG_COMP_H4		0xE4
+-#define BMP280_REG_COMP_H5		0xE5
+-#define BMP280_REG_COMP_H6		0xE7
+ 
+ #define BMP280_REG_COMP_TEMP_START	0x88
+ #define BMP280_COMP_TEMP_REG_COUNT	6
+@@ -223,8 +212,6 @@
+ #define BMP280_REG_COMP_PRESS_START	0x8E
+ #define BMP280_COMP_PRESS_REG_COUNT	18
+ 
+-#define BMP280_COMP_H5_MASK		GENMASK(15, 4)
+-
+ #define BMP280_CONTIGUOUS_CALIB_REGS	(BMP280_COMP_TEMP_REG_COUNT + \
+ 					 BMP280_COMP_PRESS_REG_COUNT)
+ 
+@@ -235,14 +222,6 @@
+ #define BMP280_FILTER_8X		3
+ #define BMP280_FILTER_16X		4
+ 
+-#define BMP280_OSRS_HUMIDITY_MASK	GENMASK(2, 0)
+-#define BMP280_OSRS_HUMIDITY_SKIP	0
+-#define BMP280_OSRS_HUMIDITY_1X		1
+-#define BMP280_OSRS_HUMIDITY_2X		2
+-#define BMP280_OSRS_HUMIDITY_4X		3
+-#define BMP280_OSRS_HUMIDITY_8X		4
+-#define BMP280_OSRS_HUMIDITY_16X	5
+-
+ #define BMP280_OSRS_TEMP_MASK		GENMASK(7, 5)
+ #define BMP280_OSRS_TEMP_SKIP		0
+ #define BMP280_OSRS_TEMP_1X		1
+@@ -264,6 +243,30 @@
+ #define BMP280_MODE_FORCED		1
+ #define BMP280_MODE_NORMAL		3
+ 
++/* BME280 specific registers */
++#define BME280_REG_HUMIDITY_LSB		0xFE
++#define BME280_REG_HUMIDITY_MSB		0xFD
++
++#define BME280_REG_CTRL_HUMIDITY	0xF2
++
++/* Due to non linear mapping, and data sizes we can't do a bulk read */
++#define BME280_REG_COMP_H1		0xA1
++#define BME280_REG_COMP_H2		0xE1
++#define BME280_REG_COMP_H3		0xE3
++#define BME280_REG_COMP_H4		0xE4
++#define BME280_REG_COMP_H5		0xE5
++#define BME280_REG_COMP_H6		0xE7
++
++#define BME280_COMP_H5_MASK		GENMASK(15, 4)
++
++#define BME280_OSRS_HUMIDITY_MASK	GENMASK(2, 0)
++#define BME280_OSRS_HUMIDITY_SKIP	0
++#define BME280_OSRS_HUMIDITY_1X		1
++#define BME280_OSRS_HUMIDITY_2X		2
++#define BME280_OSRS_HUMIDITY_4X		3
++#define BME280_OSRS_HUMIDITY_8X		4
++#define BME280_OSRS_HUMIDITY_16X	5
++
+ /* BMP180 specific registers */
+ #define BMP180_REG_OUT_XLSB		0xF8
+ #define BMP180_REG_OUT_LSB		0xF7
+@@ -418,7 +421,8 @@ struct bmp280_data {
+ 
+ struct bmp280_chip_info {
+ 	unsigned int id_reg;
+-	const unsigned int chip_id;
++	const u8 *chip_id;
++	int num_chip_id;
+ 
+ 	const struct regmap_config *regmap_config;
+ 
+@@ -464,6 +468,7 @@ extern const struct bmp280_chip_info bmp580_chip_info;
+ /* Regmap configurations */
+ extern const struct regmap_config bmp180_regmap_config;
+ extern const struct regmap_config bmp280_regmap_config;
++extern const struct regmap_config bme280_regmap_config;
+ extern const struct regmap_config bmp380_regmap_config;
+ extern const struct regmap_config bmp580_regmap_config;
+ 
+diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c
+index ab91009aea8837..85717482a616e7 100644
+--- a/drivers/infiniband/hw/mana/main.c
++++ b/drivers/infiniband/hw/mana/main.c
+@@ -359,7 +359,7 @@ int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem,
+ 
+ 	create_req->length = umem->length;
+ 	create_req->offset_in_page = ib_umem_dma_offset(umem, page_sz);
+-	create_req->gdma_page_type = order_base_2(page_sz) - PAGE_SHIFT;
++	create_req->gdma_page_type = order_base_2(page_sz) - MANA_PAGE_SHIFT;
+ 	create_req->page_count = num_pages_total;
+ 
+ 	ibdev_dbg(&dev->ib_dev, "size_dma_region %lu num_pages_total %lu\n",
+@@ -460,13 +460,13 @@ int mana_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vma)
+ 	      PAGE_SHIFT;
+ 	prot = pgprot_writecombine(vma->vm_page_prot);
+ 
+-	ret = rdma_user_mmap_io(ibcontext, vma, pfn, gc->db_page_size, prot,
++	ret = rdma_user_mmap_io(ibcontext, vma, pfn, PAGE_SIZE, prot,
+ 				NULL);
+ 	if (ret)
+ 		ibdev_dbg(ibdev, "can't rdma_user_mmap_io ret %d\n", ret);
+ 	else
+-		ibdev_dbg(ibdev, "mapped I/O pfn 0x%llx page_size %u, ret %d\n",
+-			  pfn, gc->db_page_size, ret);
++		ibdev_dbg(ibdev, "mapped I/O pfn 0x%llx page_size %lu, ret %d\n",
++			  pfn, PAGE_SIZE, ret);
+ 
+ 	return ret;
+ }
+diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c
+index 8996e00cd63a82..922d3ab998f3a5 100644
+--- a/drivers/input/keyboard/adp5589-keys.c
++++ b/drivers/input/keyboard/adp5589-keys.c
+@@ -391,10 +391,17 @@ static int adp5589_gpio_get_value(struct gpio_chip *chip, unsigned off)
+ 	struct adp5589_kpad *kpad = gpiochip_get_data(chip);
+ 	unsigned int bank = kpad->var->bank(kpad->gpiomap[off]);
+ 	unsigned int bit = kpad->var->bit(kpad->gpiomap[off]);
++	int val;
+ 
+-	return !!(adp5589_read(kpad->client,
+-			       kpad->var->reg(ADP5589_GPI_STATUS_A) + bank) &
+-			       bit);
++	mutex_lock(&kpad->gpio_lock);
++	if (kpad->dir[bank] & bit)
++		val = kpad->dat_out[bank];
++	else
++		val = adp5589_read(kpad->client,
++				   kpad->var->reg(ADP5589_GPI_STATUS_A) + bank);
++	mutex_unlock(&kpad->gpio_lock);
++
++	return !!(val & bit);
+ }
+ 
+ static void adp5589_gpio_set_value(struct gpio_chip *chip,
+@@ -936,10 +943,9 @@ static int adp5589_keypad_add(struct adp5589_kpad *kpad, unsigned int revid)
+ 
+ static void adp5589_clear_config(void *data)
+ {
+-	struct i2c_client *client = data;
+-	struct adp5589_kpad *kpad = i2c_get_clientdata(client);
++	struct adp5589_kpad *kpad = data;
+ 
+-	adp5589_write(client, kpad->var->reg(ADP5589_GENERAL_CFG), 0);
++	adp5589_write(kpad->client, kpad->var->reg(ADP5589_GENERAL_CFG), 0);
+ }
+ 
+ static int adp5589_probe(struct i2c_client *client)
+@@ -983,7 +989,7 @@ static int adp5589_probe(struct i2c_client *client)
+ 	}
+ 
+ 	error = devm_add_action_or_reset(&client->dev, adp5589_clear_config,
+-					 client);
++					 kpad);
+ 	if (error)
+ 		return error;
+ 
+@@ -1010,8 +1016,6 @@ static int adp5589_probe(struct i2c_client *client)
+ 	if (error)
+ 		return error;
+ 
+-	i2c_set_clientdata(client, kpad);
+-
+ 	dev_info(&client->dev, "Rev.%d keypad, irq %d\n", revid, client->irq);
+ 	return 0;
+ }
+diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c
+index 84f0459e503cfd..7a38e18b18196b 100644
+--- a/drivers/iommu/intel/dmar.c
++++ b/drivers/iommu/intel/dmar.c
+@@ -1202,9 +1202,7 @@ static void free_iommu(struct intel_iommu *iommu)
+  */
+ static inline void reclaim_free_desc(struct q_inval *qi)
+ {
+-	while (qi->desc_status[qi->free_tail] == QI_DONE ||
+-	       qi->desc_status[qi->free_tail] == QI_ABORT) {
+-		qi->desc_status[qi->free_tail] = QI_FREE;
++	while (qi->desc_status[qi->free_tail] == QI_FREE && qi->free_tail != qi->free_head) {
+ 		qi->free_tail = (qi->free_tail + 1) % QI_LENGTH;
+ 		qi->free_cnt++;
+ 	}
+@@ -1439,8 +1437,16 @@ int qi_submit_sync(struct intel_iommu *iommu, struct qi_desc *desc,
+ 		raw_spin_lock(&qi->q_lock);
+ 	}
+ 
+-	for (i = 0; i < count; i++)
+-		qi->desc_status[(index + i) % QI_LENGTH] = QI_DONE;
++	/*
++	 * The reclaim code can free descriptors from multiple submissions
++	 * starting from the tail of the queue. When count == 0, the
++	 * status of the standalone wait descriptor at the tail of the queue
++	 * must be set to QI_FREE to allow the reclaim code to proceed.
++	 * It is also possible that descriptors from one of the previous
++	 * submissions has to be reclaimed by a subsequent submission.
++	 */
++	for (i = 0; i <= count; i++)
++		qi->desc_status[(index + i) % QI_LENGTH] = QI_FREE;
+ 
+ 	reclaim_free_desc(qi);
+ 	raw_spin_unlock_irqrestore(&qi->q_lock, flags);
+diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
+index 9918af222c516a..b7317016834cf1 100644
+--- a/drivers/iommu/intel/iommu.c
++++ b/drivers/iommu/intel/iommu.c
+@@ -1692,10 +1692,10 @@ static int iommu_init_domains(struct intel_iommu *iommu)
+ 	 * entry for first-level or pass-through translation modes should
+ 	 * be programmed with a domain id different from those used for
+ 	 * second-level or nested translation. We reserve a domain id for
+-	 * this purpose.
++	 * this purpose. This domain id is also used for identity domain
++	 * in legacy mode.
+ 	 */
+-	if (sm_supported(iommu))
+-		set_bit(FLPT_DEFAULT_DID, iommu->domain_ids);
++	set_bit(FLPT_DEFAULT_DID, iommu->domain_ids);
+ 
+ 	return 0;
+ }
+diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
+index 56506d5753f15c..00b794d74e03be 100644
+--- a/drivers/iommu/iommufd/selftest.c
++++ b/drivers/iommu/iommufd/selftest.c
+@@ -44,8 +44,8 @@ enum {
+  * In syzkaller mode the 64 bit IOVA is converted into an nth area and offset
+  * value. This has a much smaller randomization space and syzkaller can hit it.
+  */
+-static unsigned long iommufd_test_syz_conv_iova(struct io_pagetable *iopt,
+-						u64 *iova)
++static unsigned long __iommufd_test_syz_conv_iova(struct io_pagetable *iopt,
++						  u64 *iova)
+ {
+ 	struct syz_layout {
+ 		__u32 nth_area;
+@@ -69,6 +69,21 @@ static unsigned long iommufd_test_syz_conv_iova(struct io_pagetable *iopt,
+ 	return 0;
+ }
+ 
++static unsigned long iommufd_test_syz_conv_iova(struct iommufd_access *access,
++						u64 *iova)
++{
++	unsigned long ret;
++
++	mutex_lock(&access->ioas_lock);
++	if (!access->ioas) {
++		mutex_unlock(&access->ioas_lock);
++		return 0;
++	}
++	ret = __iommufd_test_syz_conv_iova(&access->ioas->iopt, iova);
++	mutex_unlock(&access->ioas_lock);
++	return ret;
++}
++
+ void iommufd_test_syz_conv_iova_id(struct iommufd_ucmd *ucmd,
+ 				   unsigned int ioas_id, u64 *iova, u32 *flags)
+ {
+@@ -81,7 +96,7 @@ void iommufd_test_syz_conv_iova_id(struct iommufd_ucmd *ucmd,
+ 	ioas = iommufd_get_ioas(ucmd->ictx, ioas_id);
+ 	if (IS_ERR(ioas))
+ 		return;
+-	*iova = iommufd_test_syz_conv_iova(&ioas->iopt, iova);
++	*iova = __iommufd_test_syz_conv_iova(&ioas->iopt, iova);
+ 	iommufd_put_object(&ioas->obj);
+ }
+ 
+@@ -852,7 +867,7 @@ static int iommufd_test_access_pages(struct iommufd_ucmd *ucmd,
+ 	}
+ 
+ 	if (flags & MOCK_FLAGS_ACCESS_SYZ)
+-		iova = iommufd_test_syz_conv_iova(&staccess->access->ioas->iopt,
++		iova = iommufd_test_syz_conv_iova(staccess->access,
+ 					&cmd->access_pages.iova);
+ 
+ 	npages = (ALIGN(iova + length, PAGE_SIZE) -
+@@ -954,8 +969,8 @@ static int iommufd_test_access_rw(struct iommufd_ucmd *ucmd,
+ 	}
+ 
+ 	if (flags & MOCK_FLAGS_ACCESS_SYZ)
+-		iova = iommufd_test_syz_conv_iova(&staccess->access->ioas->iopt,
+-					&cmd->access_rw.iova);
++		iova = iommufd_test_syz_conv_iova(staccess->access,
++				&cmd->access_rw.iova);
+ 
+ 	rc = iommufd_access_rw(staccess->access, iova, tmp, length, flags);
+ 	if (rc)
+diff --git a/drivers/mailbox/bcm2835-mailbox.c b/drivers/mailbox/bcm2835-mailbox.c
+index fbfd0202047c37..ea12fb8d24015c 100644
+--- a/drivers/mailbox/bcm2835-mailbox.c
++++ b/drivers/mailbox/bcm2835-mailbox.c
+@@ -145,7 +145,8 @@ static int bcm2835_mbox_probe(struct platform_device *pdev)
+ 	spin_lock_init(&mbox->lock);
+ 
+ 	ret = devm_request_irq(dev, irq_of_parse_and_map(dev->of_node, 0),
+-			       bcm2835_mbox_irq, 0, dev_name(dev), mbox);
++			       bcm2835_mbox_irq, IRQF_NO_SUSPEND, dev_name(dev),
++			       mbox);
+ 	if (ret) {
+ 		dev_err(dev, "Failed to register a mailbox IRQ handler: %d\n",
+ 			ret);
+diff --git a/drivers/mailbox/rockchip-mailbox.c b/drivers/mailbox/rockchip-mailbox.c
+index 8ffad059e8984e..4d966cb2ed0367 100644
+--- a/drivers/mailbox/rockchip-mailbox.c
++++ b/drivers/mailbox/rockchip-mailbox.c
+@@ -159,7 +159,7 @@ static const struct of_device_id rockchip_mbox_of_match[] = {
+ 	{ .compatible = "rockchip,rk3368-mailbox", .data = &rk3368_drv_data},
+ 	{ },
+ };
+-MODULE_DEVICE_TABLE(of, rockchp_mbox_of_match);
++MODULE_DEVICE_TABLE(of, rockchip_mbox_of_match);
+ 
+ static int rockchip_mbox_probe(struct platform_device *pdev)
+ {
+diff --git a/drivers/media/i2c/ar0521.c b/drivers/media/i2c/ar0521.c
+index a4e39871e8f75c..375284a59fd1ce 100644
+--- a/drivers/media/i2c/ar0521.c
++++ b/drivers/media/i2c/ar0521.c
+@@ -847,7 +847,8 @@ static int ar0521_power_off(struct device *dev)
+ 	clk_disable_unprepare(sensor->extclk);
+ 
+ 	if (sensor->reset_gpio)
+-		gpiod_set_value(sensor->reset_gpio, 1); /* assert RESET signal */
++		/* assert RESET signal */
++		gpiod_set_value_cansleep(sensor->reset_gpio, 1);
+ 
+ 	for (i = ARRAY_SIZE(ar0521_supply_names) - 1; i >= 0; i--) {
+ 		if (sensor->supplies[i])
+@@ -881,7 +882,7 @@ static int ar0521_power_on(struct device *dev)
+ 
+ 	if (sensor->reset_gpio)
+ 		/* deassert RESET signal */
+-		gpiod_set_value(sensor->reset_gpio, 0);
++		gpiod_set_value_cansleep(sensor->reset_gpio, 0);
+ 	usleep_range(4500, 5000); /* min 45000 clocks */
+ 
+ 	for (cnt = 0; cnt < ARRAY_SIZE(initial_regs); cnt++) {
+diff --git a/drivers/media/i2c/imx335.c b/drivers/media/i2c/imx335.c
+index 26869abd77a678..cb3f4fc66a1740 100644
+--- a/drivers/media/i2c/imx335.c
++++ b/drivers/media/i2c/imx335.c
+@@ -75,6 +75,12 @@ struct imx335_reg_list {
+ 	const struct imx335_reg *regs;
+ };
+ 
++static const char * const imx335_supply_name[] = {
++	"avdd", /* Analog (2.9V) supply */
++	"ovdd", /* Digital I/O (1.8V) supply */
++	"dvdd", /* Digital Core (1.2V) supply */
++};
++
+ /**
+  * struct imx335_mode - imx335 sensor mode structure
+  * @width: Frame width
+@@ -108,6 +114,7 @@ struct imx335_mode {
+  * @sd: V4L2 sub-device
+  * @pad: Media pad. Only one pad supported
+  * @reset_gpio: Sensor reset gpio
++ * @supplies: Regulator supplies to handle power control
+  * @inclk: Sensor input clock
+  * @ctrl_handler: V4L2 control handler
+  * @link_freq_ctrl: Pointer to link frequency control
+@@ -127,6 +134,8 @@ struct imx335 {
+ 	struct v4l2_subdev sd;
+ 	struct media_pad pad;
+ 	struct gpio_desc *reset_gpio;
++	struct regulator_bulk_data supplies[ARRAY_SIZE(imx335_supply_name)];
++
+ 	struct clk *inclk;
+ 	struct v4l2_ctrl_handler ctrl_handler;
+ 	struct v4l2_ctrl *link_freq_ctrl;
+@@ -783,13 +792,24 @@ static int imx335_parse_hw_config(struct imx335 *imx335)
+ 
+ 	/* Request optional reset pin */
+ 	imx335->reset_gpio = devm_gpiod_get_optional(imx335->dev, "reset",
+-						     GPIOD_OUT_LOW);
++						     GPIOD_OUT_HIGH);
+ 	if (IS_ERR(imx335->reset_gpio)) {
+ 		dev_err(imx335->dev, "failed to get reset gpio %ld",
+ 			PTR_ERR(imx335->reset_gpio));
+ 		return PTR_ERR(imx335->reset_gpio);
+ 	}
+ 
++	for (i = 0; i < ARRAY_SIZE(imx335_supply_name); i++)
++		imx335->supplies[i].supply = imx335_supply_name[i];
++
++	ret = devm_regulator_bulk_get(imx335->dev,
++				      ARRAY_SIZE(imx335_supply_name),
++				      imx335->supplies);
++	if (ret) {
++		dev_err(imx335->dev, "Failed to get regulators\n");
++		return ret;
++	}
++
+ 	/* Get sensor input clock */
+ 	imx335->inclk = devm_clk_get(imx335->dev, NULL);
+ 	if (IS_ERR(imx335->inclk)) {
+@@ -868,7 +888,17 @@ static int imx335_power_on(struct device *dev)
+ 	struct imx335 *imx335 = to_imx335(sd);
+ 	int ret;
+ 
+-	gpiod_set_value_cansleep(imx335->reset_gpio, 1);
++	ret = regulator_bulk_enable(ARRAY_SIZE(imx335_supply_name),
++				    imx335->supplies);
++	if (ret) {
++		dev_err(dev, "%s: failed to enable regulators\n",
++			__func__);
++		return ret;
++	}
++
++	usleep_range(500, 550); /* Tlow */
++
++	gpiod_set_value_cansleep(imx335->reset_gpio, 0);
+ 
+ 	ret = clk_prepare_enable(imx335->inclk);
+ 	if (ret) {
+@@ -876,12 +906,13 @@ static int imx335_power_on(struct device *dev)
+ 		goto error_reset;
+ 	}
+ 
+-	usleep_range(20, 22);
++	usleep_range(20, 22); /* T4 */
+ 
+ 	return 0;
+ 
+ error_reset:
+-	gpiod_set_value_cansleep(imx335->reset_gpio, 0);
++	gpiod_set_value_cansleep(imx335->reset_gpio, 1);
++	regulator_bulk_disable(ARRAY_SIZE(imx335_supply_name), imx335->supplies);
+ 
+ 	return ret;
+ }
+@@ -897,9 +928,9 @@ static int imx335_power_off(struct device *dev)
+ 	struct v4l2_subdev *sd = dev_get_drvdata(dev);
+ 	struct imx335 *imx335 = to_imx335(sd);
+ 
+-	gpiod_set_value_cansleep(imx335->reset_gpio, 0);
+-
++	gpiod_set_value_cansleep(imx335->reset_gpio, 1);
+ 	clk_disable_unprepare(imx335->inclk);
++	regulator_bulk_disable(ARRAY_SIZE(imx335_supply_name), imx335->supplies);
+ 
+ 	return 0;
+ }
+diff --git a/drivers/media/i2c/ov5675.c b/drivers/media/i2c/ov5675.c
+index d5a2a5f823124b..c499e7e93c54b9 100644
+--- a/drivers/media/i2c/ov5675.c
++++ b/drivers/media/i2c/ov5675.c
+@@ -979,12 +979,10 @@ static int ov5675_set_stream(struct v4l2_subdev *sd, int enable)
+ 
+ static int ov5675_power_off(struct device *dev)
+ {
+-	/* 512 xvclk cycles after the last SCCB transation or MIPI frame end */
+-	u32 delay_us = DIV_ROUND_UP(512, OV5675_XVCLK_19_2 / 1000 / 1000);
+ 	struct v4l2_subdev *sd = dev_get_drvdata(dev);
+ 	struct ov5675 *ov5675 = to_ov5675(sd);
+ 
+-	usleep_range(delay_us, delay_us * 2);
++	usleep_range(90, 100);
+ 
+ 	clk_disable_unprepare(ov5675->xvclk);
+ 	gpiod_set_value_cansleep(ov5675->reset_gpio, 1);
+@@ -995,7 +993,6 @@ static int ov5675_power_off(struct device *dev)
+ 
+ static int ov5675_power_on(struct device *dev)
+ {
+-	u32 delay_us = DIV_ROUND_UP(8192, OV5675_XVCLK_19_2 / 1000 / 1000);
+ 	struct v4l2_subdev *sd = dev_get_drvdata(dev);
+ 	struct ov5675 *ov5675 = to_ov5675(sd);
+ 	int ret;
+@@ -1021,8 +1018,11 @@ static int ov5675_power_on(struct device *dev)
+ 
+ 	gpiod_set_value_cansleep(ov5675->reset_gpio, 0);
+ 
+-	/* 8192 xvclk cycles prior to the first SCCB transation */
+-	usleep_range(delay_us, delay_us * 2);
++	/* Worst case quiesence gap is 1.365 milliseconds @ 6MHz XVCLK
++	 * Add an additional threshold grace period to ensure reset
++	 * completion before initiating our first I2C transaction.
++	 */
++	usleep_range(1500, 1600);
+ 
+ 	return 0;
+ }
+diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c
+index 8640db30602680..184a8062580c87 100644
+--- a/drivers/media/platform/qcom/camss/camss-video.c
++++ b/drivers/media/platform/qcom/camss/camss-video.c
+@@ -557,12 +557,6 @@ static void video_stop_streaming(struct vb2_queue *q)
+ 
+ 		ret = v4l2_subdev_call(subdev, video, s_stream, 0);
+ 
+-		if (entity->use_count > 1) {
+-			/* Don't stop if other instances of the pipeline are still running */
+-			dev_dbg(video->camss->dev, "Video pipeline still used, don't stop streaming.\n");
+-			return;
+-		}
+-
+ 		if (ret) {
+ 			dev_err(video->camss->dev, "Video pipeline stop failed: %d\n", ret);
+ 			return;
+diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
+index 8fa6750b5b421b..0754645d26acba 100644
+--- a/drivers/media/platform/qcom/camss/camss.c
++++ b/drivers/media/platform/qcom/camss/camss.c
+@@ -1665,6 +1665,8 @@ static int camss_probe(struct platform_device *pdev)
+ 
+ 	v4l2_async_nf_init(&camss->notifier, &camss->v4l2_dev);
+ 
++	pm_runtime_enable(dev);
++
+ 	num_subdevs = camss_of_parse_ports(camss);
+ 	if (num_subdevs < 0) {
+ 		ret = num_subdevs;
+@@ -1701,8 +1703,6 @@ static int camss_probe(struct platform_device *pdev)
+ 		}
+ 	}
+ 
+-	pm_runtime_enable(dev);
+-
+ 	return 0;
+ 
+ err_register_subdevs:
+@@ -1710,6 +1710,7 @@ static int camss_probe(struct platform_device *pdev)
+ err_v4l2_device_unregister:
+ 	v4l2_device_unregister(&camss->v4l2_dev);
+ 	v4l2_async_nf_cleanup(&camss->notifier);
++	pm_runtime_disable(dev);
+ err_genpd_cleanup:
+ 	camss_genpd_cleanup(camss);
+ 
+diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
+index 054b8e74ba4f51..0fc9414f8f1849 100644
+--- a/drivers/media/platform/qcom/venus/core.c
++++ b/drivers/media/platform/qcom/venus/core.c
+@@ -424,6 +424,7 @@ static void venus_remove(struct platform_device *pdev)
+ 	struct device *dev = core->dev;
+ 	int ret;
+ 
++	cancel_delayed_work_sync(&core->work);
+ 	ret = pm_runtime_get_sync(dev);
+ 	WARN_ON(ret < 0);
+ 
+diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
+index ad13d447d48346..aa1df66d5ac62d 100644
+--- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
++++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
+@@ -39,6 +39,10 @@ static const struct media_entity_operations sun4i_csi_video_entity_ops = {
+ 	.link_validate = v4l2_subdev_link_validate,
+ };
+ 
++static const struct media_entity_operations sun4i_csi_subdev_entity_ops = {
++	.link_validate = v4l2_subdev_link_validate,
++};
++
+ static int sun4i_csi_notify_bound(struct v4l2_async_notifier *notifier,
+ 				  struct v4l2_subdev *subdev,
+ 				  struct v4l2_async_connection *asd)
+@@ -213,6 +217,7 @@ static int sun4i_csi_probe(struct platform_device *pdev)
+ 	v4l2_subdev_init(subdev, &sun4i_csi_subdev_ops);
+ 	subdev->flags = V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS;
+ 	subdev->entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;
++	subdev->entity.ops = &sun4i_csi_subdev_entity_ops;
+ 	subdev->owner = THIS_MODULE;
+ 	snprintf(subdev->name, sizeof(subdev->name), "sun4i-csi-0");
+ 	v4l2_set_subdevdata(subdev, csi);
+diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c
+index 1e30e05953dc64..7495df6b519125 100644
+--- a/drivers/media/usb/usbtv/usbtv-video.c
++++ b/drivers/media/usb/usbtv/usbtv-video.c
+@@ -962,15 +962,8 @@ int usbtv_video_init(struct usbtv *usbtv)
+ 
+ void usbtv_video_free(struct usbtv *usbtv)
+ {
+-	mutex_lock(&usbtv->vb2q_lock);
+-	mutex_lock(&usbtv->v4l2_lock);
+-
+-	usbtv_stop(usbtv);
+ 	vb2_video_unregister_device(&usbtv->vdev);
+ 	v4l2_device_disconnect(&usbtv->v4l2_dev);
+ 
+-	mutex_unlock(&usbtv->v4l2_lock);
+-	mutex_unlock(&usbtv->vb2q_lock);
+-
+ 	v4l2_device_put(&usbtv->v4l2_dev);
+ }
+diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c
+index 4007f4e16d74f0..909b15ad207556 100644
+--- a/drivers/memory/tegra/tegra186-emc.c
++++ b/drivers/memory/tegra/tegra186-emc.c
+@@ -35,11 +35,6 @@ struct tegra186_emc {
+ 	struct icc_provider provider;
+ };
+ 
+-static inline struct tegra186_emc *to_tegra186_emc(struct icc_provider *provider)
+-{
+-	return container_of(provider, struct tegra186_emc, provider);
+-}
+-
+ /*
+  * debugfs interface
+  *
+diff --git a/drivers/net/can/dev/netlink.c b/drivers/net/can/dev/netlink.c
+index dfdc039d92a6c1..01aacdcda26066 100644
+--- a/drivers/net/can/dev/netlink.c
++++ b/drivers/net/can/dev/netlink.c
+@@ -65,15 +65,6 @@ static int can_validate(struct nlattr *tb[], struct nlattr *data[],
+ 	if (!data)
+ 		return 0;
+ 
+-	if (data[IFLA_CAN_BITTIMING]) {
+-		struct can_bittiming bt;
+-
+-		memcpy(&bt, nla_data(data[IFLA_CAN_BITTIMING]), sizeof(bt));
+-		err = can_validate_bittiming(&bt, extack);
+-		if (err)
+-			return err;
+-	}
+-
+ 	if (data[IFLA_CAN_CTRLMODE]) {
+ 		struct can_ctrlmode *cm = nla_data(data[IFLA_CAN_CTRLMODE]);
+ 		u32 tdc_flags = cm->flags & CAN_CTRLMODE_TDC_MASK;
+@@ -114,6 +105,15 @@ static int can_validate(struct nlattr *tb[], struct nlattr *data[],
+ 		}
+ 	}
+ 
++	if (data[IFLA_CAN_BITTIMING]) {
++		struct can_bittiming bt;
++
++		memcpy(&bt, nla_data(data[IFLA_CAN_BITTIMING]), sizeof(bt));
++		err = can_validate_bittiming(&bt, extack);
++		if (err)
++			return err;
++	}
++
+ 	if (is_can_fd) {
+ 		if (!data[IFLA_CAN_BITTIMING] || !data[IFLA_CAN_DATA_BITTIMING])
+ 			return -EOPNOTSUPP;
+@@ -195,48 +195,6 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[],
+ 	/* We need synchronization with dev->stop() */
+ 	ASSERT_RTNL();
+ 
+-	if (data[IFLA_CAN_BITTIMING]) {
+-		struct can_bittiming bt;
+-
+-		/* Do not allow changing bittiming while running */
+-		if (dev->flags & IFF_UP)
+-			return -EBUSY;
+-
+-		/* Calculate bittiming parameters based on
+-		 * bittiming_const if set, otherwise pass bitrate
+-		 * directly via do_set_bitrate(). Bail out if neither
+-		 * is given.
+-		 */
+-		if (!priv->bittiming_const && !priv->do_set_bittiming &&
+-		    !priv->bitrate_const)
+-			return -EOPNOTSUPP;
+-
+-		memcpy(&bt, nla_data(data[IFLA_CAN_BITTIMING]), sizeof(bt));
+-		err = can_get_bittiming(dev, &bt,
+-					priv->bittiming_const,
+-					priv->bitrate_const,
+-					priv->bitrate_const_cnt,
+-					extack);
+-		if (err)
+-			return err;
+-
+-		if (priv->bitrate_max && bt.bitrate > priv->bitrate_max) {
+-			NL_SET_ERR_MSG_FMT(extack,
+-					   "arbitration bitrate %u bps surpasses transceiver capabilities of %u bps",
+-					   bt.bitrate, priv->bitrate_max);
+-			return -EINVAL;
+-		}
+-
+-		memcpy(&priv->bittiming, &bt, sizeof(bt));
+-
+-		if (priv->do_set_bittiming) {
+-			/* Finally, set the bit-timing registers */
+-			err = priv->do_set_bittiming(dev);
+-			if (err)
+-				return err;
+-		}
+-	}
+-
+ 	if (data[IFLA_CAN_CTRLMODE]) {
+ 		struct can_ctrlmode *cm;
+ 		u32 ctrlstatic;
+@@ -284,6 +242,48 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[],
+ 			priv->ctrlmode &= cm->flags | ~CAN_CTRLMODE_TDC_MASK;
+ 	}
+ 
++	if (data[IFLA_CAN_BITTIMING]) {
++		struct can_bittiming bt;
++
++		/* Do not allow changing bittiming while running */
++		if (dev->flags & IFF_UP)
++			return -EBUSY;
++
++		/* Calculate bittiming parameters based on
++		 * bittiming_const if set, otherwise pass bitrate
++		 * directly via do_set_bitrate(). Bail out if neither
++		 * is given.
++		 */
++		if (!priv->bittiming_const && !priv->do_set_bittiming &&
++		    !priv->bitrate_const)
++			return -EOPNOTSUPP;
++
++		memcpy(&bt, nla_data(data[IFLA_CAN_BITTIMING]), sizeof(bt));
++		err = can_get_bittiming(dev, &bt,
++					priv->bittiming_const,
++					priv->bitrate_const,
++					priv->bitrate_const_cnt,
++					extack);
++		if (err)
++			return err;
++
++		if (priv->bitrate_max && bt.bitrate > priv->bitrate_max) {
++			NL_SET_ERR_MSG_FMT(extack,
++					   "arbitration bitrate %u bps surpasses transceiver capabilities of %u bps",
++					   bt.bitrate, priv->bitrate_max);
++			return -EINVAL;
++		}
++
++		memcpy(&priv->bittiming, &bt, sizeof(bt));
++
++		if (priv->do_set_bittiming) {
++			/* Finally, set the bit-timing registers */
++			err = priv->do_set_bittiming(dev);
++			if (err)
++				return err;
++		}
++	}
++
+ 	if (data[IFLA_CAN_RESTART_MS]) {
+ 		/* Do not allow changing restart delay while running */
+ 		if (dev->flags & IFF_UP)
+diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
+index ac4ea93bd8ddad..eaef14ea5dd2e0 100644
+--- a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
++++ b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
+@@ -265,7 +265,7 @@ static void aq_ethtool_get_strings(struct net_device *ndev,
+ 		const int rx_stat_cnt = ARRAY_SIZE(aq_ethtool_queue_rx_stat_names);
+ 		const int tx_stat_cnt = ARRAY_SIZE(aq_ethtool_queue_tx_stat_names);
+ 		char tc_string[8];
+-		int tc;
++		unsigned int tc;
+ 
+ 		memset(tc_string, 0, sizeof(tc_string));
+ 		memcpy(p, aq_ethtool_stat_names,
+@@ -274,7 +274,7 @@ static void aq_ethtool_get_strings(struct net_device *ndev,
+ 
+ 		for (tc = 0; tc < cfg->tcs; tc++) {
+ 			if (cfg->is_qos)
+-				snprintf(tc_string, 8, "TC%d ", tc);
++				snprintf(tc_string, 8, "TC%u ", tc);
+ 
+ 			for (i = 0; i < cfg->vecs; i++) {
+ 				for (si = 0; si < rx_stat_cnt; si++) {
+diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+index 3c36dd8051485e..2e7ddbca9d53b1 100644
+--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
++++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+@@ -3021,7 +3021,7 @@ static void bnxt_get_pkgver(struct net_device *dev)
+ 
+ 	if (!bnxt_get_pkginfo(dev, buf, sizeof(buf))) {
+ 		len = strlen(bp->fw_ver_str);
+-		snprintf(bp->fw_ver_str + len, FW_VER_STR_LEN - len - 1,
++		snprintf(bp->fw_ver_str + len, FW_VER_STR_LEN - len,
+ 			 "/pkg %s", buf);
+ 	}
+ }
+diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
+index a8fbcada6b01ff..733af928caffc6 100644
+--- a/drivers/net/ethernet/freescale/fec.h
++++ b/drivers/net/ethernet/freescale/fec.h
+@@ -691,10 +691,19 @@ struct fec_enet_private {
+ 	/* XDP BPF Program */
+ 	struct bpf_prog *xdp_prog;
+ 
++	struct {
++		int pps_enable;
++		u64 ns_sys, ns_phc;
++		u32 at_corr;
++		u8 at_inc_corr;
++	} ptp_saved_state;
++
+ 	u64 ethtool_stats[];
+ };
+ 
+ void fec_ptp_init(struct platform_device *pdev, int irq_idx);
++void fec_ptp_restore_state(struct fec_enet_private *fep);
++void fec_ptp_save_state(struct fec_enet_private *fep);
+ void fec_ptp_stop(struct platform_device *pdev);
+ void fec_ptp_start_cyclecounter(struct net_device *ndev);
+ int fec_ptp_set(struct net_device *ndev, struct kernel_hwtstamp_config *config,
+diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
+index 5604a47b35b2a2..81e3173521589d 100644
+--- a/drivers/net/ethernet/freescale/fec_main.c
++++ b/drivers/net/ethernet/freescale/fec_main.c
+@@ -1058,6 +1058,8 @@ fec_restart(struct net_device *ndev)
+ 	u32 rcntl = OPT_FRAME_SIZE | 0x04;
+ 	u32 ecntl = FEC_ECR_ETHEREN;
+ 
++	fec_ptp_save_state(fep);
++
+ 	/* Whack a reset.  We should wait for this.
+ 	 * For i.MX6SX SOC, enet use AXI bus, we use disable MAC
+ 	 * instead of reset MAC itself.
+@@ -1225,8 +1227,10 @@ fec_restart(struct net_device *ndev)
+ 	writel(ecntl, fep->hwp + FEC_ECNTRL);
+ 	fec_enet_active_rxring(ndev);
+ 
+-	if (fep->bufdesc_ex)
++	if (fep->bufdesc_ex) {
+ 		fec_ptp_start_cyclecounter(ndev);
++		fec_ptp_restore_state(fep);
++	}
+ 
+ 	/* Enable interrupts we wish to service */
+ 	if (fep->link)
+@@ -1317,6 +1321,8 @@ fec_stop(struct net_device *ndev)
+ 			netdev_err(ndev, "Graceful transmit stop did not complete!\n");
+ 	}
+ 
++	fec_ptp_save_state(fep);
++
+ 	/* Whack a reset.  We should wait for this.
+ 	 * For i.MX6SX SOC, enet use AXI bus, we use disable MAC
+ 	 * instead of reset MAC itself.
+@@ -1347,6 +1353,9 @@ fec_stop(struct net_device *ndev)
+ 		val = readl(fep->hwp + FEC_ECNTRL);
+ 		val |= FEC_ECR_EN1588;
+ 		writel(val, fep->hwp + FEC_ECNTRL);
++
++		fec_ptp_start_cyclecounter(ndev);
++		fec_ptp_restore_state(fep);
+ 	}
+ }
+ 
+diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
+index 2e4f3e1782a252..5e8fac50f945d4 100644
+--- a/drivers/net/ethernet/freescale/fec_ptp.c
++++ b/drivers/net/ethernet/freescale/fec_ptp.c
+@@ -770,6 +770,56 @@ void fec_ptp_init(struct platform_device *pdev, int irq_idx)
+ 	schedule_delayed_work(&fep->time_keep, HZ);
+ }
+ 
++void fec_ptp_save_state(struct fec_enet_private *fep)
++{
++	unsigned long flags;
++	u32 atime_inc_corr;
++
++	spin_lock_irqsave(&fep->tmreg_lock, flags);
++
++	fep->ptp_saved_state.pps_enable = fep->pps_enable;
++
++	fep->ptp_saved_state.ns_phc = timecounter_read(&fep->tc);
++	fep->ptp_saved_state.ns_sys = ktime_get_ns();
++
++	fep->ptp_saved_state.at_corr = readl(fep->hwp + FEC_ATIME_CORR);
++	atime_inc_corr = readl(fep->hwp + FEC_ATIME_INC) & FEC_T_INC_CORR_MASK;
++	fep->ptp_saved_state.at_inc_corr = (u8)(atime_inc_corr >> FEC_T_INC_CORR_OFFSET);
++
++	spin_unlock_irqrestore(&fep->tmreg_lock, flags);
++}
++
++/* Restore PTP functionality after a reset */
++void fec_ptp_restore_state(struct fec_enet_private *fep)
++{
++	u32 atime_inc = readl(fep->hwp + FEC_ATIME_INC) & FEC_T_INC_MASK;
++	unsigned long flags;
++	u32 counter;
++	u64 ns;
++
++	spin_lock_irqsave(&fep->tmreg_lock, flags);
++
++	/* Reset turned it off, so adjust our status flag */
++	fep->pps_enable = 0;
++
++	writel(fep->ptp_saved_state.at_corr, fep->hwp + FEC_ATIME_CORR);
++	atime_inc |= ((u32)fep->ptp_saved_state.at_inc_corr) << FEC_T_INC_CORR_OFFSET;
++	writel(atime_inc, fep->hwp + FEC_ATIME_INC);
++
++	ns = ktime_get_ns() - fep->ptp_saved_state.ns_sys + fep->ptp_saved_state.ns_phc;
++	counter = ns & fep->cc.mask;
++	writel(counter, fep->hwp + FEC_ATIME);
++	timecounter_init(&fep->tc, &fep->cc, ns);
++
++	spin_unlock_irqrestore(&fep->tmreg_lock, flags);
++
++	/* Restart PPS if needed */
++	if (fep->ptp_saved_state.pps_enable) {
++		/* Re-enable PPS */
++		fec_ptp_enable_pps(fep, 1);
++	}
++}
++
+ void fec_ptp_stop(struct platform_device *pdev)
+ {
+ 	struct net_device *ndev = platform_get_drvdata(pdev);
+diff --git a/drivers/net/ethernet/hisilicon/hip04_eth.c b/drivers/net/ethernet/hisilicon/hip04_eth.c
+index ecf92a5d56bbf2..4b893d162e85d0 100644
+--- a/drivers/net/ethernet/hisilicon/hip04_eth.c
++++ b/drivers/net/ethernet/hisilicon/hip04_eth.c
+@@ -947,6 +947,7 @@ static int hip04_mac_probe(struct platform_device *pdev)
+ 	priv->tx_coalesce_timer.function = tx_done;
+ 
+ 	priv->map = syscon_node_to_regmap(arg.np);
++	of_node_put(arg.np);
+ 	if (IS_ERR(priv->map)) {
+ 		dev_warn(d, "no syscon hisilicon,hip04-ppe\n");
+ 		ret = PTR_ERR(priv->map);
+diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
+index f75668c4793519..616a2768e5048a 100644
+--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
++++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
+@@ -933,6 +933,7 @@ static int hns_mac_get_info(struct hns_mac_cb *mac_cb)
+ 			mac_cb->cpld_ctrl = NULL;
+ 		} else {
+ 			syscon = syscon_node_to_regmap(cpld_args.np);
++			of_node_put(cpld_args.np);
+ 			if (IS_ERR_OR_NULL(syscon)) {
+ 				dev_dbg(mac_cb->dev, "no cpld-syscon found!\n");
+ 				mac_cb->cpld_ctrl = NULL;
+diff --git a/drivers/net/ethernet/hisilicon/hns_mdio.c b/drivers/net/ethernet/hisilicon/hns_mdio.c
+index 409a89d8022087..9ffd479c750881 100644
+--- a/drivers/net/ethernet/hisilicon/hns_mdio.c
++++ b/drivers/net/ethernet/hisilicon/hns_mdio.c
+@@ -575,6 +575,7 @@ static int hns_mdio_probe(struct platform_device *pdev)
+ 						MDIO_SC_RESET_ST;
+ 				}
+ 			}
++			of_node_put(reg_args.np);
+ 		} else {
+ 			dev_warn(&pdev->dev, "find syscon ret = %#x\n", ret);
+ 			mdio_dev->subctrl_vbase = NULL;
+diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
+index 334f652c60601f..d377a286c0e1bf 100644
+--- a/drivers/net/ethernet/intel/e1000e/netdev.c
++++ b/drivers/net/ethernet/intel/e1000e/netdev.c
+@@ -6672,8 +6672,10 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
+ 		if (adapter->flags2 & FLAG2_HAS_PHY_WAKEUP) {
+ 			/* enable wakeup by the PHY */
+ 			retval = e1000_init_phy_wakeup(adapter, wufc);
+-			if (retval)
+-				return retval;
++			if (retval) {
++				e_err("Failed to enable wakeup\n");
++				goto skip_phy_configurations;
++			}
+ 		} else {
+ 			/* enable wakeup by the MAC */
+ 			ew32(WUFC, wufc);
+@@ -6694,8 +6696,10 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
+ 			 * or broadcast.
+ 			 */
+ 			retval = e1000_enable_ulp_lpt_lp(hw, !runtime);
+-			if (retval)
+-				return retval;
++			if (retval) {
++				e_err("Failed to enable ULP\n");
++				goto skip_phy_configurations;
++			}
+ 		}
+ 
+ 		/* Force SMBUS to allow WOL */
+@@ -6744,6 +6748,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
+ 		hw->phy.ops.release(hw);
+ 	}
+ 
++skip_phy_configurations:
+ 	/* Release control of h/w to f/w.  If f/w is AMT enabled, this
+ 	 * would have already happened in close and is redundant.
+ 	 */
+@@ -6986,15 +6991,13 @@ static __maybe_unused int e1000e_pm_suspend(struct device *dev)
+ 	e1000e_pm_freeze(dev);
+ 
+ 	rc = __e1000_shutdown(pdev, false);
+-	if (rc) {
+-		e1000e_pm_thaw(dev);
+-	} else {
++	if (!rc) {
+ 		/* Introduce S0ix implementation */
+ 		if (adapter->flags2 & FLAG2_ENABLE_S0IX_FLOWS)
+ 			e1000e_s0ix_entry_flow(adapter);
+ 	}
+ 
+-	return rc;
++	return 0;
+ }
+ 
+ static __maybe_unused int e1000e_pm_resume(struct device *dev)
+diff --git a/drivers/net/ethernet/intel/ice/ice_sched.c b/drivers/net/ethernet/intel/ice/ice_sched.c
+index c0533d7b66b996..908bcd07380333 100644
+--- a/drivers/net/ethernet/intel/ice/ice_sched.c
++++ b/drivers/net/ethernet/intel/ice/ice_sched.c
+@@ -28,9 +28,8 @@ ice_sched_add_root_node(struct ice_port_info *pi,
+ 	if (!root)
+ 		return -ENOMEM;
+ 
+-	/* coverity[suspicious_sizeof] */
+ 	root->children = devm_kcalloc(ice_hw_to_dev(hw), hw->max_children[0],
+-				      sizeof(*root), GFP_KERNEL);
++				      sizeof(*root->children), GFP_KERNEL);
+ 	if (!root->children) {
+ 		devm_kfree(ice_hw_to_dev(hw), root);
+ 		return -ENOMEM;
+@@ -186,10 +185,9 @@ ice_sched_add_node(struct ice_port_info *pi, u8 layer,
+ 	if (!node)
+ 		return -ENOMEM;
+ 	if (hw->max_children[layer]) {
+-		/* coverity[suspicious_sizeof] */
+ 		node->children = devm_kcalloc(ice_hw_to_dev(hw),
+ 					      hw->max_children[layer],
+-					      sizeof(*node), GFP_KERNEL);
++					      sizeof(*node->children), GFP_KERNEL);
+ 		if (!node->children) {
+ 			devm_kfree(ice_hw_to_dev(hw), node);
+ 			return -ENOMEM;
+diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
+index 61baf1da76eea7..c33c31019562f6 100644
+--- a/drivers/net/ethernet/lantiq_etop.c
++++ b/drivers/net/ethernet/lantiq_etop.c
+@@ -482,7 +482,9 @@ ltq_etop_tx(struct sk_buff *skb, struct net_device *dev)
+ 	unsigned long flags;
+ 	u32 byte_offset;
+ 
+-	len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
++	if (skb_put_padto(skb, ETH_ZLEN))
++		return NETDEV_TX_OK;
++	len = skb->len;
+ 
+ 	if ((desc->ctl & (LTQ_DMA_OWN | LTQ_DMA_C)) || ch->skb[ch->dma.desc]) {
+ 		netdev_err(dev, "tx ring full\n");
+diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
+index e809f91c08fb9d..9e02e4367bec81 100644
+--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
++++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
+@@ -1088,7 +1088,7 @@ struct mvpp2 {
+ 	unsigned int max_port_rxqs;
+ 
+ 	/* Workqueue to gather hardware statistics */
+-	char queue_name[30];
++	char queue_name[31];
+ 	struct workqueue_struct *stats_queue;
+ 
+ 	/* Debugfs root entry */
+diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c
+index d4239e3b3c88ef..11f724ad90dbfb 100644
+--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c
++++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c
+@@ -23,6 +23,9 @@ struct mlx5e_tir_builder *mlx5e_tir_builder_alloc(bool modify)
+ 	struct mlx5e_tir_builder *builder;
+ 
+ 	builder = kvzalloc(sizeof(*builder), GFP_KERNEL);
++	if (!builder)
++		return NULL;
++
+ 	builder->modify = modify;
+ 
+ 	return builder;
+diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
+index e2ffc572de188b..015faddabc8e09 100644
+--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
++++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
+@@ -67,7 +67,6 @@ static void mlx5e_ipsec_handle_tx_limit(struct work_struct *_work)
+ 		return;
+ 
+ 	spin_lock_bh(&x->lock);
+-	xfrm_state_check_expire(x);
+ 	if (x->km.state == XFRM_STATE_EXPIRED) {
+ 		sa_entry->attrs.drop = true;
+ 		spin_unlock_bh(&x->lock);
+@@ -75,6 +74,13 @@ static void mlx5e_ipsec_handle_tx_limit(struct work_struct *_work)
+ 		mlx5e_accel_ipsec_fs_modify(sa_entry);
+ 		return;
+ 	}
++
++	if (x->km.state != XFRM_STATE_VALID) {
++		spin_unlock_bh(&x->lock);
++		return;
++	}
++
++	xfrm_state_check_expire(x);
+ 	spin_unlock_bh(&x->lock);
+ 
+ 	queue_delayed_work(sa_entry->ipsec->wq, &dwork->dwork,
+diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
+index 3001a52e1ac2ec..85d6334308e318 100644
+--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
++++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
+@@ -642,7 +642,6 @@ mlx5e_sq_xmit_mpwqe(struct mlx5e_txqsq *sq, struct sk_buff *skb,
+ 	return;
+ 
+ err_unmap:
+-	mlx5e_dma_unmap_wqe_err(sq, 1);
+ 	sq->stats->dropped++;
+ 	dev_kfree_skb_any(skb);
+ 	mlx5e_tx_flush(sq);
+diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/pci_vsc.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/pci_vsc.c
+index d0b595ba611014..432c98f2626db9 100644
+--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/pci_vsc.c
++++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/pci_vsc.c
+@@ -24,6 +24,11 @@
+ 	pci_write_config_dword((dev)->pdev, (dev)->vsc_addr + (offset), (val))
+ #define VSC_MAX_RETRIES 2048
+ 
++/* Reading VSC registers can take relatively long time.
++ * Yield the cpu every 128 registers read.
++ */
++#define VSC_GW_READ_BLOCK_COUNT 128
++
+ enum {
+ 	VSC_CTRL_OFFSET = 0x4,
+ 	VSC_COUNTER_OFFSET = 0x8,
+@@ -273,6 +278,7 @@ int mlx5_vsc_gw_read_block_fast(struct mlx5_core_dev *dev, u32 *data,
+ {
+ 	unsigned int next_read_addr = 0;
+ 	unsigned int read_addr = 0;
++	unsigned int count = 0;
+ 
+ 	while (read_addr < length) {
+ 		if (mlx5_vsc_gw_read_fast(dev, read_addr, &next_read_addr,
+@@ -280,6 +286,10 @@ int mlx5_vsc_gw_read_block_fast(struct mlx5_core_dev *dev, u32 *data,
+ 			return read_addr;
+ 
+ 		read_addr = next_read_addr;
++		if (++count == VSC_GW_READ_BLOCK_COUNT) {
++			cond_resched();
++			count = 0;
++		}
+ 	}
+ 	return length;
+ }
+diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c b/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c
+index ac7e1cffbcecf0..dcf2e342fc14ad 100644
+--- a/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c
++++ b/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c
+@@ -45,8 +45,12 @@ void sparx5_ifh_parse(u32 *ifh, struct frame_info *info)
+ 	fwd = (fwd >> 5);
+ 	info->src_port = FIELD_GET(GENMASK(7, 1), fwd);
+ 
++	/*
++	 * Bit 270-271 are occasionally unexpectedly set by the hardware,
++	 * clear bits before extracting timestamp
++	 */
+ 	info->timestamp =
+-		((u64)xtr_hdr[2] << 24) |
++		((u64)(xtr_hdr[2] & GENMASK(5, 0)) << 24) |
+ 		((u64)xtr_hdr[3] << 16) |
+ 		((u64)xtr_hdr[4] <<  8) |
+ 		((u64)xtr_hdr[5] <<  0);
+diff --git a/drivers/net/ethernet/microsoft/Kconfig b/drivers/net/ethernet/microsoft/Kconfig
+index 01eb7445ead951..901fbffbf718ee 100644
+--- a/drivers/net/ethernet/microsoft/Kconfig
++++ b/drivers/net/ethernet/microsoft/Kconfig
+@@ -17,7 +17,8 @@ if NET_VENDOR_MICROSOFT
+ 
+ config MICROSOFT_MANA
+ 	tristate "Microsoft Azure Network Adapter (MANA) support"
+-	depends on PCI_MSI && X86_64
++	depends on PCI_MSI
++	depends on X86_64 || (ARM64 && !CPU_BIG_ENDIAN)
+ 	depends on PCI_HYPERV
+ 	select AUXILIARY_BUS
+ 	select PAGE_POOL
+diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c
+index 6367de0c2c2e8f..ae014e21eb6056 100644
+--- a/drivers/net/ethernet/microsoft/mana/gdma_main.c
++++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c
+@@ -179,7 +179,7 @@ int mana_gd_alloc_memory(struct gdma_context *gc, unsigned int length,
+ 	dma_addr_t dma_handle;
+ 	void *buf;
+ 
+-	if (length < PAGE_SIZE || !is_power_of_2(length))
++	if (length < MANA_PAGE_SIZE || !is_power_of_2(length))
+ 		return -EINVAL;
+ 
+ 	gmi->dev = gc->dev;
+@@ -720,7 +720,7 @@ EXPORT_SYMBOL_NS(mana_gd_destroy_dma_region, NET_MANA);
+ static int mana_gd_create_dma_region(struct gdma_dev *gd,
+ 				     struct gdma_mem_info *gmi)
+ {
+-	unsigned int num_page = gmi->length / PAGE_SIZE;
++	unsigned int num_page = gmi->length / MANA_PAGE_SIZE;
+ 	struct gdma_create_dma_region_req *req = NULL;
+ 	struct gdma_create_dma_region_resp resp = {};
+ 	struct gdma_context *gc = gd->gdma_context;
+@@ -730,10 +730,10 @@ static int mana_gd_create_dma_region(struct gdma_dev *gd,
+ 	int err;
+ 	int i;
+ 
+-	if (length < PAGE_SIZE || !is_power_of_2(length))
++	if (length < MANA_PAGE_SIZE || !is_power_of_2(length))
+ 		return -EINVAL;
+ 
+-	if (offset_in_page(gmi->virt_addr) != 0)
++	if (!MANA_PAGE_ALIGNED(gmi->virt_addr))
+ 		return -EINVAL;
+ 
+ 	hwc = gc->hwc.driver_data;
+@@ -754,7 +754,7 @@ static int mana_gd_create_dma_region(struct gdma_dev *gd,
+ 	req->page_addr_list_len = num_page;
+ 
+ 	for (i = 0; i < num_page; i++)
+-		req->page_addr_list[i] = gmi->dma_handle +  i * PAGE_SIZE;
++		req->page_addr_list[i] = gmi->dma_handle +  i * MANA_PAGE_SIZE;
+ 
+ 	err = mana_gd_send_request(gc, req_msg_size, req, sizeof(resp), &resp);
+ 	if (err)
+diff --git a/drivers/net/ethernet/microsoft/mana/hw_channel.c b/drivers/net/ethernet/microsoft/mana/hw_channel.c
+index 236daa0535ba00..9d6426d4158e31 100644
+--- a/drivers/net/ethernet/microsoft/mana/hw_channel.c
++++ b/drivers/net/ethernet/microsoft/mana/hw_channel.c
+@@ -366,12 +366,12 @@ static int mana_hwc_create_cq(struct hw_channel_context *hwc, u16 q_depth,
+ 	int err;
+ 
+ 	eq_size = roundup_pow_of_two(GDMA_EQE_SIZE * q_depth);
+-	if (eq_size < MINIMUM_SUPPORTED_PAGE_SIZE)
+-		eq_size = MINIMUM_SUPPORTED_PAGE_SIZE;
++	if (eq_size < MANA_MIN_QSIZE)
++		eq_size = MANA_MIN_QSIZE;
+ 
+ 	cq_size = roundup_pow_of_two(GDMA_CQE_SIZE * q_depth);
+-	if (cq_size < MINIMUM_SUPPORTED_PAGE_SIZE)
+-		cq_size = MINIMUM_SUPPORTED_PAGE_SIZE;
++	if (cq_size < MANA_MIN_QSIZE)
++		cq_size = MANA_MIN_QSIZE;
+ 
+ 	hwc_cq = kzalloc(sizeof(*hwc_cq), GFP_KERNEL);
+ 	if (!hwc_cq)
+@@ -433,7 +433,7 @@ static int mana_hwc_alloc_dma_buf(struct hw_channel_context *hwc, u16 q_depth,
+ 
+ 	dma_buf->num_reqs = q_depth;
+ 
+-	buf_size = PAGE_ALIGN(q_depth * max_msg_size);
++	buf_size = MANA_PAGE_ALIGN(q_depth * max_msg_size);
+ 
+ 	gmi = &dma_buf->mem_info;
+ 	err = mana_gd_alloc_memory(gc, buf_size, gmi);
+@@ -501,8 +501,8 @@ static int mana_hwc_create_wq(struct hw_channel_context *hwc,
+ 	else
+ 		queue_size = roundup_pow_of_two(GDMA_MAX_SQE_SIZE * q_depth);
+ 
+-	if (queue_size < MINIMUM_SUPPORTED_PAGE_SIZE)
+-		queue_size = MINIMUM_SUPPORTED_PAGE_SIZE;
++	if (queue_size < MANA_MIN_QSIZE)
++		queue_size = MANA_MIN_QSIZE;
+ 
+ 	hwc_wq = kzalloc(sizeof(*hwc_wq), GFP_KERNEL);
+ 	if (!hwc_wq)
+diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
+index d8cce3771af213..89852bbc877c11 100644
+--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
++++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
+@@ -1902,10 +1902,10 @@ static int mana_create_txq(struct mana_port_context *apc,
+ 	 *  to prevent overflow.
+ 	 */
+ 	txq_size = MAX_SEND_BUFFERS_PER_QUEUE * 32;
+-	BUILD_BUG_ON(!PAGE_ALIGNED(txq_size));
++	BUILD_BUG_ON(!MANA_PAGE_ALIGNED(txq_size));
+ 
+ 	cq_size = MAX_SEND_BUFFERS_PER_QUEUE * COMP_ENTRY_SIZE;
+-	cq_size = PAGE_ALIGN(cq_size);
++	cq_size = MANA_PAGE_ALIGN(cq_size);
+ 
+ 	gc = gd->gdma_context;
+ 
+@@ -2203,8 +2203,8 @@ static struct mana_rxq *mana_create_rxq(struct mana_port_context *apc,
+ 	if (err)
+ 		goto out;
+ 
+-	rq_size = PAGE_ALIGN(rq_size);
+-	cq_size = PAGE_ALIGN(cq_size);
++	rq_size = MANA_PAGE_ALIGN(rq_size);
++	cq_size = MANA_PAGE_ALIGN(cq_size);
+ 
+ 	/* Create RQ */
+ 	memset(&spec, 0, sizeof(spec));
+diff --git a/drivers/net/ethernet/microsoft/mana/shm_channel.c b/drivers/net/ethernet/microsoft/mana/shm_channel.c
+index 5553af9c8085a1..0f1679ebad96ba 100644
+--- a/drivers/net/ethernet/microsoft/mana/shm_channel.c
++++ b/drivers/net/ethernet/microsoft/mana/shm_channel.c
+@@ -6,6 +6,7 @@
+ #include <linux/io.h>
+ #include <linux/mm.h>
+ 
++#include <net/mana/gdma.h>
+ #include <net/mana/shm_channel.h>
+ 
+ #define PAGE_FRAME_L48_WIDTH_BYTES 6
+@@ -155,8 +156,8 @@ int mana_smc_setup_hwc(struct shm_channel *sc, bool reset_vf, u64 eq_addr,
+ 		return err;
+ 	}
+ 
+-	if (!PAGE_ALIGNED(eq_addr) || !PAGE_ALIGNED(cq_addr) ||
+-	    !PAGE_ALIGNED(rq_addr) || !PAGE_ALIGNED(sq_addr))
++	if (!MANA_PAGE_ALIGNED(eq_addr) || !MANA_PAGE_ALIGNED(cq_addr) ||
++	    !MANA_PAGE_ALIGNED(rq_addr) || !MANA_PAGE_ALIGNED(sq_addr))
+ 		return -EINVAL;
+ 
+ 	if ((eq_msix_index & VECTOR_MASK) != eq_msix_index)
+@@ -183,7 +184,7 @@ int mana_smc_setup_hwc(struct shm_channel *sc, bool reset_vf, u64 eq_addr,
+ 
+ 	/* EQ addr: low 48 bits of frame address */
+ 	shmem = (u64 *)ptr;
+-	frame_addr = PHYS_PFN(eq_addr);
++	frame_addr = MANA_PFN(eq_addr);
+ 	*shmem = frame_addr & PAGE_FRAME_L48_MASK;
+ 	all_addr_h4bits |= (frame_addr >> PAGE_FRAME_L48_WIDTH_BITS) <<
+ 		(frame_addr_seq++ * PAGE_FRAME_H4_WIDTH_BITS);
+@@ -191,7 +192,7 @@ int mana_smc_setup_hwc(struct shm_channel *sc, bool reset_vf, u64 eq_addr,
+ 
+ 	/* CQ addr: low 48 bits of frame address */
+ 	shmem = (u64 *)ptr;
+-	frame_addr = PHYS_PFN(cq_addr);
++	frame_addr = MANA_PFN(cq_addr);
+ 	*shmem = frame_addr & PAGE_FRAME_L48_MASK;
+ 	all_addr_h4bits |= (frame_addr >> PAGE_FRAME_L48_WIDTH_BITS) <<
+ 		(frame_addr_seq++ * PAGE_FRAME_H4_WIDTH_BITS);
+@@ -199,7 +200,7 @@ int mana_smc_setup_hwc(struct shm_channel *sc, bool reset_vf, u64 eq_addr,
+ 
+ 	/* RQ addr: low 48 bits of frame address */
+ 	shmem = (u64 *)ptr;
+-	frame_addr = PHYS_PFN(rq_addr);
++	frame_addr = MANA_PFN(rq_addr);
+ 	*shmem = frame_addr & PAGE_FRAME_L48_MASK;
+ 	all_addr_h4bits |= (frame_addr >> PAGE_FRAME_L48_WIDTH_BITS) <<
+ 		(frame_addr_seq++ * PAGE_FRAME_H4_WIDTH_BITS);
+@@ -207,7 +208,7 @@ int mana_smc_setup_hwc(struct shm_channel *sc, bool reset_vf, u64 eq_addr,
+ 
+ 	/* SQ addr: low 48 bits of frame address */
+ 	shmem = (u64 *)ptr;
+-	frame_addr = PHYS_PFN(sq_addr);
++	frame_addr = MANA_PFN(sq_addr);
+ 	*shmem = frame_addr & PAGE_FRAME_L48_MASK;
+ 	all_addr_h4bits |= (frame_addr >> PAGE_FRAME_L48_WIDTH_BITS) <<
+ 		(frame_addr_seq++ * PAGE_FRAME_H4_WIDTH_BITS);
+diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+index f2085340a1cfeb..fceb4abea2365d 100644
+--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
++++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+@@ -821,14 +821,13 @@ nfp_net_prepare_vector(struct nfp_net *nn, struct nfp_net_r_vector *r_vec,
+ 
+ 	snprintf(r_vec->name, sizeof(r_vec->name),
+ 		 "%s-rxtx-%d", nfp_net_name(nn), idx);
+-	err = request_irq(r_vec->irq_vector, r_vec->handler, 0, r_vec->name,
+-			  r_vec);
++	err = request_irq(r_vec->irq_vector, r_vec->handler, IRQF_NO_AUTOEN,
++			  r_vec->name, r_vec);
+ 	if (err) {
+ 		nfp_net_napi_del(&nn->dp, r_vec);
+ 		nn_err(nn, "Error requesting IRQ %d\n", r_vec->irq_vector);
+ 		return err;
+ 	}
+-	disable_irq(r_vec->irq_vector);
+ 
+ 	irq_set_affinity_hint(r_vec->irq_vector, &r_vec->affinity_mask);
+ 
+diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
+index 8a732edac15a02..b499d8ea6d216f 100644
+--- a/drivers/net/ethernet/realtek/r8169_main.c
++++ b/drivers/net/ethernet/realtek/r8169_main.c
+@@ -566,7 +566,34 @@ struct rtl8169_counters {
+ 	__le64	rx_broadcast;
+ 	__le32	rx_multicast;
+ 	__le16	tx_aborted;
+-	__le16	tx_underun;
++	__le16	tx_underrun;
++	/* new since RTL8125 */
++	__le64 tx_octets;
++	__le64 rx_octets;
++	__le64 rx_multicast64;
++	__le64 tx_unicast64;
++	__le64 tx_broadcast64;
++	__le64 tx_multicast64;
++	__le32 tx_pause_on;
++	__le32 tx_pause_off;
++	__le32 tx_pause_all;
++	__le32 tx_deferred;
++	__le32 tx_late_collision;
++	__le32 tx_all_collision;
++	__le32 tx_aborted32;
++	__le32 align_errors32;
++	__le32 rx_frame_too_long;
++	__le32 rx_runt;
++	__le32 rx_pause_on;
++	__le32 rx_pause_off;
++	__le32 rx_pause_all;
++	__le32 rx_unknown_opcode;
++	__le32 rx_mac_error;
++	__le32 tx_underrun32;
++	__le32 rx_mac_missed;
++	__le32 rx_tcam_dropped;
++	__le32 tdu;
++	__le32 rdu;
+ };
+ 
+ struct rtl8169_tc_offsets {
+@@ -1726,7 +1753,7 @@ static void rtl8169_get_ethtool_stats(struct net_device *dev,
+ 	data[9] = le64_to_cpu(counters->rx_broadcast);
+ 	data[10] = le32_to_cpu(counters->rx_multicast);
+ 	data[11] = le16_to_cpu(counters->tx_aborted);
+-	data[12] = le16_to_cpu(counters->tx_underun);
++	data[12] = le16_to_cpu(counters->tx_underrun);
+ }
+ 
+ static void rtl8169_get_strings(struct net_device *dev, u32 stringset, u8 *data)
+diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+index bf99495b51a9c5..a9837985a483d8 100644
+--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
++++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+@@ -14,6 +14,7 @@
+ #include <linux/slab.h>
+ #include <linux/ethtool.h>
+ #include <linux/io.h>
++#include <linux/iopoll.h>
+ #include "stmmac.h"
+ #include "stmmac_pcs.h"
+ #include "dwmac4.h"
+@@ -475,7 +476,7 @@ static int dwmac4_write_vlan_filter(struct net_device *dev,
+ 				    u8 index, u32 data)
+ {
+ 	void __iomem *ioaddr = (void __iomem *)dev->base_addr;
+-	int i, timeout = 10;
++	int ret;
+ 	u32 val;
+ 
+ 	if (index >= hw->num_vlan)
+@@ -491,16 +492,15 @@ static int dwmac4_write_vlan_filter(struct net_device *dev,
+ 
+ 	writel(val, ioaddr + GMAC_VLAN_TAG);
+ 
+-	for (i = 0; i < timeout; i++) {
+-		val = readl(ioaddr + GMAC_VLAN_TAG);
+-		if (!(val & GMAC_VLAN_TAG_CTRL_OB))
+-			return 0;
+-		udelay(1);
++	ret = readl_poll_timeout(ioaddr + GMAC_VLAN_TAG, val,
++				 !(val & GMAC_VLAN_TAG_CTRL_OB),
++				 1000, 500000);
++	if (ret) {
++		netdev_err(dev, "Timeout accessing MAC_VLAN_Tag_Filter\n");
++		return -EBUSY;
+ 	}
+ 
+-	netdev_err(dev, "Timeout accessing MAC_VLAN_Tag_Filter\n");
+-
+-	return -EBUSY;
++	return 0;
+ }
+ 
+ static int dwmac4_add_hw_vlan_rx_fltr(struct net_device *dev,
+diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+index b8c93b881a6533..85a55f459af018 100644
+--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+@@ -248,6 +248,8 @@ struct stmmac_priv {
+ 	struct stmmac_extra_stats xstats ____cacheline_aligned_in_smp;
+ 	struct stmmac_safety_stats sstats;
+ 	struct plat_stmmacenet_data *plat;
++	/* Protect est parameters */
++	struct mutex est_lock;
+ 	struct dma_features dma_cap;
+ 	struct stmmac_counters mmc;
+ 	int hw_cap_support;
+diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
+index 3d7825cb30bb1d..a04bb2e42c4ee1 100644
+--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
+@@ -70,11 +70,11 @@ static int stmmac_adjust_time(struct ptp_clock_info *ptp, s64 delta)
+ 	/* If EST is enabled, disabled it before adjust ptp time. */
+ 	if (priv->plat->est && priv->plat->est->enable) {
+ 		est_rst = true;
+-		mutex_lock(&priv->plat->est->lock);
++		mutex_lock(&priv->est_lock);
+ 		priv->plat->est->enable = false;
+ 		stmmac_est_configure(priv, priv->ioaddr, priv->plat->est,
+ 				     priv->plat->clk_ptp_rate);
+-		mutex_unlock(&priv->plat->est->lock);
++		mutex_unlock(&priv->est_lock);
+ 	}
+ 
+ 	write_lock_irqsave(&priv->ptp_lock, flags);
+@@ -87,7 +87,7 @@ static int stmmac_adjust_time(struct ptp_clock_info *ptp, s64 delta)
+ 		ktime_t current_time_ns, basetime;
+ 		u64 cycle_time;
+ 
+-		mutex_lock(&priv->plat->est->lock);
++		mutex_lock(&priv->est_lock);
+ 		priv->ptp_clock_ops.gettime64(&priv->ptp_clock_ops, &current_time);
+ 		current_time_ns = timespec64_to_ktime(current_time);
+ 		time.tv_nsec = priv->plat->est->btr_reserve[0];
+@@ -104,7 +104,7 @@ static int stmmac_adjust_time(struct ptp_clock_info *ptp, s64 delta)
+ 		priv->plat->est->enable = true;
+ 		ret = stmmac_est_configure(priv, priv->ioaddr, priv->plat->est,
+ 					   priv->plat->clk_ptp_rate);
+-		mutex_unlock(&priv->plat->est->lock);
++		mutex_unlock(&priv->est_lock);
+ 		if (ret)
+ 			netdev_err(priv->dev, "failed to configure EST\n");
+ 	}
+diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
+index 77245f856dd0e3..97ff2dd8f2aecd 100644
+--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
+@@ -396,6 +396,7 @@ static int tc_setup_cbs(struct stmmac_priv *priv,
+ 			return ret;
+ 
+ 		priv->plat->tx_queues_cfg[queue].mode_to_use = MTL_QUEUE_DCB;
++		return 0;
+ 	}
+ 
+ 	/* Final adjustments for HW */
+@@ -983,17 +984,19 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
+ 		if (!plat->est)
+ 			return -ENOMEM;
+ 
+-		mutex_init(&priv->plat->est->lock);
++		mutex_init(&priv->est_lock);
+ 	} else {
++		mutex_lock(&priv->est_lock);
+ 		memset(plat->est, 0, sizeof(*plat->est));
++		mutex_unlock(&priv->est_lock);
+ 	}
+ 
+ 	size = qopt->num_entries;
+ 
+-	mutex_lock(&priv->plat->est->lock);
++	mutex_lock(&priv->est_lock);
+ 	priv->plat->est->gcl_size = size;
+ 	priv->plat->est->enable = qopt->cmd == TAPRIO_CMD_REPLACE;
+-	mutex_unlock(&priv->plat->est->lock);
++	mutex_unlock(&priv->est_lock);
+ 
+ 	for (i = 0; i < size; i++) {
+ 		s64 delta_ns = qopt->entries[i].interval;
+@@ -1024,7 +1027,7 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
+ 		priv->plat->est->gcl[i] = delta_ns | (gates << wid);
+ 	}
+ 
+-	mutex_lock(&priv->plat->est->lock);
++	mutex_lock(&priv->est_lock);
+ 	/* Adjust for real system time */
+ 	priv->ptp_clock_ops.gettime64(&priv->ptp_clock_ops, &current_time);
+ 	current_time_ns = timespec64_to_ktime(current_time);
+@@ -1043,7 +1046,7 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
+ 	priv->plat->est->ctr[1] = (u32)ctr;
+ 
+ 	if (fpe && !priv->dma_cap.fpesel) {
+-		mutex_unlock(&priv->plat->est->lock);
++		mutex_unlock(&priv->est_lock);
+ 		return -EOPNOTSUPP;
+ 	}
+ 
+@@ -1054,7 +1057,7 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
+ 
+ 	ret = stmmac_est_configure(priv, priv->ioaddr, priv->plat->est,
+ 				   priv->plat->clk_ptp_rate);
+-	mutex_unlock(&priv->plat->est->lock);
++	mutex_unlock(&priv->est_lock);
+ 	if (ret) {
+ 		netdev_err(priv->dev, "failed to configure EST\n");
+ 		goto disable;
+@@ -1071,11 +1074,11 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
+ 
+ disable:
+ 	if (priv->plat->est) {
+-		mutex_lock(&priv->plat->est->lock);
++		mutex_lock(&priv->est_lock);
+ 		priv->plat->est->enable = false;
+ 		stmmac_est_configure(priv, priv->ioaddr, priv->plat->est,
+ 				     priv->plat->clk_ptp_rate);
+-		mutex_unlock(&priv->plat->est->lock);
++		mutex_unlock(&priv->est_lock);
+ 	}
+ 
+ 	priv->plat->fpe_cfg->enable = false;
+diff --git a/drivers/net/ieee802154/Kconfig b/drivers/net/ieee802154/Kconfig
+index 95da876c561384..1075e24b11defc 100644
+--- a/drivers/net/ieee802154/Kconfig
++++ b/drivers/net/ieee802154/Kconfig
+@@ -101,6 +101,7 @@ config IEEE802154_CA8210_DEBUGFS
+ 
+ config IEEE802154_MCR20A
+ 	tristate "MCR20A transceiver driver"
++	select REGMAP_SPI
+ 	depends on IEEE802154_DRIVERS && MAC802154
+ 	depends on SPI
+ 	help
+diff --git a/drivers/net/ieee802154/mcr20a.c b/drivers/net/ieee802154/mcr20a.c
+index 87abe3b46316e4..bab92f19c4f48e 100644
+--- a/drivers/net/ieee802154/mcr20a.c
++++ b/drivers/net/ieee802154/mcr20a.c
+@@ -1303,16 +1303,13 @@ mcr20a_probe(struct spi_device *spi)
+ 		irq_type = IRQF_TRIGGER_FALLING;
+ 
+ 	ret = devm_request_irq(&spi->dev, spi->irq, mcr20a_irq_isr,
+-			       irq_type, dev_name(&spi->dev), lp);
++			       irq_type | IRQF_NO_AUTOEN, dev_name(&spi->dev), lp);
+ 	if (ret) {
+ 		dev_err(&spi->dev, "could not request_irq for mcr20a\n");
+ 		ret = -ENODEV;
+ 		goto free_dev;
+ 	}
+ 
+-	/* disable_irq by default and wait for starting hardware */
+-	disable_irq(spi->irq);
+-
+ 	ret = ieee802154_register_hw(hw);
+ 	if (ret) {
+ 		dev_crit(&spi->dev, "ieee802154_register_hw failed\n");
+diff --git a/drivers/net/pcs/pcs-xpcs-wx.c b/drivers/net/pcs/pcs-xpcs-wx.c
+index 19c75886f070ea..5f5cd3596cb846 100644
+--- a/drivers/net/pcs/pcs-xpcs-wx.c
++++ b/drivers/net/pcs/pcs-xpcs-wx.c
+@@ -109,7 +109,7 @@ static void txgbe_pma_config_1g(struct dw_xpcs *xpcs)
+ 	txgbe_write_pma(xpcs, TXGBE_DFE_TAP_CTL0, 0);
+ 	val = txgbe_read_pma(xpcs, TXGBE_RX_GEN_CTL3);
+ 	val = u16_replace_bits(val, 0x4, TXGBE_RX_GEN_CTL3_LOS_TRSHLD0);
+-	txgbe_write_pma(xpcs, TXGBE_RX_EQ_ATTN_CTL, val);
++	txgbe_write_pma(xpcs, TXGBE_RX_GEN_CTL3, val);
+ 
+ 	txgbe_write_pma(xpcs, TXGBE_MPLLA_CTL0, 0x20);
+ 	txgbe_write_pma(xpcs, TXGBE_MPLLA_CTL3, 0x46);
+diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
+index 370c84f393759a..90f1cfbc7c50b3 100644
+--- a/drivers/net/ppp/ppp_generic.c
++++ b/drivers/net/ppp/ppp_generic.c
+@@ -2269,7 +2269,7 @@ static bool ppp_channel_bridge_input(struct channel *pch, struct sk_buff *skb)
+ 	if (!pchb)
+ 		goto out_rcu;
+ 
+-	spin_lock(&pchb->downl);
++	spin_lock_bh(&pchb->downl);
+ 	if (!pchb->chan) {
+ 		/* channel got unregistered */
+ 		kfree_skb(skb);
+@@ -2281,7 +2281,7 @@ static bool ppp_channel_bridge_input(struct channel *pch, struct sk_buff *skb)
+ 		kfree_skb(skb);
+ 
+ outl:
+-	spin_unlock(&pchb->downl);
++	spin_unlock_bh(&pchb->downl);
+ out_rcu:
+ 	rcu_read_unlock();
+ 
+diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
+index b90dccdc2d33cd..27761a884dc627 100644
+--- a/drivers/net/vrf.c
++++ b/drivers/net/vrf.c
+@@ -628,7 +628,9 @@ static void vrf_finish_direct(struct sk_buff *skb)
+ 		eth_zero_addr(eth->h_dest);
+ 		eth->h_proto = skb->protocol;
+ 
++		rcu_read_lock_bh();
+ 		dev_queue_xmit_nit(skb, vrf_dev);
++		rcu_read_unlock_bh();
+ 
+ 		skb_pull(skb, ETH_HLEN);
+ 	}
+diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c
+index b3499f966a9d6a..a4d56136f42f7e 100644
+--- a/drivers/net/wireless/ath/ath11k/dp_rx.c
++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c
+@@ -2700,7 +2700,7 @@ int ath11k_dp_process_rx(struct ath11k_base *ab, int ring_id,
+ 		if (unlikely(push_reason !=
+ 			     HAL_REO_DEST_RING_PUSH_REASON_ROUTING_INSTRUCTION)) {
+ 			dev_kfree_skb_any(msdu);
+-			ab->soc_stats.hal_reo_error[dp->reo_dst_ring[ring_id].ring_id]++;
++			ab->soc_stats.hal_reo_error[ring_id]++;
+ 			continue;
+ 		}
+ 
+diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.c b/drivers/net/wireless/ath/ath12k/dp_rx.c
+index d9bc07844fb719..70ad035acac755 100644
+--- a/drivers/net/wireless/ath/ath12k/dp_rx.c
++++ b/drivers/net/wireless/ath/ath12k/dp_rx.c
+@@ -2670,7 +2670,7 @@ int ath12k_dp_rx_process(struct ath12k_base *ab, int ring_id,
+ 		if (push_reason !=
+ 		    HAL_REO_DEST_RING_PUSH_REASON_ROUTING_INSTRUCTION) {
+ 			dev_kfree_skb_any(msdu);
+-			ab->soc_stats.hal_reo_error[dp->reo_dst_ring[ring_id].ring_id]++;
++			ab->soc_stats.hal_reo_error[ring_id]++;
+ 			continue;
+ 		}
+ 
+diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
+index 808fb6747a7f78..7791f4df6d4840 100644
+--- a/drivers/net/wireless/ath/ath9k/debug.c
++++ b/drivers/net/wireless/ath/ath9k/debug.c
+@@ -1325,11 +1325,11 @@ void ath9k_get_et_stats(struct ieee80211_hw *hw,
+ 	struct ath_softc *sc = hw->priv;
+ 	int i = 0;
+ 
+-	data[i++] = (sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_BE)].tx_pkts_all +
++	data[i++] = ((u64)sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_BE)].tx_pkts_all +
+ 		     sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_BK)].tx_pkts_all +
+ 		     sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_VI)].tx_pkts_all +
+ 		     sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_VO)].tx_pkts_all);
+-	data[i++] = (sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_BE)].tx_bytes_all +
++	data[i++] = ((u64)sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_BE)].tx_bytes_all +
+ 		     sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_BK)].tx_bytes_all +
+ 		     sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_VI)].tx_bytes_all +
+ 		     sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_VO)].tx_bytes_all);
+diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
+index e5414435b14140..ab728a70ed2796 100644
+--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
++++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
+@@ -716,8 +716,7 @@ static void ath9k_hif_usb_rx_cb(struct urb *urb)
+ 	}
+ 
+ resubmit:
+-	skb_reset_tail_pointer(skb);
+-	skb_trim(skb, 0);
++	__skb_set_length(skb, 0);
+ 
+ 	usb_anchor_urb(urb, &hif_dev->rx_submitted);
+ 	ret = usb_submit_urb(urb, GFP_ATOMIC);
+@@ -754,8 +753,7 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb)
+ 	case -ESHUTDOWN:
+ 		goto free_skb;
+ 	default:
+-		skb_reset_tail_pointer(skb);
+-		skb_trim(skb, 0);
++		__skb_set_length(skb, 0);
+ 
+ 		goto resubmit;
+ 	}
+diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
+index 93078f8cc08c03..af487a2738f826 100644
+--- a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
++++ b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
+@@ -1123,6 +1123,19 @@ struct iwl_umac_scan_abort {
+ 	__le32 flags;
+ } __packed; /* SCAN_ABORT_CMD_UMAC_API_S_VER_1 */
+ 
++/**
++ * enum iwl_umac_scan_abort_status
++ *
++ * @IWL_UMAC_SCAN_ABORT_STATUS_SUCCESS: scan was successfully aborted
++ * @IWL_UMAC_SCAN_ABORT_STATUS_IN_PROGRESS: scan abort is in progress
++ * @IWL_UMAC_SCAN_ABORT_STATUS_NOT_FOUND: nothing to abort
++ */
++enum iwl_umac_scan_abort_status {
++	IWL_UMAC_SCAN_ABORT_STATUS_SUCCESS = 0,
++	IWL_UMAC_SCAN_ABORT_STATUS_IN_PROGRESS,
++	IWL_UMAC_SCAN_ABORT_STATUS_NOT_FOUND,
++};
++
+ /**
+  * struct iwl_umac_scan_complete
+  * @uid: scan id, &enum iwl_umac_scan_uid_offsets
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+index d2daea3b1f38ad..2d35a8865d00b3 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+@@ -766,20 +766,10 @@ void iwl_mvm_mac_tx(struct ieee80211_hw *hw,
+ 	if (ieee80211_is_mgmt(hdr->frame_control))
+ 		sta = NULL;
+ 
+-	/* If there is no sta, and it's not offchannel - send through AP */
++	/* this shouldn't even happen: just drop */
+ 	if (!sta && info->control.vif->type == NL80211_IFTYPE_STATION &&
+-	    !offchannel) {
+-		struct iwl_mvm_vif *mvmvif =
+-			iwl_mvm_vif_from_mac80211(info->control.vif);
+-		u8 ap_sta_id = READ_ONCE(mvmvif->deflink.ap_sta_id);
+-
+-		if (ap_sta_id < mvm->fw->ucode_capa.num_stations) {
+-			/* mac80211 holds rcu read lock */
+-			sta = rcu_dereference(mvm->fw_id_to_mac_id[ap_sta_id]);
+-			if (IS_ERR_OR_NULL(sta))
+-				goto drop;
+-		}
+-	}
++	    !offchannel)
++		goto drop;
+ 
+ 	if (tmp_sta && !sta && link_id != IEEE80211_LINK_UNSPECIFIED &&
+ 	    !ieee80211_is_probe_resp(hdr->frame_control)) {
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c
+index fe4b39b19a6128..7c9234929b4f1b 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c
+@@ -141,7 +141,7 @@ static void iwl_mvm_mld_update_sta_key(struct ieee80211_hw *hw,
+ 	if (sta != data->sta || key->link_id >= 0)
+ 		return;
+ 
+-	err = iwl_mvm_send_cmd_pdu(mvm, cmd_id, CMD_ASYNC, sizeof(cmd), &cmd);
++	err = iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0, sizeof(cmd), &cmd);
+ 
+ 	if (err)
+ 		data->err = err;
+@@ -159,8 +159,8 @@ int iwl_mvm_mld_update_sta_keys(struct iwl_mvm *mvm,
+ 		.new_sta_mask = new_sta_mask,
+ 	};
+ 
+-	ieee80211_iter_keys_rcu(mvm->hw, vif, iwl_mvm_mld_update_sta_key,
+-				&data);
++	ieee80211_iter_keys(mvm->hw, vif, iwl_mvm_mld_update_sta_key,
++			    &data);
+ 	return data.err;
+ }
+ 
+@@ -384,7 +384,7 @@ void iwl_mvm_sec_key_remove_ap(struct iwl_mvm *mvm,
+ 	if (!sec_key_ver)
+ 		return;
+ 
+-	ieee80211_iter_keys_rcu(mvm->hw, vif,
+-				iwl_mvm_sec_key_remove_ap_iter,
+-				(void *)(uintptr_t)link_id);
++	ieee80211_iter_keys(mvm->hw, vif,
++			    iwl_mvm_sec_key_remove_ap_iter,
++			    (void *)(uintptr_t)link_id);
+ }
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+index 626620cd892f00..ded06602f6ced3 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+@@ -3222,13 +3222,23 @@ void iwl_mvm_rx_umac_scan_iter_complete_notif(struct iwl_mvm *mvm,
+ 		       mvm->scan_start);
+ }
+ 
+-static int iwl_mvm_umac_scan_abort(struct iwl_mvm *mvm, int type)
++static int iwl_mvm_umac_scan_abort(struct iwl_mvm *mvm, int type, bool *wait)
+ {
+-	struct iwl_umac_scan_abort cmd = {};
++	struct iwl_umac_scan_abort abort_cmd = {};
++	struct iwl_host_cmd cmd = {
++		.id = WIDE_ID(IWL_ALWAYS_LONG_GROUP, SCAN_ABORT_UMAC),
++		.len = { sizeof(abort_cmd), },
++		.data = { &abort_cmd, },
++		.flags = CMD_SEND_IN_RFKILL,
++	};
++
+ 	int uid, ret;
++	u32 status = IWL_UMAC_SCAN_ABORT_STATUS_NOT_FOUND;
+ 
+ 	lockdep_assert_held(&mvm->mutex);
+ 
++	*wait = true;
++
+ 	/* We should always get a valid index here, because we already
+ 	 * checked that this type of scan was running in the generic
+ 	 * code.
+@@ -3237,17 +3247,28 @@ static int iwl_mvm_umac_scan_abort(struct iwl_mvm *mvm, int type)
+ 	if (WARN_ON_ONCE(uid < 0))
+ 		return uid;
+ 
+-	cmd.uid = cpu_to_le32(uid);
++	abort_cmd.uid = cpu_to_le32(uid);
+ 
+ 	IWL_DEBUG_SCAN(mvm, "Sending scan abort, uid %u\n", uid);
+ 
+-	ret = iwl_mvm_send_cmd_pdu(mvm,
+-				   WIDE_ID(IWL_ALWAYS_LONG_GROUP, SCAN_ABORT_UMAC),
+-				   CMD_SEND_IN_RFKILL, sizeof(cmd), &cmd);
++	ret = iwl_mvm_send_cmd_status(mvm, &cmd, &status);
++
++	IWL_DEBUG_SCAN(mvm, "Scan abort: ret=%d, status=%u\n", ret, status);
+ 	if (!ret)
+ 		mvm->scan_uid_status[uid] = type << IWL_MVM_SCAN_STOPPING_SHIFT;
+ 
+-	IWL_DEBUG_SCAN(mvm, "Scan abort: ret=%d\n", ret);
++	/* Handle the case that the FW is no longer familiar with the scan that
++	 * is to be stopped. In such a case, it is expected that the scan
++	 * complete notification was already received but not yet processed.
++	 * In such a case, there is no need to wait for a scan complete
++	 * notification and the flow should continue similar to the case that
++	 * the scan was really aborted.
++	 */
++	if (status == IWL_UMAC_SCAN_ABORT_STATUS_NOT_FOUND) {
++		mvm->scan_uid_status[uid] = type << IWL_MVM_SCAN_STOPPING_SHIFT;
++		*wait = false;
++	}
++
+ 	return ret;
+ }
+ 
+@@ -3257,6 +3278,7 @@ static int iwl_mvm_scan_stop_wait(struct iwl_mvm *mvm, int type)
+ 	static const u16 scan_done_notif[] = { SCAN_COMPLETE_UMAC,
+ 					      SCAN_OFFLOAD_COMPLETE, };
+ 	int ret;
++	bool wait = true;
+ 
+ 	lockdep_assert_held(&mvm->mutex);
+ 
+@@ -3268,7 +3290,7 @@ static int iwl_mvm_scan_stop_wait(struct iwl_mvm *mvm, int type)
+ 	IWL_DEBUG_SCAN(mvm, "Preparing to stop scan, type %x\n", type);
+ 
+ 	if (fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_UMAC_SCAN))
+-		ret = iwl_mvm_umac_scan_abort(mvm, type);
++		ret = iwl_mvm_umac_scan_abort(mvm, type, &wait);
+ 	else
+ 		ret = iwl_mvm_lmac_scan_abort(mvm);
+ 
+@@ -3276,6 +3298,10 @@ static int iwl_mvm_scan_stop_wait(struct iwl_mvm *mvm, int type)
+ 		IWL_DEBUG_SCAN(mvm, "couldn't stop scan type %d\n", type);
+ 		iwl_remove_notification(&mvm->notif_wait, &wait_scan_done);
+ 		return ret;
++	} else if (!wait) {
++		IWL_DEBUG_SCAN(mvm, "no need to wait for scan type %d\n", type);
++		iwl_remove_notification(&mvm->notif_wait, &wait_scan_done);
++		return 0;
+ 	}
+ 
+ 	return iwl_wait_notification(&mvm->notif_wait, &wait_scan_done,
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+index 3adb1acc071918..ce5f2bdde13888 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+@@ -1145,6 +1145,9 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,
+ 	bool is_ampdu = false;
+ 	int hdrlen;
+ 
++	if (WARN_ON_ONCE(!sta))
++		return -1;
++
+ 	mvmsta = iwl_mvm_sta_from_mac80211(sta);
+ 	fc = hdr->frame_control;
+ 	hdrlen = ieee80211_hdrlen(fc);
+@@ -1152,9 +1155,6 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,
+ 	if (IWL_MVM_NON_TRANSMITTING_AP && ieee80211_is_probe_resp(fc))
+ 		return -1;
+ 
+-	if (WARN_ON_ONCE(!mvmsta))
+-		return -1;
+-
+ 	if (WARN_ON_ONCE(mvmsta->deflink.sta_id == IWL_MVM_INVALID_STA))
+ 		return -1;
+ 
+@@ -1285,7 +1285,7 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,
+ int iwl_mvm_tx_skb_sta(struct iwl_mvm *mvm, struct sk_buff *skb,
+ 		       struct ieee80211_sta *sta)
+ {
+-	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
++	struct iwl_mvm_sta *mvmsta;
+ 	struct ieee80211_tx_info info;
+ 	struct sk_buff_head mpdus_skbs;
+ 	struct ieee80211_vif *vif;
+@@ -1294,9 +1294,11 @@ int iwl_mvm_tx_skb_sta(struct iwl_mvm *mvm, struct sk_buff *skb,
+ 	struct sk_buff *orig_skb = skb;
+ 	const u8 *addr3;
+ 
+-	if (WARN_ON_ONCE(!mvmsta))
++	if (WARN_ON_ONCE(!sta))
+ 		return -1;
+ 
++	mvmsta = iwl_mvm_sta_from_mac80211(sta);
++
+ 	if (WARN_ON_ONCE(mvmsta->deflink.sta_id == IWL_MVM_INVALID_STA))
+ 		return -1;
+ 
+diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
+index 62f3c9a52a1d5c..a3be37526697b4 100644
+--- a/drivers/net/wireless/marvell/mwifiex/fw.h
++++ b/drivers/net/wireless/marvell/mwifiex/fw.h
+@@ -1587,7 +1587,7 @@ struct host_cmd_ds_802_11_scan_rsp {
+ 
+ struct host_cmd_ds_802_11_scan_ext {
+ 	u32   reserved;
+-	u8    tlv_buffer[1];
++	u8    tlv_buffer[];
+ } __packed;
+ 
+ struct mwifiex_ie_types_bss_mode {
+diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c
+index 72904c275461e6..5be817d9854a68 100644
+--- a/drivers/net/wireless/marvell/mwifiex/scan.c
++++ b/drivers/net/wireless/marvell/mwifiex/scan.c
+@@ -2543,8 +2543,7 @@ int mwifiex_ret_802_11_scan_ext(struct mwifiex_private *priv,
+ 	ext_scan_resp = &resp->params.ext_scan;
+ 
+ 	tlv = (void *)ext_scan_resp->tlv_buffer;
+-	buf_left = le16_to_cpu(resp->size) - (sizeof(*ext_scan_resp) + S_DS_GEN
+-					      - 1);
++	buf_left = le16_to_cpu(resp->size) - (sizeof(*ext_scan_resp) + S_DS_GEN);
+ 
+ 	while (buf_left >= sizeof(struct mwifiex_ie_types_header)) {
+ 		type = le16_to_cpu(tlv->type);
+diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+index e6af7318a9e38a..5ff260319282c6 100644
+--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
++++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+@@ -388,6 +388,7 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
+ 	ieee80211_hw_set(hw, SUPPORTS_RX_DECAP_OFFLOAD);
+ 	ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);
+ 	ieee80211_hw_set(hw, WANT_MONITOR_VIF);
++	ieee80211_hw_set(hw, SUPPORTS_TX_FRAG);
+ 
+ 	hw->max_tx_fragments = 4;
+ 
+diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+index 2222fb9aa103ef..38d27f87217336 100644
+--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
++++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+@@ -1538,12 +1538,14 @@ void mt7915_mac_reset_work(struct work_struct *work)
+ 		set_bit(MT76_RESET, &phy2->mt76->state);
+ 		cancel_delayed_work_sync(&phy2->mt76->mac_work);
+ 	}
++
++	mutex_lock(&dev->mt76.mutex);
++
+ 	mt76_worker_disable(&dev->mt76.tx_worker);
+ 	mt76_for_each_q_rx(&dev->mt76, i)
+ 		napi_disable(&dev->mt76.napi[i]);
+ 	napi_disable(&dev->mt76.tx_napi);
+ 
+-	mutex_lock(&dev->mt76.mutex);
+ 
+ 	mt76_wr(dev, MT_MCU_INT_EVENT, MT_MCU_INT_EVENT_DMA_STOPPED);
+ 
+diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+index 27655dcb791427..4fd5fd555191a4 100644
+--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
++++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+@@ -1561,6 +1561,12 @@ mt7915_twt_teardown_request(struct ieee80211_hw *hw,
+ 	mutex_unlock(&dev->mt76.mutex);
+ }
+ 
++static int
++mt7915_set_frag_threshold(struct ieee80211_hw *hw, u32 val)
++{
++	return 0;
++}
++
+ static int
+ mt7915_set_radar_background(struct ieee80211_hw *hw,
+ 			    struct cfg80211_chan_def *chandef)
+@@ -1687,6 +1693,7 @@ const struct ieee80211_ops mt7915_ops = {
+ 	.sta_set_decap_offload = mt7915_sta_set_decap_offload,
+ 	.add_twt_setup = mt7915_mac_add_twt_setup,
+ 	.twt_teardown_request = mt7915_twt_teardown_request,
++	.set_frag_threshold = mt7915_set_frag_threshold,
+ 	CFG80211_TESTMODE_CMD(mt76_testmode_cmd)
+ 	CFG80211_TESTMODE_DUMP(mt76_testmode_dump)
+ #ifdef CONFIG_MAC80211_DEBUGFS
+diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+index 272e55ef8e2d29..5fba103bfd65d5 100644
+--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
++++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+@@ -688,13 +688,17 @@ int mt7915_mcu_add_tx_ba(struct mt7915_dev *dev,
+ {
+ 	struct mt7915_sta *msta = (struct mt7915_sta *)params->sta->drv_priv;
+ 	struct mt7915_vif *mvif = msta->vif;
++	int ret;
+ 
++	mt76_worker_disable(&dev->mt76.tx_worker);
+ 	if (enable && !params->amsdu)
+ 		msta->wcid.amsdu = false;
++	ret = mt76_connac_mcu_sta_ba(&dev->mt76, &mvif->mt76, params,
++				     MCU_EXT_CMD(STA_REC_UPDATE),
++				     enable, true);
++	mt76_worker_enable(&dev->mt76.tx_worker);
+ 
+-	return mt76_connac_mcu_sta_ba(&dev->mt76, &mvif->mt76, params,
+-				      MCU_EXT_CMD(STA_REC_UPDATE),
+-				      enable, true);
++	return ret;
+ }
+ 
+ int mt7915_mcu_add_rx_ba(struct mt7915_dev *dev,
+diff --git a/drivers/net/wireless/realtek/rtw88/Kconfig b/drivers/net/wireless/realtek/rtw88/Kconfig
+index cffad1c012499e..2af2bc613458d4 100644
+--- a/drivers/net/wireless/realtek/rtw88/Kconfig
++++ b/drivers/net/wireless/realtek/rtw88/Kconfig
+@@ -12,6 +12,7 @@ if RTW88
+ 
+ config RTW88_CORE
+ 	tristate
++	select WANT_DEV_COREDUMP
+ 
+ config RTW88_PCI
+ 	tristate
+diff --git a/drivers/net/wireless/realtek/rtw89/mac80211.c b/drivers/net/wireless/realtek/rtw89/mac80211.c
+index 487d79938bc716..5b9de1f41dc780 100644
+--- a/drivers/net/wireless/realtek/rtw89/mac80211.c
++++ b/drivers/net/wireless/realtek/rtw89/mac80211.c
+@@ -126,7 +126,9 @@ static int rtw89_ops_add_interface(struct ieee80211_hw *hw,
+ 	rtwvif->rtwdev = rtwdev;
+ 	rtwvif->roc.state = RTW89_ROC_IDLE;
+ 	rtwvif->offchan = false;
+-	list_add_tail(&rtwvif->list, &rtwdev->rtwvifs_list);
++	if (!rtw89_rtwvif_in_list(rtwdev, rtwvif))
++		list_add_tail(&rtwvif->list, &rtwdev->rtwvifs_list);
++
+ 	INIT_WORK(&rtwvif->update_beacon_work, rtw89_core_update_beacon_work);
+ 	INIT_DELAYED_WORK(&rtwvif->roc.roc_work, rtw89_roc_work);
+ 	rtw89_leave_ps_mode(rtwdev);
+diff --git a/drivers/net/wireless/realtek/rtw89/phy.c b/drivers/net/wireless/realtek/rtw89/phy.c
+index 7139146cb3fad2..fac83b718a30cd 100644
+--- a/drivers/net/wireless/realtek/rtw89/phy.c
++++ b/drivers/net/wireless/realtek/rtw89/phy.c
+@@ -284,8 +284,8 @@ static void rtw89_phy_ra_sta_update(struct rtw89_dev *rtwdev,
+ 		csi_mode = RTW89_RA_RPT_MODE_HT;
+ 		ra_mask |= ((u64)sta->deflink.ht_cap.mcs.rx_mask[3] << 48) |
+ 			   ((u64)sta->deflink.ht_cap.mcs.rx_mask[2] << 36) |
+-			   (sta->deflink.ht_cap.mcs.rx_mask[1] << 24) |
+-			   (sta->deflink.ht_cap.mcs.rx_mask[0] << 12);
++			   ((u64)sta->deflink.ht_cap.mcs.rx_mask[1] << 24) |
++			   ((u64)sta->deflink.ht_cap.mcs.rx_mask[0] << 12);
+ 		high_rate_masks = rtw89_ra_mask_ht_rates;
+ 		if (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_RX_STBC)
+ 			stbc_en = 1;
+diff --git a/drivers/net/wireless/realtek/rtw89/util.h b/drivers/net/wireless/realtek/rtw89/util.h
+index e2ed4565025dda..d4ee9078a4f48c 100644
+--- a/drivers/net/wireless/realtek/rtw89/util.h
++++ b/drivers/net/wireless/realtek/rtw89/util.h
+@@ -14,6 +14,24 @@
+ #define rtw89_for_each_rtwvif(rtwdev, rtwvif)				       \
+ 	list_for_each_entry(rtwvif, &(rtwdev)->rtwvifs_list, list)
+ 
++/* Before adding rtwvif to list, we need to check if it already exist, beacase
++ * in some case such as SER L2 happen during WoWLAN flow, calling reconfig
++ * twice cause the list to be added twice.
++ */
++static inline bool rtw89_rtwvif_in_list(struct rtw89_dev *rtwdev,
++					struct rtw89_vif *new)
++{
++	struct rtw89_vif *rtwvif;
++
++	lockdep_assert_held(&rtwdev->mutex);
++
++	rtw89_for_each_rtwvif(rtwdev, rtwvif)
++		if (rtwvif == new)
++			return true;
++
++	return false;
++}
++
+ /* The result of negative dividend and positive divisor is undefined, but it
+  * should be one case of round-down or round-up. So, make it round-down if the
+  * result is round-up.
+diff --git a/drivers/net/wwan/qcom_bam_dmux.c b/drivers/net/wwan/qcom_bam_dmux.c
+index 17d46f4d291390..174a9156b3233d 100644
+--- a/drivers/net/wwan/qcom_bam_dmux.c
++++ b/drivers/net/wwan/qcom_bam_dmux.c
+@@ -823,17 +823,17 @@ static int bam_dmux_probe(struct platform_device *pdev)
+ 	ret = devm_request_threaded_irq(dev, pc_ack_irq, NULL, bam_dmux_pc_ack_irq,
+ 					IRQF_ONESHOT, NULL, dmux);
+ 	if (ret)
+-		return ret;
++		goto err_disable_pm;
+ 
+ 	ret = devm_request_threaded_irq(dev, dmux->pc_irq, NULL, bam_dmux_pc_irq,
+ 					IRQF_ONESHOT, NULL, dmux);
+ 	if (ret)
+-		return ret;
++		goto err_disable_pm;
+ 
+ 	ret = irq_get_irqchip_state(dmux->pc_irq, IRQCHIP_STATE_LINE_LEVEL,
+ 				    &dmux->pc_state);
+ 	if (ret)
+-		return ret;
++		goto err_disable_pm;
+ 
+ 	/* Check if remote finished initialization before us */
+ 	if (dmux->pc_state) {
+@@ -844,6 +844,11 @@ static int bam_dmux_probe(struct platform_device *pdev)
+ 	}
+ 
+ 	return 0;
++
++err_disable_pm:
++	pm_runtime_disable(dev);
++	pm_runtime_dont_use_autosuspend(dev);
++	return ret;
+ }
+ 
+ static int bam_dmux_remove(struct platform_device *pdev)
+diff --git a/drivers/net/xen-netback/hash.c b/drivers/net/xen-netback/hash.c
+index ff96f22648efde..45ddce35f6d2c6 100644
+--- a/drivers/net/xen-netback/hash.c
++++ b/drivers/net/xen-netback/hash.c
+@@ -95,7 +95,7 @@ static u32 xenvif_new_hash(struct xenvif *vif, const u8 *data,
+ 
+ static void xenvif_flush_hash(struct xenvif *vif)
+ {
+-	struct xenvif_hash_cache_entry *entry;
++	struct xenvif_hash_cache_entry *entry, *n;
+ 	unsigned long flags;
+ 
+ 	if (xenvif_hash_cache_size == 0)
+@@ -103,8 +103,7 @@ static void xenvif_flush_hash(struct xenvif *vif)
+ 
+ 	spin_lock_irqsave(&vif->hash.cache.lock, flags);
+ 
+-	list_for_each_entry_rcu(entry, &vif->hash.cache.list, link,
+-				lockdep_is_held(&vif->hash.cache.lock)) {
++	list_for_each_entry_safe(entry, n, &vif->hash.cache.list, link) {
+ 		list_del_rcu(&entry->link);
+ 		vif->hash.cache.count--;
+ 		kfree_rcu(entry, rcu);
+diff --git a/drivers/of/address.c b/drivers/of/address.c
+index 3219c51777507a..f323e53816e196 100644
+--- a/drivers/of/address.c
++++ b/drivers/of/address.c
+@@ -8,6 +8,7 @@
+ #include <linux/logic_pio.h>
+ #include <linux/module.h>
+ #include <linux/of_address.h>
++#include <linux/overflow.h>
+ #include <linux/pci.h>
+ #include <linux/pci_regs.h>
+ #include <linux/sizes.h>
+@@ -1142,7 +1143,11 @@ static int __of_address_to_resource(struct device_node *dev, int index, int bar_
+ 	if (of_mmio_is_nonposted(dev))
+ 		flags |= IORESOURCE_MEM_NONPOSTED;
+ 
++	if (overflows_type(taddr, r->start))
++		return -EOVERFLOW;
+ 	r->start = taddr;
++	if (overflows_type(taddr + size - 1, r->end))
++		return -EOVERFLOW;
+ 	r->end = taddr + size - 1;
+ 	r->flags = flags;
+ 	r->name = name ? name : dev->full_name;
+diff --git a/drivers/of/irq.c b/drivers/of/irq.c
+index 8fd63100ba8f08..36351ad6115eb1 100644
+--- a/drivers/of/irq.c
++++ b/drivers/of/irq.c
+@@ -357,8 +357,8 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_ar
+ 	addr = of_get_property(device, "reg", &addr_len);
+ 
+ 	/* Prevent out-of-bounds read in case of longer interrupt parent address size */
+-	if (addr_len > (3 * sizeof(__be32)))
+-		addr_len = 3 * sizeof(__be32);
++	if (addr_len > sizeof(addr_buf))
++		addr_len = sizeof(addr_buf);
+ 	if (addr)
+ 		memcpy(addr_buf, addr, addr_len);
+ 
+@@ -716,8 +716,7 @@ struct irq_domain *of_msi_map_get_device_domain(struct device *dev, u32 id,
+  * @np: device node for @dev
+  * @token: bus type for this domain
+  *
+- * Parse the msi-parent property (both the simple and the complex
+- * versions), and returns the corresponding MSI domain.
++ * Parse the msi-parent property and returns the corresponding MSI domain.
+  *
+  * Returns: the MSI domain for this device (or NULL on failure).
+  */
+@@ -725,33 +724,14 @@ struct irq_domain *of_msi_get_domain(struct device *dev,
+ 				     struct device_node *np,
+ 				     enum irq_domain_bus_token token)
+ {
+-	struct device_node *msi_np;
++	struct of_phandle_iterator it;
+ 	struct irq_domain *d;
++	int err;
+ 
+-	/* Check for a single msi-parent property */
+-	msi_np = of_parse_phandle(np, "msi-parent", 0);
+-	if (msi_np && !of_property_read_bool(msi_np, "#msi-cells")) {
+-		d = irq_find_matching_host(msi_np, token);
+-		if (!d)
+-			of_node_put(msi_np);
+-		return d;
+-	}
+-
+-	if (token == DOMAIN_BUS_PLATFORM_MSI) {
+-		/* Check for the complex msi-parent version */
+-		struct of_phandle_args args;
+-		int index = 0;
+-
+-		while (!of_parse_phandle_with_args(np, "msi-parent",
+-						   "#msi-cells",
+-						   index, &args)) {
+-			d = irq_find_matching_host(args.np, token);
+-			if (d)
+-				return d;
+-
+-			of_node_put(args.np);
+-			index++;
+-		}
++	of_for_each_phandle(&it, err, np, "msi-parent", "#msi-cells", 0) {
++		d = irq_find_matching_host(it.node, token);
++		if (d)
++			return d;
+ 	}
+ 
+ 	return NULL;
+diff --git a/drivers/perf/arm_spe_pmu.c b/drivers/perf/arm_spe_pmu.c
+index d2b0cbf0e0c41e..2bec2e3af0bd62 100644
+--- a/drivers/perf/arm_spe_pmu.c
++++ b/drivers/perf/arm_spe_pmu.c
+@@ -41,7 +41,7 @@
+ 
+ /*
+  * Cache if the event is allowed to trace Context information.
+- * This allows us to perform the check, i.e, perfmon_capable(),
++ * This allows us to perform the check, i.e, perf_allow_kernel(),
+  * in the context of the event owner, once, during the event_init().
+  */
+ #define SPE_PMU_HW_FLAGS_CX			0x00001
+@@ -50,7 +50,7 @@ static_assert((PERF_EVENT_FLAG_ARCH & SPE_PMU_HW_FLAGS_CX) == SPE_PMU_HW_FLAGS_C
+ 
+ static void set_spe_event_has_cx(struct perf_event *event)
+ {
+-	if (IS_ENABLED(CONFIG_PID_IN_CONTEXTIDR) && perfmon_capable())
++	if (IS_ENABLED(CONFIG_PID_IN_CONTEXTIDR) && !perf_allow_kernel(&event->attr))
+ 		event->hw.flags |= SPE_PMU_HW_FLAGS_CX;
+ }
+ 
+@@ -767,9 +767,8 @@ static int arm_spe_pmu_event_init(struct perf_event *event)
+ 
+ 	set_spe_event_has_cx(event);
+ 	reg = arm_spe_event_to_pmscr(event);
+-	if (!perfmon_capable() &&
+-	    (reg & (PMSCR_EL1_PA | PMSCR_EL1_PCT)))
+-		return -EACCES;
++	if (reg & (PMSCR_EL1_PA | PMSCR_EL1_PCT))
++		return perf_allow_kernel(&event->attr);
+ 
+ 	return 0;
+ }
+diff --git a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
+index 1accdaaf282c53..9040a3d39924bb 100644
+--- a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
++++ b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
+@@ -316,7 +316,9 @@ static struct pci_dev *_isst_if_get_pci_dev(int cpu, int bus_no, int dev, int fn
+ 	    cpu >= nr_cpu_ids || cpu >= num_possible_cpus())
+ 		return NULL;
+ 
+-	pkg_id = topology_physical_package_id(cpu);
++	pkg_id = topology_logical_package_id(cpu);
++	if (pkg_id >= topology_max_packages())
++		return NULL;
+ 
+ 	bus_number = isst_cpu_info[cpu].bus_info[bus_no];
+ 	if (bus_number < 0)
+diff --git a/drivers/platform/x86/lenovo-ymc.c b/drivers/platform/x86/lenovo-ymc.c
+index e1fbc35504d498..ef2c267ab485cd 100644
+--- a/drivers/platform/x86/lenovo-ymc.c
++++ b/drivers/platform/x86/lenovo-ymc.c
+@@ -78,6 +78,8 @@ static void lenovo_ymc_trigger_ec(struct wmi_device *wdev, struct lenovo_ymc_pri
+ }
+ 
+ static const struct key_entry lenovo_ymc_keymap[] = {
++	/* Ignore the uninitialized state */
++	{ KE_IGNORE, 0x00 },
+ 	/* Laptop */
+ 	{ KE_SW, 0x01, { .sw = { SW_TABLET_MODE, 0 } } },
+ 	/* Tablet */
+diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c
+index aee869769843f5..2396decdb3cb3f 100644
+--- a/drivers/platform/x86/think-lmi.c
++++ b/drivers/platform/x86/think-lmi.c
+@@ -1021,7 +1021,16 @@ static ssize_t current_value_store(struct kobject *kobj,
+ 		 * Note - this sets the variable and then the password as separate
+ 		 * WMI calls. Function tlmi_save_bios_settings will error if the
+ 		 * password is incorrect.
++		 * Workstation's require the opcode to be set before changing the
++		 * attribute.
+ 		 */
++		if (tlmi_priv.pwd_admin->valid && tlmi_priv.pwd_admin->password[0]) {
++			ret = tlmi_opcode_setting("WmiOpcodePasswordAdmin",
++						  tlmi_priv.pwd_admin->password);
++			if (ret)
++				goto out;
++		}
++
+ 		set_str = kasprintf(GFP_KERNEL, "%s,%s;", setting->display_name,
+ 				    new_setting);
+ 		if (!set_str) {
+@@ -1033,13 +1042,6 @@ static ssize_t current_value_store(struct kobject *kobj,
+ 		if (ret)
+ 			goto out;
+ 
+-		if (tlmi_priv.pwd_admin->valid && tlmi_priv.pwd_admin->password[0]) {
+-			ret = tlmi_opcode_setting("WmiOpcodePasswordAdmin",
+-						  tlmi_priv.pwd_admin->password);
+-			if (ret)
+-				goto out;
+-		}
+-
+ 		ret = tlmi_save_bios_settings("");
+ 	} else { /* old non-opcode based authentication method (deprecated) */
+ 		if (tlmi_priv.pwd_admin->valid && tlmi_priv.pwd_admin->password[0]) {
+diff --git a/drivers/platform/x86/touchscreen_dmi.c b/drivers/platform/x86/touchscreen_dmi.c
+index 06ebab520f2711..30c05a9948319d 100644
+--- a/drivers/platform/x86/touchscreen_dmi.c
++++ b/drivers/platform/x86/touchscreen_dmi.c
+@@ -885,6 +885,21 @@ static const struct ts_dmi_data rwc_nanote_p8_data = {
+ 	.properties = rwc_nanote_p8_props,
+ };
+ 
++static const struct property_entry rwc_nanote_next_props[] = {
++	PROPERTY_ENTRY_U32("touchscreen-min-x", 5),
++	PROPERTY_ENTRY_U32("touchscreen-min-y", 5),
++	PROPERTY_ENTRY_U32("touchscreen-size-x", 1785),
++	PROPERTY_ENTRY_U32("touchscreen-size-y", 1145),
++	PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
++	PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-rwc-nanote-next.fw"),
++	{ }
++};
++
++static const struct ts_dmi_data rwc_nanote_next_data = {
++	.acpi_name = "MSSL1680:00",
++	.properties = rwc_nanote_next_props,
++};
++
+ static const struct property_entry schneider_sct101ctm_props[] = {
+ 	PROPERTY_ENTRY_U32("touchscreen-size-x", 1715),
+ 	PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),
+@@ -1648,6 +1663,17 @@ const struct dmi_system_id touchscreen_dmi_table[] = {
+ 			DMI_MATCH(DMI_PRODUCT_SKU, "0001")
+ 		},
+ 	},
++	{
++		/* RWC NANOTE NEXT */
++		.driver_data = (void *)&rwc_nanote_next_data,
++		.matches = {
++			DMI_MATCH(DMI_PRODUCT_NAME, "To be filled by O.E.M."),
++			DMI_MATCH(DMI_BOARD_NAME, "To be filled by O.E.M."),
++			DMI_MATCH(DMI_BOARD_VENDOR, "To be filled by O.E.M."),
++			/* Above matches are too generic, add bios-version match */
++			DMI_MATCH(DMI_BIOS_VERSION, "S8A70R100-V005"),
++		},
++	},
+ 	{
+ 		/* Schneider SCT101CTM */
+ 		.driver_data = (void *)&schneider_sct101ctm_data,
+diff --git a/drivers/platform/x86/x86-android-tablets/core.c b/drivers/platform/x86/x86-android-tablets/core.c
+index 2fd6060a31bb0b..a0fa0b6859c9ca 100644
+--- a/drivers/platform/x86/x86-android-tablets/core.c
++++ b/drivers/platform/x86/x86-android-tablets/core.c
+@@ -25,6 +25,8 @@
+ #include "../../../gpio/gpiolib.h"
+ #include "../../../gpio/gpiolib-acpi.h"
+ 
++static struct platform_device *x86_android_tablet_device;
++
+ static int gpiochip_find_match_label(struct gpio_chip *gc, void *data)
+ {
+ 	return gc->label && !strcmp(gc->label, data);
+@@ -224,7 +226,7 @@ static __init int x86_instantiate_serdev(const struct x86_serdev_info *info, int
+ 	return ret;
+ }
+ 
+-static void x86_android_tablet_cleanup(void)
++static void x86_android_tablet_remove(struct platform_device *pdev)
+ {
+ 	int i;
+ 
+@@ -255,7 +257,7 @@ static void x86_android_tablet_cleanup(void)
+ 	software_node_unregister(bat_swnode);
+ }
+ 
+-static __init int x86_android_tablet_init(void)
++static __init int x86_android_tablet_probe(struct platform_device *pdev)
+ {
+ 	const struct x86_dev_info *dev_info;
+ 	const struct dmi_system_id *id;
+@@ -267,6 +269,8 @@ static __init int x86_android_tablet_init(void)
+ 		return -ENODEV;
+ 
+ 	dev_info = id->driver_data;
++	/* Allow x86_android_tablet_device use before probe() exits */
++	x86_android_tablet_device = pdev;
+ 
+ 	/*
+ 	 * The broken DSDTs on these devices often also include broken
+@@ -303,7 +307,7 @@ static __init int x86_android_tablet_init(void)
+ 	if (dev_info->init) {
+ 		ret = dev_info->init();
+ 		if (ret < 0) {
+-			x86_android_tablet_cleanup();
++			x86_android_tablet_remove(pdev);
+ 			return ret;
+ 		}
+ 		exit_handler = dev_info->exit;
+@@ -311,7 +315,7 @@ static __init int x86_android_tablet_init(void)
+ 
+ 	i2c_clients = kcalloc(dev_info->i2c_client_count, sizeof(*i2c_clients), GFP_KERNEL);
+ 	if (!i2c_clients) {
+-		x86_android_tablet_cleanup();
++		x86_android_tablet_remove(pdev);
+ 		return -ENOMEM;
+ 	}
+ 
+@@ -319,7 +323,7 @@ static __init int x86_android_tablet_init(void)
+ 	for (i = 0; i < i2c_client_count; i++) {
+ 		ret = x86_instantiate_i2c_client(dev_info, i);
+ 		if (ret < 0) {
+-			x86_android_tablet_cleanup();
++			x86_android_tablet_remove(pdev);
+ 			return ret;
+ 		}
+ 	}
+@@ -327,7 +331,7 @@ static __init int x86_android_tablet_init(void)
+ 	/* + 1 to make space for (optional) gpio_keys_button pdev */
+ 	pdevs = kcalloc(dev_info->pdev_count + 1, sizeof(*pdevs), GFP_KERNEL);
+ 	if (!pdevs) {
+-		x86_android_tablet_cleanup();
++		x86_android_tablet_remove(pdev);
+ 		return -ENOMEM;
+ 	}
+ 
+@@ -335,14 +339,15 @@ static __init int x86_android_tablet_init(void)
+ 	for (i = 0; i < pdev_count; i++) {
+ 		pdevs[i] = platform_device_register_full(&dev_info->pdev_info[i]);
+ 		if (IS_ERR(pdevs[i])) {
+-			x86_android_tablet_cleanup();
+-			return PTR_ERR(pdevs[i]);
++			ret = PTR_ERR(pdevs[i]);
++			x86_android_tablet_remove(pdev);
++			return ret;
+ 		}
+ 	}
+ 
+ 	serdevs = kcalloc(dev_info->serdev_count, sizeof(*serdevs), GFP_KERNEL);
+ 	if (!serdevs) {
+-		x86_android_tablet_cleanup();
++		x86_android_tablet_remove(pdev);
+ 		return -ENOMEM;
+ 	}
+ 
+@@ -350,7 +355,7 @@ static __init int x86_android_tablet_init(void)
+ 	for (i = 0; i < serdev_count; i++) {
+ 		ret = x86_instantiate_serdev(&dev_info->serdev_info[i], i);
+ 		if (ret < 0) {
+-			x86_android_tablet_cleanup();
++			x86_android_tablet_remove(pdev);
+ 			return ret;
+ 		}
+ 	}
+@@ -361,7 +366,7 @@ static __init int x86_android_tablet_init(void)
+ 
+ 		buttons = kcalloc(dev_info->gpio_button_count, sizeof(*buttons), GFP_KERNEL);
+ 		if (!buttons) {
+-			x86_android_tablet_cleanup();
++			x86_android_tablet_remove(pdev);
+ 			return -ENOMEM;
+ 		}
+ 
+@@ -369,7 +374,7 @@ static __init int x86_android_tablet_init(void)
+ 			ret = x86_android_tablet_get_gpiod(dev_info->gpio_button[i].chip,
+ 							   dev_info->gpio_button[i].pin, &gpiod);
+ 			if (ret < 0) {
+-				x86_android_tablet_cleanup();
++				x86_android_tablet_remove(pdev);
+ 				return ret;
+ 			}
+ 
+@@ -384,8 +389,9 @@ static __init int x86_android_tablet_init(void)
+ 								  PLATFORM_DEVID_AUTO,
+ 								  &pdata, sizeof(pdata));
+ 		if (IS_ERR(pdevs[pdev_count])) {
+-			x86_android_tablet_cleanup();
+-			return PTR_ERR(pdevs[pdev_count]);
++			ret = PTR_ERR(pdevs[pdev_count]);
++			x86_android_tablet_remove(pdev);
++			return ret;
+ 		}
+ 		pdev_count++;
+ 	}
+@@ -393,8 +399,29 @@ static __init int x86_android_tablet_init(void)
+ 	return 0;
+ }
+ 
++static struct platform_driver x86_android_tablet_driver = {
++	.driver = {
++		.name = KBUILD_MODNAME,
++	},
++	.remove_new = x86_android_tablet_remove,
++};
++
++static int __init x86_android_tablet_init(void)
++{
++	x86_android_tablet_device = platform_create_bundle(&x86_android_tablet_driver,
++						   x86_android_tablet_probe,
++						   NULL, 0, NULL, 0);
++
++	return PTR_ERR_OR_ZERO(x86_android_tablet_device);
++}
+ module_init(x86_android_tablet_init);
+-module_exit(x86_android_tablet_cleanup);
++
++static void __exit x86_android_tablet_exit(void)
++{
++	platform_device_unregister(x86_android_tablet_device);
++	platform_driver_unregister(&x86_android_tablet_driver);
++}
++module_exit(x86_android_tablet_exit);
+ 
+ MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
+ MODULE_DESCRIPTION("X86 Android tablets DSDT fixups driver");
+diff --git a/drivers/power/reset/brcmstb-reboot.c b/drivers/power/reset/brcmstb-reboot.c
+index 0f2944dc935516..a04713f191a112 100644
+--- a/drivers/power/reset/brcmstb-reboot.c
++++ b/drivers/power/reset/brcmstb-reboot.c
+@@ -62,9 +62,6 @@ static int brcmstb_restart_handler(struct notifier_block *this,
+ 		return NOTIFY_DONE;
+ 	}
+ 
+-	while (1)
+-		;
+-
+ 	return NOTIFY_DONE;
+ }
+ 
+diff --git a/drivers/power/supply/power_supply_hwmon.c b/drivers/power/supply/power_supply_hwmon.c
+index c97893d4c25eb1..6465b5e4a3879c 100644
+--- a/drivers/power/supply/power_supply_hwmon.c
++++ b/drivers/power/supply/power_supply_hwmon.c
+@@ -299,7 +299,8 @@ static const struct hwmon_channel_info * const power_supply_hwmon_info[] = {
+ 			   HWMON_T_INPUT     |
+ 			   HWMON_T_MAX       |
+ 			   HWMON_T_MIN       |
+-			   HWMON_T_MIN_ALARM,
++			   HWMON_T_MIN_ALARM |
++			   HWMON_T_MAX_ALARM,
+ 
+ 			   HWMON_T_LABEL     |
+ 			   HWMON_T_INPUT     |
+diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c
+index 50e486bcfa1035..5491b1b17ca368 100644
+--- a/drivers/remoteproc/ti_k3_r5_remoteproc.c
++++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c
+@@ -194,6 +194,10 @@ static void k3_r5_rproc_mbox_callback(struct mbox_client *client, void *data)
+ 	const char *name = kproc->rproc->name;
+ 	u32 msg = omap_mbox_message(data);
+ 
++	/* Do not forward message from a detached core */
++	if (kproc->rproc->state == RPROC_DETACHED)
++		return;
++
+ 	dev_dbg(dev, "mbox msg: 0x%x\n", msg);
+ 
+ 	switch (msg) {
+@@ -229,6 +233,10 @@ static void k3_r5_rproc_kick(struct rproc *rproc, int vqid)
+ 	mbox_msg_t msg = (mbox_msg_t)vqid;
+ 	int ret;
+ 
++	/* Do not forward message to a detached core */
++	if (kproc->rproc->state == RPROC_DETACHED)
++		return;
++
+ 	/* send the index of the triggered virtqueue in the mailbox payload */
+ 	ret = mbox_send_message(kproc->mbox, (void *)msg);
+ 	if (ret < 0)
+@@ -399,12 +407,9 @@ static int k3_r5_rproc_request_mbox(struct rproc *rproc)
+ 	client->knows_txdone = false;
+ 
+ 	kproc->mbox = mbox_request_channel(client, 0);
+-	if (IS_ERR(kproc->mbox)) {
+-		ret = -EBUSY;
+-		dev_err(dev, "mbox_request_channel failed: %ld\n",
+-			PTR_ERR(kproc->mbox));
+-		return ret;
+-	}
++	if (IS_ERR(kproc->mbox))
++		return dev_err_probe(dev, PTR_ERR(kproc->mbox),
++				     "mbox_request_channel failed\n");
+ 
+ 	/*
+ 	 * Ping the remote processor, this is only for sanity-sake for now;
+@@ -464,8 +469,6 @@ static int k3_r5_rproc_prepare(struct rproc *rproc)
+ 			ret);
+ 		return ret;
+ 	}
+-	core->released_from_reset = true;
+-	wake_up_interruptible(&cluster->core_transition);
+ 
+ 	/*
+ 	 * Newer IP revisions like on J7200 SoCs support h/w auto-initialization
+@@ -552,10 +555,6 @@ static int k3_r5_rproc_start(struct rproc *rproc)
+ 	u32 boot_addr;
+ 	int ret;
+ 
+-	ret = k3_r5_rproc_request_mbox(rproc);
+-	if (ret)
+-		return ret;
+-
+ 	boot_addr = rproc->bootaddr;
+ 	/* TODO: add boot_addr sanity checking */
+ 	dev_dbg(dev, "booting R5F core using boot addr = 0x%x\n", boot_addr);
+@@ -564,7 +563,7 @@ static int k3_r5_rproc_start(struct rproc *rproc)
+ 	core = kproc->core;
+ 	ret = ti_sci_proc_set_config(core->tsp, boot_addr, 0, 0);
+ 	if (ret)
+-		goto put_mbox;
++		return ret;
+ 
+ 	/* unhalt/run all applicable cores */
+ 	if (cluster->mode == CLUSTER_MODE_LOCKSTEP) {
+@@ -580,13 +579,15 @@ static int k3_r5_rproc_start(struct rproc *rproc)
+ 		if (core != core0 && core0->rproc->state == RPROC_OFFLINE) {
+ 			dev_err(dev, "%s: can not start core 1 before core 0\n",
+ 				__func__);
+-			ret = -EPERM;
+-			goto put_mbox;
++			return -EPERM;
+ 		}
+ 
+ 		ret = k3_r5_core_run(core);
+ 		if (ret)
+-			goto put_mbox;
++			return ret;
++
++		core->released_from_reset = true;
++		wake_up_interruptible(&cluster->core_transition);
+ 	}
+ 
+ 	return 0;
+@@ -596,8 +597,6 @@ static int k3_r5_rproc_start(struct rproc *rproc)
+ 		if (k3_r5_core_halt(core))
+ 			dev_warn(core->dev, "core halt back failed\n");
+ 	}
+-put_mbox:
+-	mbox_free_channel(kproc->mbox);
+ 	return ret;
+ }
+ 
+@@ -658,8 +657,6 @@ static int k3_r5_rproc_stop(struct rproc *rproc)
+ 			goto out;
+ 	}
+ 
+-	mbox_free_channel(kproc->mbox);
+-
+ 	return 0;
+ 
+ unroll_core_halt:
+@@ -674,42 +671,22 @@ static int k3_r5_rproc_stop(struct rproc *rproc)
+ /*
+  * Attach to a running R5F remote processor (IPC-only mode)
+  *
+- * The R5F attach callback only needs to request the mailbox, the remote
+- * processor is already booted, so there is no need to issue any TI-SCI
+- * commands to boot the R5F cores in IPC-only mode. This callback is invoked
+- * only in IPC-only mode.
++ * The R5F attach callback is a NOP. The remote processor is already booted, and
++ * all required resources have been acquired during probe routine, so there is
++ * no need to issue any TI-SCI commands to boot the R5F cores in IPC-only mode.
++ * This callback is invoked only in IPC-only mode and exists because
++ * rproc_validate() checks for its existence.
+  */
+-static int k3_r5_rproc_attach(struct rproc *rproc)
+-{
+-	struct k3_r5_rproc *kproc = rproc->priv;
+-	struct device *dev = kproc->dev;
+-	int ret;
+-
+-	ret = k3_r5_rproc_request_mbox(rproc);
+-	if (ret)
+-		return ret;
+-
+-	dev_info(dev, "R5F core initialized in IPC-only mode\n");
+-	return 0;
+-}
++static int k3_r5_rproc_attach(struct rproc *rproc) { return 0; }
+ 
+ /*
+  * Detach from a running R5F remote processor (IPC-only mode)
+  *
+- * The R5F detach callback performs the opposite operation to attach callback
+- * and only needs to release the mailbox, the R5F cores are not stopped and
+- * will be left in booted state in IPC-only mode. This callback is invoked
+- * only in IPC-only mode.
++ * The R5F detach callback is a NOP. The R5F cores are not stopped and will be
++ * left in booted state in IPC-only mode. This callback is invoked only in
++ * IPC-only mode and exists for sanity sake.
+  */
+-static int k3_r5_rproc_detach(struct rproc *rproc)
+-{
+-	struct k3_r5_rproc *kproc = rproc->priv;
+-	struct device *dev = kproc->dev;
+-
+-	mbox_free_channel(kproc->mbox);
+-	dev_info(dev, "R5F core deinitialized in IPC-only mode\n");
+-	return 0;
+-}
++static int k3_r5_rproc_detach(struct rproc *rproc) { return 0; }
+ 
+ /*
+  * This function implements the .get_loaded_rsc_table() callback and is used
+@@ -1277,6 +1254,10 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
+ 		kproc->rproc = rproc;
+ 		core->rproc = rproc;
+ 
++		ret = k3_r5_rproc_request_mbox(rproc);
++		if (ret)
++			return ret;
++
+ 		ret = k3_r5_rproc_configure_mode(kproc);
+ 		if (ret < 0)
+ 			goto err_config;
+@@ -1331,7 +1312,7 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
+ 			dev_err(dev,
+ 				"Timed out waiting for %s core to power up!\n",
+ 				rproc->name);
+-			return ret;
++			goto err_powerup;
+ 		}
+ 	}
+ 
+@@ -1347,6 +1328,7 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
+ 		}
+ 	}
+ 
++err_powerup:
+ 	rproc_del(rproc);
+ err_add:
+ 	k3_r5_reserved_mem_exit(kproc);
+@@ -1394,6 +1376,8 @@ static void k3_r5_cluster_rproc_exit(void *data)
+ 			}
+ 		}
+ 
++		mbox_free_channel(kproc->mbox);
++
+ 		rproc_del(rproc);
+ 
+ 		k3_r5_reserved_mem_exit(kproc);
+diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
+index f93bee96e36233..993c0878fb6606 100644
+--- a/drivers/rtc/rtc-at91sam9.c
++++ b/drivers/rtc/rtc-at91sam9.c
+@@ -368,6 +368,7 @@ static int at91_rtc_probe(struct platform_device *pdev)
+ 		return ret;
+ 
+ 	rtc->gpbr = syscon_node_to_regmap(args.np);
++	of_node_put(args.np);
+ 	rtc->gpbr_offset = args.args[0];
+ 	if (IS_ERR(rtc->gpbr)) {
+ 		dev_err(&pdev->dev, "failed to retrieve gpbr regmap, aborting.\n");
+diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
+index 00e245173320c3..4fcb73b727aa5d 100644
+--- a/drivers/scsi/NCR5380.c
++++ b/drivers/scsi/NCR5380.c
+@@ -1807,8 +1807,11 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
+ 				return;
+ 			case PHASE_MSGIN:
+ 				len = 1;
++				tmp = 0xff;
+ 				data = &tmp;
+ 				NCR5380_transfer_pio(instance, &phase, &len, &data, 0);
++				if (tmp == 0xff)
++					break;
+ 				ncmd->message = tmp;
+ 
+ 				switch (tmp) {
+@@ -1996,6 +1999,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
+ 				break;
+ 			case PHASE_STATIN:
+ 				len = 1;
++				tmp = ncmd->status;
+ 				data = &tmp;
+ 				NCR5380_transfer_pio(instance, &phase, &len, &data, 0);
+ 				ncmd->status = tmp;
+diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
+index 7d5a155073c627..9b66fa29fb05ca 100644
+--- a/drivers/scsi/aacraid/aacraid.h
++++ b/drivers/scsi/aacraid/aacraid.h
+@@ -2029,8 +2029,8 @@ struct aac_srb_reply
+ };
+ 
+ struct aac_srb_unit {
+-	struct aac_srb		srb;
+ 	struct aac_srb_reply	srb_reply;
++	struct aac_srb		srb;
+ };
+ 
+ /*
+diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
+index 44d3ada9fbbcb1..f67d72160d36ed 100644
+--- a/drivers/scsi/lpfc/lpfc_els.c
++++ b/drivers/scsi/lpfc/lpfc_els.c
+@@ -5228,9 +5228,10 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+ 	/* ACC to LOGO completes to NPort <nlp_DID> */
+ 	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
+ 			 "0109 ACC to LOGO completes to NPort x%x refcnt %d "
+-			 "Data: x%x x%x x%x\n",
+-			 ndlp->nlp_DID, kref_read(&ndlp->kref), ndlp->nlp_flag,
+-			 ndlp->nlp_state, ndlp->nlp_rpi);
++			 "last els x%x Data: x%x x%x x%x\n",
++			 ndlp->nlp_DID, kref_read(&ndlp->kref),
++			 ndlp->nlp_last_elscmd, ndlp->nlp_flag, ndlp->nlp_state,
++			 ndlp->nlp_rpi);
+ 
+ 	/* This clause allows the LOGO ACC to complete and free resources
+ 	 * for the Fabric Domain Controller.  It does deliberately skip
+@@ -5242,18 +5243,22 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+ 		goto out;
+ 
+ 	if (ndlp->nlp_state == NLP_STE_NPR_NODE) {
+-		/* If PLOGI is being retried, PLOGI completion will cleanup the
+-		 * node. The NLP_NPR_2B_DISC flag needs to be retained to make
+-		 * progress on nodes discovered from last RSCN.
+-		 */
+-		if ((ndlp->nlp_flag & NLP_DELAY_TMO) &&
+-		    (ndlp->nlp_last_elscmd == ELS_CMD_PLOGI))
+-			goto out;
+-
+ 		if (ndlp->nlp_flag & NLP_RPI_REGISTERED)
+ 			lpfc_unreg_rpi(vport, ndlp);
+ 
++		/* If came from PRLO, then PRLO_ACC is done.
++		 * Start rediscovery now.
++		 */
++		if (ndlp->nlp_last_elscmd == ELS_CMD_PRLO) {
++			spin_lock_irq(&ndlp->lock);
++			ndlp->nlp_flag |= NLP_NPR_2B_DISC;
++			spin_unlock_irq(&ndlp->lock);
++			ndlp->nlp_prev_state = ndlp->nlp_state;
++			lpfc_nlp_set_state(vport, ndlp, NLP_STE_PLOGI_ISSUE);
++			lpfc_issue_els_plogi(vport, ndlp->nlp_DID, 0);
++		}
+ 	}
++
+  out:
+ 	/*
+ 	 * The driver received a LOGO from the rport and has ACK'd it.
+diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
+index 3ed211d093dd1e..fe174062e49460 100644
+--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
++++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
+@@ -2635,8 +2635,26 @@ lpfc_rcv_prlo_mapped_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+ 	/* flush the target */
+ 	lpfc_sli_abort_iocb(vport, ndlp->nlp_sid, 0, LPFC_CTX_TGT);
+ 
+-	/* Treat like rcv logo */
+-	lpfc_rcv_logo(vport, ndlp, cmdiocb, ELS_CMD_PRLO);
++	/* Send PRLO_ACC */
++	spin_lock_irq(&ndlp->lock);
++	ndlp->nlp_flag |= NLP_LOGO_ACC;
++	spin_unlock_irq(&ndlp->lock);
++	lpfc_els_rsp_acc(vport, ELS_CMD_PRLO, cmdiocb, ndlp, NULL);
++
++	/* Save ELS_CMD_PRLO as the last elscmd and then set to NPR.
++	 * lpfc_cmpl_els_logo_acc is expected to restart discovery.
++	 */
++	ndlp->nlp_last_elscmd = ELS_CMD_PRLO;
++	ndlp->nlp_prev_state = ndlp->nlp_state;
++
++	lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE | LOG_ELS | LOG_DISCOVERY,
++			 "3422 DID x%06x nflag x%x lastels x%x ref cnt %u\n",
++			 ndlp->nlp_DID, ndlp->nlp_flag,
++			 ndlp->nlp_last_elscmd,
++			 kref_read(&ndlp->kref));
++
++	lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
++
+ 	return ndlp->nlp_state;
+ }
+ 
+diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
+index 443a3176c6c0c9..c2f6151cbd2d02 100644
+--- a/drivers/scsi/pm8001/pm8001_init.c
++++ b/drivers/scsi/pm8001/pm8001_init.c
+@@ -88,10 +88,12 @@ static void pm8001_map_queues(struct Scsi_Host *shost)
+ 	struct pm8001_hba_info *pm8001_ha = sha->lldd_ha;
+ 	struct blk_mq_queue_map *qmap = &shost->tag_set.map[HCTX_TYPE_DEFAULT];
+ 
+-	if (pm8001_ha->number_of_intr > 1)
++	if (pm8001_ha->number_of_intr > 1) {
+ 		blk_mq_pci_map_queues(qmap, pm8001_ha->pdev, 1);
++		return;
++	}
+ 
+-	return blk_mq_map_queues(qmap);
++	blk_mq_map_queues(qmap);
+ }
+ 
+ /*
+diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
+index 2ae64cda8bc9ea..0af2d366c85f94 100644
+--- a/drivers/scsi/smartpqi/smartpqi_init.c
++++ b/drivers/scsi/smartpqi/smartpqi_init.c
+@@ -5918,7 +5918,7 @@ static bool pqi_is_parity_write_stream(struct pqi_ctrl_info *ctrl_info,
+ 	int rc;
+ 	struct pqi_scsi_dev *device;
+ 	struct pqi_stream_data *pqi_stream_data;
+-	struct pqi_scsi_dev_raid_map_data rmd;
++	struct pqi_scsi_dev_raid_map_data rmd = { 0 };
+ 
+ 	if (!ctrl_info->enable_stream_detection)
+ 		return false;
+diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
+index 338aa8c429682c..212a402e753587 100644
+--- a/drivers/scsi/st.c
++++ b/drivers/scsi/st.c
+@@ -835,6 +835,9 @@ static int flush_buffer(struct scsi_tape *STp, int seek_next)
+ 	int backspace, result;
+ 	struct st_partstat *STps;
+ 
++	if (STp->ready != ST_READY)
++		return 0;
++
+ 	/*
+ 	 * If there was a bus reset, block further access
+ 	 * to this device.
+@@ -842,8 +845,6 @@ static int flush_buffer(struct scsi_tape *STp, int seek_next)
+ 	if (STp->pos_unknown)
+ 		return (-EIO);
+ 
+-	if (STp->ready != ST_READY)
+-		return 0;
+ 	STps = &(STp->ps[STp->partition]);
+ 	if (STps->rw == ST_WRITING)	/* Writing */
+ 		return st_flush_write_buffer(STp);
+diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
+index 2fb8d4e55c7773..ef3a7226db125c 100644
+--- a/drivers/spi/spi-bcm63xx.c
++++ b/drivers/spi/spi-bcm63xx.c
+@@ -466,6 +466,7 @@ static const struct platform_device_id bcm63xx_spi_dev_match[] = {
+ 	{
+ 	},
+ };
++MODULE_DEVICE_TABLE(platform, bcm63xx_spi_dev_match);
+ 
+ static const struct of_device_id bcm63xx_spi_of_match[] = {
+ 	{ .compatible = "brcm,bcm6348-spi", .data = &bcm6348_spi_reg_offsets },
+@@ -583,13 +584,15 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
+ 
+ 	bcm_spi_writeb(bs, SPI_INTR_CLEAR_ALL, SPI_INT_STATUS);
+ 
+-	pm_runtime_enable(&pdev->dev);
++	ret = devm_pm_runtime_enable(&pdev->dev);
++	if (ret)
++		goto out_clk_disable;
+ 
+ 	/* register and we are done */
+ 	ret = devm_spi_register_controller(dev, host);
+ 	if (ret) {
+ 		dev_err(dev, "spi register failed\n");
+-		goto out_pm_disable;
++		goto out_clk_disable;
+ 	}
+ 
+ 	dev_info(dev, "at %pr (irq %d, FIFOs size %d)\n",
+@@ -597,8 +600,6 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
+ 
+ 	return 0;
+ 
+-out_pm_disable:
+-	pm_runtime_disable(&pdev->dev);
+ out_clk_disable:
+ 	clk_disable_unprepare(clk);
+ out_err:
+diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c
+index 5cab7caf46586c..81edf0a3ddf843 100644
+--- a/drivers/spi/spi-cadence.c
++++ b/drivers/spi/spi-cadence.c
+@@ -581,31 +581,19 @@ static int cdns_spi_probe(struct platform_device *pdev)
+ 		goto remove_ctlr;
+ 	}
+ 
+-	xspi->pclk = devm_clk_get(&pdev->dev, "pclk");
++	xspi->pclk = devm_clk_get_enabled(&pdev->dev, "pclk");
+ 	if (IS_ERR(xspi->pclk)) {
+ 		dev_err(&pdev->dev, "pclk clock not found.\n");
+ 		ret = PTR_ERR(xspi->pclk);
+ 		goto remove_ctlr;
+ 	}
+ 
+-	ret = clk_prepare_enable(xspi->pclk);
+-	if (ret) {
+-		dev_err(&pdev->dev, "Unable to enable APB clock.\n");
+-		goto remove_ctlr;
+-	}
+-
+ 	if (!spi_controller_is_target(ctlr)) {
+-		xspi->ref_clk = devm_clk_get(&pdev->dev, "ref_clk");
++		xspi->ref_clk = devm_clk_get_enabled(&pdev->dev, "ref_clk");
+ 		if (IS_ERR(xspi->ref_clk)) {
+ 			dev_err(&pdev->dev, "ref_clk clock not found.\n");
+ 			ret = PTR_ERR(xspi->ref_clk);
+-			goto clk_dis_apb;
+-		}
+-
+-		ret = clk_prepare_enable(xspi->ref_clk);
+-		if (ret) {
+-			dev_err(&pdev->dev, "Unable to enable device clock.\n");
+-			goto clk_dis_apb;
++			goto remove_ctlr;
+ 		}
+ 
+ 		pm_runtime_use_autosuspend(&pdev->dev);
+@@ -677,12 +665,9 @@ static int cdns_spi_probe(struct platform_device *pdev)
+ 
+ clk_dis_all:
+ 	if (!spi_controller_is_target(ctlr)) {
+-		pm_runtime_set_suspended(&pdev->dev);
+ 		pm_runtime_disable(&pdev->dev);
+-		clk_disable_unprepare(xspi->ref_clk);
++		pm_runtime_set_suspended(&pdev->dev);
+ 	}
+-clk_dis_apb:
+-	clk_disable_unprepare(xspi->pclk);
+ remove_ctlr:
+ 	spi_controller_put(ctlr);
+ 	return ret;
+@@ -703,10 +688,10 @@ static void cdns_spi_remove(struct platform_device *pdev)
+ 
+ 	cdns_spi_write(xspi, CDNS_SPI_ER, CDNS_SPI_ER_DISABLE);
+ 
+-	clk_disable_unprepare(xspi->ref_clk);
+-	clk_disable_unprepare(xspi->pclk);
+-	pm_runtime_set_suspended(&pdev->dev);
+-	pm_runtime_disable(&pdev->dev);
++	if (!spi_controller_is_target(ctlr)) {
++		pm_runtime_disable(&pdev->dev);
++		pm_runtime_set_suspended(&pdev->dev);
++	}
+ 
+ 	spi_unregister_controller(ctlr);
+ }
+diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
+index 006860ee03ca0d..daa32bde615561 100644
+--- a/drivers/spi/spi-imx.c
++++ b/drivers/spi/spi-imx.c
+@@ -1870,8 +1870,8 @@ static int spi_imx_probe(struct platform_device *pdev)
+ 		spi_imx_sdma_exit(spi_imx);
+ out_runtime_pm_put:
+ 	pm_runtime_dont_use_autosuspend(spi_imx->dev);
+-	pm_runtime_set_suspended(&pdev->dev);
+ 	pm_runtime_disable(spi_imx->dev);
++	pm_runtime_set_suspended(&pdev->dev);
+ 
+ 	clk_disable_unprepare(spi_imx->clk_ipg);
+ out_put_per:
+diff --git a/drivers/spi/spi-rpc-if.c b/drivers/spi/spi-rpc-if.c
+index e11146932828a2..7cce2d2ab9ca61 100644
+--- a/drivers/spi/spi-rpc-if.c
++++ b/drivers/spi/spi-rpc-if.c
+@@ -198,9 +198,16 @@ static int __maybe_unused rpcif_spi_resume(struct device *dev)
+ 
+ static SIMPLE_DEV_PM_OPS(rpcif_spi_pm_ops, rpcif_spi_suspend, rpcif_spi_resume);
+ 
++static const struct platform_device_id rpc_if_spi_id_table[] = {
++	{ .name = "rpc-if-spi" },
++	{ /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(platform, rpc_if_spi_id_table);
++
+ static struct platform_driver rpcif_spi_driver = {
+ 	.probe	= rpcif_spi_probe,
+ 	.remove_new = rpcif_spi_remove,
++	.id_table = rpc_if_spi_id_table,
+ 	.driver = {
+ 		.name	= "rpc-if-spi",
+ #ifdef CONFIG_PM_SLEEP
+diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
+index 652eadbefe24ca..f699ce1b402530 100644
+--- a/drivers/spi/spi-s3c64xx.c
++++ b/drivers/spi/spi-s3c64xx.c
+@@ -239,7 +239,7 @@ static void s3c64xx_flush_fifo(struct s3c64xx_spi_driver_data *sdd)
+ 	loops = msecs_to_loops(1);
+ 	do {
+ 		val = readl(regs + S3C64XX_SPI_STATUS);
+-	} while (TX_FIFO_LVL(val, sdd) && loops--);
++	} while (TX_FIFO_LVL(val, sdd) && --loops);
+ 
+ 	if (loops == 0)
+ 		dev_warn(&sdd->pdev->dev, "Timed out flushing TX FIFO\n");
+@@ -252,7 +252,7 @@ static void s3c64xx_flush_fifo(struct s3c64xx_spi_driver_data *sdd)
+ 			readl(regs + S3C64XX_SPI_RX_DATA);
+ 		else
+ 			break;
+-	} while (loops--);
++	} while (--loops);
+ 
+ 	if (loops == 0)
+ 		dev_warn(&sdd->pdev->dev, "Timed out flushing RX FIFO\n");
+diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
+index 8f17d29ab7e9cc..99813232c25e98 100644
+--- a/drivers/vhost/scsi.c
++++ b/drivers/vhost/scsi.c
+@@ -1018,20 +1018,23 @@ vhost_scsi_get_req(struct vhost_virtqueue *vq, struct vhost_scsi_ctx *vc,
+ 		/* virtio-scsi spec requires byte 0 of the lun to be 1 */
+ 		vq_err(vq, "Illegal virtio-scsi lun: %u\n", *vc->lunp);
+ 	} else {
+-		struct vhost_scsi_tpg **vs_tpg, *tpg;
+-
+-		vs_tpg = vhost_vq_get_backend(vq);	/* validated at handler entry */
+-
+-		tpg = READ_ONCE(vs_tpg[*vc->target]);
+-		if (unlikely(!tpg)) {
+-			vq_err(vq, "Target 0x%x does not exist\n", *vc->target);
+-		} else {
+-			if (tpgp)
+-				*tpgp = tpg;
+-			ret = 0;
++		struct vhost_scsi_tpg **vs_tpg, *tpg = NULL;
++
++		if (vc->target) {
++			/* validated at handler entry */
++			vs_tpg = vhost_vq_get_backend(vq);
++			tpg = READ_ONCE(vs_tpg[*vc->target]);
++			if (unlikely(!tpg)) {
++				vq_err(vq, "Target 0x%x does not exist\n", *vc->target);
++				goto out;
++			}
+ 		}
+-	}
+ 
++		if (tpgp)
++			*tpgp = tpg;
++		ret = 0;
++	}
++out:
+ 	return ret;
+ }
+ 
+diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
+index f9b4ddd592ce4d..88ac24202a1ff4 100644
+--- a/drivers/video/fbdev/efifb.c
++++ b/drivers/video/fbdev/efifb.c
+@@ -571,15 +571,10 @@ static int efifb_probe(struct platform_device *dev)
+ 		break;
+ 	}
+ 
+-	err = sysfs_create_groups(&dev->dev.kobj, efifb_groups);
+-	if (err) {
+-		pr_err("efifb: cannot add sysfs attrs\n");
+-		goto err_unmap;
+-	}
+ 	err = fb_alloc_cmap(&info->cmap, 256, 0);
+ 	if (err < 0) {
+ 		pr_err("efifb: cannot allocate colormap\n");
+-		goto err_groups;
++		goto err_unmap;
+ 	}
+ 
+ 	if (efifb_pci_dev)
+@@ -603,8 +598,6 @@ static int efifb_probe(struct platform_device *dev)
+ 		pm_runtime_put(&efifb_pci_dev->dev);
+ 
+ 	fb_dealloc_cmap(&info->cmap);
+-err_groups:
+-	sysfs_remove_groups(&dev->dev.kobj, efifb_groups);
+ err_unmap:
+ 	if (mem_flags & (EFI_MEMORY_UC | EFI_MEMORY_WC))
+ 		iounmap(info->screen_base);
+@@ -624,12 +617,12 @@ static void efifb_remove(struct platform_device *pdev)
+ 
+ 	/* efifb_destroy takes care of info cleanup */
+ 	unregister_framebuffer(info);
+-	sysfs_remove_groups(&pdev->dev.kobj, efifb_groups);
+ }
+ 
+ static struct platform_driver efifb_driver = {
+ 	.driver = {
+ 		.name = "efi-framebuffer",
++		.dev_groups = efifb_groups,
+ 	},
+ 	.probe = efifb_probe,
+ 	.remove_new = efifb_remove,
+diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
+index fa943612c4e2b3..3a2427eb29f236 100644
+--- a/drivers/video/fbdev/pxafb.c
++++ b/drivers/video/fbdev/pxafb.c
+@@ -2403,6 +2403,7 @@ static void pxafb_remove(struct platform_device *dev)
+ 	info = &fbi->fb;
+ 
+ 	pxafb_overlay_exit(fbi);
++	cancel_work_sync(&fbi->task);
+ 	unregister_framebuffer(info);
+ 
+ 	pxafb_disable_controller(fbi);
+diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
+index df223ebf2551cf..a2ba1c7fc16af4 100644
+--- a/fs/btrfs/backref.c
++++ b/fs/btrfs/backref.c
+@@ -3098,10 +3098,14 @@ void btrfs_backref_release_cache(struct btrfs_backref_cache *cache)
+ 		btrfs_backref_cleanup_node(cache, node);
+ 	}
+ 
+-	cache->last_trans = 0;
+-
+-	for (i = 0; i < BTRFS_MAX_LEVEL; i++)
+-		ASSERT(list_empty(&cache->pending[i]));
++	for (i = 0; i < BTRFS_MAX_LEVEL; i++) {
++		while (!list_empty(&cache->pending[i])) {
++			node = list_first_entry(&cache->pending[i],
++						struct btrfs_backref_node,
++						list);
++			btrfs_backref_cleanup_node(cache, node);
++		}
++	}
+ 	ASSERT(list_empty(&cache->pending_edge));
+ 	ASSERT(list_empty(&cache->useless_node));
+ 	ASSERT(list_empty(&cache->changed));
+diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
+index caedd4460d9941..8ec411eb9c9b0c 100644
+--- a/fs/btrfs/disk-io.c
++++ b/fs/btrfs/disk-io.c
+@@ -4313,6 +4313,17 @@ void __cold close_ctree(struct btrfs_fs_info *fs_info)
+ 	/* clear out the rbtree of defraggable inodes */
+ 	btrfs_cleanup_defrag_inodes(fs_info);
+ 
++	/*
++	 * Wait for any fixup workers to complete.
++	 * If we don't wait for them here and they are still running by the time
++	 * we call kthread_stop() against the cleaner kthread further below, we
++	 * get an use-after-free on the cleaner because the fixup worker adds an
++	 * inode to the list of delayed iputs and then attempts to wakeup the
++	 * cleaner kthread, which was already stopped and destroyed. We parked
++	 * already the cleaner, but below we run all pending delayed iputs.
++	 */
++	btrfs_flush_workqueue(fs_info->fixup_workers);
++
+ 	/*
+ 	 * After we parked the cleaner kthread, ordered extents may have
+ 	 * completed and created new delayed iputs. If one of the async reclaim
+diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
+index 4eaac3ae5c3658..299eac696eb426 100644
+--- a/fs/btrfs/relocation.c
++++ b/fs/btrfs/relocation.c
+@@ -235,71 +235,7 @@ static struct btrfs_backref_node *walk_down_backref(
+ 	return NULL;
+ }
+ 
+-static void update_backref_node(struct btrfs_backref_cache *cache,
+-				struct btrfs_backref_node *node, u64 bytenr)
+-{
+-	struct rb_node *rb_node;
+-	rb_erase(&node->rb_node, &cache->rb_root);
+-	node->bytenr = bytenr;
+-	rb_node = rb_simple_insert(&cache->rb_root, node->bytenr, &node->rb_node);
+-	if (rb_node)
+-		btrfs_backref_panic(cache->fs_info, bytenr, -EEXIST);
+-}
+-
+-/*
+- * update backref cache after a transaction commit
+- */
+-static int update_backref_cache(struct btrfs_trans_handle *trans,
+-				struct btrfs_backref_cache *cache)
+-{
+-	struct btrfs_backref_node *node;
+-	int level = 0;
+-
+-	if (cache->last_trans == 0) {
+-		cache->last_trans = trans->transid;
+-		return 0;
+-	}
+-
+-	if (cache->last_trans == trans->transid)
+-		return 0;
+-
+-	/*
+-	 * detached nodes are used to avoid unnecessary backref
+-	 * lookup. transaction commit changes the extent tree.
+-	 * so the detached nodes are no longer useful.
+-	 */
+-	while (!list_empty(&cache->detached)) {
+-		node = list_entry(cache->detached.next,
+-				  struct btrfs_backref_node, list);
+-		btrfs_backref_cleanup_node(cache, node);
+-	}
+-
+-	while (!list_empty(&cache->changed)) {
+-		node = list_entry(cache->changed.next,
+-				  struct btrfs_backref_node, list);
+-		list_del_init(&node->list);
+-		BUG_ON(node->pending);
+-		update_backref_node(cache, node, node->new_bytenr);
+-	}
+-
+-	/*
+-	 * some nodes can be left in the pending list if there were
+-	 * errors during processing the pending nodes.
+-	 */
+-	for (level = 0; level < BTRFS_MAX_LEVEL; level++) {
+-		list_for_each_entry(node, &cache->pending[level], list) {
+-			BUG_ON(!node->pending);
+-			if (node->bytenr == node->new_bytenr)
+-				continue;
+-			update_backref_node(cache, node, node->new_bytenr);
+-		}
+-	}
+-
+-	cache->last_trans = 0;
+-	return 1;
+-}
+-
+-static bool reloc_root_is_dead(struct btrfs_root *root)
++static bool reloc_root_is_dead(const struct btrfs_root *root)
+ {
+ 	/*
+ 	 * Pair with set_bit/clear_bit in clean_dirty_subvols and
+@@ -320,7 +256,7 @@ static bool reloc_root_is_dead(struct btrfs_root *root)
+  * from no reloc root.  But btrfs_should_ignore_reloc_root() below is a
+  * special case.
+  */
+-static bool have_reloc_root(struct btrfs_root *root)
++static bool have_reloc_root(const struct btrfs_root *root)
+ {
+ 	if (reloc_root_is_dead(root))
+ 		return false;
+@@ -329,31 +265,30 @@ static bool have_reloc_root(struct btrfs_root *root)
+ 	return true;
+ }
+ 
+-int btrfs_should_ignore_reloc_root(struct btrfs_root *root)
++bool btrfs_should_ignore_reloc_root(const struct btrfs_root *root)
+ {
+ 	struct btrfs_root *reloc_root;
+ 
+ 	if (!test_bit(BTRFS_ROOT_SHAREABLE, &root->state))
+-		return 0;
++		return false;
+ 
+ 	/* This root has been merged with its reloc tree, we can ignore it */
+ 	if (reloc_root_is_dead(root))
+-		return 1;
++		return true;
+ 
+ 	reloc_root = root->reloc_root;
+ 	if (!reloc_root)
+-		return 0;
++		return false;
+ 
+ 	if (btrfs_header_generation(reloc_root->commit_root) ==
+ 	    root->fs_info->running_transaction->transid)
+-		return 0;
++		return false;
+ 	/*
+-	 * if there is reloc tree and it was created in previous
+-	 * transaction backref lookup can find the reloc tree,
+-	 * so backref node for the fs tree root is useless for
+-	 * relocation.
++	 * If there is reloc tree and it was created in previous transaction
++	 * backref lookup can find the reloc tree, so backref node for the fs
++	 * tree root is useless for relocation.
+ 	 */
+-	return 1;
++	return true;
+ }
+ 
+ /*
+@@ -547,7 +482,7 @@ static noinline_for_stack struct btrfs_backref_node *build_backref_tree(
+  */
+ static int clone_backref_node(struct btrfs_trans_handle *trans,
+ 			      struct reloc_control *rc,
+-			      struct btrfs_root *src,
++			      const struct btrfs_root *src,
+ 			      struct btrfs_root *dest)
+ {
+ 	struct btrfs_root *reloc_root = src->reloc_root;
+@@ -558,9 +493,6 @@ static int clone_backref_node(struct btrfs_trans_handle *trans,
+ 	struct btrfs_backref_edge *new_edge;
+ 	struct rb_node *rb_node;
+ 
+-	if (cache->last_trans > 0)
+-		update_backref_cache(trans, cache);
+-
+ 	rb_node = rb_simple_search(&cache->rb_root, src->commit_root->start);
+ 	if (rb_node) {
+ 		node = rb_entry(rb_node, struct btrfs_backref_node, rb_node);
+@@ -931,7 +863,7 @@ int btrfs_update_reloc_root(struct btrfs_trans_handle *trans,
+ 	btrfs_grab_root(reloc_root);
+ 
+ 	/* root->reloc_root will stay until current relocation finished */
+-	if (fs_info->reloc_ctl->merge_reloc_tree &&
++	if (fs_info->reloc_ctl && fs_info->reloc_ctl->merge_reloc_tree &&
+ 	    btrfs_root_refs(root_item) == 0) {
+ 		set_bit(BTRFS_ROOT_DEAD_RELOC_TREE, &root->state);
+ 		/*
+@@ -1187,9 +1119,9 @@ int replace_file_extents(struct btrfs_trans_handle *trans,
+ 	return ret;
+ }
+ 
+-static noinline_for_stack
+-int memcmp_node_keys(struct extent_buffer *eb, int slot,
+-		     struct btrfs_path *path, int level)
++static noinline_for_stack int memcmp_node_keys(const struct extent_buffer *eb,
++					       int slot, const struct btrfs_path *path,
++					       int level)
+ {
+ 	struct btrfs_disk_key key1;
+ 	struct btrfs_disk_key key2;
+@@ -1518,8 +1450,8 @@ int walk_down_reloc_tree(struct btrfs_root *root, struct btrfs_path *path,
+  * [min_key, max_key)
+  */
+ static int invalidate_extent_cache(struct btrfs_root *root,
+-				   struct btrfs_key *min_key,
+-				   struct btrfs_key *max_key)
++				   const struct btrfs_key *min_key,
++				   const struct btrfs_key *max_key)
+ {
+ 	struct btrfs_fs_info *fs_info = root->fs_info;
+ 	struct inode *inode = NULL;
+@@ -2830,7 +2762,7 @@ int relocate_tree_blocks(struct btrfs_trans_handle *trans,
+ 
+ static noinline_for_stack int prealloc_file_extent_cluster(
+ 				struct btrfs_inode *inode,
+-				struct file_extent_cluster *cluster)
++				const struct file_extent_cluster *cluster)
+ {
+ 	u64 alloc_hint = 0;
+ 	u64 start;
+@@ -2965,7 +2897,7 @@ static noinline_for_stack int setup_relocation_extent_mapping(struct inode *inod
+ /*
+  * Allow error injection to test balance/relocation cancellation
+  */
+-noinline int btrfs_should_cancel_balance(struct btrfs_fs_info *fs_info)
++noinline int btrfs_should_cancel_balance(const struct btrfs_fs_info *fs_info)
+ {
+ 	return atomic_read(&fs_info->balance_cancel_req) ||
+ 		atomic_read(&fs_info->reloc_cancel_req) ||
+@@ -2973,7 +2905,7 @@ noinline int btrfs_should_cancel_balance(struct btrfs_fs_info *fs_info)
+ }
+ ALLOW_ERROR_INJECTION(btrfs_should_cancel_balance, TRUE);
+ 
+-static u64 get_cluster_boundary_end(struct file_extent_cluster *cluster,
++static u64 get_cluster_boundary_end(const struct file_extent_cluster *cluster,
+ 				    int cluster_nr)
+ {
+ 	/* Last extent, use cluster end directly */
+@@ -2985,7 +2917,7 @@ static u64 get_cluster_boundary_end(struct file_extent_cluster *cluster,
+ }
+ 
+ static int relocate_one_page(struct inode *inode, struct file_ra_state *ra,
+-			     struct file_extent_cluster *cluster,
++			     const struct file_extent_cluster *cluster,
+ 			     int *cluster_nr, unsigned long page_index)
+ {
+ 	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+@@ -3120,7 +3052,7 @@ static int relocate_one_page(struct inode *inode, struct file_ra_state *ra,
+ }
+ 
+ static int relocate_file_extent_cluster(struct inode *inode,
+-					struct file_extent_cluster *cluster)
++					const struct file_extent_cluster *cluster)
+ {
+ 	u64 offset = BTRFS_I(inode)->index_cnt;
+ 	unsigned long index;
+@@ -3158,9 +3090,9 @@ static int relocate_file_extent_cluster(struct inode *inode,
+ 	return ret;
+ }
+ 
+-static noinline_for_stack
+-int relocate_data_extent(struct inode *inode, struct btrfs_key *extent_key,
+-			 struct file_extent_cluster *cluster)
++static noinline_for_stack int relocate_data_extent(struct inode *inode,
++				const struct btrfs_key *extent_key,
++				struct file_extent_cluster *cluster)
+ {
+ 	int ret;
+ 
+@@ -3193,7 +3125,7 @@ int relocate_data_extent(struct inode *inode, struct btrfs_key *extent_key,
+  * the major work is getting the generation and level of the block
+  */
+ static int add_tree_block(struct reloc_control *rc,
+-			  struct btrfs_key *extent_key,
++			  const struct btrfs_key *extent_key,
+ 			  struct btrfs_path *path,
+ 			  struct rb_root *blocks)
+ {
+@@ -3444,11 +3376,10 @@ static int delete_v1_space_cache(struct extent_buffer *leaf,
+ /*
+  * helper to find all tree blocks that reference a given data extent
+  */
+-static noinline_for_stack
+-int add_data_references(struct reloc_control *rc,
+-			struct btrfs_key *extent_key,
+-			struct btrfs_path *path,
+-			struct rb_root *blocks)
++static noinline_for_stack int add_data_references(struct reloc_control *rc,
++						  const struct btrfs_key *extent_key,
++						  struct btrfs_path *path,
++						  struct rb_root *blocks)
+ {
+ 	struct btrfs_backref_walk_ctx ctx = { 0 };
+ 	struct ulist_iterator leaf_uiter;
+@@ -3684,11 +3615,9 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
+ 			break;
+ 		}
+ restart:
+-		if (update_backref_cache(trans, &rc->backref_cache)) {
+-			btrfs_end_transaction(trans);
+-			trans = NULL;
+-			continue;
+-		}
++		if (rc->backref_cache.last_trans != trans->transid)
++			btrfs_backref_release_cache(&rc->backref_cache);
++		rc->backref_cache.last_trans = trans->transid;
+ 
+ 		ret = find_next_extent(rc, path, &key);
+ 		if (ret < 0)
+@@ -3874,9 +3803,9 @@ static void delete_orphan_inode(struct btrfs_trans_handle *trans,
+  * helper to create inode for data relocation.
+  * the inode is in data relocation tree and its link count is 0
+  */
+-static noinline_for_stack
+-struct inode *create_reloc_inode(struct btrfs_fs_info *fs_info,
+-				 struct btrfs_block_group *group)
++static noinline_for_stack struct inode *create_reloc_inode(
++					struct btrfs_fs_info *fs_info,
++					const struct btrfs_block_group *group)
+ {
+ 	struct inode *inode = NULL;
+ 	struct btrfs_trans_handle *trans;
+@@ -4422,7 +4351,8 @@ int btrfs_reloc_clone_csums(struct btrfs_ordered_extent *ordered)
+ }
+ 
+ int btrfs_reloc_cow_block(struct btrfs_trans_handle *trans,
+-			  struct btrfs_root *root, struct extent_buffer *buf,
++			  struct btrfs_root *root,
++			  const struct extent_buffer *buf,
+ 			  struct extent_buffer *cow)
+ {
+ 	struct btrfs_fs_info *fs_info = root->fs_info;
+@@ -4561,7 +4491,7 @@ int btrfs_reloc_post_snapshot(struct btrfs_trans_handle *trans,
+  *
+  * Return U64_MAX if no running relocation.
+  */
+-u64 btrfs_get_reloc_bg_bytenr(struct btrfs_fs_info *fs_info)
++u64 btrfs_get_reloc_bg_bytenr(const struct btrfs_fs_info *fs_info)
+ {
+ 	u64 logical = U64_MAX;
+ 
+diff --git a/fs/btrfs/relocation.h b/fs/btrfs/relocation.h
+index 77d69f6ae967c2..5fb60f2deb5305 100644
+--- a/fs/btrfs/relocation.h
++++ b/fs/btrfs/relocation.h
+@@ -10,15 +10,16 @@ int btrfs_update_reloc_root(struct btrfs_trans_handle *trans,
+ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info);
+ int btrfs_reloc_clone_csums(struct btrfs_ordered_extent *ordered);
+ int btrfs_reloc_cow_block(struct btrfs_trans_handle *trans,
+-			  struct btrfs_root *root, struct extent_buffer *buf,
++			  struct btrfs_root *root,
++			  const struct extent_buffer *buf,
+ 			  struct extent_buffer *cow);
+ void btrfs_reloc_pre_snapshot(struct btrfs_pending_snapshot *pending,
+ 			      u64 *bytes_to_reserve);
+ int btrfs_reloc_post_snapshot(struct btrfs_trans_handle *trans,
+ 			      struct btrfs_pending_snapshot *pending);
+-int btrfs_should_cancel_balance(struct btrfs_fs_info *fs_info);
++int btrfs_should_cancel_balance(const struct btrfs_fs_info *fs_info);
+ struct btrfs_root *find_reloc_root(struct btrfs_fs_info *fs_info, u64 bytenr);
+-int btrfs_should_ignore_reloc_root(struct btrfs_root *root);
+-u64 btrfs_get_reloc_bg_bytenr(struct btrfs_fs_info *fs_info);
++bool btrfs_should_ignore_reloc_root(const struct btrfs_root *root);
++u64 btrfs_get_reloc_bg_bytenr(const struct btrfs_fs_info *fs_info);
+ 
+ #endif
+diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
+index e912d8e411cc4c..aa1e6d88a72c7c 100644
+--- a/fs/btrfs/send.c
++++ b/fs/btrfs/send.c
+@@ -6190,8 +6190,29 @@ static int send_write_or_clone(struct send_ctx *sctx,
+ 	if (ret < 0)
+ 		return ret;
+ 
+-	if (clone_root->offset + num_bytes == info.size)
++	if (clone_root->offset + num_bytes == info.size) {
++		/*
++		 * The final size of our file matches the end offset, but it may
++		 * be that its current size is larger, so we have to truncate it
++		 * to any value between the start offset of the range and the
++		 * final i_size, otherwise the clone operation is invalid
++		 * because it's unaligned and it ends before the current EOF.
++		 * We do this truncate to the final i_size when we finish
++		 * processing the inode, but it's too late by then. And here we
++		 * truncate to the start offset of the range because it's always
++		 * sector size aligned while if it were the final i_size it
++		 * would result in dirtying part of a page, filling part of a
++		 * page with zeroes and then having the clone operation at the
++		 * receiver trigger IO and wait for it due to the dirty page.
++		 */
++		if (sctx->parent_root != NULL) {
++			ret = send_truncate(sctx, sctx->cur_ino,
++					    sctx->cur_inode_gen, offset);
++			if (ret < 0)
++				return ret;
++		}
+ 		goto clone_data;
++	}
+ 
+ write_data:
+ 	ret = send_extent_data(sctx, path, offset, num_bytes);
+diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
+index 7bf7a5fcc045f8..594e41582ae9ca 100644
+--- a/fs/cachefiles/namei.c
++++ b/fs/cachefiles/namei.c
+@@ -594,14 +594,12 @@ static bool cachefiles_open_file(struct cachefiles_object *object,
+ 	 * write and readdir but not lookup or open).
+ 	 */
+ 	touch_atime(&file->f_path);
+-	dput(dentry);
+ 	return true;
+ 
+ check_failed:
+ 	fscache_cookie_lookup_negative(object->cookie);
+ 	cachefiles_unmark_inode_in_use(object, file);
+ 	fput(file);
+-	dput(dentry);
+ 	if (ret == -ESTALE)
+ 		return cachefiles_create_file(object);
+ 	return false;
+@@ -610,7 +608,6 @@ static bool cachefiles_open_file(struct cachefiles_object *object,
+ 	fput(file);
+ error:
+ 	cachefiles_do_unmark_inode_in_use(object, d_inode(dentry));
+-	dput(dentry);
+ 	return false;
+ }
+ 
+@@ -653,7 +650,9 @@ bool cachefiles_look_up_object(struct cachefiles_object *object)
+ 		goto new_file;
+ 	}
+ 
+-	if (!cachefiles_open_file(object, dentry))
++	ret = cachefiles_open_file(object, dentry);
++	dput(dentry);
++	if (!ret)
+ 		return false;
+ 
+ 	_leave(" = t [%lu]", file_inode(object->file)->i_ino);
+diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
+index da64bb7325dbc0..1a2776025e9861 100644
+--- a/fs/ceph/addr.c
++++ b/fs/ceph/addr.c
+@@ -95,7 +95,6 @@ static bool ceph_dirty_folio(struct address_space *mapping, struct folio *folio)
+ 
+ 	/* dirty the head */
+ 	spin_lock(&ci->i_ceph_lock);
+-	BUG_ON(ci->i_wr_ref == 0); // caller should hold Fw reference
+ 	if (__ceph_have_pending_cap_snap(ci)) {
+ 		struct ceph_cap_snap *capsnap =
+ 				list_last_entry(&ci->i_cap_snaps,
+@@ -484,8 +483,11 @@ static int ceph_init_request(struct netfs_io_request *rreq, struct file *file)
+ 	rreq->netfs_priv = priv;
+ 
+ out:
+-	if (ret < 0)
++	if (ret < 0) {
++		if (got)
++			ceph_put_cap_refs(ceph_inode(inode), got);
+ 		kfree(priv);
++	}
+ 
+ 	return ret;
+ }
+diff --git a/fs/dax.c b/fs/dax.c
+index 3380b43cb6bbbd..d48b4fc7a4838e 100644
+--- a/fs/dax.c
++++ b/fs/dax.c
+@@ -1305,11 +1305,15 @@ int dax_file_unshare(struct inode *inode, loff_t pos, loff_t len,
+ 	struct iomap_iter iter = {
+ 		.inode		= inode,
+ 		.pos		= pos,
+-		.len		= len,
+ 		.flags		= IOMAP_WRITE | IOMAP_UNSHARE | IOMAP_DAX,
+ 	};
++	loff_t size = i_size_read(inode);
+ 	int ret;
+ 
++	if (pos < 0 || pos >= size)
++		return 0;
++
++	iter.len = min(len, size - pos);
+ 	while ((ret = iomap_iter(&iter, ops)) > 0)
+ 		iter.processed = dax_unshare_iter(&iter);
+ 	return ret;
+diff --git a/fs/exec.c b/fs/exec.c
+index 1cbbef281f8cfe..f49b352a60323a 100644
+--- a/fs/exec.c
++++ b/fs/exec.c
+@@ -770,7 +770,8 @@ int setup_arg_pages(struct linux_binprm *bprm,
+ 	stack_base = calc_max_stack_size(stack_base);
+ 
+ 	/* Add space for stack randomization. */
+-	stack_base += (STACK_RND_MASK << PAGE_SHIFT);
++	if (current->flags & PF_RANDOMIZE)
++		stack_base += (STACK_RND_MASK << PAGE_SHIFT);
+ 
+ 	/* Make sure we didn't let the argument array grow too large. */
+ 	if (vma->vm_end - vma->vm_start > stack_base)
+diff --git a/fs/exfat/balloc.c b/fs/exfat/balloc.c
+index e918decb373586..5b547a5963808e 100644
+--- a/fs/exfat/balloc.c
++++ b/fs/exfat/balloc.c
+@@ -110,11 +110,8 @@ int exfat_load_bitmap(struct super_block *sb)
+ 				return -EIO;
+ 
+ 			type = exfat_get_entry_type(ep);
+-			if (type == TYPE_UNUSED)
+-				break;
+-			if (type != TYPE_BITMAP)
+-				continue;
+-			if (ep->dentry.bitmap.flags == 0x0) {
++			if (type == TYPE_BITMAP &&
++			    ep->dentry.bitmap.flags == 0x0) {
+ 				int err;
+ 
+ 				err = exfat_allocate_bitmap(sb, ep);
+@@ -122,6 +119,9 @@ int exfat_load_bitmap(struct super_block *sb)
+ 				return err;
+ 			}
+ 			brelse(bh);
++
++			if (type == TYPE_UNUSED)
++				return -EINVAL;
+ 		}
+ 
+ 		if (exfat_get_next_cluster(sb, &clu.dir))
+diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
+index 3985f8c33f9553..7ea33c3fe94e1c 100644
+--- a/fs/ext4/dir.c
++++ b/fs/ext4/dir.c
+@@ -279,12 +279,20 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)
+ 					struct fscrypt_str de_name =
+ 							FSTR_INIT(de->name,
+ 								de->name_len);
++					u32 hash;
++					u32 minor_hash;
++
++					if (IS_CASEFOLDED(inode)) {
++						hash = EXT4_DIRENT_HASH(de);
++						minor_hash = EXT4_DIRENT_MINOR_HASH(de);
++					} else {
++						hash = 0;
++						minor_hash = 0;
++					}
+ 
+ 					/* Directory is encrypted */
+ 					err = fscrypt_fname_disk_to_usr(inode,
+-						EXT4_DIRENT_HASH(de),
+-						EXT4_DIRENT_MINOR_HASH(de),
+-						&de_name, &fstr);
++						hash, minor_hash, &de_name, &fstr);
+ 					de_name = fstr;
+ 					fstr.len = save_len;
+ 					if (err)
+diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
+index 448e0ea49b31d1..1c059ac1c1ef27 100644
+--- a/fs/ext4/extents.c
++++ b/fs/ext4/extents.c
+@@ -957,6 +957,8 @@ ext4_find_extent(struct inode *inode, ext4_lblk_t block,
+ 
+ 	ext4_ext_show_path(inode, path);
+ 
++	if (orig_path)
++		*orig_path = path;
+ 	return path;
+ 
+ err:
+@@ -1877,6 +1879,7 @@ static void ext4_ext_try_to_merge_up(handle_t *handle,
+ 	path[0].p_hdr->eh_max = cpu_to_le16(max_root);
+ 
+ 	brelse(path[1].p_bh);
++	path[1].p_bh = NULL;
+ 	ext4_free_blocks(handle, inode, NULL, blk, 1,
+ 			 EXT4_FREE_BLOCKS_METADATA | EXT4_FREE_BLOCKS_FORGET);
+ }
+@@ -2103,6 +2106,7 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode,
+ 				       ppath, newext);
+ 	if (err)
+ 		goto cleanup;
++	path = *ppath;
+ 	depth = ext_depth(inode);
+ 	eh = path[depth].p_hdr;
+ 
+@@ -3230,6 +3234,24 @@ static int ext4_split_extent_at(handle_t *handle,
+ 	if (err != -ENOSPC && err != -EDQUOT && err != -ENOMEM)
+ 		goto out;
+ 
++	/*
++	 * Update path is required because previous ext4_ext_insert_extent()
++	 * may have freed or reallocated the path. Using EXT4_EX_NOFAIL
++	 * guarantees that ext4_find_extent() will not return -ENOMEM,
++	 * otherwise -ENOMEM will cause a retry in do_writepages(), and a
++	 * WARN_ON may be triggered in ext4_da_update_reserve_space() due to
++	 * an incorrect ee_len causing the i_reserved_data_blocks exception.
++	 */
++	path = ext4_find_extent(inode, ee_block, ppath,
++				flags | EXT4_EX_NOFAIL);
++	if (IS_ERR(path)) {
++		EXT4_ERROR_INODE(inode, "Failed split extent on %u, err %ld",
++				 split, PTR_ERR(path));
++		return PTR_ERR(path);
++	}
++	depth = ext_depth(inode);
++	ex = path[depth].p_ext;
++
+ 	if (EXT4_EXT_MAY_ZEROOUT & split_flag) {
+ 		if (split_flag & (EXT4_EXT_DATA_VALID1|EXT4_EXT_DATA_VALID2)) {
+ 			if (split_flag & EXT4_EXT_DATA_VALID1) {
+@@ -3282,12 +3304,12 @@ static int ext4_split_extent_at(handle_t *handle,
+ 	ext4_ext_dirty(handle, inode, path + path->p_depth);
+ 	return err;
+ out:
+-	ext4_ext_show_leaf(inode, path);
++	ext4_ext_show_leaf(inode, *ppath);
+ 	return err;
+ }
+ 
+ /*
+- * ext4_split_extents() splits an extent and mark extent which is covered
++ * ext4_split_extent() splits an extent and mark extent which is covered
+  * by @map as split_flags indicates
+  *
+  * It may result in splitting the extent into multiple extents (up to three)
+@@ -3363,7 +3385,7 @@ static int ext4_split_extent(handle_t *handle,
+ 			goto out;
+ 	}
+ 
+-	ext4_ext_show_leaf(inode, path);
++	ext4_ext_show_leaf(inode, *ppath);
+ out:
+ 	return err ? err : allocated;
+ }
+@@ -3828,14 +3850,13 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode,
+ 			struct ext4_ext_path **ppath, int flags,
+ 			unsigned int allocated, ext4_fsblk_t newblock)
+ {
+-	struct ext4_ext_path __maybe_unused *path = *ppath;
+ 	int ret = 0;
+ 	int err = 0;
+ 
+ 	ext_debug(inode, "logical block %llu, max_blocks %u, flags 0x%x, allocated %u\n",
+ 		  (unsigned long long)map->m_lblk, map->m_len, flags,
+ 		  allocated);
+-	ext4_ext_show_leaf(inode, path);
++	ext4_ext_show_leaf(inode, *ppath);
+ 
+ 	/*
+ 	 * When writing into unwritten space, we should not fail to
+@@ -3932,7 +3953,7 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode,
+ 	if (allocated > map->m_len)
+ 		allocated = map->m_len;
+ 	map->m_len = allocated;
+-	ext4_ext_show_leaf(inode, path);
++	ext4_ext_show_leaf(inode, *ppath);
+ out2:
+ 	return err ? err : allocated;
+ }
+@@ -5531,6 +5552,7 @@ static int ext4_insert_range(struct file *file, loff_t offset, loff_t len)
+ 	path = ext4_find_extent(inode, offset_lblk, NULL, 0);
+ 	if (IS_ERR(path)) {
+ 		up_write(&EXT4_I(inode)->i_data_sem);
++		ret = PTR_ERR(path);
+ 		goto out_stop;
+ 	}
+ 
+@@ -5876,7 +5898,7 @@ int ext4_clu_mapped(struct inode *inode, ext4_lblk_t lclu)
+ int ext4_ext_replay_update_ex(struct inode *inode, ext4_lblk_t start,
+ 			      int len, int unwritten, ext4_fsblk_t pblk)
+ {
+-	struct ext4_ext_path *path = NULL, *ppath;
++	struct ext4_ext_path *path;
+ 	struct ext4_extent *ex;
+ 	int ret;
+ 
+@@ -5892,30 +5914,29 @@ int ext4_ext_replay_update_ex(struct inode *inode, ext4_lblk_t start,
+ 	if (le32_to_cpu(ex->ee_block) != start ||
+ 		ext4_ext_get_actual_len(ex) != len) {
+ 		/* We need to split this extent to match our extent first */
+-		ppath = path;
+ 		down_write(&EXT4_I(inode)->i_data_sem);
+-		ret = ext4_force_split_extent_at(NULL, inode, &ppath, start, 1);
++		ret = ext4_force_split_extent_at(NULL, inode, &path, start, 1);
+ 		up_write(&EXT4_I(inode)->i_data_sem);
+ 		if (ret)
+ 			goto out;
+-		kfree(path);
+-		path = ext4_find_extent(inode, start, NULL, 0);
++
++		path = ext4_find_extent(inode, start, &path, 0);
+ 		if (IS_ERR(path))
+-			return -1;
+-		ppath = path;
++			return PTR_ERR(path);
+ 		ex = path[path->p_depth].p_ext;
+ 		WARN_ON(le32_to_cpu(ex->ee_block) != start);
++
+ 		if (ext4_ext_get_actual_len(ex) != len) {
+ 			down_write(&EXT4_I(inode)->i_data_sem);
+-			ret = ext4_force_split_extent_at(NULL, inode, &ppath,
++			ret = ext4_force_split_extent_at(NULL, inode, &path,
+ 							 start + len, 1);
+ 			up_write(&EXT4_I(inode)->i_data_sem);
+ 			if (ret)
+ 				goto out;
+-			kfree(path);
+-			path = ext4_find_extent(inode, start, NULL, 0);
++
++			path = ext4_find_extent(inode, start, &path, 0);
+ 			if (IS_ERR(path))
+-				return -EINVAL;
++				return PTR_ERR(path);
+ 			ex = path[path->p_depth].p_ext;
+ 		}
+ 	}
+diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c
+index f32a91d7c05d90..b527f4ab47e021 100644
+--- a/fs/ext4/fast_commit.c
++++ b/fs/ext4/fast_commit.c
+@@ -339,22 +339,29 @@ void ext4_fc_mark_ineligible(struct super_block *sb, int reason, handle_t *handl
+ {
+ 	struct ext4_sb_info *sbi = EXT4_SB(sb);
+ 	tid_t tid;
++	bool has_transaction = true;
++	bool is_ineligible;
+ 
+ 	if (ext4_fc_disabled(sb))
+ 		return;
+ 
+-	ext4_set_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);
+ 	if (handle && !IS_ERR(handle))
+ 		tid = handle->h_transaction->t_tid;
+ 	else {
+ 		read_lock(&sbi->s_journal->j_state_lock);
+-		tid = sbi->s_journal->j_running_transaction ?
+-				sbi->s_journal->j_running_transaction->t_tid : 0;
++		if (sbi->s_journal->j_running_transaction)
++			tid = sbi->s_journal->j_running_transaction->t_tid;
++		else
++			has_transaction = false;
+ 		read_unlock(&sbi->s_journal->j_state_lock);
+ 	}
+ 	spin_lock(&sbi->s_fc_lock);
+-	if (tid_gt(tid, sbi->s_fc_ineligible_tid))
++	is_ineligible = ext4_test_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);
++	if (has_transaction &&
++	    (!is_ineligible ||
++	     (is_ineligible && tid_gt(tid, sbi->s_fc_ineligible_tid))))
+ 		sbi->s_fc_ineligible_tid = tid;
++	ext4_set_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);
+ 	spin_unlock(&sbi->s_fc_lock);
+ 	WARN_ON(reason >= EXT4_FC_REASON_MAX);
+ 	sbi->s_fc_stats.fc_ineligible_reason_count[reason]++;
+@@ -372,7 +379,7 @@ void ext4_fc_mark_ineligible(struct super_block *sb, int reason, handle_t *handl
+  */
+ static int ext4_fc_track_template(
+ 	handle_t *handle, struct inode *inode,
+-	int (*__fc_track_fn)(struct inode *, void *, bool),
++	int (*__fc_track_fn)(handle_t *handle, struct inode *, void *, bool),
+ 	void *args, int enqueue)
+ {
+ 	bool update = false;
+@@ -389,7 +396,7 @@ static int ext4_fc_track_template(
+ 		ext4_fc_reset_inode(inode);
+ 		ei->i_sync_tid = tid;
+ 	}
+-	ret = __fc_track_fn(inode, args, update);
++	ret = __fc_track_fn(handle, inode, args, update);
+ 	mutex_unlock(&ei->i_fc_lock);
+ 
+ 	if (!enqueue)
+@@ -413,7 +420,8 @@ struct __track_dentry_update_args {
+ };
+ 
+ /* __track_fn for directory entry updates. Called with ei->i_fc_lock. */
+-static int __track_dentry_update(struct inode *inode, void *arg, bool update)
++static int __track_dentry_update(handle_t *handle, struct inode *inode,
++				 void *arg, bool update)
+ {
+ 	struct ext4_fc_dentry_update *node;
+ 	struct ext4_inode_info *ei = EXT4_I(inode);
+@@ -428,14 +436,14 @@ static int __track_dentry_update(struct inode *inode, void *arg, bool update)
+ 
+ 	if (IS_ENCRYPTED(dir)) {
+ 		ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_ENCRYPTED_FILENAME,
+-					NULL);
++					handle);
+ 		mutex_lock(&ei->i_fc_lock);
+ 		return -EOPNOTSUPP;
+ 	}
+ 
+ 	node = kmem_cache_alloc(ext4_fc_dentry_cachep, GFP_NOFS);
+ 	if (!node) {
+-		ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_NOMEM, NULL);
++		ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_NOMEM, handle);
+ 		mutex_lock(&ei->i_fc_lock);
+ 		return -ENOMEM;
+ 	}
+@@ -447,7 +455,7 @@ static int __track_dentry_update(struct inode *inode, void *arg, bool update)
+ 		node->fcd_name.name = kmalloc(dentry->d_name.len, GFP_NOFS);
+ 		if (!node->fcd_name.name) {
+ 			kmem_cache_free(ext4_fc_dentry_cachep, node);
+-			ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_NOMEM, NULL);
++			ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_NOMEM, handle);
+ 			mutex_lock(&ei->i_fc_lock);
+ 			return -ENOMEM;
+ 		}
+@@ -569,7 +577,8 @@ void ext4_fc_track_create(handle_t *handle, struct dentry *dentry)
+ }
+ 
+ /* __track_fn for inode tracking */
+-static int __track_inode(struct inode *inode, void *arg, bool update)
++static int __track_inode(handle_t *handle, struct inode *inode, void *arg,
++			 bool update)
+ {
+ 	if (update)
+ 		return -EEXIST;
+@@ -607,7 +616,8 @@ struct __track_range_args {
+ };
+ 
+ /* __track_fn for tracking data updates */
+-static int __track_range(struct inode *inode, void *arg, bool update)
++static int __track_range(handle_t *handle, struct inode *inode, void *arg,
++			 bool update)
+ {
+ 	struct ext4_inode_info *ei = EXT4_I(inode);
+ 	ext4_lblk_t oldstart;
+@@ -1288,8 +1298,21 @@ static void ext4_fc_cleanup(journal_t *journal, int full, tid_t tid)
+ 		list_del_init(&iter->i_fc_list);
+ 		ext4_clear_inode_state(&iter->vfs_inode,
+ 				       EXT4_STATE_FC_COMMITTING);
+-		if (tid_geq(tid, iter->i_sync_tid))
++		if (tid_geq(tid, iter->i_sync_tid)) {
+ 			ext4_fc_reset_inode(&iter->vfs_inode);
++		} else if (full) {
++			/*
++			 * We are called after a full commit, inode has been
++			 * modified while the commit was running. Re-enqueue
++			 * the inode into STAGING, which will then be splice
++			 * back into MAIN. This cannot happen during
++			 * fastcommit because the journal is locked all the
++			 * time in that case (and tid doesn't increase so
++			 * tid check above isn't reliable).
++			 */
++			list_add_tail(&EXT4_I(&iter->vfs_inode)->i_fc_list,
++				      &sbi->s_fc_q[FC_Q_STAGING]);
++		}
+ 		/* Make sure EXT4_STATE_FC_COMMITTING bit is clear */
+ 		smp_mb();
+ #if (BITS_PER_LONG < 64)
+diff --git a/fs/ext4/file.c b/fs/ext4/file.c
+index 6aa15dafc67786..c71af675e310af 100644
+--- a/fs/ext4/file.c
++++ b/fs/ext4/file.c
+@@ -334,10 +334,10 @@ static ssize_t ext4_handle_inode_extension(struct inode *inode, loff_t offset,
+  * Clean up the inode after DIO or DAX extending write has completed and the
+  * inode size has been updated using ext4_handle_inode_extension().
+  */
+-static void ext4_inode_extension_cleanup(struct inode *inode, ssize_t count)
++static void ext4_inode_extension_cleanup(struct inode *inode, bool need_trunc)
+ {
+ 	lockdep_assert_held_write(&inode->i_rwsem);
+-	if (count < 0) {
++	if (need_trunc) {
+ 		ext4_truncate_failed_write(inode);
+ 		/*
+ 		 * If the truncate operation failed early, then the inode may
+@@ -586,7 +586,7 @@ static ssize_t ext4_dio_write_iter(struct kiocb *iocb, struct iov_iter *from)
+ 		 * writeback of delalloc blocks.
+ 		 */
+ 		WARN_ON_ONCE(ret == -EIOCBQUEUED);
+-		ext4_inode_extension_cleanup(inode, ret);
++		ext4_inode_extension_cleanup(inode, ret < 0);
+ 	}
+ 
+ out:
+@@ -670,7 +670,7 @@ ext4_dax_write_iter(struct kiocb *iocb, struct iov_iter *from)
+ 
+ 	if (extend) {
+ 		ret = ext4_handle_inode_extension(inode, offset, ret);
+-		ext4_inode_extension_cleanup(inode, ret);
++		ext4_inode_extension_cleanup(inode, ret < (ssize_t)count);
+ 	}
+ out:
+ 	inode_unlock(inode);
+diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
+index a4ffd1acac6514..14f7098bcefe1c 100644
+--- a/fs/ext4/inode.c
++++ b/fs/ext4/inode.c
+@@ -5257,8 +5257,9 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode)
+ {
+ 	unsigned offset;
+ 	journal_t *journal = EXT4_SB(inode->i_sb)->s_journal;
+-	tid_t commit_tid = 0;
++	tid_t commit_tid;
+ 	int ret;
++	bool has_transaction;
+ 
+ 	offset = inode->i_size & (PAGE_SIZE - 1);
+ 	/*
+@@ -5283,12 +5284,14 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode)
+ 		folio_put(folio);
+ 		if (ret != -EBUSY)
+ 			return;
+-		commit_tid = 0;
++		has_transaction = false;
+ 		read_lock(&journal->j_state_lock);
+-		if (journal->j_committing_transaction)
++		if (journal->j_committing_transaction) {
+ 			commit_tid = journal->j_committing_transaction->t_tid;
++			has_transaction = true;
++		}
+ 		read_unlock(&journal->j_state_lock);
+-		if (commit_tid)
++		if (has_transaction)
+ 			jbd2_log_wait_commit(journal, commit_tid);
+ 	}
+ }
+diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c
+index d98ac2af8199f1..a5e1492bbaaa56 100644
+--- a/fs/ext4/migrate.c
++++ b/fs/ext4/migrate.c
+@@ -663,8 +663,8 @@ int ext4_ind_migrate(struct inode *inode)
+ 	if (unlikely(ret2 && !ret))
+ 		ret = ret2;
+ errout:
+-	ext4_journal_stop(handle);
+ 	up_write(&EXT4_I(inode)->i_data_sem);
++	ext4_journal_stop(handle);
+ out_unlock:
+ 	ext4_writepages_up_write(inode->i_sb, alloc_ctx);
+ 	return ret;
+diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
+index e6976716e85d4d..0bfd5ff103aa44 100644
+--- a/fs/ext4/move_extent.c
++++ b/fs/ext4/move_extent.c
+@@ -36,7 +36,6 @@ get_ext_path(struct inode *inode, ext4_lblk_t lblock,
+ 		*ppath = NULL;
+ 		return -ENODATA;
+ 	}
+-	*ppath = path;
+ 	return 0;
+ }
+ 
+diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
+index 3bd2301cb48e7e..4de1f61bba76b3 100644
+--- a/fs/ext4/namei.c
++++ b/fs/ext4/namei.c
+@@ -1526,7 +1526,7 @@ static bool ext4_match(struct inode *parent,
+ }
+ 
+ /*
+- * Returns 0 if not found, -1 on failure, and 1 on success
++ * Returns 0 if not found, -EFSCORRUPTED on failure, and 1 on success
+  */
+ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size,
+ 		    struct inode *dir, struct ext4_filename *fname,
+@@ -1547,7 +1547,7 @@ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size,
+ 			 * a full check */
+ 			if (ext4_check_dir_entry(dir, NULL, de, bh, search_buf,
+ 						 buf_size, offset))
+-				return -1;
++				return -EFSCORRUPTED;
+ 			*res_dir = de;
+ 			return 1;
+ 		}
+@@ -1555,7 +1555,7 @@ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size,
+ 		de_len = ext4_rec_len_from_disk(de->rec_len,
+ 						dir->i_sb->s_blocksize);
+ 		if (de_len <= 0)
+-			return -1;
++			return -EFSCORRUPTED;
+ 		offset += de_len;
+ 		de = (struct ext4_dir_entry_2 *) ((char *) de + de_len);
+ 	}
+@@ -1707,8 +1707,10 @@ static struct buffer_head *__ext4_find_entry(struct inode *dir,
+ 			goto cleanup_and_exit;
+ 		} else {
+ 			brelse(bh);
+-			if (i < 0)
++			if (i < 0) {
++				ret = ERR_PTR(i);
+ 				goto cleanup_and_exit;
++			}
+ 		}
+ 	next:
+ 		if (++block >= nblocks)
+@@ -1803,7 +1805,7 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir,
+ 		if (retval == 1)
+ 			goto success;
+ 		brelse(bh);
+-		if (retval == -1) {
++		if (retval < 0) {
+ 			bh = ERR_PTR(ERR_BAD_DX_DIR);
+ 			goto errout;
+ 		}
+@@ -2045,7 +2047,7 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
+ 		split = count/2;
+ 
+ 	hash2 = map[split].hash;
+-	continued = hash2 == map[split - 1].hash;
++	continued = split > 0 ? hash2 == map[split - 1].hash : 0;
+ 	dxtrace(printk(KERN_INFO "Split block %lu at %x, %i/%i\n",
+ 			(unsigned long)dx_get_block(frame->at),
+ 					hash2, split, count-split));
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index 46c4f750497918..ed0dc4cc1d28e9 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -5658,8 +5658,8 @@ failed_mount8: __maybe_unused
+ failed_mount3:
+ 	/* flush s_sb_upd_work before sbi destroy */
+ 	flush_work(&sbi->s_sb_upd_work);
+-	del_timer_sync(&sbi->s_err_report);
+ 	ext4_stop_mmpd(sbi);
++	del_timer_sync(&sbi->s_err_report);
+ 	ext4_group_desc_free(sbi);
+ failed_mount:
+ 	if (sbi->s_chksum_driver)
+diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
+index c368ff671d7739..04ca085b282794 100644
+--- a/fs/ext4/xattr.c
++++ b/fs/ext4/xattr.c
+@@ -2554,6 +2554,8 @@ ext4_xattr_set(struct inode *inode, int name_index, const char *name,
+ 
+ 		error = ext4_xattr_set_handle(handle, inode, name_index, name,
+ 					      value, value_len, flags);
++		ext4_fc_mark_ineligible(inode->i_sb, EXT4_FC_REASON_XATTR,
++					handle);
+ 		error2 = ext4_journal_stop(handle);
+ 		if (error == -ENOSPC &&
+ 		    ext4_should_retry_alloc(sb, &retries))
+@@ -2561,7 +2563,6 @@ ext4_xattr_set(struct inode *inode, int name_index, const char *name,
+ 		if (error == 0)
+ 			error = error2;
+ 	}
+-	ext4_fc_mark_ineligible(inode->i_sb, EXT4_FC_REASON_XATTR, NULL);
+ 
+ 	return error;
+ }
+diff --git a/fs/file.c b/fs/file.c
+index ca984655a187fd..bd817e31d79866 100644
+--- a/fs/file.c
++++ b/fs/file.c
+@@ -267,59 +267,45 @@ static inline void __clear_open_fd(unsigned int fd, struct fdtable *fdt)
+ 	__clear_bit(fd / BITS_PER_LONG, fdt->full_fds_bits);
+ }
+ 
+-static unsigned int count_open_files(struct fdtable *fdt)
+-{
+-	unsigned int size = fdt->max_fds;
+-	unsigned int i;
+-
+-	/* Find the last open fd */
+-	for (i = size / BITS_PER_LONG; i > 0; ) {
+-		if (fdt->open_fds[--i])
+-			break;
+-	}
+-	i = (i + 1) * BITS_PER_LONG;
+-	return i;
+-}
+-
+ /*
+  * Note that a sane fdtable size always has to be a multiple of
+  * BITS_PER_LONG, since we have bitmaps that are sized by this.
+  *
+- * 'max_fds' will normally already be properly aligned, but it
+- * turns out that in the close_range() -> __close_range() ->
+- * unshare_fd() -> dup_fd() -> sane_fdtable_size() we can end
+- * up having a 'max_fds' value that isn't already aligned.
+- *
+- * Rather than make close_range() have to worry about this,
+- * just make that BITS_PER_LONG alignment be part of a sane
+- * fdtable size. Becuase that's really what it is.
++ * punch_hole is optional - when close_range() is asked to unshare
++ * and close, we don't need to copy descriptors in that range, so
++ * a smaller cloned descriptor table might suffice if the last
++ * currently opened descriptor falls into that range.
+  */
+-static unsigned int sane_fdtable_size(struct fdtable *fdt, unsigned int max_fds)
++static unsigned int sane_fdtable_size(struct fdtable *fdt, struct fd_range *punch_hole)
+ {
+-	unsigned int count;
+-
+-	count = count_open_files(fdt);
+-	if (max_fds < NR_OPEN_DEFAULT)
+-		max_fds = NR_OPEN_DEFAULT;
+-	return ALIGN(min(count, max_fds), BITS_PER_LONG);
++	unsigned int last = find_last_bit(fdt->open_fds, fdt->max_fds);
++
++	if (last == fdt->max_fds)
++		return NR_OPEN_DEFAULT;
++	if (punch_hole && punch_hole->to >= last && punch_hole->from <= last) {
++		last = find_last_bit(fdt->open_fds, punch_hole->from);
++		if (last == punch_hole->from)
++			return NR_OPEN_DEFAULT;
++	}
++	return ALIGN(last + 1, BITS_PER_LONG);
+ }
+ 
+ /*
+- * Allocate a new files structure and copy contents from the
+- * passed in files structure.
+- * errorp will be valid only when the returned files_struct is NULL.
++ * Allocate a new descriptor table and copy contents from the passed in
++ * instance.  Returns a pointer to cloned table on success, ERR_PTR()
++ * on failure.  For 'punch_hole' see sane_fdtable_size().
+  */
+-struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int *errorp)
++struct files_struct *dup_fd(struct files_struct *oldf, struct fd_range *punch_hole)
+ {
+ 	struct files_struct *newf;
+ 	struct file **old_fds, **new_fds;
+ 	unsigned int open_files, i;
+ 	struct fdtable *old_fdt, *new_fdt;
++	int error;
+ 
+-	*errorp = -ENOMEM;
+ 	newf = kmem_cache_alloc(files_cachep, GFP_KERNEL);
+ 	if (!newf)
+-		goto out;
++		return ERR_PTR(-ENOMEM);
+ 
+ 	atomic_set(&newf->count, 1);
+ 
+@@ -336,7 +322,7 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int
+ 
+ 	spin_lock(&oldf->file_lock);
+ 	old_fdt = files_fdtable(oldf);
+-	open_files = sane_fdtable_size(old_fdt, max_fds);
++	open_files = sane_fdtable_size(old_fdt, punch_hole);
+ 
+ 	/*
+ 	 * Check whether we need to allocate a larger fd array and fd set.
+@@ -349,14 +335,14 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int
+ 
+ 		new_fdt = alloc_fdtable(open_files - 1);
+ 		if (!new_fdt) {
+-			*errorp = -ENOMEM;
++			error = -ENOMEM;
+ 			goto out_release;
+ 		}
+ 
+ 		/* beyond sysctl_nr_open; nothing to do */
+ 		if (unlikely(new_fdt->max_fds < open_files)) {
+ 			__free_fdtable(new_fdt);
+-			*errorp = -EMFILE;
++			error = -EMFILE;
+ 			goto out_release;
+ 		}
+ 
+@@ -367,7 +353,7 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int
+ 		 */
+ 		spin_lock(&oldf->file_lock);
+ 		old_fdt = files_fdtable(oldf);
+-		open_files = sane_fdtable_size(old_fdt, max_fds);
++		open_files = sane_fdtable_size(old_fdt, punch_hole);
+ 	}
+ 
+ 	copy_fd_bitmaps(new_fdt, old_fdt, open_files / BITS_PER_LONG);
+@@ -401,8 +387,7 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int
+ 
+ out_release:
+ 	kmem_cache_free(files_cachep, newf);
+-out:
+-	return NULL;
++	return ERR_PTR(error);
+ }
+ 
+ static struct fdtable *close_files(struct files_struct * files)
+@@ -736,37 +721,25 @@ int __close_range(unsigned fd, unsigned max_fd, unsigned int flags)
+ 	if (fd > max_fd)
+ 		return -EINVAL;
+ 
+-	if (flags & CLOSE_RANGE_UNSHARE) {
+-		int ret;
+-		unsigned int max_unshare_fds = NR_OPEN_MAX;
++	if ((flags & CLOSE_RANGE_UNSHARE) && atomic_read(&cur_fds->count) > 1) {
++		struct fd_range range = {fd, max_fd}, *punch_hole = &range;
+ 
+ 		/*
+ 		 * If the caller requested all fds to be made cloexec we always
+ 		 * copy all of the file descriptors since they still want to
+ 		 * use them.
+ 		 */
+-		if (!(flags & CLOSE_RANGE_CLOEXEC)) {
+-			/*
+-			 * If the requested range is greater than the current
+-			 * maximum, we're closing everything so only copy all
+-			 * file descriptors beneath the lowest file descriptor.
+-			 */
+-			rcu_read_lock();
+-			if (max_fd >= last_fd(files_fdtable(cur_fds)))
+-				max_unshare_fds = fd;
+-			rcu_read_unlock();
+-		}
+-
+-		ret = unshare_fd(CLONE_FILES, max_unshare_fds, &fds);
+-		if (ret)
+-			return ret;
++		if (flags & CLOSE_RANGE_CLOEXEC)
++			punch_hole = NULL;
+ 
++		fds = dup_fd(cur_fds, punch_hole);
++		if (IS_ERR(fds))
++			return PTR_ERR(fds);
+ 		/*
+ 		 * We used to share our file descriptor table, and have now
+ 		 * created a private one, make sure we're using it below.
+ 		 */
+-		if (fds)
+-			swap(cur_fds, fds);
++		swap(cur_fds, fds);
+ 	}
+ 
+ 	if (flags & CLOSE_RANGE_CLOEXEC)
+diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
+index 975fd88c1f0f4a..aedaad4c37d757 100644
+--- a/fs/iomap/buffered-io.c
++++ b/fs/iomap/buffered-io.c
+@@ -1177,7 +1177,15 @@ static int iomap_write_delalloc_release(struct inode *inode,
+ 			error = data_end;
+ 			goto out_unlock;
+ 		}
+-		WARN_ON_ONCE(data_end <= start_byte);
++
++		/*
++		 * If we race with post-direct I/O invalidation of the page cache,
++		 * there might be no data left at start_byte.
++		 */
++		if (data_end == start_byte)
++			continue;
++
++		WARN_ON_ONCE(data_end < start_byte);
+ 		WARN_ON_ONCE(data_end > scan_end_byte);
+ 
+ 		error = iomap_write_delalloc_scan(inode, &punch_start_byte,
+@@ -1316,11 +1324,15 @@ iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len,
+ 	struct iomap_iter iter = {
+ 		.inode		= inode,
+ 		.pos		= pos,
+-		.len		= len,
+ 		.flags		= IOMAP_WRITE | IOMAP_UNSHARE,
+ 	};
++	loff_t size = i_size_read(inode);
+ 	int ret;
+ 
++	if (pos < 0 || pos >= size)
++		return 0;
++
++	iter.len = min(len, size - pos);
+ 	while ((ret = iomap_iter(&iter, ops)) > 0)
+ 		iter.processed = iomap_unshare_iter(&iter);
+ 	return ret;
+diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
+index 118699fff2f900..8fda66c98a610f 100644
+--- a/fs/jbd2/checkpoint.c
++++ b/fs/jbd2/checkpoint.c
+@@ -79,17 +79,23 @@ __releases(&journal->j_state_lock)
+ 		if (space_left < nblocks) {
+ 			int chkpt = journal->j_checkpoint_transactions != NULL;
+ 			tid_t tid = 0;
++			bool has_transaction = false;
+ 
+-			if (journal->j_committing_transaction)
++			if (journal->j_committing_transaction) {
+ 				tid = journal->j_committing_transaction->t_tid;
++				has_transaction = true;
++			}
+ 			spin_unlock(&journal->j_list_lock);
+ 			write_unlock(&journal->j_state_lock);
+ 			if (chkpt) {
+ 				jbd2_log_do_checkpoint(journal);
+-			} else if (jbd2_cleanup_journal_tail(journal) == 0) {
+-				/* We were able to recover space; yay! */
++			} else if (jbd2_cleanup_journal_tail(journal) <= 0) {
++				/*
++				 * We were able to recover space or the
++				 * journal was aborted due to an error.
++				 */
+ 				;
+-			} else if (tid) {
++			} else if (has_transaction) {
+ 				/*
+ 				 * jbd2_journal_commit_transaction() may want
+ 				 * to take the checkpoint_mutex if JBD2_FLUSHED
+@@ -409,6 +415,7 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
+ 	tid_t tid = 0;
+ 	unsigned long nr_freed = 0;
+ 	unsigned long freed;
++	bool first_set = false;
+ 
+ again:
+ 	spin_lock(&journal->j_list_lock);
+@@ -428,8 +435,10 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
+ 	else
+ 		transaction = journal->j_checkpoint_transactions;
+ 
+-	if (!first_tid)
++	if (!first_set) {
+ 		first_tid = transaction->t_tid;
++		first_set = true;
++	}
+ 	last_transaction = journal->j_checkpoint_transactions->t_cpprev;
+ 	next_transaction = transaction;
+ 	last_tid = last_transaction->t_tid;
+@@ -459,7 +468,7 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
+ 	spin_unlock(&journal->j_list_lock);
+ 	cond_resched();
+ 
+-	if (*nr_to_scan && next_tid)
++	if (*nr_to_scan && journal->j_shrink_transaction)
+ 		goto again;
+ out:
+ 	trace_jbd2_shrink_checkpoint_list(journal, first_tid, tid, last_tid,
+diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
+index 57264eb4d9da37..dfbb8f73861f64 100644
+--- a/fs/jbd2/journal.c
++++ b/fs/jbd2/journal.c
+@@ -725,7 +725,7 @@ int jbd2_fc_begin_commit(journal_t *journal, tid_t tid)
+ 		return -EINVAL;
+ 
+ 	write_lock(&journal->j_state_lock);
+-	if (tid <= journal->j_commit_sequence) {
++	if (tid_geq(journal->j_commit_sequence, tid)) {
+ 		write_unlock(&journal->j_state_lock);
+ 		return -EALREADY;
+ 	}
+@@ -755,9 +755,9 @@ EXPORT_SYMBOL(jbd2_fc_begin_commit);
+  */
+ static int __jbd2_fc_end_commit(journal_t *journal, tid_t tid, bool fallback)
+ {
+-	jbd2_journal_unlock_updates(journal);
+ 	if (journal->j_fc_cleanup_callback)
+ 		journal->j_fc_cleanup_callback(journal, 0, tid);
++	jbd2_journal_unlock_updates(journal);
+ 	write_lock(&journal->j_state_lock);
+ 	journal->j_flags &= ~JBD2_FAST_COMMIT_ONGOING;
+ 	if (fallback)
+diff --git a/fs/jfs/jfs_discard.c b/fs/jfs/jfs_discard.c
+index 575cb2ba74fc86..5f4b305030ad5e 100644
+--- a/fs/jfs/jfs_discard.c
++++ b/fs/jfs/jfs_discard.c
+@@ -65,7 +65,7 @@ void jfs_issue_discard(struct inode *ip, u64 blkno, u64 nblocks)
+ int jfs_ioc_trim(struct inode *ip, struct fstrim_range *range)
+ {
+ 	struct inode *ipbmap = JFS_SBI(ip->i_sb)->ipbmap;
+-	struct bmap *bmp = JFS_SBI(ip->i_sb)->bmap;
++	struct bmap *bmp;
+ 	struct super_block *sb = ipbmap->i_sb;
+ 	int agno, agno_end;
+ 	u64 start, end, minlen;
+@@ -83,10 +83,15 @@ int jfs_ioc_trim(struct inode *ip, struct fstrim_range *range)
+ 	if (minlen == 0)
+ 		minlen = 1;
+ 
++	down_read(&sb->s_umount);
++	bmp = JFS_SBI(ip->i_sb)->bmap;
++
+ 	if (minlen > bmp->db_agsize ||
+ 	    start >= bmp->db_mapsize ||
+-	    range->len < sb->s_blocksize)
++	    range->len < sb->s_blocksize) {
++		up_read(&sb->s_umount);
+ 		return -EINVAL;
++	}
+ 
+ 	if (end >= bmp->db_mapsize)
+ 		end = bmp->db_mapsize - 1;
+@@ -100,6 +105,8 @@ int jfs_ioc_trim(struct inode *ip, struct fstrim_range *range)
+ 		trimmed += dbDiscardAG(ip, agno, minlen);
+ 		agno++;
+ 	}
++
++	up_read(&sb->s_umount);
+ 	range->len = trimmed << sb->s_blocksize_bits;
+ 
+ 	return 0;
+diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
+index 0625d1c0d0649a..974ecf5e0d9522 100644
+--- a/fs/jfs/jfs_dmap.c
++++ b/fs/jfs/jfs_dmap.c
+@@ -2944,9 +2944,10 @@ static void dbAdjTree(dmtree_t *tp, int leafno, int newval, bool is_ctl)
+ static int dbFindLeaf(dmtree_t *tp, int l2nb, int *leafidx, bool is_ctl)
+ {
+ 	int ti, n = 0, k, x = 0;
+-	int max_size;
++	int max_size, max_idx;
+ 
+ 	max_size = is_ctl ? CTLTREESIZE : TREESIZE;
++	max_idx = is_ctl ? LPERCTL : LPERDMAP;
+ 
+ 	/* first check the root of the tree to see if there is
+ 	 * sufficient free space.
+@@ -2978,6 +2979,8 @@ static int dbFindLeaf(dmtree_t *tp, int l2nb, int *leafidx, bool is_ctl)
+ 		 */
+ 		assert(n < 4);
+ 	}
++	if (le32_to_cpu(tp->dmt_leafidx) >= max_idx)
++		return -ENOSPC;
+ 
+ 	/* set the return to the leftmost leaf describing sufficient
+ 	 * free space.
+@@ -3022,7 +3025,7 @@ static int dbFindBits(u32 word, int l2nb)
+ 
+ 	/* scan the word for nb free bits at nb alignments.
+ 	 */
+-	for (bitno = 0; mask != 0; bitno += nb, mask >>= nb) {
++	for (bitno = 0; mask != 0; bitno += nb, mask = (mask >> nb)) {
+ 		if ((mask & word) == mask)
+ 			break;
+ 	}
+diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c
+index 17faf8d3552904..49e064c1f55179 100644
+--- a/fs/jfs/xattr.c
++++ b/fs/jfs/xattr.c
+@@ -434,6 +434,8 @@ static int ea_get(struct inode *inode, struct ea_buffer *ea_buf, int min_size)
+ 	int rc;
+ 	int quota_allocation = 0;
+ 
++	memset(&ea_buf->new_ea, 0, sizeof(ea_buf->new_ea));
++
+ 	/* When fsck.jfs clears a bad ea, it doesn't clear the size */
+ 	if (ji->ea.flag == 0)
+ 		ea_size = 0;
+diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
+index cdad1eaa4a3180..f16bbbfcf672c8 100644
+--- a/fs/nfsd/nfs4state.c
++++ b/fs/nfsd/nfs4state.c
+@@ -1087,7 +1087,8 @@ static void nfs4_free_deleg(struct nfs4_stid *stid)
+  * When a delegation is recalled, the filehandle is stored in the "new"
+  * filter.
+  * Every 30 seconds we swap the filters and clear the "new" one,
+- * unless both are empty of course.
++ * unless both are empty of course.  This results in delegations for a
++ * given filehandle being blocked for between 30 and 60 seconds.
+  *
+  * Each filter is 256 bits.  We hash the filehandle to 32bit and use the
+  * low 3 bytes as hash-table indices.
+@@ -1116,9 +1117,9 @@ static int delegation_blocked(struct knfsd_fh *fh)
+ 		if (ktime_get_seconds() - bd->swap_time > 30) {
+ 			bd->entries -= bd->old_entries;
+ 			bd->old_entries = bd->entries;
++			bd->new = 1-bd->new;
+ 			memset(bd->set[bd->new], 0,
+ 			       sizeof(bd->set[0]));
+-			bd->new = 1-bd->new;
+ 			bd->swap_time = ktime_get_seconds();
+ 		}
+ 		spin_unlock(&blocked_delegations_lock);
+diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
+index 92c7dde148a4d8..76dfbb99277f05 100644
+--- a/fs/nfsd/nfs4xdr.c
++++ b/fs/nfsd/nfs4xdr.c
+@@ -1245,14 +1245,6 @@ nfsd4_decode_putfh(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
+ 	return nfs_ok;
+ }
+ 
+-static __be32
+-nfsd4_decode_putpubfh(struct nfsd4_compoundargs *argp, union nfsd4_op_u *p)
+-{
+-	if (argp->minorversion == 0)
+-		return nfs_ok;
+-	return nfserr_notsupp;
+-}
+-
+ static __be32
+ nfsd4_decode_read(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
+ {
+@@ -2345,7 +2337,7 @@ static const nfsd4_dec nfsd4_dec_ops[] = {
+ 	[OP_OPEN_CONFIRM]	= nfsd4_decode_open_confirm,
+ 	[OP_OPEN_DOWNGRADE]	= nfsd4_decode_open_downgrade,
+ 	[OP_PUTFH]		= nfsd4_decode_putfh,
+-	[OP_PUTPUBFH]		= nfsd4_decode_putpubfh,
++	[OP_PUTPUBFH]		= nfsd4_decode_noop,
+ 	[OP_PUTROOTFH]		= nfsd4_decode_noop,
+ 	[OP_READ]		= nfsd4_decode_read,
+ 	[OP_READDIR]		= nfsd4_decode_readdir,
+diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
+index 1f2a5b22b6498e..b3e51d88faff46 100644
+--- a/fs/nfsd/vfs.c
++++ b/fs/nfsd/vfs.c
+@@ -101,6 +101,7 @@ nfserrno (int errno)
+ 		{ nfserr_io, -EUCLEAN },
+ 		{ nfserr_perm, -ENOKEY },
+ 		{ nfserr_no_grace, -ENOGRACE},
++		{ nfserr_io, -EBADMSG },
+ 	};
+ 	int	i;
+ 
+diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
+index 29361634ce57ea..315f7c2f6a02c1 100644
+--- a/fs/ocfs2/aops.c
++++ b/fs/ocfs2/aops.c
+@@ -156,9 +156,8 @@ int ocfs2_get_block(struct inode *inode, sector_t iblock,
+ 	err = ocfs2_extent_map_get_blocks(inode, iblock, &p_blkno, &count,
+ 					  &ext_flags);
+ 	if (err) {
+-		mlog(ML_ERROR, "Error %d from get_blocks(0x%p, %llu, 1, "
+-		     "%llu, NULL)\n", err, inode, (unsigned long long)iblock,
+-		     (unsigned long long)p_blkno);
++		mlog(ML_ERROR, "get_blocks() failed, inode: 0x%p, "
++		     "block: %llu\n", inode, (unsigned long long)iblock);
+ 		goto bail;
+ 	}
+ 
+diff --git a/fs/ocfs2/buffer_head_io.c b/fs/ocfs2/buffer_head_io.c
+index 196638a22b48a6..45ca3cb7c0974c 100644
+--- a/fs/ocfs2/buffer_head_io.c
++++ b/fs/ocfs2/buffer_head_io.c
+@@ -235,7 +235,6 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
+ 		if (bhs[i] == NULL) {
+ 			bhs[i] = sb_getblk(sb, block++);
+ 			if (bhs[i] == NULL) {
+-				ocfs2_metadata_cache_io_unlock(ci);
+ 				status = -ENOMEM;
+ 				mlog_errno(status);
+ 				/* Don't forget to put previous bh! */
+@@ -389,7 +388,8 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
+ 		/* Always set the buffer in the cache, even if it was
+ 		 * a forced read, or read-ahead which hasn't yet
+ 		 * completed. */
+-		ocfs2_set_buffer_uptodate(ci, bh);
++		if (bh)
++			ocfs2_set_buffer_uptodate(ci, bh);
+ 	}
+ 	ocfs2_metadata_cache_io_unlock(ci);
+ 
+diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
+index 400aec9126c652..cbe3c12ff5f75c 100644
+--- a/fs/ocfs2/journal.c
++++ b/fs/ocfs2/journal.c
+@@ -1055,7 +1055,7 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)
+ 	if (!igrab(inode))
+ 		BUG();
+ 
+-	num_running_trans = atomic_read(&(osb->journal->j_num_trans));
++	num_running_trans = atomic_read(&(journal->j_num_trans));
+ 	trace_ocfs2_journal_shutdown(num_running_trans);
+ 
+ 	/* Do a commit_cache here. It will flush our journal, *and*
+@@ -1074,9 +1074,10 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)
+ 		osb->commit_task = NULL;
+ 	}
+ 
+-	BUG_ON(atomic_read(&(osb->journal->j_num_trans)) != 0);
++	BUG_ON(atomic_read(&(journal->j_num_trans)) != 0);
+ 
+-	if (ocfs2_mount_local(osb)) {
++	if (ocfs2_mount_local(osb) &&
++	    (journal->j_journal->j_flags & JBD2_LOADED)) {
+ 		jbd2_journal_lock_updates(journal->j_journal);
+ 		status = jbd2_journal_flush(journal->j_journal, 0);
+ 		jbd2_journal_unlock_updates(journal->j_journal);
+diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
+index c803c10dd97ef1..d96011ede18a75 100644
+--- a/fs/ocfs2/localalloc.c
++++ b/fs/ocfs2/localalloc.c
+@@ -1008,6 +1008,25 @@ static int ocfs2_sync_local_to_main(struct ocfs2_super *osb,
+ 		start = bit_off + 1;
+ 	}
+ 
++	/* clear the contiguous bits until the end boundary */
++	if (count) {
++		blkno = la_start_blk +
++			ocfs2_clusters_to_blocks(osb->sb,
++					start - count);
++
++		trace_ocfs2_sync_local_to_main_free(
++				count, start - count,
++				(unsigned long long)la_start_blk,
++				(unsigned long long)blkno);
++
++		status = ocfs2_release_clusters(handle,
++				main_bm_inode,
++				main_bm_bh, blkno,
++				count);
++		if (status < 0)
++			mlog_errno(status);
++	}
++
+ bail:
+ 	if (status)
+ 		mlog_errno(status);
+diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c
+index dfaae1e524124d..257f13cdd14c1f 100644
+--- a/fs/ocfs2/quota_local.c
++++ b/fs/ocfs2/quota_local.c
+@@ -689,7 +689,7 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)
+ 	int status;
+ 	struct buffer_head *bh = NULL;
+ 	struct ocfs2_quota_recovery *rec;
+-	int locked = 0;
++	int locked = 0, global_read = 0;
+ 
+ 	info->dqi_max_spc_limit = 0x7fffffffffffffffLL;
+ 	info->dqi_max_ino_limit = 0x7fffffffffffffffLL;
+@@ -697,6 +697,7 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)
+ 	if (!oinfo) {
+ 		mlog(ML_ERROR, "failed to allocate memory for ocfs2 quota"
+ 			       " info.");
++		status = -ENOMEM;
+ 		goto out_err;
+ 	}
+ 	info->dqi_priv = oinfo;
+@@ -709,6 +710,7 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)
+ 	status = ocfs2_global_read_info(sb, type);
+ 	if (status < 0)
+ 		goto out_err;
++	global_read = 1;
+ 
+ 	status = ocfs2_inode_lock(lqinode, &oinfo->dqi_lqi_bh, 1);
+ 	if (status < 0) {
+@@ -779,10 +781,12 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)
+ 		if (locked)
+ 			ocfs2_inode_unlock(lqinode, 1);
+ 		ocfs2_release_local_quota_bitmaps(&oinfo->dqi_chunk);
++		if (global_read)
++			cancel_delayed_work_sync(&oinfo->dqi_sync_work);
+ 		kfree(oinfo);
+ 	}
+ 	brelse(bh);
+-	return -1;
++	return status;
+ }
+ 
+ /* Write local info to quota file */
+diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
+index 3f80a56d0d603c..c71b79b5fb9be0 100644
+--- a/fs/ocfs2/refcounttree.c
++++ b/fs/ocfs2/refcounttree.c
+@@ -25,6 +25,7 @@
+ #include "namei.h"
+ #include "ocfs2_trace.h"
+ #include "file.h"
++#include "symlink.h"
+ 
+ #include <linux/bio.h>
+ #include <linux/blkdev.h>
+@@ -4155,8 +4156,9 @@ static int __ocfs2_reflink(struct dentry *old_dentry,
+ 	int ret;
+ 	struct inode *inode = d_inode(old_dentry);
+ 	struct buffer_head *new_bh = NULL;
++	struct ocfs2_inode_info *oi = OCFS2_I(inode);
+ 
+-	if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_SYSTEM_FILE) {
++	if (oi->ip_flags & OCFS2_INODE_SYSTEM_FILE) {
+ 		ret = -EINVAL;
+ 		mlog_errno(ret);
+ 		goto out;
+@@ -4182,6 +4184,26 @@ static int __ocfs2_reflink(struct dentry *old_dentry,
+ 		goto out_unlock;
+ 	}
+ 
++	if ((oi->ip_dyn_features & OCFS2_HAS_XATTR_FL) &&
++	    (oi->ip_dyn_features & OCFS2_INLINE_XATTR_FL)) {
++		/*
++		 * Adjust extent record count to reserve space for extended attribute.
++		 * Inline data count had been adjusted in ocfs2_duplicate_inline_data().
++		 */
++		struct ocfs2_inode_info *new_oi = OCFS2_I(new_inode);
++
++		if (!(new_oi->ip_dyn_features & OCFS2_INLINE_DATA_FL) &&
++		    !(ocfs2_inode_is_fast_symlink(new_inode))) {
++			struct ocfs2_dinode *new_di = (struct ocfs2_dinode *)new_bh->b_data;
++			struct ocfs2_dinode *old_di = (struct ocfs2_dinode *)old_bh->b_data;
++			struct ocfs2_extent_list *el = &new_di->id2.i_list;
++			int inline_size = le16_to_cpu(old_di->i_xattr_inline_size);
++
++			le16_add_cpu(&el->l_count, -(inline_size /
++					sizeof(struct ocfs2_extent_rec)));
++		}
++	}
++
+ 	ret = ocfs2_create_reflink_node(inode, old_bh,
+ 					new_inode, new_bh, preserve);
+ 	if (ret) {
+@@ -4189,7 +4211,7 @@ static int __ocfs2_reflink(struct dentry *old_dentry,
+ 		goto inode_unlock;
+ 	}
+ 
+-	if (OCFS2_I(inode)->ip_dyn_features & OCFS2_HAS_XATTR_FL) {
++	if (oi->ip_dyn_features & OCFS2_HAS_XATTR_FL) {
+ 		ret = ocfs2_reflink_xattrs(inode, old_bh,
+ 					   new_inode, new_bh,
+ 					   preserve);
+diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
+index 29d53d1d1476bd..1cc28891807154 100644
+--- a/fs/ocfs2/xattr.c
++++ b/fs/ocfs2/xattr.c
+@@ -6520,16 +6520,7 @@ static int ocfs2_reflink_xattr_inline(struct ocfs2_xattr_reflink *args)
+ 	}
+ 
+ 	new_oi = OCFS2_I(args->new_inode);
+-	/*
+-	 * Adjust extent record count to reserve space for extended attribute.
+-	 * Inline data count had been adjusted in ocfs2_duplicate_inline_data().
+-	 */
+-	if (!(new_oi->ip_dyn_features & OCFS2_INLINE_DATA_FL) &&
+-	    !(ocfs2_inode_is_fast_symlink(args->new_inode))) {
+-		struct ocfs2_extent_list *el = &new_di->id2.i_list;
+-		le16_add_cpu(&el->l_count, -(inline_size /
+-					sizeof(struct ocfs2_extent_rec)));
+-	}
++
+ 	spin_lock(&new_oi->ip_lock);
+ 	new_oi->ip_dyn_features |= OCFS2_HAS_XATTR_FL | OCFS2_INLINE_XATTR_FL;
+ 	new_di->i_dyn_features = cpu_to_le16(new_oi->ip_dyn_features);
+diff --git a/fs/overlayfs/params.c b/fs/overlayfs/params.c
+index 0f3768cf9e8716..21d31aaef95d6c 100644
+--- a/fs/overlayfs/params.c
++++ b/fs/overlayfs/params.c
+@@ -761,11 +761,6 @@ int ovl_fs_params_verify(const struct ovl_fs_context *ctx,
+ {
+ 	struct ovl_opt_set set = ctx->set;
+ 
+-	if (ctx->nr_data > 0 && !config->metacopy) {
+-		pr_err("lower data-only dirs require metacopy support.\n");
+-		return -EINVAL;
+-	}
+-
+ 	/* Workdir/index are useless in non-upper mount */
+ 	if (!config->upperdir) {
+ 		if (config->workdir) {
+@@ -917,6 +912,39 @@ int ovl_fs_params_verify(const struct ovl_fs_context *ctx,
+ 		config->metacopy = false;
+ 	}
+ 
++	/*
++	 * Fail if we don't have trusted xattr capability and a feature was
++	 * explicitly requested that requires them.
++	 */
++	if (!config->userxattr && !capable(CAP_SYS_ADMIN)) {
++		if (set.redirect &&
++		    config->redirect_mode != OVL_REDIRECT_NOFOLLOW) {
++			pr_err("redirect_dir requires permission to access trusted xattrs\n");
++			return -EPERM;
++		}
++		if (config->metacopy && set.metacopy) {
++			pr_err("metacopy requires permission to access trusted xattrs\n");
++			return -EPERM;
++		}
++		if (config->verity_mode) {
++			pr_err("verity requires permission to access trusted xattrs\n");
++			return -EPERM;
++		}
++		if (ctx->nr_data > 0) {
++			pr_err("lower data-only dirs require permission to access trusted xattrs\n");
++			return -EPERM;
++		}
++		/*
++		 * Other xattr-dependent features should be disabled without
++		 * great disturbance to the user in ovl_make_workdir().
++		 */
++	}
++
++	if (ctx->nr_data > 0 && !config->metacopy) {
++		pr_err("lower data-only dirs require metacopy support.\n");
++		return -EINVAL;
++	}
++
+ 	return 0;
+ }
+ 
+diff --git a/fs/proc/base.c b/fs/proc/base.c
+index 6e61d93ffa5523..699f085d4de7d7 100644
+--- a/fs/proc/base.c
++++ b/fs/proc/base.c
+@@ -85,6 +85,7 @@
+ #include <linux/elf.h>
+ #include <linux/pid_namespace.h>
+ #include <linux/user_namespace.h>
++#include <linux/fs_parser.h>
+ #include <linux/fs_struct.h>
+ #include <linux/slab.h>
+ #include <linux/sched/autogroup.h>
+@@ -116,6 +117,40 @@
+ static u8 nlink_tid __ro_after_init;
+ static u8 nlink_tgid __ro_after_init;
+ 
++enum proc_mem_force {
++	PROC_MEM_FORCE_ALWAYS,
++	PROC_MEM_FORCE_PTRACE,
++	PROC_MEM_FORCE_NEVER
++};
++
++static enum proc_mem_force proc_mem_force_override __ro_after_init =
++	IS_ENABLED(CONFIG_PROC_MEM_NO_FORCE) ? PROC_MEM_FORCE_NEVER :
++	IS_ENABLED(CONFIG_PROC_MEM_FORCE_PTRACE) ? PROC_MEM_FORCE_PTRACE :
++	PROC_MEM_FORCE_ALWAYS;
++
++static const struct constant_table proc_mem_force_table[] __initconst = {
++	{ "always", PROC_MEM_FORCE_ALWAYS },
++	{ "ptrace", PROC_MEM_FORCE_PTRACE },
++	{ "never", PROC_MEM_FORCE_NEVER },
++	{ }
++};
++
++static int __init early_proc_mem_force_override(char *buf)
++{
++	if (!buf)
++		return -EINVAL;
++
++	/*
++	 * lookup_constant() defaults to proc_mem_force_override to preseve
++	 * the initial Kconfig choice in case an invalid param gets passed.
++	 */
++	proc_mem_force_override = lookup_constant(proc_mem_force_table,
++						  buf, proc_mem_force_override);
++
++	return 0;
++}
++early_param("proc_mem.force_override", early_proc_mem_force_override);
++
+ struct pid_entry {
+ 	const char *name;
+ 	unsigned int len;
+@@ -834,6 +869,28 @@ static int mem_open(struct inode *inode, struct file *file)
+ 	return ret;
+ }
+ 
++static bool proc_mem_foll_force(struct file *file, struct mm_struct *mm)
++{
++	struct task_struct *task;
++	bool ptrace_active = false;
++
++	switch (proc_mem_force_override) {
++	case PROC_MEM_FORCE_NEVER:
++		return false;
++	case PROC_MEM_FORCE_PTRACE:
++		task = get_proc_task(file_inode(file));
++		if (task) {
++			ptrace_active =	READ_ONCE(task->ptrace) &&
++					READ_ONCE(task->mm) == mm &&
++					READ_ONCE(task->parent) == current;
++			put_task_struct(task);
++		}
++		return ptrace_active;
++	default:
++		return true;
++	}
++}
++
+ static ssize_t mem_rw(struct file *file, char __user *buf,
+ 			size_t count, loff_t *ppos, int write)
+ {
+@@ -854,7 +911,9 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
+ 	if (!mmget_not_zero(mm))
+ 		goto free;
+ 
+-	flags = FOLL_FORCE | (write ? FOLL_WRITE : 0);
++	flags = write ? FOLL_WRITE : 0;
++	if (proc_mem_foll_force(file, mm))
++		flags |= FOLL_FORCE;
+ 
+ 	while (count > 0) {
+ 		size_t this_len = min_t(size_t, count, PAGE_SIZE);
+diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c
+index 87caeff427a16c..2d9f8bdb6d4efe 100644
+--- a/fs/smb/client/cifsfs.c
++++ b/fs/smb/client/cifsfs.c
+@@ -312,8 +312,17 @@ cifs_statfs(struct dentry *dentry, struct kstatfs *buf)
+ 	struct TCP_Server_Info *server = tcon->ses->server;
+ 	unsigned int xid;
+ 	int rc = 0;
++	const char *full_path;
++	void *page;
+ 
+ 	xid = get_xid();
++	page = alloc_dentry_path();
++
++	full_path = build_path_from_dentry(dentry, page);
++	if (IS_ERR(full_path)) {
++		rc = PTR_ERR(full_path);
++		goto statfs_out;
++	}
+ 
+ 	if (le32_to_cpu(tcon->fsAttrInfo.MaxPathNameComponentLength) > 0)
+ 		buf->f_namelen =
+@@ -329,8 +338,10 @@ cifs_statfs(struct dentry *dentry, struct kstatfs *buf)
+ 	buf->f_ffree = 0;	/* unlimited */
+ 
+ 	if (server->ops->queryfs)
+-		rc = server->ops->queryfs(xid, tcon, cifs_sb, buf);
++		rc = server->ops->queryfs(xid, tcon, full_path, cifs_sb, buf);
+ 
++statfs_out:
++	free_dentry_path(page);
+ 	free_xid(xid);
+ 	return rc;
+ }
+diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h
+index 54a84003950a45..111540eff66e7d 100644
+--- a/fs/smb/client/cifsglob.h
++++ b/fs/smb/client/cifsglob.h
+@@ -485,7 +485,7 @@ struct smb_version_operations {
+ 			__u16 net_fid, struct cifsInodeInfo *cifs_inode);
+ 	/* query remote filesystem */
+ 	int (*queryfs)(const unsigned int, struct cifs_tcon *,
+-		       struct cifs_sb_info *, struct kstatfs *);
++		       const char *, struct cifs_sb_info *, struct kstatfs *);
+ 	/* send mandatory brlock to the server */
+ 	int (*mand_lock)(const unsigned int, struct cifsFileInfo *, __u64,
+ 			 __u64, __u32, int, int, bool);
+diff --git a/fs/smb/client/inode.c b/fs/smb/client/inode.c
+index e74ba047902d8a..e7970cbeb86111 100644
+--- a/fs/smb/client/inode.c
++++ b/fs/smb/client/inode.c
+@@ -779,10 +779,6 @@ static void cifs_open_info_to_fattr(struct cifs_fattr *fattr,
+ 		fattr->cf_mode = S_IFREG | cifs_sb->ctx->file_mode;
+ 		fattr->cf_dtype = DT_REG;
+ 
+-		/* clear write bits if ATTR_READONLY is set */
+-		if (fattr->cf_cifsattrs & ATTR_READONLY)
+-			fattr->cf_mode &= ~(S_IWUGO);
+-
+ 		/*
+ 		 * Don't accept zero nlink from non-unix servers unless
+ 		 * delete is pending.  Instead mark it as unknown.
+@@ -795,6 +791,10 @@ static void cifs_open_info_to_fattr(struct cifs_fattr *fattr,
+ 		}
+ 	}
+ 
++	/* clear write bits if ATTR_READONLY is set */
++	if (fattr->cf_cifsattrs & ATTR_READONLY)
++		fattr->cf_mode &= ~(S_IWUGO);
++
+ out_reparse:
+ 	if (S_ISLNK(fattr->cf_mode)) {
+ 		if (likely(data->symlink_target))
+@@ -1212,11 +1212,14 @@ static int cifs_get_fattr(struct cifs_open_info_data *data,
+ 				 __func__, rc);
+ 			goto out;
+ 		}
+-	}
+-
+-	/* fill in remaining high mode bits e.g. SUID, VTX */
+-	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL)
++	} else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL)
++		/* fill in remaining high mode bits e.g. SUID, VTX */
+ 		cifs_sfu_mode(fattr, full_path, cifs_sb, xid);
++	else if (!(tcon->posix_extensions))
++		/* clear write bits if ATTR_READONLY is set */
++		if (fattr->cf_cifsattrs & ATTR_READONLY)
++			fattr->cf_mode &= ~(S_IWUGO);
++
+ 
+ 	/* check for Minshall+French symlinks */
+ 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS) {
+diff --git a/fs/smb/client/reparse.c b/fs/smb/client/reparse.c
+index 48c27581ec511c..ad0e0de9a165d4 100644
+--- a/fs/smb/client/reparse.c
++++ b/fs/smb/client/reparse.c
+@@ -320,15 +320,21 @@ static int parse_reparse_posix(struct reparse_posix_data *buf,
+ 	unsigned int len;
+ 	u64 type;
+ 
++	len = le16_to_cpu(buf->ReparseDataLength);
++	if (len < sizeof(buf->InodeType)) {
++		cifs_dbg(VFS, "srv returned malformed nfs buffer\n");
++		return -EIO;
++	}
++
++	len -= sizeof(buf->InodeType);
++
+ 	switch ((type = le64_to_cpu(buf->InodeType))) {
+ 	case NFS_SPECFILE_LNK:
+-		len = le16_to_cpu(buf->ReparseDataLength);
+ 		data->symlink_target = cifs_strndup_from_utf16(buf->DataBuffer,
+ 							       len, true,
+ 							       cifs_sb->local_nls);
+ 		if (!data->symlink_target)
+ 			return -ENOMEM;
+-		convert_delimiter(data->symlink_target, '/');
+ 		cifs_dbg(FYI, "%s: target path: %s\n",
+ 			 __func__, data->symlink_target);
+ 		break;
+@@ -482,12 +488,18 @@ bool cifs_reparse_point_to_fattr(struct cifs_sb_info *cifs_sb,
+ 	u32 tag = data->reparse.tag;
+ 
+ 	if (tag == IO_REPARSE_TAG_NFS && buf) {
++		if (le16_to_cpu(buf->ReparseDataLength) < sizeof(buf->InodeType))
++			return false;
+ 		switch (le64_to_cpu(buf->InodeType)) {
+ 		case NFS_SPECFILE_CHR:
++			if (le16_to_cpu(buf->ReparseDataLength) != sizeof(buf->InodeType) + 8)
++				return false;
+ 			fattr->cf_mode |= S_IFCHR;
+ 			fattr->cf_rdev = reparse_nfs_mkdev(buf);
+ 			break;
+ 		case NFS_SPECFILE_BLK:
++			if (le16_to_cpu(buf->ReparseDataLength) != sizeof(buf->InodeType) + 8)
++				return false;
+ 			fattr->cf_mode |= S_IFBLK;
+ 			fattr->cf_rdev = reparse_nfs_mkdev(buf);
+ 			break;
+diff --git a/fs/smb/client/smb1ops.c b/fs/smb/client/smb1ops.c
+index 212ec6f66ec65b..e3a195824b4037 100644
+--- a/fs/smb/client/smb1ops.c
++++ b/fs/smb/client/smb1ops.c
+@@ -909,7 +909,7 @@ cifs_oplock_response(struct cifs_tcon *tcon, __u64 persistent_fid,
+ 
+ static int
+ cifs_queryfs(const unsigned int xid, struct cifs_tcon *tcon,
+-	     struct cifs_sb_info *cifs_sb, struct kstatfs *buf)
++	     const char *path, struct cifs_sb_info *cifs_sb, struct kstatfs *buf)
+ {
+ 	int rc = -EOPNOTSUPP;
+ 
+diff --git a/fs/smb/client/smb2inode.c b/fs/smb/client/smb2inode.c
+index dd8acd20775219..8010b3ed4b3fe4 100644
+--- a/fs/smb/client/smb2inode.c
++++ b/fs/smb/client/smb2inode.c
+@@ -1205,9 +1205,12 @@ struct inode *smb2_get_reparse_inode(struct cifs_open_info_data *data,
+ 	struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
+ 	struct cifsFileInfo *cfile;
+ 	struct inode *new = NULL;
++	int out_buftype[4] = {};
++	struct kvec out_iov[4] = {};
+ 	struct kvec in_iov[2];
+ 	int cmds[2];
+ 	int rc;
++	int i;
+ 
+ 	oparms = CIFS_OPARMS(cifs_sb, tcon, full_path,
+ 			     SYNCHRONIZE | DELETE |
+@@ -1228,7 +1231,7 @@ struct inode *smb2_get_reparse_inode(struct cifs_open_info_data *data,
+ 		cmds[1] = SMB2_OP_POSIX_QUERY_INFO;
+ 		cifs_get_writable_path(tcon, full_path, FIND_WR_ANY, &cfile);
+ 		rc = smb2_compound_op(xid, tcon, cifs_sb, full_path, &oparms,
+-				      in_iov, cmds, 2, cfile, NULL, NULL, NULL);
++				      in_iov, cmds, 2, cfile, out_iov, out_buftype, NULL);
+ 		if (!rc) {
+ 			rc = smb311_posix_get_inode_info(&new, full_path,
+ 							 data, sb, xid);
+@@ -1237,12 +1240,29 @@ struct inode *smb2_get_reparse_inode(struct cifs_open_info_data *data,
+ 		cmds[1] = SMB2_OP_QUERY_INFO;
+ 		cifs_get_writable_path(tcon, full_path, FIND_WR_ANY, &cfile);
+ 		rc = smb2_compound_op(xid, tcon, cifs_sb, full_path, &oparms,
+-				      in_iov, cmds, 2, cfile, NULL, NULL, NULL);
++				      in_iov, cmds, 2, cfile, out_iov, out_buftype, NULL);
+ 		if (!rc) {
+ 			rc = cifs_get_inode_info(&new, full_path,
+ 						 data, sb, xid, NULL);
+ 		}
+ 	}
++
++
++	/*
++	 * If CREATE was successful but SMB2_OP_SET_REPARSE failed then
++	 * remove the intermediate object created by CREATE. Otherwise
++	 * empty object stay on the server when reparse call failed.
++	 */
++	if (rc &&
++	    out_iov[0].iov_base != NULL && out_buftype[0] != CIFS_NO_BUFFER &&
++	    ((struct smb2_hdr *)out_iov[0].iov_base)->Status == STATUS_SUCCESS &&
++	    (out_iov[1].iov_base == NULL || out_buftype[1] == CIFS_NO_BUFFER ||
++	     ((struct smb2_hdr *)out_iov[1].iov_base)->Status != STATUS_SUCCESS))
++		smb2_unlink(xid, tcon, full_path, cifs_sb, NULL);
++
++	for (i = 0; i < ARRAY_SIZE(out_buftype); i++)
++		free_rsp_buf(out_buftype[i], out_iov[i].iov_base);
++
+ 	return rc ? ERR_PTR(rc) : new;
+ }
+ 
+diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
+index acd5d7d7935257..007d0a683910f6 100644
+--- a/fs/smb/client/smb2ops.c
++++ b/fs/smb/client/smb2ops.c
+@@ -2783,7 +2783,7 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon,
+ 
+ static int
+ smb2_queryfs(const unsigned int xid, struct cifs_tcon *tcon,
+-	     struct cifs_sb_info *cifs_sb, struct kstatfs *buf)
++	     const char *path, struct cifs_sb_info *cifs_sb, struct kstatfs *buf)
+ {
+ 	struct smb2_query_info_rsp *rsp;
+ 	struct smb2_fs_full_size_info *info = NULL;
+@@ -2792,7 +2792,7 @@ smb2_queryfs(const unsigned int xid, struct cifs_tcon *tcon,
+ 	int rc;
+ 
+ 
+-	rc = smb2_query_info_compound(xid, tcon, "",
++	rc = smb2_query_info_compound(xid, tcon, path,
+ 				      FILE_READ_ATTRIBUTES,
+ 				      FS_FULL_SIZE_INFORMATION,
+ 				      SMB2_O_INFO_FILESYSTEM,
+@@ -2820,28 +2820,33 @@ smb2_queryfs(const unsigned int xid, struct cifs_tcon *tcon,
+ 
+ static int
+ smb311_queryfs(const unsigned int xid, struct cifs_tcon *tcon,
+-	       struct cifs_sb_info *cifs_sb, struct kstatfs *buf)
++	       const char *path, struct cifs_sb_info *cifs_sb, struct kstatfs *buf)
+ {
+ 	int rc;
+-	__le16 srch_path = 0; /* Null - open root of share */
++	__le16 *utf16_path = NULL;
+ 	u8 oplock = SMB2_OPLOCK_LEVEL_NONE;
+ 	struct cifs_open_parms oparms;
+ 	struct cifs_fid fid;
+ 
+ 	if (!tcon->posix_extensions)
+-		return smb2_queryfs(xid, tcon, cifs_sb, buf);
++		return smb2_queryfs(xid, tcon, path, cifs_sb, buf);
+ 
+ 	oparms = (struct cifs_open_parms) {
+ 		.tcon = tcon,
+-		.path = "",
++		.path = path,
+ 		.desired_access = FILE_READ_ATTRIBUTES,
+ 		.disposition = FILE_OPEN,
+ 		.create_options = cifs_create_options(cifs_sb, 0),
+ 		.fid = &fid,
+ 	};
+ 
+-	rc = SMB2_open(xid, &oparms, &srch_path, &oplock, NULL, NULL,
++	utf16_path = cifs_convert_path_to_utf16(path, cifs_sb);
++	if (utf16_path == NULL)
++		return -ENOMEM;
++
++	rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL, NULL,
+ 		       NULL, NULL);
++	kfree(utf16_path);
+ 	if (rc)
+ 		return rc;
+ 
+diff --git a/fs/smb/server/connection.c b/fs/smb/server/connection.c
+index 7889df8112b4ee..cac80e7bfefc74 100644
+--- a/fs/smb/server/connection.c
++++ b/fs/smb/server/connection.c
+@@ -39,7 +39,8 @@ void ksmbd_conn_free(struct ksmbd_conn *conn)
+ 	xa_destroy(&conn->sessions);
+ 	kvfree(conn->request_buf);
+ 	kfree(conn->preauth_info);
+-	kfree(conn);
++	if (atomic_dec_and_test(&conn->refcnt))
++		kfree(conn);
+ }
+ 
+ /**
+@@ -68,6 +69,7 @@ struct ksmbd_conn *ksmbd_conn_alloc(void)
+ 		conn->um = NULL;
+ 	atomic_set(&conn->req_running, 0);
+ 	atomic_set(&conn->r_count, 0);
++	atomic_set(&conn->refcnt, 1);
+ 	conn->total_credits = 1;
+ 	conn->outstanding_credits = 0;
+ 
+diff --git a/fs/smb/server/connection.h b/fs/smb/server/connection.h
+index b93e5437793e00..82343afc8d0499 100644
+--- a/fs/smb/server/connection.h
++++ b/fs/smb/server/connection.h
+@@ -106,6 +106,7 @@ struct ksmbd_conn {
+ 	bool				signing_negotiated;
+ 	__le16				signing_algorithm;
+ 	bool				binding;
++	atomic_t			refcnt;
+ };
+ 
+ struct ksmbd_conn_ops {
+diff --git a/fs/smb/server/oplock.c b/fs/smb/server/oplock.c
+index e546ffa57b55ab..8ee86478287f93 100644
+--- a/fs/smb/server/oplock.c
++++ b/fs/smb/server/oplock.c
+@@ -51,6 +51,7 @@ static struct oplock_info *alloc_opinfo(struct ksmbd_work *work,
+ 	init_waitqueue_head(&opinfo->oplock_brk);
+ 	atomic_set(&opinfo->refcount, 1);
+ 	atomic_set(&opinfo->breaking_cnt, 0);
++	atomic_inc(&opinfo->conn->refcnt);
+ 
+ 	return opinfo;
+ }
+@@ -124,6 +125,8 @@ static void free_opinfo(struct oplock_info *opinfo)
+ {
+ 	if (opinfo->is_lease)
+ 		free_lease(opinfo);
++	if (opinfo->conn && atomic_dec_and_test(&opinfo->conn->refcnt))
++		kfree(opinfo->conn);
+ 	kfree(opinfo);
+ }
+ 
+@@ -163,9 +166,7 @@ static struct oplock_info *opinfo_get_list(struct ksmbd_inode *ci)
+ 		    !atomic_inc_not_zero(&opinfo->refcount))
+ 			opinfo = NULL;
+ 		else {
+-			atomic_inc(&opinfo->conn->r_count);
+ 			if (ksmbd_conn_releasing(opinfo->conn)) {
+-				atomic_dec(&opinfo->conn->r_count);
+ 				atomic_dec(&opinfo->refcount);
+ 				opinfo = NULL;
+ 			}
+@@ -177,26 +178,11 @@ static struct oplock_info *opinfo_get_list(struct ksmbd_inode *ci)
+ 	return opinfo;
+ }
+ 
+-static void opinfo_conn_put(struct oplock_info *opinfo)
++void opinfo_put(struct oplock_info *opinfo)
+ {
+-	struct ksmbd_conn *conn;
+-
+ 	if (!opinfo)
+ 		return;
+ 
+-	conn = opinfo->conn;
+-	/*
+-	 * Checking waitqueue to dropping pending requests on
+-	 * disconnection. waitqueue_active is safe because it
+-	 * uses atomic operation for condition.
+-	 */
+-	if (!atomic_dec_return(&conn->r_count) && waitqueue_active(&conn->r_count_q))
+-		wake_up(&conn->r_count_q);
+-	opinfo_put(opinfo);
+-}
+-
+-void opinfo_put(struct oplock_info *opinfo)
+-{
+ 	if (!atomic_dec_and_test(&opinfo->refcount))
+ 		return;
+ 
+@@ -1127,14 +1113,11 @@ void smb_send_parent_lease_break_noti(struct ksmbd_file *fp,
+ 			if (!atomic_inc_not_zero(&opinfo->refcount))
+ 				continue;
+ 
+-			atomic_inc(&opinfo->conn->r_count);
+-			if (ksmbd_conn_releasing(opinfo->conn)) {
+-				atomic_dec(&opinfo->conn->r_count);
++			if (ksmbd_conn_releasing(opinfo->conn))
+ 				continue;
+-			}
+ 
+ 			oplock_break(opinfo, SMB2_OPLOCK_LEVEL_NONE);
+-			opinfo_conn_put(opinfo);
++			opinfo_put(opinfo);
+ 		}
+ 	}
+ 	up_read(&p_ci->m_lock);
+@@ -1167,13 +1150,10 @@ void smb_lazy_parent_lease_break_close(struct ksmbd_file *fp)
+ 			if (!atomic_inc_not_zero(&opinfo->refcount))
+ 				continue;
+ 
+-			atomic_inc(&opinfo->conn->r_count);
+-			if (ksmbd_conn_releasing(opinfo->conn)) {
+-				atomic_dec(&opinfo->conn->r_count);
++			if (ksmbd_conn_releasing(opinfo->conn))
+ 				continue;
+-			}
+ 			oplock_break(opinfo, SMB2_OPLOCK_LEVEL_NONE);
+-			opinfo_conn_put(opinfo);
++			opinfo_put(opinfo);
+ 		}
+ 	}
+ 	up_read(&p_ci->m_lock);
+@@ -1252,7 +1232,7 @@ int smb_grant_oplock(struct ksmbd_work *work, int req_op_level, u64 pid,
+ 	prev_opinfo = opinfo_get_list(ci);
+ 	if (!prev_opinfo ||
+ 	    (prev_opinfo->level == SMB2_OPLOCK_LEVEL_NONE && lctx)) {
+-		opinfo_conn_put(prev_opinfo);
++		opinfo_put(prev_opinfo);
+ 		goto set_lev;
+ 	}
+ 	prev_op_has_lease = prev_opinfo->is_lease;
+@@ -1262,19 +1242,19 @@ int smb_grant_oplock(struct ksmbd_work *work, int req_op_level, u64 pid,
+ 	if (share_ret < 0 &&
+ 	    prev_opinfo->level == SMB2_OPLOCK_LEVEL_EXCLUSIVE) {
+ 		err = share_ret;
+-		opinfo_conn_put(prev_opinfo);
++		opinfo_put(prev_opinfo);
+ 		goto err_out;
+ 	}
+ 
+ 	if (prev_opinfo->level != SMB2_OPLOCK_LEVEL_BATCH &&
+ 	    prev_opinfo->level != SMB2_OPLOCK_LEVEL_EXCLUSIVE) {
+-		opinfo_conn_put(prev_opinfo);
++		opinfo_put(prev_opinfo);
+ 		goto op_break_not_needed;
+ 	}
+ 
+ 	list_add(&work->interim_entry, &prev_opinfo->interim_list);
+ 	err = oplock_break(prev_opinfo, SMB2_OPLOCK_LEVEL_II);
+-	opinfo_conn_put(prev_opinfo);
++	opinfo_put(prev_opinfo);
+ 	if (err == -ENOENT)
+ 		goto set_lev;
+ 	/* Check all oplock was freed by close */
+@@ -1337,14 +1317,14 @@ static void smb_break_all_write_oplock(struct ksmbd_work *work,
+ 		return;
+ 	if (brk_opinfo->level != SMB2_OPLOCK_LEVEL_BATCH &&
+ 	    brk_opinfo->level != SMB2_OPLOCK_LEVEL_EXCLUSIVE) {
+-		opinfo_conn_put(brk_opinfo);
++		opinfo_put(brk_opinfo);
+ 		return;
+ 	}
+ 
+ 	brk_opinfo->open_trunc = is_trunc;
+ 	list_add(&work->interim_entry, &brk_opinfo->interim_list);
+ 	oplock_break(brk_opinfo, SMB2_OPLOCK_LEVEL_II);
+-	opinfo_conn_put(brk_opinfo);
++	opinfo_put(brk_opinfo);
+ }
+ 
+ /**
+@@ -1376,11 +1356,8 @@ void smb_break_all_levII_oplock(struct ksmbd_work *work, struct ksmbd_file *fp,
+ 		if (!atomic_inc_not_zero(&brk_op->refcount))
+ 			continue;
+ 
+-		atomic_inc(&brk_op->conn->r_count);
+-		if (ksmbd_conn_releasing(brk_op->conn)) {
+-			atomic_dec(&brk_op->conn->r_count);
++		if (ksmbd_conn_releasing(brk_op->conn))
+ 			continue;
+-		}
+ 
+ 		rcu_read_unlock();
+ 		if (brk_op->is_lease && (brk_op->o_lease->state &
+@@ -1411,7 +1388,7 @@ void smb_break_all_levII_oplock(struct ksmbd_work *work, struct ksmbd_file *fp,
+ 		brk_op->open_trunc = is_trunc;
+ 		oplock_break(brk_op, SMB2_OPLOCK_LEVEL_NONE);
+ next:
+-		opinfo_conn_put(brk_op);
++		opinfo_put(brk_op);
+ 		rcu_read_lock();
+ 	}
+ 	rcu_read_unlock();
+diff --git a/fs/smb/server/vfs_cache.c b/fs/smb/server/vfs_cache.c
+index 8b2e37c8716ed7..271a23abc82fdd 100644
+--- a/fs/smb/server/vfs_cache.c
++++ b/fs/smb/server/vfs_cache.c
+@@ -710,6 +710,8 @@ static bool session_fd_check(struct ksmbd_tree_connect *tcon,
+ 	list_for_each_entry_rcu(op, &ci->m_op_list, op_entry) {
+ 		if (op->conn != conn)
+ 			continue;
++		if (op->conn && atomic_dec_and_test(&op->conn->refcnt))
++			kfree(op->conn);
+ 		op->conn = NULL;
+ 	}
+ 	up_write(&ci->m_lock);
+@@ -807,6 +809,7 @@ int ksmbd_reopen_durable_fd(struct ksmbd_work *work, struct ksmbd_file *fp)
+ 		if (op->conn)
+ 			continue;
+ 		op->conn = fp->conn;
++		atomic_inc(&op->conn->refcnt);
+ 	}
+ 	up_write(&ci->m_lock);
+ 
+diff --git a/include/crypto/internal/simd.h b/include/crypto/internal/simd.h
+index d2316242a98843..be97b97a75dd2d 100644
+--- a/include/crypto/internal/simd.h
++++ b/include/crypto/internal/simd.h
+@@ -14,11 +14,10 @@
+ struct simd_skcipher_alg;
+ struct skcipher_alg;
+ 
+-struct simd_skcipher_alg *simd_skcipher_create_compat(const char *algname,
++struct simd_skcipher_alg *simd_skcipher_create_compat(struct skcipher_alg *ialg,
++						      const char *algname,
+ 						      const char *drvname,
+ 						      const char *basename);
+-struct simd_skcipher_alg *simd_skcipher_create(const char *algname,
+-					       const char *basename);
+ void simd_skcipher_free(struct simd_skcipher_alg *alg);
+ 
+ int simd_register_skciphers_compat(struct skcipher_alg *algs, int count,
+@@ -32,13 +31,6 @@ void simd_unregister_skciphers(struct skcipher_alg *algs, int count,
+ struct simd_aead_alg;
+ struct aead_alg;
+ 
+-struct simd_aead_alg *simd_aead_create_compat(const char *algname,
+-					      const char *drvname,
+-					      const char *basename);
+-struct simd_aead_alg *simd_aead_create(const char *algname,
+-				       const char *basename);
+-void simd_aead_free(struct simd_aead_alg *alg);
+-
+ int simd_register_aeads_compat(struct aead_alg *algs, int count,
+ 			       struct simd_aead_alg **simd_algs);
+ 
+diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
+index a93a387f8a1a15..2ad9c9f9e90ffd 100644
+--- a/include/drm/drm_print.h
++++ b/include/drm/drm_print.h
+@@ -122,7 +122,8 @@ drm_vprintf(struct drm_printer *p, const char *fmt, va_list *va)
+ 
+ /**
+  * struct drm_print_iterator - local struct used with drm_printer_coredump
+- * @data: Pointer to the devcoredump output buffer
++ * @data: Pointer to the devcoredump output buffer, can be NULL if using
++ * drm_printer_coredump to determine size of devcoredump
+  * @start: The offset within the buffer to start writing
+  * @remain: The number of bytes to write for this iteration
+  */
+@@ -167,6 +168,57 @@ struct drm_print_iterator {
+  *			coredump_read, ...)
+  *	}
+  *
++ * The above example has a time complexity of O(N^2), where N is the size of the
++ * devcoredump. This is acceptable for small devcoredumps but scales poorly for
++ * larger ones.
++ *
++ * Another use case for drm_coredump_printer is to capture the devcoredump into
++ * a saved buffer before the dev_coredump() callback. This involves two passes:
++ * one to determine the size of the devcoredump and another to print it to a
++ * buffer. Then, in dev_coredump(), copy from the saved buffer into the
++ * devcoredump read buffer.
++ *
++ * For example::
++ *
++ *	char *devcoredump_saved_buffer;
++ *
++ *	ssize_t __coredump_print(char *buffer, ssize_t count, ...)
++ *	{
++ *		struct drm_print_iterator iter;
++ *		struct drm_printer p;
++ *
++ *		iter.data = buffer;
++ *		iter.start = 0;
++ *		iter.remain = count;
++ *
++ *		p = drm_coredump_printer(&iter);
++ *
++ *		drm_printf(p, "foo=%d\n", foo);
++ *		...
++ *		return count - iter.remain;
++ *	}
++ *
++ *	void coredump_print(...)
++ *	{
++ *		ssize_t count;
++ *
++ *		count = __coredump_print(NULL, INT_MAX, ...);
++ *		devcoredump_saved_buffer = kvmalloc(count, GFP_KERNEL);
++ *		__coredump_print(devcoredump_saved_buffer, count, ...);
++ *	}
++ *
++ *	void coredump_read(char *buffer, loff_t offset, size_t count,
++ *			   void *data, size_t datalen)
++ *	{
++ *		...
++ *		memcpy(buffer, devcoredump_saved_buffer + offset, count);
++ *		...
++ *	}
++ *
++ * The above example has a time complexity of O(N*2), where N is the size of the
++ * devcoredump. This scales better than the previous example for larger
++ * devcoredumps.
++ *
+  * RETURNS:
+  * The &drm_printer object
+  */
+diff --git a/include/dt-bindings/clock/exynos7885.h b/include/dt-bindings/clock/exynos7885.h
+index 255e3aa9432373..54cfccff85086a 100644
+--- a/include/dt-bindings/clock/exynos7885.h
++++ b/include/dt-bindings/clock/exynos7885.h
+@@ -136,12 +136,12 @@
+ #define CLK_MOUT_FSYS_MMC_CARD_USER	2
+ #define CLK_MOUT_FSYS_MMC_EMBD_USER	3
+ #define CLK_MOUT_FSYS_MMC_SDIO_USER	4
+-#define CLK_MOUT_FSYS_USB30DRD_USER	4
+ #define CLK_GOUT_MMC_CARD_ACLK		5
+ #define CLK_GOUT_MMC_CARD_SDCLKIN	6
+ #define CLK_GOUT_MMC_EMBD_ACLK		7
+ #define CLK_GOUT_MMC_EMBD_SDCLKIN	8
+ #define CLK_GOUT_MMC_SDIO_ACLK		9
+ #define CLK_GOUT_MMC_SDIO_SDCLKIN	10
++#define CLK_MOUT_FSYS_USB30DRD_USER	11
+ 
+ #endif /* _DT_BINDINGS_CLOCK_EXYNOS_7885_H */
+diff --git a/include/dt-bindings/clock/qcom,gcc-sc8180x.h b/include/dt-bindings/clock/qcom,gcc-sc8180x.h
+index e893415ae13d0f..2569f874fe13c6 100644
+--- a/include/dt-bindings/clock/qcom,gcc-sc8180x.h
++++ b/include/dt-bindings/clock/qcom,gcc-sc8180x.h
+@@ -246,6 +246,9 @@
+ #define GCC_PCIE_3_CLKREF_CLK					236
+ #define GCC_USB3_PRIM_CLKREF_CLK				237
+ #define GCC_USB3_SEC_CLKREF_CLK					238
++#define GCC_UFS_MEM_CLKREF_EN					239
++#define GCC_UFS_CARD_CLKREF_EN					240
++#define GPLL9							241
+ 
+ #define GCC_EMAC_BCR						0
+ #define GCC_GPU_BCR						1
+diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
+index 3a4cefb25ba61c..9ca4211c063f39 100644
+--- a/include/linux/cpufreq.h
++++ b/include/linux/cpufreq.h
+@@ -1124,10 +1124,9 @@ static inline int parse_perf_domain(int cpu, const char *list_name,
+ 				    const char *cell_name,
+ 				    struct of_phandle_args *args)
+ {
+-	struct device_node *cpu_np;
+ 	int ret;
+ 
+-	cpu_np = of_cpu_device_node_get(cpu);
++	struct device_node *cpu_np __free(device_node) = of_cpu_device_node_get(cpu);
+ 	if (!cpu_np)
+ 		return -ENODEV;
+ 
+@@ -1135,9 +1134,6 @@ static inline int parse_perf_domain(int cpu, const char *list_name,
+ 					 args);
+ 	if (ret < 0)
+ 		return ret;
+-
+-	of_node_put(cpu_np);
+-
+ 	return 0;
+ }
+ 
+diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
+index e066816f3519fb..fcff696860b8fe 100644
+--- a/include/linux/fdtable.h
++++ b/include/linux/fdtable.h
+@@ -22,7 +22,6 @@
+  * as this is the granularity returned by copy_fdset().
+  */
+ #define NR_OPEN_DEFAULT BITS_PER_LONG
+-#define NR_OPEN_MAX ~0U
+ 
+ struct fdtable {
+ 	unsigned int max_fds;
+@@ -117,7 +116,10 @@ struct task_struct;
+ 
+ void put_files_struct(struct files_struct *fs);
+ int unshare_files(void);
+-struct files_struct *dup_fd(struct files_struct *, unsigned, int *) __latent_entropy;
++struct fd_range {
++	unsigned int from, to;
++};
++struct files_struct *dup_fd(struct files_struct *, struct fd_range *) __latent_entropy;
+ void do_close_on_exec(struct files_struct *);
+ int iterate_fd(struct files_struct *, unsigned,
+ 		int (*)(const void *, struct file *, unsigned),
+@@ -126,8 +128,6 @@ int iterate_fd(struct files_struct *, unsigned,
+ extern int close_fd(unsigned int fd);
+ extern int __close_range(unsigned int fd, unsigned int max_fd, unsigned int flags);
+ extern struct file *close_fd_get_file(unsigned int fd);
+-extern int unshare_fd(unsigned long unshare_flags, unsigned int max_fds,
+-		      struct files_struct **new_fdp);
+ 
+ extern struct kmem_cache *files_cachep;
+ 
+diff --git a/include/linux/i2c.h b/include/linux/i2c.h
+index 32cf5708d5a5b6..a3166100f0cce2 100644
+--- a/include/linux/i2c.h
++++ b/include/linux/i2c.h
+@@ -746,6 +746,11 @@ struct i2c_adapter {
+ 
+ 	struct irq_domain *host_notify_domain;
+ 	struct regulator *bus_regulator;
++
++	struct dentry *debugfs;
++
++	/* 7bit address space */
++	DECLARE_BITMAP(addrs_in_instantiation, 1 << 7);
+ };
+ #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev)
+ 
+diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
+index b8e60a20416ba5..8f5ac20b4c03d9 100644
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -5029,6 +5029,24 @@ void netif_set_tso_max_segs(struct net_device *dev, unsigned int segs);
+ void netif_inherit_tso_max(struct net_device *to,
+ 			   const struct net_device *from);
+ 
++static inline unsigned int
++netif_get_gro_max_size(const struct net_device *dev, const struct sk_buff *skb)
++{
++	/* pairs with WRITE_ONCE() in netif_set_gro(_ipv4)_max_size() */
++	return skb->protocol == htons(ETH_P_IPV6) ?
++	       READ_ONCE(dev->gro_max_size) :
++	       READ_ONCE(dev->gro_ipv4_max_size);
++}
++
++static inline unsigned int
++netif_get_gso_max_size(const struct net_device *dev, const struct sk_buff *skb)
++{
++	/* pairs with WRITE_ONCE() in netif_set_gso(_ipv4)_max_size() */
++	return skb->protocol == htons(ETH_P_IPV6) ?
++	       READ_ONCE(dev->gso_max_size) :
++	       READ_ONCE(dev->gso_ipv4_max_size);
++}
++
+ static inline bool netif_is_macsec(const struct net_device *dev)
+ {
+ 	return dev->priv_flags & IFF_MACSEC;
+diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
+index 95d4118ee4a917..7a5563ffe61b53 100644
+--- a/include/linux/perf_event.h
++++ b/include/linux/perf_event.h
+@@ -1599,13 +1599,7 @@ static inline int perf_is_paranoid(void)
+ 	return sysctl_perf_event_paranoid > -1;
+ }
+ 
+-static inline int perf_allow_kernel(struct perf_event_attr *attr)
+-{
+-	if (sysctl_perf_event_paranoid > 1 && !perfmon_capable())
+-		return -EACCES;
+-
+-	return security_perf_event_open(attr, PERF_SECURITY_KERNEL);
+-}
++int perf_allow_kernel(struct perf_event_attr *attr);
+ 
+ static inline int perf_allow_cpu(struct perf_event_attr *attr)
+ {
+diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
+index 5acb77968902dc..42ff5a4de8ee76 100644
+--- a/include/linux/stmmac.h
++++ b/include/linux/stmmac.h
+@@ -117,7 +117,6 @@ struct stmmac_axi {
+ 
+ #define EST_GCL		1024
+ struct stmmac_est {
+-	struct mutex lock;
+ 	int enable;
+ 	u32 btr_reserve[2];
+ 	u32 btr_offset[2];
+diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
+index f46e0ca0169c72..d91e32aff5a134 100644
+--- a/include/linux/uprobes.h
++++ b/include/linux/uprobes.h
+@@ -76,6 +76,8 @@ struct uprobe_task {
+ 	struct uprobe			*active_uprobe;
+ 	unsigned long			xol_vaddr;
+ 
++	struct arch_uprobe              *auprobe;
++
+ 	struct return_instance		*return_instances;
+ 	unsigned int			depth;
+ };
+diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
+index 276ca543ef44d8..02a9f4dc594d02 100644
+--- a/include/linux/virtio_net.h
++++ b/include/linux/virtio_net.h
+@@ -103,8 +103,10 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,
+ 
+ 		if (!skb_partial_csum_set(skb, start, off))
+ 			return -EINVAL;
++		if (skb_transport_offset(skb) < nh_min_len)
++			return -EINVAL;
+ 
+-		nh_min_len = max_t(u32, nh_min_len, skb_transport_offset(skb));
++		nh_min_len = skb_transport_offset(skb);
+ 		p_off = nh_min_len + thlen;
+ 		if (!pskb_may_pull(skb, p_off))
+ 			return -EINVAL;
+diff --git a/include/net/mana/gdma.h b/include/net/mana/gdma.h
+index 88b6ef7ce1a6ef..3965343fdee0cd 100644
+--- a/include/net/mana/gdma.h
++++ b/include/net/mana/gdma.h
+@@ -222,7 +222,15 @@ struct gdma_dev {
+ 	struct auxiliary_device *adev;
+ };
+ 
+-#define MINIMUM_SUPPORTED_PAGE_SIZE PAGE_SIZE
++/* MANA_PAGE_SIZE is the DMA unit */
++#define MANA_PAGE_SHIFT 12
++#define MANA_PAGE_SIZE BIT(MANA_PAGE_SHIFT)
++#define MANA_PAGE_ALIGN(x) ALIGN((x), MANA_PAGE_SIZE)
++#define MANA_PAGE_ALIGNED(addr) IS_ALIGNED((unsigned long)(addr), MANA_PAGE_SIZE)
++#define MANA_PFN(a) ((a) >> MANA_PAGE_SHIFT)
++
++/* Required by HW */
++#define MANA_MIN_QSIZE MANA_PAGE_SIZE
+ 
+ #define GDMA_CQE_SIZE 64
+ #define GDMA_EQE_SIZE 16
+diff --git a/include/net/mana/mana.h b/include/net/mana/mana.h
+index 28e110f733ffd3..7892b79854f62e 100644
+--- a/include/net/mana/mana.h
++++ b/include/net/mana/mana.h
+@@ -42,7 +42,8 @@ enum TRI_STATE {
+ 
+ #define MAX_SEND_BUFFERS_PER_QUEUE 256
+ 
+-#define EQ_SIZE (8 * PAGE_SIZE)
++#define EQ_SIZE (8 * MANA_PAGE_SIZE)
++
+ #define LOG2_EQ_THROTTLE 3
+ 
+ #define MAX_PORTS_IN_MANA_DEV 256
+diff --git a/include/uapi/linux/cec.h b/include/uapi/linux/cec.h
+index b8e071abaea5ac..3eba3934512e60 100644
+--- a/include/uapi/linux/cec.h
++++ b/include/uapi/linux/cec.h
+@@ -132,6 +132,8 @@ static inline void cec_msg_init(struct cec_msg *msg,
+  * Set the msg destination to the orig initiator and the msg initiator to the
+  * orig destination. Note that msg and orig may be the same pointer, in which
+  * case the change is done in place.
++ *
++ * It also zeroes the reply, timeout and flags fields.
+  */
+ static inline void cec_msg_set_reply_to(struct cec_msg *msg,
+ 					struct cec_msg *orig)
+@@ -139,7 +141,9 @@ static inline void cec_msg_set_reply_to(struct cec_msg *msg,
+ 	/* The destination becomes the initiator and vice versa */
+ 	msg->msg[0] = (cec_msg_destination(orig) << 4) |
+ 		      cec_msg_initiator(orig);
+-	msg->reply = msg->timeout = 0;
++	msg->reply = 0;
++	msg->timeout = 0;
++	msg->flags = 0;
+ }
+ 
+ /**
+diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h
+index 621e3035145eba..9c29015d09c10f 100644
+--- a/include/uapi/linux/netfilter/nf_tables.h
++++ b/include/uapi/linux/netfilter/nf_tables.h
+@@ -1690,7 +1690,7 @@ enum nft_flowtable_flags {
+  *
+  * @NFTA_FLOWTABLE_TABLE: name of the table containing the expression (NLA_STRING)
+  * @NFTA_FLOWTABLE_NAME: name of this flow table (NLA_STRING)
+- * @NFTA_FLOWTABLE_HOOK: netfilter hook configuration(NLA_U32)
++ * @NFTA_FLOWTABLE_HOOK: netfilter hook configuration (NLA_NESTED)
+  * @NFTA_FLOWTABLE_USE: number of references to this flow table (NLA_U32)
+  * @NFTA_FLOWTABLE_HANDLE: object handle (NLA_U64)
+  * @NFTA_FLOWTABLE_FLAGS: flags (NLA_U32)
+diff --git a/io_uring/net.c b/io_uring/net.c
+index cf1060fb04f435..7412904387bfa0 100644
+--- a/io_uring/net.c
++++ b/io_uring/net.c
+@@ -930,6 +930,7 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags)
+ 	int ret, min_ret = 0;
+ 	bool force_nonblock = issue_flags & IO_URING_F_NONBLOCK;
+ 	size_t len = sr->len;
++	bool mshot_finished;
+ 
+ 	if (!(req->flags & REQ_F_POLLED) &&
+ 	    (sr->flags & IORING_RECVSEND_POLL_FIRST))
+@@ -999,6 +1000,7 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags)
+ 		req_set_fail(req);
+ 	}
+ 
++	mshot_finished = ret <= 0;
+ 	if (ret > 0)
+ 		ret += sr->done_io;
+ 	else if (sr->done_io)
+@@ -1006,7 +1008,7 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags)
+ 	else
+ 		io_kbuf_recycle(req, issue_flags);
+ 
+-	if (!io_recv_finish(req, &ret, &msg, ret <= 0, issue_flags))
++	if (!io_recv_finish(req, &ret, &msg, mshot_finished, issue_flags))
+ 		goto retry_multishot;
+ 
+ 	return ret;
+diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
+index 834394faf2af30..3032a464d31bbf 100644
+--- a/kernel/bpf/verifier.c
++++ b/kernel/bpf/verifier.c
+@@ -7846,6 +7846,15 @@ static int widen_imprecise_scalars(struct bpf_verifier_env *env,
+ 	return 0;
+ }
+ 
++static struct bpf_reg_state *get_iter_from_state(struct bpf_verifier_state *cur_st,
++						 struct bpf_kfunc_call_arg_meta *meta)
++{
++	int iter_frameno = meta->iter.frameno;
++	int iter_spi = meta->iter.spi;
++
++	return &cur_st->frame[iter_frameno]->stack[iter_spi].spilled_ptr;
++}
++
+ /* process_iter_next_call() is called when verifier gets to iterator's next
+  * "method" (e.g., bpf_iter_num_next() for numbers iterator) call. We'll refer
+  * to it as just "iter_next()" in comments below.
+@@ -7930,12 +7939,10 @@ static int process_iter_next_call(struct bpf_verifier_env *env, int insn_idx,
+ 	struct bpf_verifier_state *cur_st = env->cur_state, *queued_st, *prev_st;
+ 	struct bpf_func_state *cur_fr = cur_st->frame[cur_st->curframe], *queued_fr;
+ 	struct bpf_reg_state *cur_iter, *queued_iter;
+-	int iter_frameno = meta->iter.frameno;
+-	int iter_spi = meta->iter.spi;
+ 
+ 	BTF_TYPE_EMIT(struct bpf_iter);
+ 
+-	cur_iter = &env->cur_state->frame[iter_frameno]->stack[iter_spi].spilled_ptr;
++	cur_iter = get_iter_from_state(cur_st, meta);
+ 
+ 	if (cur_iter->iter.state != BPF_ITER_STATE_ACTIVE &&
+ 	    cur_iter->iter.state != BPF_ITER_STATE_DRAINED) {
+@@ -7963,7 +7970,7 @@ static int process_iter_next_call(struct bpf_verifier_env *env, int insn_idx,
+ 		if (!queued_st)
+ 			return -ENOMEM;
+ 
+-		queued_iter = &queued_st->frame[iter_frameno]->stack[iter_spi].spilled_ptr;
++		queued_iter = get_iter_from_state(queued_st, meta);
+ 		queued_iter->iter.state = BPF_ITER_STATE_ACTIVE;
+ 		queued_iter->iter.depth++;
+ 		if (prev_st)
+@@ -11995,6 +12002,17 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn,
+ 			regs[BPF_REG_0].btf = desc_btf;
+ 			regs[BPF_REG_0].type = PTR_TO_BTF_ID;
+ 			regs[BPF_REG_0].btf_id = ptr_type_id;
++
++			if (is_iter_next_kfunc(&meta)) {
++				struct bpf_reg_state *cur_iter;
++
++				cur_iter = get_iter_from_state(env->cur_state, &meta);
++
++				if (cur_iter->type & MEM_RCU) /* KF_RCU_PROTECTED */
++					regs[BPF_REG_0].type |= MEM_RCU;
++				else
++					regs[BPF_REG_0].type |= PTR_TRUSTED;
++			}
+ 		}
+ 
+ 		if (is_kfunc_ret_null(&meta)) {
+diff --git a/kernel/events/core.c b/kernel/events/core.c
+index 4d0abdace4e7cc..ec0fae49a0dd9a 100644
+--- a/kernel/events/core.c
++++ b/kernel/events/core.c
+@@ -264,6 +264,7 @@ static void event_function_call(struct perf_event *event, event_f func, void *da
+ {
+ 	struct perf_event_context *ctx = event->ctx;
+ 	struct task_struct *task = READ_ONCE(ctx->task); /* verified in event_function */
++	struct perf_cpu_context *cpuctx;
+ 	struct event_function_struct efs = {
+ 		.event = event,
+ 		.func = func,
+@@ -291,22 +292,25 @@ static void event_function_call(struct perf_event *event, event_f func, void *da
+ 	if (!task_function_call(task, event_function, &efs))
+ 		return;
+ 
+-	raw_spin_lock_irq(&ctx->lock);
++	local_irq_disable();
++	cpuctx = this_cpu_ptr(&perf_cpu_context);
++	perf_ctx_lock(cpuctx, ctx);
+ 	/*
+ 	 * Reload the task pointer, it might have been changed by
+ 	 * a concurrent perf_event_context_sched_out().
+ 	 */
+ 	task = ctx->task;
+-	if (task == TASK_TOMBSTONE) {
+-		raw_spin_unlock_irq(&ctx->lock);
+-		return;
+-	}
++	if (task == TASK_TOMBSTONE)
++		goto unlock;
+ 	if (ctx->is_active) {
+-		raw_spin_unlock_irq(&ctx->lock);
++		perf_ctx_unlock(cpuctx, ctx);
++		local_irq_enable();
+ 		goto again;
+ 	}
+ 	func(event, NULL, ctx, data);
+-	raw_spin_unlock_irq(&ctx->lock);
++unlock:
++	perf_ctx_unlock(cpuctx, ctx);
++	local_irq_enable();
+ }
+ 
+ /*
+@@ -4100,7 +4104,11 @@ static void perf_adjust_period(struct perf_event *event, u64 nsec, u64 count, bo
+ 	period = perf_calculate_period(event, nsec, count);
+ 
+ 	delta = (s64)(period - hwc->sample_period);
+-	delta = (delta + 7) / 8; /* low pass filter */
++	if (delta >= 0)
++		delta += 7;
++	else
++		delta -= 7;
++	delta /= 8; /* low pass filter */
+ 
+ 	sample_period = hwc->sample_period + delta;
+ 
+@@ -13330,6 +13338,15 @@ const struct perf_event_attr *perf_event_attrs(struct perf_event *event)
+ 	return &event->attr;
+ }
+ 
++int perf_allow_kernel(struct perf_event_attr *attr)
++{
++	if (sysctl_perf_event_paranoid > 1 && !perfmon_capable())
++		return -EACCES;
++
++	return security_perf_event_open(attr, PERF_SECURITY_KERNEL);
++}
++EXPORT_SYMBOL_GPL(perf_allow_kernel);
++
+ /*
+  * Inherit an event from parent task to child task.
+  *
+diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
+index 4705571f803458..6dac0b5798213b 100644
+--- a/kernel/events/uprobes.c
++++ b/kernel/events/uprobes.c
+@@ -1491,7 +1491,7 @@ static struct xol_area *__create_xol_area(unsigned long vaddr)
+ 
+ 	area->xol_mapping.name = "[uprobes]";
+ 	area->xol_mapping.pages = area->pages;
+-	area->pages[0] = alloc_page(GFP_HIGHUSER);
++	area->pages[0] = alloc_page(GFP_HIGHUSER | __GFP_ZERO);
+ 	if (!area->pages[0])
+ 		goto free_bitmap;
+ 	area->pages[1] = NULL;
+@@ -2071,6 +2071,7 @@ static void handler_chain(struct uprobe *uprobe, struct pt_regs *regs)
+ 	bool need_prep = false; /* prepare return uprobe, when needed */
+ 
+ 	down_read(&uprobe->register_rwsem);
++	current->utask->auprobe = &uprobe->arch;
+ 	for (uc = uprobe->consumers; uc; uc = uc->next) {
+ 		int rc = 0;
+ 
+@@ -2085,6 +2086,7 @@ static void handler_chain(struct uprobe *uprobe, struct pt_regs *regs)
+ 
+ 		remove &= rc;
+ 	}
++	current->utask->auprobe = NULL;
+ 
+ 	if (need_prep && !remove)
+ 		prepare_uretprobe(uprobe, regs); /* put bp at return */
+diff --git a/kernel/fork.c b/kernel/fork.c
+index 177ce7438db6b1..32ffbc1c96bae3 100644
+--- a/kernel/fork.c
++++ b/kernel/fork.c
+@@ -1767,33 +1767,30 @@ static int copy_files(unsigned long clone_flags, struct task_struct *tsk,
+ 		      int no_files)
+ {
+ 	struct files_struct *oldf, *newf;
+-	int error = 0;
+ 
+ 	/*
+ 	 * A background process may not have any files ...
+ 	 */
+ 	oldf = current->files;
+ 	if (!oldf)
+-		goto out;
++		return 0;
+ 
+ 	if (no_files) {
+ 		tsk->files = NULL;
+-		goto out;
++		return 0;
+ 	}
+ 
+ 	if (clone_flags & CLONE_FILES) {
+ 		atomic_inc(&oldf->count);
+-		goto out;
++		return 0;
+ 	}
+ 
+-	newf = dup_fd(oldf, NR_OPEN_MAX, &error);
+-	if (!newf)
+-		goto out;
++	newf = dup_fd(oldf, NULL);
++	if (IS_ERR(newf))
++		return PTR_ERR(newf);
+ 
+ 	tsk->files = newf;
+-	error = 0;
+-out:
+-	return error;
++	return 0;
+ }
+ 
+ static int copy_sighand(unsigned long clone_flags, struct task_struct *tsk)
+@@ -3358,17 +3355,16 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
+ /*
+  * Unshare file descriptor table if it is being shared
+  */
+-int unshare_fd(unsigned long unshare_flags, unsigned int max_fds,
+-	       struct files_struct **new_fdp)
++static int unshare_fd(unsigned long unshare_flags, struct files_struct **new_fdp)
+ {
+ 	struct files_struct *fd = current->files;
+-	int error = 0;
+ 
+ 	if ((unshare_flags & CLONE_FILES) &&
+ 	    (fd && atomic_read(&fd->count) > 1)) {
+-		*new_fdp = dup_fd(fd, max_fds, &error);
+-		if (!*new_fdp)
+-			return error;
++		fd = dup_fd(fd, NULL);
++		if (IS_ERR(fd))
++			return PTR_ERR(fd);
++		*new_fdp = fd;
+ 	}
+ 
+ 	return 0;
+@@ -3426,7 +3422,7 @@ int ksys_unshare(unsigned long unshare_flags)
+ 	err = unshare_fs(unshare_flags, &new_fs);
+ 	if (err)
+ 		goto bad_unshare_out;
+-	err = unshare_fd(unshare_flags, NR_OPEN_MAX, &new_fd);
++	err = unshare_fd(unshare_flags, &new_fd);
+ 	if (err)
+ 		goto bad_unshare_cleanup_fs;
+ 	err = unshare_userns(unshare_flags, &new_cred);
+@@ -3518,7 +3514,7 @@ int unshare_files(void)
+ 	struct files_struct *old, *copy = NULL;
+ 	int error;
+ 
+-	error = unshare_fd(CLONE_FILES, NR_OPEN_MAX, &copy);
++	error = unshare_fd(CLONE_FILES, &copy);
+ 	if (error || !copy)
+ 		return error;
+ 
+diff --git a/kernel/jump_label.c b/kernel/jump_label.c
+index 1ed269b2c4035e..554e04b25b13a8 100644
+--- a/kernel/jump_label.c
++++ b/kernel/jump_label.c
+@@ -159,22 +159,24 @@ bool static_key_slow_inc_cpuslocked(struct static_key *key)
+ 	if (static_key_fast_inc_not_disabled(key))
+ 		return true;
+ 
+-	jump_label_lock();
+-	if (atomic_read(&key->enabled) == 0) {
+-		atomic_set(&key->enabled, -1);
++	guard(mutex)(&jump_label_mutex);
++	/* Try to mark it as 'enabling in progress. */
++	if (!atomic_cmpxchg(&key->enabled, 0, -1)) {
+ 		jump_label_update(key);
+ 		/*
+-		 * Ensure that if the above cmpxchg loop observes our positive
+-		 * value, it must also observe all the text changes.
++		 * Ensure that when static_key_fast_inc_not_disabled() or
++		 * static_key_dec_not_one() observe the positive value,
++		 * they must also observe all the text changes.
+ 		 */
+ 		atomic_set_release(&key->enabled, 1);
+ 	} else {
+-		if (WARN_ON_ONCE(!static_key_fast_inc_not_disabled(key))) {
+-			jump_label_unlock();
++		/*
++		 * While holding the mutex this should never observe
++		 * anything else than a value >= 1 and succeed
++		 */
++		if (WARN_ON_ONCE(!static_key_fast_inc_not_disabled(key)))
+ 			return false;
+-		}
+ 	}
+-	jump_label_unlock();
+ 	return true;
+ }
+ 
+@@ -245,7 +247,7 @@ void static_key_disable(struct static_key *key)
+ }
+ EXPORT_SYMBOL_GPL(static_key_disable);
+ 
+-static bool static_key_slow_try_dec(struct static_key *key)
++static bool static_key_dec_not_one(struct static_key *key)
+ {
+ 	int v;
+ 
+@@ -269,6 +271,14 @@ static bool static_key_slow_try_dec(struct static_key *key)
+ 		 * enabled. This suggests an ordering problem on the user side.
+ 		 */
+ 		WARN_ON_ONCE(v < 0);
++
++		/*
++		 * Warn about underflow, and lie about success in an attempt to
++		 * not make things worse.
++		 */
++		if (WARN_ON_ONCE(v == 0))
++			return true;
++
+ 		if (v <= 1)
+ 			return false;
+ 	} while (!likely(atomic_try_cmpxchg(&key->enabled, &v, v - 1)));
+@@ -279,15 +289,27 @@ static bool static_key_slow_try_dec(struct static_key *key)
+ static void __static_key_slow_dec_cpuslocked(struct static_key *key)
+ {
+ 	lockdep_assert_cpus_held();
++	int val;
+ 
+-	if (static_key_slow_try_dec(key))
++	if (static_key_dec_not_one(key))
+ 		return;
+ 
+ 	guard(mutex)(&jump_label_mutex);
+-	if (atomic_cmpxchg(&key->enabled, 1, 0) == 1)
++	val = atomic_read(&key->enabled);
++	/*
++	 * It should be impossible to observe -1 with jump_label_mutex held,
++	 * see static_key_slow_inc_cpuslocked().
++	 */
++	if (WARN_ON_ONCE(val == -1))
++		return;
++	/*
++	 * Cannot already be 0, something went sideways.
++	 */
++	if (WARN_ON_ONCE(val == 0))
++		return;
++
++	if (atomic_dec_and_test(&key->enabled))
+ 		jump_label_update(key);
+-	else
+-		WARN_ON_ONCE(!static_key_slow_try_dec(key));
+ }
+ 
+ static void __static_key_slow_dec(struct static_key *key)
+@@ -324,7 +346,7 @@ void __static_key_slow_dec_deferred(struct static_key *key,
+ {
+ 	STATIC_KEY_CHECK_USE(key);
+ 
+-	if (static_key_slow_try_dec(key))
++	if (static_key_dec_not_one(key))
+ 		return;
+ 
+ 	schedule_delayed_work(work, timeout);
+diff --git a/kernel/rcu/rcuscale.c b/kernel/rcu/rcuscale.c
+index ffdb30495e3cc3..ed46d9e8c0e434 100644
+--- a/kernel/rcu/rcuscale.c
++++ b/kernel/rcu/rcuscale.c
+@@ -498,7 +498,7 @@ rcu_scale_writer(void *arg)
+ 			schedule_timeout_idle(torture_random(&tr) % writer_holdoff_jiffies + 1);
+ 		wdp = &wdpp[i];
+ 		*wdp = ktime_get_mono_fast_ns();
+-		if (gp_async) {
++		if (gp_async && !WARN_ON_ONCE(!cur_ops->async)) {
+ retry:
+ 			if (!rhp)
+ 				rhp = kmalloc(sizeof(*rhp), GFP_KERNEL);
+@@ -554,7 +554,7 @@ rcu_scale_writer(void *arg)
+ 			i++;
+ 		rcu_scale_wait_shutdown();
+ 	} while (!torture_must_stop());
+-	if (gp_async) {
++	if (gp_async && cur_ops->async) {
+ 		cur_ops->gp_barrier();
+ 	}
+ 	writer_n_durations[me] = i_max + 1;
+diff --git a/kernel/resource.c b/kernel/resource.c
+index ce127a829ead70..635e858db0fe81 100644
+--- a/kernel/resource.c
++++ b/kernel/resource.c
+@@ -493,20 +493,62 @@ static int __region_intersects(struct resource *parent, resource_size_t start,
+ 			       size_t size, unsigned long flags,
+ 			       unsigned long desc)
+ {
+-	struct resource res;
++	resource_size_t ostart, oend;
+ 	int type = 0; int other = 0;
+-	struct resource *p;
++	struct resource *p, *dp;
++	bool is_type, covered;
++	struct resource res;
+ 
+ 	res.start = start;
+ 	res.end = start + size - 1;
+ 
+ 	for (p = parent->child; p ; p = p->sibling) {
+-		bool is_type = (((p->flags & flags) == flags) &&
+-				((desc == IORES_DESC_NONE) ||
+-				 (desc == p->desc)));
+-
+-		if (resource_overlaps(p, &res))
+-			is_type ? type++ : other++;
++		if (!resource_overlaps(p, &res))
++			continue;
++		is_type = (p->flags & flags) == flags &&
++			(desc == IORES_DESC_NONE || desc == p->desc);
++		if (is_type) {
++			type++;
++			continue;
++		}
++		/*
++		 * Continue to search in descendant resources as if the
++		 * matched descendant resources cover some ranges of 'p'.
++		 *
++		 * |------------- "CXL Window 0" ------------|
++		 * |-- "System RAM" --|
++		 *
++		 * will behave similar as the following fake resource
++		 * tree when searching "System RAM".
++		 *
++		 * |-- "System RAM" --||-- "CXL Window 0a" --|
++		 */
++		covered = false;
++		ostart = max(res.start, p->start);
++		oend = min(res.end, p->end);
++		for_each_resource(p, dp, false) {
++			if (!resource_overlaps(dp, &res))
++				continue;
++			is_type = (dp->flags & flags) == flags &&
++				(desc == IORES_DESC_NONE || desc == dp->desc);
++			if (is_type) {
++				type++;
++				/*
++				 * Range from 'ostart' to 'dp->start'
++				 * isn't covered by matched resource.
++				 */
++				if (dp->start > ostart)
++					break;
++				if (dp->end >= oend) {
++					covered = true;
++					break;
++				}
++				/* Remove covered range */
++				ostart = max(ostart, dp->end + 1);
++			}
++		}
++		if (!covered)
++			other++;
+ 	}
+ 
+ 	if (type == 0)
+diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
+index 431971acc76322..f97e1473389ff1 100644
+--- a/kernel/sched/psi.c
++++ b/kernel/sched/psi.c
+@@ -776,13 +776,14 @@ static void record_times(struct psi_group_cpu *groupc, u64 now)
+ }
+ 
+ static void psi_group_change(struct psi_group *group, int cpu,
+-			     unsigned int clear, unsigned int set, u64 now,
++			     unsigned int clear, unsigned int set,
+ 			     bool wake_clock)
+ {
+ 	struct psi_group_cpu *groupc;
+ 	unsigned int t, m;
+ 	enum psi_states s;
+ 	u32 state_mask;
++	u64 now;
+ 
+ 	lockdep_assert_rq_held(cpu_rq(cpu));
+ 	groupc = per_cpu_ptr(group->pcpu, cpu);
+@@ -797,6 +798,7 @@ static void psi_group_change(struct psi_group *group, int cpu,
+ 	 * SOME and FULL time these may have resulted in.
+ 	 */
+ 	write_seqcount_begin(&groupc->seq);
++	now = cpu_clock(cpu);
+ 
+ 	/*
+ 	 * Start with TSK_ONCPU, which doesn't have a corresponding
+@@ -910,18 +912,15 @@ void psi_task_change(struct task_struct *task, int clear, int set)
+ {
+ 	int cpu = task_cpu(task);
+ 	struct psi_group *group;
+-	u64 now;
+ 
+ 	if (!task->pid)
+ 		return;
+ 
+ 	psi_flags_change(task, clear, set);
+ 
+-	now = cpu_clock(cpu);
+-
+ 	group = task_psi_group(task);
+ 	do {
+-		psi_group_change(group, cpu, clear, set, now, true);
++		psi_group_change(group, cpu, clear, set, true);
+ 	} while ((group = group->parent));
+ }
+ 
+@@ -930,7 +929,6 @@ void psi_task_switch(struct task_struct *prev, struct task_struct *next,
+ {
+ 	struct psi_group *group, *common = NULL;
+ 	int cpu = task_cpu(prev);
+-	u64 now = cpu_clock(cpu);
+ 
+ 	if (next->pid) {
+ 		psi_flags_change(next, 0, TSK_ONCPU);
+@@ -947,7 +945,7 @@ void psi_task_switch(struct task_struct *prev, struct task_struct *next,
+ 				break;
+ 			}
+ 
+-			psi_group_change(group, cpu, 0, TSK_ONCPU, now, true);
++			psi_group_change(group, cpu, 0, TSK_ONCPU, true);
+ 		} while ((group = group->parent));
+ 	}
+ 
+@@ -985,7 +983,7 @@ void psi_task_switch(struct task_struct *prev, struct task_struct *next,
+ 		do {
+ 			if (group == common)
+ 				break;
+-			psi_group_change(group, cpu, clear, set, now, wake_clock);
++			psi_group_change(group, cpu, clear, set, wake_clock);
+ 		} while ((group = group->parent));
+ 
+ 		/*
+@@ -997,7 +995,7 @@ void psi_task_switch(struct task_struct *prev, struct task_struct *next,
+ 		if ((prev->psi_flags ^ next->psi_flags) & ~TSK_ONCPU) {
+ 			clear &= ~TSK_ONCPU;
+ 			for (; group; group = group->parent)
+-				psi_group_change(group, cpu, clear, set, now, wake_clock);
++				psi_group_change(group, cpu, clear, set, wake_clock);
+ 		}
+ 	}
+ }
+@@ -1008,8 +1006,8 @@ void psi_account_irqtime(struct rq *rq, struct task_struct *curr, struct task_st
+ 	int cpu = task_cpu(curr);
+ 	struct psi_group *group;
+ 	struct psi_group_cpu *groupc;
+-	u64 now, irq;
+ 	s64 delta;
++	u64 irq;
+ 
+ 	if (!curr->pid)
+ 		return;
+@@ -1019,7 +1017,6 @@ void psi_account_irqtime(struct rq *rq, struct task_struct *curr, struct task_st
+ 	if (prev && task_psi_group(prev) == group)
+ 		return;
+ 
+-	now = cpu_clock(cpu);
+ 	irq = irq_time_read(cpu);
+ 	delta = (s64)(irq - rq->psi_irq_time);
+ 	if (delta < 0)
+@@ -1027,12 +1024,15 @@ void psi_account_irqtime(struct rq *rq, struct task_struct *curr, struct task_st
+ 	rq->psi_irq_time = irq;
+ 
+ 	do {
++		u64 now;
++
+ 		if (!group->enabled)
+ 			continue;
+ 
+ 		groupc = per_cpu_ptr(group->pcpu, cpu);
+ 
+ 		write_seqcount_begin(&groupc->seq);
++		now = cpu_clock(cpu);
+ 
+ 		record_times(groupc, now);
+ 		groupc->times[PSI_IRQ_FULL] += delta;
+@@ -1231,11 +1231,9 @@ void psi_cgroup_restart(struct psi_group *group)
+ 	for_each_possible_cpu(cpu) {
+ 		struct rq *rq = cpu_rq(cpu);
+ 		struct rq_flags rf;
+-		u64 now;
+ 
+ 		rq_lock_irq(rq, &rf);
+-		now = cpu_clock(cpu);
+-		psi_group_change(group, cpu, 0, 0, now, true);
++		psi_group_change(group, cpu, 0, 0, true);
+ 		rq_unlock_irq(rq, &rf);
+ 	}
+ }
+diff --git a/kernel/static_call_inline.c b/kernel/static_call_inline.c
+index 639397b5491ca0..5259cda486d058 100644
+--- a/kernel/static_call_inline.c
++++ b/kernel/static_call_inline.c
+@@ -411,6 +411,17 @@ static void static_call_del_module(struct module *mod)
+ 
+ 	for (site = start; site < stop; site++) {
+ 		key = static_call_key(site);
++
++		/*
++		 * If the key was not updated due to a memory allocation
++		 * failure in __static_call_init() then treating key::sites
++		 * as key::mods in the code below would cause random memory
++		 * access and #GP. In that case all subsequent sites have
++		 * not been touched either, so stop iterating.
++		 */
++		if (!static_call_key_has_mods(key))
++			break;
++
+ 		if (key == prev_key)
+ 			continue;
+ 
+@@ -442,7 +453,7 @@ static int static_call_module_notify(struct notifier_block *nb,
+ 	case MODULE_STATE_COMING:
+ 		ret = static_call_add_module(mod);
+ 		if (ret) {
+-			WARN(1, "Failed to allocate memory for static calls");
++			pr_warn("Failed to allocate memory for static calls\n");
+ 			static_call_del_module(mod);
+ 		}
+ 		break;
+diff --git a/kernel/trace/trace_hwlat.c b/kernel/trace/trace_hwlat.c
+index b791524a6536ac..3bd6071441ade9 100644
+--- a/kernel/trace/trace_hwlat.c
++++ b/kernel/trace/trace_hwlat.c
+@@ -520,6 +520,8 @@ static void hwlat_hotplug_workfn(struct work_struct *dummy)
+ 	if (!hwlat_busy || hwlat_data.thread_mode != MODE_PER_CPU)
+ 		goto out_unlock;
+ 
++	if (!cpu_online(cpu))
++		goto out_unlock;
+ 	if (!cpumask_test_cpu(cpu, tr->tracing_cpumask))
+ 		goto out_unlock;
+ 
+diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c
+index 461b4ab60b501a..3e2bc029fa8c83 100644
+--- a/kernel/trace/trace_osnoise.c
++++ b/kernel/trace/trace_osnoise.c
+@@ -1953,12 +1953,8 @@ static void stop_kthread(unsigned int cpu)
+ {
+ 	struct task_struct *kthread;
+ 
+-	mutex_lock(&interface_lock);
+-	kthread = per_cpu(per_cpu_osnoise_var, cpu).kthread;
++	kthread = xchg_relaxed(&(per_cpu(per_cpu_osnoise_var, cpu).kthread), NULL);
+ 	if (kthread) {
+-		per_cpu(per_cpu_osnoise_var, cpu).kthread = NULL;
+-		mutex_unlock(&interface_lock);
+-
+ 		if (cpumask_test_and_clear_cpu(cpu, &kthread_cpumask) &&
+ 		    !WARN_ON(!test_bit(OSN_WORKLOAD, &osnoise_options))) {
+ 			kthread_stop(kthread);
+@@ -1972,7 +1968,6 @@ static void stop_kthread(unsigned int cpu)
+ 			put_task_struct(kthread);
+ 		}
+ 	} else {
+-		mutex_unlock(&interface_lock);
+ 		/* if no workload, just return */
+ 		if (!test_bit(OSN_WORKLOAD, &osnoise_options)) {
+ 			/*
+@@ -1994,8 +1989,12 @@ static void stop_per_cpu_kthreads(void)
+ {
+ 	int cpu;
+ 
+-	for_each_possible_cpu(cpu)
++	cpus_read_lock();
++
++	for_each_online_cpu(cpu)
+ 		stop_kthread(cpu);
++
++	cpus_read_unlock();
+ }
+ 
+ /*
+@@ -2007,6 +2006,10 @@ static int start_kthread(unsigned int cpu)
+ 	void *main = osnoise_main;
+ 	char comm[24];
+ 
++	/* Do not start a new thread if it is already running */
++	if (per_cpu(per_cpu_osnoise_var, cpu).kthread)
++		return 0;
++
+ 	if (timerlat_enabled()) {
+ 		snprintf(comm, 24, "timerlat/%d", cpu);
+ 		main = timerlat_main;
+@@ -2061,11 +2064,10 @@ static int start_per_cpu_kthreads(void)
+ 		if (cpumask_test_and_clear_cpu(cpu, &kthread_cpumask)) {
+ 			struct task_struct *kthread;
+ 
+-			kthread = per_cpu(per_cpu_osnoise_var, cpu).kthread;
++			kthread = xchg_relaxed(&(per_cpu(per_cpu_osnoise_var, cpu).kthread), NULL);
+ 			if (!WARN_ON(!kthread))
+ 				kthread_stop(kthread);
+ 		}
+-		per_cpu(per_cpu_osnoise_var, cpu).kthread = NULL;
+ 	}
+ 
+ 	for_each_cpu(cpu, current_mask) {
+@@ -2095,6 +2097,8 @@ static void osnoise_hotplug_workfn(struct work_struct *dummy)
+ 	mutex_lock(&interface_lock);
+ 	cpus_read_lock();
+ 
++	if (!cpu_online(cpu))
++		goto out_unlock;
+ 	if (!cpumask_test_cpu(cpu, &osnoise_cpumask))
+ 		goto out_unlock;
+ 
+diff --git a/lib/buildid.c b/lib/buildid.c
+index e3a7acdeef0ed4..d3bc3d0528d5c8 100644
+--- a/lib/buildid.c
++++ b/lib/buildid.c
+@@ -18,31 +18,37 @@ static int parse_build_id_buf(unsigned char *build_id,
+ 			      const void *note_start,
+ 			      Elf32_Word note_size)
+ {
+-	Elf32_Word note_offs = 0, new_offs;
+-
+-	while (note_offs + sizeof(Elf32_Nhdr) < note_size) {
+-		Elf32_Nhdr *nhdr = (Elf32_Nhdr *)(note_start + note_offs);
++	const char note_name[] = "GNU";
++	const size_t note_name_sz = sizeof(note_name);
++	u64 note_off = 0, new_off, name_sz, desc_sz;
++	const char *data;
++
++	while (note_off + sizeof(Elf32_Nhdr) < note_size &&
++	       note_off + sizeof(Elf32_Nhdr) > note_off /* overflow */) {
++		Elf32_Nhdr *nhdr = (Elf32_Nhdr *)(note_start + note_off);
++
++		name_sz = READ_ONCE(nhdr->n_namesz);
++		desc_sz = READ_ONCE(nhdr->n_descsz);
++
++		new_off = note_off + sizeof(Elf32_Nhdr);
++		if (check_add_overflow(new_off, ALIGN(name_sz, 4), &new_off) ||
++		    check_add_overflow(new_off, ALIGN(desc_sz, 4), &new_off) ||
++		    new_off > note_size)
++			break;
+ 
+ 		if (nhdr->n_type == BUILD_ID &&
+-		    nhdr->n_namesz == sizeof("GNU") &&
+-		    !strcmp((char *)(nhdr + 1), "GNU") &&
+-		    nhdr->n_descsz > 0 &&
+-		    nhdr->n_descsz <= BUILD_ID_SIZE_MAX) {
+-			memcpy(build_id,
+-			       note_start + note_offs +
+-			       ALIGN(sizeof("GNU"), 4) + sizeof(Elf32_Nhdr),
+-			       nhdr->n_descsz);
+-			memset(build_id + nhdr->n_descsz, 0,
+-			       BUILD_ID_SIZE_MAX - nhdr->n_descsz);
++		    name_sz == note_name_sz &&
++		    memcmp(nhdr + 1, note_name, note_name_sz) == 0 &&
++		    desc_sz > 0 && desc_sz <= BUILD_ID_SIZE_MAX) {
++			data = note_start + note_off + ALIGN(note_name_sz, 4);
++			memcpy(build_id, data, desc_sz);
++			memset(build_id + desc_sz, 0, BUILD_ID_SIZE_MAX - desc_sz);
+ 			if (size)
+-				*size = nhdr->n_descsz;
++				*size = desc_sz;
+ 			return 0;
+ 		}
+-		new_offs = note_offs + sizeof(Elf32_Nhdr) +
+-			ALIGN(nhdr->n_namesz, 4) + ALIGN(nhdr->n_descsz, 4);
+-		if (new_offs <= note_offs)  /* overflow */
+-			break;
+-		note_offs = new_offs;
++
++		note_off = new_off;
+ 	}
+ 
+ 	return -EINVAL;
+@@ -71,20 +77,28 @@ static int get_build_id_32(const void *page_addr, unsigned char *build_id,
+ {
+ 	Elf32_Ehdr *ehdr = (Elf32_Ehdr *)page_addr;
+ 	Elf32_Phdr *phdr;
+-	int i;
++	__u32 i, phnum;
++
++	/*
++	 * FIXME
++	 * Neither ELF spec nor ELF loader require that program headers
++	 * start immediately after ELF header.
++	 */
++	if (ehdr->e_phoff != sizeof(Elf32_Ehdr))
++		return -EINVAL;
+ 
++	phnum = READ_ONCE(ehdr->e_phnum);
+ 	/* only supports phdr that fits in one page */
+-	if (ehdr->e_phnum >
+-	    (PAGE_SIZE - sizeof(Elf32_Ehdr)) / sizeof(Elf32_Phdr))
++	if (phnum > (PAGE_SIZE - sizeof(Elf32_Ehdr)) / sizeof(Elf32_Phdr))
+ 		return -EINVAL;
+ 
+ 	phdr = (Elf32_Phdr *)(page_addr + sizeof(Elf32_Ehdr));
+ 
+-	for (i = 0; i < ehdr->e_phnum; ++i) {
++	for (i = 0; i < phnum; ++i) {
+ 		if (phdr[i].p_type == PT_NOTE &&
+ 		    !parse_build_id(page_addr, build_id, size,
+-				    page_addr + phdr[i].p_offset,
+-				    phdr[i].p_filesz))
++				    page_addr + READ_ONCE(phdr[i].p_offset),
++				    READ_ONCE(phdr[i].p_filesz)))
+ 			return 0;
+ 	}
+ 	return -EINVAL;
+@@ -96,20 +110,28 @@ static int get_build_id_64(const void *page_addr, unsigned char *build_id,
+ {
+ 	Elf64_Ehdr *ehdr = (Elf64_Ehdr *)page_addr;
+ 	Elf64_Phdr *phdr;
+-	int i;
++	__u32 i, phnum;
++
++	/*
++	 * FIXME
++	 * Neither ELF spec nor ELF loader require that program headers
++	 * start immediately after ELF header.
++	 */
++	if (ehdr->e_phoff != sizeof(Elf64_Ehdr))
++		return -EINVAL;
+ 
++	phnum = READ_ONCE(ehdr->e_phnum);
+ 	/* only supports phdr that fits in one page */
+-	if (ehdr->e_phnum >
+-	    (PAGE_SIZE - sizeof(Elf64_Ehdr)) / sizeof(Elf64_Phdr))
++	if (phnum > (PAGE_SIZE - sizeof(Elf64_Ehdr)) / sizeof(Elf64_Phdr))
+ 		return -EINVAL;
+ 
+ 	phdr = (Elf64_Phdr *)(page_addr + sizeof(Elf64_Ehdr));
+ 
+-	for (i = 0; i < ehdr->e_phnum; ++i) {
++	for (i = 0; i < phnum; ++i) {
+ 		if (phdr[i].p_type == PT_NOTE &&
+ 		    !parse_build_id(page_addr, build_id, size,
+-				    page_addr + phdr[i].p_offset,
+-				    phdr[i].p_filesz))
++				    page_addr + READ_ONCE(phdr[i].p_offset),
++				    READ_ONCE(phdr[i].p_filesz)))
+ 			return 0;
+ 	}
+ 	return -EINVAL;
+@@ -138,6 +160,10 @@ int build_id_parse(struct vm_area_struct *vma, unsigned char *build_id,
+ 	page = find_get_page(vma->vm_file->f_mapping, 0);
+ 	if (!page)
+ 		return -EFAULT;	/* page not mapped */
++	if (!PageUptodate(page)) {
++		put_page(page);
++		return -EFAULT;
++	}
+ 
+ 	ret = -EINVAL;
+ 	page_addr = kmap_atomic(page);
+diff --git a/mm/Kconfig b/mm/Kconfig
+index ece4f2847e2b43..c11cd01169e8d1 100644
+--- a/mm/Kconfig
++++ b/mm/Kconfig
+@@ -147,12 +147,15 @@ config ZSWAP_ZPOOL_DEFAULT_ZBUD
+ 	help
+ 	  Use the zbud allocator as the default allocator.
+ 
+-config ZSWAP_ZPOOL_DEFAULT_Z3FOLD
+-	bool "z3fold"
+-	select Z3FOLD
++config ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED
++	bool "z3foldi (DEPRECATED)"
++	select Z3FOLD_DEPRECATED
+ 	help
+ 	  Use the z3fold allocator as the default allocator.
+ 
++	  Deprecated and scheduled for removal in a few cycles,
++	  see CONFIG_Z3FOLD_DEPRECATED.
++
+ config ZSWAP_ZPOOL_DEFAULT_ZSMALLOC
+ 	bool "zsmalloc"
+ 	select ZSMALLOC
+@@ -164,7 +167,7 @@ config ZSWAP_ZPOOL_DEFAULT
+        string
+        depends on ZSWAP
+        default "zbud" if ZSWAP_ZPOOL_DEFAULT_ZBUD
+-       default "z3fold" if ZSWAP_ZPOOL_DEFAULT_Z3FOLD
++       default "z3fold" if ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED
+        default "zsmalloc" if ZSWAP_ZPOOL_DEFAULT_ZSMALLOC
+        default ""
+ 
+@@ -178,15 +181,25 @@ config ZBUD
+ 	  deterministic reclaim properties that make it preferable to a higher
+ 	  density approach when reclaim will be used.
+ 
+-config Z3FOLD
+-	tristate "3:1 compression allocator (z3fold)"
++config Z3FOLD_DEPRECATED
++	tristate "3:1 compression allocator (z3fold) (DEPRECATED)"
+ 	depends on ZSWAP
+ 	help
++	  Deprecated and scheduled for removal in a few cycles. If you have
++	  a good reason for using Z3FOLD over ZSMALLOC, please contact
++	  linux-mm@kvack.org and the zswap maintainers.
++
+ 	  A special purpose allocator for storing compressed pages.
+ 	  It is designed to store up to three compressed pages per physical
+ 	  page. It is a ZBUD derivative so the simplicity and determinism are
+ 	  still there.
+ 
++config Z3FOLD
++	tristate
++	default y if Z3FOLD_DEPRECATED=y
++	default m if Z3FOLD_DEPRECATED=m
++	depends on Z3FOLD_DEPRECATED
++
+ config ZSMALLOC
+ 	tristate
+ 	prompt "N:1 compression allocator (zsmalloc)" if ZSWAP
+diff --git a/mm/slab_common.c b/mm/slab_common.c
+index 8d431193c27360..ef971fcdaa0708 100644
+--- a/mm/slab_common.c
++++ b/mm/slab_common.c
+@@ -1388,6 +1388,13 @@ __do_krealloc(const void *p, size_t new_size, gfp_t flags)
+ 
+ 	/* If the object still fits, repoison it precisely. */
+ 	if (ks >= new_size) {
++		/* Zero out spare memory. */
++		if (want_init_on_alloc(flags)) {
++			kasan_disable_current();
++			memset((void *)p + new_size, 0, ks - new_size);
++			kasan_enable_current();
++		}
++
+ 		p = kasan_krealloc((void *)p, new_size, flags);
+ 		return (void *)p;
+ 	}
+diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
+index 1b56355c40eaf5..f787b0eb7d669b 100644
+--- a/net/bluetooth/hci_core.c
++++ b/net/bluetooth/hci_core.c
+@@ -3755,6 +3755,8 @@ static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
+ 
+ 	hci_dev_lock(hdev);
+ 	conn = hci_conn_hash_lookup_handle(hdev, handle);
++	if (conn && hci_dev_test_flag(hdev, HCI_MGMT))
++		mgmt_device_connected(hdev, conn, NULL, 0);
+ 	hci_dev_unlock(hdev);
+ 
+ 	if (conn) {
+diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
+index d81c7fccdd4045..da056cca3edbcf 100644
+--- a/net/bluetooth/hci_event.c
++++ b/net/bluetooth/hci_event.c
+@@ -3707,7 +3707,7 @@ static void hci_remote_features_evt(struct hci_dev *hdev, void *data,
+ 		goto unlock;
+ 	}
+ 
+-	if (!ev->status && !test_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) {
++	if (!ev->status) {
+ 		struct hci_cp_remote_name_req cp;
+ 		memset(&cp, 0, sizeof(cp));
+ 		bacpy(&cp.bdaddr, &conn->dst);
+@@ -5324,19 +5324,16 @@ static void hci_user_confirm_request_evt(struct hci_dev *hdev, void *data,
+ 		goto unlock;
+ 	}
+ 
+-	/* If no side requires MITM protection; auto-accept */
++	/* If no side requires MITM protection; use JUST_CFM method */
+ 	if ((!loc_mitm || conn->remote_cap == HCI_IO_NO_INPUT_OUTPUT) &&
+ 	    (!rem_mitm || conn->io_capability == HCI_IO_NO_INPUT_OUTPUT)) {
+ 
+-		/* If we're not the initiators request authorization to
+-		 * proceed from user space (mgmt_user_confirm with
+-		 * confirm_hint set to 1). The exception is if neither
+-		 * side had MITM or if the local IO capability is
+-		 * NoInputNoOutput, in which case we do auto-accept
++		/* If we're not the initiator of request authorization and the
++		 * local IO capability is not NoInputNoOutput, use JUST_WORKS
++		 * method (mgmt_user_confirm with confirm_hint set to 1).
+ 		 */
+ 		if (!test_bit(HCI_CONN_AUTH_PEND, &conn->flags) &&
+-		    conn->io_capability != HCI_IO_NO_INPUT_OUTPUT &&
+-		    (loc_mitm || rem_mitm)) {
++		    conn->io_capability != HCI_IO_NO_INPUT_OUTPUT) {
+ 			bt_dev_dbg(hdev, "Confirming auto-accept as acceptor");
+ 			confirm_hint = 1;
+ 			goto confirm;
+diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
+index 3d904ca92e9e8e..69c2ba1e843eb4 100644
+--- a/net/bluetooth/hci_sock.c
++++ b/net/bluetooth/hci_sock.c
+@@ -1943,10 +1943,9 @@ static int hci_sock_setsockopt_old(struct socket *sock, int level, int optname,
+ 
+ 	switch (optname) {
+ 	case HCI_DATA_DIR:
+-		if (copy_from_sockptr(&opt, optval, sizeof(opt))) {
+-			err = -EFAULT;
++		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, len);
++		if (err)
+ 			break;
+-		}
+ 
+ 		if (opt)
+ 			hci_pi(sk)->cmsg_mask |= HCI_CMSG_DIR;
+@@ -1955,10 +1954,9 @@ static int hci_sock_setsockopt_old(struct socket *sock, int level, int optname,
+ 		break;
+ 
+ 	case HCI_TIME_STAMP:
+-		if (copy_from_sockptr(&opt, optval, sizeof(opt))) {
+-			err = -EFAULT;
++		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, len);
++		if (err)
+ 			break;
+-		}
+ 
+ 		if (opt)
+ 			hci_pi(sk)->cmsg_mask |= HCI_CMSG_TSTAMP;
+@@ -1976,11 +1974,9 @@ static int hci_sock_setsockopt_old(struct socket *sock, int level, int optname,
+ 			uf.event_mask[1] = *((u32 *) f->event_mask + 1);
+ 		}
+ 
+-		len = min_t(unsigned int, len, sizeof(uf));
+-		if (copy_from_sockptr(&uf, optval, len)) {
+-			err = -EFAULT;
++		err = bt_copy_from_sockptr(&uf, sizeof(uf), optval, len);
++		if (err)
+ 			break;
+-		}
+ 
+ 		if (!capable(CAP_NET_RAW)) {
+ 			uf.type_mask &= hci_sec_filter.type_mask;
+@@ -2039,10 +2035,9 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
+ 			goto done;
+ 		}
+ 
+-		if (copy_from_sockptr(&opt, optval, sizeof(opt))) {
+-			err = -EFAULT;
++		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, len);
++		if (err)
+ 			break;
+-		}
+ 
+ 		hci_pi(sk)->mtu = opt;
+ 		break;
+diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
+index 3ccba592f7349c..c46d123c30e14a 100644
+--- a/net/bluetooth/iso.c
++++ b/net/bluetooth/iso.c
+@@ -1349,7 +1349,7 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
+ 			       sockptr_t optval, unsigned int optlen)
+ {
+ 	struct sock *sk = sock->sk;
+-	int len, err = 0;
++	int err = 0;
+ 	struct bt_iso_qos qos = default_qos;
+ 	u32 opt;
+ 
+@@ -1364,10 +1364,9 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
+ 			break;
+ 		}
+ 
+-		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
+-			err = -EFAULT;
++		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen);
++		if (err)
+ 			break;
+-		}
+ 
+ 		if (opt)
+ 			set_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
+@@ -1376,10 +1375,9 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
+ 		break;
+ 
+ 	case BT_PKT_STATUS:
+-		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
+-			err = -EFAULT;
++		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen);
++		if (err)
+ 			break;
+-		}
+ 
+ 		if (opt)
+ 			set_bit(BT_SK_PKT_STATUS, &bt_sk(sk)->flags);
+@@ -1394,17 +1392,9 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
+ 			break;
+ 		}
+ 
+-		len = min_t(unsigned int, sizeof(qos), optlen);
+-
+-		if (copy_from_sockptr(&qos, optval, len)) {
+-			err = -EFAULT;
+-			break;
+-		}
+-
+-		if (len == sizeof(qos.ucast) && !check_ucast_qos(&qos)) {
+-			err = -EINVAL;
++		err = bt_copy_from_sockptr(&qos, sizeof(qos), optval, optlen);
++		if (err)
+ 			break;
+-		}
+ 
+ 		iso_pi(sk)->qos = qos;
+ 		iso_pi(sk)->qos_user_set = true;
+@@ -1419,18 +1409,16 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
+ 		}
+ 
+ 		if (optlen > sizeof(iso_pi(sk)->base)) {
+-			err = -EOVERFLOW;
++			err = -EINVAL;
+ 			break;
+ 		}
+ 
+-		len = min_t(unsigned int, sizeof(iso_pi(sk)->base), optlen);
+-
+-		if (copy_from_sockptr(iso_pi(sk)->base, optval, len)) {
+-			err = -EFAULT;
++		err = bt_copy_from_sockptr(iso_pi(sk)->base, optlen, optval,
++					   optlen);
++		if (err)
+ 			break;
+-		}
+ 
+-		iso_pi(sk)->base_len = len;
++		iso_pi(sk)->base_len = optlen;
+ 
+ 		break;
+ 
+diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
+index 2651cc2d5c283f..93651c421767a0 100644
+--- a/net/bluetooth/l2cap_core.c
++++ b/net/bluetooth/l2cap_core.c
+@@ -4064,17 +4064,9 @@ static void l2cap_connect(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd,
+ static int l2cap_connect_req(struct l2cap_conn *conn,
+ 			     struct l2cap_cmd_hdr *cmd, u16 cmd_len, u8 *data)
+ {
+-	struct hci_dev *hdev = conn->hcon->hdev;
+-	struct hci_conn *hcon = conn->hcon;
+-
+ 	if (cmd_len < sizeof(struct l2cap_conn_req))
+ 		return -EPROTO;
+ 
+-	hci_dev_lock(hdev);
+-	if (hci_dev_test_flag(hdev, HCI_MGMT))
+-		mgmt_device_connected(hdev, hcon, NULL, 0);
+-	hci_dev_unlock(hdev);
+-
+ 	l2cap_connect(conn, cmd, data, L2CAP_CONN_RSP);
+ 	return 0;
+ }
+diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
+index 5d332e69c7e1ab..f04ce84267988f 100644
+--- a/net/bluetooth/l2cap_sock.c
++++ b/net/bluetooth/l2cap_sock.c
+@@ -727,7 +727,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
+ 	struct sock *sk = sock->sk;
+ 	struct l2cap_chan *chan = l2cap_pi(sk)->chan;
+ 	struct l2cap_options opts;
+-	int len, err = 0;
++	int err = 0;
+ 	u32 opt;
+ 
+ 	BT_DBG("sk %p", sk);
+@@ -754,11 +754,9 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
+ 		opts.max_tx   = chan->max_tx;
+ 		opts.txwin_size = chan->tx_win;
+ 
+-		len = min_t(unsigned int, sizeof(opts), optlen);
+-		if (copy_from_sockptr(&opts, optval, len)) {
+-			err = -EFAULT;
++		err = bt_copy_from_sockptr(&opts, sizeof(opts), optval, optlen);
++		if (err)
+ 			break;
+-		}
+ 
+ 		if (opts.txwin_size > L2CAP_DEFAULT_EXT_WINDOW) {
+ 			err = -EINVAL;
+@@ -801,10 +799,9 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
+ 		break;
+ 
+ 	case L2CAP_LM:
+-		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
+-			err = -EFAULT;
++		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen);
++		if (err)
+ 			break;
+-		}
+ 
+ 		if (opt & L2CAP_LM_FIPS) {
+ 			err = -EINVAL;
+@@ -885,7 +882,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+ 	struct bt_security sec;
+ 	struct bt_power pwr;
+ 	struct l2cap_conn *conn;
+-	int len, err = 0;
++	int err = 0;
+ 	u32 opt;
+ 	u16 mtu;
+ 	u8 mode;
+@@ -911,11 +908,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+ 
+ 		sec.level = BT_SECURITY_LOW;
+ 
+-		len = min_t(unsigned int, sizeof(sec), optlen);
+-		if (copy_from_sockptr(&sec, optval, len)) {
+-			err = -EFAULT;
++		err = bt_copy_from_sockptr(&sec, sizeof(sec), optval, optlen);
++		if (err)
+ 			break;
+-		}
+ 
+ 		if (sec.level < BT_SECURITY_LOW ||
+ 		    sec.level > BT_SECURITY_FIPS) {
+@@ -960,10 +955,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+ 			break;
+ 		}
+ 
+-		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
+-			err = -EFAULT;
++		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen);
++		if (err)
+ 			break;
+-		}
+ 
+ 		if (opt) {
+ 			set_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
+@@ -975,10 +969,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+ 		break;
+ 
+ 	case BT_FLUSHABLE:
+-		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
+-			err = -EFAULT;
++		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen);
++		if (err)
+ 			break;
+-		}
+ 
+ 		if (opt > BT_FLUSHABLE_ON) {
+ 			err = -EINVAL;
+@@ -1010,11 +1003,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+ 
+ 		pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
+ 
+-		len = min_t(unsigned int, sizeof(pwr), optlen);
+-		if (copy_from_sockptr(&pwr, optval, len)) {
+-			err = -EFAULT;
++		err = bt_copy_from_sockptr(&pwr, sizeof(pwr), optval, optlen);
++		if (err)
+ 			break;
+-		}
+ 
+ 		if (pwr.force_active)
+ 			set_bit(FLAG_FORCE_ACTIVE, &chan->flags);
+@@ -1023,10 +1014,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+ 		break;
+ 
+ 	case BT_CHANNEL_POLICY:
+-		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
+-			err = -EFAULT;
++		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen);
++		if (err)
+ 			break;
+-		}
+ 
+ 		err = -EOPNOTSUPP;
+ 		break;
+@@ -1055,10 +1045,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+ 			break;
+ 		}
+ 
+-		if (copy_from_sockptr(&mtu, optval, sizeof(u16))) {
+-			err = -EFAULT;
++		err = bt_copy_from_sockptr(&mtu, sizeof(mtu), optval, optlen);
++		if (err)
+ 			break;
+-		}
+ 
+ 		if (chan->mode == L2CAP_MODE_EXT_FLOWCTL &&
+ 		    sk->sk_state == BT_CONNECTED)
+@@ -1086,10 +1075,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+ 			break;
+ 		}
+ 
+-		if (copy_from_sockptr(&mode, optval, sizeof(u8))) {
+-			err = -EFAULT;
++		err = bt_copy_from_sockptr(&mode, sizeof(mode), optval, optlen);
++		if (err)
+ 			break;
+-		}
+ 
+ 		BT_DBG("mode %u", mode);
+ 
+diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
+index 149aff29e56469..1f3a39c20a9114 100644
+--- a/net/bluetooth/mgmt.c
++++ b/net/bluetooth/mgmt.c
+@@ -1446,10 +1446,15 @@ static void cmd_status_rsp(struct mgmt_pending_cmd *cmd, void *data)
+ 
+ static void cmd_complete_rsp(struct mgmt_pending_cmd *cmd, void *data)
+ {
+-	if (cmd->cmd_complete) {
+-		u8 *status = data;
++	struct cmd_lookup *match = data;
++
++	/* dequeue cmd_sync entries using cmd as data as that is about to be
++	 * removed/freed.
++	 */
++	hci_cmd_sync_dequeue(match->hdev, NULL, cmd, NULL);
+ 
+-		cmd->cmd_complete(cmd, *status);
++	if (cmd->cmd_complete) {
++		cmd->cmd_complete(cmd, match->mgmt_status);
+ 		mgmt_pending_remove(cmd);
+ 
+ 		return;
+@@ -9342,12 +9347,12 @@ void mgmt_index_added(struct hci_dev *hdev)
+ void mgmt_index_removed(struct hci_dev *hdev)
+ {
+ 	struct mgmt_ev_ext_index ev;
+-	u8 status = MGMT_STATUS_INVALID_INDEX;
++	struct cmd_lookup match = { NULL, hdev, MGMT_STATUS_INVALID_INDEX };
+ 
+ 	if (test_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks))
+ 		return;
+ 
+-	mgmt_pending_foreach(0, hdev, cmd_complete_rsp, &status);
++	mgmt_pending_foreach(0, hdev, cmd_complete_rsp, &match);
+ 
+ 	if (hci_dev_test_flag(hdev, HCI_UNCONFIGURED)) {
+ 		mgmt_index_event(MGMT_EV_UNCONF_INDEX_REMOVED, hdev, NULL, 0,
+@@ -9398,7 +9403,7 @@ void mgmt_power_on(struct hci_dev *hdev, int err)
+ void __mgmt_power_off(struct hci_dev *hdev)
+ {
+ 	struct cmd_lookup match = { NULL, hdev };
+-	u8 status, zero_cod[] = { 0, 0, 0 };
++	u8 zero_cod[] = { 0, 0, 0 };
+ 
+ 	mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match);
+ 
+@@ -9410,11 +9415,11 @@ void __mgmt_power_off(struct hci_dev *hdev)
+ 	 * status responses.
+ 	 */
+ 	if (hci_dev_test_flag(hdev, HCI_UNREGISTER))
+-		status = MGMT_STATUS_INVALID_INDEX;
++		match.mgmt_status = MGMT_STATUS_INVALID_INDEX;
+ 	else
+-		status = MGMT_STATUS_NOT_POWERED;
++		match.mgmt_status = MGMT_STATUS_NOT_POWERED;
+ 
+-	mgmt_pending_foreach(0, hdev, cmd_complete_rsp, &status);
++	mgmt_pending_foreach(0, hdev, cmd_complete_rsp, &match);
+ 
+ 	if (memcmp(hdev->dev_class, zero_cod, sizeof(zero_cod)) != 0) {
+ 		mgmt_limited_event(MGMT_EV_CLASS_OF_DEV_CHANGED, hdev,
+diff --git a/net/core/dev.c b/net/core/dev.c
+index 5a5bd339f11eb9..70f757707f1a2f 100644
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -3500,7 +3500,7 @@ static netdev_features_t gso_features_check(const struct sk_buff *skb,
+ 	if (gso_segs > READ_ONCE(dev->gso_max_segs))
+ 		return features & ~NETIF_F_GSO_MASK;
+ 
+-	if (unlikely(skb->len >= READ_ONCE(dev->gso_max_size)))
++	if (unlikely(skb->len >= netif_get_gso_max_size(dev, skb)))
+ 		return features & ~NETIF_F_GSO_MASK;
+ 
+ 	if (!skb_shinfo(skb)->gso_type) {
+@@ -3746,7 +3746,7 @@ static void qdisc_pkt_len_init(struct sk_buff *skb)
+ 						sizeof(_tcphdr), &_tcphdr);
+ 			if (likely(th))
+ 				hdr_len += __tcp_hdrlen(th);
+-		} else {
++		} else if (shinfo->gso_type & SKB_GSO_UDP_L4) {
+ 			struct udphdr _udphdr;
+ 
+ 			if (skb_header_pointer(skb, hdr_len,
+@@ -3754,10 +3754,14 @@ static void qdisc_pkt_len_init(struct sk_buff *skb)
+ 				hdr_len += sizeof(struct udphdr);
+ 		}
+ 
+-		if (shinfo->gso_type & SKB_GSO_DODGY)
+-			gso_segs = DIV_ROUND_UP(skb->len - hdr_len,
+-						shinfo->gso_size);
++		if (unlikely(shinfo->gso_type & SKB_GSO_DODGY)) {
++			int payload = skb->len - hdr_len;
+ 
++			/* Malicious packet. */
++			if (payload <= 0)
++				return;
++			gso_segs = DIV_ROUND_UP(payload, shinfo->gso_size);
++		}
+ 		qdisc_skb_cb(skb)->pkt_len += (gso_segs - 1) * hdr_len;
+ 	}
+ }
+diff --git a/net/core/gro.c b/net/core/gro.c
+index 31e40f25fdf109..85d3f686ba539b 100644
+--- a/net/core/gro.c
++++ b/net/core/gro.c
+@@ -100,7 +100,6 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb)
+ 	unsigned int headlen = skb_headlen(skb);
+ 	unsigned int len = skb_gro_len(skb);
+ 	unsigned int delta_truesize;
+-	unsigned int gro_max_size;
+ 	unsigned int new_truesize;
+ 	struct sk_buff *lp;
+ 	int segs;
+@@ -114,12 +113,8 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb)
+ 	if (p->pp_recycle != skb->pp_recycle)
+ 		return -ETOOMANYREFS;
+ 
+-	/* pairs with WRITE_ONCE() in netif_set_gro(_ipv4)_max_size() */
+-	gro_max_size = p->protocol == htons(ETH_P_IPV6) ?
+-			READ_ONCE(p->dev->gro_max_size) :
+-			READ_ONCE(p->dev->gro_ipv4_max_size);
+-
+-	if (unlikely(p->len + len >= gro_max_size || NAPI_GRO_CB(skb)->flush))
++	if (unlikely(p->len + len >= netif_get_gro_max_size(p->dev, p) ||
++		     NAPI_GRO_CB(skb)->flush))
+ 		return -E2BIG;
+ 
+ 	if (unlikely(p->len + len >= GRO_LEGACY_MAX_SIZE)) {
+diff --git a/net/core/netpoll.c b/net/core/netpoll.c
+index 55bcacf67df3b6..e0821390040937 100644
+--- a/net/core/netpoll.c
++++ b/net/core/netpoll.c
+@@ -626,12 +626,9 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev)
+ 	const struct net_device_ops *ops;
+ 	int err;
+ 
+-	np->dev = ndev;
+-	strscpy(np->dev_name, ndev->name, IFNAMSIZ);
+-
+ 	if (ndev->priv_flags & IFF_DISABLE_NETPOLL) {
+ 		np_err(np, "%s doesn't support polling, aborting\n",
+-		       np->dev_name);
++		       ndev->name);
+ 		err = -ENOTSUPP;
+ 		goto out;
+ 	}
+@@ -649,7 +646,7 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev)
+ 
+ 		refcount_set(&npinfo->refcnt, 1);
+ 
+-		ops = np->dev->netdev_ops;
++		ops = ndev->netdev_ops;
+ 		if (ops->ndo_netpoll_setup) {
+ 			err = ops->ndo_netpoll_setup(ndev, npinfo);
+ 			if (err)
+@@ -660,6 +657,8 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev)
+ 		refcount_inc(&npinfo->refcnt);
+ 	}
+ 
++	np->dev = ndev;
++	strscpy(np->dev_name, ndev->name, IFNAMSIZ);
+ 	npinfo->netpoll = np;
+ 
+ 	/* last thing to do is link it to the net device structure */
+@@ -677,6 +676,7 @@ EXPORT_SYMBOL_GPL(__netpoll_setup);
+ int netpoll_setup(struct netpoll *np)
+ {
+ 	struct net_device *ndev = NULL;
++	bool ip_overwritten = false;
+ 	struct in_device *in_dev;
+ 	int err;
+ 
+@@ -741,6 +741,7 @@ int netpoll_setup(struct netpoll *np)
+ 			}
+ 
+ 			np->local_ip.ip = ifa->ifa_local;
++			ip_overwritten = true;
+ 			np_info(np, "local IP %pI4\n", &np->local_ip.ip);
+ 		} else {
+ #if IS_ENABLED(CONFIG_IPV6)
+@@ -757,6 +758,7 @@ int netpoll_setup(struct netpoll *np)
+ 					    !!(ipv6_addr_type(&np->remote_ip.in6) & IPV6_ADDR_LINKLOCAL))
+ 						continue;
+ 					np->local_ip.in6 = ifp->addr;
++					ip_overwritten = true;
+ 					err = 0;
+ 					break;
+ 				}
+@@ -787,6 +789,9 @@ int netpoll_setup(struct netpoll *np)
+ 	return 0;
+ 
+ put:
++	DEBUG_NET_WARN_ON_ONCE(np->dev);
++	if (ip_overwritten)
++		memset(&np->local_ip, 0, sizeof(np->local_ip));
+ 	netdev_put(ndev, &np->dev_tracker);
+ unlock:
+ 	rtnl_unlock();
+diff --git a/net/dsa/slave.c b/net/dsa/slave.c
+index 48db91b33390bb..9328ca004fd900 100644
+--- a/net/dsa/slave.c
++++ b/net/dsa/slave.c
+@@ -2822,13 +2822,14 @@ EXPORT_SYMBOL_GPL(dsa_slave_dev_check);
+ static int dsa_slave_changeupper(struct net_device *dev,
+ 				 struct netdev_notifier_changeupper_info *info)
+ {
+-	struct dsa_port *dp = dsa_slave_to_port(dev);
+ 	struct netlink_ext_ack *extack;
+ 	int err = NOTIFY_DONE;
++	struct dsa_port *dp;
+ 
+ 	if (!dsa_slave_dev_check(dev))
+ 		return err;
+ 
++	dp = dsa_slave_to_port(dev);
+ 	extack = netdev_notifier_info_to_extack(&info->info);
+ 
+ 	if (netif_is_bridge_master(info->upper_dev)) {
+@@ -2881,11 +2882,13 @@ static int dsa_slave_changeupper(struct net_device *dev,
+ static int dsa_slave_prechangeupper(struct net_device *dev,
+ 				    struct netdev_notifier_changeupper_info *info)
+ {
+-	struct dsa_port *dp = dsa_slave_to_port(dev);
++	struct dsa_port *dp;
+ 
+ 	if (!dsa_slave_dev_check(dev))
+ 		return NOTIFY_DONE;
+ 
++	dp = dsa_slave_to_port(dev);
++
+ 	if (netif_is_bridge_master(info->upper_dev) && !info->linking)
+ 		dsa_port_pre_bridge_leave(dp, info->upper_dev);
+ 	else if (netif_is_lag_master(info->upper_dev) && !info->linking)
+diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
+index bc74f131fe4dfa..cb0c80328eebf3 100644
+--- a/net/ipv4/devinet.c
++++ b/net/ipv4/devinet.c
+@@ -569,10 +569,6 @@ static int inet_set_ifa(struct net_device *dev, struct in_ifaddr *ifa)
+ 
+ 	ASSERT_RTNL();
+ 
+-	if (!in_dev) {
+-		inet_free_ifa(ifa);
+-		return -ENOBUFS;
+-	}
+ 	ipv4_devconf_setall(in_dev);
+ 	neigh_parms_data_state_setall(in_dev->arp_parms);
+ 	if (ifa->ifa_dev != in_dev) {
+@@ -1174,6 +1170,8 @@ int devinet_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr)
+ 
+ 		if (!ifa) {
+ 			ret = -ENOBUFS;
++			if (!in_dev)
++				break;
+ 			ifa = inet_alloc_ifa();
+ 			if (!ifa)
+ 				break;
+diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
+index 390f4be7f7bec2..90ce87ffed4617 100644
+--- a/net/ipv4/fib_frontend.c
++++ b/net/ipv4/fib_frontend.c
+@@ -1343,7 +1343,7 @@ static void nl_fib_lookup(struct net *net, struct fib_result_nl *frn)
+ 	struct flowi4           fl4 = {
+ 		.flowi4_mark = frn->fl_mark,
+ 		.daddr = frn->fl_addr,
+-		.flowi4_tos = frn->fl_tos,
++		.flowi4_tos = frn->fl_tos & IPTOS_RT_MASK,
+ 		.flowi4_scope = frn->fl_scope,
+ 	};
+ 	struct fib_table *tb;
+diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
+index f21a1a54037239..890c15510b4210 100644
+--- a/net/ipv4/ip_gre.c
++++ b/net/ipv4/ip_gre.c
+@@ -645,11 +645,11 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb,
+ 		if (skb_cow_head(skb, 0))
+ 			goto free_skb;
+ 
+-		tnl_params = (const struct iphdr *)skb->data;
+-
+-		if (!pskb_network_may_pull(skb, pull_len))
++		if (!pskb_may_pull(skb, pull_len))
+ 			goto free_skb;
+ 
++		tnl_params = (const struct iphdr *)skb->data;
++
+ 		/* ip_tunnel_xmit() needs skb->data pointing to gre header. */
+ 		skb_pull(skb, pull_len);
+ 		skb_reset_mac_header(skb);
+diff --git a/net/ipv4/netfilter/nf_dup_ipv4.c b/net/ipv4/netfilter/nf_dup_ipv4.c
+index 6cc5743c553a02..9a21175693db58 100644
+--- a/net/ipv4/netfilter/nf_dup_ipv4.c
++++ b/net/ipv4/netfilter/nf_dup_ipv4.c
+@@ -52,8 +52,9 @@ void nf_dup_ipv4(struct net *net, struct sk_buff *skb, unsigned int hooknum,
+ {
+ 	struct iphdr *iph;
+ 
++	local_bh_disable();
+ 	if (this_cpu_read(nf_skb_duplicated))
+-		return;
++		goto out;
+ 	/*
+ 	 * Copy the skb, and route the copy. Will later return %XT_CONTINUE for
+ 	 * the original skb, which should continue on its way as if nothing has
+@@ -61,7 +62,7 @@ void nf_dup_ipv4(struct net *net, struct sk_buff *skb, unsigned int hooknum,
+ 	 */
+ 	skb = pskb_copy(skb, GFP_ATOMIC);
+ 	if (skb == NULL)
+-		return;
++		goto out;
+ 
+ #if IS_ENABLED(CONFIG_NF_CONNTRACK)
+ 	/* Avoid counting cloned packets towards the original connection. */
+@@ -90,6 +91,8 @@ void nf_dup_ipv4(struct net *net, struct sk_buff *skb, unsigned int hooknum,
+ 	} else {
+ 		kfree_skb(skb);
+ 	}
++out:
++	local_bh_enable();
+ }
+ EXPORT_SYMBOL_GPL(nf_dup_ipv4);
+ 
+diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
+index 96d235bcf5cb22..df3ddf31f8e673 100644
+--- a/net/ipv4/tcp_ipv4.c
++++ b/net/ipv4/tcp_ipv4.c
+@@ -116,6 +116,9 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp)
+ 	const struct tcp_timewait_sock *tcptw = tcp_twsk(sktw);
+ 	struct tcp_sock *tp = tcp_sk(sk);
+ 
++	if (tw->tw_substate == TCP_FIN_WAIT2)
++		reuse = 0;
++
+ 	if (reuse == 2) {
+ 		/* Still does not detect *everything* that goes through
+ 		 * lo, since we require a loopback src or dst address
+diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
+index f544016e6eb3f0..a727eeafd0a96d 100644
+--- a/net/ipv4/udp_offload.c
++++ b/net/ipv4/udp_offload.c
+@@ -290,8 +290,26 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,
+ 		return NULL;
+ 	}
+ 
+-	if (skb_shinfo(gso_skb)->gso_type & SKB_GSO_FRAGLIST)
+-		return __udp_gso_segment_list(gso_skb, features, is_ipv6);
++	if (skb_shinfo(gso_skb)->gso_type & SKB_GSO_FRAGLIST) {
++		 /* Detect modified geometry and pass those to skb_segment. */
++		if (skb_pagelen(gso_skb) - sizeof(*uh) == skb_shinfo(gso_skb)->gso_size)
++			return __udp_gso_segment_list(gso_skb, features, is_ipv6);
++
++		 /* Setup csum, as fraglist skips this in udp4_gro_receive. */
++		gso_skb->csum_start = skb_transport_header(gso_skb) - gso_skb->head;
++		gso_skb->csum_offset = offsetof(struct udphdr, check);
++		gso_skb->ip_summed = CHECKSUM_PARTIAL;
++
++		uh = udp_hdr(gso_skb);
++		if (is_ipv6)
++			uh->check = ~udp_v6_check(gso_skb->len,
++						  &ipv6_hdr(gso_skb)->saddr,
++						  &ipv6_hdr(gso_skb)->daddr, 0);
++		else
++			uh->check = ~udp_v4_check(gso_skb->len,
++						  ip_hdr(gso_skb)->saddr,
++						  ip_hdr(gso_skb)->daddr, 0);
++	}
+ 
+ 	skb_pull(gso_skb, sizeof(*uh));
+ 
+diff --git a/net/ipv6/netfilter/nf_dup_ipv6.c b/net/ipv6/netfilter/nf_dup_ipv6.c
+index a0a2de30be3e7b..0c39c77fe8a8a4 100644
+--- a/net/ipv6/netfilter/nf_dup_ipv6.c
++++ b/net/ipv6/netfilter/nf_dup_ipv6.c
+@@ -47,11 +47,12 @@ static bool nf_dup_ipv6_route(struct net *net, struct sk_buff *skb,
+ void nf_dup_ipv6(struct net *net, struct sk_buff *skb, unsigned int hooknum,
+ 		 const struct in6_addr *gw, int oif)
+ {
++	local_bh_disable();
+ 	if (this_cpu_read(nf_skb_duplicated))
+-		return;
++		goto out;
+ 	skb = pskb_copy(skb, GFP_ATOMIC);
+ 	if (skb == NULL)
+-		return;
++		goto out;
+ 
+ #if IS_ENABLED(CONFIG_NF_CONNTRACK)
+ 	nf_reset_ct(skb);
+@@ -69,6 +70,8 @@ void nf_dup_ipv6(struct net *net, struct sk_buff *skb, unsigned int hooknum,
+ 	} else {
+ 		kfree_skb(skb);
+ 	}
++out:
++	local_bh_enable();
+ }
+ EXPORT_SYMBOL_GPL(nf_dup_ipv6);
+ 
+diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
+index 68952752b5990f..c09aed6a3cfcc8 100644
+--- a/net/mac80211/chan.c
++++ b/net/mac80211/chan.c
+@@ -245,7 +245,9 @@ ieee80211_get_max_required_bw(struct ieee80211_sub_if_data *sdata,
+ 	enum nl80211_chan_width max_bw = NL80211_CHAN_WIDTH_20_NOHT;
+ 	struct sta_info *sta;
+ 
+-	list_for_each_entry_rcu(sta, &sdata->local->sta_list, list) {
++	lockdep_assert_wiphy(sdata->local->hw.wiphy);
++
++	list_for_each_entry(sta, &sdata->local->sta_list, list) {
+ 		if (sdata != sta->sdata &&
+ 		    !(sta->sdata->bss && sta->sdata->bss == sdata->bss))
+ 			continue;
+diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
+index 42e2c84ed2484a..b14c809bcdea33 100644
+--- a/net/mac80211/mlme.c
++++ b/net/mac80211/mlme.c
+@@ -732,7 +732,7 @@ static bool ieee80211_add_vht_ie(struct ieee80211_sub_if_data *sdata,
+ 		bool disable_mu_mimo = false;
+ 		struct ieee80211_sub_if_data *other;
+ 
+-		list_for_each_entry_rcu(other, &local->interfaces, list) {
++		list_for_each_entry(other, &local->interfaces, list) {
+ 			if (other->vif.bss_conf.mu_mimo_owner) {
+ 				disable_mu_mimo = true;
+ 				break;
+diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
+index b58d061333c523..933a58895432f0 100644
+--- a/net/mac80211/scan.c
++++ b/net/mac80211/scan.c
+@@ -489,7 +489,7 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
+ 	 * the scan was in progress; if there was none this will
+ 	 * just be a no-op for the particular interface.
+ 	 */
+-	list_for_each_entry_rcu(sdata, &local->interfaces, list) {
++	list_for_each_entry(sdata, &local->interfaces, list) {
+ 		if (ieee80211_sdata_running(sdata))
+ 			wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work);
+ 	}
+diff --git a/net/mac80211/util.c b/net/mac80211/util.c
+index d682c32821a110..02b5aaad2a155c 100644
+--- a/net/mac80211/util.c
++++ b/net/mac80211/util.c
+@@ -745,7 +745,9 @@ static void __iterate_interfaces(struct ieee80211_local *local,
+ 	struct ieee80211_sub_if_data *sdata;
+ 	bool active_only = iter_flags & IEEE80211_IFACE_ITER_ACTIVE;
+ 
+-	list_for_each_entry_rcu(sdata, &local->interfaces, list) {
++	list_for_each_entry_rcu(sdata, &local->interfaces, list,
++				lockdep_is_held(&local->iflist_mtx) ||
++				lockdep_is_held(&local->hw.wiphy->mtx)) {
+ 		switch (sdata->vif.type) {
+ 		case NL80211_IFTYPE_MONITOR:
+ 			if (!(sdata->u.mntr.flags & MONITOR_FLAG_ACTIVE))
+diff --git a/net/mac802154/scan.c b/net/mac802154/scan.c
+index d9658f2c4ae6be..c9f72f271c4ea1 100644
+--- a/net/mac802154/scan.c
++++ b/net/mac802154/scan.c
+@@ -176,6 +176,7 @@ void mac802154_scan_worker(struct work_struct *work)
+ 	struct ieee802154_local *local =
+ 		container_of(work, struct ieee802154_local, scan_work.work);
+ 	struct cfg802154_scan_request *scan_req;
++	enum nl802154_scan_types scan_req_type;
+ 	struct ieee802154_sub_if_data *sdata;
+ 	unsigned int scan_duration = 0;
+ 	struct wpan_phy *wpan_phy;
+@@ -209,6 +210,7 @@ void mac802154_scan_worker(struct work_struct *work)
+ 	}
+ 
+ 	wpan_phy = scan_req->wpan_phy;
++	scan_req_type = scan_req->type;
+ 	scan_req_duration = scan_req->duration;
+ 
+ 	/* Look for the next valid chan */
+@@ -246,7 +248,7 @@ void mac802154_scan_worker(struct work_struct *work)
+ 		goto end_scan;
+ 	}
+ 
+-	if (scan_req->type == NL802154_SCAN_ACTIVE) {
++	if (scan_req_type == NL802154_SCAN_ACTIVE) {
+ 		ret = mac802154_transmit_beacon_req(local, sdata);
+ 		if (ret)
+ 			dev_err(&sdata->dev->dev,
+diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
+index da7fd3919ce483..aacb0d7f82e9f8 100644
+--- a/net/netfilter/nf_tables_api.c
++++ b/net/netfilter/nf_tables_api.c
+@@ -594,6 +594,12 @@ static int nft_mapelem_deactivate(const struct nft_ctx *ctx,
+ 				  const struct nft_set_iter *iter,
+ 				  struct nft_set_elem *elem)
+ {
++	struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
++
++	if (!nft_set_elem_active(ext, iter->genmask))
++		return 0;
++
++	nft_set_elem_change_active(ctx->net, set, ext);
+ 	nft_setelem_data_deactivate(ctx->net, set, elem);
+ 
+ 	return 0;
+@@ -619,6 +625,7 @@ static void nft_map_catchall_deactivate(const struct nft_ctx *ctx,
+ 			continue;
+ 
+ 		elem.priv = catchall->elem;
++		nft_set_elem_change_active(ctx->net, set, ext);
+ 		nft_setelem_data_deactivate(ctx->net, set, &elem);
+ 		break;
+ 	}
+@@ -3820,6 +3827,9 @@ int nft_setelem_validate(const struct nft_ctx *ctx, struct nft_set *set,
+ 	const struct nft_data *data;
+ 	int err;
+ 
++	if (!nft_set_elem_active(ext, iter->genmask))
++		return 0;
++
+ 	if (nft_set_ext_exists(ext, NFT_SET_EXT_FLAGS) &&
+ 	    *nft_set_ext_flags(ext) & NFT_SET_ELEM_INTERVAL_END)
+ 		return 0;
+@@ -3843,19 +3853,22 @@ int nft_setelem_validate(const struct nft_ctx *ctx, struct nft_set *set,
+ 
+ int nft_set_catchall_validate(const struct nft_ctx *ctx, struct nft_set *set)
+ {
+-	u8 genmask = nft_genmask_next(ctx->net);
++	struct nft_set_iter dummy_iter = {
++		.genmask	= nft_genmask_next(ctx->net),
++	};
+ 	struct nft_set_elem_catchall *catchall;
+ 	struct nft_set_elem elem;
++
+ 	struct nft_set_ext *ext;
+ 	int ret = 0;
+ 
+ 	list_for_each_entry_rcu(catchall, &set->catchall_list, list) {
+ 		ext = nft_set_elem_ext(set, catchall->elem);
+-		if (!nft_set_elem_active(ext, genmask))
++		if (!nft_set_elem_active(ext, dummy_iter.genmask))
+ 			continue;
+ 
+ 		elem.priv = catchall->elem;
+-		ret = nft_setelem_validate(ctx, set, NULL, &elem);
++		ret = nft_setelem_validate(ctx, set, &dummy_iter, &elem);
+ 		if (ret < 0)
+ 			return ret;
+ 	}
+@@ -5347,6 +5360,11 @@ static int nf_tables_bind_check_setelem(const struct nft_ctx *ctx,
+ 					const struct nft_set_iter *iter,
+ 					struct nft_set_elem *elem)
+ {
++	const struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
++
++	if (!nft_set_elem_active(ext, iter->genmask))
++		return 0;
++
+ 	return nft_setelem_data_validate(ctx, set, elem);
+ }
+ 
+@@ -5441,6 +5459,13 @@ static int nft_mapelem_activate(const struct nft_ctx *ctx,
+ 				const struct nft_set_iter *iter,
+ 				struct nft_set_elem *elem)
+ {
++	struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
++
++	/* called from abort path, reverse check to undo changes. */
++	if (nft_set_elem_active(ext, iter->genmask))
++		return 0;
++
++	nft_clear(ctx->net, ext);
+ 	nft_setelem_data_activate(ctx->net, set, elem);
+ 
+ 	return 0;
+@@ -5459,6 +5484,7 @@ static void nft_map_catchall_activate(const struct nft_ctx *ctx,
+ 		if (!nft_set_elem_active(ext, genmask))
+ 			continue;
+ 
++		nft_clear(ctx->net, ext);
+ 		elem.priv = catchall->elem;
+ 		nft_setelem_data_activate(ctx->net, set, &elem);
+ 		break;
+@@ -5733,6 +5759,9 @@ static int nf_tables_dump_setelem(const struct nft_ctx *ctx,
+ 	const struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
+ 	struct nft_set_dump_args *args;
+ 
++	if (!nft_set_elem_active(ext, iter->genmask))
++		return 0;
++
+ 	if (nft_set_elem_expired(ext) || nft_set_elem_is_dead(ext))
+ 		return 0;
+ 
+@@ -6500,7 +6529,7 @@ static void nft_setelem_activate(struct net *net, struct nft_set *set,
+ 	struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
+ 
+ 	if (nft_setelem_is_catchall(set, elem)) {
+-		nft_set_elem_change_active(net, set, ext);
++		nft_clear(net, ext);
+ 	} else {
+ 		set->ops->activate(net, set, elem);
+ 	}
+@@ -7061,6 +7090,16 @@ void nft_data_hold(const struct nft_data *data, enum nft_data_types type)
+ 	}
+ }
+ 
++static int nft_setelem_active_next(const struct net *net,
++				   const struct nft_set *set,
++				   struct nft_set_elem *elem)
++{
++	const struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
++	u8 genmask = nft_genmask_next(net);
++
++	return nft_set_elem_active(ext, genmask);
++}
++
+ static void nft_setelem_data_activate(const struct net *net,
+ 				      const struct nft_set *set,
+ 				      struct nft_set_elem *elem)
+@@ -7184,9 +7223,13 @@ static int nft_setelem_flush(const struct nft_ctx *ctx,
+ 			     const struct nft_set_iter *iter,
+ 			     struct nft_set_elem *elem)
+ {
++	const struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
+ 	struct nft_trans *trans;
+ 	int err;
+ 
++	if (!nft_set_elem_active(ext, iter->genmask))
++		return 0;
++
+ 	trans = nft_trans_alloc_gfp(ctx, NFT_MSG_DELSETELEM,
+ 				    sizeof(struct nft_trans_elem), GFP_ATOMIC);
+ 	if (!trans)
+@@ -10538,8 +10581,10 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)
+ 		case NFT_MSG_DESTROYSETELEM:
+ 			te = (struct nft_trans_elem *)trans->data;
+ 
+-			nft_setelem_data_activate(net, te->set, &te->elem);
+-			nft_setelem_activate(net, te->set, &te->elem);
++			if (!nft_setelem_active_next(net, te->set, &te->elem)) {
++				nft_setelem_data_activate(net, te->set, &te->elem);
++				nft_setelem_activate(net, te->set, &te->elem);
++			}
+ 			if (!nft_setelem_is_catchall(te->set, &te->elem))
+ 				te->set->ndeact--;
+ 
+diff --git a/net/netfilter/nft_set_bitmap.c b/net/netfilter/nft_set_bitmap.c
+index 1e5e7a181e0bc2..cbf7f7825f1b88 100644
+--- a/net/netfilter/nft_set_bitmap.c
++++ b/net/netfilter/nft_set_bitmap.c
+@@ -171,7 +171,7 @@ static void nft_bitmap_activate(const struct net *net,
+ 	nft_bitmap_location(set, nft_set_ext_key(&be->ext), &idx, &off);
+ 	/* Enter 11 state. */
+ 	priv->bitmap[idx] |= (genmask << off);
+-	nft_set_elem_change_active(net, set, &be->ext);
++	nft_clear(net, &be->ext);
+ }
+ 
+ static bool nft_bitmap_flush(const struct net *net,
+@@ -223,8 +223,6 @@ static void nft_bitmap_walk(const struct nft_ctx *ctx,
+ 	list_for_each_entry_rcu(be, &priv->list, head) {
+ 		if (iter->count < iter->skip)
+ 			goto cont;
+-		if (!nft_set_elem_active(&be->ext, iter->genmask))
+-			goto cont;
+ 
+ 		elem.priv = be;
+ 
+diff --git a/net/netfilter/nft_set_hash.c b/net/netfilter/nft_set_hash.c
+index 2013de934cef09..3a96d4a77a228a 100644
+--- a/net/netfilter/nft_set_hash.c
++++ b/net/netfilter/nft_set_hash.c
+@@ -189,7 +189,7 @@ static void nft_rhash_activate(const struct net *net, const struct nft_set *set,
+ {
+ 	struct nft_rhash_elem *he = elem->priv;
+ 
+-	nft_set_elem_change_active(net, set, &he->ext);
++	nft_clear(net, &he->ext);
+ }
+ 
+ static bool nft_rhash_flush(const struct net *net,
+@@ -277,8 +277,6 @@ static void nft_rhash_walk(const struct nft_ctx *ctx, struct nft_set *set,
+ 
+ 		if (iter->count < iter->skip)
+ 			goto cont;
+-		if (!nft_set_elem_active(&he->ext, iter->genmask))
+-			goto cont;
+ 
+ 		elem.priv = he;
+ 
+@@ -587,7 +585,7 @@ static void nft_hash_activate(const struct net *net, const struct nft_set *set,
+ {
+ 	struct nft_hash_elem *he = elem->priv;
+ 
+-	nft_set_elem_change_active(net, set, &he->ext);
++	nft_clear(net, &he->ext);
+ }
+ 
+ static bool nft_hash_flush(const struct net *net,
+@@ -641,8 +639,6 @@ static void nft_hash_walk(const struct nft_ctx *ctx, struct nft_set *set,
+ 		hlist_for_each_entry_rcu(he, &priv->table[i], node) {
+ 			if (iter->count < iter->skip)
+ 				goto cont;
+-			if (!nft_set_elem_active(&he->ext, iter->genmask))
+-				goto cont;
+ 
+ 			elem.priv = he;
+ 
+diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c
+index 22407e7e0b51e3..334958ef8d66c8 100644
+--- a/net/netfilter/nft_set_pipapo.c
++++ b/net/netfilter/nft_set_pipapo.c
+@@ -1766,7 +1766,7 @@ static void nft_pipapo_activate(const struct net *net,
+ {
+ 	struct nft_pipapo_elem *e = elem->priv;
+ 
+-	nft_set_elem_change_active(net, set, &e->ext);
++	nft_clear(net, &e->ext);
+ }
+ 
+ /**
+@@ -2068,9 +2068,6 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set,
+ 
+ 		e = f->mt[r].e;
+ 
+-		if (!nft_set_elem_active(&e->ext, iter->genmask))
+-			goto cont;
+-
+ 		elem.priv = e;
+ 
+ 		iter->err = iter->fn(ctx, set, iter, &elem);
+diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c
+index 5bf5572e945cc3..afbda7e3fd0487 100644
+--- a/net/netfilter/nft_set_rbtree.c
++++ b/net/netfilter/nft_set_rbtree.c
+@@ -527,7 +527,7 @@ static void nft_rbtree_activate(const struct net *net,
+ {
+ 	struct nft_rbtree_elem *rbe = elem->priv;
+ 
+-	nft_set_elem_change_active(net, set, &rbe->ext);
++	nft_clear(net, &rbe->ext);
+ }
+ 
+ static bool nft_rbtree_flush(const struct net *net,
+@@ -596,8 +596,6 @@ static void nft_rbtree_walk(const struct nft_ctx *ctx,
+ 
+ 		if (iter->count < iter->skip)
+ 			goto cont;
+-		if (!nft_set_elem_active(&rbe->ext, iter->genmask))
+-			goto cont;
+ 
+ 		elem.priv = rbe;
+ 
+diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
+index d431376bb120ab..66ad7dc10864e0 100644
+--- a/net/rxrpc/ar-internal.h
++++ b/net/rxrpc/ar-internal.h
+@@ -1066,7 +1066,7 @@ bool rxrpc_direct_abort(struct sk_buff *skb, enum rxrpc_abort_reason why,
+ int rxrpc_io_thread(void *data);
+ static inline void rxrpc_wake_up_io_thread(struct rxrpc_local *local)
+ {
+-	wake_up_process(local->io_thread);
++	wake_up_process(READ_ONCE(local->io_thread));
+ }
+ 
+ static inline bool rxrpc_protocol_error(struct sk_buff *skb, enum rxrpc_abort_reason why)
+diff --git a/net/rxrpc/io_thread.c b/net/rxrpc/io_thread.c
+index 4a3a08a0e2cd04..d7e72bae4d2b2c 100644
+--- a/net/rxrpc/io_thread.c
++++ b/net/rxrpc/io_thread.c
+@@ -27,11 +27,17 @@ int rxrpc_encap_rcv(struct sock *udp_sk, struct sk_buff *skb)
+ {
+ 	struct sk_buff_head *rx_queue;
+ 	struct rxrpc_local *local = rcu_dereference_sk_user_data(udp_sk);
++	struct task_struct *io_thread;
+ 
+ 	if (unlikely(!local)) {
+ 		kfree_skb(skb);
+ 		return 0;
+ 	}
++	io_thread = READ_ONCE(local->io_thread);
++	if (!io_thread) {
++		kfree_skb(skb);
++		return 0;
++	}
+ 	if (skb->tstamp == 0)
+ 		skb->tstamp = ktime_get_real();
+ 
+@@ -47,7 +53,7 @@ int rxrpc_encap_rcv(struct sock *udp_sk, struct sk_buff *skb)
+ #endif
+ 
+ 	skb_queue_tail(rx_queue, skb);
+-	rxrpc_wake_up_io_thread(local);
++	wake_up_process(io_thread);
+ 	return 0;
+ }
+ 
+@@ -554,7 +560,7 @@ int rxrpc_io_thread(void *data)
+ 	__set_current_state(TASK_RUNNING);
+ 	rxrpc_see_local(local, rxrpc_local_stop);
+ 	rxrpc_destroy_local(local);
+-	local->io_thread = NULL;
++	WRITE_ONCE(local->io_thread, NULL);
+ 	rxrpc_see_local(local, rxrpc_local_stopped);
+ 	return 0;
+ }
+diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c
+index 34d30736813531..8da6120f65330e 100644
+--- a/net/rxrpc/local_object.c
++++ b/net/rxrpc/local_object.c
+@@ -232,7 +232,7 @@ static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net)
+ 	}
+ 
+ 	wait_for_completion(&local->io_thread_ready);
+-	local->io_thread = io_thread;
++	WRITE_ONCE(local->io_thread, io_thread);
+ 	_leave(" = 0");
+ 	return 0;
+ 
+diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
+index 418d4a846d04a8..87090d67903621 100644
+--- a/net/sched/sch_taprio.c
++++ b/net/sched/sch_taprio.c
+@@ -1975,7 +1975,9 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt,
+ 			goto unlock;
+ 		}
+ 
+-		rcu_assign_pointer(q->admin_sched, new_admin);
++		/* Not going to race against advance_sched(), but still */
++		admin = rcu_replace_pointer(q->admin_sched, new_admin,
++					    lockdep_rtnl_is_held());
+ 		if (admin)
+ 			call_rcu(&admin->rcu, taprio_free_sched_cb);
+ 	} else {
+diff --git a/net/sctp/socket.c b/net/sctp/socket.c
+index 225dfacfd233fd..4a1ebe46d045d8 100644
+--- a/net/sctp/socket.c
++++ b/net/sctp/socket.c
+@@ -8551,8 +8551,10 @@ static int sctp_listen_start(struct sock *sk, int backlog)
+ 	 */
+ 	inet_sk_set_state(sk, SCTP_SS_LISTENING);
+ 	if (!ep->base.bind_addr.port) {
+-		if (sctp_autobind(sk))
++		if (sctp_autobind(sk)) {
++			inet_sk_set_state(sk, SCTP_SS_CLOSED);
+ 			return -EAGAIN;
++		}
+ 	} else {
+ 		if (sctp_get_port(sk, inet_sk(sk)->inet_num)) {
+ 			inet_sk_set_state(sk, SCTP_SS_CLOSED);
+diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
+index 878415c4352761..fec638e494c9dd 100644
+--- a/net/tipc/bearer.c
++++ b/net/tipc/bearer.c
+@@ -163,8 +163,12 @@ static int bearer_name_validate(const char *name,
+ 
+ 	/* return bearer name components, if necessary */
+ 	if (name_parts) {
+-		strcpy(name_parts->media_name, media_name);
+-		strcpy(name_parts->if_name, if_name);
++		if (strscpy(name_parts->media_name, media_name,
++			    TIPC_MAX_MEDIA_NAME) < 0)
++			return 0;
++		if (strscpy(name_parts->if_name, if_name,
++			    TIPC_MAX_IF_NAME) < 0)
++			return 0;
+ 	}
+ 	return 1;
+ }
+diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
+index 4ce23762b1c954..9e74f249cb45f1 100644
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -10048,7 +10048,20 @@ static int nl80211_start_radar_detection(struct sk_buff *skb,
+ 
+ 	err = rdev_start_radar_detection(rdev, dev, &chandef, cac_time_ms);
+ 	if (!err) {
+-		wdev->links[0].ap.chandef = chandef;
++		switch (wdev->iftype) {
++		case NL80211_IFTYPE_AP:
++		case NL80211_IFTYPE_P2P_GO:
++			wdev->links[0].ap.chandef = chandef;
++			break;
++		case NL80211_IFTYPE_ADHOC:
++			wdev->u.ibss.chandef = chandef;
++			break;
++		case NL80211_IFTYPE_MESH_POINT:
++			wdev->u.mesh.chandef = chandef;
++			break;
++		default:
++			break;
++		}
+ 		wdev->cac_started = true;
+ 		wdev->cac_start_time = jiffies;
+ 		wdev->cac_time_ms = cac_time_ms;
+diff --git a/rust/kernel/sync/locked_by.rs b/rust/kernel/sync/locked_by.rs
+index b17ee5cd98f3eb..48546ad37335b6 100644
+--- a/rust/kernel/sync/locked_by.rs
++++ b/rust/kernel/sync/locked_by.rs
+@@ -80,8 +80,12 @@ pub struct LockedBy<T: ?Sized, U: ?Sized> {
+ // SAFETY: `LockedBy` can be transferred across thread boundaries iff the data it protects can.
+ unsafe impl<T: ?Sized + Send, U: ?Sized> Send for LockedBy<T, U> {}
+ 
+-// SAFETY: `LockedBy` serialises the interior mutability it provides, so it is `Sync` as long as the
+-// data it protects is `Send`.
++// SAFETY: If `T` is not `Sync`, then parallel shared access to this `LockedBy` allows you to use
++// `access_mut` to hand out `&mut T` on one thread at the time. The requirement that `T: Send` is
++// sufficient to allow that.
++//
++// If `T` is `Sync`, then the `access` method also becomes available, which allows you to obtain
++// several `&T` from several threads at once. However, this is okay as `T` is `Sync`.
+ unsafe impl<T: ?Sized + Send, U: ?Sized> Sync for LockedBy<T, U> {}
+ 
+ impl<T, U> LockedBy<T, U> {
+@@ -115,7 +119,10 @@ impl<T: ?Sized, U> LockedBy<T, U> {
+     ///
+     /// Panics if `owner` is different from the data protected by the lock used in
+     /// [`new`](LockedBy::new).
+-    pub fn access<'a>(&'a self, owner: &'a U) -> &'a T {
++    pub fn access<'a>(&'a self, owner: &'a U) -> &'a T
++    where
++        T: Sync,
++    {
+         build_assert!(
+             size_of::<U>() > 0,
+             "`U` cannot be a ZST because `owner` wouldn't be unique"
+@@ -124,7 +131,10 @@ pub fn access<'a>(&'a self, owner: &'a U) -> &'a T {
+             panic!("mismatched owners");
+         }
+ 
+-        // SAFETY: `owner` is evidence that the owner is locked.
++        // SAFETY: `owner` is evidence that there are only shared references to the owner for the
++        // duration of 'a, so it's not possible to use `Self::access_mut` to obtain a mutable
++        // reference to the inner value that aliases with this shared reference. The type is `Sync`
++        // so there are no other requirements.
+         unsafe { &*self.data.get() }
+     }
+ 
+diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
+index 620a3527c767af..4f3ba3debc08e1 100644
+--- a/scripts/kconfig/qconf.cc
++++ b/scripts/kconfig/qconf.cc
+@@ -1174,7 +1174,7 @@ void ConfigInfoView::clicked(const QUrl &url)
+ {
+ 	QByteArray str = url.toEncoded();
+ 	const std::size_t count = str.size();
+-	char *data = new char[count + 1];
++	char *data = new char[count + 2];  // '$' + '\0'
+ 	struct symbol **result;
+ 	struct menu *m = NULL;
+ 
+diff --git a/security/Kconfig b/security/Kconfig
+index 52c9af08ad35d3..39af8b8696efb0 100644
+--- a/security/Kconfig
++++ b/security/Kconfig
+@@ -19,6 +19,38 @@ config SECURITY_DMESG_RESTRICT
+ 
+ 	  If you are unsure how to answer this question, answer N.
+ 
++choice
++	prompt "Allow /proc/pid/mem access override"
++	default PROC_MEM_ALWAYS_FORCE
++	help
++	  Traditionally /proc/pid/mem allows users to override memory
++	  permissions for users like ptrace, assuming they have ptrace
++	  capability.
++
++	  This allows people to limit that - either never override, or
++	  require actual active ptrace attachment.
++
++	  Defaults to the traditional behavior (for now)
++
++config PROC_MEM_ALWAYS_FORCE
++	bool "Traditional /proc/pid/mem behavior"
++	help
++	  This allows /proc/pid/mem accesses to override memory mapping
++	  permissions if you have ptrace access rights.
++
++config PROC_MEM_FORCE_PTRACE
++	bool "Require active ptrace() use for access override"
++	help
++	  This allows /proc/pid/mem accesses to override memory mapping
++	  permissions for active ptracers like gdb.
++
++config PROC_MEM_NO_FORCE
++	bool "Never"
++	help
++	  Never override memory mapping permissions
++
++endchoice
++
+ config SECURITY
+ 	bool "Enable different security models"
+ 	depends on SYSFS
+diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c
+index 90b53500a236bd..aed9e3ef2c9ecb 100644
+--- a/security/tomoyo/domain.c
++++ b/security/tomoyo/domain.c
+@@ -723,10 +723,13 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm)
+ 	ee->r.obj = &ee->obj;
+ 	ee->obj.path1 = bprm->file->f_path;
+ 	/* Get symlink's pathname of program. */
+-	retval = -ENOENT;
+ 	exename.name = tomoyo_realpath_nofollow(original_name);
+-	if (!exename.name)
+-		goto out;
++	if (!exename.name) {
++		/* Fallback to realpath if symlink's pathname does not exist. */
++		exename.name = tomoyo_realpath_from_path(&bprm->file->f_path);
++		if (!exename.name)
++			goto out;
++	}
+ 	tomoyo_fill_path_info(&exename);
+ retry:
+ 	/* Check 'aggregator' directive. */
+diff --git a/sound/core/init.c b/sound/core/init.c
+index b2b7e50ff4cc3b..81186af3ac625c 100644
+--- a/sound/core/init.c
++++ b/sound/core/init.c
+@@ -666,13 +666,19 @@ void snd_card_free(struct snd_card *card)
+ }
+ EXPORT_SYMBOL(snd_card_free);
+ 
++/* check, if the character is in the valid ASCII range */
++static inline bool safe_ascii_char(char c)
++{
++	return isascii(c) && isalnum(c);
++}
++
+ /* retrieve the last word of shortname or longname */
+ static const char *retrieve_id_from_card_name(const char *name)
+ {
+ 	const char *spos = name;
+ 
+ 	while (*name) {
+-		if (isspace(*name) && isalnum(name[1]))
++		if (isspace(*name) && safe_ascii_char(name[1]))
+ 			spos = name + 1;
+ 		name++;
+ 	}
+@@ -699,12 +705,12 @@ static void copy_valid_id_string(struct snd_card *card, const char *src,
+ {
+ 	char *id = card->id;
+ 
+-	while (*nid && !isalnum(*nid))
++	while (*nid && !safe_ascii_char(*nid))
+ 		nid++;
+ 	if (isdigit(*nid))
+ 		*id++ = isalpha(*src) ? *src : 'D';
+ 	while (*nid && (size_t)(id - card->id) < sizeof(card->id) - 1) {
+-		if (isalnum(*nid))
++		if (safe_ascii_char(*nid))
+ 			*id++ = *nid;
+ 		nid++;
+ 	}
+@@ -800,7 +806,7 @@ static ssize_t id_store(struct device *dev, struct device_attribute *attr,
+ 
+ 	for (idx = 0; idx < copy; idx++) {
+ 		c = buf[idx];
+-		if (!isalnum(c) && c != '_' && c != '-')
++		if (!safe_ascii_char(c) && c != '_' && c != '-')
+ 			return -EINVAL;
+ 	}
+ 	memcpy(buf1, buf, copy);
+diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
+index dae2da3808351b..abc99ae3332824 100644
+--- a/sound/core/oss/mixer_oss.c
++++ b/sound/core/oss/mixer_oss.c
+@@ -967,8 +967,8 @@ static void snd_mixer_oss_slot_free(struct snd_mixer_oss_slot *chn)
+ 	struct slot *p = chn->private_data;
+ 	if (p) {
+ 		if (p->allocated && p->assigned) {
+-			kfree_const(p->assigned->name);
+-			kfree_const(p->assigned);
++			kfree(p->assigned->name);
++			kfree(p->assigned);
+ 		}
+ 		kfree(p);
+ 	}
+diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c
+index 850544725da796..d55c3dc229c0e8 100644
+--- a/sound/isa/gus/gus_pcm.c
++++ b/sound/isa/gus/gus_pcm.c
+@@ -378,7 +378,7 @@ static int snd_gf1_pcm_playback_copy(struct snd_pcm_substream *substream,
+ 
+ 	bpos = get_bpos(pcmp, voice, pos, len);
+ 	if (bpos < 0)
+-		return pos;
++		return bpos;
+ 	if (copy_from_iter(runtime->dma_area + bpos, len, src) != len)
+ 		return -EFAULT;
+ 	return playback_copy_ack(substream, bpos, len);
+@@ -395,7 +395,7 @@ static int snd_gf1_pcm_playback_silence(struct snd_pcm_substream *substream,
+ 	
+ 	bpos = get_bpos(pcmp, voice, pos, len);
+ 	if (bpos < 0)
+-		return pos;
++		return bpos;
+ 	snd_pcm_format_set_silence(runtime->format, runtime->dma_area + bpos,
+ 				   bytes_to_samples(runtime, count));
+ 	return playback_copy_ack(substream, bpos, len);
+diff --git a/sound/pci/asihpi/hpimsgx.c b/sound/pci/asihpi/hpimsgx.c
+index d0caef2994818e..b68e6bfbbfbab5 100644
+--- a/sound/pci/asihpi/hpimsgx.c
++++ b/sound/pci/asihpi/hpimsgx.c
+@@ -708,7 +708,7 @@ static u16 HPIMSGX__init(struct hpi_message *phm,
+ 		phr->error = HPI_ERROR_PROCESSING_MESSAGE;
+ 		return phr->error;
+ 	}
+-	if (hr.error == 0) {
++	if (hr.error == 0 && hr.u.s.adapter_index < HPI_MAX_ADAPTERS) {
+ 		/* the adapter was created successfully
+ 		   save the mapping for future use */
+ 		hpi_entry_points[hr.u.s.adapter_index] = entry_point_func;
+diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h
+index f31cb31d463621..8556031bcd68e4 100644
+--- a/sound/pci/hda/hda_controller.h
++++ b/sound/pci/hda/hda_controller.h
+@@ -28,7 +28,7 @@
+ #else
+ #define AZX_DCAPS_I915_COMPONENT 0		/* NOP */
+ #endif
+-#define AZX_DCAPS_AMD_ALLOC_FIX	(1 << 14)	/* AMD allocation workaround */
++/* 14 unused */
+ #define AZX_DCAPS_CTX_WORKAROUND (1 << 15)	/* X-Fi workaround */
+ #define AZX_DCAPS_POSFIX_LPIB	(1 << 16)	/* Use LPIB as default */
+ #define AZX_DCAPS_AMD_WORKAROUND (1 << 17)	/* AMD-specific workaround */
+diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
+index d3ed3e21b1979f..8e8d4c667923c5 100644
+--- a/sound/pci/hda/hda_generic.c
++++ b/sound/pci/hda/hda_generic.c
+@@ -1383,7 +1383,7 @@ static int try_assign_dacs(struct hda_codec *codec, int num_outs,
+ 		struct nid_path *path;
+ 		hda_nid_t pin = pins[i];
+ 
+-		if (!spec->obey_preferred_dacs) {
++		if (!spec->preferred_dacs) {
+ 			path = snd_hda_get_path_from_idx(codec, path_idx[i]);
+ 			if (path) {
+ 				badness += assign_out_path_ctls(codec, path);
+@@ -1395,7 +1395,7 @@ static int try_assign_dacs(struct hda_codec *codec, int num_outs,
+ 		if (dacs[i]) {
+ 			if (is_dac_already_used(codec, dacs[i]))
+ 				badness += bad->shared_primary;
+-		} else if (spec->obey_preferred_dacs) {
++		} else if (spec->preferred_dacs) {
+ 			badness += BAD_NO_PRIMARY_DAC;
+ 		}
+ 
+diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
+index d5c9f113e477a5..a6a9d353fe635a 100644
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -40,7 +40,6 @@
+ 
+ #ifdef CONFIG_X86
+ /* for snoop control */
+-#include <linux/dma-map-ops.h>
+ #include <asm/set_memory.h>
+ #include <asm/cpufeature.h>
+ #endif
+@@ -302,7 +301,7 @@ enum {
+ 
+ /* quirks for ATI HDMI with snoop off */
+ #define AZX_DCAPS_PRESET_ATI_HDMI_NS \
+-	(AZX_DCAPS_PRESET_ATI_HDMI | AZX_DCAPS_AMD_ALLOC_FIX)
++	(AZX_DCAPS_PRESET_ATI_HDMI | AZX_DCAPS_SNOOP_OFF)
+ 
+ /* quirks for AMD SB */
+ #define AZX_DCAPS_PRESET_AMD_SB \
+@@ -1716,13 +1715,6 @@ static void azx_check_snoop_available(struct azx *chip)
+ 	if (chip->driver_caps & AZX_DCAPS_SNOOP_OFF)
+ 		snoop = false;
+ 
+-#ifdef CONFIG_X86
+-	/* check the presence of DMA ops (i.e. IOMMU), disable snoop conditionally */
+-	if ((chip->driver_caps & AZX_DCAPS_AMD_ALLOC_FIX) &&
+-	    !get_dma_ops(chip->card->dev))
+-		snoop = false;
+-#endif
+-
+ 	chip->snoop = snoop;
+ 	if (!snoop) {
+ 		dev_info(chip->card->dev, "Force to non-snoop mode\n");
+diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
+index 63bd0e384bae2c..8a3abd4babba6e 100644
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -820,6 +820,23 @@ static const struct hda_pintbl cxt_pincfg_sws_js201d[] = {
+ 	{}
+ };
+ 
++/* pincfg quirk for Tuxedo Sirius;
++ * unfortunately the (PCI) SSID conflicts with System76 Pangolin pang14,
++ * which has incompatible pin setup, so we check the codec SSID (luckily
++ * different one!) and conditionally apply the quirk here
++ */
++static void cxt_fixup_sirius_top_speaker(struct hda_codec *codec,
++					 const struct hda_fixup *fix,
++					 int action)
++{
++	/* ignore for incorrectly picked-up pang14 */
++	if (codec->core.subsystem_id == 0x278212b3)
++		return;
++	/* set up the top speaker pin */
++	if (action == HDA_FIXUP_ACT_PRE_PROBE)
++		snd_hda_codec_set_pincfg(codec, 0x1d, 0x82170111);
++}
++
+ static const struct hda_fixup cxt_fixups[] = {
+ 	[CXT_PINCFG_LENOVO_X200] = {
+ 		.type = HDA_FIXUP_PINS,
+@@ -980,11 +997,8 @@ static const struct hda_fixup cxt_fixups[] = {
+ 		.v.pins = cxt_pincfg_sws_js201d,
+ 	},
+ 	[CXT_PINCFG_TOP_SPEAKER] = {
+-		.type = HDA_FIXUP_PINS,
+-		.v.pins = (const struct hda_pintbl[]) {
+-			{ 0x1d, 0x82170111 },
+-			{ }
+-		},
++		.type = HDA_FIXUP_FUNC,
++		.v.func = cxt_fixup_sirius_top_speaker,
+ 	},
+ };
+ 
+diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
+index 130508f5ad9c8a..ebdd7c43233636 100644
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -585,6 +585,7 @@ static void alc_shutup_pins(struct hda_codec *codec)
+ 	switch (codec->core.vendor_id) {
+ 	case 0x10ec0236:
+ 	case 0x10ec0256:
++	case 0x10ec0257:
+ 	case 0x19e58326:
+ 	case 0x10ec0283:
+ 	case 0x10ec0285:
+@@ -9922,6 +9923,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+ 	SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED),
+ 	SND_PCI_QUIRK(0x103c, 0x8898, "HP EliteBook 845 G8 Notebook PC", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),
+ 	SND_PCI_QUIRK(0x103c, 0x88d0, "HP Pavilion 15-eh1xxx (mainboard 88D0)", ALC287_FIXUP_HP_GPIO_LED),
++	SND_PCI_QUIRK(0x103c, 0x88dd, "HP Pavilion 15z-ec200", ALC285_FIXUP_HP_MUTE_LED),
+ 	SND_PCI_QUIRK(0x103c, 0x8902, "HP OMEN 16", ALC285_FIXUP_HP_MUTE_LED),
+ 	SND_PCI_QUIRK(0x103c, 0x890e, "HP 255 G8 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
+ 	SND_PCI_QUIRK(0x103c, 0x8919, "HP Pavilion Aero Laptop 13-be0xxx", ALC287_FIXUP_HP_GPIO_LED),
+@@ -10329,6 +10331,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+ 	SND_PCI_QUIRK(0x17aa, 0x38cd, "Y790 VECO DUAL", ALC287_FIXUP_TAS2781_I2C),
+ 	SND_PCI_QUIRK(0x17aa, 0x38d2, "Lenovo Yoga 9 14IMH9", ALC287_FIXUP_YOGA9_14IMH9_BASS_SPK_PIN),
+ 	SND_PCI_QUIRK(0x17aa, 0x38d7, "Lenovo Yoga 9 14IMH9", ALC287_FIXUP_YOGA9_14IMH9_BASS_SPK_PIN),
++	SND_PCI_QUIRK(0x17aa, 0x38df, "Y990 YG DUAL", ALC287_FIXUP_TAS2781_I2C),
+ 	SND_PCI_QUIRK(0x17aa, 0x38f9, "Thinkbook 16P Gen5", ALC287_FIXUP_CS35L41_I2C_2),
+ 	SND_PCI_QUIRK(0x17aa, 0x38fa, "Thinkbook 16P Gen5", ALC287_FIXUP_CS35L41_I2C_2),
+ 	SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
+@@ -10361,6 +10364,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+ 	SND_PCI_QUIRK(0x1849, 0xa233, "Positivo Master C6300", ALC269_FIXUP_HEADSET_MIC),
+ 	SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MACH-WX9", ALC256_FIXUP_HUAWEI_MACH_WX9_PINS),
+ 	SND_PCI_QUIRK(0x19e5, 0x320f, "Huawei WRT-WX9 ", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),
++	SND_PCI_QUIRK(0x19e5, 0x3212, "Huawei KLV-WX9 ", ALC256_FIXUP_ACER_HEADSET_MIC),
+ 	SND_PCI_QUIRK(0x1b35, 0x1235, "CZC B20", ALC269_FIXUP_CZC_B20),
+ 	SND_PCI_QUIRK(0x1b35, 0x1236, "CZC TMI", ALC269_FIXUP_CZC_TMI),
+ 	SND_PCI_QUIRK(0x1b35, 0x1237, "CZC L101", ALC269_FIXUP_CZC_L101),
+diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
+index e7d1b43471a291..713ca262a0e979 100644
+--- a/sound/pci/rme9652/hdsp.c
++++ b/sound/pci/rme9652/hdsp.c
+@@ -1298,8 +1298,10 @@ static int snd_hdsp_midi_output_possible (struct hdsp *hdsp, int id)
+ 
+ static void snd_hdsp_flush_midi_input (struct hdsp *hdsp, int id)
+ {
+-	while (snd_hdsp_midi_input_available (hdsp, id))
+-		snd_hdsp_midi_read_byte (hdsp, id);
++	int count = 256;
++
++	while (snd_hdsp_midi_input_available(hdsp, id) && --count)
++		snd_hdsp_midi_read_byte(hdsp, id);
+ }
+ 
+ static int snd_hdsp_midi_output_write (struct hdsp_midi *hmidi)
+diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
+index 267c7848974aee..74215f57f4fc9d 100644
+--- a/sound/pci/rme9652/hdspm.c
++++ b/sound/pci/rme9652/hdspm.c
+@@ -1838,8 +1838,10 @@ static inline int snd_hdspm_midi_output_possible (struct hdspm *hdspm, int id)
+ 
+ static void snd_hdspm_flush_midi_input(struct hdspm *hdspm, int id)
+ {
+-	while (snd_hdspm_midi_input_available (hdspm, id))
+-		snd_hdspm_midi_read_byte (hdspm, id);
++	int count = 256;
++
++	while (snd_hdspm_midi_input_available(hdspm, id) && --count)
++		snd_hdspm_midi_read_byte(hdspm, id);
+ }
+ 
+ static int snd_hdspm_midi_output_write (struct hdspm_midi *hmidi)
+diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c
+index dcc4e14b3dde27..206bbb5aaab5d9 100644
+--- a/sound/soc/atmel/mchp-pdmc.c
++++ b/sound/soc/atmel/mchp-pdmc.c
+@@ -285,6 +285,9 @@ static int mchp_pdmc_chmap_ctl_put(struct snd_kcontrol *kcontrol,
+ 	if (!substream)
+ 		return -ENODEV;
+ 
++	if (!substream->runtime)
++		return 0; /* just for avoiding error from alsactl restore */
++
+ 	map = mchp_pdmc_chmap_get(substream, info);
+ 	if (!map)
+ 		return -EINVAL;
+diff --git a/sound/soc/codecs/wsa883x.c b/sound/soc/codecs/wsa883x.c
+index 2169d939898419..1831d4487ba9d1 100644
+--- a/sound/soc/codecs/wsa883x.c
++++ b/sound/soc/codecs/wsa883x.c
+@@ -998,15 +998,19 @@ static const struct reg_sequence reg_init[] = {
+ 	{WSA883X_GMAMP_SUP1, 0xE2},
+ };
+ 
+-static void wsa883x_init(struct wsa883x_priv *wsa883x)
++static int wsa883x_init(struct wsa883x_priv *wsa883x)
+ {
+ 	struct regmap *regmap = wsa883x->regmap;
+-	int variant, version;
++	int variant, version, ret;
+ 
+-	regmap_read(regmap, WSA883X_OTP_REG_0, &variant);
++	ret = regmap_read(regmap, WSA883X_OTP_REG_0, &variant);
++	if (ret)
++		return ret;
+ 	wsa883x->variant = variant & WSA883X_ID_MASK;
+ 
+-	regmap_read(regmap, WSA883X_CHIP_ID0, &version);
++	ret = regmap_read(regmap, WSA883X_CHIP_ID0, &version);
++	if (ret)
++		return ret;
+ 	wsa883x->version = version;
+ 
+ 	switch (wsa883x->variant) {
+@@ -1041,6 +1045,8 @@ static void wsa883x_init(struct wsa883x_priv *wsa883x)
+ 				   WSA883X_DRE_OFFSET_MASK,
+ 				   wsa883x->comp_offset);
+ 	}
++
++	return 0;
+ }
+ 
+ static int wsa883x_update_status(struct sdw_slave *slave,
+@@ -1049,7 +1055,7 @@ static int wsa883x_update_status(struct sdw_slave *slave,
+ 	struct wsa883x_priv *wsa883x = dev_get_drvdata(&slave->dev);
+ 
+ 	if (status == SDW_SLAVE_ATTACHED && slave->dev_num > 0)
+-		wsa883x_init(wsa883x);
++		return wsa883x_init(wsa883x);
+ 
+ 	return 0;
+ }
+diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c
+index 356a0bc3b126b3..f8144bf4c90d33 100644
+--- a/sound/soc/fsl/imx-card.c
++++ b/sound/soc/fsl/imx-card.c
+@@ -714,6 +714,7 @@ static int imx_card_probe(struct platform_device *pdev)
+ 
+ 	data->plat_data = plat_data;
+ 	data->card.dev = &pdev->dev;
++	data->card.owner = THIS_MODULE;
+ 
+ 	dev_set_drvdata(&pdev->dev, &data->card);
+ 	snd_soc_card_set_drvdata(&data->card, data);
+diff --git a/sound/usb/card.c b/sound/usb/card.c
+index 1b2edc0fd2e992..7743ea983b1a81 100644
+--- a/sound/usb/card.c
++++ b/sound/usb/card.c
+@@ -382,6 +382,12 @@ static const struct usb_audio_device_name usb_audio_names[] = {
+ 	/* Creative/Toshiba Multimedia Center SB-0500 */
+ 	DEVICE_NAME(0x041e, 0x3048, "Toshiba", "SB-0500"),
+ 
++	/* Logitech Audio Devices */
++	DEVICE_NAME(0x046d, 0x0867, "Logitech, Inc.", "Logi-MeetUp"),
++	DEVICE_NAME(0x046d, 0x0874, "Logitech, Inc.", "Logi-Tap-Audio"),
++	DEVICE_NAME(0x046d, 0x087c, "Logitech, Inc.", "Logi-Huddle"),
++	DEVICE_NAME(0x046d, 0x0898, "Logitech, Inc.", "Logi-RB-Audio"),
++	DEVICE_NAME(0x046d, 0x08d2, "Logitech, Inc.", "Logi-RBM-Audio"),
+ 	DEVICE_NAME(0x046d, 0x0990, "Logitech, Inc.", "QuickCam Pro 9000"),
+ 
+ 	DEVICE_NAME(0x05e1, 0x0408, "Syntek", "STK1160"),
+diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c
+index ffd8c157a28139..70de08635f54cb 100644
+--- a/sound/usb/line6/podhd.c
++++ b/sound/usb/line6/podhd.c
+@@ -507,7 +507,7 @@ static const struct line6_properties podhd_properties_table[] = {
+ 	[LINE6_PODHD500X] = {
+ 		.id = "PODHD500X",
+ 		.name = "POD HD500X",
+-		.capabilities	= LINE6_CAP_CONTROL
++		.capabilities	= LINE6_CAP_CONTROL | LINE6_CAP_HWMON_CTL
+ 				| LINE6_CAP_PCM | LINE6_CAP_HWMON,
+ 		.altsetting = 1,
+ 		.ep_ctrl_r = 0x81,
+diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
+index 8cc2d4937f3403..197fd07e69edd4 100644
+--- a/sound/usb/mixer.c
++++ b/sound/usb/mixer.c
+@@ -1377,6 +1377,19 @@ static int get_min_max_with_quirks(struct usb_mixer_elem_info *cval,
+ 
+ #define get_min_max(cval, def)	get_min_max_with_quirks(cval, def, NULL)
+ 
++/* get the max value advertised via control API */
++static int get_max_exposed(struct usb_mixer_elem_info *cval)
++{
++	if (!cval->max_exposed) {
++		if (cval->res)
++			cval->max_exposed =
++				DIV_ROUND_UP(cval->max - cval->min, cval->res);
++		else
++			cval->max_exposed = cval->max - cval->min;
++	}
++	return cval->max_exposed;
++}
++
+ /* get a feature/mixer unit info */
+ static int mixer_ctl_feature_info(struct snd_kcontrol *kcontrol,
+ 				  struct snd_ctl_elem_info *uinfo)
+@@ -1389,11 +1402,8 @@ static int mixer_ctl_feature_info(struct snd_kcontrol *kcontrol,
+ 	else
+ 		uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+ 	uinfo->count = cval->channels;
+-	if (cval->val_type == USB_MIXER_BOOLEAN ||
+-	    cval->val_type == USB_MIXER_INV_BOOLEAN) {
+-		uinfo->value.integer.min = 0;
+-		uinfo->value.integer.max = 1;
+-	} else {
++	if (cval->val_type != USB_MIXER_BOOLEAN &&
++	    cval->val_type != USB_MIXER_INV_BOOLEAN) {
+ 		if (!cval->initialized) {
+ 			get_min_max_with_quirks(cval, 0, kcontrol);
+ 			if (cval->initialized && cval->dBmin >= cval->dBmax) {
+@@ -1405,10 +1415,10 @@ static int mixer_ctl_feature_info(struct snd_kcontrol *kcontrol,
+ 					       &kcontrol->id);
+ 			}
+ 		}
+-		uinfo->value.integer.min = 0;
+-		uinfo->value.integer.max =
+-			DIV_ROUND_UP(cval->max - cval->min, cval->res);
+ 	}
++
++	uinfo->value.integer.min = 0;
++	uinfo->value.integer.max = get_max_exposed(cval);
+ 	return 0;
+ }
+ 
+@@ -1449,6 +1459,7 @@ static int mixer_ctl_feature_put(struct snd_kcontrol *kcontrol,
+ 				 struct snd_ctl_elem_value *ucontrol)
+ {
+ 	struct usb_mixer_elem_info *cval = kcontrol->private_data;
++	int max_val = get_max_exposed(cval);
+ 	int c, cnt, val, oval, err;
+ 	int changed = 0;
+ 
+@@ -1461,6 +1472,8 @@ static int mixer_ctl_feature_put(struct snd_kcontrol *kcontrol,
+ 			if (err < 0)
+ 				return filter_error(cval, err);
+ 			val = ucontrol->value.integer.value[cnt];
++			if (val < 0 || val > max_val)
++				return -EINVAL;
+ 			val = get_abs_value(cval, val);
+ 			if (oval != val) {
+ 				snd_usb_set_cur_mix_value(cval, c + 1, cnt, val);
+@@ -1474,6 +1487,8 @@ static int mixer_ctl_feature_put(struct snd_kcontrol *kcontrol,
+ 		if (err < 0)
+ 			return filter_error(cval, err);
+ 		val = ucontrol->value.integer.value[0];
++		if (val < 0 || val > max_val)
++			return -EINVAL;
+ 		val = get_abs_value(cval, val);
+ 		if (val != oval) {
+ 			snd_usb_set_cur_mix_value(cval, 0, 0, val);
+@@ -2337,6 +2352,8 @@ static int mixer_ctl_procunit_put(struct snd_kcontrol *kcontrol,
+ 	if (err < 0)
+ 		return filter_error(cval, err);
+ 	val = ucontrol->value.integer.value[0];
++	if (val < 0 || val > get_max_exposed(cval))
++		return -EINVAL;
+ 	val = get_abs_value(cval, val);
+ 	if (val != oval) {
+ 		set_cur_ctl_value(cval, cval->control << 8, val);
+@@ -2699,6 +2716,8 @@ static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol,
+ 	if (err < 0)
+ 		return filter_error(cval, err);
+ 	val = ucontrol->value.enumerated.item[0];
++	if (val < 0 || val >= cval->max) /* here cval->max = # elements */
++		return -EINVAL;
+ 	val = get_abs_value(cval, val);
+ 	if (val != oval) {
+ 		set_cur_ctl_value(cval, cval->control << 8, val);
+diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h
+index d43895c1ae5c6c..167fbfcf01ace9 100644
+--- a/sound/usb/mixer.h
++++ b/sound/usb/mixer.h
+@@ -88,6 +88,7 @@ struct usb_mixer_elem_info {
+ 	int channels;
+ 	int val_type;
+ 	int min, max, res;
++	int max_exposed; /* control API exposes the value in 0..max_exposed */
+ 	int dBmin, dBmax;
+ 	int cached;
+ 	int cache_val[MAX_CHANNELS];
+diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
+index d2aa97a5c438cb..75cde5779f38d5 100644
+--- a/sound/usb/quirks-table.h
++++ b/sound/usb/quirks-table.h
+@@ -35,10 +35,87 @@
+ 	.bInterfaceClass = USB_CLASS_AUDIO, \
+ 	.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL
+ 
++/* Quirk .driver_info, followed by the definition of the quirk entry;
++ * put like QUIRK_DRIVER_INFO { ... } in each entry of the quirk table
++ */
++#define QUIRK_DRIVER_INFO \
++	.driver_info = (unsigned long)&(const struct snd_usb_audio_quirk)
++
++/*
++ * Macros for quirk data entries
++ */
++
++/* Quirk data entry for ignoring the interface */
++#define QUIRK_DATA_IGNORE(_ifno) \
++	.ifnum = (_ifno), .type = QUIRK_IGNORE_INTERFACE
++/* Quirk data entry for a standard audio interface */
++#define QUIRK_DATA_STANDARD_AUDIO(_ifno) \
++	.ifnum = (_ifno), .type = QUIRK_AUDIO_STANDARD_INTERFACE
++/* Quirk data entry for a standard MIDI interface */
++#define QUIRK_DATA_STANDARD_MIDI(_ifno) \
++	.ifnum = (_ifno), .type = QUIRK_MIDI_STANDARD_INTERFACE
++/* Quirk data entry for a standard mixer interface */
++#define QUIRK_DATA_STANDARD_MIXER(_ifno) \
++	.ifnum = (_ifno), .type = QUIRK_AUDIO_STANDARD_MIXER
++
++/* Quirk data entry for Yamaha MIDI */
++#define QUIRK_DATA_MIDI_YAMAHA(_ifno) \
++	.ifnum = (_ifno), .type = QUIRK_MIDI_YAMAHA
++/* Quirk data entry for Edirol UAxx */
++#define QUIRK_DATA_EDIROL_UAXX(_ifno) \
++	.ifnum = (_ifno), .type = QUIRK_AUDIO_EDIROL_UAXX
++/* Quirk data entry for raw bytes interface */
++#define QUIRK_DATA_RAW_BYTES(_ifno) \
++	.ifnum = (_ifno), .type = QUIRK_MIDI_RAW_BYTES
++
++/* Quirk composite array terminator */
++#define QUIRK_COMPOSITE_END	{ .ifnum = -1 }
++
++/* Quirk data entry for composite quirks;
++ * followed by the quirk array that is terminated with QUIRK_COMPOSITE_END
++ * e.g. QUIRK_DATA_COMPOSITE { { quirk1 }, { quirk2 },..., QUIRK_COMPOSITE_END }
++ */
++#define QUIRK_DATA_COMPOSITE \
++	.ifnum = QUIRK_ANY_INTERFACE, \
++	.type = QUIRK_COMPOSITE, \
++	.data = &(const struct snd_usb_audio_quirk[])
++
++/* Quirk data entry for a fixed audio endpoint;
++ * followed by audioformat definition
++ * e.g. QUIRK_DATA_AUDIOFORMAT(n) { .formats = xxx, ... }
++ */
++#define QUIRK_DATA_AUDIOFORMAT(_ifno)	    \
++	.ifnum = (_ifno),		    \
++	.type = QUIRK_AUDIO_FIXED_ENDPOINT, \
++	.data = &(const struct audioformat)
++
++/* Quirk data entry for a fixed MIDI endpoint;
++ * followed by snd_usb_midi_endpoint_info definition
++ * e.g. QUIRK_DATA_MIDI_FIXED_ENDPOINT(n) { .out_cables = x, .in_cables = y }
++ */
++#define QUIRK_DATA_MIDI_FIXED_ENDPOINT(_ifno) \
++	.ifnum = (_ifno),		      \
++	.type = QUIRK_MIDI_FIXED_ENDPOINT,    \
++	.data = &(const struct snd_usb_midi_endpoint_info)
++/* Quirk data entry for a MIDIMAN MIDI endpoint */
++#define QUIRK_DATA_MIDI_MIDIMAN(_ifno) \
++	.ifnum = (_ifno),	       \
++	.type = QUIRK_MIDI_MIDIMAN,    \
++	.data = &(const struct snd_usb_midi_endpoint_info)
++/* Quirk data entry for a EMAGIC MIDI endpoint */
++#define QUIRK_DATA_MIDI_EMAGIC(_ifno) \
++	.ifnum = (_ifno),	      \
++	.type = QUIRK_MIDI_EMAGIC,    \
++	.data = &(const struct snd_usb_midi_endpoint_info)
++
++/*
++ * Here we go... the quirk table definition begins:
++ */
++
+ /* FTDI devices */
+ {
+ 	USB_DEVICE(0x0403, 0xb8d8),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "STARR LABS", */
+ 		/* .product_name = "Starr Labs MIDI USB device", */
+ 		.ifnum = 0,
+@@ -49,10 +126,8 @@
+ {
+ 	/* Creative BT-D1 */
+ 	USB_DEVICE(0x041e, 0x0005),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = 1,
+-		.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-		.data = &(const struct audioformat) {
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_AUDIOFORMAT(1) {
+ 			.formats = SNDRV_PCM_FMTBIT_S16_LE,
+ 			.channels = 2,
+ 			.iface = 1,
+@@ -87,18 +162,11 @@
+  */
+ {
+ 	USB_AUDIO_DEVICE(0x041e, 0x4095),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = &(const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_MIXER,
+-			},
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_MIXER(2) },
+ 			{
+-				.ifnum = 3,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(3) {
+ 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
+ 					.channels = 2,
+ 					.fmt_bits = 16,
+@@ -114,9 +182,7 @@
+ 					.rate_table = (unsigned int[]) { 48000 },
+ 				},
+ 			},
+-			{
+-				.ifnum = -1
+-			},
++			QUIRK_COMPOSITE_END
+ 		},
+ 	},
+ },
+@@ -128,31 +194,18 @@
+  */
+ {
+ 	USB_DEVICE(0x0424, 0xb832),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Standard Microsystems Corp.",
+ 		.product_name = "HP Wireless Audio",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++		QUIRK_DATA_COMPOSITE {
+ 			/* Mixer */
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE,
+-			},
++			{ QUIRK_DATA_IGNORE(0) },
+ 			/* Playback */
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_IGNORE_INTERFACE,
+-			},
++			{ QUIRK_DATA_IGNORE(1) },
+ 			/* Capture */
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_IGNORE_INTERFACE,
+-			},
++			{ QUIRK_DATA_IGNORE(2) },
+ 			/* HID Device, .ifnum = 3 */
+-			{
+-				.ifnum = -1,
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -175,20 +228,18 @@
+ 
+ #define YAMAHA_DEVICE(id, name) { \
+ 	USB_DEVICE(0x0499, id), \
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { \
++	QUIRK_DRIVER_INFO { \
+ 		.vendor_name = "Yamaha", \
+ 		.product_name = name, \
+-		.ifnum = QUIRK_ANY_INTERFACE, \
+-		.type = QUIRK_MIDI_YAMAHA \
++		QUIRK_DATA_MIDI_YAMAHA(QUIRK_ANY_INTERFACE) \
+ 	} \
+ }
+ #define YAMAHA_INTERFACE(id, intf, name) { \
+ 	USB_DEVICE_VENDOR_SPEC(0x0499, id), \
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { \
++	QUIRK_DRIVER_INFO { \
+ 		.vendor_name = "Yamaha", \
+ 		.product_name = name, \
+-		.ifnum = intf, \
+-		.type = QUIRK_MIDI_YAMAHA \
++		QUIRK_DATA_MIDI_YAMAHA(intf) \
+ 	} \
+ }
+ YAMAHA_DEVICE(0x1000, "UX256"),
+@@ -276,135 +327,67 @@ YAMAHA_DEVICE(0x105d, NULL),
+ YAMAHA_DEVICE(0x1718, "P-125"),
+ {
+ 	USB_DEVICE(0x0499, 0x1503),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "Yamaha", */
+ 		/* .product_name = "MOX6/MOX8", */
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 3,
+-				.type = QUIRK_MIDI_YAMAHA
+-			},
+-			{
+-				.ifnum = -1
+-			}
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
++			{ QUIRK_DATA_STANDARD_AUDIO(2) },
++			{ QUIRK_DATA_MIDI_YAMAHA(3) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x0499, 0x1507),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "Yamaha", */
+ 		/* .product_name = "THR10", */
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 3,
+-				.type = QUIRK_MIDI_YAMAHA
+-			},
+-			{
+-				.ifnum = -1
+-			}
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
++			{ QUIRK_DATA_STANDARD_AUDIO(2) },
++			{ QUIRK_DATA_MIDI_YAMAHA(3) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x0499, 0x1509),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "Yamaha", */
+ 		/* .product_name = "Steinberg UR22", */
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 3,
+-				.type = QUIRK_MIDI_YAMAHA
+-			},
+-			{
+-				.ifnum = 4,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = -1
+-			}
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
++			{ QUIRK_DATA_STANDARD_AUDIO(2) },
++			{ QUIRK_DATA_MIDI_YAMAHA(3) },
++			{ QUIRK_DATA_IGNORE(4) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x0499, 0x150a),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "Yamaha", */
+ 		/* .product_name = "THR5A", */
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 3,
+-				.type = QUIRK_MIDI_YAMAHA
+-			},
+-			{
+-				.ifnum = -1
+-			}
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
++			{ QUIRK_DATA_STANDARD_AUDIO(2) },
++			{ QUIRK_DATA_MIDI_YAMAHA(3) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x0499, 0x150c),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "Yamaha", */
+ 		/* .product_name = "THR10C", */
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 3,
+-				.type = QUIRK_MIDI_YAMAHA
+-			},
+-			{
+-				.ifnum = -1
+-			}
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
++			{ QUIRK_DATA_STANDARD_AUDIO(2) },
++			{ QUIRK_DATA_MIDI_YAMAHA(3) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -438,7 +421,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	               USB_DEVICE_ID_MATCH_INT_CLASS,
+ 	.idVendor = 0x0499,
+ 	.bInterfaceClass = USB_CLASS_VENDOR_SPEC,
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.ifnum = QUIRK_ANY_INTERFACE,
+ 		.type = QUIRK_AUTODETECT
+ 	}
+@@ -449,16 +432,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+  */
+ {
+ 	USB_DEVICE(0x0582, 0x0000),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "UA-100",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++		QUIRK_DATA_COMPOSITE {
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = & (const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
+ 					.channels = 4,
+ 					.iface = 0,
+@@ -473,9 +452,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = & (const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(1) {
+ 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
+ 					.channels = 2,
+ 					.iface = 1,
+@@ -490,106 +467,66 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
+ 					.out_cables = 0x0007,
+ 					.in_cables  = 0x0007
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x0582, 0x0002),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "UM-4",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_IGNORE(0) },
++			{ QUIRK_DATA_IGNORE(1) },
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
+ 					.out_cables = 0x000f,
+ 					.in_cables  = 0x000f
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x0582, 0x0003),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "SC-8850",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_IGNORE(0) },
++			{ QUIRK_DATA_IGNORE(1) },
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
+ 					.out_cables = 0x003f,
+ 					.in_cables  = 0x003f
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x0582, 0x0004),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "U-8",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_IGNORE(0) },
++			{ QUIRK_DATA_IGNORE(1) },
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
+ 					.out_cables = 0x0005,
+ 					.in_cables  = 0x0005
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -597,152 +534,92 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	/* Has ID 0x0099 when not in "Advanced Driver" mode.
+ 	 * The UM-2EX has only one input, but we cannot detect this. */
+ 	USB_DEVICE(0x0582, 0x0005),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "UM-2",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_IGNORE(0) },
++			{ QUIRK_DATA_IGNORE(1) },
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
+ 					.out_cables = 0x0003,
+ 					.in_cables  = 0x0003
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x0582, 0x0007),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "SC-8820",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_IGNORE(0) },
++			{ QUIRK_DATA_IGNORE(1) },
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
+ 					.out_cables = 0x0013,
+ 					.in_cables  = 0x0013
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x0582, 0x0008),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "PC-300",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_IGNORE(0) },
++			{ QUIRK_DATA_IGNORE(1) },
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
+ 					.out_cables = 0x0001,
+ 					.in_cables  = 0x0001
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	/* has ID 0x009d when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x0009),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "UM-1",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_IGNORE(0) },
++			{ QUIRK_DATA_IGNORE(1) },
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
+ 					.out_cables = 0x0001,
+ 					.in_cables  = 0x0001
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x0582, 0x000b),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "SK-500",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_IGNORE(0) },
++			{ QUIRK_DATA_IGNORE(1) },
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
+ 					.out_cables = 0x0013,
+ 					.in_cables  = 0x0013
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -750,31 +627,19 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	/* thanks to Emiliano Grilli <emillo@libero.it>
+ 	 * for helping researching this data */
+ 	USB_DEVICE(0x0582, 0x000c),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "SC-D70",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(0) },
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
+ 					.out_cables = 0x0007,
+ 					.in_cables  = 0x0007
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -788,35 +653,23 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * the 96kHz sample rate.
+ 	 */
+ 	USB_DEVICE(0x0582, 0x0010),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "UA-5",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = -1
+-			}
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
++			{ QUIRK_DATA_STANDARD_AUDIO(2) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	/* has ID 0x0013 when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x0012),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "XV-5050",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0001,
+ 			.in_cables  = 0x0001
+ 		}
+@@ -825,12 +678,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* has ID 0x0015 when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x0014),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "UM-880",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x01ff,
+ 			.in_cables  = 0x01ff
+ 		}
+@@ -839,74 +690,48 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* has ID 0x0017 when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x0016),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "SD-90",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(0) },
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
+ 			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
+ 					.out_cables = 0x000f,
+ 					.in_cables  = 0x000f
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	/* has ID 0x001c when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x001b),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "MMP-2",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_IGNORE(0) },
++			{ QUIRK_DATA_IGNORE(1) },
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
+ 					.out_cables = 0x0001,
+ 					.in_cables  = 0x0001
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	/* has ID 0x001e when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x001d),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "V-SYNTH",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0001,
+ 			.in_cables  = 0x0001
+ 		}
+@@ -915,12 +740,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* has ID 0x0024 when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x0023),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "UM-550",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x003f,
+ 			.in_cables  = 0x003f
+ 		}
+@@ -933,20 +756,13 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * and no MIDI.
+ 	 */
+ 	USB_DEVICE(0x0582, 0x0025),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "UA-20",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_IGNORE(0) },
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = & (const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(1) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 2,
+ 					.iface = 1,
+@@ -961,9 +777,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = & (const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(2) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 2,
+ 					.iface = 2,
+@@ -978,28 +792,22 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 3,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(3) {
+ 					.out_cables = 0x0001,
+ 					.in_cables  = 0x0001
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	/* has ID 0x0028 when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x0027),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "SD-20",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0003,
+ 			.in_cables  = 0x0007
+ 		}
+@@ -1008,12 +816,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* has ID 0x002a when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x0029),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "SD-80",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x000f,
+ 			.in_cables  = 0x000f
+ 		}
+@@ -1026,39 +832,24 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * but offers only 16-bit PCM and no MIDI.
+ 	 */
+ 	USB_DEVICE_VENDOR_SPEC(0x0582, 0x002b),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "UA-700",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_EDIROL_UAXX
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_EDIROL_UAXX
+-			},
+-			{
+-				.ifnum = 3,
+-				.type = QUIRK_AUDIO_EDIROL_UAXX
+-			},
+-			{
+-				.ifnum = -1
+-			}
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_EDIROL_UAXX(1) },
++			{ QUIRK_DATA_EDIROL_UAXX(2) },
++			{ QUIRK_DATA_EDIROL_UAXX(3) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	/* has ID 0x002e when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x002d),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "XV-2020",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0001,
+ 			.in_cables  = 0x0001
+ 		}
+@@ -1067,12 +858,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* has ID 0x0030 when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x002f),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "VariOS",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0007,
+ 			.in_cables  = 0x0007
+ 		}
+@@ -1081,12 +870,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* has ID 0x0034 when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x0033),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "PCR",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0003,
+ 			.in_cables  = 0x0007
+ 		}
+@@ -1098,12 +885,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * later revisions use IDs 0x0054 and 0x00a2.
+ 	 */
+ 	USB_DEVICE(0x0582, 0x0037),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "Digital Piano",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0001,
+ 			.in_cables  = 0x0001
+ 		}
+@@ -1116,39 +901,24 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * and no MIDI.
+ 	 */
+ 	USB_DEVICE_VENDOR_SPEC(0x0582, 0x003b),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "BOSS",
+ 		.product_name = "GS-10",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = & (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 3,
+-				.type = QUIRK_MIDI_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = -1
+-			}
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
++			{ QUIRK_DATA_STANDARD_AUDIO(2) },
++			{ QUIRK_DATA_STANDARD_MIDI(3) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	/* has ID 0x0041 when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x0040),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "GI-20",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0001,
+ 			.in_cables  = 0x0001
+ 		}
+@@ -1157,12 +927,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* has ID 0x0043 when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x0042),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "RS-70",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0001,
+ 			.in_cables  = 0x0001
+ 		}
+@@ -1171,36 +939,24 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* has ID 0x0049 when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x0047),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "EDIROL", */
+ 		/* .product_name = "UR-80", */
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++		QUIRK_DATA_COMPOSITE {
+ 			/* in the 96 kHz modes, only interface 1 is there */
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = -1
+-			}
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
++			{ QUIRK_DATA_STANDARD_AUDIO(2) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	/* has ID 0x004a when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x0048),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "EDIROL", */
+ 		/* .product_name = "UR-80", */
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0003,
+ 			.in_cables  = 0x0007
+ 		}
+@@ -1209,35 +965,23 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* has ID 0x004e when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x004c),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "PCR-A",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = -1
+-			}
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
++			{ QUIRK_DATA_STANDARD_AUDIO(2) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	/* has ID 0x004f when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x004d),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "PCR-A",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0003,
+ 			.in_cables  = 0x0007
+ 		}
+@@ -1249,76 +993,52 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * is standard compliant, but has only 16-bit PCM.
+ 	 */
+ 	USB_DEVICE(0x0582, 0x0050),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "UA-3FX",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = -1
+-			}
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
++			{ QUIRK_DATA_STANDARD_AUDIO(2) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x0582, 0x0052),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "UM-1SX",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_STANDARD_INTERFACE
++		QUIRK_DATA_STANDARD_MIDI(0)
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x0582, 0x0060),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "EXR Series",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_STANDARD_INTERFACE
++		QUIRK_DATA_STANDARD_MIDI(0)
+ 	}
+ },
+ {
+ 	/* has ID 0x0066 when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x0064),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "EDIROL", */
+ 		/* .product_name = "PCR-1", */
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = -1
+-			}
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
++			{ QUIRK_DATA_STANDARD_AUDIO(2) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	/* has ID 0x0067 when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x0065),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "EDIROL", */
+ 		/* .product_name = "PCR-1", */
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0001,
+ 			.in_cables  = 0x0003
+ 		}
+@@ -1327,12 +1047,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* has ID 0x006e when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x006d),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "FANTOM-X",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0001,
+ 			.in_cables  = 0x0001
+ 		}
+@@ -1345,39 +1063,24 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * offers only 16-bit PCM at 44.1 kHz and no MIDI.
+ 	 */
+ 	USB_DEVICE_VENDOR_SPEC(0x0582, 0x0074),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "UA-25",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_EDIROL_UAXX
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_EDIROL_UAXX
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_EDIROL_UAXX
+-			},
+-			{
+-				.ifnum = -1
+-			}
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_EDIROL_UAXX(0) },
++			{ QUIRK_DATA_EDIROL_UAXX(1) },
++			{ QUIRK_DATA_EDIROL_UAXX(2) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	/* has ID 0x0076 when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x0075),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "BOSS",
+ 		.product_name = "DR-880",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0001,
+ 			.in_cables  = 0x0001
+ 		}
+@@ -1386,12 +1089,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* has ID 0x007b when not in "Advanced Driver" mode */
+ 	USB_DEVICE_VENDOR_SPEC(0x0582, 0x007a),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		/* "RD" or "RD-700SX"? */
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0003,
+ 			.in_cables  = 0x0003
+ 		}
+@@ -1400,12 +1101,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* has ID 0x0081 when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x0080),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Roland",
+ 		.product_name = "G-70",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0001,
+ 			.in_cables  = 0x0001
+ 		}
+@@ -1414,12 +1113,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* has ID 0x008c when not in "Advanced Driver" mode */
+ 	USB_DEVICE(0x0582, 0x008b),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "PC-50",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0001,
+ 			.in_cables  = 0x0001
+ 		}
+@@ -1431,56 +1128,31 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * is standard compliant, but has only 16-bit PCM and no MIDI.
+ 	 */
+ 	USB_DEVICE(0x0582, 0x00a3),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "UA-4FX",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_EDIROL_UAXX
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_EDIROL_UAXX
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_EDIROL_UAXX
+-			},
+-			{
+-				.ifnum = -1
+-			}
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_EDIROL_UAXX(0) },
++			{ QUIRK_DATA_EDIROL_UAXX(1) },
++			{ QUIRK_DATA_EDIROL_UAXX(2) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	/* Edirol M-16DX */
+ 	USB_DEVICE(0x0582, 0x00c4),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(0) },
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
+ 					.out_cables = 0x0001,
+ 					.in_cables  = 0x0001
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -1490,37 +1162,22 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * offers only 16-bit PCM at 44.1 kHz and no MIDI.
+ 	 */
+ 	USB_DEVICE_VENDOR_SPEC(0x0582, 0x00e6),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "EDIROL",
+ 		.product_name = "UA-25EX",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_EDIROL_UAXX
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_EDIROL_UAXX
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_EDIROL_UAXX
+-			},
+-			{
+-				.ifnum = -1
+-			}
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_EDIROL_UAXX(0) },
++			{ QUIRK_DATA_EDIROL_UAXX(1) },
++			{ QUIRK_DATA_EDIROL_UAXX(2) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	/* Edirol UM-3G */
+ 	USB_DEVICE_VENDOR_SPEC(0x0582, 0x0108),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
+ 			.out_cables = 0x0007,
+ 			.in_cables  = 0x0007
+ 		}
+@@ -1529,45 +1186,29 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* BOSS ME-25 */
+ 	USB_DEVICE(0x0582, 0x0113),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(0) },
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
+ 					.out_cables = 0x0001,
+ 					.in_cables  = 0x0001
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	/* only 44.1 kHz works at the moment */
+ 	USB_DEVICE(0x0582, 0x0120),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "Roland", */
+ 		/* .product_name = "OCTO-CAPTURE", */
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++		QUIRK_DATA_COMPOSITE {
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = & (const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
+ 					.channels = 10,
+ 					.iface = 0,
+@@ -1583,9 +1224,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = & (const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(1) {
+ 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
+ 					.channels = 12,
+ 					.iface = 1,
+@@ -1601,40 +1240,26 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
+ 					.out_cables = 0x0001,
+ 					.in_cables  = 0x0001
+ 				}
+ 			},
+-			{
+-				.ifnum = 3,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 4,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = -1
+-			}
++			{ QUIRK_DATA_IGNORE(3) },
++			{ QUIRK_DATA_IGNORE(4) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	/* only 44.1 kHz works at the moment */
+ 	USB_DEVICE(0x0582, 0x012f),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "Roland", */
+ 		/* .product_name = "QUAD-CAPTURE", */
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++		QUIRK_DATA_COMPOSITE {
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = & (const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
+ 					.channels = 4,
+ 					.iface = 0,
+@@ -1650,9 +1275,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = & (const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(1) {
+ 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
+ 					.channels = 6,
+ 					.iface = 1,
+@@ -1668,54 +1291,32 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
+ 					.out_cables = 0x0001,
+ 					.in_cables  = 0x0001
+ 				}
+ 			},
+-			{
+-				.ifnum = 3,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 4,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = -1
+-			}
++			{ QUIRK_DATA_IGNORE(3) },
++			{ QUIRK_DATA_IGNORE(4) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x0582, 0x0159),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "Roland", */
+ 		/* .product_name = "UA-22", */
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(0) },
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
+ 					.out_cables = 0x0001,
+ 					.in_cables = 0x0001
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -1723,19 +1324,19 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ /* UA101 and co are supported by another driver */
+ {
+ 	USB_DEVICE(0x0582, 0x0044), /* UA-1000 high speed */
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.ifnum = QUIRK_NODEV_INTERFACE
+ 	},
+ },
+ {
+ 	USB_DEVICE(0x0582, 0x007d), /* UA-101 high speed */
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.ifnum = QUIRK_NODEV_INTERFACE
+ 	},
+ },
+ {
+ 	USB_DEVICE(0x0582, 0x008d), /* UA-101 full speed */
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.ifnum = QUIRK_NODEV_INTERFACE
+ 	},
+ },
+@@ -1746,7 +1347,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	               USB_DEVICE_ID_MATCH_INT_CLASS,
+ 	.idVendor = 0x0582,
+ 	.bInterfaceClass = USB_CLASS_VENDOR_SPEC,
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.ifnum = QUIRK_ANY_INTERFACE,
+ 		.type = QUIRK_AUTODETECT
+ 	}
+@@ -1761,12 +1362,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * compliant USB MIDI ports for external MIDI and controls.
+ 	 */
+ 	USB_DEVICE_VENDOR_SPEC(0x06f8, 0xb000),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Hercules",
+ 		.product_name = "DJ Console (WE)",
+-		.ifnum = 4,
+-		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_FIXED_ENDPOINT(4) {
+ 			.out_cables = 0x0001,
+ 			.in_cables = 0x0001
+ 		}
+@@ -1776,12 +1375,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ /* Midiman/M-Audio devices */
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x1002),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "M-Audio",
+ 		.product_name = "MidiSport 2x2",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_MIDI_MIDIMAN,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_MIDIMAN(QUIRK_ANY_INTERFACE) {
+ 			.out_cables = 0x0003,
+ 			.in_cables  = 0x0003
+ 		}
+@@ -1789,12 +1386,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ },
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x1011),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "M-Audio",
+ 		.product_name = "MidiSport 1x1",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_MIDI_MIDIMAN,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_MIDIMAN(QUIRK_ANY_INTERFACE) {
+ 			.out_cables = 0x0001,
+ 			.in_cables  = 0x0001
+ 		}
+@@ -1802,12 +1397,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ },
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x1015),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "M-Audio",
+ 		.product_name = "Keystation",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_MIDI_MIDIMAN,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_MIDIMAN(QUIRK_ANY_INTERFACE) {
+ 			.out_cables = 0x0001,
+ 			.in_cables  = 0x0001
+ 		}
+@@ -1815,12 +1408,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ },
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x1021),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "M-Audio",
+ 		.product_name = "MidiSport 4x4",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_MIDI_MIDIMAN,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_MIDIMAN(QUIRK_ANY_INTERFACE) {
+ 			.out_cables = 0x000f,
+ 			.in_cables  = 0x000f
+ 		}
+@@ -1833,12 +1424,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * Thanks to Olaf Giesbrecht <Olaf_Giesbrecht@yahoo.de>
+ 	 */
+ 	USB_DEVICE_VER(0x0763, 0x1031, 0x0100, 0x0109),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "M-Audio",
+ 		.product_name = "MidiSport 8x8",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_MIDI_MIDIMAN,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_MIDIMAN(QUIRK_ANY_INTERFACE) {
+ 			.out_cables = 0x01ff,
+ 			.in_cables  = 0x01ff
+ 		}
+@@ -1846,12 +1435,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ },
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x1033),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "M-Audio",
+ 		.product_name = "MidiSport 8x8",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_MIDI_MIDIMAN,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_MIDIMAN(QUIRK_ANY_INTERFACE) {
+ 			.out_cables = 0x01ff,
+ 			.in_cables  = 0x01ff
+ 		}
+@@ -1859,12 +1446,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ },
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x1041),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "M-Audio",
+ 		.product_name = "MidiSport 2x4",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_MIDI_MIDIMAN,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_MIDIMAN(QUIRK_ANY_INTERFACE) {
+ 			.out_cables = 0x000f,
+ 			.in_cables  = 0x0003
+ 		}
+@@ -1872,76 +1457,41 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ },
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x2001),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "M-Audio",
+ 		.product_name = "Quattro",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = & (const struct snd_usb_audio_quirk[]) {
++		QUIRK_DATA_COMPOSITE {
+ 			/*
+ 			 * Interfaces 0-2 are "Windows-compatible", 16-bit only,
+ 			 * and share endpoints with the other interfaces.
+ 			 * Ignore them.  The other interfaces can do 24 bits,
+ 			 * but captured samples are big-endian (see usbaudio.c).
+ 			 */
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 3,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 4,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 5,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 6,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 7,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 8,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 9,
+-				.type = QUIRK_MIDI_MIDIMAN,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++			{ QUIRK_DATA_IGNORE(0) },
++			{ QUIRK_DATA_IGNORE(1) },
++			{ QUIRK_DATA_IGNORE(2) },
++			{ QUIRK_DATA_IGNORE(3) },
++			{ QUIRK_DATA_STANDARD_AUDIO(4) },
++			{ QUIRK_DATA_STANDARD_AUDIO(5) },
++			{ QUIRK_DATA_IGNORE(6) },
++			{ QUIRK_DATA_STANDARD_AUDIO(7) },
++			{ QUIRK_DATA_STANDARD_AUDIO(8) },
++			{
++				QUIRK_DATA_MIDI_MIDIMAN(9) {
+ 					.out_cables = 0x0001,
+ 					.in_cables  = 0x0001
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x2003),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "M-Audio",
+ 		.product_name = "AudioPhile",
+-		.ifnum = 6,
+-		.type = QUIRK_MIDI_MIDIMAN,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_MIDIMAN(6) {
+ 			.out_cables = 0x0001,
+ 			.in_cables  = 0x0001
+ 		}
+@@ -1949,12 +1499,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ },
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x2008),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "M-Audio",
+ 		.product_name = "Ozone",
+-		.ifnum = 3,
+-		.type = QUIRK_MIDI_MIDIMAN,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_MIDIMAN(3) {
+ 			.out_cables = 0x0001,
+ 			.in_cables  = 0x0001
+ 		}
+@@ -1962,93 +1510,45 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ },
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x200d),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "M-Audio",
+ 		.product_name = "OmniStudio",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = & (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 3,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 4,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 5,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 6,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 7,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 8,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 9,
+-				.type = QUIRK_MIDI_MIDIMAN,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_IGNORE(0) },
++			{ QUIRK_DATA_IGNORE(1) },
++			{ QUIRK_DATA_IGNORE(2) },
++			{ QUIRK_DATA_IGNORE(3) },
++			{ QUIRK_DATA_STANDARD_AUDIO(4) },
++			{ QUIRK_DATA_STANDARD_AUDIO(5) },
++			{ QUIRK_DATA_IGNORE(6) },
++			{ QUIRK_DATA_STANDARD_AUDIO(7) },
++			{ QUIRK_DATA_STANDARD_AUDIO(8) },
++			{
++				QUIRK_DATA_MIDI_MIDIMAN(9) {
+ 					.out_cables = 0x0001,
+ 					.in_cables  = 0x0001
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x0763, 0x2019),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "M-Audio", */
+ 		/* .product_name = "Ozone Academic", */
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = & (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(0) },
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
++			{ QUIRK_DATA_STANDARD_AUDIO(2) },
+ 			{
+-				.ifnum = 3,
+-				.type = QUIRK_MIDI_MIDIMAN,
+-				.data = & (const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_MIDIMAN(3) {
+ 					.out_cables = 0x0001,
+ 					.in_cables  = 0x0001
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -2058,21 +1558,14 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ },
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x2030),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "M-Audio", */
+ 		/* .product_name = "Fast Track C400", */
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = &(const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_MIXER,
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_MIXER(1) },
+ 			/* Playback */
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(2) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 6,
+ 					.iface = 2,
+@@ -2096,9 +1589,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 			},
+ 			/* Capture */
+ 			{
+-				.ifnum = 3,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(3) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 4,
+ 					.iface = 3,
+@@ -2120,30 +1611,21 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.clock = 0x80,
+ 				}
+ 			},
+-			/* MIDI */
+-			{
+-				.ifnum = -1 /* Interface = 4 */
+-			}
++			/* MIDI: Interface = 4*/
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x2031),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "M-Audio", */
+ 		/* .product_name = "Fast Track C600", */
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = &(const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_MIXER,
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_MIXER(1) },
+ 			/* Playback */
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(2) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 8,
+ 					.iface = 2,
+@@ -2167,9 +1649,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 			},
+ 			/* Capture */
+ 			{
+-				.ifnum = 3,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(3) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 6,
+ 					.iface = 3,
+@@ -2191,29 +1671,20 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.clock = 0x80,
+ 				}
+ 			},
+-			/* MIDI */
+-			{
+-				.ifnum = -1 /* Interface = 4 */
+-			}
++			/* MIDI: Interface = 4 */
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x2080),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "M-Audio", */
+ 		/* .product_name = "Fast Track Ultra", */
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = & (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_MIXER,
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_MIXER(0) },
+ 			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = & (const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(1) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 8,
+ 					.iface = 1,
+@@ -2235,9 +1706,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = & (const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(2) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 8,
+ 					.iface = 2,
+@@ -2259,28 +1728,19 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			/* interface 3 (MIDI) is standard compliant */
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x2081),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "M-Audio", */
+ 		/* .product_name = "Fast Track Ultra 8R", */
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = & (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_MIXER,
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_MIXER(0) },
+ 			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = & (const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(1) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 8,
+ 					.iface = 1,
+@@ -2302,9 +1762,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = & (const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(2) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 8,
+ 					.iface = 2,
+@@ -2326,9 +1784,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			/* interface 3 (MIDI) is standard compliant */
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -2336,21 +1792,19 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ /* Casio devices */
+ {
+ 	USB_DEVICE(0x07cf, 0x6801),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Casio",
+ 		.product_name = "PL-40R",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_YAMAHA
++		QUIRK_DATA_MIDI_YAMAHA(0)
+ 	}
+ },
+ {
+ 	/* this ID is used by several devices without a product ID */
+ 	USB_DEVICE(0x07cf, 0x6802),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Casio",
+ 		.product_name = "Keyboard",
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_YAMAHA
++		QUIRK_DATA_MIDI_YAMAHA(0)
+ 	}
+ },
+ 
+@@ -2363,23 +1817,13 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	.idVendor = 0x07fd,
+ 	.idProduct = 0x0001,
+ 	.bDeviceSubClass = 2,
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "MOTU",
+ 		.product_name = "Fastlane",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = & (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_MIDI_RAW_BYTES
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = -1
+-			}
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_RAW_BYTES(0) },
++			{ QUIRK_DATA_IGNORE(1) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -2387,12 +1831,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ /* Emagic devices */
+ {
+ 	USB_DEVICE(0x086a, 0x0001),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Emagic",
+ 		.product_name = "Unitor8",
+-		.ifnum = 2,
+-		.type = QUIRK_MIDI_EMAGIC,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_EMAGIC(2) {
+ 			.out_cables = 0x80ff,
+ 			.in_cables  = 0x80ff
+ 		}
+@@ -2400,12 +1842,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ },
+ {
+ 	USB_DEVICE(0x086a, 0x0002),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Emagic",
+ 		/* .product_name = "AMT8", */
+-		.ifnum = 2,
+-		.type = QUIRK_MIDI_EMAGIC,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_EMAGIC(2) {
+ 			.out_cables = 0x80ff,
+ 			.in_cables  = 0x80ff
+ 		}
+@@ -2413,12 +1853,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ },
+ {
+ 	USB_DEVICE(0x086a, 0x0003),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Emagic",
+ 		/* .product_name = "MT4", */
+-		.ifnum = 2,
+-		.type = QUIRK_MIDI_EMAGIC,
+-		.data = & (const struct snd_usb_midi_endpoint_info) {
++		QUIRK_DATA_MIDI_EMAGIC(2) {
+ 			.out_cables = 0x800f,
+ 			.in_cables  = 0x8003
+ 		}
+@@ -2428,38 +1866,35 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ /* KORG devices */
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0944, 0x0200),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "KORG, Inc.",
+ 		/* .product_name = "PANDORA PX5D", */
+-		.ifnum = 3,
+-		.type = QUIRK_MIDI_STANDARD_INTERFACE,
++		QUIRK_DATA_STANDARD_MIDI(3)
+ 	}
+ },
+ 
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0944, 0x0201),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "KORG, Inc.",
+ 		/* .product_name = "ToneLab ST", */
+-		.ifnum = 3,
+-		.type = QUIRK_MIDI_STANDARD_INTERFACE,
++		QUIRK_DATA_STANDARD_MIDI(3)
+ 	}
+ },
+ 
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0944, 0x0204),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "KORG, Inc.",
+ 		/* .product_name = "ToneLab EX", */
+-		.ifnum = 3,
+-		.type = QUIRK_MIDI_STANDARD_INTERFACE,
++		QUIRK_DATA_STANDARD_MIDI(3)
+ 	}
+ },
+ 
+ /* AKAI devices */
+ {
+ 	USB_DEVICE(0x09e8, 0x0062),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "AKAI",
+ 		.product_name = "MPD16",
+ 		.ifnum = 0,
+@@ -2470,21 +1905,11 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* Akai MPC Element */
+ 	USB_DEVICE(0x09e8, 0x0021),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = & (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_MIDI_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = -1
+-			}
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_IGNORE(0) },
++			{ QUIRK_DATA_STANDARD_MIDI(1) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -2493,66 +1918,36 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* Steinberg MI2 */
+ 	USB_DEVICE_VENDOR_SPEC(0x0a4e, 0x2040),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = & (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(0) },
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
++			{ QUIRK_DATA_STANDARD_AUDIO(2) },
+ 			{
+-				.ifnum = 3,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = &(const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(3) {
+ 					.out_cables = 0x0001,
+ 					.in_cables  = 0x0001
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	/* Steinberg MI4 */
+ 	USB_DEVICE_VENDOR_SPEC(0x0a4e, 0x4040),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = & (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(0) },
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
++			{ QUIRK_DATA_STANDARD_AUDIO(2) },
+ 			{
+-				.ifnum = 3,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = &(const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(3) {
+ 					.out_cables = 0x0001,
+ 					.in_cables  = 0x0001
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -2560,34 +1955,31 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ /* TerraTec devices */
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0ccd, 0x0012),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "TerraTec",
+ 		.product_name = "PHASE 26",
+-		.ifnum = 3,
+-		.type = QUIRK_MIDI_STANDARD_INTERFACE
++		QUIRK_DATA_STANDARD_MIDI(3)
+ 	}
+ },
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0ccd, 0x0013),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "TerraTec",
+ 		.product_name = "PHASE 26",
+-		.ifnum = 3,
+-		.type = QUIRK_MIDI_STANDARD_INTERFACE
++		QUIRK_DATA_STANDARD_MIDI(3)
+ 	}
+ },
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x0ccd, 0x0014),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "TerraTec",
+ 		.product_name = "PHASE 26",
+-		.ifnum = 3,
+-		.type = QUIRK_MIDI_STANDARD_INTERFACE
++		QUIRK_DATA_STANDARD_MIDI(3)
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x0ccd, 0x0035),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Miditech",
+ 		.product_name = "Play'n Roll",
+ 		.ifnum = 0,
+@@ -2602,7 +1994,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ /* Novation EMS devices */
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x1235, 0x0001),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Novation",
+ 		.product_name = "ReMOTE Audio/XStation",
+ 		.ifnum = 4,
+@@ -2611,7 +2003,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ },
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x1235, 0x0002),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Novation",
+ 		.product_name = "Speedio",
+ 		.ifnum = 3,
+@@ -2620,38 +2012,29 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ },
+ {
+ 	USB_DEVICE(0x1235, 0x000a),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "Novation", */
+ 		/* .product_name = "Nocturn", */
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_RAW_BYTES
++		QUIRK_DATA_RAW_BYTES(0)
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x1235, 0x000e),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		/* .vendor_name = "Novation", */
+ 		/* .product_name = "Launchpad", */
+-		.ifnum = 0,
+-		.type = QUIRK_MIDI_RAW_BYTES
++		QUIRK_DATA_RAW_BYTES(0)
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x1235, 0x0010),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Focusrite",
+ 		.product_name = "Saffire 6 USB",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_MIXER(0) },
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_MIXER,
+-			},
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 4,
+ 					.iface = 0,
+@@ -2678,9 +2061,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 2,
+ 					.iface = 0,
+@@ -2702,28 +2083,19 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					}
+ 				}
+ 			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_MIDI_RAW_BYTES
+-			},
+-			{
+-				.ifnum = -1
+-			}
++			{ QUIRK_DATA_RAW_BYTES(1) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE(0x1235, 0x0018),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Novation",
+ 		.product_name = "Twitch",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++		QUIRK_DATA_COMPOSITE {
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = & (const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 4,
+ 					.iface = 0,
+@@ -2742,19 +2114,14 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					}
+ 				}
+ 			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_MIDI_RAW_BYTES
+-			},
+-			{
+-				.ifnum = -1
+-			}
++			{ QUIRK_DATA_RAW_BYTES(1) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x1235, 0x4661),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Novation",
+ 		.product_name = "ReMOTE25",
+ 		.ifnum = 0,
+@@ -2766,25 +2133,16 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* VirusTI Desktop */
+ 	USB_DEVICE_VENDOR_SPEC(0x133e, 0x0815),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = &(const struct snd_usb_audio_quirk[]) {
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
+ 			{
+-				.ifnum = 3,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = &(const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(3) {
+ 					.out_cables = 0x0003,
+ 					.in_cables  = 0x0003
+ 				}
+ 			},
+-			{
+-				.ifnum = 4,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = -1
+-			}
++			{ QUIRK_DATA_IGNORE(4) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -2812,7 +2170,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ /* QinHeng devices */
+ {
+ 	USB_DEVICE(0x1a86, 0x752d),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "QinHeng",
+ 		.product_name = "CH345",
+ 		.ifnum = 1,
+@@ -2826,7 +2184,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ /* Miditech devices */
+ {
+ 	USB_DEVICE(0x4752, 0x0011),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Miditech",
+ 		.product_name = "Midistart-2",
+ 		.ifnum = 0,
+@@ -2838,7 +2196,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* this ID used by both Miditech MidiStudio-2 and CME UF-x */
+ 	USB_DEVICE(0x7104, 0x2202),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.ifnum = 0,
+ 		.type = QUIRK_MIDI_CME
+ 	}
+@@ -2848,20 +2206,13 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	/* Thanks to Clemens Ladisch <clemens@ladisch.de> */
+ 	USB_DEVICE(0x0dba, 0x1000),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Digidesign",
+ 		.product_name = "MBox",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]){
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_MIXER,
+-			},
++		QUIRK_DATA_COMPOSITE{
++			{ QUIRK_DATA_STANDARD_MIXER(0) },
+ 			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(1) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3BE,
+ 					.channels = 2,
+ 					.iface = 1,
+@@ -2882,9 +2233,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(1) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3BE,
+ 					.channels = 2,
+ 					.iface = 1,
+@@ -2905,9 +2254,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					}
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -2915,24 +2262,14 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ /* DIGIDESIGN MBOX 2 */
+ {
+ 	USB_DEVICE(0x0dba, 0x3000),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Digidesign",
+ 		.product_name = "Mbox 2",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_IGNORE(0) },
++			{ QUIRK_DATA_IGNORE(1) },
+ 			{
+-				.ifnum = 1,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(2) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3BE,
+ 					.channels = 2,
+ 					.iface = 2,
+@@ -2950,15 +2287,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					}
+ 				}
+ 			},
++			{ QUIRK_DATA_IGNORE(3) },
+ 			{
+-				.ifnum = 3,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 4,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
+-				.formats = SNDRV_PCM_FMTBIT_S24_3BE,
++				QUIRK_DATA_AUDIOFORMAT(4) {
++					.formats = SNDRV_PCM_FMTBIT_S24_3BE,
+ 					.channels = 2,
+ 					.iface = 4,
+ 					.altsetting = 2,
+@@ -2975,14 +2307,9 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					}
+ 				}
+ 			},
++			{ QUIRK_DATA_IGNORE(5) },
+ 			{
+-				.ifnum = 5,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 6,
+-				.type = QUIRK_MIDI_MIDIMAN,
+-				.data = &(const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_MIDIMAN(6) {
+ 					.out_ep =  0x02,
+ 					.out_cables = 0x0001,
+ 					.in_ep = 0x81,
+@@ -2990,33 +2317,21 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.in_cables = 0x0001
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ /* DIGIDESIGN MBOX 3 */
+ {
+ 	USB_DEVICE(0x0dba, 0x5000),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Digidesign",
+ 		.product_name = "Mbox 3",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_IGNORE(0) },
++			{ QUIRK_DATA_IGNORE(1) },
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(2) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 4,
+ 					.iface = 2,
+@@ -3036,9 +2351,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 3,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(3) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 4,
+ 					.iface = 3,
+@@ -3059,36 +2372,25 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 4,
+-				.type = QUIRK_MIDI_FIXED_ENDPOINT,
+-				.data = &(const struct snd_usb_midi_endpoint_info) {
++				QUIRK_DATA_MIDI_FIXED_ENDPOINT(4) {
+ 					.out_cables = 0x0001,
+ 					.in_cables  = 0x0001
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ {
+ 	/* Tascam US122 MKII - playback-only support */
+ 	USB_DEVICE_VENDOR_SPEC(0x0644, 0x8021),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "TASCAM",
+ 		.product_name = "US122 MKII",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_IGNORE(0) },
+ 			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(1) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 2,
+ 					.iface = 1,
+@@ -3109,9 +2411,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					}
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -3119,20 +2419,13 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ /* Denon DN-X1600 */
+ {
+ 	USB_AUDIO_DEVICE(0x154e, 0x500e),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Denon",
+ 		.product_name = "DN-X1600",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]){
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE,
+-			},
++		QUIRK_DATA_COMPOSITE{
++			{ QUIRK_DATA_IGNORE(0) },
+ 			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(1) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 8,
+ 					.iface = 1,
+@@ -3153,9 +2446,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(2) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 8,
+ 					.iface = 2,
+@@ -3175,13 +2466,8 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					}
+ 				}
+ 			},
+-			{
+-				.ifnum = 4,
+-				.type = QUIRK_MIDI_STANDARD_INTERFACE,
+-			},
+-			{
+-				.ifnum = -1
+-			}
++			{ QUIRK_DATA_STANDARD_MIDI(4) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -3190,17 +2476,13 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	USB_DEVICE(0x045e, 0x0283),
+ 	.bInterfaceClass = USB_CLASS_PER_INTERFACE,
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Microsoft",
+ 		.product_name = "XboxLive Headset/Xbox Communicator",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = &(const struct snd_usb_audio_quirk[]) {
++		QUIRK_DATA_COMPOSITE {
+ 			{
+ 				/* playback */
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
+ 					.channels = 1,
+ 					.iface = 0,
+@@ -3216,9 +2498,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 			},
+ 			{
+ 				/* capture */
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(1) {
+ 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
+ 					.channels = 1,
+ 					.iface = 1,
+@@ -3232,9 +2512,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.rate_max = 16000
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -3243,18 +2521,11 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ {
+ 	USB_DEVICE(0x200c, 0x100b),
+ 	.bInterfaceClass = USB_CLASS_PER_INTERFACE,
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = &(const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_MIXER,
+-			},
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_MIXER(0) },
+ 			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(1) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 4,
+ 					.iface = 1,
+@@ -3273,9 +2544,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					}
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -3288,28 +2557,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * enabled in create_standard_audio_quirk().
+ 	 */
+ 	USB_DEVICE(0x1686, 0x00dd),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				/* Playback  */
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE,
+-			},
+-			{
+-				/* Capture */
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE,
+-			},
+-			{
+-				/* Midi */
+-				.ifnum = 3,
+-				.type = QUIRK_MIDI_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = -1
+-			},
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(1) }, /* Playback  */
++			{ QUIRK_DATA_STANDARD_AUDIO(2) }, /* Capture */
++			{ QUIRK_DATA_STANDARD_MIDI(3) }, /* Midi */
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -3323,18 +2576,16 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 		       USB_DEVICE_ID_MATCH_INT_SUBCLASS,
+ 	.bInterfaceClass = USB_CLASS_AUDIO,
+ 	.bInterfaceSubClass = USB_SUBCLASS_MIDISTREAMING,
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_MIDI_STANDARD_INTERFACE
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_STANDARD_MIDI(QUIRK_ANY_INTERFACE)
+ 	}
+ },
+ 
+ /* Rane SL-1 */
+ {
+ 	USB_DEVICE(0x13e5, 0x0001),
+-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_AUDIO_STANDARD_INTERFACE
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_STANDARD_AUDIO(QUIRK_ANY_INTERFACE)
+         }
+ },
+ 
+@@ -3350,24 +2601,13 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * and only the 48 kHz sample rate works for the playback interface.
+ 	 */
+ 	USB_DEVICE(0x0a12, 0x1243),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_MIXER,
+-			},
+-			/* Capture */
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_IGNORE_INTERFACE,
+-			},
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_MIXER(0) },
++			{ QUIRK_DATA_IGNORE(1) }, /* Capture */
+ 			/* Playback */
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(2) {
+ 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
+ 					.channels = 2,
+ 					.iface = 2,
+@@ -3386,9 +2626,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					}
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			},
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -3401,19 +2639,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * even on windows.
+ 	 */
+ 	USB_DEVICE(0x19b5, 0x0021),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_MIXER,
+-			},
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_MIXER(0) },
+ 			/* Playback */
+ 			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(1) {
+ 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
+ 					.channels = 2,
+ 					.iface = 1,
+@@ -3432,29 +2663,20 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					}
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			},
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+ /* MOTU Microbook II */
+ {
+ 	USB_DEVICE_VENDOR_SPEC(0x07fd, 0x0004),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "MOTU",
+ 		.product_name = "MicroBookII",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_MIXER,
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_MIXER(0) },
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3BE,
+ 					.channels = 6,
+ 					.iface = 0,
+@@ -3475,9 +2697,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3BE,
+ 					.channels = 8,
+ 					.iface = 0,
+@@ -3498,9 +2718,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					}
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -3512,14 +2730,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * The feedback for the output is the input.
+ 	 */
+ 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x0023),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
+ 					.channels = 12,
+ 					.iface = 0,
+@@ -3536,9 +2750,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
+ 					.channels = 10,
+ 					.iface = 0,
+@@ -3556,9 +2768,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.rate_table = (unsigned int[]) { 44100 }
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -3601,14 +2811,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * but not for DVS (Digital Vinyl Systems) like in Mixxx.
+ 	 */
+ 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x0017),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 8, // outputs
+ 					.iface = 0,
+@@ -3625,9 +2831,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					}
+ 			},
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 8, // inputs
+ 					.iface = 0,
+@@ -3645,9 +2849,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.rate_table = (unsigned int[]) { 48000 }
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -3658,14 +2860,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * The feedback for the output is the dummy input.
+ 	 */
+ 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x000e),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 4,
+ 					.iface = 0,
+@@ -3682,9 +2880,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 2,
+ 					.iface = 0,
+@@ -3702,9 +2898,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.rate_table = (unsigned int[]) { 44100 }
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -3715,14 +2909,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * PCM is 6 channels out & 4 channels in @ 44.1 fixed
+ 	 */
+ 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x000d),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 6, //Master, Headphones & Booth
+ 					.iface = 0,
+@@ -3739,9 +2929,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 4, //2x RCA inputs (CH1 & CH2)
+ 					.iface = 0,
+@@ -3759,9 +2947,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.rate_table = (unsigned int[]) { 44100 }
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -3773,14 +2959,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * The Feedback for the output is the input
+ 	 */
+ 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x001e),
+-		.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 4,
+ 					.iface = 0,
+@@ -3797,9 +2979,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 6,
+ 					.iface = 0,
+@@ -3817,9 +2997,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.rate_table = (unsigned int[]) { 44100 }
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -3830,14 +3008,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * 10 channels playback & 12 channels capture @ 44.1/48/96kHz S24LE
+ 	 */
+ 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x000a),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 10,
+ 					.iface = 0,
+@@ -3858,9 +3032,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 12,
+ 					.iface = 0,
+@@ -3882,9 +3054,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					}
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -3896,14 +3066,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * The Feedback for the output is the input
+ 	 */
+ 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x0029),
+-		.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 6,
+ 					.iface = 0,
+@@ -3920,9 +3086,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 6,
+ 					.iface = 0,
+@@ -3940,9 +3104,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.rate_table = (unsigned int[]) { 44100 }
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -3960,20 +3122,13 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+  */
+ {
+ 	USB_AUDIO_DEVICE(0x534d, 0x0021),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "MacroSilicon",
+ 		.product_name = "MS210x",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = &(const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_MIXER,
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_MIXER(2) },
+ 			{
+-				.ifnum = 3,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(3) {
+ 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
+ 					.channels = 2,
+ 					.iface = 3,
+@@ -3988,9 +3143,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.rate_max = 48000,
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -4008,20 +3161,13 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+  */
+ {
+ 	USB_AUDIO_DEVICE(0x534d, 0x2109),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "MacroSilicon",
+ 		.product_name = "MS2109",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = &(const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_MIXER,
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_MIXER(2) },
+ 			{
+-				.ifnum = 3,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(3) {
+ 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
+ 					.channels = 2,
+ 					.iface = 3,
+@@ -4036,9 +3182,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.rate_max = 48000,
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -4048,14 +3192,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * 8 channels playback & 8 channels capture @ 44.1/48/96kHz S24LE
+ 	 */
+ 	USB_DEVICE_VENDOR_SPEC(0x08e4, 0x017f),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 8,
+ 					.iface = 0,
+@@ -4074,9 +3214,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 8,
+ 					.iface = 0,
+@@ -4096,9 +3234,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.rate_table = (unsigned int[]) { 44100, 48000, 96000 }
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -4108,14 +3244,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * 10 channels playback & 12 channels capture @ 48kHz S24LE
+ 	 */
+ 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x001b),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 10,
+ 					.iface = 0,
+@@ -4134,9 +3266,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 12,
+ 					.iface = 0,
+@@ -4154,9 +3284,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.rate_table = (unsigned int[]) { 48000 }
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -4168,14 +3296,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * Capture on EP 0x86
+ 	 */
+ 	USB_DEVICE_VENDOR_SPEC(0x08e4, 0x0163),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 8,
+ 					.iface = 0,
+@@ -4195,9 +3319,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 				}
+ 			},
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 8,
+ 					.iface = 0,
+@@ -4217,9 +3339,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.rate_table = (unsigned int[]) { 44100, 48000, 96000 }
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -4230,14 +3350,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * and 8 channels in @ 48 fixed (endpoint 0x82).
+ 	 */
+ 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x0013),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 8, // outputs
+ 					.iface = 0,
+@@ -4254,9 +3370,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					}
+ 			},
+ 			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(0) {
+ 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ 					.channels = 8, // inputs
+ 					.iface = 0,
+@@ -4274,9 +3388,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.rate_table = (unsigned int[]) { 48000 }
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -4287,28 +3399,15 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 */
+ 	USB_DEVICE(0x1395, 0x0300),
+ 	.bInterfaceClass = USB_CLASS_PER_INTERFACE,
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = &(const struct snd_usb_audio_quirk[]) {
++	QUIRK_DRIVER_INFO {
++		QUIRK_DATA_COMPOSITE {
+ 			// Communication
+-			{
+-				.ifnum = 3,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
++			{ QUIRK_DATA_STANDARD_AUDIO(3) },
+ 			// Recording
+-			{
+-				.ifnum = 4,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
++			{ QUIRK_DATA_STANDARD_AUDIO(4) },
+ 			// Main
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
+-			{
+-				.ifnum = -1
+-			}
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -4317,21 +3416,14 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * Fiero SC-01 (firmware v1.0.0 @ 48 kHz)
+ 	 */
+ 	USB_DEVICE(0x2b53, 0x0023),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Fiero",
+ 		.product_name = "SC-01",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = &(const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(0) },
+ 			/* Playback */
+ 			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(1) {
+ 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
+ 					.channels = 2,
+ 					.fmt_bits = 24,
+@@ -4351,9 +3443,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 			},
+ 			/* Capture */
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(2) {
+ 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
+ 					.channels = 2,
+ 					.fmt_bits = 24,
+@@ -4372,9 +3462,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.clock = 0x29
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -4383,21 +3471,14 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * Fiero SC-01 (firmware v1.0.0 @ 96 kHz)
+ 	 */
+ 	USB_DEVICE(0x2b53, 0x0024),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Fiero",
+ 		.product_name = "SC-01",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = &(const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(0) },
+ 			/* Playback */
+ 			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(1) {
+ 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
+ 					.channels = 2,
+ 					.fmt_bits = 24,
+@@ -4417,9 +3498,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 			},
+ 			/* Capture */
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(2) {
+ 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
+ 					.channels = 2,
+ 					.fmt_bits = 24,
+@@ -4438,9 +3517,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.clock = 0x29
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -4449,21 +3526,14 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * Fiero SC-01 (firmware v1.1.0)
+ 	 */
+ 	USB_DEVICE(0x2b53, 0x0031),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Fiero",
+ 		.product_name = "SC-01",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = &(const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE
+-			},
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_STANDARD_AUDIO(0) },
+ 			/* Playback */
+ 			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(1) {
+ 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
+ 					.channels = 2,
+ 					.fmt_bits = 24,
+@@ -4484,9 +3554,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 			},
+ 			/* Capture */
+ 			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+-				.data = &(const struct audioformat) {
++				QUIRK_DATA_AUDIOFORMAT(2) {
+ 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
+ 					.channels = 2,
+ 					.fmt_bits = 24,
+@@ -4506,9 +3574,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 					.clock = 0x29
+ 				}
+ 			},
+-			{
+-				.ifnum = -1
+-			}
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+@@ -4517,27 +3583,14 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	 * For the standard mode, Mythware XA001AU has ID ffad:a001
+ 	 */
+ 	USB_DEVICE_VENDOR_SPEC(0xffad, 0xa001),
+-	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++	QUIRK_DRIVER_INFO {
+ 		.vendor_name = "Mythware",
+ 		.product_name = "XA001AU",
+-		.ifnum = QUIRK_ANY_INTERFACE,
+-		.type = QUIRK_COMPOSITE,
+-		.data = (const struct snd_usb_audio_quirk[]) {
+-			{
+-				.ifnum = 0,
+-				.type = QUIRK_IGNORE_INTERFACE,
+-			},
+-			{
+-				.ifnum = 1,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE,
+-			},
+-			{
+-				.ifnum = 2,
+-				.type = QUIRK_AUDIO_STANDARD_INTERFACE,
+-			},
+-			{
+-				.ifnum = -1
+-			}
++		QUIRK_DATA_COMPOSITE {
++			{ QUIRK_DATA_IGNORE(0) },
++			{ QUIRK_DATA_STANDARD_AUDIO(1) },
++			{ QUIRK_DATA_STANDARD_AUDIO(2) },
++			QUIRK_COMPOSITE_END
+ 		}
+ 	}
+ },
+diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
+index 9ba985c6a40836..1753746430da5f 100644
+--- a/sound/usb/quirks.c
++++ b/sound/usb/quirks.c
+@@ -2123,6 +2123,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
+ 		   QUIRK_FLAG_DISABLE_AUTOSUSPEND),
+ 	DEVICE_FLG(0x17aa, 0x104d, /* Lenovo ThinkStation P620 Internal Speaker + Front Headset */
+ 		   QUIRK_FLAG_DISABLE_AUTOSUSPEND),
++	DEVICE_FLG(0x1852, 0x5062, /* Luxman D-08u */
++		   QUIRK_FLAG_ITF_USB_DSD_DAC | QUIRK_FLAG_CTL_MSG_DELAY),
+ 	DEVICE_FLG(0x1852, 0x5065, /* Luxman DA-06 */
+ 		   QUIRK_FLAG_ITF_USB_DSD_DAC | QUIRK_FLAG_CTL_MSG_DELAY),
+ 	DEVICE_FLG(0x1901, 0x0191, /* GE B850V3 CP2114 audio interface */
+@@ -2181,6 +2183,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
+ 		   QUIRK_FLAG_GENERIC_IMPLICIT_FB),
+ 	DEVICE_FLG(0x2b53, 0x0031, /* Fiero SC-01 (firmware v1.1.0) */
+ 		   QUIRK_FLAG_GENERIC_IMPLICIT_FB),
++	DEVICE_FLG(0x2d95, 0x8011, /* VIVO USB-C HEADSET */
++		   QUIRK_FLAG_CTL_MSG_DELAY_1M),
+ 	DEVICE_FLG(0x2d95, 0x8021, /* VIVO USB-C-XE710 HEADSET */
+ 		   QUIRK_FLAG_CTL_MSG_DELAY_1M),
+ 	DEVICE_FLG(0x30be, 0x0101, /* Schiit Hel */
+diff --git a/tools/arch/x86/kcpuid/kcpuid.c b/tools/arch/x86/kcpuid/kcpuid.c
+index 24b7d017ec2c11..b7965dfff33a9a 100644
+--- a/tools/arch/x86/kcpuid/kcpuid.c
++++ b/tools/arch/x86/kcpuid/kcpuid.c
+@@ -7,7 +7,8 @@
+ #include <string.h>
+ #include <getopt.h>
+ 
+-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
++#define ARRAY_SIZE(x)	(sizeof(x) / sizeof((x)[0]))
++#define min(a, b)	(((a) < (b)) ? (a) : (b))
+ 
+ typedef unsigned int u32;
+ typedef unsigned long long u64;
+@@ -207,12 +208,9 @@ static void raw_dump_range(struct cpuid_range *range)
+ #define MAX_SUBLEAF_NUM		32
+ struct cpuid_range *setup_cpuid_range(u32 input_eax)
+ {
+-	u32 max_func, idx_func;
+-	int subleaf;
++	u32 max_func, idx_func, subleaf, max_subleaf;
++	u32 eax, ebx, ecx, edx, f = input_eax;
+ 	struct cpuid_range *range;
+-	u32 eax, ebx, ecx, edx;
+-	u32 f = input_eax;
+-	int max_subleaf;
+ 	bool allzero;
+ 
+ 	eax = input_eax;
+@@ -258,7 +256,7 @@ struct cpuid_range *setup_cpuid_range(u32 input_eax)
+ 		 * others have to be tried (0xf)
+ 		 */
+ 		if (f == 0x7 || f == 0x14 || f == 0x17 || f == 0x18)
+-			max_subleaf = (eax & 0xff) + 1;
++			max_subleaf = min((eax & 0xff) + 1, max_subleaf);
+ 
+ 		if (f == 0xb)
+ 			max_subleaf = 2;
+diff --git a/tools/bpf/bpftool/net.c b/tools/bpf/bpftool/net.c
+index 66a8ce8ae0127a..28e9417a5c2e35 100644
+--- a/tools/bpf/bpftool/net.c
++++ b/tools/bpf/bpftool/net.c
+@@ -480,9 +480,9 @@ static void __show_dev_tc_bpf(const struct ip_devname_ifindex *dev,
+ 		if (prog_flags[i] || json_output) {
+ 			NET_START_ARRAY("prog_flags", "%s ");
+ 			for (j = 0; prog_flags[i] && j < 32; j++) {
+-				if (!(prog_flags[i] & (1 << j)))
++				if (!(prog_flags[i] & (1U << j)))
+ 					continue;
+-				NET_DUMP_UINT_ONLY(1 << j);
++				NET_DUMP_UINT_ONLY(1U << j);
+ 			}
+ 			NET_END_ARRAY("");
+ 		}
+@@ -491,9 +491,9 @@ static void __show_dev_tc_bpf(const struct ip_devname_ifindex *dev,
+ 			if (link_flags[i] || json_output) {
+ 				NET_START_ARRAY("link_flags", "%s ");
+ 				for (j = 0; link_flags[i] && j < 32; j++) {
+-					if (!(link_flags[i] & (1 << j)))
++					if (!(link_flags[i] & (1U << j)))
+ 						continue;
+-					NET_DUMP_UINT_ONLY(1 << j);
++					NET_DUMP_UINT_ONLY(1U << j);
+ 				}
+ 				NET_END_ARRAY("");
+ 			}
+@@ -819,6 +819,9 @@ static void show_link_netfilter(void)
+ 		nf_link_count++;
+ 	}
+ 
++	if (!nf_link_info)
++		return;
++
+ 	qsort(nf_link_info, nf_link_count, sizeof(*nf_link_info), netfilter_link_compar);
+ 
+ 	for (id = 0; id < nf_link_count; id++) {
+diff --git a/tools/include/nolibc/arch-powerpc.h b/tools/include/nolibc/arch-powerpc.h
+index ac212e6185b26d..41ebd394b90c7a 100644
+--- a/tools/include/nolibc/arch-powerpc.h
++++ b/tools/include/nolibc/arch-powerpc.h
+@@ -172,7 +172,7 @@
+ 	_ret;                                                                \
+ })
+ 
+-#ifndef __powerpc64__
++#if !defined(__powerpc64__) && !defined(__clang__)
+ /* FIXME: For 32-bit PowerPC, with newer gcc compilers (e.g. gcc 13.1.0),
+  * "omit-frame-pointer" fails with __attribute__((no_stack_protector)) but
+  * works with __attribute__((__optimize__("-fno-stack-protector")))
+diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
+index ac8c0ef48a7f34..aa450cc2648aa5 100644
+--- a/tools/perf/util/hist.c
++++ b/tools/perf/util/hist.c
+@@ -637,7 +637,12 @@ static struct hist_entry *hists__findnew_entry(struct hists *hists,
+ 			 * mis-adjust symbol addresses when computing
+ 			 * the history counter to increment.
+ 			 */
+-			if (he->ms.map != entry->ms.map) {
++			if (hists__has(hists, sym) && he->ms.map != entry->ms.map) {
++				if (he->ms.sym) {
++					u64 addr = he->ms.sym->start;
++					he->ms.sym = map__find_symbol(entry->ms.map, addr);
++				}
++
+ 				map__put(he->ms.map);
+ 				he->ms.map = map__get(entry->ms.map);
+ 			}
+diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
+index 7c6874804660eb..24dead4e30656c 100644
+--- a/tools/perf/util/machine.c
++++ b/tools/perf/util/machine.c
+@@ -2536,8 +2536,12 @@ static void save_lbr_cursor_node(struct thread *thread,
+ 		cursor->curr = cursor->first;
+ 	else
+ 		cursor->curr = cursor->curr->next;
++
++	map_symbol__exit(&lbr_stitch->prev_lbr_cursor[idx].ms);
+ 	memcpy(&lbr_stitch->prev_lbr_cursor[idx], cursor->curr,
+ 	       sizeof(struct callchain_cursor_node));
++	lbr_stitch->prev_lbr_cursor[idx].ms.maps = maps__get(cursor->curr->ms.maps);
++	lbr_stitch->prev_lbr_cursor[idx].ms.map = map__get(cursor->curr->ms.map);
+ 
+ 	lbr_stitch->prev_lbr_cursor[idx].valid = true;
+ 	cursor->pos++;
+@@ -2748,6 +2752,9 @@ static bool has_stitched_lbr(struct thread *thread,
+ 		memcpy(&stitch_node->cursor, &lbr_stitch->prev_lbr_cursor[i],
+ 		       sizeof(struct callchain_cursor_node));
+ 
++		stitch_node->cursor.ms.maps = maps__get(lbr_stitch->prev_lbr_cursor[i].ms.maps);
++		stitch_node->cursor.ms.map = map__get(lbr_stitch->prev_lbr_cursor[i].ms.map);
++
+ 		if (callee)
+ 			list_add(&stitch_node->node, &lbr_stitch->lists);
+ 		else
+@@ -2771,6 +2778,8 @@ static bool alloc_lbr_stitch(struct thread *thread, unsigned int max_lbr)
+ 	if (!thread__lbr_stitch(thread)->prev_lbr_cursor)
+ 		goto free_lbr_stitch;
+ 
++	thread__lbr_stitch(thread)->prev_lbr_cursor_size = max_lbr + 1;
++
+ 	INIT_LIST_HEAD(&thread__lbr_stitch(thread)->lists);
+ 	INIT_LIST_HEAD(&thread__lbr_stitch(thread)->free_lists);
+ 
+@@ -2826,8 +2835,12 @@ static int resolve_lbr_callchain_sample(struct thread *thread,
+ 						max_lbr, callee);
+ 
+ 		if (!stitched_lbr && !list_empty(&lbr_stitch->lists)) {
+-			list_replace_init(&lbr_stitch->lists,
+-					  &lbr_stitch->free_lists);
++			struct stitch_list *stitch_node;
++
++			list_for_each_entry(stitch_node, &lbr_stitch->lists, node)
++				map_symbol__exit(&stitch_node->cursor.ms);
++
++			list_splice_init(&lbr_stitch->lists, &lbr_stitch->free_lists);
+ 		}
+ 		memcpy(&lbr_stitch->prev_sample, sample, sizeof(*sample));
+ 	}
+diff --git a/tools/perf/util/setup.py b/tools/perf/util/setup.py
+index 79d5e2955f85d8..e837132d5031bd 100644
+--- a/tools/perf/util/setup.py
++++ b/tools/perf/util/setup.py
+@@ -17,7 +17,7 @@ src_feature_tests  = getenv('srctree') + '/tools/build/feature'
+ 
+ def clang_has_option(option):
+     cc_output = Popen([cc, cc_options + option, path.join(src_feature_tests, "test-hello.c") ], stderr=PIPE).stderr.readlines()
+-    return [o for o in cc_output if ((b"unknown argument" in o) or (b"is not supported" in o))] == [ ]
++    return [o for o in cc_output if ((b"unknown argument" in o) or (b"is not supported" in o) or (b"unknown warning option" in o))] == [ ]
+ 
+ if cc_is_clang:
+     from sysconfig import get_config_vars
+@@ -63,6 +63,8 @@ cflags = getenv('CFLAGS', '').split()
+ cflags += ['-fno-strict-aliasing', '-Wno-write-strings', '-Wno-unused-parameter', '-Wno-redundant-decls', '-DPYTHON_PERF' ]
+ if cc_is_clang:
+     cflags += ["-Wno-unused-command-line-argument" ]
++    if clang_has_option("-Wno-cast-function-type-mismatch"):
++        cflags += ["-Wno-cast-function-type-mismatch" ]
+ else:
+     cflags += ['-Wno-cast-function-type' ]
+ 
+diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
+index 61e9f449c72581..6817b99e550ba7 100644
+--- a/tools/perf/util/thread.c
++++ b/tools/perf/util/thread.c
+@@ -478,6 +478,7 @@ void thread__free_stitch_list(struct thread *thread)
+ 		return;
+ 
+ 	list_for_each_entry_safe(pos, tmp, &lbr_stitch->lists, node) {
++		map_symbol__exit(&pos->cursor.ms);
+ 		list_del_init(&pos->node);
+ 		free(pos);
+ 	}
+@@ -487,6 +488,9 @@ void thread__free_stitch_list(struct thread *thread)
+ 		free(pos);
+ 	}
+ 
++	for (unsigned int i = 0 ; i < lbr_stitch->prev_lbr_cursor_size; i++)
++		map_symbol__exit(&lbr_stitch->prev_lbr_cursor[i].ms);
++
+ 	zfree(&lbr_stitch->prev_lbr_cursor);
+ 	free(thread__lbr_stitch(thread));
+ 	thread__set_lbr_stitch(thread, NULL);
+diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
+index 0df775b5c1105d..a5423f834dc9d9 100644
+--- a/tools/perf/util/thread.h
++++ b/tools/perf/util/thread.h
+@@ -28,6 +28,7 @@ struct lbr_stitch {
+ 	struct list_head		free_lists;
+ 	struct perf_sample		prev_sample;
+ 	struct callchain_cursor_node	*prev_lbr_cursor;
++	unsigned int prev_lbr_cursor_size;
+ };
+ 
+ struct thread_rb_node {
+diff --git a/tools/testing/selftests/breakpoints/step_after_suspend_test.c b/tools/testing/selftests/breakpoints/step_after_suspend_test.c
+index 2cf6f10ab7c4ac..fc02918962c757 100644
+--- a/tools/testing/selftests/breakpoints/step_after_suspend_test.c
++++ b/tools/testing/selftests/breakpoints/step_after_suspend_test.c
+@@ -153,7 +153,10 @@ void suspend(void)
+ 	if (err < 0)
+ 		ksft_exit_fail_msg("timerfd_settime() failed\n");
+ 
+-	if (write(power_state_fd, "mem", strlen("mem")) != strlen("mem"))
++	system("(echo mem > /sys/power/state) 2> /dev/null");
++
++	timerfd_gettime(timerfd, &spec);
++	if (spec.it_value.tv_sec != 0 || spec.it_value.tv_nsec != 0)
+ 		ksft_exit_fail_msg("Failed to enter Suspend state\n");
+ 
+ 	close(timerfd);
+diff --git a/tools/testing/selftests/hid/Makefile b/tools/testing/selftests/hid/Makefile
+index 2e986cbf1a4630..87b6f5f83d7e0b 100644
+--- a/tools/testing/selftests/hid/Makefile
++++ b/tools/testing/selftests/hid/Makefile
+@@ -17,6 +17,8 @@ TEST_PROGS += hid-tablet.sh
+ TEST_PROGS += hid-usb_crash.sh
+ TEST_PROGS += hid-wacom.sh
+ 
++TEST_FILES := run-hid-tools-tests.sh
++
+ CXX ?= $(CROSS_COMPILE)g++
+ 
+ HOSTPKG_CONFIG := pkg-config
+diff --git a/tools/testing/selftests/mm/charge_reserved_hugetlb.sh b/tools/testing/selftests/mm/charge_reserved_hugetlb.sh
+index e14bdd4455f2d2..8e00276b4e69be 100755
+--- a/tools/testing/selftests/mm/charge_reserved_hugetlb.sh
++++ b/tools/testing/selftests/mm/charge_reserved_hugetlb.sh
+@@ -252,7 +252,7 @@ function cleanup_hugetlb_memory() {
+   local cgroup="$1"
+   if [[ "$(pgrep -f write_to_hugetlbfs)" != "" ]]; then
+     echo killing write_to_hugetlbfs
+-    killall -2 write_to_hugetlbfs
++    killall -2 --wait write_to_hugetlbfs
+     wait_for_hugetlb_memory_to_get_depleted $cgroup
+   fi
+   set -e
+diff --git a/tools/testing/selftests/mm/write_to_hugetlbfs.c b/tools/testing/selftests/mm/write_to_hugetlbfs.c
+index 6a2caba19ee1d9..1289d311efd705 100644
+--- a/tools/testing/selftests/mm/write_to_hugetlbfs.c
++++ b/tools/testing/selftests/mm/write_to_hugetlbfs.c
+@@ -28,7 +28,7 @@ enum method {
+ 
+ /* Global variables. */
+ static const char *self;
+-static char *shmaddr;
++static int *shmaddr;
+ static int shmid;
+ 
+ /*
+@@ -47,15 +47,17 @@ void sig_handler(int signo)
+ {
+ 	printf("Received %d.\n", signo);
+ 	if (signo == SIGINT) {
+-		printf("Deleting the memory\n");
+-		if (shmdt((const void *)shmaddr) != 0) {
+-			perror("Detach failure");
++		if (shmaddr) {
++			printf("Deleting the memory\n");
++			if (shmdt((const void *)shmaddr) != 0) {
++				perror("Detach failure");
++				shmctl(shmid, IPC_RMID, NULL);
++				exit(4);
++			}
++
+ 			shmctl(shmid, IPC_RMID, NULL);
+-			exit(4);
++			printf("Done deleting the memory\n");
+ 		}
+-
+-		shmctl(shmid, IPC_RMID, NULL);
+-		printf("Done deleting the memory\n");
+ 	}
+ 	exit(2);
+ }
+@@ -211,7 +213,8 @@ int main(int argc, char **argv)
+ 			shmctl(shmid, IPC_RMID, NULL);
+ 			exit(2);
+ 		}
+-		printf("shmaddr: %p\n", ptr);
++		shmaddr = ptr;
++		printf("shmaddr: %p\n", shmaddr);
+ 
+ 		break;
+ 	default:
+diff --git a/tools/testing/selftests/netfilter/nft_audit.sh b/tools/testing/selftests/netfilter/nft_audit.sh
+index 99ed5bd6e8402f..e4717444d38e77 100755
+--- a/tools/testing/selftests/netfilter/nft_audit.sh
++++ b/tools/testing/selftests/netfilter/nft_audit.sh
+@@ -25,12 +25,31 @@ logread_pid=$!
+ trap 'kill $logread_pid; rm -f $logfile $rulefile' EXIT
+ exec 3<"$logfile"
+ 
++lsplit='s/^\(.*\) entries=\([^ ]*\) \(.*\)$/pfx="\1"\nval="\2"\nsfx="\3"/'
++summarize_logs() {
++	sum=0
++	while read line; do
++		eval $(sed "$lsplit" <<< "$line")
++		[[ $sum -gt 0 ]] && {
++			[[ "$pfx $sfx" == "$tpfx $tsfx" ]] && {
++				let "sum += val"
++				continue
++			}
++			echo "$tpfx entries=$sum $tsfx"
++		}
++		tpfx="$pfx"
++		tsfx="$sfx"
++		sum=$val
++	done
++	echo "$tpfx entries=$sum $tsfx"
++}
++
+ do_test() { # (cmd, log)
+ 	echo -n "testing for cmd: $1 ... "
+ 	cat <&3 >/dev/null
+ 	$1 >/dev/null || exit 1
+ 	sleep 0.1
+-	res=$(diff -a -u <(echo "$2") - <&3)
++	res=$(diff -a -u <(echo "$2") <(summarize_logs <&3))
+ 	[ $? -eq 0 ] && { echo "OK"; return; }
+ 	echo "FAIL"
+ 	grep -v '^\(---\|+++\|@@\)' <<< "$res"
+@@ -129,31 +148,17 @@ do_test 'nft reset rules t1 c2' \
+ 'table=t1 family=2 entries=3 op=nft_reset_rule'
+ 
+ do_test 'nft reset rules table t1' \
+-'table=t1 family=2 entries=3 op=nft_reset_rule
+-table=t1 family=2 entries=3 op=nft_reset_rule
+-table=t1 family=2 entries=3 op=nft_reset_rule'
++'table=t1 family=2 entries=9 op=nft_reset_rule'
+ 
+ do_test 'nft reset rules t2 c3' \
+-'table=t2 family=2 entries=189 op=nft_reset_rule
+-table=t2 family=2 entries=188 op=nft_reset_rule
+-table=t2 family=2 entries=126 op=nft_reset_rule'
++'table=t2 family=2 entries=503 op=nft_reset_rule'
+ 
+ do_test 'nft reset rules t2' \
+-'table=t2 family=2 entries=3 op=nft_reset_rule
+-table=t2 family=2 entries=3 op=nft_reset_rule
+-table=t2 family=2 entries=186 op=nft_reset_rule
+-table=t2 family=2 entries=188 op=nft_reset_rule
+-table=t2 family=2 entries=129 op=nft_reset_rule'
++'table=t2 family=2 entries=509 op=nft_reset_rule'
+ 
+ do_test 'nft reset rules' \
+-'table=t1 family=2 entries=3 op=nft_reset_rule
+-table=t1 family=2 entries=3 op=nft_reset_rule
+-table=t1 family=2 entries=3 op=nft_reset_rule
+-table=t2 family=2 entries=3 op=nft_reset_rule
+-table=t2 family=2 entries=3 op=nft_reset_rule
+-table=t2 family=2 entries=180 op=nft_reset_rule
+-table=t2 family=2 entries=188 op=nft_reset_rule
+-table=t2 family=2 entries=135 op=nft_reset_rule'
++'table=t1 family=2 entries=9 op=nft_reset_rule
++table=t2 family=2 entries=509 op=nft_reset_rule'
+ 
+ # resetting sets and elements
+ 
+@@ -177,13 +182,11 @@ do_test 'nft reset counters t1' \
+ 'table=t1 family=2 entries=1 op=nft_reset_obj'
+ 
+ do_test 'nft reset counters t2' \
+-'table=t2 family=2 entries=342 op=nft_reset_obj
+-table=t2 family=2 entries=158 op=nft_reset_obj'
++'table=t2 family=2 entries=500 op=nft_reset_obj'
+ 
+ do_test 'nft reset counters' \
+ 'table=t1 family=2 entries=1 op=nft_reset_obj
+-table=t2 family=2 entries=341 op=nft_reset_obj
+-table=t2 family=2 entries=159 op=nft_reset_obj'
++table=t2 family=2 entries=500 op=nft_reset_obj'
+ 
+ # resetting quotas
+ 
+@@ -194,13 +197,11 @@ do_test 'nft reset quotas t1' \
+ 'table=t1 family=2 entries=1 op=nft_reset_obj'
+ 
+ do_test 'nft reset quotas t2' \
+-'table=t2 family=2 entries=315 op=nft_reset_obj
+-table=t2 family=2 entries=185 op=nft_reset_obj'
++'table=t2 family=2 entries=500 op=nft_reset_obj'
+ 
+ do_test 'nft reset quotas' \
+ 'table=t1 family=2 entries=1 op=nft_reset_obj
+-table=t2 family=2 entries=314 op=nft_reset_obj
+-table=t2 family=2 entries=186 op=nft_reset_obj'
++table=t2 family=2 entries=500 op=nft_reset_obj'
+ 
+ # deleting rules
+ 
+diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c
+index 1fc4998f06bf6f..4aaafbfc2f9735 100644
+--- a/tools/testing/selftests/nolibc/nolibc-test.c
++++ b/tools/testing/selftests/nolibc/nolibc-test.c
+@@ -522,7 +522,7 @@ int expect_strzr(const char *expr, int llen)
+ {
+ 	int ret = 0;
+ 
+-	llen += printf(" = <%s> ", expr);
++	llen += printf(" = <%s> ", expr ? expr : "(null)");
+ 	if (expr) {
+ 		ret = 1;
+ 		result(llen, FAIL);
+@@ -541,7 +541,7 @@ int expect_strnz(const char *expr, int llen)
+ {
+ 	int ret = 0;
+ 
+-	llen += printf(" = <%s> ", expr);
++	llen += printf(" = <%s> ", expr ? expr : "(null)");
+ 	if (!expr) {
+ 		ret = 1;
+ 		result(llen, FAIL);
+diff --git a/tools/testing/selftests/vDSO/parse_vdso.c b/tools/testing/selftests/vDSO/parse_vdso.c
+index 4ae417372e9ebc..7dd5668ea8a6e3 100644
+--- a/tools/testing/selftests/vDSO/parse_vdso.c
++++ b/tools/testing/selftests/vDSO/parse_vdso.c
+@@ -36,6 +36,12 @@
+ #define ELF_BITS_XFORM(bits, x) ELF_BITS_XFORM2(bits, x)
+ #define ELF(x) ELF_BITS_XFORM(ELF_BITS, x)
+ 
++#ifdef __s390x__
++#define ELF_HASH_ENTRY ELF(Xword)
++#else
++#define ELF_HASH_ENTRY ELF(Word)
++#endif
++
+ static struct vdso_info
+ {
+ 	bool valid;
+@@ -47,8 +53,8 @@ static struct vdso_info
+ 	/* Symbol table */
+ 	ELF(Sym) *symtab;
+ 	const char *symstrings;
+-	ELF(Word) *bucket, *chain;
+-	ELF(Word) nbucket, nchain;
++	ELF_HASH_ENTRY *bucket, *chain;
++	ELF_HASH_ENTRY nbucket, nchain;
+ 
+ 	/* Version table */
+ 	ELF(Versym) *versym;
+@@ -115,7 +121,7 @@ void vdso_init_from_sysinfo_ehdr(uintptr_t base)
+ 	/*
+ 	 * Fish out the useful bits of the dynamic table.
+ 	 */
+-	ELF(Word) *hash = 0;
++	ELF_HASH_ENTRY *hash = 0;
+ 	vdso_info.symstrings = 0;
+ 	vdso_info.symtab = 0;
+ 	vdso_info.versym = 0;
+@@ -133,7 +139,7 @@ void vdso_init_from_sysinfo_ehdr(uintptr_t base)
+ 				 + vdso_info.load_offset);
+ 			break;
+ 		case DT_HASH:
+-			hash = (ELF(Word) *)
++			hash = (ELF_HASH_ENTRY *)
+ 				((uintptr_t)dyn[i].d_un.d_ptr
+ 				 + vdso_info.load_offset);
+ 			break;
+@@ -216,7 +222,8 @@ void *vdso_sym(const char *version, const char *name)
+ 		ELF(Sym) *sym = &vdso_info.symtab[chain];
+ 
+ 		/* Check for a defined global or weak function w/ right name. */
+-		if (ELF64_ST_TYPE(sym->st_info) != STT_FUNC)
++		if (ELF64_ST_TYPE(sym->st_info) != STT_FUNC &&
++		    ELF64_ST_TYPE(sym->st_info) != STT_NOTYPE)
+ 			continue;
+ 		if (ELF64_ST_BIND(sym->st_info) != STB_GLOBAL &&
+ 		    ELF64_ST_BIND(sym->st_info) != STB_WEAK)
+diff --git a/tools/testing/selftests/vDSO/vdso_config.h b/tools/testing/selftests/vDSO/vdso_config.h
+index cdfed403ba13f8..72de45f587b2c9 100644
+--- a/tools/testing/selftests/vDSO/vdso_config.h
++++ b/tools/testing/selftests/vDSO/vdso_config.h
+@@ -18,18 +18,18 @@
+ #elif defined(__aarch64__)
+ #define VDSO_VERSION		3
+ #define VDSO_NAMES		0
+-#elif defined(__powerpc__)
++#elif defined(__powerpc64__)
+ #define VDSO_VERSION		1
+ #define VDSO_NAMES		0
+-#define VDSO_32BIT		1
+-#elif defined(__powerpc64__)
++#elif defined(__powerpc__)
+ #define VDSO_VERSION		1
+ #define VDSO_NAMES		0
+-#elif defined (__s390__)
++#define VDSO_32BIT		1
++#elif defined (__s390__) && !defined(__s390x__)
+ #define VDSO_VERSION		2
+ #define VDSO_NAMES		0
+ #define VDSO_32BIT		1
+-#elif defined (__s390X__)
++#elif defined (__s390x__)
+ #define VDSO_VERSION		2
+ #define VDSO_NAMES		0
+ #elif defined(__mips__)
+diff --git a/tools/testing/selftests/vDSO/vdso_test_correctness.c b/tools/testing/selftests/vDSO/vdso_test_correctness.c
+index e691a3cf149112..cdb697ae8343cc 100644
+--- a/tools/testing/selftests/vDSO/vdso_test_correctness.c
++++ b/tools/testing/selftests/vDSO/vdso_test_correctness.c
+@@ -114,6 +114,12 @@ static void fill_function_pointers()
+ 	if (!vdso)
+ 		vdso = dlopen("linux-gate.so.1",
+ 			      RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD);
++	if (!vdso)
++		vdso = dlopen("linux-vdso32.so.1",
++			      RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD);
++	if (!vdso)
++		vdso = dlopen("linux-vdso64.so.1",
++			      RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD);
+ 	if (!vdso) {
+ 		printf("[WARN]\tfailed to find vDSO\n");
+ 		return;
+diff --git a/tools/tracing/rtla/src/osnoise_top.c b/tools/tracing/rtla/src/osnoise_top.c
+index d7295c0115a282..de8767ff043a43 100644
+--- a/tools/tracing/rtla/src/osnoise_top.c
++++ b/tools/tracing/rtla/src/osnoise_top.c
+@@ -428,7 +428,7 @@ struct osnoise_top_params *osnoise_top_parse_args(int argc, char **argv)
+ 		case 'd':
+ 			params->duration = parse_seconds_duration(optarg);
+ 			if (!params->duration)
+-				osnoise_top_usage(params, "Invalid -D duration\n");
++				osnoise_top_usage(params, "Invalid -d duration\n");
+ 			break;
+ 		case 'e':
+ 			tevent = trace_event_alloc(optarg);
+diff --git a/tools/tracing/rtla/src/timerlat_top.c b/tools/tracing/rtla/src/timerlat_top.c
+index 38d6965183d9fb..a84f43857de14d 100644
+--- a/tools/tracing/rtla/src/timerlat_top.c
++++ b/tools/tracing/rtla/src/timerlat_top.c
+@@ -339,7 +339,7 @@ static void timerlat_top_usage(char *usage)
+ 		"	  -c/--cpus cpus: run the tracer only on the given cpus",
+ 		"	  -H/--house-keeping cpus: run rtla control threads only on the given cpus",
+ 		"	  -C/--cgroup[=cgroup_name]: set cgroup, if no cgroup_name is passed, the rtla's cgroup will be inherited",
+-		"	  -d/--duration time[m|h|d]: duration of the session in seconds",
++		"	  -d/--duration time[s|m|h|d]: duration of the session",
+ 		"	  -D/--debug: print debug info",
+ 		"	     --dump-tasks: prints the task running on all CPUs if stop conditions are met (depends on !--no-aa)",
+ 		"	  -t/--trace[=file]: save the stopped trace to [file|timerlat_trace.txt]",
+@@ -485,7 +485,7 @@ static struct timerlat_top_params
+ 		case 'd':
+ 			params->duration = parse_seconds_duration(optarg);
+ 			if (!params->duration)
+-				timerlat_top_usage("Invalid -D duration\n");
++				timerlat_top_usage("Invalid -d duration\n");
+ 			break;
+ 		case 'e':
+ 			tevent = trace_event_alloc(optarg);
diff --git a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.55-56.patch b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.55-56.patch
new file mode 100644
index 000000000000..ec2276153023
--- /dev/null
+++ b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.55-56.patch
@@ -0,0 +1,101 @@
+diff --git a/Makefile b/Makefile
+index 6e297758842d9c..301c5694995c5a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,9 @@
+ # SPDX-License-Identifier: GPL-2.0
+ VERSION = 6
+ PATCHLEVEL = 6
+-SUBLEVEL = 55
++SUBLEVEL = 56
+ EXTRAVERSION =
+-NAME = Hurr durr I'ma ninja sloth
++NAME = Pinguïn Aangedreven
+ 
+ # *DOCUMENTATION*
+ # To see a list of typical targets execute "make help"
+diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
+index 24dead4e30656c..7c6874804660eb 100644
+--- a/tools/perf/util/machine.c
++++ b/tools/perf/util/machine.c
+@@ -2536,12 +2536,8 @@ static void save_lbr_cursor_node(struct thread *thread,
+ 		cursor->curr = cursor->first;
+ 	else
+ 		cursor->curr = cursor->curr->next;
+-
+-	map_symbol__exit(&lbr_stitch->prev_lbr_cursor[idx].ms);
+ 	memcpy(&lbr_stitch->prev_lbr_cursor[idx], cursor->curr,
+ 	       sizeof(struct callchain_cursor_node));
+-	lbr_stitch->prev_lbr_cursor[idx].ms.maps = maps__get(cursor->curr->ms.maps);
+-	lbr_stitch->prev_lbr_cursor[idx].ms.map = map__get(cursor->curr->ms.map);
+ 
+ 	lbr_stitch->prev_lbr_cursor[idx].valid = true;
+ 	cursor->pos++;
+@@ -2752,9 +2748,6 @@ static bool has_stitched_lbr(struct thread *thread,
+ 		memcpy(&stitch_node->cursor, &lbr_stitch->prev_lbr_cursor[i],
+ 		       sizeof(struct callchain_cursor_node));
+ 
+-		stitch_node->cursor.ms.maps = maps__get(lbr_stitch->prev_lbr_cursor[i].ms.maps);
+-		stitch_node->cursor.ms.map = map__get(lbr_stitch->prev_lbr_cursor[i].ms.map);
+-
+ 		if (callee)
+ 			list_add(&stitch_node->node, &lbr_stitch->lists);
+ 		else
+@@ -2778,8 +2771,6 @@ static bool alloc_lbr_stitch(struct thread *thread, unsigned int max_lbr)
+ 	if (!thread__lbr_stitch(thread)->prev_lbr_cursor)
+ 		goto free_lbr_stitch;
+ 
+-	thread__lbr_stitch(thread)->prev_lbr_cursor_size = max_lbr + 1;
+-
+ 	INIT_LIST_HEAD(&thread__lbr_stitch(thread)->lists);
+ 	INIT_LIST_HEAD(&thread__lbr_stitch(thread)->free_lists);
+ 
+@@ -2835,12 +2826,8 @@ static int resolve_lbr_callchain_sample(struct thread *thread,
+ 						max_lbr, callee);
+ 
+ 		if (!stitched_lbr && !list_empty(&lbr_stitch->lists)) {
+-			struct stitch_list *stitch_node;
+-
+-			list_for_each_entry(stitch_node, &lbr_stitch->lists, node)
+-				map_symbol__exit(&stitch_node->cursor.ms);
+-
+-			list_splice_init(&lbr_stitch->lists, &lbr_stitch->free_lists);
++			list_replace_init(&lbr_stitch->lists,
++					  &lbr_stitch->free_lists);
+ 		}
+ 		memcpy(&lbr_stitch->prev_sample, sample, sizeof(*sample));
+ 	}
+diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
+index 6817b99e550ba7..61e9f449c72581 100644
+--- a/tools/perf/util/thread.c
++++ b/tools/perf/util/thread.c
+@@ -478,7 +478,6 @@ void thread__free_stitch_list(struct thread *thread)
+ 		return;
+ 
+ 	list_for_each_entry_safe(pos, tmp, &lbr_stitch->lists, node) {
+-		map_symbol__exit(&pos->cursor.ms);
+ 		list_del_init(&pos->node);
+ 		free(pos);
+ 	}
+@@ -488,9 +487,6 @@ void thread__free_stitch_list(struct thread *thread)
+ 		free(pos);
+ 	}
+ 
+-	for (unsigned int i = 0 ; i < lbr_stitch->prev_lbr_cursor_size; i++)
+-		map_symbol__exit(&lbr_stitch->prev_lbr_cursor[i].ms);
+-
+ 	zfree(&lbr_stitch->prev_lbr_cursor);
+ 	free(thread__lbr_stitch(thread));
+ 	thread__set_lbr_stitch(thread, NULL);
+diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
+index a5423f834dc9d9..0df775b5c1105d 100644
+--- a/tools/perf/util/thread.h
++++ b/tools/perf/util/thread.h
+@@ -28,7 +28,6 @@ struct lbr_stitch {
+ 	struct list_head		free_lists;
+ 	struct perf_sample		prev_sample;
+ 	struct callchain_cursor_node	*prev_lbr_cursor;
+-	unsigned int prev_lbr_cursor_size;
+ };
+ 
+ struct thread_rb_node {
diff --git a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.56-57.patch b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.56-57.patch
new file mode 100644
index 000000000000..37f9889f6b7e
--- /dev/null
+++ b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.56-57.patch
@@ -0,0 +1,16701 @@
+diff --git a/Documentation/dev-tools/kselftest.rst b/Documentation/dev-tools/kselftest.rst
+index deede972f25479..3ae1b3677d7f3a 100644
+--- a/Documentation/dev-tools/kselftest.rst
++++ b/Documentation/dev-tools/kselftest.rst
+@@ -255,9 +255,21 @@ Contributing new tests (details)
+ 
+    TEST_PROGS_EXTENDED, TEST_GEN_PROGS_EXTENDED mean it is the
+    executable which is not tested by default.
++
+    TEST_FILES, TEST_GEN_FILES mean it is the file which is used by
+    test.
+ 
++   TEST_INCLUDES is similar to TEST_FILES, it lists files which should be
++   included when exporting or installing the tests, with the following
++   differences:
++
++    * symlinks to files in other directories are preserved
++    * the part of paths below tools/testing/selftests/ is preserved when
++      copying the files to the output directory
++
++   TEST_INCLUDES is meant to list dependencies located in other directories of
++   the selftests hierarchy.
++
+  * First use the headers inside the kernel source and/or git repo, and then the
+    system headers.  Headers for the kernel release as opposed to headers
+    installed by the distro on the system should be the primary focus to be able
+diff --git a/Makefile b/Makefile
+index 301c5694995c5a..5b5e40c4088c1c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ VERSION = 6
+ PATCHLEVEL = 6
+-SUBLEVEL = 56
++SUBLEVEL = 57
+ EXTRAVERSION =
+ NAME = Pinguïn Aangedreven
+ 
+diff --git a/arch/loongarch/pci/acpi.c b/arch/loongarch/pci/acpi.c
+index 365f7de771cbb9..1da4dc46df43e5 100644
+--- a/arch/loongarch/pci/acpi.c
++++ b/arch/loongarch/pci/acpi.c
+@@ -225,6 +225,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
+ 	if (bus) {
+ 		memcpy(bus->sysdata, info->cfg, sizeof(struct pci_config_window));
+ 		kfree(info);
++		kfree(root_ops);
+ 	} else {
+ 		struct pci_bus *child;
+ 
+diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
+index aa8bb0208bcc8f..2b175ddf82f0bc 100644
+--- a/arch/powerpc/configs/ps3_defconfig
++++ b/arch/powerpc/configs/ps3_defconfig
+@@ -24,7 +24,6 @@ CONFIG_PS3_VRAM=m
+ CONFIG_PS3_LPM=m
+ # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
+ CONFIG_KEXEC=y
+-# CONFIG_PPC64_BIG_ENDIAN_ELF_ABI_V2 is not set
+ CONFIG_PPC_4K_PAGES=y
+ CONFIG_SCHED_SMT=y
+ CONFIG_PM=y
+diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h
+index b79d0228144f44..3ed853b8a8c858 100644
+--- a/arch/riscv/include/asm/sbi.h
++++ b/arch/riscv/include/asm/sbi.h
+@@ -327,6 +327,8 @@ static inline int sbi_remote_fence_i(const struct cpumask *cpu_mask) { return -1
+ static inline void sbi_init(void) {}
+ #endif /* CONFIG_RISCV_SBI */
+ 
++unsigned long riscv_get_mvendorid(void);
++unsigned long riscv_get_marchid(void);
+ unsigned long riscv_cached_mvendorid(unsigned int cpu_id);
+ unsigned long riscv_cached_marchid(unsigned int cpu_id);
+ unsigned long riscv_cached_mimpid(unsigned int cpu_id);
+diff --git a/arch/riscv/include/asm/sparsemem.h b/arch/riscv/include/asm/sparsemem.h
+index 63acaecc337478..2f901a410586d0 100644
+--- a/arch/riscv/include/asm/sparsemem.h
++++ b/arch/riscv/include/asm/sparsemem.h
+@@ -7,7 +7,7 @@
+ #ifdef CONFIG_64BIT
+ #define MAX_PHYSMEM_BITS	56
+ #else
+-#define MAX_PHYSMEM_BITS	34
++#define MAX_PHYSMEM_BITS	32
+ #endif /* CONFIG_64BIT */
+ #define SECTION_SIZE_BITS	27
+ #endif /* CONFIG_SPARSEMEM */
+diff --git a/arch/riscv/include/asm/thread_info.h b/arch/riscv/include/asm/thread_info.h
+index 4fb84c2e94c650..8c72d1bcdf141e 100644
+--- a/arch/riscv/include/asm/thread_info.h
++++ b/arch/riscv/include/asm/thread_info.h
+@@ -33,7 +33,6 @@
+ 
+ #define THREAD_SHIFT            (PAGE_SHIFT + THREAD_SIZE_ORDER)
+ #define OVERFLOW_STACK_SIZE     SZ_4K
+-#define SHADOW_OVERFLOW_STACK_SIZE (1024)
+ 
+ #define IRQ_STACK_SIZE		THREAD_SIZE
+ 
+diff --git a/arch/riscv/kernel/cpu.c b/arch/riscv/kernel/cpu.c
+index 157ace8b262c20..88732abecd0230 100644
+--- a/arch/riscv/kernel/cpu.c
++++ b/arch/riscv/kernel/cpu.c
+@@ -139,6 +139,34 @@ int riscv_of_parent_hartid(struct device_node *node, unsigned long *hartid)
+ 	return -1;
+ }
+ 
++unsigned long __init riscv_get_marchid(void)
++{
++	struct riscv_cpuinfo *ci = this_cpu_ptr(&riscv_cpuinfo);
++
++#if IS_ENABLED(CONFIG_RISCV_SBI)
++	ci->marchid = sbi_spec_is_0_1() ? 0 : sbi_get_marchid();
++#elif IS_ENABLED(CONFIG_RISCV_M_MODE)
++	ci->marchid = csr_read(CSR_MARCHID);
++#else
++	ci->marchid = 0;
++#endif
++	return ci->marchid;
++}
++
++unsigned long __init riscv_get_mvendorid(void)
++{
++	struct riscv_cpuinfo *ci = this_cpu_ptr(&riscv_cpuinfo);
++
++#if IS_ENABLED(CONFIG_RISCV_SBI)
++	ci->mvendorid = sbi_spec_is_0_1() ? 0 : sbi_get_mvendorid();
++#elif IS_ENABLED(CONFIG_RISCV_M_MODE)
++	ci->mvendorid = csr_read(CSR_MVENDORID);
++#else
++	ci->mvendorid = 0;
++#endif
++	return ci->mvendorid;
++}
++
+ DEFINE_PER_CPU(struct riscv_cpuinfo, riscv_cpuinfo);
+ 
+ unsigned long riscv_cached_mvendorid(unsigned int cpu_id)
+@@ -170,12 +198,16 @@ static int riscv_cpuinfo_starting(unsigned int cpu)
+ 	struct riscv_cpuinfo *ci = this_cpu_ptr(&riscv_cpuinfo);
+ 
+ #if IS_ENABLED(CONFIG_RISCV_SBI)
+-	ci->mvendorid = sbi_spec_is_0_1() ? 0 : sbi_get_mvendorid();
+-	ci->marchid = sbi_spec_is_0_1() ? 0 : sbi_get_marchid();
++	if (!ci->mvendorid)
++		ci->mvendorid = sbi_spec_is_0_1() ? 0 : sbi_get_mvendorid();
++	if (!ci->marchid)
++		ci->marchid = sbi_spec_is_0_1() ? 0 : sbi_get_marchid();
+ 	ci->mimpid = sbi_spec_is_0_1() ? 0 : sbi_get_mimpid();
+ #elif IS_ENABLED(CONFIG_RISCV_M_MODE)
+-	ci->mvendorid = csr_read(CSR_MVENDORID);
+-	ci->marchid = csr_read(CSR_MARCHID);
++	if (!ci->mvendorid)
++		ci->mvendorid = csr_read(CSR_MVENDORID);
++	if (!ci->marchid)
++		ci->marchid = csr_read(CSR_MARCHID);
+ 	ci->mimpid = csr_read(CSR_MIMPID);
+ #else
+ 	ci->mvendorid = 0;
+diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c
+index e39a905aca2483..bb5fb2b820a21e 100644
+--- a/arch/riscv/kernel/cpufeature.c
++++ b/arch/riscv/kernel/cpufeature.c
+@@ -351,6 +351,8 @@ static void __init riscv_fill_hwcap_from_isa_string(unsigned long *isa2hwcap)
+ 	struct acpi_table_header *rhct;
+ 	acpi_status status;
+ 	unsigned int cpu;
++	u64 boot_vendorid;
++	u64 boot_archid;
+ 
+ 	if (!acpi_disabled) {
+ 		status = acpi_get_table(ACPI_SIG_RHCT, 0, &rhct);
+@@ -358,6 +360,9 @@ static void __init riscv_fill_hwcap_from_isa_string(unsigned long *isa2hwcap)
+ 			return;
+ 	}
+ 
++	boot_vendorid = riscv_get_mvendorid();
++	boot_archid = riscv_get_marchid();
++
+ 	for_each_possible_cpu(cpu) {
+ 		struct riscv_isainfo *isainfo = &hart_isa[cpu];
+ 		unsigned long this_hwcap = 0;
+@@ -405,8 +410,7 @@ static void __init riscv_fill_hwcap_from_isa_string(unsigned long *isa2hwcap)
+ 		 * CPU cores with the ratified spec will contain non-zero
+ 		 * marchid.
+ 		 */
+-		if (acpi_disabled && riscv_cached_mvendorid(cpu) == THEAD_VENDOR_ID &&
+-		    riscv_cached_marchid(cpu) == 0x0) {
++		if (acpi_disabled && boot_vendorid == THEAD_VENDOR_ID && boot_archid == 0x0) {
+ 			this_hwcap &= ~isa2hwcap[RISCV_ISA_EXT_v];
+ 			clear_bit(RISCV_ISA_EXT_v, isainfo->isa);
+ 		}
+diff --git a/arch/riscv/kernel/elf_kexec.c b/arch/riscv/kernel/elf_kexec.c
+index e60fbd8660c4a5..8c32bf1eedda08 100644
+--- a/arch/riscv/kernel/elf_kexec.c
++++ b/arch/riscv/kernel/elf_kexec.c
+@@ -444,6 +444,12 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi,
+ 			*(u32 *)loc = CLEAN_IMM(CJTYPE, *(u32 *)loc) |
+ 				 ENCODE_CJTYPE_IMM(val - addr);
+ 			break;
++		case R_RISCV_ADD16:
++			*(u16 *)loc += val;
++			break;
++		case R_RISCV_SUB16:
++			*(u16 *)loc -= val;
++			break;
+ 		case R_RISCV_ADD32:
+ 			*(u32 *)loc += val;
+ 			break;
+diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S
+index ed7baf2cf7e87b..1f90fee24a8ba8 100644
+--- a/arch/riscv/kernel/entry.S
++++ b/arch/riscv/kernel/entry.S
+@@ -219,8 +219,8 @@ SYM_CODE_START(ret_from_fork)
+ 	jalr s0
+ 1:
+ 	move a0, sp /* pt_regs */
+-	la ra, ret_from_exception
+-	tail syscall_exit_to_user_mode
++	call syscall_exit_to_user_mode
++	j ret_from_exception
+ SYM_CODE_END(ret_from_fork)
+ 
+ /*
+diff --git a/arch/s390/include/asm/facility.h b/arch/s390/include/asm/facility.h
+index 94b6919026dfb8..953d42205ea83e 100644
+--- a/arch/s390/include/asm/facility.h
++++ b/arch/s390/include/asm/facility.h
+@@ -60,8 +60,10 @@ static inline int test_facility(unsigned long nr)
+ 	unsigned long facilities_als[] = { FACILITIES_ALS };
+ 
+ 	if (__builtin_constant_p(nr) && nr < sizeof(facilities_als) * 8) {
+-		if (__test_facility(nr, &facilities_als))
+-			return 1;
++		if (__test_facility(nr, &facilities_als)) {
++			if (!__is_defined(__DECOMPRESSOR))
++				return 1;
++		}
+ 	}
+ 	return __test_facility(nr, &stfle_fac_list);
+ }
+diff --git a/arch/s390/include/asm/io.h b/arch/s390/include/asm/io.h
+index 4453ad7c11aced..36a9c7740c437a 100644
+--- a/arch/s390/include/asm/io.h
++++ b/arch/s390/include/asm/io.h
+@@ -16,8 +16,10 @@
+ #include <asm/pci_io.h>
+ 
+ #define xlate_dev_mem_ptr xlate_dev_mem_ptr
++#define kc_xlate_dev_mem_ptr xlate_dev_mem_ptr
+ void *xlate_dev_mem_ptr(phys_addr_t phys);
+ #define unxlate_dev_mem_ptr unxlate_dev_mem_ptr
++#define kc_unxlate_dev_mem_ptr unxlate_dev_mem_ptr
+ void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr);
+ 
+ #define IO_SPACE_LIMIT 0
+diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c
+index 06efad5b4f931b..a3169193775f71 100644
+--- a/arch/s390/kernel/perf_cpum_sf.c
++++ b/arch/s390/kernel/perf_cpum_sf.c
+@@ -1463,7 +1463,7 @@ static int aux_output_begin(struct perf_output_handle *handle,
+ 	unsigned long range, i, range_scan, idx, head, base, offset;
+ 	struct hws_trailer_entry *te;
+ 
+-	if (WARN_ON_ONCE(handle->head & ~PAGE_MASK))
++	if (handle->head & ~PAGE_MASK)
+ 		return -EINVAL;
+ 
+ 	aux->head = handle->head >> PAGE_SHIFT;
+@@ -1642,7 +1642,7 @@ static void hw_collect_aux(struct cpu_hw_sf *cpuhw)
+ 	unsigned long num_sdb;
+ 
+ 	aux = perf_get_aux(handle);
+-	if (WARN_ON_ONCE(!aux))
++	if (!aux)
+ 		return;
+ 
+ 	/* Inform user space new data arrived */
+@@ -1661,7 +1661,7 @@ static void hw_collect_aux(struct cpu_hw_sf *cpuhw)
+ 				num_sdb);
+ 			break;
+ 		}
+-		if (WARN_ON_ONCE(!aux))
++		if (!aux)
+ 			return;
+ 
+ 		/* Update head and alert_mark to new position */
+@@ -1896,12 +1896,8 @@ static void cpumsf_pmu_start(struct perf_event *event, int flags)
+ {
+ 	struct cpu_hw_sf *cpuhw = this_cpu_ptr(&cpu_hw_sf);
+ 
+-	if (WARN_ON_ONCE(!(event->hw.state & PERF_HES_STOPPED)))
++	if (!(event->hw.state & PERF_HES_STOPPED))
+ 		return;
+-
+-	if (flags & PERF_EF_RELOAD)
+-		WARN_ON_ONCE(!(event->hw.state & PERF_HES_UPTODATE));
+-
+ 	perf_pmu_disable(event->pmu);
+ 	event->hw.state = 0;
+ 	cpuhw->lsctl.cs = 1;
+diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
+index f47515313226c4..9af4d829649444 100644
+--- a/arch/s390/mm/cmm.c
++++ b/arch/s390/mm/cmm.c
+@@ -95,11 +95,12 @@ static long cmm_alloc_pages(long nr, long *counter,
+ 		(*counter)++;
+ 		spin_unlock(&cmm_lock);
+ 		nr--;
++		cond_resched();
+ 	}
+ 	return nr;
+ }
+ 
+-static long cmm_free_pages(long nr, long *counter, struct cmm_page_array **list)
++static long __cmm_free_pages(long nr, long *counter, struct cmm_page_array **list)
+ {
+ 	struct cmm_page_array *pa;
+ 	unsigned long addr;
+@@ -123,6 +124,21 @@ static long cmm_free_pages(long nr, long *counter, struct cmm_page_array **list)
+ 	return nr;
+ }
+ 
++static long cmm_free_pages(long nr, long *counter, struct cmm_page_array **list)
++{
++	long inc = 0;
++
++	while (nr) {
++		inc = min(256L, nr);
++		nr -= inc;
++		inc = __cmm_free_pages(inc, counter, list);
++		if (inc)
++			break;
++		cond_resched();
++	}
++	return nr + inc;
++}
++
+ static int cmm_oom_notify(struct notifier_block *self,
+ 			  unsigned long dummy, void *parm)
+ {
+diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
+index 6f1cc7f1b202a6..6dabb53f58a445 100644
+--- a/arch/x86/kernel/amd_nb.c
++++ b/arch/x86/kernel/amd_nb.c
+@@ -26,6 +26,7 @@
+ #define PCI_DEVICE_ID_AMD_19H_M70H_ROOT		0x14e8
+ #define PCI_DEVICE_ID_AMD_1AH_M00H_ROOT		0x153a
+ #define PCI_DEVICE_ID_AMD_1AH_M20H_ROOT		0x1507
++#define PCI_DEVICE_ID_AMD_1AH_M60H_ROOT		0x1122
+ #define PCI_DEVICE_ID_AMD_MI200_ROOT		0x14bb
+ 
+ #define PCI_DEVICE_ID_AMD_17H_DF_F4		0x1464
+@@ -61,6 +62,7 @@ static const struct pci_device_id amd_root_ids[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_ROOT) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_ROOT) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_ROOT) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M60H_ROOT) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_ROOT) },
+ 	{}
+ };
+@@ -92,6 +94,8 @@ static const struct pci_device_id amd_nb_misc_ids[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M60H_DF_F3) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M70H_DF_F3) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F3) },
+ 	{}
+ };
+diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
+index 878a4c6dd75651..a50c99e9b5c01f 100644
+--- a/arch/x86/net/bpf_jit_comp.c
++++ b/arch/x86/net/bpf_jit_comp.c
+@@ -58,6 +58,56 @@ static bool is_imm8(int value)
+ 	return value <= 127 && value >= -128;
+ }
+ 
++/*
++ * Let us limit the positive offset to be <= 123.
++ * This is to ensure eventual jit convergence For the following patterns:
++ * ...
++ * pass4, final_proglen=4391:
++ *   ...
++ *   20e:    48 85 ff                test   rdi,rdi
++ *   211:    74 7d                   je     0x290
++ *   213:    48 8b 77 00             mov    rsi,QWORD PTR [rdi+0x0]
++ *   ...
++ *   289:    48 85 ff                test   rdi,rdi
++ *   28c:    74 17                   je     0x2a5
++ *   28e:    e9 7f ff ff ff          jmp    0x212
++ *   293:    bf 03 00 00 00          mov    edi,0x3
++ * Note that insn at 0x211 is 2-byte cond jump insn for offset 0x7d (-125)
++ * and insn at 0x28e is 5-byte jmp insn with offset -129.
++ *
++ * pass5, final_proglen=4392:
++ *   ...
++ *   20e:    48 85 ff                test   rdi,rdi
++ *   211:    0f 84 80 00 00 00       je     0x297
++ *   217:    48 8b 77 00             mov    rsi,QWORD PTR [rdi+0x0]
++ *   ...
++ *   28d:    48 85 ff                test   rdi,rdi
++ *   290:    74 1a                   je     0x2ac
++ *   292:    eb 84                   jmp    0x218
++ *   294:    bf 03 00 00 00          mov    edi,0x3
++ * Note that insn at 0x211 is 6-byte cond jump insn now since its offset
++ * becomes 0x80 based on previous round (0x293 - 0x213 = 0x80).
++ * At the same time, insn at 0x292 is a 2-byte insn since its offset is
++ * -124.
++ *
++ * pass6 will repeat the same code as in pass4 and this will prevent
++ * eventual convergence.
++ *
++ * To fix this issue, we need to break je (2->6 bytes) <-> jmp (5->2 bytes)
++ * cycle in the above. In the above example je offset <= 0x7c should work.
++ *
++ * For other cases, je <-> je needs offset <= 0x7b to avoid no convergence
++ * issue. For jmp <-> je and jmp <-> jmp cases, jmp offset <= 0x7c should
++ * avoid no convergence issue.
++ *
++ * Overall, let us limit the positive offset for 8bit cond/uncond jmp insn
++ * to maximum 123 (0x7b). This way, the jit pass can eventually converge.
++ */
++static bool is_imm8_jmp_offset(int value)
++{
++	return value <= 123 && value >= -128;
++}
++
+ static bool is_simm32(s64 value)
+ {
+ 	return value == (s64)(s32)value;
+@@ -1774,7 +1824,7 @@ st:			if (is_imm8(insn->off))
+ 				return -EFAULT;
+ 			}
+ 			jmp_offset = addrs[i + insn->off] - addrs[i];
+-			if (is_imm8(jmp_offset)) {
++			if (is_imm8_jmp_offset(jmp_offset)) {
+ 				if (jmp_padding) {
+ 					/* To keep the jmp_offset valid, the extra bytes are
+ 					 * padded before the jump insn, so we subtract the
+@@ -1856,7 +1906,7 @@ st:			if (is_imm8(insn->off))
+ 				break;
+ 			}
+ emit_jmp:
+-			if (is_imm8(jmp_offset)) {
++			if (is_imm8_jmp_offset(jmp_offset)) {
+ 				if (jmp_padding) {
+ 					/* To avoid breaking jmp_offset, the extra bytes
+ 					 * are padded before the actual jmp insn, so
+diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
+index 0a6aea36cd9751..6e76780fb43083 100644
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -667,6 +667,87 @@ static int mobile_lpm_policy = -1;
+ module_param(mobile_lpm_policy, int, 0644);
+ MODULE_PARM_DESC(mobile_lpm_policy, "Default LPM policy for mobile chipsets");
+ 
++static char *ahci_mask_port_map;
++module_param_named(mask_port_map, ahci_mask_port_map, charp, 0444);
++MODULE_PARM_DESC(mask_port_map,
++		 "32-bits port map masks to ignore controllers ports. "
++		 "Valid values are: "
++		 "\"<mask>\" to apply the same mask to all AHCI controller "
++		 "devices, and \"<pci_dev>=<mask>,<pci_dev>=<mask>,...\" to "
++		 "specify different masks for the controllers specified, "
++		 "where <pci_dev> is the PCI ID of an AHCI controller in the "
++		 "form \"domain:bus:dev.func\"");
++
++static void ahci_apply_port_map_mask(struct device *dev,
++				     struct ahci_host_priv *hpriv, char *mask_s)
++{
++	unsigned int mask;
++
++	if (kstrtouint(mask_s, 0, &mask)) {
++		dev_err(dev, "Invalid port map mask\n");
++		return;
++	}
++
++	hpriv->mask_port_map = mask;
++}
++
++static void ahci_get_port_map_mask(struct device *dev,
++				   struct ahci_host_priv *hpriv)
++{
++	char *param, *end, *str, *mask_s;
++	char *name;
++
++	if (!strlen(ahci_mask_port_map))
++		return;
++
++	str = kstrdup(ahci_mask_port_map, GFP_KERNEL);
++	if (!str)
++		return;
++
++	/* Handle single mask case */
++	if (!strchr(str, '=')) {
++		ahci_apply_port_map_mask(dev, hpriv, str);
++		goto free;
++	}
++
++	/*
++	 * Mask list case: parse the parameter to apply the mask only if
++	 * the device name matches.
++	 */
++	param = str;
++	end = param + strlen(param);
++	while (param && param < end && *param) {
++		name = param;
++		param = strchr(name, '=');
++		if (!param)
++			break;
++
++		*param = '\0';
++		param++;
++		if (param >= end)
++			break;
++
++		if (strcmp(dev_name(dev), name) != 0) {
++			param = strchr(param, ',');
++			if (param)
++				param++;
++			continue;
++		}
++
++		mask_s = param;
++		param = strchr(mask_s, ',');
++		if (param) {
++			*param = '\0';
++			param++;
++		}
++
++		ahci_apply_port_map_mask(dev, hpriv, mask_s);
++	}
++
++free:
++	kfree(str);
++}
++
+ static void ahci_pci_save_initial_config(struct pci_dev *pdev,
+ 					 struct ahci_host_priv *hpriv)
+ {
+@@ -689,6 +770,10 @@ static void ahci_pci_save_initial_config(struct pci_dev *pdev,
+ 			  "Disabling your PATA port. Use the boot option 'ahci.marvell_enable=0' to avoid this.\n");
+ 	}
+ 
++	/* Handle port map masks passed as module parameter. */
++	if (ahci_mask_port_map)
++		ahci_get_port_map_mask(&pdev->dev, hpriv);
++
+ 	ahci_save_initial_config(&pdev->dev, hpriv);
+ }
+ 
+diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
+index cd87457375454a..a96566e1b2b84c 100644
+--- a/drivers/ata/libata-eh.c
++++ b/drivers/ata/libata-eh.c
+@@ -4049,10 +4049,20 @@ static void ata_eh_handle_port_suspend(struct ata_port *ap)
+ 
+ 	WARN_ON(ap->pflags & ATA_PFLAG_SUSPENDED);
+ 
+-	/* Set all devices attached to the port in standby mode */
+-	ata_for_each_link(link, ap, HOST_FIRST) {
+-		ata_for_each_dev(dev, link, ENABLED)
+-			ata_dev_power_set_standby(dev);
++	/*
++	 * We will reach this point for all of the PM events:
++	 * PM_EVENT_SUSPEND (if runtime pm, PM_EVENT_AUTO will also be set)
++	 * PM_EVENT_FREEZE, and PM_EVENT_HIBERNATE.
++	 *
++	 * We do not want to perform disk spin down for PM_EVENT_FREEZE.
++	 * (Spin down will be performed by the subsequent PM_EVENT_HIBERNATE.)
++	 */
++	if (!(ap->pm_mesg.event & PM_EVENT_FREEZE)) {
++		/* Set all devices attached to the port in standby mode */
++		ata_for_each_link(link, ap, HOST_FIRST) {
++			ata_for_each_dev(dev, link, ENABLED)
++				ata_dev_power_set_standby(dev);
++		}
+ 	}
+ 
+ 	/*
+diff --git a/drivers/base/bus.c b/drivers/base/bus.c
+index d7c4330786cae2..d4361ad3b433f5 100644
+--- a/drivers/base/bus.c
++++ b/drivers/base/bus.c
+@@ -152,7 +152,8 @@ static ssize_t bus_attr_show(struct kobject *kobj, struct attribute *attr,
+ {
+ 	struct bus_attribute *bus_attr = to_bus_attr(attr);
+ 	struct subsys_private *subsys_priv = to_subsys_private(kobj);
+-	ssize_t ret = 0;
++	/* return -EIO for reading a bus attribute without show() */
++	ssize_t ret = -EIO;
+ 
+ 	if (bus_attr->show)
+ 		ret = bus_attr->show(subsys_priv->bus, buf);
+@@ -164,7 +165,8 @@ static ssize_t bus_attr_store(struct kobject *kobj, struct attribute *attr,
+ {
+ 	struct bus_attribute *bus_attr = to_bus_attr(attr);
+ 	struct subsys_private *subsys_priv = to_subsys_private(kobj);
+-	ssize_t ret = 0;
++	/* return -EIO for writing a bus attribute without store() */
++	ssize_t ret = -EIO;
+ 
+ 	if (bus_attr->store)
+ 		ret = bus_attr->store(subsys_priv->bus, buf, count);
+@@ -920,6 +922,8 @@ int bus_register(const struct bus_type *bus)
+ 	bus_remove_file(bus, &bus_attr_uevent);
+ bus_uevent_fail:
+ 	kset_unregister(&priv->subsys);
++	/* Above kset_unregister() will kfree @priv */
++	priv = NULL;
+ out:
+ 	kfree(priv);
+ 	return retval;
+diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
+index 06673c6ca25555..606f388c7a5716 100644
+--- a/drivers/block/zram/zram_drv.c
++++ b/drivers/block/zram/zram_drv.c
+@@ -1983,6 +1983,13 @@ static void zram_destroy_comps(struct zram *zram)
+ 		zcomp_destroy(comp);
+ 		zram->num_active_comps--;
+ 	}
++
++	for (prio = ZRAM_PRIMARY_COMP; prio < ZRAM_MAX_COMPS; prio++) {
++		/* Do not free statically defined compression algorithms */
++		if (zram->comp_algs[prio] != default_compressor)
++			kfree(zram->comp_algs[prio]);
++		zram->comp_algs[prio] = NULL;
++	}
+ }
+ 
+ static void zram_reset_device(struct zram *zram)
+diff --git a/drivers/bus/mhi/ep/internal.h b/drivers/bus/mhi/ep/internal.h
+index a2125fa5fe2f97..accbf3a51d0cf5 100644
+--- a/drivers/bus/mhi/ep/internal.h
++++ b/drivers/bus/mhi/ep/internal.h
+@@ -159,6 +159,7 @@ struct mhi_ep_chan {
+ 	void (*xfer_cb)(struct mhi_ep_device *mhi_dev, struct mhi_result *result);
+ 	enum mhi_ch_state state;
+ 	enum dma_data_direction dir;
++	size_t rd_offset;
+ 	u64 tre_loc;
+ 	u32 tre_size;
+ 	u32 tre_bytes_left;
+diff --git a/drivers/bus/mhi/ep/main.c b/drivers/bus/mhi/ep/main.c
+index 934cdbca08e448..c48f4d9f2c690b 100644
+--- a/drivers/bus/mhi/ep/main.c
++++ b/drivers/bus/mhi/ep/main.c
+@@ -74,7 +74,7 @@ static int mhi_ep_send_completion_event(struct mhi_ep_cntrl *mhi_cntrl, struct m
+ 	struct mhi_ring_element *event;
+ 	int ret;
+ 
+-	event = kmem_cache_zalloc(mhi_cntrl->ev_ring_el_cache, GFP_KERNEL | GFP_DMA);
++	event = kmem_cache_zalloc(mhi_cntrl->ev_ring_el_cache, GFP_KERNEL);
+ 	if (!event)
+ 		return -ENOMEM;
+ 
+@@ -93,7 +93,7 @@ int mhi_ep_send_state_change_event(struct mhi_ep_cntrl *mhi_cntrl, enum mhi_stat
+ 	struct mhi_ring_element *event;
+ 	int ret;
+ 
+-	event = kmem_cache_zalloc(mhi_cntrl->ev_ring_el_cache, GFP_KERNEL | GFP_DMA);
++	event = kmem_cache_zalloc(mhi_cntrl->ev_ring_el_cache, GFP_KERNEL);
+ 	if (!event)
+ 		return -ENOMEM;
+ 
+@@ -111,7 +111,7 @@ int mhi_ep_send_ee_event(struct mhi_ep_cntrl *mhi_cntrl, enum mhi_ee_type exec_e
+ 	struct mhi_ring_element *event;
+ 	int ret;
+ 
+-	event = kmem_cache_zalloc(mhi_cntrl->ev_ring_el_cache, GFP_KERNEL | GFP_DMA);
++	event = kmem_cache_zalloc(mhi_cntrl->ev_ring_el_cache, GFP_KERNEL);
+ 	if (!event)
+ 		return -ENOMEM;
+ 
+@@ -130,7 +130,7 @@ static int mhi_ep_send_cmd_comp_event(struct mhi_ep_cntrl *mhi_cntrl, enum mhi_e
+ 	struct mhi_ring_element *event;
+ 	int ret;
+ 
+-	event = kmem_cache_zalloc(mhi_cntrl->ev_ring_el_cache, GFP_KERNEL | GFP_DMA);
++	event = kmem_cache_zalloc(mhi_cntrl->ev_ring_el_cache, GFP_KERNEL);
+ 	if (!event)
+ 		return -ENOMEM;
+ 
+@@ -183,6 +183,8 @@ static int mhi_ep_process_cmd_ring(struct mhi_ep_ring *ring, struct mhi_ring_ele
+ 
+ 				goto err_unlock;
+ 			}
++
++			mhi_chan->rd_offset = ch_ring->rd_offset;
+ 		}
+ 
+ 		/* Set channel state to RUNNING */
+@@ -312,21 +314,85 @@ bool mhi_ep_queue_is_empty(struct mhi_ep_device *mhi_dev, enum dma_data_directio
+ 	struct mhi_ep_cntrl *mhi_cntrl = mhi_dev->mhi_cntrl;
+ 	struct mhi_ep_ring *ring = &mhi_cntrl->mhi_chan[mhi_chan->chan].ring;
+ 
+-	return !!(ring->rd_offset == ring->wr_offset);
++	return !!(mhi_chan->rd_offset == ring->wr_offset);
+ }
+ EXPORT_SYMBOL_GPL(mhi_ep_queue_is_empty);
+ 
++static void mhi_ep_read_completion(struct mhi_ep_buf_info *buf_info)
++{
++	struct mhi_ep_device *mhi_dev = buf_info->mhi_dev;
++	struct mhi_ep_cntrl *mhi_cntrl = mhi_dev->mhi_cntrl;
++	struct mhi_ep_chan *mhi_chan = mhi_dev->ul_chan;
++	struct mhi_ep_ring *ring = &mhi_cntrl->mhi_chan[mhi_chan->chan].ring;
++	struct mhi_ring_element *el = &ring->ring_cache[ring->rd_offset];
++	struct mhi_result result = {};
++	int ret;
++
++	if (mhi_chan->xfer_cb) {
++		result.buf_addr = buf_info->cb_buf;
++		result.dir = mhi_chan->dir;
++		result.bytes_xferd = buf_info->size;
++
++		mhi_chan->xfer_cb(mhi_dev, &result);
++	}
++
++	/*
++	 * The host will split the data packet into multiple TREs if it can't fit
++	 * the packet in a single TRE. In that case, CHAIN flag will be set by the
++	 * host for all TREs except the last one.
++	 */
++	if (buf_info->code != MHI_EV_CC_OVERFLOW) {
++		if (MHI_TRE_DATA_GET_CHAIN(el)) {
++			/*
++			 * IEOB (Interrupt on End of Block) flag will be set by the host if
++			 * it expects the completion event for all TREs of a TD.
++			 */
++			if (MHI_TRE_DATA_GET_IEOB(el)) {
++				ret = mhi_ep_send_completion_event(mhi_cntrl, ring, el,
++							     MHI_TRE_DATA_GET_LEN(el),
++							     MHI_EV_CC_EOB);
++				if (ret < 0) {
++					dev_err(&mhi_chan->mhi_dev->dev,
++						"Error sending transfer compl. event\n");
++					goto err_free_tre_buf;
++				}
++			}
++		} else {
++			/*
++			 * IEOT (Interrupt on End of Transfer) flag will be set by the host
++			 * for the last TRE of the TD and expects the completion event for
++			 * the same.
++			 */
++			if (MHI_TRE_DATA_GET_IEOT(el)) {
++				ret = mhi_ep_send_completion_event(mhi_cntrl, ring, el,
++							     MHI_TRE_DATA_GET_LEN(el),
++							     MHI_EV_CC_EOT);
++				if (ret < 0) {
++					dev_err(&mhi_chan->mhi_dev->dev,
++						"Error sending transfer compl. event\n");
++					goto err_free_tre_buf;
++				}
++			}
++		}
++	}
++
++	mhi_ep_ring_inc_index(ring);
++
++err_free_tre_buf:
++	kmem_cache_free(mhi_cntrl->tre_buf_cache, buf_info->cb_buf);
++}
++
+ static int mhi_ep_read_channel(struct mhi_ep_cntrl *mhi_cntrl,
+-				struct mhi_ep_ring *ring,
+-				struct mhi_result *result,
+-				u32 len)
++			       struct mhi_ep_ring *ring)
+ {
+ 	struct mhi_ep_chan *mhi_chan = &mhi_cntrl->mhi_chan[ring->ch_id];
+ 	struct device *dev = &mhi_cntrl->mhi_dev->dev;
+ 	size_t tr_len, read_offset, write_offset;
+ 	struct mhi_ep_buf_info buf_info = {};
++	u32 len = MHI_EP_DEFAULT_MTU;
+ 	struct mhi_ring_element *el;
+ 	bool tr_done = false;
++	void *buf_addr;
+ 	u32 buf_left;
+ 	int ret;
+ 
+@@ -339,7 +405,7 @@ static int mhi_ep_read_channel(struct mhi_ep_cntrl *mhi_cntrl,
+ 			return -ENODEV;
+ 		}
+ 
+-		el = &ring->ring_cache[ring->rd_offset];
++		el = &ring->ring_cache[mhi_chan->rd_offset];
+ 
+ 		/* Check if there is data pending to be read from previous read operation */
+ 		if (mhi_chan->tre_bytes_left) {
+@@ -356,82 +422,50 @@ static int mhi_ep_read_channel(struct mhi_ep_cntrl *mhi_cntrl,
+ 		read_offset = mhi_chan->tre_size - mhi_chan->tre_bytes_left;
+ 		write_offset = len - buf_left;
+ 
++		buf_addr = kmem_cache_zalloc(mhi_cntrl->tre_buf_cache, GFP_KERNEL);
++		if (!buf_addr)
++			return -ENOMEM;
++
+ 		buf_info.host_addr = mhi_chan->tre_loc + read_offset;
+-		buf_info.dev_addr = result->buf_addr + write_offset;
++		buf_info.dev_addr = buf_addr + write_offset;
+ 		buf_info.size = tr_len;
++		buf_info.cb = mhi_ep_read_completion;
++		buf_info.cb_buf = buf_addr;
++		buf_info.mhi_dev = mhi_chan->mhi_dev;
++
++		if (mhi_chan->tre_bytes_left - tr_len)
++			buf_info.code = MHI_EV_CC_OVERFLOW;
+ 
+ 		dev_dbg(dev, "Reading %zd bytes from channel (%u)\n", tr_len, ring->ch_id);
+-		ret = mhi_cntrl->read_from_host(mhi_cntrl, &buf_info);
++		ret = mhi_cntrl->read_async(mhi_cntrl, &buf_info);
+ 		if (ret < 0) {
+ 			dev_err(&mhi_chan->mhi_dev->dev, "Error reading from channel\n");
+-			return ret;
++			goto err_free_buf_addr;
+ 		}
+ 
+ 		buf_left -= tr_len;
+ 		mhi_chan->tre_bytes_left -= tr_len;
+ 
+-		/*
+-		 * Once the TRE (Transfer Ring Element) of a TD (Transfer Descriptor) has been
+-		 * read completely:
+-		 *
+-		 * 1. Send completion event to the host based on the flags set in TRE.
+-		 * 2. Increment the local read offset of the transfer ring.
+-		 */
+ 		if (!mhi_chan->tre_bytes_left) {
+-			/*
+-			 * The host will split the data packet into multiple TREs if it can't fit
+-			 * the packet in a single TRE. In that case, CHAIN flag will be set by the
+-			 * host for all TREs except the last one.
+-			 */
+-			if (MHI_TRE_DATA_GET_CHAIN(el)) {
+-				/*
+-				 * IEOB (Interrupt on End of Block) flag will be set by the host if
+-				 * it expects the completion event for all TREs of a TD.
+-				 */
+-				if (MHI_TRE_DATA_GET_IEOB(el)) {
+-					ret = mhi_ep_send_completion_event(mhi_cntrl, ring, el,
+-								     MHI_TRE_DATA_GET_LEN(el),
+-								     MHI_EV_CC_EOB);
+-					if (ret < 0) {
+-						dev_err(&mhi_chan->mhi_dev->dev,
+-							"Error sending transfer compl. event\n");
+-						return ret;
+-					}
+-				}
+-			} else {
+-				/*
+-				 * IEOT (Interrupt on End of Transfer) flag will be set by the host
+-				 * for the last TRE of the TD and expects the completion event for
+-				 * the same.
+-				 */
+-				if (MHI_TRE_DATA_GET_IEOT(el)) {
+-					ret = mhi_ep_send_completion_event(mhi_cntrl, ring, el,
+-								     MHI_TRE_DATA_GET_LEN(el),
+-								     MHI_EV_CC_EOT);
+-					if (ret < 0) {
+-						dev_err(&mhi_chan->mhi_dev->dev,
+-							"Error sending transfer compl. event\n");
+-						return ret;
+-					}
+-				}
+-
++			if (MHI_TRE_DATA_GET_IEOT(el))
+ 				tr_done = true;
+-			}
+ 
+-			mhi_ep_ring_inc_index(ring);
++			mhi_chan->rd_offset = (mhi_chan->rd_offset + 1) % ring->ring_size;
+ 		}
+-
+-		result->bytes_xferd += tr_len;
+ 	} while (buf_left && !tr_done);
+ 
+ 	return 0;
++
++err_free_buf_addr:
++	kmem_cache_free(mhi_cntrl->tre_buf_cache, buf_addr);
++
++	return ret;
+ }
+ 
+-static int mhi_ep_process_ch_ring(struct mhi_ep_ring *ring, struct mhi_ring_element *el)
++static int mhi_ep_process_ch_ring(struct mhi_ep_ring *ring)
+ {
+ 	struct mhi_ep_cntrl *mhi_cntrl = ring->mhi_cntrl;
+ 	struct mhi_result result = {};
+-	u32 len = MHI_EP_DEFAULT_MTU;
+ 	struct mhi_ep_chan *mhi_chan;
+ 	int ret;
+ 
+@@ -452,32 +486,49 @@ static int mhi_ep_process_ch_ring(struct mhi_ep_ring *ring, struct mhi_ring_elem
+ 		mhi_chan->xfer_cb(mhi_chan->mhi_dev, &result);
+ 	} else {
+ 		/* UL channel */
+-		result.buf_addr = kmem_cache_zalloc(mhi_cntrl->tre_buf_cache, GFP_KERNEL | GFP_DMA);
+-		if (!result.buf_addr)
+-			return -ENOMEM;
+-
+ 		do {
+-			ret = mhi_ep_read_channel(mhi_cntrl, ring, &result, len);
++			ret = mhi_ep_read_channel(mhi_cntrl, ring);
+ 			if (ret < 0) {
+ 				dev_err(&mhi_chan->mhi_dev->dev, "Failed to read channel\n");
+-				kmem_cache_free(mhi_cntrl->tre_buf_cache, result.buf_addr);
+ 				return ret;
+ 			}
+ 
+-			result.dir = mhi_chan->dir;
+-			mhi_chan->xfer_cb(mhi_chan->mhi_dev, &result);
+-			result.bytes_xferd = 0;
+-			memset(result.buf_addr, 0, len);
+-
+ 			/* Read until the ring becomes empty */
+ 		} while (!mhi_ep_queue_is_empty(mhi_chan->mhi_dev, DMA_TO_DEVICE));
+-
+-		kmem_cache_free(mhi_cntrl->tre_buf_cache, result.buf_addr);
+ 	}
+ 
+ 	return 0;
+ }
+ 
++static void mhi_ep_skb_completion(struct mhi_ep_buf_info *buf_info)
++{
++	struct mhi_ep_device *mhi_dev = buf_info->mhi_dev;
++	struct mhi_ep_cntrl *mhi_cntrl = mhi_dev->mhi_cntrl;
++	struct mhi_ep_chan *mhi_chan = mhi_dev->dl_chan;
++	struct mhi_ep_ring *ring = &mhi_cntrl->mhi_chan[mhi_chan->chan].ring;
++	struct mhi_ring_element *el = &ring->ring_cache[ring->rd_offset];
++	struct device *dev = &mhi_dev->dev;
++	struct mhi_result result = {};
++	int ret;
++
++	if (mhi_chan->xfer_cb) {
++		result.buf_addr = buf_info->cb_buf;
++		result.dir = mhi_chan->dir;
++		result.bytes_xferd = buf_info->size;
++
++		mhi_chan->xfer_cb(mhi_dev, &result);
++	}
++
++	ret = mhi_ep_send_completion_event(mhi_cntrl, ring, el, buf_info->size,
++					   buf_info->code);
++	if (ret) {
++		dev_err(dev, "Error sending transfer completion event\n");
++		return;
++	}
++
++	mhi_ep_ring_inc_index(ring);
++}
++
+ /* TODO: Handle partially formed TDs */
+ int mhi_ep_queue_skb(struct mhi_ep_device *mhi_dev, struct sk_buff *skb)
+ {
+@@ -488,7 +539,6 @@ int mhi_ep_queue_skb(struct mhi_ep_device *mhi_dev, struct sk_buff *skb)
+ 	struct mhi_ring_element *el;
+ 	u32 buf_left, read_offset;
+ 	struct mhi_ep_ring *ring;
+-	enum mhi_ev_ccs code;
+ 	size_t tr_len;
+ 	u32 tre_len;
+ 	int ret;
+@@ -512,7 +562,7 @@ int mhi_ep_queue_skb(struct mhi_ep_device *mhi_dev, struct sk_buff *skb)
+ 			goto err_exit;
+ 		}
+ 
+-		el = &ring->ring_cache[ring->rd_offset];
++		el = &ring->ring_cache[mhi_chan->rd_offset];
+ 		tre_len = MHI_TRE_DATA_GET_LEN(el);
+ 
+ 		tr_len = min(buf_left, tre_len);
+@@ -521,33 +571,35 @@ int mhi_ep_queue_skb(struct mhi_ep_device *mhi_dev, struct sk_buff *skb)
+ 		buf_info.dev_addr = skb->data + read_offset;
+ 		buf_info.host_addr = MHI_TRE_DATA_GET_PTR(el);
+ 		buf_info.size = tr_len;
++		buf_info.cb = mhi_ep_skb_completion;
++		buf_info.cb_buf = skb;
++		buf_info.mhi_dev = mhi_dev;
+ 
+-		dev_dbg(dev, "Writing %zd bytes to channel (%u)\n", tr_len, ring->ch_id);
+-		ret = mhi_cntrl->write_to_host(mhi_cntrl, &buf_info);
+-		if (ret < 0) {
+-			dev_err(dev, "Error writing to the channel\n");
+-			goto err_exit;
+-		}
+-
+-		buf_left -= tr_len;
+ 		/*
+ 		 * For all TREs queued by the host for DL channel, only the EOT flag will be set.
+ 		 * If the packet doesn't fit into a single TRE, send the OVERFLOW event to
+ 		 * the host so that the host can adjust the packet boundary to next TREs. Else send
+ 		 * the EOT event to the host indicating the packet boundary.
+ 		 */
+-		if (buf_left)
+-			code = MHI_EV_CC_OVERFLOW;
++		if (buf_left - tr_len)
++			buf_info.code = MHI_EV_CC_OVERFLOW;
+ 		else
+-			code = MHI_EV_CC_EOT;
++			buf_info.code = MHI_EV_CC_EOT;
+ 
+-		ret = mhi_ep_send_completion_event(mhi_cntrl, ring, el, tr_len, code);
+-		if (ret) {
+-			dev_err(dev, "Error sending transfer completion event\n");
++		dev_dbg(dev, "Writing %zd bytes to channel (%u)\n", tr_len, ring->ch_id);
++		ret = mhi_cntrl->write_async(mhi_cntrl, &buf_info);
++		if (ret < 0) {
++			dev_err(dev, "Error writing to the channel\n");
+ 			goto err_exit;
+ 		}
+ 
+-		mhi_ep_ring_inc_index(ring);
++		buf_left -= tr_len;
++
++		/*
++		 * Update the read offset cached in mhi_chan. Actual read offset
++		 * will be updated by the completion handler.
++		 */
++		mhi_chan->rd_offset = (mhi_chan->rd_offset + 1) % ring->ring_size;
+ 	} while (buf_left);
+ 
+ 	mutex_unlock(&mhi_chan->lock);
+@@ -748,7 +800,6 @@ static void mhi_ep_ch_ring_worker(struct work_struct *work)
+ 	struct mhi_ep_cntrl *mhi_cntrl = container_of(work, struct mhi_ep_cntrl, ch_ring_work);
+ 	struct device *dev = &mhi_cntrl->mhi_dev->dev;
+ 	struct mhi_ep_ring_item *itr, *tmp;
+-	struct mhi_ring_element *el;
+ 	struct mhi_ep_ring *ring;
+ 	struct mhi_ep_chan *chan;
+ 	unsigned long flags;
+@@ -787,16 +838,14 @@ static void mhi_ep_ch_ring_worker(struct work_struct *work)
+ 		}
+ 
+ 		/* Sanity check to make sure there are elements in the ring */
+-		if (ring->rd_offset == ring->wr_offset) {
++		if (chan->rd_offset == ring->wr_offset) {
+ 			mutex_unlock(&chan->lock);
+ 			kmem_cache_free(mhi_cntrl->ring_item_cache, itr);
+ 			continue;
+ 		}
+ 
+-		el = &ring->ring_cache[ring->rd_offset];
+-
+ 		dev_dbg(dev, "Processing the ring for channel (%u)\n", ring->ch_id);
+-		ret = mhi_ep_process_ch_ring(ring, el);
++		ret = mhi_ep_process_ch_ring(ring);
+ 		if (ret) {
+ 			dev_err(dev, "Error processing ring for channel (%u): %d\n",
+ 				ring->ch_id, ret);
+@@ -1411,14 +1460,14 @@ int mhi_ep_register_controller(struct mhi_ep_cntrl *mhi_cntrl,
+ 
+ 	mhi_cntrl->ev_ring_el_cache = kmem_cache_create("mhi_ep_event_ring_el",
+ 							sizeof(struct mhi_ring_element), 0,
+-							SLAB_CACHE_DMA, NULL);
++							0, NULL);
+ 	if (!mhi_cntrl->ev_ring_el_cache) {
+ 		ret = -ENOMEM;
+ 		goto err_free_cmd;
+ 	}
+ 
+ 	mhi_cntrl->tre_buf_cache = kmem_cache_create("mhi_ep_tre_buf", MHI_EP_DEFAULT_MTU, 0,
+-						      SLAB_CACHE_DMA, NULL);
++						      0, NULL);
+ 	if (!mhi_cntrl->tre_buf_cache) {
+ 		ret = -ENOMEM;
+ 		goto err_destroy_ev_ring_el_cache;
+@@ -1431,6 +1480,7 @@ int mhi_ep_register_controller(struct mhi_ep_cntrl *mhi_cntrl,
+ 		ret = -ENOMEM;
+ 		goto err_destroy_tre_buf_cache;
+ 	}
++
+ 	INIT_WORK(&mhi_cntrl->state_work, mhi_ep_state_worker);
+ 	INIT_WORK(&mhi_cntrl->reset_work, mhi_ep_reset_worker);
+ 	INIT_WORK(&mhi_cntrl->cmd_ring_work, mhi_ep_cmd_ring_worker);
+diff --git a/drivers/bus/mhi/ep/ring.c b/drivers/bus/mhi/ep/ring.c
+index c673d7200b3e17..ba9f696d1aa80e 100644
+--- a/drivers/bus/mhi/ep/ring.c
++++ b/drivers/bus/mhi/ep/ring.c
+@@ -48,7 +48,7 @@ static int __mhi_ep_cache_ring(struct mhi_ep_ring *ring, size_t end)
+ 		buf_info.host_addr = ring->rbase + (start * sizeof(struct mhi_ring_element));
+ 		buf_info.dev_addr = &ring->ring_cache[start];
+ 
+-		ret = mhi_cntrl->read_from_host(mhi_cntrl, &buf_info);
++		ret = mhi_cntrl->read_sync(mhi_cntrl, &buf_info);
+ 		if (ret < 0)
+ 			return ret;
+ 	} else {
+@@ -56,7 +56,7 @@ static int __mhi_ep_cache_ring(struct mhi_ep_ring *ring, size_t end)
+ 		buf_info.host_addr = ring->rbase + (start * sizeof(struct mhi_ring_element));
+ 		buf_info.dev_addr = &ring->ring_cache[start];
+ 
+-		ret = mhi_cntrl->read_from_host(mhi_cntrl, &buf_info);
++		ret = mhi_cntrl->read_sync(mhi_cntrl, &buf_info);
+ 		if (ret < 0)
+ 			return ret;
+ 
+@@ -65,7 +65,7 @@ static int __mhi_ep_cache_ring(struct mhi_ep_ring *ring, size_t end)
+ 			buf_info.dev_addr = &ring->ring_cache[0];
+ 			buf_info.size = end * sizeof(struct mhi_ring_element);
+ 
+-			ret = mhi_cntrl->read_from_host(mhi_cntrl, &buf_info);
++			ret = mhi_cntrl->read_sync(mhi_cntrl, &buf_info);
+ 			if (ret < 0)
+ 				return ret;
+ 		}
+@@ -143,7 +143,7 @@ int mhi_ep_ring_add_element(struct mhi_ep_ring *ring, struct mhi_ring_element *e
+ 	buf_info.dev_addr = el;
+ 	buf_info.size = sizeof(*el);
+ 
+-	return mhi_cntrl->write_to_host(mhi_cntrl, &buf_info);
++	return mhi_cntrl->write_sync(mhi_cntrl, &buf_info);
+ }
+ 
+ void mhi_ep_ring_init(struct mhi_ep_ring *ring, enum mhi_ep_ring_type type, u32 id)
+diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
+index 680d1ef2a21794..796ab9a4e48fa1 100644
+--- a/drivers/char/virtio_console.c
++++ b/drivers/char/virtio_console.c
+@@ -2052,25 +2052,27 @@ static int virtcons_probe(struct virtio_device *vdev)
+ 		multiport = true;
+ 	}
+ 
+-	err = init_vqs(portdev);
+-	if (err < 0) {
+-		dev_err(&vdev->dev, "Error %d initializing vqs\n", err);
+-		goto free_chrdev;
+-	}
+-
+ 	spin_lock_init(&portdev->ports_lock);
+ 	INIT_LIST_HEAD(&portdev->ports);
+ 	INIT_LIST_HEAD(&portdev->list);
+ 
+-	virtio_device_ready(portdev->vdev);
+-
+ 	INIT_WORK(&portdev->config_work, &config_work_handler);
+ 	INIT_WORK(&portdev->control_work, &control_work_handler);
+ 
+ 	if (multiport) {
+ 		spin_lock_init(&portdev->c_ivq_lock);
+ 		spin_lock_init(&portdev->c_ovq_lock);
++	}
+ 
++	err = init_vqs(portdev);
++	if (err < 0) {
++		dev_err(&vdev->dev, "Error %d initializing vqs\n", err);
++		goto free_chrdev;
++	}
++
++	virtio_device_ready(portdev->vdev);
++
++	if (multiport) {
+ 		err = fill_queue(portdev->c_ivq, &portdev->c_ivq_lock);
+ 		if (err < 0) {
+ 			dev_err(&vdev->dev,
+diff --git a/drivers/clk/bcm/clk-bcm53573-ilp.c b/drivers/clk/bcm/clk-bcm53573-ilp.c
+index 84f2af736ee8a6..83ef41d618be37 100644
+--- a/drivers/clk/bcm/clk-bcm53573-ilp.c
++++ b/drivers/clk/bcm/clk-bcm53573-ilp.c
+@@ -112,7 +112,7 @@ static void bcm53573_ilp_init(struct device_node *np)
+ 		goto err_free_ilp;
+ 	}
+ 
+-	ilp->regmap = syscon_node_to_regmap(of_get_parent(np));
++	ilp->regmap = syscon_node_to_regmap(np->parent);
+ 	if (IS_ERR(ilp->regmap)) {
+ 		err = PTR_ERR(ilp->regmap);
+ 		goto err_free_ilp;
+diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c
+index 2b77d1fc7bb946..1e1296e748357b 100644
+--- a/drivers/clk/imx/clk-imx7d.c
++++ b/drivers/clk/imx/clk-imx7d.c
+@@ -498,9 +498,9 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node)
+ 	hws[IMX7D_ENET_AXI_ROOT_SRC] = imx_clk_hw_mux2_flags("enet_axi_src", base + 0x8900, 24, 3, enet_axi_sel, ARRAY_SIZE(enet_axi_sel), CLK_SET_PARENT_GATE);
+ 	hws[IMX7D_NAND_USDHC_BUS_ROOT_SRC] = imx_clk_hw_mux2_flags("nand_usdhc_src", base + 0x8980, 24, 3, nand_usdhc_bus_sel, ARRAY_SIZE(nand_usdhc_bus_sel), CLK_SET_PARENT_GATE);
+ 	hws[IMX7D_DRAM_PHYM_ROOT_SRC] = imx_clk_hw_mux2_flags("dram_phym_src", base + 0x9800, 24, 1, dram_phym_sel, ARRAY_SIZE(dram_phym_sel), CLK_SET_PARENT_GATE);
+-	hws[IMX7D_DRAM_ROOT_SRC] = imx_clk_hw_mux2_flags("dram_src", base + 0x9880, 24, 1, dram_sel, ARRAY_SIZE(dram_sel), CLK_SET_PARENT_GATE);
++	hws[IMX7D_DRAM_ROOT_SRC] = imx_clk_hw_mux2("dram_src", base + 0x9880, 24, 1, dram_sel, ARRAY_SIZE(dram_sel));
+ 	hws[IMX7D_DRAM_PHYM_ALT_ROOT_SRC] = imx_clk_hw_mux2_flags("dram_phym_alt_src", base + 0xa000, 24, 3, dram_phym_alt_sel, ARRAY_SIZE(dram_phym_alt_sel), CLK_SET_PARENT_GATE);
+-	hws[IMX7D_DRAM_ALT_ROOT_SRC]  = imx_clk_hw_mux2_flags("dram_alt_src", base + 0xa080, 24, 3, dram_alt_sel, ARRAY_SIZE(dram_alt_sel), CLK_SET_PARENT_GATE);
++	hws[IMX7D_DRAM_ALT_ROOT_SRC]  = imx_clk_hw_mux2("dram_alt_src", base + 0xa080, 24, 3, dram_alt_sel, ARRAY_SIZE(dram_alt_sel));
+ 	hws[IMX7D_USB_HSIC_ROOT_SRC] = imx_clk_hw_mux2_flags("usb_hsic_src", base + 0xa100, 24, 3, usb_hsic_sel, ARRAY_SIZE(usb_hsic_sel), CLK_SET_PARENT_GATE);
+ 	hws[IMX7D_PCIE_CTRL_ROOT_SRC] = imx_clk_hw_mux2_flags("pcie_ctrl_src", base + 0xa180, 24, 3, pcie_ctrl_sel, ARRAY_SIZE(pcie_ctrl_sel), CLK_SET_PARENT_GATE);
+ 	hws[IMX7D_PCIE_PHY_ROOT_SRC] = imx_clk_hw_mux2_flags("pcie_phy_src", base + 0xa200, 24, 3, pcie_phy_sel, ARRAY_SIZE(pcie_phy_sel), CLK_SET_PARENT_GATE);
+diff --git a/drivers/comedi/drivers/ni_routing/tools/convert_c_to_py.c b/drivers/comedi/drivers/ni_routing/tools/convert_c_to_py.c
+index d55521b5bdcb2d..892a66b2cea665 100644
+--- a/drivers/comedi/drivers/ni_routing/tools/convert_c_to_py.c
++++ b/drivers/comedi/drivers/ni_routing/tools/convert_c_to_py.c
+@@ -140,6 +140,11 @@ int main(void)
+ {
+ 	FILE *fp = fopen("ni_values.py", "w");
+ 
++	if (fp == NULL) {
++		fprintf(stderr, "Could not open file!");
++		return -1;
++	}
++
+ 	/* write route register values */
+ 	fprintf(fp, "ni_route_values = {\n");
+ 	for (int i = 0; ni_all_route_values[i]; ++i)
+diff --git a/drivers/dax/device.c b/drivers/dax/device.c
+index 93ebedc5ec8ca3..01e89b7ac637f2 100644
+--- a/drivers/dax/device.c
++++ b/drivers/dax/device.c
+@@ -86,7 +86,7 @@ static void dax_set_mapping(struct vm_fault *vmf, pfn_t pfn,
+ 		nr_pages = 1;
+ 
+ 	pgoff = linear_page_index(vmf->vma,
+-			ALIGN(vmf->address, fault_size));
++			ALIGN_DOWN(vmf->address, fault_size));
+ 
+ 	for (i = 0; i < nr_pages; i++) {
+ 		struct page *page = pfn_to_page(pfn_t_to_pfn(pfn) + i);
+diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c
+index 58f107194fdafd..76468e6a2899a8 100644
+--- a/drivers/gpio/gpio-aspeed.c
++++ b/drivers/gpio/gpio-aspeed.c
+@@ -406,6 +406,8 @@ static void __aspeed_gpio_set(struct gpio_chip *gc, unsigned int offset,
+ 	gpio->dcache[GPIO_BANK(offset)] = reg;
+ 
+ 	iowrite32(reg, addr);
++	/* Flush write */
++	ioread32(addr);
+ }
+ 
+ static void aspeed_gpio_set(struct gpio_chip *gc, unsigned int offset,
+@@ -1191,7 +1193,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)
+ 	if (!gpio_id)
+ 		return -EINVAL;
+ 
+-	gpio->clk = of_clk_get(pdev->dev.of_node, 0);
++	gpio->clk = devm_clk_get_enabled(&pdev->dev, NULL);
+ 	if (IS_ERR(gpio->clk)) {
+ 		dev_warn(&pdev->dev,
+ 				"Failed to get clock from devicetree, debouncing disabled\n");
+diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
+index a7a6f6c5c76556..c2efe18ceacd07 100644
+--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
+@@ -1691,7 +1691,7 @@ bool dc_validate_boot_timing(const struct dc *dc,
+ 		if (crtc_timing->pix_clk_100hz != pix_clk_100hz)
+ 			return false;
+ 
+-		if (!se->funcs->dp_get_pixel_format)
++		if (!se || !se->funcs->dp_get_pixel_format)
+ 			return false;
+ 
+ 		if (!se->funcs->dp_get_pixel_format(
+diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c
+index 93c0455766ddb0..cee5e9e64ae711 100644
+--- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c
++++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c
+@@ -432,21 +432,18 @@ static enum mod_hdcp_status authenticated_dp(struct mod_hdcp *hdcp,
+ 		goto out;
+ 	}
+ 
+-	if (status == MOD_HDCP_STATUS_SUCCESS)
+-		if (!mod_hdcp_execute_and_set(mod_hdcp_read_bstatus,
+-				&input->bstatus_read, &status,
+-				hdcp, "bstatus_read"))
+-			goto out;
+-	if (status == MOD_HDCP_STATUS_SUCCESS)
+-		if (!mod_hdcp_execute_and_set(check_link_integrity_dp,
+-				&input->link_integrity_check, &status,
+-				hdcp, "link_integrity_check"))
+-			goto out;
+-	if (status == MOD_HDCP_STATUS_SUCCESS)
+-		if (!mod_hdcp_execute_and_set(check_no_reauthentication_request_dp,
+-				&input->reauth_request_check, &status,
+-				hdcp, "reauth_request_check"))
+-			goto out;
++	mod_hdcp_execute_and_set(mod_hdcp_read_bstatus,
++			&input->bstatus_read, &status,
++			hdcp, "bstatus_read");
++
++	mod_hdcp_execute_and_set(check_link_integrity_dp,
++			&input->link_integrity_check, &status,
++			hdcp, "link_integrity_check");
++
++	mod_hdcp_execute_and_set(check_no_reauthentication_request_dp,
++			&input->reauth_request_check, &status,
++			hdcp, "reauth_request_check");
++
+ out:
+ 	return status;
+ }
+diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
+index cb90e70d85e862..65f9f66933bba2 100644
+--- a/drivers/gpu/drm/drm_crtc.c
++++ b/drivers/gpu/drm/drm_crtc.c
+@@ -904,6 +904,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
+ 	connector_set = NULL;
+ 	fb = NULL;
+ 	mode = NULL;
++	num_connectors = 0;
+ 
+ 	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
+ 
+diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
+index a42549fa96918e..cb99839afcd03a 100644
+--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
++++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
+@@ -1005,7 +1005,8 @@ static void intel_hdcp_update_value(struct intel_connector *connector,
+ 	hdcp->value = value;
+ 	if (update_property) {
+ 		drm_connector_get(&connector->base);
+-		queue_work(i915->unordered_wq, &hdcp->prop_work);
++		if (!queue_work(i915->unordered_wq, &hdcp->prop_work))
++			drm_connector_put(&connector->base);
+ 	}
+ }
+ 
+@@ -2480,7 +2481,8 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,
+ 		mutex_lock(&hdcp->mutex);
+ 		hdcp->value = DRM_MODE_CONTENT_PROTECTION_DESIRED;
+ 		drm_connector_get(&connector->base);
+-		queue_work(i915->unordered_wq, &hdcp->prop_work);
++		if (!queue_work(i915->unordered_wq, &hdcp->prop_work))
++			drm_connector_put(&connector->base);
+ 		mutex_unlock(&hdcp->mutex);
+ 	}
+ 
+@@ -2497,7 +2499,9 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,
+ 		 */
+ 		if (!desired_and_not_enabled && !content_protection_type_changed) {
+ 			drm_connector_get(&connector->base);
+-			queue_work(i915->unordered_wq, &hdcp->prop_work);
++			if (!queue_work(i915->unordered_wq, &hdcp->prop_work))
++				drm_connector_put(&connector->base);
++
+ 		}
+ 	}
+ 
+diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+index a34917b048f96f..8c7fff19c97bb0 100644
+--- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
++++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+@@ -1157,7 +1157,7 @@ nv04_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
+ 	chan = drm->channel;
+ 	if (!chan)
+ 		return -ENODEV;
+-	cli = (void *)chan->user.client;
++	cli = chan->cli;
+ 	push = chan->chan.push;
+ 
+ 	s = kzalloc(sizeof(*s), GFP_KERNEL);
+diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
+index 74b16e39138561..2e177ebab30398 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
++++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
+@@ -351,7 +351,7 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)
+ 	list_add(&chan->head, &abi16->channels);
+ 
+ 	/* create channel object and initialise dma and fence management */
+-	ret = nouveau_channel_new(drm, device, false, runm, init->fb_ctxdma_handle,
++	ret = nouveau_channel_new(cli, false, runm, init->fb_ctxdma_handle,
+ 				  init->tt_ctxdma_handle, &chan->chan);
+ 	if (ret)
+ 		goto done;
+diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
+index 3a7f4ce34aa31c..5d398a422459e1 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
++++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
+@@ -843,7 +843,7 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict,
+ {
+ 	struct nouveau_drm *drm = nouveau_bdev(bo->bdev);
+ 	struct nouveau_channel *chan = drm->ttm.chan;
+-	struct nouveau_cli *cli = (void *)chan->user.client;
++	struct nouveau_cli *cli = chan->cli;
+ 	struct nouveau_fence *fence;
+ 	int ret;
+ 
+diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
+index 7c97b288680760..cee36b1efd3917 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
++++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
+@@ -52,7 +52,7 @@ static int
+ nouveau_channel_killed(struct nvif_event *event, void *repv, u32 repc)
+ {
+ 	struct nouveau_channel *chan = container_of(event, typeof(*chan), kill);
+-	struct nouveau_cli *cli = (void *)chan->user.client;
++	struct nouveau_cli *cli = chan->cli;
+ 
+ 	NV_PRINTK(warn, cli, "channel %d killed!\n", chan->chid);
+ 
+@@ -66,7 +66,7 @@ int
+ nouveau_channel_idle(struct nouveau_channel *chan)
+ {
+ 	if (likely(chan && chan->fence && !atomic_read(&chan->killed))) {
+-		struct nouveau_cli *cli = (void *)chan->user.client;
++		struct nouveau_cli *cli = chan->cli;
+ 		struct nouveau_fence *fence = NULL;
+ 		int ret;
+ 
+@@ -142,10 +142,11 @@ nouveau_channel_wait(struct nvif_push *push, u32 size)
+ }
+ 
+ static int
+-nouveau_channel_prep(struct nouveau_drm *drm, struct nvif_device *device,
++nouveau_channel_prep(struct nouveau_cli *cli,
+ 		     u32 size, struct nouveau_channel **pchan)
+ {
+-	struct nouveau_cli *cli = (void *)device->object.client;
++	struct nouveau_drm *drm = cli->drm;
++	struct nvif_device *device = &cli->device;
+ 	struct nv_dma_v0 args = {};
+ 	struct nouveau_channel *chan;
+ 	u32 target;
+@@ -155,6 +156,7 @@ nouveau_channel_prep(struct nouveau_drm *drm, struct nvif_device *device,
+ 	if (!chan)
+ 		return -ENOMEM;
+ 
++	chan->cli = cli;
+ 	chan->device = device;
+ 	chan->drm = drm;
+ 	chan->vmm = nouveau_cli_vmm(cli);
+@@ -254,7 +256,7 @@ nouveau_channel_prep(struct nouveau_drm *drm, struct nvif_device *device,
+ }
+ 
+ static int
+-nouveau_channel_ctor(struct nouveau_drm *drm, struct nvif_device *device, bool priv, u64 runm,
++nouveau_channel_ctor(struct nouveau_cli *cli, bool priv, u64 runm,
+ 		     struct nouveau_channel **pchan)
+ {
+ 	const struct nvif_mclass hosts[] = {
+@@ -279,7 +281,7 @@ nouveau_channel_ctor(struct nouveau_drm *drm, struct nvif_device *device, bool p
+ 		struct nvif_chan_v0 chan;
+ 		char name[TASK_COMM_LEN+16];
+ 	} args;
+-	struct nouveau_cli *cli = (void *)device->object.client;
++	struct nvif_device *device = &cli->device;
+ 	struct nouveau_channel *chan;
+ 	const u64 plength = 0x10000;
+ 	const u64 ioffset = plength;
+@@ -298,7 +300,7 @@ nouveau_channel_ctor(struct nouveau_drm *drm, struct nvif_device *device, bool p
+ 		size = ioffset + ilength;
+ 
+ 	/* allocate dma push buffer */
+-	ret = nouveau_channel_prep(drm, device, size, &chan);
++	ret = nouveau_channel_prep(cli, size, &chan);
+ 	*pchan = chan;
+ 	if (ret)
+ 		return ret;
+@@ -493,13 +495,12 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
+ }
+ 
+ int
+-nouveau_channel_new(struct nouveau_drm *drm, struct nvif_device *device,
++nouveau_channel_new(struct nouveau_cli *cli,
+ 		    bool priv, u64 runm, u32 vram, u32 gart, struct nouveau_channel **pchan)
+ {
+-	struct nouveau_cli *cli = (void *)device->object.client;
+ 	int ret;
+ 
+-	ret = nouveau_channel_ctor(drm, device, priv, runm, pchan);
++	ret = nouveau_channel_ctor(cli, priv, runm, pchan);
+ 	if (ret) {
+ 		NV_PRINTK(dbg, cli, "channel create, %d\n", ret);
+ 		return ret;
+diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.h b/drivers/gpu/drm/nouveau/nouveau_chan.h
+index 5de2ef4e98c2bb..260febd634ee21 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_chan.h
++++ b/drivers/gpu/drm/nouveau/nouveau_chan.h
+@@ -12,6 +12,7 @@ struct nouveau_channel {
+ 		struct nvif_push *push;
+ 	} chan;
+ 
++	struct nouveau_cli *cli;
+ 	struct nvif_device *device;
+ 	struct nouveau_drm *drm;
+ 	struct nouveau_vmm *vmm;
+@@ -62,7 +63,7 @@ struct nouveau_channel {
+ int nouveau_channels_init(struct nouveau_drm *);
+ void nouveau_channels_fini(struct nouveau_drm *);
+ 
+-int  nouveau_channel_new(struct nouveau_drm *, struct nvif_device *, bool priv, u64 runm,
++int  nouveau_channel_new(struct nouveau_cli *, bool priv, u64 runm,
+ 			 u32 vram, u32 gart, struct nouveau_channel **);
+ void nouveau_channel_del(struct nouveau_channel **);
+ int  nouveau_channel_idle(struct nouveau_channel *);
+diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c
+index 6fb65b01d77804..097bd3af0719e0 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_dmem.c
++++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c
+@@ -193,7 +193,7 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struct vm_fault *vmf)
+ 	if (!spage || !(src & MIGRATE_PFN_MIGRATE))
+ 		goto done;
+ 
+-	dpage = alloc_page_vma(GFP_HIGHUSER, vmf->vma, vmf->address);
++	dpage = alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO, vmf->vma, vmf->address);
+ 	if (!dpage)
+ 		goto done;
+ 
+diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
+index 75545da9d1e91d..ac15a662e06042 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
++++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
+@@ -343,7 +343,7 @@ nouveau_accel_ce_init(struct nouveau_drm *drm)
+ 		return;
+ 	}
+ 
+-	ret = nouveau_channel_new(drm, device, false, runm, NvDmaFB, NvDmaTT, &drm->cechan);
++	ret = nouveau_channel_new(&drm->client, true, runm, NvDmaFB, NvDmaTT, &drm->cechan);
+ 	if (ret)
+ 		NV_ERROR(drm, "failed to create ce channel, %d\n", ret);
+ }
+@@ -371,7 +371,7 @@ nouveau_accel_gr_init(struct nouveau_drm *drm)
+ 		return;
+ 	}
+ 
+-	ret = nouveau_channel_new(drm, device, false, runm, NvDmaFB, NvDmaTT, &drm->channel);
++	ret = nouveau_channel_new(&drm->client, false, runm, NvDmaFB, NvDmaTT, &drm->channel);
+ 	if (ret) {
+ 		NV_ERROR(drm, "failed to create kernel channel, %d\n", ret);
+ 		nouveau_accel_gr_fini(drm);
+diff --git a/drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c b/drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c
+index cfa5b54ed6fe78..e6328991c87e93 100644
+--- a/drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c
++++ b/drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c
+@@ -2112,11 +2112,11 @@ static const struct panel_desc starry_qfh032011_53g_desc = {
+ };
+ 
+ static const struct drm_display_mode starry_himax83102_j02_default_mode = {
+-	.clock = 162850,
++	.clock = 162680,
+ 	.hdisplay = 1200,
+-	.hsync_start = 1200 + 50,
+-	.hsync_end = 1200 + 50 + 20,
+-	.htotal = 1200 + 50 + 20 + 50,
++	.hsync_start = 1200 + 60,
++	.hsync_end = 1200 + 60 + 20,
++	.htotal = 1200 + 60 + 20 + 40,
+ 	.vdisplay = 1920,
+ 	.vsync_start = 1920 + 116,
+ 	.vsync_end = 1920 + 116 + 8,
+diff --git a/drivers/gpu/drm/v3d/v3d_perfmon.c b/drivers/gpu/drm/v3d/v3d_perfmon.c
+index e1be7368b87dfc..73b9c92dc0fc5b 100644
+--- a/drivers/gpu/drm/v3d/v3d_perfmon.c
++++ b/drivers/gpu/drm/v3d/v3d_perfmon.c
+@@ -103,6 +103,11 @@ void v3d_perfmon_open_file(struct v3d_file_priv *v3d_priv)
+ static int v3d_perfmon_idr_del(int id, void *elem, void *data)
+ {
+ 	struct v3d_perfmon *perfmon = elem;
++	struct v3d_dev *v3d = (struct v3d_dev *)data;
++
++	/* If the active perfmon is being destroyed, stop it first */
++	if (perfmon == v3d->active_perfmon)
++		v3d_perfmon_stop(v3d, perfmon, false);
+ 
+ 	v3d_perfmon_put(perfmon);
+ 
+@@ -111,8 +116,10 @@ static int v3d_perfmon_idr_del(int id, void *elem, void *data)
+ 
+ void v3d_perfmon_close_file(struct v3d_file_priv *v3d_priv)
+ {
++	struct v3d_dev *v3d = v3d_priv->v3d;
++
+ 	mutex_lock(&v3d_priv->perfmon.lock);
+-	idr_for_each(&v3d_priv->perfmon.idr, v3d_perfmon_idr_del, NULL);
++	idr_for_each(&v3d_priv->perfmon.idr, v3d_perfmon_idr_del, v3d);
+ 	idr_destroy(&v3d_priv->perfmon.idr);
+ 	mutex_unlock(&v3d_priv->perfmon.lock);
+ 	mutex_destroy(&v3d_priv->perfmon.lock);
+diff --git a/drivers/gpu/drm/vc4/vc4_perfmon.c b/drivers/gpu/drm/vc4/vc4_perfmon.c
+index c4ac2c94623815..c00a5cc2316d20 100644
+--- a/drivers/gpu/drm/vc4/vc4_perfmon.c
++++ b/drivers/gpu/drm/vc4/vc4_perfmon.c
+@@ -116,6 +116,11 @@ void vc4_perfmon_open_file(struct vc4_file *vc4file)
+ static int vc4_perfmon_idr_del(int id, void *elem, void *data)
+ {
+ 	struct vc4_perfmon *perfmon = elem;
++	struct vc4_dev *vc4 = (struct vc4_dev *)data;
++
++	/* If the active perfmon is being destroyed, stop it first */
++	if (perfmon == vc4->active_perfmon)
++		vc4_perfmon_stop(vc4, perfmon, false);
+ 
+ 	vc4_perfmon_put(perfmon);
+ 
+@@ -130,7 +135,7 @@ void vc4_perfmon_close_file(struct vc4_file *vc4file)
+ 		return;
+ 
+ 	mutex_lock(&vc4file->perfmon.lock);
+-	idr_for_each(&vc4file->perfmon.idr, vc4_perfmon_idr_del, NULL);
++	idr_for_each(&vc4file->perfmon.idr, vc4_perfmon_idr_del, vc4);
+ 	idr_destroy(&vc4file->perfmon.idr);
+ 	mutex_unlock(&vc4file->perfmon.lock);
+ 	mutex_destroy(&vc4file->perfmon.lock);
+diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
+index 790aa908e2a788..9e2cde55b465ce 100644
+--- a/drivers/hid/Kconfig
++++ b/drivers/hid/Kconfig
+@@ -1300,6 +1300,15 @@ config HID_ALPS
+ 	Say Y here if you have a Alps touchpads over i2c-hid or usbhid
+ 	and want support for its special functionalities.
+ 
++config HID_MCP2200
++	tristate "Microchip MCP2200 HID USB-to-GPIO bridge"
++	depends on USB_HID && GPIOLIB
++	help
++	  Provides GPIO functionality over USB-HID through MCP2200 device.
++
++	  To compile this driver as a module, choose M here: the module
++	  will be called hid-mcp2200.ko.
++
+ config HID_MCP2221
+ 	tristate "Microchip MCP2221 HID USB-to-I2C/SMbus host support"
+ 	depends on USB_HID && I2C
+diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
+index 8a06d0f840bcbe..082a728eac6004 100644
+--- a/drivers/hid/Makefile
++++ b/drivers/hid/Makefile
+@@ -79,6 +79,7 @@ obj-$(CONFIG_HID_LOGITECH_HIDPP)	+= hid-logitech-hidpp.o
+ obj-$(CONFIG_HID_MACALLY)	+= hid-macally.o
+ obj-$(CONFIG_HID_MAGICMOUSE)	+= hid-magicmouse.o
+ obj-$(CONFIG_HID_MALTRON)	+= hid-maltron.o
++obj-$(CONFIG_HID_MCP2200)	+= hid-mcp2200.o
+ obj-$(CONFIG_HID_MCP2221)	+= hid-mcp2221.o
+ obj-$(CONFIG_HID_MAYFLASH)	+= hid-mf.o
+ obj-$(CONFIG_HID_MEGAWORLD_FF)	+= hid-megaworld.o
+diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_client.c b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
+index 4b59687ff5d821..3438d392920fad 100644
+--- a/drivers/hid/amd-sfh-hid/amd_sfh_client.c
++++ b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
+@@ -236,9 +236,9 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata)
+ 	cl_data->in_data = in_data;
+ 
+ 	for (i = 0; i < cl_data->num_hid_devices; i++) {
+-		in_data->sensor_virt_addr[i] = dma_alloc_coherent(dev, sizeof(int) * 8,
+-								  &cl_data->sensor_dma_addr[i],
+-								  GFP_KERNEL);
++		in_data->sensor_virt_addr[i] = dmam_alloc_coherent(dev, sizeof(int) * 8,
++								   &cl_data->sensor_dma_addr[i],
++								   GFP_KERNEL);
+ 		if (!in_data->sensor_virt_addr[i]) {
+ 			rc = -ENOMEM;
+ 			goto cleanup;
+@@ -331,7 +331,6 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata)
+ int amd_sfh_hid_client_deinit(struct amd_mp2_dev *privdata)
+ {
+ 	struct amdtp_cl_data *cl_data = privdata->cl_data;
+-	struct amd_input_data *in_data = cl_data->in_data;
+ 	int i, status;
+ 
+ 	for (i = 0; i < cl_data->num_hid_devices; i++) {
+@@ -351,12 +350,5 @@ int amd_sfh_hid_client_deinit(struct amd_mp2_dev *privdata)
+ 	cancel_delayed_work_sync(&cl_data->work_buffer);
+ 	amdtp_hid_remove(cl_data);
+ 
+-	for (i = 0; i < cl_data->num_hid_devices; i++) {
+-		if (in_data->sensor_virt_addr[i]) {
+-			dma_free_coherent(&privdata->pdev->dev, 8 * sizeof(int),
+-					  in_data->sensor_virt_addr[i],
+-					  cl_data->sensor_dma_addr[i]);
+-		}
+-	}
+ 	return 0;
+ }
+diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
+index 88cbb2fe6ac8cc..84625e817ce950 100644
+--- a/drivers/hid/hid-asus.c
++++ b/drivers/hid/hid-asus.c
+@@ -881,7 +881,10 @@ static int asus_input_mapping(struct hid_device *hdev,
+ 		case 0xb3: asus_map_key_clear(KEY_PROG3);	break; /* Fn+Left next aura */
+ 		case 0x6a: asus_map_key_clear(KEY_F13);		break; /* Screenpad toggle */
+ 		case 0x4b: asus_map_key_clear(KEY_F14);		break; /* Arrows/Pg-Up/Dn toggle */
+-
++		case 0xa5: asus_map_key_clear(KEY_F15);		break; /* ROG Ally left back */
++		case 0xa6: asus_map_key_clear(KEY_F16);		break; /* ROG Ally QAM button */
++		case 0xa7: asus_map_key_clear(KEY_F17);		break; /* ROG Ally ROG long-press */
++		case 0xa8: asus_map_key_clear(KEY_F18);		break; /* ROG Ally ROG long-press-release */
+ 
+ 		default:
+ 			/* ASUS lazily declares 256 usages, ignore the rest,
+@@ -1273,6 +1276,15 @@ static const struct hid_device_id asus_devices[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
+ 	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3),
+ 	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
++	    USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR),
++	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
++	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY),
++	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
++	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X),
++	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
+ 	    USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD),
+ 	  QUIRK_ROG_CLAYMORE_II_KEYBOARD },
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index f2e8fb357590ff..d4f6066dbbc596 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -208,6 +208,9 @@
+ #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD	0x1866
+ #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2	0x19b6
+ #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3	0x1a30
++#define USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR		0x18c6
++#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY		0x1abe
++#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X		0x1b4c
+ #define USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD	0x196b
+ #define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD	0x1869
+ 
+@@ -298,6 +301,9 @@
+ 
+ #define USB_VENDOR_ID_CIDC		0x1677
+ 
++#define I2C_VENDOR_ID_CIRQUE           0x0488
++#define I2C_PRODUCT_ID_CIRQUE_1063     0x1063
++
+ #define USB_VENDOR_ID_CJTOUCH		0x24b8
+ #define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020	0x0020
+ #define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040	0x0040
+@@ -499,6 +505,7 @@
+ #define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100 0xe100
+ 
+ #define I2C_VENDOR_ID_GOODIX		0x27c6
++#define I2C_DEVICE_ID_GOODIX_01E0	0x01e0
+ #define I2C_DEVICE_ID_GOODIX_01E8	0x01e8
+ #define I2C_DEVICE_ID_GOODIX_01E9	0x01e9
+ #define I2C_DEVICE_ID_GOODIX_01F0	0x01f0
+@@ -907,6 +914,7 @@
+ #define USB_DEVICE_ID_PICK16F1454	0x0042
+ #define USB_DEVICE_ID_PICK16F1454_V2	0xf2f7
+ #define USB_DEVICE_ID_LUXAFOR		0xf372
++#define USB_DEVICE_ID_MCP2200		0x00df
+ #define USB_DEVICE_ID_MCP2221		0x00dd
+ 
+ #define USB_VENDOR_ID_MICROSOFT		0x045e
+@@ -1025,6 +1033,8 @@
+ #define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3220_SERIES	0xc056
+ #define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3215_SERIES	0xc057
+ #define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3225_SERIES	0xc058
++#define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3325_SERIES	0x430c
++#define USB_DEVICE_ID_PLANTRONICS_ENCOREPRO_500_SERIES		0x431e
+ 
+ #define USB_VENDOR_ID_PANASONIC		0x04da
+ #define USB_DEVICE_ID_PANABOARD_UBT780	0x1044
+diff --git a/drivers/hid/hid-mcp2200.c b/drivers/hid/hid-mcp2200.c
+new file mode 100644
+index 00000000000000..bf57f7f6caa084
+--- /dev/null
++++ b/drivers/hid/hid-mcp2200.c
+@@ -0,0 +1,392 @@
++// SPDX-License-Identifier: GPL-2.0-only
++/*
++ * MCP2200 - Microchip USB to GPIO bridge
++ *
++ * Copyright (c) 2023, Johannes Roith <johannes@gnu-linux.rocks>
++ *
++ * Datasheet: https://ww1.microchip.com/downloads/en/DeviceDoc/22228A.pdf
++ * App Note for HID: https://ww1.microchip.com/downloads/en/DeviceDoc/93066A.pdf
++ */
++#include <linux/completion.h>
++#include <linux/delay.h>
++#include <linux/err.h>
++#include <linux/gpio/driver.h>
++#include <linux/hid.h>
++#include <linux/hidraw.h>
++#include <linux/module.h>
++#include <linux/mutex.h>
++#include "hid-ids.h"
++
++/* Commands codes in a raw output report */
++#define SET_CLEAR_OUTPUTS	0x08
++#define CONFIGURE		0x10
++#define READ_EE			0x20
++#define WRITE_EE		0x40
++#define READ_ALL		0x80
++
++/* MCP GPIO direction encoding */
++enum MCP_IO_DIR {
++	MCP2200_DIR_OUT = 0x00,
++	MCP2200_DIR_IN  = 0x01,
++};
++
++/* Altternative pin assignments */
++#define TXLED		2
++#define RXLED		3
++#define USBCFG		6
++#define SSPND		7
++#define MCP_NGPIO	8
++
++/* CMD to set or clear a GPIO output */
++struct mcp_set_clear_outputs {
++	u8 cmd;
++	u8 dummys1[10];
++	u8 set_bmap;
++	u8 clear_bmap;
++	u8 dummys2[3];
++} __packed;
++
++/* CMD to configure the IOs */
++struct mcp_configure {
++	u8 cmd;
++	u8 dummys1[3];
++	u8 io_bmap;
++	u8 config_alt_pins;
++	u8 io_default_val_bmap;
++	u8 config_alt_options;
++	u8 baud_h;
++	u8 baud_l;
++	u8 dummys2[6];
++} __packed;
++
++/* CMD to read all parameters */
++struct mcp_read_all {
++	u8 cmd;
++	u8 dummys[15];
++} __packed;
++
++/* Response to the read all cmd */
++struct mcp_read_all_resp {
++	u8 cmd;
++	u8 eep_addr;
++	u8 dummy;
++	u8 eep_val;
++	u8 io_bmap;
++	u8 config_alt_pins;
++	u8 io_default_val_bmap;
++	u8 config_alt_options;
++	u8 baud_h;
++	u8 baud_l;
++	u8 io_port_val_bmap;
++	u8 dummys[5];
++} __packed;
++
++struct mcp2200 {
++	struct hid_device *hdev;
++	struct mutex lock;
++	struct completion wait_in_report;
++	u8 gpio_dir;
++	u8 gpio_val;
++	u8 gpio_inval;
++	u8 baud_h;
++	u8 baud_l;
++	u8 config_alt_pins;
++	u8 gpio_reset_val;
++	u8 config_alt_options;
++	int status;
++	struct gpio_chip gc;
++	u8 hid_report[16];
++};
++
++/* this executes the READ_ALL cmd */
++static int mcp_cmd_read_all(struct mcp2200 *mcp)
++{
++	struct mcp_read_all *read_all;
++	int len, t;
++
++	reinit_completion(&mcp->wait_in_report);
++
++	mutex_lock(&mcp->lock);
++
++	read_all = (struct mcp_read_all *) mcp->hid_report;
++	read_all->cmd = READ_ALL;
++	len = hid_hw_output_report(mcp->hdev, (u8 *) read_all,
++				   sizeof(struct mcp_read_all));
++
++	mutex_unlock(&mcp->lock);
++
++	if (len != sizeof(struct mcp_read_all))
++		return -EINVAL;
++
++	t = wait_for_completion_timeout(&mcp->wait_in_report,
++					msecs_to_jiffies(4000));
++	if (!t)
++		return -ETIMEDOUT;
++
++	/* return status, negative value if wrong response was received */
++	return mcp->status;
++}
++
++static void mcp_set_multiple(struct gpio_chip *gc, unsigned long *mask,
++			     unsigned long *bits)
++{
++	struct mcp2200 *mcp = gpiochip_get_data(gc);
++	u8 value;
++	int status;
++	struct mcp_set_clear_outputs *cmd;
++
++	mutex_lock(&mcp->lock);
++	cmd = (struct mcp_set_clear_outputs *) mcp->hid_report;
++
++	value = mcp->gpio_val & ~*mask;
++	value |= (*mask & *bits);
++
++	cmd->cmd = SET_CLEAR_OUTPUTS;
++	cmd->set_bmap = value;
++	cmd->clear_bmap = ~(value);
++
++	status = hid_hw_output_report(mcp->hdev, (u8 *) cmd,
++		       sizeof(struct mcp_set_clear_outputs));
++
++	if (status == sizeof(struct mcp_set_clear_outputs))
++		mcp->gpio_val = value;
++
++	mutex_unlock(&mcp->lock);
++}
++
++static void mcp_set(struct gpio_chip *gc, unsigned int gpio_nr, int value)
++{
++	unsigned long mask = 1 << gpio_nr;
++	unsigned long bmap_value = value << gpio_nr;
++
++	mcp_set_multiple(gc, &mask, &bmap_value);
++}
++
++static int mcp_get_multiple(struct gpio_chip *gc, unsigned long *mask,
++		unsigned long *bits)
++{
++	u32 val;
++	struct mcp2200 *mcp = gpiochip_get_data(gc);
++	int status;
++
++	status = mcp_cmd_read_all(mcp);
++	if (status)
++		return status;
++
++	val = mcp->gpio_inval;
++	*bits = (val & *mask);
++	return 0;
++}
++
++static int mcp_get(struct gpio_chip *gc, unsigned int gpio_nr)
++{
++	unsigned long mask = 0, bits = 0;
++
++	mask = (1 << gpio_nr);
++	mcp_get_multiple(gc, &mask, &bits);
++	return bits > 0;
++}
++
++static int mcp_get_direction(struct gpio_chip *gc, unsigned int gpio_nr)
++{
++	struct mcp2200 *mcp = gpiochip_get_data(gc);
++
++	return (mcp->gpio_dir & (MCP2200_DIR_IN << gpio_nr))
++		? GPIO_LINE_DIRECTION_IN : GPIO_LINE_DIRECTION_OUT;
++}
++
++static int mcp_set_direction(struct gpio_chip *gc, unsigned int gpio_nr,
++			     enum MCP_IO_DIR io_direction)
++{
++	struct mcp2200 *mcp = gpiochip_get_data(gc);
++	struct mcp_configure *conf;
++	int status;
++	/* after the configure cmd we will need to set the outputs again */
++	unsigned long mask = ~(mcp->gpio_dir); /* only set outputs */
++	unsigned long bits = mcp->gpio_val;
++	/* Offsets of alternative pins in config_alt_pins, 0 is not used */
++	u8 alt_pin_conf[8] = {SSPND, USBCFG, 0, 0, 0, 0, RXLED, TXLED};
++	u8 config_alt_pins = mcp->config_alt_pins;
++
++	/* Read in the reset baudrate first, we need it later */
++	status = mcp_cmd_read_all(mcp);
++	if (status != 0)
++		return status;
++
++	mutex_lock(&mcp->lock);
++	conf = (struct mcp_configure  *) mcp->hid_report;
++
++	/* configure will reset the chip! */
++	conf->cmd = CONFIGURE;
++	conf->io_bmap = (mcp->gpio_dir & ~(1 << gpio_nr))
++		| (io_direction << gpio_nr);
++	/* Don't overwrite the reset parameters */
++	conf->baud_h = mcp->baud_h;
++	conf->baud_l = mcp->baud_l;
++	conf->config_alt_options = mcp->config_alt_options;
++	conf->io_default_val_bmap = mcp->gpio_reset_val;
++	/* Adjust alt. func if necessary */
++	if (alt_pin_conf[gpio_nr])
++		config_alt_pins &= ~(1 << alt_pin_conf[gpio_nr]);
++	conf->config_alt_pins = config_alt_pins;
++
++	status = hid_hw_output_report(mcp->hdev, (u8 *) conf,
++				      sizeof(struct mcp_set_clear_outputs));
++
++	if (status == sizeof(struct mcp_set_clear_outputs)) {
++		mcp->gpio_dir = conf->io_bmap;
++		mcp->config_alt_pins = config_alt_pins;
++	} else {
++		mutex_unlock(&mcp->lock);
++		return -EIO;
++	}
++
++	mutex_unlock(&mcp->lock);
++
++	/* Configure CMD will clear all IOs -> rewrite them */
++	mcp_set_multiple(gc, &mask, &bits);
++	return 0;
++}
++
++static int mcp_direction_input(struct gpio_chip *gc, unsigned int gpio_nr)
++{
++	return mcp_set_direction(gc, gpio_nr, MCP2200_DIR_IN);
++}
++
++static int mcp_direction_output(struct gpio_chip *gc, unsigned int gpio_nr,
++				int value)
++{
++	int ret;
++	unsigned long mask, bmap_value;
++
++	mask = 1 << gpio_nr;
++	bmap_value = value << gpio_nr;
++
++	ret = mcp_set_direction(gc, gpio_nr, MCP2200_DIR_OUT);
++	if (!ret)
++		mcp_set_multiple(gc, &mask, &bmap_value);
++	return ret;
++}
++
++static const struct gpio_chip template_chip = {
++	.label			= "mcp2200",
++	.owner			= THIS_MODULE,
++	.get_direction		= mcp_get_direction,
++	.direction_input	= mcp_direction_input,
++	.direction_output	= mcp_direction_output,
++	.set			= mcp_set,
++	.set_multiple		= mcp_set_multiple,
++	.get			= mcp_get,
++	.get_multiple		= mcp_get_multiple,
++	.base			= -1,
++	.ngpio			= MCP_NGPIO,
++	.can_sleep		= true,
++};
++
++/*
++ * MCP2200 uses interrupt endpoint for input reports. This function
++ * is called by HID layer when it receives i/p report from mcp2200,
++ * which is actually a response to the previously sent command.
++ */
++static int mcp2200_raw_event(struct hid_device *hdev, struct hid_report *report,
++		u8 *data, int size)
++{
++	struct mcp2200 *mcp = hid_get_drvdata(hdev);
++	struct mcp_read_all_resp *all_resp;
++
++	switch (data[0]) {
++	case READ_ALL:
++		all_resp = (struct mcp_read_all_resp *) data;
++		mcp->status = 0;
++		mcp->gpio_inval = all_resp->io_port_val_bmap;
++		mcp->baud_h = all_resp->baud_h;
++		mcp->baud_l = all_resp->baud_l;
++		mcp->gpio_reset_val = all_resp->io_default_val_bmap;
++		mcp->config_alt_pins = all_resp->config_alt_pins;
++		mcp->config_alt_options = all_resp->config_alt_options;
++		break;
++	default:
++		mcp->status = -EIO;
++		break;
++	}
++
++	complete(&mcp->wait_in_report);
++	return 0;
++}
++
++static int mcp2200_probe(struct hid_device *hdev, const struct hid_device_id *id)
++{
++	int ret;
++	struct mcp2200 *mcp;
++
++	mcp = devm_kzalloc(&hdev->dev, sizeof(*mcp), GFP_KERNEL);
++	if (!mcp)
++		return -ENOMEM;
++
++	ret = hid_parse(hdev);
++	if (ret) {
++		hid_err(hdev, "can't parse reports\n");
++		return ret;
++	}
++
++	ret = hid_hw_start(hdev, 0);
++	if (ret) {
++		hid_err(hdev, "can't start hardware\n");
++		return ret;
++	}
++
++	hid_info(hdev, "USB HID v%x.%02x Device [%s] on %s\n", hdev->version >> 8,
++			hdev->version & 0xff, hdev->name, hdev->phys);
++
++	ret = hid_hw_open(hdev);
++	if (ret) {
++		hid_err(hdev, "can't open device\n");
++		hid_hw_stop(hdev);
++		return ret;
++	}
++
++	mutex_init(&mcp->lock);
++	init_completion(&mcp->wait_in_report);
++	hid_set_drvdata(hdev, mcp);
++	mcp->hdev = hdev;
++
++	mcp->gc = template_chip;
++	mcp->gc.parent = &hdev->dev;
++
++	ret = devm_gpiochip_add_data(&hdev->dev, &mcp->gc, mcp);
++	if (ret < 0) {
++		hid_err(hdev, "Unable to register gpiochip\n");
++		hid_hw_close(hdev);
++		hid_hw_stop(hdev);
++		return ret;
++	}
++
++	return 0;
++}
++
++static void mcp2200_remove(struct hid_device *hdev)
++{
++	hid_hw_close(hdev);
++	hid_hw_stop(hdev);
++}
++
++static const struct hid_device_id mcp2200_devices[] = {
++	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_MCP2200) },
++	{ }
++};
++MODULE_DEVICE_TABLE(hid, mcp2200_devices);
++
++static struct hid_driver mcp2200_driver = {
++	.name		= "mcp2200",
++	.id_table	= mcp2200_devices,
++	.probe		= mcp2200_probe,
++	.remove		= mcp2200_remove,
++	.raw_event	= mcp2200_raw_event,
++};
++
++/* Register with HID core */
++module_hid_driver(mcp2200_driver);
++
++MODULE_AUTHOR("Johannes Roith <johannes@gnu-linux.rocks>");
++MODULE_DESCRIPTION("MCP2200 Microchip HID USB to GPIO bridge");
++MODULE_LICENSE("GPL");
+diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
+index 6d76463f5896f3..e7199ae2e3d918 100644
+--- a/drivers/hid/hid-multitouch.c
++++ b/drivers/hid/hid-multitouch.c
+@@ -1447,7 +1447,8 @@ static __u8 *mt_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+ {
+ 	if (hdev->vendor == I2C_VENDOR_ID_GOODIX &&
+ 	    (hdev->product == I2C_DEVICE_ID_GOODIX_01E8 ||
+-	     hdev->product == I2C_DEVICE_ID_GOODIX_01E9)) {
++	     hdev->product == I2C_DEVICE_ID_GOODIX_01E9 ||
++		 hdev->product == I2C_DEVICE_ID_GOODIX_01E0)) {
+ 		if (rdesc[607] == 0x15) {
+ 			rdesc[607] = 0x25;
+ 			dev_info(
+@@ -2068,7 +2069,10 @@ static const struct hid_device_id mt_devices[] = {
+ 		     I2C_DEVICE_ID_GOODIX_01E8) },
+ 	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT_NSMU,
+ 	  HID_DEVICE(BUS_I2C, HID_GROUP_ANY, I2C_VENDOR_ID_GOODIX,
+-		     I2C_DEVICE_ID_GOODIX_01E8) },
++		     I2C_DEVICE_ID_GOODIX_01E9) },
++	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT_NSMU,
++	  HID_DEVICE(BUS_I2C, HID_GROUP_ANY, I2C_VENDOR_ID_GOODIX,
++		     I2C_DEVICE_ID_GOODIX_01E0) },
+ 
+ 	/* GoodTouch panels */
+ 	{ .driver_data = MT_CLS_NSMU,
+diff --git a/drivers/hid/hid-plantronics.c b/drivers/hid/hid-plantronics.c
+index 3d414ae194acbd..25cfd964dc25d9 100644
+--- a/drivers/hid/hid-plantronics.c
++++ b/drivers/hid/hid-plantronics.c
+@@ -38,8 +38,10 @@
+ 			    (usage->hid & HID_USAGE_PAGE) == HID_UP_CONSUMER)
+ 
+ #define PLT_QUIRK_DOUBLE_VOLUME_KEYS BIT(0)
++#define PLT_QUIRK_FOLLOWED_OPPOSITE_VOLUME_KEYS BIT(1)
+ 
+ #define PLT_DOUBLE_KEY_TIMEOUT 5 /* ms */
++#define PLT_FOLLOWED_OPPOSITE_KEY_TIMEOUT 220 /* ms */
+ 
+ struct plt_drv_data {
+ 	unsigned long device_type;
+@@ -137,6 +139,21 @@ static int plantronics_event(struct hid_device *hdev, struct hid_field *field,
+ 
+ 		drv_data->last_volume_key_ts = cur_ts;
+ 	}
++	if (drv_data->quirks & PLT_QUIRK_FOLLOWED_OPPOSITE_VOLUME_KEYS) {
++		unsigned long prev_ts, cur_ts;
++
++		/* Usages are filtered in plantronics_usages. */
++
++		if (!value) /* Handle key presses only. */
++			return 0;
++
++		prev_ts = drv_data->last_volume_key_ts;
++		cur_ts = jiffies;
++		if (jiffies_to_msecs(cur_ts - prev_ts) <= PLT_FOLLOWED_OPPOSITE_KEY_TIMEOUT)
++			return 1; /* Ignore the followed opposite volume key. */
++
++		drv_data->last_volume_key_ts = cur_ts;
++	}
+ 
+ 	return 0;
+ }
+@@ -210,6 +227,12 @@ static const struct hid_device_id plantronics_devices[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS,
+ 					 USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3225_SERIES),
+ 		.driver_data = PLT_QUIRK_DOUBLE_VOLUME_KEYS },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS,
++					 USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3325_SERIES),
++		.driver_data = PLT_QUIRK_FOLLOWED_OPPOSITE_VOLUME_KEYS },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS,
++					 USB_DEVICE_ID_PLANTRONICS_ENCOREPRO_500_SERIES),
++		.driver_data = PLT_QUIRK_FOLLOWED_OPPOSITE_VOLUME_KEYS },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, HID_ANY_ID) },
+ 	{ }
+ };
+diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c
+index 799ad0ef9c4af0..045db6f0fb4c4f 100644
+--- a/drivers/hid/i2c-hid/i2c-hid-core.c
++++ b/drivers/hid/i2c-hid/i2c-hid-core.c
+@@ -44,12 +44,12 @@
+ #include "i2c-hid.h"
+ 
+ /* quirks to control the device */
+-#define I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV	BIT(0)
+-#define I2C_HID_QUIRK_NO_IRQ_AFTER_RESET	BIT(1)
+-#define I2C_HID_QUIRK_BOGUS_IRQ			BIT(4)
+-#define I2C_HID_QUIRK_RESET_ON_RESUME		BIT(5)
+-#define I2C_HID_QUIRK_BAD_INPUT_SIZE		BIT(6)
+-#define I2C_HID_QUIRK_NO_WAKEUP_AFTER_RESET	BIT(7)
++#define I2C_HID_QUIRK_NO_IRQ_AFTER_RESET	BIT(0)
++#define I2C_HID_QUIRK_BOGUS_IRQ			BIT(1)
++#define I2C_HID_QUIRK_RESET_ON_RESUME		BIT(2)
++#define I2C_HID_QUIRK_BAD_INPUT_SIZE		BIT(3)
++#define I2C_HID_QUIRK_NO_WAKEUP_AFTER_RESET	BIT(4)
++#define I2C_HID_QUIRK_NO_SLEEP_ON_SUSPEND	BIT(5)
+ 
+ /* Command opcodes */
+ #define I2C_HID_OPCODE_RESET			0x01
+@@ -119,8 +119,6 @@ static const struct i2c_hid_quirks {
+ 	__u16 idProduct;
+ 	__u32 quirks;
+ } i2c_hid_quirks[] = {
+-	{ USB_VENDOR_ID_WEIDA, HID_ANY_ID,
+-		I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV },
+ 	{ I2C_VENDOR_ID_HANTICK, I2C_PRODUCT_ID_HANTICK_5288,
+ 		I2C_HID_QUIRK_NO_IRQ_AFTER_RESET },
+ 	{ I2C_VENDOR_ID_ITE, I2C_DEVICE_ID_ITE_VOYO_WINPAD_A15,
+@@ -133,6 +131,8 @@ static const struct i2c_hid_quirks {
+ 		 I2C_HID_QUIRK_RESET_ON_RESUME },
+ 	{ USB_VENDOR_ID_ITE, I2C_DEVICE_ID_ITE_LENOVO_LEGION_Y720,
+ 		I2C_HID_QUIRK_BAD_INPUT_SIZE },
++	{ I2C_VENDOR_ID_CIRQUE, I2C_PRODUCT_ID_CIRQUE_1063,
++		I2C_HID_QUIRK_NO_SLEEP_ON_SUSPEND },
+ 	/*
+ 	 * Sending the wakeup after reset actually break ELAN touchscreen controller
+ 	 */
+@@ -389,8 +389,7 @@ static int i2c_hid_set_power(struct i2c_hid *ihid, int power_state)
+ 	 * The call will get a return value (EREMOTEIO) but device will be
+ 	 * triggered and activated. After that, it goes like a normal device.
+ 	 */
+-	if (power_state == I2C_HID_PWR_ON &&
+-	    ihid->quirks & I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV) {
++	if (power_state == I2C_HID_PWR_ON) {
+ 		ret = i2c_hid_set_power_command(ihid, I2C_HID_PWR_ON);
+ 
+ 		/* Device was already activated */
+@@ -949,7 +948,8 @@ static int i2c_hid_core_suspend(struct i2c_hid *ihid, bool force_poweroff)
+ 		return ret;
+ 
+ 	/* Save some power */
+-	i2c_hid_set_power(ihid, I2C_HID_PWR_SLEEP);
++	if (!(ihid->quirks & I2C_HID_QUIRK_NO_SLEEP_ON_SUSPEND))
++		i2c_hid_set_power(ihid, I2C_HID_PWR_SLEEP);
+ 
+ 	disable_irq(client->irq);
+ 
+diff --git a/drivers/hid/intel-ish-hid/ishtp-fw-loader.c b/drivers/hid/intel-ish-hid/ishtp-fw-loader.c
+index 16aa030af8453c..983be15fedcc92 100644
+--- a/drivers/hid/intel-ish-hid/ishtp-fw-loader.c
++++ b/drivers/hid/intel-ish-hid/ishtp-fw-loader.c
+@@ -635,7 +635,7 @@ static int ish_fw_xfer_direct_dma(struct ishtp_cl_data *client_data,
+ 				  const struct firmware *fw,
+ 				  const struct shim_fw_info fw_info)
+ {
+-	int rv;
++	int rv = 0;
+ 	void *dma_buf;
+ 	dma_addr_t dma_buf_phy;
+ 	u32 fragment_offset, fragment_size, payload_max_size;
+diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
+index ec38c88921589e..a4c361b6619c16 100644
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -174,6 +174,7 @@ config SENSORS_ADM9240
+ 	tristate "Analog Devices ADM9240 and compatibles"
+ 	depends on I2C
+ 	select HWMON_VID
++	select REGMAP_I2C
+ 	help
+ 	  If you say yes here you get support for Analog Devices ADM9240,
+ 	  Dallas DS1780, National Semiconductor LM81 sensor chips.
+@@ -235,6 +236,7 @@ config SENSORS_ADT7462
+ config SENSORS_ADT7470
+ 	tristate "Analog Devices ADT7470"
+ 	depends on I2C
++	select REGMAP_I2C
+ 	help
+ 	  If you say yes here you get support for the Analog Devices
+ 	  ADT7470 temperature monitoring chips.
+@@ -1200,6 +1202,7 @@ config SENSORS_MAX31790
+ config SENSORS_MC34VR500
+ 	tristate "NXP MC34VR500 hardware monitoring driver"
+ 	depends on I2C
++	select REGMAP_I2C
+ 	help
+ 	  If you say yes here you get support for the temperature and input
+ 	  voltage sensors of the NXP MC34VR500.
+@@ -2137,6 +2140,7 @@ config SENSORS_TMP464
+ config SENSORS_TMP513
+ 	tristate "Texas Instruments TMP513 and compatibles"
+ 	depends on I2C
++	select REGMAP_I2C
+ 	help
+ 	  If you say yes here you get support for Texas Instruments TMP512,
+ 	  and TMP513 temperature and power supply sensor chips.
+diff --git a/drivers/hwmon/intel-m10-bmc-hwmon.c b/drivers/hwmon/intel-m10-bmc-hwmon.c
+index ca2dff15892515..96397ae6ff18fc 100644
+--- a/drivers/hwmon/intel-m10-bmc-hwmon.c
++++ b/drivers/hwmon/intel-m10-bmc-hwmon.c
+@@ -358,7 +358,7 @@ static const struct m10bmc_sdata n6000bmc_temp_tbl[] = {
+ 	{ 0x4f0, 0x4f4, 0x4f8, 0x52c, 0x0, 500, "Board Top Near FPGA Temperature" },
+ 	{ 0x4fc, 0x500, 0x504, 0x52c, 0x0, 500, "Board Bottom Near CVL Temperature" },
+ 	{ 0x508, 0x50c, 0x510, 0x52c, 0x0, 500, "Board Top East Near VRs Temperature" },
+-	{ 0x514, 0x518, 0x51c, 0x52c, 0x0, 500, "Columbiaville Die Temperature" },
++	{ 0x514, 0x518, 0x51c, 0x52c, 0x0, 500, "CVL Die Temperature" },
+ 	{ 0x520, 0x524, 0x528, 0x52c, 0x0, 500, "Board Rear Side Temperature" },
+ 	{ 0x530, 0x534, 0x538, 0x52c, 0x0, 500, "Board Front Side Temperature" },
+ 	{ 0x53c, 0x540, 0x544, 0x0, 0x0, 500, "QSFP1 Case Temperature" },
+diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
+index ae0f454c305d63..c906731c6c2d3e 100644
+--- a/drivers/hwmon/k10temp.c
++++ b/drivers/hwmon/k10temp.c
+@@ -545,6 +545,7 @@ static const struct pci_device_id k10temp_id_table[] = {
+ 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) },
+ 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) },
+ 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) },
++	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M60H_DF_F3) },
+ 	{ PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },
+ 	{}
+ };
+diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
+index 3410add34aad28..2b8bcd121ffa5d 100644
+--- a/drivers/i2c/busses/i2c-i801.c
++++ b/drivers/i2c/busses/i2c-i801.c
+@@ -1754,8 +1754,15 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
+ 
+ 	i801_add_tco(priv);
+ 
++	/*
++	 * adapter.name is used by platform code to find the main I801 adapter
++	 * to instantiante i2c_clients, do not change.
++	 */
+ 	snprintf(priv->adapter.name, sizeof(priv->adapter.name),
+-		"SMBus I801 adapter at %04lx", priv->smba);
++		 "SMBus %s adapter at %04lx",
++		 (priv->features & FEATURE_IDF) ? "I801 IDF" : "I801",
++		 priv->smba);
++
+ 	err = i2c_add_adapter(&priv->adapter);
+ 	if (err) {
+ 		platform_device_unregister(priv->tco_pdev);
+diff --git a/drivers/i3c/master/i3c-master-cdns.c b/drivers/i3c/master/i3c-master-cdns.c
+index fa5aaaf4461814..d8426847c2837b 100644
+--- a/drivers/i3c/master/i3c-master-cdns.c
++++ b/drivers/i3c/master/i3c-master-cdns.c
+@@ -1666,6 +1666,7 @@ static void cdns_i3c_master_remove(struct platform_device *pdev)
+ {
+ 	struct cdns_i3c_master *master = platform_get_drvdata(pdev);
+ 
++	cancel_work_sync(&master->hj_work);
+ 	i3c_master_unregister(&master->base);
+ 
+ 	clk_disable_unprepare(master->sysclk);
+diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
+index 674344eb8e2f48..58befbaaf0ad54 100644
+--- a/drivers/infiniband/core/mad.c
++++ b/drivers/infiniband/core/mad.c
+@@ -2616,14 +2616,16 @@ static int retry_send(struct ib_mad_send_wr_private *mad_send_wr)
+ 
+ static void timeout_sends(struct work_struct *work)
+ {
++	struct ib_mad_send_wr_private *mad_send_wr, *n;
+ 	struct ib_mad_agent_private *mad_agent_priv;
+-	struct ib_mad_send_wr_private *mad_send_wr;
+ 	struct ib_mad_send_wc mad_send_wc;
++	struct list_head local_list;
+ 	unsigned long flags, delay;
+ 
+ 	mad_agent_priv = container_of(work, struct ib_mad_agent_private,
+ 				      timed_work.work);
+ 	mad_send_wc.vendor_err = 0;
++	INIT_LIST_HEAD(&local_list);
+ 
+ 	spin_lock_irqsave(&mad_agent_priv->lock, flags);
+ 	while (!list_empty(&mad_agent_priv->wait_list)) {
+@@ -2641,13 +2643,16 @@ static void timeout_sends(struct work_struct *work)
+ 			break;
+ 		}
+ 
+-		list_del(&mad_send_wr->agent_list);
++		list_del_init(&mad_send_wr->agent_list);
+ 		if (mad_send_wr->status == IB_WC_SUCCESS &&
+ 		    !retry_send(mad_send_wr))
+ 			continue;
+ 
+-		spin_unlock_irqrestore(&mad_agent_priv->lock, flags);
++		list_add_tail(&mad_send_wr->agent_list, &local_list);
++	}
++	spin_unlock_irqrestore(&mad_agent_priv->lock, flags);
+ 
++	list_for_each_entry_safe(mad_send_wr, n, &local_list, agent_list) {
+ 		if (mad_send_wr->status == IB_WC_SUCCESS)
+ 			mad_send_wc.status = IB_WC_RESP_TIMEOUT_ERR;
+ 		else
+@@ -2655,11 +2660,8 @@ static void timeout_sends(struct work_struct *work)
+ 		mad_send_wc.send_buf = &mad_send_wr->send_buf;
+ 		mad_agent_priv->agent.send_handler(&mad_agent_priv->agent,
+ 						   &mad_send_wc);
+-
+ 		deref_mad_agent(mad_agent_priv);
+-		spin_lock_irqsave(&mad_agent_priv->lock, flags);
+ 	}
+-	spin_unlock_irqrestore(&mad_agent_priv->lock, flags);
+ }
+ 
+ /*
+diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c
+index a524181f34df95..3a4605fda6d57e 100644
+--- a/drivers/infiniband/hw/mlx5/odp.c
++++ b/drivers/infiniband/hw/mlx5/odp.c
+@@ -733,24 +733,31 @@ static int pagefault_dmabuf_mr(struct mlx5_ib_mr *mr, size_t bcnt,
+  *  >0: Number of pages mapped
+  */
+ static int pagefault_mr(struct mlx5_ib_mr *mr, u64 io_virt, size_t bcnt,
+-			u32 *bytes_mapped, u32 flags)
++			u32 *bytes_mapped, u32 flags, bool permissive_fault)
+ {
+ 	struct ib_umem_odp *odp = to_ib_umem_odp(mr->umem);
+ 
+-	if (unlikely(io_virt < mr->ibmr.iova))
++	if (unlikely(io_virt < mr->ibmr.iova) && !permissive_fault)
+ 		return -EFAULT;
+ 
+ 	if (mr->umem->is_dmabuf)
+ 		return pagefault_dmabuf_mr(mr, bcnt, bytes_mapped, flags);
+ 
+ 	if (!odp->is_implicit_odp) {
++		u64 offset = io_virt < mr->ibmr.iova ? 0 : io_virt - mr->ibmr.iova;
+ 		u64 user_va;
+ 
+-		if (check_add_overflow(io_virt - mr->ibmr.iova,
+-				       (u64)odp->umem.address, &user_va))
++		if (check_add_overflow(offset, (u64)odp->umem.address,
++				       &user_va))
+ 			return -EFAULT;
+-		if (unlikely(user_va >= ib_umem_end(odp) ||
+-			     ib_umem_end(odp) - user_va < bcnt))
++
++		if (permissive_fault) {
++			if (user_va < ib_umem_start(odp))
++				user_va = ib_umem_start(odp);
++			if ((user_va + bcnt) > ib_umem_end(odp))
++				bcnt = ib_umem_end(odp) - user_va;
++		} else if (unlikely(user_va >= ib_umem_end(odp) ||
++				    ib_umem_end(odp) - user_va < bcnt))
+ 			return -EFAULT;
+ 		return pagefault_real_mr(mr, odp, user_va, bcnt, bytes_mapped,
+ 					 flags);
+@@ -857,7 +864,7 @@ static int pagefault_single_data_segment(struct mlx5_ib_dev *dev,
+ 	case MLX5_MKEY_MR:
+ 		mr = container_of(mmkey, struct mlx5_ib_mr, mmkey);
+ 
+-		ret = pagefault_mr(mr, io_virt, bcnt, bytes_mapped, 0);
++		ret = pagefault_mr(mr, io_virt, bcnt, bytes_mapped, 0, false);
+ 		if (ret < 0)
+ 			goto end;
+ 
+@@ -1710,7 +1717,7 @@ static void mlx5_ib_prefetch_mr_work(struct work_struct *w)
+ 	for (i = 0; i < work->num_sge; ++i) {
+ 		ret = pagefault_mr(work->frags[i].mr, work->frags[i].io_virt,
+ 				   work->frags[i].length, &bytes_mapped,
+-				   work->pf_flags);
++				   work->pf_flags, false);
+ 		if (ret <= 0)
+ 			continue;
+ 		mlx5_update_odp_stats(work->frags[i].mr, prefetch, ret);
+@@ -1761,7 +1768,7 @@ static int mlx5_ib_prefetch_sg_list(struct ib_pd *pd,
+ 		if (IS_ERR(mr))
+ 			return PTR_ERR(mr);
+ 		ret = pagefault_mr(mr, sg_list[i].addr, sg_list[i].length,
+-				   &bytes_mapped, pf_flags);
++				   &bytes_mapped, pf_flags, false);
+ 		if (ret < 0) {
+ 			mlx5r_deref_odp_mkey(&mr->mmkey);
+ 			return ret;
+diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
+index 94ac99a4f696e7..758a3d9c2844d1 100644
+--- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c
++++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
+@@ -931,12 +931,11 @@ static void rtrs_srv_info_req_done(struct ib_cq *cq, struct ib_wc *wc)
+ 	if (err)
+ 		goto close;
+ 
+-out:
+ 	rtrs_iu_free(iu, srv_path->s.dev->ib_dev, 1);
+ 	return;
+ close:
++	rtrs_iu_free(iu, srv_path->s.dev->ib_dev, 1);
+ 	close_path(srv_path);
+-	goto out;
+ }
+ 
+ static int post_recv_info_req(struct rtrs_srv_con *con)
+@@ -987,6 +986,16 @@ static int post_recv_path(struct rtrs_srv_path *srv_path)
+ 			q_size = SERVICE_CON_QUEUE_DEPTH;
+ 		else
+ 			q_size = srv->queue_depth;
++		if (srv_path->state != RTRS_SRV_CONNECTING) {
++			rtrs_err(s, "Path state invalid. state %s\n",
++				 rtrs_srv_state_str(srv_path->state));
++			return -EIO;
++		}
++
++		if (!srv_path->s.con[cid]) {
++			rtrs_err(s, "Conn not set for %d\n", cid);
++			return -EIO;
++		}
+ 
+ 		err = post_recv_io(to_srv_con(srv_path->s.con[cid]), q_size);
+ 		if (err) {
+diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
+index aa32371f04af6c..ef9ea295f9e035 100644
+--- a/drivers/input/rmi4/rmi_driver.c
++++ b/drivers/input/rmi4/rmi_driver.c
+@@ -978,12 +978,12 @@ static int rmi_driver_remove(struct device *dev)
+ 
+ 	rmi_disable_irq(rmi_dev, false);
+ 
+-	irq_domain_remove(data->irqdomain);
+-	data->irqdomain = NULL;
+-
+ 	rmi_f34_remove_sysfs(rmi_dev);
+ 	rmi_free_function_list(rmi_dev);
+ 
++	irq_domain_remove(data->irqdomain);
++	data->irqdomain = NULL;
++
+ 	return 0;
+ }
+ 
+diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c
+index 468191438849ea..29bfc2bf796b65 100644
+--- a/drivers/media/common/videobuf2/videobuf2-core.c
++++ b/drivers/media/common/videobuf2/videobuf2-core.c
+@@ -302,6 +302,10 @@ static void __vb2_plane_dmabuf_put(struct vb2_buffer *vb, struct vb2_plane *p)
+ 	p->mem_priv = NULL;
+ 	p->dbuf = NULL;
+ 	p->dbuf_mapped = 0;
++	p->bytesused = 0;
++	p->length = 0;
++	p->m.fd = 0;
++	p->data_offset = 0;
+ }
+ 
+ /*
+@@ -1296,10 +1300,6 @@ static int __prepare_dmabuf(struct vb2_buffer *vb)
+ 
+ 		/* Release previously acquired memory if present */
+ 		__vb2_plane_dmabuf_put(vb, &vb->planes[plane]);
+-		vb->planes[plane].bytesused = 0;
+-		vb->planes[plane].length = 0;
+-		vb->planes[plane].m.fd = 0;
+-		vb->planes[plane].data_offset = 0;
+ 
+ 		/* Acquire each plane's memory */
+ 		mem_priv = call_ptr_memop(attach_dmabuf,
+diff --git a/drivers/mfd/intel_soc_pmic_chtwc.c b/drivers/mfd/intel_soc_pmic_chtwc.c
+index 7fce3ef7ab453d..2a83f540d4c9d8 100644
+--- a/drivers/mfd/intel_soc_pmic_chtwc.c
++++ b/drivers/mfd/intel_soc_pmic_chtwc.c
+@@ -178,7 +178,6 @@ static const struct dmi_system_id cht_wc_model_dmi_ids[] = {
+ 		.driver_data = (void *)(long)INTEL_CHT_WC_LENOVO_YT3_X90,
+ 		.matches = {
+ 			DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "CHERRYVIEW D1 PLATFORM"),
+ 			DMI_MATCH(DMI_PRODUCT_VERSION, "Blade3-10A-001"),
+ 		},
+ 	},
+diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
+index ae1c4dc35fe336..4a2c9a9134d8c8 100644
+--- a/drivers/net/dsa/b53/b53_common.c
++++ b/drivers/net/dsa/b53/b53_common.c
+@@ -27,6 +27,7 @@
+ #include <linux/phylink.h>
+ #include <linux/etherdevice.h>
+ #include <linux/if_bridge.h>
++#include <linux/if_vlan.h>
+ #include <net/dsa.h>
+ 
+ #include "b53_regs.h"
+@@ -224,6 +225,9 @@ static const struct b53_mib_desc b53_mibs_58xx[] = {
+ 
+ #define B53_MIBS_58XX_SIZE	ARRAY_SIZE(b53_mibs_58xx)
+ 
++#define B53_MAX_MTU_25		(1536 - ETH_HLEN - VLAN_HLEN - ETH_FCS_LEN)
++#define B53_MAX_MTU		(9720 - ETH_HLEN - VLAN_HLEN - ETH_FCS_LEN)
++
+ static int b53_do_vlan_op(struct b53_device *dev, u8 op)
+ {
+ 	unsigned int i;
+@@ -2263,20 +2267,25 @@ static int b53_change_mtu(struct dsa_switch *ds, int port, int mtu)
+ 	bool allow_10_100;
+ 
+ 	if (is5325(dev) || is5365(dev))
+-		return -EOPNOTSUPP;
++		return 0;
+ 
+ 	if (!dsa_is_cpu_port(ds, port))
+ 		return 0;
+ 
+-	enable_jumbo = (mtu >= JMS_MIN_SIZE);
+-	allow_10_100 = (dev->chip_id == BCM583XX_DEVICE_ID);
++	enable_jumbo = (mtu > ETH_DATA_LEN);
++	allow_10_100 = !is63xx(dev);
+ 
+ 	return b53_set_jumbo(dev, enable_jumbo, allow_10_100);
+ }
+ 
+ static int b53_get_max_mtu(struct dsa_switch *ds, int port)
+ {
+-	return JMS_MAX_SIZE;
++	struct b53_device *dev = ds->priv;
++
++	if (is5325(dev) || is5365(dev))
++		return B53_MAX_MTU_25;
++
++	return B53_MAX_MTU;
+ }
+ 
+ static const struct dsa_switch_ops b53_switch_ops = {
+diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c
+index 24ef219e6f5657..8b05a70c0ff3f9 100644
+--- a/drivers/net/dsa/lan9303-core.c
++++ b/drivers/net/dsa/lan9303-core.c
+@@ -6,6 +6,7 @@
+ #include <linux/module.h>
+ #include <linux/gpio/consumer.h>
+ #include <linux/regmap.h>
++#include <linux/iopoll.h>
+ #include <linux/mutex.h>
+ #include <linux/mii.h>
+ #include <linux/of.h>
+@@ -839,6 +840,8 @@ static void lan9303_handle_reset(struct lan9303 *chip)
+ 	if (!chip->reset_gpio)
+ 		return;
+ 
++	gpiod_set_value_cansleep(chip->reset_gpio, 1);
++
+ 	if (chip->reset_duration != 0)
+ 		msleep(chip->reset_duration);
+ 
+@@ -864,8 +867,34 @@ static int lan9303_disable_processing(struct lan9303 *chip)
+ static int lan9303_check_device(struct lan9303 *chip)
+ {
+ 	int ret;
++	int err;
+ 	u32 reg;
+ 
++	/* In I2C-managed configurations this polling loop will clash with
++	 * switch's reading of EEPROM right after reset and this behaviour is
++	 * not configurable. While lan9303_read() already has quite long retry
++	 * timeout, seems not all cases are being detected as arbitration error.
++	 *
++	 * According to datasheet, EEPROM loader has 30ms timeout (in case of
++	 * missing EEPROM).
++	 *
++	 * Loading of the largest supported EEPROM is expected to take at least
++	 * 5.9s.
++	 */
++	err = read_poll_timeout(lan9303_read, ret,
++				!ret && reg & LAN9303_HW_CFG_READY,
++				20000, 6000000, false,
++				chip->regmap, LAN9303_HW_CFG, &reg);
++	if (ret) {
++		dev_err(chip->dev, "failed to read HW_CFG reg: %pe\n",
++			ERR_PTR(ret));
++		return ret;
++	}
++	if (err) {
++		dev_err(chip->dev, "HW_CFG not ready: 0x%08x\n", reg);
++		return err;
++	}
++
+ 	ret = lan9303_read(chip->regmap, LAN9303_CHIP_REV, &reg);
+ 	if (ret) {
+ 		dev_err(chip->dev, "failed to read chip revision register: %d\n",
+diff --git a/drivers/net/ethernet/adi/adin1110.c b/drivers/net/ethernet/adi/adin1110.c
+index d7c274af6d4dae..3c26176316a38b 100644
+--- a/drivers/net/ethernet/adi/adin1110.c
++++ b/drivers/net/ethernet/adi/adin1110.c
+@@ -318,11 +318,11 @@ static int adin1110_read_fifo(struct adin1110_port_priv *port_priv)
+ 	 * from the  ADIN1110 frame header.
+ 	 */
+ 	if (frame_size < ADIN1110_FRAME_HEADER_LEN + ADIN1110_FEC_LEN)
+-		return ret;
++		return -EINVAL;
+ 
+ 	round_len = adin1110_round_len(frame_size);
+ 	if (round_len < 0)
+-		return ret;
++		return -EINVAL;
+ 
+ 	frame_size_no_fcs = frame_size - ADIN1110_FRAME_HEADER_LEN - ADIN1110_FEC_LEN;
+ 	memset(priv->data, 0, ADIN1110_RD_HEADER_LEN);
+diff --git a/drivers/net/ethernet/amd/pds_core/main.c b/drivers/net/ethernet/amd/pds_core/main.c
+index 6d589ac532a3d8..eddbf0acdde77f 100644
+--- a/drivers/net/ethernet/amd/pds_core/main.c
++++ b/drivers/net/ethernet/amd/pds_core/main.c
+@@ -451,6 +451,9 @@ static void pdsc_remove(struct pci_dev *pdev)
+ 
+ static void pdsc_stop_health_thread(struct pdsc *pdsc)
+ {
++	if (pdsc->pdev->is_virtfn)
++		return;
++
+ 	timer_shutdown_sync(&pdsc->wdtimer);
+ 	if (pdsc->health_work.func)
+ 		cancel_work_sync(&pdsc->health_work);
+@@ -458,6 +461,9 @@ static void pdsc_stop_health_thread(struct pdsc *pdsc)
+ 
+ static void pdsc_restart_health_thread(struct pdsc *pdsc)
+ {
++	if (pdsc->pdev->is_virtfn)
++		return;
++
+ 	timer_setup(&pdsc->wdtimer, pdsc_wdtimer_cb, 0);
+ 	mod_timer(&pdsc->wdtimer, jiffies + 1);
+ }
+diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c
+index f69d974a23a1f5..5af98fba74803e 100644
+--- a/drivers/net/ethernet/cortina/gemini.c
++++ b/drivers/net/ethernet/cortina/gemini.c
+@@ -79,8 +79,8 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
+ #define GMAC0_IRQ4_8 (GMAC0_MIB_INT_BIT | GMAC0_RX_OVERRUN_INT_BIT)
+ 
+ #define GMAC_OFFLOAD_FEATURES (NETIF_F_SG | NETIF_F_IP_CSUM | \
+-		NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | \
+-		NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6)
++			       NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | \
++			       NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6)
+ 
+ /**
+  * struct gmac_queue_page - page buffer per-page info
+@@ -1148,24 +1148,26 @@ static int gmac_map_tx_bufs(struct net_device *netdev, struct sk_buff *skb,
+ 	struct gmac_txdesc *txd;
+ 	skb_frag_t *skb_frag;
+ 	dma_addr_t mapping;
+-	unsigned short mtu;
+ 	void *buffer;
++	u16 mss;
+ 	int ret;
+ 
+-	mtu  = ETH_HLEN;
+-	mtu += netdev->mtu;
+-	if (skb->protocol == htons(ETH_P_8021Q))
+-		mtu += VLAN_HLEN;
+-
+ 	word1 = skb->len;
+ 	word3 = SOF_BIT;
+ 
+-	if (word1 > mtu) {
++	mss = skb_shinfo(skb)->gso_size;
++	if (mss) {
++		/* This means we are dealing with TCP and skb->len is the
++		 * sum total of all the segments. The TSO will deal with
++		 * chopping this up for us.
++		 */
++		/* The accelerator needs the full frame size here */
++		mss += skb_tcp_all_headers(skb);
++		netdev_dbg(netdev, "segment offloading mss = %04x len=%04x\n",
++			   mss, skb->len);
+ 		word1 |= TSS_MTU_ENABLE_BIT;
+-		word3 |= mtu;
+-	}
+-
+-	if (skb->len >= ETH_FRAME_LEN) {
++		word3 |= mss;
++	} else if (skb->len >= ETH_FRAME_LEN) {
+ 		/* Hardware offloaded checksumming isn't working on frames
+ 		 * bigger than 1514 bytes. A hypothesis about this is that the
+ 		 * checksum buffer is only 1518 bytes, so when the frames get
+@@ -1180,7 +1182,9 @@ static int gmac_map_tx_bufs(struct net_device *netdev, struct sk_buff *skb,
+ 				return ret;
+ 		}
+ 		word1 |= TSS_BYPASS_BIT;
+-	} else if (skb->ip_summed == CHECKSUM_PARTIAL) {
++	}
++
++	if (skb->ip_summed == CHECKSUM_PARTIAL) {
+ 		int tcp = 0;
+ 
+ 		/* We do not switch off the checksumming on non TCP/UDP
+diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
+index 81e3173521589d..e8d9a0eba4d6b5 100644
+--- a/drivers/net/ethernet/freescale/fec_main.c
++++ b/drivers/net/ethernet/freescale/fec_main.c
+@@ -1058,7 +1058,8 @@ fec_restart(struct net_device *ndev)
+ 	u32 rcntl = OPT_FRAME_SIZE | 0x04;
+ 	u32 ecntl = FEC_ECR_ETHEREN;
+ 
+-	fec_ptp_save_state(fep);
++	if (fep->bufdesc_ex)
++		fec_ptp_save_state(fep);
+ 
+ 	/* Whack a reset.  We should wait for this.
+ 	 * For i.MX6SX SOC, enet use AXI bus, we use disable MAC
+@@ -1321,7 +1322,8 @@ fec_stop(struct net_device *ndev)
+ 			netdev_err(ndev, "Graceful transmit stop did not complete!\n");
+ 	}
+ 
+-	fec_ptp_save_state(fep);
++	if (fep->bufdesc_ex)
++		fec_ptp_save_state(fep);
+ 
+ 	/* Whack a reset.  We should wait for this.
+ 	 * For i.MX6SX SOC, enet use AXI bus, we use disable MAC
+diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c
+index c3236b59e7e934..3578b7d720c068 100644
+--- a/drivers/net/ethernet/ibm/emac/mal.c
++++ b/drivers/net/ethernet/ibm/emac/mal.c
+@@ -578,7 +578,7 @@ static int mal_probe(struct platform_device *ofdev)
+ 		printk(KERN_ERR "%pOF: Support for 405EZ not enabled!\n",
+ 				ofdev->dev.of_node);
+ 		err = -ENODEV;
+-		goto fail;
++		goto fail_unmap;
+ #endif
+ 	}
+ 
+diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
+index 4b6e7536170abc..fc8ed38aa09554 100644
+--- a/drivers/net/ethernet/intel/e1000e/hw.h
++++ b/drivers/net/ethernet/intel/e1000e/hw.h
+@@ -108,8 +108,8 @@ struct e1000_hw;
+ #define E1000_DEV_ID_PCH_RPL_I219_V22		0x0DC8
+ #define E1000_DEV_ID_PCH_MTP_I219_LM18		0x550A
+ #define E1000_DEV_ID_PCH_MTP_I219_V18		0x550B
+-#define E1000_DEV_ID_PCH_MTP_I219_LM19		0x550C
+-#define E1000_DEV_ID_PCH_MTP_I219_V19		0x550D
++#define E1000_DEV_ID_PCH_ADP_I219_LM19		0x550C
++#define E1000_DEV_ID_PCH_ADP_I219_V19		0x550D
+ #define E1000_DEV_ID_PCH_LNP_I219_LM20		0x550E
+ #define E1000_DEV_ID_PCH_LNP_I219_V20		0x550F
+ #define E1000_DEV_ID_PCH_LNP_I219_LM21		0x5510
+diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
+index f9e94be36e97f2..ce227b56cf7243 100644
+--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
++++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
+@@ -1108,6 +1108,46 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link)
+ 	return 0;
+ }
+ 
++/**
++ *  e1000e_force_smbus - Force interfaces to transition to SMBUS mode.
++ *  @hw: pointer to the HW structure
++ *
++ *  Force the MAC and the PHY to SMBUS mode. Assumes semaphore already
++ *  acquired.
++ *
++ * Return: 0 on success, negative errno on failure.
++ **/
++static s32 e1000e_force_smbus(struct e1000_hw *hw)
++{
++	u16 smb_ctrl = 0;
++	u32 ctrl_ext;
++	s32 ret_val;
++
++	/* Switching PHY interface always returns MDI error
++	 * so disable retry mechanism to avoid wasting time
++	 */
++	e1000e_disable_phy_retry(hw);
++
++	/* Force SMBus mode in the PHY */
++	ret_val = e1000_read_phy_reg_hv_locked(hw, CV_SMB_CTRL, &smb_ctrl);
++	if (ret_val) {
++		e1000e_enable_phy_retry(hw);
++		return ret_val;
++	}
++
++	smb_ctrl |= CV_SMB_CTRL_FORCE_SMBUS;
++	e1000_write_phy_reg_hv_locked(hw, CV_SMB_CTRL, smb_ctrl);
++
++	e1000e_enable_phy_retry(hw);
++
++	/* Force SMBus mode in the MAC */
++	ctrl_ext = er32(CTRL_EXT);
++	ctrl_ext |= E1000_CTRL_EXT_FORCE_SMBUS;
++	ew32(CTRL_EXT, ctrl_ext);
++
++	return 0;
++}
++
+ /**
+  *  e1000_enable_ulp_lpt_lp - configure Ultra Low Power mode for LynxPoint-LP
+  *  @hw: pointer to the HW structure
+@@ -1165,6 +1205,14 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx)
+ 	if (ret_val)
+ 		goto out;
+ 
++	if (hw->mac.type != e1000_pch_mtp) {
++		ret_val = e1000e_force_smbus(hw);
++		if (ret_val) {
++			e_dbg("Failed to force SMBUS: %d\n", ret_val);
++			goto release;
++		}
++	}
++
+ 	/* Si workaround for ULP entry flow on i127/rev6 h/w.  Enable
+ 	 * LPLU and disable Gig speed when entering ULP
+ 	 */
+@@ -1225,6 +1273,13 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx)
+ 	}
+ 
+ release:
++	if (hw->mac.type == e1000_pch_mtp) {
++		ret_val = e1000e_force_smbus(hw);
++		if (ret_val)
++			e_dbg("Failed to force SMBUS over MTL system: %d\n",
++			      ret_val);
++	}
++
+ 	hw->phy.ops.release(hw);
+ out:
+ 	if (ret_val)
+diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
+index d377a286c0e1bf..721c098f2bb1b2 100644
+--- a/drivers/net/ethernet/intel/e1000e/netdev.c
++++ b/drivers/net/ethernet/intel/e1000e/netdev.c
+@@ -6623,7 +6623,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
+ 	struct e1000_hw *hw = &adapter->hw;
+ 	u32 ctrl, ctrl_ext, rctl, status, wufc;
+ 	int retval = 0;
+-	u16 smb_ctrl;
+ 
+ 	/* Runtime suspend should only enable wakeup for link changes */
+ 	if (runtime)
+@@ -6701,23 +6700,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
+ 				goto skip_phy_configurations;
+ 			}
+ 		}
+-
+-		/* Force SMBUS to allow WOL */
+-		/* Switching PHY interface always returns MDI error
+-		 * so disable retry mechanism to avoid wasting time
+-		 */
+-		e1000e_disable_phy_retry(hw);
+-
+-		e1e_rphy(hw, CV_SMB_CTRL, &smb_ctrl);
+-		smb_ctrl |= CV_SMB_CTRL_FORCE_SMBUS;
+-		e1e_wphy(hw, CV_SMB_CTRL, smb_ctrl);
+-
+-		e1000e_enable_phy_retry(hw);
+-
+-		/* Force SMBus mode in MAC */
+-		ctrl_ext = er32(CTRL_EXT);
+-		ctrl_ext |= E1000_CTRL_EXT_FORCE_SMBUS;
+-		ew32(CTRL_EXT, ctrl_ext);
+ 	}
+ 
+ 	/* Ensure that the appropriate bits are set in LPI_CTRL
+@@ -7917,10 +7899,10 @@ static const struct pci_device_id e1000_pci_tbl[] = {
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V17), board_pch_adp },
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM22), board_pch_adp },
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V22), board_pch_adp },
++	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM19), board_pch_adp },
++	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V19), board_pch_adp },
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM18), board_pch_mtp },
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V18), board_pch_mtp },
+-	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM19), board_pch_mtp },
+-	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V19), board_pch_mtp },
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM20), board_pch_mtp },
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V20), board_pch_mtp },
+ 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM21), board_pch_mtp },
+diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
+index 18a1c3b6d72c5e..c8f35d4de271ad 100644
+--- a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
++++ b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
+@@ -5,6 +5,7 @@
+ #define _I40E_ADMINQ_CMD_H_
+ 
+ #include <linux/bits.h>
++#include <linux/types.h>
+ 
+ /* This header file defines the i40e Admin Queue commands and is shared between
+  * i40e Firmware and Software.
+diff --git a/drivers/net/ethernet/intel/i40e/i40e_diag.h b/drivers/net/ethernet/intel/i40e/i40e_diag.h
+index ece3a6b9a5c61e..ab20202a3da3ca 100644
+--- a/drivers/net/ethernet/intel/i40e/i40e_diag.h
++++ b/drivers/net/ethernet/intel/i40e/i40e_diag.h
+@@ -4,6 +4,7 @@
+ #ifndef _I40E_DIAG_H_
+ #define _I40E_DIAG_H_
+ 
++#include <linux/types.h>
+ #include "i40e_adminq_cmd.h"
+ 
+ /* forward-declare the HW struct for the compiler */
+diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
+index 1d241ebd04ec7c..80472aa1deba4e 100644
+--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
++++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
+@@ -1744,6 +1744,7 @@ struct i40e_mac_filter *i40e_add_mac_filter(struct i40e_vsi *vsi,
+ 	struct hlist_node *h;
+ 	int bkt;
+ 
++	lockdep_assert_held(&vsi->mac_filter_hash_lock);
+ 	if (vsi->info.pvid)
+ 		return i40e_add_filter(vsi, macaddr,
+ 				       le16_to_cpu(vsi->info.pvid));
+diff --git a/drivers/net/ethernet/intel/i40e/i40e_register.h b/drivers/net/ethernet/intel/i40e/i40e_register.h
+index 989c1868247338..d3c82ba3835a78 100644
+--- a/drivers/net/ethernet/intel/i40e/i40e_register.h
++++ b/drivers/net/ethernet/intel/i40e/i40e_register.h
+@@ -204,7 +204,7 @@
+ #define I40E_GLGEN_MSCA_OPCODE_SHIFT 26
+ #define I40E_GLGEN_MSCA_OPCODE_MASK(_i) I40E_MASK(_i, I40E_GLGEN_MSCA_OPCODE_SHIFT)
+ #define I40E_GLGEN_MSCA_STCODE_SHIFT 28
+-#define I40E_GLGEN_MSCA_STCODE_MASK I40E_MASK(0x1, I40E_GLGEN_MSCA_STCODE_SHIFT)
++#define I40E_GLGEN_MSCA_STCODE_MASK(_i) I40E_MASK(_i, I40E_GLGEN_MSCA_STCODE_SHIFT)
+ #define I40E_GLGEN_MSCA_MDICMD_SHIFT 30
+ #define I40E_GLGEN_MSCA_MDICMD_MASK I40E_MASK(0x1, I40E_GLGEN_MSCA_MDICMD_SHIFT)
+ #define I40E_GLGEN_MSCA_MDIINPROGEN_SHIFT 31
+diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
+index 4092f82bcfb12c..6e7cb2081ab37e 100644
+--- a/drivers/net/ethernet/intel/i40e/i40e_type.h
++++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
+@@ -40,11 +40,11 @@ typedef void (*I40E_ADMINQ_CALLBACK)(struct i40e_hw *, struct i40e_aq_desc *);
+ #define I40E_QTX_CTL_VM_QUEUE	0x1
+ #define I40E_QTX_CTL_PF_QUEUE	0x2
+ 
+-#define I40E_MDIO_CLAUSE22_STCODE_MASK		I40E_GLGEN_MSCA_STCODE_MASK
++#define I40E_MDIO_CLAUSE22_STCODE_MASK		I40E_GLGEN_MSCA_STCODE_MASK(1)
+ #define I40E_MDIO_CLAUSE22_OPCODE_WRITE_MASK	I40E_GLGEN_MSCA_OPCODE_MASK(1)
+ #define I40E_MDIO_CLAUSE22_OPCODE_READ_MASK	I40E_GLGEN_MSCA_OPCODE_MASK(2)
+ 
+-#define I40E_MDIO_CLAUSE45_STCODE_MASK		I40E_GLGEN_MSCA_STCODE_MASK
++#define I40E_MDIO_CLAUSE45_STCODE_MASK		I40E_GLGEN_MSCA_STCODE_MASK(0)
+ #define I40E_MDIO_CLAUSE45_OPCODE_ADDRESS_MASK	I40E_GLGEN_MSCA_OPCODE_MASK(0)
+ #define I40E_MDIO_CLAUSE45_OPCODE_WRITE_MASK	I40E_GLGEN_MSCA_OPCODE_MASK(1)
+ #define I40E_MDIO_CLAUSE45_OPCODE_READ_MASK	I40E_GLGEN_MSCA_OPCODE_MASK(3)
+diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+index 7d47a05274548d..d5509bc16d0d57 100644
+--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
++++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+@@ -2219,8 +2219,10 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg)
+ 		vfres->vsi_res[0].qset_handle
+ 					  = le16_to_cpu(vsi->info.qs_handle[0]);
+ 		if (!(vf->driver_caps & VIRTCHNL_VF_OFFLOAD_USO) && !vf->pf_set_mac) {
++			spin_lock_bh(&vsi->mac_filter_hash_lock);
+ 			i40e_del_mac_filter(vsi, vf->default_lan_addr.addr);
+ 			eth_zero_addr(vf->default_lan_addr.addr);
++			spin_unlock_bh(&vsi->mac_filter_hash_lock);
+ 		}
+ 		ether_addr_copy(vfres->vsi_res[0].default_mac_addr,
+ 				vf->default_lan_addr.addr);
+diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
+index 7b3ce30ba38fa0..f943964ec05ae7 100644
+--- a/drivers/net/ethernet/intel/ice/ice.h
++++ b/drivers/net/ethernet/intel/ice/ice.h
+@@ -518,7 +518,7 @@ enum ice_misc_thread_tasks {
+ 	ICE_MISC_THREAD_NBITS		/* must be last */
+ };
+ 
+-struct ice_switchdev_info {
++struct ice_eswitch {
+ 	struct ice_vsi *control_vsi;
+ 	struct ice_vsi *uplink_vsi;
+ 	struct ice_esw_br_offloads *br_offloads;
+@@ -631,7 +631,7 @@ struct ice_pf {
+ 	struct ice_link_default_override_tlv link_dflt_override;
+ 	struct ice_lag *lag; /* Link Aggregation information */
+ 
+-	struct ice_switchdev_info switchdev;
++	struct ice_eswitch eswitch;
+ 	struct ice_esw_br_port *br_port;
+ 
+ #define ICE_INVALID_AGG_NODE_ID		0
+@@ -838,7 +838,7 @@ static inline struct ice_vsi *ice_find_vsi(struct ice_pf *pf, u16 vsi_num)
+  */
+ static inline bool ice_is_switchdev_running(struct ice_pf *pf)
+ {
+-	return pf->switchdev.is_running;
++	return pf->eswitch.is_running;
+ }
+ 
+ #define ICE_FD_STAT_CTR_BLOCK_COUNT	256
+diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch.c b/drivers/net/ethernet/intel/ice/ice_eswitch.c
+index a655d499abfa85..e7f1e53314d768 100644
+--- a/drivers/net/ethernet/intel/ice/ice_eswitch.c
++++ b/drivers/net/ethernet/intel/ice/ice_eswitch.c
+@@ -16,12 +16,12 @@
+  * @vf: pointer to VF struct
+  *
+  * This function adds advanced rule that forwards packets with
+- * VF's VSI index to the corresponding switchdev ctrl VSI queue.
++ * VF's VSI index to the corresponding eswitch ctrl VSI queue.
+  */
+ static int
+ ice_eswitch_add_vf_sp_rule(struct ice_pf *pf, struct ice_vf *vf)
+ {
+-	struct ice_vsi *ctrl_vsi = pf->switchdev.control_vsi;
++	struct ice_vsi *ctrl_vsi = pf->eswitch.control_vsi;
+ 	struct ice_adv_rule_info rule_info = { 0 };
+ 	struct ice_adv_lkup_elem *list;
+ 	struct ice_hw *hw = &pf->hw;
+@@ -59,7 +59,7 @@ ice_eswitch_add_vf_sp_rule(struct ice_pf *pf, struct ice_vf *vf)
+  * @vf: pointer to the VF struct
+  *
+  * Delete the advanced rule that was used to forward packets with the VF's VSI
+- * index to the corresponding switchdev ctrl VSI queue.
++ * index to the corresponding eswitch ctrl VSI queue.
+  */
+ static void ice_eswitch_del_vf_sp_rule(struct ice_vf *vf)
+ {
+@@ -70,7 +70,7 @@ static void ice_eswitch_del_vf_sp_rule(struct ice_vf *vf)
+ }
+ 
+ /**
+- * ice_eswitch_setup_env - configure switchdev HW filters
++ * ice_eswitch_setup_env - configure eswitch HW filters
+  * @pf: pointer to PF struct
+  *
+  * This function adds HW filters configuration specific for switchdev
+@@ -78,18 +78,18 @@ static void ice_eswitch_del_vf_sp_rule(struct ice_vf *vf)
+  */
+ static int ice_eswitch_setup_env(struct ice_pf *pf)
+ {
+-	struct ice_vsi *uplink_vsi = pf->switchdev.uplink_vsi;
+-	struct net_device *uplink_netdev = uplink_vsi->netdev;
+-	struct ice_vsi *ctrl_vsi = pf->switchdev.control_vsi;
++	struct ice_vsi *uplink_vsi = pf->eswitch.uplink_vsi;
++	struct ice_vsi *ctrl_vsi = pf->eswitch.control_vsi;
++	struct net_device *netdev = uplink_vsi->netdev;
+ 	struct ice_vsi_vlan_ops *vlan_ops;
+ 	bool rule_added = false;
+ 
+ 	ice_remove_vsi_fltr(&pf->hw, uplink_vsi->idx);
+ 
+-	netif_addr_lock_bh(uplink_netdev);
+-	__dev_uc_unsync(uplink_netdev, NULL);
+-	__dev_mc_unsync(uplink_netdev, NULL);
+-	netif_addr_unlock_bh(uplink_netdev);
++	netif_addr_lock_bh(netdev);
++	__dev_uc_unsync(netdev, NULL);
++	__dev_mc_unsync(netdev, NULL);
++	netif_addr_unlock_bh(netdev);
+ 
+ 	if (ice_vsi_add_vlan_zero(uplink_vsi))
+ 		goto err_def_rx;
+@@ -132,10 +132,10 @@ static int ice_eswitch_setup_env(struct ice_pf *pf)
+ }
+ 
+ /**
+- * ice_eswitch_remap_rings_to_vectors - reconfigure rings of switchdev ctrl VSI
++ * ice_eswitch_remap_rings_to_vectors - reconfigure rings of eswitch ctrl VSI
+  * @pf: pointer to PF struct
+  *
+- * In switchdev number of allocated Tx/Rx rings is equal.
++ * In eswitch number of allocated Tx/Rx rings is equal.
+  *
+  * This function fills q_vectors structures associated with representor and
+  * move each ring pairs to port representor netdevs. Each port representor
+@@ -144,7 +144,7 @@ static int ice_eswitch_setup_env(struct ice_pf *pf)
+  */
+ static void ice_eswitch_remap_rings_to_vectors(struct ice_pf *pf)
+ {
+-	struct ice_vsi *vsi = pf->switchdev.control_vsi;
++	struct ice_vsi *vsi = pf->eswitch.control_vsi;
+ 	int q_id;
+ 
+ 	ice_for_each_txq(vsi, q_id) {
+@@ -189,7 +189,7 @@ static void ice_eswitch_remap_rings_to_vectors(struct ice_pf *pf)
+ /**
+  * ice_eswitch_release_reprs - clear PR VSIs configuration
+  * @pf: poiner to PF struct
+- * @ctrl_vsi: pointer to switchdev control VSI
++ * @ctrl_vsi: pointer to eswitch control VSI
+  */
+ static void
+ ice_eswitch_release_reprs(struct ice_pf *pf, struct ice_vsi *ctrl_vsi)
+@@ -223,7 +223,7 @@ ice_eswitch_release_reprs(struct ice_pf *pf, struct ice_vsi *ctrl_vsi)
+  */
+ static int ice_eswitch_setup_reprs(struct ice_pf *pf)
+ {
+-	struct ice_vsi *ctrl_vsi = pf->switchdev.control_vsi;
++	struct ice_vsi *ctrl_vsi = pf->eswitch.control_vsi;
+ 	int max_vsi_num = 0;
+ 	struct ice_vf *vf;
+ 	unsigned int bkt;
+@@ -359,7 +359,7 @@ ice_eswitch_port_start_xmit(struct sk_buff *skb, struct net_device *netdev)
+ }
+ 
+ /**
+- * ice_eswitch_set_target_vsi - set switchdev context in Tx context descriptor
++ * ice_eswitch_set_target_vsi - set eswitch context in Tx context descriptor
+  * @skb: pointer to send buffer
+  * @off: pointer to offload struct
+  */
+@@ -382,7 +382,7 @@ ice_eswitch_set_target_vsi(struct sk_buff *skb,
+ }
+ 
+ /**
+- * ice_eswitch_release_env - clear switchdev HW filters
++ * ice_eswitch_release_env - clear eswitch HW filters
+  * @pf: pointer to PF struct
+  *
+  * This function removes HW filters configuration specific for switchdev
+@@ -390,8 +390,8 @@ ice_eswitch_set_target_vsi(struct sk_buff *skb,
+  */
+ static void ice_eswitch_release_env(struct ice_pf *pf)
+ {
+-	struct ice_vsi *uplink_vsi = pf->switchdev.uplink_vsi;
+-	struct ice_vsi *ctrl_vsi = pf->switchdev.control_vsi;
++	struct ice_vsi *uplink_vsi = pf->eswitch.uplink_vsi;
++	struct ice_vsi *ctrl_vsi = pf->eswitch.control_vsi;
+ 	struct ice_vsi_vlan_ops *vlan_ops;
+ 
+ 	vlan_ops = ice_get_compat_vsi_vlan_ops(uplink_vsi);
+@@ -407,7 +407,7 @@ static void ice_eswitch_release_env(struct ice_pf *pf)
+ }
+ 
+ /**
+- * ice_eswitch_vsi_setup - configure switchdev control VSI
++ * ice_eswitch_vsi_setup - configure eswitch control VSI
+  * @pf: pointer to PF structure
+  * @pi: pointer to port_info structure
+  */
+@@ -486,12 +486,12 @@ static int ice_eswitch_enable_switchdev(struct ice_pf *pf)
+ 		return -EINVAL;
+ 	}
+ 
+-	pf->switchdev.control_vsi = ice_eswitch_vsi_setup(pf, pf->hw.port_info);
+-	if (!pf->switchdev.control_vsi)
++	pf->eswitch.control_vsi = ice_eswitch_vsi_setup(pf, pf->hw.port_info);
++	if (!pf->eswitch.control_vsi)
+ 		return -ENODEV;
+ 
+-	ctrl_vsi = pf->switchdev.control_vsi;
+-	pf->switchdev.uplink_vsi = uplink_vsi;
++	ctrl_vsi = pf->eswitch.control_vsi;
++	pf->eswitch.uplink_vsi = uplink_vsi;
+ 
+ 	if (ice_eswitch_setup_env(pf))
+ 		goto err_vsi;
+@@ -526,12 +526,12 @@ static int ice_eswitch_enable_switchdev(struct ice_pf *pf)
+ }
+ 
+ /**
+- * ice_eswitch_disable_switchdev - disable switchdev resources
++ * ice_eswitch_disable_switchdev - disable eswitch resources
+  * @pf: pointer to PF structure
+  */
+ static void ice_eswitch_disable_switchdev(struct ice_pf *pf)
+ {
+-	struct ice_vsi *ctrl_vsi = pf->switchdev.control_vsi;
++	struct ice_vsi *ctrl_vsi = pf->eswitch.control_vsi;
+ 
+ 	ice_eswitch_napi_disable(pf);
+ 	ice_eswitch_br_offloads_deinit(pf);
+@@ -625,7 +625,7 @@ void ice_eswitch_release(struct ice_pf *pf)
+ 		return;
+ 
+ 	ice_eswitch_disable_switchdev(pf);
+-	pf->switchdev.is_running = false;
++	pf->eswitch.is_running = false;
+ }
+ 
+ /**
+@@ -636,14 +636,15 @@ int ice_eswitch_configure(struct ice_pf *pf)
+ {
+ 	int status;
+ 
+-	if (pf->eswitch_mode == DEVLINK_ESWITCH_MODE_LEGACY || pf->switchdev.is_running)
++	if (pf->eswitch_mode == DEVLINK_ESWITCH_MODE_LEGACY ||
++	    pf->eswitch.is_running)
+ 		return 0;
+ 
+ 	status = ice_eswitch_enable_switchdev(pf);
+ 	if (status)
+ 		return status;
+ 
+-	pf->switchdev.is_running = true;
++	pf->eswitch.is_running = true;
+ 	return 0;
+ }
+ 
+@@ -693,7 +694,7 @@ void ice_eswitch_stop_all_tx_queues(struct ice_pf *pf)
+  */
+ int ice_eswitch_rebuild(struct ice_pf *pf)
+ {
+-	struct ice_vsi *ctrl_vsi = pf->switchdev.control_vsi;
++	struct ice_vsi *ctrl_vsi = pf->eswitch.control_vsi;
+ 	int status;
+ 
+ 	ice_eswitch_napi_disable(pf);
+diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch_br.c b/drivers/net/ethernet/intel/ice/ice_eswitch_br.c
+index 67bfd1f61cdd49..4750198d0c0cad 100644
+--- a/drivers/net/ethernet/intel/ice/ice_eswitch_br.c
++++ b/drivers/net/ethernet/intel/ice/ice_eswitch_br.c
+@@ -582,10 +582,13 @@ ice_eswitch_br_switchdev_event(struct notifier_block *nb,
+ 	return NOTIFY_DONE;
+ }
+ 
+-static void ice_eswitch_br_fdb_flush(struct ice_esw_br *bridge)
++void ice_eswitch_br_fdb_flush(struct ice_esw_br *bridge)
+ {
+ 	struct ice_esw_br_fdb_entry *entry, *tmp;
+ 
++	if (!bridge)
++		return;
++
+ 	list_for_each_entry_safe(entry, tmp, &bridge->fdb_list, list)
+ 		ice_eswitch_br_fdb_entry_notify_and_cleanup(bridge, entry);
+ }
+@@ -947,7 +950,7 @@ ice_eswitch_br_vf_repr_port_init(struct ice_esw_br *bridge,
+ static int
+ ice_eswitch_br_uplink_port_init(struct ice_esw_br *bridge, struct ice_pf *pf)
+ {
+-	struct ice_vsi *vsi = pf->switchdev.uplink_vsi;
++	struct ice_vsi *vsi = pf->eswitch.uplink_vsi;
+ 	struct ice_esw_br_port *br_port;
+ 	int err;
+ 
+@@ -1185,7 +1188,7 @@ ice_eswitch_br_port_event(struct notifier_block *nb,
+ static void
+ ice_eswitch_br_offloads_dealloc(struct ice_pf *pf)
+ {
+-	struct ice_esw_br_offloads *br_offloads = pf->switchdev.br_offloads;
++	struct ice_esw_br_offloads *br_offloads = pf->eswitch.br_offloads;
+ 
+ 	ASSERT_RTNL();
+ 
+@@ -1194,7 +1197,7 @@ ice_eswitch_br_offloads_dealloc(struct ice_pf *pf)
+ 
+ 	ice_eswitch_br_deinit(br_offloads, br_offloads->bridge);
+ 
+-	pf->switchdev.br_offloads = NULL;
++	pf->eswitch.br_offloads = NULL;
+ 	kfree(br_offloads);
+ }
+ 
+@@ -1205,14 +1208,14 @@ ice_eswitch_br_offloads_alloc(struct ice_pf *pf)
+ 
+ 	ASSERT_RTNL();
+ 
+-	if (pf->switchdev.br_offloads)
++	if (pf->eswitch.br_offloads)
+ 		return ERR_PTR(-EEXIST);
+ 
+ 	br_offloads = kzalloc(sizeof(*br_offloads), GFP_KERNEL);
+ 	if (!br_offloads)
+ 		return ERR_PTR(-ENOMEM);
+ 
+-	pf->switchdev.br_offloads = br_offloads;
++	pf->eswitch.br_offloads = br_offloads;
+ 	br_offloads->pf = pf;
+ 
+ 	return br_offloads;
+@@ -1223,7 +1226,7 @@ ice_eswitch_br_offloads_deinit(struct ice_pf *pf)
+ {
+ 	struct ice_esw_br_offloads *br_offloads;
+ 
+-	br_offloads = pf->switchdev.br_offloads;
++	br_offloads = pf->eswitch.br_offloads;
+ 	if (!br_offloads)
+ 		return;
+ 
+diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch_br.h b/drivers/net/ethernet/intel/ice/ice_eswitch_br.h
+index 85a8fadb2928e6..3920e506119148 100644
+--- a/drivers/net/ethernet/intel/ice/ice_eswitch_br.h
++++ b/drivers/net/ethernet/intel/ice/ice_eswitch_br.h
+@@ -116,5 +116,6 @@ void
+ ice_eswitch_br_offloads_deinit(struct ice_pf *pf);
+ int
+ ice_eswitch_br_offloads_init(struct ice_pf *pf);
++void ice_eswitch_br_fdb_flush(struct ice_esw_br *bridge);
+ 
+ #endif /* _ICE_ESWITCH_BR_H_ */
+diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
+index 4d3a9fc79a6c1d..9f12c9a0fe2968 100644
+--- a/drivers/net/ethernet/intel/ice/ice_main.c
++++ b/drivers/net/ethernet/intel/ice/ice_main.c
+@@ -84,7 +84,8 @@ ice_indr_setup_tc_cb(struct net_device *netdev, struct Qdisc *sch,
+ 
+ bool netif_is_ice(const struct net_device *dev)
+ {
+-	return dev && (dev->netdev_ops == &ice_netdev_ops);
++	return dev && (dev->netdev_ops == &ice_netdev_ops ||
++		       dev->netdev_ops == &ice_netdev_safe_mode_ops);
+ }
+ 
+ /**
+@@ -517,25 +518,6 @@ static void ice_pf_dis_all_vsi(struct ice_pf *pf, bool locked)
+ 		pf->vf_agg_node[node].num_vsis = 0;
+ }
+ 
+-/**
+- * ice_clear_sw_switch_recipes - clear switch recipes
+- * @pf: board private structure
+- *
+- * Mark switch recipes as not created in sw structures. There are cases where
+- * rules (especially advanced rules) need to be restored, either re-read from
+- * hardware or added again. For example after the reset. 'recp_created' flag
+- * prevents from doing that and need to be cleared upfront.
+- */
+-static void ice_clear_sw_switch_recipes(struct ice_pf *pf)
+-{
+-	struct ice_sw_recipe *recp;
+-	u8 i;
+-
+-	recp = pf->hw.switch_info->recp_list;
+-	for (i = 0; i < ICE_MAX_NUM_RECIPES; i++)
+-		recp[i].recp_created = false;
+-}
+-
+ /**
+  * ice_prepare_for_reset - prep for reset
+  * @pf: board private structure
+@@ -572,8 +554,9 @@ ice_prepare_for_reset(struct ice_pf *pf, enum ice_reset_req reset_type)
+ 	mutex_unlock(&pf->vfs.table_lock);
+ 
+ 	if (ice_is_eswitch_mode_switchdev(pf)) {
+-		if (reset_type != ICE_RESET_PFR)
+-			ice_clear_sw_switch_recipes(pf);
++		rtnl_lock();
++		ice_eswitch_br_fdb_flush(pf->eswitch.br_offloads->bridge);
++		rtnl_unlock();
+ 	}
+ 
+ 	/* release ADQ specific HW and SW resources */
+diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c
+index 355716e6bcc82d..19f730a68fa21c 100644
+--- a/drivers/net/ethernet/intel/ice/ice_switch.c
++++ b/drivers/net/ethernet/intel/ice/ice_switch.c
+@@ -6326,8 +6326,6 @@ ice_replay_vsi_fltr(struct ice_hw *hw, u16 vsi_handle, u8 recp_id,
+ 		if (!itr->vsi_list_info ||
+ 		    !test_bit(vsi_handle, itr->vsi_list_info->vsi_map))
+ 			continue;
+-		/* Clearing it so that the logic can add it back */
+-		clear_bit(vsi_handle, itr->vsi_list_info->vsi_map);
+ 		f_entry.fltr_info.vsi_handle = vsi_handle;
+ 		f_entry.fltr_info.fltr_act = ICE_FWD_TO_VSI;
+ 		/* update the src in case it is VSI num */
+diff --git a/drivers/net/ethernet/intel/ice/ice_tc_lib.c b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
+index 76ad5930c01029..c213121aa5010a 100644
+--- a/drivers/net/ethernet/intel/ice/ice_tc_lib.c
++++ b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
+@@ -660,7 +660,7 @@ static int ice_tc_setup_redirect_action(struct net_device *filter_dev,
+ 		   ice_tc_is_dev_uplink(target_dev)) {
+ 		repr = ice_netdev_to_repr(filter_dev);
+ 
+-		fltr->dest_vsi = repr->src_vsi->back->switchdev.uplink_vsi;
++		fltr->dest_vsi = repr->src_vsi->back->eswitch.uplink_vsi;
+ 		fltr->direction = ICE_ESWITCH_FLTR_EGRESS;
+ 	} else if (ice_tc_is_dev_uplink(filter_dev) &&
+ 		   ice_is_port_repr_netdev(target_dev)) {
+@@ -772,11 +772,22 @@ ice_eswitch_add_tc_fltr(struct ice_vsi *vsi, struct ice_tc_flower_fltr *fltr)
+ 		rule_info.sw_act.src = hw->pf_id;
+ 		rule_info.flags_info.act = ICE_SINGLE_ACT_LB_ENABLE;
+ 	} else if (fltr->direction == ICE_ESWITCH_FLTR_EGRESS &&
+-		   fltr->dest_vsi == vsi->back->switchdev.uplink_vsi) {
++		   fltr->dest_vsi == vsi->back->eswitch.uplink_vsi) {
+ 		/* VF to Uplink */
+ 		rule_info.sw_act.flag |= ICE_FLTR_TX;
+ 		rule_info.sw_act.src = vsi->idx;
+ 		rule_info.flags_info.act = ICE_SINGLE_ACT_LAN_ENABLE;
++		/* This is a specific case. The destination VSI index is
++		 * overwritten by the source VSI index. This type of filter
++		 * should allow the packet to go to the LAN, not to the
++		 * VSI passed here. It should set LAN_EN bit only. However,
++		 * the VSI must be a valid one. Setting source VSI index
++		 * here is safe. Even if the result from switch is set LAN_EN
++		 * and LB_EN (which normally will pass the packet to this VSI)
++		 * packet won't be seen on the VSI, because local loopback is
++		 * turned off.
++		 */
++		rule_info.sw_act.vsi_handle = vsi->idx;
+ 	} else {
+ 		/* VF to VF */
+ 		rule_info.sw_act.flag |= ICE_FLTR_TX;
+diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
+index 986bcbf0a6abaf..49b349fa22542a 100644
+--- a/drivers/net/ethernet/intel/igb/igb_main.c
++++ b/drivers/net/ethernet/intel/igb/igb_main.c
+@@ -9672,6 +9672,10 @@ static void igb_io_resume(struct pci_dev *pdev)
+ 	struct igb_adapter *adapter = netdev_priv(netdev);
+ 
+ 	if (netif_running(netdev)) {
++		if (!test_bit(__IGB_DOWN, &adapter->state)) {
++			dev_dbg(&pdev->dev, "Resuming from non-fatal error, do nothing.\n");
++			return;
++		}
+ 		if (igb_up(adapter)) {
+ 			dev_err(&pdev->dev, "igb_up failed after reset\n");
+ 			return;
+diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+index 89a80e3e8bb88f..d6167a7b19f21b 100644
+--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+@@ -2018,7 +2018,7 @@ static int __alloc_dma_rx_desc_resources(struct stmmac_priv *priv,
+ 	rx_q->queue_index = queue;
+ 	rx_q->priv_data = priv;
+ 
+-	pp_params.flags = PP_FLAG_DMA_MAP | (xdp_prog ? PP_FLAG_DMA_SYNC_DEV : 0);
++	pp_params.flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV;
+ 	pp_params.pool_size = dma_conf->dma_rx_size;
+ 	num_pages = DIV_ROUND_UP(dma_conf->dma_buf_sz, PAGE_SIZE);
+ 	pp_params.order = ilog2(num_pages);
+diff --git a/drivers/net/phy/bcm84881.c b/drivers/net/phy/bcm84881.c
+index 9717a1626f3fa1..37a64a37b2ae38 100644
+--- a/drivers/net/phy/bcm84881.c
++++ b/drivers/net/phy/bcm84881.c
+@@ -120,7 +120,7 @@ static int bcm84881_aneg_done(struct phy_device *phydev)
+ 
+ 	bmsr = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_C22 + MII_BMSR);
+ 	if (bmsr < 0)
+-		return val;
++		return bmsr;
+ 
+ 	return !!(val & MDIO_AN_STAT1_COMPLETE) &&
+ 	       !!(bmsr & BMSR_ANEGCOMPLETE);
+@@ -146,7 +146,7 @@ static int bcm84881_read_status(struct phy_device *phydev)
+ 
+ 	bmsr = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_C22 + MII_BMSR);
+ 	if (bmsr < 0)
+-		return val;
++		return bmsr;
+ 
+ 	phydev->autoneg_complete = !!(val & MDIO_AN_STAT1_COMPLETE) &&
+ 				   !!(bmsr & BMSR_ANEGCOMPLETE);
+diff --git a/drivers/net/phy/dp83869.c b/drivers/net/phy/dp83869.c
+index d7aaefb5226b62..5f056d7db83eed 100644
+--- a/drivers/net/phy/dp83869.c
++++ b/drivers/net/phy/dp83869.c
+@@ -645,7 +645,6 @@ static int dp83869_configure_fiber(struct phy_device *phydev,
+ 		     phydev->supported);
+ 
+ 	linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, phydev->supported);
+-	linkmode_set_bit(ADVERTISED_FIBRE, phydev->advertising);
+ 
+ 	if (dp83869->mode == DP83869_RGMII_1000_BASE) {
+ 		linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,
+diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
+index 2e4bff6055e223..ec2a3d16b1a2da 100644
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -3082,10 +3082,11 @@ static __maybe_unused int phy_led_hw_is_supported(struct led_classdev *led_cdev,
+ 
+ static void phy_leds_unregister(struct phy_device *phydev)
+ {
+-	struct phy_led *phyled;
++	struct phy_led *phyled, *tmp;
+ 
+-	list_for_each_entry(phyled, &phydev->leds, list) {
++	list_for_each_entry_safe(phyled, tmp, &phydev->leds, list) {
+ 		led_classdev_unregister(&phyled->led_cdev);
++		list_del(&phyled->list);
+ 	}
+ }
+ 
+diff --git a/drivers/net/ppp/ppp_async.c b/drivers/net/ppp/ppp_async.c
+index e94a4b08fd63b7..7d9201ef925ff1 100644
+--- a/drivers/net/ppp/ppp_async.c
++++ b/drivers/net/ppp/ppp_async.c
+@@ -541,7 +541,7 @@ ppp_async_encode(struct asyncppp *ap)
+ 	 * and 7 (code-reject) must be sent as though no options
+ 	 * had been negotiated.
+ 	 */
+-	islcp = proto == PPP_LCP && 1 <= data[2] && data[2] <= 7;
++	islcp = proto == PPP_LCP && count >= 3 && 1 <= data[2] && data[2] <= 7;
+ 
+ 	if (i == 0) {
+ 		if (islcp)
+diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
+index ba93bab948e09f..bf9e801cc61cce 100644
+--- a/drivers/net/slip/slhc.c
++++ b/drivers/net/slip/slhc.c
+@@ -643,46 +643,57 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
+ int
+ slhc_remember(struct slcompress *comp, unsigned char *icp, int isize)
+ {
+-	struct cstate *cs;
+-	unsigned ihl;
+-
++	const struct tcphdr *th;
+ 	unsigned char index;
++	struct iphdr *iph;
++	struct cstate *cs;
++	unsigned int ihl;
+ 
+-	if(isize < 20) {
+-		/* The packet is shorter than a legal IP header */
++	/* The packet is shorter than a legal IP header.
++	 * Also make sure isize is positive.
++	 */
++	if (isize < (int)sizeof(struct iphdr)) {
++runt:
+ 		comp->sls_i_runt++;
+-		return slhc_toss( comp );
++		return slhc_toss(comp);
+ 	}
++	iph = (struct iphdr *)icp;
+ 	/* Peek at the IP header's IHL field to find its length */
+-	ihl = icp[0] & 0xf;
+-	if(ihl < 20 / 4){
+-		/* The IP header length field is too small */
+-		comp->sls_i_runt++;
+-		return slhc_toss( comp );
+-	}
+-	index = icp[9];
+-	icp[9] = IPPROTO_TCP;
++	ihl = iph->ihl;
++	/* The IP header length field is too small,
++	 * or packet is shorter than the IP header followed
++	 * by minimal tcp header.
++	 */
++	if (ihl < 5 || isize < ihl * 4 + sizeof(struct tcphdr))
++		goto runt;
++
++	index = iph->protocol;
++	iph->protocol = IPPROTO_TCP;
+ 
+ 	if (ip_fast_csum(icp, ihl)) {
+ 		/* Bad IP header checksum; discard */
+ 		comp->sls_i_badcheck++;
+-		return slhc_toss( comp );
++		return slhc_toss(comp);
+ 	}
+-	if(index > comp->rslot_limit) {
++	if (index > comp->rslot_limit) {
+ 		comp->sls_i_error++;
+ 		return slhc_toss(comp);
+ 	}
+-
++	th = (struct tcphdr *)(icp + ihl * 4);
++	if (th->doff < sizeof(struct tcphdr) / 4)
++		goto runt;
++	if (isize < ihl * 4 + th->doff * 4)
++		goto runt;
+ 	/* Update local state */
+ 	cs = &comp->rstate[comp->recv_current = index];
+ 	comp->flags &=~ SLF_TOSS;
+-	memcpy(&cs->cs_ip,icp,20);
+-	memcpy(&cs->cs_tcp,icp + ihl*4,20);
++	memcpy(&cs->cs_ip, iph, sizeof(*iph));
++	memcpy(&cs->cs_tcp, th, sizeof(*th));
+ 	if (ihl > 5)
+-	  memcpy(cs->cs_ipopt, icp + sizeof(struct iphdr), (ihl - 5) * 4);
+-	if (cs->cs_tcp.doff > 5)
+-	  memcpy(cs->cs_tcpopt, icp + ihl*4 + sizeof(struct tcphdr), (cs->cs_tcp.doff - 5) * 4);
+-	cs->cs_hsize = ihl*2 + cs->cs_tcp.doff*2;
++	  memcpy(cs->cs_ipopt, &iph[1], (ihl - 5) * 4);
++	if (th->doff > 5)
++	  memcpy(cs->cs_tcpopt, &th[1], (th->doff - 5) * 4);
++	cs->cs_hsize = ihl*2 + th->doff*2;
+ 	cs->initialized = true;
+ 	/* Put headers back on packet
+ 	 * Neither header checksum is recalculated
+diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
+index 8268fa331826e7..c114c91b558bdc 100644
+--- a/drivers/net/vxlan/vxlan_core.c
++++ b/drivers/net/vxlan/vxlan_core.c
+@@ -4819,9 +4819,13 @@ static int __init vxlan_init_module(void)
+ 	if (rc)
+ 		goto out4;
+ 
+-	vxlan_vnifilter_init();
++	rc = vxlan_vnifilter_init();
++	if (rc)
++		goto out5;
+ 
+ 	return 0;
++out5:
++	rtnl_link_unregister(&vxlan_link_ops);
+ out4:
+ 	unregister_switchdev_notifier(&vxlan_switchdev_notifier_block);
+ out3:
+diff --git a/drivers/net/vxlan/vxlan_private.h b/drivers/net/vxlan/vxlan_private.h
+index 817fa3075842ee..85b6d0c347e3b4 100644
+--- a/drivers/net/vxlan/vxlan_private.h
++++ b/drivers/net/vxlan/vxlan_private.h
+@@ -202,7 +202,7 @@ int vxlan_vni_in_use(struct net *src_net, struct vxlan_dev *vxlan,
+ int vxlan_vnigroup_init(struct vxlan_dev *vxlan);
+ void vxlan_vnigroup_uninit(struct vxlan_dev *vxlan);
+ 
+-void vxlan_vnifilter_init(void);
++int vxlan_vnifilter_init(void);
+ void vxlan_vnifilter_uninit(void);
+ void vxlan_vnifilter_count(struct vxlan_dev *vxlan, __be32 vni,
+ 			   struct vxlan_vni_node *vninode,
+diff --git a/drivers/net/vxlan/vxlan_vnifilter.c b/drivers/net/vxlan/vxlan_vnifilter.c
+index 9c59d0bf8c3de0..d2023e7131bd4f 100644
+--- a/drivers/net/vxlan/vxlan_vnifilter.c
++++ b/drivers/net/vxlan/vxlan_vnifilter.c
+@@ -992,19 +992,18 @@ static int vxlan_vnifilter_process(struct sk_buff *skb, struct nlmsghdr *nlh,
+ 	return err;
+ }
+ 
+-void vxlan_vnifilter_init(void)
++static const struct rtnl_msg_handler vxlan_vnifilter_rtnl_msg_handlers[] = {
++	{THIS_MODULE, PF_BRIDGE, RTM_GETTUNNEL, NULL, vxlan_vnifilter_dump, 0},
++	{THIS_MODULE, PF_BRIDGE, RTM_NEWTUNNEL, vxlan_vnifilter_process, NULL, 0},
++	{THIS_MODULE, PF_BRIDGE, RTM_DELTUNNEL, vxlan_vnifilter_process, NULL, 0},
++};
++
++int vxlan_vnifilter_init(void)
+ {
+-	rtnl_register_module(THIS_MODULE, PF_BRIDGE, RTM_GETTUNNEL, NULL,
+-			     vxlan_vnifilter_dump, 0);
+-	rtnl_register_module(THIS_MODULE, PF_BRIDGE, RTM_NEWTUNNEL,
+-			     vxlan_vnifilter_process, NULL, 0);
+-	rtnl_register_module(THIS_MODULE, PF_BRIDGE, RTM_DELTUNNEL,
+-			     vxlan_vnifilter_process, NULL, 0);
++	return rtnl_register_many(vxlan_vnifilter_rtnl_msg_handlers);
+ }
+ 
+ void vxlan_vnifilter_uninit(void)
+ {
+-	rtnl_unregister(PF_BRIDGE, RTM_GETTUNNEL);
+-	rtnl_unregister(PF_BRIDGE, RTM_NEWTUNNEL);
+-	rtnl_unregister(PF_BRIDGE, RTM_DELTUNNEL);
++	rtnl_unregister_many(vxlan_vnifilter_rtnl_msg_handlers);
+ }
+diff --git a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
+index d6bbcc7b5b90d6..0a94c634ddc27e 100644
+--- a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
++++ b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
+@@ -1554,6 +1554,7 @@ static void switchtec_ntb_remove(struct device *dev)
+ 	switchtec_ntb_deinit_db_msg_irq(sndev);
+ 	switchtec_ntb_deinit_shared_mw(sndev);
+ 	switchtec_ntb_deinit_crosslink(sndev);
++	cancel_work_sync(&sndev->check_link_status_work);
+ 	kfree(sndev);
+ 	dev_info(dev, "ntb device unregistered\n");
+ }
+diff --git a/drivers/nvdimm/nd_virtio.c b/drivers/nvdimm/nd_virtio.c
+index 1f8c667c6f1ee0..839f10ca56eac9 100644
+--- a/drivers/nvdimm/nd_virtio.c
++++ b/drivers/nvdimm/nd_virtio.c
+@@ -44,6 +44,15 @@ static int virtio_pmem_flush(struct nd_region *nd_region)
+ 	unsigned long flags;
+ 	int err, err1;
+ 
++	/*
++	 * Don't bother to submit the request to the device if the device is
++	 * not activated.
++	 */
++	if (vdev->config->get_status(vdev) & VIRTIO_CONFIG_S_NEEDS_RESET) {
++		dev_info(&vdev->dev, "virtio pmem device needs a reset\n");
++		return -EIO;
++	}
++
+ 	might_sleep();
+ 	req_data = kmalloc(sizeof(*req_data), GFP_KERNEL);
+ 	if (!req_data)
+diff --git a/drivers/pci/endpoint/functions/pci-epf-mhi.c b/drivers/pci/endpoint/functions/pci-epf-mhi.c
+index 6dc918a8a0235d..34e7191f950867 100644
+--- a/drivers/pci/endpoint/functions/pci-epf-mhi.c
++++ b/drivers/pci/endpoint/functions/pci-epf-mhi.c
+@@ -536,11 +536,11 @@ static int pci_epf_mhi_link_up(struct pci_epf *epf)
+ 	mhi_cntrl->alloc_map = pci_epf_mhi_alloc_map;
+ 	mhi_cntrl->unmap_free = pci_epf_mhi_unmap_free;
+ 	if (info->flags & MHI_EPF_USE_DMA) {
+-		mhi_cntrl->read_from_host = pci_epf_mhi_edma_read;
+-		mhi_cntrl->write_to_host = pci_epf_mhi_edma_write;
++		mhi_cntrl->read_sync = pci_epf_mhi_edma_read;
++		mhi_cntrl->write_sync = pci_epf_mhi_edma_write;
+ 	} else {
+-		mhi_cntrl->read_from_host = pci_epf_mhi_iatu_read;
+-		mhi_cntrl->write_to_host = pci_epf_mhi_iatu_write;
++		mhi_cntrl->read_sync = pci_epf_mhi_iatu_read;
++		mhi_cntrl->write_sync = pci_epf_mhi_iatu_write;
+ 	}
+ 
+ 	/* Register the MHI EP controller */
+diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
+index 0b08ac45effbbc..54061b65a2b721 100644
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -3614,6 +3614,8 @@ DECLARE_PCI_FIXUP_FINAL(0x1814, 0x0601, /* Ralink RT2800 802.11n PCI */
+ 			quirk_broken_intx_masking);
+ DECLARE_PCI_FIXUP_FINAL(0x1b7c, 0x0004, /* Ceton InfiniTV4 */
+ 			quirk_broken_intx_masking);
++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_20K2,
++			quirk_broken_intx_masking);
+ 
+ /*
+  * Realtek RTL8169 PCI Gigabit Ethernet Controller (rev 10)
+@@ -4252,6 +4254,10 @@ static void quirk_dma_func0_alias(struct pci_dev *dev)
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_RICOH, 0xe832, quirk_dma_func0_alias);
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_RICOH, 0xe476, quirk_dma_func0_alias);
+ 
++/* Some Glenfly chips use function 0 as the PCIe Requester ID for DMA */
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_GLENFLY, 0x3d40, quirk_dma_func0_alias);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_GLENFLY, 0x3d41, quirk_dma_func0_alias);
++
+ static void quirk_dma_func1_alias(struct pci_dev *dev)
+ {
+ 	if (PCI_FUNC(dev->devfn) != 1)
+@@ -5076,6 +5082,8 @@ static const struct pci_dev_acs_enabled {
+ 	/* QCOM QDF2xxx root ports */
+ 	{ PCI_VENDOR_ID_QCOM, 0x0400, pci_quirk_qcom_rp_acs },
+ 	{ PCI_VENDOR_ID_QCOM, 0x0401, pci_quirk_qcom_rp_acs },
++	/* QCOM SA8775P root port */
++	{ PCI_VENDOR_ID_QCOM, 0x0115, pci_quirk_qcom_rp_acs },
+ 	/* HXT SD4800 root ports. The ACS design is same as QCOM QDF2xxx */
+ 	{ PCI_VENDOR_ID_HXT, 0x0401, pci_quirk_qcom_rp_acs },
+ 	/* Intel PCH root ports */
+diff --git a/drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c b/drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c
+index d4fb85c20eb0f1..a43e20abb10d54 100644
+--- a/drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c
++++ b/drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c
+@@ -37,56 +37,28 @@
+ #define EUSB2_TUNE_EUSB_EQU		0x5A
+ #define EUSB2_TUNE_EUSB_HS_COMP_CUR	0x5B
+ 
+-#define QCOM_EUSB2_REPEATER_INIT_CFG(r, v)	\
+-	{					\
+-		.reg = r,			\
+-		.val = v,			\
+-	}
+-
+-enum reg_fields {
+-	F_TUNE_EUSB_HS_COMP_CUR,
+-	F_TUNE_EUSB_EQU,
+-	F_TUNE_EUSB_SLEW,
+-	F_TUNE_USB2_HS_COMP_CUR,
+-	F_TUNE_USB2_PREEM,
+-	F_TUNE_USB2_EQU,
+-	F_TUNE_USB2_SLEW,
+-	F_TUNE_SQUELCH_U,
+-	F_TUNE_HSDISC,
+-	F_TUNE_RES_FSDIF,
+-	F_TUNE_IUSB2,
+-	F_TUNE_USB2_CROSSOVER,
+-	F_NUM_TUNE_FIELDS,
+-
+-	F_FORCE_VAL_5 = F_NUM_TUNE_FIELDS,
+-	F_FORCE_EN_5,
+-
+-	F_EN_CTL1,
+-
+-	F_RPTR_STATUS,
+-	F_NUM_FIELDS,
+-};
+-
+-static struct reg_field eusb2_repeater_tune_reg_fields[F_NUM_FIELDS] = {
+-	[F_TUNE_EUSB_HS_COMP_CUR] = REG_FIELD(EUSB2_TUNE_EUSB_HS_COMP_CUR, 0, 1),
+-	[F_TUNE_EUSB_EQU] = REG_FIELD(EUSB2_TUNE_EUSB_EQU, 0, 1),
+-	[F_TUNE_EUSB_SLEW] = REG_FIELD(EUSB2_TUNE_EUSB_SLEW, 0, 1),
+-	[F_TUNE_USB2_HS_COMP_CUR] = REG_FIELD(EUSB2_TUNE_USB2_HS_COMP_CUR, 0, 1),
+-	[F_TUNE_USB2_PREEM] = REG_FIELD(EUSB2_TUNE_USB2_PREEM, 0, 2),
+-	[F_TUNE_USB2_EQU] = REG_FIELD(EUSB2_TUNE_USB2_EQU, 0, 1),
+-	[F_TUNE_USB2_SLEW] = REG_FIELD(EUSB2_TUNE_USB2_SLEW, 0, 1),
+-	[F_TUNE_SQUELCH_U] = REG_FIELD(EUSB2_TUNE_SQUELCH_U, 0, 2),
+-	[F_TUNE_HSDISC] = REG_FIELD(EUSB2_TUNE_HSDISC, 0, 2),
+-	[F_TUNE_RES_FSDIF] = REG_FIELD(EUSB2_TUNE_RES_FSDIF, 0, 2),
+-	[F_TUNE_IUSB2] = REG_FIELD(EUSB2_TUNE_IUSB2, 0, 3),
+-	[F_TUNE_USB2_CROSSOVER] = REG_FIELD(EUSB2_TUNE_USB2_CROSSOVER, 0, 2),
+-
+-	[F_FORCE_VAL_5] = REG_FIELD(EUSB2_FORCE_VAL_5, 0, 7),
+-	[F_FORCE_EN_5] = REG_FIELD(EUSB2_FORCE_EN_5, 0, 7),
+-
+-	[F_EN_CTL1] = REG_FIELD(EUSB2_EN_CTL1, 0, 7),
+-
+-	[F_RPTR_STATUS] = REG_FIELD(EUSB2_RPTR_STATUS, 0, 7),
++enum eusb2_reg_layout {
++	TUNE_EUSB_HS_COMP_CUR,
++	TUNE_EUSB_EQU,
++	TUNE_EUSB_SLEW,
++	TUNE_USB2_HS_COMP_CUR,
++	TUNE_USB2_PREEM,
++	TUNE_USB2_EQU,
++	TUNE_USB2_SLEW,
++	TUNE_SQUELCH_U,
++	TUNE_HSDISC,
++	TUNE_RES_FSDIF,
++	TUNE_IUSB2,
++	TUNE_USB2_CROSSOVER,
++	NUM_TUNE_FIELDS,
++
++	FORCE_VAL_5 = NUM_TUNE_FIELDS,
++	FORCE_EN_5,
++
++	EN_CTL1,
++
++	RPTR_STATUS,
++	LAYOUT_SIZE,
+ };
+ 
+ struct eusb2_repeater_cfg {
+@@ -98,10 +70,11 @@ struct eusb2_repeater_cfg {
+ 
+ struct eusb2_repeater {
+ 	struct device *dev;
+-	struct regmap_field *regs[F_NUM_FIELDS];
++	struct regmap *regmap;
+ 	struct phy *phy;
+ 	struct regulator_bulk_data *vregs;
+ 	const struct eusb2_repeater_cfg *cfg;
++	u32 base;
+ 	enum phy_mode mode;
+ };
+ 
+@@ -109,10 +82,10 @@ static const char * const pm8550b_vreg_l[] = {
+ 	"vdd18", "vdd3",
+ };
+ 
+-static const u32 pm8550b_init_tbl[F_NUM_TUNE_FIELDS] = {
+-	[F_TUNE_IUSB2] = 0x8,
+-	[F_TUNE_SQUELCH_U] = 0x3,
+-	[F_TUNE_USB2_PREEM] = 0x5,
++static const u32 pm8550b_init_tbl[NUM_TUNE_FIELDS] = {
++	[TUNE_IUSB2] = 0x8,
++	[TUNE_SQUELCH_U] = 0x3,
++	[TUNE_USB2_PREEM] = 0x5,
+ };
+ 
+ static const struct eusb2_repeater_cfg pm8550b_eusb2_cfg = {
+@@ -140,32 +113,42 @@ static int eusb2_repeater_init_vregs(struct eusb2_repeater *rptr)
+ 
+ static int eusb2_repeater_init(struct phy *phy)
+ {
+-	struct reg_field *regfields = eusb2_repeater_tune_reg_fields;
+ 	struct eusb2_repeater *rptr = phy_get_drvdata(phy);
++	struct device_node *np = rptr->dev->of_node;
++	struct regmap *regmap = rptr->regmap;
+ 	const u32 *init_tbl = rptr->cfg->init_tbl;
++	u8 tune_usb2_preem = init_tbl[TUNE_USB2_PREEM];
++	u8 tune_hsdisc = init_tbl[TUNE_HSDISC];
++	u8 tune_iusb2 = init_tbl[TUNE_IUSB2];
++	u32 base = rptr->base;
+ 	u32 val;
+ 	int ret;
+-	int i;
++
++	of_property_read_u8(np, "qcom,tune-usb2-amplitude", &tune_iusb2);
++	of_property_read_u8(np, "qcom,tune-usb2-disc-thres", &tune_hsdisc);
++	of_property_read_u8(np, "qcom,tune-usb2-preem", &tune_usb2_preem);
+ 
+ 	ret = regulator_bulk_enable(rptr->cfg->num_vregs, rptr->vregs);
+ 	if (ret)
+ 		return ret;
+ 
+-	regmap_field_update_bits(rptr->regs[F_EN_CTL1], EUSB2_RPTR_EN, EUSB2_RPTR_EN);
++	regmap_write(regmap, base + EUSB2_EN_CTL1, EUSB2_RPTR_EN);
+ 
+-	for (i = 0; i < F_NUM_TUNE_FIELDS; i++) {
+-		if (init_tbl[i]) {
+-			regmap_field_update_bits(rptr->regs[i], init_tbl[i], init_tbl[i]);
+-		} else {
+-			/* Write 0 if there's no value set */
+-			u32 mask = GENMASK(regfields[i].msb, regfields[i].lsb);
++	regmap_write(regmap, base + EUSB2_TUNE_EUSB_HS_COMP_CUR, init_tbl[TUNE_EUSB_HS_COMP_CUR]);
++	regmap_write(regmap, base + EUSB2_TUNE_EUSB_EQU, init_tbl[TUNE_EUSB_EQU]);
++	regmap_write(regmap, base + EUSB2_TUNE_EUSB_SLEW, init_tbl[TUNE_EUSB_SLEW]);
++	regmap_write(regmap, base + EUSB2_TUNE_USB2_HS_COMP_CUR, init_tbl[TUNE_USB2_HS_COMP_CUR]);
++	regmap_write(regmap, base + EUSB2_TUNE_USB2_EQU, init_tbl[TUNE_USB2_EQU]);
++	regmap_write(regmap, base + EUSB2_TUNE_USB2_SLEW, init_tbl[TUNE_USB2_SLEW]);
++	regmap_write(regmap, base + EUSB2_TUNE_SQUELCH_U, init_tbl[TUNE_SQUELCH_U]);
++	regmap_write(regmap, base + EUSB2_TUNE_RES_FSDIF, init_tbl[TUNE_RES_FSDIF]);
++	regmap_write(regmap, base + EUSB2_TUNE_USB2_CROSSOVER, init_tbl[TUNE_USB2_CROSSOVER]);
+ 
+-			regmap_field_update_bits(rptr->regs[i], mask, 0);
+-		}
+-	}
++	regmap_write(regmap, base + EUSB2_TUNE_USB2_PREEM, tune_usb2_preem);
++	regmap_write(regmap, base + EUSB2_TUNE_HSDISC, tune_hsdisc);
++	regmap_write(regmap, base + EUSB2_TUNE_IUSB2, tune_iusb2);
+ 
+-	ret = regmap_field_read_poll_timeout(rptr->regs[F_RPTR_STATUS],
+-					     val, val & RPTR_OK, 10, 5);
++	ret = regmap_read_poll_timeout(regmap, base + EUSB2_RPTR_STATUS, val, val & RPTR_OK, 10, 5);
+ 	if (ret)
+ 		dev_err(rptr->dev, "initialization timed-out\n");
+ 
+@@ -176,6 +159,8 @@ static int eusb2_repeater_set_mode(struct phy *phy,
+ 				   enum phy_mode mode, int submode)
+ {
+ 	struct eusb2_repeater *rptr = phy_get_drvdata(phy);
++	struct regmap *regmap = rptr->regmap;
++	u32 base = rptr->base;
+ 
+ 	switch (mode) {
+ 	case PHY_MODE_USB_HOST:
+@@ -184,10 +169,8 @@ static int eusb2_repeater_set_mode(struct phy *phy,
+ 		 * per eUSB 1.2 Spec. Below implement software workaround until
+ 		 * PHY and controller is fixing seen observation.
+ 		 */
+-		regmap_field_update_bits(rptr->regs[F_FORCE_EN_5],
+-					 F_CLK_19P2M_EN, F_CLK_19P2M_EN);
+-		regmap_field_update_bits(rptr->regs[F_FORCE_VAL_5],
+-					 V_CLK_19P2M_EN, V_CLK_19P2M_EN);
++		regmap_write(regmap, base + EUSB2_FORCE_EN_5, F_CLK_19P2M_EN);
++		regmap_write(regmap, base + EUSB2_FORCE_VAL_5, V_CLK_19P2M_EN);
+ 		break;
+ 	case PHY_MODE_USB_DEVICE:
+ 		/*
+@@ -196,10 +179,8 @@ static int eusb2_repeater_set_mode(struct phy *phy,
+ 		 * repeater doesn't clear previous value due to shared
+ 		 * regulators (say host <-> device mode switch).
+ 		 */
+-		regmap_field_update_bits(rptr->regs[F_FORCE_EN_5],
+-					 F_CLK_19P2M_EN, 0);
+-		regmap_field_update_bits(rptr->regs[F_FORCE_VAL_5],
+-					 V_CLK_19P2M_EN, 0);
++		regmap_write(regmap, base + EUSB2_FORCE_EN_5, 0);
++		regmap_write(regmap, base + EUSB2_FORCE_VAL_5, 0);
+ 		break;
+ 	default:
+ 		return -EINVAL;
+@@ -228,9 +209,8 @@ static int eusb2_repeater_probe(struct platform_device *pdev)
+ 	struct device *dev = &pdev->dev;
+ 	struct phy_provider *phy_provider;
+ 	struct device_node *np = dev->of_node;
+-	struct regmap *regmap;
+-	int i, ret;
+ 	u32 res;
++	int ret;
+ 
+ 	rptr = devm_kzalloc(dev, sizeof(*rptr), GFP_KERNEL);
+ 	if (!rptr)
+@@ -243,22 +223,15 @@ static int eusb2_repeater_probe(struct platform_device *pdev)
+ 	if (!rptr->cfg)
+ 		return -EINVAL;
+ 
+-	regmap = dev_get_regmap(dev->parent, NULL);
+-	if (!regmap)
++	rptr->regmap = dev_get_regmap(dev->parent, NULL);
++	if (!rptr->regmap)
+ 		return -ENODEV;
+ 
+ 	ret = of_property_read_u32(np, "reg", &res);
+ 	if (ret < 0)
+ 		return ret;
+ 
+-	for (i = 0; i < F_NUM_FIELDS; i++)
+-		eusb2_repeater_tune_reg_fields[i].reg += res;
+-
+-	ret = devm_regmap_field_bulk_alloc(dev, regmap, rptr->regs,
+-					   eusb2_repeater_tune_reg_fields,
+-					   F_NUM_FIELDS);
+-	if (ret)
+-		return ret;
++	rptr->base = res;
+ 
+ 	ret = eusb2_repeater_init_vregs(rptr);
+ 	if (ret < 0) {
+diff --git a/drivers/powercap/intel_rapl_tpmi.c b/drivers/powercap/intel_rapl_tpmi.c
+index f6b7f085977ce1..1c48dba0ba96af 100644
+--- a/drivers/powercap/intel_rapl_tpmi.c
++++ b/drivers/powercap/intel_rapl_tpmi.c
+@@ -15,7 +15,8 @@
+ #include <linux/module.h>
+ #include <linux/slab.h>
+ 
+-#define TPMI_RAPL_VERSION 1
++#define TPMI_RAPL_MAJOR_VERSION 0
++#define TPMI_RAPL_MINOR_VERSION 1
+ 
+ /* 1 header + 10 registers + 5 reserved. 8 bytes for each. */
+ #define TPMI_RAPL_DOMAIN_SIZE 128
+@@ -154,11 +155,21 @@ static int parse_one_domain(struct tpmi_rapl_package *trp, u32 offset)
+ 	tpmi_domain_size = tpmi_domain_header >> 16 & 0xff;
+ 	tpmi_domain_flags = tpmi_domain_header >> 32 & 0xffff;
+ 
+-	if (tpmi_domain_version != TPMI_RAPL_VERSION) {
+-		pr_warn(FW_BUG "Unsupported version:%d\n", tpmi_domain_version);
++	if (tpmi_domain_version == TPMI_VERSION_INVALID) {
++		pr_warn(FW_BUG "Invalid version\n");
+ 		return -ENODEV;
+ 	}
+ 
++	if (TPMI_MAJOR_VERSION(tpmi_domain_version) != TPMI_RAPL_MAJOR_VERSION) {
++		pr_warn(FW_BUG "Unsupported major version:%ld\n",
++			TPMI_MAJOR_VERSION(tpmi_domain_version));
++		return -ENODEV;
++	}
++
++	if (TPMI_MINOR_VERSION(tpmi_domain_version) > TPMI_RAPL_MINOR_VERSION)
++		pr_info("Ignore: Unsupported minor version:%ld\n",
++			TPMI_MINOR_VERSION(tpmi_domain_version));
++
+ 	/* Domain size: in unit of 128 Bytes */
+ 	if (tpmi_domain_size != 1) {
+ 		pr_warn(FW_BUG "Invalid Domain size %d\n", tpmi_domain_size);
+@@ -181,7 +192,7 @@ static int parse_one_domain(struct tpmi_rapl_package *trp, u32 offset)
+ 			pr_warn(FW_BUG "System domain must support Domain Info register\n");
+ 			return -ENODEV;
+ 		}
+-		tpmi_domain_info = readq(trp->base + offset + TPMI_RAPL_REG_DOMAIN_INFO);
++		tpmi_domain_info = readq(trp->base + offset + TPMI_RAPL_REG_DOMAIN_INFO * 8);
+ 		if (!(tpmi_domain_info & TPMI_RAPL_DOMAIN_ROOT))
+ 			return 0;
+ 		domain_type = RAPL_DOMAIN_PLATFORM;
+diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
+index d68d4b22f528e2..610a69928dff2a 100644
+--- a/drivers/remoteproc/imx_rproc.c
++++ b/drivers/remoteproc/imx_rproc.c
+@@ -669,6 +669,17 @@ static struct resource_table *imx_rproc_get_loaded_rsc_table(struct rproc *rproc
+ 	return (struct resource_table *)priv->rsc_table;
+ }
+ 
++static struct resource_table *
++imx_rproc_elf_find_loaded_rsc_table(struct rproc *rproc, const struct firmware *fw)
++{
++	struct imx_rproc *priv = rproc->priv;
++
++	if (priv->rsc_table)
++		return (struct resource_table *)priv->rsc_table;
++
++	return rproc_elf_find_loaded_rsc_table(rproc, fw);
++}
++
+ static const struct rproc_ops imx_rproc_ops = {
+ 	.prepare	= imx_rproc_prepare,
+ 	.attach		= imx_rproc_attach,
+@@ -679,7 +690,7 @@ static const struct rproc_ops imx_rproc_ops = {
+ 	.da_to_va       = imx_rproc_da_to_va,
+ 	.load		= rproc_elf_load_segments,
+ 	.parse_fw	= imx_rproc_parse_fw,
+-	.find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table,
++	.find_loaded_rsc_table = imx_rproc_elf_find_loaded_rsc_table,
+ 	.get_loaded_rsc_table = imx_rproc_get_loaded_rsc_table,
+ 	.sanity_check	= rproc_elf_sanity_check,
+ 	.get_boot_addr	= rproc_elf_get_boot_addr,
+diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
+index baae1f8279e0cb..1775115239860b 100644
+--- a/drivers/scsi/lpfc/lpfc_ct.c
++++ b/drivers/scsi/lpfc/lpfc_ct.c
+@@ -1671,6 +1671,18 @@ lpfc_cmpl_ct(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+ 	}
+ 
+ out:
++	/* If the caller wanted a synchronous DA_ID completion, signal the
++	 * wait obj and clear flag to reset the vport.
++	 */
++	if (ndlp->save_flags & NLP_WAIT_FOR_DA_ID) {
++		if (ndlp->da_id_waitq)
++			wake_up(ndlp->da_id_waitq);
++	}
++
++	spin_lock_irq(&ndlp->lock);
++	ndlp->save_flags &= ~NLP_WAIT_FOR_DA_ID;
++	spin_unlock_irq(&ndlp->lock);
++
+ 	lpfc_ct_free_iocb(phba, cmdiocb);
+ 	lpfc_nlp_put(ndlp);
+ 	return;
+diff --git a/drivers/scsi/lpfc/lpfc_disc.h b/drivers/scsi/lpfc/lpfc_disc.h
+index f82615d87c4bbb..f5ae8cc158205c 100644
+--- a/drivers/scsi/lpfc/lpfc_disc.h
++++ b/drivers/scsi/lpfc/lpfc_disc.h
+@@ -90,6 +90,8 @@ enum lpfc_nlp_save_flags {
+ 	NLP_IN_RECOV_POST_DEV_LOSS	= 0x1,
+ 	/* wait for outstanding LOGO to cmpl */
+ 	NLP_WAIT_FOR_LOGO		= 0x2,
++	/* wait for outstanding DA_ID to finish */
++	NLP_WAIT_FOR_DA_ID              = 0x4
+ };
+ 
+ struct lpfc_nodelist {
+@@ -159,7 +161,12 @@ struct lpfc_nodelist {
+ 	uint32_t nvme_fb_size; /* NVME target's supported byte cnt */
+ #define NVME_FB_BIT_SHIFT 9    /* PRLI Rsp first burst in 512B units. */
+ 	uint32_t nlp_defer_did;
++
++	/* These wait objects are NPIV specific.  These IOs must complete
++	 * synchronously.
++	 */
+ 	wait_queue_head_t *logo_waitq;
++	wait_queue_head_t *da_id_waitq;
+ };
+ 
+ struct lpfc_node_rrq {
+diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
+index f67d72160d36ed..ebe84bb7bb3ddf 100644
+--- a/drivers/scsi/lpfc/lpfc_els.c
++++ b/drivers/scsi/lpfc/lpfc_els.c
+@@ -9649,11 +9649,12 @@ lpfc_els_flush_cmd(struct lpfc_vport *vport)
+ 		if (piocb->cmd_flag & LPFC_DRIVER_ABORTED && !mbx_tmo_err)
+ 			continue;
+ 
+-		/* On the ELS ring we can have ELS_REQUESTs or
+-		 * GEN_REQUESTs waiting for a response.
++		/* On the ELS ring we can have ELS_REQUESTs, ELS_RSPs,
++		 * or GEN_REQUESTs waiting for a CQE response.
+ 		 */
+ 		ulp_command = get_job_cmnd(phba, piocb);
+-		if (ulp_command == CMD_ELS_REQUEST64_CR) {
++		if (ulp_command == CMD_ELS_REQUEST64_WQE ||
++		    ulp_command == CMD_XMIT_ELS_RSP64_WQE) {
+ 			list_add_tail(&piocb->dlist, &abort_list);
+ 
+ 			/* If the link is down when flushing ELS commands
+diff --git a/drivers/scsi/lpfc/lpfc_vport.c b/drivers/scsi/lpfc/lpfc_vport.c
+index 9e0e9e02d2c473..256ee797adb306 100644
+--- a/drivers/scsi/lpfc/lpfc_vport.c
++++ b/drivers/scsi/lpfc/lpfc_vport.c
+@@ -633,6 +633,7 @@ lpfc_vport_delete(struct fc_vport *fc_vport)
+ 	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+ 	struct lpfc_hba  *phba = vport->phba;
+ 	int rc;
++	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(waitq);
+ 
+ 	if (vport->port_type == LPFC_PHYSICAL_PORT) {
+ 		lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,
+@@ -688,21 +689,49 @@ lpfc_vport_delete(struct fc_vport *fc_vport)
+ 	if (!ndlp)
+ 		goto skip_logo;
+ 
++	/* Send the DA_ID and Fabric LOGO to cleanup the NPIV fabric entries. */
+ 	if (ndlp && ndlp->nlp_state == NLP_STE_UNMAPPED_NODE &&
+ 	    phba->link_state >= LPFC_LINK_UP &&
+ 	    phba->fc_topology != LPFC_TOPOLOGY_LOOP) {
+ 		if (vport->cfg_enable_da_id) {
+-			/* Send DA_ID and wait for a completion. */
++			/* Send DA_ID and wait for a completion.  This is best
++			 * effort.  If the DA_ID fails, likely the fabric will
++			 * "leak" NportIDs but at least the driver issued the
++			 * command.
++			 */
++			ndlp = lpfc_findnode_did(vport, NameServer_DID);
++			if (!ndlp)
++				goto issue_logo;
++
++			spin_lock_irq(&ndlp->lock);
++			ndlp->da_id_waitq = &waitq;
++			ndlp->save_flags |= NLP_WAIT_FOR_DA_ID;
++			spin_unlock_irq(&ndlp->lock);
++
+ 			rc = lpfc_ns_cmd(vport, SLI_CTNS_DA_ID, 0, 0);
+-			if (rc) {
+-				lpfc_printf_log(vport->phba, KERN_WARNING,
+-						LOG_VPORT,
+-						"1829 CT command failed to "
+-						"delete objects on fabric, "
+-						"rc %d\n", rc);
++			if (!rc) {
++				wait_event_timeout(waitq,
++				   !(ndlp->save_flags & NLP_WAIT_FOR_DA_ID),
++				   msecs_to_jiffies(phba->fc_ratov * 2000));
+ 			}
++
++			lpfc_printf_vlog(vport, KERN_INFO, LOG_VPORT | LOG_ELS,
++					 "1829 DA_ID issue status %d. "
++					 "SFlag x%x NState x%x, NFlag x%x "
++					 "Rpi x%x\n",
++					 rc, ndlp->save_flags, ndlp->nlp_state,
++					 ndlp->nlp_flag, ndlp->nlp_rpi);
++
++			/* Remove the waitq and save_flags.  It no
++			 * longer matters if the wake happened.
++			 */
++			spin_lock_irq(&ndlp->lock);
++			ndlp->da_id_waitq = NULL;
++			ndlp->save_flags &= ~NLP_WAIT_FOR_DA_ID;
++			spin_unlock_irq(&ndlp->lock);
+ 		}
+ 
++issue_logo:
+ 		/*
+ 		 * If the vpi is not registered, then a valid FDISC doesn't
+ 		 * exist and there is no need for a ELS LOGO.  Just cleanup
+diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
+index b0a574c534c4c0..2c627deedc1fa2 100644
+--- a/drivers/scsi/sd.c
++++ b/drivers/scsi/sd.c
+@@ -3968,7 +3968,7 @@ static int sd_resume(struct device *dev)
+ static int sd_resume_common(struct device *dev, bool runtime)
+ {
+ 	struct scsi_disk *sdkp = dev_get_drvdata(dev);
+-	int ret = 0;
++	int ret;
+ 
+ 	if (!sdkp)	/* E.g.: runtime resume at the start of sd_probe() */
+ 		return 0;
+@@ -3978,11 +3978,8 @@ static int sd_resume_common(struct device *dev, bool runtime)
+ 		return 0;
+ 	}
+ 
+-	if (!sdkp->device->no_start_on_resume) {
+-		sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
+-		ret = sd_start_stop_device(sdkp, 1);
+-	}
+-
++	sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
++	ret = sd_start_stop_device(sdkp, 1);
+ 	if (!ret) {
+ 		sd_resume(dev);
+ 		sdkp->suspended = false;
+diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
+index e4fafc77bd2010..bbf6327b9e5a68 100644
+--- a/drivers/scsi/wd33c93.c
++++ b/drivers/scsi/wd33c93.c
+@@ -831,7 +831,7 @@ wd33c93_intr(struct Scsi_Host *instance)
+ 		/* construct an IDENTIFY message with correct disconnect bit */
+ 
+ 		hostdata->outgoing_msg[0] = IDENTIFY(0, cmd->device->lun);
+-		if (scsi_pointer->phase)
++		if (WD33C93_scsi_pointer(cmd)->phase)
+ 			hostdata->outgoing_msg[0] |= 0x40;
+ 
+ 		if (hostdata->sync_stat[cmd->device->id] == SS_FIRST) {
+diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
+index 3e7cf04aaf2a64..e69982dbd449bc 100644
+--- a/drivers/soundwire/cadence_master.c
++++ b/drivers/soundwire/cadence_master.c
+@@ -891,8 +891,14 @@ static int cdns_update_slave_status(struct sdw_cdns *cdns,
+ 		}
+ 	}
+ 
+-	if (is_slave)
+-		return sdw_handle_slave_status(&cdns->bus, status);
++	if (is_slave) {
++		int ret;
++
++		mutex_lock(&cdns->status_update_lock);
++		ret = sdw_handle_slave_status(&cdns->bus, status);
++		mutex_unlock(&cdns->status_update_lock);
++		return ret;
++	}
+ 
+ 	return 0;
+ }
+@@ -989,6 +995,31 @@ irqreturn_t sdw_cdns_irq(int irq, void *dev_id)
+ }
+ EXPORT_SYMBOL(sdw_cdns_irq);
+ 
++static void cdns_check_attached_status_dwork(struct work_struct *work)
++{
++	struct sdw_cdns *cdns =
++		container_of(work, struct sdw_cdns, attach_dwork.work);
++	enum sdw_slave_status status[SDW_MAX_DEVICES + 1];
++	u32 val;
++	int ret;
++	int i;
++
++	val = cdns_readl(cdns, CDNS_MCP_SLAVE_STAT);
++
++	for (i = 0; i <= SDW_MAX_DEVICES; i++) {
++		status[i] = val & 0x3;
++		if (status[i])
++			dev_dbg(cdns->dev, "Peripheral %d status: %d\n", i, status[i]);
++		val >>= 2;
++	}
++
++	mutex_lock(&cdns->status_update_lock);
++	ret = sdw_handle_slave_status(&cdns->bus, status);
++	mutex_unlock(&cdns->status_update_lock);
++	if (ret < 0)
++		dev_err(cdns->dev, "%s: sdw_handle_slave_status failed: %d\n", __func__, ret);
++}
++
+ /**
+  * cdns_update_slave_status_work - update slave status in a work since we will need to handle
+  * other interrupts eg. CDNS_MCP_INT_RX_WL during the update slave
+@@ -1745,7 +1776,11 @@ int sdw_cdns_probe(struct sdw_cdns *cdns)
+ 	init_completion(&cdns->tx_complete);
+ 	cdns->bus.port_ops = &cdns_port_ops;
+ 
++	mutex_init(&cdns->status_update_lock);
++
+ 	INIT_WORK(&cdns->work, cdns_update_slave_status_work);
++	INIT_DELAYED_WORK(&cdns->attach_dwork, cdns_check_attached_status_dwork);
++
+ 	return 0;
+ }
+ EXPORT_SYMBOL(sdw_cdns_probe);
+diff --git a/drivers/soundwire/cadence_master.h b/drivers/soundwire/cadence_master.h
+index bc84435e420f5b..e1d7969ba48ae8 100644
+--- a/drivers/soundwire/cadence_master.h
++++ b/drivers/soundwire/cadence_master.h
+@@ -117,6 +117,8 @@ struct sdw_cdns_dai_runtime {
+  * @link_up: Link status
+  * @msg_count: Messages sent on bus
+  * @dai_runtime_array: runtime context for each allocated DAI.
++ * @status_update_lock: protect concurrency between interrupt-based and delayed work
++ * status update
+  */
+ struct sdw_cdns {
+ 	struct device *dev;
+@@ -148,10 +150,13 @@ struct sdw_cdns {
+ 	bool interrupt_enabled;
+ 
+ 	struct work_struct work;
++	struct delayed_work attach_dwork;
+ 
+ 	struct list_head list;
+ 
+ 	struct sdw_cdns_dai_runtime **dai_runtime_array;
++
++	struct mutex status_update_lock; /* add mutual exclusion to sdw_handle_slave_status() */
+ };
+ 
+ #define bus_to_cdns(_bus) container_of(_bus, struct sdw_cdns, bus)
+diff --git a/drivers/soundwire/intel.h b/drivers/soundwire/intel.h
+index 511932c55216c7..bb6b1df2d2c201 100644
+--- a/drivers/soundwire/intel.h
++++ b/drivers/soundwire/intel.h
+@@ -91,6 +91,8 @@ static inline void intel_writew(void __iomem *base, int offset, u16 value)
+ 
+ #define INTEL_MASTER_RESET_ITERATIONS	10
+ 
++#define SDW_INTEL_DELAYED_ENUMERATION_MS	100
++
+ #define SDW_INTEL_CHECK_OPS(sdw, cb)	((sdw) && (sdw)->link_res && (sdw)->link_res->hw_ops && \
+ 					 (sdw)->link_res->hw_ops->cb)
+ #define SDW_INTEL_OPS(sdw, cb)		((sdw)->link_res->hw_ops->cb)
+diff --git a/drivers/soundwire/intel_auxdevice.c b/drivers/soundwire/intel_auxdevice.c
+index 93698532deac40..bdfff78ac2f810 100644
+--- a/drivers/soundwire/intel_auxdevice.c
++++ b/drivers/soundwire/intel_auxdevice.c
+@@ -398,6 +398,7 @@ static void intel_link_remove(struct auxiliary_device *auxdev)
+ 	 */
+ 	if (!bus->prop.hw_disabled) {
+ 		sdw_intel_debugfs_exit(sdw);
++		cancel_delayed_work_sync(&cdns->attach_dwork);
+ 		sdw_cdns_enable_interrupt(cdns, false);
+ 	}
+ 	sdw_bus_master_delete(bus);
+diff --git a/drivers/soundwire/intel_bus_common.c b/drivers/soundwire/intel_bus_common.c
+index e5ac3cc7cb79b1..db9cf211671a3e 100644
+--- a/drivers/soundwire/intel_bus_common.c
++++ b/drivers/soundwire/intel_bus_common.c
+@@ -45,21 +45,24 @@ int intel_start_bus(struct sdw_intel *sdw)
+ 		return ret;
+ 	}
+ 
+-	ret = sdw_cdns_exit_reset(cdns);
++	ret = sdw_cdns_enable_interrupt(cdns, true);
+ 	if (ret < 0) {
+-		dev_err(dev, "%s: unable to exit bus reset sequence: %d\n", __func__, ret);
++		dev_err(dev, "%s: cannot enable interrupts: %d\n", __func__, ret);
+ 		return ret;
+ 	}
+ 
+-	ret = sdw_cdns_enable_interrupt(cdns, true);
++	ret = sdw_cdns_exit_reset(cdns);
+ 	if (ret < 0) {
+-		dev_err(dev, "%s: cannot enable interrupts: %d\n", __func__, ret);
++		dev_err(dev, "%s: unable to exit bus reset sequence: %d\n", __func__, ret);
+ 		return ret;
+ 	}
+ 
+ 	sdw_cdns_check_self_clearing_bits(cdns, __func__,
+ 					  true, INTEL_MASTER_RESET_ITERATIONS);
+ 
++	schedule_delayed_work(&cdns->attach_dwork,
++			      msecs_to_jiffies(SDW_INTEL_DELAYED_ENUMERATION_MS));
++
+ 	return 0;
+ }
+ 
+@@ -136,21 +139,24 @@ int intel_start_bus_after_reset(struct sdw_intel *sdw)
+ 			return ret;
+ 		}
+ 
+-		ret = sdw_cdns_exit_reset(cdns);
++		ret = sdw_cdns_enable_interrupt(cdns, true);
+ 		if (ret < 0) {
+-			dev_err(dev, "unable to exit bus reset sequence during resume\n");
++			dev_err(dev, "cannot enable interrupts during resume\n");
+ 			return ret;
+ 		}
+ 
+-		ret = sdw_cdns_enable_interrupt(cdns, true);
++		ret = sdw_cdns_exit_reset(cdns);
+ 		if (ret < 0) {
+-			dev_err(dev, "cannot enable interrupts during resume\n");
++			dev_err(dev, "unable to exit bus reset sequence during resume\n");
+ 			return ret;
+ 		}
+ 
+ 	}
+ 	sdw_cdns_check_self_clearing_bits(cdns, __func__, true, INTEL_MASTER_RESET_ITERATIONS);
+ 
++	schedule_delayed_work(&cdns->attach_dwork,
++			      msecs_to_jiffies(SDW_INTEL_DELAYED_ENUMERATION_MS));
++
+ 	return 0;
+ }
+ 
+@@ -184,6 +190,9 @@ int intel_start_bus_after_clock_stop(struct sdw_intel *sdw)
+ 
+ 	sdw_cdns_check_self_clearing_bits(cdns, __func__, true, INTEL_MASTER_RESET_ITERATIONS);
+ 
++	schedule_delayed_work(&cdns->attach_dwork,
++			      msecs_to_jiffies(SDW_INTEL_DELAYED_ENUMERATION_MS));
++
+ 	return 0;
+ }
+ 
+@@ -194,6 +203,8 @@ int intel_stop_bus(struct sdw_intel *sdw, bool clock_stop)
+ 	bool wake_enable = false;
+ 	int ret;
+ 
++	cancel_delayed_work_sync(&cdns->attach_dwork);
++
+ 	if (clock_stop) {
+ 		ret = sdw_cdns_clock_stop(cdns, true);
+ 		if (ret < 0)
+diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c
+index 180cea7d381729..13313f07839b6f 100644
+--- a/drivers/spi/spi-fsl-lpspi.c
++++ b/drivers/spi/spi-fsl-lpspi.c
+@@ -881,39 +881,39 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
+ 	fsl_lpspi->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
+ 	if (IS_ERR(fsl_lpspi->base)) {
+ 		ret = PTR_ERR(fsl_lpspi->base);
+-		goto out_controller_put;
++		return ret;
+ 	}
+ 	fsl_lpspi->base_phys = res->start;
+ 
+ 	irq = platform_get_irq(pdev, 0);
+ 	if (irq < 0) {
+ 		ret = irq;
+-		goto out_controller_put;
++		return ret;
+ 	}
+ 
+ 	ret = devm_request_irq(&pdev->dev, irq, fsl_lpspi_isr, 0,
+ 			       dev_name(&pdev->dev), fsl_lpspi);
+ 	if (ret) {
+ 		dev_err(&pdev->dev, "can't get irq%d: %d\n", irq, ret);
+-		goto out_controller_put;
++		return ret;
+ 	}
+ 
+ 	fsl_lpspi->clk_per = devm_clk_get(&pdev->dev, "per");
+ 	if (IS_ERR(fsl_lpspi->clk_per)) {
+ 		ret = PTR_ERR(fsl_lpspi->clk_per);
+-		goto out_controller_put;
++		return ret;
+ 	}
+ 
+ 	fsl_lpspi->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
+ 	if (IS_ERR(fsl_lpspi->clk_ipg)) {
+ 		ret = PTR_ERR(fsl_lpspi->clk_ipg);
+-		goto out_controller_put;
++		return ret;
+ 	}
+ 
+ 	/* enable the clock */
+ 	ret = fsl_lpspi_init_rpm(fsl_lpspi);
+ 	if (ret)
+-		goto out_controller_put;
++		return ret;
+ 
+ 	ret = pm_runtime_get_sync(fsl_lpspi->dev);
+ 	if (ret < 0) {
+@@ -974,8 +974,6 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
+ 	pm_runtime_dont_use_autosuspend(fsl_lpspi->dev);
+ 	pm_runtime_put_sync(fsl_lpspi->dev);
+ 	pm_runtime_disable(fsl_lpspi->dev);
+-out_controller_put:
+-	spi_controller_put(controller);
+ 
+ 	return ret;
+ }
+diff --git a/drivers/staging/vme_user/vme_fake.c b/drivers/staging/vme_user/vme_fake.c
+index 7c53a8a7b79b81..95730d1270af8f 100644
+--- a/drivers/staging/vme_user/vme_fake.c
++++ b/drivers/staging/vme_user/vme_fake.c
+@@ -1064,6 +1064,12 @@ static int __init fake_init(void)
+ 	struct vme_slave_resource *slave_image;
+ 	struct vme_lm_resource *lm;
+ 
++	if (geoid < 0 || geoid >= VME_MAX_SLOTS) {
++		pr_err("VME geographical address must be between 0 and %d (exclusive), but got %d\n",
++			VME_MAX_SLOTS, geoid);
++		return -EINVAL;
++	}
++
+ 	/* We need a fake parent device */
+ 	vme_root = root_device_register("vme");
+ 	if (IS_ERR(vme_root))
+diff --git a/drivers/staging/vme_user/vme_tsi148.c b/drivers/staging/vme_user/vme_tsi148.c
+index 2f5eafd5093402..4566e391d913fc 100644
+--- a/drivers/staging/vme_user/vme_tsi148.c
++++ b/drivers/staging/vme_user/vme_tsi148.c
+@@ -2252,6 +2252,12 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+ 	struct vme_dma_resource *dma_ctrlr;
+ 	struct vme_lm_resource *lm;
+ 
++	if (geoid < 0 || geoid >= VME_MAX_SLOTS) {
++		dev_err(&pdev->dev, "VME geographical address must be between 0 and %d (exclusive), but got %d\n",
++			VME_MAX_SLOTS, geoid);
++		return -EINVAL;
++	}
++
+ 	/* If we want to support more than one of each bridge, we need to
+ 	 * dynamically generate this so we get one per device
+ 	 */
+diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
+index 0d1e980072704e..24eaec5d095c1d 100644
+--- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
++++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
+@@ -223,19 +223,19 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev, const struct pci_device_
+ 
+ 	INIT_DELAYED_WORK(&pci_info->work, proc_thermal_threshold_work_fn);
+ 
+-	ret = proc_thermal_add(&pdev->dev, proc_priv);
+-	if (ret) {
+-		dev_err(&pdev->dev, "error: proc_thermal_add, will continue\n");
+-		pci_info->no_legacy = 1;
+-	}
+-
+ 	proc_priv->priv_data = pci_info;
+ 	pci_info->proc_priv = proc_priv;
+ 	pci_set_drvdata(pdev, proc_priv);
+ 
+ 	ret = proc_thermal_mmio_add(pdev, proc_priv, id->driver_data);
+ 	if (ret)
+-		goto err_ret_thermal;
++		return ret;
++
++	ret = proc_thermal_add(&pdev->dev, proc_priv);
++	if (ret) {
++		dev_err(&pdev->dev, "error: proc_thermal_add, will continue\n");
++		pci_info->no_legacy = 1;
++	}
+ 
+ 	psv_trip.temperature = get_trip_temp(pci_info);
+ 
+@@ -245,7 +245,7 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev, const struct pci_device_
+ 							&tzone_params, 0, 0);
+ 	if (IS_ERR(pci_info->tzone)) {
+ 		ret = PTR_ERR(pci_info->tzone);
+-		goto err_ret_mmio;
++		goto err_del_legacy;
+ 	}
+ 
+ 	/* request and enable interrupt */
+@@ -276,12 +276,10 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev, const struct pci_device_
+ 	pci_free_irq_vectors(pdev);
+ err_ret_tzone:
+ 	thermal_zone_device_unregister(pci_info->tzone);
+-err_ret_mmio:
+-	proc_thermal_mmio_remove(pdev, proc_priv);
+-err_ret_thermal:
++err_del_legacy:
+ 	if (!pci_info->no_legacy)
+ 		proc_thermal_remove(proc_priv);
+-	pci_disable_device(pdev);
++	proc_thermal_mmio_remove(pdev, proc_priv);
+ 
+ 	return ret;
+ }
+@@ -303,7 +301,6 @@ static void proc_thermal_pci_remove(struct pci_dev *pdev)
+ 	proc_thermal_mmio_remove(pdev, pci_info->proc_priv);
+ 	if (!pci_info->no_legacy)
+ 		proc_thermal_remove(proc_priv);
+-	pci_disable_device(pdev);
+ }
+ 
+ #ifdef CONFIG_PM_SLEEP
+diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
+index 5d5570bebfeb61..8ff0efac6aa0d3 100644
+--- a/drivers/tty/serial/serial_core.c
++++ b/drivers/tty/serial/serial_core.c
+@@ -374,14 +374,16 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)
+ 		/*
+ 		 * Turn off DTR and RTS early.
+ 		 */
+-		if (uport && uart_console(uport) && tty) {
+-			uport->cons->cflag = tty->termios.c_cflag;
+-			uport->cons->ispeed = tty->termios.c_ispeed;
+-			uport->cons->ospeed = tty->termios.c_ospeed;
+-		}
++		if (uport) {
++			if (uart_console(uport) && tty) {
++				uport->cons->cflag = tty->termios.c_cflag;
++				uport->cons->ispeed = tty->termios.c_ispeed;
++				uport->cons->ospeed = tty->termios.c_ospeed;
++			}
+ 
+-		if (!tty || C_HUPCL(tty))
+-			uart_port_dtr_rts(uport, false);
++			if (!tty || C_HUPCL(tty))
++				uart_port_dtr_rts(uport, false);
++		}
+ 
+ 		uart_port_shutdown(port);
+ 	}
+diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
+index ed59d2367a4e72..59d53ea100c003 100644
+--- a/drivers/ufs/core/ufshcd.c
++++ b/drivers/ufs/core/ufshcd.c
+@@ -2804,9 +2804,8 @@ static void ufshcd_init_lrb(struct ufs_hba *hba, struct ufshcd_lrb *lrb, int i)
+ 	struct utp_transfer_req_desc *utrdlp = hba->utrdl_base_addr;
+ 	dma_addr_t cmd_desc_element_addr = hba->ucdl_dma_addr +
+ 		i * ufshcd_get_ucd_size(hba);
+-	u16 response_offset = offsetof(struct utp_transfer_cmd_desc,
+-				       response_upiu);
+-	u16 prdt_offset = offsetof(struct utp_transfer_cmd_desc, prd_table);
++	u16 response_offset = le16_to_cpu(utrdlp[i].response_upiu_offset);
++	u16 prdt_offset = le16_to_cpu(utrdlp[i].prd_table_offset);
+ 
+ 	lrb->utr_descriptor_ptr = utrdlp + i;
+ 	lrb->utrd_dma_addr = hba->utrdl_dma_addr +
+diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
+index 0b7bd3c643c3aa..f70ceedfb468f7 100644
+--- a/drivers/usb/chipidea/udc.c
++++ b/drivers/usb/chipidea/udc.c
+@@ -86,7 +86,7 @@ static int hw_device_state(struct ci_hdrc *ci, u32 dma)
+ 		hw_write(ci, OP_ENDPTLISTADDR, ~0, dma);
+ 		/* interrupt, error, port change, reset, sleep/suspend */
+ 		hw_write(ci, OP_USBINTR, ~0,
+-			     USBi_UI|USBi_UEI|USBi_PCI|USBi_URI|USBi_SLI);
++			     USBi_UI|USBi_UEI|USBi_PCI|USBi_URI);
+ 	} else {
+ 		hw_write(ci, OP_USBINTR, ~0, 0);
+ 	}
+@@ -876,6 +876,7 @@ __releases(ci->lock)
+ __acquires(ci->lock)
+ {
+ 	int retval;
++	u32 intr;
+ 
+ 	spin_unlock(&ci->lock);
+ 	if (ci->gadget.speed != USB_SPEED_UNKNOWN)
+@@ -889,6 +890,11 @@ __acquires(ci->lock)
+ 	if (retval)
+ 		goto done;
+ 
++	/* clear SLI */
++	hw_write(ci, OP_USBSTS, USBi_SLI, USBi_SLI);
++	intr = hw_read(ci, OP_USBINTR, ~0);
++	hw_write(ci, OP_USBINTR, ~0, intr | USBi_SLI);
++
+ 	ci->status = usb_ep_alloc_request(&ci->ep0in->ep, GFP_ATOMIC);
+ 	if (ci->status == NULL)
+ 		retval = -ENOMEM;
+diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
+index 7b84416dfc2b11..c1b7209b94836c 100644
+--- a/drivers/usb/dwc2/platform.c
++++ b/drivers/usb/dwc2/platform.c
+@@ -469,18 +469,6 @@ static int dwc2_driver_probe(struct platform_device *dev)
+ 
+ 	spin_lock_init(&hsotg->lock);
+ 
+-	hsotg->irq = platform_get_irq(dev, 0);
+-	if (hsotg->irq < 0)
+-		return hsotg->irq;
+-
+-	dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
+-		hsotg->irq);
+-	retval = devm_request_irq(hsotg->dev, hsotg->irq,
+-				  dwc2_handle_common_intr, IRQF_SHARED,
+-				  dev_name(hsotg->dev), hsotg);
+-	if (retval)
+-		return retval;
+-
+ 	hsotg->vbus_supply = devm_regulator_get_optional(hsotg->dev, "vbus");
+ 	if (IS_ERR(hsotg->vbus_supply)) {
+ 		retval = PTR_ERR(hsotg->vbus_supply);
+@@ -524,6 +512,20 @@ static int dwc2_driver_probe(struct platform_device *dev)
+ 	if (retval)
+ 		goto error;
+ 
++	hsotg->irq = platform_get_irq(dev, 0);
++	if (hsotg->irq < 0) {
++		retval = hsotg->irq;
++		goto error;
++	}
++
++	dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
++		hsotg->irq);
++	retval = devm_request_irq(hsotg->dev, hsotg->irq,
++				  dwc2_handle_common_intr, IRQF_SHARED,
++				  dev_name(hsotg->dev), hsotg);
++	if (retval)
++		goto error;
++
+ 	/*
+ 	 * For OTG cores, set the force mode bits to reflect the value
+ 	 * of dr_mode. Force mode bits should not be touched at any
+diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
+index 9955091c533608..af851e4e8c8a76 100644
+--- a/drivers/usb/dwc3/core.c
++++ b/drivers/usb/dwc3/core.c
+@@ -533,6 +533,7 @@ static int dwc3_alloc_event_buffers(struct dwc3 *dwc, unsigned int length)
+ int dwc3_event_buffers_setup(struct dwc3 *dwc)
+ {
+ 	struct dwc3_event_buffer	*evt;
++	u32				reg;
+ 
+ 	if (!dwc->ev_buf)
+ 		return 0;
+@@ -545,8 +546,10 @@ int dwc3_event_buffers_setup(struct dwc3 *dwc)
+ 			upper_32_bits(evt->dma));
+ 	dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(0),
+ 			DWC3_GEVNTSIZ_SIZE(evt->length));
+-	dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), 0);
+ 
++	/* Clear any stale event */
++	reg = dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(0));
++	dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), reg);
+ 	return 0;
+ }
+ 
+@@ -573,7 +576,10 @@ void dwc3_event_buffers_cleanup(struct dwc3 *dwc)
+ 	dwc3_writel(dwc->regs, DWC3_GEVNTADRHI(0), 0);
+ 	dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(0), DWC3_GEVNTSIZ_INTMASK
+ 			| DWC3_GEVNTSIZ_SIZE(0));
+-	dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), 0);
++
++	/* Clear any stale event */
++	reg = dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(0));
++	dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), reg);
+ }
+ 
+ static void dwc3_core_num_eps(struct dwc3 *dwc)
+@@ -2254,7 +2260,11 @@ static int dwc3_runtime_resume(struct device *dev)
+ 
+ 	switch (dwc->current_dr_role) {
+ 	case DWC3_GCTL_PRTCAP_DEVICE:
+-		dwc3_gadget_process_pending_events(dwc);
++		if (dwc->pending_events) {
++			pm_runtime_put(dwc->dev);
++			dwc->pending_events = false;
++			enable_irq(dwc->irq_gadget);
++		}
+ 		break;
+ 	case DWC3_GCTL_PRTCAP_HOST:
+ 	default:
+@@ -2341,6 +2351,12 @@ static void dwc3_complete(struct device *dev)
+ static const struct dev_pm_ops dwc3_dev_pm_ops = {
+ 	SET_SYSTEM_SLEEP_PM_OPS(dwc3_suspend, dwc3_resume)
+ 	.complete = dwc3_complete,
++
++	/*
++	 * Runtime suspend halts the controller on disconnection. It relies on
++	 * platforms with custom connection notification to start the controller
++	 * again.
++	 */
+ 	SET_RUNTIME_PM_OPS(dwc3_runtime_suspend, dwc3_runtime_resume,
+ 			dwc3_runtime_idle)
+ };
+diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
+index db1a793a9b13ff..420753205fafa1 100644
+--- a/drivers/usb/dwc3/core.h
++++ b/drivers/usb/dwc3/core.h
+@@ -1643,7 +1643,6 @@ static inline void dwc3_otg_host_init(struct dwc3 *dwc)
+ #if !IS_ENABLED(CONFIG_USB_DWC3_HOST)
+ int dwc3_gadget_suspend(struct dwc3 *dwc);
+ int dwc3_gadget_resume(struct dwc3 *dwc);
+-void dwc3_gadget_process_pending_events(struct dwc3 *dwc);
+ #else
+ static inline int dwc3_gadget_suspend(struct dwc3 *dwc)
+ {
+@@ -1655,9 +1654,6 @@ static inline int dwc3_gadget_resume(struct dwc3 *dwc)
+ 	return 0;
+ }
+ 
+-static inline void dwc3_gadget_process_pending_events(struct dwc3 *dwc)
+-{
+-}
+ #endif /* !IS_ENABLED(CONFIG_USB_DWC3_HOST) */
+ 
+ #if IS_ENABLED(CONFIG_USB_DWC3_ULPI)
+diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
+index 1a1da4a0570196..6d439aba646008 100644
+--- a/drivers/usb/dwc3/gadget.c
++++ b/drivers/usb/dwc3/gadget.c
+@@ -4741,14 +4741,3 @@ int dwc3_gadget_resume(struct dwc3 *dwc)
+ 
+ 	return dwc3_gadget_soft_connect(dwc);
+ }
+-
+-void dwc3_gadget_process_pending_events(struct dwc3 *dwc)
+-{
+-	if (dwc->pending_events) {
+-		dwc3_interrupt(dwc->irq_gadget, dwc->ev_buf);
+-		dwc3_thread_interrupt(dwc->irq_gadget, dwc->ev_buf);
+-		pm_runtime_put(dwc->dev);
+-		dwc->pending_events = false;
+-		enable_irq(dwc->irq_gadget);
+-	}
+-}
+diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
+index 9886e1cb13985b..33979f61dc4dd7 100644
+--- a/drivers/usb/gadget/udc/core.c
++++ b/drivers/usb/gadget/udc/core.c
+@@ -1671,6 +1671,7 @@ int usb_gadget_register_driver_owner(struct usb_gadget_driver *driver,
+ 	driver->driver.bus = &gadget_bus_type;
+ 	driver->driver.owner = owner;
+ 	driver->driver.mod_name = mod_name;
++	driver->driver.probe_type = PROBE_FORCE_SYNCHRONOUS;
+ 	ret = driver_register(&driver->driver);
+ 	if (ret) {
+ 		pr_warn("%s: driver registration failed: %d\n",
+diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
+index dd02b064ecd4bc..044303187d9fd0 100644
+--- a/drivers/usb/host/xhci-pci.c
++++ b/drivers/usb/host/xhci-pci.c
+@@ -73,6 +73,7 @@
+ #define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI		0x1142
+ #define PCI_DEVICE_ID_ASMEDIA_1142_XHCI			0x1242
+ #define PCI_DEVICE_ID_ASMEDIA_2142_XHCI			0x2142
++#define PCI_DEVICE_ID_ASMEDIA_3042_XHCI			0x3042
+ #define PCI_DEVICE_ID_ASMEDIA_3242_XHCI			0x3242
+ 
+ #define PCI_DEVICE_ID_CADENCE				0x17CD
+@@ -516,6 +517,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
+ 		pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI)
+ 		xhci->quirks |= XHCI_ASMEDIA_MODIFY_FLOWCONTROL;
+ 
++	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
++	    pdev->device == PCI_DEVICE_ID_ASMEDIA_3042_XHCI)
++		xhci->quirks |= XHCI_RESET_ON_RESUME;
++
+ 	if (pdev->vendor == PCI_VENDOR_ID_TI && pdev->device == 0x8241)
+ 		xhci->quirks |= XHCI_LIMIT_ENDPOINT_INTERVAL_7;
+ 
+diff --git a/drivers/usb/misc/yurex.c b/drivers/usb/misc/yurex.c
+index 6adaaf66c14d7b..c313cd41f7a5a5 100644
+--- a/drivers/usb/misc/yurex.c
++++ b/drivers/usb/misc/yurex.c
+@@ -34,8 +34,6 @@
+ #define YUREX_BUF_SIZE		8
+ #define YUREX_WRITE_TIMEOUT	(HZ*2)
+ 
+-#define MAX_S64_STRLEN 20 /* {-}922337203685477580{7,8} */
+-
+ /* table of devices that work with this driver */
+ static struct usb_device_id yurex_table[] = {
+ 	{ USB_DEVICE(YUREX_VENDOR_ID, YUREX_PRODUCT_ID) },
+@@ -403,7 +401,8 @@ static ssize_t yurex_read(struct file *file, char __user *buffer, size_t count,
+ {
+ 	struct usb_yurex *dev;
+ 	int len = 0;
+-	char in_buffer[MAX_S64_STRLEN];
++	char in_buffer[20];
++	unsigned long flags;
+ 
+ 	dev = file->private_data;
+ 
+@@ -413,16 +412,14 @@ static ssize_t yurex_read(struct file *file, char __user *buffer, size_t count,
+ 		return -ENODEV;
+ 	}
+ 
+-	if (WARN_ON_ONCE(dev->bbu > S64_MAX || dev->bbu < S64_MIN)) {
+-		mutex_unlock(&dev->io_mutex);
+-		return -EIO;
+-	}
+-
+-	spin_lock_irq(&dev->lock);
+-	scnprintf(in_buffer, MAX_S64_STRLEN, "%lld\n", dev->bbu);
+-	spin_unlock_irq(&dev->lock);
++	spin_lock_irqsave(&dev->lock, flags);
++	len = snprintf(in_buffer, 20, "%lld\n", dev->bbu);
++	spin_unlock_irqrestore(&dev->lock, flags);
+ 	mutex_unlock(&dev->io_mutex);
+ 
++	if (WARN_ON_ONCE(len >= sizeof(in_buffer)))
++		return -EIO;
++
+ 	return simple_read_from_buffer(buffer, count, ppos, in_buffer, len);
+ }
+ 
+diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
+index fd68204374f2ce..e5ad23d86833d5 100644
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -2423,6 +2423,17 @@ UNUSUAL_DEV(  0xc251, 0x4003, 0x0100, 0x0100,
+ 		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+ 		US_FL_NOT_LOCKABLE),
+ 
++/*
++ * Reported by Icenowy Zheng <uwu@icenowy.me>
++ * This is an interface for vendor-specific cryptic commands instead
++ * of real USB storage device.
++ */
++UNUSUAL_DEV(  0xe5b7, 0x0811, 0x0100, 0x0100,
++		"ZhuHai JieLi Technology",
++		"JieLi BR21",
++		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
++		US_FL_IGNORE_DEVICE),
++
+ /* Reported by Andrew Simmons <andrew.simmons@gmail.com> */
+ UNUSUAL_DEV(  0xed06, 0x4500, 0x0001, 0x0001,
+ 		"DataStor",
+diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
+index 125269f39f83a3..01db27cbf1d10d 100644
+--- a/drivers/usb/typec/tipd/core.c
++++ b/drivers/usb/typec/tipd/core.c
+@@ -907,6 +907,8 @@ static void tps6598x_remove(struct i2c_client *client)
+ 
+ 	if (!client->irq)
+ 		cancel_delayed_work_sync(&tps->wq_poll);
++	else
++		devm_free_irq(tps->dev, client->irq, tps);
+ 
+ 	tps6598x_disconnect(tps, 0);
+ 	typec_unregister_port(tps->port);
+diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
+index 24035b4f2cd707..405d587450ef84 100644
+--- a/drivers/video/fbdev/core/fbcon.c
++++ b/drivers/video/fbdev/core/fbcon.c
+@@ -847,6 +847,8 @@ static int set_con2fb_map(int unit, int newidx, int user)
+ 			return err;
+ 
+ 		fbcon_add_cursor_work(info);
++	} else if (vc) {
++		set_blitting_type(vc, info);
+ 	}
+ 
+ 	con2fb_map[unit] = newidx;
+diff --git a/drivers/video/fbdev/sis/sis_main.c b/drivers/video/fbdev/sis/sis_main.c
+index 6d524a65af181a..ad39571f913491 100644
+--- a/drivers/video/fbdev/sis/sis_main.c
++++ b/drivers/video/fbdev/sis/sis_main.c
+@@ -184,7 +184,7 @@ static void sisfb_search_mode(char *name, bool quiet)
+ {
+ 	unsigned int j = 0, xres = 0, yres = 0, depth = 0, rate = 0;
+ 	int i = 0;
+-	char strbuf[16], strbuf1[20];
++	char strbuf[24], strbuf1[20];
+ 	char *nameptr = name;
+ 
+ 	/* We don't know the hardware specs yet and there is no ivideo */
+diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
+index 50d795a2542c3b..b3680e1c7054c4 100644
+--- a/fs/btrfs/extent-tree.c
++++ b/fs/btrfs/extent-tree.c
+@@ -1303,13 +1303,24 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len,
+ 		bytes_left = end - start;
+ 	}
+ 
+-	if (bytes_left) {
++	while (bytes_left) {
++		u64 bytes_to_discard = min(BTRFS_MAX_DISCARD_CHUNK_SIZE, bytes_left);
++
+ 		ret = blkdev_issue_discard(bdev, start >> SECTOR_SHIFT,
+-					   bytes_left >> SECTOR_SHIFT,
++					   bytes_to_discard >> SECTOR_SHIFT,
+ 					   GFP_NOFS);
+-		if (!ret)
+-			*discarded_bytes += bytes_left;
++
++		if (ret) {
++			if (ret != -EOPNOTSUPP)
++				break;
++			continue;
++		}
++
++		start += bytes_to_discard;
++		bytes_left -= bytes_to_discard;
++		*discarded_bytes += bytes_to_discard;
+ 	}
++
+ 	return ret;
+ }
+ 
+diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
+index 2128a032c3b74d..5203095318b027 100644
+--- a/fs/btrfs/volumes.h
++++ b/fs/btrfs/volumes.h
+@@ -15,6 +15,12 @@
+ 
+ #define BTRFS_MAX_DATA_CHUNK_SIZE	(10ULL * SZ_1G)
+ 
++/*
++ * Arbitratry maximum size of one discard request to limit potentially long time
++ * spent in blkdev_issue_discard().
++ */
++#define BTRFS_MAX_DISCARD_CHUNK_SIZE	(SZ_1G)
++
+ extern struct mutex uuid_mutex;
+ 
+ #define BTRFS_STRIPE_LEN		SZ_64K
+diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
+index 2784f6cb448222..c4463c3f2068dd 100644
+--- a/fs/btrfs/zoned.c
++++ b/fs/btrfs/zoned.c
+@@ -1357,7 +1357,7 @@ static int btrfs_load_zone_info(struct btrfs_fs_info *fs_info, int zone_idx,
+ 	switch (zone.cond) {
+ 	case BLK_ZONE_COND_OFFLINE:
+ 	case BLK_ZONE_COND_READONLY:
+-		btrfs_err(fs_info,
++		btrfs_err_in_rcu(fs_info,
+ 		"zoned: offline/readonly zone %llu on device %s (devid %llu)",
+ 			  (info->physical >> device->zone_info->zone_size_shift),
+ 			  rcu_str_deref(device->name), device->devid);
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index ed0dc4cc1d28e9..1d14a38017a7f0 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -744,11 +744,12 @@ static void ext4_handle_error(struct super_block *sb, bool force_ro, int error,
+ 
+ 	ext4_msg(sb, KERN_CRIT, "Remounting filesystem read-only");
+ 	/*
+-	 * Make sure updated value of ->s_mount_flags will be visible before
+-	 * ->s_flags update
++	 * EXT4_FLAGS_SHUTDOWN was set which stops all filesystem
++	 * modifications. We don't set SB_RDONLY because that requires
++	 * sb->s_umount semaphore and setting it without proper remount
++	 * procedure is confusing code such as freeze_super() leading to
++	 * deadlocks and other problems.
+ 	 */
+-	smp_wmb();
+-	sb->s_flags |= SB_RDONLY;
+ }
+ 
+ static void update_super_work(struct work_struct *work)
+diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
+index 04ca085b282794..f40785bc4e5549 100644
+--- a/fs/ext4/xattr.c
++++ b/fs/ext4/xattr.c
+@@ -458,7 +458,7 @@ static int ext4_xattr_inode_iget(struct inode *parent, unsigned long ea_ino,
+ 		ext4_set_inode_state(inode, EXT4_STATE_LUSTRE_EA_INODE);
+ 		ext4_xattr_inode_set_ref(inode, 1);
+ 	} else {
+-		inode_lock(inode);
++		inode_lock_nested(inode, I_MUTEX_XATTR);
+ 		inode->i_flags |= S_NOQUOTA;
+ 		inode_unlock(inode);
+ 	}
+@@ -1039,7 +1039,7 @@ static int ext4_xattr_inode_update_ref(handle_t *handle, struct inode *ea_inode,
+ 	s64 ref_count;
+ 	int ret;
+ 
+-	inode_lock(ea_inode);
++	inode_lock_nested(ea_inode, I_MUTEX_XATTR);
+ 
+ 	ret = ext4_reserve_inode_write(handle, ea_inode, &iloc);
+ 	if (ret)
+diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
+index 299b6d6aaa7953..c537e1d02cf3a1 100644
+--- a/fs/gfs2/quota.c
++++ b/fs/gfs2/quota.c
+@@ -446,47 +446,29 @@ static void bh_put(struct gfs2_quota_data *qd)
+ 	mutex_unlock(&sdp->sd_quota_mutex);
+ }
+ 
+-static int qd_check_sync(struct gfs2_sbd *sdp, struct gfs2_quota_data *qd,
+-			 u64 *sync_gen)
++static bool qd_grab_sync(struct gfs2_sbd *sdp, struct gfs2_quota_data *qd,
++			 u64 sync_gen)
+ {
+ 	if (test_bit(QDF_LOCKED, &qd->qd_flags) ||
+ 	    !test_bit(QDF_CHANGE, &qd->qd_flags) ||
+-	    (sync_gen && (qd->qd_sync_gen >= *sync_gen)))
+-		return 0;
+-
+-	/*
+-	 * If qd_change is 0 it means a pending quota change was negated.
+-	 * We should not sync it, but we still have a qd reference and slot
+-	 * reference taken by gfs2_quota_change -> do_qc that need to be put.
+-	 */
+-	if (!qd->qd_change && test_and_clear_bit(QDF_CHANGE, &qd->qd_flags)) {
+-		slot_put(qd);
+-		qd_put(qd);
+-		return 0;
+-	}
++	    qd->qd_sync_gen >= sync_gen)
++		return false;
+ 
+ 	if (!lockref_get_not_dead(&qd->qd_lockref))
+-		return 0;
++		return false;
+ 
+ 	list_move_tail(&qd->qd_list, &sdp->sd_quota_list);
+ 	set_bit(QDF_LOCKED, &qd->qd_flags);
+ 	qd->qd_change_sync = qd->qd_change;
+ 	slot_hold(qd);
+-	return 1;
++	return true;
+ }
+ 
+-static int qd_bh_get_or_undo(struct gfs2_sbd *sdp, struct gfs2_quota_data *qd)
++static void qd_ungrab_sync(struct gfs2_quota_data *qd)
+ {
+-	int error;
+-
+-	error = bh_get(qd);
+-	if (!error)
+-		return 0;
+-
+ 	clear_bit(QDF_LOCKED, &qd->qd_flags);
+ 	slot_put(qd);
+ 	qd_put(qd);
+-	return error;
+ }
+ 
+ static int qd_fish(struct gfs2_sbd *sdp, struct gfs2_quota_data **qdp)
+@@ -502,7 +484,7 @@ static int qd_fish(struct gfs2_sbd *sdp, struct gfs2_quota_data **qdp)
+ 	spin_lock(&qd_lock);
+ 
+ 	list_for_each_entry(iter, &sdp->sd_quota_list, qd_list) {
+-		if (qd_check_sync(sdp, iter, &sdp->sd_quota_sync_gen)) {
++		if (qd_grab_sync(sdp, iter, sdp->sd_quota_sync_gen)) {
+ 			qd = iter;
+ 			break;
+ 		}
+@@ -511,12 +493,15 @@ static int qd_fish(struct gfs2_sbd *sdp, struct gfs2_quota_data **qdp)
+ 	spin_unlock(&qd_lock);
+ 
+ 	if (qd) {
+-		error = qd_bh_get_or_undo(sdp, qd);
+-		if (error)
++		error = bh_get(qd);
++		if (error) {
++			qd_ungrab_sync(qd);
+ 			return error;
+-		*qdp = qd;
++		}
+ 	}
+ 
++	*qdp = qd;
++
+ 	return 0;
+ }
+ 
+@@ -1148,7 +1133,6 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)
+ 	struct gfs2_quota_data *qda[2 * GFS2_MAXQUOTAS];
+ 	unsigned int count = 0;
+ 	u32 x;
+-	int found;
+ 
+ 	if (!test_and_clear_bit(GIF_QD_LOCKED, &ip->i_flags))
+ 		return;
+@@ -1156,6 +1140,7 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)
+ 	for (x = 0; x < ip->i_qadata->qa_qd_num; x++) {
+ 		struct gfs2_quota_data *qd;
+ 		bool sync;
++		int error;
+ 
+ 		qd = ip->i_qadata->qa_qd[x];
+ 		sync = need_sync(qd);
+@@ -1165,14 +1150,20 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)
+ 			continue;
+ 
+ 		spin_lock(&qd_lock);
+-		found = qd_check_sync(sdp, qd, NULL);
++		sync = qd_grab_sync(sdp, qd, U64_MAX);
+ 		spin_unlock(&qd_lock);
+ 
+-		if (!found)
++		if (!sync)
++			continue;
++
++		gfs2_assert_warn(sdp, qd->qd_change_sync);
++		error = bh_get(qd);
++		if (error) {
++			qd_ungrab_sync(qd);
+ 			continue;
++		}
+ 
+-		if (!qd_bh_get_or_undo(sdp, qd))
+-			qda[count++] = qd;
++		qda[count++] = qd;
+ 	}
+ 
+ 	if (count) {
+diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
+index 321af81c456e2a..d5f6437da352da 100644
+--- a/fs/nfs/callback_xdr.c
++++ b/fs/nfs/callback_xdr.c
+@@ -372,6 +372,8 @@ static __be32 decode_rc_list(struct xdr_stream *xdr,
+ 
+ 	rc_list->rcl_nrefcalls = ntohl(*p++);
+ 	if (rc_list->rcl_nrefcalls) {
++		if (unlikely(rc_list->rcl_nrefcalls > xdr->buf->len))
++			goto out;
+ 		p = xdr_inline_decode(xdr,
+ 			     rc_list->rcl_nrefcalls * 2 * sizeof(uint32_t));
+ 		if (unlikely(p == NULL))
+diff --git a/fs/nfs/client.c b/fs/nfs/client.c
+index 4d9249c99989f7..62607d52bfa5e7 100644
+--- a/fs/nfs/client.c
++++ b/fs/nfs/client.c
+@@ -987,6 +987,7 @@ struct nfs_server *nfs_alloc_server(void)
+ 	INIT_LIST_HEAD(&server->layouts);
+ 	INIT_LIST_HEAD(&server->state_owners_lru);
+ 	INIT_LIST_HEAD(&server->ss_copies);
++	INIT_LIST_HEAD(&server->ss_src_copies);
+ 
+ 	atomic_set(&server->active, 0);
+ 
+diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
+index 28704f924612c4..531c9c20ef1d1b 100644
+--- a/fs/nfs/nfs42proc.c
++++ b/fs/nfs/nfs42proc.c
+@@ -218,7 +218,7 @@ static int handle_async_copy(struct nfs42_copy_res *res,
+ 
+ 	if (dst_server != src_server) {
+ 		spin_lock(&src_server->nfs_client->cl_lock);
+-		list_add_tail(&copy->src_copies, &src_server->ss_copies);
++		list_add_tail(&copy->src_copies, &src_server->ss_src_copies);
+ 		spin_unlock(&src_server->nfs_client->cl_lock);
+ 	}
+ 
+diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
+index 6c4539ed2654ac..794bb4aa588d39 100644
+--- a/fs/nfs/nfs4state.c
++++ b/fs/nfs/nfs4state.c
+@@ -1597,7 +1597,7 @@ static void nfs42_complete_copies(struct nfs4_state_owner *sp, struct nfs4_state
+ 			complete(&copy->completion);
+ 		}
+ 	}
+-	list_for_each_entry(copy, &sp->so_server->ss_copies, src_copies) {
++	list_for_each_entry(copy, &sp->so_server->ss_src_copies, src_copies) {
+ 		if ((test_bit(NFS_CLNT_SRC_SSC_COPY_STATE, &state->flags) &&
+ 				!nfs4_stateid_match_other(&state->stateid,
+ 				&copy->parent_src_state->stateid)))
+diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
+index 5c9f8f8404d5b0..6f2bcbfde45e69 100644
+--- a/fs/nfsd/filecache.c
++++ b/fs/nfsd/filecache.c
+@@ -718,7 +718,7 @@ nfsd_file_cache_init(void)
+ 
+ 	ret = rhltable_init(&nfsd_file_rhltable, &nfsd_file_rhash_params);
+ 	if (ret)
+-		return ret;
++		goto out;
+ 
+ 	ret = -ENOMEM;
+ 	nfsd_filecache_wq = alloc_workqueue("nfsd_filecache", 0, 0);
+@@ -770,6 +770,8 @@ nfsd_file_cache_init(void)
+ 
+ 	INIT_DELAYED_WORK(&nfsd_filecache_laundrette, nfsd_file_gc_worker);
+ out:
++	if (ret)
++		clear_bit(NFSD_FILE_CACHE_UP, &nfsd_file_flags);
+ 	return ret;
+ out_notifier:
+ 	lease_unregister_notifier(&nfsd_file_lease_notifier);
+diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
+index cd69cbd0aaae7f..f14d21b6c6d395 100644
+--- a/fs/ntfs3/file.c
++++ b/fs/ntfs3/file.c
+@@ -418,7 +418,7 @@ static int ntfs_truncate(struct inode *inode, loff_t new_size)
+ }
+ 
+ /*
+- * ntfs_fallocate
++ * ntfs_fallocate - file_operations::ntfs_fallocate
+  *
+  * Preallocate space for a file. This implements ntfs's fallocate file
+  * operation, which gets called from sys_fallocate system call. User
+@@ -553,6 +553,8 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len)
+ 		ni_lock(ni);
+ 		err = attr_collapse_range(ni, vbo, len);
+ 		ni_unlock(ni);
++		if (err)
++			goto out;
+ 	} else if (mode & FALLOC_FL_INSERT_RANGE) {
+ 		/* Check new size. */
+ 		err = inode_newsize_ok(inode, new_size);
+diff --git a/fs/ntfs3/frecord.c b/fs/ntfs3/frecord.c
+index f7c381730b396f..61055bcfe8277f 100644
+--- a/fs/ntfs3/frecord.c
++++ b/fs/ntfs3/frecord.c
+@@ -1900,13 +1900,13 @@ enum REPARSE_SIGN ni_parse_reparse(struct ntfs_inode *ni, struct ATTRIB *attr,
+ 
+ /*
+  * fiemap_fill_next_extent_k - a copy of fiemap_fill_next_extent
+- * but it accepts kernel address for fi_extents_start
++ * but it uses 'fe_k' instead of fieinfo->fi_extents_start
+  */
+ static int fiemap_fill_next_extent_k(struct fiemap_extent_info *fieinfo,
+-				     u64 logical, u64 phys, u64 len, u32 flags)
++				     struct fiemap_extent *fe_k, u64 logical,
++				     u64 phys, u64 len, u32 flags)
+ {
+ 	struct fiemap_extent extent;
+-	struct fiemap_extent __user *dest = fieinfo->fi_extents_start;
+ 
+ 	/* only count the extents */
+ 	if (fieinfo->fi_extents_max == 0) {
+@@ -1930,8 +1930,7 @@ static int fiemap_fill_next_extent_k(struct fiemap_extent_info *fieinfo,
+ 	extent.fe_length = len;
+ 	extent.fe_flags = flags;
+ 
+-	dest += fieinfo->fi_extents_mapped;
+-	memcpy(dest, &extent, sizeof(extent));
++	memcpy(fe_k + fieinfo->fi_extents_mapped, &extent, sizeof(extent));
+ 
+ 	fieinfo->fi_extents_mapped++;
+ 	if (fieinfo->fi_extents_mapped == fieinfo->fi_extents_max)
+@@ -1949,7 +1948,6 @@ int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,
+ 	      __u64 vbo, __u64 len)
+ {
+ 	int err = 0;
+-	struct fiemap_extent __user *fe_u = fieinfo->fi_extents_start;
+ 	struct fiemap_extent *fe_k = NULL;
+ 	struct ntfs_sb_info *sbi = ni->mi.sbi;
+ 	u8 cluster_bits = sbi->cluster_bits;
+@@ -2008,7 +2006,6 @@ int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,
+ 		err = -ENOMEM;
+ 		goto out;
+ 	}
+-	fieinfo->fi_extents_start = fe_k;
+ 
+ 	end = vbo + len;
+ 	alloc_size = le64_to_cpu(attr->nres.alloc_size);
+@@ -2098,8 +2095,8 @@ int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,
+ 			if (vbo + dlen >= end)
+ 				flags |= FIEMAP_EXTENT_LAST;
+ 
+-			err = fiemap_fill_next_extent_k(fieinfo, vbo, lbo, dlen,
+-							flags);
++			err = fiemap_fill_next_extent_k(fieinfo, fe_k, vbo, lbo,
++							dlen, flags);
+ 
+ 			if (err < 0)
+ 				break;
+@@ -2120,7 +2117,7 @@ int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,
+ 		if (vbo + bytes >= end)
+ 			flags |= FIEMAP_EXTENT_LAST;
+ 
+-		err = fiemap_fill_next_extent_k(fieinfo, vbo, lbo, bytes,
++		err = fiemap_fill_next_extent_k(fieinfo, fe_k, vbo, lbo, bytes,
+ 						flags);
+ 		if (err < 0)
+ 			break;
+@@ -2137,15 +2134,13 @@ int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,
+ 	/*
+ 	 * Copy to user memory out of lock
+ 	 */
+-	if (copy_to_user(fe_u, fe_k,
++	if (copy_to_user(fieinfo->fi_extents_start, fe_k,
+ 			 fieinfo->fi_extents_max *
+ 				 sizeof(struct fiemap_extent))) {
+ 		err = -EFAULT;
+ 	}
+ 
+ out:
+-	/* Restore original pointer. */
+-	fieinfo->fi_extents_start = fe_u;
+ 	kfree(fe_k);
+ 	return err;
+ }
+diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c
+index 231b012fb19d3d..2a1aeab53ea4b5 100644
+--- a/fs/ntfs3/fslog.c
++++ b/fs/ntfs3/fslog.c
+@@ -609,14 +609,29 @@ static inline void add_client(struct CLIENT_REC *ca, u16 index, __le16 *head)
+ 	*head = cpu_to_le16(index);
+ }
+ 
++/*
++ * Enumerate restart table.
++ *
++ * @t - table to enumerate.
++ * @c - current enumerated element.
++ *
++ * enumeration starts with @c == NULL
++ * returns next element or NULL
++ */
+ static inline void *enum_rstbl(struct RESTART_TABLE *t, void *c)
+ {
+ 	__le32 *e;
+ 	u32 bprt;
+-	u16 rsize = t ? le16_to_cpu(t->size) : 0;
++	u16 rsize;
++
++	if (!t)
++		return NULL;
++
++	rsize = le16_to_cpu(t->size);
+ 
+ 	if (!c) {
+-		if (!t || !t->total)
++		/* start enumeration. */
++		if (!t->total)
+ 			return NULL;
+ 		e = Add2Ptr(t, sizeof(struct RESTART_TABLE));
+ 	} else {
+diff --git a/fs/ntfs3/namei.c b/fs/ntfs3/namei.c
+index b5687d74b44952..bcdc1ec90a96a8 100644
+--- a/fs/ntfs3/namei.c
++++ b/fs/ntfs3/namei.c
+@@ -501,7 +501,7 @@ static int ntfs_d_hash(const struct dentry *dentry, struct qstr *name)
+ 	/*
+ 	 * Try slow way with current upcase table
+ 	 */
+-	uni = __getname();
++	uni = kmem_cache_alloc(names_cachep, GFP_NOWAIT);
+ 	if (!uni)
+ 		return -ENOMEM;
+ 
+@@ -523,7 +523,7 @@ static int ntfs_d_hash(const struct dentry *dentry, struct qstr *name)
+ 	err = 0;
+ 
+ out:
+-	__putname(uni);
++	kmem_cache_free(names_cachep, uni);
+ 	return err;
+ }
+ 
+diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
+index 23fc24d16b31e4..7e4fa9c68c1dd0 100644
+--- a/fs/proc/kcore.c
++++ b/fs/proc/kcore.c
+@@ -50,6 +50,20 @@ static struct proc_dir_entry *proc_root_kcore;
+ #define	kc_offset_to_vaddr(o) ((o) + PAGE_OFFSET)
+ #endif
+ 
++#ifndef kc_xlate_dev_mem_ptr
++#define kc_xlate_dev_mem_ptr kc_xlate_dev_mem_ptr
++static inline void *kc_xlate_dev_mem_ptr(phys_addr_t phys)
++{
++	return __va(phys);
++}
++#endif
++#ifndef kc_unxlate_dev_mem_ptr
++#define kc_unxlate_dev_mem_ptr kc_unxlate_dev_mem_ptr
++static inline void kc_unxlate_dev_mem_ptr(phys_addr_t phys, void *virt)
++{
++}
++#endif
++
+ static LIST_HEAD(kclist_head);
+ static DECLARE_RWSEM(kclist_lock);
+ static int kcore_need_update = 1;
+@@ -471,6 +485,8 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)
+ 	while (buflen) {
+ 		struct page *page;
+ 		unsigned long pfn;
++		phys_addr_t phys;
++		void *__start;
+ 
+ 		/*
+ 		 * If this is the first iteration or the address is not within
+@@ -537,7 +553,8 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)
+ 			}
+ 			break;
+ 		case KCORE_RAM:
+-			pfn = __pa(start) >> PAGE_SHIFT;
++			phys = __pa(start);
++			pfn =  phys >> PAGE_SHIFT;
+ 			page = pfn_to_online_page(pfn);
+ 
+ 			/*
+@@ -556,13 +573,28 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)
+ 			fallthrough;
+ 		case KCORE_VMEMMAP:
+ 		case KCORE_TEXT:
++			if (m->type == KCORE_RAM) {
++				__start = kc_xlate_dev_mem_ptr(phys);
++				if (!__start) {
++					ret = -ENOMEM;
++					if (iov_iter_zero(tsz, iter) != tsz)
++						ret = -EFAULT;
++					goto out;
++				}
++			} else {
++				__start = (void *)start;
++			}
++
+ 			/*
+ 			 * Sadly we must use a bounce buffer here to be able to
+ 			 * make use of copy_from_kernel_nofault(), as these
+ 			 * memory regions might not always be mapped on all
+ 			 * architectures.
+ 			 */
+-			if (copy_from_kernel_nofault(buf, (void *)start, tsz)) {
++			ret = copy_from_kernel_nofault(buf, __start, tsz);
++			if (m->type == KCORE_RAM)
++				kc_unxlate_dev_mem_ptr(phys, __start);
++			if (ret) {
+ 				if (iov_iter_zero(tsz, iter) != tsz) {
+ 					ret = -EFAULT;
+ 					goto out;
+diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
+index 007d0a683910f6..450e3050324c6c 100644
+--- a/fs/smb/client/smb2ops.c
++++ b/fs/smb/client/smb2ops.c
+@@ -4250,7 +4250,7 @@ smb2_get_enc_key(struct TCP_Server_Info *server, __u64 ses_id, int enc, u8 *key)
+  */
+ static int
+ crypt_message(struct TCP_Server_Info *server, int num_rqst,
+-	      struct smb_rqst *rqst, int enc)
++	      struct smb_rqst *rqst, int enc, struct crypto_aead *tfm)
+ {
+ 	struct smb2_transform_hdr *tr_hdr =
+ 		(struct smb2_transform_hdr *)rqst[0].rq_iov[0].iov_base;
+@@ -4261,8 +4261,6 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
+ 	u8 key[SMB3_ENC_DEC_KEY_SIZE];
+ 	struct aead_request *req;
+ 	u8 *iv;
+-	DECLARE_CRYPTO_WAIT(wait);
+-	struct crypto_aead *tfm;
+ 	unsigned int crypt_len = le32_to_cpu(tr_hdr->OriginalMessageSize);
+ 	void *creq;
+ 	size_t sensitive_size;
+@@ -4274,14 +4272,6 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
+ 		return rc;
+ 	}
+ 
+-	rc = smb3_crypto_aead_allocate(server);
+-	if (rc) {
+-		cifs_server_dbg(VFS, "%s: crypto alloc failed\n", __func__);
+-		return rc;
+-	}
+-
+-	tfm = enc ? server->secmech.enc : server->secmech.dec;
+-
+ 	if ((server->cipher_type == SMB2_ENCRYPTION_AES256_CCM) ||
+ 		(server->cipher_type == SMB2_ENCRYPTION_AES256_GCM))
+ 		rc = crypto_aead_setkey(tfm, key, SMB3_GCM256_CRYPTKEY_SIZE);
+@@ -4321,11 +4311,7 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
+ 	aead_request_set_crypt(req, sg, sg, crypt_len, iv);
+ 	aead_request_set_ad(req, assoc_data_len);
+ 
+-	aead_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
+-				  crypto_req_done, &wait);
+-
+-	rc = crypto_wait_req(enc ? crypto_aead_encrypt(req)
+-				: crypto_aead_decrypt(req), &wait);
++	rc = enc ? crypto_aead_encrypt(req) : crypto_aead_decrypt(req);
+ 
+ 	if (!rc && enc)
+ 		memcpy(&tr_hdr->Signature, sign, SMB2_SIGNATURE_SIZE);
+@@ -4432,7 +4418,7 @@ smb3_init_transform_rq(struct TCP_Server_Info *server, int num_rqst,
+ 	/* fill the 1st iov with a transform header */
+ 	fill_transform_hdr(tr_hdr, orig_len, old_rq, server->cipher_type);
+ 
+-	rc = crypt_message(server, num_rqst, new_rq, 1);
++	rc = crypt_message(server, num_rqst, new_rq, 1, server->secmech.enc);
+ 	cifs_dbg(FYI, "Encrypt message returned %d\n", rc);
+ 	if (rc)
+ 		goto err_free;
+@@ -4457,8 +4443,9 @@ decrypt_raw_data(struct TCP_Server_Info *server, char *buf,
+ 		 unsigned int buf_data_size, struct iov_iter *iter,
+ 		 bool is_offloaded)
+ {
+-	struct kvec iov[2];
++	struct crypto_aead *tfm;
+ 	struct smb_rqst rqst = {NULL};
++	struct kvec iov[2];
+ 	size_t iter_size = 0;
+ 	int rc;
+ 
+@@ -4475,9 +4462,31 @@ decrypt_raw_data(struct TCP_Server_Info *server, char *buf,
+ 		iter_size = iov_iter_count(iter);
+ 	}
+ 
+-	rc = crypt_message(server, 1, &rqst, 0);
++	if (is_offloaded) {
++		if ((server->cipher_type == SMB2_ENCRYPTION_AES128_GCM) ||
++		    (server->cipher_type == SMB2_ENCRYPTION_AES256_GCM))
++			tfm = crypto_alloc_aead("gcm(aes)", 0, 0);
++		else
++			tfm = crypto_alloc_aead("ccm(aes)", 0, 0);
++		if (IS_ERR(tfm)) {
++			rc = PTR_ERR(tfm);
++			cifs_server_dbg(VFS, "%s: Failed alloc decrypt TFM, rc=%d\n", __func__, rc);
++
++			return rc;
++		}
++	} else {
++		if (unlikely(!server->secmech.dec))
++			return -EIO;
++
++		tfm = server->secmech.dec;
++	}
++
++	rc = crypt_message(server, 1, &rqst, 0, tfm);
+ 	cifs_dbg(FYI, "Decrypt message returned %d\n", rc);
+ 
++	if (is_offloaded)
++		crypto_free_aead(tfm);
++
+ 	if (rc)
+ 		return rc;
+ 
+diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c
+index bf45b8652e5805..83a03201bb8628 100644
+--- a/fs/smb/client/smb2pdu.c
++++ b/fs/smb/client/smb2pdu.c
+@@ -1263,6 +1263,12 @@ SMB2_negotiate(const unsigned int xid,
+ 		else
+ 			cifs_server_dbg(VFS, "Missing expected negotiate contexts\n");
+ 	}
++
++	if (server->cipher_type && !rc) {
++		rc = smb3_crypto_aead_allocate(server);
++		if (rc)
++			cifs_server_dbg(VFS, "%s: crypto alloc failed, rc=%d\n", __func__, rc);
++	}
+ neg_exit:
+ 	free_rsp_buf(resp_buftype, rsp);
+ 	return rc;
+diff --git a/fs/unicode/mkutf8data.c b/fs/unicode/mkutf8data.c
+index bc1a7c8b5c8dfc..e779252be1648b 100644
+--- a/fs/unicode/mkutf8data.c
++++ b/fs/unicode/mkutf8data.c
+@@ -2230,75 +2230,6 @@ static void nfdicf_init(void)
+ 		file_fail(fold_name);
+ }
+ 
+-static void ignore_init(void)
+-{
+-	FILE *file;
+-	unsigned int unichar;
+-	unsigned int first;
+-	unsigned int last;
+-	unsigned int *um;
+-	int count;
+-	int ret;
+-
+-	if (verbose > 0)
+-		printf("Parsing %s\n", prop_name);
+-	file = fopen(prop_name, "r");
+-	if (!file)
+-		open_fail(prop_name, errno);
+-	assert(file);
+-	count = 0;
+-	while (fgets(line, LINESIZE, file)) {
+-		ret = sscanf(line, "%X..%X ; %s # ", &first, &last, buf0);
+-		if (ret == 3) {
+-			if (strcmp(buf0, "Default_Ignorable_Code_Point"))
+-				continue;
+-			if (!utf32valid(first) || !utf32valid(last))
+-				line_fail(prop_name, line);
+-			for (unichar = first; unichar <= last; unichar++) {
+-				free(unicode_data[unichar].utf32nfdi);
+-				um = malloc(sizeof(unsigned int));
+-				*um = 0;
+-				unicode_data[unichar].utf32nfdi = um;
+-				free(unicode_data[unichar].utf32nfdicf);
+-				um = malloc(sizeof(unsigned int));
+-				*um = 0;
+-				unicode_data[unichar].utf32nfdicf = um;
+-				count++;
+-			}
+-			if (verbose > 1)
+-				printf(" %X..%X Default_Ignorable_Code_Point\n",
+-					first, last);
+-			continue;
+-		}
+-		ret = sscanf(line, "%X ; %s # ", &unichar, buf0);
+-		if (ret == 2) {
+-			if (strcmp(buf0, "Default_Ignorable_Code_Point"))
+-				continue;
+-			if (!utf32valid(unichar))
+-				line_fail(prop_name, line);
+-			free(unicode_data[unichar].utf32nfdi);
+-			um = malloc(sizeof(unsigned int));
+-			*um = 0;
+-			unicode_data[unichar].utf32nfdi = um;
+-			free(unicode_data[unichar].utf32nfdicf);
+-			um = malloc(sizeof(unsigned int));
+-			*um = 0;
+-			unicode_data[unichar].utf32nfdicf = um;
+-			if (verbose > 1)
+-				printf(" %X Default_Ignorable_Code_Point\n",
+-					unichar);
+-			count++;
+-			continue;
+-		}
+-	}
+-	fclose(file);
+-
+-	if (verbose > 0)
+-		printf("Found %d entries\n", count);
+-	if (count == 0)
+-		file_fail(prop_name);
+-}
+-
+ static void corrections_init(void)
+ {
+ 	FILE *file;
+@@ -3410,7 +3341,6 @@ int main(int argc, char *argv[])
+ 	ccc_init();
+ 	nfdi_init();
+ 	nfdicf_init();
+-	ignore_init();
+ 	corrections_init();
+ 	hangul_decompose();
+ 	nfdi_decompose();
+diff --git a/fs/unicode/utf8data.c_shipped b/fs/unicode/utf8data.c_shipped
+index d9b62901aa96b7..1aab5257a331f0 100644
+--- a/fs/unicode/utf8data.c_shipped
++++ b/fs/unicode/utf8data.c_shipped
+@@ -82,58 +82,58 @@ static const struct utf8data utf8nfdidata[] = {
+ 	{ 0xc0100, 20736 }
+ };
+ 
+-static const unsigned char utf8data[64256] = {
++static const unsigned char utf8data[64080] = {
+ 	/* nfdicf_30100 */
+-	0xd7,0x07,0x66,0x84,0x0c,0x01,0x00,0xc6,0xd5,0x16,0xe4,0x99,0x1a,0xe3,0x63,0x15,
+-	0xe2,0x4c,0x0e,0xc1,0xe0,0x4e,0x0d,0xcf,0x86,0x65,0x2d,0x0d,0x01,0x00,0xd4,0xb8,
+-	0xd3,0x27,0xe2,0x89,0xa3,0xe1,0xce,0x35,0xe0,0x2c,0x22,0xcf,0x86,0xc5,0xe4,0x15,
+-	0x6d,0xe3,0x60,0x68,0xe2,0xf6,0x65,0xe1,0x29,0x65,0xe0,0xee,0x64,0xcf,0x86,0xe5,
+-	0xb3,0x64,0x64,0x96,0x64,0x0b,0x00,0xd2,0x0e,0xe1,0xb5,0x3c,0xe0,0xba,0xa3,0xcf,
+-	0x86,0xcf,0x06,0x01,0x00,0xd1,0x0c,0xe0,0x1e,0xa9,0xcf,0x86,0xcf,0x06,0x02,0xff,
++	0xd7,0x07,0x66,0x84,0x0c,0x01,0x00,0xc6,0xd5,0x16,0xe4,0x96,0x1a,0xe3,0x60,0x15,
++	0xe2,0x49,0x0e,0xc1,0xe0,0x4b,0x0d,0xcf,0x86,0x65,0x2d,0x0d,0x01,0x00,0xd4,0xb8,
++	0xd3,0x27,0xe2,0x03,0xa3,0xe1,0xcb,0x35,0xe0,0x29,0x22,0xcf,0x86,0xc5,0xe4,0xfa,
++	0x6c,0xe3,0x45,0x68,0xe2,0xdb,0x65,0xe1,0x0e,0x65,0xe0,0xd3,0x64,0xcf,0x86,0xe5,
++	0x98,0x64,0x64,0x7b,0x64,0x0b,0x00,0xd2,0x0e,0xe1,0xb3,0x3c,0xe0,0x34,0xa3,0xcf,
++	0x86,0xcf,0x06,0x01,0x00,0xd1,0x0c,0xe0,0x98,0xa8,0xcf,0x86,0xcf,0x06,0x02,0xff,
+ 	0xff,0xd0,0x08,0xcf,0x86,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x01,
+-	0x00,0xe4,0xe1,0x45,0xe3,0x3b,0x45,0xd2,0x06,0xcf,0x06,0x01,0x00,0xe1,0x87,0xad,
+-	0xd0,0x21,0xcf,0x86,0xe5,0x81,0xaa,0xe4,0x00,0xaa,0xe3,0xbf,0xa9,0xe2,0x9e,0xa9,
+-	0xe1,0x8d,0xa9,0x10,0x08,0x01,0xff,0xe8,0xb1,0x88,0x00,0x01,0xff,0xe6,0x9b,0xb4,
+-	0x00,0xcf,0x86,0xe5,0x63,0xac,0xd4,0x19,0xe3,0xa2,0xab,0xe2,0x81,0xab,0xe1,0x70,
+-	0xab,0x10,0x08,0x01,0xff,0xe9,0xb9,0xbf,0x00,0x01,0xff,0xe8,0xab,0x96,0x00,0xe3,
+-	0x09,0xac,0xe2,0xe8,0xab,0xe1,0xd7,0xab,0x10,0x08,0x01,0xff,0xe7,0xb8,0xb7,0x00,
+-	0x01,0xff,0xe9,0x9b,0xbb,0x00,0x83,0xe2,0x19,0xfa,0xe1,0xf2,0xf6,0xe0,0x6f,0xf5,
+-	0xcf,0x86,0xd5,0x31,0xc4,0xe3,0x54,0x4e,0xe2,0xf5,0x4c,0xe1,0xa4,0xcc,0xe0,0x9c,
+-	0x4b,0xcf,0x86,0xe5,0x8e,0x49,0xe4,0xaf,0x46,0xe3,0x11,0xbd,0xe2,0x68,0xbc,0xe1,
+-	0x43,0xbc,0xe0,0x1c,0xbc,0xcf,0x86,0xe5,0xe9,0xbb,0x94,0x07,0x63,0xd4,0xbb,0x07,
+-	0x00,0x07,0x00,0xe4,0xdb,0xf4,0xd3,0x08,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd2,0x0b,
+-	0xe1,0xea,0xe1,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd1,0x0e,0xe0,0xd9,0xe2,0xcf,0x86,
+-	0xe5,0x9e,0xe2,0xcf,0x06,0x11,0x00,0xd0,0x0b,0xcf,0x86,0xe5,0xd9,0xe2,0xcf,0x06,
+-	0x13,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x00,0x00,0xe4,0x74,0xf4,0xe3,0x5d,0xf3,
+-	0xd2,0xa0,0xe1,0x13,0xe7,0xd0,0x21,0xcf,0x86,0xe5,0x14,0xe4,0xe4,0x90,0xe3,0xe3,
+-	0x4e,0xe3,0xe2,0x2d,0xe3,0xe1,0x1b,0xe3,0x10,0x08,0x05,0xff,0xe4,0xb8,0xbd,0x00,
+-	0x05,0xff,0xe4,0xb8,0xb8,0x00,0xcf,0x86,0xd5,0x1c,0xe4,0x70,0xe5,0xe3,0x2f,0xe5,
+-	0xe2,0x0e,0xe5,0xe1,0xfd,0xe4,0x10,0x08,0x05,0xff,0xe5,0x92,0xa2,0x00,0x05,0xff,
+-	0xe5,0x93,0xb6,0x00,0xd4,0x34,0xd3,0x18,0xe2,0xf7,0xe5,0xe1,0xe6,0xe5,0x10,0x09,
+-	0x05,0xff,0xf0,0xa1,0x9a,0xa8,0x00,0x05,0xff,0xf0,0xa1,0x9b,0xaa,0x00,0xe2,0x17,
+-	0xe6,0x91,0x11,0x10,0x09,0x05,0xff,0xf0,0xa1,0x8d,0xaa,0x00,0x05,0xff,0xe5,0xac,
+-	0x88,0x00,0x05,0xff,0xe5,0xac,0xbe,0x00,0xe3,0x5d,0xe6,0xd2,0x14,0xe1,0x2c,0xe6,
++	0x00,0xe4,0xdf,0x45,0xe3,0x39,0x45,0xd2,0x06,0xcf,0x06,0x01,0x00,0xe1,0x01,0xad,
++	0xd0,0x21,0xcf,0x86,0xe5,0xfb,0xa9,0xe4,0x7a,0xa9,0xe3,0x39,0xa9,0xe2,0x18,0xa9,
++	0xe1,0x07,0xa9,0x10,0x08,0x01,0xff,0xe8,0xb1,0x88,0x00,0x01,0xff,0xe6,0x9b,0xb4,
++	0x00,0xcf,0x86,0xe5,0xdd,0xab,0xd4,0x19,0xe3,0x1c,0xab,0xe2,0xfb,0xaa,0xe1,0xea,
++	0xaa,0x10,0x08,0x01,0xff,0xe9,0xb9,0xbf,0x00,0x01,0xff,0xe8,0xab,0x96,0x00,0xe3,
++	0x83,0xab,0xe2,0x62,0xab,0xe1,0x51,0xab,0x10,0x08,0x01,0xff,0xe7,0xb8,0xb7,0x00,
++	0x01,0xff,0xe9,0x9b,0xbb,0x00,0x83,0xe2,0x68,0xf9,0xe1,0x52,0xf6,0xe0,0xcf,0xf4,
++	0xcf,0x86,0xd5,0x31,0xc4,0xe3,0x51,0x4e,0xe2,0xf2,0x4c,0xe1,0x09,0xcc,0xe0,0x99,
++	0x4b,0xcf,0x86,0xe5,0x8b,0x49,0xe4,0xac,0x46,0xe3,0x76,0xbc,0xe2,0xcd,0xbb,0xe1,
++	0xa8,0xbb,0xe0,0x81,0xbb,0xcf,0x86,0xe5,0x4e,0xbb,0x94,0x07,0x63,0x39,0xbb,0x07,
++	0x00,0x07,0x00,0xe4,0x3b,0xf4,0xd3,0x08,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd2,0x0b,
++	0xe1,0x4a,0xe1,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd1,0x0e,0xe0,0x39,0xe2,0xcf,0x86,
++	0xe5,0xfe,0xe1,0xcf,0x06,0x11,0x00,0xd0,0x0b,0xcf,0x86,0xe5,0x39,0xe2,0xcf,0x06,
++	0x13,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x00,0x00,0xe4,0xd4,0xf3,0xe3,0xbd,0xf2,
++	0xd2,0xa0,0xe1,0x73,0xe6,0xd0,0x21,0xcf,0x86,0xe5,0x74,0xe3,0xe4,0xf0,0xe2,0xe3,
++	0xae,0xe2,0xe2,0x8d,0xe2,0xe1,0x7b,0xe2,0x10,0x08,0x05,0xff,0xe4,0xb8,0xbd,0x00,
++	0x05,0xff,0xe4,0xb8,0xb8,0x00,0xcf,0x86,0xd5,0x1c,0xe4,0xd0,0xe4,0xe3,0x8f,0xe4,
++	0xe2,0x6e,0xe4,0xe1,0x5d,0xe4,0x10,0x08,0x05,0xff,0xe5,0x92,0xa2,0x00,0x05,0xff,
++	0xe5,0x93,0xb6,0x00,0xd4,0x34,0xd3,0x18,0xe2,0x57,0xe5,0xe1,0x46,0xe5,0x10,0x09,
++	0x05,0xff,0xf0,0xa1,0x9a,0xa8,0x00,0x05,0xff,0xf0,0xa1,0x9b,0xaa,0x00,0xe2,0x77,
++	0xe5,0x91,0x11,0x10,0x09,0x05,0xff,0xf0,0xa1,0x8d,0xaa,0x00,0x05,0xff,0xe5,0xac,
++	0x88,0x00,0x05,0xff,0xe5,0xac,0xbe,0x00,0xe3,0xbd,0xe5,0xd2,0x14,0xe1,0x8c,0xe5,
+ 	0x10,0x08,0x05,0xff,0xe5,0xaf,0xb3,0x00,0x05,0xff,0xf0,0xa1,0xac,0x98,0x00,0xe1,
+-	0x38,0xe6,0x10,0x08,0x05,0xff,0xe5,0xbc,0xb3,0x00,0x05,0xff,0xe5,0xb0,0xa2,0x00,
+-	0xd1,0xd5,0xd0,0x6a,0xcf,0x86,0xe5,0x8d,0xeb,0xd4,0x19,0xe3,0xc6,0xea,0xe2,0xa4,
+-	0xea,0xe1,0x93,0xea,0x10,0x08,0x05,0xff,0xe6,0xb4,0xbe,0x00,0x05,0xff,0xe6,0xb5,
+-	0xb7,0x00,0xd3,0x18,0xe2,0x10,0xeb,0xe1,0xff,0xea,0x10,0x09,0x05,0xff,0xf0,0xa3,
+-	0xbd,0x9e,0x00,0x05,0xff,0xf0,0xa3,0xbe,0x8e,0x00,0xd2,0x13,0xe1,0x28,0xeb,0x10,
++	0x98,0xe5,0x10,0x08,0x05,0xff,0xe5,0xbc,0xb3,0x00,0x05,0xff,0xe5,0xb0,0xa2,0x00,
++	0xd1,0xd5,0xd0,0x6a,0xcf,0x86,0xe5,0xed,0xea,0xd4,0x19,0xe3,0x26,0xea,0xe2,0x04,
++	0xea,0xe1,0xf3,0xe9,0x10,0x08,0x05,0xff,0xe6,0xb4,0xbe,0x00,0x05,0xff,0xe6,0xb5,
++	0xb7,0x00,0xd3,0x18,0xe2,0x70,0xea,0xe1,0x5f,0xea,0x10,0x09,0x05,0xff,0xf0,0xa3,
++	0xbd,0x9e,0x00,0x05,0xff,0xf0,0xa3,0xbe,0x8e,0x00,0xd2,0x13,0xe1,0x88,0xea,0x10,
+ 	0x08,0x05,0xff,0xe7,0x81,0xbd,0x00,0x05,0xff,0xe7,0x81,0xb7,0x00,0xd1,0x11,0x10,
+ 	0x08,0x05,0xff,0xe7,0x85,0x85,0x00,0x05,0xff,0xf0,0xa4,0x89,0xa3,0x00,0x10,0x08,
+-	0x05,0xff,0xe7,0x86,0x9c,0x00,0x05,0xff,0xe4,0x8e,0xab,0x00,0xcf,0x86,0xe5,0x2a,
+-	0xed,0xd4,0x1a,0xe3,0x62,0xec,0xe2,0x48,0xec,0xe1,0x35,0xec,0x10,0x08,0x05,0xff,
+-	0xe7,0x9b,0xb4,0x00,0x05,0xff,0xf0,0xa5,0x83,0xb3,0x00,0xd3,0x16,0xe2,0xaa,0xec,
+-	0xe1,0x98,0xec,0x10,0x08,0x05,0xff,0xe7,0xa3,0x8c,0x00,0x05,0xff,0xe4,0x83,0xa3,
+-	0x00,0xd2,0x13,0xe1,0xc6,0xec,0x10,0x08,0x05,0xff,0xe4,0x84,0xaf,0x00,0x05,0xff,
++	0x05,0xff,0xe7,0x86,0x9c,0x00,0x05,0xff,0xe4,0x8e,0xab,0x00,0xcf,0x86,0xe5,0x8a,
++	0xec,0xd4,0x1a,0xe3,0xc2,0xeb,0xe2,0xa8,0xeb,0xe1,0x95,0xeb,0x10,0x08,0x05,0xff,
++	0xe7,0x9b,0xb4,0x00,0x05,0xff,0xf0,0xa5,0x83,0xb3,0x00,0xd3,0x16,0xe2,0x0a,0xec,
++	0xe1,0xf8,0xeb,0x10,0x08,0x05,0xff,0xe7,0xa3,0x8c,0x00,0x05,0xff,0xe4,0x83,0xa3,
++	0x00,0xd2,0x13,0xe1,0x26,0xec,0x10,0x08,0x05,0xff,0xe4,0x84,0xaf,0x00,0x05,0xff,
+ 	0xe7,0xa9,0x80,0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0xa5,0xa5,0xbc,0x00,0x05,
+ 	0xff,0xf0,0xa5,0xaa,0xa7,0x00,0x10,0x09,0x05,0xff,0xf0,0xa5,0xaa,0xa7,0x00,0x05,
+-	0xff,0xe7,0xaa,0xae,0x00,0xe0,0xdc,0xef,0xcf,0x86,0xd5,0x1d,0xe4,0x51,0xee,0xe3,
+-	0x0d,0xee,0xe2,0xeb,0xed,0xe1,0xda,0xed,0x10,0x09,0x05,0xff,0xf0,0xa3,0x8d,0x9f,
+-	0x00,0x05,0xff,0xe4,0x8f,0x95,0x00,0xd4,0x19,0xe3,0xf8,0xee,0xe2,0xd4,0xee,0xe1,
+-	0xc3,0xee,0x10,0x08,0x05,0xff,0xe8,0x8d,0x93,0x00,0x05,0xff,0xe8,0x8f,0x8a,0x00,
+-	0xd3,0x18,0xe2,0x43,0xef,0xe1,0x32,0xef,0x10,0x09,0x05,0xff,0xf0,0xa6,0xbe,0xb1,
+-	0x00,0x05,0xff,0xf0,0xa7,0x83,0x92,0x00,0xd2,0x13,0xe1,0x5b,0xef,0x10,0x08,0x05,
++	0xff,0xe7,0xaa,0xae,0x00,0xe0,0x3c,0xef,0xcf,0x86,0xd5,0x1d,0xe4,0xb1,0xed,0xe3,
++	0x6d,0xed,0xe2,0x4b,0xed,0xe1,0x3a,0xed,0x10,0x09,0x05,0xff,0xf0,0xa3,0x8d,0x9f,
++	0x00,0x05,0xff,0xe4,0x8f,0x95,0x00,0xd4,0x19,0xe3,0x58,0xee,0xe2,0x34,0xee,0xe1,
++	0x23,0xee,0x10,0x08,0x05,0xff,0xe8,0x8d,0x93,0x00,0x05,0xff,0xe8,0x8f,0x8a,0x00,
++	0xd3,0x18,0xe2,0xa3,0xee,0xe1,0x92,0xee,0x10,0x09,0x05,0xff,0xf0,0xa6,0xbe,0xb1,
++	0x00,0x05,0xff,0xf0,0xa7,0x83,0x92,0x00,0xd2,0x13,0xe1,0xbb,0xee,0x10,0x08,0x05,
+ 	0xff,0xe8,0x9a,0x88,0x00,0x05,0xff,0xe8,0x9c,0x8e,0x00,0xd1,0x10,0x10,0x08,0x05,
+ 	0xff,0xe8,0x9c,0xa8,0x00,0x05,0xff,0xe8,0x9d,0xab,0x00,0x10,0x08,0x05,0xff,0xe8,
+ 	0x9e,0x86,0x00,0x05,0xff,0xe4,0xb5,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+@@ -141,152 +141,152 @@ static const unsigned char utf8data[64256] = {
+ 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 	/* nfdi_30100 */
+-	0x57,0x04,0x01,0x00,0xc6,0xd5,0x16,0xe4,0xc2,0x59,0xe3,0xfb,0x54,0xe2,0x74,0x4f,
+-	0xc1,0xe0,0xa0,0x4d,0xcf,0x86,0x65,0x84,0x4d,0x01,0x00,0xd4,0xb8,0xd3,0x27,0xe2,
+-	0x0c,0xa0,0xe1,0xdf,0x8d,0xe0,0x39,0x71,0xcf,0x86,0xc5,0xe4,0x98,0x69,0xe3,0xe3,
+-	0x64,0xe2,0x79,0x62,0xe1,0xac,0x61,0xe0,0x71,0x61,0xcf,0x86,0xe5,0x36,0x61,0x64,
+-	0x19,0x61,0x0b,0x00,0xd2,0x0e,0xe1,0xc2,0xa0,0xe0,0x3d,0xa0,0xcf,0x86,0xcf,0x06,
+-	0x01,0x00,0xd1,0x0c,0xe0,0xa1,0xa5,0xcf,0x86,0xcf,0x06,0x02,0xff,0xff,0xd0,0x08,
+-	0xcf,0x86,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x01,0x00,0xe4,0x9e,
+-	0xb6,0xe3,0x18,0xae,0xd2,0x06,0xcf,0x06,0x01,0x00,0xe1,0x0a,0xaa,0xd0,0x21,0xcf,
+-	0x86,0xe5,0x04,0xa7,0xe4,0x83,0xa6,0xe3,0x42,0xa6,0xe2,0x21,0xa6,0xe1,0x10,0xa6,
+-	0x10,0x08,0x01,0xff,0xe8,0xb1,0x88,0x00,0x01,0xff,0xe6,0x9b,0xb4,0x00,0xcf,0x86,
+-	0xe5,0xe6,0xa8,0xd4,0x19,0xe3,0x25,0xa8,0xe2,0x04,0xa8,0xe1,0xf3,0xa7,0x10,0x08,
+-	0x01,0xff,0xe9,0xb9,0xbf,0x00,0x01,0xff,0xe8,0xab,0x96,0x00,0xe3,0x8c,0xa8,0xe2,
+-	0x6b,0xa8,0xe1,0x5a,0xa8,0x10,0x08,0x01,0xff,0xe7,0xb8,0xb7,0x00,0x01,0xff,0xe9,
+-	0x9b,0xbb,0x00,0x83,0xe2,0x9c,0xf6,0xe1,0x75,0xf3,0xe0,0xf2,0xf1,0xcf,0x86,0xd5,
+-	0x31,0xc4,0xe3,0x6d,0xcc,0xe2,0x46,0xca,0xe1,0x27,0xc9,0xe0,0xb7,0xbf,0xcf,0x86,
+-	0xe5,0xaa,0xbb,0xe4,0xa3,0xba,0xe3,0x94,0xb9,0xe2,0xeb,0xb8,0xe1,0xc6,0xb8,0xe0,
+-	0x9f,0xb8,0xcf,0x86,0xe5,0x6c,0xb8,0x94,0x07,0x63,0x57,0xb8,0x07,0x00,0x07,0x00,
+-	0xe4,0x5e,0xf1,0xd3,0x08,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd2,0x0b,0xe1,0x6d,0xde,
+-	0xcf,0x86,0xcf,0x06,0x05,0x00,0xd1,0x0e,0xe0,0x5c,0xdf,0xcf,0x86,0xe5,0x21,0xdf,
+-	0xcf,0x06,0x11,0x00,0xd0,0x0b,0xcf,0x86,0xe5,0x5c,0xdf,0xcf,0x06,0x13,0x00,0xcf,
+-	0x86,0xd5,0x06,0xcf,0x06,0x00,0x00,0xe4,0xf7,0xf0,0xe3,0xe0,0xef,0xd2,0xa0,0xe1,
+-	0x96,0xe3,0xd0,0x21,0xcf,0x86,0xe5,0x97,0xe0,0xe4,0x13,0xe0,0xe3,0xd1,0xdf,0xe2,
+-	0xb0,0xdf,0xe1,0x9e,0xdf,0x10,0x08,0x05,0xff,0xe4,0xb8,0xbd,0x00,0x05,0xff,0xe4,
+-	0xb8,0xb8,0x00,0xcf,0x86,0xd5,0x1c,0xe4,0xf3,0xe1,0xe3,0xb2,0xe1,0xe2,0x91,0xe1,
+-	0xe1,0x80,0xe1,0x10,0x08,0x05,0xff,0xe5,0x92,0xa2,0x00,0x05,0xff,0xe5,0x93,0xb6,
+-	0x00,0xd4,0x34,0xd3,0x18,0xe2,0x7a,0xe2,0xe1,0x69,0xe2,0x10,0x09,0x05,0xff,0xf0,
+-	0xa1,0x9a,0xa8,0x00,0x05,0xff,0xf0,0xa1,0x9b,0xaa,0x00,0xe2,0x9a,0xe2,0x91,0x11,
+-	0x10,0x09,0x05,0xff,0xf0,0xa1,0x8d,0xaa,0x00,0x05,0xff,0xe5,0xac,0x88,0x00,0x05,
+-	0xff,0xe5,0xac,0xbe,0x00,0xe3,0xe0,0xe2,0xd2,0x14,0xe1,0xaf,0xe2,0x10,0x08,0x05,
+-	0xff,0xe5,0xaf,0xb3,0x00,0x05,0xff,0xf0,0xa1,0xac,0x98,0x00,0xe1,0xbb,0xe2,0x10,
+-	0x08,0x05,0xff,0xe5,0xbc,0xb3,0x00,0x05,0xff,0xe5,0xb0,0xa2,0x00,0xd1,0xd5,0xd0,
+-	0x6a,0xcf,0x86,0xe5,0x10,0xe8,0xd4,0x19,0xe3,0x49,0xe7,0xe2,0x27,0xe7,0xe1,0x16,
+-	0xe7,0x10,0x08,0x05,0xff,0xe6,0xb4,0xbe,0x00,0x05,0xff,0xe6,0xb5,0xb7,0x00,0xd3,
+-	0x18,0xe2,0x93,0xe7,0xe1,0x82,0xe7,0x10,0x09,0x05,0xff,0xf0,0xa3,0xbd,0x9e,0x00,
+-	0x05,0xff,0xf0,0xa3,0xbe,0x8e,0x00,0xd2,0x13,0xe1,0xab,0xe7,0x10,0x08,0x05,0xff,
+-	0xe7,0x81,0xbd,0x00,0x05,0xff,0xe7,0x81,0xb7,0x00,0xd1,0x11,0x10,0x08,0x05,0xff,
+-	0xe7,0x85,0x85,0x00,0x05,0xff,0xf0,0xa4,0x89,0xa3,0x00,0x10,0x08,0x05,0xff,0xe7,
+-	0x86,0x9c,0x00,0x05,0xff,0xe4,0x8e,0xab,0x00,0xcf,0x86,0xe5,0xad,0xe9,0xd4,0x1a,
+-	0xe3,0xe5,0xe8,0xe2,0xcb,0xe8,0xe1,0xb8,0xe8,0x10,0x08,0x05,0xff,0xe7,0x9b,0xb4,
+-	0x00,0x05,0xff,0xf0,0xa5,0x83,0xb3,0x00,0xd3,0x16,0xe2,0x2d,0xe9,0xe1,0x1b,0xe9,
+-	0x10,0x08,0x05,0xff,0xe7,0xa3,0x8c,0x00,0x05,0xff,0xe4,0x83,0xa3,0x00,0xd2,0x13,
+-	0xe1,0x49,0xe9,0x10,0x08,0x05,0xff,0xe4,0x84,0xaf,0x00,0x05,0xff,0xe7,0xa9,0x80,
+-	0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0xa5,0xa5,0xbc,0x00,0x05,0xff,0xf0,0xa5,
+-	0xaa,0xa7,0x00,0x10,0x09,0x05,0xff,0xf0,0xa5,0xaa,0xa7,0x00,0x05,0xff,0xe7,0xaa,
+-	0xae,0x00,0xe0,0x5f,0xec,0xcf,0x86,0xd5,0x1d,0xe4,0xd4,0xea,0xe3,0x90,0xea,0xe2,
+-	0x6e,0xea,0xe1,0x5d,0xea,0x10,0x09,0x05,0xff,0xf0,0xa3,0x8d,0x9f,0x00,0x05,0xff,
+-	0xe4,0x8f,0x95,0x00,0xd4,0x19,0xe3,0x7b,0xeb,0xe2,0x57,0xeb,0xe1,0x46,0xeb,0x10,
+-	0x08,0x05,0xff,0xe8,0x8d,0x93,0x00,0x05,0xff,0xe8,0x8f,0x8a,0x00,0xd3,0x18,0xe2,
+-	0xc6,0xeb,0xe1,0xb5,0xeb,0x10,0x09,0x05,0xff,0xf0,0xa6,0xbe,0xb1,0x00,0x05,0xff,
+-	0xf0,0xa7,0x83,0x92,0x00,0xd2,0x13,0xe1,0xde,0xeb,0x10,0x08,0x05,0xff,0xe8,0x9a,
+-	0x88,0x00,0x05,0xff,0xe8,0x9c,0x8e,0x00,0xd1,0x10,0x10,0x08,0x05,0xff,0xe8,0x9c,
+-	0xa8,0x00,0x05,0xff,0xe8,0x9d,0xab,0x00,0x10,0x08,0x05,0xff,0xe8,0x9e,0x86,0x00,
+-	0x05,0xff,0xe4,0xb5,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++	0x57,0x04,0x01,0x00,0xc6,0xd5,0x13,0xe4,0xa8,0x59,0xe3,0xe2,0x54,0xe2,0x5b,0x4f,
++	0xc1,0xe0,0x87,0x4d,0xcf,0x06,0x01,0x00,0xd4,0xb8,0xd3,0x27,0xe2,0x89,0x9f,0xe1,
++	0x91,0x8d,0xe0,0x21,0x71,0xcf,0x86,0xc5,0xe4,0x80,0x69,0xe3,0xcb,0x64,0xe2,0x61,
++	0x62,0xe1,0x94,0x61,0xe0,0x59,0x61,0xcf,0x86,0xe5,0x1e,0x61,0x64,0x01,0x61,0x0b,
++	0x00,0xd2,0x0e,0xe1,0x3f,0xa0,0xe0,0xba,0x9f,0xcf,0x86,0xcf,0x06,0x01,0x00,0xd1,
++	0x0c,0xe0,0x1e,0xa5,0xcf,0x86,0xcf,0x06,0x02,0xff,0xff,0xd0,0x08,0xcf,0x86,0xcf,
++	0x06,0x01,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x01,0x00,0xe4,0x1b,0xb6,0xe3,0x95,
++	0xad,0xd2,0x06,0xcf,0x06,0x01,0x00,0xe1,0x87,0xa9,0xd0,0x21,0xcf,0x86,0xe5,0x81,
++	0xa6,0xe4,0x00,0xa6,0xe3,0xbf,0xa5,0xe2,0x9e,0xa5,0xe1,0x8d,0xa5,0x10,0x08,0x01,
++	0xff,0xe8,0xb1,0x88,0x00,0x01,0xff,0xe6,0x9b,0xb4,0x00,0xcf,0x86,0xe5,0x63,0xa8,
++	0xd4,0x19,0xe3,0xa2,0xa7,0xe2,0x81,0xa7,0xe1,0x70,0xa7,0x10,0x08,0x01,0xff,0xe9,
++	0xb9,0xbf,0x00,0x01,0xff,0xe8,0xab,0x96,0x00,0xe3,0x09,0xa8,0xe2,0xe8,0xa7,0xe1,
++	0xd7,0xa7,0x10,0x08,0x01,0xff,0xe7,0xb8,0xb7,0x00,0x01,0xff,0xe9,0x9b,0xbb,0x00,
++	0x83,0xe2,0xee,0xf5,0xe1,0xd8,0xf2,0xe0,0x55,0xf1,0xcf,0x86,0xd5,0x31,0xc4,0xe3,
++	0xd5,0xcb,0xe2,0xae,0xc9,0xe1,0x8f,0xc8,0xe0,0x1f,0xbf,0xcf,0x86,0xe5,0x12,0xbb,
++	0xe4,0x0b,0xba,0xe3,0xfc,0xb8,0xe2,0x53,0xb8,0xe1,0x2e,0xb8,0xe0,0x07,0xb8,0xcf,
++	0x86,0xe5,0xd4,0xb7,0x94,0x07,0x63,0xbf,0xb7,0x07,0x00,0x07,0x00,0xe4,0xc1,0xf0,
++	0xd3,0x08,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd2,0x0b,0xe1,0xd0,0xdd,0xcf,0x86,0xcf,
++	0x06,0x05,0x00,0xd1,0x0e,0xe0,0xbf,0xde,0xcf,0x86,0xe5,0x84,0xde,0xcf,0x06,0x11,
++	0x00,0xd0,0x0b,0xcf,0x86,0xe5,0xbf,0xde,0xcf,0x06,0x13,0x00,0xcf,0x86,0xd5,0x06,
++	0xcf,0x06,0x00,0x00,0xe4,0x5a,0xf0,0xe3,0x43,0xef,0xd2,0xa0,0xe1,0xf9,0xe2,0xd0,
++	0x21,0xcf,0x86,0xe5,0xfa,0xdf,0xe4,0x76,0xdf,0xe3,0x34,0xdf,0xe2,0x13,0xdf,0xe1,
++	0x01,0xdf,0x10,0x08,0x05,0xff,0xe4,0xb8,0xbd,0x00,0x05,0xff,0xe4,0xb8,0xb8,0x00,
++	0xcf,0x86,0xd5,0x1c,0xe4,0x56,0xe1,0xe3,0x15,0xe1,0xe2,0xf4,0xe0,0xe1,0xe3,0xe0,
++	0x10,0x08,0x05,0xff,0xe5,0x92,0xa2,0x00,0x05,0xff,0xe5,0x93,0xb6,0x00,0xd4,0x34,
++	0xd3,0x18,0xe2,0xdd,0xe1,0xe1,0xcc,0xe1,0x10,0x09,0x05,0xff,0xf0,0xa1,0x9a,0xa8,
++	0x00,0x05,0xff,0xf0,0xa1,0x9b,0xaa,0x00,0xe2,0xfd,0xe1,0x91,0x11,0x10,0x09,0x05,
++	0xff,0xf0,0xa1,0x8d,0xaa,0x00,0x05,0xff,0xe5,0xac,0x88,0x00,0x05,0xff,0xe5,0xac,
++	0xbe,0x00,0xe3,0x43,0xe2,0xd2,0x14,0xe1,0x12,0xe2,0x10,0x08,0x05,0xff,0xe5,0xaf,
++	0xb3,0x00,0x05,0xff,0xf0,0xa1,0xac,0x98,0x00,0xe1,0x1e,0xe2,0x10,0x08,0x05,0xff,
++	0xe5,0xbc,0xb3,0x00,0x05,0xff,0xe5,0xb0,0xa2,0x00,0xd1,0xd5,0xd0,0x6a,0xcf,0x86,
++	0xe5,0x73,0xe7,0xd4,0x19,0xe3,0xac,0xe6,0xe2,0x8a,0xe6,0xe1,0x79,0xe6,0x10,0x08,
++	0x05,0xff,0xe6,0xb4,0xbe,0x00,0x05,0xff,0xe6,0xb5,0xb7,0x00,0xd3,0x18,0xe2,0xf6,
++	0xe6,0xe1,0xe5,0xe6,0x10,0x09,0x05,0xff,0xf0,0xa3,0xbd,0x9e,0x00,0x05,0xff,0xf0,
++	0xa3,0xbe,0x8e,0x00,0xd2,0x13,0xe1,0x0e,0xe7,0x10,0x08,0x05,0xff,0xe7,0x81,0xbd,
++	0x00,0x05,0xff,0xe7,0x81,0xb7,0x00,0xd1,0x11,0x10,0x08,0x05,0xff,0xe7,0x85,0x85,
++	0x00,0x05,0xff,0xf0,0xa4,0x89,0xa3,0x00,0x10,0x08,0x05,0xff,0xe7,0x86,0x9c,0x00,
++	0x05,0xff,0xe4,0x8e,0xab,0x00,0xcf,0x86,0xe5,0x10,0xe9,0xd4,0x1a,0xe3,0x48,0xe8,
++	0xe2,0x2e,0xe8,0xe1,0x1b,0xe8,0x10,0x08,0x05,0xff,0xe7,0x9b,0xb4,0x00,0x05,0xff,
++	0xf0,0xa5,0x83,0xb3,0x00,0xd3,0x16,0xe2,0x90,0xe8,0xe1,0x7e,0xe8,0x10,0x08,0x05,
++	0xff,0xe7,0xa3,0x8c,0x00,0x05,0xff,0xe4,0x83,0xa3,0x00,0xd2,0x13,0xe1,0xac,0xe8,
++	0x10,0x08,0x05,0xff,0xe4,0x84,0xaf,0x00,0x05,0xff,0xe7,0xa9,0x80,0x00,0xd1,0x12,
++	0x10,0x09,0x05,0xff,0xf0,0xa5,0xa5,0xbc,0x00,0x05,0xff,0xf0,0xa5,0xaa,0xa7,0x00,
++	0x10,0x09,0x05,0xff,0xf0,0xa5,0xaa,0xa7,0x00,0x05,0xff,0xe7,0xaa,0xae,0x00,0xe0,
++	0xc2,0xeb,0xcf,0x86,0xd5,0x1d,0xe4,0x37,0xea,0xe3,0xf3,0xe9,0xe2,0xd1,0xe9,0xe1,
++	0xc0,0xe9,0x10,0x09,0x05,0xff,0xf0,0xa3,0x8d,0x9f,0x00,0x05,0xff,0xe4,0x8f,0x95,
++	0x00,0xd4,0x19,0xe3,0xde,0xea,0xe2,0xba,0xea,0xe1,0xa9,0xea,0x10,0x08,0x05,0xff,
++	0xe8,0x8d,0x93,0x00,0x05,0xff,0xe8,0x8f,0x8a,0x00,0xd3,0x18,0xe2,0x29,0xeb,0xe1,
++	0x18,0xeb,0x10,0x09,0x05,0xff,0xf0,0xa6,0xbe,0xb1,0x00,0x05,0xff,0xf0,0xa7,0x83,
++	0x92,0x00,0xd2,0x13,0xe1,0x41,0xeb,0x10,0x08,0x05,0xff,0xe8,0x9a,0x88,0x00,0x05,
++	0xff,0xe8,0x9c,0x8e,0x00,0xd1,0x10,0x10,0x08,0x05,0xff,0xe8,0x9c,0xa8,0x00,0x05,
++	0xff,0xe8,0x9d,0xab,0x00,0x10,0x08,0x05,0xff,0xe8,0x9e,0x86,0x00,0x05,0xff,0xe4,
++	0xb5,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 	/* nfdicf_30200 */
+-	0xd7,0x07,0x66,0x84,0x05,0x01,0x00,0xc6,0xd5,0x16,0xe4,0x99,0x13,0xe3,0x63,0x0e,
+-	0xe2,0x4c,0x07,0xc1,0xe0,0x4e,0x06,0xcf,0x86,0x65,0x2d,0x06,0x01,0x00,0xd4,0x2a,
+-	0xe3,0xd0,0x35,0xe2,0x88,0x9c,0xe1,0xcd,0x2e,0xe0,0x2b,0x1b,0xcf,0x86,0xc5,0xe4,
+-	0x14,0x66,0xe3,0x5f,0x61,0xe2,0xf5,0x5e,0xe1,0x28,0x5e,0xe0,0xed,0x5d,0xcf,0x86,
+-	0xe5,0xb2,0x5d,0x64,0x95,0x5d,0x0b,0x00,0x83,0xe2,0xa7,0xf3,0xe1,0x80,0xf0,0xe0,
+-	0xfd,0xee,0xcf,0x86,0xd5,0x31,0xc4,0xe3,0xe2,0x47,0xe2,0x83,0x46,0xe1,0x32,0xc6,
+-	0xe0,0x2a,0x45,0xcf,0x86,0xe5,0x1c,0x43,0xe4,0x3d,0x40,0xe3,0x9f,0xb6,0xe2,0xf6,
+-	0xb5,0xe1,0xd1,0xb5,0xe0,0xaa,0xb5,0xcf,0x86,0xe5,0x77,0xb5,0x94,0x07,0x63,0x62,
+-	0xb5,0x07,0x00,0x07,0x00,0xe4,0x69,0xee,0xd3,0x08,0xcf,0x86,0xcf,0x06,0x05,0x00,
+-	0xd2,0x0b,0xe1,0x78,0xdb,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd1,0x0e,0xe0,0x67,0xdc,
+-	0xcf,0x86,0xe5,0x2c,0xdc,0xcf,0x06,0x11,0x00,0xd0,0x0b,0xcf,0x86,0xe5,0x67,0xdc,
+-	0xcf,0x06,0x13,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x00,0x00,0xe4,0x02,0xee,0xe3,
+-	0xeb,0xec,0xd2,0xa0,0xe1,0xa1,0xe0,0xd0,0x21,0xcf,0x86,0xe5,0xa2,0xdd,0xe4,0x1e,
+-	0xdd,0xe3,0xdc,0xdc,0xe2,0xbb,0xdc,0xe1,0xa9,0xdc,0x10,0x08,0x05,0xff,0xe4,0xb8,
+-	0xbd,0x00,0x05,0xff,0xe4,0xb8,0xb8,0x00,0xcf,0x86,0xd5,0x1c,0xe4,0xfe,0xde,0xe3,
+-	0xbd,0xde,0xe2,0x9c,0xde,0xe1,0x8b,0xde,0x10,0x08,0x05,0xff,0xe5,0x92,0xa2,0x00,
+-	0x05,0xff,0xe5,0x93,0xb6,0x00,0xd4,0x34,0xd3,0x18,0xe2,0x85,0xdf,0xe1,0x74,0xdf,
++	0xd7,0x07,0x66,0x84,0x05,0x01,0x00,0xc6,0xd5,0x16,0xe4,0x96,0x13,0xe3,0x60,0x0e,
++	0xe2,0x49,0x07,0xc1,0xe0,0x4b,0x06,0xcf,0x86,0x65,0x2d,0x06,0x01,0x00,0xd4,0x2a,
++	0xe3,0xce,0x35,0xe2,0x02,0x9c,0xe1,0xca,0x2e,0xe0,0x28,0x1b,0xcf,0x86,0xc5,0xe4,
++	0xf9,0x65,0xe3,0x44,0x61,0xe2,0xda,0x5e,0xe1,0x0d,0x5e,0xe0,0xd2,0x5d,0xcf,0x86,
++	0xe5,0x97,0x5d,0x64,0x7a,0x5d,0x0b,0x00,0x83,0xe2,0xf6,0xf2,0xe1,0xe0,0xef,0xe0,
++	0x5d,0xee,0xcf,0x86,0xd5,0x31,0xc4,0xe3,0xdf,0x47,0xe2,0x80,0x46,0xe1,0x97,0xc5,
++	0xe0,0x27,0x45,0xcf,0x86,0xe5,0x19,0x43,0xe4,0x3a,0x40,0xe3,0x04,0xb6,0xe2,0x5b,
++	0xb5,0xe1,0x36,0xb5,0xe0,0x0f,0xb5,0xcf,0x86,0xe5,0xdc,0xb4,0x94,0x07,0x63,0xc7,
++	0xb4,0x07,0x00,0x07,0x00,0xe4,0xc9,0xed,0xd3,0x08,0xcf,0x86,0xcf,0x06,0x05,0x00,
++	0xd2,0x0b,0xe1,0xd8,0xda,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd1,0x0e,0xe0,0xc7,0xdb,
++	0xcf,0x86,0xe5,0x8c,0xdb,0xcf,0x06,0x11,0x00,0xd0,0x0b,0xcf,0x86,0xe5,0xc7,0xdb,
++	0xcf,0x06,0x13,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x00,0x00,0xe4,0x62,0xed,0xe3,
++	0x4b,0xec,0xd2,0xa0,0xe1,0x01,0xe0,0xd0,0x21,0xcf,0x86,0xe5,0x02,0xdd,0xe4,0x7e,
++	0xdc,0xe3,0x3c,0xdc,0xe2,0x1b,0xdc,0xe1,0x09,0xdc,0x10,0x08,0x05,0xff,0xe4,0xb8,
++	0xbd,0x00,0x05,0xff,0xe4,0xb8,0xb8,0x00,0xcf,0x86,0xd5,0x1c,0xe4,0x5e,0xde,0xe3,
++	0x1d,0xde,0xe2,0xfc,0xdd,0xe1,0xeb,0xdd,0x10,0x08,0x05,0xff,0xe5,0x92,0xa2,0x00,
++	0x05,0xff,0xe5,0x93,0xb6,0x00,0xd4,0x34,0xd3,0x18,0xe2,0xe5,0xde,0xe1,0xd4,0xde,
+ 	0x10,0x09,0x05,0xff,0xf0,0xa1,0x9a,0xa8,0x00,0x05,0xff,0xf0,0xa1,0x9b,0xaa,0x00,
+-	0xe2,0xa5,0xdf,0x91,0x11,0x10,0x09,0x05,0xff,0xf0,0xa1,0x8d,0xaa,0x00,0x05,0xff,
+-	0xe5,0xac,0x88,0x00,0x05,0xff,0xe5,0xac,0xbe,0x00,0xe3,0xeb,0xdf,0xd2,0x14,0xe1,
+-	0xba,0xdf,0x10,0x08,0x05,0xff,0xe5,0xaf,0xb3,0x00,0x05,0xff,0xf0,0xa1,0xac,0x98,
+-	0x00,0xe1,0xc6,0xdf,0x10,0x08,0x05,0xff,0xe5,0xbc,0xb3,0x00,0x05,0xff,0xe5,0xb0,
+-	0xa2,0x00,0xd1,0xd5,0xd0,0x6a,0xcf,0x86,0xe5,0x1b,0xe5,0xd4,0x19,0xe3,0x54,0xe4,
+-	0xe2,0x32,0xe4,0xe1,0x21,0xe4,0x10,0x08,0x05,0xff,0xe6,0xb4,0xbe,0x00,0x05,0xff,
+-	0xe6,0xb5,0xb7,0x00,0xd3,0x18,0xe2,0x9e,0xe4,0xe1,0x8d,0xe4,0x10,0x09,0x05,0xff,
+-	0xf0,0xa3,0xbd,0x9e,0x00,0x05,0xff,0xf0,0xa3,0xbe,0x8e,0x00,0xd2,0x13,0xe1,0xb6,
++	0xe2,0x05,0xdf,0x91,0x11,0x10,0x09,0x05,0xff,0xf0,0xa1,0x8d,0xaa,0x00,0x05,0xff,
++	0xe5,0xac,0x88,0x00,0x05,0xff,0xe5,0xac,0xbe,0x00,0xe3,0x4b,0xdf,0xd2,0x14,0xe1,
++	0x1a,0xdf,0x10,0x08,0x05,0xff,0xe5,0xaf,0xb3,0x00,0x05,0xff,0xf0,0xa1,0xac,0x98,
++	0x00,0xe1,0x26,0xdf,0x10,0x08,0x05,0xff,0xe5,0xbc,0xb3,0x00,0x05,0xff,0xe5,0xb0,
++	0xa2,0x00,0xd1,0xd5,0xd0,0x6a,0xcf,0x86,0xe5,0x7b,0xe4,0xd4,0x19,0xe3,0xb4,0xe3,
++	0xe2,0x92,0xe3,0xe1,0x81,0xe3,0x10,0x08,0x05,0xff,0xe6,0xb4,0xbe,0x00,0x05,0xff,
++	0xe6,0xb5,0xb7,0x00,0xd3,0x18,0xe2,0xfe,0xe3,0xe1,0xed,0xe3,0x10,0x09,0x05,0xff,
++	0xf0,0xa3,0xbd,0x9e,0x00,0x05,0xff,0xf0,0xa3,0xbe,0x8e,0x00,0xd2,0x13,0xe1,0x16,
+ 	0xe4,0x10,0x08,0x05,0xff,0xe7,0x81,0xbd,0x00,0x05,0xff,0xe7,0x81,0xb7,0x00,0xd1,
+ 	0x11,0x10,0x08,0x05,0xff,0xe7,0x85,0x85,0x00,0x05,0xff,0xf0,0xa4,0x89,0xa3,0x00,
+ 	0x10,0x08,0x05,0xff,0xe7,0x86,0x9c,0x00,0x05,0xff,0xe4,0x8e,0xab,0x00,0xcf,0x86,
+-	0xe5,0xb8,0xe6,0xd4,0x1a,0xe3,0xf0,0xe5,0xe2,0xd6,0xe5,0xe1,0xc3,0xe5,0x10,0x08,
++	0xe5,0x18,0xe6,0xd4,0x1a,0xe3,0x50,0xe5,0xe2,0x36,0xe5,0xe1,0x23,0xe5,0x10,0x08,
+ 	0x05,0xff,0xe7,0x9b,0xb4,0x00,0x05,0xff,0xf0,0xa5,0x83,0xb3,0x00,0xd3,0x16,0xe2,
+-	0x38,0xe6,0xe1,0x26,0xe6,0x10,0x08,0x05,0xff,0xe7,0xa3,0x8c,0x00,0x05,0xff,0xe4,
+-	0x83,0xa3,0x00,0xd2,0x13,0xe1,0x54,0xe6,0x10,0x08,0x05,0xff,0xe4,0x84,0xaf,0x00,
++	0x98,0xe5,0xe1,0x86,0xe5,0x10,0x08,0x05,0xff,0xe7,0xa3,0x8c,0x00,0x05,0xff,0xe4,
++	0x83,0xa3,0x00,0xd2,0x13,0xe1,0xb4,0xe5,0x10,0x08,0x05,0xff,0xe4,0x84,0xaf,0x00,
+ 	0x05,0xff,0xe7,0xa9,0x80,0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0xa5,0xa5,0xbc,
+ 	0x00,0x05,0xff,0xf0,0xa5,0xaa,0xa7,0x00,0x10,0x09,0x05,0xff,0xf0,0xa5,0xaa,0xa7,
+-	0x00,0x05,0xff,0xe7,0xaa,0xae,0x00,0xe0,0x6a,0xe9,0xcf,0x86,0xd5,0x1d,0xe4,0xdf,
+-	0xe7,0xe3,0x9b,0xe7,0xe2,0x79,0xe7,0xe1,0x68,0xe7,0x10,0x09,0x05,0xff,0xf0,0xa3,
+-	0x8d,0x9f,0x00,0x05,0xff,0xe4,0x8f,0x95,0x00,0xd4,0x19,0xe3,0x86,0xe8,0xe2,0x62,
+-	0xe8,0xe1,0x51,0xe8,0x10,0x08,0x05,0xff,0xe8,0x8d,0x93,0x00,0x05,0xff,0xe8,0x8f,
+-	0x8a,0x00,0xd3,0x18,0xe2,0xd1,0xe8,0xe1,0xc0,0xe8,0x10,0x09,0x05,0xff,0xf0,0xa6,
+-	0xbe,0xb1,0x00,0x05,0xff,0xf0,0xa7,0x83,0x92,0x00,0xd2,0x13,0xe1,0xe9,0xe8,0x10,
++	0x00,0x05,0xff,0xe7,0xaa,0xae,0x00,0xe0,0xca,0xe8,0xcf,0x86,0xd5,0x1d,0xe4,0x3f,
++	0xe7,0xe3,0xfb,0xe6,0xe2,0xd9,0xe6,0xe1,0xc8,0xe6,0x10,0x09,0x05,0xff,0xf0,0xa3,
++	0x8d,0x9f,0x00,0x05,0xff,0xe4,0x8f,0x95,0x00,0xd4,0x19,0xe3,0xe6,0xe7,0xe2,0xc2,
++	0xe7,0xe1,0xb1,0xe7,0x10,0x08,0x05,0xff,0xe8,0x8d,0x93,0x00,0x05,0xff,0xe8,0x8f,
++	0x8a,0x00,0xd3,0x18,0xe2,0x31,0xe8,0xe1,0x20,0xe8,0x10,0x09,0x05,0xff,0xf0,0xa6,
++	0xbe,0xb1,0x00,0x05,0xff,0xf0,0xa7,0x83,0x92,0x00,0xd2,0x13,0xe1,0x49,0xe8,0x10,
+ 	0x08,0x05,0xff,0xe8,0x9a,0x88,0x00,0x05,0xff,0xe8,0x9c,0x8e,0x00,0xd1,0x10,0x10,
+ 	0x08,0x05,0xff,0xe8,0x9c,0xa8,0x00,0x05,0xff,0xe8,0x9d,0xab,0x00,0x10,0x08,0x05,
+ 	0xff,0xe8,0x9e,0x86,0x00,0x05,0xff,0xe4,0xb5,0x97,0x00,0x00,0x00,0x00,0x00,0x00,
+ 	/* nfdi_30200 */
+-	0x57,0x04,0x01,0x00,0xc6,0xd5,0x16,0xe4,0x82,0x53,0xe3,0xbb,0x4e,0xe2,0x34,0x49,
+-	0xc1,0xe0,0x60,0x47,0xcf,0x86,0x65,0x44,0x47,0x01,0x00,0xd4,0x2a,0xe3,0x1c,0x9a,
+-	0xe2,0xcb,0x99,0xe1,0x9e,0x87,0xe0,0xf8,0x6a,0xcf,0x86,0xc5,0xe4,0x57,0x63,0xe3,
+-	0xa2,0x5e,0xe2,0x38,0x5c,0xe1,0x6b,0x5b,0xe0,0x30,0x5b,0xcf,0x86,0xe5,0xf5,0x5a,
+-	0x64,0xd8,0x5a,0x0b,0x00,0x83,0xe2,0xea,0xf0,0xe1,0xc3,0xed,0xe0,0x40,0xec,0xcf,
+-	0x86,0xd5,0x31,0xc4,0xe3,0xbb,0xc6,0xe2,0x94,0xc4,0xe1,0x75,0xc3,0xe0,0x05,0xba,
+-	0xcf,0x86,0xe5,0xf8,0xb5,0xe4,0xf1,0xb4,0xe3,0xe2,0xb3,0xe2,0x39,0xb3,0xe1,0x14,
+-	0xb3,0xe0,0xed,0xb2,0xcf,0x86,0xe5,0xba,0xb2,0x94,0x07,0x63,0xa5,0xb2,0x07,0x00,
+-	0x07,0x00,0xe4,0xac,0xeb,0xd3,0x08,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd2,0x0b,0xe1,
+-	0xbb,0xd8,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd1,0x0e,0xe0,0xaa,0xd9,0xcf,0x86,0xe5,
+-	0x6f,0xd9,0xcf,0x06,0x11,0x00,0xd0,0x0b,0xcf,0x86,0xe5,0xaa,0xd9,0xcf,0x06,0x13,
+-	0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x00,0x00,0xe4,0x45,0xeb,0xe3,0x2e,0xea,0xd2,
+-	0xa0,0xe1,0xe4,0xdd,0xd0,0x21,0xcf,0x86,0xe5,0xe5,0xda,0xe4,0x61,0xda,0xe3,0x1f,
+-	0xda,0xe2,0xfe,0xd9,0xe1,0xec,0xd9,0x10,0x08,0x05,0xff,0xe4,0xb8,0xbd,0x00,0x05,
+-	0xff,0xe4,0xb8,0xb8,0x00,0xcf,0x86,0xd5,0x1c,0xe4,0x41,0xdc,0xe3,0x00,0xdc,0xe2,
+-	0xdf,0xdb,0xe1,0xce,0xdb,0x10,0x08,0x05,0xff,0xe5,0x92,0xa2,0x00,0x05,0xff,0xe5,
+-	0x93,0xb6,0x00,0xd4,0x34,0xd3,0x18,0xe2,0xc8,0xdc,0xe1,0xb7,0xdc,0x10,0x09,0x05,
+-	0xff,0xf0,0xa1,0x9a,0xa8,0x00,0x05,0xff,0xf0,0xa1,0x9b,0xaa,0x00,0xe2,0xe8,0xdc,
+-	0x91,0x11,0x10,0x09,0x05,0xff,0xf0,0xa1,0x8d,0xaa,0x00,0x05,0xff,0xe5,0xac,0x88,
+-	0x00,0x05,0xff,0xe5,0xac,0xbe,0x00,0xe3,0x2e,0xdd,0xd2,0x14,0xe1,0xfd,0xdc,0x10,
+-	0x08,0x05,0xff,0xe5,0xaf,0xb3,0x00,0x05,0xff,0xf0,0xa1,0xac,0x98,0x00,0xe1,0x09,
+-	0xdd,0x10,0x08,0x05,0xff,0xe5,0xbc,0xb3,0x00,0x05,0xff,0xe5,0xb0,0xa2,0x00,0xd1,
+-	0xd5,0xd0,0x6a,0xcf,0x86,0xe5,0x5e,0xe2,0xd4,0x19,0xe3,0x97,0xe1,0xe2,0x75,0xe1,
+-	0xe1,0x64,0xe1,0x10,0x08,0x05,0xff,0xe6,0xb4,0xbe,0x00,0x05,0xff,0xe6,0xb5,0xb7,
+-	0x00,0xd3,0x18,0xe2,0xe1,0xe1,0xe1,0xd0,0xe1,0x10,0x09,0x05,0xff,0xf0,0xa3,0xbd,
+-	0x9e,0x00,0x05,0xff,0xf0,0xa3,0xbe,0x8e,0x00,0xd2,0x13,0xe1,0xf9,0xe1,0x10,0x08,
+-	0x05,0xff,0xe7,0x81,0xbd,0x00,0x05,0xff,0xe7,0x81,0xb7,0x00,0xd1,0x11,0x10,0x08,
+-	0x05,0xff,0xe7,0x85,0x85,0x00,0x05,0xff,0xf0,0xa4,0x89,0xa3,0x00,0x10,0x08,0x05,
+-	0xff,0xe7,0x86,0x9c,0x00,0x05,0xff,0xe4,0x8e,0xab,0x00,0xcf,0x86,0xe5,0xfb,0xe3,
+-	0xd4,0x1a,0xe3,0x33,0xe3,0xe2,0x19,0xe3,0xe1,0x06,0xe3,0x10,0x08,0x05,0xff,0xe7,
+-	0x9b,0xb4,0x00,0x05,0xff,0xf0,0xa5,0x83,0xb3,0x00,0xd3,0x16,0xe2,0x7b,0xe3,0xe1,
+-	0x69,0xe3,0x10,0x08,0x05,0xff,0xe7,0xa3,0x8c,0x00,0x05,0xff,0xe4,0x83,0xa3,0x00,
+-	0xd2,0x13,0xe1,0x97,0xe3,0x10,0x08,0x05,0xff,0xe4,0x84,0xaf,0x00,0x05,0xff,0xe7,
+-	0xa9,0x80,0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0xa5,0xa5,0xbc,0x00,0x05,0xff,
+-	0xf0,0xa5,0xaa,0xa7,0x00,0x10,0x09,0x05,0xff,0xf0,0xa5,0xaa,0xa7,0x00,0x05,0xff,
+-	0xe7,0xaa,0xae,0x00,0xe0,0xad,0xe6,0xcf,0x86,0xd5,0x1d,0xe4,0x22,0xe5,0xe3,0xde,
+-	0xe4,0xe2,0xbc,0xe4,0xe1,0xab,0xe4,0x10,0x09,0x05,0xff,0xf0,0xa3,0x8d,0x9f,0x00,
+-	0x05,0xff,0xe4,0x8f,0x95,0x00,0xd4,0x19,0xe3,0xc9,0xe5,0xe2,0xa5,0xe5,0xe1,0x94,
+-	0xe5,0x10,0x08,0x05,0xff,0xe8,0x8d,0x93,0x00,0x05,0xff,0xe8,0x8f,0x8a,0x00,0xd3,
+-	0x18,0xe2,0x14,0xe6,0xe1,0x03,0xe6,0x10,0x09,0x05,0xff,0xf0,0xa6,0xbe,0xb1,0x00,
+-	0x05,0xff,0xf0,0xa7,0x83,0x92,0x00,0xd2,0x13,0xe1,0x2c,0xe6,0x10,0x08,0x05,0xff,
+-	0xe8,0x9a,0x88,0x00,0x05,0xff,0xe8,0x9c,0x8e,0x00,0xd1,0x10,0x10,0x08,0x05,0xff,
+-	0xe8,0x9c,0xa8,0x00,0x05,0xff,0xe8,0x9d,0xab,0x00,0x10,0x08,0x05,0xff,0xe8,0x9e,
+-	0x86,0x00,0x05,0xff,0xe4,0xb5,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++	0x57,0x04,0x01,0x00,0xc6,0xd5,0x13,0xe4,0x68,0x53,0xe3,0xa2,0x4e,0xe2,0x1b,0x49,
++	0xc1,0xe0,0x47,0x47,0xcf,0x06,0x01,0x00,0xd4,0x2a,0xe3,0x99,0x99,0xe2,0x48,0x99,
++	0xe1,0x50,0x87,0xe0,0xe0,0x6a,0xcf,0x86,0xc5,0xe4,0x3f,0x63,0xe3,0x8a,0x5e,0xe2,
++	0x20,0x5c,0xe1,0x53,0x5b,0xe0,0x18,0x5b,0xcf,0x86,0xe5,0xdd,0x5a,0x64,0xc0,0x5a,
++	0x0b,0x00,0x83,0xe2,0x3c,0xf0,0xe1,0x26,0xed,0xe0,0xa3,0xeb,0xcf,0x86,0xd5,0x31,
++	0xc4,0xe3,0x23,0xc6,0xe2,0xfc,0xc3,0xe1,0xdd,0xc2,0xe0,0x6d,0xb9,0xcf,0x86,0xe5,
++	0x60,0xb5,0xe4,0x59,0xb4,0xe3,0x4a,0xb3,0xe2,0xa1,0xb2,0xe1,0x7c,0xb2,0xe0,0x55,
++	0xb2,0xcf,0x86,0xe5,0x22,0xb2,0x94,0x07,0x63,0x0d,0xb2,0x07,0x00,0x07,0x00,0xe4,
++	0x0f,0xeb,0xd3,0x08,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd2,0x0b,0xe1,0x1e,0xd8,0xcf,
++	0x86,0xcf,0x06,0x05,0x00,0xd1,0x0e,0xe0,0x0d,0xd9,0xcf,0x86,0xe5,0xd2,0xd8,0xcf,
++	0x06,0x11,0x00,0xd0,0x0b,0xcf,0x86,0xe5,0x0d,0xd9,0xcf,0x06,0x13,0x00,0xcf,0x86,
++	0xd5,0x06,0xcf,0x06,0x00,0x00,0xe4,0xa8,0xea,0xe3,0x91,0xe9,0xd2,0xa0,0xe1,0x47,
++	0xdd,0xd0,0x21,0xcf,0x86,0xe5,0x48,0xda,0xe4,0xc4,0xd9,0xe3,0x82,0xd9,0xe2,0x61,
++	0xd9,0xe1,0x4f,0xd9,0x10,0x08,0x05,0xff,0xe4,0xb8,0xbd,0x00,0x05,0xff,0xe4,0xb8,
++	0xb8,0x00,0xcf,0x86,0xd5,0x1c,0xe4,0xa4,0xdb,0xe3,0x63,0xdb,0xe2,0x42,0xdb,0xe1,
++	0x31,0xdb,0x10,0x08,0x05,0xff,0xe5,0x92,0xa2,0x00,0x05,0xff,0xe5,0x93,0xb6,0x00,
++	0xd4,0x34,0xd3,0x18,0xe2,0x2b,0xdc,0xe1,0x1a,0xdc,0x10,0x09,0x05,0xff,0xf0,0xa1,
++	0x9a,0xa8,0x00,0x05,0xff,0xf0,0xa1,0x9b,0xaa,0x00,0xe2,0x4b,0xdc,0x91,0x11,0x10,
++	0x09,0x05,0xff,0xf0,0xa1,0x8d,0xaa,0x00,0x05,0xff,0xe5,0xac,0x88,0x00,0x05,0xff,
++	0xe5,0xac,0xbe,0x00,0xe3,0x91,0xdc,0xd2,0x14,0xe1,0x60,0xdc,0x10,0x08,0x05,0xff,
++	0xe5,0xaf,0xb3,0x00,0x05,0xff,0xf0,0xa1,0xac,0x98,0x00,0xe1,0x6c,0xdc,0x10,0x08,
++	0x05,0xff,0xe5,0xbc,0xb3,0x00,0x05,0xff,0xe5,0xb0,0xa2,0x00,0xd1,0xd5,0xd0,0x6a,
++	0xcf,0x86,0xe5,0xc1,0xe1,0xd4,0x19,0xe3,0xfa,0xe0,0xe2,0xd8,0xe0,0xe1,0xc7,0xe0,
++	0x10,0x08,0x05,0xff,0xe6,0xb4,0xbe,0x00,0x05,0xff,0xe6,0xb5,0xb7,0x00,0xd3,0x18,
++	0xe2,0x44,0xe1,0xe1,0x33,0xe1,0x10,0x09,0x05,0xff,0xf0,0xa3,0xbd,0x9e,0x00,0x05,
++	0xff,0xf0,0xa3,0xbe,0x8e,0x00,0xd2,0x13,0xe1,0x5c,0xe1,0x10,0x08,0x05,0xff,0xe7,
++	0x81,0xbd,0x00,0x05,0xff,0xe7,0x81,0xb7,0x00,0xd1,0x11,0x10,0x08,0x05,0xff,0xe7,
++	0x85,0x85,0x00,0x05,0xff,0xf0,0xa4,0x89,0xa3,0x00,0x10,0x08,0x05,0xff,0xe7,0x86,
++	0x9c,0x00,0x05,0xff,0xe4,0x8e,0xab,0x00,0xcf,0x86,0xe5,0x5e,0xe3,0xd4,0x1a,0xe3,
++	0x96,0xe2,0xe2,0x7c,0xe2,0xe1,0x69,0xe2,0x10,0x08,0x05,0xff,0xe7,0x9b,0xb4,0x00,
++	0x05,0xff,0xf0,0xa5,0x83,0xb3,0x00,0xd3,0x16,0xe2,0xde,0xe2,0xe1,0xcc,0xe2,0x10,
++	0x08,0x05,0xff,0xe7,0xa3,0x8c,0x00,0x05,0xff,0xe4,0x83,0xa3,0x00,0xd2,0x13,0xe1,
++	0xfa,0xe2,0x10,0x08,0x05,0xff,0xe4,0x84,0xaf,0x00,0x05,0xff,0xe7,0xa9,0x80,0x00,
++	0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0xa5,0xa5,0xbc,0x00,0x05,0xff,0xf0,0xa5,0xaa,
++	0xa7,0x00,0x10,0x09,0x05,0xff,0xf0,0xa5,0xaa,0xa7,0x00,0x05,0xff,0xe7,0xaa,0xae,
++	0x00,0xe0,0x10,0xe6,0xcf,0x86,0xd5,0x1d,0xe4,0x85,0xe4,0xe3,0x41,0xe4,0xe2,0x1f,
++	0xe4,0xe1,0x0e,0xe4,0x10,0x09,0x05,0xff,0xf0,0xa3,0x8d,0x9f,0x00,0x05,0xff,0xe4,
++	0x8f,0x95,0x00,0xd4,0x19,0xe3,0x2c,0xe5,0xe2,0x08,0xe5,0xe1,0xf7,0xe4,0x10,0x08,
++	0x05,0xff,0xe8,0x8d,0x93,0x00,0x05,0xff,0xe8,0x8f,0x8a,0x00,0xd3,0x18,0xe2,0x77,
++	0xe5,0xe1,0x66,0xe5,0x10,0x09,0x05,0xff,0xf0,0xa6,0xbe,0xb1,0x00,0x05,0xff,0xf0,
++	0xa7,0x83,0x92,0x00,0xd2,0x13,0xe1,0x8f,0xe5,0x10,0x08,0x05,0xff,0xe8,0x9a,0x88,
++	0x00,0x05,0xff,0xe8,0x9c,0x8e,0x00,0xd1,0x10,0x10,0x08,0x05,0xff,0xe8,0x9c,0xa8,
++	0x00,0x05,0xff,0xe8,0x9d,0xab,0x00,0x10,0x08,0x05,0xff,0xe8,0x9e,0x86,0x00,0x05,
++	0xff,0xe4,0xb5,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 	/* nfdicf_c0100 */
+ 	0xd7,0xb0,0x56,0x04,0x01,0x00,0x95,0xa8,0xd4,0x5e,0xd3,0x2e,0xd2,0x16,0xd1,0x0a,
+ 	0x10,0x04,0x01,0x00,0x01,0xff,0x61,0x00,0x10,0x06,0x01,0xff,0x62,0x00,0x01,0xff,
+@@ -299,3184 +299,3174 @@ static const unsigned char utf8data[64256] = {
+ 	0xd1,0x0c,0x10,0x06,0x01,0xff,0x74,0x00,0x01,0xff,0x75,0x00,0x10,0x06,0x01,0xff,
+ 	0x76,0x00,0x01,0xff,0x77,0x00,0x92,0x16,0xd1,0x0c,0x10,0x06,0x01,0xff,0x78,0x00,
+ 	0x01,0xff,0x79,0x00,0x10,0x06,0x01,0xff,0x7a,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
+-	0xc6,0xe5,0xf9,0x14,0xe4,0x6f,0x0d,0xe3,0x39,0x08,0xe2,0x22,0x01,0xc1,0xd0,0x24,
+-	0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x07,0x63,0xd8,0x43,0x01,0x00,0x93,0x13,0x52,
+-	0x04,0x01,0x00,0x91,0x0b,0x10,0x04,0x01,0x00,0x01,0xff,0xce,0xbc,0x00,0x01,0x00,
+-	0x01,0x00,0xcf,0x86,0xe5,0xb3,0x44,0xd4,0x7f,0xd3,0x3f,0xd2,0x20,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0x61,0xcc,0x80,0x00,0x01,0xff,0x61,0xcc,0x81,0x00,0x10,0x08,0x01,
+-	0xff,0x61,0xcc,0x82,0x00,0x01,0xff,0x61,0xcc,0x83,0x00,0xd1,0x10,0x10,0x08,0x01,
+-	0xff,0x61,0xcc,0x88,0x00,0x01,0xff,0x61,0xcc,0x8a,0x00,0x10,0x07,0x01,0xff,0xc3,
+-	0xa6,0x00,0x01,0xff,0x63,0xcc,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
+-	0x65,0xcc,0x80,0x00,0x01,0xff,0x65,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,
+-	0x82,0x00,0x01,0xff,0x65,0xcc,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,0xcc,
+-	0x80,0x00,0x01,0xff,0x69,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x69,0xcc,0x82,0x00,
+-	0x01,0xff,0x69,0xcc,0x88,0x00,0xd3,0x3b,0xd2,0x1f,0xd1,0x0f,0x10,0x07,0x01,0xff,
+-	0xc3,0xb0,0x00,0x01,0xff,0x6e,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x80,
+-	0x00,0x01,0xff,0x6f,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x82,
+-	0x00,0x01,0xff,0x6f,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x88,0x00,0x01,
+-	0x00,0xd2,0x1f,0xd1,0x0f,0x10,0x07,0x01,0xff,0xc3,0xb8,0x00,0x01,0xff,0x75,0xcc,
+-	0x80,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0x81,0x00,0x01,0xff,0x75,0xcc,0x82,0x00,
+-	0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0x88,0x00,0x01,0xff,0x79,0xcc,0x81,0x00,
+-	0x10,0x07,0x01,0xff,0xc3,0xbe,0x00,0x01,0xff,0x73,0x73,0x00,0xe1,0xd4,0x03,0xe0,
+-	0xeb,0x01,0xcf,0x86,0xd5,0xfb,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x01,0xff,0x61,0xcc,0x84,0x00,0x01,0xff,0x61,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,
+-	0x61,0xcc,0x86,0x00,0x01,0xff,0x61,0xcc,0x86,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
+-	0x61,0xcc,0xa8,0x00,0x01,0xff,0x61,0xcc,0xa8,0x00,0x10,0x08,0x01,0xff,0x63,0xcc,
+-	0x81,0x00,0x01,0xff,0x63,0xcc,0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
+-	0x63,0xcc,0x82,0x00,0x01,0xff,0x63,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x63,0xcc,
+-	0x87,0x00,0x01,0xff,0x63,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x63,0xcc,
+-	0x8c,0x00,0x01,0xff,0x63,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x64,0xcc,0x8c,0x00,
+-	0x01,0xff,0x64,0xcc,0x8c,0x00,0xd3,0x3b,0xd2,0x1b,0xd1,0x0b,0x10,0x07,0x01,0xff,
+-	0xc4,0x91,0x00,0x01,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,0x84,0x00,0x01,0xff,0x65,
+-	0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0x86,0x00,0x01,0xff,0x65,
+-	0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,0x87,0x00,0x01,0xff,0x65,0xcc,0x87,
+-	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0xa8,0x00,0x01,0xff,0x65,
+-	0xcc,0xa8,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,0x8c,0x00,0x01,0xff,0x65,0xcc,0x8c,
+-	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x67,0xcc,0x82,0x00,0x01,0xff,0x67,0xcc,0x82,
+-	0x00,0x10,0x08,0x01,0xff,0x67,0xcc,0x86,0x00,0x01,0xff,0x67,0xcc,0x86,0x00,0xd4,
+-	0x7b,0xd3,0x3b,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x67,0xcc,0x87,0x00,0x01,
+-	0xff,0x67,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x67,0xcc,0xa7,0x00,0x01,0xff,0x67,
+-	0xcc,0xa7,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x68,0xcc,0x82,0x00,0x01,0xff,0x68,
+-	0xcc,0x82,0x00,0x10,0x07,0x01,0xff,0xc4,0xa7,0x00,0x01,0x00,0xd2,0x20,0xd1,0x10,
+-	0x10,0x08,0x01,0xff,0x69,0xcc,0x83,0x00,0x01,0xff,0x69,0xcc,0x83,0x00,0x10,0x08,
+-	0x01,0xff,0x69,0xcc,0x84,0x00,0x01,0xff,0x69,0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,
+-	0x01,0xff,0x69,0xcc,0x86,0x00,0x01,0xff,0x69,0xcc,0x86,0x00,0x10,0x08,0x01,0xff,
+-	0x69,0xcc,0xa8,0x00,0x01,0xff,0x69,0xcc,0xa8,0x00,0xd3,0x37,0xd2,0x17,0xd1,0x0c,
+-	0x10,0x08,0x01,0xff,0x69,0xcc,0x87,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xc4,0xb3,
+-	0x00,0x01,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6a,0xcc,0x82,0x00,0x01,0xff,0x6a,
+-	0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x6b,0xcc,0xa7,0x00,0x01,0xff,0x6b,0xcc,0xa7,
+-	0x00,0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x6c,0xcc,0x81,0x00,0x10,
+-	0x08,0x01,0xff,0x6c,0xcc,0x81,0x00,0x01,0xff,0x6c,0xcc,0xa7,0x00,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0x6c,0xcc,0xa7,0x00,0x01,0xff,0x6c,0xcc,0x8c,0x00,0x10,0x08,0x01,
+-	0xff,0x6c,0xcc,0x8c,0x00,0x01,0xff,0xc5,0x80,0x00,0xcf,0x86,0xd5,0xed,0xd4,0x72,
+-	0xd3,0x37,0xd2,0x17,0xd1,0x0b,0x10,0x04,0x01,0x00,0x01,0xff,0xc5,0x82,0x00,0x10,
+-	0x04,0x01,0x00,0x01,0xff,0x6e,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,
+-	0xcc,0x81,0x00,0x01,0xff,0x6e,0xcc,0xa7,0x00,0x10,0x08,0x01,0xff,0x6e,0xcc,0xa7,
+-	0x00,0x01,0xff,0x6e,0xcc,0x8c,0x00,0xd2,0x1b,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,
+-	0xcc,0x8c,0x00,0x01,0xff,0xca,0xbc,0x6e,0x00,0x10,0x07,0x01,0xff,0xc5,0x8b,0x00,
+-	0x01,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x84,0x00,0x01,0xff,0x6f,0xcc,
+-	0x84,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x86,0x00,0x01,0xff,0x6f,0xcc,0x86,0x00,
+-	0xd3,0x3b,0xd2,0x1b,0xd1,0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x8b,0x00,0x01,0xff,
+-	0x6f,0xcc,0x8b,0x00,0x10,0x07,0x01,0xff,0xc5,0x93,0x00,0x01,0x00,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0x72,0xcc,0x81,0x00,0x01,0xff,0x72,0xcc,0x81,0x00,0x10,0x08,0x01,
+-	0xff,0x72,0xcc,0xa7,0x00,0x01,0xff,0x72,0xcc,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0x72,0xcc,0x8c,0x00,0x01,0xff,0x72,0xcc,0x8c,0x00,0x10,0x08,0x01,
+-	0xff,0x73,0xcc,0x81,0x00,0x01,0xff,0x73,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,
+-	0xff,0x73,0xcc,0x82,0x00,0x01,0xff,0x73,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x73,
+-	0xcc,0xa7,0x00,0x01,0xff,0x73,0xcc,0xa7,0x00,0xd4,0x7b,0xd3,0x3b,0xd2,0x20,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0x73,0xcc,0x8c,0x00,0x01,0xff,0x73,0xcc,0x8c,0x00,0x10,
+-	0x08,0x01,0xff,0x74,0xcc,0xa7,0x00,0x01,0xff,0x74,0xcc,0xa7,0x00,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0x74,0xcc,0x8c,0x00,0x01,0xff,0x74,0xcc,0x8c,0x00,0x10,0x07,0x01,
+-	0xff,0xc5,0xa7,0x00,0x01,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,
+-	0x83,0x00,0x01,0xff,0x75,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0x84,0x00,
+-	0x01,0xff,0x75,0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0x86,0x00,
+-	0x01,0xff,0x75,0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0x8a,0x00,0x01,0xff,
+-	0x75,0xcc,0x8a,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,
+-	0x8b,0x00,0x01,0xff,0x75,0xcc,0x8b,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0xa8,0x00,
+-	0x01,0xff,0x75,0xcc,0xa8,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x82,0x00,
+-	0x01,0xff,0x77,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x79,0xcc,0x82,0x00,0x01,0xff,
+-	0x79,0xcc,0x82,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x79,0xcc,0x88,0x00,
+-	0x01,0xff,0x7a,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0x81,0x00,0x01,0xff,
+-	0x7a,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x7a,0xcc,0x87,0x00,0x01,0xff,
+-	0x7a,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0x8c,0x00,0x01,0xff,0x73,0x00,
+-	0xe0,0x65,0x01,0xcf,0x86,0xd5,0xb4,0xd4,0x5a,0xd3,0x2f,0xd2,0x16,0xd1,0x0b,0x10,
+-	0x04,0x01,0x00,0x01,0xff,0xc9,0x93,0x00,0x10,0x07,0x01,0xff,0xc6,0x83,0x00,0x01,
+-	0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xc6,0x85,0x00,0x01,0x00,0x10,0x07,0x01,0xff,
+-	0xc9,0x94,0x00,0x01,0xff,0xc6,0x88,0x00,0xd2,0x19,0xd1,0x0b,0x10,0x04,0x01,0x00,
+-	0x01,0xff,0xc9,0x96,0x00,0x10,0x07,0x01,0xff,0xc9,0x97,0x00,0x01,0xff,0xc6,0x8c,
+-	0x00,0x51,0x04,0x01,0x00,0x10,0x07,0x01,0xff,0xc7,0x9d,0x00,0x01,0xff,0xc9,0x99,
+-	0x00,0xd3,0x32,0xd2,0x19,0xd1,0x0e,0x10,0x07,0x01,0xff,0xc9,0x9b,0x00,0x01,0xff,
+-	0xc6,0x92,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xc9,0xa0,0x00,0xd1,0x0b,0x10,0x07,
+-	0x01,0xff,0xc9,0xa3,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xc9,0xa9,0x00,0x01,0xff,
+-	0xc9,0xa8,0x00,0xd2,0x0f,0x91,0x0b,0x10,0x07,0x01,0xff,0xc6,0x99,0x00,0x01,0x00,
+-	0x01,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xc9,0xaf,0x00,0x01,0xff,0xc9,0xb2,0x00,
+-	0x10,0x04,0x01,0x00,0x01,0xff,0xc9,0xb5,0x00,0xd4,0x5d,0xd3,0x34,0xd2,0x1b,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x9b,0x00,0x01,0xff,0x6f,0xcc,0x9b,0x00,0x10,
+-	0x07,0x01,0xff,0xc6,0xa3,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xc6,0xa5,
+-	0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xca,0x80,0x00,0x01,0xff,0xc6,0xa8,0x00,0xd2,
+-	0x0f,0x91,0x0b,0x10,0x04,0x01,0x00,0x01,0xff,0xca,0x83,0x00,0x01,0x00,0xd1,0x0b,
+-	0x10,0x07,0x01,0xff,0xc6,0xad,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xca,0x88,0x00,
+-	0x01,0xff,0x75,0xcc,0x9b,0x00,0xd3,0x33,0xd2,0x1d,0xd1,0x0f,0x10,0x08,0x01,0xff,
+-	0x75,0xcc,0x9b,0x00,0x01,0xff,0xca,0x8a,0x00,0x10,0x07,0x01,0xff,0xca,0x8b,0x00,
+-	0x01,0xff,0xc6,0xb4,0x00,0xd1,0x0b,0x10,0x04,0x01,0x00,0x01,0xff,0xc6,0xb6,0x00,
+-	0x10,0x04,0x01,0x00,0x01,0xff,0xca,0x92,0x00,0xd2,0x0f,0x91,0x0b,0x10,0x07,0x01,
+-	0xff,0xc6,0xb9,0x00,0x01,0x00,0x01,0x00,0x91,0x0b,0x10,0x07,0x01,0xff,0xc6,0xbd,
+-	0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0xd4,0xd4,0x44,0xd3,0x16,0x52,0x04,0x01,
+-	0x00,0x51,0x07,0x01,0xff,0xc7,0x86,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xc7,0x89,
+-	0x00,0xd2,0x12,0x91,0x0b,0x10,0x07,0x01,0xff,0xc7,0x89,0x00,0x01,0x00,0x01,0xff,
+-	0xc7,0x8c,0x00,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x61,0xcc,0x8c,0x00,0x10,
+-	0x08,0x01,0xff,0x61,0xcc,0x8c,0x00,0x01,0xff,0x69,0xcc,0x8c,0x00,0xd3,0x46,0xd2,
+-	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,0xcc,0x8c,0x00,0x01,0xff,0x6f,0xcc,0x8c,
+-	0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x8c,0x00,0x01,0xff,0x75,0xcc,0x8c,0x00,0xd1,
+-	0x12,0x10,0x08,0x01,0xff,0x75,0xcc,0x8c,0x00,0x01,0xff,0x75,0xcc,0x88,0xcc,0x84,
+-	0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,0x84,0x00,0x01,0xff,0x75,0xcc,0x88,
+-	0xcc,0x81,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,0x81,
+-	0x00,0x01,0xff,0x75,0xcc,0x88,0xcc,0x8c,0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,
+-	0xcc,0x8c,0x00,0x01,0xff,0x75,0xcc,0x88,0xcc,0x80,0x00,0xd1,0x0e,0x10,0x0a,0x01,
+-	0xff,0x75,0xcc,0x88,0xcc,0x80,0x00,0x01,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0x88,
+-	0xcc,0x84,0x00,0x01,0xff,0x61,0xcc,0x88,0xcc,0x84,0x00,0xd4,0x87,0xd3,0x41,0xd2,
+-	0x26,0xd1,0x14,0x10,0x0a,0x01,0xff,0x61,0xcc,0x87,0xcc,0x84,0x00,0x01,0xff,0x61,
+-	0xcc,0x87,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,0xc3,0xa6,0xcc,0x84,0x00,0x01,0xff,
+-	0xc3,0xa6,0xcc,0x84,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xc7,0xa5,0x00,0x01,0x00,
+-	0x10,0x08,0x01,0xff,0x67,0xcc,0x8c,0x00,0x01,0xff,0x67,0xcc,0x8c,0x00,0xd2,0x20,
+-	0xd1,0x10,0x10,0x08,0x01,0xff,0x6b,0xcc,0x8c,0x00,0x01,0xff,0x6b,0xcc,0x8c,0x00,
+-	0x10,0x08,0x01,0xff,0x6f,0xcc,0xa8,0x00,0x01,0xff,0x6f,0xcc,0xa8,0x00,0xd1,0x14,
+-	0x10,0x0a,0x01,0xff,0x6f,0xcc,0xa8,0xcc,0x84,0x00,0x01,0xff,0x6f,0xcc,0xa8,0xcc,
+-	0x84,0x00,0x10,0x09,0x01,0xff,0xca,0x92,0xcc,0x8c,0x00,0x01,0xff,0xca,0x92,0xcc,
+-	0x8c,0x00,0xd3,0x38,0xd2,0x1a,0xd1,0x0f,0x10,0x08,0x01,0xff,0x6a,0xcc,0x8c,0x00,
+-	0x01,0xff,0xc7,0xb3,0x00,0x10,0x07,0x01,0xff,0xc7,0xb3,0x00,0x01,0x00,0xd1,0x10,
+-	0x10,0x08,0x01,0xff,0x67,0xcc,0x81,0x00,0x01,0xff,0x67,0xcc,0x81,0x00,0x10,0x07,
+-	0x04,0xff,0xc6,0x95,0x00,0x04,0xff,0xc6,0xbf,0x00,0xd2,0x24,0xd1,0x10,0x10,0x08,
+-	0x04,0xff,0x6e,0xcc,0x80,0x00,0x04,0xff,0x6e,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,
+-	0x61,0xcc,0x8a,0xcc,0x81,0x00,0x01,0xff,0x61,0xcc,0x8a,0xcc,0x81,0x00,0xd1,0x12,
+-	0x10,0x09,0x01,0xff,0xc3,0xa6,0xcc,0x81,0x00,0x01,0xff,0xc3,0xa6,0xcc,0x81,0x00,
+-	0x10,0x09,0x01,0xff,0xc3,0xb8,0xcc,0x81,0x00,0x01,0xff,0xc3,0xb8,0xcc,0x81,0x00,
+-	0xe2,0x31,0x02,0xe1,0xc3,0x44,0xe0,0xc8,0x01,0xcf,0x86,0xd5,0xfb,0xd4,0x80,0xd3,
+-	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0x8f,0x00,0x01,0xff,0x61,
+-	0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x61,0xcc,0x91,0x00,0x01,0xff,0x61,0xcc,0x91,
+-	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0x8f,0x00,0x01,0xff,0x65,0xcc,0x8f,
+-	0x00,0x10,0x08,0x01,0xff,0x65,0xcc,0x91,0x00,0x01,0xff,0x65,0xcc,0x91,0x00,0xd2,
+-	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,0xcc,0x8f,0x00,0x01,0xff,0x69,0xcc,0x8f,
+-	0x00,0x10,0x08,0x01,0xff,0x69,0xcc,0x91,0x00,0x01,0xff,0x69,0xcc,0x91,0x00,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x8f,0x00,0x01,0xff,0x6f,0xcc,0x8f,0x00,0x10,
+-	0x08,0x01,0xff,0x6f,0xcc,0x91,0x00,0x01,0xff,0x6f,0xcc,0x91,0x00,0xd3,0x40,0xd2,
+-	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x72,0xcc,0x8f,0x00,0x01,0xff,0x72,0xcc,0x8f,
+-	0x00,0x10,0x08,0x01,0xff,0x72,0xcc,0x91,0x00,0x01,0xff,0x72,0xcc,0x91,0x00,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0x8f,0x00,0x01,0xff,0x75,0xcc,0x8f,0x00,0x10,
+-	0x08,0x01,0xff,0x75,0xcc,0x91,0x00,0x01,0xff,0x75,0xcc,0x91,0x00,0xd2,0x20,0xd1,
+-	0x10,0x10,0x08,0x04,0xff,0x73,0xcc,0xa6,0x00,0x04,0xff,0x73,0xcc,0xa6,0x00,0x10,
+-	0x08,0x04,0xff,0x74,0xcc,0xa6,0x00,0x04,0xff,0x74,0xcc,0xa6,0x00,0xd1,0x0b,0x10,
+-	0x07,0x04,0xff,0xc8,0x9d,0x00,0x04,0x00,0x10,0x08,0x04,0xff,0x68,0xcc,0x8c,0x00,
+-	0x04,0xff,0x68,0xcc,0x8c,0x00,0xd4,0x79,0xd3,0x31,0xd2,0x16,0xd1,0x0b,0x10,0x07,
+-	0x06,0xff,0xc6,0x9e,0x00,0x07,0x00,0x10,0x07,0x04,0xff,0xc8,0xa3,0x00,0x04,0x00,
+-	0xd1,0x0b,0x10,0x07,0x04,0xff,0xc8,0xa5,0x00,0x04,0x00,0x10,0x08,0x04,0xff,0x61,
+-	0xcc,0x87,0x00,0x04,0xff,0x61,0xcc,0x87,0x00,0xd2,0x24,0xd1,0x10,0x10,0x08,0x04,
+-	0xff,0x65,0xcc,0xa7,0x00,0x04,0xff,0x65,0xcc,0xa7,0x00,0x10,0x0a,0x04,0xff,0x6f,
+-	0xcc,0x88,0xcc,0x84,0x00,0x04,0xff,0x6f,0xcc,0x88,0xcc,0x84,0x00,0xd1,0x14,0x10,
+-	0x0a,0x04,0xff,0x6f,0xcc,0x83,0xcc,0x84,0x00,0x04,0xff,0x6f,0xcc,0x83,0xcc,0x84,
+-	0x00,0x10,0x08,0x04,0xff,0x6f,0xcc,0x87,0x00,0x04,0xff,0x6f,0xcc,0x87,0x00,0xd3,
+-	0x27,0xe2,0x21,0x43,0xd1,0x14,0x10,0x0a,0x04,0xff,0x6f,0xcc,0x87,0xcc,0x84,0x00,
+-	0x04,0xff,0x6f,0xcc,0x87,0xcc,0x84,0x00,0x10,0x08,0x04,0xff,0x79,0xcc,0x84,0x00,
+-	0x04,0xff,0x79,0xcc,0x84,0x00,0xd2,0x13,0x51,0x04,0x08,0x00,0x10,0x08,0x08,0xff,
+-	0xe2,0xb1,0xa5,0x00,0x08,0xff,0xc8,0xbc,0x00,0xd1,0x0b,0x10,0x04,0x08,0x00,0x08,
+-	0xff,0xc6,0x9a,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0xa6,0x00,0x08,0x00,0xcf,0x86,
+-	0x95,0x5f,0x94,0x5b,0xd3,0x2f,0xd2,0x16,0xd1,0x0b,0x10,0x04,0x08,0x00,0x08,0xff,
+-	0xc9,0x82,0x00,0x10,0x04,0x09,0x00,0x09,0xff,0xc6,0x80,0x00,0xd1,0x0e,0x10,0x07,
+-	0x09,0xff,0xca,0x89,0x00,0x09,0xff,0xca,0x8c,0x00,0x10,0x07,0x09,0xff,0xc9,0x87,
+-	0x00,0x09,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x09,0xff,0xc9,0x89,0x00,0x09,0x00,
+-	0x10,0x07,0x09,0xff,0xc9,0x8b,0x00,0x09,0x00,0xd1,0x0b,0x10,0x07,0x09,0xff,0xc9,
+-	0x8d,0x00,0x09,0x00,0x10,0x07,0x09,0xff,0xc9,0x8f,0x00,0x09,0x00,0x01,0x00,0x01,
+-	0x00,0xd1,0x8b,0xd0,0x0c,0xcf,0x86,0xe5,0x10,0x43,0x64,0xef,0x42,0x01,0xe6,0xcf,
+-	0x86,0xd5,0x2a,0xe4,0x99,0x43,0xe3,0x7f,0x43,0xd2,0x11,0xe1,0x5e,0x43,0x10,0x07,
+-	0x01,0xff,0xcc,0x80,0x00,0x01,0xff,0xcc,0x81,0x00,0xe1,0x65,0x43,0x10,0x09,0x01,
+-	0xff,0xcc,0x88,0xcc,0x81,0x00,0x01,0xff,0xce,0xb9,0x00,0xd4,0x0f,0x93,0x0b,0x92,
+-	0x07,0x61,0xab,0x43,0x01,0xea,0x06,0xe6,0x06,0xe6,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,
+-	0x10,0x07,0x0a,0xff,0xcd,0xb1,0x00,0x0a,0x00,0x10,0x07,0x0a,0xff,0xcd,0xb3,0x00,
+-	0x0a,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xca,0xb9,0x00,0x01,0x00,0x10,0x07,0x0a,
+-	0xff,0xcd,0xb7,0x00,0x0a,0x00,0xd2,0x07,0x61,0x97,0x43,0x00,0x00,0x51,0x04,0x09,
+-	0x00,0x10,0x06,0x01,0xff,0x3b,0x00,0x10,0xff,0xcf,0xb3,0x00,0xe0,0x31,0x01,0xcf,
+-	0x86,0xd5,0xd3,0xd4,0x5f,0xd3,0x21,0x52,0x04,0x00,0x00,0xd1,0x0d,0x10,0x04,0x01,
+-	0x00,0x01,0xff,0xc2,0xa8,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x81,
+-	0x00,0x01,0xff,0xc2,0xb7,0x00,0xd2,0x1f,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb5,
+-	0xcc,0x81,0x00,0x01,0xff,0xce,0xb7,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,
+-	0xcc,0x81,0x00,0x00,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xce,0xbf,0xcc,0x81,0x00,
+-	0x00,0x00,0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,0x01,0xff,0xcf,0x89,0xcc,
+-	0x81,0x00,0xd3,0x3c,0xd2,0x20,0xd1,0x12,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x88,
+-	0xcc,0x81,0x00,0x01,0xff,0xce,0xb1,0x00,0x10,0x07,0x01,0xff,0xce,0xb2,0x00,0x01,
+-	0xff,0xce,0xb3,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xce,0xb4,0x00,0x01,0xff,0xce,
+-	0xb5,0x00,0x10,0x07,0x01,0xff,0xce,0xb6,0x00,0x01,0xff,0xce,0xb7,0x00,0xd2,0x1c,
+-	0xd1,0x0e,0x10,0x07,0x01,0xff,0xce,0xb8,0x00,0x01,0xff,0xce,0xb9,0x00,0x10,0x07,
+-	0x01,0xff,0xce,0xba,0x00,0x01,0xff,0xce,0xbb,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,
+-	0xce,0xbc,0x00,0x01,0xff,0xce,0xbd,0x00,0x10,0x07,0x01,0xff,0xce,0xbe,0x00,0x01,
+-	0xff,0xce,0xbf,0x00,0xe4,0x85,0x43,0xd3,0x35,0xd2,0x19,0xd1,0x0e,0x10,0x07,0x01,
+-	0xff,0xcf,0x80,0x00,0x01,0xff,0xcf,0x81,0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xcf,
+-	0x83,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xcf,0x84,0x00,0x01,0xff,0xcf,0x85,0x00,
+-	0x10,0x07,0x01,0xff,0xcf,0x86,0x00,0x01,0xff,0xcf,0x87,0x00,0xe2,0x2b,0x43,0xd1,
+-	0x0e,0x10,0x07,0x01,0xff,0xcf,0x88,0x00,0x01,0xff,0xcf,0x89,0x00,0x10,0x09,0x01,
+-	0xff,0xce,0xb9,0xcc,0x88,0x00,0x01,0xff,0xcf,0x85,0xcc,0x88,0x00,0xcf,0x86,0xd5,
+-	0x94,0xd4,0x3c,0xd3,0x13,0x92,0x0f,0x51,0x04,0x01,0x00,0x10,0x07,0x01,0xff,0xcf,
+-	0x83,0x00,0x01,0x00,0x01,0x00,0xd2,0x07,0x61,0x3a,0x43,0x01,0x00,0xd1,0x12,0x10,
+-	0x09,0x01,0xff,0xce,0xbf,0xcc,0x81,0x00,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,0x10,
+-	0x09,0x01,0xff,0xcf,0x89,0xcc,0x81,0x00,0x0a,0xff,0xcf,0x97,0x00,0xd3,0x2c,0xd2,
+-	0x11,0xe1,0x46,0x43,0x10,0x07,0x01,0xff,0xce,0xb2,0x00,0x01,0xff,0xce,0xb8,0x00,
+-	0xd1,0x10,0x10,0x09,0x01,0xff,0xcf,0x92,0xcc,0x88,0x00,0x01,0xff,0xcf,0x86,0x00,
+-	0x10,0x07,0x01,0xff,0xcf,0x80,0x00,0x04,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x06,
+-	0xff,0xcf,0x99,0x00,0x06,0x00,0x10,0x07,0x01,0xff,0xcf,0x9b,0x00,0x04,0x00,0xd1,
+-	0x0b,0x10,0x07,0x01,0xff,0xcf,0x9d,0x00,0x04,0x00,0x10,0x07,0x01,0xff,0xcf,0x9f,
+-	0x00,0x04,0x00,0xd4,0x58,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xcf,
+-	0xa1,0x00,0x04,0x00,0x10,0x07,0x01,0xff,0xcf,0xa3,0x00,0x01,0x00,0xd1,0x0b,0x10,
+-	0x07,0x01,0xff,0xcf,0xa5,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xcf,0xa7,0x00,0x01,
+-	0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xcf,0xa9,0x00,0x01,0x00,0x10,0x07,
+-	0x01,0xff,0xcf,0xab,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xcf,0xad,0x00,
+-	0x01,0x00,0x10,0x07,0x01,0xff,0xcf,0xaf,0x00,0x01,0x00,0xd3,0x2b,0xd2,0x12,0x91,
+-	0x0e,0x10,0x07,0x01,0xff,0xce,0xba,0x00,0x01,0xff,0xcf,0x81,0x00,0x01,0x00,0xd1,
+-	0x0e,0x10,0x07,0x05,0xff,0xce,0xb8,0x00,0x05,0xff,0xce,0xb5,0x00,0x10,0x04,0x06,
+-	0x00,0x07,0xff,0xcf,0xb8,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x04,0x07,0x00,0x07,0xff,
+-	0xcf,0xb2,0x00,0x10,0x07,0x07,0xff,0xcf,0xbb,0x00,0x07,0x00,0xd1,0x0b,0x10,0x04,
+-	0x08,0x00,0x08,0xff,0xcd,0xbb,0x00,0x10,0x07,0x08,0xff,0xcd,0xbc,0x00,0x08,0xff,
+-	0xcd,0xbd,0x00,0xe3,0xed,0x46,0xe2,0x3d,0x05,0xe1,0x27,0x02,0xe0,0x66,0x01,0xcf,
+-	0x86,0xd5,0xf0,0xd4,0x7e,0xd3,0x40,0xd2,0x22,0xd1,0x12,0x10,0x09,0x04,0xff,0xd0,
+-	0xb5,0xcc,0x80,0x00,0x01,0xff,0xd0,0xb5,0xcc,0x88,0x00,0x10,0x07,0x01,0xff,0xd1,
+-	0x92,0x00,0x01,0xff,0xd0,0xb3,0xcc,0x81,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,
+-	0x94,0x00,0x01,0xff,0xd1,0x95,0x00,0x10,0x07,0x01,0xff,0xd1,0x96,0x00,0x01,0xff,
+-	0xd1,0x96,0xcc,0x88,0x00,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,0x98,0x00,
+-	0x01,0xff,0xd1,0x99,0x00,0x10,0x07,0x01,0xff,0xd1,0x9a,0x00,0x01,0xff,0xd1,0x9b,
+-	0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0xba,0xcc,0x81,0x00,0x04,0xff,0xd0,0xb8,
+-	0xcc,0x80,0x00,0x10,0x09,0x01,0xff,0xd1,0x83,0xcc,0x86,0x00,0x01,0xff,0xd1,0x9f,
+-	0x00,0xd3,0x38,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd0,0xb0,0x00,0x01,0xff,
+-	0xd0,0xb1,0x00,0x10,0x07,0x01,0xff,0xd0,0xb2,0x00,0x01,0xff,0xd0,0xb3,0x00,0xd1,
+-	0x0e,0x10,0x07,0x01,0xff,0xd0,0xb4,0x00,0x01,0xff,0xd0,0xb5,0x00,0x10,0x07,0x01,
+-	0xff,0xd0,0xb6,0x00,0x01,0xff,0xd0,0xb7,0x00,0xd2,0x1e,0xd1,0x10,0x10,0x07,0x01,
+-	0xff,0xd0,0xb8,0x00,0x01,0xff,0xd0,0xb8,0xcc,0x86,0x00,0x10,0x07,0x01,0xff,0xd0,
+-	0xba,0x00,0x01,0xff,0xd0,0xbb,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd0,0xbc,0x00,
+-	0x01,0xff,0xd0,0xbd,0x00,0x10,0x07,0x01,0xff,0xd0,0xbe,0x00,0x01,0xff,0xd0,0xbf,
+-	0x00,0xe4,0x25,0x42,0xd3,0x38,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,0x80,
+-	0x00,0x01,0xff,0xd1,0x81,0x00,0x10,0x07,0x01,0xff,0xd1,0x82,0x00,0x01,0xff,0xd1,
+-	0x83,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,0x84,0x00,0x01,0xff,0xd1,0x85,0x00,
+-	0x10,0x07,0x01,0xff,0xd1,0x86,0x00,0x01,0xff,0xd1,0x87,0x00,0xd2,0x1c,0xd1,0x0e,
+-	0x10,0x07,0x01,0xff,0xd1,0x88,0x00,0x01,0xff,0xd1,0x89,0x00,0x10,0x07,0x01,0xff,
+-	0xd1,0x8a,0x00,0x01,0xff,0xd1,0x8b,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,0x8c,
+-	0x00,0x01,0xff,0xd1,0x8d,0x00,0x10,0x07,0x01,0xff,0xd1,0x8e,0x00,0x01,0xff,0xd1,
+-	0x8f,0x00,0xcf,0x86,0xd5,0x07,0x64,0xcf,0x41,0x01,0x00,0xd4,0x58,0xd3,0x2c,0xd2,
+-	0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xa1,0x00,0x01,0x00,0x10,0x07,0x01,0xff,
+-	0xd1,0xa3,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xa5,0x00,0x01,0x00,
+-	0x10,0x07,0x01,0xff,0xd1,0xa7,0x00,0x01,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,
+-	0xff,0xd1,0xa9,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xab,0x00,0x01,0x00,0xd1,
+-	0x0b,0x10,0x07,0x01,0xff,0xd1,0xad,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xaf,
+-	0x00,0x01,0x00,0xd3,0x33,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xb1,0x00,
+-	0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xb3,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,
+-	0xff,0xd1,0xb5,0x00,0x01,0x00,0x10,0x09,0x01,0xff,0xd1,0xb5,0xcc,0x8f,0x00,0x01,
+-	0xff,0xd1,0xb5,0xcc,0x8f,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xb9,
+-	0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xbb,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,
+-	0x01,0xff,0xd1,0xbd,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xbf,0x00,0x01,0x00,
+-	0xe0,0x41,0x01,0xcf,0x86,0xd5,0x8e,0xd4,0x36,0xd3,0x11,0xe2,0x91,0x41,0xe1,0x88,
+-	0x41,0x10,0x07,0x01,0xff,0xd2,0x81,0x00,0x01,0x00,0xd2,0x0f,0x51,0x04,0x04,0x00,
+-	0x10,0x07,0x06,0xff,0xd2,0x8b,0x00,0x06,0x00,0xd1,0x0b,0x10,0x07,0x04,0xff,0xd2,
+-	0x8d,0x00,0x04,0x00,0x10,0x07,0x04,0xff,0xd2,0x8f,0x00,0x04,0x00,0xd3,0x2c,0xd2,
+-	0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0x91,0x00,0x01,0x00,0x10,0x07,0x01,0xff,
+-	0xd2,0x93,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0x95,0x00,0x01,0x00,
+-	0x10,0x07,0x01,0xff,0xd2,0x97,0x00,0x01,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,
+-	0xff,0xd2,0x99,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0x9b,0x00,0x01,0x00,0xd1,
+-	0x0b,0x10,0x07,0x01,0xff,0xd2,0x9d,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0x9f,
+-	0x00,0x01,0x00,0xd4,0x58,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,
+-	0xa1,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xa3,0x00,0x01,0x00,0xd1,0x0b,0x10,
+-	0x07,0x01,0xff,0xd2,0xa5,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xa7,0x00,0x01,
+-	0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0xa9,0x00,0x01,0x00,0x10,0x07,
+-	0x01,0xff,0xd2,0xab,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0xad,0x00,
+-	0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xaf,0x00,0x01,0x00,0xd3,0x2c,0xd2,0x16,0xd1,
+-	0x0b,0x10,0x07,0x01,0xff,0xd2,0xb1,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xb3,
+-	0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0xb5,0x00,0x01,0x00,0x10,0x07,
+-	0x01,0xff,0xd2,0xb7,0x00,0x01,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,
+-	0xb9,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xbb,0x00,0x01,0x00,0xd1,0x0b,0x10,
+-	0x07,0x01,0xff,0xd2,0xbd,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xbf,0x00,0x01,
+-	0x00,0xcf,0x86,0xd5,0xdc,0xd4,0x5a,0xd3,0x36,0xd2,0x20,0xd1,0x10,0x10,0x07,0x01,
+-	0xff,0xd3,0x8f,0x00,0x01,0xff,0xd0,0xb6,0xcc,0x86,0x00,0x10,0x09,0x01,0xff,0xd0,
+-	0xb6,0xcc,0x86,0x00,0x01,0xff,0xd3,0x84,0x00,0xd1,0x0b,0x10,0x04,0x01,0x00,0x06,
+-	0xff,0xd3,0x86,0x00,0x10,0x04,0x06,0x00,0x01,0xff,0xd3,0x88,0x00,0xd2,0x16,0xd1,
+-	0x0b,0x10,0x04,0x01,0x00,0x06,0xff,0xd3,0x8a,0x00,0x10,0x04,0x06,0x00,0x01,0xff,
+-	0xd3,0x8c,0x00,0xe1,0x69,0x40,0x10,0x04,0x01,0x00,0x06,0xff,0xd3,0x8e,0x00,0xd3,
+-	0x41,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0xb0,0xcc,0x86,0x00,0x01,0xff,
+-	0xd0,0xb0,0xcc,0x86,0x00,0x10,0x09,0x01,0xff,0xd0,0xb0,0xcc,0x88,0x00,0x01,0xff,
+-	0xd0,0xb0,0xcc,0x88,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd3,0x95,0x00,0x01,0x00,
+-	0x10,0x09,0x01,0xff,0xd0,0xb5,0xcc,0x86,0x00,0x01,0xff,0xd0,0xb5,0xcc,0x86,0x00,
+-	0xd2,0x1d,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd3,0x99,0x00,0x01,0x00,0x10,0x09,0x01,
+-	0xff,0xd3,0x99,0xcc,0x88,0x00,0x01,0xff,0xd3,0x99,0xcc,0x88,0x00,0xd1,0x12,0x10,
+-	0x09,0x01,0xff,0xd0,0xb6,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb6,0xcc,0x88,0x00,0x10,
+-	0x09,0x01,0xff,0xd0,0xb7,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb7,0xcc,0x88,0x00,0xd4,
+-	0x82,0xd3,0x41,0xd2,0x1d,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd3,0xa1,0x00,0x01,0x00,
+-	0x10,0x09,0x01,0xff,0xd0,0xb8,0xcc,0x84,0x00,0x01,0xff,0xd0,0xb8,0xcc,0x84,0x00,
+-	0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0xb8,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb8,0xcc,
+-	0x88,0x00,0x10,0x09,0x01,0xff,0xd0,0xbe,0xcc,0x88,0x00,0x01,0xff,0xd0,0xbe,0xcc,
+-	0x88,0x00,0xd2,0x1d,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd3,0xa9,0x00,0x01,0x00,0x10,
+-	0x09,0x01,0xff,0xd3,0xa9,0xcc,0x88,0x00,0x01,0xff,0xd3,0xa9,0xcc,0x88,0x00,0xd1,
+-	0x12,0x10,0x09,0x04,0xff,0xd1,0x8d,0xcc,0x88,0x00,0x04,0xff,0xd1,0x8d,0xcc,0x88,
+-	0x00,0x10,0x09,0x01,0xff,0xd1,0x83,0xcc,0x84,0x00,0x01,0xff,0xd1,0x83,0xcc,0x84,
+-	0x00,0xd3,0x41,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd1,0x83,0xcc,0x88,0x00,
+-	0x01,0xff,0xd1,0x83,0xcc,0x88,0x00,0x10,0x09,0x01,0xff,0xd1,0x83,0xcc,0x8b,0x00,
+-	0x01,0xff,0xd1,0x83,0xcc,0x8b,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd1,0x87,0xcc,
+-	0x88,0x00,0x01,0xff,0xd1,0x87,0xcc,0x88,0x00,0x10,0x07,0x08,0xff,0xd3,0xb7,0x00,
+-	0x08,0x00,0xd2,0x1d,0xd1,0x12,0x10,0x09,0x01,0xff,0xd1,0x8b,0xcc,0x88,0x00,0x01,
+-	0xff,0xd1,0x8b,0xcc,0x88,0x00,0x10,0x07,0x09,0xff,0xd3,0xbb,0x00,0x09,0x00,0xd1,
+-	0x0b,0x10,0x07,0x09,0xff,0xd3,0xbd,0x00,0x09,0x00,0x10,0x07,0x09,0xff,0xd3,0xbf,
+-	0x00,0x09,0x00,0xe1,0x26,0x02,0xe0,0x78,0x01,0xcf,0x86,0xd5,0xb0,0xd4,0x58,0xd3,
+-	0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x06,0xff,0xd4,0x81,0x00,0x06,0x00,0x10,0x07,
+-	0x06,0xff,0xd4,0x83,0x00,0x06,0x00,0xd1,0x0b,0x10,0x07,0x06,0xff,0xd4,0x85,0x00,
+-	0x06,0x00,0x10,0x07,0x06,0xff,0xd4,0x87,0x00,0x06,0x00,0xd2,0x16,0xd1,0x0b,0x10,
+-	0x07,0x06,0xff,0xd4,0x89,0x00,0x06,0x00,0x10,0x07,0x06,0xff,0xd4,0x8b,0x00,0x06,
+-	0x00,0xd1,0x0b,0x10,0x07,0x06,0xff,0xd4,0x8d,0x00,0x06,0x00,0x10,0x07,0x06,0xff,
+-	0xd4,0x8f,0x00,0x06,0x00,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x09,0xff,0xd4,
+-	0x91,0x00,0x09,0x00,0x10,0x07,0x09,0xff,0xd4,0x93,0x00,0x09,0x00,0xd1,0x0b,0x10,
+-	0x07,0x0a,0xff,0xd4,0x95,0x00,0x0a,0x00,0x10,0x07,0x0a,0xff,0xd4,0x97,0x00,0x0a,
+-	0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x0a,0xff,0xd4,0x99,0x00,0x0a,0x00,0x10,0x07,
+-	0x0a,0xff,0xd4,0x9b,0x00,0x0a,0x00,0xd1,0x0b,0x10,0x07,0x0a,0xff,0xd4,0x9d,0x00,
+-	0x0a,0x00,0x10,0x07,0x0a,0xff,0xd4,0x9f,0x00,0x0a,0x00,0xd4,0x58,0xd3,0x2c,0xd2,
+-	0x16,0xd1,0x0b,0x10,0x07,0x0a,0xff,0xd4,0xa1,0x00,0x0a,0x00,0x10,0x07,0x0a,0xff,
+-	0xd4,0xa3,0x00,0x0a,0x00,0xd1,0x0b,0x10,0x07,0x0b,0xff,0xd4,0xa5,0x00,0x0b,0x00,
+-	0x10,0x07,0x0c,0xff,0xd4,0xa7,0x00,0x0c,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x10,
+-	0xff,0xd4,0xa9,0x00,0x10,0x00,0x10,0x07,0x10,0xff,0xd4,0xab,0x00,0x10,0x00,0xd1,
+-	0x0b,0x10,0x07,0x10,0xff,0xd4,0xad,0x00,0x10,0x00,0x10,0x07,0x10,0xff,0xd4,0xaf,
+-	0x00,0x10,0x00,0xd3,0x35,0xd2,0x19,0xd1,0x0b,0x10,0x04,0x00,0x00,0x01,0xff,0xd5,
+-	0xa1,0x00,0x10,0x07,0x01,0xff,0xd5,0xa2,0x00,0x01,0xff,0xd5,0xa3,0x00,0xd1,0x0e,
+-	0x10,0x07,0x01,0xff,0xd5,0xa4,0x00,0x01,0xff,0xd5,0xa5,0x00,0x10,0x07,0x01,0xff,
+-	0xd5,0xa6,0x00,0x01,0xff,0xd5,0xa7,0x00,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,
+-	0xd5,0xa8,0x00,0x01,0xff,0xd5,0xa9,0x00,0x10,0x07,0x01,0xff,0xd5,0xaa,0x00,0x01,
+-	0xff,0xd5,0xab,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,0xac,0x00,0x01,0xff,0xd5,
+-	0xad,0x00,0x10,0x07,0x01,0xff,0xd5,0xae,0x00,0x01,0xff,0xd5,0xaf,0x00,0xcf,0x86,
+-	0xe5,0x08,0x3f,0xd4,0x70,0xd3,0x38,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,
+-	0xb0,0x00,0x01,0xff,0xd5,0xb1,0x00,0x10,0x07,0x01,0xff,0xd5,0xb2,0x00,0x01,0xff,
+-	0xd5,0xb3,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,0xb4,0x00,0x01,0xff,0xd5,0xb5,
+-	0x00,0x10,0x07,0x01,0xff,0xd5,0xb6,0x00,0x01,0xff,0xd5,0xb7,0x00,0xd2,0x1c,0xd1,
+-	0x0e,0x10,0x07,0x01,0xff,0xd5,0xb8,0x00,0x01,0xff,0xd5,0xb9,0x00,0x10,0x07,0x01,
+-	0xff,0xd5,0xba,0x00,0x01,0xff,0xd5,0xbb,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,
+-	0xbc,0x00,0x01,0xff,0xd5,0xbd,0x00,0x10,0x07,0x01,0xff,0xd5,0xbe,0x00,0x01,0xff,
+-	0xd5,0xbf,0x00,0xe3,0x87,0x3e,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd6,0x80,
+-	0x00,0x01,0xff,0xd6,0x81,0x00,0x10,0x07,0x01,0xff,0xd6,0x82,0x00,0x01,0xff,0xd6,
+-	0x83,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd6,0x84,0x00,0x01,0xff,0xd6,0x85,0x00,
+-	0x10,0x07,0x01,0xff,0xd6,0x86,0x00,0x00,0x00,0xe0,0x2f,0x3f,0xcf,0x86,0xe5,0xc0,
+-	0x3e,0xe4,0x97,0x3e,0xe3,0x76,0x3e,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,
+-	0x04,0x01,0x00,0x01,0xff,0xd5,0xa5,0xd6,0x82,0x00,0xe4,0x3e,0x25,0xe3,0xc3,0x1a,
+-	0xe2,0x7b,0x81,0xe1,0xc0,0x13,0xd0,0x1e,0xcf,0x86,0xc5,0xe4,0x08,0x4b,0xe3,0x53,
+-	0x46,0xe2,0xe9,0x43,0xe1,0x1c,0x43,0xe0,0xe1,0x42,0xcf,0x86,0xe5,0xa6,0x42,0x64,
+-	0x89,0x42,0x0b,0x00,0xcf,0x86,0xe5,0xfa,0x01,0xe4,0x03,0x56,0xe3,0x76,0x01,0xe2,
+-	0x8e,0x53,0xd1,0x0c,0xe0,0xef,0x52,0xcf,0x86,0x65,0x8d,0x52,0x04,0x00,0xe0,0x0d,
+-	0x01,0xcf,0x86,0xd5,0x0a,0xe4,0x10,0x53,0x63,0xff,0x52,0x0a,0x00,0xd4,0x80,0xd3,
+-	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0x80,0x00,0x01,0xff,0xe2,
+-	0xb4,0x81,0x00,0x10,0x08,0x01,0xff,0xe2,0xb4,0x82,0x00,0x01,0xff,0xe2,0xb4,0x83,
+-	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0x84,0x00,0x01,0xff,0xe2,0xb4,0x85,
+-	0x00,0x10,0x08,0x01,0xff,0xe2,0xb4,0x86,0x00,0x01,0xff,0xe2,0xb4,0x87,0x00,0xd2,
+-	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0x88,0x00,0x01,0xff,0xe2,0xb4,0x89,
+-	0x00,0x10,0x08,0x01,0xff,0xe2,0xb4,0x8a,0x00,0x01,0xff,0xe2,0xb4,0x8b,0x00,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0x8c,0x00,0x01,0xff,0xe2,0xb4,0x8d,0x00,0x10,
+-	0x08,0x01,0xff,0xe2,0xb4,0x8e,0x00,0x01,0xff,0xe2,0xb4,0x8f,0x00,0xd3,0x40,0xd2,
+-	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0x90,0x00,0x01,0xff,0xe2,0xb4,0x91,
+-	0x00,0x10,0x08,0x01,0xff,0xe2,0xb4,0x92,0x00,0x01,0xff,0xe2,0xb4,0x93,0x00,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0x94,0x00,0x01,0xff,0xe2,0xb4,0x95,0x00,0x10,
+-	0x08,0x01,0xff,0xe2,0xb4,0x96,0x00,0x01,0xff,0xe2,0xb4,0x97,0x00,0xd2,0x20,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0x98,0x00,0x01,0xff,0xe2,0xb4,0x99,0x00,0x10,
+-	0x08,0x01,0xff,0xe2,0xb4,0x9a,0x00,0x01,0xff,0xe2,0xb4,0x9b,0x00,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0xe2,0xb4,0x9c,0x00,0x01,0xff,0xe2,0xb4,0x9d,0x00,0x10,0x08,0x01,
+-	0xff,0xe2,0xb4,0x9e,0x00,0x01,0xff,0xe2,0xb4,0x9f,0x00,0xcf,0x86,0xe5,0x42,0x52,
+-	0x94,0x50,0xd3,0x3c,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0xa0,0x00,
+-	0x01,0xff,0xe2,0xb4,0xa1,0x00,0x10,0x08,0x01,0xff,0xe2,0xb4,0xa2,0x00,0x01,0xff,
+-	0xe2,0xb4,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0xa4,0x00,0x01,0xff,
+-	0xe2,0xb4,0xa5,0x00,0x10,0x04,0x00,0x00,0x0d,0xff,0xe2,0xb4,0xa7,0x00,0x52,0x04,
+-	0x00,0x00,0x91,0x0c,0x10,0x04,0x00,0x00,0x0d,0xff,0xe2,0xb4,0xad,0x00,0x00,0x00,
+-	0x01,0x00,0xd2,0x1b,0xe1,0xfc,0x52,0xe0,0xad,0x52,0xcf,0x86,0x95,0x0f,0x94,0x0b,
+-	0x93,0x07,0x62,0x92,0x52,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0xd1,0x13,0xe0,
+-	0xd3,0x53,0xcf,0x86,0x95,0x0a,0xe4,0xa8,0x53,0x63,0x97,0x53,0x04,0x00,0x04,0x00,
+-	0xd0,0x0d,0xcf,0x86,0x95,0x07,0x64,0x22,0x54,0x08,0x00,0x04,0x00,0xcf,0x86,0x55,
+-	0x04,0x04,0x00,0x54,0x04,0x04,0x00,0xd3,0x07,0x62,0x2f,0x54,0x04,0x00,0xd2,0x20,
+-	0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8f,0xb0,0x00,0x11,0xff,0xe1,0x8f,0xb1,0x00,
+-	0x10,0x08,0x11,0xff,0xe1,0x8f,0xb2,0x00,0x11,0xff,0xe1,0x8f,0xb3,0x00,0x91,0x10,
+-	0x10,0x08,0x11,0xff,0xe1,0x8f,0xb4,0x00,0x11,0xff,0xe1,0x8f,0xb5,0x00,0x00,0x00,
+-	0xd4,0x1c,0xe3,0xe0,0x56,0xe2,0x17,0x56,0xe1,0xda,0x55,0xe0,0xbb,0x55,0xcf,0x86,
+-	0x95,0x0a,0xe4,0xa4,0x55,0x63,0x88,0x55,0x04,0x00,0x04,0x00,0xe3,0xd2,0x01,0xe2,
+-	0x2b,0x5a,0xd1,0x0c,0xe0,0x4c,0x59,0xcf,0x86,0x65,0x25,0x59,0x0a,0x00,0xe0,0x9c,
+-	0x59,0xcf,0x86,0xd5,0xc5,0xd4,0x45,0xd3,0x31,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x12,
+-	0xff,0xd0,0xb2,0x00,0x12,0xff,0xd0,0xb4,0x00,0x10,0x07,0x12,0xff,0xd0,0xbe,0x00,
+-	0x12,0xff,0xd1,0x81,0x00,0x51,0x07,0x12,0xff,0xd1,0x82,0x00,0x10,0x07,0x12,0xff,
+-	0xd1,0x8a,0x00,0x12,0xff,0xd1,0xa3,0x00,0x92,0x10,0x91,0x0c,0x10,0x08,0x12,0xff,
+-	0xea,0x99,0x8b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,
+-	0x10,0x08,0x14,0xff,0xe1,0x83,0x90,0x00,0x14,0xff,0xe1,0x83,0x91,0x00,0x10,0x08,
+-	0x14,0xff,0xe1,0x83,0x92,0x00,0x14,0xff,0xe1,0x83,0x93,0x00,0xd1,0x10,0x10,0x08,
+-	0x14,0xff,0xe1,0x83,0x94,0x00,0x14,0xff,0xe1,0x83,0x95,0x00,0x10,0x08,0x14,0xff,
+-	0xe1,0x83,0x96,0x00,0x14,0xff,0xe1,0x83,0x97,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x14,0xff,0xe1,0x83,0x98,0x00,0x14,0xff,0xe1,0x83,0x99,0x00,0x10,0x08,0x14,0xff,
+-	0xe1,0x83,0x9a,0x00,0x14,0xff,0xe1,0x83,0x9b,0x00,0xd1,0x10,0x10,0x08,0x14,0xff,
+-	0xe1,0x83,0x9c,0x00,0x14,0xff,0xe1,0x83,0x9d,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,
+-	0x9e,0x00,0x14,0xff,0xe1,0x83,0x9f,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,
+-	0x10,0x08,0x14,0xff,0xe1,0x83,0xa0,0x00,0x14,0xff,0xe1,0x83,0xa1,0x00,0x10,0x08,
+-	0x14,0xff,0xe1,0x83,0xa2,0x00,0x14,0xff,0xe1,0x83,0xa3,0x00,0xd1,0x10,0x10,0x08,
+-	0x14,0xff,0xe1,0x83,0xa4,0x00,0x14,0xff,0xe1,0x83,0xa5,0x00,0x10,0x08,0x14,0xff,
+-	0xe1,0x83,0xa6,0x00,0x14,0xff,0xe1,0x83,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x14,0xff,0xe1,0x83,0xa8,0x00,0x14,0xff,0xe1,0x83,0xa9,0x00,0x10,0x08,0x14,0xff,
+-	0xe1,0x83,0xaa,0x00,0x14,0xff,0xe1,0x83,0xab,0x00,0xd1,0x10,0x10,0x08,0x14,0xff,
+-	0xe1,0x83,0xac,0x00,0x14,0xff,0xe1,0x83,0xad,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,
+-	0xae,0x00,0x14,0xff,0xe1,0x83,0xaf,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x14,0xff,0xe1,0x83,0xb0,0x00,0x14,0xff,0xe1,0x83,0xb1,0x00,0x10,0x08,0x14,0xff,
+-	0xe1,0x83,0xb2,0x00,0x14,0xff,0xe1,0x83,0xb3,0x00,0xd1,0x10,0x10,0x08,0x14,0xff,
+-	0xe1,0x83,0xb4,0x00,0x14,0xff,0xe1,0x83,0xb5,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,
+-	0xb6,0x00,0x14,0xff,0xe1,0x83,0xb7,0x00,0xd2,0x1c,0xd1,0x10,0x10,0x08,0x14,0xff,
+-	0xe1,0x83,0xb8,0x00,0x14,0xff,0xe1,0x83,0xb9,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,
+-	0xba,0x00,0x00,0x00,0xd1,0x0c,0x10,0x04,0x00,0x00,0x14,0xff,0xe1,0x83,0xbd,0x00,
+-	0x10,0x08,0x14,0xff,0xe1,0x83,0xbe,0x00,0x14,0xff,0xe1,0x83,0xbf,0x00,0xe2,0x9d,
+-	0x08,0xe1,0x48,0x04,0xe0,0x1c,0x02,0xcf,0x86,0xe5,0x11,0x01,0xd4,0x84,0xd3,0x40,
+-	0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0xa5,0x00,0x01,0xff,0x61,0xcc,
+-	0xa5,0x00,0x10,0x08,0x01,0xff,0x62,0xcc,0x87,0x00,0x01,0xff,0x62,0xcc,0x87,0x00,
+-	0xd1,0x10,0x10,0x08,0x01,0xff,0x62,0xcc,0xa3,0x00,0x01,0xff,0x62,0xcc,0xa3,0x00,
+-	0x10,0x08,0x01,0xff,0x62,0xcc,0xb1,0x00,0x01,0xff,0x62,0xcc,0xb1,0x00,0xd2,0x24,
+-	0xd1,0x14,0x10,0x0a,0x01,0xff,0x63,0xcc,0xa7,0xcc,0x81,0x00,0x01,0xff,0x63,0xcc,
+-	0xa7,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x64,0xcc,0x87,0x00,0x01,0xff,0x64,0xcc,
+-	0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x64,0xcc,0xa3,0x00,0x01,0xff,0x64,0xcc,
+-	0xa3,0x00,0x10,0x08,0x01,0xff,0x64,0xcc,0xb1,0x00,0x01,0xff,0x64,0xcc,0xb1,0x00,
+-	0xd3,0x48,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x64,0xcc,0xa7,0x00,0x01,0xff,
+-	0x64,0xcc,0xa7,0x00,0x10,0x08,0x01,0xff,0x64,0xcc,0xad,0x00,0x01,0xff,0x64,0xcc,
+-	0xad,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x65,0xcc,0x84,0xcc,0x80,0x00,0x01,0xff,
+-	0x65,0xcc,0x84,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x65,0xcc,0x84,0xcc,0x81,0x00,
+-	0x01,0xff,0x65,0xcc,0x84,0xcc,0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
+-	0x65,0xcc,0xad,0x00,0x01,0xff,0x65,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,
+-	0xb0,0x00,0x01,0xff,0x65,0xcc,0xb0,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x65,0xcc,
+-	0xa7,0xcc,0x86,0x00,0x01,0xff,0x65,0xcc,0xa7,0xcc,0x86,0x00,0x10,0x08,0x01,0xff,
+-	0x66,0xcc,0x87,0x00,0x01,0xff,0x66,0xcc,0x87,0x00,0xd4,0x84,0xd3,0x40,0xd2,0x20,
+-	0xd1,0x10,0x10,0x08,0x01,0xff,0x67,0xcc,0x84,0x00,0x01,0xff,0x67,0xcc,0x84,0x00,
+-	0x10,0x08,0x01,0xff,0x68,0xcc,0x87,0x00,0x01,0xff,0x68,0xcc,0x87,0x00,0xd1,0x10,
+-	0x10,0x08,0x01,0xff,0x68,0xcc,0xa3,0x00,0x01,0xff,0x68,0xcc,0xa3,0x00,0x10,0x08,
+-	0x01,0xff,0x68,0xcc,0x88,0x00,0x01,0xff,0x68,0xcc,0x88,0x00,0xd2,0x20,0xd1,0x10,
+-	0x10,0x08,0x01,0xff,0x68,0xcc,0xa7,0x00,0x01,0xff,0x68,0xcc,0xa7,0x00,0x10,0x08,
+-	0x01,0xff,0x68,0xcc,0xae,0x00,0x01,0xff,0x68,0xcc,0xae,0x00,0xd1,0x10,0x10,0x08,
+-	0x01,0xff,0x69,0xcc,0xb0,0x00,0x01,0xff,0x69,0xcc,0xb0,0x00,0x10,0x0a,0x01,0xff,
+-	0x69,0xcc,0x88,0xcc,0x81,0x00,0x01,0xff,0x69,0xcc,0x88,0xcc,0x81,0x00,0xd3,0x40,
+-	0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x6b,0xcc,0x81,0x00,0x01,0xff,0x6b,0xcc,
+-	0x81,0x00,0x10,0x08,0x01,0xff,0x6b,0xcc,0xa3,0x00,0x01,0xff,0x6b,0xcc,0xa3,0x00,
+-	0xd1,0x10,0x10,0x08,0x01,0xff,0x6b,0xcc,0xb1,0x00,0x01,0xff,0x6b,0xcc,0xb1,0x00,
+-	0x10,0x08,0x01,0xff,0x6c,0xcc,0xa3,0x00,0x01,0xff,0x6c,0xcc,0xa3,0x00,0xd2,0x24,
+-	0xd1,0x14,0x10,0x0a,0x01,0xff,0x6c,0xcc,0xa3,0xcc,0x84,0x00,0x01,0xff,0x6c,0xcc,
+-	0xa3,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x6c,0xcc,0xb1,0x00,0x01,0xff,0x6c,0xcc,
+-	0xb1,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6c,0xcc,0xad,0x00,0x01,0xff,0x6c,0xcc,
+-	0xad,0x00,0x10,0x08,0x01,0xff,0x6d,0xcc,0x81,0x00,0x01,0xff,0x6d,0xcc,0x81,0x00,
+-	0xcf,0x86,0xe5,0x15,0x01,0xd4,0x88,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
+-	0xff,0x6d,0xcc,0x87,0x00,0x01,0xff,0x6d,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x6d,
+-	0xcc,0xa3,0x00,0x01,0xff,0x6d,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,
+-	0xcc,0x87,0x00,0x01,0xff,0x6e,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x6e,0xcc,0xa3,
+-	0x00,0x01,0xff,0x6e,0xcc,0xa3,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,
+-	0xcc,0xb1,0x00,0x01,0xff,0x6e,0xcc,0xb1,0x00,0x10,0x08,0x01,0xff,0x6e,0xcc,0xad,
+-	0x00,0x01,0xff,0x6e,0xcc,0xad,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x83,
+-	0xcc,0x81,0x00,0x01,0xff,0x6f,0xcc,0x83,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x6f,
+-	0xcc,0x83,0xcc,0x88,0x00,0x01,0xff,0x6f,0xcc,0x83,0xcc,0x88,0x00,0xd3,0x48,0xd2,
+-	0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x84,0xcc,0x80,0x00,0x01,0xff,0x6f,
+-	0xcc,0x84,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x84,0xcc,0x81,0x00,0x01,
+-	0xff,0x6f,0xcc,0x84,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x70,0xcc,0x81,
+-	0x00,0x01,0xff,0x70,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x70,0xcc,0x87,0x00,0x01,
+-	0xff,0x70,0xcc,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x72,0xcc,0x87,
+-	0x00,0x01,0xff,0x72,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x72,0xcc,0xa3,0x00,0x01,
+-	0xff,0x72,0xcc,0xa3,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x72,0xcc,0xa3,0xcc,0x84,
+-	0x00,0x01,0xff,0x72,0xcc,0xa3,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x72,0xcc,0xb1,
+-	0x00,0x01,0xff,0x72,0xcc,0xb1,0x00,0xd4,0x8c,0xd3,0x48,0xd2,0x20,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0x73,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x87,0x00,0x10,0x08,0x01,
+-	0xff,0x73,0xcc,0xa3,0x00,0x01,0xff,0x73,0xcc,0xa3,0x00,0xd1,0x14,0x10,0x0a,0x01,
+-	0xff,0x73,0xcc,0x81,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x81,0xcc,0x87,0x00,0x10,
+-	0x0a,0x01,0xff,0x73,0xcc,0x8c,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x8c,0xcc,0x87,
+-	0x00,0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x73,0xcc,0xa3,0xcc,0x87,0x00,0x01,
+-	0xff,0x73,0xcc,0xa3,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x74,0xcc,0x87,0x00,0x01,
+-	0xff,0x74,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x74,0xcc,0xa3,0x00,0x01,
+-	0xff,0x74,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x74,0xcc,0xb1,0x00,0x01,0xff,0x74,
+-	0xcc,0xb1,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x74,0xcc,0xad,
+-	0x00,0x01,0xff,0x74,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0xa4,0x00,0x01,
+-	0xff,0x75,0xcc,0xa4,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0xb0,0x00,0x01,
+-	0xff,0x75,0xcc,0xb0,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0xad,0x00,0x01,0xff,0x75,
+-	0xcc,0xad,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,0xcc,0x83,0xcc,0x81,
+-	0x00,0x01,0xff,0x75,0xcc,0x83,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x84,
+-	0xcc,0x88,0x00,0x01,0xff,0x75,0xcc,0x84,0xcc,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,
+-	0xff,0x76,0xcc,0x83,0x00,0x01,0xff,0x76,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x76,
+-	0xcc,0xa3,0x00,0x01,0xff,0x76,0xcc,0xa3,0x00,0xe0,0x11,0x02,0xcf,0x86,0xd5,0xe2,
+-	0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x80,0x00,
+-	0x01,0xff,0x77,0xcc,0x80,0x00,0x10,0x08,0x01,0xff,0x77,0xcc,0x81,0x00,0x01,0xff,
+-	0x77,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x88,0x00,0x01,0xff,
+-	0x77,0xcc,0x88,0x00,0x10,0x08,0x01,0xff,0x77,0xcc,0x87,0x00,0x01,0xff,0x77,0xcc,
+-	0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0xa3,0x00,0x01,0xff,
+-	0x77,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x78,0xcc,0x87,0x00,0x01,0xff,0x78,0xcc,
+-	0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x78,0xcc,0x88,0x00,0x01,0xff,0x78,0xcc,
+-	0x88,0x00,0x10,0x08,0x01,0xff,0x79,0xcc,0x87,0x00,0x01,0xff,0x79,0xcc,0x87,0x00,
+-	0xd3,0x33,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x7a,0xcc,0x82,0x00,0x01,0xff,
+-	0x7a,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0xa3,0x00,0x01,0xff,0x7a,0xcc,
+-	0xa3,0x00,0xe1,0x12,0x59,0x10,0x08,0x01,0xff,0x7a,0xcc,0xb1,0x00,0x01,0xff,0x7a,
+-	0xcc,0xb1,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x8a,0x00,0x01,
+-	0xff,0x79,0xcc,0x8a,0x00,0x10,0x08,0x01,0xff,0x61,0xca,0xbe,0x00,0x02,0xff,0x73,
+-	0xcc,0x87,0x00,0x51,0x04,0x0a,0x00,0x10,0x07,0x0a,0xff,0x73,0x73,0x00,0x0a,0x00,
+-	0xd4,0x98,0xd3,0x48,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0xa3,0x00,
+-	0x01,0xff,0x61,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x61,0xcc,0x89,0x00,0x01,0xff,
+-	0x61,0xcc,0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x61,0xcc,0x82,0xcc,0x81,0x00,
+-	0x01,0xff,0x61,0xcc,0x82,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0x82,0xcc,
+-	0x80,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x80,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,
+-	0x01,0xff,0x61,0xcc,0x82,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x89,0x00,
+-	0x10,0x0a,0x01,0xff,0x61,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,
+-	0x83,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x61,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,
+-	0x61,0xcc,0xa3,0xcc,0x82,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0x86,0xcc,0x81,0x00,
+-	0x01,0xff,0x61,0xcc,0x86,0xcc,0x81,0x00,0xd3,0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,
+-	0x01,0xff,0x61,0xcc,0x86,0xcc,0x80,0x00,0x01,0xff,0x61,0xcc,0x86,0xcc,0x80,0x00,
+-	0x10,0x0a,0x01,0xff,0x61,0xcc,0x86,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x86,0xcc,
+-	0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x61,0xcc,0x86,0xcc,0x83,0x00,0x01,0xff,
+-	0x61,0xcc,0x86,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0xa3,0xcc,0x86,0x00,
+-	0x01,0xff,0x61,0xcc,0xa3,0xcc,0x86,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
+-	0x65,0xcc,0xa3,0x00,0x01,0xff,0x65,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,
+-	0x89,0x00,0x01,0xff,0x65,0xcc,0x89,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,
+-	0x83,0x00,0x01,0xff,0x65,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x65,0xcc,0x82,0xcc,
+-	0x81,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x81,0x00,0xcf,0x86,0xe5,0x31,0x01,0xd4,
+-	0x90,0xd3,0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x65,0xcc,0x82,0xcc,0x80,
+-	0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x65,0xcc,0x82,
+-	0xcc,0x89,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,
+-	0xff,0x65,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x83,0x00,0x10,
+-	0x0a,0x01,0xff,0x65,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,0x65,0xcc,0xa3,0xcc,0x82,
+-	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,0xcc,0x89,0x00,0x01,0xff,0x69,
+-	0xcc,0x89,0x00,0x10,0x08,0x01,0xff,0x69,0xcc,0xa3,0x00,0x01,0xff,0x69,0xcc,0xa3,
+-	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0xa3,0x00,0x01,0xff,0x6f,0xcc,0xa3,
+-	0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x89,0x00,0xd3,
+-	0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x81,0x00,0x01,
+-	0xff,0x6f,0xcc,0x82,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x80,
+-	0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x80,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,
+-	0xcc,0x82,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x89,0x00,0x10,0x0a,0x01,
+-	0xff,0x6f,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x83,0x00,0xd2,
+-	0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,0x6f,
+-	0xcc,0xa3,0xcc,0x82,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x81,0x00,0x01,
+-	0xff,0x6f,0xcc,0x9b,0xcc,0x81,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,
+-	0xcc,0x80,0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x6f,
+-	0xcc,0x9b,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x89,0x00,0xd4,0x98,0xd3,
+-	0x48,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x83,0x00,0x01,
+-	0xff,0x6f,0xcc,0x9b,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0xa3,
+-	0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,
+-	0xcc,0xa3,0x00,0x01,0xff,0x75,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0x89,
+-	0x00,0x01,0xff,0x75,0xcc,0x89,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,
+-	0xcc,0x9b,0xcc,0x81,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x81,0x00,0x10,0x0a,0x01,
+-	0xff,0x75,0xcc,0x9b,0xcc,0x80,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x80,0x00,0xd1,
+-	0x14,0x10,0x0a,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x89,0x00,0x01,0xff,0x75,0xcc,0x9b,
+-	0xcc,0x89,0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x83,0x00,0x01,0xff,0x75,
+-	0xcc,0x9b,0xcc,0x83,0x00,0xd3,0x44,0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,
+-	0xcc,0x9b,0xcc,0xa3,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0xa3,0x00,0x10,0x08,0x01,
+-	0xff,0x79,0xcc,0x80,0x00,0x01,0xff,0x79,0xcc,0x80,0x00,0xd1,0x10,0x10,0x08,0x01,
+-	0xff,0x79,0xcc,0xa3,0x00,0x01,0xff,0x79,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x79,
+-	0xcc,0x89,0x00,0x01,0xff,0x79,0xcc,0x89,0x00,0xd2,0x1c,0xd1,0x10,0x10,0x08,0x01,
+-	0xff,0x79,0xcc,0x83,0x00,0x01,0xff,0x79,0xcc,0x83,0x00,0x10,0x08,0x0a,0xff,0xe1,
+-	0xbb,0xbb,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xe1,0xbb,0xbd,0x00,0x0a,
+-	0x00,0x10,0x08,0x0a,0xff,0xe1,0xbb,0xbf,0x00,0x0a,0x00,0xe1,0xbf,0x02,0xe0,0xa1,
+-	0x01,0xcf,0x86,0xd5,0xc6,0xd4,0x6c,0xd3,0x18,0xe2,0x0e,0x59,0xe1,0xf7,0x58,0x10,
+-	0x09,0x01,0xff,0xce,0xb1,0xcc,0x93,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0x00,0xd2,
+-	0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x93,0x00,0x01,0xff,0xce,0xb1,
+-	0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,
+-	0xce,0xb1,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,
+-	0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,
+-	0xff,0xce,0xb1,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcd,0x82,
+-	0x00,0xd3,0x18,0xe2,0x4a,0x59,0xe1,0x33,0x59,0x10,0x09,0x01,0xff,0xce,0xb5,0xcc,
+-	0x93,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,
+-	0xff,0xce,0xb5,0xcc,0x93,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0x00,0x10,0x0b,0x01,
+-	0xff,0xce,0xb5,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0xcc,0x80,
+-	0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xce,0xb5,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,
+-	0xce,0xb5,0xcc,0x94,0xcc,0x81,0x00,0x00,0x00,0xd4,0x6c,0xd3,0x18,0xe2,0x74,0x59,
+-	0xe1,0x5d,0x59,0x10,0x09,0x01,0xff,0xce,0xb7,0xcc,0x93,0x00,0x01,0xff,0xce,0xb7,
+-	0xcc,0x94,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb7,0xcc,0x93,0x00,
+-	0x01,0xff,0xce,0xb7,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,
+-	0x80,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,
+-	0xff,0xce,0xb7,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x81,
+-	0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb7,
+-	0xcc,0x94,0xcd,0x82,0x00,0xd3,0x18,0xe2,0xb0,0x59,0xe1,0x99,0x59,0x10,0x09,0x01,
+-	0xff,0xce,0xb9,0xcc,0x93,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0x00,0xd2,0x28,0xd1,
+-	0x12,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x93,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,
+-	0x00,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xb9,
+-	0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x93,0xcc,
+-	0x81,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xce,
+-	0xb9,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0xcd,0x82,0x00,0xcf,
+-	0x86,0xd5,0xac,0xd4,0x5a,0xd3,0x18,0xe2,0xed,0x59,0xe1,0xd6,0x59,0x10,0x09,0x01,
+-	0xff,0xce,0xbf,0xcc,0x93,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,0x00,0xd2,0x28,0xd1,
+-	0x12,0x10,0x09,0x01,0xff,0xce,0xbf,0xcc,0x93,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,
+-	0x00,0x10,0x0b,0x01,0xff,0xce,0xbf,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xbf,
+-	0xcc,0x94,0xcc,0x80,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xce,0xbf,0xcc,0x93,0xcc,
+-	0x81,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,0xcc,0x81,0x00,0x00,0x00,0xd3,0x18,0xe2,
+-	0x17,0x5a,0xe1,0x00,0x5a,0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x93,0x00,0x01,0xff,
+-	0xcf,0x85,0xcc,0x94,0x00,0xd2,0x1c,0xd1,0x0d,0x10,0x04,0x00,0x00,0x01,0xff,0xcf,
+-	0x85,0xcc,0x94,0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcc,0x80,
+-	0x00,0xd1,0x0f,0x10,0x04,0x00,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcc,0x81,0x00,
+-	0x10,0x04,0x00,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcd,0x82,0x00,0xe4,0xd3,0x5a,
+-	0xd3,0x18,0xe2,0x52,0x5a,0xe1,0x3b,0x5a,0x10,0x09,0x01,0xff,0xcf,0x89,0xcc,0x93,
+-	0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,
+-	0xcf,0x89,0xcc,0x93,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,
+-	0xcf,0x89,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x80,0x00,
+-	0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xcf,
+-	0x89,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcd,0x82,
+-	0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcd,0x82,0x00,0xe0,0xd9,0x02,0xcf,0x86,0xe5,
+-	0x91,0x01,0xd4,0xc8,0xd3,0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb1,
+-	0xcc,0x93,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xce,0xb9,0x00,0x10,0x0d,
+-	0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,
+-	0x94,0xcc,0x80,0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,
+-	0xcc,0x81,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x81,0xce,0xb9,0x00,
+-	0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,0x01,0xff,0xce,
+-	0xb1,0xcc,0x94,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,
+-	0xce,0xb1,0xcc,0x93,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xce,0xb9,0x00,
+-	0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xce,
+-	0xb1,0xcc,0x94,0xcc,0x80,0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,0xb1,
+-	0xcc,0x93,0xcc,0x81,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x81,0xce,
+-	0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,0x01,
+-	0xff,0xce,0xb1,0xcc,0x94,0xcd,0x82,0xce,0xb9,0x00,0xd3,0x64,0xd2,0x30,0xd1,0x16,
+-	0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,
+-	0x94,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x80,0xce,0xb9,
+-	0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,
+-	0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x81,0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,
+-	0x94,0xcc,0x81,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,0x82,
+-	0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x30,
+-	0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xce,0xb9,0x00,0x01,0xff,0xce,
+-	0xb7,0xcc,0x94,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x80,
+-	0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,0xce,0xb9,0x00,0xd1,0x1a,
+-	0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x81,0xce,0xb9,0x00,0x01,0xff,0xce,
+-	0xb7,0xcc,0x94,0xcc,0x81,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,
+-	0xcd,0x82,0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x82,0xce,0xb9,0x00,
+-	0xd4,0xc8,0xd3,0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,
+-	0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,
+-	0xcf,0x89,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,
+-	0x80,0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x81,
+-	0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x81,0xce,0xb9,0x00,0x10,0x0d,
+-	0x01,0xff,0xcf,0x89,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,
+-	0x94,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x89,
+-	0xcc,0x93,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xce,0xb9,0x00,0x10,0x0d,
+-	0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,
+-	0x94,0xcc,0x80,0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,
+-	0xcc,0x81,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x81,0xce,0xb9,0x00,
+-	0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,0x01,0xff,0xcf,
+-	0x89,0xcc,0x94,0xcd,0x82,0xce,0xb9,0x00,0xd3,0x49,0xd2,0x26,0xd1,0x12,0x10,0x09,
+-	0x01,0xff,0xce,0xb1,0xcc,0x86,0x00,0x01,0xff,0xce,0xb1,0xcc,0x84,0x00,0x10,0x0b,
+-	0x01,0xff,0xce,0xb1,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xce,0xb9,0x00,
+-	0xd1,0x0f,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x81,0xce,0xb9,0x00,0x00,0x00,0x10,
+-	0x09,0x01,0xff,0xce,0xb1,0xcd,0x82,0x00,0x01,0xff,0xce,0xb1,0xcd,0x82,0xce,0xb9,
+-	0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x86,0x00,0x01,0xff,
+-	0xce,0xb1,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x80,0x00,0x01,0xff,
+-	0xce,0xb1,0xcc,0x81,0x00,0xe1,0xf3,0x5a,0x10,0x09,0x01,0xff,0xce,0xb1,0xce,0xb9,
+-	0x00,0x01,0x00,0xcf,0x86,0xd5,0xbd,0xd4,0x7e,0xd3,0x44,0xd2,0x21,0xd1,0x0d,0x10,
+-	0x04,0x01,0x00,0x01,0xff,0xc2,0xa8,0xcd,0x82,0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,
+-	0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xce,0xb9,0x00,0xd1,0x0f,0x10,0x0b,
+-	0x01,0xff,0xce,0xb7,0xcc,0x81,0xce,0xb9,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xce,
+-	0xb7,0xcd,0x82,0x00,0x01,0xff,0xce,0xb7,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x24,0xd1,
+-	0x12,0x10,0x09,0x01,0xff,0xce,0xb5,0xcc,0x80,0x00,0x01,0xff,0xce,0xb5,0xcc,0x81,
+-	0x00,0x10,0x09,0x01,0xff,0xce,0xb7,0xcc,0x80,0x00,0x01,0xff,0xce,0xb7,0xcc,0x81,
+-	0x00,0xe1,0x02,0x5b,0x10,0x09,0x01,0xff,0xce,0xb7,0xce,0xb9,0x00,0x01,0xff,0xe1,
+-	0xbe,0xbf,0xcc,0x80,0x00,0xd3,0x18,0xe2,0x28,0x5b,0xe1,0x11,0x5b,0x10,0x09,0x01,
+-	0xff,0xce,0xb9,0xcc,0x86,0x00,0x01,0xff,0xce,0xb9,0xcc,0x84,0x00,0xe2,0x4c,0x5b,
+-	0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x86,0x00,0x01,0xff,0xce,0xb9,0xcc,
+-	0x84,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x80,0x00,0x01,0xff,0xce,0xb9,0xcc,
+-	0x81,0x00,0xd4,0x51,0xd3,0x18,0xe2,0x6f,0x5b,0xe1,0x58,0x5b,0x10,0x09,0x01,0xff,
+-	0xcf,0x85,0xcc,0x86,0x00,0x01,0xff,0xcf,0x85,0xcc,0x84,0x00,0xd2,0x24,0xd1,0x12,
+-	0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x86,0x00,0x01,0xff,0xcf,0x85,0xcc,0x84,0x00,
+-	0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x80,0x00,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,
+-	0xe1,0x8f,0x5b,0x10,0x09,0x01,0xff,0xcf,0x81,0xcc,0x94,0x00,0x01,0xff,0xc2,0xa8,
+-	0xcc,0x80,0x00,0xd3,0x3b,0xd2,0x18,0x51,0x04,0x00,0x00,0x10,0x0b,0x01,0xff,0xcf,
+-	0x89,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xce,0xb9,0x00,0xd1,0x0f,0x10,
+-	0x0b,0x01,0xff,0xcf,0x89,0xcc,0x81,0xce,0xb9,0x00,0x00,0x00,0x10,0x09,0x01,0xff,
+-	0xcf,0x89,0xcd,0x82,0x00,0x01,0xff,0xcf,0x89,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x24,
+-	0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xbf,0xcc,0x80,0x00,0x01,0xff,0xce,0xbf,0xcc,
+-	0x81,0x00,0x10,0x09,0x01,0xff,0xcf,0x89,0xcc,0x80,0x00,0x01,0xff,0xcf,0x89,0xcc,
+-	0x81,0x00,0xe1,0x99,0x5b,0x10,0x09,0x01,0xff,0xcf,0x89,0xce,0xb9,0x00,0x01,0xff,
+-	0xc2,0xb4,0x00,0xe0,0x0c,0x68,0xcf,0x86,0xe5,0x23,0x02,0xe4,0x25,0x01,0xe3,0x85,
+-	0x5e,0xd2,0x2a,0xe1,0x5f,0x5c,0xe0,0xdd,0x5b,0xcf,0x86,0xe5,0xbb,0x5b,0x94,0x1b,
+-	0xe3,0xa4,0x5b,0x92,0x14,0x91,0x10,0x10,0x08,0x01,0xff,0xe2,0x80,0x82,0x00,0x01,
+-	0xff,0xe2,0x80,0x83,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd1,0xd6,0xd0,0x46,0xcf,
+-	0x86,0x55,0x04,0x01,0x00,0xd4,0x29,0xd3,0x13,0x52,0x04,0x01,0x00,0x51,0x04,0x01,
+-	0x00,0x10,0x07,0x01,0xff,0xcf,0x89,0x00,0x01,0x00,0x92,0x12,0x51,0x04,0x01,0x00,
+-	0x10,0x06,0x01,0xff,0x6b,0x00,0x01,0xff,0x61,0xcc,0x8a,0x00,0x01,0x00,0xe3,0x25,
+-	0x5d,0x92,0x10,0x51,0x04,0x01,0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0x8e,0x00,0x01,
+-	0x00,0x01,0x00,0xcf,0x86,0xd5,0x0a,0xe4,0x42,0x5d,0x63,0x2d,0x5d,0x06,0x00,0x94,
+-	0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x85,0xb0,0x00,0x01,
+-	0xff,0xe2,0x85,0xb1,0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0xb2,0x00,0x01,0xff,0xe2,
+-	0x85,0xb3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x85,0xb4,0x00,0x01,0xff,0xe2,
+-	0x85,0xb5,0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0xb6,0x00,0x01,0xff,0xe2,0x85,0xb7,
+-	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x85,0xb8,0x00,0x01,0xff,0xe2,
+-	0x85,0xb9,0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0xba,0x00,0x01,0xff,0xe2,0x85,0xbb,
+-	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x85,0xbc,0x00,0x01,0xff,0xe2,0x85,0xbd,
+-	0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0xbe,0x00,0x01,0xff,0xe2,0x85,0xbf,0x00,0x01,
+-	0x00,0xe0,0x34,0x5d,0xcf,0x86,0xe5,0x13,0x5d,0xe4,0xf2,0x5c,0xe3,0xe1,0x5c,0xe2,
+-	0xd4,0x5c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x04,0xff,0xe2,0x86,0x84,0x00,
+-	0xe3,0x23,0x61,0xe2,0xf0,0x60,0xd1,0x0c,0xe0,0x9d,0x60,0xcf,0x86,0x65,0x7e,0x60,
+-	0x01,0x00,0xd0,0x62,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x18,
+-	0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x08,0x01,0xff,0xe2,0x93,0x90,0x00,
+-	0x01,0xff,0xe2,0x93,0x91,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x93,
+-	0x92,0x00,0x01,0xff,0xe2,0x93,0x93,0x00,0x10,0x08,0x01,0xff,0xe2,0x93,0x94,0x00,
+-	0x01,0xff,0xe2,0x93,0x95,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x93,0x96,0x00,
+-	0x01,0xff,0xe2,0x93,0x97,0x00,0x10,0x08,0x01,0xff,0xe2,0x93,0x98,0x00,0x01,0xff,
+-	0xe2,0x93,0x99,0x00,0xcf,0x86,0xe5,0x57,0x60,0x94,0x80,0xd3,0x40,0xd2,0x20,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0xe2,0x93,0x9a,0x00,0x01,0xff,0xe2,0x93,0x9b,0x00,0x10,
+-	0x08,0x01,0xff,0xe2,0x93,0x9c,0x00,0x01,0xff,0xe2,0x93,0x9d,0x00,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0xe2,0x93,0x9e,0x00,0x01,0xff,0xe2,0x93,0x9f,0x00,0x10,0x08,0x01,
+-	0xff,0xe2,0x93,0xa0,0x00,0x01,0xff,0xe2,0x93,0xa1,0x00,0xd2,0x20,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0xe2,0x93,0xa2,0x00,0x01,0xff,0xe2,0x93,0xa3,0x00,0x10,0x08,0x01,
+-	0xff,0xe2,0x93,0xa4,0x00,0x01,0xff,0xe2,0x93,0xa5,0x00,0xd1,0x10,0x10,0x08,0x01,
+-	0xff,0xe2,0x93,0xa6,0x00,0x01,0xff,0xe2,0x93,0xa7,0x00,0x10,0x08,0x01,0xff,0xe2,
+-	0x93,0xa8,0x00,0x01,0xff,0xe2,0x93,0xa9,0x00,0x01,0x00,0xd4,0x0c,0xe3,0x33,0x62,
+-	0xe2,0x2c,0x62,0xcf,0x06,0x04,0x00,0xe3,0x0c,0x65,0xe2,0xff,0x63,0xe1,0x2e,0x02,
+-	0xe0,0x84,0x01,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,
+-	0x10,0x08,0x08,0xff,0xe2,0xb0,0xb0,0x00,0x08,0xff,0xe2,0xb0,0xb1,0x00,0x10,0x08,
+-	0x08,0xff,0xe2,0xb0,0xb2,0x00,0x08,0xff,0xe2,0xb0,0xb3,0x00,0xd1,0x10,0x10,0x08,
+-	0x08,0xff,0xe2,0xb0,0xb4,0x00,0x08,0xff,0xe2,0xb0,0xb5,0x00,0x10,0x08,0x08,0xff,
+-	0xe2,0xb0,0xb6,0x00,0x08,0xff,0xe2,0xb0,0xb7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x08,0xff,0xe2,0xb0,0xb8,0x00,0x08,0xff,0xe2,0xb0,0xb9,0x00,0x10,0x08,0x08,0xff,
+-	0xe2,0xb0,0xba,0x00,0x08,0xff,0xe2,0xb0,0xbb,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,
+-	0xe2,0xb0,0xbc,0x00,0x08,0xff,0xe2,0xb0,0xbd,0x00,0x10,0x08,0x08,0xff,0xe2,0xb0,
+-	0xbe,0x00,0x08,0xff,0xe2,0xb0,0xbf,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x08,0xff,0xe2,0xb1,0x80,0x00,0x08,0xff,0xe2,0xb1,0x81,0x00,0x10,0x08,0x08,0xff,
+-	0xe2,0xb1,0x82,0x00,0x08,0xff,0xe2,0xb1,0x83,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,
+-	0xe2,0xb1,0x84,0x00,0x08,0xff,0xe2,0xb1,0x85,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,
+-	0x86,0x00,0x08,0xff,0xe2,0xb1,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,
+-	0xe2,0xb1,0x88,0x00,0x08,0xff,0xe2,0xb1,0x89,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,
+-	0x8a,0x00,0x08,0xff,0xe2,0xb1,0x8b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb1,
+-	0x8c,0x00,0x08,0xff,0xe2,0xb1,0x8d,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0x8e,0x00,
+-	0x08,0xff,0xe2,0xb1,0x8f,0x00,0x94,0x7c,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x08,0xff,0xe2,0xb1,0x90,0x00,0x08,0xff,0xe2,0xb1,0x91,0x00,0x10,0x08,0x08,0xff,
+-	0xe2,0xb1,0x92,0x00,0x08,0xff,0xe2,0xb1,0x93,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,
+-	0xe2,0xb1,0x94,0x00,0x08,0xff,0xe2,0xb1,0x95,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,
+-	0x96,0x00,0x08,0xff,0xe2,0xb1,0x97,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,
+-	0xe2,0xb1,0x98,0x00,0x08,0xff,0xe2,0xb1,0x99,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,
+-	0x9a,0x00,0x08,0xff,0xe2,0xb1,0x9b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb1,
+-	0x9c,0x00,0x08,0xff,0xe2,0xb1,0x9d,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0x9e,0x00,
+-	0x00,0x00,0x08,0x00,0xcf,0x86,0xd5,0x07,0x64,0xef,0x61,0x08,0x00,0xd4,0x63,0xd3,
+-	0x32,0xd2,0x1b,0xd1,0x0c,0x10,0x08,0x09,0xff,0xe2,0xb1,0xa1,0x00,0x09,0x00,0x10,
+-	0x07,0x09,0xff,0xc9,0xab,0x00,0x09,0xff,0xe1,0xb5,0xbd,0x00,0xd1,0x0b,0x10,0x07,
+-	0x09,0xff,0xc9,0xbd,0x00,0x09,0x00,0x10,0x04,0x09,0x00,0x09,0xff,0xe2,0xb1,0xa8,
+-	0x00,0xd2,0x18,0xd1,0x0c,0x10,0x04,0x09,0x00,0x09,0xff,0xe2,0xb1,0xaa,0x00,0x10,
+-	0x04,0x09,0x00,0x09,0xff,0xe2,0xb1,0xac,0x00,0xd1,0x0b,0x10,0x04,0x09,0x00,0x0a,
+-	0xff,0xc9,0x91,0x00,0x10,0x07,0x0a,0xff,0xc9,0xb1,0x00,0x0a,0xff,0xc9,0x90,0x00,
+-	0xd3,0x27,0xd2,0x17,0xd1,0x0b,0x10,0x07,0x0b,0xff,0xc9,0x92,0x00,0x0a,0x00,0x10,
+-	0x08,0x0a,0xff,0xe2,0xb1,0xb3,0x00,0x0a,0x00,0x91,0x0c,0x10,0x04,0x09,0x00,0x09,
+-	0xff,0xe2,0xb1,0xb6,0x00,0x09,0x00,0x52,0x04,0x0a,0x00,0x51,0x04,0x0a,0x00,0x10,
+-	0x07,0x0b,0xff,0xc8,0xbf,0x00,0x0b,0xff,0xc9,0x80,0x00,0xe0,0x83,0x01,0xcf,0x86,
+-	0xd5,0xc0,0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,
+-	0x81,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x83,0x00,0x08,0x00,0xd1,0x0c,
+-	0x10,0x08,0x08,0xff,0xe2,0xb2,0x85,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,
+-	0x87,0x00,0x08,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0x89,0x00,
+-	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x8b,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,
+-	0x08,0xff,0xe2,0xb2,0x8d,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x8f,0x00,
+-	0x08,0x00,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0x91,0x00,
+-	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x93,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,
+-	0x08,0xff,0xe2,0xb2,0x95,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x97,0x00,
+-	0x08,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0x99,0x00,0x08,0x00,
+-	0x10,0x08,0x08,0xff,0xe2,0xb2,0x9b,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
+-	0xe2,0xb2,0x9d,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x9f,0x00,0x08,0x00,
+-	0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xa1,0x00,
+-	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xa3,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,
+-	0x08,0xff,0xe2,0xb2,0xa5,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xa7,0x00,
+-	0x08,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xa9,0x00,0x08,0x00,
+-	0x10,0x08,0x08,0xff,0xe2,0xb2,0xab,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
+-	0xe2,0xb2,0xad,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xaf,0x00,0x08,0x00,
+-	0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xb1,0x00,0x08,0x00,
+-	0x10,0x08,0x08,0xff,0xe2,0xb2,0xb3,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
+-	0xe2,0xb2,0xb5,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xb7,0x00,0x08,0x00,
+-	0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xb9,0x00,0x08,0x00,0x10,0x08,
+-	0x08,0xff,0xe2,0xb2,0xbb,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,
+-	0xbd,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xbf,0x00,0x08,0x00,0xcf,0x86,
+-	0xd5,0xc0,0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,
+-	0x81,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x83,0x00,0x08,0x00,0xd1,0x0c,
+-	0x10,0x08,0x08,0xff,0xe2,0xb3,0x85,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,
+-	0x87,0x00,0x08,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0x89,0x00,
+-	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x8b,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,
+-	0x08,0xff,0xe2,0xb3,0x8d,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x8f,0x00,
+-	0x08,0x00,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0x91,0x00,
+-	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x93,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,
+-	0x08,0xff,0xe2,0xb3,0x95,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x97,0x00,
+-	0x08,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0x99,0x00,0x08,0x00,
+-	0x10,0x08,0x08,0xff,0xe2,0xb3,0x9b,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
+-	0xe2,0xb3,0x9d,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x9f,0x00,0x08,0x00,
+-	0xd4,0x3b,0xd3,0x1c,0x92,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0xa1,0x00,
+-	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0xa3,0x00,0x08,0x00,0x08,0x00,0xd2,0x10,
+-	0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x0b,0xff,0xe2,0xb3,0xac,0x00,0xe1,0x3b,
+-	0x5f,0x10,0x04,0x0b,0x00,0x0b,0xff,0xe2,0xb3,0xae,0x00,0xe3,0x40,0x5f,0x92,0x10,
+-	0x51,0x04,0x0b,0xe6,0x10,0x08,0x0d,0xff,0xe2,0xb3,0xb3,0x00,0x0d,0x00,0x00,0x00,
+-	0xe2,0x98,0x08,0xd1,0x0b,0xe0,0x11,0x67,0xcf,0x86,0xcf,0x06,0x01,0x00,0xe0,0x65,
+-	0x6c,0xcf,0x86,0xe5,0xa7,0x05,0xd4,0x06,0xcf,0x06,0x04,0x00,0xd3,0x0c,0xe2,0xf8,
+-	0x67,0xe1,0x8f,0x67,0xcf,0x06,0x04,0x00,0xe2,0xdb,0x01,0xe1,0x26,0x01,0xd0,0x09,
+-	0xcf,0x86,0x65,0xf4,0x67,0x0a,0x00,0xcf,0x86,0xd5,0xc0,0xd4,0x60,0xd3,0x30,0xd2,
+-	0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x81,0x00,0x0a,0x00,0x10,0x08,0x0a,
+-	0xff,0xea,0x99,0x83,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x85,
+-	0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0x87,0x00,0x0a,0x00,0xd2,0x18,0xd1,
+-	0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x89,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,
+-	0x99,0x8b,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x8d,0x00,0x0a,
+-	0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0x8f,0x00,0x0a,0x00,0xd3,0x30,0xd2,0x18,0xd1,
+-	0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x91,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,
+-	0x99,0x93,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x95,0x00,0x0a,
+-	0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0x97,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,
+-	0x08,0x0a,0xff,0xea,0x99,0x99,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0x9b,
+-	0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x9d,0x00,0x0a,0x00,0x10,
+-	0x08,0x0a,0xff,0xea,0x99,0x9f,0x00,0x0a,0x00,0xe4,0x5d,0x67,0xd3,0x30,0xd2,0x18,
+-	0xd1,0x0c,0x10,0x08,0x0c,0xff,0xea,0x99,0xa1,0x00,0x0c,0x00,0x10,0x08,0x0a,0xff,
+-	0xea,0x99,0xa3,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0xa5,0x00,
+-	0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0xa7,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,
+-	0x10,0x08,0x0a,0xff,0xea,0x99,0xa9,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,
+-	0xab,0x00,0x0a,0x00,0xe1,0x0c,0x67,0x10,0x08,0x0a,0xff,0xea,0x99,0xad,0x00,0x0a,
+-	0x00,0xe0,0x35,0x67,0xcf,0x86,0x95,0xab,0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,
+-	0x10,0x08,0x0a,0xff,0xea,0x9a,0x81,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9a,
+-	0x83,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9a,0x85,0x00,0x0a,0x00,
+-	0x10,0x08,0x0a,0xff,0xea,0x9a,0x87,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,
+-	0x0a,0xff,0xea,0x9a,0x89,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9a,0x8b,0x00,
+-	0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9a,0x8d,0x00,0x0a,0x00,0x10,0x08,
+-	0x0a,0xff,0xea,0x9a,0x8f,0x00,0x0a,0x00,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,
+-	0x0a,0xff,0xea,0x9a,0x91,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9a,0x93,0x00,
+-	0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9a,0x95,0x00,0x0a,0x00,0x10,0x08,
+-	0x0a,0xff,0xea,0x9a,0x97,0x00,0x0a,0x00,0xe2,0x92,0x66,0xd1,0x0c,0x10,0x08,0x10,
+-	0xff,0xea,0x9a,0x99,0x00,0x10,0x00,0x10,0x08,0x10,0xff,0xea,0x9a,0x9b,0x00,0x10,
+-	0x00,0x0b,0x00,0xe1,0x10,0x02,0xd0,0xb9,0xcf,0x86,0xd5,0x07,0x64,0x9e,0x66,0x08,
+-	0x00,0xd4,0x58,0xd3,0x28,0xd2,0x10,0x51,0x04,0x09,0x00,0x10,0x08,0x0a,0xff,0xea,
+-	0x9c,0xa3,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9c,0xa5,0x00,0x0a,
+-	0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xa7,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,
+-	0x08,0x0a,0xff,0xea,0x9c,0xa9,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xab,
+-	0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9c,0xad,0x00,0x0a,0x00,0x10,
+-	0x08,0x0a,0xff,0xea,0x9c,0xaf,0x00,0x0a,0x00,0xd3,0x28,0xd2,0x10,0x51,0x04,0x0a,
+-	0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xb3,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,
+-	0xff,0xea,0x9c,0xb5,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xb7,0x00,0x0a,
+-	0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9c,0xb9,0x00,0x0a,0x00,0x10,
+-	0x08,0x0a,0xff,0xea,0x9c,0xbb,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,
+-	0x9c,0xbd,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xbf,0x00,0x0a,0x00,0xcf,
+-	0x86,0xd5,0xc0,0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,
+-	0x9d,0x81,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x83,0x00,0x0a,0x00,0xd1,
+-	0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0x85,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,
+-	0x9d,0x87,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0x89,
+-	0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x8b,0x00,0x0a,0x00,0xd1,0x0c,0x10,
+-	0x08,0x0a,0xff,0xea,0x9d,0x8d,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x8f,
+-	0x00,0x0a,0x00,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0x91,
+-	0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x93,0x00,0x0a,0x00,0xd1,0x0c,0x10,
+-	0x08,0x0a,0xff,0xea,0x9d,0x95,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x97,
+-	0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0x99,0x00,0x0a,
+-	0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x9b,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,
+-	0xff,0xea,0x9d,0x9d,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x9f,0x00,0x0a,
+-	0x00,0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0xa1,
+-	0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xa3,0x00,0x0a,0x00,0xd1,0x0c,0x10,
+-	0x08,0x0a,0xff,0xea,0x9d,0xa5,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xa7,
+-	0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0xa9,0x00,0x0a,
+-	0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xab,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,
+-	0xff,0xea,0x9d,0xad,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xaf,0x00,0x0a,
+-	0x00,0x53,0x04,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x04,0x0a,0x00,0x0a,0xff,0xea,
+-	0x9d,0xba,0x00,0x10,0x04,0x0a,0x00,0x0a,0xff,0xea,0x9d,0xbc,0x00,0xd1,0x0c,0x10,
+-	0x04,0x0a,0x00,0x0a,0xff,0xe1,0xb5,0xb9,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xbf,
+-	0x00,0x0a,0x00,0xe0,0x71,0x01,0xcf,0x86,0xd5,0xa6,0xd4,0x4e,0xd3,0x30,0xd2,0x18,
+-	0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9e,0x81,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,
+-	0xea,0x9e,0x83,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9e,0x85,0x00,
+-	0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9e,0x87,0x00,0x0a,0x00,0xd2,0x10,0x51,0x04,
+-	0x0a,0x00,0x10,0x04,0x0a,0x00,0x0a,0xff,0xea,0x9e,0x8c,0x00,0xe1,0x9a,0x64,0x10,
+-	0x04,0x0a,0x00,0x0c,0xff,0xc9,0xa5,0x00,0xd3,0x28,0xd2,0x18,0xd1,0x0c,0x10,0x08,
+-	0x0c,0xff,0xea,0x9e,0x91,0x00,0x0c,0x00,0x10,0x08,0x0d,0xff,0xea,0x9e,0x93,0x00,
+-	0x0d,0x00,0x51,0x04,0x10,0x00,0x10,0x08,0x10,0xff,0xea,0x9e,0x97,0x00,0x10,0x00,
+-	0xd2,0x18,0xd1,0x0c,0x10,0x08,0x10,0xff,0xea,0x9e,0x99,0x00,0x10,0x00,0x10,0x08,
+-	0x10,0xff,0xea,0x9e,0x9b,0x00,0x10,0x00,0xd1,0x0c,0x10,0x08,0x10,0xff,0xea,0x9e,
+-	0x9d,0x00,0x10,0x00,0x10,0x08,0x10,0xff,0xea,0x9e,0x9f,0x00,0x10,0x00,0xd4,0x63,
+-	0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0c,0xff,0xea,0x9e,0xa1,0x00,0x0c,0x00,
+-	0x10,0x08,0x0c,0xff,0xea,0x9e,0xa3,0x00,0x0c,0x00,0xd1,0x0c,0x10,0x08,0x0c,0xff,
+-	0xea,0x9e,0xa5,0x00,0x0c,0x00,0x10,0x08,0x0c,0xff,0xea,0x9e,0xa7,0x00,0x0c,0x00,
+-	0xd2,0x1a,0xd1,0x0c,0x10,0x08,0x0c,0xff,0xea,0x9e,0xa9,0x00,0x0c,0x00,0x10,0x07,
+-	0x0d,0xff,0xc9,0xa6,0x00,0x10,0xff,0xc9,0x9c,0x00,0xd1,0x0e,0x10,0x07,0x10,0xff,
+-	0xc9,0xa1,0x00,0x10,0xff,0xc9,0xac,0x00,0x10,0x07,0x12,0xff,0xc9,0xaa,0x00,0x14,
+-	0x00,0xd3,0x35,0xd2,0x1d,0xd1,0x0e,0x10,0x07,0x10,0xff,0xca,0x9e,0x00,0x10,0xff,
+-	0xca,0x87,0x00,0x10,0x07,0x11,0xff,0xca,0x9d,0x00,0x11,0xff,0xea,0xad,0x93,0x00,
+-	0xd1,0x0c,0x10,0x08,0x11,0xff,0xea,0x9e,0xb5,0x00,0x11,0x00,0x10,0x08,0x11,0xff,
+-	0xea,0x9e,0xb7,0x00,0x11,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x14,0xff,0xea,0x9e,
+-	0xb9,0x00,0x14,0x00,0x10,0x08,0x15,0xff,0xea,0x9e,0xbb,0x00,0x15,0x00,0xd1,0x0c,
+-	0x10,0x08,0x15,0xff,0xea,0x9e,0xbd,0x00,0x15,0x00,0x10,0x08,0x15,0xff,0xea,0x9e,
+-	0xbf,0x00,0x15,0x00,0xcf,0x86,0xe5,0xd4,0x63,0x94,0x2f,0x93,0x2b,0xd2,0x10,0x51,
+-	0x04,0x00,0x00,0x10,0x08,0x15,0xff,0xea,0x9f,0x83,0x00,0x15,0x00,0xd1,0x0f,0x10,
+-	0x08,0x15,0xff,0xea,0x9e,0x94,0x00,0x15,0xff,0xca,0x82,0x00,0x10,0x08,0x15,0xff,
+-	0xe1,0xb6,0x8e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe4,0xb4,0x66,0xd3,0x1d,0xe2,
+-	0x5b,0x64,0xe1,0x0a,0x64,0xe0,0xf7,0x63,0xcf,0x86,0xe5,0xd8,0x63,0x94,0x0b,0x93,
+-	0x07,0x62,0xc3,0x63,0x08,0x00,0x08,0x00,0x08,0x00,0xd2,0x0f,0xe1,0x5a,0x65,0xe0,
+-	0x27,0x65,0xcf,0x86,0x65,0x0c,0x65,0x0a,0x00,0xd1,0xab,0xd0,0x1a,0xcf,0x86,0xe5,
+-	0x17,0x66,0xe4,0xfa,0x65,0xe3,0xe1,0x65,0xe2,0xd4,0x65,0x91,0x08,0x10,0x04,0x00,
+-	0x00,0x0c,0x00,0x0c,0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0xd4,0x0b,0x93,0x07,0x62,
+-	0x27,0x66,0x11,0x00,0x00,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x11,0xff,
+-	0xe1,0x8e,0xa0,0x00,0x11,0xff,0xe1,0x8e,0xa1,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,
+-	0xa2,0x00,0x11,0xff,0xe1,0x8e,0xa3,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,
+-	0xa4,0x00,0x11,0xff,0xe1,0x8e,0xa5,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,0xa6,0x00,
+-	0x11,0xff,0xe1,0x8e,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,
+-	0xa8,0x00,0x11,0xff,0xe1,0x8e,0xa9,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,0xaa,0x00,
+-	0x11,0xff,0xe1,0x8e,0xab,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,0xac,0x00,
+-	0x11,0xff,0xe1,0x8e,0xad,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,0xae,0x00,0x11,0xff,
+-	0xe1,0x8e,0xaf,0x00,0xe0,0xb2,0x65,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,
+-	0xd2,0x20,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,0xb0,0x00,0x11,0xff,0xe1,0x8e,
+-	0xb1,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,0xb2,0x00,0x11,0xff,0xe1,0x8e,0xb3,0x00,
+-	0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,0xb4,0x00,0x11,0xff,0xe1,0x8e,0xb5,0x00,
+-	0x10,0x08,0x11,0xff,0xe1,0x8e,0xb6,0x00,0x11,0xff,0xe1,0x8e,0xb7,0x00,0xd2,0x20,
+-	0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,0xb8,0x00,0x11,0xff,0xe1,0x8e,0xb9,0x00,
+-	0x10,0x08,0x11,0xff,0xe1,0x8e,0xba,0x00,0x11,0xff,0xe1,0x8e,0xbb,0x00,0xd1,0x10,
+-	0x10,0x08,0x11,0xff,0xe1,0x8e,0xbc,0x00,0x11,0xff,0xe1,0x8e,0xbd,0x00,0x10,0x08,
+-	0x11,0xff,0xe1,0x8e,0xbe,0x00,0x11,0xff,0xe1,0x8e,0xbf,0x00,0xd3,0x40,0xd2,0x20,
+-	0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8f,0x80,0x00,0x11,0xff,0xe1,0x8f,0x81,0x00,
+-	0x10,0x08,0x11,0xff,0xe1,0x8f,0x82,0x00,0x11,0xff,0xe1,0x8f,0x83,0x00,0xd1,0x10,
+-	0x10,0x08,0x11,0xff,0xe1,0x8f,0x84,0x00,0x11,0xff,0xe1,0x8f,0x85,0x00,0x10,0x08,
+-	0x11,0xff,0xe1,0x8f,0x86,0x00,0x11,0xff,0xe1,0x8f,0x87,0x00,0xd2,0x20,0xd1,0x10,
+-	0x10,0x08,0x11,0xff,0xe1,0x8f,0x88,0x00,0x11,0xff,0xe1,0x8f,0x89,0x00,0x10,0x08,
+-	0x11,0xff,0xe1,0x8f,0x8a,0x00,0x11,0xff,0xe1,0x8f,0x8b,0x00,0xd1,0x10,0x10,0x08,
+-	0x11,0xff,0xe1,0x8f,0x8c,0x00,0x11,0xff,0xe1,0x8f,0x8d,0x00,0x10,0x08,0x11,0xff,
+-	0xe1,0x8f,0x8e,0x00,0x11,0xff,0xe1,0x8f,0x8f,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,
+-	0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8f,0x90,0x00,0x11,0xff,0xe1,0x8f,0x91,0x00,
+-	0x10,0x08,0x11,0xff,0xe1,0x8f,0x92,0x00,0x11,0xff,0xe1,0x8f,0x93,0x00,0xd1,0x10,
+-	0x10,0x08,0x11,0xff,0xe1,0x8f,0x94,0x00,0x11,0xff,0xe1,0x8f,0x95,0x00,0x10,0x08,
+-	0x11,0xff,0xe1,0x8f,0x96,0x00,0x11,0xff,0xe1,0x8f,0x97,0x00,0xd2,0x20,0xd1,0x10,
+-	0x10,0x08,0x11,0xff,0xe1,0x8f,0x98,0x00,0x11,0xff,0xe1,0x8f,0x99,0x00,0x10,0x08,
+-	0x11,0xff,0xe1,0x8f,0x9a,0x00,0x11,0xff,0xe1,0x8f,0x9b,0x00,0xd1,0x10,0x10,0x08,
+-	0x11,0xff,0xe1,0x8f,0x9c,0x00,0x11,0xff,0xe1,0x8f,0x9d,0x00,0x10,0x08,0x11,0xff,
+-	0xe1,0x8f,0x9e,0x00,0x11,0xff,0xe1,0x8f,0x9f,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,
+-	0x10,0x08,0x11,0xff,0xe1,0x8f,0xa0,0x00,0x11,0xff,0xe1,0x8f,0xa1,0x00,0x10,0x08,
+-	0x11,0xff,0xe1,0x8f,0xa2,0x00,0x11,0xff,0xe1,0x8f,0xa3,0x00,0xd1,0x10,0x10,0x08,
+-	0x11,0xff,0xe1,0x8f,0xa4,0x00,0x11,0xff,0xe1,0x8f,0xa5,0x00,0x10,0x08,0x11,0xff,
+-	0xe1,0x8f,0xa6,0x00,0x11,0xff,0xe1,0x8f,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x11,0xff,0xe1,0x8f,0xa8,0x00,0x11,0xff,0xe1,0x8f,0xa9,0x00,0x10,0x08,0x11,0xff,
+-	0xe1,0x8f,0xaa,0x00,0x11,0xff,0xe1,0x8f,0xab,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,
+-	0xe1,0x8f,0xac,0x00,0x11,0xff,0xe1,0x8f,0xad,0x00,0x10,0x08,0x11,0xff,0xe1,0x8f,
+-	0xae,0x00,0x11,0xff,0xe1,0x8f,0xaf,0x00,0xd1,0x0c,0xe0,0xeb,0x63,0xcf,0x86,0xcf,
+-	0x06,0x02,0xff,0xff,0xd0,0x08,0xcf,0x86,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0x06,
+-	0xcf,0x06,0x01,0x00,0xd4,0xae,0xd3,0x09,0xe2,0x54,0x64,0xcf,0x06,0x01,0x00,0xd2,
+-	0x27,0xe1,0x1f,0x70,0xe0,0x26,0x6e,0xcf,0x86,0xe5,0x3f,0x6d,0xe4,0xce,0x6c,0xe3,
+-	0x99,0x6c,0xe2,0x78,0x6c,0xe1,0x67,0x6c,0x10,0x08,0x01,0xff,0xe5,0x88,0x87,0x00,
+-	0x01,0xff,0xe5,0xba,0xa6,0x00,0xe1,0x74,0x74,0xe0,0xe8,0x73,0xcf,0x86,0xe5,0x22,
+-	0x73,0xd4,0x3b,0x93,0x37,0xd2,0x1d,0xd1,0x0e,0x10,0x07,0x01,0xff,0x66,0x66,0x00,
+-	0x01,0xff,0x66,0x69,0x00,0x10,0x07,0x01,0xff,0x66,0x6c,0x00,0x01,0xff,0x66,0x66,
+-	0x69,0x00,0xd1,0x0f,0x10,0x08,0x01,0xff,0x66,0x66,0x6c,0x00,0x01,0xff,0x73,0x74,
+-	0x00,0x10,0x07,0x01,0xff,0x73,0x74,0x00,0x00,0x00,0x00,0x00,0xe3,0xc8,0x72,0xd2,
+-	0x11,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xd5,0xb4,0xd5,0xb6,0x00,
+-	0xd1,0x12,0x10,0x09,0x01,0xff,0xd5,0xb4,0xd5,0xa5,0x00,0x01,0xff,0xd5,0xb4,0xd5,
+-	0xab,0x00,0x10,0x09,0x01,0xff,0xd5,0xbe,0xd5,0xb6,0x00,0x01,0xff,0xd5,0xb4,0xd5,
+-	0xad,0x00,0xd3,0x09,0xe2,0x40,0x74,0xcf,0x06,0x01,0x00,0xd2,0x13,0xe1,0x30,0x75,
+-	0xe0,0xc1,0x74,0xcf,0x86,0xe5,0x9e,0x74,0x64,0x8d,0x74,0x06,0xff,0x00,0xe1,0x96,
+-	0x75,0xe0,0x63,0x75,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,
+-	0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x7c,
+-	0xd3,0x3c,0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0xef,0xbd,0x81,0x00,
+-	0x10,0x08,0x01,0xff,0xef,0xbd,0x82,0x00,0x01,0xff,0xef,0xbd,0x83,0x00,0xd1,0x10,
+-	0x10,0x08,0x01,0xff,0xef,0xbd,0x84,0x00,0x01,0xff,0xef,0xbd,0x85,0x00,0x10,0x08,
+-	0x01,0xff,0xef,0xbd,0x86,0x00,0x01,0xff,0xef,0xbd,0x87,0x00,0xd2,0x20,0xd1,0x10,
+-	0x10,0x08,0x01,0xff,0xef,0xbd,0x88,0x00,0x01,0xff,0xef,0xbd,0x89,0x00,0x10,0x08,
+-	0x01,0xff,0xef,0xbd,0x8a,0x00,0x01,0xff,0xef,0xbd,0x8b,0x00,0xd1,0x10,0x10,0x08,
+-	0x01,0xff,0xef,0xbd,0x8c,0x00,0x01,0xff,0xef,0xbd,0x8d,0x00,0x10,0x08,0x01,0xff,
+-	0xef,0xbd,0x8e,0x00,0x01,0xff,0xef,0xbd,0x8f,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,
+-	0x10,0x08,0x01,0xff,0xef,0xbd,0x90,0x00,0x01,0xff,0xef,0xbd,0x91,0x00,0x10,0x08,
+-	0x01,0xff,0xef,0xbd,0x92,0x00,0x01,0xff,0xef,0xbd,0x93,0x00,0xd1,0x10,0x10,0x08,
+-	0x01,0xff,0xef,0xbd,0x94,0x00,0x01,0xff,0xef,0xbd,0x95,0x00,0x10,0x08,0x01,0xff,
+-	0xef,0xbd,0x96,0x00,0x01,0xff,0xef,0xbd,0x97,0x00,0x92,0x1c,0xd1,0x10,0x10,0x08,
+-	0x01,0xff,0xef,0xbd,0x98,0x00,0x01,0xff,0xef,0xbd,0x99,0x00,0x10,0x08,0x01,0xff,
+-	0xef,0xbd,0x9a,0x00,0x01,0x00,0x01,0x00,0x83,0xe2,0x87,0xb3,0xe1,0x60,0xb0,0xe0,
+-	0xdd,0xae,0xcf,0x86,0xe5,0x81,0x9b,0xc4,0xe3,0xc1,0x07,0xe2,0x62,0x06,0xe1,0x11,
+-	0x86,0xe0,0x09,0x05,0xcf,0x86,0xe5,0xfb,0x02,0xd4,0x1c,0xe3,0x7f,0x76,0xe2,0xd6,
+-	0x75,0xe1,0xb1,0x75,0xe0,0x8a,0x75,0xcf,0x86,0xe5,0x57,0x75,0x94,0x07,0x63,0x42,
+-	0x75,0x07,0x00,0x07,0x00,0xe3,0x2b,0x78,0xe2,0xf0,0x77,0xe1,0x77,0x01,0xe0,0x88,
+-	0x77,0xcf,0x86,0xe5,0x21,0x01,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,
+-	0x05,0xff,0xf0,0x90,0x90,0xa8,0x00,0x05,0xff,0xf0,0x90,0x90,0xa9,0x00,0x10,0x09,
+-	0x05,0xff,0xf0,0x90,0x90,0xaa,0x00,0x05,0xff,0xf0,0x90,0x90,0xab,0x00,0xd1,0x12,
+-	0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xac,0x00,0x05,0xff,0xf0,0x90,0x90,0xad,0x00,
+-	0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xae,0x00,0x05,0xff,0xf0,0x90,0x90,0xaf,0x00,
+-	0xd2,0x24,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xb0,0x00,0x05,0xff,0xf0,
+-	0x90,0x90,0xb1,0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xb2,0x00,0x05,0xff,0xf0,
+-	0x90,0x90,0xb3,0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xb4,0x00,0x05,
+-	0xff,0xf0,0x90,0x90,0xb5,0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xb6,0x00,0x05,
+-	0xff,0xf0,0x90,0x90,0xb7,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x05,0xff,
+-	0xf0,0x90,0x90,0xb8,0x00,0x05,0xff,0xf0,0x90,0x90,0xb9,0x00,0x10,0x09,0x05,0xff,
+-	0xf0,0x90,0x90,0xba,0x00,0x05,0xff,0xf0,0x90,0x90,0xbb,0x00,0xd1,0x12,0x10,0x09,
+-	0x05,0xff,0xf0,0x90,0x90,0xbc,0x00,0x05,0xff,0xf0,0x90,0x90,0xbd,0x00,0x10,0x09,
+-	0x05,0xff,0xf0,0x90,0x90,0xbe,0x00,0x05,0xff,0xf0,0x90,0x90,0xbf,0x00,0xd2,0x24,
+-	0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x91,0x80,0x00,0x05,0xff,0xf0,0x90,0x91,
+-	0x81,0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x91,0x82,0x00,0x05,0xff,0xf0,0x90,0x91,
+-	0x83,0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x91,0x84,0x00,0x05,0xff,0xf0,
+-	0x90,0x91,0x85,0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x91,0x86,0x00,0x05,0xff,0xf0,
+-	0x90,0x91,0x87,0x00,0x94,0x4c,0x93,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x05,0xff,
+-	0xf0,0x90,0x91,0x88,0x00,0x05,0xff,0xf0,0x90,0x91,0x89,0x00,0x10,0x09,0x05,0xff,
+-	0xf0,0x90,0x91,0x8a,0x00,0x05,0xff,0xf0,0x90,0x91,0x8b,0x00,0xd1,0x12,0x10,0x09,
+-	0x05,0xff,0xf0,0x90,0x91,0x8c,0x00,0x05,0xff,0xf0,0x90,0x91,0x8d,0x00,0x10,0x09,
+-	0x07,0xff,0xf0,0x90,0x91,0x8e,0x00,0x07,0xff,0xf0,0x90,0x91,0x8f,0x00,0x05,0x00,
+-	0x05,0x00,0xd0,0xa0,0xcf,0x86,0xd5,0x07,0x64,0x30,0x76,0x07,0x00,0xd4,0x07,0x63,
+-	0x3d,0x76,0x07,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,
+-	0x93,0x98,0x00,0x12,0xff,0xf0,0x90,0x93,0x99,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,
+-	0x93,0x9a,0x00,0x12,0xff,0xf0,0x90,0x93,0x9b,0x00,0xd1,0x12,0x10,0x09,0x12,0xff,
+-	0xf0,0x90,0x93,0x9c,0x00,0x12,0xff,0xf0,0x90,0x93,0x9d,0x00,0x10,0x09,0x12,0xff,
+-	0xf0,0x90,0x93,0x9e,0x00,0x12,0xff,0xf0,0x90,0x93,0x9f,0x00,0xd2,0x24,0xd1,0x12,
+-	0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xa0,0x00,0x12,0xff,0xf0,0x90,0x93,0xa1,0x00,
+-	0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xa2,0x00,0x12,0xff,0xf0,0x90,0x93,0xa3,0x00,
+-	0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xa4,0x00,0x12,0xff,0xf0,0x90,0x93,
+-	0xa5,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xa6,0x00,0x12,0xff,0xf0,0x90,0x93,
+-	0xa7,0x00,0xcf,0x86,0xe5,0xc6,0x75,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,
+-	0x09,0x12,0xff,0xf0,0x90,0x93,0xa8,0x00,0x12,0xff,0xf0,0x90,0x93,0xa9,0x00,0x10,
+-	0x09,0x12,0xff,0xf0,0x90,0x93,0xaa,0x00,0x12,0xff,0xf0,0x90,0x93,0xab,0x00,0xd1,
+-	0x12,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xac,0x00,0x12,0xff,0xf0,0x90,0x93,0xad,
+-	0x00,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xae,0x00,0x12,0xff,0xf0,0x90,0x93,0xaf,
+-	0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xb0,0x00,0x12,0xff,
+-	0xf0,0x90,0x93,0xb1,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xb2,0x00,0x12,0xff,
+-	0xf0,0x90,0x93,0xb3,0x00,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xb4,0x00,
+-	0x12,0xff,0xf0,0x90,0x93,0xb5,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xb6,0x00,
+-	0x12,0xff,0xf0,0x90,0x93,0xb7,0x00,0x93,0x28,0x92,0x24,0xd1,0x12,0x10,0x09,0x12,
+-	0xff,0xf0,0x90,0x93,0xb8,0x00,0x12,0xff,0xf0,0x90,0x93,0xb9,0x00,0x10,0x09,0x12,
+-	0xff,0xf0,0x90,0x93,0xba,0x00,0x12,0xff,0xf0,0x90,0x93,0xbb,0x00,0x00,0x00,0x12,
+-	0x00,0xd4,0x1f,0xe3,0xdf,0x76,0xe2,0x6a,0x76,0xe1,0x09,0x76,0xe0,0xea,0x75,0xcf,
+-	0x86,0xe5,0xb7,0x75,0x94,0x0a,0xe3,0xa2,0x75,0x62,0x99,0x75,0x07,0x00,0x07,0x00,
+-	0xe3,0xde,0x78,0xe2,0xaf,0x78,0xd1,0x09,0xe0,0x4c,0x78,0xcf,0x06,0x0b,0x00,0xe0,
+-	0x7f,0x78,0xcf,0x86,0xe5,0x21,0x01,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,
+-	0x09,0x11,0xff,0xf0,0x90,0xb3,0x80,0x00,0x11,0xff,0xf0,0x90,0xb3,0x81,0x00,0x10,
+-	0x09,0x11,0xff,0xf0,0x90,0xb3,0x82,0x00,0x11,0xff,0xf0,0x90,0xb3,0x83,0x00,0xd1,
+-	0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x84,0x00,0x11,0xff,0xf0,0x90,0xb3,0x85,
+-	0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x86,0x00,0x11,0xff,0xf0,0x90,0xb3,0x87,
+-	0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x88,0x00,0x11,0xff,
+-	0xf0,0x90,0xb3,0x89,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x8a,0x00,0x11,0xff,
+-	0xf0,0x90,0xb3,0x8b,0x00,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x8c,0x00,
+-	0x11,0xff,0xf0,0x90,0xb3,0x8d,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x8e,0x00,
+-	0x11,0xff,0xf0,0x90,0xb3,0x8f,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x11,
+-	0xff,0xf0,0x90,0xb3,0x90,0x00,0x11,0xff,0xf0,0x90,0xb3,0x91,0x00,0x10,0x09,0x11,
+-	0xff,0xf0,0x90,0xb3,0x92,0x00,0x11,0xff,0xf0,0x90,0xb3,0x93,0x00,0xd1,0x12,0x10,
+-	0x09,0x11,0xff,0xf0,0x90,0xb3,0x94,0x00,0x11,0xff,0xf0,0x90,0xb3,0x95,0x00,0x10,
+-	0x09,0x11,0xff,0xf0,0x90,0xb3,0x96,0x00,0x11,0xff,0xf0,0x90,0xb3,0x97,0x00,0xd2,
+-	0x24,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x98,0x00,0x11,0xff,0xf0,0x90,
+-	0xb3,0x99,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x9a,0x00,0x11,0xff,0xf0,0x90,
+-	0xb3,0x9b,0x00,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x9c,0x00,0x11,0xff,
+-	0xf0,0x90,0xb3,0x9d,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x9e,0x00,0x11,0xff,
+-	0xf0,0x90,0xb3,0x9f,0x00,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x11,
+-	0xff,0xf0,0x90,0xb3,0xa0,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa1,0x00,0x10,0x09,0x11,
+-	0xff,0xf0,0x90,0xb3,0xa2,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa3,0x00,0xd1,0x12,0x10,
+-	0x09,0x11,0xff,0xf0,0x90,0xb3,0xa4,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa5,0x00,0x10,
+-	0x09,0x11,0xff,0xf0,0x90,0xb3,0xa6,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa7,0x00,0xd2,
+-	0x24,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xa8,0x00,0x11,0xff,0xf0,0x90,
+-	0xb3,0xa9,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xaa,0x00,0x11,0xff,0xf0,0x90,
+-	0xb3,0xab,0x00,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xac,0x00,0x11,0xff,
+-	0xf0,0x90,0xb3,0xad,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xae,0x00,0x11,0xff,
+-	0xf0,0x90,0xb3,0xaf,0x00,0x93,0x23,0x92,0x1f,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,
+-	0x90,0xb3,0xb0,0x00,0x11,0xff,0xf0,0x90,0xb3,0xb1,0x00,0x10,0x09,0x11,0xff,0xf0,
+-	0x90,0xb3,0xb2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x15,0xe4,0x91,
+-	0x7b,0xe3,0x9b,0x79,0xe2,0x94,0x78,0xe1,0xe4,0x77,0xe0,0x9d,0x77,0xcf,0x06,0x0c,
+-	0x00,0xe4,0xeb,0x7e,0xe3,0x44,0x7e,0xe2,0xed,0x7d,0xd1,0x0c,0xe0,0xb2,0x7d,0xcf,
+-	0x86,0x65,0x93,0x7d,0x14,0x00,0xe0,0xb6,0x7d,0xcf,0x86,0x55,0x04,0x00,0x00,0xd4,
+-	0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x80,0x00,
+-	0x10,0xff,0xf0,0x91,0xa3,0x81,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x82,0x00,
+-	0x10,0xff,0xf0,0x91,0xa3,0x83,0x00,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,
+-	0x84,0x00,0x10,0xff,0xf0,0x91,0xa3,0x85,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,
+-	0x86,0x00,0x10,0xff,0xf0,0x91,0xa3,0x87,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x10,
+-	0xff,0xf0,0x91,0xa3,0x88,0x00,0x10,0xff,0xf0,0x91,0xa3,0x89,0x00,0x10,0x09,0x10,
+-	0xff,0xf0,0x91,0xa3,0x8a,0x00,0x10,0xff,0xf0,0x91,0xa3,0x8b,0x00,0xd1,0x12,0x10,
+-	0x09,0x10,0xff,0xf0,0x91,0xa3,0x8c,0x00,0x10,0xff,0xf0,0x91,0xa3,0x8d,0x00,0x10,
+-	0x09,0x10,0xff,0xf0,0x91,0xa3,0x8e,0x00,0x10,0xff,0xf0,0x91,0xa3,0x8f,0x00,0xd3,
+-	0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x90,0x00,0x10,0xff,
+-	0xf0,0x91,0xa3,0x91,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x92,0x00,0x10,0xff,
+-	0xf0,0x91,0xa3,0x93,0x00,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x94,0x00,
+-	0x10,0xff,0xf0,0x91,0xa3,0x95,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x96,0x00,
+-	0x10,0xff,0xf0,0x91,0xa3,0x97,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,
+-	0x91,0xa3,0x98,0x00,0x10,0xff,0xf0,0x91,0xa3,0x99,0x00,0x10,0x09,0x10,0xff,0xf0,
+-	0x91,0xa3,0x9a,0x00,0x10,0xff,0xf0,0x91,0xa3,0x9b,0x00,0xd1,0x12,0x10,0x09,0x10,
+-	0xff,0xf0,0x91,0xa3,0x9c,0x00,0x10,0xff,0xf0,0x91,0xa3,0x9d,0x00,0x10,0x09,0x10,
+-	0xff,0xf0,0x91,0xa3,0x9e,0x00,0x10,0xff,0xf0,0x91,0xa3,0x9f,0x00,0xd1,0x11,0xe0,
+-	0x12,0x81,0xcf,0x86,0xe5,0x09,0x81,0xe4,0xd2,0x80,0xcf,0x06,0x00,0x00,0xe0,0xdb,
+-	0x82,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x00,0x00,0xd4,0x09,0xe3,0x10,0x81,0xcf,0x06,
+-	0x0c,0x00,0xd3,0x06,0xcf,0x06,0x00,0x00,0xe2,0x3b,0x82,0xe1,0x16,0x82,0xd0,0x06,
+-	0xcf,0x06,0x00,0x00,0xcf,0x86,0xa5,0x21,0x01,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,
+-	0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xa0,0x00,0x14,0xff,0xf0,0x96,0xb9,0xa1,
+-	0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xa2,0x00,0x14,0xff,0xf0,0x96,0xb9,0xa3,
+-	0x00,0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xa4,0x00,0x14,0xff,0xf0,0x96,
+-	0xb9,0xa5,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xa6,0x00,0x14,0xff,0xf0,0x96,
+-	0xb9,0xa7,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xa8,0x00,
+-	0x14,0xff,0xf0,0x96,0xb9,0xa9,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xaa,0x00,
+-	0x14,0xff,0xf0,0x96,0xb9,0xab,0x00,0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,
+-	0xac,0x00,0x14,0xff,0xf0,0x96,0xb9,0xad,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,
+-	0xae,0x00,0x14,0xff,0xf0,0x96,0xb9,0xaf,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,
+-	0x09,0x14,0xff,0xf0,0x96,0xb9,0xb0,0x00,0x14,0xff,0xf0,0x96,0xb9,0xb1,0x00,0x10,
+-	0x09,0x14,0xff,0xf0,0x96,0xb9,0xb2,0x00,0x14,0xff,0xf0,0x96,0xb9,0xb3,0x00,0xd1,
+-	0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xb4,0x00,0x14,0xff,0xf0,0x96,0xb9,0xb5,
+-	0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xb6,0x00,0x14,0xff,0xf0,0x96,0xb9,0xb7,
+-	0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xb8,0x00,0x14,0xff,
+-	0xf0,0x96,0xb9,0xb9,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xba,0x00,0x14,0xff,
+-	0xf0,0x96,0xb9,0xbb,0x00,0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xbc,0x00,
+-	0x14,0xff,0xf0,0x96,0xb9,0xbd,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xbe,0x00,
+-	0x14,0xff,0xf0,0x96,0xb9,0xbf,0x00,0x14,0x00,0xd2,0x14,0xe1,0x25,0x82,0xe0,0x1c,
+-	0x82,0xcf,0x86,0xe5,0xdd,0x81,0xe4,0x9a,0x81,0xcf,0x06,0x12,0x00,0xd1,0x0b,0xe0,
+-	0x51,0x83,0xcf,0x86,0xcf,0x06,0x00,0x00,0xe0,0x95,0x8b,0xcf,0x86,0xd5,0x22,0xe4,
+-	0xd0,0x88,0xe3,0x93,0x88,0xe2,0x38,0x88,0xe1,0x31,0x88,0xe0,0x2a,0x88,0xcf,0x86,
+-	0xe5,0xfb,0x87,0xe4,0xe2,0x87,0x93,0x07,0x62,0xd1,0x87,0x12,0xe6,0x12,0xe6,0xe4,
+-	0x36,0x89,0xe3,0x2f,0x89,0xd2,0x09,0xe1,0xb8,0x88,0xcf,0x06,0x10,0x00,0xe1,0x1f,
+-	0x89,0xe0,0xec,0x88,0xcf,0x86,0xe5,0x21,0x01,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,
+-	0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xa2,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xa3,
+-	0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xa4,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xa5,
+-	0x00,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xa6,0x00,0x12,0xff,0xf0,0x9e,
+-	0xa4,0xa7,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xa8,0x00,0x12,0xff,0xf0,0x9e,
+-	0xa4,0xa9,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xaa,0x00,
+-	0x12,0xff,0xf0,0x9e,0xa4,0xab,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xac,0x00,
+-	0x12,0xff,0xf0,0x9e,0xa4,0xad,0x00,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,
+-	0xae,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xaf,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,
+-	0xb0,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb1,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,
+-	0x09,0x12,0xff,0xf0,0x9e,0xa4,0xb2,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb3,0x00,0x10,
+-	0x09,0x12,0xff,0xf0,0x9e,0xa4,0xb4,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb5,0x00,0xd1,
+-	0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xb6,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb7,
+-	0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xb8,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb9,
+-	0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xba,0x00,0x12,0xff,
+-	0xf0,0x9e,0xa4,0xbb,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xbc,0x00,0x12,0xff,
+-	0xf0,0x9e,0xa4,0xbd,0x00,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xbe,0x00,
+-	0x12,0xff,0xf0,0x9e,0xa4,0xbf,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa5,0x80,0x00,
+-	0x12,0xff,0xf0,0x9e,0xa5,0x81,0x00,0x94,0x1e,0x93,0x1a,0x92,0x16,0x91,0x12,0x10,
+-	0x09,0x12,0xff,0xf0,0x9e,0xa5,0x82,0x00,0x12,0xff,0xf0,0x9e,0xa5,0x83,0x00,0x12,
+-	0x00,0x12,0x00,0x12,0x00,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-	/* nfdi_c0100 */
+-	0x57,0x04,0x01,0x00,0xc6,0xe5,0xac,0x13,0xe4,0x41,0x0c,0xe3,0x7a,0x07,0xe2,0xf3,
+-	0x01,0xc1,0xd0,0x1f,0xcf,0x86,0x55,0x04,0x01,0x00,0x94,0x15,0x53,0x04,0x01,0x00,
+-	0x52,0x04,0x01,0x00,0x91,0x09,0x10,0x04,0x01,0x00,0x01,0xff,0x00,0x01,0x00,0x01,
+-	0x00,0xcf,0x86,0xd5,0xe4,0xd4,0x7c,0xd3,0x3c,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
+-	0xff,0x41,0xcc,0x80,0x00,0x01,0xff,0x41,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x41,
+-	0xcc,0x82,0x00,0x01,0xff,0x41,0xcc,0x83,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,
+-	0xcc,0x88,0x00,0x01,0xff,0x41,0xcc,0x8a,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0x43,
+-	0xcc,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x45,0xcc,0x80,0x00,0x01,
+-	0xff,0x45,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x45,0xcc,0x82,0x00,0x01,0xff,0x45,
+-	0xcc,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x49,0xcc,0x80,0x00,0x01,0xff,0x49,
+-	0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x49,0xcc,0x82,0x00,0x01,0xff,0x49,0xcc,0x88,
+-	0x00,0xd3,0x38,0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x4e,0xcc,0x83,
+-	0x00,0x10,0x08,0x01,0xff,0x4f,0xcc,0x80,0x00,0x01,0xff,0x4f,0xcc,0x81,0x00,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0x82,0x00,0x01,0xff,0x4f,0xcc,0x83,0x00,0x10,
+-	0x08,0x01,0xff,0x4f,0xcc,0x88,0x00,0x01,0x00,0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,
+-	0x00,0x01,0xff,0x55,0xcc,0x80,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0x81,0x00,0x01,
+-	0xff,0x55,0xcc,0x82,0x00,0x91,0x10,0x10,0x08,0x01,0xff,0x55,0xcc,0x88,0x00,0x01,
+-	0xff,0x59,0xcc,0x81,0x00,0x01,0x00,0xd4,0x7c,0xd3,0x3c,0xd2,0x20,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0x61,0xcc,0x80,0x00,0x01,0xff,0x61,0xcc,0x81,0x00,0x10,0x08,0x01,
+-	0xff,0x61,0xcc,0x82,0x00,0x01,0xff,0x61,0xcc,0x83,0x00,0xd1,0x10,0x10,0x08,0x01,
+-	0xff,0x61,0xcc,0x88,0x00,0x01,0xff,0x61,0xcc,0x8a,0x00,0x10,0x04,0x01,0x00,0x01,
++	0xc6,0xe5,0xf6,0x14,0xe4,0x6c,0x0d,0xe3,0x36,0x08,0xe2,0x1f,0x01,0xc1,0xd0,0x21,
++	0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0x93,0x13,0x52,0x04,0x01,0x00,
++	0x91,0x0b,0x10,0x04,0x01,0x00,0x01,0xff,0xce,0xbc,0x00,0x01,0x00,0x01,0x00,0xcf,
++	0x86,0xe5,0x9d,0x44,0xd4,0x7f,0xd3,0x3f,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0x61,0xcc,0x80,0x00,0x01,0xff,0x61,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x61,0xcc,
++	0x82,0x00,0x01,0xff,0x61,0xcc,0x83,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,
++	0x88,0x00,0x01,0xff,0x61,0xcc,0x8a,0x00,0x10,0x07,0x01,0xff,0xc3,0xa6,0x00,0x01,
+ 	0xff,0x63,0xcc,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0x80,
+ 	0x00,0x01,0xff,0x65,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,0x82,0x00,0x01,
+ 	0xff,0x65,0xcc,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,0xcc,0x80,0x00,0x01,
+ 	0xff,0x69,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x69,0xcc,0x82,0x00,0x01,0xff,0x69,
+-	0xcc,0x88,0x00,0xd3,0x38,0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x6e,
+-	0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x80,0x00,0x01,0xff,0x6f,0xcc,0x81,
+-	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x82,0x00,0x01,0xff,0x6f,0xcc,0x83,
+-	0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x88,0x00,0x01,0x00,0xd2,0x1c,0xd1,0x0c,0x10,
+-	0x04,0x01,0x00,0x01,0xff,0x75,0xcc,0x80,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0x81,
+-	0x00,0x01,0xff,0x75,0xcc,0x82,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0x88,
+-	0x00,0x01,0xff,0x79,0xcc,0x81,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0x79,0xcc,0x88,
+-	0x00,0xe1,0x9a,0x03,0xe0,0xd3,0x01,0xcf,0x86,0xd5,0xf4,0xd4,0x80,0xd3,0x40,0xd2,
+-	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0x84,0x00,0x01,0xff,0x61,0xcc,0x84,
+-	0x00,0x10,0x08,0x01,0xff,0x41,0xcc,0x86,0x00,0x01,0xff,0x61,0xcc,0x86,0x00,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0xa8,0x00,0x01,0xff,0x61,0xcc,0xa8,0x00,0x10,
+-	0x08,0x01,0xff,0x43,0xcc,0x81,0x00,0x01,0xff,0x63,0xcc,0x81,0x00,0xd2,0x20,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0x43,0xcc,0x82,0x00,0x01,0xff,0x63,0xcc,0x82,0x00,0x10,
+-	0x08,0x01,0xff,0x43,0xcc,0x87,0x00,0x01,0xff,0x63,0xcc,0x87,0x00,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0x43,0xcc,0x8c,0x00,0x01,0xff,0x63,0xcc,0x8c,0x00,0x10,0x08,0x01,
+-	0xff,0x44,0xcc,0x8c,0x00,0x01,0xff,0x64,0xcc,0x8c,0x00,0xd3,0x34,0xd2,0x14,0x51,
+-	0x04,0x01,0x00,0x10,0x08,0x01,0xff,0x45,0xcc,0x84,0x00,0x01,0xff,0x65,0xcc,0x84,
+-	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x45,0xcc,0x86,0x00,0x01,0xff,0x65,0xcc,0x86,
+-	0x00,0x10,0x08,0x01,0xff,0x45,0xcc,0x87,0x00,0x01,0xff,0x65,0xcc,0x87,0x00,0xd2,
+-	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x45,0xcc,0xa8,0x00,0x01,0xff,0x65,0xcc,0xa8,
+-	0x00,0x10,0x08,0x01,0xff,0x45,0xcc,0x8c,0x00,0x01,0xff,0x65,0xcc,0x8c,0x00,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0x47,0xcc,0x82,0x00,0x01,0xff,0x67,0xcc,0x82,0x00,0x10,
+-	0x08,0x01,0xff,0x47,0xcc,0x86,0x00,0x01,0xff,0x67,0xcc,0x86,0x00,0xd4,0x74,0xd3,
+-	0x34,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x47,0xcc,0x87,0x00,0x01,0xff,0x67,
+-	0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x47,0xcc,0xa7,0x00,0x01,0xff,0x67,0xcc,0xa7,
+-	0x00,0x91,0x10,0x10,0x08,0x01,0xff,0x48,0xcc,0x82,0x00,0x01,0xff,0x68,0xcc,0x82,
+-	0x00,0x01,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x49,0xcc,0x83,0x00,0x01,
+-	0xff,0x69,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x49,0xcc,0x84,0x00,0x01,0xff,0x69,
+-	0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x49,0xcc,0x86,0x00,0x01,0xff,0x69,
+-	0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x49,0xcc,0xa8,0x00,0x01,0xff,0x69,0xcc,0xa8,
+-	0x00,0xd3,0x30,0xd2,0x10,0x91,0x0c,0x10,0x08,0x01,0xff,0x49,0xcc,0x87,0x00,0x01,
+-	0x00,0x01,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4a,0xcc,0x82,0x00,0x01,0xff,0x6a,
+-	0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x4b,0xcc,0xa7,0x00,0x01,0xff,0x6b,0xcc,0xa7,
+-	0x00,0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x4c,0xcc,0x81,0x00,0x10,
+-	0x08,0x01,0xff,0x6c,0xcc,0x81,0x00,0x01,0xff,0x4c,0xcc,0xa7,0x00,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0x6c,0xcc,0xa7,0x00,0x01,0xff,0x4c,0xcc,0x8c,0x00,0x10,0x08,0x01,
+-	0xff,0x6c,0xcc,0x8c,0x00,0x01,0x00,0xcf,0x86,0xd5,0xd4,0xd4,0x60,0xd3,0x30,0xd2,
+-	0x10,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0x4e,0xcc,0x81,0x00,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0x6e,0xcc,0x81,0x00,0x01,0xff,0x4e,0xcc,0xa7,0x00,0x10,
+-	0x08,0x01,0xff,0x6e,0xcc,0xa7,0x00,0x01,0xff,0x4e,0xcc,0x8c,0x00,0xd2,0x10,0x91,
+-	0x0c,0x10,0x08,0x01,0xff,0x6e,0xcc,0x8c,0x00,0x01,0x00,0x01,0x00,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0x4f,0xcc,0x84,0x00,0x01,0xff,0x6f,0xcc,0x84,0x00,0x10,0x08,0x01,
+-	0xff,0x4f,0xcc,0x86,0x00,0x01,0xff,0x6f,0xcc,0x86,0x00,0xd3,0x34,0xd2,0x14,0x91,
+-	0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0x8b,0x00,0x01,0xff,0x6f,0xcc,0x8b,0x00,0x01,
+-	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x52,0xcc,0x81,0x00,0x01,0xff,0x72,0xcc,0x81,
+-	0x00,0x10,0x08,0x01,0xff,0x52,0xcc,0xa7,0x00,0x01,0xff,0x72,0xcc,0xa7,0x00,0xd2,
+-	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x52,0xcc,0x8c,0x00,0x01,0xff,0x72,0xcc,0x8c,
+-	0x00,0x10,0x08,0x01,0xff,0x53,0xcc,0x81,0x00,0x01,0xff,0x73,0xcc,0x81,0x00,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0x53,0xcc,0x82,0x00,0x01,0xff,0x73,0xcc,0x82,0x00,0x10,
+-	0x08,0x01,0xff,0x53,0xcc,0xa7,0x00,0x01,0xff,0x73,0xcc,0xa7,0x00,0xd4,0x74,0xd3,
+-	0x34,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x53,0xcc,0x8c,0x00,0x01,0xff,0x73,
+-	0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x54,0xcc,0xa7,0x00,0x01,0xff,0x74,0xcc,0xa7,
+-	0x00,0x91,0x10,0x10,0x08,0x01,0xff,0x54,0xcc,0x8c,0x00,0x01,0xff,0x74,0xcc,0x8c,
+-	0x00,0x01,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x55,0xcc,0x83,0x00,0x01,
+-	0xff,0x75,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0x84,0x00,0x01,0xff,0x75,
+-	0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x55,0xcc,0x86,0x00,0x01,0xff,0x75,
+-	0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0x8a,0x00,0x01,0xff,0x75,0xcc,0x8a,
+-	0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x55,0xcc,0x8b,0x00,0x01,
+-	0xff,0x75,0xcc,0x8b,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0xa8,0x00,0x01,0xff,0x75,
+-	0xcc,0xa8,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x57,0xcc,0x82,0x00,0x01,0xff,0x77,
+-	0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x59,0xcc,0x82,0x00,0x01,0xff,0x79,0xcc,0x82,
+-	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x59,0xcc,0x88,0x00,0x01,0xff,0x5a,
+-	0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0x81,0x00,0x01,0xff,0x5a,0xcc,0x87,
+-	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x7a,0xcc,0x87,0x00,0x01,0xff,0x5a,0xcc,0x8c,
+-	0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0x8c,0x00,0x01,0x00,0xd0,0x4a,0xcf,0x86,0x55,
+-	0x04,0x01,0x00,0xd4,0x2c,0xd3,0x18,0x92,0x14,0x91,0x10,0x10,0x08,0x01,0xff,0x4f,
+-	0xcc,0x9b,0x00,0x01,0xff,0x6f,0xcc,0x9b,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,
+-	0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0x55,0xcc,0x9b,0x00,0x93,
+-	0x14,0x92,0x10,0x91,0x0c,0x10,0x08,0x01,0xff,0x75,0xcc,0x9b,0x00,0x01,0x00,0x01,
+-	0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0xb4,0xd4,0x24,0x53,0x04,0x01,0x00,0x52,
+-	0x04,0x01,0x00,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x41,0xcc,0x8c,0x00,0x10,
+-	0x08,0x01,0xff,0x61,0xcc,0x8c,0x00,0x01,0xff,0x49,0xcc,0x8c,0x00,0xd3,0x46,0xd2,
+-	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,0xcc,0x8c,0x00,0x01,0xff,0x4f,0xcc,0x8c,
+-	0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x8c,0x00,0x01,0xff,0x55,0xcc,0x8c,0x00,0xd1,
+-	0x12,0x10,0x08,0x01,0xff,0x75,0xcc,0x8c,0x00,0x01,0xff,0x55,0xcc,0x88,0xcc,0x84,
+-	0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,0x84,0x00,0x01,0xff,0x55,0xcc,0x88,
+-	0xcc,0x81,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,0x81,
+-	0x00,0x01,0xff,0x55,0xcc,0x88,0xcc,0x8c,0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,
+-	0xcc,0x8c,0x00,0x01,0xff,0x55,0xcc,0x88,0xcc,0x80,0x00,0xd1,0x0e,0x10,0x0a,0x01,
+-	0xff,0x75,0xcc,0x88,0xcc,0x80,0x00,0x01,0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x88,
+-	0xcc,0x84,0x00,0x01,0xff,0x61,0xcc,0x88,0xcc,0x84,0x00,0xd4,0x80,0xd3,0x3a,0xd2,
+-	0x26,0xd1,0x14,0x10,0x0a,0x01,0xff,0x41,0xcc,0x87,0xcc,0x84,0x00,0x01,0xff,0x61,
+-	0xcc,0x87,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,0xc3,0x86,0xcc,0x84,0x00,0x01,0xff,
+-	0xc3,0xa6,0xcc,0x84,0x00,0x51,0x04,0x01,0x00,0x10,0x08,0x01,0xff,0x47,0xcc,0x8c,
+-	0x00,0x01,0xff,0x67,0xcc,0x8c,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x4b,
+-	0xcc,0x8c,0x00,0x01,0xff,0x6b,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x4f,0xcc,0xa8,
+-	0x00,0x01,0xff,0x6f,0xcc,0xa8,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0xa8,
+-	0xcc,0x84,0x00,0x01,0xff,0x6f,0xcc,0xa8,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,0xc6,
+-	0xb7,0xcc,0x8c,0x00,0x01,0xff,0xca,0x92,0xcc,0x8c,0x00,0xd3,0x24,0xd2,0x10,0x91,
+-	0x0c,0x10,0x08,0x01,0xff,0x6a,0xcc,0x8c,0x00,0x01,0x00,0x01,0x00,0x91,0x10,0x10,
+-	0x08,0x01,0xff,0x47,0xcc,0x81,0x00,0x01,0xff,0x67,0xcc,0x81,0x00,0x04,0x00,0xd2,
+-	0x24,0xd1,0x10,0x10,0x08,0x04,0xff,0x4e,0xcc,0x80,0x00,0x04,0xff,0x6e,0xcc,0x80,
+-	0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x8a,0xcc,0x81,0x00,0x01,0xff,0x61,0xcc,0x8a,
+-	0xcc,0x81,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xc3,0x86,0xcc,0x81,0x00,0x01,0xff,
+-	0xc3,0xa6,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xc3,0x98,0xcc,0x81,0x00,0x01,0xff,
+-	0xc3,0xb8,0xcc,0x81,0x00,0xe2,0x07,0x02,0xe1,0xae,0x01,0xe0,0x93,0x01,0xcf,0x86,
+-	0xd5,0xf4,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,
+-	0x8f,0x00,0x01,0xff,0x61,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x41,0xcc,0x91,0x00,
+-	0x01,0xff,0x61,0xcc,0x91,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x45,0xcc,0x8f,0x00,
+-	0x01,0xff,0x65,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x45,0xcc,0x91,0x00,0x01,0xff,
+-	0x65,0xcc,0x91,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x49,0xcc,0x8f,0x00,
+-	0x01,0xff,0x69,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x49,0xcc,0x91,0x00,0x01,0xff,
+-	0x69,0xcc,0x91,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0x8f,0x00,0x01,0xff,
+-	0x6f,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x4f,0xcc,0x91,0x00,0x01,0xff,0x6f,0xcc,
+-	0x91,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x52,0xcc,0x8f,0x00,
+-	0x01,0xff,0x72,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x52,0xcc,0x91,0x00,0x01,0xff,
+-	0x72,0xcc,0x91,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x55,0xcc,0x8f,0x00,0x01,0xff,
+-	0x75,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0x91,0x00,0x01,0xff,0x75,0xcc,
+-	0x91,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x04,0xff,0x53,0xcc,0xa6,0x00,0x04,0xff,
+-	0x73,0xcc,0xa6,0x00,0x10,0x08,0x04,0xff,0x54,0xcc,0xa6,0x00,0x04,0xff,0x74,0xcc,
+-	0xa6,0x00,0x51,0x04,0x04,0x00,0x10,0x08,0x04,0xff,0x48,0xcc,0x8c,0x00,0x04,0xff,
+-	0x68,0xcc,0x8c,0x00,0xd4,0x68,0xd3,0x20,0xd2,0x0c,0x91,0x08,0x10,0x04,0x06,0x00,
+-	0x07,0x00,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x08,0x04,0xff,0x41,0xcc,0x87,0x00,
+-	0x04,0xff,0x61,0xcc,0x87,0x00,0xd2,0x24,0xd1,0x10,0x10,0x08,0x04,0xff,0x45,0xcc,
+-	0xa7,0x00,0x04,0xff,0x65,0xcc,0xa7,0x00,0x10,0x0a,0x04,0xff,0x4f,0xcc,0x88,0xcc,
++	0xcc,0x88,0x00,0xd3,0x3b,0xd2,0x1f,0xd1,0x0f,0x10,0x07,0x01,0xff,0xc3,0xb0,0x00,
++	0x01,0xff,0x6e,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x80,0x00,0x01,0xff,
++	0x6f,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x82,0x00,0x01,0xff,
++	0x6f,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x88,0x00,0x01,0x00,0xd2,0x1f,
++	0xd1,0x0f,0x10,0x07,0x01,0xff,0xc3,0xb8,0x00,0x01,0xff,0x75,0xcc,0x80,0x00,0x10,
++	0x08,0x01,0xff,0x75,0xcc,0x81,0x00,0x01,0xff,0x75,0xcc,0x82,0x00,0xd1,0x10,0x10,
++	0x08,0x01,0xff,0x75,0xcc,0x88,0x00,0x01,0xff,0x79,0xcc,0x81,0x00,0x10,0x07,0x01,
++	0xff,0xc3,0xbe,0x00,0x01,0xff,0x73,0x73,0x00,0xe1,0xd4,0x03,0xe0,0xeb,0x01,0xcf,
++	0x86,0xd5,0xfb,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,
++	0xcc,0x84,0x00,0x01,0xff,0x61,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x61,0xcc,0x86,
++	0x00,0x01,0xff,0x61,0xcc,0x86,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0xa8,
++	0x00,0x01,0xff,0x61,0xcc,0xa8,0x00,0x10,0x08,0x01,0xff,0x63,0xcc,0x81,0x00,0x01,
++	0xff,0x63,0xcc,0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x63,0xcc,0x82,
++	0x00,0x01,0xff,0x63,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x63,0xcc,0x87,0x00,0x01,
++	0xff,0x63,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x63,0xcc,0x8c,0x00,0x01,
++	0xff,0x63,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x64,0xcc,0x8c,0x00,0x01,0xff,0x64,
++	0xcc,0x8c,0x00,0xd3,0x3b,0xd2,0x1b,0xd1,0x0b,0x10,0x07,0x01,0xff,0xc4,0x91,0x00,
++	0x01,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,0x84,0x00,0x01,0xff,0x65,0xcc,0x84,0x00,
++	0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0x86,0x00,0x01,0xff,0x65,0xcc,0x86,0x00,
++	0x10,0x08,0x01,0xff,0x65,0xcc,0x87,0x00,0x01,0xff,0x65,0xcc,0x87,0x00,0xd2,0x20,
++	0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0xa8,0x00,0x01,0xff,0x65,0xcc,0xa8,0x00,
++	0x10,0x08,0x01,0xff,0x65,0xcc,0x8c,0x00,0x01,0xff,0x65,0xcc,0x8c,0x00,0xd1,0x10,
++	0x10,0x08,0x01,0xff,0x67,0xcc,0x82,0x00,0x01,0xff,0x67,0xcc,0x82,0x00,0x10,0x08,
++	0x01,0xff,0x67,0xcc,0x86,0x00,0x01,0xff,0x67,0xcc,0x86,0x00,0xd4,0x7b,0xd3,0x3b,
++	0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x67,0xcc,0x87,0x00,0x01,0xff,0x67,0xcc,
++	0x87,0x00,0x10,0x08,0x01,0xff,0x67,0xcc,0xa7,0x00,0x01,0xff,0x67,0xcc,0xa7,0x00,
++	0xd1,0x10,0x10,0x08,0x01,0xff,0x68,0xcc,0x82,0x00,0x01,0xff,0x68,0xcc,0x82,0x00,
++	0x10,0x07,0x01,0xff,0xc4,0xa7,0x00,0x01,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
++	0xff,0x69,0xcc,0x83,0x00,0x01,0xff,0x69,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x69,
++	0xcc,0x84,0x00,0x01,0xff,0x69,0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,
++	0xcc,0x86,0x00,0x01,0xff,0x69,0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x69,0xcc,0xa8,
++	0x00,0x01,0xff,0x69,0xcc,0xa8,0x00,0xd3,0x37,0xd2,0x17,0xd1,0x0c,0x10,0x08,0x01,
++	0xff,0x69,0xcc,0x87,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xc4,0xb3,0x00,0x01,0x00,
++	0xd1,0x10,0x10,0x08,0x01,0xff,0x6a,0xcc,0x82,0x00,0x01,0xff,0x6a,0xcc,0x82,0x00,
++	0x10,0x08,0x01,0xff,0x6b,0xcc,0xa7,0x00,0x01,0xff,0x6b,0xcc,0xa7,0x00,0xd2,0x1c,
++	0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x6c,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,
++	0x6c,0xcc,0x81,0x00,0x01,0xff,0x6c,0xcc,0xa7,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0x6c,0xcc,0xa7,0x00,0x01,0xff,0x6c,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x6c,0xcc,
++	0x8c,0x00,0x01,0xff,0xc5,0x80,0x00,0xcf,0x86,0xd5,0xed,0xd4,0x72,0xd3,0x37,0xd2,
++	0x17,0xd1,0x0b,0x10,0x04,0x01,0x00,0x01,0xff,0xc5,0x82,0x00,0x10,0x04,0x01,0x00,
++	0x01,0xff,0x6e,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,0xcc,0x81,0x00,
++	0x01,0xff,0x6e,0xcc,0xa7,0x00,0x10,0x08,0x01,0xff,0x6e,0xcc,0xa7,0x00,0x01,0xff,
++	0x6e,0xcc,0x8c,0x00,0xd2,0x1b,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,0xcc,0x8c,0x00,
++	0x01,0xff,0xca,0xbc,0x6e,0x00,0x10,0x07,0x01,0xff,0xc5,0x8b,0x00,0x01,0x00,0xd1,
++	0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x84,0x00,0x01,0xff,0x6f,0xcc,0x84,0x00,0x10,
++	0x08,0x01,0xff,0x6f,0xcc,0x86,0x00,0x01,0xff,0x6f,0xcc,0x86,0x00,0xd3,0x3b,0xd2,
++	0x1b,0xd1,0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x8b,0x00,0x01,0xff,0x6f,0xcc,0x8b,
++	0x00,0x10,0x07,0x01,0xff,0xc5,0x93,0x00,0x01,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0x72,0xcc,0x81,0x00,0x01,0xff,0x72,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x72,0xcc,
++	0xa7,0x00,0x01,0xff,0x72,0xcc,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0x72,0xcc,0x8c,0x00,0x01,0xff,0x72,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x73,0xcc,
++	0x81,0x00,0x01,0xff,0x73,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x73,0xcc,
++	0x82,0x00,0x01,0xff,0x73,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x73,0xcc,0xa7,0x00,
++	0x01,0xff,0x73,0xcc,0xa7,0x00,0xd4,0x7b,0xd3,0x3b,0xd2,0x20,0xd1,0x10,0x10,0x08,
++	0x01,0xff,0x73,0xcc,0x8c,0x00,0x01,0xff,0x73,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,
++	0x74,0xcc,0xa7,0x00,0x01,0xff,0x74,0xcc,0xa7,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0x74,0xcc,0x8c,0x00,0x01,0xff,0x74,0xcc,0x8c,0x00,0x10,0x07,0x01,0xff,0xc5,0xa7,
++	0x00,0x01,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0x83,0x00,0x01,
++	0xff,0x75,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0x84,0x00,0x01,0xff,0x75,
++	0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0x86,0x00,0x01,0xff,0x75,
++	0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0x8a,0x00,0x01,0xff,0x75,0xcc,0x8a,
++	0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0x8b,0x00,0x01,
++	0xff,0x75,0xcc,0x8b,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0xa8,0x00,0x01,0xff,0x75,
++	0xcc,0xa8,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x82,0x00,0x01,0xff,0x77,
++	0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x79,0xcc,0x82,0x00,0x01,0xff,0x79,0xcc,0x82,
++	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x79,0xcc,0x88,0x00,0x01,0xff,0x7a,
++	0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0x81,0x00,0x01,0xff,0x7a,0xcc,0x87,
++	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x7a,0xcc,0x87,0x00,0x01,0xff,0x7a,0xcc,0x8c,
++	0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0x8c,0x00,0x01,0xff,0x73,0x00,0xe0,0x65,0x01,
++	0xcf,0x86,0xd5,0xb4,0xd4,0x5a,0xd3,0x2f,0xd2,0x16,0xd1,0x0b,0x10,0x04,0x01,0x00,
++	0x01,0xff,0xc9,0x93,0x00,0x10,0x07,0x01,0xff,0xc6,0x83,0x00,0x01,0x00,0xd1,0x0b,
++	0x10,0x07,0x01,0xff,0xc6,0x85,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xc9,0x94,0x00,
++	0x01,0xff,0xc6,0x88,0x00,0xd2,0x19,0xd1,0x0b,0x10,0x04,0x01,0x00,0x01,0xff,0xc9,
++	0x96,0x00,0x10,0x07,0x01,0xff,0xc9,0x97,0x00,0x01,0xff,0xc6,0x8c,0x00,0x51,0x04,
++	0x01,0x00,0x10,0x07,0x01,0xff,0xc7,0x9d,0x00,0x01,0xff,0xc9,0x99,0x00,0xd3,0x32,
++	0xd2,0x19,0xd1,0x0e,0x10,0x07,0x01,0xff,0xc9,0x9b,0x00,0x01,0xff,0xc6,0x92,0x00,
++	0x10,0x04,0x01,0x00,0x01,0xff,0xc9,0xa0,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xc9,
++	0xa3,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xc9,0xa9,0x00,0x01,0xff,0xc9,0xa8,0x00,
++	0xd2,0x0f,0x91,0x0b,0x10,0x07,0x01,0xff,0xc6,0x99,0x00,0x01,0x00,0x01,0x00,0xd1,
++	0x0e,0x10,0x07,0x01,0xff,0xc9,0xaf,0x00,0x01,0xff,0xc9,0xb2,0x00,0x10,0x04,0x01,
++	0x00,0x01,0xff,0xc9,0xb5,0x00,0xd4,0x5d,0xd3,0x34,0xd2,0x1b,0xd1,0x10,0x10,0x08,
++	0x01,0xff,0x6f,0xcc,0x9b,0x00,0x01,0xff,0x6f,0xcc,0x9b,0x00,0x10,0x07,0x01,0xff,
++	0xc6,0xa3,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xc6,0xa5,0x00,0x01,0x00,
++	0x10,0x07,0x01,0xff,0xca,0x80,0x00,0x01,0xff,0xc6,0xa8,0x00,0xd2,0x0f,0x91,0x0b,
++	0x10,0x04,0x01,0x00,0x01,0xff,0xca,0x83,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,
++	0xff,0xc6,0xad,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xca,0x88,0x00,0x01,0xff,0x75,
++	0xcc,0x9b,0x00,0xd3,0x33,0xd2,0x1d,0xd1,0x0f,0x10,0x08,0x01,0xff,0x75,0xcc,0x9b,
++	0x00,0x01,0xff,0xca,0x8a,0x00,0x10,0x07,0x01,0xff,0xca,0x8b,0x00,0x01,0xff,0xc6,
++	0xb4,0x00,0xd1,0x0b,0x10,0x04,0x01,0x00,0x01,0xff,0xc6,0xb6,0x00,0x10,0x04,0x01,
++	0x00,0x01,0xff,0xca,0x92,0x00,0xd2,0x0f,0x91,0x0b,0x10,0x07,0x01,0xff,0xc6,0xb9,
++	0x00,0x01,0x00,0x01,0x00,0x91,0x0b,0x10,0x07,0x01,0xff,0xc6,0xbd,0x00,0x01,0x00,
++	0x01,0x00,0xcf,0x86,0xd5,0xd4,0xd4,0x44,0xd3,0x16,0x52,0x04,0x01,0x00,0x51,0x07,
++	0x01,0xff,0xc7,0x86,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xc7,0x89,0x00,0xd2,0x12,
++	0x91,0x0b,0x10,0x07,0x01,0xff,0xc7,0x89,0x00,0x01,0x00,0x01,0xff,0xc7,0x8c,0x00,
++	0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x61,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,
++	0x61,0xcc,0x8c,0x00,0x01,0xff,0x69,0xcc,0x8c,0x00,0xd3,0x46,0xd2,0x20,0xd1,0x10,
++	0x10,0x08,0x01,0xff,0x69,0xcc,0x8c,0x00,0x01,0xff,0x6f,0xcc,0x8c,0x00,0x10,0x08,
++	0x01,0xff,0x6f,0xcc,0x8c,0x00,0x01,0xff,0x75,0xcc,0x8c,0x00,0xd1,0x12,0x10,0x08,
++	0x01,0xff,0x75,0xcc,0x8c,0x00,0x01,0xff,0x75,0xcc,0x88,0xcc,0x84,0x00,0x10,0x0a,
++	0x01,0xff,0x75,0xcc,0x88,0xcc,0x84,0x00,0x01,0xff,0x75,0xcc,0x88,0xcc,0x81,0x00,
++	0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,0x81,0x00,0x01,0xff,
++	0x75,0xcc,0x88,0xcc,0x8c,0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,0x8c,0x00,
++	0x01,0xff,0x75,0xcc,0x88,0xcc,0x80,0x00,0xd1,0x0e,0x10,0x0a,0x01,0xff,0x75,0xcc,
++	0x88,0xcc,0x80,0x00,0x01,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0x88,0xcc,0x84,0x00,
++	0x01,0xff,0x61,0xcc,0x88,0xcc,0x84,0x00,0xd4,0x87,0xd3,0x41,0xd2,0x26,0xd1,0x14,
++	0x10,0x0a,0x01,0xff,0x61,0xcc,0x87,0xcc,0x84,0x00,0x01,0xff,0x61,0xcc,0x87,0xcc,
++	0x84,0x00,0x10,0x09,0x01,0xff,0xc3,0xa6,0xcc,0x84,0x00,0x01,0xff,0xc3,0xa6,0xcc,
++	0x84,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xc7,0xa5,0x00,0x01,0x00,0x10,0x08,0x01,
++	0xff,0x67,0xcc,0x8c,0x00,0x01,0xff,0x67,0xcc,0x8c,0x00,0xd2,0x20,0xd1,0x10,0x10,
++	0x08,0x01,0xff,0x6b,0xcc,0x8c,0x00,0x01,0xff,0x6b,0xcc,0x8c,0x00,0x10,0x08,0x01,
++	0xff,0x6f,0xcc,0xa8,0x00,0x01,0xff,0x6f,0xcc,0xa8,0x00,0xd1,0x14,0x10,0x0a,0x01,
++	0xff,0x6f,0xcc,0xa8,0xcc,0x84,0x00,0x01,0xff,0x6f,0xcc,0xa8,0xcc,0x84,0x00,0x10,
++	0x09,0x01,0xff,0xca,0x92,0xcc,0x8c,0x00,0x01,0xff,0xca,0x92,0xcc,0x8c,0x00,0xd3,
++	0x38,0xd2,0x1a,0xd1,0x0f,0x10,0x08,0x01,0xff,0x6a,0xcc,0x8c,0x00,0x01,0xff,0xc7,
++	0xb3,0x00,0x10,0x07,0x01,0xff,0xc7,0xb3,0x00,0x01,0x00,0xd1,0x10,0x10,0x08,0x01,
++	0xff,0x67,0xcc,0x81,0x00,0x01,0xff,0x67,0xcc,0x81,0x00,0x10,0x07,0x04,0xff,0xc6,
++	0x95,0x00,0x04,0xff,0xc6,0xbf,0x00,0xd2,0x24,0xd1,0x10,0x10,0x08,0x04,0xff,0x6e,
++	0xcc,0x80,0x00,0x04,0xff,0x6e,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0x8a,
++	0xcc,0x81,0x00,0x01,0xff,0x61,0xcc,0x8a,0xcc,0x81,0x00,0xd1,0x12,0x10,0x09,0x01,
++	0xff,0xc3,0xa6,0xcc,0x81,0x00,0x01,0xff,0xc3,0xa6,0xcc,0x81,0x00,0x10,0x09,0x01,
++	0xff,0xc3,0xb8,0xcc,0x81,0x00,0x01,0xff,0xc3,0xb8,0xcc,0x81,0x00,0xe2,0x31,0x02,
++	0xe1,0xad,0x44,0xe0,0xc8,0x01,0xcf,0x86,0xd5,0xfb,0xd4,0x80,0xd3,0x40,0xd2,0x20,
++	0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0x8f,0x00,0x01,0xff,0x61,0xcc,0x8f,0x00,
++	0x10,0x08,0x01,0xff,0x61,0xcc,0x91,0x00,0x01,0xff,0x61,0xcc,0x91,0x00,0xd1,0x10,
++	0x10,0x08,0x01,0xff,0x65,0xcc,0x8f,0x00,0x01,0xff,0x65,0xcc,0x8f,0x00,0x10,0x08,
++	0x01,0xff,0x65,0xcc,0x91,0x00,0x01,0xff,0x65,0xcc,0x91,0x00,0xd2,0x20,0xd1,0x10,
++	0x10,0x08,0x01,0xff,0x69,0xcc,0x8f,0x00,0x01,0xff,0x69,0xcc,0x8f,0x00,0x10,0x08,
++	0x01,0xff,0x69,0xcc,0x91,0x00,0x01,0xff,0x69,0xcc,0x91,0x00,0xd1,0x10,0x10,0x08,
++	0x01,0xff,0x6f,0xcc,0x8f,0x00,0x01,0xff,0x6f,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,
++	0x6f,0xcc,0x91,0x00,0x01,0xff,0x6f,0xcc,0x91,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,
++	0x10,0x08,0x01,0xff,0x72,0xcc,0x8f,0x00,0x01,0xff,0x72,0xcc,0x8f,0x00,0x10,0x08,
++	0x01,0xff,0x72,0xcc,0x91,0x00,0x01,0xff,0x72,0xcc,0x91,0x00,0xd1,0x10,0x10,0x08,
++	0x01,0xff,0x75,0xcc,0x8f,0x00,0x01,0xff,0x75,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,
++	0x75,0xcc,0x91,0x00,0x01,0xff,0x75,0xcc,0x91,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
++	0x04,0xff,0x73,0xcc,0xa6,0x00,0x04,0xff,0x73,0xcc,0xa6,0x00,0x10,0x08,0x04,0xff,
++	0x74,0xcc,0xa6,0x00,0x04,0xff,0x74,0xcc,0xa6,0x00,0xd1,0x0b,0x10,0x07,0x04,0xff,
++	0xc8,0x9d,0x00,0x04,0x00,0x10,0x08,0x04,0xff,0x68,0xcc,0x8c,0x00,0x04,0xff,0x68,
++	0xcc,0x8c,0x00,0xd4,0x79,0xd3,0x31,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x06,0xff,0xc6,
++	0x9e,0x00,0x07,0x00,0x10,0x07,0x04,0xff,0xc8,0xa3,0x00,0x04,0x00,0xd1,0x0b,0x10,
++	0x07,0x04,0xff,0xc8,0xa5,0x00,0x04,0x00,0x10,0x08,0x04,0xff,0x61,0xcc,0x87,0x00,
++	0x04,0xff,0x61,0xcc,0x87,0x00,0xd2,0x24,0xd1,0x10,0x10,0x08,0x04,0xff,0x65,0xcc,
++	0xa7,0x00,0x04,0xff,0x65,0xcc,0xa7,0x00,0x10,0x0a,0x04,0xff,0x6f,0xcc,0x88,0xcc,
+ 	0x84,0x00,0x04,0xff,0x6f,0xcc,0x88,0xcc,0x84,0x00,0xd1,0x14,0x10,0x0a,0x04,0xff,
+-	0x4f,0xcc,0x83,0xcc,0x84,0x00,0x04,0xff,0x6f,0xcc,0x83,0xcc,0x84,0x00,0x10,0x08,
+-	0x04,0xff,0x4f,0xcc,0x87,0x00,0x04,0xff,0x6f,0xcc,0x87,0x00,0x93,0x30,0xd2,0x24,
+-	0xd1,0x14,0x10,0x0a,0x04,0xff,0x4f,0xcc,0x87,0xcc,0x84,0x00,0x04,0xff,0x6f,0xcc,
+-	0x87,0xcc,0x84,0x00,0x10,0x08,0x04,0xff,0x59,0xcc,0x84,0x00,0x04,0xff,0x79,0xcc,
+-	0x84,0x00,0x51,0x04,0x07,0x00,0x10,0x04,0x07,0x00,0x08,0x00,0x08,0x00,0xcf,0x86,
+-	0x95,0x14,0x94,0x10,0x93,0x0c,0x92,0x08,0x11,0x04,0x08,0x00,0x09,0x00,0x09,0x00,
+-	0x09,0x00,0x01,0x00,0x01,0x00,0xd0,0x22,0xcf,0x86,0x55,0x04,0x01,0x00,0x94,0x18,
+-	0x53,0x04,0x01,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x04,0x00,0x04,0x00,
+-	0x11,0x04,0x04,0x00,0x07,0x00,0x01,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,0x01,0x00,
+-	0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
+-	0x04,0x00,0x94,0x18,0x53,0x04,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x04,0x00,
+-	0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x07,0x00,0x07,0x00,0xe1,0x35,0x01,0xd0,
+-	0x72,0xcf,0x86,0xd5,0x24,0x54,0x04,0x01,0xe6,0xd3,0x10,0x52,0x04,0x01,0xe6,0x91,
+-	0x08,0x10,0x04,0x01,0xe6,0x01,0xe8,0x01,0xdc,0x92,0x0c,0x51,0x04,0x01,0xdc,0x10,
+-	0x04,0x01,0xe8,0x01,0xd8,0x01,0xdc,0xd4,0x2c,0xd3,0x1c,0xd2,0x10,0xd1,0x08,0x10,
+-	0x04,0x01,0xdc,0x01,0xca,0x10,0x04,0x01,0xca,0x01,0xdc,0x51,0x04,0x01,0xdc,0x10,
+-	0x04,0x01,0xdc,0x01,0xca,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0xca,0x01,0xdc,0x01,
+-	0xdc,0x01,0xdc,0xd3,0x08,0x12,0x04,0x01,0xdc,0x01,0x01,0xd2,0x0c,0x91,0x08,0x10,
+-	0x04,0x01,0x01,0x01,0xdc,0x01,0xdc,0x91,0x08,0x10,0x04,0x01,0xdc,0x01,0xe6,0x01,
+-	0xe6,0xcf,0x86,0xd5,0x7f,0xd4,0x47,0xd3,0x2e,0xd2,0x19,0xd1,0x0e,0x10,0x07,0x01,
+-	0xff,0xcc,0x80,0x00,0x01,0xff,0xcc,0x81,0x00,0x10,0x04,0x01,0xe6,0x01,0xff,0xcc,
+-	0x93,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xcc,0x88,0xcc,0x81,0x00,0x01,0xf0,0x10,
+-	0x04,0x04,0xe6,0x04,0xdc,0xd2,0x08,0x11,0x04,0x04,0xdc,0x04,0xe6,0xd1,0x08,0x10,
+-	0x04,0x04,0xe6,0x04,0xdc,0x10,0x04,0x04,0xdc,0x06,0xff,0x00,0xd3,0x18,0xd2,0x0c,
+-	0x51,0x04,0x07,0xe6,0x10,0x04,0x07,0xe6,0x07,0xdc,0x51,0x04,0x07,0xdc,0x10,0x04,
+-	0x07,0xdc,0x07,0xe6,0xd2,0x10,0xd1,0x08,0x10,0x04,0x08,0xe8,0x08,0xdc,0x10,0x04,
+-	0x08,0xdc,0x08,0xe6,0xd1,0x08,0x10,0x04,0x08,0xe9,0x07,0xea,0x10,0x04,0x07,0xea,
+-	0x07,0xe9,0xd4,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,0x01,0xea,0x10,0x04,0x04,0xe9,
+-	0x06,0xe6,0x06,0xe6,0x06,0xe6,0xd3,0x13,0x52,0x04,0x0a,0x00,0x91,0x0b,0x10,0x07,
+-	0x01,0xff,0xca,0xb9,0x00,0x01,0x00,0x0a,0x00,0xd2,0x0c,0x51,0x04,0x00,0x00,0x10,
+-	0x04,0x01,0x00,0x09,0x00,0x51,0x04,0x09,0x00,0x10,0x06,0x01,0xff,0x3b,0x00,0x10,
+-	0x00,0xd0,0xe1,0xcf,0x86,0xd5,0x7a,0xd4,0x5f,0xd3,0x21,0x52,0x04,0x00,0x00,0xd1,
+-	0x0d,0x10,0x04,0x01,0x00,0x01,0xff,0xc2,0xa8,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,
+-	0xce,0x91,0xcc,0x81,0x00,0x01,0xff,0xc2,0xb7,0x00,0xd2,0x1f,0xd1,0x12,0x10,0x09,
+-	0x01,0xff,0xce,0x95,0xcc,0x81,0x00,0x01,0xff,0xce,0x97,0xcc,0x81,0x00,0x10,0x09,
+-	0x01,0xff,0xce,0x99,0xcc,0x81,0x00,0x00,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xce,
+-	0x9f,0xcc,0x81,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xce,0xa5,0xcc,0x81,0x00,0x01,
+-	0xff,0xce,0xa9,0xcc,0x81,0x00,0x93,0x17,0x92,0x13,0x91,0x0f,0x10,0x0b,0x01,0xff,
+-	0xce,0xb9,0xcc,0x88,0xcc,0x81,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,
+-	0x4a,0xd3,0x10,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x01,
+-	0x00,0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,0xce,0x99,0xcc,0x88,0x00,
+-	0x01,0xff,0xce,0xa5,0xcc,0x88,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,
+-	0x81,0x00,0x01,0xff,0xce,0xb5,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb7,0xcc,
+-	0x81,0x00,0x01,0xff,0xce,0xb9,0xcc,0x81,0x00,0x93,0x17,0x92,0x13,0x91,0x0f,0x10,
+-	0x0b,0x01,0xff,0xcf,0x85,0xcc,0x88,0xcc,0x81,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
+-	0x01,0x00,0xcf,0x86,0xd5,0x7b,0xd4,0x39,0x53,0x04,0x01,0x00,0xd2,0x16,0x51,0x04,
+-	0x01,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x88,0x00,0x01,0xff,0xcf,0x85,0xcc,
+-	0x88,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xbf,0xcc,0x81,0x00,0x01,0xff,0xcf,
+-	0x85,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xcf,0x89,0xcc,0x81,0x00,0x0a,0x00,0xd3,
+-	0x26,0xd2,0x11,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xcf,0x92,0xcc,
+-	0x81,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xcf,0x92,0xcc,0x88,0x00,0x01,0x00,0x10,
+-	0x04,0x01,0x00,0x04,0x00,0xd2,0x0c,0x51,0x04,0x06,0x00,0x10,0x04,0x01,0x00,0x04,
+-	0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x04,0x00,0x10,0x04,0x01,0x00,0x04,0x00,0xd4,
+-	0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x04,0x00,0x01,0x00,0x01,
+-	0x00,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x05,0x00,0x10,0x04,0x06,
+-	0x00,0x07,0x00,0x12,0x04,0x07,0x00,0x08,0x00,0xe3,0x47,0x04,0xe2,0xbe,0x02,0xe1,
+-	0x07,0x01,0xd0,0x8b,0xcf,0x86,0xd5,0x6c,0xd4,0x53,0xd3,0x30,0xd2,0x1f,0xd1,0x12,
+-	0x10,0x09,0x04,0xff,0xd0,0x95,0xcc,0x80,0x00,0x01,0xff,0xd0,0x95,0xcc,0x88,0x00,
+-	0x10,0x04,0x01,0x00,0x01,0xff,0xd0,0x93,0xcc,0x81,0x00,0x51,0x04,0x01,0x00,0x10,
+-	0x04,0x01,0x00,0x01,0xff,0xd0,0x86,0xcc,0x88,0x00,0x52,0x04,0x01,0x00,0xd1,0x12,
+-	0x10,0x09,0x01,0xff,0xd0,0x9a,0xcc,0x81,0x00,0x04,0xff,0xd0,0x98,0xcc,0x80,0x00,
+-	0x10,0x09,0x01,0xff,0xd0,0xa3,0xcc,0x86,0x00,0x01,0x00,0x53,0x04,0x01,0x00,0x92,
+-	0x11,0x91,0x0d,0x10,0x04,0x01,0x00,0x01,0xff,0xd0,0x98,0xcc,0x86,0x00,0x01,0x00,
+-	0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x92,0x11,0x91,0x0d,0x10,0x04,
+-	0x01,0x00,0x01,0xff,0xd0,0xb8,0xcc,0x86,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,
+-	0x57,0x54,0x04,0x01,0x00,0xd3,0x30,0xd2,0x1f,0xd1,0x12,0x10,0x09,0x04,0xff,0xd0,
+-	0xb5,0xcc,0x80,0x00,0x01,0xff,0xd0,0xb5,0xcc,0x88,0x00,0x10,0x04,0x01,0x00,0x01,
+-	0xff,0xd0,0xb3,0xcc,0x81,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xff,
+-	0xd1,0x96,0xcc,0x88,0x00,0x52,0x04,0x01,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,
+-	0xba,0xcc,0x81,0x00,0x04,0xff,0xd0,0xb8,0xcc,0x80,0x00,0x10,0x09,0x01,0xff,0xd1,
+-	0x83,0xcc,0x86,0x00,0x01,0x00,0x54,0x04,0x01,0x00,0x93,0x1a,0x52,0x04,0x01,0x00,
+-	0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,0xd1,0xb4,0xcc,0x8f,0x00,0x01,0xff,0xd1,
+-	0xb5,0xcc,0x8f,0x00,0x01,0x00,0xd0,0x2e,0xcf,0x86,0x95,0x28,0x94,0x24,0xd3,0x18,
+-	0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xe6,0x51,0x04,0x01,0xe6,
+-	0x10,0x04,0x01,0xe6,0x0a,0xe6,0x92,0x08,0x11,0x04,0x04,0x00,0x06,0x00,0x04,0x00,
+-	0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0xbe,0xd4,0x4a,0xd3,0x2a,0xd2,0x1a,0xd1,0x0d,
+-	0x10,0x04,0x01,0x00,0x01,0xff,0xd0,0x96,0xcc,0x86,0x00,0x10,0x09,0x01,0xff,0xd0,
+-	0xb6,0xcc,0x86,0x00,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x06,0x00,0x10,0x04,
+-	0x06,0x00,0x01,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x06,0x00,0x10,0x04,
+-	0x06,0x00,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x06,0x00,0x10,0x04,0x06,0x00,
+-	0x09,0x00,0xd3,0x3a,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0x90,0xcc,0x86,
+-	0x00,0x01,0xff,0xd0,0xb0,0xcc,0x86,0x00,0x10,0x09,0x01,0xff,0xd0,0x90,0xcc,0x88,
+-	0x00,0x01,0xff,0xd0,0xb0,0xcc,0x88,0x00,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,
+-	0xd0,0x95,0xcc,0x86,0x00,0x01,0xff,0xd0,0xb5,0xcc,0x86,0x00,0xd2,0x16,0x51,0x04,
+-	0x01,0x00,0x10,0x09,0x01,0xff,0xd3,0x98,0xcc,0x88,0x00,0x01,0xff,0xd3,0x99,0xcc,
+-	0x88,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0x96,0xcc,0x88,0x00,0x01,0xff,0xd0,
+-	0xb6,0xcc,0x88,0x00,0x10,0x09,0x01,0xff,0xd0,0x97,0xcc,0x88,0x00,0x01,0xff,0xd0,
+-	0xb7,0xcc,0x88,0x00,0xd4,0x74,0xd3,0x3a,0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,
+-	0x01,0xff,0xd0,0x98,0xcc,0x84,0x00,0x01,0xff,0xd0,0xb8,0xcc,0x84,0x00,0xd1,0x12,
+-	0x10,0x09,0x01,0xff,0xd0,0x98,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb8,0xcc,0x88,0x00,
+-	0x10,0x09,0x01,0xff,0xd0,0x9e,0xcc,0x88,0x00,0x01,0xff,0xd0,0xbe,0xcc,0x88,0x00,
+-	0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,0xd3,0xa8,0xcc,0x88,0x00,0x01,
+-	0xff,0xd3,0xa9,0xcc,0x88,0x00,0xd1,0x12,0x10,0x09,0x04,0xff,0xd0,0xad,0xcc,0x88,
+-	0x00,0x04,0xff,0xd1,0x8d,0xcc,0x88,0x00,0x10,0x09,0x01,0xff,0xd0,0xa3,0xcc,0x84,
+-	0x00,0x01,0xff,0xd1,0x83,0xcc,0x84,0x00,0xd3,0x3a,0xd2,0x24,0xd1,0x12,0x10,0x09,
+-	0x01,0xff,0xd0,0xa3,0xcc,0x88,0x00,0x01,0xff,0xd1,0x83,0xcc,0x88,0x00,0x10,0x09,
+-	0x01,0xff,0xd0,0xa3,0xcc,0x8b,0x00,0x01,0xff,0xd1,0x83,0xcc,0x8b,0x00,0x91,0x12,
+-	0x10,0x09,0x01,0xff,0xd0,0xa7,0xcc,0x88,0x00,0x01,0xff,0xd1,0x87,0xcc,0x88,0x00,
+-	0x08,0x00,0x92,0x16,0x91,0x12,0x10,0x09,0x01,0xff,0xd0,0xab,0xcc,0x88,0x00,0x01,
+-	0xff,0xd1,0x8b,0xcc,0x88,0x00,0x09,0x00,0x09,0x00,0xd1,0x74,0xd0,0x36,0xcf,0x86,
+-	0xd5,0x10,0x54,0x04,0x06,0x00,0x93,0x08,0x12,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,
+-	0xd4,0x10,0x93,0x0c,0x52,0x04,0x0a,0x00,0x11,0x04,0x0b,0x00,0x0c,0x00,0x10,0x00,
+-	0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
+-	0x01,0x00,0xcf,0x86,0xd5,0x24,0x54,0x04,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,
+-	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,
+-	0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,
+-	0x10,0x04,0x14,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd0,0xba,
+-	0xcf,0x86,0xd5,0x4c,0xd4,0x24,0x53,0x04,0x01,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,
+-	0x14,0x00,0x01,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,
+-	0x10,0x00,0x10,0x04,0x10,0x00,0x0d,0x00,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,
+-	0x00,0x00,0x02,0xdc,0x02,0xe6,0x51,0x04,0x02,0xe6,0x10,0x04,0x02,0xdc,0x02,0xe6,
+-	0x92,0x0c,0x51,0x04,0x02,0xe6,0x10,0x04,0x02,0xde,0x02,0xdc,0x02,0xe6,0xd4,0x2c,
+-	0xd3,0x10,0x92,0x0c,0x51,0x04,0x02,0xe6,0x10,0x04,0x08,0xdc,0x02,0xdc,0x02,0xdc,
+-	0xd2,0x0c,0x51,0x04,0x02,0xe6,0x10,0x04,0x02,0xdc,0x02,0xe6,0xd1,0x08,0x10,0x04,
+-	0x02,0xe6,0x02,0xde,0x10,0x04,0x02,0xe4,0x02,0xe6,0xd3,0x20,0xd2,0x10,0xd1,0x08,
+-	0x10,0x04,0x01,0x0a,0x01,0x0b,0x10,0x04,0x01,0x0c,0x01,0x0d,0xd1,0x08,0x10,0x04,
+-	0x01,0x0e,0x01,0x0f,0x10,0x04,0x01,0x10,0x01,0x11,0xd2,0x10,0xd1,0x08,0x10,0x04,
+-	0x01,0x12,0x01,0x13,0x10,0x04,0x09,0x13,0x01,0x14,0xd1,0x08,0x10,0x04,0x01,0x15,
+-	0x01,0x16,0x10,0x04,0x01,0x00,0x01,0x17,0xcf,0x86,0xd5,0x28,0x94,0x24,0x93,0x20,
+-	0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x01,0x18,0x10,0x04,0x01,0x19,0x01,0x00,
+-	0xd1,0x08,0x10,0x04,0x02,0xe6,0x08,0xdc,0x10,0x04,0x08,0x00,0x08,0x12,0x00,0x00,
+-	0x01,0x00,0xd4,0x1c,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,
+-	0x01,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x14,0x00,0x93,0x10,
+-	0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-	0xe2,0xfb,0x01,0xe1,0x2b,0x01,0xd0,0xa8,0xcf,0x86,0xd5,0x55,0xd4,0x28,0xd3,0x10,
+-	0x52,0x04,0x07,0x00,0x91,0x08,0x10,0x04,0x0d,0x00,0x10,0x00,0x0a,0x00,0xd2,0x0c,
+-	0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x00,0x08,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
+-	0x07,0x00,0x07,0x00,0xd3,0x0c,0x52,0x04,0x07,0xe6,0x11,0x04,0x07,0xe6,0x0a,0xe6,
+-	0xd2,0x10,0xd1,0x08,0x10,0x04,0x0a,0x1e,0x0a,0x1f,0x10,0x04,0x0a,0x20,0x01,0x00,
+-	0xd1,0x09,0x10,0x05,0x0f,0xff,0x00,0x00,0x00,0x10,0x04,0x08,0x00,0x01,0x00,0xd4,
+-	0x3d,0x93,0x39,0xd2,0x1a,0xd1,0x08,0x10,0x04,0x0c,0x00,0x01,0x00,0x10,0x09,0x01,
+-	0xff,0xd8,0xa7,0xd9,0x93,0x00,0x01,0xff,0xd8,0xa7,0xd9,0x94,0x00,0xd1,0x12,0x10,
+-	0x09,0x01,0xff,0xd9,0x88,0xd9,0x94,0x00,0x01,0xff,0xd8,0xa7,0xd9,0x95,0x00,0x10,
+-	0x09,0x01,0xff,0xd9,0x8a,0xd9,0x94,0x00,0x01,0x00,0x01,0x00,0x53,0x04,0x01,0x00,
+-	0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x0a,0x00,0x0a,0x00,0xcf,0x86,
+-	0xd5,0x5c,0xd4,0x20,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,
+-	0x01,0x00,0x01,0x1b,0xd1,0x08,0x10,0x04,0x01,0x1c,0x01,0x1d,0x10,0x04,0x01,0x1e,
+-	0x01,0x1f,0xd3,0x20,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x20,0x01,0x21,0x10,0x04,
+-	0x01,0x22,0x04,0xe6,0xd1,0x08,0x10,0x04,0x04,0xe6,0x04,0xdc,0x10,0x04,0x07,0xdc,
+-	0x07,0xe6,0xd2,0x0c,0x91,0x08,0x10,0x04,0x07,0xe6,0x08,0xe6,0x08,0xe6,0xd1,0x08,
+-	0x10,0x04,0x08,0xdc,0x08,0xe6,0x10,0x04,0x08,0xe6,0x0c,0xdc,0xd4,0x10,0x53,0x04,
+-	0x01,0x00,0x52,0x04,0x01,0x00,0x11,0x04,0x01,0x00,0x06,0x00,0x93,0x10,0x92,0x0c,
+-	0x91,0x08,0x10,0x04,0x01,0x23,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd0,0x22,
+-	0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x08,
+-	0x11,0x04,0x04,0x00,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x04,0x00,
+-	0xcf,0x86,0xd5,0x5b,0xd4,0x2e,0xd3,0x1e,0x92,0x1a,0xd1,0x0d,0x10,0x09,0x01,0xff,
+-	0xdb,0x95,0xd9,0x94,0x00,0x01,0x00,0x10,0x09,0x01,0xff,0xdb,0x81,0xd9,0x94,0x00,
++	0x6f,0xcc,0x83,0xcc,0x84,0x00,0x04,0xff,0x6f,0xcc,0x83,0xcc,0x84,0x00,0x10,0x08,
++	0x04,0xff,0x6f,0xcc,0x87,0x00,0x04,0xff,0x6f,0xcc,0x87,0x00,0xd3,0x27,0xe2,0x0b,
++	0x43,0xd1,0x14,0x10,0x0a,0x04,0xff,0x6f,0xcc,0x87,0xcc,0x84,0x00,0x04,0xff,0x6f,
++	0xcc,0x87,0xcc,0x84,0x00,0x10,0x08,0x04,0xff,0x79,0xcc,0x84,0x00,0x04,0xff,0x79,
++	0xcc,0x84,0x00,0xd2,0x13,0x51,0x04,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0xa5,
++	0x00,0x08,0xff,0xc8,0xbc,0x00,0xd1,0x0b,0x10,0x04,0x08,0x00,0x08,0xff,0xc6,0x9a,
++	0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0xa6,0x00,0x08,0x00,0xcf,0x86,0x95,0x5f,0x94,
++	0x5b,0xd3,0x2f,0xd2,0x16,0xd1,0x0b,0x10,0x04,0x08,0x00,0x08,0xff,0xc9,0x82,0x00,
++	0x10,0x04,0x09,0x00,0x09,0xff,0xc6,0x80,0x00,0xd1,0x0e,0x10,0x07,0x09,0xff,0xca,
++	0x89,0x00,0x09,0xff,0xca,0x8c,0x00,0x10,0x07,0x09,0xff,0xc9,0x87,0x00,0x09,0x00,
++	0xd2,0x16,0xd1,0x0b,0x10,0x07,0x09,0xff,0xc9,0x89,0x00,0x09,0x00,0x10,0x07,0x09,
++	0xff,0xc9,0x8b,0x00,0x09,0x00,0xd1,0x0b,0x10,0x07,0x09,0xff,0xc9,0x8d,0x00,0x09,
++	0x00,0x10,0x07,0x09,0xff,0xc9,0x8f,0x00,0x09,0x00,0x01,0x00,0x01,0x00,0xd1,0x8b,
++	0xd0,0x0c,0xcf,0x86,0xe5,0xfa,0x42,0x64,0xd9,0x42,0x01,0xe6,0xcf,0x86,0xd5,0x2a,
++	0xe4,0x82,0x43,0xe3,0x69,0x43,0xd2,0x11,0xe1,0x48,0x43,0x10,0x07,0x01,0xff,0xcc,
++	0x80,0x00,0x01,0xff,0xcc,0x81,0x00,0xe1,0x4f,0x43,0x10,0x09,0x01,0xff,0xcc,0x88,
++	0xcc,0x81,0x00,0x01,0xff,0xce,0xb9,0x00,0xd4,0x0f,0x93,0x0b,0x92,0x07,0x61,0x94,
++	0x43,0x01,0xea,0x06,0xe6,0x06,0xe6,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x0a,
++	0xff,0xcd,0xb1,0x00,0x0a,0x00,0x10,0x07,0x0a,0xff,0xcd,0xb3,0x00,0x0a,0x00,0xd1,
++	0x0b,0x10,0x07,0x01,0xff,0xca,0xb9,0x00,0x01,0x00,0x10,0x07,0x0a,0xff,0xcd,0xb7,
++	0x00,0x0a,0x00,0xd2,0x07,0x61,0x80,0x43,0x00,0x00,0x51,0x04,0x09,0x00,0x10,0x06,
++	0x01,0xff,0x3b,0x00,0x10,0xff,0xcf,0xb3,0x00,0xe0,0x31,0x01,0xcf,0x86,0xd5,0xd3,
++	0xd4,0x5f,0xd3,0x21,0x52,0x04,0x00,0x00,0xd1,0x0d,0x10,0x04,0x01,0x00,0x01,0xff,
++	0xc2,0xa8,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x81,0x00,0x01,0xff,
++	0xc2,0xb7,0x00,0xd2,0x1f,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb5,0xcc,0x81,0x00,
++	0x01,0xff,0xce,0xb7,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x81,0x00,
++	0x00,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xce,0xbf,0xcc,0x81,0x00,0x00,0x00,0x10,
++	0x09,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,0x01,0xff,0xcf,0x89,0xcc,0x81,0x00,0xd3,
++	0x3c,0xd2,0x20,0xd1,0x12,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x88,0xcc,0x81,0x00,
++	0x01,0xff,0xce,0xb1,0x00,0x10,0x07,0x01,0xff,0xce,0xb2,0x00,0x01,0xff,0xce,0xb3,
++	0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xce,0xb4,0x00,0x01,0xff,0xce,0xb5,0x00,0x10,
++	0x07,0x01,0xff,0xce,0xb6,0x00,0x01,0xff,0xce,0xb7,0x00,0xd2,0x1c,0xd1,0x0e,0x10,
++	0x07,0x01,0xff,0xce,0xb8,0x00,0x01,0xff,0xce,0xb9,0x00,0x10,0x07,0x01,0xff,0xce,
++	0xba,0x00,0x01,0xff,0xce,0xbb,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xce,0xbc,0x00,
++	0x01,0xff,0xce,0xbd,0x00,0x10,0x07,0x01,0xff,0xce,0xbe,0x00,0x01,0xff,0xce,0xbf,
++	0x00,0xe4,0x6e,0x43,0xd3,0x35,0xd2,0x19,0xd1,0x0e,0x10,0x07,0x01,0xff,0xcf,0x80,
++	0x00,0x01,0xff,0xcf,0x81,0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xcf,0x83,0x00,0xd1,
++	0x0e,0x10,0x07,0x01,0xff,0xcf,0x84,0x00,0x01,0xff,0xcf,0x85,0x00,0x10,0x07,0x01,
++	0xff,0xcf,0x86,0x00,0x01,0xff,0xcf,0x87,0x00,0xe2,0x14,0x43,0xd1,0x0e,0x10,0x07,
++	0x01,0xff,0xcf,0x88,0x00,0x01,0xff,0xcf,0x89,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,
++	0xcc,0x88,0x00,0x01,0xff,0xcf,0x85,0xcc,0x88,0x00,0xcf,0x86,0xd5,0x94,0xd4,0x3c,
++	0xd3,0x13,0x92,0x0f,0x51,0x04,0x01,0x00,0x10,0x07,0x01,0xff,0xcf,0x83,0x00,0x01,
++	0x00,0x01,0x00,0xd2,0x07,0x61,0x23,0x43,0x01,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,
++	0xce,0xbf,0xcc,0x81,0x00,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,
++	0xcf,0x89,0xcc,0x81,0x00,0x0a,0xff,0xcf,0x97,0x00,0xd3,0x2c,0xd2,0x11,0xe1,0x2f,
++	0x43,0x10,0x07,0x01,0xff,0xce,0xb2,0x00,0x01,0xff,0xce,0xb8,0x00,0xd1,0x10,0x10,
++	0x09,0x01,0xff,0xcf,0x92,0xcc,0x88,0x00,0x01,0xff,0xcf,0x86,0x00,0x10,0x07,0x01,
++	0xff,0xcf,0x80,0x00,0x04,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x06,0xff,0xcf,0x99,
++	0x00,0x06,0x00,0x10,0x07,0x01,0xff,0xcf,0x9b,0x00,0x04,0x00,0xd1,0x0b,0x10,0x07,
++	0x01,0xff,0xcf,0x9d,0x00,0x04,0x00,0x10,0x07,0x01,0xff,0xcf,0x9f,0x00,0x04,0x00,
++	0xd4,0x58,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xcf,0xa1,0x00,0x04,
++	0x00,0x10,0x07,0x01,0xff,0xcf,0xa3,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,
++	0xcf,0xa5,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xcf,0xa7,0x00,0x01,0x00,0xd2,0x16,
++	0xd1,0x0b,0x10,0x07,0x01,0xff,0xcf,0xa9,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xcf,
++	0xab,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xcf,0xad,0x00,0x01,0x00,0x10,
++	0x07,0x01,0xff,0xcf,0xaf,0x00,0x01,0x00,0xd3,0x2b,0xd2,0x12,0x91,0x0e,0x10,0x07,
++	0x01,0xff,0xce,0xba,0x00,0x01,0xff,0xcf,0x81,0x00,0x01,0x00,0xd1,0x0e,0x10,0x07,
++	0x05,0xff,0xce,0xb8,0x00,0x05,0xff,0xce,0xb5,0x00,0x10,0x04,0x06,0x00,0x07,0xff,
++	0xcf,0xb8,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x04,0x07,0x00,0x07,0xff,0xcf,0xb2,0x00,
++	0x10,0x07,0x07,0xff,0xcf,0xbb,0x00,0x07,0x00,0xd1,0x0b,0x10,0x04,0x08,0x00,0x08,
++	0xff,0xcd,0xbb,0x00,0x10,0x07,0x08,0xff,0xcd,0xbc,0x00,0x08,0xff,0xcd,0xbd,0x00,
++	0xe3,0xd6,0x46,0xe2,0x3d,0x05,0xe1,0x27,0x02,0xe0,0x66,0x01,0xcf,0x86,0xd5,0xf0,
++	0xd4,0x7e,0xd3,0x40,0xd2,0x22,0xd1,0x12,0x10,0x09,0x04,0xff,0xd0,0xb5,0xcc,0x80,
++	0x00,0x01,0xff,0xd0,0xb5,0xcc,0x88,0x00,0x10,0x07,0x01,0xff,0xd1,0x92,0x00,0x01,
++	0xff,0xd0,0xb3,0xcc,0x81,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,0x94,0x00,0x01,
++	0xff,0xd1,0x95,0x00,0x10,0x07,0x01,0xff,0xd1,0x96,0x00,0x01,0xff,0xd1,0x96,0xcc,
++	0x88,0x00,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,0x98,0x00,0x01,0xff,0xd1,
++	0x99,0x00,0x10,0x07,0x01,0xff,0xd1,0x9a,0x00,0x01,0xff,0xd1,0x9b,0x00,0xd1,0x12,
++	0x10,0x09,0x01,0xff,0xd0,0xba,0xcc,0x81,0x00,0x04,0xff,0xd0,0xb8,0xcc,0x80,0x00,
++	0x10,0x09,0x01,0xff,0xd1,0x83,0xcc,0x86,0x00,0x01,0xff,0xd1,0x9f,0x00,0xd3,0x38,
++	0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd0,0xb0,0x00,0x01,0xff,0xd0,0xb1,0x00,
++	0x10,0x07,0x01,0xff,0xd0,0xb2,0x00,0x01,0xff,0xd0,0xb3,0x00,0xd1,0x0e,0x10,0x07,
++	0x01,0xff,0xd0,0xb4,0x00,0x01,0xff,0xd0,0xb5,0x00,0x10,0x07,0x01,0xff,0xd0,0xb6,
++	0x00,0x01,0xff,0xd0,0xb7,0x00,0xd2,0x1e,0xd1,0x10,0x10,0x07,0x01,0xff,0xd0,0xb8,
++	0x00,0x01,0xff,0xd0,0xb8,0xcc,0x86,0x00,0x10,0x07,0x01,0xff,0xd0,0xba,0x00,0x01,
++	0xff,0xd0,0xbb,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd0,0xbc,0x00,0x01,0xff,0xd0,
++	0xbd,0x00,0x10,0x07,0x01,0xff,0xd0,0xbe,0x00,0x01,0xff,0xd0,0xbf,0x00,0xe4,0x0e,
++	0x42,0xd3,0x38,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,0x80,0x00,0x01,0xff,
++	0xd1,0x81,0x00,0x10,0x07,0x01,0xff,0xd1,0x82,0x00,0x01,0xff,0xd1,0x83,0x00,0xd1,
++	0x0e,0x10,0x07,0x01,0xff,0xd1,0x84,0x00,0x01,0xff,0xd1,0x85,0x00,0x10,0x07,0x01,
++	0xff,0xd1,0x86,0x00,0x01,0xff,0xd1,0x87,0x00,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,
++	0xff,0xd1,0x88,0x00,0x01,0xff,0xd1,0x89,0x00,0x10,0x07,0x01,0xff,0xd1,0x8a,0x00,
++	0x01,0xff,0xd1,0x8b,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,0x8c,0x00,0x01,0xff,
++	0xd1,0x8d,0x00,0x10,0x07,0x01,0xff,0xd1,0x8e,0x00,0x01,0xff,0xd1,0x8f,0x00,0xcf,
++	0x86,0xd5,0x07,0x64,0xb8,0x41,0x01,0x00,0xd4,0x58,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,
++	0x10,0x07,0x01,0xff,0xd1,0xa1,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xa3,0x00,
++	0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xa5,0x00,0x01,0x00,0x10,0x07,0x01,
++	0xff,0xd1,0xa7,0x00,0x01,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xa9,
++	0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xab,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,
++	0x01,0xff,0xd1,0xad,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xaf,0x00,0x01,0x00,
++	0xd3,0x33,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xb1,0x00,0x01,0x00,0x10,
++	0x07,0x01,0xff,0xd1,0xb3,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xb5,
++	0x00,0x01,0x00,0x10,0x09,0x01,0xff,0xd1,0xb5,0xcc,0x8f,0x00,0x01,0xff,0xd1,0xb5,
++	0xcc,0x8f,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xb9,0x00,0x01,0x00,
++	0x10,0x07,0x01,0xff,0xd1,0xbb,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,
++	0xbd,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xbf,0x00,0x01,0x00,0xe0,0x41,0x01,
++	0xcf,0x86,0xd5,0x8e,0xd4,0x36,0xd3,0x11,0xe2,0x7a,0x41,0xe1,0x71,0x41,0x10,0x07,
++	0x01,0xff,0xd2,0x81,0x00,0x01,0x00,0xd2,0x0f,0x51,0x04,0x04,0x00,0x10,0x07,0x06,
++	0xff,0xd2,0x8b,0x00,0x06,0x00,0xd1,0x0b,0x10,0x07,0x04,0xff,0xd2,0x8d,0x00,0x04,
++	0x00,0x10,0x07,0x04,0xff,0xd2,0x8f,0x00,0x04,0x00,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,
++	0x10,0x07,0x01,0xff,0xd2,0x91,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0x93,0x00,
++	0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0x95,0x00,0x01,0x00,0x10,0x07,0x01,
++	0xff,0xd2,0x97,0x00,0x01,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0x99,
++	0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0x9b,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,
++	0x01,0xff,0xd2,0x9d,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0x9f,0x00,0x01,0x00,
++	0xd4,0x58,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0xa1,0x00,0x01,
++	0x00,0x10,0x07,0x01,0xff,0xd2,0xa3,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,
++	0xd2,0xa5,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xa7,0x00,0x01,0x00,0xd2,0x16,
++	0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0xa9,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,
++	0xab,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0xad,0x00,0x01,0x00,0x10,
++	0x07,0x01,0xff,0xd2,0xaf,0x00,0x01,0x00,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,
++	0x01,0xff,0xd2,0xb1,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xb3,0x00,0x01,0x00,
++	0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0xb5,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,
++	0xb7,0x00,0x01,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0xb9,0x00,0x01,
++	0x00,0x10,0x07,0x01,0xff,0xd2,0xbb,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,
++	0xd2,0xbd,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xbf,0x00,0x01,0x00,0xcf,0x86,
++	0xd5,0xdc,0xd4,0x5a,0xd3,0x36,0xd2,0x20,0xd1,0x10,0x10,0x07,0x01,0xff,0xd3,0x8f,
++	0x00,0x01,0xff,0xd0,0xb6,0xcc,0x86,0x00,0x10,0x09,0x01,0xff,0xd0,0xb6,0xcc,0x86,
++	0x00,0x01,0xff,0xd3,0x84,0x00,0xd1,0x0b,0x10,0x04,0x01,0x00,0x06,0xff,0xd3,0x86,
++	0x00,0x10,0x04,0x06,0x00,0x01,0xff,0xd3,0x88,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x04,
++	0x01,0x00,0x06,0xff,0xd3,0x8a,0x00,0x10,0x04,0x06,0x00,0x01,0xff,0xd3,0x8c,0x00,
++	0xe1,0x52,0x40,0x10,0x04,0x01,0x00,0x06,0xff,0xd3,0x8e,0x00,0xd3,0x41,0xd2,0x24,
++	0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0xb0,0xcc,0x86,0x00,0x01,0xff,0xd0,0xb0,0xcc,
++	0x86,0x00,0x10,0x09,0x01,0xff,0xd0,0xb0,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb0,0xcc,
++	0x88,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd3,0x95,0x00,0x01,0x00,0x10,0x09,0x01,
++	0xff,0xd0,0xb5,0xcc,0x86,0x00,0x01,0xff,0xd0,0xb5,0xcc,0x86,0x00,0xd2,0x1d,0xd1,
++	0x0b,0x10,0x07,0x01,0xff,0xd3,0x99,0x00,0x01,0x00,0x10,0x09,0x01,0xff,0xd3,0x99,
++	0xcc,0x88,0x00,0x01,0xff,0xd3,0x99,0xcc,0x88,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,
++	0xd0,0xb6,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb6,0xcc,0x88,0x00,0x10,0x09,0x01,0xff,
++	0xd0,0xb7,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb7,0xcc,0x88,0x00,0xd4,0x82,0xd3,0x41,
++	0xd2,0x1d,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd3,0xa1,0x00,0x01,0x00,0x10,0x09,0x01,
++	0xff,0xd0,0xb8,0xcc,0x84,0x00,0x01,0xff,0xd0,0xb8,0xcc,0x84,0x00,0xd1,0x12,0x10,
++	0x09,0x01,0xff,0xd0,0xb8,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb8,0xcc,0x88,0x00,0x10,
++	0x09,0x01,0xff,0xd0,0xbe,0xcc,0x88,0x00,0x01,0xff,0xd0,0xbe,0xcc,0x88,0x00,0xd2,
++	0x1d,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd3,0xa9,0x00,0x01,0x00,0x10,0x09,0x01,0xff,
++	0xd3,0xa9,0xcc,0x88,0x00,0x01,0xff,0xd3,0xa9,0xcc,0x88,0x00,0xd1,0x12,0x10,0x09,
++	0x04,0xff,0xd1,0x8d,0xcc,0x88,0x00,0x04,0xff,0xd1,0x8d,0xcc,0x88,0x00,0x10,0x09,
++	0x01,0xff,0xd1,0x83,0xcc,0x84,0x00,0x01,0xff,0xd1,0x83,0xcc,0x84,0x00,0xd3,0x41,
++	0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd1,0x83,0xcc,0x88,0x00,0x01,0xff,0xd1,
++	0x83,0xcc,0x88,0x00,0x10,0x09,0x01,0xff,0xd1,0x83,0xcc,0x8b,0x00,0x01,0xff,0xd1,
++	0x83,0xcc,0x8b,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd1,0x87,0xcc,0x88,0x00,0x01,
++	0xff,0xd1,0x87,0xcc,0x88,0x00,0x10,0x07,0x08,0xff,0xd3,0xb7,0x00,0x08,0x00,0xd2,
++	0x1d,0xd1,0x12,0x10,0x09,0x01,0xff,0xd1,0x8b,0xcc,0x88,0x00,0x01,0xff,0xd1,0x8b,
++	0xcc,0x88,0x00,0x10,0x07,0x09,0xff,0xd3,0xbb,0x00,0x09,0x00,0xd1,0x0b,0x10,0x07,
++	0x09,0xff,0xd3,0xbd,0x00,0x09,0x00,0x10,0x07,0x09,0xff,0xd3,0xbf,0x00,0x09,0x00,
++	0xe1,0x26,0x02,0xe0,0x78,0x01,0xcf,0x86,0xd5,0xb0,0xd4,0x58,0xd3,0x2c,0xd2,0x16,
++	0xd1,0x0b,0x10,0x07,0x06,0xff,0xd4,0x81,0x00,0x06,0x00,0x10,0x07,0x06,0xff,0xd4,
++	0x83,0x00,0x06,0x00,0xd1,0x0b,0x10,0x07,0x06,0xff,0xd4,0x85,0x00,0x06,0x00,0x10,
++	0x07,0x06,0xff,0xd4,0x87,0x00,0x06,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x06,0xff,
++	0xd4,0x89,0x00,0x06,0x00,0x10,0x07,0x06,0xff,0xd4,0x8b,0x00,0x06,0x00,0xd1,0x0b,
++	0x10,0x07,0x06,0xff,0xd4,0x8d,0x00,0x06,0x00,0x10,0x07,0x06,0xff,0xd4,0x8f,0x00,
++	0x06,0x00,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x09,0xff,0xd4,0x91,0x00,0x09,
++	0x00,0x10,0x07,0x09,0xff,0xd4,0x93,0x00,0x09,0x00,0xd1,0x0b,0x10,0x07,0x0a,0xff,
++	0xd4,0x95,0x00,0x0a,0x00,0x10,0x07,0x0a,0xff,0xd4,0x97,0x00,0x0a,0x00,0xd2,0x16,
++	0xd1,0x0b,0x10,0x07,0x0a,0xff,0xd4,0x99,0x00,0x0a,0x00,0x10,0x07,0x0a,0xff,0xd4,
++	0x9b,0x00,0x0a,0x00,0xd1,0x0b,0x10,0x07,0x0a,0xff,0xd4,0x9d,0x00,0x0a,0x00,0x10,
++	0x07,0x0a,0xff,0xd4,0x9f,0x00,0x0a,0x00,0xd4,0x58,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,
++	0x10,0x07,0x0a,0xff,0xd4,0xa1,0x00,0x0a,0x00,0x10,0x07,0x0a,0xff,0xd4,0xa3,0x00,
++	0x0a,0x00,0xd1,0x0b,0x10,0x07,0x0b,0xff,0xd4,0xa5,0x00,0x0b,0x00,0x10,0x07,0x0c,
++	0xff,0xd4,0xa7,0x00,0x0c,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x10,0xff,0xd4,0xa9,
++	0x00,0x10,0x00,0x10,0x07,0x10,0xff,0xd4,0xab,0x00,0x10,0x00,0xd1,0x0b,0x10,0x07,
++	0x10,0xff,0xd4,0xad,0x00,0x10,0x00,0x10,0x07,0x10,0xff,0xd4,0xaf,0x00,0x10,0x00,
++	0xd3,0x35,0xd2,0x19,0xd1,0x0b,0x10,0x04,0x00,0x00,0x01,0xff,0xd5,0xa1,0x00,0x10,
++	0x07,0x01,0xff,0xd5,0xa2,0x00,0x01,0xff,0xd5,0xa3,0x00,0xd1,0x0e,0x10,0x07,0x01,
++	0xff,0xd5,0xa4,0x00,0x01,0xff,0xd5,0xa5,0x00,0x10,0x07,0x01,0xff,0xd5,0xa6,0x00,
++	0x01,0xff,0xd5,0xa7,0x00,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,0xa8,0x00,
++	0x01,0xff,0xd5,0xa9,0x00,0x10,0x07,0x01,0xff,0xd5,0xaa,0x00,0x01,0xff,0xd5,0xab,
++	0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,0xac,0x00,0x01,0xff,0xd5,0xad,0x00,0x10,
++	0x07,0x01,0xff,0xd5,0xae,0x00,0x01,0xff,0xd5,0xaf,0x00,0xcf,0x86,0xe5,0xf1,0x3e,
++	0xd4,0x70,0xd3,0x38,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,0xb0,0x00,0x01,
++	0xff,0xd5,0xb1,0x00,0x10,0x07,0x01,0xff,0xd5,0xb2,0x00,0x01,0xff,0xd5,0xb3,0x00,
++	0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,0xb4,0x00,0x01,0xff,0xd5,0xb5,0x00,0x10,0x07,
++	0x01,0xff,0xd5,0xb6,0x00,0x01,0xff,0xd5,0xb7,0x00,0xd2,0x1c,0xd1,0x0e,0x10,0x07,
++	0x01,0xff,0xd5,0xb8,0x00,0x01,0xff,0xd5,0xb9,0x00,0x10,0x07,0x01,0xff,0xd5,0xba,
++	0x00,0x01,0xff,0xd5,0xbb,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,0xbc,0x00,0x01,
++	0xff,0xd5,0xbd,0x00,0x10,0x07,0x01,0xff,0xd5,0xbe,0x00,0x01,0xff,0xd5,0xbf,0x00,
++	0xe3,0x70,0x3e,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd6,0x80,0x00,0x01,0xff,
++	0xd6,0x81,0x00,0x10,0x07,0x01,0xff,0xd6,0x82,0x00,0x01,0xff,0xd6,0x83,0x00,0xd1,
++	0x0e,0x10,0x07,0x01,0xff,0xd6,0x84,0x00,0x01,0xff,0xd6,0x85,0x00,0x10,0x07,0x01,
++	0xff,0xd6,0x86,0x00,0x00,0x00,0xe0,0x18,0x3f,0xcf,0x86,0xe5,0xa9,0x3e,0xe4,0x80,
++	0x3e,0xe3,0x5f,0x3e,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
++	0x01,0xff,0xd5,0xa5,0xd6,0x82,0x00,0xe4,0x3e,0x25,0xe3,0xc4,0x1a,0xe2,0xf8,0x80,
++	0xe1,0xc0,0x13,0xd0,0x1e,0xcf,0x86,0xc5,0xe4,0xf0,0x4a,0xe3,0x3b,0x46,0xe2,0xd1,
++	0x43,0xe1,0x04,0x43,0xe0,0xc9,0x42,0xcf,0x86,0xe5,0x8e,0x42,0x64,0x71,0x42,0x0b,
++	0x00,0xcf,0x86,0xe5,0xfa,0x01,0xe4,0xd5,0x55,0xe3,0x76,0x01,0xe2,0x76,0x53,0xd1,
++	0x0c,0xe0,0xd7,0x52,0xcf,0x86,0x65,0x75,0x52,0x04,0x00,0xe0,0x0d,0x01,0xcf,0x86,
++	0xd5,0x0a,0xe4,0xf8,0x52,0x63,0xe7,0x52,0x0a,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,
++	0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0x80,0x00,0x01,0xff,0xe2,0xb4,0x81,0x00,
++	0x10,0x08,0x01,0xff,0xe2,0xb4,0x82,0x00,0x01,0xff,0xe2,0xb4,0x83,0x00,0xd1,0x10,
++	0x10,0x08,0x01,0xff,0xe2,0xb4,0x84,0x00,0x01,0xff,0xe2,0xb4,0x85,0x00,0x10,0x08,
++	0x01,0xff,0xe2,0xb4,0x86,0x00,0x01,0xff,0xe2,0xb4,0x87,0x00,0xd2,0x20,0xd1,0x10,
++	0x10,0x08,0x01,0xff,0xe2,0xb4,0x88,0x00,0x01,0xff,0xe2,0xb4,0x89,0x00,0x10,0x08,
++	0x01,0xff,0xe2,0xb4,0x8a,0x00,0x01,0xff,0xe2,0xb4,0x8b,0x00,0xd1,0x10,0x10,0x08,
++	0x01,0xff,0xe2,0xb4,0x8c,0x00,0x01,0xff,0xe2,0xb4,0x8d,0x00,0x10,0x08,0x01,0xff,
++	0xe2,0xb4,0x8e,0x00,0x01,0xff,0xe2,0xb4,0x8f,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,
++	0x10,0x08,0x01,0xff,0xe2,0xb4,0x90,0x00,0x01,0xff,0xe2,0xb4,0x91,0x00,0x10,0x08,
++	0x01,0xff,0xe2,0xb4,0x92,0x00,0x01,0xff,0xe2,0xb4,0x93,0x00,0xd1,0x10,0x10,0x08,
++	0x01,0xff,0xe2,0xb4,0x94,0x00,0x01,0xff,0xe2,0xb4,0x95,0x00,0x10,0x08,0x01,0xff,
++	0xe2,0xb4,0x96,0x00,0x01,0xff,0xe2,0xb4,0x97,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
++	0x01,0xff,0xe2,0xb4,0x98,0x00,0x01,0xff,0xe2,0xb4,0x99,0x00,0x10,0x08,0x01,0xff,
++	0xe2,0xb4,0x9a,0x00,0x01,0xff,0xe2,0xb4,0x9b,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0xe2,0xb4,0x9c,0x00,0x01,0xff,0xe2,0xb4,0x9d,0x00,0x10,0x08,0x01,0xff,0xe2,0xb4,
++	0x9e,0x00,0x01,0xff,0xe2,0xb4,0x9f,0x00,0xcf,0x86,0xe5,0x2a,0x52,0x94,0x50,0xd3,
++	0x3c,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0xa0,0x00,0x01,0xff,0xe2,
++	0xb4,0xa1,0x00,0x10,0x08,0x01,0xff,0xe2,0xb4,0xa2,0x00,0x01,0xff,0xe2,0xb4,0xa3,
++	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0xa4,0x00,0x01,0xff,0xe2,0xb4,0xa5,
++	0x00,0x10,0x04,0x00,0x00,0x0d,0xff,0xe2,0xb4,0xa7,0x00,0x52,0x04,0x00,0x00,0x91,
++	0x0c,0x10,0x04,0x00,0x00,0x0d,0xff,0xe2,0xb4,0xad,0x00,0x00,0x00,0x01,0x00,0xd2,
++	0x1b,0xe1,0xce,0x52,0xe0,0x7f,0x52,0xcf,0x86,0x95,0x0f,0x94,0x0b,0x93,0x07,0x62,
++	0x64,0x52,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0xd1,0x13,0xe0,0xa5,0x53,0xcf,
++	0x86,0x95,0x0a,0xe4,0x7a,0x53,0x63,0x69,0x53,0x04,0x00,0x04,0x00,0xd0,0x0d,0xcf,
++	0x86,0x95,0x07,0x64,0xf4,0x53,0x08,0x00,0x04,0x00,0xcf,0x86,0x55,0x04,0x04,0x00,
++	0x54,0x04,0x04,0x00,0xd3,0x07,0x62,0x01,0x54,0x04,0x00,0xd2,0x20,0xd1,0x10,0x10,
++	0x08,0x11,0xff,0xe1,0x8f,0xb0,0x00,0x11,0xff,0xe1,0x8f,0xb1,0x00,0x10,0x08,0x11,
++	0xff,0xe1,0x8f,0xb2,0x00,0x11,0xff,0xe1,0x8f,0xb3,0x00,0x91,0x10,0x10,0x08,0x11,
++	0xff,0xe1,0x8f,0xb4,0x00,0x11,0xff,0xe1,0x8f,0xb5,0x00,0x00,0x00,0xd4,0x1c,0xe3,
++	0x92,0x56,0xe2,0xc9,0x55,0xe1,0x8c,0x55,0xe0,0x6d,0x55,0xcf,0x86,0x95,0x0a,0xe4,
++	0x56,0x55,0x63,0x45,0x55,0x04,0x00,0x04,0x00,0xe3,0xd2,0x01,0xe2,0xdd,0x59,0xd1,
++	0x0c,0xe0,0xfe,0x58,0xcf,0x86,0x65,0xd7,0x58,0x0a,0x00,0xe0,0x4e,0x59,0xcf,0x86,
++	0xd5,0xc5,0xd4,0x45,0xd3,0x31,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x12,0xff,0xd0,0xb2,
++	0x00,0x12,0xff,0xd0,0xb4,0x00,0x10,0x07,0x12,0xff,0xd0,0xbe,0x00,0x12,0xff,0xd1,
++	0x81,0x00,0x51,0x07,0x12,0xff,0xd1,0x82,0x00,0x10,0x07,0x12,0xff,0xd1,0x8a,0x00,
++	0x12,0xff,0xd1,0xa3,0x00,0x92,0x10,0x91,0x0c,0x10,0x08,0x12,0xff,0xea,0x99,0x8b,
++	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x14,
++	0xff,0xe1,0x83,0x90,0x00,0x14,0xff,0xe1,0x83,0x91,0x00,0x10,0x08,0x14,0xff,0xe1,
++	0x83,0x92,0x00,0x14,0xff,0xe1,0x83,0x93,0x00,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,
++	0x83,0x94,0x00,0x14,0xff,0xe1,0x83,0x95,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0x96,
++	0x00,0x14,0xff,0xe1,0x83,0x97,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,
++	0x83,0x98,0x00,0x14,0xff,0xe1,0x83,0x99,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0x9a,
++	0x00,0x14,0xff,0xe1,0x83,0x9b,0x00,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,0x83,0x9c,
++	0x00,0x14,0xff,0xe1,0x83,0x9d,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0x9e,0x00,0x14,
++	0xff,0xe1,0x83,0x9f,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x14,
++	0xff,0xe1,0x83,0xa0,0x00,0x14,0xff,0xe1,0x83,0xa1,0x00,0x10,0x08,0x14,0xff,0xe1,
++	0x83,0xa2,0x00,0x14,0xff,0xe1,0x83,0xa3,0x00,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,
++	0x83,0xa4,0x00,0x14,0xff,0xe1,0x83,0xa5,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0xa6,
++	0x00,0x14,0xff,0xe1,0x83,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,
++	0x83,0xa8,0x00,0x14,0xff,0xe1,0x83,0xa9,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0xaa,
++	0x00,0x14,0xff,0xe1,0x83,0xab,0x00,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,0x83,0xac,
++	0x00,0x14,0xff,0xe1,0x83,0xad,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0xae,0x00,0x14,
++	0xff,0xe1,0x83,0xaf,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,
++	0x83,0xb0,0x00,0x14,0xff,0xe1,0x83,0xb1,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0xb2,
++	0x00,0x14,0xff,0xe1,0x83,0xb3,0x00,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,0x83,0xb4,
++	0x00,0x14,0xff,0xe1,0x83,0xb5,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0xb6,0x00,0x14,
++	0xff,0xe1,0x83,0xb7,0x00,0xd2,0x1c,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,0x83,0xb8,
++	0x00,0x14,0xff,0xe1,0x83,0xb9,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0xba,0x00,0x00,
++	0x00,0xd1,0x0c,0x10,0x04,0x00,0x00,0x14,0xff,0xe1,0x83,0xbd,0x00,0x10,0x08,0x14,
++	0xff,0xe1,0x83,0xbe,0x00,0x14,0xff,0xe1,0x83,0xbf,0x00,0xe2,0x9d,0x08,0xe1,0x48,
++	0x04,0xe0,0x1c,0x02,0xcf,0x86,0xe5,0x11,0x01,0xd4,0x84,0xd3,0x40,0xd2,0x20,0xd1,
++	0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0xa5,0x00,0x01,0xff,0x61,0xcc,0xa5,0x00,0x10,
++	0x08,0x01,0xff,0x62,0xcc,0x87,0x00,0x01,0xff,0x62,0xcc,0x87,0x00,0xd1,0x10,0x10,
++	0x08,0x01,0xff,0x62,0xcc,0xa3,0x00,0x01,0xff,0x62,0xcc,0xa3,0x00,0x10,0x08,0x01,
++	0xff,0x62,0xcc,0xb1,0x00,0x01,0xff,0x62,0xcc,0xb1,0x00,0xd2,0x24,0xd1,0x14,0x10,
++	0x0a,0x01,0xff,0x63,0xcc,0xa7,0xcc,0x81,0x00,0x01,0xff,0x63,0xcc,0xa7,0xcc,0x81,
++	0x00,0x10,0x08,0x01,0xff,0x64,0xcc,0x87,0x00,0x01,0xff,0x64,0xcc,0x87,0x00,0xd1,
++	0x10,0x10,0x08,0x01,0xff,0x64,0xcc,0xa3,0x00,0x01,0xff,0x64,0xcc,0xa3,0x00,0x10,
++	0x08,0x01,0xff,0x64,0xcc,0xb1,0x00,0x01,0xff,0x64,0xcc,0xb1,0x00,0xd3,0x48,0xd2,
++	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x64,0xcc,0xa7,0x00,0x01,0xff,0x64,0xcc,0xa7,
++	0x00,0x10,0x08,0x01,0xff,0x64,0xcc,0xad,0x00,0x01,0xff,0x64,0xcc,0xad,0x00,0xd1,
++	0x14,0x10,0x0a,0x01,0xff,0x65,0xcc,0x84,0xcc,0x80,0x00,0x01,0xff,0x65,0xcc,0x84,
++	0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x65,0xcc,0x84,0xcc,0x81,0x00,0x01,0xff,0x65,
++	0xcc,0x84,0xcc,0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0xad,
++	0x00,0x01,0xff,0x65,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,0xb0,0x00,0x01,
++	0xff,0x65,0xcc,0xb0,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x65,0xcc,0xa7,0xcc,0x86,
++	0x00,0x01,0xff,0x65,0xcc,0xa7,0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x66,0xcc,0x87,
++	0x00,0x01,0xff,0x66,0xcc,0x87,0x00,0xd4,0x84,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,
++	0x08,0x01,0xff,0x67,0xcc,0x84,0x00,0x01,0xff,0x67,0xcc,0x84,0x00,0x10,0x08,0x01,
++	0xff,0x68,0xcc,0x87,0x00,0x01,0xff,0x68,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,
++	0xff,0x68,0xcc,0xa3,0x00,0x01,0xff,0x68,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x68,
++	0xcc,0x88,0x00,0x01,0xff,0x68,0xcc,0x88,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
++	0xff,0x68,0xcc,0xa7,0x00,0x01,0xff,0x68,0xcc,0xa7,0x00,0x10,0x08,0x01,0xff,0x68,
++	0xcc,0xae,0x00,0x01,0xff,0x68,0xcc,0xae,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,
++	0xcc,0xb0,0x00,0x01,0xff,0x69,0xcc,0xb0,0x00,0x10,0x0a,0x01,0xff,0x69,0xcc,0x88,
++	0xcc,0x81,0x00,0x01,0xff,0x69,0xcc,0x88,0xcc,0x81,0x00,0xd3,0x40,0xd2,0x20,0xd1,
++	0x10,0x10,0x08,0x01,0xff,0x6b,0xcc,0x81,0x00,0x01,0xff,0x6b,0xcc,0x81,0x00,0x10,
++	0x08,0x01,0xff,0x6b,0xcc,0xa3,0x00,0x01,0xff,0x6b,0xcc,0xa3,0x00,0xd1,0x10,0x10,
++	0x08,0x01,0xff,0x6b,0xcc,0xb1,0x00,0x01,0xff,0x6b,0xcc,0xb1,0x00,0x10,0x08,0x01,
++	0xff,0x6c,0xcc,0xa3,0x00,0x01,0xff,0x6c,0xcc,0xa3,0x00,0xd2,0x24,0xd1,0x14,0x10,
++	0x0a,0x01,0xff,0x6c,0xcc,0xa3,0xcc,0x84,0x00,0x01,0xff,0x6c,0xcc,0xa3,0xcc,0x84,
++	0x00,0x10,0x08,0x01,0xff,0x6c,0xcc,0xb1,0x00,0x01,0xff,0x6c,0xcc,0xb1,0x00,0xd1,
++	0x10,0x10,0x08,0x01,0xff,0x6c,0xcc,0xad,0x00,0x01,0xff,0x6c,0xcc,0xad,0x00,0x10,
++	0x08,0x01,0xff,0x6d,0xcc,0x81,0x00,0x01,0xff,0x6d,0xcc,0x81,0x00,0xcf,0x86,0xe5,
++	0x15,0x01,0xd4,0x88,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x6d,0xcc,
++	0x87,0x00,0x01,0xff,0x6d,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x6d,0xcc,0xa3,0x00,
++	0x01,0xff,0x6d,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,0xcc,0x87,0x00,
++	0x01,0xff,0x6e,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x6e,0xcc,0xa3,0x00,0x01,0xff,
++	0x6e,0xcc,0xa3,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,0xcc,0xb1,0x00,
++	0x01,0xff,0x6e,0xcc,0xb1,0x00,0x10,0x08,0x01,0xff,0x6e,0xcc,0xad,0x00,0x01,0xff,
++	0x6e,0xcc,0xad,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x83,0xcc,0x81,0x00,
++	0x01,0xff,0x6f,0xcc,0x83,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x83,0xcc,
++	0x88,0x00,0x01,0xff,0x6f,0xcc,0x83,0xcc,0x88,0x00,0xd3,0x48,0xd2,0x28,0xd1,0x14,
++	0x10,0x0a,0x01,0xff,0x6f,0xcc,0x84,0xcc,0x80,0x00,0x01,0xff,0x6f,0xcc,0x84,0xcc,
++	0x80,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x84,0xcc,0x81,0x00,0x01,0xff,0x6f,0xcc,
++	0x84,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x70,0xcc,0x81,0x00,0x01,0xff,
++	0x70,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x70,0xcc,0x87,0x00,0x01,0xff,0x70,0xcc,
++	0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x72,0xcc,0x87,0x00,0x01,0xff,
++	0x72,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x72,0xcc,0xa3,0x00,0x01,0xff,0x72,0xcc,
++	0xa3,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x72,0xcc,0xa3,0xcc,0x84,0x00,0x01,0xff,
++	0x72,0xcc,0xa3,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x72,0xcc,0xb1,0x00,0x01,0xff,
++	0x72,0xcc,0xb1,0x00,0xd4,0x8c,0xd3,0x48,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0x73,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x73,0xcc,
++	0xa3,0x00,0x01,0xff,0x73,0xcc,0xa3,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x73,0xcc,
++	0x81,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x81,0xcc,0x87,0x00,0x10,0x0a,0x01,0xff,
++	0x73,0xcc,0x8c,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x8c,0xcc,0x87,0x00,0xd2,0x24,
++	0xd1,0x14,0x10,0x0a,0x01,0xff,0x73,0xcc,0xa3,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,
++	0xa3,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x74,0xcc,0x87,0x00,0x01,0xff,0x74,0xcc,
++	0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x74,0xcc,0xa3,0x00,0x01,0xff,0x74,0xcc,
++	0xa3,0x00,0x10,0x08,0x01,0xff,0x74,0xcc,0xb1,0x00,0x01,0xff,0x74,0xcc,0xb1,0x00,
++	0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x74,0xcc,0xad,0x00,0x01,0xff,
++	0x74,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0xa4,0x00,0x01,0xff,0x75,0xcc,
++	0xa4,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0xb0,0x00,0x01,0xff,0x75,0xcc,
++	0xb0,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0xad,0x00,0x01,0xff,0x75,0xcc,0xad,0x00,
++	0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,0xcc,0x83,0xcc,0x81,0x00,0x01,0xff,
++	0x75,0xcc,0x83,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x84,0xcc,0x88,0x00,
++	0x01,0xff,0x75,0xcc,0x84,0xcc,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x76,0xcc,
++	0x83,0x00,0x01,0xff,0x76,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x76,0xcc,0xa3,0x00,
++	0x01,0xff,0x76,0xcc,0xa3,0x00,0xe0,0x11,0x02,0xcf,0x86,0xd5,0xe2,0xd4,0x80,0xd3,
++	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x80,0x00,0x01,0xff,0x77,
++	0xcc,0x80,0x00,0x10,0x08,0x01,0xff,0x77,0xcc,0x81,0x00,0x01,0xff,0x77,0xcc,0x81,
++	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x88,0x00,0x01,0xff,0x77,0xcc,0x88,
++	0x00,0x10,0x08,0x01,0xff,0x77,0xcc,0x87,0x00,0x01,0xff,0x77,0xcc,0x87,0x00,0xd2,
++	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0xa3,0x00,0x01,0xff,0x77,0xcc,0xa3,
++	0x00,0x10,0x08,0x01,0xff,0x78,0xcc,0x87,0x00,0x01,0xff,0x78,0xcc,0x87,0x00,0xd1,
++	0x10,0x10,0x08,0x01,0xff,0x78,0xcc,0x88,0x00,0x01,0xff,0x78,0xcc,0x88,0x00,0x10,
++	0x08,0x01,0xff,0x79,0xcc,0x87,0x00,0x01,0xff,0x79,0xcc,0x87,0x00,0xd3,0x33,0xd2,
++	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x7a,0xcc,0x82,0x00,0x01,0xff,0x7a,0xcc,0x82,
++	0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0xa3,0x00,0x01,0xff,0x7a,0xcc,0xa3,0x00,0xe1,
++	0xc4,0x58,0x10,0x08,0x01,0xff,0x7a,0xcc,0xb1,0x00,0x01,0xff,0x7a,0xcc,0xb1,0x00,
++	0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x8a,0x00,0x01,0xff,0x79,0xcc,
++	0x8a,0x00,0x10,0x08,0x01,0xff,0x61,0xca,0xbe,0x00,0x02,0xff,0x73,0xcc,0x87,0x00,
++	0x51,0x04,0x0a,0x00,0x10,0x07,0x0a,0xff,0x73,0x73,0x00,0x0a,0x00,0xd4,0x98,0xd3,
++	0x48,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0xa3,0x00,0x01,0xff,0x61,
++	0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x61,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x89,
++	0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x61,0xcc,0x82,0xcc,0x81,0x00,0x01,0xff,0x61,
++	0xcc,0x82,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0x82,0xcc,0x80,0x00,0x01,
++	0xff,0x61,0xcc,0x82,0xcc,0x80,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x61,
++	0xcc,0x82,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x89,0x00,0x10,0x0a,0x01,
++	0xff,0x61,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x83,0x00,0xd1,
++	0x14,0x10,0x0a,0x01,0xff,0x61,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,0x61,0xcc,0xa3,
++	0xcc,0x82,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0x86,0xcc,0x81,0x00,0x01,0xff,0x61,
++	0xcc,0x86,0xcc,0x81,0x00,0xd3,0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x61,
++	0xcc,0x86,0xcc,0x80,0x00,0x01,0xff,0x61,0xcc,0x86,0xcc,0x80,0x00,0x10,0x0a,0x01,
++	0xff,0x61,0xcc,0x86,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x86,0xcc,0x89,0x00,0xd1,
++	0x14,0x10,0x0a,0x01,0xff,0x61,0xcc,0x86,0xcc,0x83,0x00,0x01,0xff,0x61,0xcc,0x86,
++	0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0xa3,0xcc,0x86,0x00,0x01,0xff,0x61,
++	0xcc,0xa3,0xcc,0x86,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0xa3,
++	0x00,0x01,0xff,0x65,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,0x89,0x00,0x01,
++	0xff,0x65,0xcc,0x89,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0x83,0x00,0x01,
++	0xff,0x65,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x65,0xcc,0x82,0xcc,0x81,0x00,0x01,
++	0xff,0x65,0xcc,0x82,0xcc,0x81,0x00,0xcf,0x86,0xe5,0x31,0x01,0xd4,0x90,0xd3,0x50,
++	0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x65,0xcc,0x82,0xcc,0x80,0x00,0x01,0xff,
++	0x65,0xcc,0x82,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x65,0xcc,0x82,0xcc,0x89,0x00,
++	0x01,0xff,0x65,0xcc,0x82,0xcc,0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x65,0xcc,
++	0x82,0xcc,0x83,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,
++	0x65,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,0x65,0xcc,0xa3,0xcc,0x82,0x00,0xd2,0x20,
++	0xd1,0x10,0x10,0x08,0x01,0xff,0x69,0xcc,0x89,0x00,0x01,0xff,0x69,0xcc,0x89,0x00,
++	0x10,0x08,0x01,0xff,0x69,0xcc,0xa3,0x00,0x01,0xff,0x69,0xcc,0xa3,0x00,0xd1,0x10,
++	0x10,0x08,0x01,0xff,0x6f,0xcc,0xa3,0x00,0x01,0xff,0x6f,0xcc,0xa3,0x00,0x10,0x08,
++	0x01,0xff,0x6f,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x89,0x00,0xd3,0x50,0xd2,0x28,
++	0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x81,0x00,0x01,0xff,0x6f,0xcc,
++	0x82,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x80,0x00,0x01,0xff,
++	0x6f,0xcc,0x82,0xcc,0x80,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x82,0xcc,
++	0x89,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x89,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,
++	0x82,0xcc,0x83,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x83,0x00,0xd2,0x28,0xd1,0x14,
++	0x10,0x0a,0x01,0xff,0x6f,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,0x6f,0xcc,0xa3,0xcc,
++	0x82,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x81,0x00,0x01,0xff,0x6f,0xcc,
++	0x9b,0xcc,0x81,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x80,0x00,
++	0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,0xcc,
++	0x89,0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x89,0x00,0xd4,0x98,0xd3,0x48,0xd2,0x28,
++	0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x83,0x00,0x01,0xff,0x6f,0xcc,
++	0x9b,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0xa3,0x00,0x01,0xff,
++	0x6f,0xcc,0x9b,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0xa3,0x00,
++	0x01,0xff,0x75,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0x89,0x00,0x01,0xff,
++	0x75,0xcc,0x89,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,0xcc,0x9b,0xcc,
++	0x81,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,
++	0x9b,0xcc,0x80,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x80,0x00,0xd1,0x14,0x10,0x0a,
++	0x01,0xff,0x75,0xcc,0x9b,0xcc,0x89,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x89,0x00,
++	0x10,0x0a,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x83,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,
++	0x83,0x00,0xd3,0x44,0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,0xcc,0x9b,0xcc,
++	0xa3,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x79,0xcc,
++	0x80,0x00,0x01,0xff,0x79,0xcc,0x80,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x79,0xcc,
++	0xa3,0x00,0x01,0xff,0x79,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x79,0xcc,0x89,0x00,
++	0x01,0xff,0x79,0xcc,0x89,0x00,0xd2,0x1c,0xd1,0x10,0x10,0x08,0x01,0xff,0x79,0xcc,
++	0x83,0x00,0x01,0xff,0x79,0xcc,0x83,0x00,0x10,0x08,0x0a,0xff,0xe1,0xbb,0xbb,0x00,
++	0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xe1,0xbb,0xbd,0x00,0x0a,0x00,0x10,0x08,
++	0x0a,0xff,0xe1,0xbb,0xbf,0x00,0x0a,0x00,0xe1,0xbf,0x02,0xe0,0xa1,0x01,0xcf,0x86,
++	0xd5,0xc6,0xd4,0x6c,0xd3,0x18,0xe2,0xc0,0x58,0xe1,0xa9,0x58,0x10,0x09,0x01,0xff,
++	0xce,0xb1,0xcc,0x93,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0x00,0xd2,0x28,0xd1,0x12,
++	0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x93,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0x00,
++	0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xb1,0xcc,
++	0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x81,
++	0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xce,0xb1,
++	0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcd,0x82,0x00,0xd3,0x18,
++	0xe2,0xfc,0x58,0xe1,0xe5,0x58,0x10,0x09,0x01,0xff,0xce,0xb5,0xcc,0x93,0x00,0x01,
++	0xff,0xce,0xb5,0xcc,0x94,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb5,
++	0xcc,0x93,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb5,
++	0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0xcc,0x80,0x00,0x91,0x16,
++	0x10,0x0b,0x01,0xff,0xce,0xb5,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0xb5,0xcc,
++	0x94,0xcc,0x81,0x00,0x00,0x00,0xd4,0x6c,0xd3,0x18,0xe2,0x26,0x59,0xe1,0x0f,0x59,
++	0x10,0x09,0x01,0xff,0xce,0xb7,0xcc,0x93,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0x00,
++	0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb7,0xcc,0x93,0x00,0x01,0xff,0xce,
++	0xb7,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x80,0x00,0x01,
++	0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb7,
++	0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,
++	0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,
++	0x82,0x00,0xd3,0x18,0xe2,0x62,0x59,0xe1,0x4b,0x59,0x10,0x09,0x01,0xff,0xce,0xb9,
++	0xcc,0x93,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,
++	0x01,0xff,0xce,0xb9,0xcc,0x93,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0x00,0x10,0x0b,
++	0x01,0xff,0xce,0xb9,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0xcc,
++	0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x93,0xcc,0x81,0x00,0x01,
++	0xff,0xce,0xb9,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x93,
++	0xcd,0x82,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0xcd,0x82,0x00,0xcf,0x86,0xd5,0xac,
++	0xd4,0x5a,0xd3,0x18,0xe2,0x9f,0x59,0xe1,0x88,0x59,0x10,0x09,0x01,0xff,0xce,0xbf,
++	0xcc,0x93,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,
++	0x01,0xff,0xce,0xbf,0xcc,0x93,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,0x00,0x10,0x0b,
++	0x01,0xff,0xce,0xbf,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,0xcc,
++	0x80,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xce,0xbf,0xcc,0x93,0xcc,0x81,0x00,0x01,
++	0xff,0xce,0xbf,0xcc,0x94,0xcc,0x81,0x00,0x00,0x00,0xd3,0x18,0xe2,0xc9,0x59,0xe1,
++	0xb2,0x59,0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x93,0x00,0x01,0xff,0xcf,0x85,0xcc,
++	0x94,0x00,0xd2,0x1c,0xd1,0x0d,0x10,0x04,0x00,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,
++	0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x0f,
++	0x10,0x04,0x00,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcc,0x81,0x00,0x10,0x04,0x00,
++	0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcd,0x82,0x00,0xe4,0x85,0x5a,0xd3,0x18,0xe2,
++	0x04,0x5a,0xe1,0xed,0x59,0x10,0x09,0x01,0xff,0xcf,0x89,0xcc,0x93,0x00,0x01,0xff,
++	0xcf,0x89,0xcc,0x94,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xcf,0x89,0xcc,
++	0x93,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,
++	0x93,0xcc,0x80,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,
++	0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,
++	0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,
++	0xcf,0x89,0xcc,0x94,0xcd,0x82,0x00,0xe0,0xd9,0x02,0xcf,0x86,0xe5,0x91,0x01,0xd4,
++	0xc8,0xd3,0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,0xce,
++	0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,
++	0xb1,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x80,
++	0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x81,0xce,
++	0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x81,0xce,0xb9,0x00,0x10,0x0d,0x01,
++	0xff,0xce,0xb1,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,
++	0xcd,0x82,0xce,0xb9,0x00,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,
++	0x93,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xce,0xb9,0x00,0x10,0x0d,0x01,
++	0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,
++	0xcc,0x80,0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,
++	0x81,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x81,0xce,0xb9,0x00,0x10,
++	0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,
++	0xcc,0x94,0xcd,0x82,0xce,0xb9,0x00,0xd3,0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,
++	0xff,0xce,0xb7,0xcc,0x93,0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xce,0xb9,
++	0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,
++	0xce,0xb7,0xcc,0x94,0xcc,0x80,0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,
++	0xb7,0xcc,0x93,0xcc,0x81,0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x81,
++	0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,
++	0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x30,0xd1,0x16,0x10,
++	0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,
++	0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,
++	0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,
++	0xff,0xce,0xb7,0xcc,0x93,0xcc,0x81,0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,
++	0xcc,0x81,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,0x82,0xce,
++	0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x82,0xce,0xb9,0x00,0xd4,0xc8,0xd3,
++	0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xce,0xb9,0x00,
++	0x01,0xff,0xcf,0x89,0xcc,0x94,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,
++	0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x80,0xce,0xb9,
++	0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x81,0xce,0xb9,0x00,
++	0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x81,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xcf,
++	0x89,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcd,0x82,
++	0xce,0xb9,0x00,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xce,
++	0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xcf,
++	0x89,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x80,
++	0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x81,0xce,
++	0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x81,0xce,0xb9,0x00,0x10,0x0d,0x01,
++	0xff,0xcf,0x89,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,
++	0xcd,0x82,0xce,0xb9,0x00,0xd3,0x49,0xd2,0x26,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,
++	0xb1,0xcc,0x86,0x00,0x01,0xff,0xce,0xb1,0xcc,0x84,0x00,0x10,0x0b,0x01,0xff,0xce,
++	0xb1,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xce,0xb9,0x00,0xd1,0x0f,0x10,
++	0x0b,0x01,0xff,0xce,0xb1,0xcc,0x81,0xce,0xb9,0x00,0x00,0x00,0x10,0x09,0x01,0xff,
++	0xce,0xb1,0xcd,0x82,0x00,0x01,0xff,0xce,0xb1,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x24,
++	0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x86,0x00,0x01,0xff,0xce,0xb1,0xcc,
++	0x84,0x00,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x80,0x00,0x01,0xff,0xce,0xb1,0xcc,
++	0x81,0x00,0xe1,0xa5,0x5a,0x10,0x09,0x01,0xff,0xce,0xb1,0xce,0xb9,0x00,0x01,0x00,
++	0xcf,0x86,0xd5,0xbd,0xd4,0x7e,0xd3,0x44,0xd2,0x21,0xd1,0x0d,0x10,0x04,0x01,0x00,
++	0x01,0xff,0xc2,0xa8,0xcd,0x82,0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x80,0xce,
++	0xb9,0x00,0x01,0xff,0xce,0xb7,0xce,0xb9,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xce,
++	0xb7,0xcc,0x81,0xce,0xb9,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xce,0xb7,0xcd,0x82,
++	0x00,0x01,0xff,0xce,0xb7,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,
++	0x01,0xff,0xce,0xb5,0xcc,0x80,0x00,0x01,0xff,0xce,0xb5,0xcc,0x81,0x00,0x10,0x09,
++	0x01,0xff,0xce,0xb7,0xcc,0x80,0x00,0x01,0xff,0xce,0xb7,0xcc,0x81,0x00,0xe1,0xb4,
++	0x5a,0x10,0x09,0x01,0xff,0xce,0xb7,0xce,0xb9,0x00,0x01,0xff,0xe1,0xbe,0xbf,0xcc,
++	0x80,0x00,0xd3,0x18,0xe2,0xda,0x5a,0xe1,0xc3,0x5a,0x10,0x09,0x01,0xff,0xce,0xb9,
++	0xcc,0x86,0x00,0x01,0xff,0xce,0xb9,0xcc,0x84,0x00,0xe2,0xfe,0x5a,0xd1,0x12,0x10,
++	0x09,0x01,0xff,0xce,0xb9,0xcc,0x86,0x00,0x01,0xff,0xce,0xb9,0xcc,0x84,0x00,0x10,
++	0x09,0x01,0xff,0xce,0xb9,0xcc,0x80,0x00,0x01,0xff,0xce,0xb9,0xcc,0x81,0x00,0xd4,
++	0x51,0xd3,0x18,0xe2,0x21,0x5b,0xe1,0x0a,0x5b,0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,
++	0x86,0x00,0x01,0xff,0xcf,0x85,0xcc,0x84,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,
++	0xff,0xcf,0x85,0xcc,0x86,0x00,0x01,0xff,0xcf,0x85,0xcc,0x84,0x00,0x10,0x09,0x01,
++	0xff,0xcf,0x85,0xcc,0x80,0x00,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,0xe1,0x41,0x5b,
++	0x10,0x09,0x01,0xff,0xcf,0x81,0xcc,0x94,0x00,0x01,0xff,0xc2,0xa8,0xcc,0x80,0x00,
++	0xd3,0x3b,0xd2,0x18,0x51,0x04,0x00,0x00,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x80,
++	0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xce,0xb9,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,
++	0xcf,0x89,0xcc,0x81,0xce,0xb9,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xcf,0x89,0xcd,
++	0x82,0x00,0x01,0xff,0xcf,0x89,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x24,0xd1,0x12,0x10,
++	0x09,0x01,0xff,0xce,0xbf,0xcc,0x80,0x00,0x01,0xff,0xce,0xbf,0xcc,0x81,0x00,0x10,
++	0x09,0x01,0xff,0xcf,0x89,0xcc,0x80,0x00,0x01,0xff,0xcf,0x89,0xcc,0x81,0x00,0xe1,
++	0x4b,0x5b,0x10,0x09,0x01,0xff,0xcf,0x89,0xce,0xb9,0x00,0x01,0xff,0xc2,0xb4,0x00,
++	0xe0,0xa2,0x67,0xcf,0x86,0xe5,0x24,0x02,0xe4,0x26,0x01,0xe3,0x1b,0x5e,0xd2,0x2b,
++	0xe1,0xf5,0x5b,0xe0,0x7a,0x5b,0xcf,0x86,0xe5,0x5f,0x5b,0x94,0x1c,0x93,0x18,0x92,
++	0x14,0x91,0x10,0x10,0x08,0x01,0xff,0xe2,0x80,0x82,0x00,0x01,0xff,0xe2,0x80,0x83,
++	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd1,0xd6,0xd0,0x46,0xcf,0x86,0x55,
++	0x04,0x01,0x00,0xd4,0x29,0xd3,0x13,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,
++	0x07,0x01,0xff,0xcf,0x89,0x00,0x01,0x00,0x92,0x12,0x51,0x04,0x01,0x00,0x10,0x06,
++	0x01,0xff,0x6b,0x00,0x01,0xff,0x61,0xcc,0x8a,0x00,0x01,0x00,0xe3,0xba,0x5c,0x92,
++	0x10,0x51,0x04,0x01,0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0x8e,0x00,0x01,0x00,0x01,
++	0x00,0xcf,0x86,0xd5,0x0a,0xe4,0xd7,0x5c,0x63,0xc2,0x5c,0x06,0x00,0x94,0x80,0xd3,
++	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x85,0xb0,0x00,0x01,0xff,0xe2,
++	0x85,0xb1,0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0xb2,0x00,0x01,0xff,0xe2,0x85,0xb3,
++	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x85,0xb4,0x00,0x01,0xff,0xe2,0x85,0xb5,
++	0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0xb6,0x00,0x01,0xff,0xe2,0x85,0xb7,0x00,0xd2,
++	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x85,0xb8,0x00,0x01,0xff,0xe2,0x85,0xb9,
++	0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0xba,0x00,0x01,0xff,0xe2,0x85,0xbb,0x00,0xd1,
++	0x10,0x10,0x08,0x01,0xff,0xe2,0x85,0xbc,0x00,0x01,0xff,0xe2,0x85,0xbd,0x00,0x10,
++	0x08,0x01,0xff,0xe2,0x85,0xbe,0x00,0x01,0xff,0xe2,0x85,0xbf,0x00,0x01,0x00,0xe0,
++	0xc9,0x5c,0xcf,0x86,0xe5,0xa8,0x5c,0xe4,0x87,0x5c,0xe3,0x76,0x5c,0xe2,0x69,0x5c,
++	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x04,0xff,0xe2,0x86,0x84,0x00,0xe3,0xb8,
++	0x60,0xe2,0x85,0x60,0xd1,0x0c,0xe0,0x32,0x60,0xcf,0x86,0x65,0x13,0x60,0x01,0x00,
++	0xd0,0x62,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x18,0x52,0x04,
++	0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x08,0x01,0xff,0xe2,0x93,0x90,0x00,0x01,0xff,
++	0xe2,0x93,0x91,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x93,0x92,0x00,
++	0x01,0xff,0xe2,0x93,0x93,0x00,0x10,0x08,0x01,0xff,0xe2,0x93,0x94,0x00,0x01,0xff,
++	0xe2,0x93,0x95,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x93,0x96,0x00,0x01,0xff,
++	0xe2,0x93,0x97,0x00,0x10,0x08,0x01,0xff,0xe2,0x93,0x98,0x00,0x01,0xff,0xe2,0x93,
++	0x99,0x00,0xcf,0x86,0xe5,0xec,0x5f,0x94,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,
++	0x08,0x01,0xff,0xe2,0x93,0x9a,0x00,0x01,0xff,0xe2,0x93,0x9b,0x00,0x10,0x08,0x01,
++	0xff,0xe2,0x93,0x9c,0x00,0x01,0xff,0xe2,0x93,0x9d,0x00,0xd1,0x10,0x10,0x08,0x01,
++	0xff,0xe2,0x93,0x9e,0x00,0x01,0xff,0xe2,0x93,0x9f,0x00,0x10,0x08,0x01,0xff,0xe2,
++	0x93,0xa0,0x00,0x01,0xff,0xe2,0x93,0xa1,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
++	0xff,0xe2,0x93,0xa2,0x00,0x01,0xff,0xe2,0x93,0xa3,0x00,0x10,0x08,0x01,0xff,0xe2,
++	0x93,0xa4,0x00,0x01,0xff,0xe2,0x93,0xa5,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,
++	0x93,0xa6,0x00,0x01,0xff,0xe2,0x93,0xa7,0x00,0x10,0x08,0x01,0xff,0xe2,0x93,0xa8,
++	0x00,0x01,0xff,0xe2,0x93,0xa9,0x00,0x01,0x00,0xd4,0x0c,0xe3,0xc8,0x61,0xe2,0xc1,
++	0x61,0xcf,0x06,0x04,0x00,0xe3,0xa1,0x64,0xe2,0x94,0x63,0xe1,0x2e,0x02,0xe0,0x84,
++	0x01,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
++	0x08,0xff,0xe2,0xb0,0xb0,0x00,0x08,0xff,0xe2,0xb0,0xb1,0x00,0x10,0x08,0x08,0xff,
++	0xe2,0xb0,0xb2,0x00,0x08,0xff,0xe2,0xb0,0xb3,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,
++	0xe2,0xb0,0xb4,0x00,0x08,0xff,0xe2,0xb0,0xb5,0x00,0x10,0x08,0x08,0xff,0xe2,0xb0,
++	0xb6,0x00,0x08,0xff,0xe2,0xb0,0xb7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,
++	0xe2,0xb0,0xb8,0x00,0x08,0xff,0xe2,0xb0,0xb9,0x00,0x10,0x08,0x08,0xff,0xe2,0xb0,
++	0xba,0x00,0x08,0xff,0xe2,0xb0,0xbb,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb0,
++	0xbc,0x00,0x08,0xff,0xe2,0xb0,0xbd,0x00,0x10,0x08,0x08,0xff,0xe2,0xb0,0xbe,0x00,
++	0x08,0xff,0xe2,0xb0,0xbf,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,
++	0xe2,0xb1,0x80,0x00,0x08,0xff,0xe2,0xb1,0x81,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,
++	0x82,0x00,0x08,0xff,0xe2,0xb1,0x83,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb1,
++	0x84,0x00,0x08,0xff,0xe2,0xb1,0x85,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0x86,0x00,
++	0x08,0xff,0xe2,0xb1,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb1,
++	0x88,0x00,0x08,0xff,0xe2,0xb1,0x89,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0x8a,0x00,
++	0x08,0xff,0xe2,0xb1,0x8b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb1,0x8c,0x00,
++	0x08,0xff,0xe2,0xb1,0x8d,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0x8e,0x00,0x08,0xff,
++	0xe2,0xb1,0x8f,0x00,0x94,0x7c,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,
++	0xe2,0xb1,0x90,0x00,0x08,0xff,0xe2,0xb1,0x91,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,
++	0x92,0x00,0x08,0xff,0xe2,0xb1,0x93,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb1,
++	0x94,0x00,0x08,0xff,0xe2,0xb1,0x95,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0x96,0x00,
++	0x08,0xff,0xe2,0xb1,0x97,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb1,
++	0x98,0x00,0x08,0xff,0xe2,0xb1,0x99,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0x9a,0x00,
++	0x08,0xff,0xe2,0xb1,0x9b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb1,0x9c,0x00,
++	0x08,0xff,0xe2,0xb1,0x9d,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0x9e,0x00,0x00,0x00,
++	0x08,0x00,0xcf,0x86,0xd5,0x07,0x64,0x84,0x61,0x08,0x00,0xd4,0x63,0xd3,0x32,0xd2,
++	0x1b,0xd1,0x0c,0x10,0x08,0x09,0xff,0xe2,0xb1,0xa1,0x00,0x09,0x00,0x10,0x07,0x09,
++	0xff,0xc9,0xab,0x00,0x09,0xff,0xe1,0xb5,0xbd,0x00,0xd1,0x0b,0x10,0x07,0x09,0xff,
++	0xc9,0xbd,0x00,0x09,0x00,0x10,0x04,0x09,0x00,0x09,0xff,0xe2,0xb1,0xa8,0x00,0xd2,
++	0x18,0xd1,0x0c,0x10,0x04,0x09,0x00,0x09,0xff,0xe2,0xb1,0xaa,0x00,0x10,0x04,0x09,
++	0x00,0x09,0xff,0xe2,0xb1,0xac,0x00,0xd1,0x0b,0x10,0x04,0x09,0x00,0x0a,0xff,0xc9,
++	0x91,0x00,0x10,0x07,0x0a,0xff,0xc9,0xb1,0x00,0x0a,0xff,0xc9,0x90,0x00,0xd3,0x27,
++	0xd2,0x17,0xd1,0x0b,0x10,0x07,0x0b,0xff,0xc9,0x92,0x00,0x0a,0x00,0x10,0x08,0x0a,
++	0xff,0xe2,0xb1,0xb3,0x00,0x0a,0x00,0x91,0x0c,0x10,0x04,0x09,0x00,0x09,0xff,0xe2,
++	0xb1,0xb6,0x00,0x09,0x00,0x52,0x04,0x0a,0x00,0x51,0x04,0x0a,0x00,0x10,0x07,0x0b,
++	0xff,0xc8,0xbf,0x00,0x0b,0xff,0xc9,0x80,0x00,0xe0,0x83,0x01,0xcf,0x86,0xd5,0xc0,
++	0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0x81,0x00,
++	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x83,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,
++	0x08,0xff,0xe2,0xb2,0x85,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x87,0x00,
++	0x08,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0x89,0x00,0x08,0x00,
++	0x10,0x08,0x08,0xff,0xe2,0xb2,0x8b,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
++	0xe2,0xb2,0x8d,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x8f,0x00,0x08,0x00,
++	0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0x91,0x00,0x08,0x00,
++	0x10,0x08,0x08,0xff,0xe2,0xb2,0x93,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
++	0xe2,0xb2,0x95,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x97,0x00,0x08,0x00,
++	0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0x99,0x00,0x08,0x00,0x10,0x08,
++	0x08,0xff,0xe2,0xb2,0x9b,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,
++	0x9d,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x9f,0x00,0x08,0x00,0xd4,0x60,
++	0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xa1,0x00,0x08,0x00,
++	0x10,0x08,0x08,0xff,0xe2,0xb2,0xa3,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
++	0xe2,0xb2,0xa5,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xa7,0x00,0x08,0x00,
++	0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xa9,0x00,0x08,0x00,0x10,0x08,
++	0x08,0xff,0xe2,0xb2,0xab,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,
++	0xad,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xaf,0x00,0x08,0x00,0xd3,0x30,
++	0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xb1,0x00,0x08,0x00,0x10,0x08,
++	0x08,0xff,0xe2,0xb2,0xb3,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,
++	0xb5,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xb7,0x00,0x08,0x00,0xd2,0x18,
++	0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xb9,0x00,0x08,0x00,0x10,0x08,0x08,0xff,
++	0xe2,0xb2,0xbb,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xbd,0x00,
++	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xbf,0x00,0x08,0x00,0xcf,0x86,0xd5,0xc0,
++	0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0x81,0x00,
++	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x83,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,
++	0x08,0xff,0xe2,0xb3,0x85,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x87,0x00,
++	0x08,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0x89,0x00,0x08,0x00,
++	0x10,0x08,0x08,0xff,0xe2,0xb3,0x8b,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
++	0xe2,0xb3,0x8d,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x8f,0x00,0x08,0x00,
++	0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0x91,0x00,0x08,0x00,
++	0x10,0x08,0x08,0xff,0xe2,0xb3,0x93,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
++	0xe2,0xb3,0x95,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x97,0x00,0x08,0x00,
++	0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0x99,0x00,0x08,0x00,0x10,0x08,
++	0x08,0xff,0xe2,0xb3,0x9b,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,
++	0x9d,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x9f,0x00,0x08,0x00,0xd4,0x3b,
++	0xd3,0x1c,0x92,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0xa1,0x00,0x08,0x00,
++	0x10,0x08,0x08,0xff,0xe2,0xb3,0xa3,0x00,0x08,0x00,0x08,0x00,0xd2,0x10,0x51,0x04,
++	0x08,0x00,0x10,0x04,0x08,0x00,0x0b,0xff,0xe2,0xb3,0xac,0x00,0xe1,0xd0,0x5e,0x10,
++	0x04,0x0b,0x00,0x0b,0xff,0xe2,0xb3,0xae,0x00,0xe3,0xd5,0x5e,0x92,0x10,0x51,0x04,
++	0x0b,0xe6,0x10,0x08,0x0d,0xff,0xe2,0xb3,0xb3,0x00,0x0d,0x00,0x00,0x00,0xe2,0x98,
++	0x08,0xd1,0x0b,0xe0,0x8d,0x66,0xcf,0x86,0xcf,0x06,0x01,0x00,0xe0,0xe1,0x6b,0xcf,
++	0x86,0xe5,0xa7,0x05,0xd4,0x06,0xcf,0x06,0x04,0x00,0xd3,0x0c,0xe2,0x74,0x67,0xe1,
++	0x0b,0x67,0xcf,0x06,0x04,0x00,0xe2,0xdb,0x01,0xe1,0x26,0x01,0xd0,0x09,0xcf,0x86,
++	0x65,0x70,0x67,0x0a,0x00,0xcf,0x86,0xd5,0xc0,0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,
++	0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x81,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,
++	0x99,0x83,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x85,0x00,0x0a,
++	0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0x87,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,
++	0x08,0x0a,0xff,0xea,0x99,0x89,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0x8b,
++	0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x8d,0x00,0x0a,0x00,0x10,
++	0x08,0x0a,0xff,0xea,0x99,0x8f,0x00,0x0a,0x00,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,
++	0x08,0x0a,0xff,0xea,0x99,0x91,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0x93,
++	0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x95,0x00,0x0a,0x00,0x10,
++	0x08,0x0a,0xff,0xea,0x99,0x97,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,
++	0xff,0xea,0x99,0x99,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0x9b,0x00,0x0a,
++	0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x9d,0x00,0x0a,0x00,0x10,0x08,0x0a,
++	0xff,0xea,0x99,0x9f,0x00,0x0a,0x00,0xe4,0xd9,0x66,0xd3,0x30,0xd2,0x18,0xd1,0x0c,
++	0x10,0x08,0x0c,0xff,0xea,0x99,0xa1,0x00,0x0c,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,
++	0xa3,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0xa5,0x00,0x0a,0x00,
++	0x10,0x08,0x0a,0xff,0xea,0x99,0xa7,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,
++	0x0a,0xff,0xea,0x99,0xa9,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0xab,0x00,
++	0x0a,0x00,0xe1,0x88,0x66,0x10,0x08,0x0a,0xff,0xea,0x99,0xad,0x00,0x0a,0x00,0xe0,
++	0xb1,0x66,0xcf,0x86,0x95,0xab,0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,
++	0x0a,0xff,0xea,0x9a,0x81,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9a,0x83,0x00,
++	0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9a,0x85,0x00,0x0a,0x00,0x10,0x08,
++	0x0a,0xff,0xea,0x9a,0x87,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,
++	0xea,0x9a,0x89,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9a,0x8b,0x00,0x0a,0x00,
++	0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9a,0x8d,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,
++	0xea,0x9a,0x8f,0x00,0x0a,0x00,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,
++	0xea,0x9a,0x91,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9a,0x93,0x00,0x0a,0x00,
++	0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9a,0x95,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,
++	0xea,0x9a,0x97,0x00,0x0a,0x00,0xe2,0x0e,0x66,0xd1,0x0c,0x10,0x08,0x10,0xff,0xea,
++	0x9a,0x99,0x00,0x10,0x00,0x10,0x08,0x10,0xff,0xea,0x9a,0x9b,0x00,0x10,0x00,0x0b,
++	0x00,0xe1,0x10,0x02,0xd0,0xb9,0xcf,0x86,0xd5,0x07,0x64,0x1a,0x66,0x08,0x00,0xd4,
++	0x58,0xd3,0x28,0xd2,0x10,0x51,0x04,0x09,0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xa3,
++	0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9c,0xa5,0x00,0x0a,0x00,0x10,
++	0x08,0x0a,0xff,0xea,0x9c,0xa7,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,
++	0xff,0xea,0x9c,0xa9,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xab,0x00,0x0a,
++	0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9c,0xad,0x00,0x0a,0x00,0x10,0x08,0x0a,
++	0xff,0xea,0x9c,0xaf,0x00,0x0a,0x00,0xd3,0x28,0xd2,0x10,0x51,0x04,0x0a,0x00,0x10,
++	0x08,0x0a,0xff,0xea,0x9c,0xb3,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,
++	0x9c,0xb5,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xb7,0x00,0x0a,0x00,0xd2,
++	0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9c,0xb9,0x00,0x0a,0x00,0x10,0x08,0x0a,
++	0xff,0xea,0x9c,0xbb,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9c,0xbd,
++	0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xbf,0x00,0x0a,0x00,0xcf,0x86,0xd5,
++	0xc0,0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0x81,
++	0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x83,0x00,0x0a,0x00,0xd1,0x0c,0x10,
++	0x08,0x0a,0xff,0xea,0x9d,0x85,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x87,
++	0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0x89,0x00,0x0a,
++	0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x8b,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,
++	0xff,0xea,0x9d,0x8d,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x8f,0x00,0x0a,
++	0x00,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0x91,0x00,0x0a,
++	0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x93,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,
++	0xff,0xea,0x9d,0x95,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x97,0x00,0x0a,
++	0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0x99,0x00,0x0a,0x00,0x10,
++	0x08,0x0a,0xff,0xea,0x9d,0x9b,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,
++	0x9d,0x9d,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x9f,0x00,0x0a,0x00,0xd4,
++	0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0xa1,0x00,0x0a,
++	0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xa3,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,
++	0xff,0xea,0x9d,0xa5,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xa7,0x00,0x0a,
++	0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0xa9,0x00,0x0a,0x00,0x10,
++	0x08,0x0a,0xff,0xea,0x9d,0xab,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,
++	0x9d,0xad,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xaf,0x00,0x0a,0x00,0x53,
++	0x04,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x04,0x0a,0x00,0x0a,0xff,0xea,0x9d,0xba,
++	0x00,0x10,0x04,0x0a,0x00,0x0a,0xff,0xea,0x9d,0xbc,0x00,0xd1,0x0c,0x10,0x04,0x0a,
++	0x00,0x0a,0xff,0xe1,0xb5,0xb9,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xbf,0x00,0x0a,
++	0x00,0xe0,0x71,0x01,0xcf,0x86,0xd5,0xa6,0xd4,0x4e,0xd3,0x30,0xd2,0x18,0xd1,0x0c,
++	0x10,0x08,0x0a,0xff,0xea,0x9e,0x81,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9e,
++	0x83,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9e,0x85,0x00,0x0a,0x00,
++	0x10,0x08,0x0a,0xff,0xea,0x9e,0x87,0x00,0x0a,0x00,0xd2,0x10,0x51,0x04,0x0a,0x00,
++	0x10,0x04,0x0a,0x00,0x0a,0xff,0xea,0x9e,0x8c,0x00,0xe1,0x16,0x64,0x10,0x04,0x0a,
++	0x00,0x0c,0xff,0xc9,0xa5,0x00,0xd3,0x28,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0c,0xff,
++	0xea,0x9e,0x91,0x00,0x0c,0x00,0x10,0x08,0x0d,0xff,0xea,0x9e,0x93,0x00,0x0d,0x00,
++	0x51,0x04,0x10,0x00,0x10,0x08,0x10,0xff,0xea,0x9e,0x97,0x00,0x10,0x00,0xd2,0x18,
++	0xd1,0x0c,0x10,0x08,0x10,0xff,0xea,0x9e,0x99,0x00,0x10,0x00,0x10,0x08,0x10,0xff,
++	0xea,0x9e,0x9b,0x00,0x10,0x00,0xd1,0x0c,0x10,0x08,0x10,0xff,0xea,0x9e,0x9d,0x00,
++	0x10,0x00,0x10,0x08,0x10,0xff,0xea,0x9e,0x9f,0x00,0x10,0x00,0xd4,0x63,0xd3,0x30,
++	0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0c,0xff,0xea,0x9e,0xa1,0x00,0x0c,0x00,0x10,0x08,
++	0x0c,0xff,0xea,0x9e,0xa3,0x00,0x0c,0x00,0xd1,0x0c,0x10,0x08,0x0c,0xff,0xea,0x9e,
++	0xa5,0x00,0x0c,0x00,0x10,0x08,0x0c,0xff,0xea,0x9e,0xa7,0x00,0x0c,0x00,0xd2,0x1a,
++	0xd1,0x0c,0x10,0x08,0x0c,0xff,0xea,0x9e,0xa9,0x00,0x0c,0x00,0x10,0x07,0x0d,0xff,
++	0xc9,0xa6,0x00,0x10,0xff,0xc9,0x9c,0x00,0xd1,0x0e,0x10,0x07,0x10,0xff,0xc9,0xa1,
++	0x00,0x10,0xff,0xc9,0xac,0x00,0x10,0x07,0x12,0xff,0xc9,0xaa,0x00,0x14,0x00,0xd3,
++	0x35,0xd2,0x1d,0xd1,0x0e,0x10,0x07,0x10,0xff,0xca,0x9e,0x00,0x10,0xff,0xca,0x87,
++	0x00,0x10,0x07,0x11,0xff,0xca,0x9d,0x00,0x11,0xff,0xea,0xad,0x93,0x00,0xd1,0x0c,
++	0x10,0x08,0x11,0xff,0xea,0x9e,0xb5,0x00,0x11,0x00,0x10,0x08,0x11,0xff,0xea,0x9e,
++	0xb7,0x00,0x11,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x14,0xff,0xea,0x9e,0xb9,0x00,
++	0x14,0x00,0x10,0x08,0x15,0xff,0xea,0x9e,0xbb,0x00,0x15,0x00,0xd1,0x0c,0x10,0x08,
++	0x15,0xff,0xea,0x9e,0xbd,0x00,0x15,0x00,0x10,0x08,0x15,0xff,0xea,0x9e,0xbf,0x00,
++	0x15,0x00,0xcf,0x86,0xe5,0x50,0x63,0x94,0x2f,0x93,0x2b,0xd2,0x10,0x51,0x04,0x00,
++	0x00,0x10,0x08,0x15,0xff,0xea,0x9f,0x83,0x00,0x15,0x00,0xd1,0x0f,0x10,0x08,0x15,
++	0xff,0xea,0x9e,0x94,0x00,0x15,0xff,0xca,0x82,0x00,0x10,0x08,0x15,0xff,0xe1,0xb6,
++	0x8e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe4,0x30,0x66,0xd3,0x1d,0xe2,0xd7,0x63,
++	0xe1,0x86,0x63,0xe0,0x73,0x63,0xcf,0x86,0xe5,0x54,0x63,0x94,0x0b,0x93,0x07,0x62,
++	0x3f,0x63,0x08,0x00,0x08,0x00,0x08,0x00,0xd2,0x0f,0xe1,0xd6,0x64,0xe0,0xa3,0x64,
++	0xcf,0x86,0x65,0x88,0x64,0x0a,0x00,0xd1,0xab,0xd0,0x1a,0xcf,0x86,0xe5,0x93,0x65,
++	0xe4,0x76,0x65,0xe3,0x5d,0x65,0xe2,0x50,0x65,0x91,0x08,0x10,0x04,0x00,0x00,0x0c,
++	0x00,0x0c,0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0xd4,0x0b,0x93,0x07,0x62,0xa3,0x65,
++	0x11,0x00,0x00,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,
++	0xa0,0x00,0x11,0xff,0xe1,0x8e,0xa1,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,0xa2,0x00,
++	0x11,0xff,0xe1,0x8e,0xa3,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,0xa4,0x00,
++	0x11,0xff,0xe1,0x8e,0xa5,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,0xa6,0x00,0x11,0xff,
++	0xe1,0x8e,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,0xa8,0x00,
++	0x11,0xff,0xe1,0x8e,0xa9,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,0xaa,0x00,0x11,0xff,
++	0xe1,0x8e,0xab,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,0xac,0x00,0x11,0xff,
++	0xe1,0x8e,0xad,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,0xae,0x00,0x11,0xff,0xe1,0x8e,
++	0xaf,0x00,0xe0,0x2e,0x65,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,
++	0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,0xb0,0x00,0x11,0xff,0xe1,0x8e,0xb1,0x00,
++	0x10,0x08,0x11,0xff,0xe1,0x8e,0xb2,0x00,0x11,0xff,0xe1,0x8e,0xb3,0x00,0xd1,0x10,
++	0x10,0x08,0x11,0xff,0xe1,0x8e,0xb4,0x00,0x11,0xff,0xe1,0x8e,0xb5,0x00,0x10,0x08,
++	0x11,0xff,0xe1,0x8e,0xb6,0x00,0x11,0xff,0xe1,0x8e,0xb7,0x00,0xd2,0x20,0xd1,0x10,
++	0x10,0x08,0x11,0xff,0xe1,0x8e,0xb8,0x00,0x11,0xff,0xe1,0x8e,0xb9,0x00,0x10,0x08,
++	0x11,0xff,0xe1,0x8e,0xba,0x00,0x11,0xff,0xe1,0x8e,0xbb,0x00,0xd1,0x10,0x10,0x08,
++	0x11,0xff,0xe1,0x8e,0xbc,0x00,0x11,0xff,0xe1,0x8e,0xbd,0x00,0x10,0x08,0x11,0xff,
++	0xe1,0x8e,0xbe,0x00,0x11,0xff,0xe1,0x8e,0xbf,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,
++	0x10,0x08,0x11,0xff,0xe1,0x8f,0x80,0x00,0x11,0xff,0xe1,0x8f,0x81,0x00,0x10,0x08,
++	0x11,0xff,0xe1,0x8f,0x82,0x00,0x11,0xff,0xe1,0x8f,0x83,0x00,0xd1,0x10,0x10,0x08,
++	0x11,0xff,0xe1,0x8f,0x84,0x00,0x11,0xff,0xe1,0x8f,0x85,0x00,0x10,0x08,0x11,0xff,
++	0xe1,0x8f,0x86,0x00,0x11,0xff,0xe1,0x8f,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
++	0x11,0xff,0xe1,0x8f,0x88,0x00,0x11,0xff,0xe1,0x8f,0x89,0x00,0x10,0x08,0x11,0xff,
++	0xe1,0x8f,0x8a,0x00,0x11,0xff,0xe1,0x8f,0x8b,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,
++	0xe1,0x8f,0x8c,0x00,0x11,0xff,0xe1,0x8f,0x8d,0x00,0x10,0x08,0x11,0xff,0xe1,0x8f,
++	0x8e,0x00,0x11,0xff,0xe1,0x8f,0x8f,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,
++	0x10,0x08,0x11,0xff,0xe1,0x8f,0x90,0x00,0x11,0xff,0xe1,0x8f,0x91,0x00,0x10,0x08,
++	0x11,0xff,0xe1,0x8f,0x92,0x00,0x11,0xff,0xe1,0x8f,0x93,0x00,0xd1,0x10,0x10,0x08,
++	0x11,0xff,0xe1,0x8f,0x94,0x00,0x11,0xff,0xe1,0x8f,0x95,0x00,0x10,0x08,0x11,0xff,
++	0xe1,0x8f,0x96,0x00,0x11,0xff,0xe1,0x8f,0x97,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
++	0x11,0xff,0xe1,0x8f,0x98,0x00,0x11,0xff,0xe1,0x8f,0x99,0x00,0x10,0x08,0x11,0xff,
++	0xe1,0x8f,0x9a,0x00,0x11,0xff,0xe1,0x8f,0x9b,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,
++	0xe1,0x8f,0x9c,0x00,0x11,0xff,0xe1,0x8f,0x9d,0x00,0x10,0x08,0x11,0xff,0xe1,0x8f,
++	0x9e,0x00,0x11,0xff,0xe1,0x8f,0x9f,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
++	0x11,0xff,0xe1,0x8f,0xa0,0x00,0x11,0xff,0xe1,0x8f,0xa1,0x00,0x10,0x08,0x11,0xff,
++	0xe1,0x8f,0xa2,0x00,0x11,0xff,0xe1,0x8f,0xa3,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,
++	0xe1,0x8f,0xa4,0x00,0x11,0xff,0xe1,0x8f,0xa5,0x00,0x10,0x08,0x11,0xff,0xe1,0x8f,
++	0xa6,0x00,0x11,0xff,0xe1,0x8f,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x11,0xff,
++	0xe1,0x8f,0xa8,0x00,0x11,0xff,0xe1,0x8f,0xa9,0x00,0x10,0x08,0x11,0xff,0xe1,0x8f,
++	0xaa,0x00,0x11,0xff,0xe1,0x8f,0xab,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8f,
++	0xac,0x00,0x11,0xff,0xe1,0x8f,0xad,0x00,0x10,0x08,0x11,0xff,0xe1,0x8f,0xae,0x00,
++	0x11,0xff,0xe1,0x8f,0xaf,0x00,0xd1,0x0c,0xe0,0x67,0x63,0xcf,0x86,0xcf,0x06,0x02,
++	0xff,0xff,0xd0,0x08,0xcf,0x86,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,
++	0x01,0x00,0xd4,0xae,0xd3,0x09,0xe2,0xd0,0x63,0xcf,0x06,0x01,0x00,0xd2,0x27,0xe1,
++	0x9b,0x6f,0xe0,0xa2,0x6d,0xcf,0x86,0xe5,0xbb,0x6c,0xe4,0x4a,0x6c,0xe3,0x15,0x6c,
++	0xe2,0xf4,0x6b,0xe1,0xe3,0x6b,0x10,0x08,0x01,0xff,0xe5,0x88,0x87,0x00,0x01,0xff,
++	0xe5,0xba,0xa6,0x00,0xe1,0xf0,0x73,0xe0,0x64,0x73,0xcf,0x86,0xe5,0x9e,0x72,0xd4,
++	0x3b,0x93,0x37,0xd2,0x1d,0xd1,0x0e,0x10,0x07,0x01,0xff,0x66,0x66,0x00,0x01,0xff,
++	0x66,0x69,0x00,0x10,0x07,0x01,0xff,0x66,0x6c,0x00,0x01,0xff,0x66,0x66,0x69,0x00,
++	0xd1,0x0f,0x10,0x08,0x01,0xff,0x66,0x66,0x6c,0x00,0x01,0xff,0x73,0x74,0x00,0x10,
++	0x07,0x01,0xff,0x73,0x74,0x00,0x00,0x00,0x00,0x00,0xe3,0x44,0x72,0xd2,0x11,0x51,
++	0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xd5,0xb4,0xd5,0xb6,0x00,0xd1,0x12,
++	0x10,0x09,0x01,0xff,0xd5,0xb4,0xd5,0xa5,0x00,0x01,0xff,0xd5,0xb4,0xd5,0xab,0x00,
++	0x10,0x09,0x01,0xff,0xd5,0xbe,0xd5,0xb6,0x00,0x01,0xff,0xd5,0xb4,0xd5,0xad,0x00,
++	0xd3,0x09,0xe2,0xbc,0x73,0xcf,0x06,0x01,0x00,0xd2,0x12,0xe1,0xab,0x74,0xe0,0x3c,
++	0x74,0xcf,0x86,0xe5,0x19,0x74,0x64,0x08,0x74,0x06,0x00,0xe1,0x11,0x75,0xe0,0xde,
++	0x74,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,
++	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x7c,0xd3,0x3c,0xd2,
++	0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0xef,0xbd,0x81,0x00,0x10,0x08,0x01,
++	0xff,0xef,0xbd,0x82,0x00,0x01,0xff,0xef,0xbd,0x83,0x00,0xd1,0x10,0x10,0x08,0x01,
++	0xff,0xef,0xbd,0x84,0x00,0x01,0xff,0xef,0xbd,0x85,0x00,0x10,0x08,0x01,0xff,0xef,
++	0xbd,0x86,0x00,0x01,0xff,0xef,0xbd,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
++	0xff,0xef,0xbd,0x88,0x00,0x01,0xff,0xef,0xbd,0x89,0x00,0x10,0x08,0x01,0xff,0xef,
++	0xbd,0x8a,0x00,0x01,0xff,0xef,0xbd,0x8b,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xef,
++	0xbd,0x8c,0x00,0x01,0xff,0xef,0xbd,0x8d,0x00,0x10,0x08,0x01,0xff,0xef,0xbd,0x8e,
++	0x00,0x01,0xff,0xef,0xbd,0x8f,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
++	0xff,0xef,0xbd,0x90,0x00,0x01,0xff,0xef,0xbd,0x91,0x00,0x10,0x08,0x01,0xff,0xef,
++	0xbd,0x92,0x00,0x01,0xff,0xef,0xbd,0x93,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xef,
++	0xbd,0x94,0x00,0x01,0xff,0xef,0xbd,0x95,0x00,0x10,0x08,0x01,0xff,0xef,0xbd,0x96,
++	0x00,0x01,0xff,0xef,0xbd,0x97,0x00,0x92,0x1c,0xd1,0x10,0x10,0x08,0x01,0xff,0xef,
++	0xbd,0x98,0x00,0x01,0xff,0xef,0xbd,0x99,0x00,0x10,0x08,0x01,0xff,0xef,0xbd,0x9a,
++	0x00,0x01,0x00,0x01,0x00,0x83,0xe2,0xd9,0xb2,0xe1,0xc3,0xaf,0xe0,0x40,0xae,0xcf,
++	0x86,0xe5,0xe4,0x9a,0xc4,0xe3,0xc1,0x07,0xe2,0x62,0x06,0xe1,0x79,0x85,0xe0,0x09,
++	0x05,0xcf,0x86,0xe5,0xfb,0x02,0xd4,0x1c,0xe3,0xe7,0x75,0xe2,0x3e,0x75,0xe1,0x19,
++	0x75,0xe0,0xf2,0x74,0xcf,0x86,0xe5,0xbf,0x74,0x94,0x07,0x63,0xaa,0x74,0x07,0x00,
++	0x07,0x00,0xe3,0x93,0x77,0xe2,0x58,0x77,0xe1,0x77,0x01,0xe0,0xf0,0x76,0xcf,0x86,
++	0xe5,0x21,0x01,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,
++	0x90,0x90,0xa8,0x00,0x05,0xff,0xf0,0x90,0x90,0xa9,0x00,0x10,0x09,0x05,0xff,0xf0,
++	0x90,0x90,0xaa,0x00,0x05,0xff,0xf0,0x90,0x90,0xab,0x00,0xd1,0x12,0x10,0x09,0x05,
++	0xff,0xf0,0x90,0x90,0xac,0x00,0x05,0xff,0xf0,0x90,0x90,0xad,0x00,0x10,0x09,0x05,
++	0xff,0xf0,0x90,0x90,0xae,0x00,0x05,0xff,0xf0,0x90,0x90,0xaf,0x00,0xd2,0x24,0xd1,
++	0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xb0,0x00,0x05,0xff,0xf0,0x90,0x90,0xb1,
++	0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xb2,0x00,0x05,0xff,0xf0,0x90,0x90,0xb3,
++	0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xb4,0x00,0x05,0xff,0xf0,0x90,
++	0x90,0xb5,0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xb6,0x00,0x05,0xff,0xf0,0x90,
++	0x90,0xb7,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,
++	0xb8,0x00,0x05,0xff,0xf0,0x90,0x90,0xb9,0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,
++	0xba,0x00,0x05,0xff,0xf0,0x90,0x90,0xbb,0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,
++	0x90,0x90,0xbc,0x00,0x05,0xff,0xf0,0x90,0x90,0xbd,0x00,0x10,0x09,0x05,0xff,0xf0,
++	0x90,0x90,0xbe,0x00,0x05,0xff,0xf0,0x90,0x90,0xbf,0x00,0xd2,0x24,0xd1,0x12,0x10,
++	0x09,0x05,0xff,0xf0,0x90,0x91,0x80,0x00,0x05,0xff,0xf0,0x90,0x91,0x81,0x00,0x10,
++	0x09,0x05,0xff,0xf0,0x90,0x91,0x82,0x00,0x05,0xff,0xf0,0x90,0x91,0x83,0x00,0xd1,
++	0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x91,0x84,0x00,0x05,0xff,0xf0,0x90,0x91,0x85,
++	0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x91,0x86,0x00,0x05,0xff,0xf0,0x90,0x91,0x87,
++	0x00,0x94,0x4c,0x93,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x91,
++	0x88,0x00,0x05,0xff,0xf0,0x90,0x91,0x89,0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x91,
++	0x8a,0x00,0x05,0xff,0xf0,0x90,0x91,0x8b,0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,
++	0x90,0x91,0x8c,0x00,0x05,0xff,0xf0,0x90,0x91,0x8d,0x00,0x10,0x09,0x07,0xff,0xf0,
++	0x90,0x91,0x8e,0x00,0x07,0xff,0xf0,0x90,0x91,0x8f,0x00,0x05,0x00,0x05,0x00,0xd0,
++	0xa0,0xcf,0x86,0xd5,0x07,0x64,0x98,0x75,0x07,0x00,0xd4,0x07,0x63,0xa5,0x75,0x07,
++	0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0x98,0x00,
++	0x12,0xff,0xf0,0x90,0x93,0x99,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0x9a,0x00,
++	0x12,0xff,0xf0,0x90,0x93,0x9b,0x00,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,
++	0x9c,0x00,0x12,0xff,0xf0,0x90,0x93,0x9d,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,
++	0x9e,0x00,0x12,0xff,0xf0,0x90,0x93,0x9f,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,
++	0xff,0xf0,0x90,0x93,0xa0,0x00,0x12,0xff,0xf0,0x90,0x93,0xa1,0x00,0x10,0x09,0x12,
++	0xff,0xf0,0x90,0x93,0xa2,0x00,0x12,0xff,0xf0,0x90,0x93,0xa3,0x00,0xd1,0x12,0x10,
++	0x09,0x12,0xff,0xf0,0x90,0x93,0xa4,0x00,0x12,0xff,0xf0,0x90,0x93,0xa5,0x00,0x10,
++	0x09,0x12,0xff,0xf0,0x90,0x93,0xa6,0x00,0x12,0xff,0xf0,0x90,0x93,0xa7,0x00,0xcf,
++	0x86,0xe5,0x2e,0x75,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,
++	0xf0,0x90,0x93,0xa8,0x00,0x12,0xff,0xf0,0x90,0x93,0xa9,0x00,0x10,0x09,0x12,0xff,
++	0xf0,0x90,0x93,0xaa,0x00,0x12,0xff,0xf0,0x90,0x93,0xab,0x00,0xd1,0x12,0x10,0x09,
++	0x12,0xff,0xf0,0x90,0x93,0xac,0x00,0x12,0xff,0xf0,0x90,0x93,0xad,0x00,0x10,0x09,
++	0x12,0xff,0xf0,0x90,0x93,0xae,0x00,0x12,0xff,0xf0,0x90,0x93,0xaf,0x00,0xd2,0x24,
++	0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xb0,0x00,0x12,0xff,0xf0,0x90,0x93,
++	0xb1,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xb2,0x00,0x12,0xff,0xf0,0x90,0x93,
++	0xb3,0x00,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xb4,0x00,0x12,0xff,0xf0,
++	0x90,0x93,0xb5,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xb6,0x00,0x12,0xff,0xf0,
++	0x90,0x93,0xb7,0x00,0x93,0x28,0x92,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,
++	0x93,0xb8,0x00,0x12,0xff,0xf0,0x90,0x93,0xb9,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,
++	0x93,0xba,0x00,0x12,0xff,0xf0,0x90,0x93,0xbb,0x00,0x00,0x00,0x12,0x00,0xd4,0x1f,
++	0xe3,0x47,0x76,0xe2,0xd2,0x75,0xe1,0x71,0x75,0xe0,0x52,0x75,0xcf,0x86,0xe5,0x1f,
++	0x75,0x94,0x0a,0xe3,0x0a,0x75,0x62,0x01,0x75,0x07,0x00,0x07,0x00,0xe3,0x46,0x78,
++	0xe2,0x17,0x78,0xd1,0x09,0xe0,0xb4,0x77,0xcf,0x06,0x0b,0x00,0xe0,0xe7,0x77,0xcf,
++	0x86,0xe5,0x21,0x01,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x11,0xff,
++	0xf0,0x90,0xb3,0x80,0x00,0x11,0xff,0xf0,0x90,0xb3,0x81,0x00,0x10,0x09,0x11,0xff,
++	0xf0,0x90,0xb3,0x82,0x00,0x11,0xff,0xf0,0x90,0xb3,0x83,0x00,0xd1,0x12,0x10,0x09,
++	0x11,0xff,0xf0,0x90,0xb3,0x84,0x00,0x11,0xff,0xf0,0x90,0xb3,0x85,0x00,0x10,0x09,
++	0x11,0xff,0xf0,0x90,0xb3,0x86,0x00,0x11,0xff,0xf0,0x90,0xb3,0x87,0x00,0xd2,0x24,
++	0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x88,0x00,0x11,0xff,0xf0,0x90,0xb3,
++	0x89,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x8a,0x00,0x11,0xff,0xf0,0x90,0xb3,
++	0x8b,0x00,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x8c,0x00,0x11,0xff,0xf0,
++	0x90,0xb3,0x8d,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x8e,0x00,0x11,0xff,0xf0,
++	0x90,0xb3,0x8f,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,
++	0xb3,0x90,0x00,0x11,0xff,0xf0,0x90,0xb3,0x91,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,
++	0xb3,0x92,0x00,0x11,0xff,0xf0,0x90,0xb3,0x93,0x00,0xd1,0x12,0x10,0x09,0x11,0xff,
++	0xf0,0x90,0xb3,0x94,0x00,0x11,0xff,0xf0,0x90,0xb3,0x95,0x00,0x10,0x09,0x11,0xff,
++	0xf0,0x90,0xb3,0x96,0x00,0x11,0xff,0xf0,0x90,0xb3,0x97,0x00,0xd2,0x24,0xd1,0x12,
++	0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x98,0x00,0x11,0xff,0xf0,0x90,0xb3,0x99,0x00,
++	0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x9a,0x00,0x11,0xff,0xf0,0x90,0xb3,0x9b,0x00,
++	0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x9c,0x00,0x11,0xff,0xf0,0x90,0xb3,
++	0x9d,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x9e,0x00,0x11,0xff,0xf0,0x90,0xb3,
++	0x9f,0x00,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,
++	0xb3,0xa0,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa1,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,
++	0xb3,0xa2,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa3,0x00,0xd1,0x12,0x10,0x09,0x11,0xff,
++	0xf0,0x90,0xb3,0xa4,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa5,0x00,0x10,0x09,0x11,0xff,
++	0xf0,0x90,0xb3,0xa6,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa7,0x00,0xd2,0x24,0xd1,0x12,
++	0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xa8,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa9,0x00,
++	0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xaa,0x00,0x11,0xff,0xf0,0x90,0xb3,0xab,0x00,
++	0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xac,0x00,0x11,0xff,0xf0,0x90,0xb3,
++	0xad,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xae,0x00,0x11,0xff,0xf0,0x90,0xb3,
++	0xaf,0x00,0x93,0x23,0x92,0x1f,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xb0,
++	0x00,0x11,0xff,0xf0,0x90,0xb3,0xb1,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xb2,
++	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x15,0xe4,0xf9,0x7a,0xe3,0x03,
++	0x79,0xe2,0xfc,0x77,0xe1,0x4c,0x77,0xe0,0x05,0x77,0xcf,0x06,0x0c,0x00,0xe4,0x53,
++	0x7e,0xe3,0xac,0x7d,0xe2,0x55,0x7d,0xd1,0x0c,0xe0,0x1a,0x7d,0xcf,0x86,0x65,0xfb,
++	0x7c,0x14,0x00,0xe0,0x1e,0x7d,0xcf,0x86,0x55,0x04,0x00,0x00,0xd4,0x90,0xd3,0x48,
++	0xd2,0x24,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x80,0x00,0x10,0xff,0xf0,
++	0x91,0xa3,0x81,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x82,0x00,0x10,0xff,0xf0,
++	0x91,0xa3,0x83,0x00,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x84,0x00,0x10,
++	0xff,0xf0,0x91,0xa3,0x85,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x86,0x00,0x10,
++	0xff,0xf0,0x91,0xa3,0x87,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,
++	0xa3,0x88,0x00,0x10,0xff,0xf0,0x91,0xa3,0x89,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,
++	0xa3,0x8a,0x00,0x10,0xff,0xf0,0x91,0xa3,0x8b,0x00,0xd1,0x12,0x10,0x09,0x10,0xff,
++	0xf0,0x91,0xa3,0x8c,0x00,0x10,0xff,0xf0,0x91,0xa3,0x8d,0x00,0x10,0x09,0x10,0xff,
++	0xf0,0x91,0xa3,0x8e,0x00,0x10,0xff,0xf0,0x91,0xa3,0x8f,0x00,0xd3,0x48,0xd2,0x24,
++	0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x90,0x00,0x10,0xff,0xf0,0x91,0xa3,
++	0x91,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x92,0x00,0x10,0xff,0xf0,0x91,0xa3,
++	0x93,0x00,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x94,0x00,0x10,0xff,0xf0,
++	0x91,0xa3,0x95,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x96,0x00,0x10,0xff,0xf0,
++	0x91,0xa3,0x97,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x98,
++	0x00,0x10,0xff,0xf0,0x91,0xa3,0x99,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x9a,
++	0x00,0x10,0xff,0xf0,0x91,0xa3,0x9b,0x00,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,
++	0xa3,0x9c,0x00,0x10,0xff,0xf0,0x91,0xa3,0x9d,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,
++	0xa3,0x9e,0x00,0x10,0xff,0xf0,0x91,0xa3,0x9f,0x00,0xd1,0x11,0xe0,0x7a,0x80,0xcf,
++	0x86,0xe5,0x71,0x80,0xe4,0x3a,0x80,0xcf,0x06,0x00,0x00,0xe0,0x43,0x82,0xcf,0x86,
++	0xd5,0x06,0xcf,0x06,0x00,0x00,0xd4,0x09,0xe3,0x78,0x80,0xcf,0x06,0x0c,0x00,0xd3,
++	0x06,0xcf,0x06,0x00,0x00,0xe2,0xa3,0x81,0xe1,0x7e,0x81,0xd0,0x06,0xcf,0x06,0x00,
++	0x00,0xcf,0x86,0xa5,0x21,0x01,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,
++	0x14,0xff,0xf0,0x96,0xb9,0xa0,0x00,0x14,0xff,0xf0,0x96,0xb9,0xa1,0x00,0x10,0x09,
++	0x14,0xff,0xf0,0x96,0xb9,0xa2,0x00,0x14,0xff,0xf0,0x96,0xb9,0xa3,0x00,0xd1,0x12,
++	0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xa4,0x00,0x14,0xff,0xf0,0x96,0xb9,0xa5,0x00,
++	0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xa6,0x00,0x14,0xff,0xf0,0x96,0xb9,0xa7,0x00,
++	0xd2,0x24,0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xa8,0x00,0x14,0xff,0xf0,
++	0x96,0xb9,0xa9,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xaa,0x00,0x14,0xff,0xf0,
++	0x96,0xb9,0xab,0x00,0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xac,0x00,0x14,
++	0xff,0xf0,0x96,0xb9,0xad,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xae,0x00,0x14,
++	0xff,0xf0,0x96,0xb9,0xaf,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x14,0xff,
++	0xf0,0x96,0xb9,0xb0,0x00,0x14,0xff,0xf0,0x96,0xb9,0xb1,0x00,0x10,0x09,0x14,0xff,
++	0xf0,0x96,0xb9,0xb2,0x00,0x14,0xff,0xf0,0x96,0xb9,0xb3,0x00,0xd1,0x12,0x10,0x09,
++	0x14,0xff,0xf0,0x96,0xb9,0xb4,0x00,0x14,0xff,0xf0,0x96,0xb9,0xb5,0x00,0x10,0x09,
++	0x14,0xff,0xf0,0x96,0xb9,0xb6,0x00,0x14,0xff,0xf0,0x96,0xb9,0xb7,0x00,0xd2,0x24,
++	0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xb8,0x00,0x14,0xff,0xf0,0x96,0xb9,
++	0xb9,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xba,0x00,0x14,0xff,0xf0,0x96,0xb9,
++	0xbb,0x00,0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xbc,0x00,0x14,0xff,0xf0,
++	0x96,0xb9,0xbd,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xbe,0x00,0x14,0xff,0xf0,
++	0x96,0xb9,0xbf,0x00,0x14,0x00,0xd2,0x14,0xe1,0x8d,0x81,0xe0,0x84,0x81,0xcf,0x86,
++	0xe5,0x45,0x81,0xe4,0x02,0x81,0xcf,0x06,0x12,0x00,0xd1,0x0b,0xe0,0xb8,0x82,0xcf,
++	0x86,0xcf,0x06,0x00,0x00,0xe0,0xf8,0x8a,0xcf,0x86,0xd5,0x22,0xe4,0x33,0x88,0xe3,
++	0xf6,0x87,0xe2,0x9b,0x87,0xe1,0x94,0x87,0xe0,0x8d,0x87,0xcf,0x86,0xe5,0x5e,0x87,
++	0xe4,0x45,0x87,0x93,0x07,0x62,0x34,0x87,0x12,0xe6,0x12,0xe6,0xe4,0x99,0x88,0xe3,
++	0x92,0x88,0xd2,0x09,0xe1,0x1b,0x88,0xcf,0x06,0x10,0x00,0xe1,0x82,0x88,0xe0,0x4f,
++	0x88,0xcf,0x86,0xe5,0x21,0x01,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,
++	0x12,0xff,0xf0,0x9e,0xa4,0xa2,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xa3,0x00,0x10,0x09,
++	0x12,0xff,0xf0,0x9e,0xa4,0xa4,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xa5,0x00,0xd1,0x12,
++	0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xa6,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xa7,0x00,
++	0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xa8,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xa9,0x00,
++	0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xaa,0x00,0x12,0xff,0xf0,
++	0x9e,0xa4,0xab,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xac,0x00,0x12,0xff,0xf0,
++	0x9e,0xa4,0xad,0x00,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xae,0x00,0x12,
++	0xff,0xf0,0x9e,0xa4,0xaf,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xb0,0x00,0x12,
++	0xff,0xf0,0x9e,0xa4,0xb1,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,
++	0xf0,0x9e,0xa4,0xb2,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb3,0x00,0x10,0x09,0x12,0xff,
++	0xf0,0x9e,0xa4,0xb4,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb5,0x00,0xd1,0x12,0x10,0x09,
++	0x12,0xff,0xf0,0x9e,0xa4,0xb6,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb7,0x00,0x10,0x09,
++	0x12,0xff,0xf0,0x9e,0xa4,0xb8,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb9,0x00,0xd2,0x24,
++	0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xba,0x00,0x12,0xff,0xf0,0x9e,0xa4,
++	0xbb,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xbc,0x00,0x12,0xff,0xf0,0x9e,0xa4,
++	0xbd,0x00,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xbe,0x00,0x12,0xff,0xf0,
++	0x9e,0xa4,0xbf,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa5,0x80,0x00,0x12,0xff,0xf0,
++	0x9e,0xa5,0x81,0x00,0x94,0x1e,0x93,0x1a,0x92,0x16,0x91,0x12,0x10,0x09,0x12,0xff,
++	0xf0,0x9e,0xa5,0x82,0x00,0x12,0xff,0xf0,0x9e,0xa5,0x83,0x00,0x12,0x00,0x12,0x00,
++	0x12,0x00,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++	/* nfdi_c0100 */
++	0x57,0x04,0x01,0x00,0xc6,0xe5,0x91,0x13,0xe4,0x27,0x0c,0xe3,0x61,0x07,0xe2,0xda,
++	0x01,0xc1,0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0xe4,0xd4,0x7c,0xd3,0x3c,
++	0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0x80,0x00,0x01,0xff,0x41,0xcc,
++	0x81,0x00,0x10,0x08,0x01,0xff,0x41,0xcc,0x82,0x00,0x01,0xff,0x41,0xcc,0x83,0x00,
++	0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0x88,0x00,0x01,0xff,0x41,0xcc,0x8a,0x00,
++	0x10,0x04,0x01,0x00,0x01,0xff,0x43,0xcc,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
++	0x01,0xff,0x45,0xcc,0x80,0x00,0x01,0xff,0x45,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,
++	0x45,0xcc,0x82,0x00,0x01,0xff,0x45,0xcc,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0x49,0xcc,0x80,0x00,0x01,0xff,0x49,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x49,0xcc,
++	0x82,0x00,0x01,0xff,0x49,0xcc,0x88,0x00,0xd3,0x38,0xd2,0x1c,0xd1,0x0c,0x10,0x04,
++	0x01,0x00,0x01,0xff,0x4e,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x4f,0xcc,0x80,0x00,
++	0x01,0xff,0x4f,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0x82,0x00,
++	0x01,0xff,0x4f,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x4f,0xcc,0x88,0x00,0x01,0x00,
++	0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x55,0xcc,0x80,0x00,0x10,0x08,
++	0x01,0xff,0x55,0xcc,0x81,0x00,0x01,0xff,0x55,0xcc,0x82,0x00,0x91,0x10,0x10,0x08,
++	0x01,0xff,0x55,0xcc,0x88,0x00,0x01,0xff,0x59,0xcc,0x81,0x00,0x01,0x00,0xd4,0x7c,
++	0xd3,0x3c,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0x80,0x00,0x01,0xff,
++	0x61,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x61,0xcc,0x82,0x00,0x01,0xff,0x61,0xcc,
++	0x83,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0x88,0x00,0x01,0xff,0x61,0xcc,
++	0x8a,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0x63,0xcc,0xa7,0x00,0xd2,0x20,0xd1,0x10,
++	0x10,0x08,0x01,0xff,0x65,0xcc,0x80,0x00,0x01,0xff,0x65,0xcc,0x81,0x00,0x10,0x08,
++	0x01,0xff,0x65,0xcc,0x82,0x00,0x01,0xff,0x65,0xcc,0x88,0x00,0xd1,0x10,0x10,0x08,
++	0x01,0xff,0x69,0xcc,0x80,0x00,0x01,0xff,0x69,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,
++	0x69,0xcc,0x82,0x00,0x01,0xff,0x69,0xcc,0x88,0x00,0xd3,0x38,0xd2,0x1c,0xd1,0x0c,
++	0x10,0x04,0x01,0x00,0x01,0xff,0x6e,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,
++	0x80,0x00,0x01,0xff,0x6f,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,
++	0x82,0x00,0x01,0xff,0x6f,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x88,0x00,
++	0x01,0x00,0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x75,0xcc,0x80,0x00,
++	0x10,0x08,0x01,0xff,0x75,0xcc,0x81,0x00,0x01,0xff,0x75,0xcc,0x82,0x00,0xd1,0x10,
++	0x10,0x08,0x01,0xff,0x75,0xcc,0x88,0x00,0x01,0xff,0x79,0xcc,0x81,0x00,0x10,0x04,
++	0x01,0x00,0x01,0xff,0x79,0xcc,0x88,0x00,0xe1,0x9a,0x03,0xe0,0xd3,0x01,0xcf,0x86,
++	0xd5,0xf4,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,
++	0x84,0x00,0x01,0xff,0x61,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x41,0xcc,0x86,0x00,
++	0x01,0xff,0x61,0xcc,0x86,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0xa8,0x00,
++	0x01,0xff,0x61,0xcc,0xa8,0x00,0x10,0x08,0x01,0xff,0x43,0xcc,0x81,0x00,0x01,0xff,
++	0x63,0xcc,0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x43,0xcc,0x82,0x00,
++	0x01,0xff,0x63,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x43,0xcc,0x87,0x00,0x01,0xff,
++	0x63,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x43,0xcc,0x8c,0x00,0x01,0xff,
++	0x63,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x44,0xcc,0x8c,0x00,0x01,0xff,0x64,0xcc,
++	0x8c,0x00,0xd3,0x34,0xd2,0x14,0x51,0x04,0x01,0x00,0x10,0x08,0x01,0xff,0x45,0xcc,
++	0x84,0x00,0x01,0xff,0x65,0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x45,0xcc,
++	0x86,0x00,0x01,0xff,0x65,0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x45,0xcc,0x87,0x00,
++	0x01,0xff,0x65,0xcc,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x45,0xcc,
++	0xa8,0x00,0x01,0xff,0x65,0xcc,0xa8,0x00,0x10,0x08,0x01,0xff,0x45,0xcc,0x8c,0x00,
++	0x01,0xff,0x65,0xcc,0x8c,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x47,0xcc,0x82,0x00,
++	0x01,0xff,0x67,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x47,0xcc,0x86,0x00,0x01,0xff,
++	0x67,0xcc,0x86,0x00,0xd4,0x74,0xd3,0x34,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0x47,0xcc,0x87,0x00,0x01,0xff,0x67,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x47,0xcc,
++	0xa7,0x00,0x01,0xff,0x67,0xcc,0xa7,0x00,0x91,0x10,0x10,0x08,0x01,0xff,0x48,0xcc,
++	0x82,0x00,0x01,0xff,0x68,0xcc,0x82,0x00,0x01,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
++	0x01,0xff,0x49,0xcc,0x83,0x00,0x01,0xff,0x69,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,
++	0x49,0xcc,0x84,0x00,0x01,0xff,0x69,0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0x49,0xcc,0x86,0x00,0x01,0xff,0x69,0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x49,0xcc,
++	0xa8,0x00,0x01,0xff,0x69,0xcc,0xa8,0x00,0xd3,0x30,0xd2,0x10,0x91,0x0c,0x10,0x08,
++	0x01,0xff,0x49,0xcc,0x87,0x00,0x01,0x00,0x01,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0x4a,0xcc,0x82,0x00,0x01,0xff,0x6a,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x4b,0xcc,
++	0xa7,0x00,0x01,0xff,0x6b,0xcc,0xa7,0x00,0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,
++	0x01,0xff,0x4c,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x6c,0xcc,0x81,0x00,0x01,0xff,
++	0x4c,0xcc,0xa7,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6c,0xcc,0xa7,0x00,0x01,0xff,
++	0x4c,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x6c,0xcc,0x8c,0x00,0x01,0x00,0xcf,0x86,
++	0xd5,0xd4,0xd4,0x60,0xd3,0x30,0xd2,0x10,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
++	0x01,0xff,0x4e,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,0xcc,0x81,0x00,
++	0x01,0xff,0x4e,0xcc,0xa7,0x00,0x10,0x08,0x01,0xff,0x6e,0xcc,0xa7,0x00,0x01,0xff,
++	0x4e,0xcc,0x8c,0x00,0xd2,0x10,0x91,0x0c,0x10,0x08,0x01,0xff,0x6e,0xcc,0x8c,0x00,
++	0x01,0x00,0x01,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0x84,0x00,0x01,0xff,
++	0x6f,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x4f,0xcc,0x86,0x00,0x01,0xff,0x6f,0xcc,
++	0x86,0x00,0xd3,0x34,0xd2,0x14,0x91,0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0x8b,0x00,
++	0x01,0xff,0x6f,0xcc,0x8b,0x00,0x01,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x52,0xcc,
++	0x81,0x00,0x01,0xff,0x72,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x52,0xcc,0xa7,0x00,
++	0x01,0xff,0x72,0xcc,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x52,0xcc,
++	0x8c,0x00,0x01,0xff,0x72,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x53,0xcc,0x81,0x00,
++	0x01,0xff,0x73,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x53,0xcc,0x82,0x00,
++	0x01,0xff,0x73,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x53,0xcc,0xa7,0x00,0x01,0xff,
++	0x73,0xcc,0xa7,0x00,0xd4,0x74,0xd3,0x34,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0x53,0xcc,0x8c,0x00,0x01,0xff,0x73,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x54,0xcc,
++	0xa7,0x00,0x01,0xff,0x74,0xcc,0xa7,0x00,0x91,0x10,0x10,0x08,0x01,0xff,0x54,0xcc,
++	0x8c,0x00,0x01,0xff,0x74,0xcc,0x8c,0x00,0x01,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
++	0x01,0xff,0x55,0xcc,0x83,0x00,0x01,0xff,0x75,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,
++	0x55,0xcc,0x84,0x00,0x01,0xff,0x75,0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0x55,0xcc,0x86,0x00,0x01,0xff,0x75,0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,
++	0x8a,0x00,0x01,0xff,0x75,0xcc,0x8a,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
++	0x01,0xff,0x55,0xcc,0x8b,0x00,0x01,0xff,0x75,0xcc,0x8b,0x00,0x10,0x08,0x01,0xff,
++	0x55,0xcc,0xa8,0x00,0x01,0xff,0x75,0xcc,0xa8,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0x57,0xcc,0x82,0x00,0x01,0xff,0x77,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x59,0xcc,
++	0x82,0x00,0x01,0xff,0x79,0xcc,0x82,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0x59,0xcc,0x88,0x00,0x01,0xff,0x5a,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,
++	0x81,0x00,0x01,0xff,0x5a,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x7a,0xcc,
++	0x87,0x00,0x01,0xff,0x5a,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0x8c,0x00,
++	0x01,0x00,0xd0,0x4a,0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x2c,0xd3,0x18,0x92,0x14,
++	0x91,0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0x9b,0x00,0x01,0xff,0x6f,0xcc,0x9b,0x00,
+ 	0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
+-	0x04,0x00,0xd3,0x19,0xd2,0x11,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xff,
+-	0xdb,0x92,0xd9,0x94,0x00,0x11,0x04,0x01,0x00,0x01,0xe6,0x52,0x04,0x01,0xe6,0xd1,
+-	0x08,0x10,0x04,0x01,0xe6,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xe6,0xd4,0x38,0xd3,
+-	0x1c,0xd2,0x0c,0x51,0x04,0x01,0xe6,0x10,0x04,0x01,0xe6,0x01,0xdc,0xd1,0x08,0x10,
+-	0x04,0x01,0xe6,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xe6,0xd2,0x10,0xd1,0x08,0x10,
+-	0x04,0x01,0xe6,0x01,0x00,0x10,0x04,0x01,0xdc,0x01,0xe6,0x91,0x08,0x10,0x04,0x01,
+-	0xe6,0x01,0xdc,0x07,0x00,0x53,0x04,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x04,
+-	0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x07,0x00,0xd1,0xc8,0xd0,0x76,0xcf,
+-	0x86,0xd5,0x28,0xd4,0x14,0x53,0x04,0x04,0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,
+-	0x00,0x10,0x04,0x00,0x00,0x04,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x04,
+-	0x00,0x04,0x24,0x04,0x00,0x04,0x00,0x04,0x00,0xd4,0x14,0x53,0x04,0x04,0x00,0x52,
+-	0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x07,0x00,0x07,0x00,0xd3,0x1c,0xd2,
+-	0x0c,0x91,0x08,0x10,0x04,0x04,0xe6,0x04,0xdc,0x04,0xe6,0xd1,0x08,0x10,0x04,0x04,
+-	0xdc,0x04,0xe6,0x10,0x04,0x04,0xe6,0x04,0xdc,0xd2,0x0c,0x51,0x04,0x04,0xdc,0x10,
+-	0x04,0x04,0xe6,0x04,0xdc,0xd1,0x08,0x10,0x04,0x04,0xdc,0x04,0xe6,0x10,0x04,0x04,
+-	0xdc,0x04,0xe6,0xcf,0x86,0xd5,0x3c,0x94,0x38,0xd3,0x1c,0xd2,0x0c,0x51,0x04,0x04,
+-	0xe6,0x10,0x04,0x04,0xdc,0x04,0xe6,0xd1,0x08,0x10,0x04,0x04,0xdc,0x04,0xe6,0x10,
+-	0x04,0x04,0xdc,0x04,0xe6,0xd2,0x10,0xd1,0x08,0x10,0x04,0x04,0xdc,0x04,0xe6,0x10,
+-	0x04,0x04,0xe6,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x07,0x00,0x07,0x00,0x08,
+-	0x00,0x94,0x10,0x53,0x04,0x08,0x00,0x52,0x04,0x08,0x00,0x11,0x04,0x08,0x00,0x0a,
+-	0x00,0x0a,0x00,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,0x00,0x93,
+-	0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,
+-	0x00,0xcf,0x86,0x55,0x04,0x09,0x00,0xd4,0x14,0x53,0x04,0x09,0x00,0x92,0x0c,0x51,
+-	0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x09,0xe6,0x09,0xe6,0xd3,0x10,0x92,0x0c,0x51,
+-	0x04,0x09,0xe6,0x10,0x04,0x09,0xdc,0x09,0xe6,0x09,0x00,0xd2,0x0c,0x51,0x04,0x09,
+-	0x00,0x10,0x04,0x09,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x14,0xdc,0x14,
+-	0x00,0xe4,0xf8,0x57,0xe3,0x45,0x3f,0xe2,0xf4,0x3e,0xe1,0xc7,0x2c,0xe0,0x21,0x10,
+-	0xcf,0x86,0xc5,0xe4,0x80,0x08,0xe3,0xcb,0x03,0xe2,0x61,0x01,0xd1,0x94,0xd0,0x5a,
+-	0xcf,0x86,0xd5,0x20,0x54,0x04,0x0b,0x00,0xd3,0x0c,0x52,0x04,0x0b,0x00,0x11,0x04,
+-	0x0b,0x00,0x0b,0xe6,0x92,0x0c,0x51,0x04,0x0b,0xe6,0x10,0x04,0x0b,0x00,0x0b,0xe6,
+-	0x0b,0xe6,0xd4,0x24,0xd3,0x10,0x52,0x04,0x0b,0xe6,0x91,0x08,0x10,0x04,0x0b,0x00,
+-	0x0b,0xe6,0x0b,0xe6,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0b,0x00,0x0b,0xe6,0x0b,0xe6,
+-	0x11,0x04,0x0b,0xe6,0x00,0x00,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,0x00,0x51,0x04,
+-	0x0b,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0xcf,0x86,0xd5,0x20,0x54,0x04,0x0c,0x00,
+-	0x53,0x04,0x0c,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0c,0x00,0x0c,0xdc,0x0c,0xdc,
+-	0x51,0x04,0x00,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,0x94,0x14,0x53,0x04,0x13,0x00,
+-	0x92,0x0c,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-	0xd0,0x4a,0xcf,0x86,0x55,0x04,0x00,0x00,0xd4,0x20,0xd3,0x10,0x92,0x0c,0x91,0x08,
+-	0x10,0x04,0x0d,0x00,0x10,0x00,0x0d,0x00,0x0d,0x00,0x52,0x04,0x0d,0x00,0x91,0x08,
+-	0x10,0x04,0x0d,0x00,0x10,0x00,0x10,0x00,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x10,0x00,
+-	0x10,0x04,0x10,0x00,0x11,0x00,0x91,0x08,0x10,0x04,0x11,0x00,0x00,0x00,0x12,0x00,
+-	0x52,0x04,0x12,0x00,0x11,0x04,0x12,0x00,0x00,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,
+-	0x00,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x14,0xdc,
+-	0x12,0xe6,0x12,0xe6,0xd4,0x30,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x12,0xe6,0x10,0x04,
+-	0x12,0x00,0x11,0xdc,0x51,0x04,0x0d,0xe6,0x10,0x04,0x0d,0xdc,0x0d,0xe6,0xd2,0x0c,
+-	0x91,0x08,0x10,0x04,0x0d,0xe6,0x0d,0xdc,0x0d,0xe6,0x91,0x08,0x10,0x04,0x0d,0xe6,
+-	0x0d,0xdc,0x0d,0xdc,0xd3,0x1c,0xd2,0x10,0xd1,0x08,0x10,0x04,0x0d,0x1b,0x0d,0x1c,
+-	0x10,0x04,0x0d,0x1d,0x0d,0xe6,0x51,0x04,0x0d,0xe6,0x10,0x04,0x0d,0xdc,0x0d,0xe6,
+-	0xd2,0x10,0xd1,0x08,0x10,0x04,0x0d,0xe6,0x0d,0xdc,0x10,0x04,0x0d,0xdc,0x0d,0xe6,
+-	0x51,0x04,0x0d,0xe6,0x10,0x04,0x0d,0xe6,0x10,0xe6,0xe1,0x3a,0x01,0xd0,0x77,0xcf,
+-	0x86,0xd5,0x20,0x94,0x1c,0x93,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0b,0x00,0x01,
+-	0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x07,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,
+-	0x00,0xd4,0x1b,0x53,0x04,0x01,0x00,0x92,0x13,0x91,0x0f,0x10,0x04,0x01,0x00,0x01,
+-	0xff,0xe0,0xa4,0xa8,0xe0,0xa4,0xbc,0x00,0x01,0x00,0x01,0x00,0xd3,0x26,0xd2,0x13,
+-	0x91,0x0f,0x10,0x04,0x01,0x00,0x01,0xff,0xe0,0xa4,0xb0,0xe0,0xa4,0xbc,0x00,0x01,
+-	0x00,0x91,0x0f,0x10,0x0b,0x01,0xff,0xe0,0xa4,0xb3,0xe0,0xa4,0xbc,0x00,0x01,0x00,
+-	0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x0c,0x00,0x91,0x08,0x10,0x04,0x01,0x07,
+-	0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x8c,0xd4,0x18,0x53,0x04,0x01,0x00,0x52,0x04,
+-	0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x01,0x09,0x10,0x04,0x0b,0x00,0x0c,0x00,
+-	0xd3,0x1c,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x01,0xe6,0x10,0x04,0x01,0xdc,
+-	0x01,0xe6,0x91,0x08,0x10,0x04,0x01,0xe6,0x0b,0x00,0x0c,0x00,0xd2,0x2c,0xd1,0x16,
+-	0x10,0x0b,0x01,0xff,0xe0,0xa4,0x95,0xe0,0xa4,0xbc,0x00,0x01,0xff,0xe0,0xa4,0x96,
+-	0xe0,0xa4,0xbc,0x00,0x10,0x0b,0x01,0xff,0xe0,0xa4,0x97,0xe0,0xa4,0xbc,0x00,0x01,
+-	0xff,0xe0,0xa4,0x9c,0xe0,0xa4,0xbc,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xe0,0xa4,
+-	0xa1,0xe0,0xa4,0xbc,0x00,0x01,0xff,0xe0,0xa4,0xa2,0xe0,0xa4,0xbc,0x00,0x10,0x0b,
+-	0x01,0xff,0xe0,0xa4,0xab,0xe0,0xa4,0xbc,0x00,0x01,0xff,0xe0,0xa4,0xaf,0xe0,0xa4,
+-	0xbc,0x00,0x54,0x04,0x01,0x00,0xd3,0x14,0x92,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,
+-	0x0a,0x00,0x10,0x04,0x0a,0x00,0x0c,0x00,0x0c,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,
+-	0x10,0x00,0x0b,0x00,0x10,0x04,0x0b,0x00,0x09,0x00,0x91,0x08,0x10,0x04,0x09,0x00,
+-	0x08,0x00,0x09,0x00,0xd0,0x86,0xcf,0x86,0xd5,0x44,0xd4,0x2c,0xd3,0x18,0xd2,0x0c,
+-	0x91,0x08,0x10,0x04,0x10,0x00,0x01,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,
+-	0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,
++	0x01,0xff,0x55,0xcc,0x9b,0x00,0x93,0x14,0x92,0x10,0x91,0x0c,0x10,0x08,0x01,0xff,
++	0x75,0xcc,0x9b,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0xb4,
++	0xd4,0x24,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x0c,0x10,0x04,0x01,0x00,
++	0x01,0xff,0x41,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x61,0xcc,0x8c,0x00,0x01,0xff,
++	0x49,0xcc,0x8c,0x00,0xd3,0x46,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,0xcc,
++	0x8c,0x00,0x01,0xff,0x4f,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x8c,0x00,
++	0x01,0xff,0x55,0xcc,0x8c,0x00,0xd1,0x12,0x10,0x08,0x01,0xff,0x75,0xcc,0x8c,0x00,
++	0x01,0xff,0x55,0xcc,0x88,0xcc,0x84,0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,
++	0x84,0x00,0x01,0xff,0x55,0xcc,0x88,0xcc,0x81,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,
++	0x01,0xff,0x75,0xcc,0x88,0xcc,0x81,0x00,0x01,0xff,0x55,0xcc,0x88,0xcc,0x8c,0x00,
++	0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,0x8c,0x00,0x01,0xff,0x55,0xcc,0x88,0xcc,
++	0x80,0x00,0xd1,0x0e,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,0x80,0x00,0x01,0x00,
++	0x10,0x0a,0x01,0xff,0x41,0xcc,0x88,0xcc,0x84,0x00,0x01,0xff,0x61,0xcc,0x88,0xcc,
++	0x84,0x00,0xd4,0x80,0xd3,0x3a,0xd2,0x26,0xd1,0x14,0x10,0x0a,0x01,0xff,0x41,0xcc,
++	0x87,0xcc,0x84,0x00,0x01,0xff,0x61,0xcc,0x87,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,
++	0xc3,0x86,0xcc,0x84,0x00,0x01,0xff,0xc3,0xa6,0xcc,0x84,0x00,0x51,0x04,0x01,0x00,
++	0x10,0x08,0x01,0xff,0x47,0xcc,0x8c,0x00,0x01,0xff,0x67,0xcc,0x8c,0x00,0xd2,0x20,
++	0xd1,0x10,0x10,0x08,0x01,0xff,0x4b,0xcc,0x8c,0x00,0x01,0xff,0x6b,0xcc,0x8c,0x00,
++	0x10,0x08,0x01,0xff,0x4f,0xcc,0xa8,0x00,0x01,0xff,0x6f,0xcc,0xa8,0x00,0xd1,0x14,
++	0x10,0x0a,0x01,0xff,0x4f,0xcc,0xa8,0xcc,0x84,0x00,0x01,0xff,0x6f,0xcc,0xa8,0xcc,
++	0x84,0x00,0x10,0x09,0x01,0xff,0xc6,0xb7,0xcc,0x8c,0x00,0x01,0xff,0xca,0x92,0xcc,
++	0x8c,0x00,0xd3,0x24,0xd2,0x10,0x91,0x0c,0x10,0x08,0x01,0xff,0x6a,0xcc,0x8c,0x00,
++	0x01,0x00,0x01,0x00,0x91,0x10,0x10,0x08,0x01,0xff,0x47,0xcc,0x81,0x00,0x01,0xff,
++	0x67,0xcc,0x81,0x00,0x04,0x00,0xd2,0x24,0xd1,0x10,0x10,0x08,0x04,0xff,0x4e,0xcc,
++	0x80,0x00,0x04,0xff,0x6e,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x8a,0xcc,
++	0x81,0x00,0x01,0xff,0x61,0xcc,0x8a,0xcc,0x81,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,
++	0xc3,0x86,0xcc,0x81,0x00,0x01,0xff,0xc3,0xa6,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,
++	0xc3,0x98,0xcc,0x81,0x00,0x01,0xff,0xc3,0xb8,0xcc,0x81,0x00,0xe2,0x07,0x02,0xe1,
++	0xae,0x01,0xe0,0x93,0x01,0xcf,0x86,0xd5,0xf4,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,
++	0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0x8f,0x00,0x01,0xff,0x61,0xcc,0x8f,0x00,0x10,
++	0x08,0x01,0xff,0x41,0xcc,0x91,0x00,0x01,0xff,0x61,0xcc,0x91,0x00,0xd1,0x10,0x10,
++	0x08,0x01,0xff,0x45,0xcc,0x8f,0x00,0x01,0xff,0x65,0xcc,0x8f,0x00,0x10,0x08,0x01,
++	0xff,0x45,0xcc,0x91,0x00,0x01,0xff,0x65,0xcc,0x91,0x00,0xd2,0x20,0xd1,0x10,0x10,
++	0x08,0x01,0xff,0x49,0xcc,0x8f,0x00,0x01,0xff,0x69,0xcc,0x8f,0x00,0x10,0x08,0x01,
++	0xff,0x49,0xcc,0x91,0x00,0x01,0xff,0x69,0xcc,0x91,0x00,0xd1,0x10,0x10,0x08,0x01,
++	0xff,0x4f,0xcc,0x8f,0x00,0x01,0xff,0x6f,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x4f,
++	0xcc,0x91,0x00,0x01,0xff,0x6f,0xcc,0x91,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,
++	0x08,0x01,0xff,0x52,0xcc,0x8f,0x00,0x01,0xff,0x72,0xcc,0x8f,0x00,0x10,0x08,0x01,
++	0xff,0x52,0xcc,0x91,0x00,0x01,0xff,0x72,0xcc,0x91,0x00,0xd1,0x10,0x10,0x08,0x01,
++	0xff,0x55,0xcc,0x8f,0x00,0x01,0xff,0x75,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x55,
++	0xcc,0x91,0x00,0x01,0xff,0x75,0xcc,0x91,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x04,
++	0xff,0x53,0xcc,0xa6,0x00,0x04,0xff,0x73,0xcc,0xa6,0x00,0x10,0x08,0x04,0xff,0x54,
++	0xcc,0xa6,0x00,0x04,0xff,0x74,0xcc,0xa6,0x00,0x51,0x04,0x04,0x00,0x10,0x08,0x04,
++	0xff,0x48,0xcc,0x8c,0x00,0x04,0xff,0x68,0xcc,0x8c,0x00,0xd4,0x68,0xd3,0x20,0xd2,
++	0x0c,0x91,0x08,0x10,0x04,0x06,0x00,0x07,0x00,0x04,0x00,0x51,0x04,0x04,0x00,0x10,
++	0x08,0x04,0xff,0x41,0xcc,0x87,0x00,0x04,0xff,0x61,0xcc,0x87,0x00,0xd2,0x24,0xd1,
++	0x10,0x10,0x08,0x04,0xff,0x45,0xcc,0xa7,0x00,0x04,0xff,0x65,0xcc,0xa7,0x00,0x10,
++	0x0a,0x04,0xff,0x4f,0xcc,0x88,0xcc,0x84,0x00,0x04,0xff,0x6f,0xcc,0x88,0xcc,0x84,
++	0x00,0xd1,0x14,0x10,0x0a,0x04,0xff,0x4f,0xcc,0x83,0xcc,0x84,0x00,0x04,0xff,0x6f,
++	0xcc,0x83,0xcc,0x84,0x00,0x10,0x08,0x04,0xff,0x4f,0xcc,0x87,0x00,0x04,0xff,0x6f,
++	0xcc,0x87,0x00,0x93,0x30,0xd2,0x24,0xd1,0x14,0x10,0x0a,0x04,0xff,0x4f,0xcc,0x87,
++	0xcc,0x84,0x00,0x04,0xff,0x6f,0xcc,0x87,0xcc,0x84,0x00,0x10,0x08,0x04,0xff,0x59,
++	0xcc,0x84,0x00,0x04,0xff,0x79,0xcc,0x84,0x00,0x51,0x04,0x07,0x00,0x10,0x04,0x07,
++	0x00,0x08,0x00,0x08,0x00,0xcf,0x86,0x95,0x14,0x94,0x10,0x93,0x0c,0x92,0x08,0x11,
++	0x04,0x08,0x00,0x09,0x00,0x09,0x00,0x09,0x00,0x01,0x00,0x01,0x00,0xd0,0x22,0xcf,
++	0x86,0x55,0x04,0x01,0x00,0x94,0x18,0x53,0x04,0x01,0x00,0xd2,0x0c,0x91,0x08,0x10,
++	0x04,0x01,0x00,0x04,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x07,0x00,0x01,0x00,0xcf,
++	0x86,0xd5,0x18,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x51,
++	0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x04,0x00,0x94,0x18,0x53,0x04,0x01,0x00,0xd2,
++	0x08,0x11,0x04,0x01,0x00,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x07,
++	0x00,0x07,0x00,0xe1,0x34,0x01,0xd0,0x72,0xcf,0x86,0xd5,0x24,0x54,0x04,0x01,0xe6,
++	0xd3,0x10,0x52,0x04,0x01,0xe6,0x91,0x08,0x10,0x04,0x01,0xe6,0x01,0xe8,0x01,0xdc,
++	0x92,0x0c,0x51,0x04,0x01,0xdc,0x10,0x04,0x01,0xe8,0x01,0xd8,0x01,0xdc,0xd4,0x2c,
++	0xd3,0x1c,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0xdc,0x01,0xca,0x10,0x04,0x01,0xca,
++	0x01,0xdc,0x51,0x04,0x01,0xdc,0x10,0x04,0x01,0xdc,0x01,0xca,0x92,0x0c,0x91,0x08,
++	0x10,0x04,0x01,0xca,0x01,0xdc,0x01,0xdc,0x01,0xdc,0xd3,0x08,0x12,0x04,0x01,0xdc,
++	0x01,0x01,0xd2,0x0c,0x91,0x08,0x10,0x04,0x01,0x01,0x01,0xdc,0x01,0xdc,0x91,0x08,
++	0x10,0x04,0x01,0xdc,0x01,0xe6,0x01,0xe6,0xcf,0x86,0xd5,0x7e,0xd4,0x46,0xd3,0x2e,
++	0xd2,0x19,0xd1,0x0e,0x10,0x07,0x01,0xff,0xcc,0x80,0x00,0x01,0xff,0xcc,0x81,0x00,
++	0x10,0x04,0x01,0xe6,0x01,0xff,0xcc,0x93,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xcc,
++	0x88,0xcc,0x81,0x00,0x01,0xf0,0x10,0x04,0x04,0xe6,0x04,0xdc,0xd2,0x08,0x11,0x04,
++	0x04,0xdc,0x04,0xe6,0xd1,0x08,0x10,0x04,0x04,0xe6,0x04,0xdc,0x10,0x04,0x04,0xdc,
++	0x06,0x00,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x07,0xe6,0x10,0x04,0x07,0xe6,0x07,0xdc,
++	0x51,0x04,0x07,0xdc,0x10,0x04,0x07,0xdc,0x07,0xe6,0xd2,0x10,0xd1,0x08,0x10,0x04,
++	0x08,0xe8,0x08,0xdc,0x10,0x04,0x08,0xdc,0x08,0xe6,0xd1,0x08,0x10,0x04,0x08,0xe9,
++	0x07,0xea,0x10,0x04,0x07,0xea,0x07,0xe9,0xd4,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,
++	0x01,0xea,0x10,0x04,0x04,0xe9,0x06,0xe6,0x06,0xe6,0x06,0xe6,0xd3,0x13,0x52,0x04,
++	0x0a,0x00,0x91,0x0b,0x10,0x07,0x01,0xff,0xca,0xb9,0x00,0x01,0x00,0x0a,0x00,0xd2,
++	0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x01,0x00,0x09,0x00,0x51,0x04,0x09,0x00,0x10,
++	0x06,0x01,0xff,0x3b,0x00,0x10,0x00,0xd0,0xe1,0xcf,0x86,0xd5,0x7a,0xd4,0x5f,0xd3,
++	0x21,0x52,0x04,0x00,0x00,0xd1,0x0d,0x10,0x04,0x01,0x00,0x01,0xff,0xc2,0xa8,0xcc,
++	0x81,0x00,0x10,0x09,0x01,0xff,0xce,0x91,0xcc,0x81,0x00,0x01,0xff,0xc2,0xb7,0x00,
++	0xd2,0x1f,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x95,0xcc,0x81,0x00,0x01,0xff,0xce,
++	0x97,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0x99,0xcc,0x81,0x00,0x00,0x00,0xd1,
++	0x0d,0x10,0x09,0x01,0xff,0xce,0x9f,0xcc,0x81,0x00,0x00,0x00,0x10,0x09,0x01,0xff,
++	0xce,0xa5,0xcc,0x81,0x00,0x01,0xff,0xce,0xa9,0xcc,0x81,0x00,0x93,0x17,0x92,0x13,
++	0x91,0x0f,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x88,0xcc,0x81,0x00,0x01,0x00,0x01,
++	0x00,0x01,0x00,0x01,0x00,0xd4,0x4a,0xd3,0x10,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,
++	0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,0x01,
++	0xff,0xce,0x99,0xcc,0x88,0x00,0x01,0xff,0xce,0xa5,0xcc,0x88,0x00,0xd1,0x12,0x10,
++	0x09,0x01,0xff,0xce,0xb1,0xcc,0x81,0x00,0x01,0xff,0xce,0xb5,0xcc,0x81,0x00,0x10,
++	0x09,0x01,0xff,0xce,0xb7,0xcc,0x81,0x00,0x01,0xff,0xce,0xb9,0xcc,0x81,0x00,0x93,
++	0x17,0x92,0x13,0x91,0x0f,0x10,0x0b,0x01,0xff,0xcf,0x85,0xcc,0x88,0xcc,0x81,0x00,
++	0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x7b,0xd4,0x39,0x53,0x04,
++	0x01,0x00,0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x88,
++	0x00,0x01,0xff,0xcf,0x85,0xcc,0x88,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xbf,
++	0xcc,0x81,0x00,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xcf,0x89,
++	0xcc,0x81,0x00,0x0a,0x00,0xd3,0x26,0xd2,0x11,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
++	0x00,0x01,0xff,0xcf,0x92,0xcc,0x81,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xcf,0x92,
++	0xcc,0x88,0x00,0x01,0x00,0x10,0x04,0x01,0x00,0x04,0x00,0xd2,0x0c,0x51,0x04,0x06,
++	0x00,0x10,0x04,0x01,0x00,0x04,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x04,0x00,0x10,
++	0x04,0x01,0x00,0x04,0x00,0xd4,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,
++	0x00,0x04,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,
++	0x04,0x05,0x00,0x10,0x04,0x06,0x00,0x07,0x00,0x12,0x04,0x07,0x00,0x08,0x00,0xe3,
++	0x47,0x04,0xe2,0xbe,0x02,0xe1,0x07,0x01,0xd0,0x8b,0xcf,0x86,0xd5,0x6c,0xd4,0x53,
++	0xd3,0x30,0xd2,0x1f,0xd1,0x12,0x10,0x09,0x04,0xff,0xd0,0x95,0xcc,0x80,0x00,0x01,
++	0xff,0xd0,0x95,0xcc,0x88,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xd0,0x93,0xcc,0x81,
++	0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xd0,0x86,0xcc,0x88,0x00,
++	0x52,0x04,0x01,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0x9a,0xcc,0x81,0x00,0x04,
++	0xff,0xd0,0x98,0xcc,0x80,0x00,0x10,0x09,0x01,0xff,0xd0,0xa3,0xcc,0x86,0x00,0x01,
++	0x00,0x53,0x04,0x01,0x00,0x92,0x11,0x91,0x0d,0x10,0x04,0x01,0x00,0x01,0xff,0xd0,
++	0x98,0xcc,0x86,0x00,0x01,0x00,0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,
++	0x92,0x11,0x91,0x0d,0x10,0x04,0x01,0x00,0x01,0xff,0xd0,0xb8,0xcc,0x86,0x00,0x01,
++	0x00,0x01,0x00,0xcf,0x86,0xd5,0x57,0x54,0x04,0x01,0x00,0xd3,0x30,0xd2,0x1f,0xd1,
++	0x12,0x10,0x09,0x04,0xff,0xd0,0xb5,0xcc,0x80,0x00,0x01,0xff,0xd0,0xb5,0xcc,0x88,
++	0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xd0,0xb3,0xcc,0x81,0x00,0x51,0x04,0x01,0x00,
++	0x10,0x04,0x01,0x00,0x01,0xff,0xd1,0x96,0xcc,0x88,0x00,0x52,0x04,0x01,0x00,0xd1,
++	0x12,0x10,0x09,0x01,0xff,0xd0,0xba,0xcc,0x81,0x00,0x04,0xff,0xd0,0xb8,0xcc,0x80,
++	0x00,0x10,0x09,0x01,0xff,0xd1,0x83,0xcc,0x86,0x00,0x01,0x00,0x54,0x04,0x01,0x00,
++	0x93,0x1a,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,0xd1,0xb4,
++	0xcc,0x8f,0x00,0x01,0xff,0xd1,0xb5,0xcc,0x8f,0x00,0x01,0x00,0xd0,0x2e,0xcf,0x86,
++	0x95,0x28,0x94,0x24,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
++	0x01,0xe6,0x51,0x04,0x01,0xe6,0x10,0x04,0x01,0xe6,0x0a,0xe6,0x92,0x08,0x11,0x04,
++	0x04,0x00,0x06,0x00,0x04,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0xbe,0xd4,0x4a,
++	0xd3,0x2a,0xd2,0x1a,0xd1,0x0d,0x10,0x04,0x01,0x00,0x01,0xff,0xd0,0x96,0xcc,0x86,
++	0x00,0x10,0x09,0x01,0xff,0xd0,0xb6,0xcc,0x86,0x00,0x01,0x00,0xd1,0x08,0x10,0x04,
++	0x01,0x00,0x06,0x00,0x10,0x04,0x06,0x00,0x01,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,
++	0x01,0x00,0x06,0x00,0x10,0x04,0x06,0x00,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,
++	0x06,0x00,0x10,0x04,0x06,0x00,0x09,0x00,0xd3,0x3a,0xd2,0x24,0xd1,0x12,0x10,0x09,
++	0x01,0xff,0xd0,0x90,0xcc,0x86,0x00,0x01,0xff,0xd0,0xb0,0xcc,0x86,0x00,0x10,0x09,
++	0x01,0xff,0xd0,0x90,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb0,0xcc,0x88,0x00,0x51,0x04,
++	0x01,0x00,0x10,0x09,0x01,0xff,0xd0,0x95,0xcc,0x86,0x00,0x01,0xff,0xd0,0xb5,0xcc,
++	0x86,0x00,0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,0xd3,0x98,0xcc,0x88,
++	0x00,0x01,0xff,0xd3,0x99,0xcc,0x88,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0x96,
++	0xcc,0x88,0x00,0x01,0xff,0xd0,0xb6,0xcc,0x88,0x00,0x10,0x09,0x01,0xff,0xd0,0x97,
++	0xcc,0x88,0x00,0x01,0xff,0xd0,0xb7,0xcc,0x88,0x00,0xd4,0x74,0xd3,0x3a,0xd2,0x16,
++	0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,0xd0,0x98,0xcc,0x84,0x00,0x01,0xff,0xd0,
++	0xb8,0xcc,0x84,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0x98,0xcc,0x88,0x00,0x01,
++	0xff,0xd0,0xb8,0xcc,0x88,0x00,0x10,0x09,0x01,0xff,0xd0,0x9e,0xcc,0x88,0x00,0x01,
++	0xff,0xd0,0xbe,0xcc,0x88,0x00,0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,
++	0xd3,0xa8,0xcc,0x88,0x00,0x01,0xff,0xd3,0xa9,0xcc,0x88,0x00,0xd1,0x12,0x10,0x09,
++	0x04,0xff,0xd0,0xad,0xcc,0x88,0x00,0x04,0xff,0xd1,0x8d,0xcc,0x88,0x00,0x10,0x09,
++	0x01,0xff,0xd0,0xa3,0xcc,0x84,0x00,0x01,0xff,0xd1,0x83,0xcc,0x84,0x00,0xd3,0x3a,
++	0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0xa3,0xcc,0x88,0x00,0x01,0xff,0xd1,
++	0x83,0xcc,0x88,0x00,0x10,0x09,0x01,0xff,0xd0,0xa3,0xcc,0x8b,0x00,0x01,0xff,0xd1,
++	0x83,0xcc,0x8b,0x00,0x91,0x12,0x10,0x09,0x01,0xff,0xd0,0xa7,0xcc,0x88,0x00,0x01,
++	0xff,0xd1,0x87,0xcc,0x88,0x00,0x08,0x00,0x92,0x16,0x91,0x12,0x10,0x09,0x01,0xff,
++	0xd0,0xab,0xcc,0x88,0x00,0x01,0xff,0xd1,0x8b,0xcc,0x88,0x00,0x09,0x00,0x09,0x00,
++	0xd1,0x74,0xd0,0x36,0xcf,0x86,0xd5,0x10,0x54,0x04,0x06,0x00,0x93,0x08,0x12,0x04,
++	0x09,0x00,0x0a,0x00,0x0a,0x00,0xd4,0x10,0x93,0x0c,0x52,0x04,0x0a,0x00,0x11,0x04,
++	0x0b,0x00,0x0c,0x00,0x10,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,
++	0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x24,0x54,0x04,0x01,0x00,
++	0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,
++	0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x14,
++	0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
++	0x01,0x00,0x01,0x00,0xd0,0xba,0xcf,0x86,0xd5,0x4c,0xd4,0x24,0x53,0x04,0x01,0x00,
++	0xd2,0x10,0xd1,0x08,0x10,0x04,0x14,0x00,0x01,0x00,0x10,0x04,0x04,0x00,0x00,0x00,
++	0xd1,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x04,0x10,0x00,0x0d,0x00,0xd3,0x18,
++	0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x02,0xdc,0x02,0xe6,0x51,0x04,0x02,0xe6,
++	0x10,0x04,0x02,0xdc,0x02,0xe6,0x92,0x0c,0x51,0x04,0x02,0xe6,0x10,0x04,0x02,0xde,
++	0x02,0xdc,0x02,0xe6,0xd4,0x2c,0xd3,0x10,0x92,0x0c,0x51,0x04,0x02,0xe6,0x10,0x04,
++	0x08,0xdc,0x02,0xdc,0x02,0xdc,0xd2,0x0c,0x51,0x04,0x02,0xe6,0x10,0x04,0x02,0xdc,
++	0x02,0xe6,0xd1,0x08,0x10,0x04,0x02,0xe6,0x02,0xde,0x10,0x04,0x02,0xe4,0x02,0xe6,
++	0xd3,0x20,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x0a,0x01,0x0b,0x10,0x04,0x01,0x0c,
++	0x01,0x0d,0xd1,0x08,0x10,0x04,0x01,0x0e,0x01,0x0f,0x10,0x04,0x01,0x10,0x01,0x11,
++	0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x12,0x01,0x13,0x10,0x04,0x09,0x13,0x01,0x14,
++	0xd1,0x08,0x10,0x04,0x01,0x15,0x01,0x16,0x10,0x04,0x01,0x00,0x01,0x17,0xcf,0x86,
++	0xd5,0x28,0x94,0x24,0x93,0x20,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x01,0x18,
++	0x10,0x04,0x01,0x19,0x01,0x00,0xd1,0x08,0x10,0x04,0x02,0xe6,0x08,0xdc,0x10,0x04,
++	0x08,0x00,0x08,0x12,0x00,0x00,0x01,0x00,0xd4,0x1c,0x53,0x04,0x01,0x00,0xd2,0x0c,
++	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,
++	0x00,0x00,0x14,0x00,0x93,0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
++	0x00,0x00,0x00,0x00,0x00,0x00,0xe2,0xfa,0x01,0xe1,0x2a,0x01,0xd0,0xa7,0xcf,0x86,
++	0xd5,0x54,0xd4,0x28,0xd3,0x10,0x52,0x04,0x07,0x00,0x91,0x08,0x10,0x04,0x0d,0x00,
++	0x10,0x00,0x0a,0x00,0xd2,0x0c,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x00,0x08,0x00,
++	0x91,0x08,0x10,0x04,0x01,0x00,0x07,0x00,0x07,0x00,0xd3,0x0c,0x52,0x04,0x07,0xe6,
++	0x11,0x04,0x07,0xe6,0x0a,0xe6,0xd2,0x10,0xd1,0x08,0x10,0x04,0x0a,0x1e,0x0a,0x1f,
++	0x10,0x04,0x0a,0x20,0x01,0x00,0xd1,0x08,0x10,0x04,0x0f,0x00,0x00,0x00,0x10,0x04,
++	0x08,0x00,0x01,0x00,0xd4,0x3d,0x93,0x39,0xd2,0x1a,0xd1,0x08,0x10,0x04,0x0c,0x00,
++	0x01,0x00,0x10,0x09,0x01,0xff,0xd8,0xa7,0xd9,0x93,0x00,0x01,0xff,0xd8,0xa7,0xd9,
++	0x94,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd9,0x88,0xd9,0x94,0x00,0x01,0xff,0xd8,
++	0xa7,0xd9,0x95,0x00,0x10,0x09,0x01,0xff,0xd9,0x8a,0xd9,0x94,0x00,0x01,0x00,0x01,
++	0x00,0x53,0x04,0x01,0x00,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x0a,
++	0x00,0x0a,0x00,0xcf,0x86,0xd5,0x5c,0xd4,0x20,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,
++	0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0x1b,0xd1,0x08,0x10,0x04,0x01,0x1c,0x01,
++	0x1d,0x10,0x04,0x01,0x1e,0x01,0x1f,0xd3,0x20,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,
++	0x20,0x01,0x21,0x10,0x04,0x01,0x22,0x04,0xe6,0xd1,0x08,0x10,0x04,0x04,0xe6,0x04,
++	0xdc,0x10,0x04,0x07,0xdc,0x07,0xe6,0xd2,0x0c,0x91,0x08,0x10,0x04,0x07,0xe6,0x08,
++	0xe6,0x08,0xe6,0xd1,0x08,0x10,0x04,0x08,0xdc,0x08,0xe6,0x10,0x04,0x08,0xe6,0x0c,
++	0xdc,0xd4,0x10,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x11,0x04,0x01,0x00,0x06,
++	0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x23,0x01,0x00,0x01,0x00,0x01,
++	0x00,0x01,0x00,0xd0,0x22,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0x53,
++	0x04,0x01,0x00,0xd2,0x08,0x11,0x04,0x04,0x00,0x01,0x00,0x51,0x04,0x01,0x00,0x10,
++	0x04,0x01,0x00,0x04,0x00,0xcf,0x86,0xd5,0x5b,0xd4,0x2e,0xd3,0x1e,0x92,0x1a,0xd1,
++	0x0d,0x10,0x09,0x01,0xff,0xdb,0x95,0xd9,0x94,0x00,0x01,0x00,0x10,0x09,0x01,0xff,
++	0xdb,0x81,0xd9,0x94,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,
++	0x00,0x10,0x04,0x01,0x00,0x04,0x00,0xd3,0x19,0xd2,0x11,0x51,0x04,0x01,0x00,0x10,
++	0x04,0x01,0x00,0x01,0xff,0xdb,0x92,0xd9,0x94,0x00,0x11,0x04,0x01,0x00,0x01,0xe6,
++	0x52,0x04,0x01,0xe6,0xd1,0x08,0x10,0x04,0x01,0xe6,0x01,0x00,0x10,0x04,0x01,0x00,
++	0x01,0xe6,0xd4,0x38,0xd3,0x1c,0xd2,0x0c,0x51,0x04,0x01,0xe6,0x10,0x04,0x01,0xe6,
++	0x01,0xdc,0xd1,0x08,0x10,0x04,0x01,0xe6,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xe6,
++	0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0xe6,0x01,0x00,0x10,0x04,0x01,0xdc,0x01,0xe6,
++	0x91,0x08,0x10,0x04,0x01,0xe6,0x01,0xdc,0x07,0x00,0x53,0x04,0x01,0x00,0xd2,0x08,
++	0x11,0x04,0x01,0x00,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x07,0x00,
++	0xd1,0xc8,0xd0,0x76,0xcf,0x86,0xd5,0x28,0xd4,0x14,0x53,0x04,0x04,0x00,0x52,0x04,
++	0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x00,0x00,0x04,0x00,0x93,0x10,0x92,0x0c,
++	0x91,0x08,0x10,0x04,0x04,0x00,0x04,0x24,0x04,0x00,0x04,0x00,0x04,0x00,0xd4,0x14,
++	0x53,0x04,0x04,0x00,0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x07,0x00,
++	0x07,0x00,0xd3,0x1c,0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,0xe6,0x04,0xdc,0x04,0xe6,
++	0xd1,0x08,0x10,0x04,0x04,0xdc,0x04,0xe6,0x10,0x04,0x04,0xe6,0x04,0xdc,0xd2,0x0c,
++	0x51,0x04,0x04,0xdc,0x10,0x04,0x04,0xe6,0x04,0xdc,0xd1,0x08,0x10,0x04,0x04,0xdc,
++	0x04,0xe6,0x10,0x04,0x04,0xdc,0x04,0xe6,0xcf,0x86,0xd5,0x3c,0x94,0x38,0xd3,0x1c,
++	0xd2,0x0c,0x51,0x04,0x04,0xe6,0x10,0x04,0x04,0xdc,0x04,0xe6,0xd1,0x08,0x10,0x04,
++	0x04,0xdc,0x04,0xe6,0x10,0x04,0x04,0xdc,0x04,0xe6,0xd2,0x10,0xd1,0x08,0x10,0x04,
++	0x04,0xdc,0x04,0xe6,0x10,0x04,0x04,0xe6,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,
++	0x07,0x00,0x07,0x00,0x08,0x00,0x94,0x10,0x53,0x04,0x08,0x00,0x52,0x04,0x08,0x00,
++	0x11,0x04,0x08,0x00,0x0a,0x00,0x0a,0x00,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x04,0x00,
++	0x54,0x04,0x04,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x06,0x00,
++	0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0x55,0x04,0x09,0x00,0xd4,0x14,0x53,0x04,
++	0x09,0x00,0x92,0x0c,0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x09,0xe6,0x09,0xe6,
++	0xd3,0x10,0x92,0x0c,0x51,0x04,0x09,0xe6,0x10,0x04,0x09,0xdc,0x09,0xe6,0x09,0x00,
++	0xd2,0x0c,0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x00,0x00,0x91,0x08,0x10,0x04,
++	0x00,0x00,0x14,0xdc,0x14,0x00,0xe4,0x78,0x57,0xe3,0xda,0x3e,0xe2,0x89,0x3e,0xe1,
++	0x91,0x2c,0xe0,0x21,0x10,0xcf,0x86,0xc5,0xe4,0x80,0x08,0xe3,0xcb,0x03,0xe2,0x61,
++	0x01,0xd1,0x94,0xd0,0x5a,0xcf,0x86,0xd5,0x20,0x54,0x04,0x0b,0x00,0xd3,0x0c,0x52,
++	0x04,0x0b,0x00,0x11,0x04,0x0b,0x00,0x0b,0xe6,0x92,0x0c,0x51,0x04,0x0b,0xe6,0x10,
++	0x04,0x0b,0x00,0x0b,0xe6,0x0b,0xe6,0xd4,0x24,0xd3,0x10,0x52,0x04,0x0b,0xe6,0x91,
++	0x08,0x10,0x04,0x0b,0x00,0x0b,0xe6,0x0b,0xe6,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0b,
++	0x00,0x0b,0xe6,0x0b,0xe6,0x11,0x04,0x0b,0xe6,0x00,0x00,0x53,0x04,0x0b,0x00,0x52,
++	0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0xcf,0x86,0xd5,
++	0x20,0x54,0x04,0x0c,0x00,0x53,0x04,0x0c,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0c,
++	0x00,0x0c,0xdc,0x0c,0xdc,0x51,0x04,0x00,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,0x94,
++	0x14,0x53,0x04,0x13,0x00,0x92,0x0c,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x00,
++	0x00,0x00,0x00,0x00,0x00,0xd0,0x4a,0xcf,0x86,0x55,0x04,0x00,0x00,0xd4,0x20,0xd3,
++	0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0d,0x00,0x10,0x00,0x0d,0x00,0x0d,0x00,0x52,
++	0x04,0x0d,0x00,0x91,0x08,0x10,0x04,0x0d,0x00,0x10,0x00,0x10,0x00,0xd3,0x18,0xd2,
++	0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x11,0x00,0x91,0x08,0x10,0x04,0x11,
++	0x00,0x00,0x00,0x12,0x00,0x52,0x04,0x12,0x00,0x11,0x04,0x12,0x00,0x00,0x00,0xcf,
++	0x86,0xd5,0x18,0x54,0x04,0x00,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,
++	0x04,0x00,0x00,0x14,0xdc,0x12,0xe6,0x12,0xe6,0xd4,0x30,0xd3,0x18,0xd2,0x0c,0x51,
++	0x04,0x12,0xe6,0x10,0x04,0x12,0x00,0x11,0xdc,0x51,0x04,0x0d,0xe6,0x10,0x04,0x0d,
++	0xdc,0x0d,0xe6,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0d,0xe6,0x0d,0xdc,0x0d,0xe6,0x91,
++	0x08,0x10,0x04,0x0d,0xe6,0x0d,0xdc,0x0d,0xdc,0xd3,0x1c,0xd2,0x10,0xd1,0x08,0x10,
++	0x04,0x0d,0x1b,0x0d,0x1c,0x10,0x04,0x0d,0x1d,0x0d,0xe6,0x51,0x04,0x0d,0xe6,0x10,
++	0x04,0x0d,0xdc,0x0d,0xe6,0xd2,0x10,0xd1,0x08,0x10,0x04,0x0d,0xe6,0x0d,0xdc,0x10,
++	0x04,0x0d,0xdc,0x0d,0xe6,0x51,0x04,0x0d,0xe6,0x10,0x04,0x0d,0xe6,0x10,0xe6,0xe1,
++	0x3a,0x01,0xd0,0x77,0xcf,0x86,0xd5,0x20,0x94,0x1c,0x93,0x18,0xd2,0x0c,0x91,0x08,
++	0x10,0x04,0x0b,0x00,0x01,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x07,0x00,0x01,0x00,
++	0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x1b,0x53,0x04,0x01,0x00,0x92,0x13,0x91,0x0f,
++	0x10,0x04,0x01,0x00,0x01,0xff,0xe0,0xa4,0xa8,0xe0,0xa4,0xbc,0x00,0x01,0x00,0x01,
++	0x00,0xd3,0x26,0xd2,0x13,0x91,0x0f,0x10,0x04,0x01,0x00,0x01,0xff,0xe0,0xa4,0xb0,
++	0xe0,0xa4,0xbc,0x00,0x01,0x00,0x91,0x0f,0x10,0x0b,0x01,0xff,0xe0,0xa4,0xb3,0xe0,
++	0xa4,0xbc,0x00,0x01,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x0c,0x00,0x91,
++	0x08,0x10,0x04,0x01,0x07,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x8c,0xd4,0x18,0x53,
++	0x04,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x01,0x09,0x10,
++	0x04,0x0b,0x00,0x0c,0x00,0xd3,0x1c,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x01,
++	0xe6,0x10,0x04,0x01,0xdc,0x01,0xe6,0x91,0x08,0x10,0x04,0x01,0xe6,0x0b,0x00,0x0c,
++	0x00,0xd2,0x2c,0xd1,0x16,0x10,0x0b,0x01,0xff,0xe0,0xa4,0x95,0xe0,0xa4,0xbc,0x00,
++	0x01,0xff,0xe0,0xa4,0x96,0xe0,0xa4,0xbc,0x00,0x10,0x0b,0x01,0xff,0xe0,0xa4,0x97,
++	0xe0,0xa4,0xbc,0x00,0x01,0xff,0xe0,0xa4,0x9c,0xe0,0xa4,0xbc,0x00,0xd1,0x16,0x10,
++	0x0b,0x01,0xff,0xe0,0xa4,0xa1,0xe0,0xa4,0xbc,0x00,0x01,0xff,0xe0,0xa4,0xa2,0xe0,
++	0xa4,0xbc,0x00,0x10,0x0b,0x01,0xff,0xe0,0xa4,0xab,0xe0,0xa4,0xbc,0x00,0x01,0xff,
++	0xe0,0xa4,0xaf,0xe0,0xa4,0xbc,0x00,0x54,0x04,0x01,0x00,0xd3,0x14,0x92,0x10,0xd1,
++	0x08,0x10,0x04,0x01,0x00,0x0a,0x00,0x10,0x04,0x0a,0x00,0x0c,0x00,0x0c,0x00,0xd2,
++	0x10,0xd1,0x08,0x10,0x04,0x10,0x00,0x0b,0x00,0x10,0x04,0x0b,0x00,0x09,0x00,0x91,
++	0x08,0x10,0x04,0x09,0x00,0x08,0x00,0x09,0x00,0xd0,0x86,0xcf,0x86,0xd5,0x44,0xd4,
++	0x2c,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x10,0x00,0x01,0x00,0x01,0x00,0x91,
++	0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,
++	0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x93,0x14,0x92,0x10,0xd1,
++	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,
++	0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,
++	0x00,0x01,0x00,0x01,0x00,0xd3,0x18,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,
++	0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0xd2,0x08,0x11,
++	0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x01,0x07,0x07,0x00,0x01,0x00,0xcf,
++	0x86,0xd5,0x7b,0xd4,0x42,0xd3,0x14,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,
++	0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xd2,0x17,0xd1,0x08,0x10,0x04,0x01,
++	0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xe0,0xa7,0x87,0xe0,0xa6,0xbe,0x00,
++	0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe0,0xa7,0x87,0xe0,0xa7,0x97,0x00,0x01,0x09,0x10,
++	0x04,0x08,0x00,0x00,0x00,0xd3,0x10,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,
++	0x04,0x00,0x00,0x01,0x00,0x52,0x04,0x00,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xe0,
++	0xa6,0xa1,0xe0,0xa6,0xbc,0x00,0x01,0xff,0xe0,0xa6,0xa2,0xe0,0xa6,0xbc,0x00,0x10,
++	0x04,0x00,0x00,0x01,0xff,0xe0,0xa6,0xaf,0xe0,0xa6,0xbc,0x00,0xd4,0x10,0x93,0x0c,
++	0x52,0x04,0x01,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x53,0x04,0x01,0x00,
++	0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x0b,0x00,0x51,0x04,0x13,0x00,
++	0x10,0x04,0x14,0xe6,0x00,0x00,0xe2,0x48,0x02,0xe1,0x4f,0x01,0xd0,0xa4,0xcf,0x86,
++	0xd5,0x4c,0xd4,0x34,0xd3,0x1c,0xd2,0x10,0xd1,0x08,0x10,0x04,0x00,0x00,0x07,0x00,
++	0x10,0x04,0x01,0x00,0x07,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,
++	0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x51,0x04,0x00,0x00,
+ 	0x10,0x04,0x00,0x00,0x01,0x00,0x93,0x14,0x92,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,
+ 	0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,
+ 	0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,
+-	0xd3,0x18,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x01,0x00,
+-	0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,
+-	0x91,0x08,0x10,0x04,0x01,0x07,0x07,0x00,0x01,0x00,0xcf,0x86,0xd5,0x7b,0xd4,0x42,
+-	0xd3,0x14,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,
+-	0x00,0x00,0x01,0x00,0xd2,0x17,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,
+-	0x00,0x00,0x01,0xff,0xe0,0xa7,0x87,0xe0,0xa6,0xbe,0x00,0xd1,0x0f,0x10,0x0b,0x01,
+-	0xff,0xe0,0xa7,0x87,0xe0,0xa7,0x97,0x00,0x01,0x09,0x10,0x04,0x08,0x00,0x00,0x00,
+-	0xd3,0x10,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,
+-	0x52,0x04,0x00,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xe0,0xa6,0xa1,0xe0,0xa6,0xbc,
+-	0x00,0x01,0xff,0xe0,0xa6,0xa2,0xe0,0xa6,0xbc,0x00,0x10,0x04,0x00,0x00,0x01,0xff,
+-	0xe0,0xa6,0xaf,0xe0,0xa6,0xbc,0x00,0xd4,0x10,0x93,0x0c,0x52,0x04,0x01,0x00,0x11,
+-	0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,
+-	0x00,0x10,0x04,0x01,0x00,0x0b,0x00,0x51,0x04,0x13,0x00,0x10,0x04,0x14,0xe6,0x00,
+-	0x00,0xe2,0x48,0x02,0xe1,0x4f,0x01,0xd0,0xa4,0xcf,0x86,0xd5,0x4c,0xd4,0x34,0xd3,
+-	0x1c,0xd2,0x10,0xd1,0x08,0x10,0x04,0x00,0x00,0x07,0x00,0x10,0x04,0x01,0x00,0x07,
+-	0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,
+-	0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,
+-	0x00,0x93,0x14,0x92,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x00,
+-	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x91,
+-	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0xd3,0x2e,0xd2,0x17,0xd1,
+-	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xe0,0xa8,0xb2,
+-	0xe0,0xa8,0xbc,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,
+-	0xe0,0xa8,0xb8,0xe0,0xa8,0xbc,0x00,0x00,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,
+-	0x00,0x91,0x08,0x10,0x04,0x01,0x07,0x00,0x00,0x01,0x00,0xcf,0x86,0xd5,0x80,0xd4,
+-	0x34,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x51,
+-	0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,
+-	0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x01,
+-	0x09,0x00,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x0a,0x00,0x00,
+-	0x00,0x00,0x00,0xd2,0x25,0xd1,0x0f,0x10,0x04,0x00,0x00,0x01,0xff,0xe0,0xa8,0x96,
+-	0xe0,0xa8,0xbc,0x00,0x10,0x0b,0x01,0xff,0xe0,0xa8,0x97,0xe0,0xa8,0xbc,0x00,0x01,
+-	0xff,0xe0,0xa8,0x9c,0xe0,0xa8,0xbc,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,
+-	0x10,0x0b,0x01,0xff,0xe0,0xa8,0xab,0xe0,0xa8,0xbc,0x00,0x00,0x00,0xd4,0x10,0x93,
+-	0x0c,0x52,0x04,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x93,0x14,0x52,
+-	0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x0a,0x00,0x10,0x04,0x14,0x00,0x00,
+-	0x00,0x00,0x00,0xd0,0x82,0xcf,0x86,0xd5,0x40,0xd4,0x2c,0xd3,0x18,0xd2,0x0c,0x91,
+-	0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,
+-	0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x07,0x00,0x01,0x00,0x10,
+-	0x04,0x00,0x00,0x01,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x00,
+-	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x91,
+-	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0xd3,0x18,0xd2,0x0c,0x91,
+-	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,
+-	0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x01,
+-	0x07,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x3c,0xd4,0x28,0xd3,0x10,0x52,0x04,0x01,
+-	0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,
+-	0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x01,0x09,0x00,
+-	0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
+-	0x00,0x00,0x00,0xd4,0x18,0x93,0x14,0xd2,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x07,
+-	0x00,0x07,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd3,0x10,0x92,0x0c,0x91,
+-	0x08,0x10,0x04,0x0d,0x00,0x07,0x00,0x00,0x00,0x00,0x00,0x92,0x0c,0x91,0x08,0x10,
+-	0x04,0x00,0x00,0x11,0x00,0x13,0x00,0x13,0x00,0xe1,0x24,0x01,0xd0,0x86,0xcf,0x86,
+-	0xd5,0x44,0xd4,0x2c,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,
+-	0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,
+-	0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x93,0x14,
+-	0x92,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,
+-	0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,
+-	0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,
+-	0x01,0x00,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x07,0x00,0x01,0x00,
+-	0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x01,0x07,0x01,0x00,
+-	0x01,0x00,0xcf,0x86,0xd5,0x73,0xd4,0x45,0xd3,0x14,0x52,0x04,0x01,0x00,0xd1,0x08,
+-	0x10,0x04,0x0a,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xd2,0x1e,0xd1,0x0f,
+-	0x10,0x0b,0x01,0xff,0xe0,0xad,0x87,0xe0,0xad,0x96,0x00,0x00,0x00,0x10,0x04,0x00,
+-	0x00,0x01,0xff,0xe0,0xad,0x87,0xe0,0xac,0xbe,0x00,0x91,0x0f,0x10,0x0b,0x01,0xff,
+-	0xe0,0xad,0x87,0xe0,0xad,0x97,0x00,0x01,0x09,0x00,0x00,0xd3,0x0c,0x52,0x04,0x00,
+-	0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x52,0x04,0x00,0x00,0xd1,0x16,0x10,0x0b,0x01,
+-	0xff,0xe0,0xac,0xa1,0xe0,0xac,0xbc,0x00,0x01,0xff,0xe0,0xac,0xa2,0xe0,0xac,0xbc,
+-	0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xd4,0x14,0x93,0x10,0xd2,0x08,0x11,0x04,0x01,
+-	0x00,0x0a,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x93,0x10,0x92,0x0c,0x91,
+-	0x08,0x10,0x04,0x01,0x00,0x07,0x00,0x0c,0x00,0x0c,0x00,0x00,0x00,0xd0,0xb1,0xcf,
+-	0x86,0xd5,0x63,0xd4,0x28,0xd3,0x14,0xd2,0x08,0x11,0x04,0x00,0x00,0x01,0x00,0x91,
+-	0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,
+-	0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0xd3,0x1f,0xd2,0x0c,0x91,
+-	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x91,0x0f,0x10,0x0b,0x01,0xff,0xe0,
+-	0xae,0x92,0xe0,0xaf,0x97,0x00,0x01,0x00,0x00,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,
+-	0x00,0x00,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
+-	0x00,0x00,0x01,0x00,0xd4,0x2c,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,
+-	0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0xd2,0x0c,
+-	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,
+-	0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x08,0x00,0x01,0x00,
+-	0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0xcf,0x86,
+-	0xd5,0x61,0xd4,0x45,0xd3,0x14,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
+-	0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0xd2,0x1e,0xd1,0x08,0x10,0x04,0x01,0x00,
+-	0x00,0x00,0x10,0x0b,0x01,0xff,0xe0,0xaf,0x86,0xe0,0xae,0xbe,0x00,0x01,0xff,0xe0,
+-	0xaf,0x87,0xe0,0xae,0xbe,0x00,0x91,0x0f,0x10,0x0b,0x01,0xff,0xe0,0xaf,0x86,0xe0,
+-	0xaf,0x97,0x00,0x01,0x09,0x00,0x00,0x93,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0a,
+-	0x00,0x00,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x00,
+-	0x00,0xd4,0x14,0x93,0x10,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x08,
+-	0x00,0x01,0x00,0x01,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
+-	0x00,0x07,0x00,0x07,0x00,0x92,0x0c,0x51,0x04,0x07,0x00,0x10,0x04,0x07,0x00,0x00,
+-	0x00,0x00,0x00,0xe3,0x1c,0x04,0xe2,0x1a,0x02,0xd1,0xf3,0xd0,0x76,0xcf,0x86,0xd5,
+-	0x3c,0xd4,0x28,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x10,0x00,0x01,0x00,0x01,
+-	0x00,0x91,0x08,0x10,0x04,0x14,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0x91,
+-	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,
+-	0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,
+-	0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0xd3,
+-	0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x10,0x00,0x01,0x00,0x01,0x00,0xd2,
+-	0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x0a,0x00,0x01,
+-	0x00,0xcf,0x86,0xd5,0x53,0xd4,0x2f,0xd3,0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,
+-	0x04,0x01,0x00,0x00,0x00,0x01,0x00,0xd2,0x13,0x91,0x0f,0x10,0x0b,0x01,0xff,0xe0,
+-	0xb1,0x86,0xe0,0xb1,0x96,0x00,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
+-	0x01,0x09,0x00,0x00,0xd3,0x14,0x52,0x04,0x00,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,
+-	0x01,0x54,0x10,0x04,0x01,0x5b,0x00,0x00,0x92,0x0c,0x51,0x04,0x0a,0x00,0x10,0x04,
+-	0x11,0x00,0x00,0x00,0x00,0x00,0xd4,0x14,0x93,0x10,0xd2,0x08,0x11,0x04,0x01,0x00,
+-	0x0a,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x93,0x10,0x52,0x04,0x00,0x00,
+-	0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x15,0x00,0x0a,0x00,0xd0,0x76,0xcf,0x86,
+-	0xd5,0x3c,0xd4,0x28,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x12,0x00,0x10,0x00,
+-	0x01,0x00,0x91,0x08,0x10,0x04,0x14,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,
+-	0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,
+-	0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,
++	0xd3,0x2e,0xd2,0x17,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x01,0x00,
++	0x01,0xff,0xe0,0xa8,0xb2,0xe0,0xa8,0xbc,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,0x01,
++	0x00,0x10,0x0b,0x01,0xff,0xe0,0xa8,0xb8,0xe0,0xa8,0xbc,0x00,0x00,0x00,0xd2,0x08,
++	0x11,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x01,0x07,0x00,0x00,0x01,0x00,
++	0xcf,0x86,0xd5,0x80,0xd4,0x34,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,
++	0x01,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xd2,0x10,
++	0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x91,0x08,
++	0x10,0x04,0x01,0x00,0x01,0x09,0x00,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,
++	0x00,0x00,0x0a,0x00,0x00,0x00,0x00,0x00,0xd2,0x25,0xd1,0x0f,0x10,0x04,0x00,0x00,
++	0x01,0xff,0xe0,0xa8,0x96,0xe0,0xa8,0xbc,0x00,0x10,0x0b,0x01,0xff,0xe0,0xa8,0x97,
++	0xe0,0xa8,0xbc,0x00,0x01,0xff,0xe0,0xa8,0x9c,0xe0,0xa8,0xbc,0x00,0xd1,0x08,0x10,
++	0x04,0x01,0x00,0x00,0x00,0x10,0x0b,0x01,0xff,0xe0,0xa8,0xab,0xe0,0xa8,0xbc,0x00,
++	0x00,0x00,0xd4,0x10,0x93,0x0c,0x52,0x04,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,
++	0x01,0x00,0x93,0x14,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x0a,0x00,
++	0x10,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0xd0,0x82,0xcf,0x86,0xd5,0x40,0xd4,0x2c,
++	0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x91,0x08,
++	0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,
++	0x07,0x00,0x01,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,
++	0x01,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,
+ 	0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,
+-	0xd3,0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,
+-	0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x07,0x07,0x07,0x00,
+-	0x01,0x00,0xcf,0x86,0xd5,0x82,0xd4,0x5e,0xd3,0x2a,0xd2,0x13,0x91,0x0f,0x10,0x0b,
+-	0x01,0xff,0xe0,0xb2,0xbf,0xe0,0xb3,0x95,0x00,0x01,0x00,0x01,0x00,0xd1,0x08,0x10,
+-	0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xe0,0xb3,0x86,0xe0,0xb3,
+-	0x95,0x00,0xd2,0x28,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe0,0xb3,0x86,0xe0,0xb3,0x96,
+-	0x00,0x00,0x00,0x10,0x0b,0x01,0xff,0xe0,0xb3,0x86,0xe0,0xb3,0x82,0x00,0x01,0xff,
+-	0xe0,0xb3,0x86,0xe0,0xb3,0x82,0xe0,0xb3,0x95,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
+-	0x01,0x09,0x00,0x00,0xd3,0x14,0x52,0x04,0x00,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,
+-	0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,
+-	0x10,0x04,0x01,0x00,0x00,0x00,0xd4,0x14,0x93,0x10,0xd2,0x08,0x11,0x04,0x01,0x00,
+-	0x09,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x93,0x14,0x92,0x10,0xd1,0x08,
+-	0x10,0x04,0x00,0x00,0x09,0x00,0x10,0x04,0x09,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-	0xe1,0x06,0x01,0xd0,0x6e,0xcf,0x86,0xd5,0x3c,0xd4,0x28,0xd3,0x18,0xd2,0x0c,0x91,
+-	0x08,0x10,0x04,0x13,0x00,0x10,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,
+-	0x00,0x01,0x00,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,
+-	0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,
+-	0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,
+-	0x00,0x0c,0x00,0x01,0x00,0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,
+-	0x00,0x10,0x04,0x0c,0x00,0x13,0x09,0x91,0x08,0x10,0x04,0x13,0x09,0x0a,0x00,0x01,
+-	0x00,0xcf,0x86,0xd5,0x65,0xd4,0x45,0xd3,0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,
+-	0x04,0x0a,0x00,0x00,0x00,0x01,0x00,0xd2,0x1e,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,
+-	0x00,0x10,0x0b,0x01,0xff,0xe0,0xb5,0x86,0xe0,0xb4,0xbe,0x00,0x01,0xff,0xe0,0xb5,
+-	0x87,0xe0,0xb4,0xbe,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe0,0xb5,0x86,0xe0,0xb5,
+-	0x97,0x00,0x01,0x09,0x10,0x04,0x0c,0x00,0x12,0x00,0xd3,0x10,0x52,0x04,0x00,0x00,
+-	0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x01,0x00,0x52,0x04,0x12,0x00,0x51,0x04,
+-	0x12,0x00,0x10,0x04,0x12,0x00,0x11,0x00,0xd4,0x14,0x93,0x10,0xd2,0x08,0x11,0x04,
+-	0x01,0x00,0x0a,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd3,0x0c,0x52,0x04,
+-	0x0a,0x00,0x11,0x04,0x0a,0x00,0x12,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x12,0x00,
+-	0x0a,0x00,0x0a,0x00,0x0a,0x00,0xd0,0x5a,0xcf,0x86,0xd5,0x34,0xd4,0x18,0x93,0x14,
+-	0xd2,0x08,0x11,0x04,0x00,0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x04,0x00,
+-	0x04,0x00,0x04,0x00,0xd3,0x10,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,
+-	0x04,0x00,0x00,0x00,0x92,0x08,0x11,0x04,0x00,0x00,0x04,0x00,0x04,0x00,0x54,0x04,
+-	0x04,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,0x04,0x00,0x10,0x04,0x00,0x00,0x04,0x00,
+-	0x04,0x00,0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x04,0x00,0x00,0x00,
+-	0xcf,0x86,0xd5,0x77,0xd4,0x28,0xd3,0x10,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,
+-	0x10,0x04,0x04,0x00,0x00,0x00,0xd2,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x04,0x09,
+-	0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x04,0x00,0xd3,0x14,0x52,0x04,
+-	0x04,0x00,0xd1,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x10,0x04,0x04,0x00,0x00,0x00,
+-	0xd2,0x13,0x51,0x04,0x04,0x00,0x10,0x0b,0x04,0xff,0xe0,0xb7,0x99,0xe0,0xb7,0x8a,
+-	0x00,0x04,0x00,0xd1,0x19,0x10,0x0b,0x04,0xff,0xe0,0xb7,0x99,0xe0,0xb7,0x8f,0x00,
+-	0x04,0xff,0xe0,0xb7,0x99,0xe0,0xb7,0x8f,0xe0,0xb7,0x8a,0x00,0x10,0x0b,0x04,0xff,
+-	0xe0,0xb7,0x99,0xe0,0xb7,0x9f,0x00,0x04,0x00,0xd4,0x10,0x93,0x0c,0x52,0x04,0x00,
+-	0x00,0x11,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x93,0x14,0xd2,0x08,0x11,0x04,0x00,
+-	0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe2,
+-	0x31,0x01,0xd1,0x58,0xd0,0x3a,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,
+-	0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
+-	0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,0x67,0x10,0x04,
+-	0x01,0x09,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xcf,0x86,
+-	0x95,0x18,0xd4,0x0c,0x53,0x04,0x01,0x00,0x12,0x04,0x01,0x6b,0x01,0x00,0x53,0x04,
+-	0x01,0x00,0x12,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0xd0,0x9e,0xcf,0x86,0xd5,0x54,
+-	0xd4,0x3c,0xd3,0x20,0xd2,0x10,0xd1,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x10,0x04,
+-	0x01,0x00,0x00,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x15,0x00,
+-	0x01,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x15,0x00,0x10,0x04,0x01,0x00,
+-	0x00,0x00,0x91,0x08,0x10,0x04,0x15,0x00,0x01,0x00,0x15,0x00,0xd3,0x08,0x12,0x04,
+-	0x15,0x00,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x15,0x00,0x01,0x00,0x01,0x00,
+-	0x01,0x00,0xd4,0x30,0xd3,0x1c,0xd2,0x0c,0x91,0x08,0x10,0x04,0x15,0x00,0x01,0x00,
+-	0x01,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x10,0x04,0x00,0x00,0x01,0x00,
+-	0xd2,0x08,0x11,0x04,0x15,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x15,0x00,0x01,0x00,
+-	0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,0x76,0x10,0x04,0x15,0x09,
+-	0x01,0x00,0x11,0x04,0x01,0x00,0x00,0x00,0xcf,0x86,0x95,0x34,0xd4,0x20,0xd3,0x14,
+-	0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x01,0x00,
+-	0x00,0x00,0x52,0x04,0x01,0x7a,0x11,0x04,0x01,0x00,0x00,0x00,0x53,0x04,0x01,0x00,
+-	0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x01,0x00,0x0d,0x00,0x00,0x00,
+-	0xe1,0x2b,0x01,0xd0,0x3e,0xcf,0x86,0xd5,0x14,0x54,0x04,0x02,0x00,0x53,0x04,0x02,
+-	0x00,0x92,0x08,0x11,0x04,0x02,0xdc,0x02,0x00,0x02,0x00,0x54,0x04,0x02,0x00,0xd3,
+-	0x14,0x52,0x04,0x02,0x00,0xd1,0x08,0x10,0x04,0x02,0x00,0x02,0xdc,0x10,0x04,0x02,
+-	0x00,0x02,0xdc,0x92,0x0c,0x91,0x08,0x10,0x04,0x02,0x00,0x02,0xd8,0x02,0x00,0x02,
+-	0x00,0xcf,0x86,0xd5,0x73,0xd4,0x36,0xd3,0x17,0x92,0x13,0x51,0x04,0x02,0x00,0x10,
+-	0x04,0x02,0x00,0x02,0xff,0xe0,0xbd,0x82,0xe0,0xbe,0xb7,0x00,0x02,0x00,0xd2,0x0c,
+-	0x91,0x08,0x10,0x04,0x00,0x00,0x02,0x00,0x02,0x00,0x91,0x0f,0x10,0x04,0x02,0x00,
+-	0x02,0xff,0xe0,0xbd,0x8c,0xe0,0xbe,0xb7,0x00,0x02,0x00,0xd3,0x26,0xd2,0x13,0x51,
+-	0x04,0x02,0x00,0x10,0x0b,0x02,0xff,0xe0,0xbd,0x91,0xe0,0xbe,0xb7,0x00,0x02,0x00,
+-	0x51,0x04,0x02,0x00,0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbd,0x96,0xe0,0xbe,0xb7,
+-	0x00,0x52,0x04,0x02,0x00,0x91,0x0f,0x10,0x0b,0x02,0xff,0xe0,0xbd,0x9b,0xe0,0xbe,
+-	0xb7,0x00,0x02,0x00,0x02,0x00,0xd4,0x27,0x53,0x04,0x02,0x00,0xd2,0x17,0xd1,0x0f,
+-	0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbd,0x80,0xe0,0xbe,0xb5,0x00,0x10,0x04,0x04,
+-	0x00,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,0xd3,0x35,0xd2,
+-	0x17,0xd1,0x08,0x10,0x04,0x00,0x00,0x02,0x81,0x10,0x04,0x02,0x82,0x02,0xff,0xe0,
+-	0xbd,0xb1,0xe0,0xbd,0xb2,0x00,0xd1,0x0f,0x10,0x04,0x02,0x84,0x02,0xff,0xe0,0xbd,
+-	0xb1,0xe0,0xbd,0xb4,0x00,0x10,0x0b,0x02,0xff,0xe0,0xbe,0xb2,0xe0,0xbe,0x80,0x00,
+-	0x02,0x00,0xd2,0x13,0x91,0x0f,0x10,0x0b,0x02,0xff,0xe0,0xbe,0xb3,0xe0,0xbe,0x80,
+-	0x00,0x02,0x00,0x02,0x82,0x11,0x04,0x02,0x82,0x02,0x00,0xd0,0xd3,0xcf,0x86,0xd5,
+-	0x65,0xd4,0x27,0xd3,0x1f,0xd2,0x13,0x91,0x0f,0x10,0x04,0x02,0x82,0x02,0xff,0xe0,
+-	0xbd,0xb1,0xe0,0xbe,0x80,0x00,0x02,0xe6,0x91,0x08,0x10,0x04,0x02,0x09,0x02,0x00,
+-	0x02,0xe6,0x12,0x04,0x02,0x00,0x0c,0x00,0xd3,0x1f,0xd2,0x13,0x51,0x04,0x02,0x00,
+-	0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbe,0x92,0xe0,0xbe,0xb7,0x00,0x51,0x04,0x02,
+-	0x00,0x10,0x04,0x04,0x00,0x02,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x02,
+-	0x00,0x02,0x00,0x91,0x0f,0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbe,0x9c,0xe0,0xbe,
+-	0xb7,0x00,0x02,0x00,0xd4,0x3d,0xd3,0x26,0xd2,0x13,0x51,0x04,0x02,0x00,0x10,0x0b,
+-	0x02,0xff,0xe0,0xbe,0xa1,0xe0,0xbe,0xb7,0x00,0x02,0x00,0x51,0x04,0x02,0x00,0x10,
+-	0x04,0x02,0x00,0x02,0xff,0xe0,0xbe,0xa6,0xe0,0xbe,0xb7,0x00,0x52,0x04,0x02,0x00,
+-	0x91,0x0f,0x10,0x0b,0x02,0xff,0xe0,0xbe,0xab,0xe0,0xbe,0xb7,0x00,0x02,0x00,0x04,
+-	0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x02,0x00,0x02,0x00,0x02,
+-	0x00,0xd2,0x13,0x91,0x0f,0x10,0x04,0x04,0x00,0x02,0xff,0xe0,0xbe,0x90,0xe0,0xbe,
+-	0xb5,0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0xcf,0x86,
+-	0x95,0x4c,0xd4,0x24,0xd3,0x10,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,
+-	0x04,0xdc,0x04,0x00,0x52,0x04,0x04,0x00,0xd1,0x08,0x10,0x04,0x04,0x00,0x00,0x00,
+-	0x10,0x04,0x0a,0x00,0x04,0x00,0xd3,0x14,0xd2,0x08,0x11,0x04,0x08,0x00,0x0a,0x00,
+-	0x91,0x08,0x10,0x04,0x0a,0x00,0x0b,0x00,0x0b,0x00,0x92,0x10,0xd1,0x08,0x10,0x04,
+-	0x0b,0x00,0x0c,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,
+-	0xe5,0xf7,0x04,0xe4,0x79,0x03,0xe3,0x7b,0x01,0xe2,0x04,0x01,0xd1,0x7f,0xd0,0x65,
+-	0xcf,0x86,0x55,0x04,0x04,0x00,0xd4,0x33,0xd3,0x1f,0xd2,0x0c,0x51,0x04,0x04,0x00,
+-	0x10,0x04,0x0a,0x00,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x0b,0x04,0xff,0xe1,0x80,
+-	0xa5,0xe1,0x80,0xae,0x00,0x04,0x00,0x92,0x10,0xd1,0x08,0x10,0x04,0x0a,0x00,0x04,
+-	0x00,0x10,0x04,0x04,0x00,0x0a,0x00,0x04,0x00,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x04,
+-	0x00,0x10,0x04,0x04,0x00,0x0a,0x00,0x51,0x04,0x0a,0x00,0x10,0x04,0x04,0x00,0x04,
+-	0x07,0x92,0x10,0xd1,0x08,0x10,0x04,0x04,0x00,0x04,0x09,0x10,0x04,0x0a,0x09,0x0a,
+-	0x00,0x0a,0x00,0xcf,0x86,0x95,0x14,0x54,0x04,0x04,0x00,0x53,0x04,0x04,0x00,0x92,
+-	0x08,0x11,0x04,0x04,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0xd0,0x2e,0xcf,0x86,0x95,
+-	0x28,0xd4,0x14,0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,
+-	0x00,0x0a,0xdc,0x0a,0x00,0x53,0x04,0x0a,0x00,0xd2,0x08,0x11,0x04,0x0a,0x00,0x0b,
+-	0x00,0x11,0x04,0x0b,0x00,0x0a,0x00,0x01,0x00,0xcf,0x86,0xd5,0x24,0x94,0x20,0xd3,
+-	0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x00,0x00,0x0d,0x00,0x52,
+-	0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x0d,0x00,0x00,0x00,0x01,0x00,0x54,
+-	0x04,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
+-	0x00,0x06,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x06,0x00,0x08,0x00,0x10,0x04,0x08,
+-	0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x08,0x00,0x0d,0x00,0x0d,0x00,0xd1,0x3e,0xd0,
+-	0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0x1d,0x54,0x04,0x01,0x00,0x53,0x04,0x01,
+-	0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,
+-	0x00,0x01,0xff,0x00,0x94,0x15,0x93,0x11,0x92,0x0d,0x91,0x09,0x10,0x05,0x01,0xff,
+-	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd0,0x1e,0xcf,0x86,0x55,
+-	0x04,0x01,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
+-	0x00,0x0b,0x00,0x0b,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,
+-	0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x92,0x08,0x11,0x04,0x01,0x00,0x0b,0x00,0x0b,
+-	0x00,0xe2,0x21,0x01,0xd1,0x6c,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x94,0x14,0x93,0x10,
+-	0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0x04,0x00,
+-	0x04,0x00,0x04,0x00,0xcf,0x86,0x95,0x48,0xd4,0x24,0xd3,0x10,0x52,0x04,0x04,0x00,
+-	0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,
+-	0x04,0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0xd3,0x10,0x52,0x04,
+-	0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0xd2,0x0c,0x91,0x08,
+-	0x10,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0x04,0x00,
+-	0xd0,0x62,0xcf,0x86,0xd5,0x28,0x94,0x24,0xd3,0x10,0x52,0x04,0x04,0x00,0x51,0x04,
+-	0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,
+-	0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0xd4,0x14,0x53,0x04,
+-	0x04,0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,
+-	0xd3,0x14,0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0x11,0x04,
+-	0x04,0x00,0x00,0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,
+-	0x00,0x00,0xcf,0x86,0xd5,0x38,0xd4,0x24,0xd3,0x14,0xd2,0x0c,0x91,0x08,0x10,0x04,
+-	0x04,0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0x52,0x04,0x04,0x00,
+-	0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0x93,0x10,0x52,0x04,0x04,0x00,
+-	0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0x94,0x14,0x53,0x04,
+-	0x04,0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,
+-	0x04,0x00,0xd1,0x9c,0xd0,0x3e,0xcf,0x86,0x95,0x38,0xd4,0x14,0x53,0x04,0x04,0x00,
+-	0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0xd3,0x14,
+-	0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,
+-	0x00,0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,
+-	0x04,0x00,0xcf,0x86,0xd5,0x34,0xd4,0x14,0x93,0x10,0x52,0x04,0x04,0x00,0x51,0x04,
+-	0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0x04,0x00,0x53,0x04,0x04,0x00,0xd2,0x0c,
+-	0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,
+-	0x0c,0xe6,0x10,0x04,0x0c,0xe6,0x08,0xe6,0xd4,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,
+-	0x10,0x04,0x08,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x53,0x04,0x04,0x00,
+-	0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0xd0,0x1a,
+-	0xcf,0x86,0x95,0x14,0x54,0x04,0x08,0x00,0x53,0x04,0x08,0x00,0x92,0x08,0x11,0x04,
+-	0x08,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,
+-	0x04,0x00,0xd3,0x10,0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x11,0x00,
+-	0x00,0x00,0x52,0x04,0x11,0x00,0x11,0x04,0x11,0x00,0x00,0x00,0xd3,0x30,0xd2,0x2a,
+-	0xd1,0x24,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,
+-	0x10,0x04,0x0b,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,
+-	0xcf,0x06,0x04,0x00,0xcf,0x06,0x04,0x00,0xcf,0x06,0x04,0x00,0xd2,0x6c,0xd1,0x24,
+-	0xd0,0x06,0xcf,0x06,0x04,0x00,0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,0x00,
+-	0x93,0x10,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x0b,0x00,
+-	0x0b,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x04,0x00,0x53,0x04,0x04,0x00,
+-	0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x04,0x00,
+-	0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,
+-	0x10,0x04,0x04,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,
+-	0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,0x80,0xd0,0x46,0xcf,0x86,0xd5,0x28,
+-	0xd4,0x14,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x91,0x08,0x10,0x04,0x06,0x00,
+-	0x00,0x00,0x06,0x00,0x93,0x10,0x52,0x04,0x06,0x00,0x91,0x08,0x10,0x04,0x06,0x09,
+-	0x00,0x00,0x00,0x00,0x00,0x00,0x54,0x04,0x06,0x00,0x93,0x14,0x52,0x04,0x06,0x00,
+-	0xd1,0x08,0x10,0x04,0x06,0x09,0x06,0x00,0x10,0x04,0x06,0x00,0x00,0x00,0x00,0x00,
+-	0xcf,0x86,0xd5,0x10,0x54,0x04,0x06,0x00,0x93,0x08,0x12,0x04,0x06,0x00,0x00,0x00,
+-	0x00,0x00,0xd4,0x14,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x91,0x08,0x10,0x04,
+-	0x06,0x00,0x00,0x00,0x06,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x06,0x00,
+-	0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0xd0,0x1b,0xcf,0x86,0x55,0x04,0x04,0x00,
+-	0x54,0x04,0x04,0x00,0x93,0x0d,0x52,0x04,0x04,0x00,0x11,0x05,0x04,0xff,0x00,0x04,
+-	0x00,0x04,0x00,0xcf,0x86,0xd5,0x24,0x54,0x04,0x04,0x00,0xd3,0x10,0x92,0x0c,0x51,
+-	0x04,0x04,0x00,0x10,0x04,0x04,0x09,0x04,0x00,0x04,0x00,0x52,0x04,0x04,0x00,0x91,
+-	0x08,0x10,0x04,0x04,0x00,0x07,0xe6,0x00,0x00,0xd4,0x10,0x53,0x04,0x04,0x00,0x92,
+-	0x08,0x11,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x07,0x00,0x92,0x08,0x11,
+-	0x04,0x07,0x00,0x00,0x00,0x00,0x00,0xe4,0xb7,0x03,0xe3,0x58,0x01,0xd2,0x8f,0xd1,
+-	0x53,0xd0,0x35,0xcf,0x86,0x95,0x2f,0xd4,0x1f,0x53,0x04,0x04,0x00,0xd2,0x0d,0x51,
+-	0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x04,0xff,0x00,0x51,0x05,0x04,0xff,0x00,0x10,
+-	0x05,0x04,0xff,0x00,0x00,0x00,0x53,0x04,0x04,0x00,0x92,0x08,0x11,0x04,0x04,0x00,
+-	0x00,0x00,0x00,0x00,0x04,0x00,0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,0x00,
+-	0x53,0x04,0x04,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,0x00,0x00,
+-	0x00,0x00,0xd0,0x22,0xcf,0x86,0x55,0x04,0x04,0x00,0x94,0x18,0x53,0x04,0x04,0x00,
+-	0x92,0x10,0xd1,0x08,0x10,0x04,0x04,0x00,0x04,0xe4,0x10,0x04,0x0a,0x00,0x00,0x00,
+-	0x00,0x00,0x0b,0x00,0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,0x0b,0x00,0x93,0x0c,
+-	0x52,0x04,0x0b,0x00,0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0xd1,0x80,0xd0,0x42,
+-	0xcf,0x86,0xd5,0x1c,0x54,0x04,0x07,0x00,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,
+-	0xd1,0x08,0x10,0x04,0x07,0x00,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0xd4,0x0c,
+-	0x53,0x04,0x07,0x00,0x12,0x04,0x07,0x00,0x00,0x00,0x53,0x04,0x07,0x00,0x92,0x10,
+-	0xd1,0x08,0x10,0x04,0x07,0x00,0x07,0xde,0x10,0x04,0x07,0xe6,0x07,0xdc,0x00,0x00,
+-	0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x07,0x00,
+-	0x00,0x00,0x00,0x00,0x07,0x00,0x07,0x00,0x07,0x00,0xd4,0x10,0x53,0x04,0x07,0x00,
+-	0x52,0x04,0x07,0x00,0x11,0x04,0x07,0x00,0x00,0x00,0x93,0x10,0x52,0x04,0x07,0x00,
+-	0x91,0x08,0x10,0x04,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd0,0x1a,0xcf,0x86,
+-	0x55,0x04,0x08,0x00,0x94,0x10,0x53,0x04,0x08,0x00,0x92,0x08,0x11,0x04,0x08,0x00,
+-	0x0b,0x00,0x00,0x00,0x08,0x00,0xcf,0x86,0x95,0x28,0xd4,0x10,0x53,0x04,0x08,0x00,
+-	0x92,0x08,0x11,0x04,0x08,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x08,0x00,0xd2,0x0c,
+-	0x51,0x04,0x08,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x08,0x00,
+-	0x07,0x00,0xd2,0xe4,0xd1,0x80,0xd0,0x2e,0xcf,0x86,0x95,0x28,0x54,0x04,0x08,0x00,
+-	0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x08,0xe6,
+-	0xd2,0x0c,0x91,0x08,0x10,0x04,0x08,0xdc,0x08,0x00,0x08,0x00,0x11,0x04,0x00,0x00,
+-	0x08,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,
+-	0x52,0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0xd4,0x14,
+-	0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0b,0x09,0x0b,0x00,0x0b,0x00,0x0b,0x00,
+-	0x0b,0x00,0xd3,0x10,0x52,0x04,0x0b,0x00,0x91,0x08,0x10,0x04,0x0b,0x00,0x0b,0xe6,
+-	0x0b,0xe6,0x52,0x04,0x0b,0xe6,0xd1,0x08,0x10,0x04,0x0b,0xe6,0x00,0x00,0x10,0x04,
+-	0x00,0x00,0x0b,0xdc,0xd0,0x5e,0xcf,0x86,0xd5,0x20,0xd4,0x10,0x53,0x04,0x0b,0x00,
+-	0x92,0x08,0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x0b,0x00,0x92,0x08,
+-	0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0xd4,0x10,0x53,0x04,0x0b,0x00,0x52,0x04,
+-	0x0b,0x00,0x11,0x04,0x0b,0x00,0x00,0x00,0xd3,0x10,0x52,0x04,0x10,0xe6,0x91,0x08,
+-	0x10,0x04,0x10,0xe6,0x10,0xdc,0x10,0xdc,0xd2,0x0c,0x51,0x04,0x10,0xdc,0x10,0x04,
+-	0x10,0xdc,0x10,0xe6,0xd1,0x08,0x10,0x04,0x10,0xe6,0x10,0xdc,0x10,0x04,0x10,0x00,
+-	0x00,0x00,0xcf,0x06,0x00,0x00,0xe1,0x1e,0x01,0xd0,0xaa,0xcf,0x86,0xd5,0x6e,0xd4,
+-	0x53,0xd3,0x17,0x52,0x04,0x09,0x00,0x51,0x04,0x09,0x00,0x10,0x0b,0x09,0xff,0xe1,
+-	0xac,0x85,0xe1,0xac,0xb5,0x00,0x09,0x00,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x09,0xff,
+-	0xe1,0xac,0x87,0xe1,0xac,0xb5,0x00,0x09,0x00,0x10,0x0b,0x09,0xff,0xe1,0xac,0x89,
+-	0xe1,0xac,0xb5,0x00,0x09,0x00,0xd1,0x0f,0x10,0x0b,0x09,0xff,0xe1,0xac,0x8b,0xe1,
+-	0xac,0xb5,0x00,0x09,0x00,0x10,0x0b,0x09,0xff,0xe1,0xac,0x8d,0xe1,0xac,0xb5,0x00,
+-	0x09,0x00,0x93,0x17,0x92,0x13,0x51,0x04,0x09,0x00,0x10,0x0b,0x09,0xff,0xe1,0xac,
+-	0x91,0xe1,0xac,0xb5,0x00,0x09,0x00,0x09,0x00,0x09,0x00,0x54,0x04,0x09,0x00,0xd3,
+-	0x10,0x52,0x04,0x09,0x00,0x91,0x08,0x10,0x04,0x09,0x07,0x09,0x00,0x09,0x00,0xd2,
+-	0x13,0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x09,0xff,0xe1,0xac,0xba,0xe1,0xac,
+-	0xb5,0x00,0x91,0x0f,0x10,0x04,0x09,0x00,0x09,0xff,0xe1,0xac,0xbc,0xe1,0xac,0xb5,
+-	0x00,0x09,0x00,0xcf,0x86,0xd5,0x3d,0x94,0x39,0xd3,0x31,0xd2,0x25,0xd1,0x16,0x10,
+-	0x0b,0x09,0xff,0xe1,0xac,0xbe,0xe1,0xac,0xb5,0x00,0x09,0xff,0xe1,0xac,0xbf,0xe1,
+-	0xac,0xb5,0x00,0x10,0x04,0x09,0x00,0x09,0xff,0xe1,0xad,0x82,0xe1,0xac,0xb5,0x00,
+-	0x91,0x08,0x10,0x04,0x09,0x09,0x09,0x00,0x09,0x00,0x12,0x04,0x09,0x00,0x00,0x00,
+-	0x09,0x00,0xd4,0x1c,0x53,0x04,0x09,0x00,0xd2,0x0c,0x51,0x04,0x09,0x00,0x10,0x04,
+-	0x09,0x00,0x09,0xe6,0x91,0x08,0x10,0x04,0x09,0xdc,0x09,0xe6,0x09,0xe6,0xd3,0x08,
+-	0x12,0x04,0x09,0xe6,0x09,0x00,0x52,0x04,0x09,0x00,0x91,0x08,0x10,0x04,0x09,0x00,
+-	0x00,0x00,0x00,0x00,0xd0,0x2e,0xcf,0x86,0x55,0x04,0x0a,0x00,0xd4,0x18,0x53,0x04,
+-	0x0a,0x00,0xd2,0x0c,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x09,0x0d,0x09,0x11,0x04,
+-	0x0d,0x00,0x0a,0x00,0x53,0x04,0x0a,0x00,0x92,0x08,0x11,0x04,0x0a,0x00,0x0d,0x00,
+-	0x0d,0x00,0xcf,0x86,0x55,0x04,0x0c,0x00,0xd4,0x14,0x93,0x10,0x52,0x04,0x0c,0x00,
+-	0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x07,0x0c,0x00,0x0c,0x00,0xd3,0x0c,0x92,0x08,
+-	0x11,0x04,0x0c,0x00,0x0c,0x09,0x00,0x00,0x12,0x04,0x00,0x00,0x0c,0x00,0xe3,0xb2,
+-	0x01,0xe2,0x09,0x01,0xd1,0x4c,0xd0,0x2a,0xcf,0x86,0x55,0x04,0x0a,0x00,0x54,0x04,
+-	0x0a,0x00,0xd3,0x10,0x52,0x04,0x0a,0x00,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x00,
+-	0x0a,0x07,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0a,0x00,0x0a,0x00,
+-	0xcf,0x86,0x95,0x1c,0x94,0x18,0x53,0x04,0x0a,0x00,0xd2,0x08,0x11,0x04,0x0a,0x00,
+-	0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,
+-	0xd0,0x3a,0xcf,0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x12,0x00,0x92,0x0c,0x91,0x08,
+-	0x10,0x04,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x14,0x00,0x54,0x04,0x14,0x00,
+-	0x53,0x04,0x14,0x00,0xd2,0x0c,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x00,0x00,
+-	0x91,0x08,0x10,0x04,0x00,0x00,0x14,0x00,0x14,0x00,0xcf,0x86,0xd5,0x2c,0xd4,0x08,
+-	0x13,0x04,0x0d,0x00,0x00,0x00,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x0b,0xe6,0x10,0x04,
+-	0x0b,0xe6,0x0b,0x00,0x91,0x08,0x10,0x04,0x0b,0x01,0x0b,0xdc,0x0b,0xdc,0x92,0x08,
+-	0x11,0x04,0x0b,0xdc,0x0b,0xe6,0x0b,0xdc,0xd4,0x28,0xd3,0x10,0x92,0x0c,0x91,0x08,
+-	0x10,0x04,0x0b,0xe6,0x0b,0x00,0x0b,0x01,0x0b,0x01,0xd2,0x0c,0x91,0x08,0x10,0x04,
+-	0x0b,0x01,0x0b,0x00,0x0b,0x00,0x91,0x08,0x10,0x04,0x0b,0x00,0x0b,0xdc,0x0b,0x00,
+-	0xd3,0x1c,0xd2,0x0c,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x0d,0x00,0xd1,0x08,
+-	0x10,0x04,0x0d,0xe6,0x0d,0x00,0x10,0x04,0x0d,0x00,0x13,0x00,0x92,0x0c,0x51,0x04,
+-	0x10,0xe6,0x10,0x04,0x15,0x00,0x00,0x00,0x00,0x00,0xd1,0x1c,0xd0,0x06,0xcf,0x06,
+-	0x07,0x00,0xcf,0x86,0x55,0x04,0x07,0x00,0x94,0x0c,0x53,0x04,0x07,0x00,0x12,0x04,
+-	0x07,0x00,0x08,0x00,0x08,0x00,0xd0,0x06,0xcf,0x06,0x08,0x00,0xcf,0x86,0xd5,0x40,
+-	0xd4,0x2c,0xd3,0x10,0x92,0x0c,0x51,0x04,0x08,0xe6,0x10,0x04,0x08,0xdc,0x08,0xe6,
+-	0x09,0xe6,0xd2,0x0c,0x51,0x04,0x09,0xe6,0x10,0x04,0x09,0xdc,0x0a,0xe6,0xd1,0x08,
+-	0x10,0x04,0x0a,0xe6,0x0a,0xea,0x10,0x04,0x0a,0xd6,0x0a,0xdc,0x93,0x10,0x92,0x0c,
+-	0x91,0x08,0x10,0x04,0x0a,0xca,0x0a,0xe6,0x0a,0xe6,0x0a,0xe6,0x0a,0xe6,0xd4,0x14,
+-	0x93,0x10,0x52,0x04,0x0a,0xe6,0x51,0x04,0x0a,0xe6,0x10,0x04,0x0a,0xe6,0x10,0xe6,
+-	0x10,0xe6,0xd3,0x10,0x52,0x04,0x10,0xe6,0x51,0x04,0x10,0xe6,0x10,0x04,0x13,0xe8,
+-	0x13,0xe4,0xd2,0x10,0xd1,0x08,0x10,0x04,0x13,0xe4,0x13,0xdc,0x10,0x04,0x00,0x00,
+-	0x12,0xe6,0xd1,0x08,0x10,0x04,0x0c,0xe9,0x0b,0xdc,0x10,0x04,0x09,0xe6,0x09,0xdc,
+-	0xe2,0x80,0x08,0xe1,0x48,0x04,0xe0,0x1c,0x02,0xcf,0x86,0xe5,0x11,0x01,0xd4,0x84,
+-	0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0xa5,0x00,0x01,0xff,
+-	0x61,0xcc,0xa5,0x00,0x10,0x08,0x01,0xff,0x42,0xcc,0x87,0x00,0x01,0xff,0x62,0xcc,
+-	0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x42,0xcc,0xa3,0x00,0x01,0xff,0x62,0xcc,
+-	0xa3,0x00,0x10,0x08,0x01,0xff,0x42,0xcc,0xb1,0x00,0x01,0xff,0x62,0xcc,0xb1,0x00,
+-	0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x43,0xcc,0xa7,0xcc,0x81,0x00,0x01,0xff,
+-	0x63,0xcc,0xa7,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x44,0xcc,0x87,0x00,0x01,0xff,
+-	0x64,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x44,0xcc,0xa3,0x00,0x01,0xff,
+-	0x64,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x44,0xcc,0xb1,0x00,0x01,0xff,0x64,0xcc,
+-	0xb1,0x00,0xd3,0x48,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x44,0xcc,0xa7,0x00,
+-	0x01,0xff,0x64,0xcc,0xa7,0x00,0x10,0x08,0x01,0xff,0x44,0xcc,0xad,0x00,0x01,0xff,
+-	0x64,0xcc,0xad,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x45,0xcc,0x84,0xcc,0x80,0x00,
+-	0x01,0xff,0x65,0xcc,0x84,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x45,0xcc,0x84,0xcc,
+-	0x81,0x00,0x01,0xff,0x65,0xcc,0x84,0xcc,0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x01,0xff,0x45,0xcc,0xad,0x00,0x01,0xff,0x65,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,
+-	0x45,0xcc,0xb0,0x00,0x01,0xff,0x65,0xcc,0xb0,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,
+-	0x45,0xcc,0xa7,0xcc,0x86,0x00,0x01,0xff,0x65,0xcc,0xa7,0xcc,0x86,0x00,0x10,0x08,
+-	0x01,0xff,0x46,0xcc,0x87,0x00,0x01,0xff,0x66,0xcc,0x87,0x00,0xd4,0x84,0xd3,0x40,
+-	0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x47,0xcc,0x84,0x00,0x01,0xff,0x67,0xcc,
+-	0x84,0x00,0x10,0x08,0x01,0xff,0x48,0xcc,0x87,0x00,0x01,0xff,0x68,0xcc,0x87,0x00,
+-	0xd1,0x10,0x10,0x08,0x01,0xff,0x48,0xcc,0xa3,0x00,0x01,0xff,0x68,0xcc,0xa3,0x00,
+-	0x10,0x08,0x01,0xff,0x48,0xcc,0x88,0x00,0x01,0xff,0x68,0xcc,0x88,0x00,0xd2,0x20,
+-	0xd1,0x10,0x10,0x08,0x01,0xff,0x48,0xcc,0xa7,0x00,0x01,0xff,0x68,0xcc,0xa7,0x00,
+-	0x10,0x08,0x01,0xff,0x48,0xcc,0xae,0x00,0x01,0xff,0x68,0xcc,0xae,0x00,0xd1,0x10,
+-	0x10,0x08,0x01,0xff,0x49,0xcc,0xb0,0x00,0x01,0xff,0x69,0xcc,0xb0,0x00,0x10,0x0a,
+-	0x01,0xff,0x49,0xcc,0x88,0xcc,0x81,0x00,0x01,0xff,0x69,0xcc,0x88,0xcc,0x81,0x00,
+-	0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x4b,0xcc,0x81,0x00,0x01,0xff,
+-	0x6b,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x4b,0xcc,0xa3,0x00,0x01,0xff,0x6b,0xcc,
+-	0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4b,0xcc,0xb1,0x00,0x01,0xff,0x6b,0xcc,
+-	0xb1,0x00,0x10,0x08,0x01,0xff,0x4c,0xcc,0xa3,0x00,0x01,0xff,0x6c,0xcc,0xa3,0x00,
+-	0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4c,0xcc,0xa3,0xcc,0x84,0x00,0x01,0xff,
+-	0x6c,0xcc,0xa3,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x4c,0xcc,0xb1,0x00,0x01,0xff,
+-	0x6c,0xcc,0xb1,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4c,0xcc,0xad,0x00,0x01,0xff,
+-	0x6c,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x4d,0xcc,0x81,0x00,0x01,0xff,0x6d,0xcc,
+-	0x81,0x00,0xcf,0x86,0xe5,0x15,0x01,0xd4,0x88,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0x4d,0xcc,0x87,0x00,0x01,0xff,0x6d,0xcc,0x87,0x00,0x10,0x08,0x01,
+-	0xff,0x4d,0xcc,0xa3,0x00,0x01,0xff,0x6d,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,
+-	0xff,0x4e,0xcc,0x87,0x00,0x01,0xff,0x6e,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x4e,
+-	0xcc,0xa3,0x00,0x01,0xff,0x6e,0xcc,0xa3,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
+-	0xff,0x4e,0xcc,0xb1,0x00,0x01,0xff,0x6e,0xcc,0xb1,0x00,0x10,0x08,0x01,0xff,0x4e,
+-	0xcc,0xad,0x00,0x01,0xff,0x6e,0xcc,0xad,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,
+-	0xcc,0x83,0xcc,0x81,0x00,0x01,0xff,0x6f,0xcc,0x83,0xcc,0x81,0x00,0x10,0x0a,0x01,
+-	0xff,0x4f,0xcc,0x83,0xcc,0x88,0x00,0x01,0xff,0x6f,0xcc,0x83,0xcc,0x88,0x00,0xd3,
+-	0x48,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x84,0xcc,0x80,0x00,0x01,
+-	0xff,0x6f,0xcc,0x84,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x84,0xcc,0x81,
+-	0x00,0x01,0xff,0x6f,0xcc,0x84,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x50,
+-	0xcc,0x81,0x00,0x01,0xff,0x70,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x50,0xcc,0x87,
+-	0x00,0x01,0xff,0x70,0xcc,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x52,
+-	0xcc,0x87,0x00,0x01,0xff,0x72,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x52,0xcc,0xa3,
+-	0x00,0x01,0xff,0x72,0xcc,0xa3,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x52,0xcc,0xa3,
+-	0xcc,0x84,0x00,0x01,0xff,0x72,0xcc,0xa3,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x52,
+-	0xcc,0xb1,0x00,0x01,0xff,0x72,0xcc,0xb1,0x00,0xd4,0x8c,0xd3,0x48,0xd2,0x20,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0x53,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x87,0x00,0x10,
+-	0x08,0x01,0xff,0x53,0xcc,0xa3,0x00,0x01,0xff,0x73,0xcc,0xa3,0x00,0xd1,0x14,0x10,
+-	0x0a,0x01,0xff,0x53,0xcc,0x81,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x81,0xcc,0x87,
+-	0x00,0x10,0x0a,0x01,0xff,0x53,0xcc,0x8c,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x8c,
+-	0xcc,0x87,0x00,0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x53,0xcc,0xa3,0xcc,0x87,
+-	0x00,0x01,0xff,0x73,0xcc,0xa3,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x54,0xcc,0x87,
+-	0x00,0x01,0xff,0x74,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x54,0xcc,0xa3,
+-	0x00,0x01,0xff,0x74,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x54,0xcc,0xb1,0x00,0x01,
+-	0xff,0x74,0xcc,0xb1,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x54,
+-	0xcc,0xad,0x00,0x01,0xff,0x74,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0xa4,
+-	0x00,0x01,0xff,0x75,0xcc,0xa4,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x55,0xcc,0xb0,
+-	0x00,0x01,0xff,0x75,0xcc,0xb0,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0xad,0x00,0x01,
+-	0xff,0x75,0xcc,0xad,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x55,0xcc,0x83,
+-	0xcc,0x81,0x00,0x01,0xff,0x75,0xcc,0x83,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x55,
+-	0xcc,0x84,0xcc,0x88,0x00,0x01,0xff,0x75,0xcc,0x84,0xcc,0x88,0x00,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0x56,0xcc,0x83,0x00,0x01,0xff,0x76,0xcc,0x83,0x00,0x10,0x08,0x01,
+-	0xff,0x56,0xcc,0xa3,0x00,0x01,0xff,0x76,0xcc,0xa3,0x00,0xe0,0x10,0x02,0xcf,0x86,
+-	0xd5,0xe1,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x57,0xcc,
+-	0x80,0x00,0x01,0xff,0x77,0xcc,0x80,0x00,0x10,0x08,0x01,0xff,0x57,0xcc,0x81,0x00,
+-	0x01,0xff,0x77,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x57,0xcc,0x88,0x00,
+-	0x01,0xff,0x77,0xcc,0x88,0x00,0x10,0x08,0x01,0xff,0x57,0xcc,0x87,0x00,0x01,0xff,
+-	0x77,0xcc,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x57,0xcc,0xa3,0x00,
+-	0x01,0xff,0x77,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x58,0xcc,0x87,0x00,0x01,0xff,
+-	0x78,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x58,0xcc,0x88,0x00,0x01,0xff,
+-	0x78,0xcc,0x88,0x00,0x10,0x08,0x01,0xff,0x59,0xcc,0x87,0x00,0x01,0xff,0x79,0xcc,
+-	0x87,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x5a,0xcc,0x82,0x00,
+-	0x01,0xff,0x7a,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x5a,0xcc,0xa3,0x00,0x01,0xff,
+-	0x7a,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x5a,0xcc,0xb1,0x00,0x01,0xff,
+-	0x7a,0xcc,0xb1,0x00,0x10,0x08,0x01,0xff,0x68,0xcc,0xb1,0x00,0x01,0xff,0x74,0xcc,
+-	0x88,0x00,0x92,0x1d,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x8a,0x00,0x01,0xff,
+-	0x79,0xcc,0x8a,0x00,0x10,0x04,0x01,0x00,0x02,0xff,0xc5,0xbf,0xcc,0x87,0x00,0x0a,
+-	0x00,0xd4,0x98,0xd3,0x48,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0xa3,
+-	0x00,0x01,0xff,0x61,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x41,0xcc,0x89,0x00,0x01,
+-	0xff,0x61,0xcc,0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x41,0xcc,0x82,0xcc,0x81,
+-	0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x82,
+-	0xcc,0x80,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x80,0x00,0xd2,0x28,0xd1,0x14,0x10,
+-	0x0a,0x01,0xff,0x41,0xcc,0x82,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x89,
+-	0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x61,0xcc,0x82,
+-	0xcc,0x83,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x41,0xcc,0xa3,0xcc,0x82,0x00,0x01,
+-	0xff,0x61,0xcc,0xa3,0xcc,0x82,0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x86,0xcc,0x81,
+-	0x00,0x01,0xff,0x61,0xcc,0x86,0xcc,0x81,0x00,0xd3,0x50,0xd2,0x28,0xd1,0x14,0x10,
+-	0x0a,0x01,0xff,0x41,0xcc,0x86,0xcc,0x80,0x00,0x01,0xff,0x61,0xcc,0x86,0xcc,0x80,
+-	0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x86,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x86,
+-	0xcc,0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x41,0xcc,0x86,0xcc,0x83,0x00,0x01,
+-	0xff,0x61,0xcc,0x86,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0xa3,0xcc,0x86,
+-	0x00,0x01,0xff,0x61,0xcc,0xa3,0xcc,0x86,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
+-	0xff,0x45,0xcc,0xa3,0x00,0x01,0xff,0x65,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x45,
+-	0xcc,0x89,0x00,0x01,0xff,0x65,0xcc,0x89,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x45,
+-	0xcc,0x83,0x00,0x01,0xff,0x65,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x45,0xcc,0x82,
+-	0xcc,0x81,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x81,0x00,0xcf,0x86,0xe5,0x31,0x01,
+-	0xd4,0x90,0xd3,0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x45,0xcc,0x82,0xcc,
+-	0x80,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x45,0xcc,
+-	0x82,0xcc,0x89,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x89,0x00,0xd1,0x14,0x10,0x0a,
+-	0x01,0xff,0x45,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x83,0x00,
+-	0x10,0x0a,0x01,0xff,0x45,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,0x65,0xcc,0xa3,0xcc,
+-	0x82,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x49,0xcc,0x89,0x00,0x01,0xff,
+-	0x69,0xcc,0x89,0x00,0x10,0x08,0x01,0xff,0x49,0xcc,0xa3,0x00,0x01,0xff,0x69,0xcc,
+-	0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0xa3,0x00,0x01,0xff,0x6f,0xcc,
+-	0xa3,0x00,0x10,0x08,0x01,0xff,0x4f,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x89,0x00,
+-	0xd3,0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x82,0xcc,0x81,0x00,
+-	0x01,0xff,0x6f,0xcc,0x82,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x82,0xcc,
+-	0x80,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x80,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,
+-	0x4f,0xcc,0x82,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x89,0x00,0x10,0x0a,
+-	0x01,0xff,0x4f,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x83,0x00,
+-	0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,
+-	0x6f,0xcc,0xa3,0xcc,0x82,0x00,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x9b,0xcc,0x81,0x00,
+-	0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x81,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,
+-	0x9b,0xcc,0x80,0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,
+-	0x4f,0xcc,0x9b,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x89,0x00,0xd4,0x98,
+-	0xd3,0x48,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x9b,0xcc,0x83,0x00,
+-	0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x9b,0xcc,
+-	0xa3,0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
+-	0x55,0xcc,0xa3,0x00,0x01,0xff,0x75,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,
+-	0x89,0x00,0x01,0xff,0x75,0xcc,0x89,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,
+-	0x55,0xcc,0x9b,0xcc,0x81,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x81,0x00,0x10,0x0a,
+-	0x01,0xff,0x55,0xcc,0x9b,0xcc,0x80,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x80,0x00,
+-	0xd1,0x14,0x10,0x0a,0x01,0xff,0x55,0xcc,0x9b,0xcc,0x89,0x00,0x01,0xff,0x75,0xcc,
+-	0x9b,0xcc,0x89,0x00,0x10,0x0a,0x01,0xff,0x55,0xcc,0x9b,0xcc,0x83,0x00,0x01,0xff,
+-	0x75,0xcc,0x9b,0xcc,0x83,0x00,0xd3,0x44,0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,
+-	0x55,0xcc,0x9b,0xcc,0xa3,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0xa3,0x00,0x10,0x08,
+-	0x01,0xff,0x59,0xcc,0x80,0x00,0x01,0xff,0x79,0xcc,0x80,0x00,0xd1,0x10,0x10,0x08,
+-	0x01,0xff,0x59,0xcc,0xa3,0x00,0x01,0xff,0x79,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,
+-	0x59,0xcc,0x89,0x00,0x01,0xff,0x79,0xcc,0x89,0x00,0x92,0x14,0x91,0x10,0x10,0x08,
+-	0x01,0xff,0x59,0xcc,0x83,0x00,0x01,0xff,0x79,0xcc,0x83,0x00,0x0a,0x00,0x0a,0x00,
+-	0xe1,0xc0,0x04,0xe0,0x80,0x02,0xcf,0x86,0xe5,0x2d,0x01,0xd4,0xa8,0xd3,0x54,0xd2,
+-	0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x93,0x00,0x01,0xff,0xce,0xb1,
+-	0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,
+-	0xce,0xb1,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,
+-	0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,
+-	0xff,0xce,0xb1,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcd,0x82,
+-	0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x91,0xcc,0x93,0x00,0x01,0xff,
+-	0xce,0x91,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0x91,0xcc,0x93,0xcc,0x80,0x00,
+-	0x01,0xff,0xce,0x91,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,
+-	0x91,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0x91,0xcc,0x94,0xcc,0x81,0x00,0x10,
+-	0x0b,0x01,0xff,0xce,0x91,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0x91,0xcc,0x94,
+-	0xcd,0x82,0x00,0xd3,0x42,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb5,0xcc,
+-	0x93,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb5,0xcc,
+-	0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0xcc,0x80,0x00,0x91,0x16,0x10,
+-	0x0b,0x01,0xff,0xce,0xb5,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,
+-	0xcc,0x81,0x00,0x00,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x95,0xcc,
+-	0x93,0x00,0x01,0xff,0xce,0x95,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0x95,0xcc,
+-	0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0x95,0xcc,0x94,0xcc,0x80,0x00,0x91,0x16,0x10,
+-	0x0b,0x01,0xff,0xce,0x95,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0x95,0xcc,0x94,
+-	0xcc,0x81,0x00,0x00,0x00,0xd4,0xa8,0xd3,0x54,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,
+-	0xff,0xce,0xb7,0xcc,0x93,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0x00,0x10,0x0b,0x01,
+-	0xff,0xce,0xb7,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,
+-	0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,
+-	0xce,0xb7,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,
+-	0x82,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x82,0x00,0xd2,0x28,0xd1,0x12,0x10,
+-	0x09,0x01,0xff,0xce,0x97,0xcc,0x93,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0x00,0x10,
+-	0x0b,0x01,0xff,0xce,0x97,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,
+-	0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0x97,0xcc,0x93,0xcc,0x81,0x00,
+-	0x01,0xff,0xce,0x97,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xce,0x97,0xcc,
+-	0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcd,0x82,0x00,0xd3,0x54,0xd2,
+-	0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x93,0x00,0x01,0xff,0xce,0xb9,
+-	0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,
+-	0xce,0xb9,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,
+-	0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,
+-	0xff,0xce,0xb9,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0xcd,0x82,
+-	0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x99,0xcc,0x93,0x00,0x01,0xff,
+-	0xce,0x99,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0x99,0xcc,0x93,0xcc,0x80,0x00,
+-	0x01,0xff,0xce,0x99,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,
+-	0x99,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0x99,0xcc,0x94,0xcc,0x81,0x00,0x10,
+-	0x0b,0x01,0xff,0xce,0x99,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0x99,0xcc,0x94,
+-	0xcd,0x82,0x00,0xcf,0x86,0xe5,0x13,0x01,0xd4,0x84,0xd3,0x42,0xd2,0x28,0xd1,0x12,
+-	0x10,0x09,0x01,0xff,0xce,0xbf,0xcc,0x93,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,0x00,
+-	0x10,0x0b,0x01,0xff,0xce,0xbf,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xbf,0xcc,
+-	0x94,0xcc,0x80,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xce,0xbf,0xcc,0x93,0xcc,0x81,
+-	0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,0xcc,0x81,0x00,0x00,0x00,0xd2,0x28,0xd1,0x12,
+-	0x10,0x09,0x01,0xff,0xce,0x9f,0xcc,0x93,0x00,0x01,0xff,0xce,0x9f,0xcc,0x94,0x00,
+-	0x10,0x0b,0x01,0xff,0xce,0x9f,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0x9f,0xcc,
+-	0x94,0xcc,0x80,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xce,0x9f,0xcc,0x93,0xcc,0x81,
+-	0x00,0x01,0xff,0xce,0x9f,0xcc,0x94,0xcc,0x81,0x00,0x00,0x00,0xd3,0x54,0xd2,0x28,
+-	0xd1,0x12,0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x93,0x00,0x01,0xff,0xcf,0x85,0xcc,
+-	0x94,0x00,0x10,0x0b,0x01,0xff,0xcf,0x85,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xcf,
+-	0x85,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x85,0xcc,0x93,
+-	0xcc,0x81,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,
+-	0xcf,0x85,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcd,0x82,0x00,
+-	0xd2,0x1c,0xd1,0x0d,0x10,0x04,0x00,0x00,0x01,0xff,0xce,0xa5,0xcc,0x94,0x00,0x10,
+-	0x04,0x00,0x00,0x01,0xff,0xce,0xa5,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x0f,0x10,0x04,
+-	0x00,0x00,0x01,0xff,0xce,0xa5,0xcc,0x94,0xcc,0x81,0x00,0x10,0x04,0x00,0x00,0x01,
+-	0xff,0xce,0xa5,0xcc,0x94,0xcd,0x82,0x00,0xd4,0xa8,0xd3,0x54,0xd2,0x28,0xd1,0x12,
+-	0x10,0x09,0x01,0xff,0xcf,0x89,0xcc,0x93,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0x00,
+-	0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xcf,0x89,0xcc,
+-	0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x81,
+-	0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xcf,0x89,
+-	0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcd,0x82,0x00,0xd2,0x28,
+-	0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xa9,0xcc,0x93,0x00,0x01,0xff,0xce,0xa9,0xcc,
+-	0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,
+-	0xa9,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xa9,0xcc,0x93,
+-	0xcc,0x81,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,
+-	0xce,0xa9,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,0xcd,0x82,0x00,
+-	0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x80,0x00,0x01,
+-	0xff,0xce,0xb1,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb5,0xcc,0x80,0x00,0x01,
+-	0xff,0xce,0xb5,0xcc,0x81,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb7,0xcc,0x80,
+-	0x00,0x01,0xff,0xce,0xb7,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x80,
+-	0x00,0x01,0xff,0xce,0xb9,0xcc,0x81,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,
+-	0xce,0xbf,0xcc,0x80,0x00,0x01,0xff,0xce,0xbf,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,
+-	0xcf,0x85,0xcc,0x80,0x00,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,0x91,0x12,0x10,0x09,
+-	0x01,0xff,0xcf,0x89,0xcc,0x80,0x00,0x01,0xff,0xcf,0x89,0xcc,0x81,0x00,0x00,0x00,
+-	0xe0,0xe1,0x02,0xcf,0x86,0xe5,0x91,0x01,0xd4,0xc8,0xd3,0x64,0xd2,0x30,0xd1,0x16,
+-	0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcd,0x85,0x00,0x01,0xff,0xce,0xb1,0xcc,
+-	0x94,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0xcd,0x85,
+-	0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x80,0xcd,0x85,0x00,0xd1,0x1a,0x10,0x0d,
+-	0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,0x01,0xff,0xce,0xb1,0xcc,
+-	0x94,0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcd,0x82,
+-	0xcd,0x85,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x30,
+-	0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0x91,0xcc,0x93,0xcd,0x85,0x00,0x01,0xff,0xce,
+-	0x91,0xcc,0x94,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0x91,0xcc,0x93,0xcc,0x80,
+-	0xcd,0x85,0x00,0x01,0xff,0xce,0x91,0xcc,0x94,0xcc,0x80,0xcd,0x85,0x00,0xd1,0x1a,
+-	0x10,0x0d,0x01,0xff,0xce,0x91,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,0x01,0xff,0xce,
+-	0x91,0xcc,0x94,0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0x91,0xcc,0x93,
+-	0xcd,0x82,0xcd,0x85,0x00,0x01,0xff,0xce,0x91,0xcc,0x94,0xcd,0x82,0xcd,0x85,0x00,
+-	0xd3,0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,0x85,
+-	0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,
+-	0xcc,0x93,0xcc,0x80,0xcd,0x85,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,0xcd,
+-	0x85,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x81,0xcd,0x85,
+-	0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,
+-	0xce,0xb7,0xcc,0x93,0xcd,0x82,0xcd,0x85,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,
+-	0x82,0xcd,0x85,0x00,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0x97,0xcc,0x93,
+-	0xcd,0x85,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,
+-	0xce,0x97,0xcc,0x93,0xcc,0x80,0xcd,0x85,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcc,
+-	0x80,0xcd,0x85,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,0x97,0xcc,0x93,0xcc,0x81,
+-	0xcd,0x85,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,
+-	0x01,0xff,0xce,0x97,0xcc,0x93,0xcd,0x82,0xcd,0x85,0x00,0x01,0xff,0xce,0x97,0xcc,
+-	0x94,0xcd,0x82,0xcd,0x85,0x00,0xd4,0xc8,0xd3,0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,
+-	0x01,0xff,0xcf,0x89,0xcc,0x93,0xcd,0x85,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcd,
+-	0x85,0x00,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x80,0xcd,0x85,0x00,0x01,
+-	0xff,0xcf,0x89,0xcc,0x94,0xcc,0x80,0xcd,0x85,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,
+-	0xcf,0x89,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,
+-	0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcd,0x82,0xcd,0x85,
+-	0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x30,0xd1,0x16,
+-	0x10,0x0b,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcd,0x85,0x00,0x01,0xff,0xce,0xa9,0xcc,
+-	0x94,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcc,0x80,0xcd,0x85,
+-	0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,0xcc,0x80,0xcd,0x85,0x00,0xd1,0x1a,0x10,0x0d,
+-	0x01,0xff,0xce,0xa9,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,0x01,0xff,0xce,0xa9,0xcc,
+-	0x94,0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcd,0x82,
+-	0xcd,0x85,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,0xcd,0x82,0xcd,0x85,0x00,0xd3,0x49,
+-	0xd2,0x26,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x86,0x00,0x01,0xff,0xce,
+-	0xb1,0xcc,0x84,0x00,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x80,0xcd,0x85,0x00,0x01,
+-	0xff,0xce,0xb1,0xcd,0x85,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x81,
+-	0xcd,0x85,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xce,0xb1,0xcd,0x82,0x00,0x01,0xff,
+-	0xce,0xb1,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,
+-	0x91,0xcc,0x86,0x00,0x01,0xff,0xce,0x91,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,0xce,
+-	0x91,0xcc,0x80,0x00,0x01,0xff,0xce,0x91,0xcc,0x81,0x00,0xd1,0x0d,0x10,0x09,0x01,
+-	0xff,0xce,0x91,0xcd,0x85,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xce,0xb9,0x00,0x01,
+-	0x00,0xcf,0x86,0xe5,0x16,0x01,0xd4,0x8f,0xd3,0x44,0xd2,0x21,0xd1,0x0d,0x10,0x04,
+-	0x01,0x00,0x01,0xff,0xc2,0xa8,0xcd,0x82,0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,
+-	0x80,0xcd,0x85,0x00,0x01,0xff,0xce,0xb7,0xcd,0x85,0x00,0xd1,0x0f,0x10,0x0b,0x01,
+-	0xff,0xce,0xb7,0xcc,0x81,0xcd,0x85,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xce,0xb7,
+-	0xcd,0x82,0x00,0x01,0xff,0xce,0xb7,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x24,0xd1,0x12,
+-	0x10,0x09,0x01,0xff,0xce,0x95,0xcc,0x80,0x00,0x01,0xff,0xce,0x95,0xcc,0x81,0x00,
+-	0x10,0x09,0x01,0xff,0xce,0x97,0xcc,0x80,0x00,0x01,0xff,0xce,0x97,0xcc,0x81,0x00,
+-	0xd1,0x13,0x10,0x09,0x01,0xff,0xce,0x97,0xcd,0x85,0x00,0x01,0xff,0xe1,0xbe,0xbf,
+-	0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0xe1,0xbe,0xbf,0xcc,0x81,0x00,0x01,0xff,0xe1,
+-	0xbe,0xbf,0xcd,0x82,0x00,0xd3,0x40,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,
+-	0xb9,0xcc,0x86,0x00,0x01,0xff,0xce,0xb9,0xcc,0x84,0x00,0x10,0x0b,0x01,0xff,0xce,
+-	0xb9,0xcc,0x88,0xcc,0x80,0x00,0x01,0xff,0xce,0xb9,0xcc,0x88,0xcc,0x81,0x00,0x51,
+-	0x04,0x00,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,0xcd,0x82,0x00,0x01,0xff,0xce,0xb9,
+-	0xcc,0x88,0xcd,0x82,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x99,0xcc,
+-	0x86,0x00,0x01,0xff,0xce,0x99,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,0xce,0x99,0xcc,
+-	0x80,0x00,0x01,0xff,0xce,0x99,0xcc,0x81,0x00,0xd1,0x0e,0x10,0x04,0x00,0x00,0x01,
+-	0xff,0xe1,0xbf,0xbe,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0xe1,0xbf,0xbe,0xcc,0x81,
+-	0x00,0x01,0xff,0xe1,0xbf,0xbe,0xcd,0x82,0x00,0xd4,0x93,0xd3,0x4e,0xd2,0x28,0xd1,
+-	0x12,0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x86,0x00,0x01,0xff,0xcf,0x85,0xcc,0x84,
+-	0x00,0x10,0x0b,0x01,0xff,0xcf,0x85,0xcc,0x88,0xcc,0x80,0x00,0x01,0xff,0xcf,0x85,
+-	0xcc,0x88,0xcc,0x81,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xcf,0x81,0xcc,0x93,0x00,
+-	0x01,0xff,0xcf,0x81,0xcc,0x94,0x00,0x10,0x09,0x01,0xff,0xcf,0x85,0xcd,0x82,0x00,
+-	0x01,0xff,0xcf,0x85,0xcc,0x88,0xcd,0x82,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,
+-	0xff,0xce,0xa5,0xcc,0x86,0x00,0x01,0xff,0xce,0xa5,0xcc,0x84,0x00,0x10,0x09,0x01,
+-	0xff,0xce,0xa5,0xcc,0x80,0x00,0x01,0xff,0xce,0xa5,0xcc,0x81,0x00,0xd1,0x12,0x10,
+-	0x09,0x01,0xff,0xce,0xa1,0xcc,0x94,0x00,0x01,0xff,0xc2,0xa8,0xcc,0x80,0x00,0x10,
+-	0x09,0x01,0xff,0xc2,0xa8,0xcc,0x81,0x00,0x01,0xff,0x60,0x00,0xd3,0x3b,0xd2,0x18,
+-	0x51,0x04,0x00,0x00,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x80,0xcd,0x85,0x00,0x01,
+-	0xff,0xcf,0x89,0xcd,0x85,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x81,
+-	0xcd,0x85,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xcf,0x89,0xcd,0x82,0x00,0x01,0xff,
+-	0xcf,0x89,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,
+-	0x9f,0xcc,0x80,0x00,0x01,0xff,0xce,0x9f,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,
+-	0xa9,0xcc,0x80,0x00,0x01,0xff,0xce,0xa9,0xcc,0x81,0x00,0xd1,0x10,0x10,0x09,0x01,
+-	0xff,0xce,0xa9,0xcd,0x85,0x00,0x01,0xff,0xc2,0xb4,0x00,0x10,0x04,0x01,0x00,0x00,
+-	0x00,0xe0,0x7e,0x0c,0xcf,0x86,0xe5,0xbb,0x08,0xe4,0x14,0x06,0xe3,0xf7,0x02,0xe2,
+-	0xbd,0x01,0xd1,0xd0,0xd0,0x4f,0xcf,0x86,0xd5,0x2e,0x94,0x2a,0xd3,0x18,0x92,0x14,
+-	0x91,0x10,0x10,0x08,0x01,0xff,0xe2,0x80,0x82,0x00,0x01,0xff,0xe2,0x80,0x83,0x00,
+-	0x01,0x00,0x01,0x00,0x92,0x0d,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xff,
+-	0x00,0x01,0xff,0x00,0x01,0x00,0x94,0x1b,0x53,0x04,0x01,0x00,0xd2,0x09,0x11,0x04,
+-	0x01,0x00,0x01,0xff,0x00,0x51,0x05,0x01,0xff,0x00,0x10,0x05,0x01,0xff,0x00,0x04,
+-	0x00,0x01,0x00,0xcf,0x86,0xd5,0x48,0xd4,0x1c,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,
+-	0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x06,0x00,0x52,0x04,0x04,0x00,0x11,0x04,0x04,
+-	0x00,0x06,0x00,0xd3,0x1c,0xd2,0x0c,0x51,0x04,0x06,0x00,0x10,0x04,0x06,0x00,0x07,
+-	0x00,0xd1,0x08,0x10,0x04,0x07,0x00,0x08,0x00,0x10,0x04,0x08,0x00,0x06,0x00,0x52,
+-	0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x06,0x00,0xd4,0x23,0xd3,
+-	0x14,0x52,0x05,0x06,0xff,0x00,0x91,0x0a,0x10,0x05,0x0a,0xff,0x00,0x00,0xff,0x00,
+-	0x0f,0xff,0x00,0x92,0x0a,0x11,0x05,0x0f,0xff,0x00,0x01,0xff,0x00,0x01,0xff,0x00,
+-	0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x06,0x00,0x00,0x00,0x01,0x00,
+-	0x01,0x00,0xd0,0x7e,0xcf,0x86,0xd5,0x34,0xd4,0x14,0x53,0x04,0x01,0x00,0x52,0x04,
+-	0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0xd3,0x10,0x52,0x04,
+-	0x08,0x00,0x91,0x08,0x10,0x04,0x08,0x00,0x0c,0x00,0x0c,0x00,0x52,0x04,0x0c,0x00,
+-	0x91,0x08,0x10,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,0xd4,0x1c,0x53,0x04,0x01,0x00,
+-	0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x02,0x00,0x91,0x08,0x10,0x04,
+-	0x03,0x00,0x04,0x00,0x04,0x00,0xd3,0x10,0xd2,0x08,0x11,0x04,0x06,0x00,0x08,0x00,
+-	0x11,0x04,0x08,0x00,0x0b,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x0b,0x00,0x0c,0x00,
+-	0x10,0x04,0x0e,0x00,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x11,0x00,0x13,0x00,
+-	0xcf,0x86,0xd5,0x28,0x54,0x04,0x00,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,0x01,0xe6,
+-	0x01,0x01,0x01,0xe6,0xd2,0x0c,0x51,0x04,0x01,0x01,0x10,0x04,0x01,0x01,0x01,0xe6,
+-	0x91,0x08,0x10,0x04,0x01,0xe6,0x01,0x00,0x01,0x00,0xd4,0x30,0xd3,0x1c,0xd2,0x0c,
+-	0x91,0x08,0x10,0x04,0x01,0x00,0x01,0xe6,0x04,0x00,0xd1,0x08,0x10,0x04,0x06,0x00,
+-	0x06,0x01,0x10,0x04,0x06,0x01,0x06,0xe6,0x92,0x10,0xd1,0x08,0x10,0x04,0x06,0xdc,
+-	0x06,0xe6,0x10,0x04,0x06,0x01,0x08,0x01,0x09,0xdc,0x93,0x10,0x92,0x0c,0x91,0x08,
+-	0x10,0x04,0x0a,0xe6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,0x81,0xd0,0x4f,
+-	0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x29,0xd3,0x13,0x52,0x04,0x01,0x00,0x51,0x04,
+-	0x01,0x00,0x10,0x07,0x01,0xff,0xce,0xa9,0x00,0x01,0x00,0x92,0x12,0x51,0x04,0x01,
+-	0x00,0x10,0x06,0x01,0xff,0x4b,0x00,0x01,0xff,0x41,0xcc,0x8a,0x00,0x01,0x00,0x53,
+-	0x04,0x01,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x04,0x00,0x10,0x04,0x04,
+-	0x00,0x07,0x00,0x91,0x08,0x10,0x04,0x08,0x00,0x06,0x00,0x06,0x00,0xcf,0x86,0x95,
+-	0x2c,0xd4,0x18,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0xd1,0x08,0x10,0x04,0x08,
+-	0x00,0x09,0x00,0x10,0x04,0x09,0x00,0x0a,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x0b,
+-	0x00,0x10,0x04,0x0b,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd0,0x68,0xcf,
+-	0x86,0xd5,0x48,0xd4,0x28,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
+-	0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,0x92,0x0c,0x91,
+-	0x08,0x10,0x04,0x0a,0x00,0x0b,0x00,0x11,0x00,0x00,0x00,0x53,0x04,0x01,0x00,0x92,
+-	0x18,0x51,0x04,0x01,0x00,0x10,0x0a,0x01,0xff,0xe2,0x86,0x90,0xcc,0xb8,0x00,0x01,
+-	0xff,0xe2,0x86,0x92,0xcc,0xb8,0x00,0x01,0x00,0x94,0x1a,0x53,0x04,0x01,0x00,0x52,
+-	0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x0a,0x01,0xff,0xe2,0x86,0x94,0xcc,0xb8,
+-	0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x2e,0x94,0x2a,0x53,0x04,0x01,0x00,0x52,
+-	0x04,0x01,0x00,0xd1,0x0e,0x10,0x04,0x01,0x00,0x01,0xff,0xe2,0x87,0x90,0xcc,0xb8,
+-	0x00,0x10,0x0a,0x01,0xff,0xe2,0x87,0x94,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x87,0x92,
+-	0xcc,0xb8,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x51,0x04,0x01,
+-	0x00,0x10,0x04,0x01,0x00,0x04,0x00,0x04,0x00,0x93,0x08,0x12,0x04,0x04,0x00,0x06,
+-	0x00,0x06,0x00,0xe2,0x38,0x02,0xe1,0x3f,0x01,0xd0,0x68,0xcf,0x86,0xd5,0x3e,0x94,
+-	0x3a,0xd3,0x16,0x52,0x04,0x01,0x00,0x91,0x0e,0x10,0x0a,0x01,0xff,0xe2,0x88,0x83,
+-	0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0xd2,0x12,0x91,0x0e,0x10,0x04,0x01,0x00,0x01,
+-	0xff,0xe2,0x88,0x88,0xcc,0xb8,0x00,0x01,0x00,0x91,0x0e,0x10,0x0a,0x01,0xff,0xe2,
+-	0x88,0x8b,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x24,0x93,0x20,0x52,
+-	0x04,0x01,0x00,0xd1,0x0e,0x10,0x0a,0x01,0xff,0xe2,0x88,0xa3,0xcc,0xb8,0x00,0x01,
+-	0x00,0x10,0x0a,0x01,0xff,0xe2,0x88,0xa5,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x01,
+-	0x00,0xcf,0x86,0xd5,0x48,0x94,0x44,0xd3,0x2e,0xd2,0x12,0x91,0x0e,0x10,0x04,0x01,
+-	0x00,0x01,0xff,0xe2,0x88,0xbc,0xcc,0xb8,0x00,0x01,0x00,0xd1,0x0e,0x10,0x0a,0x01,
+-	0xff,0xe2,0x89,0x83,0xcc,0xb8,0x00,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xe2,
+-	0x89,0x85,0xcc,0xb8,0x00,0x92,0x12,0x91,0x0e,0x10,0x04,0x01,0x00,0x01,0xff,0xe2,
+-	0x89,0x88,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x40,0xd3,0x1e,0x92,
+-	0x1a,0xd1,0x0c,0x10,0x08,0x01,0xff,0x3d,0xcc,0xb8,0x00,0x01,0x00,0x10,0x0a,0x01,
+-	0xff,0xe2,0x89,0xa1,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,
+-	0x0e,0x10,0x04,0x01,0x00,0x01,0xff,0xe2,0x89,0x8d,0xcc,0xb8,0x00,0x10,0x08,0x01,
+-	0xff,0x3c,0xcc,0xb8,0x00,0x01,0xff,0x3e,0xcc,0xb8,0x00,0xd3,0x30,0xd2,0x18,0x91,
+-	0x14,0x10,0x0a,0x01,0xff,0xe2,0x89,0xa4,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x89,0xa5,
+-	0xcc,0xb8,0x00,0x01,0x00,0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x89,0xb2,0xcc,0xb8,
+-	0x00,0x01,0xff,0xe2,0x89,0xb3,0xcc,0xb8,0x00,0x01,0x00,0x92,0x18,0x91,0x14,0x10,
+-	0x0a,0x01,0xff,0xe2,0x89,0xb6,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x89,0xb7,0xcc,0xb8,
+-	0x00,0x01,0x00,0x01,0x00,0xd0,0x86,0xcf,0x86,0xd5,0x50,0x94,0x4c,0xd3,0x30,0xd2,
+-	0x18,0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x89,0xba,0xcc,0xb8,0x00,0x01,0xff,0xe2,
+-	0x89,0xbb,0xcc,0xb8,0x00,0x01,0x00,0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x8a,0x82,
+-	0xcc,0xb8,0x00,0x01,0xff,0xe2,0x8a,0x83,0xcc,0xb8,0x00,0x01,0x00,0x92,0x18,0x91,
+-	0x14,0x10,0x0a,0x01,0xff,0xe2,0x8a,0x86,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x8a,0x87,
+-	0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x30,0x53,0x04,0x01,0x00,0x52,
+-	0x04,0x01,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0xe2,0x8a,0xa2,0xcc,0xb8,0x00,0x01,
+-	0xff,0xe2,0x8a,0xa8,0xcc,0xb8,0x00,0x10,0x0a,0x01,0xff,0xe2,0x8a,0xa9,0xcc,0xb8,
+-	0x00,0x01,0xff,0xe2,0x8a,0xab,0xcc,0xb8,0x00,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,
+-	0x00,0xd4,0x5c,0xd3,0x2c,0x92,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0xe2,0x89,0xbc,
+-	0xcc,0xb8,0x00,0x01,0xff,0xe2,0x89,0xbd,0xcc,0xb8,0x00,0x10,0x0a,0x01,0xff,0xe2,
+-	0x8a,0x91,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x8a,0x92,0xcc,0xb8,0x00,0x01,0x00,0xd2,
+-	0x18,0x51,0x04,0x01,0x00,0x10,0x0a,0x01,0xff,0xe2,0x8a,0xb2,0xcc,0xb8,0x00,0x01,
+-	0xff,0xe2,0x8a,0xb3,0xcc,0xb8,0x00,0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x8a,0xb4,
+-	0xcc,0xb8,0x00,0x01,0xff,0xe2,0x8a,0xb5,0xcc,0xb8,0x00,0x01,0x00,0x93,0x0c,0x92,
+-	0x08,0x11,0x04,0x01,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0xd1,0x64,0xd0,0x3e,0xcf,
+-	0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x04,
+-	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x20,0x53,0x04,0x01,0x00,0x92,
+-	0x18,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x80,0x88,0x00,0x10,0x08,0x01,
+-	0xff,0xe3,0x80,0x89,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,
+-	0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,
+-	0x04,0x01,0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x06,0x00,0x04,0x00,0x04,0x00,0xd0,
+-	0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x04,0x00,0x53,0x04,0x04,0x00,0x92,0x0c,0x51,
+-	0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0xcf,0x86,0xd5,
+-	0x2c,0xd4,0x14,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x51,0x04,0x06,0x00,0x10,
+-	0x04,0x06,0x00,0x07,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x07,0x00,0x08,
+-	0x00,0x08,0x00,0x08,0x00,0x12,0x04,0x08,0x00,0x09,0x00,0xd4,0x14,0x53,0x04,0x09,
+-	0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x0b,0x00,0x0c,0x00,0x0c,0x00,0x0c,0x00,0xd3,
+-	0x08,0x12,0x04,0x0c,0x00,0x10,0x00,0xd2,0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x10,
+-	0x00,0x12,0x00,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x13,0x00,0xd3,0xa6,0xd2,
+-	0x74,0xd1,0x40,0xd0,0x22,0xcf,0x86,0x55,0x04,0x01,0x00,0x94,0x18,0x93,0x14,0x52,
+-	0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x04,0x00,0x10,0x04,0x04,0x00,0x00,
+-	0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0x95,0x18,0x94,0x14,0x53,0x04,0x01,0x00,0x92,
+-	0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
+-	0x00,0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x14,0x53,
+-	0x04,0x01,0x00,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x06,0x00,0x06,
+-	0x00,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x51,0x04,0x06,0x00,0x10,0x04,0x06,
+-	0x00,0x07,0x00,0xd1,0x06,0xcf,0x06,0x01,0x00,0xd0,0x1a,0xcf,0x86,0x95,0x14,0x54,
+-	0x04,0x01,0x00,0x93,0x0c,0x52,0x04,0x01,0x00,0x11,0x04,0x01,0x00,0x06,0x00,0x06,
+-	0x00,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0x13,0x04,0x04,
+-	0x00,0x06,0x00,0xd2,0xdc,0xd1,0x48,0xd0,0x26,0xcf,0x86,0x95,0x20,0x54,0x04,0x01,
+-	0x00,0xd3,0x0c,0x52,0x04,0x01,0x00,0x11,0x04,0x07,0x00,0x06,0x00,0x92,0x0c,0x91,
+-	0x08,0x10,0x04,0x08,0x00,0x04,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0x55,
+-	0x04,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,0x04,0x00,0x06,
+-	0x00,0x06,0x00,0x52,0x04,0x06,0x00,0x11,0x04,0x06,0x00,0x08,0x00,0xd0,0x5e,0xcf,
+-	0x86,0xd5,0x2c,0xd4,0x10,0x53,0x04,0x06,0x00,0x92,0x08,0x11,0x04,0x06,0x00,0x07,
+-	0x00,0x07,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,0x07,0x00,0x08,0x00,0x08,0x00,0x52,
+-	0x04,0x08,0x00,0x91,0x08,0x10,0x04,0x08,0x00,0x0a,0x00,0x0b,0x00,0xd4,0x10,0x93,
+-	0x0c,0x92,0x08,0x11,0x04,0x07,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0xd3,0x10,0x92,
+-	0x0c,0x51,0x04,0x08,0x00,0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,0x52,0x04,0x0a,
+-	0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x0b,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x1c,0x94,
+-	0x18,0xd3,0x08,0x12,0x04,0x0a,0x00,0x0b,0x00,0x52,0x04,0x0b,0x00,0x51,0x04,0x0b,
+-	0x00,0x10,0x04,0x0c,0x00,0x0b,0x00,0x0b,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x51,
+-	0x04,0x0b,0x00,0x10,0x04,0x0c,0x00,0x0b,0x00,0x0c,0x00,0x0b,0x00,0x0b,0x00,0xd1,
+-	0xa8,0xd0,0x42,0xcf,0x86,0xd5,0x28,0x94,0x24,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,
+-	0x04,0x10,0x00,0x01,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x0c,0x00,0x01,
+-	0x00,0x92,0x08,0x11,0x04,0x01,0x00,0x0c,0x00,0x01,0x00,0x01,0x00,0x94,0x14,0x53,
+-	0x04,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x0c,0x00,0x01,0x00,0x01,0x00,0x01,
+-	0x00,0x01,0x00,0xcf,0x86,0xd5,0x40,0xd4,0x18,0x53,0x04,0x01,0x00,0x52,0x04,0x01,
+-	0x00,0xd1,0x08,0x10,0x04,0x0c,0x00,0x01,0x00,0x10,0x04,0x0c,0x00,0x01,0x00,0xd3,
+-	0x18,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x0c,0x00,0x51,0x04,0x0c,
+-	0x00,0x10,0x04,0x01,0x00,0x0b,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,
+-	0x04,0x01,0x00,0x0c,0x00,0xd4,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0c,
+-	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x06,0x00,0x93,0x0c,0x52,0x04,0x06,0x00,0x11,
+-	0x04,0x06,0x00,0x01,0x00,0x01,0x00,0xd0,0x3e,0xcf,0x86,0xd5,0x18,0x54,0x04,0x01,
+-	0x00,0x93,0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x0c,0x00,0x0c,
+-	0x00,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0c,
+-	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,
+-	0x04,0x01,0x00,0x0c,0x00,0xcf,0x86,0xd5,0x2c,0x94,0x28,0xd3,0x10,0x52,0x04,0x08,
+-	0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x09,0x00,0xd2,0x0c,0x51,0x04,0x09,
+-	0x00,0x10,0x04,0x09,0x00,0x0d,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x0d,0x00,0x0c,
+-	0x00,0x06,0x00,0x94,0x0c,0x53,0x04,0x06,0x00,0x12,0x04,0x06,0x00,0x0a,0x00,0x06,
+-	0x00,0xe4,0x39,0x01,0xd3,0x0c,0xd2,0x06,0xcf,0x06,0x04,0x00,0xcf,0x06,0x06,0x00,
+-	0xd2,0x30,0xd1,0x06,0xcf,0x06,0x06,0x00,0xd0,0x06,0xcf,0x06,0x06,0x00,0xcf,0x86,
+-	0x95,0x1e,0x54,0x04,0x06,0x00,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x91,0x0e,
+-	0x10,0x0a,0x06,0xff,0xe2,0xab,0x9d,0xcc,0xb8,0x00,0x06,0x00,0x06,0x00,0x06,0x00,
+-	0xd1,0x80,0xd0,0x3a,0xcf,0x86,0xd5,0x28,0xd4,0x10,0x53,0x04,0x07,0x00,0x52,0x04,
+-	0x07,0x00,0x11,0x04,0x07,0x00,0x08,0x00,0xd3,0x08,0x12,0x04,0x08,0x00,0x09,0x00,
+-	0x92,0x0c,0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,0x94,0x0c,
+-	0x93,0x08,0x12,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0xcf,0x86,0xd5,0x30,
+-	0xd4,0x14,0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,
+-	0x10,0x00,0x10,0x00,0xd3,0x10,0x52,0x04,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,
+-	0x0b,0x00,0x0b,0x00,0x92,0x08,0x11,0x04,0x0b,0x00,0x10,0x00,0x10,0x00,0x54,0x04,
+-	0x10,0x00,0x93,0x0c,0x52,0x04,0x10,0x00,0x11,0x04,0x00,0x00,0x10,0x00,0x10,0x00,
+-	0xd0,0x32,0xcf,0x86,0xd5,0x14,0x54,0x04,0x10,0x00,0x93,0x0c,0x52,0x04,0x10,0x00,
+-	0x11,0x04,0x10,0x00,0x00,0x00,0x10,0x00,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,
+-	0xd2,0x08,0x11,0x04,0x10,0x00,0x14,0x00,0x91,0x08,0x10,0x04,0x14,0x00,0x10,0x00,
+-	0x10,0x00,0xcf,0x86,0xd5,0x28,0xd4,0x14,0x53,0x04,0x10,0x00,0x92,0x0c,0x91,0x08,
+-	0x10,0x04,0x10,0x00,0x15,0x00,0x10,0x00,0x10,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,
+-	0x10,0x00,0x10,0x04,0x13,0x00,0x14,0x00,0x14,0x00,0x14,0x00,0xd4,0x0c,0x53,0x04,
+-	0x14,0x00,0x12,0x04,0x14,0x00,0x11,0x00,0x53,0x04,0x14,0x00,0x52,0x04,0x14,0x00,
+-	0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x15,0x00,0xe3,0xb9,0x01,0xd2,0xac,0xd1,
+-	0x68,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x08,0x00,0x94,0x14,0x53,0x04,0x08,0x00,0x52,
+-	0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,0x00,0x08,0x00,0xcf,
+-	0x86,0xd5,0x18,0x54,0x04,0x08,0x00,0x53,0x04,0x08,0x00,0x52,0x04,0x08,0x00,0x51,
+-	0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,0x00,0xd4,0x14,0x53,0x04,0x09,0x00,0x52,
+-	0x04,0x09,0x00,0x91,0x08,0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,0xd3,0x10,0x92,
+-	0x0c,0x91,0x08,0x10,0x04,0x0b,0x00,0x0a,0x00,0x0a,0x00,0x09,0x00,0x52,0x04,0x0a,
+-	0x00,0x11,0x04,0x0a,0x00,0x0b,0x00,0xd0,0x06,0xcf,0x06,0x08,0x00,0xcf,0x86,0x55,
+-	0x04,0x08,0x00,0xd4,0x1c,0x53,0x04,0x08,0x00,0xd2,0x0c,0x51,0x04,0x08,0x00,0x10,
+-	0x04,0x08,0x00,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x0b,0xe6,0xd3,
+-	0x0c,0x92,0x08,0x11,0x04,0x0b,0xe6,0x0d,0x00,0x00,0x00,0x92,0x0c,0x91,0x08,0x10,
+-	0x04,0x00,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0xd1,0x6c,0xd0,0x2a,0xcf,0x86,0x55,
+-	0x04,0x08,0x00,0x94,0x20,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,
+-	0x04,0x00,0x00,0x0d,0x00,0x52,0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x0d,
+-	0x00,0x00,0x00,0x08,0x00,0xcf,0x86,0x55,0x04,0x08,0x00,0xd4,0x1c,0xd3,0x0c,0x52,
+-	0x04,0x08,0x00,0x11,0x04,0x08,0x00,0x0d,0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,
+-	0x00,0x10,0x04,0x00,0x00,0x08,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0c,
+-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,
+-	0x04,0x00,0x00,0x0c,0x09,0xd0,0x5a,0xcf,0x86,0xd5,0x18,0x54,0x04,0x08,0x00,0x93,
+-	0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,0x00,0x00,
+-	0x00,0xd4,0x20,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,
+-	0x00,0x00,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,
+-	0x00,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,
+-	0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,0x00,0xcf,
+-	0x86,0x95,0x40,0xd4,0x20,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,
+-	0x04,0x08,0x00,0x00,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,
+-	0x00,0x00,0x00,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,
+-	0x00,0x00,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,
+-	0x00,0x0a,0xe6,0xd2,0x9c,0xd1,0x68,0xd0,0x32,0xcf,0x86,0xd5,0x14,0x54,0x04,0x08,
+-	0x00,0x53,0x04,0x08,0x00,0x52,0x04,0x0a,0x00,0x11,0x04,0x08,0x00,0x0a,0x00,0x54,
+-	0x04,0x0a,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0a,0x00,0x0b,0x00,0x0d,
+-	0x00,0x0d,0x00,0x12,0x04,0x0d,0x00,0x10,0x00,0xcf,0x86,0x95,0x30,0x94,0x2c,0xd3,
+-	0x18,0xd2,0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x12,0x00,0x91,0x08,0x10,
+-	0x04,0x12,0x00,0x13,0x00,0x13,0x00,0xd2,0x08,0x11,0x04,0x13,0x00,0x14,0x00,0x51,
+-	0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x15,0x00,0x00,0x00,0x00,0x00,0xd0,0x1e,0xcf,
+-	0x86,0x95,0x18,0x54,0x04,0x04,0x00,0x53,0x04,0x04,0x00,0x92,0x0c,0x51,0x04,0x04,
+-	0x00,0x10,0x04,0x00,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0xcf,0x86,0x55,0x04,0x04,
+-	0x00,0x54,0x04,0x04,0x00,0x93,0x08,0x12,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0xd1,
+-	0x06,0xcf,0x06,0x04,0x00,0xd0,0x06,0xcf,0x06,0x04,0x00,0xcf,0x86,0xd5,0x14,0x54,
+-	0x04,0x04,0x00,0x93,0x0c,0x52,0x04,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0x00,
+-	0x00,0x54,0x04,0x00,0x00,0x53,0x04,0x04,0x00,0x12,0x04,0x04,0x00,0x00,0x00,0xcf,
+-	0x86,0xe5,0xa6,0x05,0xe4,0x9f,0x05,0xe3,0x96,0x04,0xe2,0xe4,0x03,0xe1,0xc0,0x01,
+-	0xd0,0x3e,0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x1c,0x53,0x04,0x01,0x00,0xd2,0x0c,
+-	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0xda,0x01,0xe4,0x91,0x08,0x10,0x04,0x01,0xe8,
+-	0x01,0xde,0x01,0xe0,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x04,0x00,0x10,0x04,
+-	0x04,0x00,0x06,0x00,0x51,0x04,0x06,0x00,0x10,0x04,0x04,0x00,0x01,0x00,0xcf,0x86,
+-	0xd5,0xaa,0xd4,0x32,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,
+-	0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,
+-	0x8b,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0x8d,0xe3,0x82,
+-	0x99,0x00,0x01,0x00,0xd3,0x3c,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,
+-	0x8f,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0x91,0xe3,0x82,
+-	0x99,0x00,0x01,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0x93,0xe3,0x82,0x99,
+-	0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0x95,0xe3,0x82,0x99,0x00,0x01,0x00,
+-	0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0x97,0xe3,0x82,0x99,0x00,0x01,
+-	0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0x99,0xe3,0x82,0x99,0x00,0x01,0x00,0xd1,0x0f,
+-	0x10,0x0b,0x01,0xff,0xe3,0x81,0x9b,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,
+-	0xff,0xe3,0x81,0x9d,0xe3,0x82,0x99,0x00,0x01,0x00,0xd4,0x53,0xd3,0x3c,0xd2,0x1e,
+-	0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0x9f,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,
+-	0x0b,0x01,0xff,0xe3,0x81,0xa1,0xe3,0x82,0x99,0x00,0x01,0x00,0xd1,0x0f,0x10,0x04,
+-	0x01,0x00,0x01,0xff,0xe3,0x81,0xa4,0xe3,0x82,0x99,0x00,0x10,0x04,0x01,0x00,0x01,
+-	0xff,0xe3,0x81,0xa6,0xe3,0x82,0x99,0x00,0x92,0x13,0x91,0x0f,0x10,0x04,0x01,0x00,
+-	0x01,0xff,0xe3,0x81,0xa8,0xe3,0x82,0x99,0x00,0x01,0x00,0x01,0x00,0xd3,0x4a,0xd2,
+-	0x25,0xd1,0x16,0x10,0x0b,0x01,0xff,0xe3,0x81,0xaf,0xe3,0x82,0x99,0x00,0x01,0xff,
+-	0xe3,0x81,0xaf,0xe3,0x82,0x9a,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x81,0xb2,
+-	0xe3,0x82,0x99,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0xb2,0xe3,0x82,0x9a,
+-	0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0xb5,0xe3,0x82,0x99,0x00,0x01,0xff,
+-	0xe3,0x81,0xb5,0xe3,0x82,0x9a,0x00,0xd2,0x1e,0xd1,0x0f,0x10,0x04,0x01,0x00,0x01,
+-	0xff,0xe3,0x81,0xb8,0xe3,0x82,0x99,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0xb8,0xe3,
+-	0x82,0x9a,0x00,0x01,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xe3,0x81,0xbb,0xe3,0x82,
+-	0x99,0x00,0x01,0xff,0xe3,0x81,0xbb,0xe3,0x82,0x9a,0x00,0x01,0x00,0xd0,0xee,0xcf,
+-	0x86,0xd5,0x42,0x54,0x04,0x01,0x00,0xd3,0x1b,0x52,0x04,0x01,0x00,0xd1,0x0f,0x10,
+-	0x0b,0x01,0xff,0xe3,0x81,0x86,0xe3,0x82,0x99,0x00,0x06,0x00,0x10,0x04,0x06,0x00,
+-	0x00,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x00,0x00,0x01,0x08,0x10,0x04,0x01,0x08,
+-	0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0x9d,0xe3,0x82,0x99,
+-	0x00,0x06,0x00,0xd4,0x32,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x06,0x00,0x01,
+-	0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,
+-	0x82,0xab,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0xad,0xe3,
+-	0x82,0x99,0x00,0x01,0x00,0xd3,0x3c,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,
+-	0x82,0xaf,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0xb1,0xe3,
+-	0x82,0x99,0x00,0x01,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,0xb3,0xe3,0x82,
+-	0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0xb5,0xe3,0x82,0x99,0x00,0x01,
+-	0x00,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,0xb7,0xe3,0x82,0x99,0x00,
+-	0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0xb9,0xe3,0x82,0x99,0x00,0x01,0x00,0xd1,
+-	0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,0xbb,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,
+-	0x01,0xff,0xe3,0x82,0xbd,0xe3,0x82,0x99,0x00,0x01,0x00,0xcf,0x86,0xd5,0xd5,0xd4,
+-	0x53,0xd3,0x3c,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,0xbf,0xe3,0x82,
+-	0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x83,0x81,0xe3,0x82,0x99,0x00,0x01,
+-	0x00,0xd1,0x0f,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x84,0xe3,0x82,0x99,0x00,
+-	0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x86,0xe3,0x82,0x99,0x00,0x92,0x13,0x91,
+-	0x0f,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x88,0xe3,0x82,0x99,0x00,0x01,0x00,
+-	0x01,0x00,0xd3,0x4a,0xd2,0x25,0xd1,0x16,0x10,0x0b,0x01,0xff,0xe3,0x83,0x8f,0xe3,
+-	0x82,0x99,0x00,0x01,0xff,0xe3,0x83,0x8f,0xe3,0x82,0x9a,0x00,0x10,0x04,0x01,0x00,
+-	0x01,0xff,0xe3,0x83,0x92,0xe3,0x82,0x99,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,
+-	0x83,0x92,0xe3,0x82,0x9a,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x83,0x95,0xe3,
+-	0x82,0x99,0x00,0x01,0xff,0xe3,0x83,0x95,0xe3,0x82,0x9a,0x00,0xd2,0x1e,0xd1,0x0f,
+-	0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x98,0xe3,0x82,0x99,0x00,0x10,0x0b,0x01,
+-	0xff,0xe3,0x83,0x98,0xe3,0x82,0x9a,0x00,0x01,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,
+-	0xe3,0x83,0x9b,0xe3,0x82,0x99,0x00,0x01,0xff,0xe3,0x83,0x9b,0xe3,0x82,0x9a,0x00,
+-	0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x22,0x52,0x04,0x01,0x00,0xd1,0x0f,0x10,0x0b,
+-	0x01,0xff,0xe3,0x82,0xa6,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x04,0x01,0x00,0x01,
+-	0xff,0xe3,0x83,0xaf,0xe3,0x82,0x99,0x00,0xd2,0x25,0xd1,0x16,0x10,0x0b,0x01,0xff,
+-	0xe3,0x83,0xb0,0xe3,0x82,0x99,0x00,0x01,0xff,0xe3,0x83,0xb1,0xe3,0x82,0x99,0x00,
+-	0x10,0x0b,0x01,0xff,0xe3,0x83,0xb2,0xe3,0x82,0x99,0x00,0x01,0x00,0x51,0x04,0x01,
+-	0x00,0x10,0x0b,0x01,0xff,0xe3,0x83,0xbd,0xe3,0x82,0x99,0x00,0x06,0x00,0xd1,0x65,
+-	0xd0,0x46,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x52,0x04,0x00,0x00,0x91,0x08,
+-	0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x18,0x53,0x04,
+-	0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x0a,0x00,0x10,0x04,
+-	0x13,0x00,0x14,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,
+-	0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0x94,0x15,0x93,0x11,
+-	0x52,0x04,0x01,0x00,0x91,0x09,0x10,0x05,0x01,0xff,0x00,0x01,0x00,0x01,0x00,0x01,
+-	0x00,0x01,0x00,0xd0,0x32,0xcf,0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x01,0x00,0x52,
+-	0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x54,
+-	0x04,0x04,0x00,0x53,0x04,0x04,0x00,0x92,0x0c,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,
+-	0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x08,0x14,0x04,0x08,0x00,0x0a,0x00,0x94,
+-	0x0c,0x93,0x08,0x12,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0xd2,0xa4,0xd1,
+-	0x5c,0xd0,0x22,0xcf,0x86,0x95,0x1c,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,
+-	0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x07,0x00,0x10,0x04,0x07,0x00,0x00,
+-	0x00,0x01,0x00,0xcf,0x86,0xd5,0x20,0xd4,0x0c,0x93,0x08,0x12,0x04,0x01,0x00,0x0b,
+-	0x00,0x0b,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x07,0x00,0x06,0x00,0x06,
+-	0x00,0x06,0x00,0x06,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,
+-	0x00,0x51,0x04,0x07,0x00,0x10,0x04,0x08,0x00,0x01,0x00,0xd0,0x1e,0xcf,0x86,0x55,
+-	0x04,0x01,0x00,0x54,0x04,0x01,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,
+-	0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0xcf,0x86,0xd5,0x10,0x94,0x0c,0x53,
+-	0x04,0x01,0x00,0x12,0x04,0x01,0x00,0x07,0x00,0x01,0x00,0x54,0x04,0x01,0x00,0x53,
+-	0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x16,
+-	0x00,0xd1,0x30,0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,
+-	0x04,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
+-	0x00,0x07,0x00,0x92,0x0c,0x51,0x04,0x07,0x00,0x10,0x04,0x07,0x00,0x01,0x00,0x01,
+-	0x00,0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0x14,0x54,0x04,0x01,0x00,0x53,
+-	0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x11,0x04,0x01,0x00,0x07,0x00,0x54,0x04,0x01,
+-	0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
+-	0x00,0x07,0x00,0xcf,0x06,0x04,0x00,0xcf,0x06,0x04,0x00,0xd1,0x48,0xd0,0x40,0xcf,
+-	0x86,0xd5,0x06,0xcf,0x06,0x04,0x00,0xd4,0x06,0xcf,0x06,0x04,0x00,0xd3,0x2c,0xd2,
+-	0x06,0xcf,0x06,0x04,0x00,0xd1,0x06,0xcf,0x06,0x04,0x00,0xd0,0x1a,0xcf,0x86,0x55,
+-	0x04,0x04,0x00,0x54,0x04,0x04,0x00,0x93,0x0c,0x52,0x04,0x04,0x00,0x11,0x04,0x04,
+-	0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x07,0x00,0xcf,0x06,0x01,0x00,0xcf,0x86,0xcf,
+-	0x06,0x01,0x00,0xcf,0x86,0xcf,0x06,0x01,0x00,0xe2,0x71,0x05,0xd1,0x8c,0xd0,0x08,
+-	0xcf,0x86,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x01,0x00,0xd4,0x06,
+-	0xcf,0x06,0x01,0x00,0xd3,0x06,0xcf,0x06,0x01,0x00,0xd2,0x06,0xcf,0x06,0x01,0x00,
+-	0xd1,0x06,0xcf,0x06,0x01,0x00,0xd0,0x22,0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x10,
+-	0x93,0x0c,0x52,0x04,0x01,0x00,0x11,0x04,0x01,0x00,0x08,0x00,0x08,0x00,0x53,0x04,
+-	0x08,0x00,0x12,0x04,0x08,0x00,0x0a,0x00,0xcf,0x86,0xd5,0x28,0xd4,0x18,0xd3,0x08,
+-	0x12,0x04,0x0a,0x00,0x0b,0x00,0x52,0x04,0x0b,0x00,0x91,0x08,0x10,0x04,0x0d,0x00,
+-	0x11,0x00,0x11,0x00,0x93,0x0c,0x52,0x04,0x11,0x00,0x11,0x04,0x11,0x00,0x13,0x00,
+-	0x13,0x00,0x94,0x14,0x53,0x04,0x13,0x00,0x92,0x0c,0x51,0x04,0x13,0x00,0x10,0x04,
+-	0x13,0x00,0x14,0x00,0x14,0x00,0x00,0x00,0xe0,0xdb,0x04,0xcf,0x86,0xe5,0xdf,0x01,
+-	0xd4,0x06,0xcf,0x06,0x04,0x00,0xd3,0x74,0xd2,0x6e,0xd1,0x06,0xcf,0x06,0x04,0x00,
+-	0xd0,0x3e,0xcf,0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x04,0x00,0x52,0x04,0x04,0x00,
+-	0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0xd4,0x10,0x93,0x0c,
+-	0x92,0x08,0x11,0x04,0x04,0x00,0x06,0x00,0x04,0x00,0x04,0x00,0x93,0x10,0x52,0x04,
+-	0x04,0x00,0x91,0x08,0x10,0x04,0x06,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0xcf,0x86,
+-	0x95,0x24,0x94,0x20,0x93,0x1c,0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x06,0x00,
+-	0x04,0x00,0xd1,0x08,0x10,0x04,0x04,0x00,0x06,0x00,0x10,0x04,0x04,0x00,0x00,0x00,
+-	0x00,0x00,0x0b,0x00,0x0b,0x00,0xcf,0x06,0x0a,0x00,0xd2,0x84,0xd1,0x4c,0xd0,0x16,
+-	0xcf,0x86,0x55,0x04,0x0a,0x00,0x94,0x0c,0x53,0x04,0x0a,0x00,0x12,0x04,0x0a,0x00,
+-	0x00,0x00,0x00,0x00,0xcf,0x86,0x55,0x04,0x0a,0x00,0xd4,0x1c,0xd3,0x0c,0x92,0x08,
+-	0x11,0x04,0x0c,0x00,0x0a,0x00,0x0a,0x00,0x52,0x04,0x0a,0x00,0x51,0x04,0x0a,0x00,
+-	0x10,0x04,0x0a,0x00,0x0a,0xe6,0xd3,0x08,0x12,0x04,0x0a,0x00,0x0d,0xe6,0x52,0x04,
+-	0x0d,0xe6,0x11,0x04,0x0a,0xe6,0x0a,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,
+-	0x0a,0x00,0x53,0x04,0x0a,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,
+-	0x11,0xe6,0x0d,0xe6,0x0b,0x00,0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,0x0b,0x00,
+-	0x93,0x0c,0x92,0x08,0x11,0x04,0x0b,0xe6,0x0b,0x00,0x0b,0x00,0x00,0x00,0xd1,0x40,
+-	0xd0,0x3a,0xcf,0x86,0xd5,0x24,0x54,0x04,0x08,0x00,0xd3,0x10,0x52,0x04,0x08,0x00,
+-	0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x09,0x00,0x92,0x0c,0x51,0x04,0x09,0x00,
+-	0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,0x94,0x10,0x93,0x0c,0x92,0x08,0x11,0x04,
+-	0x09,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0xcf,0x06,0x0a,0x00,0xd0,0x5e,
+-	0xcf,0x86,0xd5,0x28,0xd4,0x18,0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,0xd1,0x08,
+-	0x10,0x04,0x0a,0x00,0x0c,0x00,0x10,0x04,0x0c,0x00,0x11,0x00,0x93,0x0c,0x92,0x08,
+-	0x11,0x04,0x0c,0x00,0x0d,0x00,0x10,0x00,0x10,0x00,0xd4,0x1c,0x53,0x04,0x0c,0x00,
+-	0xd2,0x0c,0x51,0x04,0x0c,0x00,0x10,0x04,0x0d,0x00,0x10,0x00,0x51,0x04,0x10,0x00,
+-	0x10,0x04,0x12,0x00,0x14,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,0x10,0x00,0x11,0x00,
+-	0x11,0x00,0x92,0x08,0x11,0x04,0x14,0x00,0x15,0x00,0x15,0x00,0xcf,0x86,0xd5,0x1c,
+-	0x94,0x18,0x93,0x14,0xd2,0x08,0x11,0x04,0x00,0x00,0x15,0x00,0x51,0x04,0x15,0x00,
+-	0x10,0x04,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x54,0x04,0x00,0x00,0xd3,0x10,
+-	0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x92,0x0c,
+-	0x51,0x04,0x0d,0x00,0x10,0x04,0x0c,0x00,0x0a,0x00,0x0a,0x00,0xe4,0xf2,0x02,0xe3,
+-	0x65,0x01,0xd2,0x98,0xd1,0x48,0xd0,0x36,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,
+-	0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x09,0x08,0x00,0x08,0x00,
+-	0x08,0x00,0xd4,0x0c,0x53,0x04,0x08,0x00,0x12,0x04,0x08,0x00,0x00,0x00,0x53,0x04,
+-	0x0b,0x00,0x92,0x08,0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0x55,0x04,
+-	0x09,0x00,0x54,0x04,0x09,0x00,0x13,0x04,0x09,0x00,0x00,0x00,0xd0,0x06,0xcf,0x06,
+-	0x0a,0x00,0xcf,0x86,0xd5,0x2c,0xd4,0x1c,0xd3,0x10,0x52,0x04,0x0a,0x00,0x91,0x08,
+-	0x10,0x04,0x0a,0x09,0x12,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x11,0x04,0x00,0x00,
+-	0x0a,0x00,0x53,0x04,0x0a,0x00,0x92,0x08,0x11,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,
+-	0x54,0x04,0x0b,0xe6,0xd3,0x0c,0x92,0x08,0x11,0x04,0x0b,0xe6,0x0b,0x00,0x0b,0x00,
+-	0x52,0x04,0x0b,0x00,0x11,0x04,0x11,0x00,0x14,0x00,0xd1,0x60,0xd0,0x22,0xcf,0x86,
+-	0x55,0x04,0x0a,0x00,0x94,0x18,0x53,0x04,0x0a,0x00,0xd2,0x0c,0x51,0x04,0x0a,0x00,
+-	0x10,0x04,0x0a,0x00,0x0a,0xdc,0x11,0x04,0x0a,0xdc,0x0a,0x00,0x0a,0x00,0xcf,0x86,
+-	0xd5,0x24,0x54,0x04,0x0a,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,0x0a,0x00,0x10,0x04,
+-	0x0a,0x00,0x0a,0x09,0x00,0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,
+-	0x00,0x00,0x0a,0x00,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,0x00,
+-	0x91,0x08,0x10,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0xd0,0x1e,0xcf,0x86,0x55,0x04,
+-	0x0b,0x00,0x54,0x04,0x0b,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x0b,0x00,0x10,0x04,
+-	0x0b,0x00,0x0b,0x07,0x0b,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x34,0xd4,0x20,0xd3,0x10,
+-	0x92,0x0c,0x91,0x08,0x10,0x04,0x0b,0x09,0x0b,0x00,0x0b,0x00,0x0b,0x00,0x52,0x04,
+-	0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x00,0x00,0x0b,0x00,0x53,0x04,0x0b,0x00,
+-	0xd2,0x08,0x11,0x04,0x0b,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x0b,0x00,0x54,0x04,
+-	0x10,0x00,0x53,0x04,0x10,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,
+-	0x10,0x00,0x00,0x00,0xd2,0xd0,0xd1,0x50,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x0a,0x00,
+-	0x54,0x04,0x0a,0x00,0x93,0x10,0x52,0x04,0x0a,0x00,0x51,0x04,0x0a,0x00,0x10,0x04,
+-	0x0a,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x20,0xd4,0x10,0x53,0x04,0x0a,0x00,
+-	0x52,0x04,0x0a,0x00,0x11,0x04,0x0a,0x00,0x00,0x00,0x53,0x04,0x0a,0x00,0x92,0x08,
+-	0x11,0x04,0x0a,0x00,0x00,0x00,0x0a,0x00,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,
+-	0x12,0x04,0x0b,0x00,0x10,0x00,0xd0,0x3a,0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,
+-	0x0b,0x00,0xd3,0x1c,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0b,0xe6,0x0b,0x00,0x0b,0xe6,
+-	0xd1,0x08,0x10,0x04,0x0b,0xdc,0x0b,0x00,0x10,0x04,0x0b,0x00,0x0b,0xe6,0xd2,0x0c,
+-	0x91,0x08,0x10,0x04,0x0b,0xe6,0x0b,0x00,0x0b,0x00,0x11,0x04,0x0b,0x00,0x0b,0xe6,
+-	0xcf,0x86,0xd5,0x2c,0xd4,0x18,0x93,0x14,0x92,0x10,0xd1,0x08,0x10,0x04,0x0b,0x00,
+-	0x0b,0xe6,0x10,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x00,0x00,
+-	0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0b,0x00,0x0b,0x00,0x54,0x04,
+-	0x0d,0x00,0x93,0x10,0x52,0x04,0x0d,0x00,0x51,0x04,0x0d,0x00,0x10,0x04,0x0d,0x09,
+-	0x00,0x00,0x00,0x00,0xd1,0x8c,0xd0,0x72,0xcf,0x86,0xd5,0x4c,0xd4,0x30,0xd3,0x18,
+-	0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x0c,0x00,0x0c,0x00,0x51,0x04,0x0c,0x00,
+-	0x10,0x04,0x0c,0x00,0x00,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x0c,0x00,
+-	0x0c,0x00,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,0x93,0x18,0xd2,0x0c,
+-	0x91,0x08,0x10,0x04,0x00,0x00,0x0c,0x00,0x0c,0x00,0x51,0x04,0x0c,0x00,0x10,0x04,
+-	0x0c,0x00,0x00,0x00,0x00,0x00,0x94,0x20,0xd3,0x10,0x52,0x04,0x0c,0x00,0x51,0x04,
+-	0x0c,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,0x52,0x04,0x0c,0x00,0x51,0x04,0x0c,0x00,
+-	0x10,0x04,0x0c,0x00,0x00,0x00,0x10,0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0x94,0x10,
+-	0x93,0x0c,0x52,0x04,0x11,0x00,0x11,0x04,0x10,0x00,0x15,0x00,0x00,0x00,0x11,0x00,
+-	0xd0,0x06,0xcf,0x06,0x11,0x00,0xcf,0x86,0x55,0x04,0x0b,0x00,0xd4,0x14,0x53,0x04,
+-	0x0b,0x00,0x52,0x04,0x0b,0x00,0x91,0x08,0x10,0x04,0x0b,0x00,0x0b,0x09,0x00,0x00,
+-	0x53,0x04,0x0b,0x00,0x92,0x08,0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,
+-	0x02,0xff,0xff,0xcf,0x86,0xcf,0x06,0x02,0xff,0xff,0xd1,0x76,0xd0,0x09,0xcf,0x86,
+-	0xcf,0x06,0x02,0xff,0xff,0xcf,0x86,0x85,0xd4,0x07,0xcf,0x06,0x02,0xff,0xff,0xd3,
+-	0x07,0xcf,0x06,0x02,0xff,0xff,0xd2,0x07,0xcf,0x06,0x02,0xff,0xff,0xd1,0x07,0xcf,
+-	0x06,0x02,0xff,0xff,0xd0,0x18,0xcf,0x86,0x55,0x05,0x02,0xff,0xff,0x94,0x0d,0x93,
+-	0x09,0x12,0x05,0x02,0xff,0xff,0x00,0x00,0x00,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x24,
+-	0x94,0x20,0xd3,0x10,0x52,0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,
+-	0x00,0x00,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0b,0x00,0x0b,0x00,
+-	0x0b,0x00,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,0x12,0x04,0x0b,0x00,0x00,0x00,
+-	0xd0,0x08,0xcf,0x86,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x01,0x00,
+-	0xe4,0x9c,0x10,0xe3,0x16,0x08,0xd2,0x06,0xcf,0x06,0x01,0x00,0xe1,0x08,0x04,0xe0,
+-	0x04,0x02,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0xe8,0xb1,0x88,0x00,0x01,0xff,0xe6,0x9b,0xb4,0x00,0x10,0x08,0x01,
+-	0xff,0xe8,0xbb,0x8a,0x00,0x01,0xff,0xe8,0xb3,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,
+-	0xff,0xe6,0xbb,0x91,0x00,0x01,0xff,0xe4,0xb8,0xb2,0x00,0x10,0x08,0x01,0xff,0xe5,
+-	0x8f,0xa5,0x00,0x01,0xff,0xe9,0xbe,0x9c,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
+-	0xff,0xe9,0xbe,0x9c,0x00,0x01,0xff,0xe5,0xa5,0x91,0x00,0x10,0x08,0x01,0xff,0xe9,
+-	0x87,0x91,0x00,0x01,0xff,0xe5,0x96,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,
+-	0xa5,0x88,0x00,0x01,0xff,0xe6,0x87,0xb6,0x00,0x10,0x08,0x01,0xff,0xe7,0x99,0xa9,
+-	0x00,0x01,0xff,0xe7,0xbe,0x85,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
+-	0xff,0xe8,0x98,0xbf,0x00,0x01,0xff,0xe8,0x9e,0xba,0x00,0x10,0x08,0x01,0xff,0xe8,
+-	0xa3,0xb8,0x00,0x01,0xff,0xe9,0x82,0x8f,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,
+-	0xa8,0x82,0x00,0x01,0xff,0xe6,0xb4,0x9b,0x00,0x10,0x08,0x01,0xff,0xe7,0x83,0x99,
+-	0x00,0x01,0xff,0xe7,0x8f,0x9e,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,
+-	0x90,0xbd,0x00,0x01,0xff,0xe9,0x85,0xaa,0x00,0x10,0x08,0x01,0xff,0xe9,0xa7,0xb1,
+-	0x00,0x01,0xff,0xe4,0xba,0x82,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0x8d,0xb5,
+-	0x00,0x01,0xff,0xe6,0xac,0x84,0x00,0x10,0x08,0x01,0xff,0xe7,0x88,0x9b,0x00,0x01,
+-	0xff,0xe8,0x98,0xad,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
+-	0xff,0xe9,0xb8,0x9e,0x00,0x01,0xff,0xe5,0xb5,0x90,0x00,0x10,0x08,0x01,0xff,0xe6,
+-	0xbf,0xab,0x00,0x01,0xff,0xe8,0x97,0x8d,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,
+-	0xa5,0xa4,0x00,0x01,0xff,0xe6,0x8b,0x89,0x00,0x10,0x08,0x01,0xff,0xe8,0x87,0x98,
+-	0x00,0x01,0xff,0xe8,0xa0,0x9f,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,
+-	0xbb,0x8a,0x00,0x01,0xff,0xe6,0x9c,0x97,0x00,0x10,0x08,0x01,0xff,0xe6,0xb5,0xaa,
+-	0x00,0x01,0xff,0xe7,0x8b,0xbc,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0x83,0x8e,
+-	0x00,0x01,0xff,0xe4,0xbe,0x86,0x00,0x10,0x08,0x01,0xff,0xe5,0x86,0xb7,0x00,0x01,
+-	0xff,0xe5,0x8b,0x9e,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,
+-	0x93,0x84,0x00,0x01,0xff,0xe6,0xab,0x93,0x00,0x10,0x08,0x01,0xff,0xe7,0x88,0x90,
+-	0x00,0x01,0xff,0xe7,0x9b,0xa7,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x80,0x81,
+-	0x00,0x01,0xff,0xe8,0x98,0x86,0x00,0x10,0x08,0x01,0xff,0xe8,0x99,0x9c,0x00,0x01,
+-	0xff,0xe8,0xb7,0xaf,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0x9c,0xb2,
+-	0x00,0x01,0xff,0xe9,0xad,0xaf,0x00,0x10,0x08,0x01,0xff,0xe9,0xb7,0xba,0x00,0x01,
+-	0xff,0xe7,0xa2,0x8c,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,0xa5,0xbf,0x00,0x01,
+-	0xff,0xe7,0xb6,0xa0,0x00,0x10,0x08,0x01,0xff,0xe8,0x8f,0x89,0x00,0x01,0xff,0xe9,
+-	0x8c,0x84,0x00,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,
+-	0x10,0x08,0x01,0xff,0xe9,0xb9,0xbf,0x00,0x01,0xff,0xe8,0xab,0x96,0x00,0x10,0x08,
+-	0x01,0xff,0xe5,0xa3,0x9f,0x00,0x01,0xff,0xe5,0xbc,0x84,0x00,0xd1,0x10,0x10,0x08,
+-	0x01,0xff,0xe7,0xb1,0xa0,0x00,0x01,0xff,0xe8,0x81,0xbe,0x00,0x10,0x08,0x01,0xff,
+-	0xe7,0x89,0xa2,0x00,0x01,0xff,0xe7,0xa3,0x8a,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x01,0xff,0xe8,0xb3,0x82,0x00,0x01,0xff,0xe9,0x9b,0xb7,0x00,0x10,0x08,0x01,0xff,
+-	0xe5,0xa3,0x98,0x00,0x01,0xff,0xe5,0xb1,0xa2,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
+-	0xe6,0xa8,0x93,0x00,0x01,0xff,0xe6,0xb7,0x9a,0x00,0x10,0x08,0x01,0xff,0xe6,0xbc,
+-	0x8f,0x00,0x01,0xff,0xe7,0xb4,0xaf,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x01,0xff,0xe7,0xb8,0xb7,0x00,0x01,0xff,0xe9,0x99,0x8b,0x00,0x10,0x08,0x01,0xff,
+-	0xe5,0x8b,0x92,0x00,0x01,0xff,0xe8,0x82,0x8b,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
+-	0xe5,0x87,0x9c,0x00,0x01,0xff,0xe5,0x87,0x8c,0x00,0x10,0x08,0x01,0xff,0xe7,0xa8,
+-	0x9c,0x00,0x01,0xff,0xe7,0xb6,0xbe,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
+-	0xe8,0x8f,0xb1,0x00,0x01,0xff,0xe9,0x99,0xb5,0x00,0x10,0x08,0x01,0xff,0xe8,0xae,
+-	0x80,0x00,0x01,0xff,0xe6,0x8b,0x8f,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xa8,
+-	0x82,0x00,0x01,0xff,0xe8,0xab,0xbe,0x00,0x10,0x08,0x01,0xff,0xe4,0xb8,0xb9,0x00,
+-	0x01,0xff,0xe5,0xaf,0xa7,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x01,0xff,0xe6,0x80,0x92,0x00,0x01,0xff,0xe7,0x8e,0x87,0x00,0x10,0x08,0x01,0xff,
+-	0xe7,0x95,0xb0,0x00,0x01,0xff,0xe5,0x8c,0x97,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
+-	0xe7,0xa3,0xbb,0x00,0x01,0xff,0xe4,0xbe,0xbf,0x00,0x10,0x08,0x01,0xff,0xe5,0xbe,
+-	0xa9,0x00,0x01,0xff,0xe4,0xb8,0x8d,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
+-	0xe6,0xb3,0x8c,0x00,0x01,0xff,0xe6,0x95,0xb8,0x00,0x10,0x08,0x01,0xff,0xe7,0xb4,
+-	0xa2,0x00,0x01,0xff,0xe5,0x8f,0x83,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0xa1,
+-	0x9e,0x00,0x01,0xff,0xe7,0x9c,0x81,0x00,0x10,0x08,0x01,0xff,0xe8,0x91,0x89,0x00,
+-	0x01,0xff,0xe8,0xaa,0xaa,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
+-	0xe6,0xae,0xba,0x00,0x01,0xff,0xe8,0xbe,0xb0,0x00,0x10,0x08,0x01,0xff,0xe6,0xb2,
+-	0x88,0x00,0x01,0xff,0xe6,0x8b,0xbe,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x8b,
+-	0xa5,0x00,0x01,0xff,0xe6,0x8e,0xa0,0x00,0x10,0x08,0x01,0xff,0xe7,0x95,0xa5,0x00,
+-	0x01,0xff,0xe4,0xba,0xae,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0x85,
+-	0xa9,0x00,0x01,0xff,0xe5,0x87,0x89,0x00,0x10,0x08,0x01,0xff,0xe6,0xa2,0x81,0x00,
+-	0x01,0xff,0xe7,0xb3,0xa7,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x89,0xaf,0x00,
+-	0x01,0xff,0xe8,0xab,0x92,0x00,0x10,0x08,0x01,0xff,0xe9,0x87,0x8f,0x00,0x01,0xff,
+-	0xe5,0x8b,0xb5,0x00,0xe0,0x04,0x02,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,
+-	0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0x91,0x82,0x00,0x01,0xff,0xe5,0xa5,
+-	0xb3,0x00,0x10,0x08,0x01,0xff,0xe5,0xbb,0xac,0x00,0x01,0xff,0xe6,0x97,0x85,0x00,
+-	0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xbf,0xbe,0x00,0x01,0xff,0xe7,0xa4,0xaa,0x00,
+-	0x10,0x08,0x01,0xff,0xe9,0x96,0xad,0x00,0x01,0xff,0xe9,0xa9,0xaa,0x00,0xd2,0x20,
+-	0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0xba,0x97,0x00,0x01,0xff,0xe9,0xbb,0x8e,0x00,
+-	0x10,0x08,0x01,0xff,0xe5,0x8a,0x9b,0x00,0x01,0xff,0xe6,0x9b,0x86,0x00,0xd1,0x10,
+-	0x10,0x08,0x01,0xff,0xe6,0xad,0xb7,0x00,0x01,0xff,0xe8,0xbd,0xa2,0x00,0x10,0x08,
+-	0x01,0xff,0xe5,0xb9,0xb4,0x00,0x01,0xff,0xe6,0x86,0x90,0x00,0xd3,0x40,0xd2,0x20,
+-	0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0x88,0x80,0x00,0x01,0xff,0xe6,0x92,0x9a,0x00,
+-	0x10,0x08,0x01,0xff,0xe6,0xbc,0xa3,0x00,0x01,0xff,0xe7,0x85,0x89,0x00,0xd1,0x10,
+-	0x10,0x08,0x01,0xff,0xe7,0x92,0x89,0x00,0x01,0xff,0xe7,0xa7,0x8a,0x00,0x10,0x08,
+-	0x01,0xff,0xe7,0xb7,0xb4,0x00,0x01,0xff,0xe8,0x81,0xaf,0x00,0xd2,0x20,0xd1,0x10,
+-	0x10,0x08,0x01,0xff,0xe8,0xbc,0xa6,0x00,0x01,0xff,0xe8,0x93,0xae,0x00,0x10,0x08,
+-	0x01,0xff,0xe9,0x80,0xa3,0x00,0x01,0xff,0xe9,0x8d,0x8a,0x00,0xd1,0x10,0x10,0x08,
+-	0x01,0xff,0xe5,0x88,0x97,0x00,0x01,0xff,0xe5,0x8a,0xa3,0x00,0x10,0x08,0x01,0xff,
+-	0xe5,0x92,0xbd,0x00,0x01,0xff,0xe7,0x83,0x88,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,
+-	0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0xa3,0x82,0x00,0x01,0xff,0xe8,0xaa,0xaa,0x00,
+-	0x10,0x08,0x01,0xff,0xe5,0xbb,0x89,0x00,0x01,0xff,0xe5,0xbf,0xb5,0x00,0xd1,0x10,
+-	0x10,0x08,0x01,0xff,0xe6,0x8d,0xbb,0x00,0x01,0xff,0xe6,0xae,0xae,0x00,0x10,0x08,
+-	0x01,0xff,0xe7,0xb0,0xbe,0x00,0x01,0xff,0xe7,0x8d,0xb5,0x00,0xd2,0x20,0xd1,0x10,
+-	0x10,0x08,0x01,0xff,0xe4,0xbb,0xa4,0x00,0x01,0xff,0xe5,0x9b,0xb9,0x00,0x10,0x08,
+-	0x01,0xff,0xe5,0xaf,0xa7,0x00,0x01,0xff,0xe5,0xb6,0xba,0x00,0xd1,0x10,0x10,0x08,
+-	0x01,0xff,0xe6,0x80,0x9c,0x00,0x01,0xff,0xe7,0x8e,0xb2,0x00,0x10,0x08,0x01,0xff,
+-	0xe7,0x91,0xa9,0x00,0x01,0xff,0xe7,0xbe,0x9a,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,
+-	0x10,0x08,0x01,0xff,0xe8,0x81,0x86,0x00,0x01,0xff,0xe9,0x88,0xb4,0x00,0x10,0x08,
+-	0x01,0xff,0xe9,0x9b,0xb6,0x00,0x01,0xff,0xe9,0x9d,0x88,0x00,0xd1,0x10,0x10,0x08,
+-	0x01,0xff,0xe9,0xa0,0x98,0x00,0x01,0xff,0xe4,0xbe,0x8b,0x00,0x10,0x08,0x01,0xff,
+-	0xe7,0xa6,0xae,0x00,0x01,0xff,0xe9,0x86,0xb4,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x01,0xff,0xe9,0x9a,0xb8,0x00,0x01,0xff,0xe6,0x83,0xa1,0x00,0x10,0x08,0x01,0xff,
+-	0xe4,0xba,0x86,0x00,0x01,0xff,0xe5,0x83,0x9a,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
+-	0xe5,0xaf,0xae,0x00,0x01,0xff,0xe5,0xb0,0xbf,0x00,0x10,0x08,0x01,0xff,0xe6,0x96,
+-	0x99,0x00,0x01,0xff,0xe6,0xa8,0x82,0x00,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,
+-	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,0x87,0x8e,0x00,0x01,0xff,0xe7,
+-	0x99,0x82,0x00,0x10,0x08,0x01,0xff,0xe8,0x93,0xbc,0x00,0x01,0xff,0xe9,0x81,0xbc,
+-	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0xbe,0x8d,0x00,0x01,0xff,0xe6,0x9a,0x88,
+-	0x00,0x10,0x08,0x01,0xff,0xe9,0x98,0xae,0x00,0x01,0xff,0xe5,0x8a,0x89,0x00,0xd2,
+-	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0x9d,0xbb,0x00,0x01,0xff,0xe6,0x9f,0xb3,
+-	0x00,0x10,0x08,0x01,0xff,0xe6,0xb5,0x81,0x00,0x01,0xff,0xe6,0xba,0x9c,0x00,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0xe7,0x90,0x89,0x00,0x01,0xff,0xe7,0x95,0x99,0x00,0x10,
+-	0x08,0x01,0xff,0xe7,0xa1,0xab,0x00,0x01,0xff,0xe7,0xb4,0x90,0x00,0xd3,0x40,0xd2,
+-	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0xa1,0x9e,0x00,0x01,0xff,0xe5,0x85,0xad,
+-	0x00,0x10,0x08,0x01,0xff,0xe6,0x88,0xae,0x00,0x01,0xff,0xe9,0x99,0xb8,0x00,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0xe5,0x80,0xab,0x00,0x01,0xff,0xe5,0xb4,0x99,0x00,0x10,
+-	0x08,0x01,0xff,0xe6,0xb7,0xaa,0x00,0x01,0xff,0xe8,0xbc,0xaa,0x00,0xd2,0x20,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0xe5,0xbe,0x8b,0x00,0x01,0xff,0xe6,0x85,0x84,0x00,0x10,
+-	0x08,0x01,0xff,0xe6,0xa0,0x97,0x00,0x01,0xff,0xe7,0x8e,0x87,0x00,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0xe9,0x9a,0x86,0x00,0x01,0xff,0xe5,0x88,0xa9,0x00,0x10,0x08,0x01,
+-	0xff,0xe5,0x90,0x8f,0x00,0x01,0xff,0xe5,0xb1,0xa5,0x00,0xd4,0x80,0xd3,0x40,0xd2,
+-	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0x98,0x93,0x00,0x01,0xff,0xe6,0x9d,0x8e,
+-	0x00,0x10,0x08,0x01,0xff,0xe6,0xa2,0xa8,0x00,0x01,0xff,0xe6,0xb3,0xa5,0x00,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0xe7,0x90,0x86,0x00,0x01,0xff,0xe7,0x97,0xa2,0x00,0x10,
+-	0x08,0x01,0xff,0xe7,0xbd,0xb9,0x00,0x01,0xff,0xe8,0xa3,0x8f,0x00,0xd2,0x20,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0xe8,0xa3,0xa1,0x00,0x01,0xff,0xe9,0x87,0x8c,0x00,0x10,
+-	0x08,0x01,0xff,0xe9,0x9b,0xa2,0x00,0x01,0xff,0xe5,0x8c,0xbf,0x00,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0xe6,0xba,0xba,0x00,0x01,0xff,0xe5,0x90,0x9d,0x00,0x10,0x08,0x01,
+-	0xff,0xe7,0x87,0x90,0x00,0x01,0xff,0xe7,0x92,0x98,0x00,0xd3,0x40,0xd2,0x20,0xd1,
+-	0x10,0x10,0x08,0x01,0xff,0xe8,0x97,0xba,0x00,0x01,0xff,0xe9,0x9a,0xa3,0x00,0x10,
+-	0x08,0x01,0xff,0xe9,0xb1,0x97,0x00,0x01,0xff,0xe9,0xba,0x9f,0x00,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0xe6,0x9e,0x97,0x00,0x01,0xff,0xe6,0xb7,0x8b,0x00,0x10,0x08,0x01,
+-	0xff,0xe8,0x87,0xa8,0x00,0x01,0xff,0xe7,0xab,0x8b,0x00,0xd2,0x20,0xd1,0x10,0x10,
+-	0x08,0x01,0xff,0xe7,0xac,0xa0,0x00,0x01,0xff,0xe7,0xb2,0x92,0x00,0x10,0x08,0x01,
+-	0xff,0xe7,0x8b,0x80,0x00,0x01,0xff,0xe7,0x82,0x99,0x00,0xd1,0x10,0x10,0x08,0x01,
+-	0xff,0xe8,0xad,0x98,0x00,0x01,0xff,0xe4,0xbb,0x80,0x00,0x10,0x08,0x01,0xff,0xe8,
+-	0x8c,0xb6,0x00,0x01,0xff,0xe5,0x88,0xba,0x00,0xe2,0xad,0x06,0xe1,0xc4,0x03,0xe0,
+-	0xcb,0x01,0xcf,0x86,0xd5,0xe4,0xd4,0x74,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x01,0xff,0xe5,0x88,0x87,0x00,0x01,0xff,0xe5,0xba,0xa6,0x00,0x10,0x08,0x01,0xff,
+-	0xe6,0x8b,0x93,0x00,0x01,0xff,0xe7,0xb3,0x96,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
+-	0xe5,0xae,0x85,0x00,0x01,0xff,0xe6,0xb4,0x9e,0x00,0x10,0x08,0x01,0xff,0xe6,0x9a,
+-	0xb4,0x00,0x01,0xff,0xe8,0xbc,0xbb,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
+-	0xe8,0xa1,0x8c,0x00,0x01,0xff,0xe9,0x99,0x8d,0x00,0x10,0x08,0x01,0xff,0xe8,0xa6,
+-	0x8b,0x00,0x01,0xff,0xe5,0xbb,0x93,0x00,0x91,0x10,0x10,0x08,0x01,0xff,0xe5,0x85,
+-	0x80,0x00,0x01,0xff,0xe5,0x97,0x80,0x00,0x01,0x00,0xd3,0x34,0xd2,0x18,0xd1,0x0c,
+-	0x10,0x08,0x01,0xff,0xe5,0xa1,0x9a,0x00,0x01,0x00,0x10,0x08,0x01,0xff,0xe6,0x99,
+-	0xb4,0x00,0x01,0x00,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0xe5,0x87,0x9e,0x00,
+-	0x10,0x08,0x01,0xff,0xe7,0x8c,0xaa,0x00,0x01,0xff,0xe7,0x9b,0x8a,0x00,0xd2,0x20,
+-	0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,0xa4,0xbc,0x00,0x01,0xff,0xe7,0xa5,0x9e,0x00,
+-	0x10,0x08,0x01,0xff,0xe7,0xa5,0xa5,0x00,0x01,0xff,0xe7,0xa6,0x8f,0x00,0xd1,0x10,
+-	0x10,0x08,0x01,0xff,0xe9,0x9d,0x96,0x00,0x01,0xff,0xe7,0xb2,0xbe,0x00,0x10,0x08,
+-	0x01,0xff,0xe7,0xbe,0xbd,0x00,0x01,0x00,0xd4,0x64,0xd3,0x30,0xd2,0x18,0xd1,0x0c,
+-	0x10,0x08,0x01,0xff,0xe8,0x98,0x92,0x00,0x01,0x00,0x10,0x08,0x01,0xff,0xe8,0xab,
+-	0xb8,0x00,0x01,0x00,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0xe9,0x80,0xb8,0x00,
+-	0x10,0x08,0x01,0xff,0xe9,0x83,0xbd,0x00,0x01,0x00,0xd2,0x14,0x51,0x04,0x01,0x00,
+-	0x10,0x08,0x01,0xff,0xe9,0xa3,0xaf,0x00,0x01,0xff,0xe9,0xa3,0xbc,0x00,0xd1,0x10,
+-	0x10,0x08,0x01,0xff,0xe9,0xa4,0xa8,0x00,0x01,0xff,0xe9,0xb6,0xb4,0x00,0x10,0x08,
+-	0x0d,0xff,0xe9,0x83,0x9e,0x00,0x0d,0xff,0xe9,0x9a,0xb7,0x00,0xd3,0x40,0xd2,0x20,
+-	0xd1,0x10,0x10,0x08,0x06,0xff,0xe4,0xbe,0xae,0x00,0x06,0xff,0xe5,0x83,0xa7,0x00,
+-	0x10,0x08,0x06,0xff,0xe5,0x85,0x8d,0x00,0x06,0xff,0xe5,0x8b,0x89,0x00,0xd1,0x10,
+-	0x10,0x08,0x06,0xff,0xe5,0x8b,0xa4,0x00,0x06,0xff,0xe5,0x8d,0x91,0x00,0x10,0x08,
+-	0x06,0xff,0xe5,0x96,0x9d,0x00,0x06,0xff,0xe5,0x98,0x86,0x00,0xd2,0x20,0xd1,0x10,
+-	0x10,0x08,0x06,0xff,0xe5,0x99,0xa8,0x00,0x06,0xff,0xe5,0xa1,0x80,0x00,0x10,0x08,
+-	0x06,0xff,0xe5,0xa2,0xa8,0x00,0x06,0xff,0xe5,0xb1,0xa4,0x00,0xd1,0x10,0x10,0x08,
+-	0x06,0xff,0xe5,0xb1,0xae,0x00,0x06,0xff,0xe6,0x82,0x94,0x00,0x10,0x08,0x06,0xff,
+-	0xe6,0x85,0xa8,0x00,0x06,0xff,0xe6,0x86,0x8e,0x00,0xcf,0x86,0xe5,0x01,0x01,0xd4,
+-	0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x06,0xff,0xe6,0x87,0xb2,0x00,0x06,
+-	0xff,0xe6,0x95,0x8f,0x00,0x10,0x08,0x06,0xff,0xe6,0x97,0xa2,0x00,0x06,0xff,0xe6,
+-	0x9a,0x91,0x00,0xd1,0x10,0x10,0x08,0x06,0xff,0xe6,0xa2,0x85,0x00,0x06,0xff,0xe6,
+-	0xb5,0xb7,0x00,0x10,0x08,0x06,0xff,0xe6,0xb8,0x9a,0x00,0x06,0xff,0xe6,0xbc,0xa2,
+-	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x06,0xff,0xe7,0x85,0xae,0x00,0x06,0xff,0xe7,
+-	0x88,0xab,0x00,0x10,0x08,0x06,0xff,0xe7,0x90,0xa2,0x00,0x06,0xff,0xe7,0xa2,0x91,
+-	0x00,0xd1,0x10,0x10,0x08,0x06,0xff,0xe7,0xa4,0xbe,0x00,0x06,0xff,0xe7,0xa5,0x89,
+-	0x00,0x10,0x08,0x06,0xff,0xe7,0xa5,0x88,0x00,0x06,0xff,0xe7,0xa5,0x90,0x00,0xd3,
+-	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x06,0xff,0xe7,0xa5,0x96,0x00,0x06,0xff,0xe7,
+-	0xa5,0x9d,0x00,0x10,0x08,0x06,0xff,0xe7,0xa6,0x8d,0x00,0x06,0xff,0xe7,0xa6,0x8e,
+-	0x00,0xd1,0x10,0x10,0x08,0x06,0xff,0xe7,0xa9,0x80,0x00,0x06,0xff,0xe7,0xaa,0x81,
+-	0x00,0x10,0x08,0x06,0xff,0xe7,0xaf,0x80,0x00,0x06,0xff,0xe7,0xb7,0xb4,0x00,0xd2,
+-	0x20,0xd1,0x10,0x10,0x08,0x06,0xff,0xe7,0xb8,0x89,0x00,0x06,0xff,0xe7,0xb9,0x81,
+-	0x00,0x10,0x08,0x06,0xff,0xe7,0xbd,0xb2,0x00,0x06,0xff,0xe8,0x80,0x85,0x00,0xd1,
+-	0x10,0x10,0x08,0x06,0xff,0xe8,0x87,0xad,0x00,0x06,0xff,0xe8,0x89,0xb9,0x00,0x10,
+-	0x08,0x06,0xff,0xe8,0x89,0xb9,0x00,0x06,0xff,0xe8,0x91,0x97,0x00,0xd4,0x75,0xd3,
+-	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x06,0xff,0xe8,0xa4,0x90,0x00,0x06,0xff,0xe8,
+-	0xa6,0x96,0x00,0x10,0x08,0x06,0xff,0xe8,0xac,0x81,0x00,0x06,0xff,0xe8,0xac,0xb9,
+-	0x00,0xd1,0x10,0x10,0x08,0x06,0xff,0xe8,0xb3,0x93,0x00,0x06,0xff,0xe8,0xb4,0x88,
+-	0x00,0x10,0x08,0x06,0xff,0xe8,0xbe,0xb6,0x00,0x06,0xff,0xe9,0x80,0xb8,0x00,0xd2,
+-	0x20,0xd1,0x10,0x10,0x08,0x06,0xff,0xe9,0x9b,0xa3,0x00,0x06,0xff,0xe9,0x9f,0xbf,
+-	0x00,0x10,0x08,0x06,0xff,0xe9,0xa0,0xbb,0x00,0x0b,0xff,0xe6,0x81,0xb5,0x00,0x91,
+-	0x11,0x10,0x09,0x0b,0xff,0xf0,0xa4,0x8b,0xae,0x00,0x0b,0xff,0xe8,0x88,0x98,0x00,
+-	0x00,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe4,0xb8,0xa6,0x00,
+-	0x08,0xff,0xe5,0x86,0xb5,0x00,0x10,0x08,0x08,0xff,0xe5,0x85,0xa8,0x00,0x08,0xff,
+-	0xe4,0xbe,0x80,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe5,0x85,0x85,0x00,0x08,0xff,
+-	0xe5,0x86,0x80,0x00,0x10,0x08,0x08,0xff,0xe5,0x8b,0x87,0x00,0x08,0xff,0xe5,0x8b,
+-	0xba,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe5,0x96,0x9d,0x00,0x08,0xff,
+-	0xe5,0x95,0x95,0x00,0x10,0x08,0x08,0xff,0xe5,0x96,0x99,0x00,0x08,0xff,0xe5,0x97,
+-	0xa2,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe5,0xa1,0x9a,0x00,0x08,0xff,0xe5,0xa2,
+-	0xb3,0x00,0x10,0x08,0x08,0xff,0xe5,0xa5,0x84,0x00,0x08,0xff,0xe5,0xa5,0x94,0x00,
+-	0xe0,0x04,0x02,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,
+-	0x10,0x08,0x08,0xff,0xe5,0xa9,0xa2,0x00,0x08,0xff,0xe5,0xac,0xa8,0x00,0x10,0x08,
+-	0x08,0xff,0xe5,0xbb,0x92,0x00,0x08,0xff,0xe5,0xbb,0x99,0x00,0xd1,0x10,0x10,0x08,
+-	0x08,0xff,0xe5,0xbd,0xa9,0x00,0x08,0xff,0xe5,0xbe,0xad,0x00,0x10,0x08,0x08,0xff,
+-	0xe6,0x83,0x98,0x00,0x08,0xff,0xe6,0x85,0x8e,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x08,0xff,0xe6,0x84,0x88,0x00,0x08,0xff,0xe6,0x86,0x8e,0x00,0x10,0x08,0x08,0xff,
+-	0xe6,0x85,0xa0,0x00,0x08,0xff,0xe6,0x87,0xb2,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,
+-	0xe6,0x88,0xb4,0x00,0x08,0xff,0xe6,0x8f,0x84,0x00,0x10,0x08,0x08,0xff,0xe6,0x90,
+-	0x9c,0x00,0x08,0xff,0xe6,0x91,0x92,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x08,0xff,0xe6,0x95,0x96,0x00,0x08,0xff,0xe6,0x99,0xb4,0x00,0x10,0x08,0x08,0xff,
+-	0xe6,0x9c,0x97,0x00,0x08,0xff,0xe6,0x9c,0x9b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,
+-	0xe6,0x9d,0x96,0x00,0x08,0xff,0xe6,0xad,0xb9,0x00,0x10,0x08,0x08,0xff,0xe6,0xae,
+-	0xba,0x00,0x08,0xff,0xe6,0xb5,0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,
+-	0xe6,0xbb,0x9b,0x00,0x08,0xff,0xe6,0xbb,0x8b,0x00,0x10,0x08,0x08,0xff,0xe6,0xbc,
+-	0xa2,0x00,0x08,0xff,0xe7,0x80,0x9e,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe7,0x85,
+-	0xae,0x00,0x08,0xff,0xe7,0x9e,0xa7,0x00,0x10,0x08,0x08,0xff,0xe7,0x88,0xb5,0x00,
+-	0x08,0xff,0xe7,0x8a,0xaf,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x08,0xff,0xe7,0x8c,0xaa,0x00,0x08,0xff,0xe7,0x91,0xb1,0x00,0x10,0x08,0x08,0xff,
+-	0xe7,0x94,0x86,0x00,0x08,0xff,0xe7,0x94,0xbb,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,
+-	0xe7,0x98,0x9d,0x00,0x08,0xff,0xe7,0x98,0x9f,0x00,0x10,0x08,0x08,0xff,0xe7,0x9b,
+-	0x8a,0x00,0x08,0xff,0xe7,0x9b,0x9b,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,
+-	0xe7,0x9b,0xb4,0x00,0x08,0xff,0xe7,0x9d,0x8a,0x00,0x10,0x08,0x08,0xff,0xe7,0x9d,
+-	0x80,0x00,0x08,0xff,0xe7,0xa3,0x8c,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe7,0xaa,
+-	0xb1,0x00,0x08,0xff,0xe7,0xaf,0x80,0x00,0x10,0x08,0x08,0xff,0xe7,0xb1,0xbb,0x00,
+-	0x08,0xff,0xe7,0xb5,0x9b,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,
+-	0xe7,0xb7,0xb4,0x00,0x08,0xff,0xe7,0xbc,0xbe,0x00,0x10,0x08,0x08,0xff,0xe8,0x80,
+-	0x85,0x00,0x08,0xff,0xe8,0x8d,0x92,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe8,0x8f,
+-	0xaf,0x00,0x08,0xff,0xe8,0x9d,0xb9,0x00,0x10,0x08,0x08,0xff,0xe8,0xa5,0x81,0x00,
+-	0x08,0xff,0xe8,0xa6,0x86,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe8,0xa6,
+-	0x96,0x00,0x08,0xff,0xe8,0xaa,0xbf,0x00,0x10,0x08,0x08,0xff,0xe8,0xab,0xb8,0x00,
+-	0x08,0xff,0xe8,0xab,0x8b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe8,0xac,0x81,0x00,
+-	0x08,0xff,0xe8,0xab,0xbe,0x00,0x10,0x08,0x08,0xff,0xe8,0xab,0xad,0x00,0x08,0xff,
+-	0xe8,0xac,0xb9,0x00,0xcf,0x86,0x95,0xde,0xd4,0x81,0xd3,0x40,0xd2,0x20,0xd1,0x10,
+-	0x10,0x08,0x08,0xff,0xe8,0xae,0x8a,0x00,0x08,0xff,0xe8,0xb4,0x88,0x00,0x10,0x08,
+-	0x08,0xff,0xe8,0xbc,0xb8,0x00,0x08,0xff,0xe9,0x81,0xb2,0x00,0xd1,0x10,0x10,0x08,
+-	0x08,0xff,0xe9,0x86,0x99,0x00,0x08,0xff,0xe9,0x89,0xb6,0x00,0x10,0x08,0x08,0xff,
+-	0xe9,0x99,0xbc,0x00,0x08,0xff,0xe9,0x9b,0xa3,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
+-	0x08,0xff,0xe9,0x9d,0x96,0x00,0x08,0xff,0xe9,0x9f,0x9b,0x00,0x10,0x08,0x08,0xff,
+-	0xe9,0x9f,0xbf,0x00,0x08,0xff,0xe9,0xa0,0x8b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,
+-	0xe9,0xa0,0xbb,0x00,0x08,0xff,0xe9,0xac,0x92,0x00,0x10,0x08,0x08,0xff,0xe9,0xbe,
+-	0x9c,0x00,0x08,0xff,0xf0,0xa2,0xa1,0x8a,0x00,0xd3,0x45,0xd2,0x22,0xd1,0x12,0x10,
+-	0x09,0x08,0xff,0xf0,0xa2,0xa1,0x84,0x00,0x08,0xff,0xf0,0xa3,0x8f,0x95,0x00,0x10,
+-	0x08,0x08,0xff,0xe3,0xae,0x9d,0x00,0x08,0xff,0xe4,0x80,0x98,0x00,0xd1,0x11,0x10,
+-	0x08,0x08,0xff,0xe4,0x80,0xb9,0x00,0x08,0xff,0xf0,0xa5,0x89,0x89,0x00,0x10,0x09,
+-	0x08,0xff,0xf0,0xa5,0xb3,0x90,0x00,0x08,0xff,0xf0,0xa7,0xbb,0x93,0x00,0x92,0x14,
+-	0x91,0x10,0x10,0x08,0x08,0xff,0xe9,0xbd,0x83,0x00,0x08,0xff,0xe9,0xbe,0x8e,0x00,
+-	0x00,0x00,0x00,0x00,0x00,0x00,0xe1,0x94,0x01,0xe0,0x08,0x01,0xcf,0x86,0xd5,0x42,
+-	0xd4,0x14,0x93,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
+-	0x00,0x00,0x00,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,
+-	0x01,0x00,0x01,0x00,0x52,0x04,0x00,0x00,0xd1,0x0d,0x10,0x04,0x00,0x00,0x04,0xff,
+-	0xd7,0x99,0xd6,0xb4,0x00,0x10,0x04,0x01,0x1a,0x01,0xff,0xd7,0xb2,0xd6,0xb7,0x00,
+-	0xd4,0x42,0x53,0x04,0x01,0x00,0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,
+-	0xd7,0xa9,0xd7,0x81,0x00,0x01,0xff,0xd7,0xa9,0xd7,0x82,0x00,0xd1,0x16,0x10,0x0b,
+-	0x01,0xff,0xd7,0xa9,0xd6,0xbc,0xd7,0x81,0x00,0x01,0xff,0xd7,0xa9,0xd6,0xbc,0xd7,
+-	0x82,0x00,0x10,0x09,0x01,0xff,0xd7,0x90,0xd6,0xb7,0x00,0x01,0xff,0xd7,0x90,0xd6,
+-	0xb8,0x00,0xd3,0x43,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0x90,0xd6,0xbc,
+-	0x00,0x01,0xff,0xd7,0x91,0xd6,0xbc,0x00,0x10,0x09,0x01,0xff,0xd7,0x92,0xd6,0xbc,
+-	0x00,0x01,0xff,0xd7,0x93,0xd6,0xbc,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0x94,
+-	0xd6,0xbc,0x00,0x01,0xff,0xd7,0x95,0xd6,0xbc,0x00,0x10,0x09,0x01,0xff,0xd7,0x96,
+-	0xd6,0xbc,0x00,0x00,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0x98,0xd6,
+-	0xbc,0x00,0x01,0xff,0xd7,0x99,0xd6,0xbc,0x00,0x10,0x09,0x01,0xff,0xd7,0x9a,0xd6,
+-	0xbc,0x00,0x01,0xff,0xd7,0x9b,0xd6,0xbc,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xd7,
+-	0x9c,0xd6,0xbc,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xd7,0x9e,0xd6,0xbc,0x00,0x00,
+-	0x00,0xcf,0x86,0x95,0x85,0x94,0x81,0xd3,0x3e,0xd2,0x1f,0xd1,0x12,0x10,0x09,0x01,
+-	0xff,0xd7,0xa0,0xd6,0xbc,0x00,0x01,0xff,0xd7,0xa1,0xd6,0xbc,0x00,0x10,0x04,0x00,
+-	0x00,0x01,0xff,0xd7,0xa3,0xd6,0xbc,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xd7,0xa4,
+-	0xd6,0xbc,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xd7,0xa6,0xd6,0xbc,0x00,0x01,0xff,
+-	0xd7,0xa7,0xd6,0xbc,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0xa8,0xd6,
+-	0xbc,0x00,0x01,0xff,0xd7,0xa9,0xd6,0xbc,0x00,0x10,0x09,0x01,0xff,0xd7,0xaa,0xd6,
+-	0xbc,0x00,0x01,0xff,0xd7,0x95,0xd6,0xb9,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,
+-	0x91,0xd6,0xbf,0x00,0x01,0xff,0xd7,0x9b,0xd6,0xbf,0x00,0x10,0x09,0x01,0xff,0xd7,
+-	0xa4,0xd6,0xbf,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd0,0x1a,0xcf,0x86,0x55,0x04,
+-	0x01,0x00,0x54,0x04,0x01,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x01,0x00,0x0c,0x00,
+-	0x0c,0x00,0x0c,0x00,0xcf,0x86,0x95,0x24,0xd4,0x10,0x93,0x0c,0x92,0x08,0x11,0x04,
+-	0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x00,0x00,
+-	0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd3,0x5a,0xd2,0x06,
+-	0xcf,0x06,0x01,0x00,0xd1,0x14,0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0x95,0x08,
+-	0x14,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd0,0x1a,0xcf,0x86,0x95,0x14,0x54,0x04,
+-	0x01,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
+-	0x01,0x00,0xcf,0x86,0xd5,0x0c,0x94,0x08,0x13,0x04,0x01,0x00,0x00,0x00,0x05,0x00,
+-	0x54,0x04,0x05,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,
+-	0x06,0x00,0x07,0x00,0x00,0x00,0xd2,0xce,0xd1,0xa5,0xd0,0x37,0xcf,0x86,0xd5,0x15,
+-	0x54,0x05,0x06,0xff,0x00,0x53,0x04,0x08,0x00,0x92,0x08,0x11,0x04,0x08,0x00,0x00,
+-	0x00,0x00,0x00,0x94,0x1c,0xd3,0x10,0x52,0x04,0x01,0xe6,0x51,0x04,0x0a,0xe6,0x10,
+-	0x04,0x0a,0xe6,0x10,0xdc,0x52,0x04,0x10,0xdc,0x11,0x04,0x10,0xdc,0x11,0xe6,0x01,
+-	0x00,0xcf,0x86,0xd5,0x38,0xd4,0x24,0xd3,0x14,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,
+-	0x04,0x01,0x00,0x06,0x00,0x10,0x04,0x06,0x00,0x07,0x00,0x92,0x0c,0x91,0x08,0x10,
+-	0x04,0x07,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x01,
+-	0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0xd4,0x18,0xd3,0x10,0x52,
+-	0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x12,0x04,0x01,
+-	0x00,0x00,0x00,0x93,0x18,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x06,
+-	0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0xd0,0x06,0xcf,
+-	0x06,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,
++	0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x91,0x08,
++	0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,
++	0x91,0x08,0x10,0x04,0x01,0x07,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x3c,0xd4,0x28,
++	0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x00,0x00,0x01,0x00,
++	0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,
++	0x01,0x00,0x01,0x09,0x00,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,
++	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd4,0x18,0x93,0x14,0xd2,0x0c,0x91,0x08,
++	0x10,0x04,0x01,0x00,0x07,0x00,0x07,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,
++	0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0d,0x00,0x07,0x00,0x00,0x00,0x00,0x00,
++	0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x11,0x00,0x13,0x00,0x13,0x00,0xe1,0x24,
++	0x01,0xd0,0x86,0xcf,0x86,0xd5,0x44,0xd4,0x2c,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,
++	0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,
+ 	0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x00,
+-	0x00,0x01,0xff,0x00,0xd1,0x50,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x94,0x14,0x93,0x10,
+-	0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
+-	0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,
+-	0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x06,0x00,0x94,0x14,
+-	0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x06,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
+-	0x01,0x00,0x01,0x00,0xd0,0x2f,0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x15,0x93,0x11,
+-	0x92,0x0d,0x91,0x09,0x10,0x05,0x01,0xff,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,
+-	0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
+-	0x00,0x00,0x00,0xcf,0x86,0xd5,0x38,0xd4,0x18,0xd3,0x0c,0x92,0x08,0x11,0x04,0x00,
+-	0x00,0x01,0x00,0x01,0x00,0x92,0x08,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd3,
+-	0x0c,0x92,0x08,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x00,
+-	0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0xd4,0x20,0xd3,
+-	0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x52,
+-	0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x53,0x05,0x00,
+-	0xff,0x00,0xd2,0x0d,0x91,0x09,0x10,0x05,0x00,0xff,0x00,0x04,0x00,0x04,0x00,0x91,
+-	0x08,0x10,0x04,0x03,0x00,0x01,0x00,0x01,0x00,0x83,0xe2,0x46,0x3e,0xe1,0x1f,0x3b,
+-	0xe0,0x9c,0x39,0xcf,0x86,0xe5,0x40,0x26,0xc4,0xe3,0x16,0x14,0xe2,0xef,0x11,0xe1,
+-	0xd0,0x10,0xe0,0x60,0x07,0xcf,0x86,0xe5,0x53,0x03,0xe4,0x4c,0x02,0xe3,0x3d,0x01,
+-	0xd2,0x94,0xd1,0x70,0xd0,0x4a,0xcf,0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x07,0x00,
+-	0x52,0x04,0x07,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x07,0x00,0x07,0x00,0x07,0x00,
+-	0xd4,0x14,0x93,0x10,0x52,0x04,0x07,0x00,0x51,0x04,0x07,0x00,0x10,0x04,0x07,0x00,
+-	0x00,0x00,0x07,0x00,0x53,0x04,0x07,0x00,0xd2,0x0c,0x51,0x04,0x07,0x00,0x10,0x04,
+-	0x07,0x00,0x00,0x00,0x51,0x04,0x07,0x00,0x10,0x04,0x00,0x00,0x07,0x00,0xcf,0x86,
+-	0x95,0x20,0xd4,0x10,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,0x11,0x04,0x07,0x00,
+-	0x00,0x00,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,0x11,0x04,0x07,0x00,0x00,0x00,
+-	0x00,0x00,0xd0,0x06,0xcf,0x06,0x07,0x00,0xcf,0x86,0x55,0x04,0x07,0x00,0x54,0x04,
+-	0x07,0x00,0x53,0x04,0x07,0x00,0x92,0x0c,0x51,0x04,0x07,0x00,0x10,0x04,0x07,0x00,
+-	0x00,0x00,0x00,0x00,0xd1,0x40,0xd0,0x3a,0xcf,0x86,0xd5,0x20,0x94,0x1c,0x93,0x18,
+-	0xd2,0x0c,0x51,0x04,0x07,0x00,0x10,0x04,0x07,0x00,0x00,0x00,0x51,0x04,0x00,0x00,
+-	0x10,0x04,0x00,0x00,0x07,0x00,0x07,0x00,0x07,0x00,0x54,0x04,0x07,0x00,0x93,0x10,
+-	0x52,0x04,0x07,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x07,0x00,0x07,0x00,
+-	0xcf,0x06,0x08,0x00,0xd0,0x46,0xcf,0x86,0xd5,0x2c,0xd4,0x20,0x53,0x04,0x08,0x00,
+-	0xd2,0x0c,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x10,0x00,0xd1,0x08,0x10,0x04,
+-	0x10,0x00,0x12,0x00,0x10,0x04,0x12,0x00,0x00,0x00,0x53,0x04,0x0a,0x00,0x12,0x04,
+-	0x0a,0x00,0x00,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x10,0x00,
+-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x08,0x14,0x04,
+-	0x00,0x00,0x0a,0x00,0x54,0x04,0x0a,0x00,0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,
+-	0x91,0x08,0x10,0x04,0x0a,0x00,0x0a,0xdc,0x00,0x00,0xd2,0x5e,0xd1,0x06,0xcf,0x06,
+-	0x00,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x0a,0x00,0x53,0x04,0x0a,0x00,
+-	0x52,0x04,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,
+-	0xcf,0x86,0xd5,0x18,0x54,0x04,0x0a,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,
+-	0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd4,0x14,0x93,0x10,0x92,0x0c,
+-	0x91,0x08,0x10,0x04,0x10,0xdc,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x53,0x04,
+-	0x10,0x00,0x12,0x04,0x10,0x00,0x00,0x00,0xd1,0x70,0xd0,0x36,0xcf,0x86,0xd5,0x18,
+-	0x54,0x04,0x05,0x00,0x53,0x04,0x05,0x00,0x52,0x04,0x05,0x00,0x51,0x04,0x05,0x00,
+-	0x10,0x04,0x05,0x00,0x10,0x00,0x94,0x18,0xd3,0x08,0x12,0x04,0x05,0x00,0x00,0x00,
+-	0x52,0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x13,0x00,0x13,0x00,0x05,0x00,
+-	0xcf,0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x05,0x00,0x92,0x0c,0x51,0x04,0x05,0x00,
+-	0x10,0x04,0x05,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x54,0x04,0x10,0x00,0xd3,0x0c,
+-	0x52,0x04,0x10,0x00,0x11,0x04,0x10,0x00,0x10,0xe6,0x92,0x0c,0x51,0x04,0x10,0xe6,
+-	0x10,0x04,0x10,0xe6,0x00,0x00,0x00,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,
+-	0x07,0x00,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,0x51,0x04,0x07,0x00,0x10,0x04,
+-	0x00,0x00,0x07,0x00,0x08,0x00,0xcf,0x86,0x95,0x1c,0xd4,0x0c,0x93,0x08,0x12,0x04,
+-	0x08,0x00,0x00,0x00,0x08,0x00,0x93,0x0c,0x52,0x04,0x08,0x00,0x11,0x04,0x08,0x00,
+-	0x00,0x00,0x00,0x00,0x00,0x00,0xd3,0xba,0xd2,0x80,0xd1,0x34,0xd0,0x1a,0xcf,0x86,
+-	0x55,0x04,0x05,0x00,0x94,0x10,0x93,0x0c,0x52,0x04,0x05,0x00,0x11,0x04,0x05,0x00,
+-	0x07,0x00,0x05,0x00,0x05,0x00,0xcf,0x86,0x95,0x14,0x94,0x10,0x53,0x04,0x05,0x00,
+-	0x52,0x04,0x05,0x00,0x11,0x04,0x05,0x00,0x07,0x00,0x07,0x00,0x07,0x00,0xd0,0x2a,
+-	0xcf,0x86,0xd5,0x14,0x54,0x04,0x07,0x00,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,
+-	0x11,0x04,0x07,0x00,0x00,0x00,0x94,0x10,0x53,0x04,0x07,0x00,0x92,0x08,0x11,0x04,
+-	0x07,0x00,0x00,0x00,0x00,0x00,0x12,0x00,0xcf,0x86,0xd5,0x10,0x54,0x04,0x12,0x00,
+-	0x93,0x08,0x12,0x04,0x12,0x00,0x00,0x00,0x12,0x00,0x54,0x04,0x12,0x00,0x53,0x04,
+-	0x12,0x00,0x12,0x04,0x12,0x00,0x00,0x00,0xd1,0x34,0xd0,0x12,0xcf,0x86,0x55,0x04,
+-	0x10,0x00,0x94,0x08,0x13,0x04,0x10,0x00,0x00,0x00,0x10,0x00,0xcf,0x86,0x55,0x04,
+-	0x10,0x00,0x94,0x18,0xd3,0x08,0x12,0x04,0x10,0x00,0x00,0x00,0x52,0x04,0x00,0x00,
+-	0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,
+-	0xd2,0x06,0xcf,0x06,0x10,0x00,0xd1,0x40,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x10,0x00,
+-	0x54,0x04,0x10,0x00,0x93,0x10,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,
+-	0x10,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x14,0x54,0x04,0x10,0x00,0x93,0x0c,
+-	0x52,0x04,0x10,0x00,0x11,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x94,0x08,0x13,0x04,
+-	0x10,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xe4,0xce,0x02,0xe3,0x45,0x01,
+-	0xd2,0xd0,0xd1,0x70,0xd0,0x52,0xcf,0x86,0xd5,0x20,0x94,0x1c,0xd3,0x0c,0x52,0x04,
+-	0x07,0x00,0x11,0x04,0x07,0x00,0x00,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x07,0x00,
+-	0x00,0x00,0x07,0x00,0x07,0x00,0x07,0x00,0x54,0x04,0x07,0x00,0xd3,0x10,0x52,0x04,
+-	0x07,0x00,0x51,0x04,0x07,0x00,0x10,0x04,0x00,0x00,0x07,0x00,0xd2,0x0c,0x91,0x08,
+-	0x10,0x04,0x07,0x00,0x00,0x00,0x00,0x00,0xd1,0x08,0x10,0x04,0x07,0x00,0x00,0x00,
+-	0x10,0x04,0x00,0x00,0x07,0x00,0xcf,0x86,0x95,0x18,0x54,0x04,0x0b,0x00,0x93,0x10,
+-	0x52,0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x00,0x00,0x0b,0x00,0x0b,0x00,
+-	0x10,0x00,0xd0,0x32,0xcf,0x86,0xd5,0x18,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,
+-	0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x94,0x14,
+-	0x93,0x10,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,
+-	0x10,0x00,0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,0x04,0x11,0x00,0xd3,0x14,
+-	0xd2,0x0c,0x51,0x04,0x11,0x00,0x10,0x04,0x11,0x00,0x00,0x00,0x11,0x04,0x11,0x00,
+-	0x00,0x00,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x11,0x00,0x11,0x00,
+-	0xd1,0x40,0xd0,0x3a,0xcf,0x86,0xd5,0x1c,0x54,0x04,0x09,0x00,0x53,0x04,0x09,0x00,
+-	0xd2,0x08,0x11,0x04,0x09,0x00,0x0b,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,
+-	0x09,0x00,0x54,0x04,0x0a,0x00,0x53,0x04,0x0a,0x00,0xd2,0x08,0x11,0x04,0x0a,0x00,
+-	0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0a,0x00,0xcf,0x06,0x00,0x00,
+-	0xd0,0x1a,0xcf,0x86,0x55,0x04,0x0d,0x00,0x54,0x04,0x0d,0x00,0x53,0x04,0x0d,0x00,
+-	0x52,0x04,0x00,0x00,0x11,0x04,0x11,0x00,0x0d,0x00,0xcf,0x86,0x95,0x14,0x54,0x04,
+-	0x11,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x00,0x00,0x11,0x00,0x11,0x00,0x11,0x00,
+-	0x11,0x00,0xd2,0xec,0xd1,0xa4,0xd0,0x76,0xcf,0x86,0xd5,0x48,0xd4,0x28,0xd3,0x14,
+-	0x52,0x04,0x08,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,0x08,0x00,0x10,0x04,0x08,0x00,
+-	0x00,0x00,0x52,0x04,0x00,0x00,0xd1,0x08,0x10,0x04,0x08,0x00,0x08,0xdc,0x10,0x04,
+-	0x08,0x00,0x08,0xe6,0xd3,0x10,0x52,0x04,0x08,0x00,0x91,0x08,0x10,0x04,0x00,0x00,
+-	0x08,0x00,0x08,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x08,0x00,0x08,0x00,
+-	0x08,0x00,0x54,0x04,0x08,0x00,0xd3,0x0c,0x52,0x04,0x08,0x00,0x11,0x04,0x14,0x00,
+-	0x00,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x08,0xe6,0x08,0x01,0x10,0x04,0x08,0xdc,
+-	0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x08,0x09,0xcf,0x86,0x95,0x28,
+-	0xd4,0x14,0x53,0x04,0x08,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,
+-	0x00,0x00,0x00,0x00,0x53,0x04,0x08,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x08,0x00,
+-	0x00,0x00,0x00,0x00,0x00,0x00,0x0b,0x00,0xd0,0x0a,0xcf,0x86,0x15,0x04,0x10,0x00,
+-	0x00,0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0xd4,0x24,0xd3,0x14,0x52,0x04,0x10,0x00,
+-	0xd1,0x08,0x10,0x04,0x10,0x00,0x10,0xe6,0x10,0x04,0x10,0xdc,0x00,0x00,0x92,0x0c,
+-	0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x93,0x10,0x52,0x04,
+-	0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xd1,0x54,
+-	0xd0,0x26,0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,0x0b,0x00,0xd3,0x0c,0x52,0x04,
+-	0x0b,0x00,0x11,0x04,0x0b,0x00,0x00,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,
+-	0x0b,0x00,0x0b,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x14,0x54,0x04,0x0b,0x00,0x93,0x0c,
+-	0x52,0x04,0x0b,0x00,0x11,0x04,0x0b,0x00,0x00,0x00,0x0b,0x00,0x54,0x04,0x0b,0x00,
+-	0x93,0x10,0x92,0x0c,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,
+-	0x0b,0x00,0xd0,0x42,0xcf,0x86,0xd5,0x28,0x54,0x04,0x10,0x00,0xd3,0x0c,0x92,0x08,
+-	0x11,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,
+-	0x10,0x00,0x10,0x00,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x94,0x14,
+-	0x53,0x04,0x00,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,
+-	0x10,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd3,0x96,0xd2,0x68,0xd1,0x24,0xd0,0x06,
+-	0xcf,0x06,0x0b,0x00,0xcf,0x86,0x95,0x18,0x94,0x14,0x53,0x04,0x0b,0x00,0x92,0x0c,
+-	0x91,0x08,0x10,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-	0xd0,0x1e,0xcf,0x86,0x55,0x04,0x11,0x00,0x54,0x04,0x11,0x00,0x93,0x10,0x92,0x0c,
+-	0x51,0x04,0x11,0x00,0x10,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,
+-	0x55,0x04,0x11,0x00,0x54,0x04,0x11,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,0x11,0x00,
+-	0x10,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0x92,0x08,0x11,0x04,0x00,0x00,0x11,0x00,
+-	0x11,0x00,0xd1,0x28,0xd0,0x22,0xcf,0x86,0x55,0x04,0x14,0x00,0xd4,0x0c,0x93,0x08,
+-	0x12,0x04,0x14,0x00,0x14,0xe6,0x00,0x00,0x53,0x04,0x14,0x00,0x92,0x08,0x11,0x04,
+-	0x14,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xd2,0x2a,
+-	0xd1,0x24,0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,0x04,
+-	0x0b,0x00,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,
+-	0x0b,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd1,0x58,0xd0,0x12,0xcf,0x86,0x55,0x04,
+-	0x14,0x00,0x94,0x08,0x13,0x04,0x14,0x00,0x00,0x00,0x14,0x00,0xcf,0x86,0x95,0x40,
+-	0xd4,0x24,0xd3,0x0c,0x52,0x04,0x14,0x00,0x11,0x04,0x14,0x00,0x14,0xdc,0xd2,0x0c,
+-	0x51,0x04,0x14,0xe6,0x10,0x04,0x14,0xe6,0x14,0xdc,0x91,0x08,0x10,0x04,0x14,0xe6,
+-	0x14,0xdc,0x14,0xdc,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0xdc,0x14,0x00,
+-	0x14,0x00,0x14,0x00,0x92,0x08,0x11,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-	0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,0x04,0x15,0x00,
+-	0x93,0x10,0x52,0x04,0x15,0x00,0x51,0x04,0x15,0x00,0x10,0x04,0x15,0x00,0x00,0x00,
+-	0x00,0x00,0xcf,0x86,0xe5,0x0f,0x06,0xe4,0xf8,0x03,0xe3,0x02,0x02,0xd2,0xfb,0xd1,
+-	0x4c,0xd0,0x06,0xcf,0x06,0x0c,0x00,0xcf,0x86,0xd5,0x2c,0xd4,0x1c,0xd3,0x10,0x52,
+-	0x04,0x0c,0x00,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x09,0x0c,0x00,0x52,0x04,0x0c,
+-	0x00,0x11,0x04,0x0c,0x00,0x00,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x00,0x00,0x0c,
+-	0x00,0x0c,0x00,0x0c,0x00,0x54,0x04,0x0c,0x00,0x53,0x04,0x00,0x00,0x52,0x04,0x00,
+-	0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x09,0xd0,0x69,0xcf,0x86,0xd5,
+-	0x32,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,0xd2,0x15,0x51,0x04,0x0b,0x00,0x10,
+-	0x0d,0x0b,0xff,0xf0,0x91,0x82,0x99,0xf0,0x91,0x82,0xba,0x00,0x0b,0x00,0x91,0x11,
+-	0x10,0x0d,0x0b,0xff,0xf0,0x91,0x82,0x9b,0xf0,0x91,0x82,0xba,0x00,0x0b,0x00,0x0b,
+-	0x00,0xd4,0x1d,0x53,0x04,0x0b,0x00,0x92,0x15,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,
+-	0x00,0x0b,0xff,0xf0,0x91,0x82,0xa5,0xf0,0x91,0x82,0xba,0x00,0x0b,0x00,0x53,0x04,
+-	0x0b,0x00,0x92,0x10,0xd1,0x08,0x10,0x04,0x0b,0x00,0x0b,0x09,0x10,0x04,0x0b,0x07,
+-	0x0b,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x20,0x94,0x1c,0xd3,0x0c,0x92,0x08,0x11,0x04,
+-	0x0b,0x00,0x00,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,
+-	0x14,0x00,0x00,0x00,0x0d,0x00,0xd4,0x14,0x53,0x04,0x0d,0x00,0x92,0x0c,0x91,0x08,
+-	0x10,0x04,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x0d,0x00,0x92,0x08,
+-	0x11,0x04,0x0d,0x00,0x00,0x00,0x00,0x00,0xd1,0x96,0xd0,0x5c,0xcf,0x86,0xd5,0x18,
+-	0x94,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,0x0d,0xe6,0x10,0x04,0x0d,0xe6,0x0d,0x00,
+-	0x0d,0x00,0x0d,0x00,0x0d,0x00,0xd4,0x26,0x53,0x04,0x0d,0x00,0x52,0x04,0x0d,0x00,
+-	0x51,0x04,0x0d,0x00,0x10,0x0d,0x0d,0xff,0xf0,0x91,0x84,0xb1,0xf0,0x91,0x84,0xa7,
+-	0x00,0x0d,0xff,0xf0,0x91,0x84,0xb2,0xf0,0x91,0x84,0xa7,0x00,0x93,0x18,0xd2,0x0c,
+-	0x51,0x04,0x0d,0x00,0x10,0x04,0x0d,0x00,0x0d,0x09,0x91,0x08,0x10,0x04,0x0d,0x09,
+-	0x00,0x00,0x0d,0x00,0x0d,0x00,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x52,0x04,
+-	0x0d,0x00,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0x10,0x00,
+-	0x54,0x04,0x10,0x00,0x93,0x18,0xd2,0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,
+-	0x10,0x07,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xd0,0x06,
+-	0xcf,0x06,0x0d,0x00,0xcf,0x86,0xd5,0x40,0xd4,0x2c,0xd3,0x10,0x92,0x0c,0x91,0x08,
+-	0x10,0x04,0x0d,0x09,0x0d,0x00,0x0d,0x00,0x0d,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,
+-	0x0d,0x00,0x11,0x00,0x10,0x04,0x11,0x07,0x11,0x00,0x91,0x08,0x10,0x04,0x11,0x00,
+-	0x10,0x00,0x00,0x00,0x53,0x04,0x0d,0x00,0x92,0x0c,0x51,0x04,0x0d,0x00,0x10,0x04,
+-	0x10,0x00,0x11,0x00,0x11,0x00,0xd4,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,
+-	0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x93,0x10,0x52,0x04,0x10,0x00,
+-	0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd2,0xc8,0xd1,0x48,
+-	0xd0,0x42,0xcf,0x86,0xd5,0x18,0x54,0x04,0x10,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,
+-	0x10,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x54,0x04,0x10,0x00,
+-	0xd3,0x14,0x52,0x04,0x10,0x00,0xd1,0x08,0x10,0x04,0x10,0x00,0x10,0x09,0x10,0x04,
+-	0x10,0x07,0x10,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x12,0x00,
+-	0x00,0x00,0xcf,0x06,0x00,0x00,0xd0,0x52,0xcf,0x86,0xd5,0x3c,0xd4,0x28,0xd3,0x10,
+-	0x52,0x04,0x11,0x00,0x51,0x04,0x11,0x00,0x10,0x04,0x11,0x00,0x00,0x00,0xd2,0x0c,
+-	0x91,0x08,0x10,0x04,0x11,0x00,0x00,0x00,0x11,0x00,0x51,0x04,0x11,0x00,0x10,0x04,
+-	0x00,0x00,0x11,0x00,0x53,0x04,0x11,0x00,0x52,0x04,0x11,0x00,0x51,0x04,0x11,0x00,
+-	0x10,0x04,0x00,0x00,0x11,0x00,0x94,0x10,0x53,0x04,0x11,0x00,0x92,0x08,0x11,0x04,
+-	0x11,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0xd4,0x18,
+-	0x53,0x04,0x10,0x00,0x92,0x10,0xd1,0x08,0x10,0x04,0x10,0x00,0x10,0x07,0x10,0x04,
+-	0x10,0x09,0x00,0x00,0x00,0x00,0x53,0x04,0x10,0x00,0x92,0x08,0x11,0x04,0x10,0x00,
+-	0x00,0x00,0x00,0x00,0xe1,0x27,0x01,0xd0,0x8a,0xcf,0x86,0xd5,0x44,0xd4,0x2c,0xd3,
+-	0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x11,0x00,0x10,0x00,0x10,0x00,0x91,0x08,0x10,
+-	0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x52,0x04,0x10,0x00,0xd1,0x08,0x10,0x04,0x10,
+-	0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x93,0x14,0x92,0x10,0xd1,0x08,0x10,
+-	0x04,0x10,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0xd4,
+-	0x14,0x53,0x04,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x10,
+-	0x00,0x10,0x00,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x10,
+-	0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0xd2,0x0c,0x51,0x04,0x10,
+-	0x00,0x10,0x04,0x00,0x00,0x14,0x07,0x91,0x08,0x10,0x04,0x10,0x07,0x10,0x00,0x10,
+-	0x00,0xcf,0x86,0xd5,0x6a,0xd4,0x42,0xd3,0x14,0x52,0x04,0x10,0x00,0xd1,0x08,0x10,
+-	0x04,0x10,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0xd2,0x19,0xd1,0x08,0x10,
+-	0x04,0x10,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0xff,0xf0,0x91,0x8d,0x87,0xf0,
+-	0x91,0x8c,0xbe,0x00,0x91,0x11,0x10,0x0d,0x10,0xff,0xf0,0x91,0x8d,0x87,0xf0,0x91,
+-	0x8d,0x97,0x00,0x10,0x09,0x00,0x00,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x11,
+-	0x00,0x00,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x52,
+-	0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0xd4,0x1c,0xd3,
+-	0x0c,0x52,0x04,0x10,0x00,0x11,0x04,0x00,0x00,0x10,0xe6,0x52,0x04,0x10,0xe6,0x91,
+-	0x08,0x10,0x04,0x10,0xe6,0x00,0x00,0x00,0x00,0x93,0x10,0x52,0x04,0x10,0xe6,0x91,
+-	0x08,0x10,0x04,0x10,0xe6,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xe3,
+-	0x30,0x01,0xd2,0xb7,0xd1,0x48,0xd0,0x06,0xcf,0x06,0x12,0x00,0xcf,0x86,0x95,0x3c,
+-	0xd4,0x1c,0x93,0x18,0xd2,0x0c,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x09,0x12,0x00,
+-	0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x07,0x12,0x00,0x12,0x00,0x53,0x04,0x12,0x00,
+-	0xd2,0x0c,0x51,0x04,0x12,0x00,0x10,0x04,0x00,0x00,0x12,0x00,0xd1,0x08,0x10,0x04,
+-	0x00,0x00,0x12,0x00,0x10,0x04,0x14,0xe6,0x15,0x00,0x00,0x00,0xd0,0x45,0xcf,0x86,
+-	0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,0xd2,0x15,0x51,0x04,
+-	0x10,0x00,0x10,0x04,0x10,0x00,0x10,0xff,0xf0,0x91,0x92,0xb9,0xf0,0x91,0x92,0xba,
+-	0x00,0xd1,0x11,0x10,0x0d,0x10,0xff,0xf0,0x91,0x92,0xb9,0xf0,0x91,0x92,0xb0,0x00,
+-	0x10,0x00,0x10,0x0d,0x10,0xff,0xf0,0x91,0x92,0xb9,0xf0,0x91,0x92,0xbd,0x00,0x10,
+-	0x00,0xcf,0x86,0x95,0x24,0xd4,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,0x10,0x00,0x10,
+-	0x04,0x10,0x09,0x10,0x07,0x10,0x00,0x00,0x00,0x53,0x04,0x10,0x00,0x92,0x08,0x11,
+-	0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,0x06,0xcf,0x06,0x00,0x00,0xd0,
+-	0x40,0xcf,0x86,0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,0xd3,0x0c,0x52,0x04,0x10,
+-	0x00,0x11,0x04,0x10,0x00,0x00,0x00,0xd2,0x1e,0x51,0x04,0x10,0x00,0x10,0x0d,0x10,
+-	0xff,0xf0,0x91,0x96,0xb8,0xf0,0x91,0x96,0xaf,0x00,0x10,0xff,0xf0,0x91,0x96,0xb9,
+-	0xf0,0x91,0x96,0xaf,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x10,0x09,0xcf,
+-	0x86,0x95,0x2c,0xd4,0x1c,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x10,0x07,0x10,
+-	0x00,0x10,0x00,0x10,0x00,0x92,0x08,0x11,0x04,0x10,0x00,0x11,0x00,0x11,0x00,0x53,
+-	0x04,0x11,0x00,0x52,0x04,0x11,0x00,0x11,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0xd2,
+-	0xa0,0xd1,0x5c,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,0x53,
+-	0x04,0x10,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x10,
+-	0x09,0xcf,0x86,0xd5,0x24,0xd4,0x14,0x93,0x10,0x52,0x04,0x10,0x00,0x91,0x08,0x10,
+-	0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x10,0x00,0x92,0x08,0x11,
+-	0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x94,0x14,0x53,0x04,0x12,0x00,0x52,0x04,0x12,
+-	0x00,0x91,0x08,0x10,0x04,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd0,0x2a,0xcf,
+-	0x86,0x55,0x04,0x0d,0x00,0x54,0x04,0x0d,0x00,0xd3,0x10,0x52,0x04,0x0d,0x00,0x51,
+-	0x04,0x0d,0x00,0x10,0x04,0x0d,0x09,0x0d,0x07,0x92,0x0c,0x91,0x08,0x10,0x04,0x15,
+-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0x95,0x14,0x94,0x10,0x53,0x04,0x0d,
+-	0x00,0x92,0x08,0x11,0x04,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,
+-	0x40,0xd0,0x3a,0xcf,0x86,0xd5,0x20,0x54,0x04,0x11,0x00,0x53,0x04,0x11,0x00,0xd2,
+-	0x0c,0x51,0x04,0x11,0x00,0x10,0x04,0x14,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x00,
+-	0x00,0x11,0x00,0x11,0x00,0x94,0x14,0x53,0x04,0x11,0x00,0x92,0x0c,0x51,0x04,0x11,
+-	0x00,0x10,0x04,0x11,0x00,0x11,0x09,0x00,0x00,0x11,0x00,0xcf,0x06,0x00,0x00,0xcf,
+-	0x06,0x00,0x00,0xe4,0x59,0x01,0xd3,0xb2,0xd2,0x5c,0xd1,0x28,0xd0,0x22,0xcf,0x86,
+-	0x55,0x04,0x14,0x00,0x54,0x04,0x14,0x00,0x53,0x04,0x14,0x00,0x92,0x10,0xd1,0x08,
+-	0x10,0x04,0x14,0x00,0x14,0x09,0x10,0x04,0x14,0x07,0x14,0x00,0x00,0x00,0xcf,0x06,
+-	0x00,0x00,0xd0,0x0a,0xcf,0x86,0x15,0x04,0x00,0x00,0x10,0x00,0xcf,0x86,0x55,0x04,
+-	0x10,0x00,0x54,0x04,0x10,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,0x10,0x00,0x10,0x04,
+-	0x10,0x00,0x00,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,
+-	0x00,0x00,0x10,0x00,0xd1,0x06,0xcf,0x06,0x00,0x00,0xd0,0x1a,0xcf,0x86,0x55,0x04,
+-	0x00,0x00,0x94,0x10,0x53,0x04,0x15,0x00,0x92,0x08,0x11,0x04,0x00,0x00,0x15,0x00,
+-	0x15,0x00,0x15,0x00,0xcf,0x86,0xd5,0x14,0x54,0x04,0x15,0x00,0x53,0x04,0x15,0x00,
+-	0x92,0x08,0x11,0x04,0x00,0x00,0x15,0x00,0x15,0x00,0x94,0x1c,0x93,0x18,0xd2,0x0c,
+-	0x91,0x08,0x10,0x04,0x15,0x09,0x15,0x00,0x15,0x00,0x91,0x08,0x10,0x04,0x15,0x00,
+-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd2,0xa0,0xd1,0x3c,0xd0,0x1e,0xcf,0x86,
+-	0x55,0x04,0x13,0x00,0x54,0x04,0x13,0x00,0x93,0x10,0x52,0x04,0x13,0x00,0x91,0x08,
+-	0x10,0x04,0x13,0x09,0x13,0x00,0x13,0x00,0x13,0x00,0xcf,0x86,0x95,0x18,0x94,0x14,
+-	0x93,0x10,0x52,0x04,0x13,0x00,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x13,0x09,
+-	0x00,0x00,0x13,0x00,0x13,0x00,0xd0,0x46,0xcf,0x86,0xd5,0x2c,0xd4,0x10,0x93,0x0c,
+-	0x52,0x04,0x13,0x00,0x11,0x04,0x15,0x00,0x13,0x00,0x13,0x00,0x53,0x04,0x13,0x00,
+-	0xd2,0x0c,0x91,0x08,0x10,0x04,0x13,0x00,0x13,0x09,0x13,0x00,0x91,0x08,0x10,0x04,
+-	0x13,0x00,0x14,0x00,0x13,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,0x13,0x00,
+-	0x10,0x04,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0x55,0x04,
+-	0x10,0x00,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,
+-	0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xe3,0xa9,0x01,0xd2,
+-	0xb0,0xd1,0x6c,0xd0,0x3e,0xcf,0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x12,0x00,0x92,
+-	0x0c,0x91,0x08,0x10,0x04,0x12,0x00,0x00,0x00,0x12,0x00,0x12,0x00,0x12,0x00,0x54,
+-	0x04,0x12,0x00,0xd3,0x10,0x52,0x04,0x12,0x00,0x51,0x04,0x12,0x00,0x10,0x04,0x12,
+-	0x00,0x00,0x00,0x52,0x04,0x12,0x00,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x12,
+-	0x09,0xcf,0x86,0xd5,0x14,0x94,0x10,0x93,0x0c,0x52,0x04,0x12,0x00,0x11,0x04,0x12,
+-	0x00,0x00,0x00,0x00,0x00,0x12,0x00,0x94,0x14,0x53,0x04,0x12,0x00,0x52,0x04,0x12,
+-	0x00,0x91,0x08,0x10,0x04,0x12,0x00,0x00,0x00,0x00,0x00,0x12,0x00,0xd0,0x3e,0xcf,
+-	0x86,0xd5,0x14,0x54,0x04,0x12,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x00,0x00,0x12,
+-	0x00,0x12,0x00,0x12,0x00,0xd4,0x14,0x53,0x04,0x12,0x00,0x92,0x0c,0x91,0x08,0x10,
+-	0x04,0x00,0x00,0x12,0x00,0x12,0x00,0x12,0x00,0x93,0x10,0x52,0x04,0x12,0x00,0x51,
+-	0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd1,
+-	0xa0,0xd0,0x52,0xcf,0x86,0xd5,0x24,0x94,0x20,0xd3,0x10,0x52,0x04,0x13,0x00,0x51,
+-	0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x00,0x00,0x92,0x0c,0x51,0x04,0x13,0x00,0x10,
+-	0x04,0x00,0x00,0x13,0x00,0x13,0x00,0x13,0x00,0x54,0x04,0x13,0x00,0xd3,0x10,0x52,
+-	0x04,0x13,0x00,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x00,0x00,0xd2,0x0c,0x51,
+-	0x04,0x00,0x00,0x10,0x04,0x13,0x00,0x00,0x00,0x51,0x04,0x13,0x00,0x10,0x04,0x00,
+-	0x00,0x13,0x00,0xcf,0x86,0xd5,0x28,0xd4,0x18,0x93,0x14,0xd2,0x0c,0x51,0x04,0x13,
+-	0x00,0x10,0x04,0x13,0x07,0x13,0x00,0x11,0x04,0x13,0x09,0x13,0x00,0x00,0x00,0x53,
+-	0x04,0x13,0x00,0x92,0x08,0x11,0x04,0x13,0x00,0x00,0x00,0x00,0x00,0x94,0x20,0xd3,
+-	0x10,0x52,0x04,0x14,0x00,0x51,0x04,0x14,0x00,0x10,0x04,0x00,0x00,0x14,0x00,0x92,
+-	0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,0x14,0x00,0x14,0x00,0x14,0x00,0xd0,
+-	0x52,0xcf,0x86,0xd5,0x3c,0xd4,0x14,0x53,0x04,0x14,0x00,0x52,0x04,0x14,0x00,0x51,
+-	0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x00,0x00,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x14,
+-	0x00,0x10,0x04,0x00,0x00,0x14,0x00,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x14,
+-	0x09,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x94,
+-	0x10,0x53,0x04,0x14,0x00,0x92,0x08,0x11,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0x00,
+-	0x00,0xcf,0x06,0x00,0x00,0xd2,0x2a,0xd1,0x06,0xcf,0x06,0x00,0x00,0xd0,0x06,0xcf,
+-	0x06,0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,0x04,0x14,0x00,0x53,0x04,0x14,
+-	0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,
+-	0x06,0xcf,0x06,0x00,0x00,0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x86,0x55,0x04,0x15,
+-	0x00,0x54,0x04,0x15,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,0x15,0x00,0x00,0x00,0x00,
+-	0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x15,0x00,0xd0,
+-	0xca,0xcf,0x86,0xd5,0xc2,0xd4,0x54,0xd3,0x06,0xcf,0x06,0x09,0x00,0xd2,0x06,0xcf,
+-	0x06,0x09,0x00,0xd1,0x24,0xd0,0x06,0xcf,0x06,0x09,0x00,0xcf,0x86,0x55,0x04,0x09,
+-	0x00,0x94,0x14,0x53,0x04,0x09,0x00,0x52,0x04,0x09,0x00,0x51,0x04,0x09,0x00,0x10,
+-	0x04,0x09,0x00,0x10,0x00,0x10,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x10,
+-	0x00,0x53,0x04,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x10,0x00,0x11,0x00,0x00,
+-	0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd3,0x68,0xd2,0x46,0xd1,0x40,0xd0,
+-	0x06,0xcf,0x06,0x09,0x00,0xcf,0x86,0x55,0x04,0x09,0x00,0xd4,0x20,0xd3,0x10,0x92,
+-	0x0c,0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x10,0x00,0x10,0x00,0x52,0x04,0x10,
+-	0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x93,0x10,0x52,0x04,0x09,
+-	0x00,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x11,
+-	0x00,0xd1,0x1c,0xd0,0x06,0xcf,0x06,0x11,0x00,0xcf,0x86,0x95,0x10,0x94,0x0c,0x93,
+-	0x08,0x12,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,
+-	0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x86,0xd5,0x4c,0xd4,0x06,0xcf,
+-	0x06,0x0b,0x00,0xd3,0x40,0xd2,0x3a,0xd1,0x34,0xd0,0x2e,0xcf,0x86,0x55,0x04,0x0b,
+-	0x00,0xd4,0x14,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,
+-	0x04,0x0b,0x00,0x00,0x00,0x53,0x04,0x15,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x15,
++	0x00,0x01,0x00,0x93,0x14,0x92,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,
++	0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,
++	0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0xd3,0x18,0xd2,
++	0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x00,
++	0x00,0x07,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,
++	0x04,0x01,0x07,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x73,0xd4,0x45,0xd3,0x14,0x52,
++	0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x0a,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,
++	0x00,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe0,0xad,0x87,0xe0,0xad,0x96,0x00,
++	0x00,0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xe0,0xad,0x87,0xe0,0xac,0xbe,0x00,0x91,
++	0x0f,0x10,0x0b,0x01,0xff,0xe0,0xad,0x87,0xe0,0xad,0x97,0x00,0x01,0x09,0x00,0x00,
++	0xd3,0x0c,0x52,0x04,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x52,0x04,0x00,0x00,
++	0xd1,0x16,0x10,0x0b,0x01,0xff,0xe0,0xac,0xa1,0xe0,0xac,0xbc,0x00,0x01,0xff,0xe0,
++	0xac,0xa2,0xe0,0xac,0xbc,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xd4,0x14,0x93,0x10,
++	0xd2,0x08,0x11,0x04,0x01,0x00,0x0a,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,
++	0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x07,0x00,0x0c,0x00,0x0c,0x00,
++	0x00,0x00,0xd0,0xb1,0xcf,0x86,0xd5,0x63,0xd4,0x28,0xd3,0x14,0xd2,0x08,0x11,0x04,
++	0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd2,0x0c,
++	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,
++	0xd3,0x1f,0xd2,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x91,0x0f,
++	0x10,0x0b,0x01,0xff,0xe0,0xae,0x92,0xe0,0xaf,0x97,0x00,0x01,0x00,0x00,0x00,0xd2,
++	0x10,0xd1,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x91,
++	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0xd4,0x2c,0xd3,0x18,0xd2,0x0c,0x51,
++	0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,
++	0x00,0x00,0x00,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x11,
++	0x04,0x00,0x00,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,
++	0x04,0x08,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x00,
++	0x00,0x01,0x00,0xcf,0x86,0xd5,0x61,0xd4,0x45,0xd3,0x14,0xd2,0x0c,0x51,0x04,0x01,
++	0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0xd2,0x1e,0xd1,
++	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x0b,0x01,0xff,0xe0,0xaf,0x86,0xe0,0xae,
++	0xbe,0x00,0x01,0xff,0xe0,0xaf,0x87,0xe0,0xae,0xbe,0x00,0x91,0x0f,0x10,0x0b,0x01,
++	0xff,0xe0,0xaf,0x86,0xe0,0xaf,0x97,0x00,0x01,0x09,0x00,0x00,0x93,0x18,0xd2,0x0c,
++	0x91,0x08,0x10,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,
++	0x00,0x00,0x01,0x00,0x00,0x00,0xd4,0x14,0x93,0x10,0x52,0x04,0x00,0x00,0x51,0x04,
++	0x00,0x00,0x10,0x04,0x08,0x00,0x01,0x00,0x01,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,
++	0x01,0x00,0x10,0x04,0x01,0x00,0x07,0x00,0x07,0x00,0x92,0x0c,0x51,0x04,0x07,0x00,
++	0x10,0x04,0x07,0x00,0x00,0x00,0x00,0x00,0xe3,0x1c,0x04,0xe2,0x1a,0x02,0xd1,0xf3,
++	0xd0,0x76,0xcf,0x86,0xd5,0x3c,0xd4,0x28,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,
++	0x10,0x00,0x01,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x14,0x00,0x01,0x00,0x01,0x00,
++	0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x93,0x10,
++	0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
++	0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,
++	0x01,0x00,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x10,0x00,
++	0x01,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,
++	0x00,0x00,0x0a,0x00,0x01,0x00,0xcf,0x86,0xd5,0x53,0xd4,0x2f,0xd3,0x10,0x52,0x04,
++	0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0xd2,0x13,0x91,0x0f,
++	0x10,0x0b,0x01,0xff,0xe0,0xb1,0x86,0xe0,0xb1,0x96,0x00,0x00,0x00,0x01,0x00,0x91,
++	0x08,0x10,0x04,0x01,0x00,0x01,0x09,0x00,0x00,0xd3,0x14,0x52,0x04,0x00,0x00,0xd1,
++	0x08,0x10,0x04,0x00,0x00,0x01,0x54,0x10,0x04,0x01,0x5b,0x00,0x00,0x92,0x0c,0x51,
++	0x04,0x0a,0x00,0x10,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0xd4,0x14,0x93,0x10,0xd2,
++	0x08,0x11,0x04,0x01,0x00,0x0a,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x93,
++	0x10,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x15,0x00,0x0a,
++	0x00,0xd0,0x76,0xcf,0x86,0xd5,0x3c,0xd4,0x28,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,
++	0x04,0x12,0x00,0x10,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x14,0x00,0x01,0x00,0x01,
++	0x00,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x93,
++	0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x01,
++	0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,
++	0x00,0x01,0x00,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x00,
++	0x00,0x01,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,
++	0x04,0x07,0x07,0x07,0x00,0x01,0x00,0xcf,0x86,0xd5,0x82,0xd4,0x5e,0xd3,0x2a,0xd2,
++	0x13,0x91,0x0f,0x10,0x0b,0x01,0xff,0xe0,0xb2,0xbf,0xe0,0xb3,0x95,0x00,0x01,0x00,
++	0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x01,0x00,0x01,0xff,
++	0xe0,0xb3,0x86,0xe0,0xb3,0x95,0x00,0xd2,0x28,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe0,
++	0xb3,0x86,0xe0,0xb3,0x96,0x00,0x00,0x00,0x10,0x0b,0x01,0xff,0xe0,0xb3,0x86,0xe0,
++	0xb3,0x82,0x00,0x01,0xff,0xe0,0xb3,0x86,0xe0,0xb3,0x82,0xe0,0xb3,0x95,0x00,0x91,
++	0x08,0x10,0x04,0x01,0x00,0x01,0x09,0x00,0x00,0xd3,0x14,0x52,0x04,0x00,0x00,0xd1,
++	0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x52,0x04,0x00,
++	0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0xd4,0x14,0x93,0x10,0xd2,
++	0x08,0x11,0x04,0x01,0x00,0x09,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x93,
++	0x14,0x92,0x10,0xd1,0x08,0x10,0x04,0x00,0x00,0x09,0x00,0x10,0x04,0x09,0x00,0x00,
++	0x00,0x00,0x00,0x00,0x00,0xe1,0x06,0x01,0xd0,0x6e,0xcf,0x86,0xd5,0x3c,0xd4,0x28,
++	0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x13,0x00,0x10,0x00,0x01,0x00,0x91,0x08,
++	0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,
++	0x01,0x00,0x00,0x00,0x01,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,
++	0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,
++	0x91,0x08,0x10,0x04,0x01,0x00,0x0c,0x00,0x01,0x00,0x01,0x00,0x53,0x04,0x01,0x00,
++	0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x0c,0x00,0x13,0x09,0x91,0x08,0x10,0x04,
++	0x13,0x09,0x0a,0x00,0x01,0x00,0xcf,0x86,0xd5,0x65,0xd4,0x45,0xd3,0x10,0x52,0x04,
++	0x01,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x00,0x00,0x01,0x00,0xd2,0x1e,0xd1,0x08,
++	0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x0b,0x01,0xff,0xe0,0xb5,0x86,0xe0,0xb4,0xbe,
++	0x00,0x01,0xff,0xe0,0xb5,0x87,0xe0,0xb4,0xbe,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,
++	0xe0,0xb5,0x86,0xe0,0xb5,0x97,0x00,0x01,0x09,0x10,0x04,0x0c,0x00,0x12,0x00,0xd3,
++	0x10,0x52,0x04,0x00,0x00,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x01,0x00,0x52,
++	0x04,0x12,0x00,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x11,0x00,0xd4,0x14,0x93,
++	0x10,0xd2,0x08,0x11,0x04,0x01,0x00,0x0a,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,
++	0x00,0xd3,0x0c,0x52,0x04,0x0a,0x00,0x11,0x04,0x0a,0x00,0x12,0x00,0x92,0x0c,0x91,
++	0x08,0x10,0x04,0x12,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0xd0,0x5a,0xcf,0x86,0xd5,
++	0x34,0xd4,0x18,0x93,0x14,0xd2,0x08,0x11,0x04,0x00,0x00,0x04,0x00,0x91,0x08,0x10,
++	0x04,0x00,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0xd3,0x10,0x52,0x04,0x04,0x00,0x51,
++	0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0x92,0x08,0x11,0x04,0x00,0x00,0x04,
++	0x00,0x04,0x00,0x54,0x04,0x04,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,0x04,0x00,0x10,
++	0x04,0x00,0x00,0x04,0x00,0x04,0x00,0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x00,
++	0x00,0x04,0x00,0x00,0x00,0xcf,0x86,0xd5,0x77,0xd4,0x28,0xd3,0x10,0x52,0x04,0x04,
++	0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0xd2,0x0c,0x51,0x04,0x00,
++	0x00,0x10,0x04,0x04,0x09,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x04,
++	0x00,0xd3,0x14,0x52,0x04,0x04,0x00,0xd1,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x10,
++	0x04,0x04,0x00,0x00,0x00,0xd2,0x13,0x51,0x04,0x04,0x00,0x10,0x0b,0x04,0xff,0xe0,
++	0xb7,0x99,0xe0,0xb7,0x8a,0x00,0x04,0x00,0xd1,0x19,0x10,0x0b,0x04,0xff,0xe0,0xb7,
++	0x99,0xe0,0xb7,0x8f,0x00,0x04,0xff,0xe0,0xb7,0x99,0xe0,0xb7,0x8f,0xe0,0xb7,0x8a,
++	0x00,0x10,0x0b,0x04,0xff,0xe0,0xb7,0x99,0xe0,0xb7,0x9f,0x00,0x04,0x00,0xd4,0x10,
++	0x93,0x0c,0x52,0x04,0x00,0x00,0x11,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x93,0x14,
++	0xd2,0x08,0x11,0x04,0x00,0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,
++	0x00,0x00,0x00,0x00,0xe2,0x31,0x01,0xd1,0x58,0xd0,0x3a,0xcf,0x86,0xd5,0x18,0x94,
++	0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,
++	0x00,0x01,0x00,0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,
++	0x04,0x01,0x67,0x10,0x04,0x01,0x09,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,
++	0x00,0x01,0x00,0xcf,0x86,0x95,0x18,0xd4,0x0c,0x53,0x04,0x01,0x00,0x12,0x04,0x01,
++	0x6b,0x01,0x00,0x53,0x04,0x01,0x00,0x12,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0xd0,
++	0x9e,0xcf,0x86,0xd5,0x54,0xd4,0x3c,0xd3,0x20,0xd2,0x10,0xd1,0x08,0x10,0x04,0x00,
++	0x00,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,
++	0x00,0x10,0x04,0x15,0x00,0x01,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x15,
++	0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x15,0x00,0x01,0x00,0x15,
++	0x00,0xd3,0x08,0x12,0x04,0x15,0x00,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x15,
++	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x30,0xd3,0x1c,0xd2,0x0c,0x91,0x08,0x10,
++	0x04,0x15,0x00,0x01,0x00,0x01,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x10,
++	0x04,0x00,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x15,0x00,0x01,0x00,0x91,0x08,0x10,
++	0x04,0x15,0x00,0x01,0x00,0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,
++	0x76,0x10,0x04,0x15,0x09,0x01,0x00,0x11,0x04,0x01,0x00,0x00,0x00,0xcf,0x86,0x95,
++	0x34,0xd4,0x20,0xd3,0x14,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,
++	0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x52,0x04,0x01,0x7a,0x11,0x04,0x01,0x00,0x00,
++	0x00,0x53,0x04,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x01,
++	0x00,0x0d,0x00,0x00,0x00,0xe1,0x2b,0x01,0xd0,0x3e,0xcf,0x86,0xd5,0x14,0x54,0x04,
++	0x02,0x00,0x53,0x04,0x02,0x00,0x92,0x08,0x11,0x04,0x02,0xdc,0x02,0x00,0x02,0x00,
++	0x54,0x04,0x02,0x00,0xd3,0x14,0x52,0x04,0x02,0x00,0xd1,0x08,0x10,0x04,0x02,0x00,
++	0x02,0xdc,0x10,0x04,0x02,0x00,0x02,0xdc,0x92,0x0c,0x91,0x08,0x10,0x04,0x02,0x00,
++	0x02,0xd8,0x02,0x00,0x02,0x00,0xcf,0x86,0xd5,0x73,0xd4,0x36,0xd3,0x17,0x92,0x13,
++	0x51,0x04,0x02,0x00,0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbd,0x82,0xe0,0xbe,0xb7,
++	0x00,0x02,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x02,0x00,0x02,0x00,0x91,
++	0x0f,0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbd,0x8c,0xe0,0xbe,0xb7,0x00,0x02,0x00,
++	0xd3,0x26,0xd2,0x13,0x51,0x04,0x02,0x00,0x10,0x0b,0x02,0xff,0xe0,0xbd,0x91,0xe0,
++	0xbe,0xb7,0x00,0x02,0x00,0x51,0x04,0x02,0x00,0x10,0x04,0x02,0x00,0x02,0xff,0xe0,
++	0xbd,0x96,0xe0,0xbe,0xb7,0x00,0x52,0x04,0x02,0x00,0x91,0x0f,0x10,0x0b,0x02,0xff,
++	0xe0,0xbd,0x9b,0xe0,0xbe,0xb7,0x00,0x02,0x00,0x02,0x00,0xd4,0x27,0x53,0x04,0x02,
++	0x00,0xd2,0x17,0xd1,0x0f,0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbd,0x80,0xe0,0xbe,
++	0xb5,0x00,0x10,0x04,0x04,0x00,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x00,0x00,
++	0x00,0x00,0xd3,0x35,0xd2,0x17,0xd1,0x08,0x10,0x04,0x00,0x00,0x02,0x81,0x10,0x04,
++	0x02,0x82,0x02,0xff,0xe0,0xbd,0xb1,0xe0,0xbd,0xb2,0x00,0xd1,0x0f,0x10,0x04,0x02,
++	0x84,0x02,0xff,0xe0,0xbd,0xb1,0xe0,0xbd,0xb4,0x00,0x10,0x0b,0x02,0xff,0xe0,0xbe,
++	0xb2,0xe0,0xbe,0x80,0x00,0x02,0x00,0xd2,0x13,0x91,0x0f,0x10,0x0b,0x02,0xff,0xe0,
++	0xbe,0xb3,0xe0,0xbe,0x80,0x00,0x02,0x00,0x02,0x82,0x11,0x04,0x02,0x82,0x02,0x00,
++	0xd0,0xd3,0xcf,0x86,0xd5,0x65,0xd4,0x27,0xd3,0x1f,0xd2,0x13,0x91,0x0f,0x10,0x04,
++	0x02,0x82,0x02,0xff,0xe0,0xbd,0xb1,0xe0,0xbe,0x80,0x00,0x02,0xe6,0x91,0x08,0x10,
++	0x04,0x02,0x09,0x02,0x00,0x02,0xe6,0x12,0x04,0x02,0x00,0x0c,0x00,0xd3,0x1f,0xd2,
++	0x13,0x51,0x04,0x02,0x00,0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbe,0x92,0xe0,0xbe,
++	0xb7,0x00,0x51,0x04,0x02,0x00,0x10,0x04,0x04,0x00,0x02,0x00,0xd2,0x0c,0x91,0x08,
++	0x10,0x04,0x00,0x00,0x02,0x00,0x02,0x00,0x91,0x0f,0x10,0x04,0x02,0x00,0x02,0xff,
++	0xe0,0xbe,0x9c,0xe0,0xbe,0xb7,0x00,0x02,0x00,0xd4,0x3d,0xd3,0x26,0xd2,0x13,0x51,
++	0x04,0x02,0x00,0x10,0x0b,0x02,0xff,0xe0,0xbe,0xa1,0xe0,0xbe,0xb7,0x00,0x02,0x00,
++	0x51,0x04,0x02,0x00,0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbe,0xa6,0xe0,0xbe,0xb7,
++	0x00,0x52,0x04,0x02,0x00,0x91,0x0f,0x10,0x0b,0x02,0xff,0xe0,0xbe,0xab,0xe0,0xbe,
++	0xb7,0x00,0x02,0x00,0x04,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,
++	0x02,0x00,0x02,0x00,0x02,0x00,0xd2,0x13,0x91,0x0f,0x10,0x04,0x04,0x00,0x02,0xff,
++	0xe0,0xbe,0x90,0xe0,0xbe,0xb5,0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x00,
++	0x00,0x04,0x00,0xcf,0x86,0x95,0x4c,0xd4,0x24,0xd3,0x10,0x52,0x04,0x04,0x00,0x51,
++	0x04,0x04,0x00,0x10,0x04,0x04,0xdc,0x04,0x00,0x52,0x04,0x04,0x00,0xd1,0x08,0x10,
++	0x04,0x04,0x00,0x00,0x00,0x10,0x04,0x0a,0x00,0x04,0x00,0xd3,0x14,0xd2,0x08,0x11,
++	0x04,0x08,0x00,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x0b,0x00,0x0b,0x00,0x92,
++	0x10,0xd1,0x08,0x10,0x04,0x0b,0x00,0x0c,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,0x00,
++	0x00,0x00,0x00,0xcf,0x86,0xe5,0xcc,0x04,0xe4,0x63,0x03,0xe3,0x65,0x01,0xe2,0x04,
++	0x01,0xd1,0x7f,0xd0,0x65,0xcf,0x86,0x55,0x04,0x04,0x00,0xd4,0x33,0xd3,0x1f,0xd2,
++	0x0c,0x51,0x04,0x04,0x00,0x10,0x04,0x0a,0x00,0x04,0x00,0x51,0x04,0x04,0x00,0x10,
++	0x0b,0x04,0xff,0xe1,0x80,0xa5,0xe1,0x80,0xae,0x00,0x04,0x00,0x92,0x10,0xd1,0x08,
++	0x10,0x04,0x0a,0x00,0x04,0x00,0x10,0x04,0x04,0x00,0x0a,0x00,0x04,0x00,0xd3,0x18,
++	0xd2,0x0c,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x0a,0x00,0x51,0x04,0x0a,0x00,
++	0x10,0x04,0x04,0x00,0x04,0x07,0x92,0x10,0xd1,0x08,0x10,0x04,0x04,0x00,0x04,0x09,
++	0x10,0x04,0x0a,0x09,0x0a,0x00,0x0a,0x00,0xcf,0x86,0x95,0x14,0x54,0x04,0x04,0x00,
++	0x53,0x04,0x04,0x00,0x92,0x08,0x11,0x04,0x04,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,
++	0xd0,0x2e,0xcf,0x86,0x95,0x28,0xd4,0x14,0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,
++	0x91,0x08,0x10,0x04,0x0a,0x00,0x0a,0xdc,0x0a,0x00,0x53,0x04,0x0a,0x00,0xd2,0x08,
++	0x11,0x04,0x0a,0x00,0x0b,0x00,0x11,0x04,0x0b,0x00,0x0a,0x00,0x01,0x00,0xcf,0x86,
++	0xd5,0x24,0x94,0x20,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,
++	0x00,0x00,0x0d,0x00,0x52,0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x0d,0x00,
++	0x00,0x00,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,
++	0x01,0x00,0x10,0x04,0x01,0x00,0x06,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x06,0x00,
++	0x08,0x00,0x10,0x04,0x08,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x08,0x00,0x0d,0x00,
++	0x0d,0x00,0xd1,0x28,0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0x95,0x1c,0x54,0x04,
++	0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x0b,0x00,0x51,0x04,
++	0x0b,0x00,0x10,0x04,0x0b,0x00,0x01,0x00,0x01,0x00,0xd0,0x1e,0xcf,0x86,0x55,0x04,
++	0x01,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
++	0x0b,0x00,0x0b,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,
++	0x01,0x00,0x53,0x04,0x01,0x00,0x92,0x08,0x11,0x04,0x01,0x00,0x0b,0x00,0x0b,0x00,
++	0xe2,0x21,0x01,0xd1,0x6c,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x94,0x14,0x93,0x10,0x52,
++	0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0x04,0x00,0x04,
++	0x00,0x04,0x00,0xcf,0x86,0x95,0x48,0xd4,0x24,0xd3,0x10,0x52,0x04,0x04,0x00,0x51,
++	0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,
++	0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0xd3,0x10,0x52,0x04,0x04,
++	0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0xd2,0x0c,0x91,0x08,0x10,
++	0x04,0x04,0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0xd0,
++	0x62,0xcf,0x86,0xd5,0x28,0x94,0x24,0xd3,0x10,0x52,0x04,0x04,0x00,0x51,0x04,0x04,
++	0x00,0x10,0x04,0x04,0x00,0x08,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x00,
++	0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0xd4,0x14,0x53,0x04,0x04,
++	0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0xd3,
++	0x14,0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,
++	0x00,0x00,0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,
++	0x00,0xcf,0x86,0xd5,0x38,0xd4,0x24,0xd3,0x14,0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,
++	0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0x52,0x04,0x04,0x00,0x51,
++	0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0x93,0x10,0x52,0x04,0x04,0x00,0x51,
++	0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0x94,0x14,0x53,0x04,0x04,
++	0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0x04,
++	0x00,0xd1,0x9c,0xd0,0x3e,0xcf,0x86,0x95,0x38,0xd4,0x14,0x53,0x04,0x04,0x00,0x52,
++	0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0xd3,0x14,0xd2,
++	0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,
++	0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0x04,
++	0x00,0xcf,0x86,0xd5,0x34,0xd4,0x14,0x93,0x10,0x52,0x04,0x04,0x00,0x51,0x04,0x04,
++	0x00,0x10,0x04,0x04,0x00,0x08,0x00,0x04,0x00,0x53,0x04,0x04,0x00,0xd2,0x0c,0x51,
++	0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,0x0c,
++	0xe6,0x10,0x04,0x0c,0xe6,0x08,0xe6,0xd4,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,
++	0x04,0x08,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x53,0x04,0x04,0x00,0x52,
++	0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0xd0,0x1a,0xcf,
++	0x86,0x95,0x14,0x54,0x04,0x08,0x00,0x53,0x04,0x08,0x00,0x92,0x08,0x11,0x04,0x08,
++	0x00,0x00,0x00,0x00,0x00,0x04,0x00,0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,
++	0x00,0xd3,0x10,0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x11,0x00,0x00,
++	0x00,0x52,0x04,0x11,0x00,0x11,0x04,0x11,0x00,0x00,0x00,0xd3,0x30,0xd2,0x2a,0xd1,
++	0x24,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,
++	0x04,0x0b,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0xcf,
++	0x06,0x04,0x00,0xcf,0x06,0x04,0x00,0xcf,0x06,0x04,0x00,0xd2,0x6c,0xd1,0x24,0xd0,
++	0x06,0xcf,0x06,0x04,0x00,0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,0x00,0x93,
++	0x10,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x0b,0x00,0x0b,
++	0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x04,0x00,0x53,0x04,0x04,0x00,0x52,
++	0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0xcf,
++	0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,
++	0x04,0x04,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x10,
++	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,0x80,0xd0,0x46,0xcf,0x86,0xd5,0x28,0xd4,
++	0x14,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x91,0x08,0x10,0x04,0x06,0x00,0x00,
++	0x00,0x06,0x00,0x93,0x10,0x52,0x04,0x06,0x00,0x91,0x08,0x10,0x04,0x06,0x09,0x00,
++	0x00,0x00,0x00,0x00,0x00,0x54,0x04,0x06,0x00,0x93,0x14,0x52,0x04,0x06,0x00,0xd1,
++	0x08,0x10,0x04,0x06,0x09,0x06,0x00,0x10,0x04,0x06,0x00,0x00,0x00,0x00,0x00,0xcf,
++	0x86,0xd5,0x10,0x54,0x04,0x06,0x00,0x93,0x08,0x12,0x04,0x06,0x00,0x00,0x00,0x00,
++	0x00,0xd4,0x14,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x91,0x08,0x10,0x04,0x06,
++	0x00,0x00,0x00,0x06,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x06,0x00,0x00,
++	0x00,0x06,0x00,0x00,0x00,0x00,0x00,0xd0,0x06,0xcf,0x06,0x04,0x00,0xcf,0x86,0xd5,
++	0x24,0x54,0x04,0x04,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,0x04,0x00,0x10,0x04,0x04,
++	0x09,0x04,0x00,0x04,0x00,0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x07,
++	0xe6,0x00,0x00,0xd4,0x10,0x53,0x04,0x04,0x00,0x92,0x08,0x11,0x04,0x04,0x00,0x00,
++	0x00,0x00,0x00,0x53,0x04,0x07,0x00,0x92,0x08,0x11,0x04,0x07,0x00,0x00,0x00,0x00,
++	0x00,0xe4,0xac,0x03,0xe3,0x4d,0x01,0xd2,0x84,0xd1,0x48,0xd0,0x2a,0xcf,0x86,0x95,
++	0x24,0xd4,0x14,0x53,0x04,0x04,0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,
++	0x04,0x04,0x00,0x00,0x00,0x53,0x04,0x04,0x00,0x92,0x08,0x11,0x04,0x04,0x00,0x00,
++	0x00,0x00,0x00,0x04,0x00,0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,0x00,0x53,
++	0x04,0x04,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0x00,
++	0x00,0xd0,0x22,0xcf,0x86,0x55,0x04,0x04,0x00,0x94,0x18,0x53,0x04,0x04,0x00,0x92,
++	0x10,0xd1,0x08,0x10,0x04,0x04,0x00,0x04,0xe4,0x10,0x04,0x0a,0x00,0x00,0x00,0x00,
++	0x00,0x0b,0x00,0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,0x0b,0x00,0x93,0x0c,0x52,
++	0x04,0x0b,0x00,0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0xd1,0x80,0xd0,0x42,0xcf,
++	0x86,0xd5,0x1c,0x54,0x04,0x07,0x00,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,0xd1,
++	0x08,0x10,0x04,0x07,0x00,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0xd4,0x0c,0x53,
++	0x04,0x07,0x00,0x12,0x04,0x07,0x00,0x00,0x00,0x53,0x04,0x07,0x00,0x92,0x10,0xd1,
++	0x08,0x10,0x04,0x07,0x00,0x07,0xde,0x10,0x04,0x07,0xe6,0x07,0xdc,0x00,0x00,0xcf,
++	0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x07,0x00,0x00,
++	0x00,0x00,0x00,0x07,0x00,0x07,0x00,0x07,0x00,0xd4,0x10,0x53,0x04,0x07,0x00,0x52,
++	0x04,0x07,0x00,0x11,0x04,0x07,0x00,0x00,0x00,0x93,0x10,0x52,0x04,0x07,0x00,0x91,
++	0x08,0x10,0x04,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd0,0x1a,0xcf,0x86,0x55,
++	0x04,0x08,0x00,0x94,0x10,0x53,0x04,0x08,0x00,0x92,0x08,0x11,0x04,0x08,0x00,0x0b,
++	0x00,0x00,0x00,0x08,0x00,0xcf,0x86,0x95,0x28,0xd4,0x10,0x53,0x04,0x08,0x00,0x92,
++	0x08,0x11,0x04,0x08,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x08,0x00,0xd2,0x0c,0x51,
++	0x04,0x08,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x08,0x00,0x07,
++	0x00,0xd2,0xe4,0xd1,0x80,0xd0,0x2e,0xcf,0x86,0x95,0x28,0x54,0x04,0x08,0x00,0xd3,
++	0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x08,0xe6,0xd2,
++	0x0c,0x91,0x08,0x10,0x04,0x08,0xdc,0x08,0x00,0x08,0x00,0x11,0x04,0x00,0x00,0x08,
++	0x00,0x0b,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,0x52,
++	0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0xd4,0x14,0x93,
++	0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0b,0x09,0x0b,0x00,0x0b,0x00,0x0b,0x00,0x0b,
++	0x00,0xd3,0x10,0x52,0x04,0x0b,0x00,0x91,0x08,0x10,0x04,0x0b,0x00,0x0b,0xe6,0x0b,
++	0xe6,0x52,0x04,0x0b,0xe6,0xd1,0x08,0x10,0x04,0x0b,0xe6,0x00,0x00,0x10,0x04,0x00,
++	0x00,0x0b,0xdc,0xd0,0x5e,0xcf,0x86,0xd5,0x20,0xd4,0x10,0x53,0x04,0x0b,0x00,0x92,
++	0x08,0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x0b,0x00,0x92,0x08,0x11,
++	0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0xd4,0x10,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,
++	0x00,0x11,0x04,0x0b,0x00,0x00,0x00,0xd3,0x10,0x52,0x04,0x10,0xe6,0x91,0x08,0x10,
++	0x04,0x10,0xe6,0x10,0xdc,0x10,0xdc,0xd2,0x0c,0x51,0x04,0x10,0xdc,0x10,0x04,0x10,
++	0xdc,0x10,0xe6,0xd1,0x08,0x10,0x04,0x10,0xe6,0x10,0xdc,0x10,0x04,0x10,0x00,0x00,
++	0x00,0xcf,0x06,0x00,0x00,0xe1,0x1e,0x01,0xd0,0xaa,0xcf,0x86,0xd5,0x6e,0xd4,0x53,
++	0xd3,0x17,0x52,0x04,0x09,0x00,0x51,0x04,0x09,0x00,0x10,0x0b,0x09,0xff,0xe1,0xac,
++	0x85,0xe1,0xac,0xb5,0x00,0x09,0x00,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x09,0xff,0xe1,
++	0xac,0x87,0xe1,0xac,0xb5,0x00,0x09,0x00,0x10,0x0b,0x09,0xff,0xe1,0xac,0x89,0xe1,
++	0xac,0xb5,0x00,0x09,0x00,0xd1,0x0f,0x10,0x0b,0x09,0xff,0xe1,0xac,0x8b,0xe1,0xac,
++	0xb5,0x00,0x09,0x00,0x10,0x0b,0x09,0xff,0xe1,0xac,0x8d,0xe1,0xac,0xb5,0x00,0x09,
++	0x00,0x93,0x17,0x92,0x13,0x51,0x04,0x09,0x00,0x10,0x0b,0x09,0xff,0xe1,0xac,0x91,
++	0xe1,0xac,0xb5,0x00,0x09,0x00,0x09,0x00,0x09,0x00,0x54,0x04,0x09,0x00,0xd3,0x10,
++	0x52,0x04,0x09,0x00,0x91,0x08,0x10,0x04,0x09,0x07,0x09,0x00,0x09,0x00,0xd2,0x13,
++	0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x09,0xff,0xe1,0xac,0xba,0xe1,0xac,0xb5,
++	0x00,0x91,0x0f,0x10,0x04,0x09,0x00,0x09,0xff,0xe1,0xac,0xbc,0xe1,0xac,0xb5,0x00,
++	0x09,0x00,0xcf,0x86,0xd5,0x3d,0x94,0x39,0xd3,0x31,0xd2,0x25,0xd1,0x16,0x10,0x0b,
++	0x09,0xff,0xe1,0xac,0xbe,0xe1,0xac,0xb5,0x00,0x09,0xff,0xe1,0xac,0xbf,0xe1,0xac,
++	0xb5,0x00,0x10,0x04,0x09,0x00,0x09,0xff,0xe1,0xad,0x82,0xe1,0xac,0xb5,0x00,0x91,
++	0x08,0x10,0x04,0x09,0x09,0x09,0x00,0x09,0x00,0x12,0x04,0x09,0x00,0x00,0x00,0x09,
++	0x00,0xd4,0x1c,0x53,0x04,0x09,0x00,0xd2,0x0c,0x51,0x04,0x09,0x00,0x10,0x04,0x09,
++	0x00,0x09,0xe6,0x91,0x08,0x10,0x04,0x09,0xdc,0x09,0xe6,0x09,0xe6,0xd3,0x08,0x12,
++	0x04,0x09,0xe6,0x09,0x00,0x52,0x04,0x09,0x00,0x91,0x08,0x10,0x04,0x09,0x00,0x00,
++	0x00,0x00,0x00,0xd0,0x2e,0xcf,0x86,0x55,0x04,0x0a,0x00,0xd4,0x18,0x53,0x04,0x0a,
++	0x00,0xd2,0x0c,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x09,0x0d,0x09,0x11,0x04,0x0d,
++	0x00,0x0a,0x00,0x53,0x04,0x0a,0x00,0x92,0x08,0x11,0x04,0x0a,0x00,0x0d,0x00,0x0d,
++	0x00,0xcf,0x86,0x55,0x04,0x0c,0x00,0xd4,0x14,0x93,0x10,0x52,0x04,0x0c,0x00,0x51,
++	0x04,0x0c,0x00,0x10,0x04,0x0c,0x07,0x0c,0x00,0x0c,0x00,0xd3,0x0c,0x92,0x08,0x11,
++	0x04,0x0c,0x00,0x0c,0x09,0x00,0x00,0x12,0x04,0x00,0x00,0x0c,0x00,0xe3,0xb2,0x01,
++	0xe2,0x09,0x01,0xd1,0x4c,0xd0,0x2a,0xcf,0x86,0x55,0x04,0x0a,0x00,0x54,0x04,0x0a,
++	0x00,0xd3,0x10,0x52,0x04,0x0a,0x00,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x00,0x0a,
++	0x07,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0a,0x00,0x0a,0x00,0xcf,
++	0x86,0x95,0x1c,0x94,0x18,0x53,0x04,0x0a,0x00,0xd2,0x08,0x11,0x04,0x0a,0x00,0x00,
++	0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0xd0,
++	0x3a,0xcf,0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x12,0x00,0x92,0x0c,0x91,0x08,0x10,
++	0x04,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x14,0x00,0x54,0x04,0x14,0x00,0x53,
++	0x04,0x14,0x00,0xd2,0x0c,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x00,0x00,0x91,
++	0x08,0x10,0x04,0x00,0x00,0x14,0x00,0x14,0x00,0xcf,0x86,0xd5,0x2c,0xd4,0x08,0x13,
++	0x04,0x0d,0x00,0x00,0x00,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x0b,0xe6,0x10,0x04,0x0b,
++	0xe6,0x0b,0x00,0x91,0x08,0x10,0x04,0x0b,0x01,0x0b,0xdc,0x0b,0xdc,0x92,0x08,0x11,
++	0x04,0x0b,0xdc,0x0b,0xe6,0x0b,0xdc,0xd4,0x28,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,
++	0x04,0x0b,0xe6,0x0b,0x00,0x0b,0x01,0x0b,0x01,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0b,
++	0x01,0x0b,0x00,0x0b,0x00,0x91,0x08,0x10,0x04,0x0b,0x00,0x0b,0xdc,0x0b,0x00,0xd3,
++	0x1c,0xd2,0x0c,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x0d,0x00,0xd1,0x08,0x10,
++	0x04,0x0d,0xe6,0x0d,0x00,0x10,0x04,0x0d,0x00,0x13,0x00,0x92,0x0c,0x51,0x04,0x10,
++	0xe6,0x10,0x04,0x15,0x00,0x00,0x00,0x00,0x00,0xd1,0x1c,0xd0,0x06,0xcf,0x06,0x07,
++	0x00,0xcf,0x86,0x55,0x04,0x07,0x00,0x94,0x0c,0x53,0x04,0x07,0x00,0x12,0x04,0x07,
++	0x00,0x08,0x00,0x08,0x00,0xd0,0x06,0xcf,0x06,0x08,0x00,0xcf,0x86,0xd5,0x40,0xd4,
++	0x2c,0xd3,0x10,0x92,0x0c,0x51,0x04,0x08,0xe6,0x10,0x04,0x08,0xdc,0x08,0xe6,0x09,
++	0xe6,0xd2,0x0c,0x51,0x04,0x09,0xe6,0x10,0x04,0x09,0xdc,0x0a,0xe6,0xd1,0x08,0x10,
++	0x04,0x0a,0xe6,0x0a,0xea,0x10,0x04,0x0a,0xd6,0x0a,0xdc,0x93,0x10,0x92,0x0c,0x91,
++	0x08,0x10,0x04,0x0a,0xca,0x0a,0xe6,0x0a,0xe6,0x0a,0xe6,0x0a,0xe6,0xd4,0x14,0x93,
++	0x10,0x52,0x04,0x0a,0xe6,0x51,0x04,0x0a,0xe6,0x10,0x04,0x0a,0xe6,0x10,0xe6,0x10,
++	0xe6,0xd3,0x10,0x52,0x04,0x10,0xe6,0x51,0x04,0x10,0xe6,0x10,0x04,0x13,0xe8,0x13,
++	0xe4,0xd2,0x10,0xd1,0x08,0x10,0x04,0x13,0xe4,0x13,0xdc,0x10,0x04,0x00,0x00,0x12,
++	0xe6,0xd1,0x08,0x10,0x04,0x0c,0xe9,0x0b,0xdc,0x10,0x04,0x09,0xe6,0x09,0xdc,0xe2,
++	0x80,0x08,0xe1,0x48,0x04,0xe0,0x1c,0x02,0xcf,0x86,0xe5,0x11,0x01,0xd4,0x84,0xd3,
++	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0xa5,0x00,0x01,0xff,0x61,
++	0xcc,0xa5,0x00,0x10,0x08,0x01,0xff,0x42,0xcc,0x87,0x00,0x01,0xff,0x62,0xcc,0x87,
++	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x42,0xcc,0xa3,0x00,0x01,0xff,0x62,0xcc,0xa3,
++	0x00,0x10,0x08,0x01,0xff,0x42,0xcc,0xb1,0x00,0x01,0xff,0x62,0xcc,0xb1,0x00,0xd2,
++	0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x43,0xcc,0xa7,0xcc,0x81,0x00,0x01,0xff,0x63,
++	0xcc,0xa7,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x44,0xcc,0x87,0x00,0x01,0xff,0x64,
++	0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x44,0xcc,0xa3,0x00,0x01,0xff,0x64,
++	0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x44,0xcc,0xb1,0x00,0x01,0xff,0x64,0xcc,0xb1,
++	0x00,0xd3,0x48,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x44,0xcc,0xa7,0x00,0x01,
++	0xff,0x64,0xcc,0xa7,0x00,0x10,0x08,0x01,0xff,0x44,0xcc,0xad,0x00,0x01,0xff,0x64,
++	0xcc,0xad,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x45,0xcc,0x84,0xcc,0x80,0x00,0x01,
++	0xff,0x65,0xcc,0x84,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x45,0xcc,0x84,0xcc,0x81,
++	0x00,0x01,0xff,0x65,0xcc,0x84,0xcc,0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
++	0xff,0x45,0xcc,0xad,0x00,0x01,0xff,0x65,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x45,
++	0xcc,0xb0,0x00,0x01,0xff,0x65,0xcc,0xb0,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x45,
++	0xcc,0xa7,0xcc,0x86,0x00,0x01,0xff,0x65,0xcc,0xa7,0xcc,0x86,0x00,0x10,0x08,0x01,
++	0xff,0x46,0xcc,0x87,0x00,0x01,0xff,0x66,0xcc,0x87,0x00,0xd4,0x84,0xd3,0x40,0xd2,
++	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x47,0xcc,0x84,0x00,0x01,0xff,0x67,0xcc,0x84,
++	0x00,0x10,0x08,0x01,0xff,0x48,0xcc,0x87,0x00,0x01,0xff,0x68,0xcc,0x87,0x00,0xd1,
++	0x10,0x10,0x08,0x01,0xff,0x48,0xcc,0xa3,0x00,0x01,0xff,0x68,0xcc,0xa3,0x00,0x10,
++	0x08,0x01,0xff,0x48,0xcc,0x88,0x00,0x01,0xff,0x68,0xcc,0x88,0x00,0xd2,0x20,0xd1,
++	0x10,0x10,0x08,0x01,0xff,0x48,0xcc,0xa7,0x00,0x01,0xff,0x68,0xcc,0xa7,0x00,0x10,
++	0x08,0x01,0xff,0x48,0xcc,0xae,0x00,0x01,0xff,0x68,0xcc,0xae,0x00,0xd1,0x10,0x10,
++	0x08,0x01,0xff,0x49,0xcc,0xb0,0x00,0x01,0xff,0x69,0xcc,0xb0,0x00,0x10,0x0a,0x01,
++	0xff,0x49,0xcc,0x88,0xcc,0x81,0x00,0x01,0xff,0x69,0xcc,0x88,0xcc,0x81,0x00,0xd3,
++	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x4b,0xcc,0x81,0x00,0x01,0xff,0x6b,
++	0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x4b,0xcc,0xa3,0x00,0x01,0xff,0x6b,0xcc,0xa3,
++	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4b,0xcc,0xb1,0x00,0x01,0xff,0x6b,0xcc,0xb1,
++	0x00,0x10,0x08,0x01,0xff,0x4c,0xcc,0xa3,0x00,0x01,0xff,0x6c,0xcc,0xa3,0x00,0xd2,
++	0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4c,0xcc,0xa3,0xcc,0x84,0x00,0x01,0xff,0x6c,
++	0xcc,0xa3,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x4c,0xcc,0xb1,0x00,0x01,0xff,0x6c,
++	0xcc,0xb1,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4c,0xcc,0xad,0x00,0x01,0xff,0x6c,
++	0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x4d,0xcc,0x81,0x00,0x01,0xff,0x6d,0xcc,0x81,
++	0x00,0xcf,0x86,0xe5,0x15,0x01,0xd4,0x88,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
++	0x01,0xff,0x4d,0xcc,0x87,0x00,0x01,0xff,0x6d,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,
++	0x4d,0xcc,0xa3,0x00,0x01,0xff,0x6d,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0x4e,0xcc,0x87,0x00,0x01,0xff,0x6e,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x4e,0xcc,
++	0xa3,0x00,0x01,0xff,0x6e,0xcc,0xa3,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0x4e,0xcc,0xb1,0x00,0x01,0xff,0x6e,0xcc,0xb1,0x00,0x10,0x08,0x01,0xff,0x4e,0xcc,
++	0xad,0x00,0x01,0xff,0x6e,0xcc,0xad,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,
++	0x83,0xcc,0x81,0x00,0x01,0xff,0x6f,0xcc,0x83,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,
++	0x4f,0xcc,0x83,0xcc,0x88,0x00,0x01,0xff,0x6f,0xcc,0x83,0xcc,0x88,0x00,0xd3,0x48,
++	0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x84,0xcc,0x80,0x00,0x01,0xff,
++	0x6f,0xcc,0x84,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x84,0xcc,0x81,0x00,
++	0x01,0xff,0x6f,0xcc,0x84,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x50,0xcc,
++	0x81,0x00,0x01,0xff,0x70,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x50,0xcc,0x87,0x00,
++	0x01,0xff,0x70,0xcc,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x52,0xcc,
++	0x87,0x00,0x01,0xff,0x72,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x52,0xcc,0xa3,0x00,
++	0x01,0xff,0x72,0xcc,0xa3,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x52,0xcc,0xa3,0xcc,
++	0x84,0x00,0x01,0xff,0x72,0xcc,0xa3,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x52,0xcc,
++	0xb1,0x00,0x01,0xff,0x72,0xcc,0xb1,0x00,0xd4,0x8c,0xd3,0x48,0xd2,0x20,0xd1,0x10,
++	0x10,0x08,0x01,0xff,0x53,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x87,0x00,0x10,0x08,
++	0x01,0xff,0x53,0xcc,0xa3,0x00,0x01,0xff,0x73,0xcc,0xa3,0x00,0xd1,0x14,0x10,0x0a,
++	0x01,0xff,0x53,0xcc,0x81,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x81,0xcc,0x87,0x00,
++	0x10,0x0a,0x01,0xff,0x53,0xcc,0x8c,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x8c,0xcc,
++	0x87,0x00,0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x53,0xcc,0xa3,0xcc,0x87,0x00,
++	0x01,0xff,0x73,0xcc,0xa3,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x54,0xcc,0x87,0x00,
++	0x01,0xff,0x74,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x54,0xcc,0xa3,0x00,
++	0x01,0xff,0x74,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x54,0xcc,0xb1,0x00,0x01,0xff,
++	0x74,0xcc,0xb1,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x54,0xcc,
++	0xad,0x00,0x01,0xff,0x74,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0xa4,0x00,
++	0x01,0xff,0x75,0xcc,0xa4,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x55,0xcc,0xb0,0x00,
++	0x01,0xff,0x75,0xcc,0xb0,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0xad,0x00,0x01,0xff,
++	0x75,0xcc,0xad,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x55,0xcc,0x83,0xcc,
++	0x81,0x00,0x01,0xff,0x75,0xcc,0x83,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x55,0xcc,
++	0x84,0xcc,0x88,0x00,0x01,0xff,0x75,0xcc,0x84,0xcc,0x88,0x00,0xd1,0x10,0x10,0x08,
++	0x01,0xff,0x56,0xcc,0x83,0x00,0x01,0xff,0x76,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,
++	0x56,0xcc,0xa3,0x00,0x01,0xff,0x76,0xcc,0xa3,0x00,0xe0,0x10,0x02,0xcf,0x86,0xd5,
++	0xe1,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x57,0xcc,0x80,
++	0x00,0x01,0xff,0x77,0xcc,0x80,0x00,0x10,0x08,0x01,0xff,0x57,0xcc,0x81,0x00,0x01,
++	0xff,0x77,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x57,0xcc,0x88,0x00,0x01,
++	0xff,0x77,0xcc,0x88,0x00,0x10,0x08,0x01,0xff,0x57,0xcc,0x87,0x00,0x01,0xff,0x77,
++	0xcc,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x57,0xcc,0xa3,0x00,0x01,
++	0xff,0x77,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x58,0xcc,0x87,0x00,0x01,0xff,0x78,
++	0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x58,0xcc,0x88,0x00,0x01,0xff,0x78,
++	0xcc,0x88,0x00,0x10,0x08,0x01,0xff,0x59,0xcc,0x87,0x00,0x01,0xff,0x79,0xcc,0x87,
++	0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x5a,0xcc,0x82,0x00,0x01,
++	0xff,0x7a,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x5a,0xcc,0xa3,0x00,0x01,0xff,0x7a,
++	0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x5a,0xcc,0xb1,0x00,0x01,0xff,0x7a,
++	0xcc,0xb1,0x00,0x10,0x08,0x01,0xff,0x68,0xcc,0xb1,0x00,0x01,0xff,0x74,0xcc,0x88,
++	0x00,0x92,0x1d,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x8a,0x00,0x01,0xff,0x79,
++	0xcc,0x8a,0x00,0x10,0x04,0x01,0x00,0x02,0xff,0xc5,0xbf,0xcc,0x87,0x00,0x0a,0x00,
++	0xd4,0x98,0xd3,0x48,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0xa3,0x00,
++	0x01,0xff,0x61,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x41,0xcc,0x89,0x00,0x01,0xff,
++	0x61,0xcc,0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x41,0xcc,0x82,0xcc,0x81,0x00,
++	0x01,0xff,0x61,0xcc,0x82,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x82,0xcc,
++	0x80,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x80,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,
++	0x01,0xff,0x41,0xcc,0x82,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x89,0x00,
++	0x10,0x0a,0x01,0xff,0x41,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,
++	0x83,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x41,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,
++	0x61,0xcc,0xa3,0xcc,0x82,0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x86,0xcc,0x81,0x00,
++	0x01,0xff,0x61,0xcc,0x86,0xcc,0x81,0x00,0xd3,0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,
++	0x01,0xff,0x41,0xcc,0x86,0xcc,0x80,0x00,0x01,0xff,0x61,0xcc,0x86,0xcc,0x80,0x00,
++	0x10,0x0a,0x01,0xff,0x41,0xcc,0x86,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x86,0xcc,
++	0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x41,0xcc,0x86,0xcc,0x83,0x00,0x01,0xff,
++	0x61,0xcc,0x86,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0xa3,0xcc,0x86,0x00,
++	0x01,0xff,0x61,0xcc,0xa3,0xcc,0x86,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0x45,0xcc,0xa3,0x00,0x01,0xff,0x65,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x45,0xcc,
++	0x89,0x00,0x01,0xff,0x65,0xcc,0x89,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x45,0xcc,
++	0x83,0x00,0x01,0xff,0x65,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x45,0xcc,0x82,0xcc,
++	0x81,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x81,0x00,0xcf,0x86,0xe5,0x31,0x01,0xd4,
++	0x90,0xd3,0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x45,0xcc,0x82,0xcc,0x80,
++	0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x45,0xcc,0x82,
++	0xcc,0x89,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,
++	0xff,0x45,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x83,0x00,0x10,
++	0x0a,0x01,0xff,0x45,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,0x65,0xcc,0xa3,0xcc,0x82,
++	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x49,0xcc,0x89,0x00,0x01,0xff,0x69,
++	0xcc,0x89,0x00,0x10,0x08,0x01,0xff,0x49,0xcc,0xa3,0x00,0x01,0xff,0x69,0xcc,0xa3,
++	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0xa3,0x00,0x01,0xff,0x6f,0xcc,0xa3,
++	0x00,0x10,0x08,0x01,0xff,0x4f,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x89,0x00,0xd3,
++	0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x82,0xcc,0x81,0x00,0x01,
++	0xff,0x6f,0xcc,0x82,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x82,0xcc,0x80,
++	0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x80,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,
++	0xcc,0x82,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x89,0x00,0x10,0x0a,0x01,
++	0xff,0x4f,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x83,0x00,0xd2,
++	0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,0x6f,
++	0xcc,0xa3,0xcc,0x82,0x00,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x9b,0xcc,0x81,0x00,0x01,
++	0xff,0x6f,0xcc,0x9b,0xcc,0x81,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x9b,
++	0xcc,0x80,0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x4f,
++	0xcc,0x9b,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x89,0x00,0xd4,0x98,0xd3,
++	0x48,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x9b,0xcc,0x83,0x00,0x01,
++	0xff,0x6f,0xcc,0x9b,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x9b,0xcc,0xa3,
++	0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x55,
++	0xcc,0xa3,0x00,0x01,0xff,0x75,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0x89,
++	0x00,0x01,0xff,0x75,0xcc,0x89,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x55,
++	0xcc,0x9b,0xcc,0x81,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x81,0x00,0x10,0x0a,0x01,
++	0xff,0x55,0xcc,0x9b,0xcc,0x80,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x80,0x00,0xd1,
++	0x14,0x10,0x0a,0x01,0xff,0x55,0xcc,0x9b,0xcc,0x89,0x00,0x01,0xff,0x75,0xcc,0x9b,
++	0xcc,0x89,0x00,0x10,0x0a,0x01,0xff,0x55,0xcc,0x9b,0xcc,0x83,0x00,0x01,0xff,0x75,
++	0xcc,0x9b,0xcc,0x83,0x00,0xd3,0x44,0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x55,
++	0xcc,0x9b,0xcc,0xa3,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0xa3,0x00,0x10,0x08,0x01,
++	0xff,0x59,0xcc,0x80,0x00,0x01,0xff,0x79,0xcc,0x80,0x00,0xd1,0x10,0x10,0x08,0x01,
++	0xff,0x59,0xcc,0xa3,0x00,0x01,0xff,0x79,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x59,
++	0xcc,0x89,0x00,0x01,0xff,0x79,0xcc,0x89,0x00,0x92,0x14,0x91,0x10,0x10,0x08,0x01,
++	0xff,0x59,0xcc,0x83,0x00,0x01,0xff,0x79,0xcc,0x83,0x00,0x0a,0x00,0x0a,0x00,0xe1,
++	0xc0,0x04,0xe0,0x80,0x02,0xcf,0x86,0xe5,0x2d,0x01,0xd4,0xa8,0xd3,0x54,0xd2,0x28,
++	0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x93,0x00,0x01,0xff,0xce,0xb1,0xcc,
++	0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,
++	0xb1,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,
++	0xcc,0x81,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,
++	0xce,0xb1,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcd,0x82,0x00,
++	0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x91,0xcc,0x93,0x00,0x01,0xff,0xce,
++	0x91,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0x91,0xcc,0x93,0xcc,0x80,0x00,0x01,
++	0xff,0xce,0x91,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0x91,
++	0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0x91,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,
++	0x01,0xff,0xce,0x91,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0x91,0xcc,0x94,0xcd,
++	0x82,0x00,0xd3,0x42,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb5,0xcc,0x93,
++	0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb5,0xcc,0x93,
++	0xcc,0x80,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0xcc,0x80,0x00,0x91,0x16,0x10,0x0b,
++	0x01,0xff,0xce,0xb5,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0xcc,
++	0x81,0x00,0x00,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x95,0xcc,0x93,
++	0x00,0x01,0xff,0xce,0x95,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0x95,0xcc,0x93,
++	0xcc,0x80,0x00,0x01,0xff,0xce,0x95,0xcc,0x94,0xcc,0x80,0x00,0x91,0x16,0x10,0x0b,
++	0x01,0xff,0xce,0x95,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0x95,0xcc,0x94,0xcc,
++	0x81,0x00,0x00,0x00,0xd4,0xa8,0xd3,0x54,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,
++	0xce,0xb7,0xcc,0x93,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,
++	0xce,0xb7,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,0x00,
++	0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,
++	0xb7,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,0x82,
++	0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x82,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,
++	0x01,0xff,0xce,0x97,0xcc,0x93,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0x00,0x10,0x0b,
++	0x01,0xff,0xce,0x97,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcc,
++	0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0x97,0xcc,0x93,0xcc,0x81,0x00,0x01,
++	0xff,0xce,0x97,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xce,0x97,0xcc,0x93,
++	0xcd,0x82,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcd,0x82,0x00,0xd3,0x54,0xd2,0x28,
++	0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x93,0x00,0x01,0xff,0xce,0xb9,0xcc,
++	0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,
++	0xb9,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x93,
++	0xcc,0x81,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,
++	0xce,0xb9,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0xcd,0x82,0x00,
++	0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x99,0xcc,0x93,0x00,0x01,0xff,0xce,
++	0x99,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0x99,0xcc,0x93,0xcc,0x80,0x00,0x01,
++	0xff,0xce,0x99,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0x99,
++	0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0x99,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,
++	0x01,0xff,0xce,0x99,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0x99,0xcc,0x94,0xcd,
++	0x82,0x00,0xcf,0x86,0xe5,0x13,0x01,0xd4,0x84,0xd3,0x42,0xd2,0x28,0xd1,0x12,0x10,
++	0x09,0x01,0xff,0xce,0xbf,0xcc,0x93,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,0x00,0x10,
++	0x0b,0x01,0xff,0xce,0xbf,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,
++	0xcc,0x80,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xce,0xbf,0xcc,0x93,0xcc,0x81,0x00,
++	0x01,0xff,0xce,0xbf,0xcc,0x94,0xcc,0x81,0x00,0x00,0x00,0xd2,0x28,0xd1,0x12,0x10,
++	0x09,0x01,0xff,0xce,0x9f,0xcc,0x93,0x00,0x01,0xff,0xce,0x9f,0xcc,0x94,0x00,0x10,
++	0x0b,0x01,0xff,0xce,0x9f,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0x9f,0xcc,0x94,
++	0xcc,0x80,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xce,0x9f,0xcc,0x93,0xcc,0x81,0x00,
++	0x01,0xff,0xce,0x9f,0xcc,0x94,0xcc,0x81,0x00,0x00,0x00,0xd3,0x54,0xd2,0x28,0xd1,
++	0x12,0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x93,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,
++	0x00,0x10,0x0b,0x01,0xff,0xcf,0x85,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xcf,0x85,
++	0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x85,0xcc,0x93,0xcc,
++	0x81,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xcf,
++	0x85,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcd,0x82,0x00,0xd2,
++	0x1c,0xd1,0x0d,0x10,0x04,0x00,0x00,0x01,0xff,0xce,0xa5,0xcc,0x94,0x00,0x10,0x04,
++	0x00,0x00,0x01,0xff,0xce,0xa5,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x0f,0x10,0x04,0x00,
++	0x00,0x01,0xff,0xce,0xa5,0xcc,0x94,0xcc,0x81,0x00,0x10,0x04,0x00,0x00,0x01,0xff,
++	0xce,0xa5,0xcc,0x94,0xcd,0x82,0x00,0xd4,0xa8,0xd3,0x54,0xd2,0x28,0xd1,0x12,0x10,
++	0x09,0x01,0xff,0xcf,0x89,0xcc,0x93,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0x00,0x10,
++	0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,
++	0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x81,0x00,
++	0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,
++	0x93,0xcd,0x82,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcd,0x82,0x00,0xd2,0x28,0xd1,
++	0x12,0x10,0x09,0x01,0xff,0xce,0xa9,0xcc,0x93,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,
++	0x00,0x10,0x0b,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xa9,
++	0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcc,
++	0x81,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xce,
++	0xa9,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,0xcd,0x82,0x00,0xd3,
++	0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x80,0x00,0x01,0xff,
++	0xce,0xb1,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb5,0xcc,0x80,0x00,0x01,0xff,
++	0xce,0xb5,0xcc,0x81,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb7,0xcc,0x80,0x00,
++	0x01,0xff,0xce,0xb7,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x80,0x00,
++	0x01,0xff,0xce,0xb9,0xcc,0x81,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,
++	0xbf,0xcc,0x80,0x00,0x01,0xff,0xce,0xbf,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xcf,
++	0x85,0xcc,0x80,0x00,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,0x91,0x12,0x10,0x09,0x01,
++	0xff,0xcf,0x89,0xcc,0x80,0x00,0x01,0xff,0xcf,0x89,0xcc,0x81,0x00,0x00,0x00,0xe0,
++	0xe1,0x02,0xcf,0x86,0xe5,0x91,0x01,0xd4,0xc8,0xd3,0x64,0xd2,0x30,0xd1,0x16,0x10,
++	0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcd,0x85,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,
++	0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0xcd,0x85,0x00,
++	0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x80,0xcd,0x85,0x00,0xd1,0x1a,0x10,0x0d,0x01,
++	0xff,0xce,0xb1,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,
++	0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcd,0x82,0xcd,
++	0x85,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x30,0xd1,
++	0x16,0x10,0x0b,0x01,0xff,0xce,0x91,0xcc,0x93,0xcd,0x85,0x00,0x01,0xff,0xce,0x91,
++	0xcc,0x94,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0x91,0xcc,0x93,0xcc,0x80,0xcd,
++	0x85,0x00,0x01,0xff,0xce,0x91,0xcc,0x94,0xcc,0x80,0xcd,0x85,0x00,0xd1,0x1a,0x10,
++	0x0d,0x01,0xff,0xce,0x91,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,0x01,0xff,0xce,0x91,
++	0xcc,0x94,0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0x91,0xcc,0x93,0xcd,
++	0x82,0xcd,0x85,0x00,0x01,0xff,0xce,0x91,0xcc,0x94,0xcd,0x82,0xcd,0x85,0x00,0xd3,
++	0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,0x85,0x00,
++	0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,
++	0x93,0xcc,0x80,0xcd,0x85,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,0xcd,0x85,
++	0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,
++	0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,
++	0xb7,0xcc,0x93,0xcd,0x82,0xcd,0x85,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x82,
++	0xcd,0x85,0x00,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0x97,0xcc,0x93,0xcd,
++	0x85,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,
++	0x97,0xcc,0x93,0xcc,0x80,0xcd,0x85,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcc,0x80,
++	0xcd,0x85,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,0x97,0xcc,0x93,0xcc,0x81,0xcd,
++	0x85,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,
++	0xff,0xce,0x97,0xcc,0x93,0xcd,0x82,0xcd,0x85,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,
++	0xcd,0x82,0xcd,0x85,0x00,0xd4,0xc8,0xd3,0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,
++	0xff,0xcf,0x89,0xcc,0x93,0xcd,0x85,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcd,0x85,
++	0x00,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x80,0xcd,0x85,0x00,0x01,0xff,
++	0xcf,0x89,0xcc,0x94,0xcc,0x80,0xcd,0x85,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xcf,
++	0x89,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x81,
++	0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcd,0x82,0xcd,0x85,0x00,
++	0x01,0xff,0xcf,0x89,0xcc,0x94,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x30,0xd1,0x16,0x10,
++	0x0b,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcd,0x85,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,
++	0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcc,0x80,0xcd,0x85,0x00,
++	0x01,0xff,0xce,0xa9,0xcc,0x94,0xcc,0x80,0xcd,0x85,0x00,0xd1,0x1a,0x10,0x0d,0x01,
++	0xff,0xce,0xa9,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,
++	0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcd,0x82,0xcd,
++	0x85,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,0xcd,0x82,0xcd,0x85,0x00,0xd3,0x49,0xd2,
++	0x26,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x86,0x00,0x01,0xff,0xce,0xb1,
++	0xcc,0x84,0x00,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x80,0xcd,0x85,0x00,0x01,0xff,
++	0xce,0xb1,0xcd,0x85,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x81,0xcd,
++	0x85,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xce,0xb1,0xcd,0x82,0x00,0x01,0xff,0xce,
++	0xb1,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x91,
++	0xcc,0x86,0x00,0x01,0xff,0xce,0x91,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,0xce,0x91,
++	0xcc,0x80,0x00,0x01,0xff,0xce,0x91,0xcc,0x81,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,
++	0xce,0x91,0xcd,0x85,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xce,0xb9,0x00,0x01,0x00,
++	0xcf,0x86,0xe5,0x16,0x01,0xd4,0x8f,0xd3,0x44,0xd2,0x21,0xd1,0x0d,0x10,0x04,0x01,
++	0x00,0x01,0xff,0xc2,0xa8,0xcd,0x82,0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x80,
++	0xcd,0x85,0x00,0x01,0xff,0xce,0xb7,0xcd,0x85,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,
++	0xce,0xb7,0xcc,0x81,0xcd,0x85,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xce,0xb7,0xcd,
++	0x82,0x00,0x01,0xff,0xce,0xb7,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x24,0xd1,0x12,0x10,
++	0x09,0x01,0xff,0xce,0x95,0xcc,0x80,0x00,0x01,0xff,0xce,0x95,0xcc,0x81,0x00,0x10,
++	0x09,0x01,0xff,0xce,0x97,0xcc,0x80,0x00,0x01,0xff,0xce,0x97,0xcc,0x81,0x00,0xd1,
++	0x13,0x10,0x09,0x01,0xff,0xce,0x97,0xcd,0x85,0x00,0x01,0xff,0xe1,0xbe,0xbf,0xcc,
++	0x80,0x00,0x10,0x0a,0x01,0xff,0xe1,0xbe,0xbf,0xcc,0x81,0x00,0x01,0xff,0xe1,0xbe,
++	0xbf,0xcd,0x82,0x00,0xd3,0x40,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb9,
++	0xcc,0x86,0x00,0x01,0xff,0xce,0xb9,0xcc,0x84,0x00,0x10,0x0b,0x01,0xff,0xce,0xb9,
++	0xcc,0x88,0xcc,0x80,0x00,0x01,0xff,0xce,0xb9,0xcc,0x88,0xcc,0x81,0x00,0x51,0x04,
++	0x00,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,0xcd,0x82,0x00,0x01,0xff,0xce,0xb9,0xcc,
++	0x88,0xcd,0x82,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x99,0xcc,0x86,
++	0x00,0x01,0xff,0xce,0x99,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,0xce,0x99,0xcc,0x80,
++	0x00,0x01,0xff,0xce,0x99,0xcc,0x81,0x00,0xd1,0x0e,0x10,0x04,0x00,0x00,0x01,0xff,
++	0xe1,0xbf,0xbe,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0xe1,0xbf,0xbe,0xcc,0x81,0x00,
++	0x01,0xff,0xe1,0xbf,0xbe,0xcd,0x82,0x00,0xd4,0x93,0xd3,0x4e,0xd2,0x28,0xd1,0x12,
++	0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x86,0x00,0x01,0xff,0xcf,0x85,0xcc,0x84,0x00,
++	0x10,0x0b,0x01,0xff,0xcf,0x85,0xcc,0x88,0xcc,0x80,0x00,0x01,0xff,0xcf,0x85,0xcc,
++	0x88,0xcc,0x81,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xcf,0x81,0xcc,0x93,0x00,0x01,
++	0xff,0xcf,0x81,0xcc,0x94,0x00,0x10,0x09,0x01,0xff,0xcf,0x85,0xcd,0x82,0x00,0x01,
++	0xff,0xcf,0x85,0xcc,0x88,0xcd,0x82,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,
++	0xce,0xa5,0xcc,0x86,0x00,0x01,0xff,0xce,0xa5,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,
++	0xce,0xa5,0xcc,0x80,0x00,0x01,0xff,0xce,0xa5,0xcc,0x81,0x00,0xd1,0x12,0x10,0x09,
++	0x01,0xff,0xce,0xa1,0xcc,0x94,0x00,0x01,0xff,0xc2,0xa8,0xcc,0x80,0x00,0x10,0x09,
++	0x01,0xff,0xc2,0xa8,0xcc,0x81,0x00,0x01,0xff,0x60,0x00,0xd3,0x3b,0xd2,0x18,0x51,
++	0x04,0x00,0x00,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x80,0xcd,0x85,0x00,0x01,0xff,
++	0xcf,0x89,0xcd,0x85,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x81,0xcd,
++	0x85,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xcf,0x89,0xcd,0x82,0x00,0x01,0xff,0xcf,
++	0x89,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x9f,
++	0xcc,0x80,0x00,0x01,0xff,0xce,0x9f,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xa9,
++	0xcc,0x80,0x00,0x01,0xff,0xce,0xa9,0xcc,0x81,0x00,0xd1,0x10,0x10,0x09,0x01,0xff,
++	0xce,0xa9,0xcd,0x85,0x00,0x01,0xff,0xc2,0xb4,0x00,0x10,0x04,0x01,0x00,0x00,0x00,
++	0xe0,0x62,0x0c,0xcf,0x86,0xe5,0x9f,0x08,0xe4,0xf8,0x05,0xe3,0xdb,0x02,0xe2,0xa1,
++	0x01,0xd1,0xb4,0xd0,0x3a,0xcf,0x86,0xd5,0x20,0x94,0x1c,0x93,0x18,0x92,0x14,0x91,
++	0x10,0x10,0x08,0x01,0xff,0xe2,0x80,0x82,0x00,0x01,0xff,0xe2,0x80,0x83,0x00,0x01,
++	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x14,0x53,0x04,0x01,0x00,0x52,0x04,0x01,
++	0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x04,0x00,0x01,0x00,0xcf,0x86,0xd5,
++	0x48,0xd4,0x1c,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
++	0x00,0x06,0x00,0x52,0x04,0x04,0x00,0x11,0x04,0x04,0x00,0x06,0x00,0xd3,0x1c,0xd2,
++	0x0c,0x51,0x04,0x06,0x00,0x10,0x04,0x06,0x00,0x07,0x00,0xd1,0x08,0x10,0x04,0x07,
++	0x00,0x08,0x00,0x10,0x04,0x08,0x00,0x06,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,
++	0x00,0x10,0x04,0x08,0x00,0x06,0x00,0xd4,0x1c,0xd3,0x10,0x52,0x04,0x06,0x00,0x91,
++	0x08,0x10,0x04,0x0a,0x00,0x00,0x00,0x0f,0x00,0x92,0x08,0x11,0x04,0x0f,0x00,0x01,
++	0x00,0x01,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x06,0x00,0x00,
++	0x00,0x01,0x00,0x01,0x00,0xd0,0x7e,0xcf,0x86,0xd5,0x34,0xd4,0x14,0x53,0x04,0x01,
++	0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0xd3,
++	0x10,0x52,0x04,0x08,0x00,0x91,0x08,0x10,0x04,0x08,0x00,0x0c,0x00,0x0c,0x00,0x52,
++	0x04,0x0c,0x00,0x91,0x08,0x10,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,0xd4,0x1c,0x53,
++	0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x02,0x00,0x91,
++	0x08,0x10,0x04,0x03,0x00,0x04,0x00,0x04,0x00,0xd3,0x10,0xd2,0x08,0x11,0x04,0x06,
++	0x00,0x08,0x00,0x11,0x04,0x08,0x00,0x0b,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x0b,
++	0x00,0x0c,0x00,0x10,0x04,0x0e,0x00,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x11,
++	0x00,0x13,0x00,0xcf,0x86,0xd5,0x28,0x54,0x04,0x00,0x00,0xd3,0x0c,0x92,0x08,0x11,
++	0x04,0x01,0xe6,0x01,0x01,0x01,0xe6,0xd2,0x0c,0x51,0x04,0x01,0x01,0x10,0x04,0x01,
++	0x01,0x01,0xe6,0x91,0x08,0x10,0x04,0x01,0xe6,0x01,0x00,0x01,0x00,0xd4,0x30,0xd3,
++	0x1c,0xd2,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x01,0xe6,0x04,0x00,0xd1,0x08,0x10,
++	0x04,0x06,0x00,0x06,0x01,0x10,0x04,0x06,0x01,0x06,0xe6,0x92,0x10,0xd1,0x08,0x10,
++	0x04,0x06,0xdc,0x06,0xe6,0x10,0x04,0x06,0x01,0x08,0x01,0x09,0xdc,0x93,0x10,0x92,
++	0x0c,0x91,0x08,0x10,0x04,0x0a,0xe6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,
++	0x81,0xd0,0x4f,0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x29,0xd3,0x13,0x52,0x04,0x01,
++	0x00,0x51,0x04,0x01,0x00,0x10,0x07,0x01,0xff,0xce,0xa9,0x00,0x01,0x00,0x92,0x12,
++	0x51,0x04,0x01,0x00,0x10,0x06,0x01,0xff,0x4b,0x00,0x01,0xff,0x41,0xcc,0x8a,0x00,
++	0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x04,0x00,
++	0x10,0x04,0x04,0x00,0x07,0x00,0x91,0x08,0x10,0x04,0x08,0x00,0x06,0x00,0x06,0x00,
++	0xcf,0x86,0x95,0x2c,0xd4,0x18,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0xd1,0x08,
++	0x10,0x04,0x08,0x00,0x09,0x00,0x10,0x04,0x09,0x00,0x0a,0x00,0x93,0x10,0x92,0x0c,
++	0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
++	0xd0,0x68,0xcf,0x86,0xd5,0x48,0xd4,0x28,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x01,0x00,
++	0x10,0x04,0x01,0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,
++	0x92,0x0c,0x91,0x08,0x10,0x04,0x0a,0x00,0x0b,0x00,0x11,0x00,0x00,0x00,0x53,0x04,
++	0x01,0x00,0x92,0x18,0x51,0x04,0x01,0x00,0x10,0x0a,0x01,0xff,0xe2,0x86,0x90,0xcc,
++	0xb8,0x00,0x01,0xff,0xe2,0x86,0x92,0xcc,0xb8,0x00,0x01,0x00,0x94,0x1a,0x53,0x04,
++	0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x0a,0x01,0xff,0xe2,0x86,
++	0x94,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x2e,0x94,0x2a,0x53,0x04,
++	0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x0e,0x10,0x04,0x01,0x00,0x01,0xff,0xe2,0x87,
++	0x90,0xcc,0xb8,0x00,0x10,0x0a,0x01,0xff,0xe2,0x87,0x94,0xcc,0xb8,0x00,0x01,0xff,
++	0xe2,0x87,0x92,0xcc,0xb8,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,
++	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x04,0x00,0x04,0x00,0x93,0x08,0x12,0x04,
++	0x04,0x00,0x06,0x00,0x06,0x00,0xe2,0x38,0x02,0xe1,0x3f,0x01,0xd0,0x68,0xcf,0x86,
++	0xd5,0x3e,0x94,0x3a,0xd3,0x16,0x52,0x04,0x01,0x00,0x91,0x0e,0x10,0x0a,0x01,0xff,
++	0xe2,0x88,0x83,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0xd2,0x12,0x91,0x0e,0x10,0x04,
++	0x01,0x00,0x01,0xff,0xe2,0x88,0x88,0xcc,0xb8,0x00,0x01,0x00,0x91,0x0e,0x10,0x0a,
++	0x01,0xff,0xe2,0x88,0x8b,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x24,
++	0x93,0x20,0x52,0x04,0x01,0x00,0xd1,0x0e,0x10,0x0a,0x01,0xff,0xe2,0x88,0xa3,0xcc,
++	0xb8,0x00,0x01,0x00,0x10,0x0a,0x01,0xff,0xe2,0x88,0xa5,0xcc,0xb8,0x00,0x01,0x00,
++	0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x48,0x94,0x44,0xd3,0x2e,0xd2,0x12,0x91,0x0e,
++	0x10,0x04,0x01,0x00,0x01,0xff,0xe2,0x88,0xbc,0xcc,0xb8,0x00,0x01,0x00,0xd1,0x0e,
++	0x10,0x0a,0x01,0xff,0xe2,0x89,0x83,0xcc,0xb8,0x00,0x01,0x00,0x10,0x04,0x01,0x00,
++	0x01,0xff,0xe2,0x89,0x85,0xcc,0xb8,0x00,0x92,0x12,0x91,0x0e,0x10,0x04,0x01,0x00,
++	0x01,0xff,0xe2,0x89,0x88,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x40,
++	0xd3,0x1e,0x92,0x1a,0xd1,0x0c,0x10,0x08,0x01,0xff,0x3d,0xcc,0xb8,0x00,0x01,0x00,
++	0x10,0x0a,0x01,0xff,0xe2,0x89,0xa1,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x52,0x04,
++	0x01,0x00,0xd1,0x0e,0x10,0x04,0x01,0x00,0x01,0xff,0xe2,0x89,0x8d,0xcc,0xb8,0x00,
++	0x10,0x08,0x01,0xff,0x3c,0xcc,0xb8,0x00,0x01,0xff,0x3e,0xcc,0xb8,0x00,0xd3,0x30,
++	0xd2,0x18,0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x89,0xa4,0xcc,0xb8,0x00,0x01,0xff,
++	0xe2,0x89,0xa5,0xcc,0xb8,0x00,0x01,0x00,0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x89,
++	0xb2,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x89,0xb3,0xcc,0xb8,0x00,0x01,0x00,0x92,0x18,
++	0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x89,0xb6,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x89,
++	0xb7,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0xd0,0x86,0xcf,0x86,0xd5,0x50,0x94,0x4c,
++	0xd3,0x30,0xd2,0x18,0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x89,0xba,0xcc,0xb8,0x00,
++	0x01,0xff,0xe2,0x89,0xbb,0xcc,0xb8,0x00,0x01,0x00,0x91,0x14,0x10,0x0a,0x01,0xff,
++	0xe2,0x8a,0x82,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x8a,0x83,0xcc,0xb8,0x00,0x01,0x00,
++	0x92,0x18,0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x8a,0x86,0xcc,0xb8,0x00,0x01,0xff,
++	0xe2,0x8a,0x87,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x30,0x53,0x04,
++	0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0xe2,0x8a,0xa2,0xcc,
++	0xb8,0x00,0x01,0xff,0xe2,0x8a,0xa8,0xcc,0xb8,0x00,0x10,0x0a,0x01,0xff,0xe2,0x8a,
++	0xa9,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x8a,0xab,0xcc,0xb8,0x00,0x01,0x00,0xcf,0x86,
++	0x55,0x04,0x01,0x00,0xd4,0x5c,0xd3,0x2c,0x92,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,
++	0xe2,0x89,0xbc,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x89,0xbd,0xcc,0xb8,0x00,0x10,0x0a,
++	0x01,0xff,0xe2,0x8a,0x91,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x8a,0x92,0xcc,0xb8,0x00,
++	0x01,0x00,0xd2,0x18,0x51,0x04,0x01,0x00,0x10,0x0a,0x01,0xff,0xe2,0x8a,0xb2,0xcc,
++	0xb8,0x00,0x01,0xff,0xe2,0x8a,0xb3,0xcc,0xb8,0x00,0x91,0x14,0x10,0x0a,0x01,0xff,
++	0xe2,0x8a,0xb4,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x8a,0xb5,0xcc,0xb8,0x00,0x01,0x00,
++	0x93,0x0c,0x92,0x08,0x11,0x04,0x01,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0xd1,0x64,
++	0xd0,0x3e,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,
++	0x01,0x00,0x04,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x20,0x53,0x04,
++	0x01,0x00,0x92,0x18,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x80,0x88,0x00,
++	0x10,0x08,0x01,0xff,0xe3,0x80,0x89,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,
++	0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,
++	0x01,0x00,0x10,0x04,0x01,0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x06,0x00,0x04,0x00,
++	0x04,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x04,0x00,0x53,0x04,0x04,0x00,
++	0x92,0x0c,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x06,0x00,0x06,0x00,0x06,0x00,
++	0xcf,0x86,0xd5,0x2c,0xd4,0x14,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x51,0x04,
++	0x06,0x00,0x10,0x04,0x06,0x00,0x07,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,
++	0x07,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x12,0x04,0x08,0x00,0x09,0x00,0xd4,0x14,
++	0x53,0x04,0x09,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x0b,0x00,0x0c,0x00,0x0c,0x00,
++	0x0c,0x00,0xd3,0x08,0x12,0x04,0x0c,0x00,0x10,0x00,0xd2,0x0c,0x51,0x04,0x10,0x00,
++	0x10,0x04,0x10,0x00,0x12,0x00,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x13,0x00,
++	0xd3,0xa6,0xd2,0x74,0xd1,0x40,0xd0,0x22,0xcf,0x86,0x55,0x04,0x01,0x00,0x94,0x18,
++	0x93,0x14,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x04,0x00,0x10,0x04,
++	0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0x95,0x18,0x94,0x14,0x53,0x04,
++	0x01,0x00,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x00,0x00,
++	0x00,0x00,0x01,0x00,0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,
++	0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
++	0x06,0x00,0x06,0x00,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x51,0x04,0x06,0x00,
++	0x10,0x04,0x06,0x00,0x07,0x00,0xd1,0x06,0xcf,0x06,0x01,0x00,0xd0,0x1a,0xcf,0x86,
++	0x95,0x14,0x54,0x04,0x01,0x00,0x93,0x0c,0x52,0x04,0x01,0x00,0x11,0x04,0x01,0x00,
++	0x06,0x00,0x06,0x00,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,
++	0x13,0x04,0x04,0x00,0x06,0x00,0xd2,0xdc,0xd1,0x48,0xd0,0x26,0xcf,0x86,0x95,0x20,
++	0x54,0x04,0x01,0x00,0xd3,0x0c,0x52,0x04,0x01,0x00,0x11,0x04,0x07,0x00,0x06,0x00,
++	0x92,0x0c,0x91,0x08,0x10,0x04,0x08,0x00,0x04,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
++	0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,
++	0x04,0x00,0x06,0x00,0x06,0x00,0x52,0x04,0x06,0x00,0x11,0x04,0x06,0x00,0x08,0x00,
++	0xd0,0x5e,0xcf,0x86,0xd5,0x2c,0xd4,0x10,0x53,0x04,0x06,0x00,0x92,0x08,0x11,0x04,
++	0x06,0x00,0x07,0x00,0x07,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,0x07,0x00,0x08,0x00,
++	0x08,0x00,0x52,0x04,0x08,0x00,0x91,0x08,0x10,0x04,0x08,0x00,0x0a,0x00,0x0b,0x00,
++	0xd4,0x10,0x93,0x0c,0x92,0x08,0x11,0x04,0x07,0x00,0x08,0x00,0x08,0x00,0x08,0x00,
++	0xd3,0x10,0x92,0x0c,0x51,0x04,0x08,0x00,0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,
++	0x52,0x04,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x0b,0x00,0x0b,0x00,0xcf,0x86,
++	0xd5,0x1c,0x94,0x18,0xd3,0x08,0x12,0x04,0x0a,0x00,0x0b,0x00,0x52,0x04,0x0b,0x00,
++	0x51,0x04,0x0b,0x00,0x10,0x04,0x0c,0x00,0x0b,0x00,0x0b,0x00,0x94,0x14,0x93,0x10,
++	0x92,0x0c,0x51,0x04,0x0b,0x00,0x10,0x04,0x0c,0x00,0x0b,0x00,0x0c,0x00,0x0b,0x00,
++	0x0b,0x00,0xd1,0xa8,0xd0,0x42,0xcf,0x86,0xd5,0x28,0x94,0x24,0xd3,0x18,0xd2,0x0c,
++	0x91,0x08,0x10,0x04,0x10,0x00,0x01,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
++	0x0c,0x00,0x01,0x00,0x92,0x08,0x11,0x04,0x01,0x00,0x0c,0x00,0x01,0x00,0x01,0x00,
++	0x94,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x0c,0x00,0x01,0x00,
++	0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x40,0xd4,0x18,0x53,0x04,0x01,0x00,
++	0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x0c,0x00,0x01,0x00,0x10,0x04,0x0c,0x00,
++	0x01,0x00,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x0c,0x00,
++	0x51,0x04,0x0c,0x00,0x10,0x04,0x01,0x00,0x0b,0x00,0x52,0x04,0x01,0x00,0x51,0x04,
++	0x01,0x00,0x10,0x04,0x01,0x00,0x0c,0x00,0xd4,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,
++	0x10,0x04,0x0c,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x06,0x00,0x93,0x0c,0x52,0x04,
++	0x06,0x00,0x11,0x04,0x06,0x00,0x01,0x00,0x01,0x00,0xd0,0x3e,0xcf,0x86,0xd5,0x18,
++	0x54,0x04,0x01,0x00,0x93,0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
++	0x0c,0x00,0x0c,0x00,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,
++	0x10,0x04,0x0c,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,
++	0x01,0x00,0x10,0x04,0x01,0x00,0x0c,0x00,0xcf,0x86,0xd5,0x2c,0x94,0x28,0xd3,0x10,
++	0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x09,0x00,0xd2,0x0c,
++	0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x0d,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,
++	0x0d,0x00,0x0c,0x00,0x06,0x00,0x94,0x0c,0x53,0x04,0x06,0x00,0x12,0x04,0x06,0x00,
++	0x0a,0x00,0x06,0x00,0xe4,0x39,0x01,0xd3,0x0c,0xd2,0x06,0xcf,0x06,0x04,0x00,0xcf,
++	0x06,0x06,0x00,0xd2,0x30,0xd1,0x06,0xcf,0x06,0x06,0x00,0xd0,0x06,0xcf,0x06,0x06,
++	0x00,0xcf,0x86,0x95,0x1e,0x54,0x04,0x06,0x00,0x53,0x04,0x06,0x00,0x52,0x04,0x06,
++	0x00,0x91,0x0e,0x10,0x0a,0x06,0xff,0xe2,0xab,0x9d,0xcc,0xb8,0x00,0x06,0x00,0x06,
++	0x00,0x06,0x00,0xd1,0x80,0xd0,0x3a,0xcf,0x86,0xd5,0x28,0xd4,0x10,0x53,0x04,0x07,
++	0x00,0x52,0x04,0x07,0x00,0x11,0x04,0x07,0x00,0x08,0x00,0xd3,0x08,0x12,0x04,0x08,
++	0x00,0x09,0x00,0x92,0x0c,0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,
++	0x00,0x94,0x0c,0x93,0x08,0x12,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0xcf,
++	0x86,0xd5,0x30,0xd4,0x14,0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,0x91,0x08,0x10,
++	0x04,0x0a,0x00,0x10,0x00,0x10,0x00,0xd3,0x10,0x52,0x04,0x0a,0x00,0x91,0x08,0x10,
++	0x04,0x0a,0x00,0x0b,0x00,0x0b,0x00,0x92,0x08,0x11,0x04,0x0b,0x00,0x10,0x00,0x10,
++	0x00,0x54,0x04,0x10,0x00,0x93,0x0c,0x52,0x04,0x10,0x00,0x11,0x04,0x00,0x00,0x10,
++	0x00,0x10,0x00,0xd0,0x32,0xcf,0x86,0xd5,0x14,0x54,0x04,0x10,0x00,0x93,0x0c,0x52,
++	0x04,0x10,0x00,0x11,0x04,0x10,0x00,0x00,0x00,0x10,0x00,0x54,0x04,0x10,0x00,0x53,
++	0x04,0x10,0x00,0xd2,0x08,0x11,0x04,0x10,0x00,0x14,0x00,0x91,0x08,0x10,0x04,0x14,
++	0x00,0x10,0x00,0x10,0x00,0xcf,0x86,0xd5,0x28,0xd4,0x14,0x53,0x04,0x10,0x00,0x92,
++	0x0c,0x91,0x08,0x10,0x04,0x10,0x00,0x15,0x00,0x10,0x00,0x10,0x00,0x93,0x10,0x92,
++	0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x13,0x00,0x14,0x00,0x14,0x00,0x14,0x00,0xd4,
++	0x0c,0x53,0x04,0x14,0x00,0x12,0x04,0x14,0x00,0x11,0x00,0x53,0x04,0x14,0x00,0x52,
++	0x04,0x14,0x00,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x15,0x00,0xe3,0xb9,0x01,
++	0xd2,0xac,0xd1,0x68,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x08,0x00,0x94,0x14,0x53,0x04,
++	0x08,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,0x00,
++	0x08,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,0x08,0x00,0x53,0x04,0x08,0x00,0x52,0x04,
++	0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,0x00,0xd4,0x14,0x53,0x04,
++	0x09,0x00,0x52,0x04,0x09,0x00,0x91,0x08,0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,
++	0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0b,0x00,0x0a,0x00,0x0a,0x00,0x09,0x00,
++	0x52,0x04,0x0a,0x00,0x11,0x04,0x0a,0x00,0x0b,0x00,0xd0,0x06,0xcf,0x06,0x08,0x00,
++	0xcf,0x86,0x55,0x04,0x08,0x00,0xd4,0x1c,0x53,0x04,0x08,0x00,0xd2,0x0c,0x51,0x04,
++	0x08,0x00,0x10,0x04,0x08,0x00,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,
++	0x0b,0xe6,0xd3,0x0c,0x92,0x08,0x11,0x04,0x0b,0xe6,0x0d,0x00,0x00,0x00,0x92,0x0c,
++	0x91,0x08,0x10,0x04,0x00,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0xd1,0x6c,0xd0,0x2a,
++	0xcf,0x86,0x55,0x04,0x08,0x00,0x94,0x20,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,
++	0x08,0x00,0x10,0x04,0x00,0x00,0x0d,0x00,0x52,0x04,0x00,0x00,0x91,0x08,0x10,0x04,
++	0x00,0x00,0x0d,0x00,0x00,0x00,0x08,0x00,0xcf,0x86,0x55,0x04,0x08,0x00,0xd4,0x1c,
++	0xd3,0x0c,0x52,0x04,0x08,0x00,0x11,0x04,0x08,0x00,0x0d,0x00,0x52,0x04,0x00,0x00,
++	0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x08,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,
++	0x10,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x51,0x04,
++	0x00,0x00,0x10,0x04,0x00,0x00,0x0c,0x09,0xd0,0x5a,0xcf,0x86,0xd5,0x18,0x54,0x04,
++	0x08,0x00,0x93,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,
++	0x00,0x00,0x00,0x00,0xd4,0x20,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,
++	0x10,0x04,0x08,0x00,0x00,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,
++	0x08,0x00,0x00,0x00,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,
++	0x08,0x00,0x00,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,
++	0x00,0x00,0xcf,0x86,0x95,0x40,0xd4,0x20,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,
++	0x08,0x00,0x10,0x04,0x08,0x00,0x00,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,
++	0x10,0x04,0x08,0x00,0x00,0x00,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,
++	0x10,0x04,0x08,0x00,0x00,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,
++	0x08,0x00,0x00,0x00,0x0a,0xe6,0xd2,0x9c,0xd1,0x68,0xd0,0x32,0xcf,0x86,0xd5,0x14,
++	0x54,0x04,0x08,0x00,0x53,0x04,0x08,0x00,0x52,0x04,0x0a,0x00,0x11,0x04,0x08,0x00,
++	0x0a,0x00,0x54,0x04,0x0a,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0a,0x00,
++	0x0b,0x00,0x0d,0x00,0x0d,0x00,0x12,0x04,0x0d,0x00,0x10,0x00,0xcf,0x86,0x95,0x30,
++	0x94,0x2c,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x12,0x00,
++	0x91,0x08,0x10,0x04,0x12,0x00,0x13,0x00,0x13,0x00,0xd2,0x08,0x11,0x04,0x13,0x00,
++	0x14,0x00,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x15,0x00,0x00,0x00,0x00,0x00,
++	0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x04,0x00,0x53,0x04,0x04,0x00,0x92,0x0c,
++	0x51,0x04,0x04,0x00,0x10,0x04,0x00,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0xcf,0x86,
++	0x55,0x04,0x04,0x00,0x54,0x04,0x04,0x00,0x93,0x08,0x12,0x04,0x04,0x00,0x00,0x00,
++	0x00,0x00,0xd1,0x06,0xcf,0x06,0x04,0x00,0xd0,0x06,0xcf,0x06,0x04,0x00,0xcf,0x86,
++	0xd5,0x14,0x54,0x04,0x04,0x00,0x93,0x0c,0x52,0x04,0x04,0x00,0x11,0x04,0x04,0x00,
++	0x00,0x00,0x00,0x00,0x54,0x04,0x00,0x00,0x53,0x04,0x04,0x00,0x12,0x04,0x04,0x00,
++	0x00,0x00,0xcf,0x86,0xe5,0x8d,0x05,0xe4,0x86,0x05,0xe3,0x7d,0x04,0xe2,0xe4,0x03,
++	0xe1,0xc0,0x01,0xd0,0x3e,0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x1c,0x53,0x04,0x01,
++	0x00,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0xda,0x01,0xe4,0x91,0x08,0x10,
++	0x04,0x01,0xe8,0x01,0xde,0x01,0xe0,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x04,
++	0x00,0x10,0x04,0x04,0x00,0x06,0x00,0x51,0x04,0x06,0x00,0x10,0x04,0x04,0x00,0x01,
++	0x00,0xcf,0x86,0xd5,0xaa,0xd4,0x32,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,
++	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x0f,0x10,0x0b,0x01,
++	0xff,0xe3,0x81,0x8b,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,
++	0x8d,0xe3,0x82,0x99,0x00,0x01,0x00,0xd3,0x3c,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,
++	0xff,0xe3,0x81,0x8f,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,
++	0x91,0xe3,0x82,0x99,0x00,0x01,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0x93,
++	0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0x95,0xe3,0x82,0x99,
++	0x00,0x01,0x00,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0x97,0xe3,0x82,
++	0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0x99,0xe3,0x82,0x99,0x00,0x01,
++	0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0x9b,0xe3,0x82,0x99,0x00,0x01,0x00,
++	0x10,0x0b,0x01,0xff,0xe3,0x81,0x9d,0xe3,0x82,0x99,0x00,0x01,0x00,0xd4,0x53,0xd3,
++	0x3c,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0x9f,0xe3,0x82,0x99,0x00,
++	0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0xa1,0xe3,0x82,0x99,0x00,0x01,0x00,0xd1,
++	0x0f,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x81,0xa4,0xe3,0x82,0x99,0x00,0x10,0x04,
++	0x01,0x00,0x01,0xff,0xe3,0x81,0xa6,0xe3,0x82,0x99,0x00,0x92,0x13,0x91,0x0f,0x10,
++	0x04,0x01,0x00,0x01,0xff,0xe3,0x81,0xa8,0xe3,0x82,0x99,0x00,0x01,0x00,0x01,0x00,
++	0xd3,0x4a,0xd2,0x25,0xd1,0x16,0x10,0x0b,0x01,0xff,0xe3,0x81,0xaf,0xe3,0x82,0x99,
++	0x00,0x01,0xff,0xe3,0x81,0xaf,0xe3,0x82,0x9a,0x00,0x10,0x04,0x01,0x00,0x01,0xff,
++	0xe3,0x81,0xb2,0xe3,0x82,0x99,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0xb2,
++	0xe3,0x82,0x9a,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0xb5,0xe3,0x82,0x99,
++	0x00,0x01,0xff,0xe3,0x81,0xb5,0xe3,0x82,0x9a,0x00,0xd2,0x1e,0xd1,0x0f,0x10,0x04,
++	0x01,0x00,0x01,0xff,0xe3,0x81,0xb8,0xe3,0x82,0x99,0x00,0x10,0x0b,0x01,0xff,0xe3,
++	0x81,0xb8,0xe3,0x82,0x9a,0x00,0x01,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xe3,0x81,
++	0xbb,0xe3,0x82,0x99,0x00,0x01,0xff,0xe3,0x81,0xbb,0xe3,0x82,0x9a,0x00,0x01,0x00,
++	0xd0,0xee,0xcf,0x86,0xd5,0x42,0x54,0x04,0x01,0x00,0xd3,0x1b,0x52,0x04,0x01,0x00,
++	0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0x86,0xe3,0x82,0x99,0x00,0x06,0x00,0x10,
++	0x04,0x06,0x00,0x00,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x00,0x00,0x01,0x08,0x10,
++	0x04,0x01,0x08,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0x9d,
++	0xe3,0x82,0x99,0x00,0x06,0x00,0xd4,0x32,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,
++	0x06,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x0f,0x10,0x0b,
++	0x01,0xff,0xe3,0x82,0xab,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,
++	0x82,0xad,0xe3,0x82,0x99,0x00,0x01,0x00,0xd3,0x3c,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,
++	0x01,0xff,0xe3,0x82,0xaf,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,
++	0x82,0xb1,0xe3,0x82,0x99,0x00,0x01,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,
++	0xb3,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0xb5,0xe3,0x82,
++	0x99,0x00,0x01,0x00,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,0xb7,0xe3,
++	0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0xb9,0xe3,0x82,0x99,0x00,
++	0x01,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,0xbb,0xe3,0x82,0x99,0x00,0x01,
++	0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0xbd,0xe3,0x82,0x99,0x00,0x01,0x00,0xcf,0x86,
++	0xd5,0xd5,0xd4,0x53,0xd3,0x3c,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,
++	0xbf,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x83,0x81,0xe3,0x82,
++	0x99,0x00,0x01,0x00,0xd1,0x0f,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x84,0xe3,
++	0x82,0x99,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x86,0xe3,0x82,0x99,0x00,
++	0x92,0x13,0x91,0x0f,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x88,0xe3,0x82,0x99,
++	0x00,0x01,0x00,0x01,0x00,0xd3,0x4a,0xd2,0x25,0xd1,0x16,0x10,0x0b,0x01,0xff,0xe3,
++	0x83,0x8f,0xe3,0x82,0x99,0x00,0x01,0xff,0xe3,0x83,0x8f,0xe3,0x82,0x9a,0x00,0x10,
++	0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x92,0xe3,0x82,0x99,0x00,0xd1,0x0f,0x10,0x0b,
++	0x01,0xff,0xe3,0x83,0x92,0xe3,0x82,0x9a,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,
++	0x83,0x95,0xe3,0x82,0x99,0x00,0x01,0xff,0xe3,0x83,0x95,0xe3,0x82,0x9a,0x00,0xd2,
++	0x1e,0xd1,0x0f,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x98,0xe3,0x82,0x99,0x00,
++	0x10,0x0b,0x01,0xff,0xe3,0x83,0x98,0xe3,0x82,0x9a,0x00,0x01,0x00,0x91,0x16,0x10,
++	0x0b,0x01,0xff,0xe3,0x83,0x9b,0xe3,0x82,0x99,0x00,0x01,0xff,0xe3,0x83,0x9b,0xe3,
++	0x82,0x9a,0x00,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x22,0x52,0x04,0x01,0x00,0xd1,
++	0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,0xa6,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x04,
++	0x01,0x00,0x01,0xff,0xe3,0x83,0xaf,0xe3,0x82,0x99,0x00,0xd2,0x25,0xd1,0x16,0x10,
++	0x0b,0x01,0xff,0xe3,0x83,0xb0,0xe3,0x82,0x99,0x00,0x01,0xff,0xe3,0x83,0xb1,0xe3,
++	0x82,0x99,0x00,0x10,0x0b,0x01,0xff,0xe3,0x83,0xb2,0xe3,0x82,0x99,0x00,0x01,0x00,
++	0x51,0x04,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x83,0xbd,0xe3,0x82,0x99,0x00,0x06,
++	0x00,0xd1,0x4c,0xd0,0x46,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x52,0x04,0x00,
++	0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,
++	0x18,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x0a,
++	0x00,0x10,0x04,0x13,0x00,0x14,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,
++	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x06,0x01,0x00,0xd0,0x32,0xcf,
++	0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,
++	0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x54,0x04,0x04,0x00,0x53,0x04,0x04,
++	0x00,0x92,0x0c,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,0xcf,
++	0x86,0xd5,0x08,0x14,0x04,0x08,0x00,0x0a,0x00,0x94,0x0c,0x93,0x08,0x12,0x04,0x0a,
++	0x00,0x00,0x00,0x00,0x00,0x06,0x00,0xd2,0xa4,0xd1,0x5c,0xd0,0x22,0xcf,0x86,0x95,
++	0x1c,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,
++	0x04,0x01,0x00,0x07,0x00,0x10,0x04,0x07,0x00,0x00,0x00,0x01,0x00,0xcf,0x86,0xd5,
++	0x20,0xd4,0x0c,0x93,0x08,0x12,0x04,0x01,0x00,0x0b,0x00,0x0b,0x00,0x93,0x10,0x92,
++	0x0c,0x91,0x08,0x10,0x04,0x07,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x54,
++	0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x07,0x00,0x10,
++	0x04,0x08,0x00,0x01,0x00,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,
++	0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x06,0x00,0x06,0x00,0x06,
++	0x00,0x06,0x00,0xcf,0x86,0xd5,0x10,0x94,0x0c,0x53,0x04,0x01,0x00,0x12,0x04,0x01,
++	0x00,0x07,0x00,0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,
++	0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x16,0x00,0xd1,0x30,0xd0,0x06,0xcf,
++	0x06,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x10,0x52,
++	0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x07,0x00,0x92,0x0c,0x51,
++	0x04,0x07,0x00,0x10,0x04,0x07,0x00,0x01,0x00,0x01,0x00,0xd0,0x06,0xcf,0x06,0x01,
++	0x00,0xcf,0x86,0xd5,0x14,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,
++	0x00,0x11,0x04,0x01,0x00,0x07,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,
++	0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x07,0x00,0xcf,0x06,0x04,
++	0x00,0xcf,0x06,0x04,0x00,0xd1,0x48,0xd0,0x40,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x04,
++	0x00,0xd4,0x06,0xcf,0x06,0x04,0x00,0xd3,0x2c,0xd2,0x06,0xcf,0x06,0x04,0x00,0xd1,
++	0x06,0xcf,0x06,0x04,0x00,0xd0,0x1a,0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,
++	0x00,0x93,0x0c,0x52,0x04,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0xcf,
++	0x06,0x07,0x00,0xcf,0x06,0x01,0x00,0xcf,0x86,0xcf,0x06,0x01,0x00,0xcf,0x86,0xcf,
++	0x06,0x01,0x00,0xe2,0x71,0x05,0xd1,0x8c,0xd0,0x08,0xcf,0x86,0xcf,0x06,0x01,0x00,
++	0xcf,0x86,0xd5,0x06,0xcf,0x06,0x01,0x00,0xd4,0x06,0xcf,0x06,0x01,0x00,0xd3,0x06,
++	0xcf,0x06,0x01,0x00,0xd2,0x06,0xcf,0x06,0x01,0x00,0xd1,0x06,0xcf,0x06,0x01,0x00,
++	0xd0,0x22,0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x10,0x93,0x0c,0x52,0x04,0x01,0x00,
++	0x11,0x04,0x01,0x00,0x08,0x00,0x08,0x00,0x53,0x04,0x08,0x00,0x12,0x04,0x08,0x00,
++	0x0a,0x00,0xcf,0x86,0xd5,0x28,0xd4,0x18,0xd3,0x08,0x12,0x04,0x0a,0x00,0x0b,0x00,
++	0x52,0x04,0x0b,0x00,0x91,0x08,0x10,0x04,0x0d,0x00,0x11,0x00,0x11,0x00,0x93,0x0c,
++	0x52,0x04,0x11,0x00,0x11,0x04,0x11,0x00,0x13,0x00,0x13,0x00,0x94,0x14,0x53,0x04,
++	0x13,0x00,0x92,0x0c,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x14,0x00,0x14,0x00,
++	0x00,0x00,0xe0,0xdb,0x04,0xcf,0x86,0xe5,0xdf,0x01,0xd4,0x06,0xcf,0x06,0x04,0x00,
++	0xd3,0x74,0xd2,0x6e,0xd1,0x06,0xcf,0x06,0x04,0x00,0xd0,0x3e,0xcf,0x86,0xd5,0x18,
++	0x94,0x14,0x53,0x04,0x04,0x00,0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,
++	0x00,0x00,0x00,0x00,0x04,0x00,0xd4,0x10,0x93,0x0c,0x92,0x08,0x11,0x04,0x04,0x00,
++	0x06,0x00,0x04,0x00,0x04,0x00,0x93,0x10,0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,
++	0x06,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0xcf,0x86,0x95,0x24,0x94,0x20,0x93,0x1c,
++	0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x06,0x00,0x04,0x00,0xd1,0x08,0x10,0x04,
++	0x04,0x00,0x06,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x0b,0x00,0x0b,0x00,
++	0xcf,0x06,0x0a,0x00,0xd2,0x84,0xd1,0x4c,0xd0,0x16,0xcf,0x86,0x55,0x04,0x0a,0x00,
++	0x94,0x0c,0x53,0x04,0x0a,0x00,0x12,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,
++	0x55,0x04,0x0a,0x00,0xd4,0x1c,0xd3,0x0c,0x92,0x08,0x11,0x04,0x0c,0x00,0x0a,0x00,
++	0x0a,0x00,0x52,0x04,0x0a,0x00,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x00,0x0a,0xe6,
++	0xd3,0x08,0x12,0x04,0x0a,0x00,0x0d,0xe6,0x52,0x04,0x0d,0xe6,0x11,0x04,0x0a,0xe6,
++	0x0a,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x0a,0x00,0x53,0x04,0x0a,0x00,
++	0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x11,0xe6,0x0d,0xe6,0x0b,0x00,
++	0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,0x0b,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,
++	0x0b,0xe6,0x0b,0x00,0x0b,0x00,0x00,0x00,0xd1,0x40,0xd0,0x3a,0xcf,0x86,0xd5,0x24,
++	0x54,0x04,0x08,0x00,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,
++	0x08,0x00,0x09,0x00,0x92,0x0c,0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x0a,0x00,
++	0x0a,0x00,0x94,0x10,0x93,0x0c,0x92,0x08,0x11,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,
++	0x0a,0x00,0x0a,0x00,0xcf,0x06,0x0a,0x00,0xd0,0x5e,0xcf,0x86,0xd5,0x28,0xd4,0x18,
++	0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,0xd1,0x08,0x10,0x04,0x0a,0x00,0x0c,0x00,
++	0x10,0x04,0x0c,0x00,0x11,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x0c,0x00,0x0d,0x00,
++	0x10,0x00,0x10,0x00,0xd4,0x1c,0x53,0x04,0x0c,0x00,0xd2,0x0c,0x51,0x04,0x0c,0x00,
++	0x10,0x04,0x0d,0x00,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x12,0x00,0x14,0x00,
++	0xd3,0x0c,0x92,0x08,0x11,0x04,0x10,0x00,0x11,0x00,0x11,0x00,0x92,0x08,0x11,0x04,
++	0x14,0x00,0x15,0x00,0x15,0x00,0xcf,0x86,0xd5,0x1c,0x94,0x18,0x93,0x14,0xd2,0x08,
++	0x11,0x04,0x00,0x00,0x15,0x00,0x51,0x04,0x15,0x00,0x10,0x04,0x15,0x00,0x00,0x00,
++	0x00,0x00,0x00,0x00,0x54,0x04,0x00,0x00,0xd3,0x10,0x52,0x04,0x00,0x00,0x51,0x04,
++	0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x92,0x0c,0x51,0x04,0x0d,0x00,0x10,0x04,
++	0x0c,0x00,0x0a,0x00,0x0a,0x00,0xe4,0xf2,0x02,0xe3,0x65,0x01,0xd2,0x98,0xd1,0x48,
++	0xd0,0x36,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x52,0x04,0x08,0x00,0x51,0x04,
++	0x08,0x00,0x10,0x04,0x08,0x09,0x08,0x00,0x08,0x00,0x08,0x00,0xd4,0x0c,0x53,0x04,
++	0x08,0x00,0x12,0x04,0x08,0x00,0x00,0x00,0x53,0x04,0x0b,0x00,0x92,0x08,0x11,0x04,
++	0x0b,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0x55,0x04,0x09,0x00,0x54,0x04,0x09,0x00,
++	0x13,0x04,0x09,0x00,0x00,0x00,0xd0,0x06,0xcf,0x06,0x0a,0x00,0xcf,0x86,0xd5,0x2c,
++	0xd4,0x1c,0xd3,0x10,0x52,0x04,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x09,0x12,0x00,
++	0x00,0x00,0x52,0x04,0x00,0x00,0x11,0x04,0x00,0x00,0x0a,0x00,0x53,0x04,0x0a,0x00,
++	0x92,0x08,0x11,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,0x54,0x04,0x0b,0xe6,0xd3,0x0c,
++	0x92,0x08,0x11,0x04,0x0b,0xe6,0x0b,0x00,0x0b,0x00,0x52,0x04,0x0b,0x00,0x11,0x04,
++	0x11,0x00,0x14,0x00,0xd1,0x60,0xd0,0x22,0xcf,0x86,0x55,0x04,0x0a,0x00,0x94,0x18,
++	0x53,0x04,0x0a,0x00,0xd2,0x0c,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x00,0x0a,0xdc,
++	0x11,0x04,0x0a,0xdc,0x0a,0x00,0x0a,0x00,0xcf,0x86,0xd5,0x24,0x54,0x04,0x0a,0x00,
++	0xd3,0x10,0x92,0x0c,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x00,0x0a,0x09,0x00,0x00,
++	0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0a,0x00,0x54,0x04,
++	0x0b,0x00,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,0x00,0x91,0x08,0x10,0x04,0x0b,0x00,
++	0x00,0x00,0x00,0x00,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,0x0b,0x00,
++	0x93,0x10,0x92,0x0c,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x0b,0x07,0x0b,0x00,
++	0x0b,0x00,0xcf,0x86,0xd5,0x34,0xd4,0x20,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,
++	0x0b,0x09,0x0b,0x00,0x0b,0x00,0x0b,0x00,0x52,0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,
++	0x10,0x04,0x00,0x00,0x0b,0x00,0x53,0x04,0x0b,0x00,0xd2,0x08,0x11,0x04,0x0b,0x00,
++	0x00,0x00,0x11,0x04,0x00,0x00,0x0b,0x00,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,
++	0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0xd2,0xd0,
++	0xd1,0x50,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x0a,0x00,0x54,0x04,0x0a,0x00,0x93,0x10,
++	0x52,0x04,0x0a,0x00,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,
++	0xcf,0x86,0xd5,0x20,0xd4,0x10,0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,0x11,0x04,
++	0x0a,0x00,0x00,0x00,0x53,0x04,0x0a,0x00,0x92,0x08,0x11,0x04,0x0a,0x00,0x00,0x00,
++	0x0a,0x00,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,0x12,0x04,0x0b,0x00,0x10,0x00,
++	0xd0,0x3a,0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,0x0b,0x00,0xd3,0x1c,0xd2,0x0c,
++	0x91,0x08,0x10,0x04,0x0b,0xe6,0x0b,0x00,0x0b,0xe6,0xd1,0x08,0x10,0x04,0x0b,0xdc,
++	0x0b,0x00,0x10,0x04,0x0b,0x00,0x0b,0xe6,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0b,0xe6,
++	0x0b,0x00,0x0b,0x00,0x11,0x04,0x0b,0x00,0x0b,0xe6,0xcf,0x86,0xd5,0x2c,0xd4,0x18,
++	0x93,0x14,0x92,0x10,0xd1,0x08,0x10,0x04,0x0b,0x00,0x0b,0xe6,0x10,0x04,0x0b,0x00,
++	0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x00,0x00,0x92,0x0c,0x51,0x04,0x00,0x00,
++	0x10,0x04,0x00,0x00,0x0b,0x00,0x0b,0x00,0x54,0x04,0x0d,0x00,0x93,0x10,0x52,0x04,
++	0x0d,0x00,0x51,0x04,0x0d,0x00,0x10,0x04,0x0d,0x09,0x00,0x00,0x00,0x00,0xd1,0x8c,
++	0xd0,0x72,0xcf,0x86,0xd5,0x4c,0xd4,0x30,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,
++	0x00,0x00,0x0c,0x00,0x0c,0x00,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,
++	0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x0c,0x00,0x0c,0x00,0x51,0x04,0x0c,0x00,
++	0x10,0x04,0x0c,0x00,0x00,0x00,0x93,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,
++	0x0c,0x00,0x0c,0x00,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,
++	0x94,0x20,0xd3,0x10,0x52,0x04,0x0c,0x00,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x00,
++	0x00,0x00,0x52,0x04,0x0c,0x00,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,
++	0x10,0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0x94,0x10,0x93,0x0c,0x52,0x04,0x11,0x00,
++	0x11,0x04,0x10,0x00,0x15,0x00,0x00,0x00,0x11,0x00,0xd0,0x06,0xcf,0x06,0x11,0x00,
++	0xcf,0x86,0x55,0x04,0x0b,0x00,0xd4,0x14,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,0x00,
++	0x91,0x08,0x10,0x04,0x0b,0x00,0x0b,0x09,0x00,0x00,0x53,0x04,0x0b,0x00,0x92,0x08,
++	0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x02,0xff,0xff,0xcf,0x86,0xcf,
++	0x06,0x02,0xff,0xff,0xd1,0x76,0xd0,0x09,0xcf,0x86,0xcf,0x06,0x02,0xff,0xff,0xcf,
++	0x86,0x85,0xd4,0x07,0xcf,0x06,0x02,0xff,0xff,0xd3,0x07,0xcf,0x06,0x02,0xff,0xff,
++	0xd2,0x07,0xcf,0x06,0x02,0xff,0xff,0xd1,0x07,0xcf,0x06,0x02,0xff,0xff,0xd0,0x18,
++	0xcf,0x86,0x55,0x05,0x02,0xff,0xff,0x94,0x0d,0x93,0x09,0x12,0x05,0x02,0xff,0xff,
++	0x00,0x00,0x00,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x24,0x94,0x20,0xd3,0x10,0x52,0x04,
++	0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0x92,0x0c,0x51,0x04,
++	0x00,0x00,0x10,0x04,0x00,0x00,0x0b,0x00,0x0b,0x00,0x0b,0x00,0x54,0x04,0x0b,0x00,
++	0x53,0x04,0x0b,0x00,0x12,0x04,0x0b,0x00,0x00,0x00,0xd0,0x08,0xcf,0x86,0xcf,0x06,
++	0x01,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x01,0x00,0xe4,0x9c,0x10,0xe3,0x16,0x08,
++	0xd2,0x06,0xcf,0x06,0x01,0x00,0xe1,0x08,0x04,0xe0,0x04,0x02,0xcf,0x86,0xe5,0x01,
++	0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0xb1,0x88,
++	0x00,0x01,0xff,0xe6,0x9b,0xb4,0x00,0x10,0x08,0x01,0xff,0xe8,0xbb,0x8a,0x00,0x01,
++	0xff,0xe8,0xb3,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xbb,0x91,0x00,0x01,
++	0xff,0xe4,0xb8,0xb2,0x00,0x10,0x08,0x01,0xff,0xe5,0x8f,0xa5,0x00,0x01,0xff,0xe9,
++	0xbe,0x9c,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0xbe,0x9c,0x00,0x01,
++	0xff,0xe5,0xa5,0x91,0x00,0x10,0x08,0x01,0xff,0xe9,0x87,0x91,0x00,0x01,0xff,0xe5,
++	0x96,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0xa5,0x88,0x00,0x01,0xff,0xe6,
++	0x87,0xb6,0x00,0x10,0x08,0x01,0xff,0xe7,0x99,0xa9,0x00,0x01,0xff,0xe7,0xbe,0x85,
++	0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x98,0xbf,0x00,0x01,
++	0xff,0xe8,0x9e,0xba,0x00,0x10,0x08,0x01,0xff,0xe8,0xa3,0xb8,0x00,0x01,0xff,0xe9,
++	0x82,0x8f,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xa8,0x82,0x00,0x01,0xff,0xe6,
++	0xb4,0x9b,0x00,0x10,0x08,0x01,0xff,0xe7,0x83,0x99,0x00,0x01,0xff,0xe7,0x8f,0x9e,
++	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x90,0xbd,0x00,0x01,0xff,0xe9,
++	0x85,0xaa,0x00,0x10,0x08,0x01,0xff,0xe9,0xa7,0xb1,0x00,0x01,0xff,0xe4,0xba,0x82,
++	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0x8d,0xb5,0x00,0x01,0xff,0xe6,0xac,0x84,
++	0x00,0x10,0x08,0x01,0xff,0xe7,0x88,0x9b,0x00,0x01,0xff,0xe8,0x98,0xad,0x00,0xd4,
++	0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0xb8,0x9e,0x00,0x01,
++	0xff,0xe5,0xb5,0x90,0x00,0x10,0x08,0x01,0xff,0xe6,0xbf,0xab,0x00,0x01,0xff,0xe8,
++	0x97,0x8d,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0xa5,0xa4,0x00,0x01,0xff,0xe6,
++	0x8b,0x89,0x00,0x10,0x08,0x01,0xff,0xe8,0x87,0x98,0x00,0x01,0xff,0xe8,0xa0,0x9f,
++	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0xbb,0x8a,0x00,0x01,0xff,0xe6,
++	0x9c,0x97,0x00,0x10,0x08,0x01,0xff,0xe6,0xb5,0xaa,0x00,0x01,0xff,0xe7,0x8b,0xbc,
++	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0x83,0x8e,0x00,0x01,0xff,0xe4,0xbe,0x86,
++	0x00,0x10,0x08,0x01,0xff,0xe5,0x86,0xb7,0x00,0x01,0xff,0xe5,0x8b,0x9e,0x00,0xd3,
++	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0x93,0x84,0x00,0x01,0xff,0xe6,
++	0xab,0x93,0x00,0x10,0x08,0x01,0xff,0xe7,0x88,0x90,0x00,0x01,0xff,0xe7,0x9b,0xa7,
++	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x80,0x81,0x00,0x01,0xff,0xe8,0x98,0x86,
++	0x00,0x10,0x08,0x01,0xff,0xe8,0x99,0x9c,0x00,0x01,0xff,0xe8,0xb7,0xaf,0x00,0xd2,
++	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0x9c,0xb2,0x00,0x01,0xff,0xe9,0xad,0xaf,
++	0x00,0x10,0x08,0x01,0xff,0xe9,0xb7,0xba,0x00,0x01,0xff,0xe7,0xa2,0x8c,0x00,0xd1,
++	0x10,0x10,0x08,0x01,0xff,0xe7,0xa5,0xbf,0x00,0x01,0xff,0xe7,0xb6,0xa0,0x00,0x10,
++	0x08,0x01,0xff,0xe8,0x8f,0x89,0x00,0x01,0xff,0xe9,0x8c,0x84,0x00,0xcf,0x86,0xe5,
++	0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0xb9,
++	0xbf,0x00,0x01,0xff,0xe8,0xab,0x96,0x00,0x10,0x08,0x01,0xff,0xe5,0xa3,0x9f,0x00,
++	0x01,0xff,0xe5,0xbc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,0xb1,0xa0,0x00,
++	0x01,0xff,0xe8,0x81,0xbe,0x00,0x10,0x08,0x01,0xff,0xe7,0x89,0xa2,0x00,0x01,0xff,
++	0xe7,0xa3,0x8a,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0xb3,0x82,0x00,
++	0x01,0xff,0xe9,0x9b,0xb7,0x00,0x10,0x08,0x01,0xff,0xe5,0xa3,0x98,0x00,0x01,0xff,
++	0xe5,0xb1,0xa2,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xa8,0x93,0x00,0x01,0xff,
++	0xe6,0xb7,0x9a,0x00,0x10,0x08,0x01,0xff,0xe6,0xbc,0x8f,0x00,0x01,0xff,0xe7,0xb4,
++	0xaf,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,0xb8,0xb7,0x00,
++	0x01,0xff,0xe9,0x99,0x8b,0x00,0x10,0x08,0x01,0xff,0xe5,0x8b,0x92,0x00,0x01,0xff,
++	0xe8,0x82,0x8b,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0x87,0x9c,0x00,0x01,0xff,
++	0xe5,0x87,0x8c,0x00,0x10,0x08,0x01,0xff,0xe7,0xa8,0x9c,0x00,0x01,0xff,0xe7,0xb6,
++	0xbe,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x8f,0xb1,0x00,0x01,0xff,
++	0xe9,0x99,0xb5,0x00,0x10,0x08,0x01,0xff,0xe8,0xae,0x80,0x00,0x01,0xff,0xe6,0x8b,
++	0x8f,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xa8,0x82,0x00,0x01,0xff,0xe8,0xab,
++	0xbe,0x00,0x10,0x08,0x01,0xff,0xe4,0xb8,0xb9,0x00,0x01,0xff,0xe5,0xaf,0xa7,0x00,
++	0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0x80,0x92,0x00,
++	0x01,0xff,0xe7,0x8e,0x87,0x00,0x10,0x08,0x01,0xff,0xe7,0x95,0xb0,0x00,0x01,0xff,
++	0xe5,0x8c,0x97,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,0xa3,0xbb,0x00,0x01,0xff,
++	0xe4,0xbe,0xbf,0x00,0x10,0x08,0x01,0xff,0xe5,0xbe,0xa9,0x00,0x01,0xff,0xe4,0xb8,
++	0x8d,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xb3,0x8c,0x00,0x01,0xff,
++	0xe6,0x95,0xb8,0x00,0x10,0x08,0x01,0xff,0xe7,0xb4,0xa2,0x00,0x01,0xff,0xe5,0x8f,
++	0x83,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0xa1,0x9e,0x00,0x01,0xff,0xe7,0x9c,
++	0x81,0x00,0x10,0x08,0x01,0xff,0xe8,0x91,0x89,0x00,0x01,0xff,0xe8,0xaa,0xaa,0x00,
++	0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xae,0xba,0x00,0x01,0xff,
++	0xe8,0xbe,0xb0,0x00,0x10,0x08,0x01,0xff,0xe6,0xb2,0x88,0x00,0x01,0xff,0xe6,0x8b,
++	0xbe,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x8b,0xa5,0x00,0x01,0xff,0xe6,0x8e,
++	0xa0,0x00,0x10,0x08,0x01,0xff,0xe7,0x95,0xa5,0x00,0x01,0xff,0xe4,0xba,0xae,0x00,
++	0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0x85,0xa9,0x00,0x01,0xff,0xe5,0x87,
++	0x89,0x00,0x10,0x08,0x01,0xff,0xe6,0xa2,0x81,0x00,0x01,0xff,0xe7,0xb3,0xa7,0x00,
++	0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x89,0xaf,0x00,0x01,0xff,0xe8,0xab,0x92,0x00,
++	0x10,0x08,0x01,0xff,0xe9,0x87,0x8f,0x00,0x01,0xff,0xe5,0x8b,0xb5,0x00,0xe0,0x04,
++	0x02,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
++	0x01,0xff,0xe5,0x91,0x82,0x00,0x01,0xff,0xe5,0xa5,0xb3,0x00,0x10,0x08,0x01,0xff,
++	0xe5,0xbb,0xac,0x00,0x01,0xff,0xe6,0x97,0x85,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0xe6,0xbf,0xbe,0x00,0x01,0xff,0xe7,0xa4,0xaa,0x00,0x10,0x08,0x01,0xff,0xe9,0x96,
++	0xad,0x00,0x01,0xff,0xe9,0xa9,0xaa,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0xe9,0xba,0x97,0x00,0x01,0xff,0xe9,0xbb,0x8e,0x00,0x10,0x08,0x01,0xff,0xe5,0x8a,
++	0x9b,0x00,0x01,0xff,0xe6,0x9b,0x86,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xad,
++	0xb7,0x00,0x01,0xff,0xe8,0xbd,0xa2,0x00,0x10,0x08,0x01,0xff,0xe5,0xb9,0xb4,0x00,
++	0x01,0xff,0xe6,0x86,0x90,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0xe6,0x88,0x80,0x00,0x01,0xff,0xe6,0x92,0x9a,0x00,0x10,0x08,0x01,0xff,0xe6,0xbc,
++	0xa3,0x00,0x01,0xff,0xe7,0x85,0x89,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,0x92,
++	0x89,0x00,0x01,0xff,0xe7,0xa7,0x8a,0x00,0x10,0x08,0x01,0xff,0xe7,0xb7,0xb4,0x00,
++	0x01,0xff,0xe8,0x81,0xaf,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0xbc,
++	0xa6,0x00,0x01,0xff,0xe8,0x93,0xae,0x00,0x10,0x08,0x01,0xff,0xe9,0x80,0xa3,0x00,
++	0x01,0xff,0xe9,0x8d,0x8a,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0x88,0x97,0x00,
++	0x01,0xff,0xe5,0x8a,0xa3,0x00,0x10,0x08,0x01,0xff,0xe5,0x92,0xbd,0x00,0x01,0xff,
++	0xe7,0x83,0x88,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0xe8,0xa3,0x82,0x00,0x01,0xff,0xe8,0xaa,0xaa,0x00,0x10,0x08,0x01,0xff,0xe5,0xbb,
++	0x89,0x00,0x01,0xff,0xe5,0xbf,0xb5,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0x8d,
++	0xbb,0x00,0x01,0xff,0xe6,0xae,0xae,0x00,0x10,0x08,0x01,0xff,0xe7,0xb0,0xbe,0x00,
++	0x01,0xff,0xe7,0x8d,0xb5,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe4,0xbb,
++	0xa4,0x00,0x01,0xff,0xe5,0x9b,0xb9,0x00,0x10,0x08,0x01,0xff,0xe5,0xaf,0xa7,0x00,
++	0x01,0xff,0xe5,0xb6,0xba,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0x80,0x9c,0x00,
++	0x01,0xff,0xe7,0x8e,0xb2,0x00,0x10,0x08,0x01,0xff,0xe7,0x91,0xa9,0x00,0x01,0xff,
++	0xe7,0xbe,0x9a,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x81,
++	0x86,0x00,0x01,0xff,0xe9,0x88,0xb4,0x00,0x10,0x08,0x01,0xff,0xe9,0x9b,0xb6,0x00,
++	0x01,0xff,0xe9,0x9d,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0xa0,0x98,0x00,
++	0x01,0xff,0xe4,0xbe,0x8b,0x00,0x10,0x08,0x01,0xff,0xe7,0xa6,0xae,0x00,0x01,0xff,
++	0xe9,0x86,0xb4,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0x9a,0xb8,0x00,
++	0x01,0xff,0xe6,0x83,0xa1,0x00,0x10,0x08,0x01,0xff,0xe4,0xba,0x86,0x00,0x01,0xff,
++	0xe5,0x83,0x9a,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0xaf,0xae,0x00,0x01,0xff,
++	0xe5,0xb0,0xbf,0x00,0x10,0x08,0x01,0xff,0xe6,0x96,0x99,0x00,0x01,0xff,0xe6,0xa8,
++	0x82,0x00,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,
++	0x08,0x01,0xff,0xe7,0x87,0x8e,0x00,0x01,0xff,0xe7,0x99,0x82,0x00,0x10,0x08,0x01,
++	0xff,0xe8,0x93,0xbc,0x00,0x01,0xff,0xe9,0x81,0xbc,0x00,0xd1,0x10,0x10,0x08,0x01,
++	0xff,0xe9,0xbe,0x8d,0x00,0x01,0xff,0xe6,0x9a,0x88,0x00,0x10,0x08,0x01,0xff,0xe9,
++	0x98,0xae,0x00,0x01,0xff,0xe5,0x8a,0x89,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
++	0xff,0xe6,0x9d,0xbb,0x00,0x01,0xff,0xe6,0x9f,0xb3,0x00,0x10,0x08,0x01,0xff,0xe6,
++	0xb5,0x81,0x00,0x01,0xff,0xe6,0xba,0x9c,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,
++	0x90,0x89,0x00,0x01,0xff,0xe7,0x95,0x99,0x00,0x10,0x08,0x01,0xff,0xe7,0xa1,0xab,
++	0x00,0x01,0xff,0xe7,0xb4,0x90,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
++	0xff,0xe9,0xa1,0x9e,0x00,0x01,0xff,0xe5,0x85,0xad,0x00,0x10,0x08,0x01,0xff,0xe6,
++	0x88,0xae,0x00,0x01,0xff,0xe9,0x99,0xb8,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,
++	0x80,0xab,0x00,0x01,0xff,0xe5,0xb4,0x99,0x00,0x10,0x08,0x01,0xff,0xe6,0xb7,0xaa,
++	0x00,0x01,0xff,0xe8,0xbc,0xaa,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,
++	0xbe,0x8b,0x00,0x01,0xff,0xe6,0x85,0x84,0x00,0x10,0x08,0x01,0xff,0xe6,0xa0,0x97,
++	0x00,0x01,0xff,0xe7,0x8e,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0x9a,0x86,
++	0x00,0x01,0xff,0xe5,0x88,0xa9,0x00,0x10,0x08,0x01,0xff,0xe5,0x90,0x8f,0x00,0x01,
++	0xff,0xe5,0xb1,0xa5,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
++	0xff,0xe6,0x98,0x93,0x00,0x01,0xff,0xe6,0x9d,0x8e,0x00,0x10,0x08,0x01,0xff,0xe6,
++	0xa2,0xa8,0x00,0x01,0xff,0xe6,0xb3,0xa5,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,
++	0x90,0x86,0x00,0x01,0xff,0xe7,0x97,0xa2,0x00,0x10,0x08,0x01,0xff,0xe7,0xbd,0xb9,
++	0x00,0x01,0xff,0xe8,0xa3,0x8f,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,
++	0xa3,0xa1,0x00,0x01,0xff,0xe9,0x87,0x8c,0x00,0x10,0x08,0x01,0xff,0xe9,0x9b,0xa2,
++	0x00,0x01,0xff,0xe5,0x8c,0xbf,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xba,0xba,
++	0x00,0x01,0xff,0xe5,0x90,0x9d,0x00,0x10,0x08,0x01,0xff,0xe7,0x87,0x90,0x00,0x01,
++	0xff,0xe7,0x92,0x98,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,
++	0x97,0xba,0x00,0x01,0xff,0xe9,0x9a,0xa3,0x00,0x10,0x08,0x01,0xff,0xe9,0xb1,0x97,
++	0x00,0x01,0xff,0xe9,0xba,0x9f,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0x9e,0x97,
++	0x00,0x01,0xff,0xe6,0xb7,0x8b,0x00,0x10,0x08,0x01,0xff,0xe8,0x87,0xa8,0x00,0x01,
++	0xff,0xe7,0xab,0x8b,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,0xac,0xa0,
++	0x00,0x01,0xff,0xe7,0xb2,0x92,0x00,0x10,0x08,0x01,0xff,0xe7,0x8b,0x80,0x00,0x01,
++	0xff,0xe7,0x82,0x99,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0xad,0x98,0x00,0x01,
++	0xff,0xe4,0xbb,0x80,0x00,0x10,0x08,0x01,0xff,0xe8,0x8c,0xb6,0x00,0x01,0xff,0xe5,
++	0x88,0xba,0x00,0xe2,0xad,0x06,0xe1,0xc4,0x03,0xe0,0xcb,0x01,0xcf,0x86,0xd5,0xe4,
++	0xd4,0x74,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0x88,0x87,0x00,
++	0x01,0xff,0xe5,0xba,0xa6,0x00,0x10,0x08,0x01,0xff,0xe6,0x8b,0x93,0x00,0x01,0xff,
++	0xe7,0xb3,0x96,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0xae,0x85,0x00,0x01,0xff,
++	0xe6,0xb4,0x9e,0x00,0x10,0x08,0x01,0xff,0xe6,0x9a,0xb4,0x00,0x01,0xff,0xe8,0xbc,
++	0xbb,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0xa1,0x8c,0x00,0x01,0xff,
++	0xe9,0x99,0x8d,0x00,0x10,0x08,0x01,0xff,0xe8,0xa6,0x8b,0x00,0x01,0xff,0xe5,0xbb,
++	0x93,0x00,0x91,0x10,0x10,0x08,0x01,0xff,0xe5,0x85,0x80,0x00,0x01,0xff,0xe5,0x97,
++	0x80,0x00,0x01,0x00,0xd3,0x34,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x01,0xff,0xe5,0xa1,
++	0x9a,0x00,0x01,0x00,0x10,0x08,0x01,0xff,0xe6,0x99,0xb4,0x00,0x01,0x00,0xd1,0x0c,
++	0x10,0x04,0x01,0x00,0x01,0xff,0xe5,0x87,0x9e,0x00,0x10,0x08,0x01,0xff,0xe7,0x8c,
++	0xaa,0x00,0x01,0xff,0xe7,0x9b,0x8a,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
++	0xe7,0xa4,0xbc,0x00,0x01,0xff,0xe7,0xa5,0x9e,0x00,0x10,0x08,0x01,0xff,0xe7,0xa5,
++	0xa5,0x00,0x01,0xff,0xe7,0xa6,0x8f,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0x9d,
++	0x96,0x00,0x01,0xff,0xe7,0xb2,0xbe,0x00,0x10,0x08,0x01,0xff,0xe7,0xbe,0xbd,0x00,
++	0x01,0x00,0xd4,0x64,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x01,0xff,0xe8,0x98,
++	0x92,0x00,0x01,0x00,0x10,0x08,0x01,0xff,0xe8,0xab,0xb8,0x00,0x01,0x00,0xd1,0x0c,
++	0x10,0x04,0x01,0x00,0x01,0xff,0xe9,0x80,0xb8,0x00,0x10,0x08,0x01,0xff,0xe9,0x83,
++	0xbd,0x00,0x01,0x00,0xd2,0x14,0x51,0x04,0x01,0x00,0x10,0x08,0x01,0xff,0xe9,0xa3,
++	0xaf,0x00,0x01,0xff,0xe9,0xa3,0xbc,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0xa4,
++	0xa8,0x00,0x01,0xff,0xe9,0xb6,0xb4,0x00,0x10,0x08,0x0d,0xff,0xe9,0x83,0x9e,0x00,
++	0x0d,0xff,0xe9,0x9a,0xb7,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x06,0xff,
++	0xe4,0xbe,0xae,0x00,0x06,0xff,0xe5,0x83,0xa7,0x00,0x10,0x08,0x06,0xff,0xe5,0x85,
++	0x8d,0x00,0x06,0xff,0xe5,0x8b,0x89,0x00,0xd1,0x10,0x10,0x08,0x06,0xff,0xe5,0x8b,
++	0xa4,0x00,0x06,0xff,0xe5,0x8d,0x91,0x00,0x10,0x08,0x06,0xff,0xe5,0x96,0x9d,0x00,
++	0x06,0xff,0xe5,0x98,0x86,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x06,0xff,0xe5,0x99,
++	0xa8,0x00,0x06,0xff,0xe5,0xa1,0x80,0x00,0x10,0x08,0x06,0xff,0xe5,0xa2,0xa8,0x00,
++	0x06,0xff,0xe5,0xb1,0xa4,0x00,0xd1,0x10,0x10,0x08,0x06,0xff,0xe5,0xb1,0xae,0x00,
++	0x06,0xff,0xe6,0x82,0x94,0x00,0x10,0x08,0x06,0xff,0xe6,0x85,0xa8,0x00,0x06,0xff,
++	0xe6,0x86,0x8e,0x00,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,
++	0x10,0x10,0x08,0x06,0xff,0xe6,0x87,0xb2,0x00,0x06,0xff,0xe6,0x95,0x8f,0x00,0x10,
++	0x08,0x06,0xff,0xe6,0x97,0xa2,0x00,0x06,0xff,0xe6,0x9a,0x91,0x00,0xd1,0x10,0x10,
++	0x08,0x06,0xff,0xe6,0xa2,0x85,0x00,0x06,0xff,0xe6,0xb5,0xb7,0x00,0x10,0x08,0x06,
++	0xff,0xe6,0xb8,0x9a,0x00,0x06,0xff,0xe6,0xbc,0xa2,0x00,0xd2,0x20,0xd1,0x10,0x10,
++	0x08,0x06,0xff,0xe7,0x85,0xae,0x00,0x06,0xff,0xe7,0x88,0xab,0x00,0x10,0x08,0x06,
++	0xff,0xe7,0x90,0xa2,0x00,0x06,0xff,0xe7,0xa2,0x91,0x00,0xd1,0x10,0x10,0x08,0x06,
++	0xff,0xe7,0xa4,0xbe,0x00,0x06,0xff,0xe7,0xa5,0x89,0x00,0x10,0x08,0x06,0xff,0xe7,
++	0xa5,0x88,0x00,0x06,0xff,0xe7,0xa5,0x90,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,
++	0x08,0x06,0xff,0xe7,0xa5,0x96,0x00,0x06,0xff,0xe7,0xa5,0x9d,0x00,0x10,0x08,0x06,
++	0xff,0xe7,0xa6,0x8d,0x00,0x06,0xff,0xe7,0xa6,0x8e,0x00,0xd1,0x10,0x10,0x08,0x06,
++	0xff,0xe7,0xa9,0x80,0x00,0x06,0xff,0xe7,0xaa,0x81,0x00,0x10,0x08,0x06,0xff,0xe7,
++	0xaf,0x80,0x00,0x06,0xff,0xe7,0xb7,0xb4,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x06,
++	0xff,0xe7,0xb8,0x89,0x00,0x06,0xff,0xe7,0xb9,0x81,0x00,0x10,0x08,0x06,0xff,0xe7,
++	0xbd,0xb2,0x00,0x06,0xff,0xe8,0x80,0x85,0x00,0xd1,0x10,0x10,0x08,0x06,0xff,0xe8,
++	0x87,0xad,0x00,0x06,0xff,0xe8,0x89,0xb9,0x00,0x10,0x08,0x06,0xff,0xe8,0x89,0xb9,
++	0x00,0x06,0xff,0xe8,0x91,0x97,0x00,0xd4,0x75,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,
++	0x08,0x06,0xff,0xe8,0xa4,0x90,0x00,0x06,0xff,0xe8,0xa6,0x96,0x00,0x10,0x08,0x06,
++	0xff,0xe8,0xac,0x81,0x00,0x06,0xff,0xe8,0xac,0xb9,0x00,0xd1,0x10,0x10,0x08,0x06,
++	0xff,0xe8,0xb3,0x93,0x00,0x06,0xff,0xe8,0xb4,0x88,0x00,0x10,0x08,0x06,0xff,0xe8,
++	0xbe,0xb6,0x00,0x06,0xff,0xe9,0x80,0xb8,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x06,
++	0xff,0xe9,0x9b,0xa3,0x00,0x06,0xff,0xe9,0x9f,0xbf,0x00,0x10,0x08,0x06,0xff,0xe9,
++	0xa0,0xbb,0x00,0x0b,0xff,0xe6,0x81,0xb5,0x00,0x91,0x11,0x10,0x09,0x0b,0xff,0xf0,
++	0xa4,0x8b,0xae,0x00,0x0b,0xff,0xe8,0x88,0x98,0x00,0x00,0x00,0xd3,0x40,0xd2,0x20,
++	0xd1,0x10,0x10,0x08,0x08,0xff,0xe4,0xb8,0xa6,0x00,0x08,0xff,0xe5,0x86,0xb5,0x00,
++	0x10,0x08,0x08,0xff,0xe5,0x85,0xa8,0x00,0x08,0xff,0xe4,0xbe,0x80,0x00,0xd1,0x10,
++	0x10,0x08,0x08,0xff,0xe5,0x85,0x85,0x00,0x08,0xff,0xe5,0x86,0x80,0x00,0x10,0x08,
++	0x08,0xff,0xe5,0x8b,0x87,0x00,0x08,0xff,0xe5,0x8b,0xba,0x00,0xd2,0x20,0xd1,0x10,
++	0x10,0x08,0x08,0xff,0xe5,0x96,0x9d,0x00,0x08,0xff,0xe5,0x95,0x95,0x00,0x10,0x08,
++	0x08,0xff,0xe5,0x96,0x99,0x00,0x08,0xff,0xe5,0x97,0xa2,0x00,0xd1,0x10,0x10,0x08,
++	0x08,0xff,0xe5,0xa1,0x9a,0x00,0x08,0xff,0xe5,0xa2,0xb3,0x00,0x10,0x08,0x08,0xff,
++	0xe5,0xa5,0x84,0x00,0x08,0xff,0xe5,0xa5,0x94,0x00,0xe0,0x04,0x02,0xcf,0x86,0xe5,
++	0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe5,0xa9,
++	0xa2,0x00,0x08,0xff,0xe5,0xac,0xa8,0x00,0x10,0x08,0x08,0xff,0xe5,0xbb,0x92,0x00,
++	0x08,0xff,0xe5,0xbb,0x99,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe5,0xbd,0xa9,0x00,
++	0x08,0xff,0xe5,0xbe,0xad,0x00,0x10,0x08,0x08,0xff,0xe6,0x83,0x98,0x00,0x08,0xff,
++	0xe6,0x85,0x8e,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe6,0x84,0x88,0x00,
++	0x08,0xff,0xe6,0x86,0x8e,0x00,0x10,0x08,0x08,0xff,0xe6,0x85,0xa0,0x00,0x08,0xff,
++	0xe6,0x87,0xb2,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe6,0x88,0xb4,0x00,0x08,0xff,
++	0xe6,0x8f,0x84,0x00,0x10,0x08,0x08,0xff,0xe6,0x90,0x9c,0x00,0x08,0xff,0xe6,0x91,
++	0x92,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe6,0x95,0x96,0x00,
++	0x08,0xff,0xe6,0x99,0xb4,0x00,0x10,0x08,0x08,0xff,0xe6,0x9c,0x97,0x00,0x08,0xff,
++	0xe6,0x9c,0x9b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe6,0x9d,0x96,0x00,0x08,0xff,
++	0xe6,0xad,0xb9,0x00,0x10,0x08,0x08,0xff,0xe6,0xae,0xba,0x00,0x08,0xff,0xe6,0xb5,
++	0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe6,0xbb,0x9b,0x00,0x08,0xff,
++	0xe6,0xbb,0x8b,0x00,0x10,0x08,0x08,0xff,0xe6,0xbc,0xa2,0x00,0x08,0xff,0xe7,0x80,
++	0x9e,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe7,0x85,0xae,0x00,0x08,0xff,0xe7,0x9e,
++	0xa7,0x00,0x10,0x08,0x08,0xff,0xe7,0x88,0xb5,0x00,0x08,0xff,0xe7,0x8a,0xaf,0x00,
++	0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe7,0x8c,0xaa,0x00,
++	0x08,0xff,0xe7,0x91,0xb1,0x00,0x10,0x08,0x08,0xff,0xe7,0x94,0x86,0x00,0x08,0xff,
++	0xe7,0x94,0xbb,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe7,0x98,0x9d,0x00,0x08,0xff,
++	0xe7,0x98,0x9f,0x00,0x10,0x08,0x08,0xff,0xe7,0x9b,0x8a,0x00,0x08,0xff,0xe7,0x9b,
++	0x9b,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe7,0x9b,0xb4,0x00,0x08,0xff,
++	0xe7,0x9d,0x8a,0x00,0x10,0x08,0x08,0xff,0xe7,0x9d,0x80,0x00,0x08,0xff,0xe7,0xa3,
++	0x8c,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe7,0xaa,0xb1,0x00,0x08,0xff,0xe7,0xaf,
++	0x80,0x00,0x10,0x08,0x08,0xff,0xe7,0xb1,0xbb,0x00,0x08,0xff,0xe7,0xb5,0x9b,0x00,
++	0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe7,0xb7,0xb4,0x00,0x08,0xff,
++	0xe7,0xbc,0xbe,0x00,0x10,0x08,0x08,0xff,0xe8,0x80,0x85,0x00,0x08,0xff,0xe8,0x8d,
++	0x92,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe8,0x8f,0xaf,0x00,0x08,0xff,0xe8,0x9d,
++	0xb9,0x00,0x10,0x08,0x08,0xff,0xe8,0xa5,0x81,0x00,0x08,0xff,0xe8,0xa6,0x86,0x00,
++	0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe8,0xa6,0x96,0x00,0x08,0xff,0xe8,0xaa,
++	0xbf,0x00,0x10,0x08,0x08,0xff,0xe8,0xab,0xb8,0x00,0x08,0xff,0xe8,0xab,0x8b,0x00,
++	0xd1,0x10,0x10,0x08,0x08,0xff,0xe8,0xac,0x81,0x00,0x08,0xff,0xe8,0xab,0xbe,0x00,
++	0x10,0x08,0x08,0xff,0xe8,0xab,0xad,0x00,0x08,0xff,0xe8,0xac,0xb9,0x00,0xcf,0x86,
++	0x95,0xde,0xd4,0x81,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe8,0xae,
++	0x8a,0x00,0x08,0xff,0xe8,0xb4,0x88,0x00,0x10,0x08,0x08,0xff,0xe8,0xbc,0xb8,0x00,
++	0x08,0xff,0xe9,0x81,0xb2,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe9,0x86,0x99,0x00,
++	0x08,0xff,0xe9,0x89,0xb6,0x00,0x10,0x08,0x08,0xff,0xe9,0x99,0xbc,0x00,0x08,0xff,
++	0xe9,0x9b,0xa3,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe9,0x9d,0x96,0x00,
++	0x08,0xff,0xe9,0x9f,0x9b,0x00,0x10,0x08,0x08,0xff,0xe9,0x9f,0xbf,0x00,0x08,0xff,
++	0xe9,0xa0,0x8b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe9,0xa0,0xbb,0x00,0x08,0xff,
++	0xe9,0xac,0x92,0x00,0x10,0x08,0x08,0xff,0xe9,0xbe,0x9c,0x00,0x08,0xff,0xf0,0xa2,
++	0xa1,0x8a,0x00,0xd3,0x45,0xd2,0x22,0xd1,0x12,0x10,0x09,0x08,0xff,0xf0,0xa2,0xa1,
++	0x84,0x00,0x08,0xff,0xf0,0xa3,0x8f,0x95,0x00,0x10,0x08,0x08,0xff,0xe3,0xae,0x9d,
++	0x00,0x08,0xff,0xe4,0x80,0x98,0x00,0xd1,0x11,0x10,0x08,0x08,0xff,0xe4,0x80,0xb9,
++	0x00,0x08,0xff,0xf0,0xa5,0x89,0x89,0x00,0x10,0x09,0x08,0xff,0xf0,0xa5,0xb3,0x90,
++	0x00,0x08,0xff,0xf0,0xa7,0xbb,0x93,0x00,0x92,0x14,0x91,0x10,0x10,0x08,0x08,0xff,
++	0xe9,0xbd,0x83,0x00,0x08,0xff,0xe9,0xbe,0x8e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++	0xe1,0x94,0x01,0xe0,0x08,0x01,0xcf,0x86,0xd5,0x42,0xd4,0x14,0x93,0x10,0x52,0x04,
++	0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0xd3,0x10,
++	0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x52,0x04,
++	0x00,0x00,0xd1,0x0d,0x10,0x04,0x00,0x00,0x04,0xff,0xd7,0x99,0xd6,0xb4,0x00,0x10,
++	0x04,0x01,0x1a,0x01,0xff,0xd7,0xb2,0xd6,0xb7,0x00,0xd4,0x42,0x53,0x04,0x01,0x00,
++	0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,0xd7,0xa9,0xd7,0x81,0x00,0x01,
++	0xff,0xd7,0xa9,0xd7,0x82,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xd7,0xa9,0xd6,0xbc,
++	0xd7,0x81,0x00,0x01,0xff,0xd7,0xa9,0xd6,0xbc,0xd7,0x82,0x00,0x10,0x09,0x01,0xff,
++	0xd7,0x90,0xd6,0xb7,0x00,0x01,0xff,0xd7,0x90,0xd6,0xb8,0x00,0xd3,0x43,0xd2,0x24,
++	0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0x90,0xd6,0xbc,0x00,0x01,0xff,0xd7,0x91,0xd6,
++	0xbc,0x00,0x10,0x09,0x01,0xff,0xd7,0x92,0xd6,0xbc,0x00,0x01,0xff,0xd7,0x93,0xd6,
++	0xbc,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0x94,0xd6,0xbc,0x00,0x01,0xff,0xd7,
++	0x95,0xd6,0xbc,0x00,0x10,0x09,0x01,0xff,0xd7,0x96,0xd6,0xbc,0x00,0x00,0x00,0xd2,
++	0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0x98,0xd6,0xbc,0x00,0x01,0xff,0xd7,0x99,
++	0xd6,0xbc,0x00,0x10,0x09,0x01,0xff,0xd7,0x9a,0xd6,0xbc,0x00,0x01,0xff,0xd7,0x9b,
++	0xd6,0xbc,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xd7,0x9c,0xd6,0xbc,0x00,0x00,0x00,
++	0x10,0x09,0x01,0xff,0xd7,0x9e,0xd6,0xbc,0x00,0x00,0x00,0xcf,0x86,0x95,0x85,0x94,
++	0x81,0xd3,0x3e,0xd2,0x1f,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0xa0,0xd6,0xbc,0x00,
++	0x01,0xff,0xd7,0xa1,0xd6,0xbc,0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xd7,0xa3,0xd6,
++	0xbc,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xd7,0xa4,0xd6,0xbc,0x00,0x00,0x00,0x10,
++	0x09,0x01,0xff,0xd7,0xa6,0xd6,0xbc,0x00,0x01,0xff,0xd7,0xa7,0xd6,0xbc,0x00,0xd2,
++	0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0xa8,0xd6,0xbc,0x00,0x01,0xff,0xd7,0xa9,
++	0xd6,0xbc,0x00,0x10,0x09,0x01,0xff,0xd7,0xaa,0xd6,0xbc,0x00,0x01,0xff,0xd7,0x95,
++	0xd6,0xb9,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0x91,0xd6,0xbf,0x00,0x01,0xff,
++	0xd7,0x9b,0xd6,0xbf,0x00,0x10,0x09,0x01,0xff,0xd7,0xa4,0xd6,0xbf,0x00,0x01,0x00,
++	0x01,0x00,0x01,0x00,0xd0,0x1a,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,
++	0x93,0x0c,0x92,0x08,0x11,0x04,0x01,0x00,0x0c,0x00,0x0c,0x00,0x0c,0x00,0xcf,0x86,
++	0x95,0x24,0xd4,0x10,0x93,0x0c,0x92,0x08,0x11,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,
++	0x00,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,
++	0x01,0x00,0x01,0x00,0x01,0x00,0xd3,0x5a,0xd2,0x06,0xcf,0x06,0x01,0x00,0xd1,0x14,
++	0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0x95,0x08,0x14,0x04,0x00,0x00,0x01,0x00,
++	0x01,0x00,0xd0,0x1a,0xcf,0x86,0x95,0x14,0x54,0x04,0x01,0x00,0x93,0x0c,0x92,0x08,
++	0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x0c,
++	0x94,0x08,0x13,0x04,0x01,0x00,0x00,0x00,0x05,0x00,0x54,0x04,0x05,0x00,0x53,0x04,
++	0x01,0x00,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x06,0x00,0x07,0x00,0x00,0x00,
++	0xd2,0xcc,0xd1,0xa4,0xd0,0x36,0xcf,0x86,0xd5,0x14,0x54,0x04,0x06,0x00,0x53,0x04,
++	0x08,0x00,0x92,0x08,0x11,0x04,0x08,0x00,0x00,0x00,0x00,0x00,0x94,0x1c,0xd3,0x10,
++	0x52,0x04,0x01,0xe6,0x51,0x04,0x0a,0xe6,0x10,0x04,0x0a,0xe6,0x10,0xdc,0x52,0x04,
++	0x10,0xdc,0x11,0x04,0x10,0xdc,0x11,0xe6,0x01,0x00,0xcf,0x86,0xd5,0x38,0xd4,0x24,
++	0xd3,0x14,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x06,0x00,0x10,0x04,
++	0x06,0x00,0x07,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x07,0x00,0x01,0x00,0x01,0x00,
++	0x01,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,
++	0x01,0x00,0x01,0x00,0xd4,0x18,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,
++	0x10,0x04,0x01,0x00,0x00,0x00,0x12,0x04,0x01,0x00,0x00,0x00,0x93,0x18,0xd2,0x0c,
++	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x06,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
++	0x00,0x00,0x01,0x00,0x01,0x00,0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0x55,0x04,
++	0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,
++	0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xd1,0x50,0xd0,0x1e,
++	0xcf,0x86,0x95,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,
++	0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x18,
++	0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,
++	0x10,0x04,0x01,0x00,0x06,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,
++	0x06,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd0,0x1e,0xcf,0x86,
++	0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,
++	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0xcf,0x86,0xd5,0x38,0xd4,0x18,
++	0xd3,0x0c,0x92,0x08,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x92,0x08,0x11,0x04,
++	0x00,0x00,0x01,0x00,0x01,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,0x00,0x00,0x01,0x00,
++	0x01,0x00,0xd2,0x08,0x11,0x04,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
++	0x00,0x00,0x00,0x00,0xd4,0x20,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,
++	0x10,0x04,0x01,0x00,0x00,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,
++	0x01,0x00,0x00,0x00,0x53,0x04,0x00,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,
++	0x04,0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x03,0x00,0x01,0x00,0x01,0x00,0x83,0xe2,
++	0x30,0x3e,0xe1,0x1a,0x3b,0xe0,0x97,0x39,0xcf,0x86,0xe5,0x3b,0x26,0xc4,0xe3,0x16,
++	0x14,0xe2,0xef,0x11,0xe1,0xd0,0x10,0xe0,0x60,0x07,0xcf,0x86,0xe5,0x53,0x03,0xe4,
++	0x4c,0x02,0xe3,0x3d,0x01,0xd2,0x94,0xd1,0x70,0xd0,0x4a,0xcf,0x86,0xd5,0x18,0x94,
++	0x14,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x07,
++	0x00,0x07,0x00,0x07,0x00,0xd4,0x14,0x93,0x10,0x52,0x04,0x07,0x00,0x51,0x04,0x07,
++	0x00,0x10,0x04,0x07,0x00,0x00,0x00,0x07,0x00,0x53,0x04,0x07,0x00,0xd2,0x0c,0x51,
++	0x04,0x07,0x00,0x10,0x04,0x07,0x00,0x00,0x00,0x51,0x04,0x07,0x00,0x10,0x04,0x00,
++	0x00,0x07,0x00,0xcf,0x86,0x95,0x20,0xd4,0x10,0x53,0x04,0x07,0x00,0x52,0x04,0x07,
++	0x00,0x11,0x04,0x07,0x00,0x00,0x00,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,0x11,
++	0x04,0x07,0x00,0x00,0x00,0x00,0x00,0xd0,0x06,0xcf,0x06,0x07,0x00,0xcf,0x86,0x55,
++	0x04,0x07,0x00,0x54,0x04,0x07,0x00,0x53,0x04,0x07,0x00,0x92,0x0c,0x51,0x04,0x07,
++	0x00,0x10,0x04,0x07,0x00,0x00,0x00,0x00,0x00,0xd1,0x40,0xd0,0x3a,0xcf,0x86,0xd5,
++	0x20,0x94,0x1c,0x93,0x18,0xd2,0x0c,0x51,0x04,0x07,0x00,0x10,0x04,0x07,0x00,0x00,
++	0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x07,0x00,0x07,0x00,0x07,0x00,0x54,
++	0x04,0x07,0x00,0x93,0x10,0x52,0x04,0x07,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,
++	0x00,0x07,0x00,0x07,0x00,0xcf,0x06,0x08,0x00,0xd0,0x46,0xcf,0x86,0xd5,0x2c,0xd4,
++	0x20,0x53,0x04,0x08,0x00,0xd2,0x0c,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x10,
++	0x00,0xd1,0x08,0x10,0x04,0x10,0x00,0x12,0x00,0x10,0x04,0x12,0x00,0x00,0x00,0x53,
++	0x04,0x0a,0x00,0x12,0x04,0x0a,0x00,0x00,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,
++	0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,
++	0x86,0xd5,0x08,0x14,0x04,0x00,0x00,0x0a,0x00,0x54,0x04,0x0a,0x00,0x53,0x04,0x0a,
++	0x00,0x52,0x04,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x0a,0xdc,0x00,0x00,0xd2,
++	0x5e,0xd1,0x06,0xcf,0x06,0x00,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x0a,
++	0x00,0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x00,
++	0x00,0x00,0x00,0x0a,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,0x0a,0x00,0x93,0x10,0x92,
++	0x0c,0x91,0x08,0x10,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd4,
++	0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x10,0xdc,0x10,0x00,0x10,0x00,0x10,
++	0x00,0x10,0x00,0x53,0x04,0x10,0x00,0x12,0x04,0x10,0x00,0x00,0x00,0xd1,0x70,0xd0,
++	0x36,0xcf,0x86,0xd5,0x18,0x54,0x04,0x05,0x00,0x53,0x04,0x05,0x00,0x52,0x04,0x05,
++	0x00,0x51,0x04,0x05,0x00,0x10,0x04,0x05,0x00,0x10,0x00,0x94,0x18,0xd3,0x08,0x12,
++	0x04,0x05,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x13,
++	0x00,0x13,0x00,0x05,0x00,0xcf,0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x05,0x00,0x92,
++	0x0c,0x51,0x04,0x05,0x00,0x10,0x04,0x05,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x54,
++	0x04,0x10,0x00,0xd3,0x0c,0x52,0x04,0x10,0x00,0x11,0x04,0x10,0x00,0x10,0xe6,0x92,
++	0x0c,0x51,0x04,0x10,0xe6,0x10,0x04,0x10,0xe6,0x00,0x00,0x00,0x00,0xd0,0x1e,0xcf,
++	0x86,0x95,0x18,0x54,0x04,0x07,0x00,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,0x51,
++	0x04,0x07,0x00,0x10,0x04,0x00,0x00,0x07,0x00,0x08,0x00,0xcf,0x86,0x95,0x1c,0xd4,
++	0x0c,0x93,0x08,0x12,0x04,0x08,0x00,0x00,0x00,0x08,0x00,0x93,0x0c,0x52,0x04,0x08,
++	0x00,0x11,0x04,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd3,0xba,0xd2,0x80,0xd1,
++	0x34,0xd0,0x1a,0xcf,0x86,0x55,0x04,0x05,0x00,0x94,0x10,0x93,0x0c,0x52,0x04,0x05,
++	0x00,0x11,0x04,0x05,0x00,0x07,0x00,0x05,0x00,0x05,0x00,0xcf,0x86,0x95,0x14,0x94,
++	0x10,0x53,0x04,0x05,0x00,0x52,0x04,0x05,0x00,0x11,0x04,0x05,0x00,0x07,0x00,0x07,
++	0x00,0x07,0x00,0xd0,0x2a,0xcf,0x86,0xd5,0x14,0x54,0x04,0x07,0x00,0x53,0x04,0x07,
++	0x00,0x52,0x04,0x07,0x00,0x11,0x04,0x07,0x00,0x00,0x00,0x94,0x10,0x53,0x04,0x07,
++	0x00,0x92,0x08,0x11,0x04,0x07,0x00,0x00,0x00,0x00,0x00,0x12,0x00,0xcf,0x86,0xd5,
++	0x10,0x54,0x04,0x12,0x00,0x93,0x08,0x12,0x04,0x12,0x00,0x00,0x00,0x12,0x00,0x54,
++	0x04,0x12,0x00,0x53,0x04,0x12,0x00,0x12,0x04,0x12,0x00,0x00,0x00,0xd1,0x34,0xd0,
++	0x12,0xcf,0x86,0x55,0x04,0x10,0x00,0x94,0x08,0x13,0x04,0x10,0x00,0x00,0x00,0x10,
++	0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0x94,0x18,0xd3,0x08,0x12,0x04,0x10,0x00,0x00,
++	0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x00,
++	0x00,0xcf,0x06,0x00,0x00,0xd2,0x06,0xcf,0x06,0x10,0x00,0xd1,0x40,0xd0,0x1e,0xcf,
++	0x86,0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,0x93,0x10,0x52,0x04,0x10,0x00,0x51,
++	0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x14,0x54,
++	0x04,0x10,0x00,0x93,0x0c,0x52,0x04,0x10,0x00,0x11,0x04,0x10,0x00,0x00,0x00,0x00,
++	0x00,0x94,0x08,0x13,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xe4,
++	0xce,0x02,0xe3,0x45,0x01,0xd2,0xd0,0xd1,0x70,0xd0,0x52,0xcf,0x86,0xd5,0x20,0x94,
++	0x1c,0xd3,0x0c,0x52,0x04,0x07,0x00,0x11,0x04,0x07,0x00,0x00,0x00,0x92,0x0c,0x91,
++	0x08,0x10,0x04,0x07,0x00,0x00,0x00,0x07,0x00,0x07,0x00,0x07,0x00,0x54,0x04,0x07,
++	0x00,0xd3,0x10,0x52,0x04,0x07,0x00,0x51,0x04,0x07,0x00,0x10,0x04,0x00,0x00,0x07,
++	0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x07,0x00,0x00,0x00,0x00,0x00,0xd1,0x08,0x10,
++	0x04,0x07,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x07,0x00,0xcf,0x86,0x95,0x18,0x54,
++	0x04,0x0b,0x00,0x93,0x10,0x52,0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x00,
++	0x00,0x0b,0x00,0x0b,0x00,0x10,0x00,0xd0,0x32,0xcf,0x86,0xd5,0x18,0x54,0x04,0x10,
++	0x00,0x53,0x04,0x10,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,
++	0x00,0x00,0x00,0x94,0x14,0x93,0x10,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,
++	0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,
++	0x04,0x11,0x00,0xd3,0x14,0xd2,0x0c,0x51,0x04,0x11,0x00,0x10,0x04,0x11,0x00,0x00,
++	0x00,0x11,0x04,0x11,0x00,0x00,0x00,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,
++	0x00,0x11,0x00,0x11,0x00,0xd1,0x40,0xd0,0x3a,0xcf,0x86,0xd5,0x1c,0x54,0x04,0x09,
++	0x00,0x53,0x04,0x09,0x00,0xd2,0x08,0x11,0x04,0x09,0x00,0x0b,0x00,0x51,0x04,0x00,
++	0x00,0x10,0x04,0x00,0x00,0x09,0x00,0x54,0x04,0x0a,0x00,0x53,0x04,0x0a,0x00,0xd2,
++	0x08,0x11,0x04,0x0a,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0a,
++	0x00,0xcf,0x06,0x00,0x00,0xd0,0x1a,0xcf,0x86,0x55,0x04,0x0d,0x00,0x54,0x04,0x0d,
++	0x00,0x53,0x04,0x0d,0x00,0x52,0x04,0x00,0x00,0x11,0x04,0x11,0x00,0x0d,0x00,0xcf,
++	0x86,0x95,0x14,0x54,0x04,0x11,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x00,0x00,0x11,
++	0x00,0x11,0x00,0x11,0x00,0x11,0x00,0xd2,0xec,0xd1,0xa4,0xd0,0x76,0xcf,0x86,0xd5,
++	0x48,0xd4,0x28,0xd3,0x14,0x52,0x04,0x08,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,0x08,
++	0x00,0x10,0x04,0x08,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0xd1,0x08,0x10,0x04,0x08,
++	0x00,0x08,0xdc,0x10,0x04,0x08,0x00,0x08,0xe6,0xd3,0x10,0x52,0x04,0x08,0x00,0x91,
++	0x08,0x10,0x04,0x00,0x00,0x08,0x00,0x08,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,
++	0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x54,0x04,0x08,0x00,0xd3,0x0c,0x52,0x04,0x08,
++	0x00,0x11,0x04,0x14,0x00,0x00,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x08,0xe6,0x08,
++	0x01,0x10,0x04,0x08,0xdc,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x08,
++	0x09,0xcf,0x86,0x95,0x28,0xd4,0x14,0x53,0x04,0x08,0x00,0x92,0x0c,0x91,0x08,0x10,
++	0x04,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x08,0x00,0x92,0x0c,0x91,
++	0x08,0x10,0x04,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0b,0x00,0xd0,0x0a,0xcf,
++	0x86,0x15,0x04,0x10,0x00,0x00,0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0xd4,0x24,0xd3,
++	0x14,0x52,0x04,0x10,0x00,0xd1,0x08,0x10,0x04,0x10,0x00,0x10,0xe6,0x10,0x04,0x10,
++	0xdc,0x00,0x00,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x10,
++	0x00,0x93,0x10,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,
++	0x00,0x00,0x00,0xd1,0x54,0xd0,0x26,0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,0x0b,
++	0x00,0xd3,0x0c,0x52,0x04,0x0b,0x00,0x11,0x04,0x0b,0x00,0x00,0x00,0x92,0x0c,0x91,
++	0x08,0x10,0x04,0x00,0x00,0x0b,0x00,0x0b,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x14,0x54,
++	0x04,0x0b,0x00,0x93,0x0c,0x52,0x04,0x0b,0x00,0x11,0x04,0x0b,0x00,0x00,0x00,0x0b,
++	0x00,0x54,0x04,0x0b,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,
++	0x00,0x00,0x00,0x00,0x00,0x0b,0x00,0xd0,0x42,0xcf,0x86,0xd5,0x28,0x54,0x04,0x10,
++	0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xd2,0x0c,0x91,
++	0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x91,0x08,0x10,0x04,0x10,0x00,0x00,
++	0x00,0x00,0x00,0x94,0x14,0x53,0x04,0x00,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,
++	0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd3,0x96,0xd2,
++	0x68,0xd1,0x24,0xd0,0x06,0xcf,0x06,0x0b,0x00,0xcf,0x86,0x95,0x18,0x94,0x14,0x53,
++	0x04,0x0b,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,
++	0x00,0x00,0x00,0x00,0x00,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x11,0x00,0x54,0x04,0x11,
++	0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x11,0x00,0x10,0x04,0x11,0x00,0x00,0x00,0x00,
++	0x00,0x00,0x00,0xcf,0x86,0x55,0x04,0x11,0x00,0x54,0x04,0x11,0x00,0xd3,0x10,0x92,
++	0x0c,0x51,0x04,0x11,0x00,0x10,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0x92,0x08,0x11,
++	0x04,0x00,0x00,0x11,0x00,0x11,0x00,0xd1,0x28,0xd0,0x22,0xcf,0x86,0x55,0x04,0x14,
++	0x00,0xd4,0x0c,0x93,0x08,0x12,0x04,0x14,0x00,0x14,0xe6,0x00,0x00,0x53,0x04,0x14,
++	0x00,0x92,0x08,0x11,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,
++	0x06,0x00,0x00,0xd2,0x2a,0xd1,0x24,0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x86,0x55,
++	0x04,0x00,0x00,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,0x00,0x51,
++	0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd1,0x58,0xd0,
++	0x12,0xcf,0x86,0x55,0x04,0x14,0x00,0x94,0x08,0x13,0x04,0x14,0x00,0x00,0x00,0x14,
++	0x00,0xcf,0x86,0x95,0x40,0xd4,0x24,0xd3,0x0c,0x52,0x04,0x14,0x00,0x11,0x04,0x14,
++	0x00,0x14,0xdc,0xd2,0x0c,0x51,0x04,0x14,0xe6,0x10,0x04,0x14,0xe6,0x14,0xdc,0x91,
++	0x08,0x10,0x04,0x14,0xe6,0x14,0xdc,0x14,0xdc,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,
++	0x04,0x14,0xdc,0x14,0x00,0x14,0x00,0x14,0x00,0x92,0x08,0x11,0x04,0x14,0x00,0x00,
++	0x00,0x00,0x00,0x00,0x00,0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x86,0x55,0x04,0x00,
++	0x00,0x54,0x04,0x15,0x00,0x93,0x10,0x52,0x04,0x15,0x00,0x51,0x04,0x15,0x00,0x10,
++	0x04,0x15,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xe5,0x0f,0x06,0xe4,0xf8,0x03,0xe3,
++	0x02,0x02,0xd2,0xfb,0xd1,0x4c,0xd0,0x06,0xcf,0x06,0x0c,0x00,0xcf,0x86,0xd5,0x2c,
++	0xd4,0x1c,0xd3,0x10,0x52,0x04,0x0c,0x00,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x09,
++	0x0c,0x00,0x52,0x04,0x0c,0x00,0x11,0x04,0x0c,0x00,0x00,0x00,0x93,0x0c,0x92,0x08,
++	0x11,0x04,0x00,0x00,0x0c,0x00,0x0c,0x00,0x0c,0x00,0x54,0x04,0x0c,0x00,0x53,0x04,
++	0x00,0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x09,
++	0xd0,0x69,0xcf,0x86,0xd5,0x32,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,0xd2,0x15,
++	0x51,0x04,0x0b,0x00,0x10,0x0d,0x0b,0xff,0xf0,0x91,0x82,0x99,0xf0,0x91,0x82,0xba,
++	0x00,0x0b,0x00,0x91,0x11,0x10,0x0d,0x0b,0xff,0xf0,0x91,0x82,0x9b,0xf0,0x91,0x82,
++	0xba,0x00,0x0b,0x00,0x0b,0x00,0xd4,0x1d,0x53,0x04,0x0b,0x00,0x92,0x15,0x51,0x04,
++	0x0b,0x00,0x10,0x04,0x0b,0x00,0x0b,0xff,0xf0,0x91,0x82,0xa5,0xf0,0x91,0x82,0xba,
++	0x00,0x0b,0x00,0x53,0x04,0x0b,0x00,0x92,0x10,0xd1,0x08,0x10,0x04,0x0b,0x00,0x0b,
++	0x09,0x10,0x04,0x0b,0x07,0x0b,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x20,0x94,0x1c,0xd3,
++	0x0c,0x92,0x08,0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x91,
++	0x08,0x10,0x04,0x00,0x00,0x14,0x00,0x00,0x00,0x0d,0x00,0xd4,0x14,0x53,0x04,0x0d,
++	0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53,
++	0x04,0x0d,0x00,0x92,0x08,0x11,0x04,0x0d,0x00,0x00,0x00,0x00,0x00,0xd1,0x96,0xd0,
++	0x5c,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,0x0d,0xe6,0x10,
++	0x04,0x0d,0xe6,0x0d,0x00,0x0d,0x00,0x0d,0x00,0x0d,0x00,0xd4,0x26,0x53,0x04,0x0d,
++	0x00,0x52,0x04,0x0d,0x00,0x51,0x04,0x0d,0x00,0x10,0x0d,0x0d,0xff,0xf0,0x91,0x84,
++	0xb1,0xf0,0x91,0x84,0xa7,0x00,0x0d,0xff,0xf0,0x91,0x84,0xb2,0xf0,0x91,0x84,0xa7,
++	0x00,0x93,0x18,0xd2,0x0c,0x51,0x04,0x0d,0x00,0x10,0x04,0x0d,0x00,0x0d,0x09,0x91,
++	0x08,0x10,0x04,0x0d,0x09,0x00,0x00,0x0d,0x00,0x0d,0x00,0xcf,0x86,0xd5,0x18,0x94,
++	0x14,0x93,0x10,0x52,0x04,0x0d,0x00,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x00,
++	0x00,0x00,0x00,0x10,0x00,0x54,0x04,0x10,0x00,0x93,0x18,0xd2,0x0c,0x51,0x04,0x10,
++	0x00,0x10,0x04,0x10,0x00,0x10,0x07,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,
++	0x00,0x00,0x00,0xd0,0x06,0xcf,0x06,0x0d,0x00,0xcf,0x86,0xd5,0x40,0xd4,0x2c,0xd3,
++	0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0d,0x09,0x0d,0x00,0x0d,0x00,0x0d,0x00,0xd2,
++	0x10,0xd1,0x08,0x10,0x04,0x0d,0x00,0x11,0x00,0x10,0x04,0x11,0x07,0x11,0x00,0x91,
++	0x08,0x10,0x04,0x11,0x00,0x10,0x00,0x00,0x00,0x53,0x04,0x0d,0x00,0x92,0x0c,0x51,
++	0x04,0x0d,0x00,0x10,0x04,0x10,0x00,0x11,0x00,0x11,0x00,0xd4,0x14,0x93,0x10,0x92,
++	0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x93,
++	0x10,0x52,0x04,0x10,0x00,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,
++	0x00,0xd2,0xc8,0xd1,0x48,0xd0,0x42,0xcf,0x86,0xd5,0x18,0x54,0x04,0x10,0x00,0x93,
++	0x10,0x92,0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x10,
++	0x00,0x54,0x04,0x10,0x00,0xd3,0x14,0x52,0x04,0x10,0x00,0xd1,0x08,0x10,0x04,0x10,
++	0x00,0x10,0x09,0x10,0x04,0x10,0x07,0x10,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,
++	0x00,0x10,0x04,0x12,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd0,0x52,0xcf,0x86,0xd5,
++	0x3c,0xd4,0x28,0xd3,0x10,0x52,0x04,0x11,0x00,0x51,0x04,0x11,0x00,0x10,0x04,0x11,
++	0x00,0x00,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x11,0x00,0x00,0x00,0x11,0x00,0x51,
++	0x04,0x11,0x00,0x10,0x04,0x00,0x00,0x11,0x00,0x53,0x04,0x11,0x00,0x52,0x04,0x11,
++	0x00,0x51,0x04,0x11,0x00,0x10,0x04,0x00,0x00,0x11,0x00,0x94,0x10,0x53,0x04,0x11,
++	0x00,0x92,0x08,0x11,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0xcf,0x86,0x55,
++	0x04,0x10,0x00,0xd4,0x18,0x53,0x04,0x10,0x00,0x92,0x10,0xd1,0x08,0x10,0x04,0x10,
++	0x00,0x10,0x07,0x10,0x04,0x10,0x09,0x00,0x00,0x00,0x00,0x53,0x04,0x10,0x00,0x92,
++	0x08,0x11,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xe1,0x27,0x01,0xd0,0x8a,0xcf,0x86,
++	0xd5,0x44,0xd4,0x2c,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x11,0x00,0x10,0x00,
++	0x10,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x52,0x04,0x10,0x00,
++	0xd1,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x93,0x14,
++	0x92,0x10,0xd1,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,
++	0x10,0x00,0x10,0x00,0xd4,0x14,0x53,0x04,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,
++	0x10,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,
++	0x10,0x00,0x00,0x00,0x10,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,
++	0xd2,0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x00,0x00,0x14,0x07,0x91,0x08,0x10,0x04,
++	0x10,0x07,0x10,0x00,0x10,0x00,0xcf,0x86,0xd5,0x6a,0xd4,0x42,0xd3,0x14,0x52,0x04,
++	0x10,0x00,0xd1,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,
++	0xd2,0x19,0xd1,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0xff,
++	0xf0,0x91,0x8d,0x87,0xf0,0x91,0x8c,0xbe,0x00,0x91,0x11,0x10,0x0d,0x10,0xff,0xf0,
++	0x91,0x8d,0x87,0xf0,0x91,0x8d,0x97,0x00,0x10,0x09,0x00,0x00,0xd3,0x18,0xd2,0x0c,
++	0x91,0x08,0x10,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,
++	0x00,0x00,0x10,0x00,0x52,0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,
++	0x10,0x00,0xd4,0x1c,0xd3,0x0c,0x52,0x04,0x10,0x00,0x11,0x04,0x00,0x00,0x10,0xe6,
++	0x52,0x04,0x10,0xe6,0x91,0x08,0x10,0x04,0x10,0xe6,0x00,0x00,0x00,0x00,0x93,0x10,
++	0x52,0x04,0x10,0xe6,0x91,0x08,0x10,0x04,0x10,0xe6,0x00,0x00,0x00,0x00,0x00,0x00,
++	0xcf,0x06,0x00,0x00,0xe3,0x30,0x01,0xd2,0xb7,0xd1,0x48,0xd0,0x06,0xcf,0x06,0x12,
++	0x00,0xcf,0x86,0x95,0x3c,0xd4,0x1c,0x93,0x18,0xd2,0x0c,0x51,0x04,0x12,0x00,0x10,
++	0x04,0x12,0x09,0x12,0x00,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x07,0x12,0x00,0x12,
++	0x00,0x53,0x04,0x12,0x00,0xd2,0x0c,0x51,0x04,0x12,0x00,0x10,0x04,0x00,0x00,0x12,
++	0x00,0xd1,0x08,0x10,0x04,0x00,0x00,0x12,0x00,0x10,0x04,0x14,0xe6,0x15,0x00,0x00,
++	0x00,0xd0,0x45,0xcf,0x86,0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,0x53,0x04,0x10,
++	0x00,0xd2,0x15,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x10,0xff,0xf0,0x91,0x92,
++	0xb9,0xf0,0x91,0x92,0xba,0x00,0xd1,0x11,0x10,0x0d,0x10,0xff,0xf0,0x91,0x92,0xb9,
++	0xf0,0x91,0x92,0xb0,0x00,0x10,0x00,0x10,0x0d,0x10,0xff,0xf0,0x91,0x92,0xb9,0xf0,
++	0x91,0x92,0xbd,0x00,0x10,0x00,0xcf,0x86,0x95,0x24,0xd4,0x14,0x93,0x10,0x92,0x0c,
++	0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x09,0x10,0x07,0x10,0x00,0x00,0x00,0x53,0x04,
++	0x10,0x00,0x92,0x08,0x11,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,0x06,
++	0xcf,0x06,0x00,0x00,0xd0,0x40,0xcf,0x86,0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,
++	0xd3,0x0c,0x52,0x04,0x10,0x00,0x11,0x04,0x10,0x00,0x00,0x00,0xd2,0x1e,0x51,0x04,
++	0x10,0x00,0x10,0x0d,0x10,0xff,0xf0,0x91,0x96,0xb8,0xf0,0x91,0x96,0xaf,0x00,0x10,
++	0xff,0xf0,0x91,0x96,0xb9,0xf0,0x91,0x96,0xaf,0x00,0x51,0x04,0x10,0x00,0x10,0x04,
++	0x10,0x00,0x10,0x09,0xcf,0x86,0x95,0x2c,0xd4,0x1c,0xd3,0x10,0x92,0x0c,0x91,0x08,
++	0x10,0x04,0x10,0x07,0x10,0x00,0x10,0x00,0x10,0x00,0x92,0x08,0x11,0x04,0x10,0x00,
++	0x11,0x00,0x11,0x00,0x53,0x04,0x11,0x00,0x52,0x04,0x11,0x00,0x11,0x04,0x11,0x00,
++	0x00,0x00,0x00,0x00,0xd2,0xa0,0xd1,0x5c,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x10,0x00,
++	0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,
++	0x10,0x04,0x10,0x00,0x10,0x09,0xcf,0x86,0xd5,0x24,0xd4,0x14,0x93,0x10,0x52,0x04,
++	0x10,0x00,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x04,
++	0x10,0x00,0x92,0x08,0x11,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x94,0x14,0x53,0x04,
++	0x12,0x00,0x52,0x04,0x12,0x00,0x91,0x08,0x10,0x04,0x12,0x00,0x00,0x00,0x00,0x00,
++	0x00,0x00,0xd0,0x2a,0xcf,0x86,0x55,0x04,0x0d,0x00,0x54,0x04,0x0d,0x00,0xd3,0x10,
++	0x52,0x04,0x0d,0x00,0x51,0x04,0x0d,0x00,0x10,0x04,0x0d,0x09,0x0d,0x07,0x92,0x0c,
++	0x91,0x08,0x10,0x04,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0x95,0x14,
++	0x94,0x10,0x53,0x04,0x0d,0x00,0x92,0x08,0x11,0x04,0x0d,0x00,0x00,0x00,0x00,0x00,
++	0x00,0x00,0x00,0x00,0xd1,0x40,0xd0,0x3a,0xcf,0x86,0xd5,0x20,0x54,0x04,0x11,0x00,
++	0x53,0x04,0x11,0x00,0xd2,0x0c,0x51,0x04,0x11,0x00,0x10,0x04,0x14,0x00,0x00,0x00,
++	0x91,0x08,0x10,0x04,0x00,0x00,0x11,0x00,0x11,0x00,0x94,0x14,0x53,0x04,0x11,0x00,
++	0x92,0x0c,0x51,0x04,0x11,0x00,0x10,0x04,0x11,0x00,0x11,0x09,0x00,0x00,0x11,0x00,
++	0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xe4,0x59,0x01,0xd3,0xb2,0xd2,0x5c,0xd1,
++	0x28,0xd0,0x22,0xcf,0x86,0x55,0x04,0x14,0x00,0x54,0x04,0x14,0x00,0x53,0x04,0x14,
++	0x00,0x92,0x10,0xd1,0x08,0x10,0x04,0x14,0x00,0x14,0x09,0x10,0x04,0x14,0x07,0x14,
++	0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd0,0x0a,0xcf,0x86,0x15,0x04,0x00,0x00,0x10,
++	0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,0xd3,0x10,0x92,0x0c,0x51,
++	0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x51,
++	0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0xd1,0x06,0xcf,0x06,0x00,0x00,0xd0,
++	0x1a,0xcf,0x86,0x55,0x04,0x00,0x00,0x94,0x10,0x53,0x04,0x15,0x00,0x92,0x08,0x11,
++	0x04,0x00,0x00,0x15,0x00,0x15,0x00,0x15,0x00,0xcf,0x86,0xd5,0x14,0x54,0x04,0x15,
++	0x00,0x53,0x04,0x15,0x00,0x92,0x08,0x11,0x04,0x00,0x00,0x15,0x00,0x15,0x00,0x94,
++	0x1c,0x93,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x15,0x09,0x15,0x00,0x15,0x00,0x91,
++	0x08,0x10,0x04,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd2,0xa0,0xd1,
++	0x3c,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x13,0x00,0x54,0x04,0x13,0x00,0x93,0x10,0x52,
++	0x04,0x13,0x00,0x91,0x08,0x10,0x04,0x13,0x09,0x13,0x00,0x13,0x00,0x13,0x00,0xcf,
++	0x86,0x95,0x18,0x94,0x14,0x93,0x10,0x52,0x04,0x13,0x00,0x51,0x04,0x13,0x00,0x10,
++	0x04,0x13,0x00,0x13,0x09,0x00,0x00,0x13,0x00,0x13,0x00,0xd0,0x46,0xcf,0x86,0xd5,
++	0x2c,0xd4,0x10,0x93,0x0c,0x52,0x04,0x13,0x00,0x11,0x04,0x15,0x00,0x13,0x00,0x13,
++	0x00,0x53,0x04,0x13,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x13,0x00,0x13,0x09,0x13,
++	0x00,0x91,0x08,0x10,0x04,0x13,0x00,0x14,0x00,0x13,0x00,0x94,0x14,0x93,0x10,0x92,
++	0x0c,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++	0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,0x92,
++	0x0c,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,
++	0x00,0xe3,0xa9,0x01,0xd2,0xb0,0xd1,0x6c,0xd0,0x3e,0xcf,0x86,0xd5,0x18,0x94,0x14,
++	0x53,0x04,0x12,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x12,0x00,0x00,0x00,0x12,0x00,
++	0x12,0x00,0x12,0x00,0x54,0x04,0x12,0x00,0xd3,0x10,0x52,0x04,0x12,0x00,0x51,0x04,
++	0x12,0x00,0x10,0x04,0x12,0x00,0x00,0x00,0x52,0x04,0x12,0x00,0x51,0x04,0x12,0x00,
++	0x10,0x04,0x12,0x00,0x12,0x09,0xcf,0x86,0xd5,0x14,0x94,0x10,0x93,0x0c,0x52,0x04,
++	0x12,0x00,0x11,0x04,0x12,0x00,0x00,0x00,0x00,0x00,0x12,0x00,0x94,0x14,0x53,0x04,
++	0x12,0x00,0x52,0x04,0x12,0x00,0x91,0x08,0x10,0x04,0x12,0x00,0x00,0x00,0x00,0x00,
++	0x12,0x00,0xd0,0x3e,0xcf,0x86,0xd5,0x14,0x54,0x04,0x12,0x00,0x93,0x0c,0x92,0x08,
++	0x11,0x04,0x00,0x00,0x12,0x00,0x12,0x00,0x12,0x00,0xd4,0x14,0x53,0x04,0x12,0x00,
++	0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x12,0x00,0x12,0x00,0x12,0x00,0x93,0x10,
++	0x52,0x04,0x12,0x00,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x00,0x00,0x00,0x00,
++	0xcf,0x06,0x00,0x00,0xd1,0xa0,0xd0,0x52,0xcf,0x86,0xd5,0x24,0x94,0x20,0xd3,0x10,
++	0x52,0x04,0x13,0x00,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x00,0x00,0x92,0x0c,
++	0x51,0x04,0x13,0x00,0x10,0x04,0x00,0x00,0x13,0x00,0x13,0x00,0x13,0x00,0x54,0x04,
++	0x13,0x00,0xd3,0x10,0x52,0x04,0x13,0x00,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x00,
++	0x00,0x00,0xd2,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x13,0x00,0x00,0x00,0x51,0x04,
++	0x13,0x00,0x10,0x04,0x00,0x00,0x13,0x00,0xcf,0x86,0xd5,0x28,0xd4,0x18,0x93,0x14,
++	0xd2,0x0c,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x07,0x13,0x00,0x11,0x04,0x13,0x09,
++	0x13,0x00,0x00,0x00,0x53,0x04,0x13,0x00,0x92,0x08,0x11,0x04,0x13,0x00,0x00,0x00,
++	0x00,0x00,0x94,0x20,0xd3,0x10,0x52,0x04,0x14,0x00,0x51,0x04,0x14,0x00,0x10,0x04,
++	0x00,0x00,0x14,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,0x14,0x00,
++	0x14,0x00,0x14,0x00,0xd0,0x52,0xcf,0x86,0xd5,0x3c,0xd4,0x14,0x53,0x04,0x14,0x00,
++	0x52,0x04,0x14,0x00,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x00,0x00,0xd3,0x18,
++	0xd2,0x0c,0x51,0x04,0x14,0x00,0x10,0x04,0x00,0x00,0x14,0x00,0x51,0x04,0x14,0x00,
++	0x10,0x04,0x14,0x00,0x14,0x09,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,
++	0x00,0x00,0x00,0x00,0x94,0x10,0x53,0x04,0x14,0x00,0x92,0x08,0x11,0x04,0x14,0x00,
++	0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd2,0x2a,0xd1,0x06,0xcf,0x06,
++	0x00,0x00,0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,0x04,
++	0x14,0x00,0x53,0x04,0x14,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,
++	0x00,0x00,0x00,0x00,0xd1,0x06,0xcf,0x06,0x00,0x00,0xd0,0x06,0xcf,0x06,0x00,0x00,
++	0xcf,0x86,0x55,0x04,0x15,0x00,0x54,0x04,0x15,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,
++	0x15,0x00,0x00,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,
++	0x00,0x00,0x15,0x00,0xd0,0xca,0xcf,0x86,0xd5,0xc2,0xd4,0x54,0xd3,0x06,0xcf,0x06,
++	0x09,0x00,0xd2,0x06,0xcf,0x06,0x09,0x00,0xd1,0x24,0xd0,0x06,0xcf,0x06,0x09,0x00,
++	0xcf,0x86,0x55,0x04,0x09,0x00,0x94,0x14,0x53,0x04,0x09,0x00,0x52,0x04,0x09,0x00,
++	0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x10,0x00,0x10,0x00,0xd0,0x1e,0xcf,0x86,
++	0x95,0x18,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,
++	0x10,0x00,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd3,0x68,
++	0xd2,0x46,0xd1,0x40,0xd0,0x06,0xcf,0x06,0x09,0x00,0xcf,0x86,0x55,0x04,0x09,0x00,
++	0xd4,0x20,0xd3,0x10,0x92,0x0c,0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x10,0x00,
++	0x10,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,
++	0x93,0x10,0x52,0x04,0x09,0x00,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,
++	0x00,0x00,0xcf,0x06,0x11,0x00,0xd1,0x1c,0xd0,0x06,0xcf,0x06,0x11,0x00,0xcf,0x86,
++	0x95,0x10,0x94,0x0c,0x93,0x08,0x12,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++	0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x86,
++	0xd5,0x4c,0xd4,0x06,0xcf,0x06,0x0b,0x00,0xd3,0x40,0xd2,0x3a,0xd1,0x34,0xd0,0x2e,
++	0xcf,0x86,0x55,0x04,0x0b,0x00,0xd4,0x14,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,0x00,
++	0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0x53,0x04,0x15,0x00,0x92,0x0c,
++	0x91,0x08,0x10,0x04,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,
++	0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,
++	0xd1,0x4c,0xd0,0x44,0xcf,0x86,0xd5,0x3c,0xd4,0x06,0xcf,0x06,0x00,0x00,0xd3,0x06,
++	0xcf,0x06,0x11,0x00,0xd2,0x2a,0xd1,0x24,0xd0,0x06,0xcf,0x06,0x11,0x00,0xcf,0x86,
++	0x95,0x18,0x94,0x14,0x93,0x10,0x52,0x04,0x11,0x00,0x51,0x04,0x11,0x00,0x10,0x04,
++	0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,
++	0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x86,0xcf,0x06,0x00,0x00,0xe0,0xd2,0x01,0xcf,
++	0x86,0xd5,0x06,0xcf,0x06,0x00,0x00,0xe4,0x0b,0x01,0xd3,0x06,0xcf,0x06,0x0c,0x00,
++	0xd2,0x84,0xd1,0x50,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x0c,0x00,0x54,0x04,0x0c,0x00,
++	0x53,0x04,0x0c,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,
++	0x00,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,0x52,0x04,
++	0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x94,0x14,0x53,0x04,
++	0x10,0x00,0xd2,0x08,0x11,0x04,0x10,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x10,0x00,
++	0x00,0x00,0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x86,0xd5,0x08,0x14,0x04,0x00,0x00,
++	0x10,0x00,0xd4,0x10,0x53,0x04,0x10,0x00,0x52,0x04,0x10,0x00,0x11,0x04,0x10,0x00,
++	0x00,0x00,0x93,0x10,0x52,0x04,0x10,0x01,0x91,0x08,0x10,0x04,0x10,0x01,0x10,0x00,
++	0x00,0x00,0x00,0x00,0xd1,0x6c,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x10,0x00,0x54,0x04,
++	0x10,0x00,0x93,0x10,0x52,0x04,0x10,0xe6,0x51,0x04,0x10,0xe6,0x10,0x04,0x10,0xe6,
++	0x10,0x00,0x10,0x00,0xcf,0x86,0xd5,0x24,0xd4,0x10,0x93,0x0c,0x52,0x04,0x10,0x00,
++	0x11,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x10,0x00,0x92,0x0c,0x51,0x04,
++	0x10,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0xd4,0x14,0x93,0x10,0x92,0x0c,
++	0x51,0x04,0x10,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x53,0x04,
++	0x10,0x00,0x52,0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,
++	0xd0,0x0e,0xcf,0x86,0x95,0x08,0x14,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,
++	0x00,0x00,0xd3,0x06,0xcf,0x06,0x00,0x00,0xd2,0x30,0xd1,0x0c,0xd0,0x06,0xcf,0x06,
++	0x00,0x00,0xcf,0x06,0x14,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x14,0x00,
++	0x53,0x04,0x14,0x00,0x92,0x0c,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x00,0x00,
++	0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd1,0x4c,0xd0,0x06,0xcf,0x06,0x0d,0x00,
++	0xcf,0x86,0xd5,0x2c,0x94,0x28,0xd3,0x10,0x52,0x04,0x0d,0x00,0x91,0x08,0x10,0x04,
++	0x0d,0x00,0x15,0x00,0x15,0x00,0xd2,0x0c,0x51,0x04,0x15,0x00,0x10,0x04,0x15,0x00,
++	0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x15,0x00,0x0d,0x00,0x54,0x04,
++	0x0d,0x00,0x53,0x04,0x0d,0x00,0x52,0x04,0x0d,0x00,0x51,0x04,0x0d,0x00,0x10,0x04,
++	0x0d,0x00,0x15,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x94,0x14,0x53,0x04,0x15,0x00,
++	0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0d,0x00,0x0d,0x00,
++	0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,
++	0x10,0x04,0x12,0x00,0x13,0x00,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,
++	0xcf,0x06,0x12,0x00,0xe2,0xc5,0x01,0xd1,0x8e,0xd0,0x86,0xcf,0x86,0xd5,0x48,0xd4,
++	0x06,0xcf,0x06,0x12,0x00,0xd3,0x06,0xcf,0x06,0x12,0x00,0xd2,0x06,0xcf,0x06,0x12,
++	0x00,0xd1,0x06,0xcf,0x06,0x12,0x00,0xd0,0x06,0xcf,0x06,0x12,0x00,0xcf,0x86,0x55,
++	0x04,0x12,0x00,0xd4,0x14,0x53,0x04,0x12,0x00,0x52,0x04,0x12,0x00,0x91,0x08,0x10,
++	0x04,0x12,0x00,0x14,0x00,0x14,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x14,0x00,0x15,
++	0x00,0x15,0x00,0x00,0x00,0xd4,0x36,0xd3,0x06,0xcf,0x06,0x12,0x00,0xd2,0x2a,0xd1,
++	0x06,0xcf,0x06,0x12,0x00,0xd0,0x06,0xcf,0x06,0x12,0x00,0xcf,0x86,0x55,0x04,0x12,
++	0x00,0x54,0x04,0x12,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x12,0x00,0x10,0x04,0x12,
+ 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,
+-	0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xd1,0x4c,0xd0,0x44,0xcf,
+-	0x86,0xd5,0x3c,0xd4,0x06,0xcf,0x06,0x00,0x00,0xd3,0x06,0xcf,0x06,0x11,0x00,0xd2,
+-	0x2a,0xd1,0x24,0xd0,0x06,0xcf,0x06,0x11,0x00,0xcf,0x86,0x95,0x18,0x94,0x14,0x93,
+-	0x10,0x52,0x04,0x11,0x00,0x51,0x04,0x11,0x00,0x10,0x04,0x11,0x00,0x00,0x00,0x00,
+-	0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,
+-	0x00,0xcf,0x86,0xcf,0x06,0x00,0x00,0xe0,0xd2,0x01,0xcf,0x86,0xd5,0x06,0xcf,0x06,
+-	0x00,0x00,0xe4,0x0b,0x01,0xd3,0x06,0xcf,0x06,0x0c,0x00,0xd2,0x84,0xd1,0x50,0xd0,
+-	0x1e,0xcf,0x86,0x55,0x04,0x0c,0x00,0x54,0x04,0x0c,0x00,0x53,0x04,0x0c,0x00,0x92,
+-	0x0c,0x91,0x08,0x10,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,
+-	0x18,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,
+-	0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x94,0x14,0x53,0x04,0x10,0x00,0xd2,0x08,0x11,
+-	0x04,0x10,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x10,0x00,0x00,0x00,0xd0,0x06,0xcf,
+-	0x06,0x00,0x00,0xcf,0x86,0xd5,0x08,0x14,0x04,0x00,0x00,0x10,0x00,0xd4,0x10,0x53,
+-	0x04,0x10,0x00,0x52,0x04,0x10,0x00,0x11,0x04,0x10,0x00,0x00,0x00,0x93,0x10,0x52,
+-	0x04,0x10,0x01,0x91,0x08,0x10,0x04,0x10,0x01,0x10,0x00,0x00,0x00,0x00,0x00,0xd1,
+-	0x6c,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,0x93,0x10,0x52,
+-	0x04,0x10,0xe6,0x51,0x04,0x10,0xe6,0x10,0x04,0x10,0xe6,0x10,0x00,0x10,0x00,0xcf,
+-	0x86,0xd5,0x24,0xd4,0x10,0x93,0x0c,0x52,0x04,0x10,0x00,0x11,0x04,0x10,0x00,0x00,
+-	0x00,0x00,0x00,0x53,0x04,0x10,0x00,0x92,0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x00,
+-	0x00,0x10,0x00,0x10,0x00,0xd4,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,0x10,0x00,0x10,
+-	0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x53,0x04,0x10,0x00,0x52,0x04,0x00,
+-	0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0xd0,0x0e,0xcf,0x86,0x95,
+-	0x08,0x14,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd3,0x06,0xcf,
+-	0x06,0x00,0x00,0xd2,0x30,0xd1,0x0c,0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x06,0x14,
+-	0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x14,0x00,0x53,0x04,0x14,0x00,0x92,
+-	0x0c,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,
+-	0x06,0x00,0x00,0xd1,0x4c,0xd0,0x06,0xcf,0x06,0x0d,0x00,0xcf,0x86,0xd5,0x2c,0x94,
+-	0x28,0xd3,0x10,0x52,0x04,0x0d,0x00,0x91,0x08,0x10,0x04,0x0d,0x00,0x15,0x00,0x15,
+-	0x00,0xd2,0x0c,0x51,0x04,0x15,0x00,0x10,0x04,0x15,0x00,0x00,0x00,0x51,0x04,0x00,
+-	0x00,0x10,0x04,0x00,0x00,0x15,0x00,0x0d,0x00,0x54,0x04,0x0d,0x00,0x53,0x04,0x0d,
+-	0x00,0x52,0x04,0x0d,0x00,0x51,0x04,0x0d,0x00,0x10,0x04,0x0d,0x00,0x15,0x00,0xd0,
+-	0x1e,0xcf,0x86,0x95,0x18,0x94,0x14,0x53,0x04,0x15,0x00,0x52,0x04,0x00,0x00,0x51,
+-	0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0d,0x00,0x0d,0x00,0x00,0x00,0xcf,0x86,0x55,
+-	0x04,0x00,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x12,0x00,0x13,
+-	0x00,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xcf,0x06,0x12,0x00,0xe2,
+-	0xc6,0x01,0xd1,0x8e,0xd0,0x86,0xcf,0x86,0xd5,0x48,0xd4,0x06,0xcf,0x06,0x12,0x00,
+-	0xd3,0x06,0xcf,0x06,0x12,0x00,0xd2,0x06,0xcf,0x06,0x12,0x00,0xd1,0x06,0xcf,0x06,
+-	0x12,0x00,0xd0,0x06,0xcf,0x06,0x12,0x00,0xcf,0x86,0x55,0x04,0x12,0x00,0xd4,0x14,
+-	0x53,0x04,0x12,0x00,0x52,0x04,0x12,0x00,0x91,0x08,0x10,0x04,0x12,0x00,0x14,0x00,
+-	0x14,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x14,0x00,0x15,0x00,0x15,0x00,0x00,0x00,
+-	0xd4,0x36,0xd3,0x06,0xcf,0x06,0x12,0x00,0xd2,0x2a,0xd1,0x06,0xcf,0x06,0x12,0x00,
+-	0xd0,0x06,0xcf,0x06,0x12,0x00,0xcf,0x86,0x55,0x04,0x12,0x00,0x54,0x04,0x12,0x00,
+-	0x93,0x10,0x92,0x0c,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x00,0x00,0x00,0x00,
+-	0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x86,0xcf,0x06,0x00,0x00,
+-	0xd0,0x08,0xcf,0x86,0xcf,0x06,0x00,0x00,0xcf,0x86,0xd5,0xa2,0xd4,0x9c,0xd3,0x74,
+-	0xd2,0x26,0xd1,0x20,0xd0,0x1a,0xcf,0x86,0x95,0x14,0x94,0x10,0x93,0x0c,0x92,0x08,
+-	0x11,0x04,0x0c,0x00,0x13,0x00,0x13,0x00,0x13,0x00,0x13,0x00,0x13,0x00,0xcf,0x06,
+-	0x13,0x00,0xcf,0x06,0x13,0x00,0xd1,0x48,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,
+-	0x13,0x00,0x53,0x04,0x13,0x00,0x52,0x04,0x13,0x00,0x51,0x04,0x13,0x00,0x10,0x04,
+-	0x13,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,0x00,0x00,0x93,0x10,
+-	0x92,0x0c,0x51,0x04,0x15,0x00,0x10,0x04,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-	0x94,0x0c,0x93,0x08,0x12,0x04,0x00,0x00,0x15,0x00,0x00,0x00,0x13,0x00,0xcf,0x06,
+-	0x13,0x00,0xd2,0x22,0xd1,0x06,0xcf,0x06,0x13,0x00,0xd0,0x06,0xcf,0x06,0x13,0x00,
+-	0xcf,0x86,0x55,0x04,0x13,0x00,0x54,0x04,0x13,0x00,0x53,0x04,0x13,0x00,0x12,0x04,
+-	0x13,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xd4,0x06,0xcf,0x06,
+-	0x00,0x00,0xd3,0x7f,0xd2,0x79,0xd1,0x34,0xd0,0x06,0xcf,0x06,0x10,0x00,0xcf,0x86,
+-	0x55,0x04,0x10,0x00,0xd4,0x14,0x53,0x04,0x10,0x00,0x92,0x0c,0x51,0x04,0x10,0x00,
+-	0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x10,0x00,0x52,0x04,0x10,0x00,
+-	0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xd0,0x3f,0xcf,0x86,0xd5,0x2c,
+-	0xd4,0x14,0x53,0x04,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,
+-	0x00,0x00,0x00,0x00,0x53,0x04,0x10,0x00,0xd2,0x08,0x11,0x04,0x10,0x00,0x00,0x00,
+-	0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x01,0x10,0x00,0x94,0x0d,0x93,0x09,0x12,0x05,
+-	0x10,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,
+-	0x00,0xcf,0x06,0x00,0x00,0xe1,0x96,0x04,0xd0,0x08,0xcf,0x86,0xcf,0x06,0x00,0x00,
+-	0xcf,0x86,0xe5,0x33,0x04,0xe4,0x83,0x02,0xe3,0xf8,0x01,0xd2,0x26,0xd1,0x06,0xcf,
+-	0x06,0x05,0x00,0xd0,0x06,0xcf,0x06,0x05,0x00,0xcf,0x86,0x55,0x04,0x05,0x00,0x54,
+-	0x04,0x05,0x00,0x93,0x0c,0x52,0x04,0x05,0x00,0x11,0x04,0x05,0x00,0x00,0x00,0x00,
+-	0x00,0xd1,0xef,0xd0,0x2a,0xcf,0x86,0x55,0x04,0x05,0x00,0x94,0x20,0xd3,0x10,0x52,
+-	0x04,0x05,0x00,0x51,0x04,0x05,0x00,0x10,0x04,0x05,0x00,0x00,0x00,0x92,0x0c,0x91,
+-	0x08,0x10,0x04,0x00,0x00,0x0a,0x00,0x05,0x00,0x05,0x00,0x05,0x00,0xcf,0x86,0xd5,
+-	0x2a,0x54,0x04,0x05,0x00,0x53,0x04,0x05,0x00,0x52,0x04,0x05,0x00,0x51,0x04,0x05,
+-	0x00,0x10,0x0d,0x05,0xff,0xf0,0x9d,0x85,0x97,0xf0,0x9d,0x85,0xa5,0x00,0x05,0xff,
+-	0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,0x00,0xd4,0x75,0xd3,0x61,0xd2,0x44,0xd1,
+-	0x22,0x10,0x11,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,0xf0,0x9d,0x85,
+-	0xae,0x00,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,0xf0,0x9d,0x85,0xaf,
+-	0x00,0x10,0x11,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,0xf0,0x9d,0x85,
+-	0xb0,0x00,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,0xf0,0x9d,0x85,0xb1,
+-	0x00,0xd1,0x15,0x10,0x11,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,0xf0,
+-	0x9d,0x85,0xb2,0x00,0x05,0xd8,0x10,0x04,0x05,0xd8,0x05,0x01,0xd2,0x08,0x11,0x04,
+-	0x05,0x01,0x05,0x00,0x91,0x08,0x10,0x04,0x05,0x00,0x05,0xe2,0x05,0xd8,0xd3,0x12,
+-	0x92,0x0d,0x51,0x04,0x05,0xd8,0x10,0x04,0x05,0xd8,0x05,0xff,0x00,0x05,0xff,0x00,
+-	0x92,0x0e,0x51,0x05,0x05,0xff,0x00,0x10,0x05,0x05,0xff,0x00,0x05,0xdc,0x05,0xdc,
++	0x86,0xcf,0x06,0x00,0x00,0xd0,0x08,0xcf,0x86,0xcf,0x06,0x00,0x00,0xcf,0x86,0xd5,
++	0xa2,0xd4,0x9c,0xd3,0x74,0xd2,0x26,0xd1,0x20,0xd0,0x1a,0xcf,0x86,0x95,0x14,0x94,
++	0x10,0x93,0x0c,0x92,0x08,0x11,0x04,0x0c,0x00,0x13,0x00,0x13,0x00,0x13,0x00,0x13,
++	0x00,0x13,0x00,0xcf,0x06,0x13,0x00,0xcf,0x06,0x13,0x00,0xd1,0x48,0xd0,0x1e,0xcf,
++	0x86,0x95,0x18,0x54,0x04,0x13,0x00,0x53,0x04,0x13,0x00,0x52,0x04,0x13,0x00,0x51,
++	0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x18,0x54,
++	0x04,0x00,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x15,0x00,0x10,0x04,0x15,0x00,0x00,
++	0x00,0x00,0x00,0x00,0x00,0x94,0x0c,0x93,0x08,0x12,0x04,0x00,0x00,0x15,0x00,0x00,
++	0x00,0x13,0x00,0xcf,0x06,0x13,0x00,0xd2,0x22,0xd1,0x06,0xcf,0x06,0x13,0x00,0xd0,
++	0x06,0xcf,0x06,0x13,0x00,0xcf,0x86,0x55,0x04,0x13,0x00,0x54,0x04,0x13,0x00,0x53,
++	0x04,0x13,0x00,0x12,0x04,0x13,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,
++	0x00,0xd4,0x06,0xcf,0x06,0x00,0x00,0xd3,0x7e,0xd2,0x78,0xd1,0x34,0xd0,0x06,0xcf,
++	0x06,0x10,0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0xd4,0x14,0x53,0x04,0x10,0x00,0x92,
++	0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x10,
++	0x00,0x52,0x04,0x10,0x00,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xd0,
++	0x3e,0xcf,0x86,0xd5,0x2c,0xd4,0x14,0x53,0x04,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,
++	0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x10,0x00,0xd2,0x08,0x11,
++	0x04,0x10,0x00,0x00,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x01,0x10,0x00,0x94,
++	0x0c,0x93,0x08,0x12,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,
++	0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xe1,0x92,0x04,0xd0,0x08,0xcf,0x86,
++	0xcf,0x06,0x00,0x00,0xcf,0x86,0xe5,0x2f,0x04,0xe4,0x7f,0x02,0xe3,0xf4,0x01,0xd2,
++	0x26,0xd1,0x06,0xcf,0x06,0x05,0x00,0xd0,0x06,0xcf,0x06,0x05,0x00,0xcf,0x86,0x55,
++	0x04,0x05,0x00,0x54,0x04,0x05,0x00,0x93,0x0c,0x52,0x04,0x05,0x00,0x11,0x04,0x05,
++	0x00,0x00,0x00,0x00,0x00,0xd1,0xeb,0xd0,0x2a,0xcf,0x86,0x55,0x04,0x05,0x00,0x94,
++	0x20,0xd3,0x10,0x52,0x04,0x05,0x00,0x51,0x04,0x05,0x00,0x10,0x04,0x05,0x00,0x00,
++	0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x0a,0x00,0x05,0x00,0x05,0x00,0x05,
++	0x00,0xcf,0x86,0xd5,0x2a,0x54,0x04,0x05,0x00,0x53,0x04,0x05,0x00,0x52,0x04,0x05,
++	0x00,0x51,0x04,0x05,0x00,0x10,0x0d,0x05,0xff,0xf0,0x9d,0x85,0x97,0xf0,0x9d,0x85,
++	0xa5,0x00,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,0x00,0xd4,0x75,0xd3,
++	0x61,0xd2,0x44,0xd1,0x22,0x10,0x11,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,
++	0xa5,0xf0,0x9d,0x85,0xae,0x00,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,
++	0xf0,0x9d,0x85,0xaf,0x00,0x10,0x11,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,
++	0xa5,0xf0,0x9d,0x85,0xb0,0x00,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,
++	0xf0,0x9d,0x85,0xb1,0x00,0xd1,0x15,0x10,0x11,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,
++	0x9d,0x85,0xa5,0xf0,0x9d,0x85,0xb2,0x00,0x05,0xd8,0x10,0x04,0x05,0xd8,0x05,0x01,
++	0xd2,0x08,0x11,0x04,0x05,0x01,0x05,0x00,0x91,0x08,0x10,0x04,0x05,0x00,0x05,0xe2,
++	0x05,0xd8,0xd3,0x10,0x92,0x0c,0x51,0x04,0x05,0xd8,0x10,0x04,0x05,0xd8,0x05,0x00,
++	0x05,0x00,0x92,0x0c,0x51,0x04,0x05,0x00,0x10,0x04,0x05,0x00,0x05,0xdc,0x05,0xdc,
+ 	0xd0,0x97,0xcf,0x86,0xd5,0x28,0x94,0x24,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x05,0xdc,
+ 	0x10,0x04,0x05,0xdc,0x05,0x00,0x91,0x08,0x10,0x04,0x05,0x00,0x05,0xe6,0x05,0xe6,
+ 	0x92,0x08,0x11,0x04,0x05,0xe6,0x05,0xdc,0x05,0x00,0x05,0x00,0xd4,0x14,0x53,0x04,
+@@ -4090,21 +4080,20 @@ static const unsigned char utf8data[64256] = {
+ 	0x00,0xd3,0x06,0xcf,0x06,0x00,0x00,0xd2,0x06,0xcf,0x06,0x00,0x00,0xd1,0x06,0xcf,
+ 	0x06,0x00,0x00,0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,
+ 	0x04,0x00,0x00,0x53,0x04,0x00,0x00,0x52,0x04,0x00,0x00,0x11,0x04,0x00,0x00,0x02,
+-	0x00,0xd4,0xd9,0xd3,0x81,0xd2,0x79,0xd1,0x71,0xd0,0x69,0xcf,0x86,0xd5,0x60,0xd4,
+-	0x59,0xd3,0x52,0xd2,0x33,0xd1,0x2c,0xd0,0x25,0xcf,0x86,0x95,0x1e,0x94,0x19,0x93,
+-	0x14,0x92,0x0f,0x91,0x0a,0x10,0x05,0x00,0xff,0x00,0x05,0xff,0x00,0x00,0xff,0x00,
+-	0x00,0xff,0x00,0x00,0xff,0x00,0x00,0xff,0x00,0x05,0xff,0x00,0xcf,0x06,0x05,0xff,
+-	0x00,0xcf,0x06,0x00,0xff,0x00,0xd1,0x07,0xcf,0x06,0x07,0xff,0x00,0xd0,0x07,0xcf,
+-	0x06,0x07,0xff,0x00,0xcf,0x86,0x55,0x05,0x07,0xff,0x00,0x14,0x05,0x07,0xff,0x00,
+-	0x00,0xff,0x00,0xcf,0x06,0x00,0xff,0x00,0xcf,0x06,0x00,0xff,0x00,0xcf,0x06,0x00,
+-	0xff,0x00,0xcf,0x86,0xcf,0x06,0x00,0x00,0xcf,0x86,0xcf,0x06,0x00,0x00,0xcf,0x86,
+-	0xcf,0x06,0x00,0x00,0xd2,0x08,0xcf,0x86,0xcf,0x06,0x00,0x00,0xd1,0x08,0xcf,0x86,
+-	0xcf,0x06,0x00,0x00,0xd0,0x08,0xcf,0x86,0xcf,0x06,0x00,0x00,0xcf,0x86,0xd5,0x06,
+-	0xcf,0x06,0x00,0x00,0xd4,0x06,0xcf,0x06,0x00,0x00,0xd3,0x06,0xcf,0x06,0x00,0x00,
+-	0xd2,0x06,0xcf,0x06,0x00,0x00,0xd1,0x06,0xcf,0x06,0x00,0x00,0xd0,0x06,0xcf,0x06,
+-	0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,0x04,0x00,0x00,0x53,0x04,0x00,0x00,
+-	0x52,0x04,0x00,0x00,0x11,0x04,0x00,0x00,0x02,0x00,0xcf,0x86,0xcf,0x06,0x02,0x00,
+-	0x81,0x80,0xcf,0x86,0x85,0x84,0xcf,0x86,0xcf,0x06,0x02,0x00,0x00,0x00,0x00,0x00
++	0x00,0xd4,0xc8,0xd3,0x70,0xd2,0x68,0xd1,0x60,0xd0,0x58,0xcf,0x86,0xd5,0x50,0xd4,
++	0x4a,0xd3,0x44,0xd2,0x2a,0xd1,0x24,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x94,0x14,0x93,
++	0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x05,0x00,0x00,0x00,0x00,0x00,0x00,
++	0x00,0x00,0x00,0x05,0x00,0xcf,0x06,0x05,0x00,0xcf,0x06,0x00,0x00,0xd1,0x06,0xcf,
++	0x06,0x07,0x00,0xd0,0x06,0xcf,0x06,0x07,0x00,0xcf,0x86,0x55,0x04,0x07,0x00,0x14,
++	0x04,0x07,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,
++	0x00,0xcf,0x86,0xcf,0x06,0x00,0x00,0xcf,0x86,0xcf,0x06,0x00,0x00,0xcf,0x86,0xcf,
++	0x06,0x00,0x00,0xd2,0x08,0xcf,0x86,0xcf,0x06,0x00,0x00,0xd1,0x08,0xcf,0x86,0xcf,
++	0x06,0x00,0x00,0xd0,0x08,0xcf,0x86,0xcf,0x06,0x00,0x00,0xcf,0x86,0xd5,0x06,0xcf,
++	0x06,0x00,0x00,0xd4,0x06,0xcf,0x06,0x00,0x00,0xd3,0x06,0xcf,0x06,0x00,0x00,0xd2,
++	0x06,0xcf,0x06,0x00,0x00,0xd1,0x06,0xcf,0x06,0x00,0x00,0xd0,0x06,0xcf,0x06,0x00,
++	0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,0x04,0x00,0x00,0x53,0x04,0x00,0x00,0x52,
++	0x04,0x00,0x00,0x11,0x04,0x00,0x00,0x02,0x00,0xcf,0x86,0xcf,0x06,0x02,0x00,0x81,
++	0x80,0xcf,0x86,0x85,0x84,0xcf,0x86,0xcf,0x06,0x02,0x00,0x00,0x00,0x00,0x00,0x00
+ };
+ 
+ struct utf8data_table utf8_data_table = {
+diff --git a/include/linux/bpf.h b/include/linux/bpf.h
+index 722102518dc951..1e05cc80e0485f 100644
+--- a/include/linux/bpf.h
++++ b/include/linux/bpf.h
+@@ -288,6 +288,7 @@ struct bpf_map {
+ 	 * same prog type, JITed flag and xdp_has_frags flag.
+ 	 */
+ 	struct {
++		const struct btf_type *attach_func_proto;
+ 		spinlock_t lock;
+ 		enum bpf_prog_type type;
+ 		bool jited;
+diff --git a/include/linux/intel_tpmi.h b/include/linux/intel_tpmi.h
+index 04d937ad4dc4f5..ee07393445f9f2 100644
+--- a/include/linux/intel_tpmi.h
++++ b/include/linux/intel_tpmi.h
+@@ -6,6 +6,12 @@
+ #ifndef _INTEL_TPMI_H_
+ #define _INTEL_TPMI_H_
+ 
++#include <linux/bitfield.h>
++
++#define TPMI_VERSION_INVALID	0xff
++#define TPMI_MINOR_VERSION(val)	FIELD_GET(GENMASK(4, 0), val)
++#define TPMI_MAJOR_VERSION(val)	FIELD_GET(GENMASK(7, 5), val)
++
+ /**
+  * struct intel_tpmi_plat_info - Platform information for a TPMI device instance
+  * @package_id:	CPU Package id
+diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
+index 8553dc1d0e8983..f0bc9aa5aed3f6 100644
+--- a/include/linux/jbd2.h
++++ b/include/linux/jbd2.h
+@@ -1084,7 +1084,7 @@ struct journal_s
+ 	int			j_revoke_records_per_block;
+ 
+ 	/**
+-	 * @j_transaction_overhead:
++	 * @j_transaction_overhead_buffers:
+ 	 *
+ 	 * Number of blocks each transaction needs for its own bookkeeping
+ 	 */
+diff --git a/include/linux/mhi_ep.h b/include/linux/mhi_ep.h
+index 96f3a133540dba..11bf3212f7822d 100644
+--- a/include/linux/mhi_ep.h
++++ b/include/linux/mhi_ep.h
+@@ -51,14 +51,23 @@ struct mhi_ep_db_info {
+ 
+ /**
+  * struct mhi_ep_buf_info - MHI Endpoint transfer buffer info
++ * @mhi_dev: MHI device associated with this buffer
+  * @dev_addr: Address of the buffer in endpoint
+  * @host_addr: Address of the bufffer in host
+  * @size: Size of the buffer
++ * @code: Transfer completion code
++ * @cb: Callback to be executed by controller drivers after transfer completion (async)
++ * @cb_buf: Opaque buffer to be passed to the callback
+  */
+ struct mhi_ep_buf_info {
++	struct mhi_ep_device *mhi_dev;
+ 	void *dev_addr;
+ 	u64 host_addr;
+ 	size_t size;
++	int code;
++
++	void (*cb)(struct mhi_ep_buf_info *buf_info);
++	void *cb_buf;
+ };
+ 
+ /**
+@@ -94,8 +103,10 @@ struct mhi_ep_buf_info {
+  * @raise_irq: CB function for raising IRQ to the host
+  * @alloc_map: CB function for allocating memory in endpoint for storing host context and mapping it
+  * @unmap_free: CB function to unmap and free the allocated memory in endpoint for storing host context
+- * @read_from_host: CB function for reading from host memory from endpoint
+- * @write_to_host: CB function for writing to host memory from endpoint
++ * @read_sync: CB function for reading from host memory synchronously
++ * @write_sync: CB function for writing to host memory synchronously
++ * @read_async: CB function for reading from host memory asynchronously
++ * @write_async: CB function for writing to host memory asynchronously
+  * @mhi_state: MHI Endpoint state
+  * @max_chan: Maximum channels supported by the endpoint controller
+  * @mru: MRU (Maximum Receive Unit) value of the endpoint controller
+@@ -149,8 +160,10 @@ struct mhi_ep_cntrl {
+ 			 void __iomem **virt, size_t size);
+ 	void (*unmap_free)(struct mhi_ep_cntrl *mhi_cntrl, u64 pci_addr, phys_addr_t phys,
+ 			   void __iomem *virt, size_t size);
+-	int (*read_from_host)(struct mhi_ep_cntrl *mhi_cntrl, struct mhi_ep_buf_info *buf_info);
+-	int (*write_to_host)(struct mhi_ep_cntrl *mhi_cntrl, struct mhi_ep_buf_info *buf_info);
++	int (*read_sync)(struct mhi_ep_cntrl *mhi_cntrl, struct mhi_ep_buf_info *buf_info);
++	int (*write_sync)(struct mhi_ep_cntrl *mhi_cntrl, struct mhi_ep_buf_info *buf_info);
++	int (*read_async)(struct mhi_ep_cntrl *mhi_cntrl, struct mhi_ep_buf_info *buf_info);
++	int (*write_async)(struct mhi_ep_cntrl *mhi_cntrl, struct mhi_ep_buf_info *buf_info);
+ 
+ 	enum mhi_state mhi_state;
+ 
+diff --git a/include/linux/netlink.h b/include/linux/netlink.h
+index 75d7de34c90874..e8d713a37d1769 100644
+--- a/include/linux/netlink.h
++++ b/include/linux/netlink.h
+@@ -289,6 +289,7 @@ struct netlink_callback {
+ 	u16			answer_flags;
+ 	u32			min_dump_alloc;
+ 	unsigned int		prev_seq, seq;
++	int			flags;
+ 	bool			strict_check;
+ 	union {
+ 		u8		ctx[48];
+@@ -321,6 +322,7 @@ struct netlink_dump_control {
+ 	void *data;
+ 	struct module *module;
+ 	u32 min_dump_alloc;
++	int flags;
+ };
+ 
+ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
+diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
+index cd628c4b011e54..86d96e00c2e3de 100644
+--- a/include/linux/nfs_fs_sb.h
++++ b/include/linux/nfs_fs_sb.h
+@@ -238,6 +238,7 @@ struct nfs_server {
+ 	struct list_head	layouts;
+ 	struct list_head	delegations;
+ 	struct list_head	ss_copies;
++	struct list_head	ss_src_copies;
+ 
+ 	unsigned long		mig_gen;
+ 	unsigned long		mig_status;
+diff --git a/include/linux/pci.h b/include/linux/pci.h
+index 7b18a4b3efb0e7..2b7e45bae94089 100644
+--- a/include/linux/pci.h
++++ b/include/linux/pci.h
+@@ -1630,8 +1630,6 @@ struct msix_entry {
+ 	u16	entry;	/* Driver uses to specify entry, OS writes */
+ };
+ 
+-struct msi_domain_template;
+-
+ #ifdef CONFIG_PCI_MSI
+ int pci_msi_vec_count(struct pci_dev *dev);
+ void pci_disable_msi(struct pci_dev *dev);
+@@ -1664,11 +1662,6 @@ void pci_msix_free_irq(struct pci_dev *pdev, struct msi_map map);
+ void pci_free_irq_vectors(struct pci_dev *dev);
+ int pci_irq_vector(struct pci_dev *dev, unsigned int nr);
+ const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev, int vec);
+-bool pci_create_ims_domain(struct pci_dev *pdev, const struct msi_domain_template *template,
+-			   unsigned int hwsize, void *data);
+-struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev, union msi_instance_cookie *icookie,
+-				 const struct irq_affinity_desc *affdesc);
+-void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map);
+ 
+ #else
+ static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; }
+@@ -1732,25 +1725,6 @@ static inline const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev,
+ {
+ 	return cpu_possible_mask;
+ }
+-
+-static inline bool pci_create_ims_domain(struct pci_dev *pdev,
+-					 const struct msi_domain_template *template,
+-					 unsigned int hwsize, void *data)
+-{ return false; }
+-
+-static inline struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev,
+-					       union msi_instance_cookie *icookie,
+-					       const struct irq_affinity_desc *affdesc)
+-{
+-	struct msi_map map = { .index = -ENOSYS, };
+-
+-	return map;
+-}
+-
+-static inline void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map)
+-{
+-}
+-
+ #endif
+ 
+ /**
+@@ -2667,6 +2641,14 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev)
+ void pci_uevent_ers(struct pci_dev *pdev, enum  pci_ers_result err_type);
+ #endif
+ 
++struct msi_domain_template;
++
++bool pci_create_ims_domain(struct pci_dev *pdev, const struct msi_domain_template *template,
++			   unsigned int hwsize, void *data);
++struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev, union msi_instance_cookie *icookie,
++				 const struct irq_affinity_desc *affdesc);
++void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map);
++
+ #include <linux/dma-mapping.h>
+ 
+ #define pci_printk(level, pdev, fmt, arg...) \
+diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
+index abff4e3b6a58b9..3dce2be622e745 100644
+--- a/include/linux/pci_ids.h
++++ b/include/linux/pci_ids.h
+@@ -580,6 +580,8 @@
+ #define PCI_DEVICE_ID_AMD_19H_M78H_DF_F3 0x12fb
+ #define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3 0x12c3
+ #define PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3 0x16fb
++#define PCI_DEVICE_ID_AMD_1AH_M60H_DF_F3 0x124b
++#define PCI_DEVICE_ID_AMD_1AH_M70H_DF_F3 0x12bb
+ #define PCI_DEVICE_ID_AMD_MI200_DF_F3	0x14d3
+ #define PCI_DEVICE_ID_AMD_VANGOGH_USB	0x163a
+ #define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703
+@@ -2653,6 +2655,8 @@
+ #define PCI_DEVICE_ID_DCI_PCCOM8	0x0002
+ #define PCI_DEVICE_ID_DCI_PCCOM2	0x0004
+ 
++#define PCI_VENDOR_ID_GLENFLY		0x6766
++
+ #define PCI_VENDOR_ID_INTEL		0x8086
+ #define PCI_DEVICE_ID_INTEL_EESSC	0x0008
+ #define PCI_DEVICE_ID_INTEL_HDA_CML_LP	0x02c8
+diff --git a/include/linux/tcp.h b/include/linux/tcp.h
+index 3c5efeeb024f65..9b371aa7c79623 100644
+--- a/include/linux/tcp.h
++++ b/include/linux/tcp.h
+@@ -377,6 +377,14 @@ struct tcp_sock {
+ 				 * Total data bytes retransmitted
+ 				 */
+ 	u32	total_retrans;	/* Total retransmits for entire connection */
++	u32	rto_stamp;	/* Start time (ms) of last CA_Loss recovery */
++	u16	total_rto;	/* Total number of RTO timeouts, including
++				 * SYN/SYN-ACK and recurring timeouts.
++				 */
++	u16	total_rto_recoveries;	/* Total number of RTO recoveries,
++					 * including any unfinished recovery.
++					 */
++	u32	total_rto_time;	/* ms spent in (completed) RTO recoveries. */
+ 
+ 	u32	urg_seq;	/* Seq of received urgent pointer */
+ 	unsigned int		keepalive_time;	  /* time before keep alive takes place */
+diff --git a/include/net/mctp.h b/include/net/mctp.h
+index 2bff5f47ce82f1..1eb1b4393e46bd 100644
+--- a/include/net/mctp.h
++++ b/include/net/mctp.h
+@@ -293,7 +293,7 @@ void mctp_neigh_remove_dev(struct mctp_dev *mdev);
+ int mctp_routes_init(void);
+ void mctp_routes_exit(void);
+ 
+-void mctp_device_init(void);
++int mctp_device_init(void);
+ void mctp_device_exit(void);
+ 
+ #endif /* __NET_MCTP_H */
+diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
+index 6506221c5fe31f..c1fa6fee0acfa7 100644
+--- a/include/net/rtnetlink.h
++++ b/include/net/rtnetlink.h
+@@ -12,6 +12,7 @@ typedef int (*rtnl_dumpit_func)(struct sk_buff *, struct netlink_callback *);
+ enum rtnl_link_flags {
+ 	RTNL_FLAG_DOIT_UNLOCKED		= BIT(0),
+ 	RTNL_FLAG_BULK_DEL_SUPPORTED	= BIT(1),
++	RTNL_FLAG_DUMP_UNLOCKED		= BIT(2),
+ };
+ 
+ enum rtnl_kinds {
+@@ -27,6 +28,15 @@ static inline enum rtnl_kinds rtnl_msgtype_kind(int msgtype)
+ 	return msgtype & RTNL_KIND_MASK;
+ }
+ 
++struct rtnl_msg_handler {
++	struct module *owner;
++	int protocol;
++	int msgtype;
++	rtnl_doit_func doit;
++	rtnl_dumpit_func dumpit;
++	int flags;
++};
++
+ void rtnl_register(int protocol, int msgtype,
+ 		   rtnl_doit_func, rtnl_dumpit_func, unsigned int flags);
+ int rtnl_register_module(struct module *owner, int protocol, int msgtype,
+@@ -34,6 +44,14 @@ int rtnl_register_module(struct module *owner, int protocol, int msgtype,
+ int rtnl_unregister(int protocol, int msgtype);
+ void rtnl_unregister_all(int protocol);
+ 
++int __rtnl_register_many(const struct rtnl_msg_handler *handlers, int n);
++void __rtnl_unregister_many(const struct rtnl_msg_handler *handlers, int n);
++
++#define rtnl_register_many(handlers)				\
++	__rtnl_register_many(handlers, ARRAY_SIZE(handlers))
++#define rtnl_unregister_many(handlers)				\
++	__rtnl_unregister_many(handlers, ARRAY_SIZE(handlers))
++
+ static inline int rtnl_msg_family(const struct nlmsghdr *nlh)
+ {
+ 	if (nlmsg_len(nlh) >= sizeof(struct rtgenmsg))
+diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
+index 2799d44e5b9798..326d3a322c109e 100644
+--- a/include/net/sch_generic.h
++++ b/include/net/sch_generic.h
+@@ -845,7 +845,6 @@ static inline void qdisc_calculate_pkt_len(struct sk_buff *skb,
+ static inline int qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch,
+ 				struct sk_buff **to_free)
+ {
+-	qdisc_calculate_pkt_len(skb, sch);
+ 	return sch->enqueue(skb, sch, to_free);
+ }
+ 
+diff --git a/include/net/sock.h b/include/net/sock.h
+index 2a1aee50384828..c3961050b8e394 100644
+--- a/include/net/sock.h
++++ b/include/net/sock.h
+@@ -902,6 +902,8 @@ static inline void sk_add_bind2_node(struct sock *sk, struct hlist_head *list)
+ 	hlist_for_each_entry(__sk, list, sk_bind_node)
+ #define sk_for_each_bound_bhash2(__sk, list) \
+ 	hlist_for_each_entry(__sk, list, sk_bind2_node)
++#define sk_for_each_bound_safe(__sk, tmp, list) \
++	hlist_for_each_entry_safe(__sk, tmp, list, sk_bind_node)
+ 
+ /**
+  * sk_for_each_entry_offset_rcu - iterate over a list at a given struct offset
+diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
+index 9c8b6f611330c2..c38f4fe5e64cf4 100644
+--- a/include/scsi/scsi_device.h
++++ b/include/scsi/scsi_device.h
+@@ -216,7 +216,6 @@ struct scsi_device {
+ 	unsigned use_192_bytes_for_3f:1; /* ask for 192 bytes from page 0x3f */
+ 	unsigned no_start_on_add:1;	/* do not issue start on add */
+ 	unsigned allow_restart:1; /* issue START_UNIT in error handler */
+-	unsigned no_start_on_resume:1; /* Do not issue START_STOP_UNIT on resume */
+ 	unsigned start_stop_pwr_cond:1;	/* Set power cond. in START_STOP_UNIT */
+ 	unsigned no_uld_attach:1; /* disable connecting to upper level drivers */
+ 	unsigned select_no_atn:1;
+diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h
+index 4e5f35dc042a17..c0f2135968fec1 100644
+--- a/include/sound/cs35l56.h
++++ b/include/sound/cs35l56.h
+@@ -287,6 +287,7 @@ int cs35l56_runtime_suspend_common(struct cs35l56_base *cs35l56_base);
+ int cs35l56_runtime_resume_common(struct cs35l56_base *cs35l56_base, bool is_soundwire);
+ void cs35l56_init_cs_dsp(struct cs35l56_base *cs35l56_base, struct cs_dsp *cs_dsp);
+ int cs35l56_hw_init(struct cs35l56_base *cs35l56_base);
++int cs35l56_get_speaker_id(struct cs35l56_base *cs35l56_base);
+ int cs35l56_get_bclk_freq_id(unsigned int freq);
+ void cs35l56_fill_supply_names(struct regulator_bulk_data *data);
+ 
+diff --git a/include/sound/tas2781-tlv.h b/include/sound/tas2781-tlv.h
+index 4038dd421150a3..1dc59005d241fb 100644
+--- a/include/sound/tas2781-tlv.h
++++ b/include/sound/tas2781-tlv.h
+@@ -15,7 +15,7 @@
+ #ifndef __TAS2781_TLV_H__
+ #define __TAS2781_TLV_H__
+ 
+-static const DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0);
++static const __maybe_unused DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0);
+ static const DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0);
+ 
+ #endif
+diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
+index 879eeb0a084b4d..d1d08da6331ab5 100644
+--- a/include/uapi/linux/tcp.h
++++ b/include/uapi/linux/tcp.h
+@@ -289,6 +289,18 @@ struct tcp_info {
+ 				      */
+ 
+ 	__u32   tcpi_rehash;         /* PLB or timeout triggered rehash attempts */
++
++	__u16	tcpi_total_rto;	/* Total number of RTO timeouts, including
++				 * SYN/SYN-ACK and recurring timeouts.
++				 */
++	__u16	tcpi_total_rto_recoveries;	/* Total number of RTO
++						 * recoveries, including any
++						 * unfinished recovery.
++						 */
++	__u32	tcpi_total_rto_time;	/* Total time spent in RTO recoveries
++					 * in milliseconds, including any
++					 * unfinished recovery.
++					 */
+ };
+ 
+ /* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */
+diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
+index 7b0a100e1139ae..39d8d1fc5c2bc0 100644
+--- a/io_uring/io_uring.c
++++ b/io_uring/io_uring.c
+@@ -701,6 +701,21 @@ static void __io_cqring_overflow_flush(struct io_ring_ctx *ctx)
+ 		memcpy(cqe, &ocqe->cqe, cqe_size);
+ 		list_del(&ocqe->list);
+ 		kfree(ocqe);
++
++		/*
++		 * For silly syzbot cases that deliberately overflow by huge
++		 * amounts, check if we need to resched and drop and
++		 * reacquire the locks if so. Nothing real would ever hit this.
++		 * Ideally we'd have a non-posting unlock for this, but hard
++		 * to care for a non-real case.
++		 */
++		if (need_resched()) {
++			io_cq_unlock_post(ctx);
++			mutex_unlock(&ctx->uring_lock);
++			cond_resched();
++			mutex_lock(&ctx->uring_lock);
++			io_cq_lock(ctx);
++		}
+ 	}
+ 
+ 	if (list_empty(&ctx->cq_overflow_list)) {
+diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c
+index c9843dde690813..1811efcfbd6e3b 100644
+--- a/kernel/bpf/arraymap.c
++++ b/kernel/bpf/arraymap.c
+@@ -73,6 +73,9 @@ int array_map_alloc_check(union bpf_attr *attr)
+ 	/* avoid overflow on round_up(map->value_size) */
+ 	if (attr->value_size > INT_MAX)
+ 		return -E2BIG;
++	/* percpu map value size is bound by PCPU_MIN_UNIT_SIZE */
++	if (percpu && round_up(attr->value_size, 8) > PCPU_MIN_UNIT_SIZE)
++		return -E2BIG;
+ 
+ 	return 0;
+ }
+diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
+index 4124805ad7ba5f..58ee17f429a33a 100644
+--- a/kernel/bpf/core.c
++++ b/kernel/bpf/core.c
+@@ -2259,6 +2259,7 @@ bool bpf_prog_map_compatible(struct bpf_map *map,
+ {
+ 	enum bpf_prog_type prog_type = resolve_prog_type(fp);
+ 	bool ret;
++	struct bpf_prog_aux *aux = fp->aux;
+ 
+ 	if (fp->kprobe_override)
+ 		return false;
+@@ -2268,7 +2269,7 @@ bool bpf_prog_map_compatible(struct bpf_map *map,
+ 	 * in the case of devmap and cpumap). Until device checks
+ 	 * are implemented, prohibit adding dev-bound programs to program maps.
+ 	 */
+-	if (bpf_prog_is_dev_bound(fp->aux))
++	if (bpf_prog_is_dev_bound(aux))
+ 		return false;
+ 
+ 	spin_lock(&map->owner.lock);
+@@ -2278,12 +2279,26 @@ bool bpf_prog_map_compatible(struct bpf_map *map,
+ 		 */
+ 		map->owner.type  = prog_type;
+ 		map->owner.jited = fp->jited;
+-		map->owner.xdp_has_frags = fp->aux->xdp_has_frags;
++		map->owner.xdp_has_frags = aux->xdp_has_frags;
++		map->owner.attach_func_proto = aux->attach_func_proto;
+ 		ret = true;
+ 	} else {
+ 		ret = map->owner.type  == prog_type &&
+ 		      map->owner.jited == fp->jited &&
+-		      map->owner.xdp_has_frags == fp->aux->xdp_has_frags;
++		      map->owner.xdp_has_frags == aux->xdp_has_frags;
++		if (ret &&
++		    map->owner.attach_func_proto != aux->attach_func_proto) {
++			switch (prog_type) {
++			case BPF_PROG_TYPE_TRACING:
++			case BPF_PROG_TYPE_LSM:
++			case BPF_PROG_TYPE_EXT:
++			case BPF_PROG_TYPE_STRUCT_OPS:
++				ret = false;
++				break;
++			default:
++				break;
++			}
++		}
+ 	}
+ 	spin_unlock(&map->owner.lock);
+ 
+diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c
+index 85cd17ca382905..7c64ad4f3732be 100644
+--- a/kernel/bpf/hashtab.c
++++ b/kernel/bpf/hashtab.c
+@@ -458,6 +458,9 @@ static int htab_map_alloc_check(union bpf_attr *attr)
+ 		 * kmalloc-able later in htab_map_update_elem()
+ 		 */
+ 		return -E2BIG;
++	/* percpu map value size is bound by PCPU_MIN_UNIT_SIZE */
++	if (percpu && round_up(attr->value_size, 8) > PCPU_MIN_UNIT_SIZE)
++		return -E2BIG;
+ 
+ 	return 0;
+ }
+diff --git a/kernel/kthread.c b/kernel/kthread.c
+index ac03bc55e17caf..980e6b325b7dc7 100644
+--- a/kernel/kthread.c
++++ b/kernel/kthread.c
+@@ -622,6 +622,8 @@ void kthread_unpark(struct task_struct *k)
+ {
+ 	struct kthread *kthread = to_kthread(k);
+ 
++	if (!test_bit(KTHREAD_SHOULD_PARK, &kthread->flags))
++		return;
+ 	/*
+ 	 * Newly created kthread was parked when the CPU was offline.
+ 	 * The binding was lost and we need to set it again.
+diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
+index 8541084eeba504..3d7b119f6e2a36 100644
+--- a/kernel/rcu/tree.c
++++ b/kernel/rcu/tree.c
+@@ -2727,8 +2727,10 @@ __call_rcu_common(struct rcu_head *head, rcu_callback_t func, bool lazy_in)
+ 	}
+ 
+ 	check_cb_ovld(rdp);
+-	if (rcu_nocb_try_bypass(rdp, head, &was_alldone, flags, lazy))
++	if (rcu_nocb_try_bypass(rdp, head, &was_alldone, flags, lazy)) {
++		local_irq_restore(flags);
+ 		return; // Enqueued onto ->nocb_bypass, so just leave.
++	}
+ 	// If no-CBs CPU gets here, rcu_nocb_try_bypass() acquired ->nocb_lock.
+ 	rcu_segcblist_enqueue(&rdp->cblist, head);
+ 	if (__is_kvfree_rcu_offset((unsigned long)func))
+@@ -2746,8 +2748,8 @@ __call_rcu_common(struct rcu_head *head, rcu_callback_t func, bool lazy_in)
+ 		__call_rcu_nocb_wake(rdp, was_alldone, flags); /* unlocks */
+ 	} else {
+ 		__call_rcu_core(rdp, head, flags);
+-		local_irq_restore(flags);
+ 	}
++	local_irq_restore(flags);
+ }
+ 
+ #ifdef CONFIG_RCU_LAZY
+@@ -4626,8 +4628,9 @@ void rcutree_migrate_callbacks(int cpu)
+ 		__call_rcu_nocb_wake(my_rdp, true, flags);
+ 	} else {
+ 		rcu_nocb_unlock(my_rdp); /* irqs remain disabled. */
+-		raw_spin_unlock_irqrestore_rcu_node(my_rnp, flags);
++		raw_spin_unlock_rcu_node(my_rnp); /* irqs remain disabled. */
+ 	}
++	local_irq_restore(flags);
+ 	if (needwake)
+ 		rcu_gp_kthread_wake();
+ 	lockdep_assert_irqs_enabled();
+diff --git a/kernel/rcu/tree_nocb.h b/kernel/rcu/tree_nocb.h
+index e019f166daa61b..8993b2322be2b0 100644
+--- a/kernel/rcu/tree_nocb.h
++++ b/kernel/rcu/tree_nocb.h
+@@ -516,9 +516,7 @@ static bool rcu_nocb_try_bypass(struct rcu_data *rdp, struct rcu_head *rhp,
+ 	// 2. Both of these conditions are met:
+ 	//    a. The bypass list previously had only lazy CBs, and:
+ 	//    b. The new CB is non-lazy.
+-	if (ncbs && (!bypass_is_lazy || lazy)) {
+-		local_irq_restore(flags);
+-	} else {
++	if (!ncbs || (bypass_is_lazy && !lazy)) {
+ 		// No-CBs GP kthread might be indefinitely asleep, if so, wake.
+ 		rcu_nocb_lock(rdp); // Rare during call_rcu() flood.
+ 		if (!rcu_segcblist_pend_cbs(&rdp->cblist)) {
+@@ -528,7 +526,7 @@ static bool rcu_nocb_try_bypass(struct rcu_data *rdp, struct rcu_head *rhp,
+ 		} else {
+ 			trace_rcu_nocb_wake(rcu_state.name, rdp->cpu,
+ 					    TPS("FirstBQnoWake"));
+-			rcu_nocb_unlock_irqrestore(rdp, flags);
++			rcu_nocb_unlock(rdp);
+ 		}
+ 	}
+ 	return true; // Callback already enqueued.
+@@ -554,7 +552,7 @@ static void __call_rcu_nocb_wake(struct rcu_data *rdp, bool was_alldone,
+ 	// If we are being polled or there is no kthread, just leave.
+ 	t = READ_ONCE(rdp->nocb_gp_kthread);
+ 	if (rcu_nocb_poll || !t) {
+-		rcu_nocb_unlock_irqrestore(rdp, flags);
++		rcu_nocb_unlock(rdp);
+ 		trace_rcu_nocb_wake(rcu_state.name, rdp->cpu,
+ 				    TPS("WakeNotPoll"));
+ 		return;
+@@ -567,17 +565,23 @@ static void __call_rcu_nocb_wake(struct rcu_data *rdp, bool was_alldone,
+ 		rdp->qlen_last_fqs_check = len;
+ 		// Only lazy CBs in bypass list
+ 		if (lazy_len && bypass_len == lazy_len) {
+-			rcu_nocb_unlock_irqrestore(rdp, flags);
++			rcu_nocb_unlock(rdp);
+ 			wake_nocb_gp_defer(rdp, RCU_NOCB_WAKE_LAZY,
+ 					   TPS("WakeLazy"));
+-		} else if (!irqs_disabled_flags(flags)) {
++		} else if (!irqs_disabled_flags(flags) && cpu_online(rdp->cpu)) {
+ 			/* ... if queue was empty ... */
+-			rcu_nocb_unlock_irqrestore(rdp, flags);
++			rcu_nocb_unlock(rdp);
+ 			wake_nocb_gp(rdp, false);
+ 			trace_rcu_nocb_wake(rcu_state.name, rdp->cpu,
+ 					    TPS("WakeEmpty"));
+ 		} else {
+-			rcu_nocb_unlock_irqrestore(rdp, flags);
++			/*
++			 * Don't do the wake-up upfront on fragile paths.
++			 * Also offline CPUs can't call swake_up_one_online() from
++			 * (soft-)IRQs. Rely on the final deferred wake-up from
++			 * rcutree_report_cpu_dead()
++			 */
++			rcu_nocb_unlock(rdp);
+ 			wake_nocb_gp_defer(rdp, RCU_NOCB_WAKE,
+ 					   TPS("WakeEmptyIsDeferred"));
+ 		}
+@@ -595,15 +599,15 @@ static void __call_rcu_nocb_wake(struct rcu_data *rdp, bool was_alldone,
+ 		if ((rdp->nocb_cb_sleep ||
+ 		     !rcu_segcblist_ready_cbs(&rdp->cblist)) &&
+ 		    !timer_pending(&rdp->nocb_timer)) {
+-			rcu_nocb_unlock_irqrestore(rdp, flags);
++			rcu_nocb_unlock(rdp);
+ 			wake_nocb_gp_defer(rdp, RCU_NOCB_WAKE_FORCE,
+ 					   TPS("WakeOvfIsDeferred"));
+ 		} else {
+-			rcu_nocb_unlock_irqrestore(rdp, flags);
++			rcu_nocb_unlock(rdp);
+ 			trace_rcu_nocb_wake(rcu_state.name, rdp->cpu, TPS("WakeNot"));
+ 		}
+ 	} else {
+-		rcu_nocb_unlock_irqrestore(rdp, flags);
++		rcu_nocb_unlock(rdp);
+ 		trace_rcu_nocb_wake(rcu_state.name, rdp->cpu, TPS("WakeNot"));
+ 	}
+ }
+diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
+index be878005e34499..4f93d57cc02990 100644
+--- a/kernel/trace/trace.c
++++ b/kernel/trace/trace.c
+@@ -2316,6 +2316,10 @@ struct saved_cmdlines_buffer {
+ };
+ static struct saved_cmdlines_buffer *savedcmd;
+ 
++/* Holds the size of a cmdline and pid element */
++#define SAVED_CMDLINE_MAP_ELEMENT_SIZE(s)			\
++	(TASK_COMM_LEN + sizeof((s)->map_cmdline_to_pid[0]))
++
+ static inline char *get_saved_cmdlines(int idx)
+ {
+ 	return &savedcmd->saved_cmdlines[idx * TASK_COMM_LEN];
+@@ -2330,7 +2334,6 @@ static void free_saved_cmdlines_buffer(struct saved_cmdlines_buffer *s)
+ {
+ 	int order = get_order(sizeof(*s) + s->cmdline_num * TASK_COMM_LEN);
+ 
+-	kfree(s->map_cmdline_to_pid);
+ 	kmemleak_free(s);
+ 	free_pages((unsigned long)s, order);
+ }
+@@ -2343,7 +2346,7 @@ static struct saved_cmdlines_buffer *allocate_cmdlines_buffer(unsigned int val)
+ 	int order;
+ 
+ 	/* Figure out how much is needed to hold the given number of cmdlines */
+-	orig_size = sizeof(*s) + val * TASK_COMM_LEN;
++	orig_size = sizeof(*s) + val * SAVED_CMDLINE_MAP_ELEMENT_SIZE(s);
+ 	order = get_order(orig_size);
+ 	size = 1 << (order + PAGE_SHIFT);
+ 	page = alloc_pages(GFP_KERNEL, order);
+@@ -2355,16 +2358,11 @@ static struct saved_cmdlines_buffer *allocate_cmdlines_buffer(unsigned int val)
+ 	memset(s, 0, sizeof(*s));
+ 
+ 	/* Round up to actual allocation */
+-	val = (size - sizeof(*s)) / TASK_COMM_LEN;
++	val = (size - sizeof(*s)) / SAVED_CMDLINE_MAP_ELEMENT_SIZE(s);
+ 	s->cmdline_num = val;
+ 
+-	s->map_cmdline_to_pid = kmalloc_array(val,
+-					      sizeof(*s->map_cmdline_to_pid),
+-					      GFP_KERNEL);
+-	if (!s->map_cmdline_to_pid) {
+-		free_saved_cmdlines_buffer(s);
+-		return NULL;
+-	}
++	/* Place map_cmdline_to_pid array right after saved_cmdlines */
++	s->map_cmdline_to_pid = (unsigned *)&s->saved_cmdlines[val * TASK_COMM_LEN];
+ 
+ 	s->cmdline_idx = 0;
+ 	memset(&s->map_pid_to_cmdline, NO_CMDLINE_MAP,
+diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
+index 3b7d3e9eb6ea45..db575094c49825 100644
+--- a/kernel/trace/trace_output.c
++++ b/kernel/trace/trace_output.c
+@@ -1587,12 +1587,11 @@ static enum print_line_t trace_print_print(struct trace_iterator *iter,
+ {
+ 	struct print_entry *field;
+ 	struct trace_seq *s = &iter->seq;
+-	int max = iter->ent_size - offsetof(struct print_entry, buf);
+ 
+ 	trace_assign_type(field, iter->ent);
+ 
+ 	seq_print_ip_sym(s, field->ip, flags);
+-	trace_seq_printf(s, ": %.*s", max, field->buf);
++	trace_seq_printf(s, ": %s", field->buf);
+ 
+ 	return trace_handle_return(s);
+ }
+@@ -1601,11 +1600,10 @@ static enum print_line_t trace_print_raw(struct trace_iterator *iter, int flags,
+ 					 struct trace_event *event)
+ {
+ 	struct print_entry *field;
+-	int max = iter->ent_size - offsetof(struct print_entry, buf);
+ 
+ 	trace_assign_type(field, iter->ent);
+ 
+-	trace_seq_printf(&iter->seq, "# %lx %.*s", field->ip, max, field->buf);
++	trace_seq_printf(&iter->seq, "# %lx %s", field->ip, field->buf);
+ 
+ 	return trace_handle_return(&iter->seq);
+ }
+diff --git a/lib/bootconfig.c b/lib/bootconfig.c
+index 8841554432d5b4..97f8911ea339e6 100644
+--- a/lib/bootconfig.c
++++ b/lib/bootconfig.c
+@@ -901,7 +901,8 @@ static int __init xbc_parse_tree(void)
+ }
+ 
+ /**
+- * xbc_exit() - Clean up all parsed bootconfig
++ * _xbc_exit() - Clean up all parsed bootconfig
++ * @early: Set true if this is called before budy system is initialized.
+  *
+  * This clears all data structures of parsed bootconfig on memory.
+  * If you need to reuse xbc_init() with new boot config, you can
+diff --git a/lib/build_OID_registry b/lib/build_OID_registry
+index 56d8bafeb848b0..8267e8d71338b0 100755
+--- a/lib/build_OID_registry
++++ b/lib/build_OID_registry
+@@ -38,7 +38,9 @@ close IN_FILE || die;
+ #
+ open C_FILE, ">$ARGV[1]" or die;
+ print C_FILE "/*\n";
+-print C_FILE " * Automatically generated by ", $0 =~ s#^\Q$abs_srctree/\E##r, ".  Do not edit\n";
++my $scriptname = $0;
++$scriptname =~ s#^\Q$abs_srctree/\E##;
++print C_FILE " * Automatically generated by ", $scriptname, ".  Do not edit\n";
+ print C_FILE " */\n";
+ 
+ #
+diff --git a/mm/secretmem.c b/mm/secretmem.c
+index 3afb5ad701e14a..399552814fd0ff 100644
+--- a/mm/secretmem.c
++++ b/mm/secretmem.c
+@@ -238,7 +238,7 @@ SYSCALL_DEFINE1(memfd_secret, unsigned int, flags)
+ 	/* make sure local flags do not confict with global fcntl.h */
+ 	BUILD_BUG_ON(SECRETMEM_FLAGS_MASK & O_CLOEXEC);
+ 
+-	if (!secretmem_enable)
++	if (!secretmem_enable || !can_set_direct_map())
+ 		return -ENOSYS;
+ 
+ 	if (flags & ~(SECRETMEM_FLAGS_MASK | O_CLOEXEC))
+@@ -280,7 +280,7 @@ static struct file_system_type secretmem_fs = {
+ 
+ static int __init secretmem_init(void)
+ {
+-	if (!secretmem_enable)
++	if (!secretmem_enable || !can_set_direct_map())
+ 		return 0;
+ 
+ 	secretmem_mnt = kern_mount(&secretmem_fs);
+diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
+index ed95a87ef9ab6d..35d739988ce3e4 100644
+--- a/net/bluetooth/hci_conn.c
++++ b/net/bluetooth/hci_conn.c
+@@ -290,6 +290,9 @@ static int hci_enhanced_setup_sync(struct hci_dev *hdev, void *data)
+ 
+ 	kfree(conn_handle);
+ 
++	if (!hci_conn_valid(hdev, conn))
++		return -ECANCELED;
++
+ 	bt_dev_dbg(hdev, "hcon %p", conn);
+ 
+ 	configure_datapath_sync(hdev, &conn->codec);
+diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
+index f787b0eb7d669b..d4e607bf35baff 100644
+--- a/net/bluetooth/hci_core.c
++++ b/net/bluetooth/hci_core.c
+@@ -711,8 +711,8 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
+ 
+ 	switch (cmd) {
+ 	case HCISETAUTH:
+-		err = __hci_cmd_sync_status(hdev, HCI_OP_WRITE_AUTH_ENABLE,
+-					    1, &dr.dev_opt, HCI_CMD_TIMEOUT);
++		err = hci_cmd_sync_status(hdev, HCI_OP_WRITE_AUTH_ENABLE,
++					  1, &dr.dev_opt, HCI_CMD_TIMEOUT);
+ 		break;
+ 
+ 	case HCISETENCRYPT:
+@@ -723,23 +723,21 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
+ 
+ 		if (!test_bit(HCI_AUTH, &hdev->flags)) {
+ 			/* Auth must be enabled first */
+-			err = __hci_cmd_sync_status(hdev,
+-						    HCI_OP_WRITE_AUTH_ENABLE,
+-						    1, &dr.dev_opt,
+-						    HCI_CMD_TIMEOUT);
++			err = hci_cmd_sync_status(hdev,
++						  HCI_OP_WRITE_AUTH_ENABLE,
++						  1, &dr.dev_opt,
++						  HCI_CMD_TIMEOUT);
+ 			if (err)
+ 				break;
+ 		}
+ 
+-		err = __hci_cmd_sync_status(hdev, HCI_OP_WRITE_ENCRYPT_MODE,
+-					    1, &dr.dev_opt,
+-					    HCI_CMD_TIMEOUT);
++		err = hci_cmd_sync_status(hdev, HCI_OP_WRITE_ENCRYPT_MODE,
++					  1, &dr.dev_opt, HCI_CMD_TIMEOUT);
+ 		break;
+ 
+ 	case HCISETSCAN:
+-		err = __hci_cmd_sync_status(hdev, HCI_OP_WRITE_SCAN_ENABLE,
+-					    1, &dr.dev_opt,
+-					    HCI_CMD_TIMEOUT);
++		err = hci_cmd_sync_status(hdev, HCI_OP_WRITE_SCAN_ENABLE,
++					  1, &dr.dev_opt, HCI_CMD_TIMEOUT);
+ 
+ 		/* Ensure that the connectable and discoverable states
+ 		 * get correctly modified as this was a non-mgmt change.
+@@ -751,9 +749,8 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
+ 	case HCISETLINKPOL:
+ 		policy = cpu_to_le16(dr.dev_opt);
+ 
+-		err = __hci_cmd_sync_status(hdev, HCI_OP_WRITE_DEF_LINK_POLICY,
+-					    2, &policy,
+-					    HCI_CMD_TIMEOUT);
++		err = hci_cmd_sync_status(hdev, HCI_OP_WRITE_DEF_LINK_POLICY,
++					  2, &policy, HCI_CMD_TIMEOUT);
+ 		break;
+ 
+ 	case HCISETLINKMODE:
+diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
+index 29aa07e9db9d71..cbff37b3273407 100644
+--- a/net/bluetooth/rfcomm/sock.c
++++ b/net/bluetooth/rfcomm/sock.c
+@@ -865,9 +865,7 @@ static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned lon
+ 
+ 	if (err == -ENOIOCTLCMD) {
+ #ifdef CONFIG_BT_RFCOMM_TTY
+-		lock_sock(sk);
+ 		err = rfcomm_dev_ioctl(sk, cmd, (void __user *) arg);
+-		release_sock(sk);
+ #else
+ 		err = -EOPNOTSUPP;
+ #endif
+diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c
+index 68d55386130326..a1cfa75bbadb97 100644
+--- a/net/bridge/br_netfilter_hooks.c
++++ b/net/bridge/br_netfilter_hooks.c
+@@ -33,6 +33,7 @@
+ #include <net/ip.h>
+ #include <net/ipv6.h>
+ #include <net/addrconf.h>
++#include <net/dst_metadata.h>
+ #include <net/route.h>
+ #include <net/netfilter/br_netfilter.h>
+ #include <net/netns/generic.h>
+@@ -871,6 +872,10 @@ static int br_nf_dev_queue_xmit(struct net *net, struct sock *sk, struct sk_buff
+ 		return br_dev_queue_push_xmit(net, sk, skb);
+ 	}
+ 
++	/* Fragmentation on metadata/template dst is not supported */
++	if (unlikely(!skb_valid_dst(skb)))
++		goto drop;
++
+ 	/* This is wrong! We should preserve the original fragment
+ 	 * boundaries by preserving frag_list rather than refragmenting.
+ 	 */
+diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
+index 4488faf059a363..4b80ec5ae57003 100644
+--- a/net/bridge/br_netlink.c
++++ b/net/bridge/br_netlink.c
+@@ -1905,7 +1905,10 @@ int __init br_netlink_init(void)
+ {
+ 	int err;
+ 
+-	br_vlan_rtnl_init();
++	err = br_vlan_rtnl_init();
++	if (err)
++		goto out;
++
+ 	rtnl_af_register(&br_af_ops);
+ 
+ 	err = rtnl_link_register(&br_link_ops);
+@@ -1916,6 +1919,7 @@ int __init br_netlink_init(void)
+ 
+ out_af:
+ 	rtnl_af_unregister(&br_af_ops);
++out:
+ 	return err;
+ }
+ 
+diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
+index e4f1a08322da92..72d80fd943a8a2 100644
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -1547,7 +1547,7 @@ void br_vlan_get_stats(const struct net_bridge_vlan *v,
+ void br_vlan_port_event(struct net_bridge_port *p, unsigned long event);
+ int br_vlan_bridge_event(struct net_device *dev, unsigned long event,
+ 			 void *ptr);
+-void br_vlan_rtnl_init(void);
++int br_vlan_rtnl_init(void);
+ void br_vlan_rtnl_uninit(void);
+ void br_vlan_notify(const struct net_bridge *br,
+ 		    const struct net_bridge_port *p,
+@@ -1778,8 +1778,9 @@ static inline int br_vlan_bridge_event(struct net_device *dev,
+ 	return 0;
+ }
+ 
+-static inline void br_vlan_rtnl_init(void)
++static inline int br_vlan_rtnl_init(void)
+ {
++	return 0;
+ }
+ 
+ static inline void br_vlan_rtnl_uninit(void)
+diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
+index 15f44d026e75a8..be714b4d7b4307 100644
+--- a/net/bridge/br_vlan.c
++++ b/net/bridge/br_vlan.c
+@@ -2296,19 +2296,18 @@ static int br_vlan_rtm_process(struct sk_buff *skb, struct nlmsghdr *nlh,
+ 	return err;
+ }
+ 
+-void br_vlan_rtnl_init(void)
++static const struct rtnl_msg_handler br_vlan_rtnl_msg_handlers[] = {
++	{THIS_MODULE, PF_BRIDGE, RTM_NEWVLAN, br_vlan_rtm_process, NULL, 0},
++	{THIS_MODULE, PF_BRIDGE, RTM_DELVLAN, br_vlan_rtm_process, NULL, 0},
++	{THIS_MODULE, PF_BRIDGE, RTM_GETVLAN, NULL, br_vlan_rtm_dump, 0},
++};
++
++int br_vlan_rtnl_init(void)
+ {
+-	rtnl_register_module(THIS_MODULE, PF_BRIDGE, RTM_GETVLAN, NULL,
+-			     br_vlan_rtm_dump, 0);
+-	rtnl_register_module(THIS_MODULE, PF_BRIDGE, RTM_NEWVLAN,
+-			     br_vlan_rtm_process, NULL, 0);
+-	rtnl_register_module(THIS_MODULE, PF_BRIDGE, RTM_DELVLAN,
+-			     br_vlan_rtm_process, NULL, 0);
++	return rtnl_register_many(br_vlan_rtnl_msg_handlers);
+ }
+ 
+ void br_vlan_rtnl_uninit(void)
+ {
+-	rtnl_unregister(PF_BRIDGE, RTM_GETVLAN);
+-	rtnl_unregister(PF_BRIDGE, RTM_NEWVLAN);
+-	rtnl_unregister(PF_BRIDGE, RTM_DELVLAN);
++	rtnl_unregister_many(br_vlan_rtnl_msg_handlers);
+ }
+diff --git a/net/ceph/messenger_v2.c b/net/ceph/messenger_v2.c
+index a901cae2f1060a..f9ed6bf6c4776a 100644
+--- a/net/ceph/messenger_v2.c
++++ b/net/ceph/messenger_v2.c
+@@ -2038,6 +2038,9 @@ static int prepare_sparse_read_data(struct ceph_connection *con)
+ 	if (!con_secure(con))
+ 		con->in_data_crc = -1;
+ 
++	ceph_msg_data_cursor_init(&con->v2.in_cursor, msg,
++				  msg->sparse_read_total);
++
+ 	reset_in_kvecs(con);
+ 	con->v2.in_state = IN_S_PREPARE_SPARSE_DATA_CONT;
+ 	con->v2.data_len_remain = data_len(msg);
+diff --git a/net/core/dst.c b/net/core/dst.c
+index 980e2fd2f013b3..137b8d1c72203a 100644
+--- a/net/core/dst.c
++++ b/net/core/dst.c
+@@ -109,9 +109,6 @@ struct dst_entry *dst_destroy(struct dst_entry * dst)
+ 		child = xdst->child;
+ 	}
+ #endif
+-	if (!(dst->flags & DST_NOCOUNT))
+-		dst_entries_add(dst->ops, -1);
+-
+ 	if (dst->ops->destroy)
+ 		dst->ops->destroy(dst);
+ 	netdev_put(dst->dev, &dst->dev_tracker);
+@@ -161,17 +158,27 @@ void dst_dev_put(struct dst_entry *dst)
+ }
+ EXPORT_SYMBOL(dst_dev_put);
+ 
++static void dst_count_dec(struct dst_entry *dst)
++{
++	if (!(dst->flags & DST_NOCOUNT))
++		dst_entries_add(dst->ops, -1);
++}
++
+ void dst_release(struct dst_entry *dst)
+ {
+-	if (dst && rcuref_put(&dst->__rcuref))
++	if (dst && rcuref_put(&dst->__rcuref)) {
++		dst_count_dec(dst);
+ 		call_rcu_hurry(&dst->rcu_head, dst_destroy_rcu);
++	}
+ }
+ EXPORT_SYMBOL(dst_release);
+ 
+ void dst_release_immediate(struct dst_entry *dst)
+ {
+-	if (dst && rcuref_put(&dst->__rcuref))
++	if (dst && rcuref_put(&dst->__rcuref)) {
++		dst_count_dec(dst);
+ 		dst_destroy(dst);
++	}
+ }
+ EXPORT_SYMBOL(dst_release_immediate);
+ 
+diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
+index 8573dad6d81716..c76c54879fdddb 100644
+--- a/net/core/rtnetlink.c
++++ b/net/core/rtnetlink.c
+@@ -389,6 +389,35 @@ void rtnl_unregister_all(int protocol)
+ }
+ EXPORT_SYMBOL_GPL(rtnl_unregister_all);
+ 
++int __rtnl_register_many(const struct rtnl_msg_handler *handlers, int n)
++{
++	const struct rtnl_msg_handler *handler;
++	int i, err;
++
++	for (i = 0, handler = handlers; i < n; i++, handler++) {
++		err = rtnl_register_internal(handler->owner, handler->protocol,
++					     handler->msgtype, handler->doit,
++					     handler->dumpit, handler->flags);
++		if (err) {
++			__rtnl_unregister_many(handlers, i);
++			break;
++		}
++	}
++
++	return err;
++}
++EXPORT_SYMBOL_GPL(__rtnl_register_many);
++
++void __rtnl_unregister_many(const struct rtnl_msg_handler *handlers, int n)
++{
++	const struct rtnl_msg_handler *handler;
++	int i;
++
++	for (i = n - 1, handler = handlers + n - 1; i >= 0; i--, handler--)
++		rtnl_unregister(handler->protocol, handler->msgtype);
++}
++EXPORT_SYMBOL_GPL(__rtnl_unregister_many);
++
+ static LIST_HEAD(link_ops);
+ 
+ static const struct rtnl_link_ops *rtnl_link_ops_get(const char *kind)
+@@ -6376,6 +6405,7 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
+ 		}
+ 		owner = link->owner;
+ 		dumpit = link->dumpit;
++		flags = link->flags;
+ 
+ 		if (type == RTM_GETLINK - RTM_BASE)
+ 			min_dump_alloc = rtnl_calcit(skb, nlh);
+@@ -6393,6 +6423,7 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
+ 				.dump		= dumpit,
+ 				.min_dump_alloc	= min_dump_alloc,
+ 				.module		= owner,
++				.flags		= flags,
+ 			};
+ 			err = netlink_dump_start(rtnl, skb, nlh, &c);
+ 			/* netlink_dump_start() will keep a reference on
+diff --git a/net/ipv4/netfilter/nf_reject_ipv4.c b/net/ipv4/netfilter/nf_reject_ipv4.c
+index fc761915c5f6fb..675b5bbed638e4 100644
+--- a/net/ipv4/netfilter/nf_reject_ipv4.c
++++ b/net/ipv4/netfilter/nf_reject_ipv4.c
+@@ -239,9 +239,8 @@ static int nf_reject_fill_skb_dst(struct sk_buff *skb_in)
+ void nf_send_reset(struct net *net, struct sock *sk, struct sk_buff *oldskb,
+ 		   int hook)
+ {
+-	struct sk_buff *nskb;
+-	struct iphdr *niph;
+ 	const struct tcphdr *oth;
++	struct sk_buff *nskb;
+ 	struct tcphdr _oth;
+ 
+ 	oth = nf_reject_ip_tcphdr_get(oldskb, &_oth, hook);
+@@ -266,14 +265,12 @@ void nf_send_reset(struct net *net, struct sock *sk, struct sk_buff *oldskb,
+ 	nskb->mark = IP4_REPLY_MARK(net, oldskb->mark);
+ 
+ 	skb_reserve(nskb, LL_MAX_HEADER);
+-	niph = nf_reject_iphdr_put(nskb, oldskb, IPPROTO_TCP,
+-				   ip4_dst_hoplimit(skb_dst(nskb)));
++	nf_reject_iphdr_put(nskb, oldskb, IPPROTO_TCP,
++			    ip4_dst_hoplimit(skb_dst(nskb)));
+ 	nf_reject_ip_tcphdr_put(nskb, oldskb, oth);
+ 	if (ip_route_me_harder(net, sk, nskb, RTN_UNSPEC))
+ 		goto free_nskb;
+ 
+-	niph = ip_hdr(nskb);
+-
+ 	/* "Never happens" */
+ 	if (nskb->len > dst_mtu(skb_dst(nskb)))
+ 		goto free_nskb;
+@@ -290,6 +287,7 @@ void nf_send_reset(struct net *net, struct sock *sk, struct sk_buff *oldskb,
+ 	 */
+ 	if (nf_bridge_info_exists(oldskb)) {
+ 		struct ethhdr *oeth = eth_hdr(oldskb);
++		struct iphdr *niph = ip_hdr(nskb);
+ 		struct net_device *br_indev;
+ 
+ 		br_indev = nf_bridge_get_physindev(oldskb, net);
+diff --git a/net/ipv4/netfilter/nft_fib_ipv4.c b/net/ipv4/netfilter/nft_fib_ipv4.c
+index 9eee535c64dd48..ba233fdd81886b 100644
+--- a/net/ipv4/netfilter/nft_fib_ipv4.c
++++ b/net/ipv4/netfilter/nft_fib_ipv4.c
+@@ -66,6 +66,7 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,
+ 		.flowi4_scope = RT_SCOPE_UNIVERSE,
+ 		.flowi4_iif = LOOPBACK_IFINDEX,
+ 		.flowi4_uid = sock_net_uid(nft_net(pkt), NULL),
++		.flowi4_l3mdev = l3mdev_master_ifindex_rcu(nft_in(pkt)),
+ 	};
+ 	const struct net_device *oif;
+ 	const struct net_device *found;
+@@ -84,9 +85,6 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,
+ 	else
+ 		oif = NULL;
+ 
+-	if (priv->flags & NFTA_FIB_F_IIF)
+-		fl4.flowi4_l3mdev = l3mdev_master_ifindex_rcu(oif);
+-
+ 	if (nft_hook(pkt) == NF_INET_PRE_ROUTING &&
+ 	    nft_fib_is_loopback(pkt->skb, nft_in(pkt))) {
+ 		nft_fib_store_result(dest, priv, nft_in(pkt));
+diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
+index 1e3202f2b7a87f..75371928d94f6e 100644
+--- a/net/ipv4/tcp.c
++++ b/net/ipv4/tcp.c
+@@ -3851,6 +3851,15 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info)
+ 	info->tcpi_rcv_wnd = tp->rcv_wnd;
+ 	info->tcpi_rehash = tp->plb_rehash + tp->timeout_rehash;
+ 	info->tcpi_fastopen_client_fail = tp->fastopen_client_fail;
++
++	info->tcpi_total_rto = tp->total_rto;
++	info->tcpi_total_rto_recoveries = tp->total_rto_recoveries;
++	info->tcpi_total_rto_time = tp->total_rto_time;
++	if (tp->rto_stamp) {
++		info->tcpi_total_rto_time += tcp_time_stamp_raw() -
++						tp->rto_stamp;
++	}
++
+ 	unlock_sock_fast(sk, slow);
+ }
+ EXPORT_SYMBOL_GPL(tcp_get_info);
+diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
+index b565c8a8e7badf..fb053942dba2a1 100644
+--- a/net/ipv4/tcp_input.c
++++ b/net/ipv4/tcp_input.c
+@@ -2108,6 +2108,10 @@ void tcp_clear_retrans(struct tcp_sock *tp)
+ 	tp->undo_marker = 0;
+ 	tp->undo_retrans = -1;
+ 	tp->sacked_out = 0;
++	tp->rto_stamp = 0;
++	tp->total_rto = 0;
++	tp->total_rto_recoveries = 0;
++	tp->total_rto_time = 0;
+ }
+ 
+ static inline void tcp_init_undo(struct tcp_sock *tp)
+@@ -2452,8 +2456,22 @@ static bool tcp_skb_spurious_retrans(const struct tcp_sock *tp,
+  */
+ static inline bool tcp_packet_delayed(const struct tcp_sock *tp)
+ {
+-	return tp->retrans_stamp &&
+-	       tcp_tsopt_ecr_before(tp, tp->retrans_stamp);
++	const struct sock *sk = (const struct sock *)tp;
++
++	if (tp->retrans_stamp &&
++	    tcp_tsopt_ecr_before(tp, tp->retrans_stamp))
++		return true;  /* got echoed TS before first retransmission */
++
++	/* Check if nothing was retransmitted (retrans_stamp==0), which may
++	 * happen in fast recovery due to TSQ. But we ignore zero retrans_stamp
++	 * in TCP_SYN_SENT, since when we set FLAG_SYN_ACKED we also clear
++	 * retrans_stamp even if we had retransmitted the SYN.
++	 */
++	if (!tp->retrans_stamp &&	   /* no record of a retransmit/SYN? */
++	    sk->sk_state != TCP_SYN_SENT)  /* not the FLAG_SYN_ACKED case? */
++		return true;  /* nothing was retransmitted */
++
++	return false;
+ }
+ 
+ /* Undo procedures. */
+@@ -2487,6 +2505,16 @@ static bool tcp_any_retrans_done(const struct sock *sk)
+ 	return false;
+ }
+ 
++/* If loss recovery is finished and there are no retransmits out in the
++ * network, then we clear retrans_stamp so that upon the next loss recovery
++ * retransmits_timed_out() and timestamp-undo are using the correct value.
++ */
++static void tcp_retrans_stamp_cleanup(struct sock *sk)
++{
++	if (!tcp_any_retrans_done(sk))
++		tcp_sk(sk)->retrans_stamp = 0;
++}
++
+ static void DBGUNDO(struct sock *sk, const char *msg)
+ {
+ #if FASTRETRANS_DEBUG > 1
+@@ -2854,6 +2882,9 @@ void tcp_enter_recovery(struct sock *sk, bool ece_ack)
+ 	struct tcp_sock *tp = tcp_sk(sk);
+ 	int mib_idx;
+ 
++	/* Start the clock with our fast retransmit, for undo and ETIMEDOUT. */
++	tcp_retrans_stamp_cleanup(sk);
++
+ 	if (tcp_is_reno(tp))
+ 		mib_idx = LINUX_MIB_TCPRENORECOVERY;
+ 	else
+@@ -2872,6 +2903,14 @@ void tcp_enter_recovery(struct sock *sk, bool ece_ack)
+ 	tcp_set_ca_state(sk, TCP_CA_Recovery);
+ }
+ 
++static void tcp_update_rto_time(struct tcp_sock *tp)
++{
++	if (tp->rto_stamp) {
++		tp->total_rto_time += tcp_time_stamp(tp) - tp->rto_stamp;
++		tp->rto_stamp = 0;
++	}
++}
++
+ /* Process an ACK in CA_Loss state. Move to CA_Open if lost data are
+  * recovered or spurious. Otherwise retransmits more on partial ACKs.
+  */
+@@ -3076,6 +3115,8 @@ static void tcp_fastretrans_alert(struct sock *sk, const u32 prior_snd_una,
+ 		break;
+ 	case TCP_CA_Loss:
+ 		tcp_process_loss(sk, flag, num_dupack, rexmit);
++		if (icsk->icsk_ca_state != TCP_CA_Loss)
++			tcp_update_rto_time(tp);
+ 		tcp_identify_packet_loss(sk, ack_flag);
+ 		if (!(icsk->icsk_ca_state == TCP_CA_Open ||
+ 		      (*ack_flag & FLAG_LOST_RETRANS)))
+@@ -6513,9 +6554,17 @@ static void tcp_rcv_synrecv_state_fastopen(struct sock *sk)
+ 	if (inet_csk(sk)->icsk_ca_state == TCP_CA_Loss && !tp->packets_out)
+ 		tcp_try_undo_recovery(sk);
+ 
+-	/* Reset rtx states to prevent spurious retransmits_timed_out() */
+-	tp->retrans_stamp = 0;
++	tcp_update_rto_time(tp);
+ 	inet_csk(sk)->icsk_retransmits = 0;
++	/* In tcp_fastopen_synack_timer() on the first SYNACK RTO we set
++	 * retrans_stamp but don't enter CA_Loss, so in case that happened we
++	 * need to zero retrans_stamp here to prevent spurious
++	 * retransmits_timed_out(). However, if the ACK of our SYNACK caused us
++	 * to enter CA_Recovery then we need to leave retrans_stamp as it was
++	 * set entering CA_Recovery, for correct retransmits_timed_out() and
++	 * undo behavior.
++	 */
++	tcp_retrans_stamp_cleanup(sk);
+ 
+ 	/* Once we leave TCP_SYN_RECV or TCP_FIN_WAIT_1,
+ 	 * we no longer need req so release it.
+diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
+index 0c04c460001f10..cc2b608b1a8e78 100644
+--- a/net/ipv4/tcp_minisocks.c
++++ b/net/ipv4/tcp_minisocks.c
+@@ -560,6 +560,10 @@ struct sock *tcp_create_openreq_child(const struct sock *sk,
+ 		newtp->undo_marker = treq->snt_isn;
+ 		newtp->retrans_stamp = div_u64(treq->snt_synack,
+ 					       USEC_PER_SEC / TCP_TS_HZ);
++		newtp->total_rto = req->num_timeout;
++		newtp->total_rto_recoveries = 1;
++		newtp->total_rto_time = tcp_time_stamp_raw() -
++						newtp->retrans_stamp;
+ 	}
+ 	newtp->tsoffset = treq->ts_off;
+ #ifdef CONFIG_TCP_MD5SIG
+diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
+index 64bcf384e9ddcc..b65cd417b0f7ca 100644
+--- a/net/ipv4/tcp_timer.c
++++ b/net/ipv4/tcp_timer.c
+@@ -411,6 +411,19 @@ abort:		tcp_write_err(sk);
+ 	}
+ }
+ 
++static void tcp_update_rto_stats(struct sock *sk)
++{
++	struct inet_connection_sock *icsk = inet_csk(sk);
++	struct tcp_sock *tp = tcp_sk(sk);
++
++	if (!icsk->icsk_retransmits) {
++		tp->total_rto_recoveries++;
++		tp->rto_stamp = tcp_time_stamp(tp);
++	}
++	icsk->icsk_retransmits++;
++	tp->total_rto++;
++}
++
+ /*
+  *	Timer for Fast Open socket to retransmit SYNACK. Note that the
+  *	sk here is the child socket, not the parent (listener) socket.
+@@ -443,7 +456,7 @@ static void tcp_fastopen_synack_timer(struct sock *sk, struct request_sock *req)
+ 	 */
+ 	inet_rtx_syn_ack(sk, req);
+ 	req->num_timeout++;
+-	icsk->icsk_retransmits++;
++	tcp_update_rto_stats(sk);
+ 	if (!tp->retrans_stamp)
+ 		tp->retrans_stamp = tcp_time_stamp(tp);
+ 	inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
+@@ -586,7 +599,7 @@ void tcp_retransmit_timer(struct sock *sk)
+ 
+ 	tcp_enter_loss(sk);
+ 
+-	icsk->icsk_retransmits++;
++	tcp_update_rto_stats(sk);
+ 	if (tcp_retransmit_skb(sk, tcp_rtx_queue_head(sk), 1) > 0) {
+ 		/* Retransmission failed because of local congestion,
+ 		 * Let senders fight for local resources conservatively.
+diff --git a/net/ipv6/netfilter/nf_reject_ipv6.c b/net/ipv6/netfilter/nf_reject_ipv6.c
+index 690d1c04769133..4e0976534648c4 100644
+--- a/net/ipv6/netfilter/nf_reject_ipv6.c
++++ b/net/ipv6/netfilter/nf_reject_ipv6.c
+@@ -273,7 +273,6 @@ void nf_send_reset6(struct net *net, struct sock *sk, struct sk_buff *oldskb,
+ 	const struct tcphdr *otcph;
+ 	unsigned int otcplen, hh_len;
+ 	const struct ipv6hdr *oip6h = ipv6_hdr(oldskb);
+-	struct ipv6hdr *ip6h;
+ 	struct dst_entry *dst = NULL;
+ 	struct flowi6 fl6;
+ 
+@@ -329,8 +328,7 @@ void nf_send_reset6(struct net *net, struct sock *sk, struct sk_buff *oldskb,
+ 	nskb->mark = fl6.flowi6_mark;
+ 
+ 	skb_reserve(nskb, hh_len + dst->header_len);
+-	ip6h = nf_reject_ip6hdr_put(nskb, oldskb, IPPROTO_TCP,
+-				    ip6_dst_hoplimit(dst));
++	nf_reject_ip6hdr_put(nskb, oldskb, IPPROTO_TCP, ip6_dst_hoplimit(dst));
+ 	nf_reject_ip6_tcphdr_put(nskb, oldskb, otcph, otcplen);
+ 
+ 	nf_ct_attach(nskb, oldskb);
+@@ -345,6 +343,7 @@ void nf_send_reset6(struct net *net, struct sock *sk, struct sk_buff *oldskb,
+ 	 */
+ 	if (nf_bridge_info_exists(oldskb)) {
+ 		struct ethhdr *oeth = eth_hdr(oldskb);
++		struct ipv6hdr *ip6h = ipv6_hdr(nskb);
+ 		struct net_device *br_indev;
+ 
+ 		br_indev = nf_bridge_get_physindev(oldskb, net);
+diff --git a/net/ipv6/netfilter/nft_fib_ipv6.c b/net/ipv6/netfilter/nft_fib_ipv6.c
+index 36dc14b34388c8..c9f1634b3838ae 100644
+--- a/net/ipv6/netfilter/nft_fib_ipv6.c
++++ b/net/ipv6/netfilter/nft_fib_ipv6.c
+@@ -41,8 +41,6 @@ static int nft_fib6_flowi_init(struct flowi6 *fl6, const struct nft_fib *priv,
+ 	if (ipv6_addr_type(&fl6->daddr) & IPV6_ADDR_LINKLOCAL) {
+ 		lookup_flags |= RT6_LOOKUP_F_IFACE;
+ 		fl6->flowi6_oif = get_ifindex(dev ? dev : pkt->skb->dev);
+-	} else if (priv->flags & NFTA_FIB_F_IIF) {
+-		fl6->flowi6_l3mdev = l3mdev_master_ifindex_rcu(dev);
+ 	}
+ 
+ 	if (ipv6_addr_type(&fl6->saddr) & IPV6_ADDR_UNICAST)
+@@ -75,6 +73,8 @@ static u32 __nft_fib6_eval_type(const struct nft_fib *priv,
+ 	else if (priv->flags & NFTA_FIB_F_OIF)
+ 		dev = nft_out(pkt);
+ 
++	fl6.flowi6_l3mdev = l3mdev_master_ifindex_rcu(dev);
++
+ 	nft_fib6_flowi_init(&fl6, priv, pkt, dev, iph);
+ 
+ 	if (dev && nf_ipv6_chk_addr(nft_net(pkt), &fl6.daddr, dev, true))
+@@ -165,6 +165,7 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs,
+ 		.flowi6_iif = LOOPBACK_IFINDEX,
+ 		.flowi6_proto = pkt->tprot,
+ 		.flowi6_uid = sock_net_uid(nft_net(pkt), NULL),
++		.flowi6_l3mdev = l3mdev_master_ifindex_rcu(nft_in(pkt)),
+ 	};
+ 	struct rt6_info *rt;
+ 	int lookup_flags;
+diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
+index 933a58895432f0..d4a032f3457732 100644
+--- a/net/mac80211/scan.c
++++ b/net/mac80211/scan.c
+@@ -346,7 +346,8 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_sub_if_data *sdata)
+ 	struct cfg80211_scan_request *req;
+ 	struct cfg80211_chan_def chandef;
+ 	u8 bands_used = 0;
+-	int i, ielen, n_chans;
++	int i, ielen;
++	u32 *n_chans;
+ 	u32 flags = 0;
+ 
+ 	req = rcu_dereference_protected(local->scan_req,
+@@ -356,34 +357,34 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_sub_if_data *sdata)
+ 		return false;
+ 
+ 	if (ieee80211_hw_check(&local->hw, SINGLE_SCAN_ON_ALL_BANDS)) {
++		local->hw_scan_req->req.n_channels = req->n_channels;
++
+ 		for (i = 0; i < req->n_channels; i++) {
+ 			local->hw_scan_req->req.channels[i] = req->channels[i];
+ 			bands_used |= BIT(req->channels[i]->band);
+ 		}
+-
+-		n_chans = req->n_channels;
+ 	} else {
+ 		do {
+ 			if (local->hw_scan_band == NUM_NL80211_BANDS)
+ 				return false;
+ 
+-			n_chans = 0;
++			n_chans = &local->hw_scan_req->req.n_channels;
++			*n_chans = 0;
+ 
+ 			for (i = 0; i < req->n_channels; i++) {
+ 				if (req->channels[i]->band !=
+ 				    local->hw_scan_band)
+ 					continue;
+-				local->hw_scan_req->req.channels[n_chans] =
++				local->hw_scan_req->req.channels[(*n_chans)++] =
+ 							req->channels[i];
+-				n_chans++;
++
+ 				bands_used |= BIT(req->channels[i]->band);
+ 			}
+ 
+ 			local->hw_scan_band++;
+-		} while (!n_chans);
++		} while (!*n_chans);
+ 	}
+ 
+-	local->hw_scan_req->req.n_channels = n_chans;
+ 	ieee80211_prepare_scan_chandef(&chandef, req->scan_width);
+ 
+ 	if (req->flags & NL80211_SCAN_FLAG_MIN_PREQ_CONTENT)
+diff --git a/net/mctp/af_mctp.c b/net/mctp/af_mctp.c
+index f6be58b68c6f36..28be85d055330b 100644
+--- a/net/mctp/af_mctp.c
++++ b/net/mctp/af_mctp.c
+@@ -676,10 +676,14 @@ static __init int mctp_init(void)
+ 	if (rc)
+ 		goto err_unreg_routes;
+ 
+-	mctp_device_init();
++	rc = mctp_device_init();
++	if (rc)
++		goto err_unreg_neigh;
+ 
+ 	return 0;
+ 
++err_unreg_neigh:
++	mctp_neigh_exit();
+ err_unreg_routes:
+ 	mctp_routes_exit();
+ err_unreg_proto:
+diff --git a/net/mctp/device.c b/net/mctp/device.c
+index acb97b25742896..85cc5f31f1e7c0 100644
+--- a/net/mctp/device.c
++++ b/net/mctp/device.c
+@@ -524,25 +524,31 @@ static struct notifier_block mctp_dev_nb = {
+ 	.priority = ADDRCONF_NOTIFY_PRIORITY,
+ };
+ 
+-void __init mctp_device_init(void)
++static const struct rtnl_msg_handler mctp_device_rtnl_msg_handlers[] = {
++	{THIS_MODULE, PF_MCTP, RTM_NEWADDR, mctp_rtm_newaddr, NULL, 0},
++	{THIS_MODULE, PF_MCTP, RTM_DELADDR, mctp_rtm_deladdr, NULL, 0},
++	{THIS_MODULE, PF_MCTP, RTM_GETADDR, NULL, mctp_dump_addrinfo, 0},
++};
++
++int __init mctp_device_init(void)
+ {
+-	register_netdevice_notifier(&mctp_dev_nb);
++	int err;
+ 
+-	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_GETADDR,
+-			     NULL, mctp_dump_addrinfo, 0);
+-	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_NEWADDR,
+-			     mctp_rtm_newaddr, NULL, 0);
+-	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_DELADDR,
+-			     mctp_rtm_deladdr, NULL, 0);
++	register_netdevice_notifier(&mctp_dev_nb);
+ 	rtnl_af_register(&mctp_af_ops);
++
++	err = rtnl_register_many(mctp_device_rtnl_msg_handlers);
++	if (err) {
++		rtnl_af_unregister(&mctp_af_ops);
++		unregister_netdevice_notifier(&mctp_dev_nb);
++	}
++
++	return err;
+ }
+ 
+ void __exit mctp_device_exit(void)
+ {
++	rtnl_unregister_many(mctp_device_rtnl_msg_handlers);
+ 	rtnl_af_unregister(&mctp_af_ops);
+-	rtnl_unregister(PF_MCTP, RTM_DELADDR);
+-	rtnl_unregister(PF_MCTP, RTM_NEWADDR);
+-	rtnl_unregister(PF_MCTP, RTM_GETADDR);
+-
+ 	unregister_netdevice_notifier(&mctp_dev_nb);
+ }
+diff --git a/net/mctp/neigh.c b/net/mctp/neigh.c
+index ffa0f9e0983fba..590f642413e4ef 100644
+--- a/net/mctp/neigh.c
++++ b/net/mctp/neigh.c
+@@ -322,22 +322,29 @@ static struct pernet_operations mctp_net_ops = {
+ 	.exit = mctp_neigh_net_exit,
+ };
+ 
++static const struct rtnl_msg_handler mctp_neigh_rtnl_msg_handlers[] = {
++	{THIS_MODULE, PF_MCTP, RTM_NEWNEIGH, mctp_rtm_newneigh, NULL, 0},
++	{THIS_MODULE, PF_MCTP, RTM_DELNEIGH, mctp_rtm_delneigh, NULL, 0},
++	{THIS_MODULE, PF_MCTP, RTM_GETNEIGH, NULL, mctp_rtm_getneigh, 0},
++};
++
+ int __init mctp_neigh_init(void)
+ {
+-	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_NEWNEIGH,
+-			     mctp_rtm_newneigh, NULL, 0);
+-	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_DELNEIGH,
+-			     mctp_rtm_delneigh, NULL, 0);
+-	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_GETNEIGH,
+-			     NULL, mctp_rtm_getneigh, 0);
+-
+-	return register_pernet_subsys(&mctp_net_ops);
++	int err;
++
++	err = register_pernet_subsys(&mctp_net_ops);
++	if (err)
++		return err;
++
++	err = rtnl_register_many(mctp_neigh_rtnl_msg_handlers);
++	if (err)
++		unregister_pernet_subsys(&mctp_net_ops);
++
++	return err;
+ }
+ 
+-void __exit mctp_neigh_exit(void)
++void mctp_neigh_exit(void)
+ {
++	rtnl_unregister_many(mctp_neigh_rtnl_msg_handlers);
+ 	unregister_pernet_subsys(&mctp_net_ops);
+-	rtnl_unregister(PF_MCTP, RTM_GETNEIGH);
+-	rtnl_unregister(PF_MCTP, RTM_DELNEIGH);
+-	rtnl_unregister(PF_MCTP, RTM_NEWNEIGH);
+ }
+diff --git a/net/mctp/route.c b/net/mctp/route.c
+index 01c530dbc1a657..c6a815df9d358c 100644
+--- a/net/mctp/route.c
++++ b/net/mctp/route.c
+@@ -1410,26 +1410,39 @@ static struct pernet_operations mctp_net_ops = {
+ 	.exit = mctp_routes_net_exit,
+ };
+ 
++static const struct rtnl_msg_handler mctp_route_rtnl_msg_handlers[] = {
++	{THIS_MODULE, PF_MCTP, RTM_NEWROUTE, mctp_newroute, NULL, 0},
++	{THIS_MODULE, PF_MCTP, RTM_DELROUTE, mctp_delroute, NULL, 0},
++	{THIS_MODULE, PF_MCTP, RTM_GETROUTE, NULL, mctp_dump_rtinfo, 0},
++};
++
+ int __init mctp_routes_init(void)
+ {
++	int err;
++
+ 	dev_add_pack(&mctp_packet_type);
+ 
+-	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_GETROUTE,
+-			     NULL, mctp_dump_rtinfo, 0);
+-	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_NEWROUTE,
+-			     mctp_newroute, NULL, 0);
+-	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_DELROUTE,
+-			     mctp_delroute, NULL, 0);
++	err = register_pernet_subsys(&mctp_net_ops);
++	if (err)
++		goto err_pernet;
++
++	err = rtnl_register_many(mctp_route_rtnl_msg_handlers);
++	if (err)
++		goto err_rtnl;
+ 
+-	return register_pernet_subsys(&mctp_net_ops);
++	return 0;
++
++err_rtnl:
++	unregister_pernet_subsys(&mctp_net_ops);
++err_pernet:
++	dev_remove_pack(&mctp_packet_type);
++	return err;
+ }
+ 
+ void mctp_routes_exit(void)
+ {
++	rtnl_unregister_many(mctp_route_rtnl_msg_handlers);
+ 	unregister_pernet_subsys(&mctp_net_ops);
+-	rtnl_unregister(PF_MCTP, RTM_DELROUTE);
+-	rtnl_unregister(PF_MCTP, RTM_NEWROUTE);
+-	rtnl_unregister(PF_MCTP, RTM_GETROUTE);
+ 	dev_remove_pack(&mctp_packet_type);
+ }
+ 
+diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
+index 1af29af6538858..43e8343df0db71 100644
+--- a/net/mpls/af_mpls.c
++++ b/net/mpls/af_mpls.c
+@@ -1154,7 +1154,7 @@ static int mpls_netconf_fill_devconf(struct sk_buff *skb, struct mpls_dev *mdev,
+ 
+ 	if ((all || type == NETCONFA_INPUT) &&
+ 	    nla_put_s32(skb, NETCONFA_INPUT,
+-			mdev->input_enabled) < 0)
++			READ_ONCE(mdev->input_enabled)) < 0)
+ 		goto nla_put_failure;
+ 
+ 	nlmsg_end(skb, nlh);
+@@ -1303,11 +1303,12 @@ static int mpls_netconf_dump_devconf(struct sk_buff *skb,
+ {
+ 	const struct nlmsghdr *nlh = cb->nlh;
+ 	struct net *net = sock_net(skb->sk);
+-	struct hlist_head *head;
++	struct {
++		unsigned long ifindex;
++	} *ctx = (void *)cb->ctx;
+ 	struct net_device *dev;
+ 	struct mpls_dev *mdev;
+-	int idx, s_idx;
+-	int h, s_h;
++	int err = 0;
+ 
+ 	if (cb->strict_check) {
+ 		struct netlink_ext_ack *extack = cb->extack;
+@@ -1324,40 +1325,23 @@ static int mpls_netconf_dump_devconf(struct sk_buff *skb,
+ 		}
+ 	}
+ 
+-	s_h = cb->args[0];
+-	s_idx = idx = cb->args[1];
+-
+-	for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
+-		idx = 0;
+-		head = &net->dev_index_head[h];
+-		rcu_read_lock();
+-		cb->seq = net->dev_base_seq;
+-		hlist_for_each_entry_rcu(dev, head, index_hlist) {
+-			if (idx < s_idx)
+-				goto cont;
+-			mdev = mpls_dev_get(dev);
+-			if (!mdev)
+-				goto cont;
+-			if (mpls_netconf_fill_devconf(skb, mdev,
+-						      NETLINK_CB(cb->skb).portid,
+-						      nlh->nlmsg_seq,
+-						      RTM_NEWNETCONF,
+-						      NLM_F_MULTI,
+-						      NETCONFA_ALL) < 0) {
+-				rcu_read_unlock();
+-				goto done;
+-			}
+-			nl_dump_check_consistent(cb, nlmsg_hdr(skb));
+-cont:
+-			idx++;
+-		}
+-		rcu_read_unlock();
++	rcu_read_lock();
++	for_each_netdev_dump(net, dev, ctx->ifindex) {
++		mdev = mpls_dev_get(dev);
++		if (!mdev)
++			continue;
++		err = mpls_netconf_fill_devconf(skb, mdev,
++						NETLINK_CB(cb->skb).portid,
++						nlh->nlmsg_seq,
++						RTM_NEWNETCONF,
++						NLM_F_MULTI,
++						NETCONFA_ALL);
++		if (err < 0)
++			break;
+ 	}
+-done:
+-	cb->args[0] = h;
+-	cb->args[1] = idx;
++	rcu_read_unlock();
+ 
+-	return skb->len;
++	return err;
+ }
+ 
+ #define MPLS_PERDEV_SYSCTL_OFFSET(field)	\
+@@ -2745,6 +2729,15 @@ static struct rtnl_af_ops mpls_af_ops __read_mostly = {
+ 	.get_stats_af_size = mpls_get_stats_af_size,
+ };
+ 
++static const struct rtnl_msg_handler mpls_rtnl_msg_handlers[] __initdata_or_module = {
++	{THIS_MODULE, PF_MPLS, RTM_NEWROUTE, mpls_rtm_newroute, NULL, 0},
++	{THIS_MODULE, PF_MPLS, RTM_DELROUTE, mpls_rtm_delroute, NULL, 0},
++	{THIS_MODULE, PF_MPLS, RTM_GETROUTE, mpls_getroute, mpls_dump_routes, 0},
++	{THIS_MODULE, PF_MPLS, RTM_GETNETCONF,
++	 mpls_netconf_get_devconf, mpls_netconf_dump_devconf,
++	 RTNL_FLAG_DUMP_UNLOCKED},
++};
++
+ static int __init mpls_init(void)
+ {
+ 	int err;
+@@ -2763,23 +2756,25 @@ static int __init mpls_init(void)
+ 
+ 	rtnl_af_register(&mpls_af_ops);
+ 
+-	rtnl_register_module(THIS_MODULE, PF_MPLS, RTM_NEWROUTE,
+-			     mpls_rtm_newroute, NULL, 0);
+-	rtnl_register_module(THIS_MODULE, PF_MPLS, RTM_DELROUTE,
+-			     mpls_rtm_delroute, NULL, 0);
+-	rtnl_register_module(THIS_MODULE, PF_MPLS, RTM_GETROUTE,
+-			     mpls_getroute, mpls_dump_routes, 0);
+-	rtnl_register_module(THIS_MODULE, PF_MPLS, RTM_GETNETCONF,
+-			     mpls_netconf_get_devconf,
+-			     mpls_netconf_dump_devconf, 0);
+-	err = ipgre_tunnel_encap_add_mpls_ops();
++	err = rtnl_register_many(mpls_rtnl_msg_handlers);
+ 	if (err)
++		goto out_unregister_rtnl_af;
++
++	err = ipgre_tunnel_encap_add_mpls_ops();
++	if (err) {
+ 		pr_err("Can't add mpls over gre tunnel ops\n");
++		goto out_unregister_rtnl;
++	}
+ 
+ 	err = 0;
+ out:
+ 	return err;
+ 
++out_unregister_rtnl:
++	rtnl_unregister_many(mpls_rtnl_msg_handlers);
++out_unregister_rtnl_af:
++	rtnl_af_unregister(&mpls_af_ops);
++	dev_remove_pack(&mpls_packet_type);
+ out_unregister_pernet:
+ 	unregister_pernet_subsys(&mpls_net_ops);
+ 	goto out;
+diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c
+index 7884217f33eb2f..79f2278434b950 100644
+--- a/net/mptcp/mib.c
++++ b/net/mptcp/mib.c
+@@ -26,6 +26,8 @@ static const struct snmp_mib mptcp_snmp_list[] = {
+ 	SNMP_MIB_ITEM("MPJoinAckRx", MPTCP_MIB_JOINACKRX),
+ 	SNMP_MIB_ITEM("MPJoinAckHMacFailure", MPTCP_MIB_JOINACKMAC),
+ 	SNMP_MIB_ITEM("DSSNotMatching", MPTCP_MIB_DSSNOMATCH),
++	SNMP_MIB_ITEM("DSSCorruptionFallback", MPTCP_MIB_DSSCORRUPTIONFALLBACK),
++	SNMP_MIB_ITEM("DSSCorruptionReset", MPTCP_MIB_DSSCORRUPTIONRESET),
+ 	SNMP_MIB_ITEM("InfiniteMapTx", MPTCP_MIB_INFINITEMAPTX),
+ 	SNMP_MIB_ITEM("InfiniteMapRx", MPTCP_MIB_INFINITEMAPRX),
+ 	SNMP_MIB_ITEM("DSSNoMatchTCP", MPTCP_MIB_DSSTCPMISMATCH),
+diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h
+index 443604462ace80..e6e570251d32a4 100644
+--- a/net/mptcp/mib.h
++++ b/net/mptcp/mib.h
+@@ -19,6 +19,8 @@ enum linux_mptcp_mib_field {
+ 	MPTCP_MIB_JOINACKRX,		/* Received an ACK + MP_JOIN */
+ 	MPTCP_MIB_JOINACKMAC,		/* HMAC was wrong on ACK + MP_JOIN */
+ 	MPTCP_MIB_DSSNOMATCH,		/* Received a new mapping that did not match the previous one */
++	MPTCP_MIB_DSSCORRUPTIONFALLBACK,/* DSS corruption detected, fallback */
++	MPTCP_MIB_DSSCORRUPTIONRESET,	/* DSS corruption detected, MPJ subflow reset */
+ 	MPTCP_MIB_INFINITEMAPTX,	/* Sent an infinite mapping */
+ 	MPTCP_MIB_INFINITEMAPRX,	/* Received an infinite mapping */
+ 	MPTCP_MIB_DSSTCPMISMATCH,	/* DSS-mapping did not map with TCP's sequence numbers */
+diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
+index 953c22c0ec47ec..131af6be4b678a 100644
+--- a/net/mptcp/pm_netlink.c
++++ b/net/mptcp/pm_netlink.c
+@@ -864,7 +864,8 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk,
+ 			int how = RCV_SHUTDOWN | SEND_SHUTDOWN;
+ 			u8 id = subflow_get_local_id(subflow);
+ 
+-			if (inet_sk_state_load(ssk) == TCP_CLOSE)
++			if ((1 << inet_sk_state_load(ssk)) &
++			    (TCPF_FIN_WAIT1 | TCPF_FIN_WAIT2 | TCPF_CLOSING | TCPF_CLOSE))
+ 				continue;
+ 			if (rm_type == MPTCP_MIB_RMADDR && remote_id != rm_id)
+ 				continue;
+diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
+index ba6248372aee70..8cdd4ec152e7b5 100644
+--- a/net/mptcp/protocol.c
++++ b/net/mptcp/protocol.c
+@@ -620,6 +620,18 @@ static bool mptcp_check_data_fin(struct sock *sk)
+ 	return ret;
+ }
+ 
++static void mptcp_dss_corruption(struct mptcp_sock *msk, struct sock *ssk)
++{
++	if (READ_ONCE(msk->allow_infinite_fallback)) {
++		MPTCP_INC_STATS(sock_net(ssk),
++				MPTCP_MIB_DSSCORRUPTIONFALLBACK);
++		mptcp_do_fallback(ssk);
++	} else {
++		MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DSSCORRUPTIONRESET);
++		mptcp_subflow_reset(ssk);
++	}
++}
++
+ static bool __mptcp_move_skbs_from_subflow(struct mptcp_sock *msk,
+ 					   struct sock *ssk,
+ 					   unsigned int *bytes)
+@@ -692,10 +704,16 @@ static bool __mptcp_move_skbs_from_subflow(struct mptcp_sock *msk,
+ 				moved += len;
+ 			seq += len;
+ 
+-			if (WARN_ON_ONCE(map_remaining < len))
+-				break;
++			if (unlikely(map_remaining < len)) {
++				DEBUG_NET_WARN_ON_ONCE(1);
++				mptcp_dss_corruption(msk, ssk);
++			}
+ 		} else {
+-			WARN_ON_ONCE(!fin);
++			if (unlikely(!fin)) {
++				DEBUG_NET_WARN_ON_ONCE(1);
++				mptcp_dss_corruption(msk, ssk);
++			}
++
+ 			sk_eat_skb(ssk, skb);
+ 			done = true;
+ 		}
+diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
+index 2c779275a0310c..38f46502d76e04 100644
+--- a/net/mptcp/subflow.c
++++ b/net/mptcp/subflow.c
+@@ -944,8 +944,10 @@ static bool skb_is_fully_mapped(struct sock *ssk, struct sk_buff *skb)
+ 	unsigned int skb_consumed;
+ 
+ 	skb_consumed = tcp_sk(ssk)->copied_seq - TCP_SKB_CB(skb)->seq;
+-	if (WARN_ON_ONCE(skb_consumed >= skb->len))
++	if (unlikely(skb_consumed >= skb->len)) {
++		DEBUG_NET_WARN_ON_ONCE(1);
+ 		return true;
++	}
+ 
+ 	return skb->len - skb_consumed <= subflow->map_data_len -
+ 					  mptcp_subflow_get_map_offset(subflow);
+@@ -1247,7 +1249,7 @@ static bool subflow_can_fallback(struct mptcp_subflow_context *subflow)
+ 	else if (READ_ONCE(msk->csum_enabled))
+ 		return !subflow->valid_csum_seen;
+ 	else
+-		return !subflow->fully_established;
++		return READ_ONCE(msk->allow_infinite_fallback);
+ }
+ 
+ static void mptcp_subflow_fail(struct mptcp_sock *msk, struct sock *ssk)
+diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
+index c4e0516a8dfab4..ccca6e3848bcc8 100644
+--- a/net/netfilter/nf_nat_core.c
++++ b/net/netfilter/nf_nat_core.c
+@@ -183,7 +183,35 @@ hash_by_src(const struct net *net,
+ 	return reciprocal_scale(hash, nf_nat_htable_size);
+ }
+ 
+-/* Is this tuple already taken? (not by us) */
++/**
++ * nf_nat_used_tuple - check if proposed nat tuple clashes with existing entry
++ * @tuple: proposed NAT binding
++ * @ignored_conntrack: our (unconfirmed) conntrack entry
++ *
++ * A conntrack entry can be inserted to the connection tracking table
++ * if there is no existing entry with an identical tuple in either direction.
++ *
++ * Example:
++ * INITIATOR -> NAT/PAT -> RESPONDER
++ *
++ * INITIATOR passes through NAT/PAT ("us") and SNAT is done (saddr rewrite).
++ * Then, later, NAT/PAT itself also connects to RESPONDER.
++ *
++ * This will not work if the SNAT done earlier has same IP:PORT source pair.
++ *
++ * Conntrack table has:
++ * ORIGINAL: $IP_INITIATOR:$SPORT -> $IP_RESPONDER:$DPORT
++ * REPLY:    $IP_RESPONDER:$DPORT -> $IP_NAT:$SPORT
++ *
++ * and new locally originating connection wants:
++ * ORIGINAL: $IP_NAT:$SPORT -> $IP_RESPONDER:$DPORT
++ * REPLY:    $IP_RESPONDER:$DPORT -> $IP_NAT:$SPORT
++ *
++ * ... which would mean incoming packets cannot be distinguished between
++ * the existing and the newly added entry (identical IP_CT_DIR_REPLY tuple).
++ *
++ * @return: true if the proposed NAT mapping collides with an existing entry.
++ */
+ static int
+ nf_nat_used_tuple(const struct nf_conntrack_tuple *tuple,
+ 		  const struct nf_conn *ignored_conntrack)
+@@ -200,6 +228,94 @@ nf_nat_used_tuple(const struct nf_conntrack_tuple *tuple,
+ 	return nf_conntrack_tuple_taken(&reply, ignored_conntrack);
+ }
+ 
++static bool nf_nat_allow_clash(const struct nf_conn *ct)
++{
++	return nf_ct_l4proto_find(nf_ct_protonum(ct))->allow_clash;
++}
++
++/**
++ * nf_nat_used_tuple_new - check if to-be-inserted conntrack collides with existing entry
++ * @tuple: proposed NAT binding
++ * @ignored_ct: our (unconfirmed) conntrack entry
++ *
++ * Same as nf_nat_used_tuple, but also check for rare clash in reverse
++ * direction. Should be called only when @tuple has not been altered, i.e.
++ * @ignored_conntrack will not be subject to NAT.
++ *
++ * @return: true if the proposed NAT mapping collides with existing entry.
++ */
++static noinline bool
++nf_nat_used_tuple_new(const struct nf_conntrack_tuple *tuple,
++		      const struct nf_conn *ignored_ct)
++{
++	static const unsigned long uses_nat = IPS_NAT_MASK | IPS_SEQ_ADJUST_BIT;
++	const struct nf_conntrack_tuple_hash *thash;
++	const struct nf_conntrack_zone *zone;
++	struct nf_conn *ct;
++	bool taken = true;
++	struct net *net;
++
++	if (!nf_nat_used_tuple(tuple, ignored_ct))
++		return false;
++
++	if (!nf_nat_allow_clash(ignored_ct))
++		return true;
++
++	/* Initial choice clashes with existing conntrack.
++	 * Check for (rare) reverse collision.
++	 *
++	 * This can happen when new packets are received in both directions
++	 * at the exact same time on different CPUs.
++	 *
++	 * Without SMP, first packet creates new conntrack entry and second
++	 * packet is resolved as established reply packet.
++	 *
++	 * With parallel processing, both packets could be picked up as
++	 * new and both get their own ct entry allocated.
++	 *
++	 * If ignored_conntrack and colliding ct are not subject to NAT then
++	 * pretend the tuple is available and let later clash resolution
++	 * handle this at insertion time.
++	 *
++	 * Without it, the 'reply' packet has its source port rewritten
++	 * by nat engine.
++	 */
++	if (READ_ONCE(ignored_ct->status) & uses_nat)
++		return true;
++
++	net = nf_ct_net(ignored_ct);
++	zone = nf_ct_zone(ignored_ct);
++
++	thash = nf_conntrack_find_get(net, zone, tuple);
++	if (unlikely(!thash)) /* clashing entry went away */
++		return false;
++
++	ct = nf_ct_tuplehash_to_ctrack(thash);
++
++	/* NB: IP_CT_DIR_ORIGINAL should be impossible because
++	 * nf_nat_used_tuple() handles origin collisions.
++	 *
++	 * Handle remote chance other CPU confirmed its ct right after.
++	 */
++	if (thash->tuple.dst.dir != IP_CT_DIR_REPLY)
++		goto out;
++
++	/* clashing connection subject to NAT? Retry with new tuple. */
++	if (READ_ONCE(ct->status) & uses_nat)
++		goto out;
++
++	if (nf_ct_tuple_equal(&ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple,
++			      &ignored_ct->tuplehash[IP_CT_DIR_REPLY].tuple) &&
++	    nf_ct_tuple_equal(&ct->tuplehash[IP_CT_DIR_REPLY].tuple,
++			      &ignored_ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple)) {
++		taken = false;
++		goto out;
++	}
++out:
++	nf_ct_put(ct);
++	return taken;
++}
++
+ static bool nf_nat_may_kill(struct nf_conn *ct, unsigned long flags)
+ {
+ 	static const unsigned long flags_refuse = IPS_FIXED_TIMEOUT |
+@@ -608,7 +724,7 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple,
+ 	    !(range->flags & NF_NAT_RANGE_PROTO_RANDOM_ALL)) {
+ 		/* try the original tuple first */
+ 		if (nf_in_range(orig_tuple, range)) {
+-			if (!nf_nat_used_tuple(orig_tuple, ct)) {
++			if (!nf_nat_used_tuple_new(orig_tuple, ct)) {
+ 				*tuple = *orig_tuple;
+ 				return;
+ 			}
+diff --git a/net/netfilter/xt_CHECKSUM.c b/net/netfilter/xt_CHECKSUM.c
+index c8a639f5616841..9d99f5a3d1764b 100644
+--- a/net/netfilter/xt_CHECKSUM.c
++++ b/net/netfilter/xt_CHECKSUM.c
+@@ -63,24 +63,37 @@ static int checksum_tg_check(const struct xt_tgchk_param *par)
+ 	return 0;
+ }
+ 
+-static struct xt_target checksum_tg_reg __read_mostly = {
+-	.name		= "CHECKSUM",
+-	.family		= NFPROTO_UNSPEC,
+-	.target		= checksum_tg,
+-	.targetsize	= sizeof(struct xt_CHECKSUM_info),
+-	.table		= "mangle",
+-	.checkentry	= checksum_tg_check,
+-	.me		= THIS_MODULE,
++static struct xt_target checksum_tg_reg[] __read_mostly = {
++	{
++		.name		= "CHECKSUM",
++		.family		= NFPROTO_IPV4,
++		.target		= checksum_tg,
++		.targetsize	= sizeof(struct xt_CHECKSUM_info),
++		.table		= "mangle",
++		.checkentry	= checksum_tg_check,
++		.me		= THIS_MODULE,
++	},
++#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
++	{
++		.name		= "CHECKSUM",
++		.family		= NFPROTO_IPV6,
++		.target		= checksum_tg,
++		.targetsize	= sizeof(struct xt_CHECKSUM_info),
++		.table		= "mangle",
++		.checkentry	= checksum_tg_check,
++		.me		= THIS_MODULE,
++	},
++#endif
+ };
+ 
+ static int __init checksum_tg_init(void)
+ {
+-	return xt_register_target(&checksum_tg_reg);
++	return xt_register_targets(checksum_tg_reg, ARRAY_SIZE(checksum_tg_reg));
+ }
+ 
+ static void __exit checksum_tg_exit(void)
+ {
+-	xt_unregister_target(&checksum_tg_reg);
++	xt_unregister_targets(checksum_tg_reg, ARRAY_SIZE(checksum_tg_reg));
+ }
+ 
+ module_init(checksum_tg_init);
+diff --git a/net/netfilter/xt_CLASSIFY.c b/net/netfilter/xt_CLASSIFY.c
+index 0accac98dea784..0ae8d8a1216e19 100644
+--- a/net/netfilter/xt_CLASSIFY.c
++++ b/net/netfilter/xt_CLASSIFY.c
+@@ -38,9 +38,9 @@ static struct xt_target classify_tg_reg[] __read_mostly = {
+ 	{
+ 		.name       = "CLASSIFY",
+ 		.revision   = 0,
+-		.family     = NFPROTO_UNSPEC,
++		.family     = NFPROTO_IPV4,
+ 		.hooks      = (1 << NF_INET_LOCAL_OUT) | (1 << NF_INET_FORWARD) |
+-		              (1 << NF_INET_POST_ROUTING),
++			      (1 << NF_INET_POST_ROUTING),
+ 		.target     = classify_tg,
+ 		.targetsize = sizeof(struct xt_classify_target_info),
+ 		.me         = THIS_MODULE,
+@@ -54,6 +54,18 @@ static struct xt_target classify_tg_reg[] __read_mostly = {
+ 		.targetsize = sizeof(struct xt_classify_target_info),
+ 		.me         = THIS_MODULE,
+ 	},
++#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
++	{
++		.name       = "CLASSIFY",
++		.revision   = 0,
++		.family     = NFPROTO_IPV6,
++		.hooks      = (1 << NF_INET_LOCAL_OUT) | (1 << NF_INET_FORWARD) |
++			      (1 << NF_INET_POST_ROUTING),
++		.target     = classify_tg,
++		.targetsize = sizeof(struct xt_classify_target_info),
++		.me         = THIS_MODULE,
++	},
++#endif
+ };
+ 
+ static int __init classify_tg_init(void)
+diff --git a/net/netfilter/xt_CONNSECMARK.c b/net/netfilter/xt_CONNSECMARK.c
+index 76acecf3e757a0..1494b3ee30e11e 100644
+--- a/net/netfilter/xt_CONNSECMARK.c
++++ b/net/netfilter/xt_CONNSECMARK.c
+@@ -114,25 +114,39 @@ static void connsecmark_tg_destroy(const struct xt_tgdtor_param *par)
+ 	nf_ct_netns_put(par->net, par->family);
+ }
+ 
+-static struct xt_target connsecmark_tg_reg __read_mostly = {
+-	.name       = "CONNSECMARK",
+-	.revision   = 0,
+-	.family     = NFPROTO_UNSPEC,
+-	.checkentry = connsecmark_tg_check,
+-	.destroy    = connsecmark_tg_destroy,
+-	.target     = connsecmark_tg,
+-	.targetsize = sizeof(struct xt_connsecmark_target_info),
+-	.me         = THIS_MODULE,
++static struct xt_target connsecmark_tg_reg[] __read_mostly = {
++	{
++		.name       = "CONNSECMARK",
++		.revision   = 0,
++		.family     = NFPROTO_IPV4,
++		.checkentry = connsecmark_tg_check,
++		.destroy    = connsecmark_tg_destroy,
++		.target     = connsecmark_tg,
++		.targetsize = sizeof(struct xt_connsecmark_target_info),
++		.me         = THIS_MODULE,
++	},
++#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
++	{
++		.name       = "CONNSECMARK",
++		.revision   = 0,
++		.family     = NFPROTO_IPV6,
++		.checkentry = connsecmark_tg_check,
++		.destroy    = connsecmark_tg_destroy,
++		.target     = connsecmark_tg,
++		.targetsize = sizeof(struct xt_connsecmark_target_info),
++		.me         = THIS_MODULE,
++	},
++#endif
+ };
+ 
+ static int __init connsecmark_tg_init(void)
+ {
+-	return xt_register_target(&connsecmark_tg_reg);
++	return xt_register_targets(connsecmark_tg_reg, ARRAY_SIZE(connsecmark_tg_reg));
+ }
+ 
+ static void __exit connsecmark_tg_exit(void)
+ {
+-	xt_unregister_target(&connsecmark_tg_reg);
++	xt_unregister_targets(connsecmark_tg_reg, ARRAY_SIZE(connsecmark_tg_reg));
+ }
+ 
+ module_init(connsecmark_tg_init);
+diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c
+index 2be2f7a7b60f4e..3ba94c34297cf5 100644
+--- a/net/netfilter/xt_CT.c
++++ b/net/netfilter/xt_CT.c
+@@ -313,10 +313,30 @@ static void xt_ct_tg_destroy_v1(const struct xt_tgdtor_param *par)
+ 	xt_ct_tg_destroy(par, par->targinfo);
+ }
+ 
++static unsigned int
++notrack_tg(struct sk_buff *skb, const struct xt_action_param *par)
++{
++	/* Previously seen (loopback)? Ignore. */
++	if (skb->_nfct != 0)
++		return XT_CONTINUE;
++
++	nf_ct_set(skb, NULL, IP_CT_UNTRACKED);
++
++	return XT_CONTINUE;
++}
++
+ static struct xt_target xt_ct_tg_reg[] __read_mostly = {
++	{
++		.name		= "NOTRACK",
++		.revision	= 0,
++		.family		= NFPROTO_IPV4,
++		.target		= notrack_tg,
++		.table		= "raw",
++		.me		= THIS_MODULE,
++	},
+ 	{
+ 		.name		= "CT",
+-		.family		= NFPROTO_UNSPEC,
++		.family		= NFPROTO_IPV4,
+ 		.targetsize	= sizeof(struct xt_ct_target_info),
+ 		.usersize	= offsetof(struct xt_ct_target_info, ct),
+ 		.checkentry	= xt_ct_tg_check_v0,
+@@ -327,7 +347,7 @@ static struct xt_target xt_ct_tg_reg[] __read_mostly = {
+ 	},
+ 	{
+ 		.name		= "CT",
+-		.family		= NFPROTO_UNSPEC,
++		.family		= NFPROTO_IPV4,
+ 		.revision	= 1,
+ 		.targetsize	= sizeof(struct xt_ct_target_info_v1),
+ 		.usersize	= offsetof(struct xt_ct_target_info, ct),
+@@ -339,7 +359,7 @@ static struct xt_target xt_ct_tg_reg[] __read_mostly = {
+ 	},
+ 	{
+ 		.name		= "CT",
+-		.family		= NFPROTO_UNSPEC,
++		.family		= NFPROTO_IPV4,
+ 		.revision	= 2,
+ 		.targetsize	= sizeof(struct xt_ct_target_info_v1),
+ 		.usersize	= offsetof(struct xt_ct_target_info, ct),
+@@ -349,49 +369,61 @@ static struct xt_target xt_ct_tg_reg[] __read_mostly = {
+ 		.table		= "raw",
+ 		.me		= THIS_MODULE,
+ 	},
+-};
+-
+-static unsigned int
+-notrack_tg(struct sk_buff *skb, const struct xt_action_param *par)
+-{
+-	/* Previously seen (loopback)? Ignore. */
+-	if (skb->_nfct != 0)
+-		return XT_CONTINUE;
+-
+-	nf_ct_set(skb, NULL, IP_CT_UNTRACKED);
+-
+-	return XT_CONTINUE;
+-}
+-
+-static struct xt_target notrack_tg_reg __read_mostly = {
+-	.name		= "NOTRACK",
+-	.revision	= 0,
+-	.family		= NFPROTO_UNSPEC,
+-	.target		= notrack_tg,
+-	.table		= "raw",
+-	.me		= THIS_MODULE,
++#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
++	{
++		.name		= "NOTRACK",
++		.revision	= 0,
++		.family		= NFPROTO_IPV6,
++		.target		= notrack_tg,
++		.table		= "raw",
++		.me		= THIS_MODULE,
++	},
++	{
++		.name		= "CT",
++		.family		= NFPROTO_IPV6,
++		.targetsize	= sizeof(struct xt_ct_target_info),
++		.usersize	= offsetof(struct xt_ct_target_info, ct),
++		.checkentry	= xt_ct_tg_check_v0,
++		.destroy	= xt_ct_tg_destroy_v0,
++		.target		= xt_ct_target_v0,
++		.table		= "raw",
++		.me		= THIS_MODULE,
++	},
++	{
++		.name		= "CT",
++		.family		= NFPROTO_IPV6,
++		.revision	= 1,
++		.targetsize	= sizeof(struct xt_ct_target_info_v1),
++		.usersize	= offsetof(struct xt_ct_target_info, ct),
++		.checkentry	= xt_ct_tg_check_v1,
++		.destroy	= xt_ct_tg_destroy_v1,
++		.target		= xt_ct_target_v1,
++		.table		= "raw",
++		.me		= THIS_MODULE,
++	},
++	{
++		.name		= "CT",
++		.family		= NFPROTO_IPV6,
++		.revision	= 2,
++		.targetsize	= sizeof(struct xt_ct_target_info_v1),
++		.usersize	= offsetof(struct xt_ct_target_info, ct),
++		.checkentry	= xt_ct_tg_check_v2,
++		.destroy	= xt_ct_tg_destroy_v1,
++		.target		= xt_ct_target_v1,
++		.table		= "raw",
++		.me		= THIS_MODULE,
++	},
++#endif
+ };
+ 
+ static int __init xt_ct_tg_init(void)
+ {
+-	int ret;
+-
+-	ret = xt_register_target(&notrack_tg_reg);
+-	if (ret < 0)
+-		return ret;
+-
+-	ret = xt_register_targets(xt_ct_tg_reg, ARRAY_SIZE(xt_ct_tg_reg));
+-	if (ret < 0) {
+-		xt_unregister_target(&notrack_tg_reg);
+-		return ret;
+-	}
+-	return 0;
++	return xt_register_targets(xt_ct_tg_reg, ARRAY_SIZE(xt_ct_tg_reg));
+ }
+ 
+ static void __exit xt_ct_tg_exit(void)
+ {
+ 	xt_unregister_targets(xt_ct_tg_reg, ARRAY_SIZE(xt_ct_tg_reg));
+-	xt_unregister_target(&notrack_tg_reg);
+ }
+ 
+ module_init(xt_ct_tg_init);
+diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c
+index db720efa811d58..f8b25b6f5da736 100644
+--- a/net/netfilter/xt_IDLETIMER.c
++++ b/net/netfilter/xt_IDLETIMER.c
+@@ -458,28 +458,49 @@ static void idletimer_tg_destroy_v1(const struct xt_tgdtor_param *par)
+ 
+ static struct xt_target idletimer_tg[] __read_mostly = {
+ 	{
+-	.name		= "IDLETIMER",
+-	.family		= NFPROTO_UNSPEC,
+-	.target		= idletimer_tg_target,
+-	.targetsize     = sizeof(struct idletimer_tg_info),
+-	.usersize	= offsetof(struct idletimer_tg_info, timer),
+-	.checkentry	= idletimer_tg_checkentry,
+-	.destroy        = idletimer_tg_destroy,
+-	.me		= THIS_MODULE,
++		.name		= "IDLETIMER",
++		.family		= NFPROTO_IPV4,
++		.target		= idletimer_tg_target,
++		.targetsize     = sizeof(struct idletimer_tg_info),
++		.usersize	= offsetof(struct idletimer_tg_info, timer),
++		.checkentry	= idletimer_tg_checkentry,
++		.destroy        = idletimer_tg_destroy,
++		.me		= THIS_MODULE,
+ 	},
+ 	{
+-	.name		= "IDLETIMER",
+-	.family		= NFPROTO_UNSPEC,
+-	.revision	= 1,
+-	.target		= idletimer_tg_target_v1,
+-	.targetsize     = sizeof(struct idletimer_tg_info_v1),
+-	.usersize	= offsetof(struct idletimer_tg_info_v1, timer),
+-	.checkentry	= idletimer_tg_checkentry_v1,
+-	.destroy        = idletimer_tg_destroy_v1,
+-	.me		= THIS_MODULE,
++		.name		= "IDLETIMER",
++		.family		= NFPROTO_IPV4,
++		.revision	= 1,
++		.target		= idletimer_tg_target_v1,
++		.targetsize     = sizeof(struct idletimer_tg_info_v1),
++		.usersize	= offsetof(struct idletimer_tg_info_v1, timer),
++		.checkentry	= idletimer_tg_checkentry_v1,
++		.destroy        = idletimer_tg_destroy_v1,
++		.me		= THIS_MODULE,
+ 	},
+-
+-
++#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
++	{
++		.name		= "IDLETIMER",
++		.family		= NFPROTO_IPV6,
++		.target		= idletimer_tg_target,
++		.targetsize     = sizeof(struct idletimer_tg_info),
++		.usersize	= offsetof(struct idletimer_tg_info, timer),
++		.checkentry	= idletimer_tg_checkentry,
++		.destroy        = idletimer_tg_destroy,
++		.me		= THIS_MODULE,
++	},
++	{
++		.name		= "IDLETIMER",
++		.family		= NFPROTO_IPV6,
++		.revision	= 1,
++		.target		= idletimer_tg_target_v1,
++		.targetsize     = sizeof(struct idletimer_tg_info_v1),
++		.usersize	= offsetof(struct idletimer_tg_info_v1, timer),
++		.checkentry	= idletimer_tg_checkentry_v1,
++		.destroy        = idletimer_tg_destroy_v1,
++		.me		= THIS_MODULE,
++	},
++#endif
+ };
+ 
+ static struct class *idletimer_tg_class;
+diff --git a/net/netfilter/xt_LED.c b/net/netfilter/xt_LED.c
+index 36c9720ad8d6d4..f7b0286d106ac1 100644
+--- a/net/netfilter/xt_LED.c
++++ b/net/netfilter/xt_LED.c
+@@ -175,26 +175,41 @@ static void led_tg_destroy(const struct xt_tgdtor_param *par)
+ 	kfree(ledinternal);
+ }
+ 
+-static struct xt_target led_tg_reg __read_mostly = {
+-	.name		= "LED",
+-	.revision	= 0,
+-	.family		= NFPROTO_UNSPEC,
+-	.target		= led_tg,
+-	.targetsize	= sizeof(struct xt_led_info),
+-	.usersize	= offsetof(struct xt_led_info, internal_data),
+-	.checkentry	= led_tg_check,
+-	.destroy	= led_tg_destroy,
+-	.me		= THIS_MODULE,
++static struct xt_target led_tg_reg[] __read_mostly = {
++	{
++		.name		= "LED",
++		.revision	= 0,
++		.family		= NFPROTO_IPV4,
++		.target		= led_tg,
++		.targetsize	= sizeof(struct xt_led_info),
++		.usersize	= offsetof(struct xt_led_info, internal_data),
++		.checkentry	= led_tg_check,
++		.destroy	= led_tg_destroy,
++		.me		= THIS_MODULE,
++	},
++#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
++	{
++		.name		= "LED",
++		.revision	= 0,
++		.family		= NFPROTO_IPV6,
++		.target		= led_tg,
++		.targetsize	= sizeof(struct xt_led_info),
++		.usersize	= offsetof(struct xt_led_info, internal_data),
++		.checkentry	= led_tg_check,
++		.destroy	= led_tg_destroy,
++		.me		= THIS_MODULE,
++	},
++#endif
+ };
+ 
+ static int __init led_tg_init(void)
+ {
+-	return xt_register_target(&led_tg_reg);
++	return xt_register_targets(led_tg_reg, ARRAY_SIZE(led_tg_reg));
+ }
+ 
+ static void __exit led_tg_exit(void)
+ {
+-	xt_unregister_target(&led_tg_reg);
++	xt_unregister_targets(led_tg_reg, ARRAY_SIZE(led_tg_reg));
+ }
+ 
+ module_init(led_tg_init);
+diff --git a/net/netfilter/xt_NFLOG.c b/net/netfilter/xt_NFLOG.c
+index e660c3710a1096..d80abd6ccaf8f7 100644
+--- a/net/netfilter/xt_NFLOG.c
++++ b/net/netfilter/xt_NFLOG.c
+@@ -64,25 +64,39 @@ static void nflog_tg_destroy(const struct xt_tgdtor_param *par)
+ 	nf_logger_put(par->family, NF_LOG_TYPE_ULOG);
+ }
+ 
+-static struct xt_target nflog_tg_reg __read_mostly = {
+-	.name       = "NFLOG",
+-	.revision   = 0,
+-	.family     = NFPROTO_UNSPEC,
+-	.checkentry = nflog_tg_check,
+-	.destroy    = nflog_tg_destroy,
+-	.target     = nflog_tg,
+-	.targetsize = sizeof(struct xt_nflog_info),
+-	.me         = THIS_MODULE,
++static struct xt_target nflog_tg_reg[] __read_mostly = {
++	{
++		.name       = "NFLOG",
++		.revision   = 0,
++		.family     = NFPROTO_IPV4,
++		.checkentry = nflog_tg_check,
++		.destroy    = nflog_tg_destroy,
++		.target     = nflog_tg,
++		.targetsize = sizeof(struct xt_nflog_info),
++		.me         = THIS_MODULE,
++	},
++#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
++	{
++		.name       = "NFLOG",
++		.revision   = 0,
++		.family     = NFPROTO_IPV4,
++		.checkentry = nflog_tg_check,
++		.destroy    = nflog_tg_destroy,
++		.target     = nflog_tg,
++		.targetsize = sizeof(struct xt_nflog_info),
++		.me         = THIS_MODULE,
++	},
++#endif
+ };
+ 
+ static int __init nflog_tg_init(void)
+ {
+-	return xt_register_target(&nflog_tg_reg);
++	return xt_register_targets(nflog_tg_reg, ARRAY_SIZE(nflog_tg_reg));
+ }
+ 
+ static void __exit nflog_tg_exit(void)
+ {
+-	xt_unregister_target(&nflog_tg_reg);
++	xt_unregister_targets(nflog_tg_reg, ARRAY_SIZE(nflog_tg_reg));
+ }
+ 
+ module_init(nflog_tg_init);
+diff --git a/net/netfilter/xt_RATEEST.c b/net/netfilter/xt_RATEEST.c
+index 80f6624e23554b..4f49cfc2783120 100644
+--- a/net/netfilter/xt_RATEEST.c
++++ b/net/netfilter/xt_RATEEST.c
+@@ -179,16 +179,31 @@ static void xt_rateest_tg_destroy(const struct xt_tgdtor_param *par)
+ 	xt_rateest_put(par->net, info->est);
+ }
+ 
+-static struct xt_target xt_rateest_tg_reg __read_mostly = {
+-	.name       = "RATEEST",
+-	.revision   = 0,
+-	.family     = NFPROTO_UNSPEC,
+-	.target     = xt_rateest_tg,
+-	.checkentry = xt_rateest_tg_checkentry,
+-	.destroy    = xt_rateest_tg_destroy,
+-	.targetsize = sizeof(struct xt_rateest_target_info),
+-	.usersize   = offsetof(struct xt_rateest_target_info, est),
+-	.me         = THIS_MODULE,
++static struct xt_target xt_rateest_tg_reg[] __read_mostly = {
++	{
++		.name       = "RATEEST",
++		.revision   = 0,
++		.family     = NFPROTO_IPV4,
++		.target     = xt_rateest_tg,
++		.checkentry = xt_rateest_tg_checkentry,
++		.destroy    = xt_rateest_tg_destroy,
++		.targetsize = sizeof(struct xt_rateest_target_info),
++		.usersize   = offsetof(struct xt_rateest_target_info, est),
++		.me         = THIS_MODULE,
++	},
++#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
++	{
++		.name       = "RATEEST",
++		.revision   = 0,
++		.family     = NFPROTO_IPV6,
++		.target     = xt_rateest_tg,
++		.checkentry = xt_rateest_tg_checkentry,
++		.destroy    = xt_rateest_tg_destroy,
++		.targetsize = sizeof(struct xt_rateest_target_info),
++		.usersize   = offsetof(struct xt_rateest_target_info, est),
++		.me         = THIS_MODULE,
++	},
++#endif
+ };
+ 
+ static __net_init int xt_rateest_net_init(struct net *net)
+@@ -214,12 +229,12 @@ static int __init xt_rateest_tg_init(void)
+ 
+ 	if (err)
+ 		return err;
+-	return xt_register_target(&xt_rateest_tg_reg);
++	return xt_register_targets(xt_rateest_tg_reg, ARRAY_SIZE(xt_rateest_tg_reg));
+ }
+ 
+ static void __exit xt_rateest_tg_fini(void)
+ {
+-	xt_unregister_target(&xt_rateest_tg_reg);
++	xt_unregister_targets(xt_rateest_tg_reg, ARRAY_SIZE(xt_rateest_tg_reg));
+ 	unregister_pernet_subsys(&xt_rateest_net_ops);
+ }
+ 
+diff --git a/net/netfilter/xt_SECMARK.c b/net/netfilter/xt_SECMARK.c
+index 498a0bf6f0444a..5bc5ea505eb9e0 100644
+--- a/net/netfilter/xt_SECMARK.c
++++ b/net/netfilter/xt_SECMARK.c
+@@ -157,7 +157,7 @@ static struct xt_target secmark_tg_reg[] __read_mostly = {
+ 	{
+ 		.name		= "SECMARK",
+ 		.revision	= 0,
+-		.family		= NFPROTO_UNSPEC,
++		.family		= NFPROTO_IPV4,
+ 		.checkentry	= secmark_tg_check_v0,
+ 		.destroy	= secmark_tg_destroy,
+ 		.target		= secmark_tg_v0,
+@@ -167,7 +167,7 @@ static struct xt_target secmark_tg_reg[] __read_mostly = {
+ 	{
+ 		.name		= "SECMARK",
+ 		.revision	= 1,
+-		.family		= NFPROTO_UNSPEC,
++		.family		= NFPROTO_IPV4,
+ 		.checkentry	= secmark_tg_check_v1,
+ 		.destroy	= secmark_tg_destroy,
+ 		.target		= secmark_tg_v1,
+@@ -175,6 +175,29 @@ static struct xt_target secmark_tg_reg[] __read_mostly = {
+ 		.usersize	= offsetof(struct xt_secmark_target_info_v1, secid),
+ 		.me		= THIS_MODULE,
+ 	},
++#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
++	{
++		.name		= "SECMARK",
++		.revision	= 0,
++		.family		= NFPROTO_IPV6,
++		.checkentry	= secmark_tg_check_v0,
++		.destroy	= secmark_tg_destroy,
++		.target		= secmark_tg_v0,
++		.targetsize	= sizeof(struct xt_secmark_target_info),
++		.me		= THIS_MODULE,
++	},
++	{
++		.name		= "SECMARK",
++		.revision	= 1,
++		.family		= NFPROTO_IPV6,
++		.checkentry	= secmark_tg_check_v1,
++		.destroy	= secmark_tg_destroy,
++		.target		= secmark_tg_v1,
++		.targetsize	= sizeof(struct xt_secmark_target_info_v1),
++		.usersize	= offsetof(struct xt_secmark_target_info_v1, secid),
++		.me		= THIS_MODULE,
++	},
++#endif
+ };
+ 
+ static int __init secmark_tg_init(void)
+diff --git a/net/netfilter/xt_TRACE.c b/net/netfilter/xt_TRACE.c
+index 5582dce98cae7d..f3fa4f11348cd8 100644
+--- a/net/netfilter/xt_TRACE.c
++++ b/net/netfilter/xt_TRACE.c
+@@ -29,25 +29,38 @@ trace_tg(struct sk_buff *skb, const struct xt_action_param *par)
+ 	return XT_CONTINUE;
+ }
+ 
+-static struct xt_target trace_tg_reg __read_mostly = {
+-	.name		= "TRACE",
+-	.revision	= 0,
+-	.family		= NFPROTO_UNSPEC,
+-	.table		= "raw",
+-	.target		= trace_tg,
+-	.checkentry	= trace_tg_check,
+-	.destroy	= trace_tg_destroy,
+-	.me		= THIS_MODULE,
++static struct xt_target trace_tg_reg[] __read_mostly = {
++	{
++		.name		= "TRACE",
++		.revision	= 0,
++		.family		= NFPROTO_IPV4,
++		.table		= "raw",
++		.target		= trace_tg,
++		.checkentry	= trace_tg_check,
++		.destroy	= trace_tg_destroy,
++		.me		= THIS_MODULE,
++	},
++#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
++	{
++		.name		= "TRACE",
++		.revision	= 0,
++		.family		= NFPROTO_IPV6,
++		.table		= "raw",
++		.target		= trace_tg,
++		.checkentry	= trace_tg_check,
++		.destroy	= trace_tg_destroy,
++	},
++#endif
+ };
+ 
+ static int __init trace_tg_init(void)
+ {
+-	return xt_register_target(&trace_tg_reg);
++	return xt_register_targets(trace_tg_reg, ARRAY_SIZE(trace_tg_reg));
+ }
+ 
+ static void __exit trace_tg_exit(void)
+ {
+-	xt_unregister_target(&trace_tg_reg);
++	xt_unregister_targets(trace_tg_reg, ARRAY_SIZE(trace_tg_reg));
+ }
+ 
+ module_init(trace_tg_init);
+diff --git a/net/netfilter/xt_addrtype.c b/net/netfilter/xt_addrtype.c
+index e9b2181e8c425f..a7708894310716 100644
+--- a/net/netfilter/xt_addrtype.c
++++ b/net/netfilter/xt_addrtype.c
+@@ -208,13 +208,24 @@ static struct xt_match addrtype_mt_reg[] __read_mostly = {
+ 	},
+ 	{
+ 		.name		= "addrtype",
+-		.family		= NFPROTO_UNSPEC,
++		.family		= NFPROTO_IPV4,
+ 		.revision	= 1,
+ 		.match		= addrtype_mt_v1,
+ 		.checkentry	= addrtype_mt_checkentry_v1,
+ 		.matchsize	= sizeof(struct xt_addrtype_info_v1),
+ 		.me		= THIS_MODULE
+-	}
++	},
++#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
++	{
++		.name		= "addrtype",
++		.family		= NFPROTO_IPV6,
++		.revision	= 1,
++		.match		= addrtype_mt_v1,
++		.checkentry	= addrtype_mt_checkentry_v1,
++		.matchsize	= sizeof(struct xt_addrtype_info_v1),
++		.me		= THIS_MODULE
++	},
++#endif
+ };
+ 
+ static int __init addrtype_mt_init(void)
+diff --git a/net/netfilter/xt_cluster.c b/net/netfilter/xt_cluster.c
+index a047a545371e18..908fd5f2c3c848 100644
+--- a/net/netfilter/xt_cluster.c
++++ b/net/netfilter/xt_cluster.c
+@@ -146,24 +146,37 @@ static void xt_cluster_mt_destroy(const struct xt_mtdtor_param *par)
+ 	nf_ct_netns_put(par->net, par->family);
+ }
+ 
+-static struct xt_match xt_cluster_match __read_mostly = {
+-	.name		= "cluster",
+-	.family		= NFPROTO_UNSPEC,
+-	.match		= xt_cluster_mt,
+-	.checkentry	= xt_cluster_mt_checkentry,
+-	.matchsize	= sizeof(struct xt_cluster_match_info),
+-	.destroy	= xt_cluster_mt_destroy,
+-	.me		= THIS_MODULE,
++static struct xt_match xt_cluster_match[] __read_mostly = {
++	{
++		.name		= "cluster",
++		.family		= NFPROTO_IPV4,
++		.match		= xt_cluster_mt,
++		.checkentry	= xt_cluster_mt_checkentry,
++		.matchsize	= sizeof(struct xt_cluster_match_info),
++		.destroy	= xt_cluster_mt_destroy,
++		.me		= THIS_MODULE,
++	},
++#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
++	{
++		.name		= "cluster",
++		.family		= NFPROTO_IPV6,
++		.match		= xt_cluster_mt,
++		.checkentry	= xt_cluster_mt_checkentry,
++		.matchsize	= sizeof(struct xt_cluster_match_info),
++		.destroy	= xt_cluster_mt_destroy,
++		.me		= THIS_MODULE,
++	},
++#endif
+ };
+ 
+ static int __init xt_cluster_mt_init(void)
+ {
+-	return xt_register_match(&xt_cluster_match);
++	return xt_register_matches(xt_cluster_match, ARRAY_SIZE(xt_cluster_match));
+ }
+ 
+ static void __exit xt_cluster_mt_fini(void)
+ {
+-	xt_unregister_match(&xt_cluster_match);
++	xt_unregister_matches(xt_cluster_match, ARRAY_SIZE(xt_cluster_match));
+ }
+ 
+ MODULE_AUTHOR("Pablo Neira Ayuso <pablo@netfilter.org>");
+diff --git a/net/netfilter/xt_connbytes.c b/net/netfilter/xt_connbytes.c
+index 93cb018c3055f8..2aabdcea870723 100644
+--- a/net/netfilter/xt_connbytes.c
++++ b/net/netfilter/xt_connbytes.c
+@@ -111,9 +111,11 @@ static int connbytes_mt_check(const struct xt_mtchk_param *par)
+ 		return -EINVAL;
+ 
+ 	ret = nf_ct_netns_get(par->net, par->family);
+-	if (ret < 0)
++	if (ret < 0) {
+ 		pr_info_ratelimited("cannot load conntrack support for proto=%u\n",
+ 				    par->family);
++		return ret;
++	}
+ 
+ 	/*
+ 	 * This filter cannot function correctly unless connection tracking
+diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c
+index 5d04ef80a61dcf..d1d0fa6c8061e9 100644
+--- a/net/netfilter/xt_connlimit.c
++++ b/net/netfilter/xt_connlimit.c
+@@ -106,26 +106,41 @@ static void connlimit_mt_destroy(const struct xt_mtdtor_param *par)
+ 	nf_conncount_destroy(par->net, par->family, info->data);
+ }
+ 
+-static struct xt_match connlimit_mt_reg __read_mostly = {
+-	.name       = "connlimit",
+-	.revision   = 1,
+-	.family     = NFPROTO_UNSPEC,
+-	.checkentry = connlimit_mt_check,
+-	.match      = connlimit_mt,
+-	.matchsize  = sizeof(struct xt_connlimit_info),
+-	.usersize   = offsetof(struct xt_connlimit_info, data),
+-	.destroy    = connlimit_mt_destroy,
+-	.me         = THIS_MODULE,
++static struct xt_match connlimit_mt_reg[] __read_mostly = {
++	{
++		.name       = "connlimit",
++		.revision   = 1,
++		.family     = NFPROTO_IPV4,
++		.checkentry = connlimit_mt_check,
++		.match      = connlimit_mt,
++		.matchsize  = sizeof(struct xt_connlimit_info),
++		.usersize   = offsetof(struct xt_connlimit_info, data),
++		.destroy    = connlimit_mt_destroy,
++		.me         = THIS_MODULE,
++	},
++#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
++	{
++		.name       = "connlimit",
++		.revision   = 1,
++		.family     = NFPROTO_IPV6,
++		.checkentry = connlimit_mt_check,
++		.match      = connlimit_mt,
++		.matchsize  = sizeof(struct xt_connlimit_info),
++		.usersize   = offsetof(struct xt_connlimit_info, data),
++		.destroy    = connlimit_mt_destroy,
++		.me         = THIS_MODULE,
++	},
++#endif
+ };
+ 
+ static int __init connlimit_mt_init(void)
+ {
+-	return xt_register_match(&connlimit_mt_reg);
++	return xt_register_matches(connlimit_mt_reg, ARRAY_SIZE(connlimit_mt_reg));
+ }
+ 
+ static void __exit connlimit_mt_exit(void)
+ {
+-	xt_unregister_match(&connlimit_mt_reg);
++	xt_unregister_matches(connlimit_mt_reg, ARRAY_SIZE(connlimit_mt_reg));
+ }
+ 
+ module_init(connlimit_mt_init);
+diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c
+index ad3c033db64e70..4277084de2e70c 100644
+--- a/net/netfilter/xt_connmark.c
++++ b/net/netfilter/xt_connmark.c
+@@ -151,7 +151,7 @@ static struct xt_target connmark_tg_reg[] __read_mostly = {
+ 	{
+ 		.name           = "CONNMARK",
+ 		.revision       = 1,
+-		.family         = NFPROTO_UNSPEC,
++		.family         = NFPROTO_IPV4,
+ 		.checkentry     = connmark_tg_check,
+ 		.target         = connmark_tg,
+ 		.targetsize     = sizeof(struct xt_connmark_tginfo1),
+@@ -161,13 +161,35 @@ static struct xt_target connmark_tg_reg[] __read_mostly = {
+ 	{
+ 		.name           = "CONNMARK",
+ 		.revision       = 2,
+-		.family         = NFPROTO_UNSPEC,
++		.family         = NFPROTO_IPV4,
+ 		.checkentry     = connmark_tg_check,
+ 		.target         = connmark_tg_v2,
+ 		.targetsize     = sizeof(struct xt_connmark_tginfo2),
+ 		.destroy        = connmark_tg_destroy,
+ 		.me             = THIS_MODULE,
+-	}
++	},
++#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
++	{
++		.name           = "CONNMARK",
++		.revision       = 1,
++		.family         = NFPROTO_IPV6,
++		.checkentry     = connmark_tg_check,
++		.target         = connmark_tg,
++		.targetsize     = sizeof(struct xt_connmark_tginfo1),
++		.destroy        = connmark_tg_destroy,
++		.me             = THIS_MODULE,
++	},
++	{
++		.name           = "CONNMARK",
++		.revision       = 2,
++		.family         = NFPROTO_IPV6,
++		.checkentry     = connmark_tg_check,
++		.target         = connmark_tg_v2,
++		.targetsize     = sizeof(struct xt_connmark_tginfo2),
++		.destroy        = connmark_tg_destroy,
++		.me             = THIS_MODULE,
++	},
++#endif
+ };
+ 
+ static struct xt_match connmark_mt_reg __read_mostly = {
+diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
+index 1ad74b5920b533..f76fe04fc9a4e1 100644
+--- a/net/netfilter/xt_mark.c
++++ b/net/netfilter/xt_mark.c
+@@ -39,13 +39,35 @@ mark_mt(const struct sk_buff *skb, struct xt_action_param *par)
+ 	return ((skb->mark & info->mask) == info->mark) ^ info->invert;
+ }
+ 
+-static struct xt_target mark_tg_reg __read_mostly = {
+-	.name           = "MARK",
+-	.revision       = 2,
+-	.family         = NFPROTO_UNSPEC,
+-	.target         = mark_tg,
+-	.targetsize     = sizeof(struct xt_mark_tginfo2),
+-	.me             = THIS_MODULE,
++static struct xt_target mark_tg_reg[] __read_mostly = {
++	{
++		.name           = "MARK",
++		.revision       = 2,
++		.family         = NFPROTO_IPV4,
++		.target         = mark_tg,
++		.targetsize     = sizeof(struct xt_mark_tginfo2),
++		.me             = THIS_MODULE,
++	},
++#if IS_ENABLED(CONFIG_IP_NF_ARPTABLES)
++	{
++		.name           = "MARK",
++		.revision       = 2,
++		.family         = NFPROTO_ARP,
++		.target         = mark_tg,
++		.targetsize     = sizeof(struct xt_mark_tginfo2),
++		.me             = THIS_MODULE,
++	},
++#endif
++#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
++	{
++		.name           = "MARK",
++		.revision       = 2,
++		.family         = NFPROTO_IPV4,
++		.target         = mark_tg,
++		.targetsize     = sizeof(struct xt_mark_tginfo2),
++		.me             = THIS_MODULE,
++	},
++#endif
+ };
+ 
+ static struct xt_match mark_mt_reg __read_mostly = {
+@@ -61,12 +83,12 @@ static int __init mark_mt_init(void)
+ {
+ 	int ret;
+ 
+-	ret = xt_register_target(&mark_tg_reg);
++	ret = xt_register_targets(mark_tg_reg, ARRAY_SIZE(mark_tg_reg));
+ 	if (ret < 0)
+ 		return ret;
+ 	ret = xt_register_match(&mark_mt_reg);
+ 	if (ret < 0) {
+-		xt_unregister_target(&mark_tg_reg);
++		xt_unregister_targets(mark_tg_reg, ARRAY_SIZE(mark_tg_reg));
+ 		return ret;
+ 	}
+ 	return 0;
+@@ -75,7 +97,7 @@ static int __init mark_mt_init(void)
+ static void __exit mark_mt_exit(void)
+ {
+ 	xt_unregister_match(&mark_mt_reg);
+-	xt_unregister_target(&mark_tg_reg);
++	xt_unregister_targets(mark_tg_reg, ARRAY_SIZE(mark_tg_reg));
+ }
+ 
+ module_init(mark_mt_init);
+diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
+index db49fc4d42cf7c..50e13207a05aa5 100644
+--- a/net/netlink/af_netlink.c
++++ b/net/netlink/af_netlink.c
+@@ -636,7 +636,7 @@ static struct proto netlink_proto = {
+ };
+ 
+ static int __netlink_create(struct net *net, struct socket *sock,
+-			    struct mutex *cb_mutex, int protocol,
++			    struct mutex *dump_cb_mutex, int protocol,
+ 			    int kern)
+ {
+ 	struct sock *sk;
+@@ -651,15 +651,11 @@ static int __netlink_create(struct net *net, struct socket *sock,
+ 	sock_init_data(sock, sk);
+ 
+ 	nlk = nlk_sk(sk);
+-	if (cb_mutex) {
+-		nlk->cb_mutex = cb_mutex;
+-	} else {
+-		nlk->cb_mutex = &nlk->cb_def_mutex;
+-		mutex_init(nlk->cb_mutex);
+-		lockdep_set_class_and_name(nlk->cb_mutex,
++	mutex_init(&nlk->nl_cb_mutex);
++	lockdep_set_class_and_name(&nlk->nl_cb_mutex,
+ 					   nlk_cb_mutex_keys + protocol,
+ 					   nlk_cb_mutex_key_strings[protocol]);
+-	}
++	nlk->dump_cb_mutex = dump_cb_mutex;
+ 	init_waitqueue_head(&nlk->wait);
+ 
+ 	sk->sk_destruct = netlink_sock_destruct;
+@@ -2147,8 +2143,9 @@ void __netlink_clear_multicast_users(struct sock *ksk, unsigned int group)
+ {
+ 	struct sock *sk;
+ 	struct netlink_table *tbl = &nl_table[ksk->sk_protocol];
++	struct hlist_node *tmp;
+ 
+-	sk_for_each_bound(sk, &tbl->mc_list)
++	sk_for_each_bound_safe(sk, tmp, &tbl->mc_list)
+ 		netlink_update_socket_mc(nlk_sk(sk), group, 0);
+ }
+ 
+@@ -2211,7 +2208,7 @@ static int netlink_dump(struct sock *sk, bool lock_taken)
+ 	int alloc_size;
+ 
+ 	if (!lock_taken)
+-		mutex_lock(nlk->cb_mutex);
++		mutex_lock(&nlk->nl_cb_mutex);
+ 	if (!nlk->cb_running) {
+ 		err = -EINVAL;
+ 		goto errout_skb;
+@@ -2263,14 +2260,24 @@ static int netlink_dump(struct sock *sk, bool lock_taken)
+ 	netlink_skb_set_owner_r(skb, sk);
+ 
+ 	if (nlk->dump_done_errno > 0) {
++		struct mutex *extra_mutex = nlk->dump_cb_mutex;
++
+ 		cb->extack = &extack;
++
++		if (cb->flags & RTNL_FLAG_DUMP_UNLOCKED)
++			extra_mutex = NULL;
++		if (extra_mutex)
++			mutex_lock(extra_mutex);
+ 		nlk->dump_done_errno = cb->dump(skb, cb);
++		if (extra_mutex)
++			mutex_unlock(extra_mutex);
++
+ 		cb->extack = NULL;
+ 	}
+ 
+ 	if (nlk->dump_done_errno > 0 ||
+ 	    skb_tailroom(skb) < nlmsg_total_size(sizeof(nlk->dump_done_errno))) {
+-		mutex_unlock(nlk->cb_mutex);
++		mutex_unlock(&nlk->nl_cb_mutex);
+ 
+ 		if (sk_filter(sk, skb))
+ 			kfree_skb(skb);
+@@ -2304,13 +2311,13 @@ static int netlink_dump(struct sock *sk, bool lock_taken)
+ 	WRITE_ONCE(nlk->cb_running, false);
+ 	module = cb->module;
+ 	skb = cb->skb;
+-	mutex_unlock(nlk->cb_mutex);
++	mutex_unlock(&nlk->nl_cb_mutex);
+ 	module_put(module);
+ 	consume_skb(skb);
+ 	return 0;
+ 
+ errout_skb:
+-	mutex_unlock(nlk->cb_mutex);
++	mutex_unlock(&nlk->nl_cb_mutex);
+ 	kfree_skb(skb);
+ 	return err;
+ }
+@@ -2333,7 +2340,7 @@ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
+ 	}
+ 
+ 	nlk = nlk_sk(sk);
+-	mutex_lock(nlk->cb_mutex);
++	mutex_lock(&nlk->nl_cb_mutex);
+ 	/* A dump is in progress... */
+ 	if (nlk->cb_running) {
+ 		ret = -EBUSY;
+@@ -2353,6 +2360,7 @@ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
+ 	cb->data = control->data;
+ 	cb->module = control->module;
+ 	cb->min_dump_alloc = control->min_dump_alloc;
++	cb->flags = control->flags;
+ 	cb->skb = skb;
+ 
+ 	cb->strict_check = nlk_test_bit(STRICT_CHK, NETLINK_CB(skb).sk);
+@@ -2384,7 +2392,7 @@ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
+ 	module_put(control->module);
+ error_unlock:
+ 	sock_put(sk);
+-	mutex_unlock(nlk->cb_mutex);
++	mutex_unlock(&nlk->nl_cb_mutex);
+ error_free:
+ 	kfree_skb(skb);
+ 	return ret;
+diff --git a/net/netlink/af_netlink.h b/net/netlink/af_netlink.h
+index 2145979b9986a0..9751e29d4bbb9a 100644
+--- a/net/netlink/af_netlink.h
++++ b/net/netlink/af_netlink.h
+@@ -39,8 +39,9 @@ struct netlink_sock {
+ 	bool			cb_running;
+ 	int			dump_done_errno;
+ 	struct netlink_callback	cb;
+-	struct mutex		*cb_mutex;
+-	struct mutex		cb_def_mutex;
++	struct mutex		nl_cb_mutex;
++
++	struct mutex		*dump_cb_mutex;
+ 	void			(*netlink_rcv)(struct sk_buff *skb);
+ 	int			(*netlink_bind)(struct net *net, int group);
+ 	void			(*netlink_unbind)(struct net *net, int group);
+diff --git a/net/phonet/pn_netlink.c b/net/phonet/pn_netlink.c
+index dd4c7e9a634fbe..894e5c72d6bfff 100644
+--- a/net/phonet/pn_netlink.c
++++ b/net/phonet/pn_netlink.c
+@@ -178,7 +178,7 @@ static int fill_route(struct sk_buff *skb, struct net_device *dev, u8 dst,
+ 	rtm->rtm_type = RTN_UNICAST;
+ 	rtm->rtm_flags = 0;
+ 	if (nla_put_u8(skb, RTA_DST, dst) ||
+-	    nla_put_u32(skb, RTA_OIF, dev->ifindex))
++	    nla_put_u32(skb, RTA_OIF, READ_ONCE(dev->ifindex)))
+ 		goto nla_put_failure;
+ 	nlmsg_end(skb, nlh);
+ 	return 0;
+@@ -263,6 +263,7 @@ static int route_doit(struct sk_buff *skb, struct nlmsghdr *nlh,
+ static int route_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
+ {
+ 	struct net *net = sock_net(skb->sk);
++	int err = 0;
+ 	u8 addr;
+ 
+ 	rcu_read_lock();
+@@ -272,35 +273,29 @@ static int route_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
+ 		if (!dev)
+ 			continue;
+ 
+-		if (fill_route(skb, dev, addr << 2, NETLINK_CB(cb->skb).portid,
+-			       cb->nlh->nlmsg_seq, RTM_NEWROUTE) < 0)
+-			goto out;
++		err = fill_route(skb, dev, addr << 2,
++				 NETLINK_CB(cb->skb).portid,
++				 cb->nlh->nlmsg_seq, RTM_NEWROUTE);
++		if (err < 0)
++			break;
+ 	}
+-
+-out:
+ 	rcu_read_unlock();
+ 	cb->args[0] = addr;
+ 
+-	return skb->len;
++	return err;
+ }
+ 
++static const struct rtnl_msg_handler phonet_rtnl_msg_handlers[] __initdata_or_module = {
++	{THIS_MODULE, PF_PHONET, RTM_NEWADDR, addr_doit, NULL, 0},
++	{THIS_MODULE, PF_PHONET, RTM_DELADDR, addr_doit, NULL, 0},
++	{THIS_MODULE, PF_PHONET, RTM_GETADDR, NULL, getaddr_dumpit, 0},
++	{THIS_MODULE, PF_PHONET, RTM_NEWROUTE, route_doit, NULL, 0},
++	{THIS_MODULE, PF_PHONET, RTM_DELROUTE, route_doit, NULL, 0},
++	{THIS_MODULE, PF_PHONET, RTM_GETROUTE, NULL, route_dumpit,
++	 RTNL_FLAG_DUMP_UNLOCKED},
++};
++
+ int __init phonet_netlink_register(void)
+ {
+-	int err = rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_NEWADDR,
+-				       addr_doit, NULL, 0);
+-	if (err)
+-		return err;
+-
+-	/* Further rtnl_register_module() cannot fail */
+-	rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_DELADDR,
+-			     addr_doit, NULL, 0);
+-	rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_GETADDR,
+-			     NULL, getaddr_dumpit, 0);
+-	rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_NEWROUTE,
+-			     route_doit, NULL, 0);
+-	rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_DELROUTE,
+-			     route_doit, NULL, 0);
+-	rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_GETROUTE,
+-			     NULL, route_dumpit, 0);
+-	return 0;
++	return rtnl_register_many(phonet_rtnl_msg_handlers);
+ }
+diff --git a/net/rxrpc/sendmsg.c b/net/rxrpc/sendmsg.c
+index 8e0b94714e849f..24f765d243db1c 100644
+--- a/net/rxrpc/sendmsg.c
++++ b/net/rxrpc/sendmsg.c
+@@ -303,6 +303,11 @@ static int rxrpc_send_data(struct rxrpc_sock *rx,
+ 	sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk);
+ 
+ reload:
++	txb = call->tx_pending;
++	call->tx_pending = NULL;
++	if (txb)
++		rxrpc_see_txbuf(txb, rxrpc_txbuf_see_send_more);
++
+ 	ret = -EPIPE;
+ 	if (sk->sk_shutdown & SEND_SHUTDOWN)
+ 		goto maybe_error;
+@@ -329,11 +334,6 @@ static int rxrpc_send_data(struct rxrpc_sock *rx,
+ 			goto maybe_error;
+ 	}
+ 
+-	txb = call->tx_pending;
+-	call->tx_pending = NULL;
+-	if (txb)
+-		rxrpc_see_txbuf(txb, rxrpc_txbuf_see_send_more);
+-
+ 	do {
+ 		if (!txb) {
+ 			size_t remain, bufsize, chunk, offset;
+diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
+index 0feb824242a68b..1455892694c001 100644
+--- a/net/sched/sch_api.c
++++ b/net/sched/sch_api.c
+@@ -593,7 +593,6 @@ void __qdisc_calculate_pkt_len(struct sk_buff *skb,
+ 		pkt_len = 1;
+ 	qdisc_skb_cb(skb)->pkt_len = pkt_len;
+ }
+-EXPORT_SYMBOL(__qdisc_calculate_pkt_len);
+ 
+ void qdisc_warn_nonwc(const char *txt, struct Qdisc *qdisc)
+ {
+@@ -1172,6 +1171,12 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
+ 			return -EINVAL;
+ 		}
+ 
++		if (new &&
++		    !(parent->flags & TCQ_F_MQROOT) &&
++		    rcu_access_pointer(new->stab)) {
++			NL_SET_ERR_MSG(extack, "STAB not supported on a non root");
++			return -EINVAL;
++		}
+ 		err = cops->graft(parent, cl, new, &old, extack);
+ 		if (err)
+ 			return err;
+diff --git a/net/sctp/socket.c b/net/sctp/socket.c
+index 4a1ebe46d045d8..108a0745c0c3ca 100644
+--- a/net/sctp/socket.c
++++ b/net/sctp/socket.c
+@@ -8525,6 +8525,7 @@ static int sctp_listen_start(struct sock *sk, int backlog)
+ 	struct sctp_endpoint *ep = sp->ep;
+ 	struct crypto_shash *tfm = NULL;
+ 	char alg[32];
++	int err;
+ 
+ 	/* Allocate HMAC for generating cookie. */
+ 	if (!sp->hmac && sp->sctp_hmac_alg) {
+@@ -8552,18 +8553,25 @@ static int sctp_listen_start(struct sock *sk, int backlog)
+ 	inet_sk_set_state(sk, SCTP_SS_LISTENING);
+ 	if (!ep->base.bind_addr.port) {
+ 		if (sctp_autobind(sk)) {
+-			inet_sk_set_state(sk, SCTP_SS_CLOSED);
+-			return -EAGAIN;
++			err = -EAGAIN;
++			goto err;
+ 		}
+ 	} else {
+ 		if (sctp_get_port(sk, inet_sk(sk)->inet_num)) {
+-			inet_sk_set_state(sk, SCTP_SS_CLOSED);
+-			return -EADDRINUSE;
++			err = -EADDRINUSE;
++			goto err;
+ 		}
+ 	}
+ 
+ 	WRITE_ONCE(sk->sk_max_ack_backlog, backlog);
+-	return sctp_hash_endpoint(ep);
++	err = sctp_hash_endpoint(ep);
++	if (err)
++		goto err;
++
++	return 0;
++err:
++	inet_sk_set_state(sk, SCTP_SS_CLOSED);
++	return err;
+ }
+ 
+ /*
+diff --git a/net/socket.c b/net/socket.c
+index 9db33cd4a71b89..bad58f23f30722 100644
+--- a/net/socket.c
++++ b/net/socket.c
+@@ -1569,8 +1569,13 @@ int __sock_create(struct net *net, int family, int type, int protocol,
+ 	rcu_read_unlock();
+ 
+ 	err = pf->create(net, sock, protocol, kern);
+-	if (err < 0)
++	if (err < 0) {
++		/* ->create should release the allocated sock->sk object on error
++		 * but it may leave the dangling pointer
++		 */
++		sock->sk = NULL;
+ 		goto out_module_put;
++	}
+ 
+ 	/*
+ 	 * Now to bump the refcnt of the [loadable] module that owns this
+diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
+index a6a9d353fe635a..134c6f6e0959ae 100644
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -2682,7 +2682,7 @@ static const struct pci_device_id azx_ids[] = {
+ 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
+ 	  AZX_DCAPS_PM_RUNTIME },
+ 	/* GLENFLY */
+-	{ PCI_DEVICE(0x6766, PCI_ANY_ID),
++	{ PCI_DEVICE(PCI_VENDOR_ID_GLENFLY, PCI_ANY_ID),
+ 	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
+ 	  .class_mask = 0xffffff,
+ 	  .driver_data = AZX_DRIVER_GFHDMI | AZX_DCAPS_POSFIX_LPIB |
+diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
+index ebdd7c43233636..07e1547fff2e51 100644
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -10053,6 +10053,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+ 	SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK),
+ 	SND_PCI_QUIRK(0x1043, 0x1663, "ASUS GU603ZV", ALC285_FIXUP_ASUS_HEADSET_MIC),
+ 	SND_PCI_QUIRK(0x1043, 0x1683, "ASUS UM3402YAR", ALC287_FIXUP_CS35L41_I2C_2),
++	SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS UX3402VA", ALC245_FIXUP_CS35L41_SPI_2),
+ 	SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),
+ 	SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC),
+ 	SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS),
+@@ -10090,14 +10091,12 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+ 	SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE),
+ 	SND_PCI_QUIRK(0x1043, 0x1da2, "ASUS UP6502ZA/ZD", ALC245_FIXUP_CS35L41_SPI_2),
+ 	SND_PCI_QUIRK(0x1043, 0x1e02, "ASUS UX3402ZA", ALC245_FIXUP_CS35L41_SPI_2),
+-	SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS UX3402VA", ALC245_FIXUP_CS35L41_SPI_2),
+-	SND_PCI_QUIRK(0x1043, 0x1f62, "ASUS UX7602ZM", ALC245_FIXUP_CS35L41_SPI_2),
+ 	SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502),
+-	SND_PCI_QUIRK(0x1043, 0x1e12, "ASUS UM6702RA/RC", ALC287_FIXUP_CS35L41_I2C_2),
++	SND_PCI_QUIRK(0x1043, 0x1e12, "ASUS UM3402", ALC287_FIXUP_CS35L41_I2C_2),
+ 	SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS),
+ 	SND_PCI_QUIRK(0x1043, 0x1e5e, "ASUS ROG Strix G513", ALC294_FIXUP_ASUS_G513_PINS),
+ 	SND_PCI_QUIRK(0x1043, 0x1e8e, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA401),
+-	SND_PCI_QUIRK(0x1043, 0x1ee2, "ASUS UM3402", ALC287_FIXUP_CS35L41_I2C_2),
++	SND_PCI_QUIRK(0x1043, 0x1ee2, "ASUS UM6702RA/RC", ALC287_FIXUP_CS35L41_I2C_2),
+ 	SND_PCI_QUIRK(0x1043, 0x1c52, "ASUS Zephyrus G15 2022", ALC289_FIXUP_ASUS_GA401),
+ 	SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401),
+ 	SND_PCI_QUIRK(0x1043, 0x1f12, "ASUS UM5302", ALC287_FIXUP_CS35L41_I2C_2),
+diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c
+index 69c951e3058424..d3db89c93b331d 100644
+--- a/sound/soc/codecs/cs35l56-shared.c
++++ b/sound/soc/codecs/cs35l56-shared.c
+@@ -5,6 +5,7 @@
+ // Copyright (C) 2023 Cirrus Logic, Inc. and
+ //                    Cirrus Logic International Semiconductor Ltd.
+ 
++#include <linux/gpio/consumer.h>
+ #include <linux/regmap.h>
+ #include <linux/regulator/consumer.h>
+ #include <linux/types.h>
+@@ -695,6 +696,41 @@ int cs35l56_hw_init(struct cs35l56_base *cs35l56_base)
+ }
+ EXPORT_SYMBOL_NS_GPL(cs35l56_hw_init, SND_SOC_CS35L56_SHARED);
+ 
++int cs35l56_get_speaker_id(struct cs35l56_base *cs35l56_base)
++{
++	struct gpio_descs *descs;
++	int speaker_id;
++	int i, ret;
++
++	/* Read the speaker type qualifier from the motherboard GPIOs */
++	descs = gpiod_get_array_optional(cs35l56_base->dev, "spk-id", GPIOD_IN);
++	if (!descs) {
++		return -ENOENT;
++	} else if (IS_ERR(descs)) {
++		ret = PTR_ERR(descs);
++		return dev_err_probe(cs35l56_base->dev, ret, "Failed to get spk-id-gpios\n");
++	}
++
++	speaker_id = 0;
++	for (i = 0; i < descs->ndescs; i++) {
++		ret = gpiod_get_value_cansleep(descs->desc[i]);
++		if (ret < 0) {
++			dev_err_probe(cs35l56_base->dev, ret, "Failed to read spk-id[%d]\n", i);
++			goto err;
++		}
++
++		speaker_id |= (ret << i);
++	}
++
++	dev_dbg(cs35l56_base->dev, "Speaker ID = %d\n", speaker_id);
++	ret = speaker_id;
++err:
++	gpiod_put_array(descs);
++
++	return ret;
++}
++EXPORT_SYMBOL_NS_GPL(cs35l56_get_speaker_id, SND_SOC_CS35L56_SHARED);
++
+ static const u32 cs35l56_bclk_valid_for_pll_freq_table[] = {
+ 	[0x0C] = 128000,
+ 	[0x0F] = 256000,
+diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c
+index c855ef3ec665ef..015269f0db54cf 100644
+--- a/sound/soc/codecs/cs35l56.c
++++ b/sound/soc/codecs/cs35l56.c
+@@ -941,10 +941,19 @@ static int cs35l56_component_probe(struct snd_soc_component *component)
+ 
+ 	if (!cs35l56->dsp.system_name &&
+ 	    (snd_soc_card_get_pci_ssid(component->card, &vendor, &device) == 0)) {
+-		cs35l56->dsp.system_name = devm_kasprintf(cs35l56->base.dev,
+-							  GFP_KERNEL,
+-							  "%04x%04x",
+-							  vendor, device);
++		/* Append a speaker qualifier if there is a speaker ID */
++		if (cs35l56->speaker_id >= 0) {
++			cs35l56->dsp.system_name = devm_kasprintf(cs35l56->base.dev,
++								  GFP_KERNEL,
++								  "%04x%04x-spkid%d",
++								  vendor, device,
++								  cs35l56->speaker_id);
++		} else {
++			cs35l56->dsp.system_name = devm_kasprintf(cs35l56->base.dev,
++								  GFP_KERNEL,
++								  "%04x%04x",
++								  vendor, device);
++		}
+ 		if (!cs35l56->dsp.system_name)
+ 			return -ENOMEM;
+ 	}
+@@ -1230,7 +1239,13 @@ static int cs35l56_get_firmware_uid(struct cs35l56_private *cs35l56)
+ 	if (ret < 0)
+ 		return 0;
+ 
+-	cs35l56->dsp.system_name = devm_kstrdup(dev, prop, GFP_KERNEL);
++	/* Append a speaker qualifier if there is a speaker ID */
++	if (cs35l56->speaker_id >= 0)
++		cs35l56->dsp.system_name = devm_kasprintf(dev, GFP_KERNEL, "%s-spkid%d",
++							  prop, cs35l56->speaker_id);
++	else
++		cs35l56->dsp.system_name = devm_kstrdup(dev, prop, GFP_KERNEL);
++
+ 	if (cs35l56->dsp.system_name == NULL)
+ 		return -ENOMEM;
+ 
+@@ -1245,6 +1260,7 @@ int cs35l56_common_probe(struct cs35l56_private *cs35l56)
+ 
+ 	init_completion(&cs35l56->init_completion);
+ 	mutex_init(&cs35l56->base.irq_lock);
++	cs35l56->speaker_id = -ENOENT;
+ 
+ 	dev_set_drvdata(cs35l56->base.dev, cs35l56);
+ 
+@@ -1281,6 +1297,12 @@ int cs35l56_common_probe(struct cs35l56_private *cs35l56)
+ 		gpiod_set_value_cansleep(cs35l56->base.reset_gpio, 1);
+ 	}
+ 
++	ret = cs35l56_get_speaker_id(&cs35l56->base);
++	if ((ret < 0) && (ret != -ENOENT))
++		goto err;
++
++	cs35l56->speaker_id = ret;
++
+ 	ret = cs35l56_get_firmware_uid(cs35l56);
+ 	if (ret != 0)
+ 		goto err;
+diff --git a/sound/soc/codecs/cs35l56.h b/sound/soc/codecs/cs35l56.h
+index d9fbf568a19586..b000e7365e4065 100644
+--- a/sound/soc/codecs/cs35l56.h
++++ b/sound/soc/codecs/cs35l56.h
+@@ -44,6 +44,7 @@ struct cs35l56_private {
+ 	bool sdw_attached;
+ 	struct completion init_completion;
+ 
++	int speaker_id;
+ 	u32 rx_mask;
+ 	u32 tx_mask;
+ 	u8 asp_slot_width;
+diff --git a/tools/iio/iio_generic_buffer.c b/tools/iio/iio_generic_buffer.c
+index 0d0a7a19d6f952..9ef5ee087eda36 100644
+--- a/tools/iio/iio_generic_buffer.c
++++ b/tools/iio/iio_generic_buffer.c
+@@ -498,6 +498,10 @@ int main(int argc, char **argv)
+ 			return -ENOMEM;
+ 		}
+ 		trigger_name = malloc(IIO_MAX_NAME_LENGTH);
++		if (!trigger_name) {
++			ret = -ENOMEM;
++			goto error;
++		}
+ 		ret = read_sysfs_string("name", trig_dev_name, trigger_name);
+ 		free(trig_dev_name);
+ 		if (ret < 0) {
+diff --git a/tools/lib/subcmd/parse-options.c b/tools/lib/subcmd/parse-options.c
+index d943d78b787ed7..9fa75943f2ed17 100644
+--- a/tools/lib/subcmd/parse-options.c
++++ b/tools/lib/subcmd/parse-options.c
+@@ -633,10 +633,11 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o
+ 			const char *const subcommands[], const char *usagestr[], int flags)
+ {
+ 	struct parse_opt_ctx_t ctx;
+-	char *buf = NULL;
+ 
+ 	/* build usage string if it's not provided */
+ 	if (subcommands && !usagestr[0]) {
++		char *buf = NULL;
++
+ 		astrcatf(&buf, "%s %s [<options>] {", subcmd_config.exec_name, argv[0]);
+ 
+ 		for (int i = 0; subcommands[i]; i++) {
+@@ -678,10 +679,7 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o
+ 			astrcatf(&error_buf, "unknown switch `%c'", *ctx.opt);
+ 		usage_with_options(usagestr, options);
+ 	}
+-	if (buf) {
+-		usagestr[0] = NULL;
+-		free(buf);
+-	}
++
+ 	return parse_options_end(&ctx);
+ }
+ 
+diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
+index 9714327fd0eadd..cf623c1490d959 100644
+--- a/tools/perf/builtin-kmem.c
++++ b/tools/perf/builtin-kmem.c
+@@ -2058,6 +2058,8 @@ int cmd_kmem(int argc, const char **argv)
+ 
+ out_delete:
+ 	perf_session__delete(session);
++	/* free usage string allocated by parse_options_subcommand */
++	free((void *)kmem_usage[0]);
+ 
+ 	return ret;
+ }
+diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
+index 71165036e4cac8..988bef73bd0957 100644
+--- a/tools/perf/builtin-kvm.c
++++ b/tools/perf/builtin-kvm.c
+@@ -2187,5 +2187,8 @@ int cmd_kvm(int argc, const char **argv)
+ 	else
+ 		usage_with_options(kvm_usage, kvm_options);
+ 
++	/* free usage string allocated by parse_options_subcommand */
++	free((void *)kvm_usage[0]);
++
+ 	return 0;
+ }
+diff --git a/tools/perf/builtin-kwork.c b/tools/perf/builtin-kwork.c
+index de2fbb7c56c325..be210be42c77b3 100644
+--- a/tools/perf/builtin-kwork.c
++++ b/tools/perf/builtin-kwork.c
+@@ -1853,5 +1853,8 @@ int cmd_kwork(int argc, const char **argv)
+ 	} else
+ 		usage_with_options(kwork_usage, kwork_options);
+ 
++	/* free usage string allocated by parse_options_subcommand */
++	free((void *)kwork_usage[0]);
++
+ 	return 0;
+ }
+diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
+index 0b4b4445c52077..fcb32c58bee7e4 100644
+--- a/tools/perf/builtin-lock.c
++++ b/tools/perf/builtin-lock.c
+@@ -2622,6 +2622,9 @@ int cmd_lock(int argc, const char **argv)
+ 		usage_with_options(lock_usage, lock_options);
+ 	}
+ 
++	/* free usage string allocated by parse_options_subcommand */
++	free((void *)lock_usage[0]);
++
+ 	zfree(&lockhash_table);
+ 	return rc;
+ }
+diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
+index 865f321d729b69..286105be91cec9 100644
+--- a/tools/perf/builtin-mem.c
++++ b/tools/perf/builtin-mem.c
+@@ -518,5 +518,8 @@ int cmd_mem(int argc, const char **argv)
+ 	else
+ 		usage_with_options(mem_usage, mem_options);
+ 
++	/* free usage string allocated by parse_options_subcommand */
++	free((void *)mem_usage[0]);
++
+ 	return 0;
+ }
+diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
+index 42185da0f000a0..ac9d94dbbeefae 100644
+--- a/tools/perf/builtin-sched.c
++++ b/tools/perf/builtin-sched.c
+@@ -3211,14 +3211,44 @@ static void perf_sched__merge_lat(struct perf_sched *sched)
+ 	}
+ }
+ 
++static int setup_cpus_switch_event(struct perf_sched *sched)
++{
++	unsigned int i;
++
++	sched->cpu_last_switched = calloc(MAX_CPUS, sizeof(*(sched->cpu_last_switched)));
++	if (!sched->cpu_last_switched)
++		return -1;
++
++	sched->curr_pid = malloc(MAX_CPUS * sizeof(*(sched->curr_pid)));
++	if (!sched->curr_pid) {
++		zfree(&sched->cpu_last_switched);
++		return -1;
++	}
++
++	for (i = 0; i < MAX_CPUS; i++)
++		sched->curr_pid[i] = -1;
++
++	return 0;
++}
++
++static void free_cpus_switch_event(struct perf_sched *sched)
++{
++	zfree(&sched->curr_pid);
++	zfree(&sched->cpu_last_switched);
++}
++
+ static int perf_sched__lat(struct perf_sched *sched)
+ {
++	int rc = -1;
+ 	struct rb_node *next;
+ 
+ 	setup_pager();
+ 
++	if (setup_cpus_switch_event(sched))
++		return rc;
++
+ 	if (perf_sched__read_events(sched))
+-		return -1;
++		goto out_free_cpus_switch_event;
+ 
+ 	perf_sched__merge_lat(sched);
+ 	perf_sched__sort_lat(sched);
+@@ -3247,13 +3277,15 @@ static int perf_sched__lat(struct perf_sched *sched)
+ 	print_bad_events(sched);
+ 	printf("\n");
+ 
+-	return 0;
++	rc = 0;
++
++out_free_cpus_switch_event:
++	free_cpus_switch_event(sched);
++	return rc;
+ }
+ 
+ static int setup_map_cpus(struct perf_sched *sched)
+ {
+-	struct perf_cpu_map *map;
+-
+ 	sched->max_cpu.cpu  = sysconf(_SC_NPROCESSORS_CONF);
+ 
+ 	if (sched->map.comp) {
+@@ -3262,16 +3294,15 @@ static int setup_map_cpus(struct perf_sched *sched)
+ 			return -1;
+ 	}
+ 
+-	if (!sched->map.cpus_str)
+-		return 0;
+-
+-	map = perf_cpu_map__new(sched->map.cpus_str);
+-	if (!map) {
+-		pr_err("failed to get cpus map from %s\n", sched->map.cpus_str);
+-		return -1;
++	if (sched->map.cpus_str) {
++		sched->map.cpus = perf_cpu_map__new(sched->map.cpus_str);
++		if (!sched->map.cpus) {
++			pr_err("failed to get cpus map from %s\n", sched->map.cpus_str);
++			zfree(&sched->map.comp_cpus);
++			return -1;
++		}
+ 	}
+ 
+-	sched->map.cpus = map;
+ 	return 0;
+ }
+ 
+@@ -3311,33 +3342,69 @@ static int setup_color_cpus(struct perf_sched *sched)
+ 
+ static int perf_sched__map(struct perf_sched *sched)
+ {
++	int rc = -1;
++
++	sched->curr_thread = calloc(MAX_CPUS, sizeof(*(sched->curr_thread)));
++	if (!sched->curr_thread)
++		return rc;
++
++	if (setup_cpus_switch_event(sched))
++		goto out_free_curr_thread;
++
+ 	if (setup_map_cpus(sched))
+-		return -1;
++		goto out_free_cpus_switch_event;
+ 
+ 	if (setup_color_pids(sched))
+-		return -1;
++		goto out_put_map_cpus;
+ 
+ 	if (setup_color_cpus(sched))
+-		return -1;
++		goto out_put_color_pids;
+ 
+ 	setup_pager();
+ 	if (perf_sched__read_events(sched))
+-		return -1;
++		goto out_put_color_cpus;
++
++	rc = 0;
+ 	print_bad_events(sched);
+-	return 0;
++
++out_put_color_cpus:
++	perf_cpu_map__put(sched->map.color_cpus);
++
++out_put_color_pids:
++	perf_thread_map__put(sched->map.color_pids);
++
++out_put_map_cpus:
++	zfree(&sched->map.comp_cpus);
++	perf_cpu_map__put(sched->map.cpus);
++
++out_free_cpus_switch_event:
++	free_cpus_switch_event(sched);
++
++out_free_curr_thread:
++	zfree(&sched->curr_thread);
++	return rc;
+ }
+ 
+ static int perf_sched__replay(struct perf_sched *sched)
+ {
++	int ret;
+ 	unsigned long i;
+ 
++	mutex_init(&sched->start_work_mutex);
++	mutex_init(&sched->work_done_wait_mutex);
++
++	ret = setup_cpus_switch_event(sched);
++	if (ret)
++		goto out_mutex_destroy;
++
+ 	calibrate_run_measurement_overhead(sched);
+ 	calibrate_sleep_measurement_overhead(sched);
+ 
+ 	test_calibrations(sched);
+ 
+-	if (perf_sched__read_events(sched))
+-		return -1;
++	ret = perf_sched__read_events(sched);
++	if (ret)
++		goto out_free_cpus_switch_event;
+ 
+ 	printf("nr_run_events:        %ld\n", sched->nr_run_events);
+ 	printf("nr_sleep_events:      %ld\n", sched->nr_sleep_events);
+@@ -3362,7 +3429,14 @@ static int perf_sched__replay(struct perf_sched *sched)
+ 
+ 	sched->thread_funcs_exit = true;
+ 	destroy_tasks(sched);
+-	return 0;
++
++out_free_cpus_switch_event:
++	free_cpus_switch_event(sched);
++
++out_mutex_destroy:
++	mutex_destroy(&sched->start_work_mutex);
++	mutex_destroy(&sched->work_done_wait_mutex);
++	return ret;
+ }
+ 
+ static void setup_sorting(struct perf_sched *sched, const struct option *options,
+@@ -3597,28 +3671,7 @@ int cmd_sched(int argc, const char **argv)
+ 		.switch_event	    = replay_switch_event,
+ 		.fork_event	    = replay_fork_event,
+ 	};
+-	unsigned int i;
+-	int ret = 0;
+-
+-	mutex_init(&sched.start_work_mutex);
+-	mutex_init(&sched.work_done_wait_mutex);
+-	sched.curr_thread = calloc(MAX_CPUS, sizeof(*sched.curr_thread));
+-	if (!sched.curr_thread) {
+-		ret = -ENOMEM;
+-		goto out;
+-	}
+-	sched.cpu_last_switched = calloc(MAX_CPUS, sizeof(*sched.cpu_last_switched));
+-	if (!sched.cpu_last_switched) {
+-		ret = -ENOMEM;
+-		goto out;
+-	}
+-	sched.curr_pid = malloc(MAX_CPUS * sizeof(*sched.curr_pid));
+-	if (!sched.curr_pid) {
+-		ret = -ENOMEM;
+-		goto out;
+-	}
+-	for (i = 0; i < MAX_CPUS; i++)
+-		sched.curr_pid[i] = -1;
++	int ret;
+ 
+ 	argc = parse_options_subcommand(argc, argv, sched_options, sched_subcommands,
+ 					sched_usage, PARSE_OPT_STOP_AT_NON_OPTION);
+@@ -3629,9 +3682,9 @@ int cmd_sched(int argc, const char **argv)
+ 	 * Aliased to 'perf script' for now:
+ 	 */
+ 	if (!strcmp(argv[0], "script")) {
+-		ret = cmd_script(argc, argv);
++		return cmd_script(argc, argv);
+ 	} else if (strlen(argv[0]) > 2 && strstarts("record", argv[0])) {
+-		ret = __cmd_record(argc, argv);
++		return __cmd_record(argc, argv);
+ 	} else if (strlen(argv[0]) > 2 && strstarts("latency", argv[0])) {
+ 		sched.tp_handler = &lat_ops;
+ 		if (argc > 1) {
+@@ -3640,7 +3693,7 @@ int cmd_sched(int argc, const char **argv)
+ 				usage_with_options(latency_usage, latency_options);
+ 		}
+ 		setup_sorting(&sched, latency_options, latency_usage);
+-		ret = perf_sched__lat(&sched);
++		return perf_sched__lat(&sched);
+ 	} else if (!strcmp(argv[0], "map")) {
+ 		if (argc) {
+ 			argc = parse_options(argc, argv, map_options, map_usage, 0);
+@@ -3649,7 +3702,7 @@ int cmd_sched(int argc, const char **argv)
+ 		}
+ 		sched.tp_handler = &map_ops;
+ 		setup_sorting(&sched, latency_options, latency_usage);
+-		ret = perf_sched__map(&sched);
++		return perf_sched__map(&sched);
+ 	} else if (strlen(argv[0]) > 2 && strstarts("replay", argv[0])) {
+ 		sched.tp_handler = &replay_ops;
+ 		if (argc) {
+@@ -3657,7 +3710,7 @@ int cmd_sched(int argc, const char **argv)
+ 			if (argc)
+ 				usage_with_options(replay_usage, replay_options);
+ 		}
+-		ret = perf_sched__replay(&sched);
++		return perf_sched__replay(&sched);
+ 	} else if (!strcmp(argv[0], "timehist")) {
+ 		if (argc) {
+ 			argc = parse_options(argc, argv, timehist_options,
+@@ -3673,24 +3726,19 @@ int cmd_sched(int argc, const char **argv)
+ 				parse_options_usage(NULL, timehist_options, "w", true);
+ 			if (sched.show_next)
+ 				parse_options_usage(NULL, timehist_options, "n", true);
+-			ret = -EINVAL;
+-			goto out;
++			return -EINVAL;
+ 		}
+ 		ret = symbol__validate_sym_arguments();
+ 		if (ret)
+-			goto out;
++			return ret;
+ 
+-		ret = perf_sched__timehist(&sched);
++		return perf_sched__timehist(&sched);
+ 	} else {
+ 		usage_with_options(sched_usage, sched_options);
+ 	}
+ 
+-out:
+-	free(sched.curr_pid);
+-	free(sched.cpu_last_switched);
+-	free(sched.curr_thread);
+-	mutex_destroy(&sched.start_work_mutex);
+-	mutex_destroy(&sched.work_done_wait_mutex);
++	/* free usage string allocated by parse_options_subcommand */
++	free((void *)sched_usage[0]);
+ 
+-	return ret;
++	return 0;
+ }
+diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
+index 24451f8f429106..045090085ac5bd 100755
+--- a/tools/testing/ktest/ktest.pl
++++ b/tools/testing/ktest/ktest.pl
+@@ -2043,7 +2043,7 @@ sub get_grub_index {
+     } elsif ($reboot_type eq "grub2") {
+ 	$command = "cat $grub_file";
+ 	$target = '^\s*menuentry.*' . $grub_menu_qt;
+-	$skip = '^\s*menuentry';
++	$skip = '^\s*menuentry\s';
+ 	$submenu = '^\s*submenu\s';
+     } elsif ($reboot_type eq "grub2bls") {
+ 	$command = $grub_bls_get;
+diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
+index 697f13bbbc3217..5b61b8bb29f846 100644
+--- a/tools/testing/selftests/Makefile
++++ b/tools/testing/selftests/Makefile
+@@ -184,6 +184,8 @@ run_tests: all
+ 	@for TARGET in $(TARGETS); do \
+ 		BUILD_TARGET=$$BUILD/$$TARGET;	\
+ 		$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests \
++				SRC_PATH=$(shell readlink -e $$(pwd)) \
++				OBJ_PATH=$(BUILD)                   \
+ 				O=$(abs_objtree);		    \
+ 	done;
+ 
+@@ -234,7 +236,10 @@ ifdef INSTALL_PATH
+ 	@ret=1;	\
+ 	for TARGET in $(TARGETS); do \
+ 		BUILD_TARGET=$$BUILD/$$TARGET;	\
+-		$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET INSTALL_PATH=$(INSTALL_PATH)/$$TARGET install \
++		$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET install \
++				INSTALL_PATH=$(INSTALL_PATH)/$$TARGET \
++				SRC_PATH=$(shell readlink -e $$(pwd)) \
++				OBJ_PATH=$(INSTALL_PATH) \
+ 				O=$(abs_objtree)		\
+ 				$(if $(FORCE_TARGETS),|| exit);	\
+ 		ret=$$((ret * $$?));		\
+diff --git a/tools/testing/selftests/bpf/progs/verifier_int_ptr.c b/tools/testing/selftests/bpf/progs/verifier_int_ptr.c
+index 589e8270de4628..d873da71f14363 100644
+--- a/tools/testing/selftests/bpf/progs/verifier_int_ptr.c
++++ b/tools/testing/selftests/bpf/progs/verifier_int_ptr.c
+@@ -8,7 +8,6 @@
+ SEC("socket")
+ __description("ARG_PTR_TO_LONG uninitialized")
+ __success
+-__failure_unpriv __msg_unpriv("invalid indirect read from stack R4 off -16+0 size 8")
+ __naked void arg_ptr_to_long_uninitialized(void)
+ {
+ 	asm volatile ("					\
+@@ -36,9 +35,7 @@ __naked void arg_ptr_to_long_uninitialized(void)
+ 
+ SEC("socket")
+ __description("ARG_PTR_TO_LONG half-uninitialized")
+-/* in privileged mode reads from uninitialized stack locations are permitted */
+-__success __failure_unpriv
+-__msg_unpriv("invalid indirect read from stack R4 off -16+4 size 8")
++__success
+ __retval(0)
+ __naked void ptr_to_long_half_uninitialized(void)
+ {
+diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk
+index a8f0442a36bca0..01db65c0e84ca3 100644
+--- a/tools/testing/selftests/lib.mk
++++ b/tools/testing/selftests/lib.mk
+@@ -77,11 +77,29 @@ define RUN_TESTS
+ 	run_many $(1)
+ endef
+ 
++define INSTALL_INCLUDES
++	$(if $(TEST_INCLUDES), \
++		relative_files=""; \
++		for entry in $(TEST_INCLUDES); do \
++			entry_dir=$$(readlink -e "$$(dirname "$$entry")"); \
++			entry_name=$$(basename "$$entry"); \
++			relative_dir=$${entry_dir#"$$SRC_PATH"/}; \
++			if [ "$$relative_dir" = "$$entry_dir" ]; then \
++				echo "Error: TEST_INCLUDES entry \"$$entry\" not located inside selftests directory ($$SRC_PATH)" >&2; \
++				exit 1; \
++			fi; \
++			relative_files="$$relative_files $$relative_dir/$$entry_name"; \
++		done; \
++		cd $(SRC_PATH) && rsync -aR $$relative_files $(OBJ_PATH)/ \
++	)
++endef
++
+ run_tests: all
+ ifdef building_out_of_srctree
+ 	@if [ "X$(TEST_PROGS)$(TEST_PROGS_EXTENDED)$(TEST_FILES)" != "X" ]; then \
+ 		rsync -aq --copy-unsafe-links $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(OUTPUT); \
+ 	fi
++	@$(INSTALL_INCLUDES)
+ 	@if [ "X$(TEST_PROGS)" != "X" ]; then \
+ 		$(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) \
+ 				  $(addprefix $(OUTPUT)/,$(TEST_PROGS))) ; \
+@@ -111,6 +129,7 @@ endef
+ install: all
+ ifdef INSTALL_PATH
+ 	$(INSTALL_RULE)
++	$(INSTALL_INCLUDES)
+ else
+ 	$(error Error: set INSTALL_PATH to use install)
+ endif
+diff --git a/tools/testing/selftests/mm/hmm-tests.c b/tools/testing/selftests/mm/hmm-tests.c
+index 20294553a5dd7a..2840924ec97680 100644
+--- a/tools/testing/selftests/mm/hmm-tests.c
++++ b/tools/testing/selftests/mm/hmm-tests.c
+@@ -1657,7 +1657,7 @@ TEST_F(hmm2, double_map)
+ 
+ 	buffer->fd = -1;
+ 	buffer->size = size;
+-	buffer->mirror = malloc(npages);
++	buffer->mirror = malloc(size);
+ 	ASSERT_NE(buffer->mirror, NULL);
+ 
+ 	/* Reserve a range of addresses. */
+diff --git a/tools/testing/selftests/net/forwarding/no_forwarding.sh b/tools/testing/selftests/net/forwarding/no_forwarding.sh
+index 9e677aa64a06a6..694ece9ba3a742 100755
+--- a/tools/testing/selftests/net/forwarding/no_forwarding.sh
++++ b/tools/testing/selftests/net/forwarding/no_forwarding.sh
+@@ -202,7 +202,7 @@ one_bridge_two_pvids()
+ 	ip link set $swp2 master br0
+ 
+ 	bridge vlan add dev $swp1 vid 1 pvid untagged
+-	bridge vlan add dev $swp1 vid 2 pvid untagged
++	bridge vlan add dev $swp2 vid 2 pvid untagged
+ 
+ 	run_test "Switch ports in VLAN-aware bridge with different PVIDs"
+ 
+diff --git a/tools/testing/selftests/net/setup_loopback.sh b/tools/testing/selftests/net/setup_loopback.sh
+old mode 100755
+new mode 100644
+diff --git a/tools/testing/selftests/rseq/rseq.c b/tools/testing/selftests/rseq/rseq.c
+index 96e812bdf8a45c..5b9772cdf2651b 100644
+--- a/tools/testing/selftests/rseq/rseq.c
++++ b/tools/testing/selftests/rseq/rseq.c
+@@ -60,12 +60,6 @@ unsigned int rseq_size = -1U;
+ /* Flags used during rseq registration.  */
+ unsigned int rseq_flags;
+ 
+-/*
+- * rseq feature size supported by the kernel. 0 if the registration was
+- * unsuccessful.
+- */
+-unsigned int rseq_feature_size = -1U;
+-
+ static int rseq_ownership;
+ static int rseq_reg_success;	/* At least one rseq registration has succeded. */
+ 
+@@ -111,6 +105,43 @@ int rseq_available(void)
+ 	}
+ }
+ 
++/* The rseq areas need to be at least 32 bytes. */
++static
++unsigned int get_rseq_min_alloc_size(void)
++{
++	unsigned int alloc_size = rseq_size;
++
++	if (alloc_size < ORIG_RSEQ_ALLOC_SIZE)
++		alloc_size = ORIG_RSEQ_ALLOC_SIZE;
++	return alloc_size;
++}
++
++/*
++ * Return the feature size supported by the kernel.
++ *
++ * Depending on the value returned by getauxval(AT_RSEQ_FEATURE_SIZE):
++ *
++ * 0:   Return ORIG_RSEQ_FEATURE_SIZE (20)
++ * > 0: Return the value from getauxval(AT_RSEQ_FEATURE_SIZE).
++ *
++ * It should never return a value below ORIG_RSEQ_FEATURE_SIZE.
++ */
++static
++unsigned int get_rseq_kernel_feature_size(void)
++{
++	unsigned long auxv_rseq_feature_size, auxv_rseq_align;
++
++	auxv_rseq_align = getauxval(AT_RSEQ_ALIGN);
++	assert(!auxv_rseq_align || auxv_rseq_align <= RSEQ_THREAD_AREA_ALLOC_SIZE);
++
++	auxv_rseq_feature_size = getauxval(AT_RSEQ_FEATURE_SIZE);
++	assert(!auxv_rseq_feature_size || auxv_rseq_feature_size <= RSEQ_THREAD_AREA_ALLOC_SIZE);
++	if (auxv_rseq_feature_size)
++		return auxv_rseq_feature_size;
++	else
++		return ORIG_RSEQ_FEATURE_SIZE;
++}
++
+ int rseq_register_current_thread(void)
+ {
+ 	int rc;
+@@ -119,7 +150,7 @@ int rseq_register_current_thread(void)
+ 		/* Treat libc's ownership as a successful registration. */
+ 		return 0;
+ 	}
+-	rc = sys_rseq(&__rseq_abi, rseq_size, 0, RSEQ_SIG);
++	rc = sys_rseq(&__rseq_abi, get_rseq_min_alloc_size(), 0, RSEQ_SIG);
+ 	if (rc) {
+ 		if (RSEQ_READ_ONCE(rseq_reg_success)) {
+ 			/* Incoherent success/failure within process. */
+@@ -140,28 +171,12 @@ int rseq_unregister_current_thread(void)
+ 		/* Treat libc's ownership as a successful unregistration. */
+ 		return 0;
+ 	}
+-	rc = sys_rseq(&__rseq_abi, rseq_size, RSEQ_ABI_FLAG_UNREGISTER, RSEQ_SIG);
++	rc = sys_rseq(&__rseq_abi, get_rseq_min_alloc_size(), RSEQ_ABI_FLAG_UNREGISTER, RSEQ_SIG);
+ 	if (rc)
+ 		return -1;
+ 	return 0;
+ }
+ 
+-static
+-unsigned int get_rseq_feature_size(void)
+-{
+-	unsigned long auxv_rseq_feature_size, auxv_rseq_align;
+-
+-	auxv_rseq_align = getauxval(AT_RSEQ_ALIGN);
+-	assert(!auxv_rseq_align || auxv_rseq_align <= RSEQ_THREAD_AREA_ALLOC_SIZE);
+-
+-	auxv_rseq_feature_size = getauxval(AT_RSEQ_FEATURE_SIZE);
+-	assert(!auxv_rseq_feature_size || auxv_rseq_feature_size <= RSEQ_THREAD_AREA_ALLOC_SIZE);
+-	if (auxv_rseq_feature_size)
+-		return auxv_rseq_feature_size;
+-	else
+-		return ORIG_RSEQ_FEATURE_SIZE;
+-}
+-
+ static __attribute__((constructor))
+ void rseq_init(void)
+ {
+@@ -178,28 +193,54 @@ void rseq_init(void)
+ 	}
+ 	if (libc_rseq_size_p && libc_rseq_offset_p && libc_rseq_flags_p &&
+ 			*libc_rseq_size_p != 0) {
++		unsigned int libc_rseq_size;
++
+ 		/* rseq registration owned by glibc */
+ 		rseq_offset = *libc_rseq_offset_p;
+-		rseq_size = *libc_rseq_size_p;
++		libc_rseq_size = *libc_rseq_size_p;
+ 		rseq_flags = *libc_rseq_flags_p;
+-		rseq_feature_size = get_rseq_feature_size();
+-		if (rseq_feature_size > rseq_size)
+-			rseq_feature_size = rseq_size;
++
++		/*
++		 * Previous versions of glibc expose the value
++		 * 32 even though the kernel only supported 20
++		 * bytes initially. Therefore treat 32 as a
++		 * special-case. glibc 2.40 exposes a 20 bytes
++		 * __rseq_size without using getauxval(3) to
++		 * query the supported size, while still allocating a 32
++		 * bytes area. Also treat 20 as a special-case.
++		 *
++		 * Special-cases are handled by using the following
++		 * value as active feature set size:
++		 *
++		 *   rseq_size = min(32, get_rseq_kernel_feature_size())
++		 */
++		switch (libc_rseq_size) {
++		case ORIG_RSEQ_FEATURE_SIZE:
++			fallthrough;
++		case ORIG_RSEQ_ALLOC_SIZE:
++		{
++			unsigned int rseq_kernel_feature_size = get_rseq_kernel_feature_size();
++
++			if (rseq_kernel_feature_size < ORIG_RSEQ_ALLOC_SIZE)
++				rseq_size = rseq_kernel_feature_size;
++			else
++				rseq_size = ORIG_RSEQ_ALLOC_SIZE;
++			break;
++		}
++		default:
++			/* Otherwise just use the __rseq_size from libc as rseq_size. */
++			rseq_size = libc_rseq_size;
++			break;
++		}
+ 		return;
+ 	}
+ 	rseq_ownership = 1;
+ 	if (!rseq_available()) {
+ 		rseq_size = 0;
+-		rseq_feature_size = 0;
+ 		return;
+ 	}
+ 	rseq_offset = (void *)&__rseq_abi - rseq_thread_pointer();
+ 	rseq_flags = 0;
+-	rseq_feature_size = get_rseq_feature_size();
+-	if (rseq_feature_size == ORIG_RSEQ_FEATURE_SIZE)
+-		rseq_size = ORIG_RSEQ_ALLOC_SIZE;
+-	else
+-		rseq_size = RSEQ_THREAD_AREA_ALLOC_SIZE;
+ }
+ 
+ static __attribute__((destructor))
+@@ -209,7 +250,6 @@ void rseq_exit(void)
+ 		return;
+ 	rseq_offset = 0;
+ 	rseq_size = -1U;
+-	rseq_feature_size = -1U;
+ 	rseq_ownership = 0;
+ }
+ 
+diff --git a/tools/testing/selftests/rseq/rseq.h b/tools/testing/selftests/rseq/rseq.h
+index d7364ea4d201d2..4e217b620e0c7a 100644
+--- a/tools/testing/selftests/rseq/rseq.h
++++ b/tools/testing/selftests/rseq/rseq.h
+@@ -68,12 +68,6 @@ extern unsigned int rseq_size;
+ /* Flags used during rseq registration. */
+ extern unsigned int rseq_flags;
+ 
+-/*
+- * rseq feature size supported by the kernel. 0 if the registration was
+- * unsuccessful.
+- */
+-extern unsigned int rseq_feature_size;
+-
+ enum rseq_mo {
+ 	RSEQ_MO_RELAXED = 0,
+ 	RSEQ_MO_CONSUME = 1,	/* Unused */
+@@ -193,7 +187,7 @@ static inline uint32_t rseq_current_cpu(void)
+ 
+ static inline bool rseq_node_id_available(void)
+ {
+-	return (int) rseq_feature_size >= rseq_offsetofend(struct rseq_abi, node_id);
++	return (int) rseq_size >= rseq_offsetofend(struct rseq_abi, node_id);
+ }
+ 
+ /*
+@@ -207,7 +201,7 @@ static inline uint32_t rseq_current_node_id(void)
+ 
+ static inline bool rseq_mm_cid_available(void)
+ {
+-	return (int) rseq_feature_size >= rseq_offsetofend(struct rseq_abi, mm_cid);
++	return (int) rseq_size >= rseq_offsetofend(struct rseq_abi, mm_cid);
+ }
+ 
+ static inline uint32_t rseq_current_mm_cid(void)
diff --git a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.57-58.patch b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.57-58.patch
new file mode 100644
index 000000000000..62597ba3abe9
--- /dev/null
+++ b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.57-58.patch
@@ -0,0 +1,4422 @@
+diff --git a/Makefile b/Makefile
+index 5b5e40c4088c1c..f80e78c7cf2006 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ VERSION = 6
+ PATCHLEVEL = 6
+-SUBLEVEL = 57
++SUBLEVEL = 58
+ EXTRAVERSION =
+ NAME = Pinguïn Aangedreven
+ 
+diff --git a/arch/arm64/include/asm/uprobes.h b/arch/arm64/include/asm/uprobes.h
+index 2b09495499c618..014b02897f8e22 100644
+--- a/arch/arm64/include/asm/uprobes.h
++++ b/arch/arm64/include/asm/uprobes.h
+@@ -10,11 +10,9 @@
+ #include <asm/insn.h>
+ #include <asm/probes.h>
+ 
+-#define MAX_UINSN_BYTES		AARCH64_INSN_SIZE
+-
+ #define UPROBE_SWBP_INSN	cpu_to_le32(BRK64_OPCODE_UPROBES)
+ #define UPROBE_SWBP_INSN_SIZE	AARCH64_INSN_SIZE
+-#define UPROBE_XOL_SLOT_BYTES	MAX_UINSN_BYTES
++#define UPROBE_XOL_SLOT_BYTES	AARCH64_INSN_SIZE
+ 
+ typedef __le32 uprobe_opcode_t;
+ 
+@@ -23,8 +21,8 @@ struct arch_uprobe_task {
+ 
+ struct arch_uprobe {
+ 	union {
+-		u8 insn[MAX_UINSN_BYTES];
+-		u8 ixol[MAX_UINSN_BYTES];
++		__le32 insn;
++		__le32 ixol;
+ 	};
+ 	struct arch_probe_insn api;
+ 	bool simulate;
+diff --git a/arch/arm64/kernel/probes/decode-insn.c b/arch/arm64/kernel/probes/decode-insn.c
+index 968d5fffe23302..3496d6169e59b2 100644
+--- a/arch/arm64/kernel/probes/decode-insn.c
++++ b/arch/arm64/kernel/probes/decode-insn.c
+@@ -99,10 +99,6 @@ arm_probe_decode_insn(probe_opcode_t insn, struct arch_probe_insn *api)
+ 	    aarch64_insn_is_blr(insn) ||
+ 	    aarch64_insn_is_ret(insn)) {
+ 		api->handler = simulate_br_blr_ret;
+-	} else if (aarch64_insn_is_ldr_lit(insn)) {
+-		api->handler = simulate_ldr_literal;
+-	} else if (aarch64_insn_is_ldrsw_lit(insn)) {
+-		api->handler = simulate_ldrsw_literal;
+ 	} else {
+ 		/*
+ 		 * Instruction cannot be stepped out-of-line and we don't
+@@ -140,6 +136,17 @@ arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi)
+ 	probe_opcode_t insn = le32_to_cpu(*addr);
+ 	probe_opcode_t *scan_end = NULL;
+ 	unsigned long size = 0, offset = 0;
++	struct arch_probe_insn *api = &asi->api;
++
++	if (aarch64_insn_is_ldr_lit(insn)) {
++		api->handler = simulate_ldr_literal;
++		decoded = INSN_GOOD_NO_SLOT;
++	} else if (aarch64_insn_is_ldrsw_lit(insn)) {
++		api->handler = simulate_ldrsw_literal;
++		decoded = INSN_GOOD_NO_SLOT;
++	} else {
++		decoded = arm_probe_decode_insn(insn, &asi->api);
++	}
+ 
+ 	/*
+ 	 * If there's a symbol defined in front of and near enough to
+@@ -157,7 +164,6 @@ arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi)
+ 		else
+ 			scan_end = addr - MAX_ATOMIC_CONTEXT_SIZE;
+ 	}
+-	decoded = arm_probe_decode_insn(insn, &asi->api);
+ 
+ 	if (decoded != INSN_REJECTED && scan_end)
+ 		if (is_probed_address_atomic(addr - 1, scan_end))
+diff --git a/arch/arm64/kernel/probes/simulate-insn.c b/arch/arm64/kernel/probes/simulate-insn.c
+index 22d0b32524763e..b65334ab79d2b0 100644
+--- a/arch/arm64/kernel/probes/simulate-insn.c
++++ b/arch/arm64/kernel/probes/simulate-insn.c
+@@ -171,17 +171,15 @@ simulate_tbz_tbnz(u32 opcode, long addr, struct pt_regs *regs)
+ void __kprobes
+ simulate_ldr_literal(u32 opcode, long addr, struct pt_regs *regs)
+ {
+-	u64 *load_addr;
++	unsigned long load_addr;
+ 	int xn = opcode & 0x1f;
+-	int disp;
+ 
+-	disp = ldr_displacement(opcode);
+-	load_addr = (u64 *) (addr + disp);
++	load_addr = addr + ldr_displacement(opcode);
+ 
+ 	if (opcode & (1 << 30))	/* x0-x30 */
+-		set_x_reg(regs, xn, *load_addr);
++		set_x_reg(regs, xn, READ_ONCE(*(u64 *)load_addr));
+ 	else			/* w0-w30 */
+-		set_w_reg(regs, xn, *load_addr);
++		set_w_reg(regs, xn, READ_ONCE(*(u32 *)load_addr));
+ 
+ 	instruction_pointer_set(regs, instruction_pointer(regs) + 4);
+ }
+@@ -189,14 +187,12 @@ simulate_ldr_literal(u32 opcode, long addr, struct pt_regs *regs)
+ void __kprobes
+ simulate_ldrsw_literal(u32 opcode, long addr, struct pt_regs *regs)
+ {
+-	s32 *load_addr;
++	unsigned long load_addr;
+ 	int xn = opcode & 0x1f;
+-	int disp;
+ 
+-	disp = ldr_displacement(opcode);
+-	load_addr = (s32 *) (addr + disp);
++	load_addr = addr + ldr_displacement(opcode);
+ 
+-	set_x_reg(regs, xn, *load_addr);
++	set_x_reg(regs, xn, READ_ONCE(*(s32 *)load_addr));
+ 
+ 	instruction_pointer_set(regs, instruction_pointer(regs) + 4);
+ }
+diff --git a/arch/arm64/kernel/probes/uprobes.c b/arch/arm64/kernel/probes/uprobes.c
+index d49aef2657cdf7..a2f137a595fc1c 100644
+--- a/arch/arm64/kernel/probes/uprobes.c
++++ b/arch/arm64/kernel/probes/uprobes.c
+@@ -42,7 +42,7 @@ int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm,
+ 	else if (!IS_ALIGNED(addr, AARCH64_INSN_SIZE))
+ 		return -EINVAL;
+ 
+-	insn = *(probe_opcode_t *)(&auprobe->insn[0]);
++	insn = le32_to_cpu(auprobe->insn);
+ 
+ 	switch (arm_probe_decode_insn(insn, &auprobe->api)) {
+ 	case INSN_REJECTED:
+@@ -108,7 +108,7 @@ bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs)
+ 	if (!auprobe->simulate)
+ 		return false;
+ 
+-	insn = *(probe_opcode_t *)(&auprobe->insn[0]);
++	insn = le32_to_cpu(auprobe->insn);
+ 	addr = instruction_pointer(regs);
+ 
+ 	if (auprobe->api.handler)
+diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c
+index 3c65b8258ae67a..2cc3ec034046c9 100644
+--- a/arch/s390/kvm/diag.c
++++ b/arch/s390/kvm/diag.c
+@@ -77,7 +77,7 @@ static int __diag_page_ref_service(struct kvm_vcpu *vcpu)
+ 	vcpu->stat.instruction_diagnose_258++;
+ 	if (vcpu->run->s.regs.gprs[rx] & 7)
+ 		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);
+-	rc = read_guest(vcpu, vcpu->run->s.regs.gprs[rx], rx, &parm, sizeof(parm));
++	rc = read_guest_real(vcpu, vcpu->run->s.regs.gprs[rx], &parm, sizeof(parm));
+ 	if (rc)
+ 		return kvm_s390_inject_prog_cond(vcpu, rc);
+ 	if (parm.parm_version != 2 || parm.parm_len < 5 || parm.code != 0x258)
+diff --git a/arch/s390/kvm/gaccess.c b/arch/s390/kvm/gaccess.c
+index ff8349d17b331a..090dc38334336b 100644
+--- a/arch/s390/kvm/gaccess.c
++++ b/arch/s390/kvm/gaccess.c
+@@ -1001,6 +1001,8 @@ static int access_guest_page(struct kvm *kvm, enum gacc_mode mode, gpa_t gpa,
+ 	const gfn_t gfn = gpa_to_gfn(gpa);
+ 	int rc;
+ 
++	if (!gfn_to_memslot(kvm, gfn))
++		return PGM_ADDRESSING;
+ 	if (mode == GACC_STORE)
+ 		rc = kvm_write_guest_page(kvm, gfn, data, offset, len);
+ 	else
+@@ -1158,6 +1160,8 @@ int access_guest_real(struct kvm_vcpu *vcpu, unsigned long gra,
+ 		gra += fragment_len;
+ 		data += fragment_len;
+ 	}
++	if (rc > 0)
++		vcpu->arch.pgm.code = rc;
+ 	return rc;
+ }
+ 
+diff --git a/arch/s390/kvm/gaccess.h b/arch/s390/kvm/gaccess.h
+index b320d12aa04934..3fde45a151f22e 100644
+--- a/arch/s390/kvm/gaccess.h
++++ b/arch/s390/kvm/gaccess.h
+@@ -405,11 +405,12 @@ int read_guest_abs(struct kvm_vcpu *vcpu, unsigned long gpa, void *data,
+  * @len: number of bytes to copy
+  *
+  * Copy @len bytes from @data (kernel space) to @gra (guest real address).
+- * It is up to the caller to ensure that the entire guest memory range is
+- * valid memory before calling this function.
+  * Guest low address and key protection are not checked.
+  *
+- * Returns zero on success or -EFAULT on error.
++ * Returns zero on success, -EFAULT when copying from @data failed, or
++ * PGM_ADRESSING in case @gra is outside a memslot. In this case, pgm check info
++ * is also stored to allow injecting into the guest (if applicable) using
++ * kvm_s390_inject_prog_cond().
+  *
+  * If an error occurs data may have been copied partially to guest memory.
+  */
+@@ -428,11 +429,12 @@ int write_guest_real(struct kvm_vcpu *vcpu, unsigned long gra, void *data,
+  * @len: number of bytes to copy
+  *
+  * Copy @len bytes from @gra (guest real address) to @data (kernel space).
+- * It is up to the caller to ensure that the entire guest memory range is
+- * valid memory before calling this function.
+  * Guest key protection is not checked.
+  *
+- * Returns zero on success or -EFAULT on error.
++ * Returns zero on success, -EFAULT when copying to @data failed, or
++ * PGM_ADRESSING in case @gra is outside a memslot. In this case, pgm check info
++ * is also stored to allow injecting into the guest (if applicable) using
++ * kvm_s390_inject_prog_cond().
+  *
+  * If an error occurs data may have been copied partially to kernel space.
+  */
+diff --git a/arch/x86/entry/entry.S b/arch/x86/entry/entry.S
+index 718c00367f9a5a..34eca8015b64bc 100644
+--- a/arch/x86/entry/entry.S
++++ b/arch/x86/entry/entry.S
+@@ -9,6 +9,8 @@
+ #include <asm/unwind_hints.h>
+ #include <asm/segment.h>
+ #include <asm/cache.h>
++#include <asm/cpufeatures.h>
++#include <asm/nospec-branch.h>
+ 
+ .pushsection .noinstr.text, "ax"
+ 
+@@ -17,6 +19,9 @@ SYM_FUNC_START(entry_ibpb)
+ 	movl	$PRED_CMD_IBPB, %eax
+ 	xorl	%edx, %edx
+ 	wrmsr
++
++	/* Make sure IBPB clears return stack preductions too. */
++	FILL_RETURN_BUFFER %rax, RSB_CLEAR_LOOPS, X86_BUG_IBPB_NO_RET
+ 	RET
+ SYM_FUNC_END(entry_ibpb)
+ /* For KVM */
+diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
+index 74a4358c7f4500..3894acc54b79c4 100644
+--- a/arch/x86/entry/entry_32.S
++++ b/arch/x86/entry/entry_32.S
+@@ -875,6 +875,8 @@ SYM_FUNC_START(entry_SYSENTER_32)
+ 
+ 	/* Now ready to switch the cr3 */
+ 	SWITCH_TO_USER_CR3 scratch_reg=%eax
++	/* Clobbers ZF */
++	CLEAR_CPU_BUFFERS
+ 
+ 	/*
+ 	 * Restore all flags except IF. (We restore IF separately because
+@@ -885,7 +887,6 @@ SYM_FUNC_START(entry_SYSENTER_32)
+ 	BUG_IF_WRONG_CR3 no_user_check=1
+ 	popfl
+ 	popl	%eax
+-	CLEAR_CPU_BUFFERS
+ 
+ 	/*
+ 	 * Return back to the vDSO, which will pop ecx and edx.
+@@ -1148,7 +1149,6 @@ SYM_CODE_START(asm_exc_nmi)
+ 
+ 	/* Not on SYSENTER stack. */
+ 	call	exc_nmi
+-	CLEAR_CPU_BUFFERS
+ 	jmp	.Lnmi_return
+ 
+ .Lnmi_from_sysenter_stack:
+@@ -1169,6 +1169,7 @@ SYM_CODE_START(asm_exc_nmi)
+ 
+ 	CHECK_AND_APPLY_ESPFIX
+ 	RESTORE_ALL_NMI cr3_reg=%edi pop=4
++	CLEAR_CPU_BUFFERS
+ 	jmp	.Lirq_return
+ 
+ #ifdef CONFIG_X86_ESPFIX32
+@@ -1210,6 +1211,7 @@ SYM_CODE_START(asm_exc_nmi)
+ 	 *  1 - orig_ax
+ 	 */
+ 	lss	(1+5+6)*4(%esp), %esp			# back to espfix stack
++	CLEAR_CPU_BUFFERS
+ 	jmp	.Lirq_return
+ #endif
+ SYM_CODE_END(asm_exc_nmi)
+diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h
+index 8c1593dd2c3171..55d18eef6775a6 100644
+--- a/arch/x86/include/asm/cpufeatures.h
++++ b/arch/x86/include/asm/cpufeatures.h
+@@ -216,7 +216,7 @@
+ #define X86_FEATURE_SPEC_STORE_BYPASS_DISABLE	( 7*32+23) /* "" Disable Speculative Store Bypass. */
+ #define X86_FEATURE_LS_CFG_SSBD		( 7*32+24)  /* "" AMD SSBD implementation via LS_CFG MSR */
+ #define X86_FEATURE_IBRS		( 7*32+25) /* Indirect Branch Restricted Speculation */
+-#define X86_FEATURE_IBPB		( 7*32+26) /* Indirect Branch Prediction Barrier */
++#define X86_FEATURE_IBPB		( 7*32+26) /* "ibpb" Indirect Branch Prediction Barrier without a guaranteed RSB flush */
+ #define X86_FEATURE_STIBP		( 7*32+27) /* Single Thread Indirect Branch Predictors */
+ #define X86_FEATURE_ZEN			( 7*32+28) /* "" Generic flag for all Zen and newer */
+ #define X86_FEATURE_L1TF_PTEINV		( 7*32+29) /* "" L1TF workaround PTE inversion */
+@@ -347,6 +347,7 @@
+ #define X86_FEATURE_CPPC		(13*32+27) /* Collaborative Processor Performance Control */
+ #define X86_FEATURE_AMD_PSFD            (13*32+28) /* "" Predictive Store Forwarding Disable */
+ #define X86_FEATURE_BTC_NO		(13*32+29) /* "" Not vulnerable to Branch Type Confusion */
++#define X86_FEATURE_AMD_IBPB_RET	(13*32+30) /* "" IBPB clears return address predictor */
+ #define X86_FEATURE_BRS			(13*32+31) /* Branch Sampling available */
+ 
+ /* Thermal and Power Management Leaf, CPUID level 0x00000006 (EAX), word 14 */
+@@ -516,4 +517,5 @@
+ #define X86_BUG_DIV0			X86_BUG(1*32 + 1) /* AMD DIV0 speculation bug */
+ #define X86_BUG_RFDS			X86_BUG(1*32 + 2) /* CPU is vulnerable to Register File Data Sampling */
+ #define X86_BUG_BHI			X86_BUG(1*32 + 3) /* CPU is affected by Branch History Injection */
++#define X86_BUG_IBPB_NO_RET		X86_BUG(1*32 + 4) /* "ibpb_no_ret" IBPB omits return target predictions */
+ #endif /* _ASM_X86_CPUFEATURES_H */
+diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
+index a8781c8763b44f..ee642d26e30457 100644
+--- a/arch/x86/include/asm/nospec-branch.h
++++ b/arch/x86/include/asm/nospec-branch.h
+@@ -332,7 +332,16 @@
+  * Note: Only the memory operand variant of VERW clears the CPU buffers.
+  */
+ .macro CLEAR_CPU_BUFFERS
+-	ALTERNATIVE "", __stringify(verw _ASM_RIP(mds_verw_sel)), X86_FEATURE_CLEAR_CPU_BUF
++#ifdef CONFIG_X86_64
++	ALTERNATIVE "", "verw mds_verw_sel(%rip)", X86_FEATURE_CLEAR_CPU_BUF
++#else
++	/*
++	 * In 32bit mode, the memory operand must be a %cs reference. The data
++	 * segments may not be usable (vm86 mode), and the stack segment may not
++	 * be flat (ESPFIX32).
++	 */
++	ALTERNATIVE "", "verw %cs:mds_verw_sel", X86_FEATURE_CLEAR_CPU_BUF
++#endif
+ .endm
+ 
+ #ifdef CONFIG_X86_64
+diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
+index f2e605ee75d966..00ca9c3c1d8bf8 100644
+--- a/arch/x86/kernel/apic/apic.c
++++ b/arch/x86/kernel/apic/apic.c
+@@ -473,7 +473,19 @@ static int lapic_timer_shutdown(struct clock_event_device *evt)
+ 	v = apic_read(APIC_LVTT);
+ 	v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
+ 	apic_write(APIC_LVTT, v);
+-	apic_write(APIC_TMICT, 0);
++
++	/*
++	 * Setting APIC_LVT_MASKED (above) should be enough to tell
++	 * the hardware that this timer will never fire. But AMD
++	 * erratum 411 and some Intel CPU behavior circa 2024 say
++	 * otherwise.  Time for belt and suspenders programming: mask
++	 * the timer _and_ zero the counter registers:
++	 */
++	if (v & APIC_LVT_TIMER_TSCDEADLINE)
++		wrmsrl(MSR_IA32_TSC_DEADLINE, 0);
++	else
++		apic_write(APIC_TMICT, 0);
++
+ 	return 0;
+ }
+ 
+diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
+index 9fd91022d92d0f..145c81c68394be 100644
+--- a/arch/x86/kernel/cpu/amd.c
++++ b/arch/x86/kernel/cpu/amd.c
+@@ -1374,7 +1374,8 @@ void amd_check_microcode(void)
+ 	if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
+ 		return;
+ 
+-	on_each_cpu(zenbleed_check_cpu, NULL, 1);
++	if (cpu_feature_enabled(X86_FEATURE_ZEN2))
++		on_each_cpu(zenbleed_check_cpu, NULL, 1);
+ }
+ 
+ /*
+diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
+index c2dc9b7426acb4..7b5ba5b8592a25 100644
+--- a/arch/x86/kernel/cpu/bugs.c
++++ b/arch/x86/kernel/cpu/bugs.c
+@@ -1113,8 +1113,25 @@ static void __init retbleed_select_mitigation(void)
+ 
+ 	case RETBLEED_MITIGATION_IBPB:
+ 		setup_force_cpu_cap(X86_FEATURE_ENTRY_IBPB);
++
++		/*
++		 * IBPB on entry already obviates the need for
++		 * software-based untraining so clear those in case some
++		 * other mitigation like SRSO has selected them.
++		 */
++		setup_clear_cpu_cap(X86_FEATURE_UNRET);
++		setup_clear_cpu_cap(X86_FEATURE_RETHUNK);
++
+ 		setup_force_cpu_cap(X86_FEATURE_IBPB_ON_VMEXIT);
+ 		mitigate_smt = true;
++
++		/*
++		 * There is no need for RSB filling: entry_ibpb() ensures
++		 * all predictions, including the RSB, are invalidated,
++		 * regardless of IBPB implementation.
++		 */
++		setup_clear_cpu_cap(X86_FEATURE_RSB_VMEXIT);
++
+ 		break;
+ 
+ 	case RETBLEED_MITIGATION_STUFF:
+@@ -2610,6 +2627,14 @@ static void __init srso_select_mitigation(void)
+ 			if (has_microcode) {
+ 				setup_force_cpu_cap(X86_FEATURE_ENTRY_IBPB);
+ 				srso_mitigation = SRSO_MITIGATION_IBPB;
++
++				/*
++				 * IBPB on entry already obviates the need for
++				 * software-based untraining so clear those in case some
++				 * other mitigation like Retbleed has selected them.
++				 */
++				setup_clear_cpu_cap(X86_FEATURE_UNRET);
++				setup_clear_cpu_cap(X86_FEATURE_RETHUNK);
+ 			}
+ 		} else {
+ 			pr_err("WARNING: kernel not compiled with CPU_IBPB_ENTRY.\n");
+@@ -2622,6 +2647,13 @@ static void __init srso_select_mitigation(void)
+ 			if (!boot_cpu_has(X86_FEATURE_ENTRY_IBPB) && has_microcode) {
+ 				setup_force_cpu_cap(X86_FEATURE_IBPB_ON_VMEXIT);
+ 				srso_mitigation = SRSO_MITIGATION_IBPB_ON_VMEXIT;
++
++				/*
++				 * There is no need for RSB filling: entry_ibpb() ensures
++				 * all predictions, including the RSB, are invalidated,
++				 * regardless of IBPB implementation.
++				 */
++				setup_clear_cpu_cap(X86_FEATURE_RSB_VMEXIT);
+ 			}
+ 		} else {
+ 			pr_err("WARNING: kernel not compiled with CPU_SRSO.\n");
+diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
+index 74d566263467ed..7a1e58fb43a033 100644
+--- a/arch/x86/kernel/cpu/common.c
++++ b/arch/x86/kernel/cpu/common.c
+@@ -1483,6 +1483,9 @@ static void __init cpu_set_bug_bits(struct cpuinfo_x86 *c)
+ 	     boot_cpu_has(X86_FEATURE_HYPERVISOR)))
+ 		setup_force_cpu_bug(X86_BUG_BHI);
+ 
++	if (cpu_has(c, X86_FEATURE_AMD_IBPB) && !cpu_has(c, X86_FEATURE_AMD_IBPB_RET))
++		setup_force_cpu_bug(X86_BUG_IBPB_NO_RET);
++
+ 	if (cpu_matches(cpu_vuln_whitelist, NO_MELTDOWN))
+ 		return;
+ 
+diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c
+index 8073fd3042939c..10830995eadab6 100644
+--- a/arch/x86/kernel/cpu/resctrl/core.c
++++ b/arch/x86/kernel/cpu/resctrl/core.c
+@@ -193,7 +193,7 @@ static inline bool rdt_get_mb_table(struct rdt_resource *r)
+ 	return false;
+ }
+ 
+-static bool __get_mem_config_intel(struct rdt_resource *r)
++static __init bool __get_mem_config_intel(struct rdt_resource *r)
+ {
+ 	struct rdt_hw_resource *hw_res = resctrl_to_arch_res(r);
+ 	union cpuid_0x10_3_eax eax;
+@@ -227,7 +227,7 @@ static bool __get_mem_config_intel(struct rdt_resource *r)
+ 	return true;
+ }
+ 
+-static bool __rdt_get_mem_config_amd(struct rdt_resource *r)
++static __init bool __rdt_get_mem_config_amd(struct rdt_resource *r)
+ {
+ 	struct rdt_hw_resource *hw_res = resctrl_to_arch_res(r);
+ 	u32 eax, ebx, ecx, edx, subleaf;
+diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
+index dd7310c94713c9..dc510f493ba572 100644
+--- a/block/blk-rq-qos.c
++++ b/block/blk-rq-qos.c
+@@ -219,8 +219,8 @@ static int rq_qos_wake_function(struct wait_queue_entry *curr,
+ 
+ 	data->got_token = true;
+ 	smp_wmb();
+-	list_del_init(&curr->entry);
+ 	wake_up_process(data->task);
++	list_del_init_careful(&curr->entry);
+ 	return 1;
+ }
+ 
+diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
+index 9cafbce1faf388..f31607a24f5735 100644
+--- a/drivers/block/ublk_drv.c
++++ b/drivers/block/ublk_drv.c
+@@ -2327,10 +2327,19 @@ static int ublk_ctrl_add_dev(struct io_uring_cmd *cmd)
+ 	 * TODO: provide forward progress for RECOVERY handler, so that
+ 	 * unprivileged device can benefit from it
+ 	 */
+-	if (info.flags & UBLK_F_UNPRIVILEGED_DEV)
++	if (info.flags & UBLK_F_UNPRIVILEGED_DEV) {
+ 		info.flags &= ~(UBLK_F_USER_RECOVERY_REISSUE |
+ 				UBLK_F_USER_RECOVERY);
+ 
++		/*
++		 * For USER_COPY, we depends on userspace to fill request
++		 * buffer by pwrite() to ublk char device, which can't be
++		 * used for unprivileged device
++		 */
++		if (info.flags & UBLK_F_USER_COPY)
++			return -EINVAL;
++	}
++
+ 	/* the created device is always owned by current user */
+ 	ublk_store_owner_uid_gid(&info.owner_uid, &info.owner_gid);
+ 
+diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
+index bc53da383f855a..b3a9b93f027a90 100644
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -1354,10 +1354,15 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags)
+ 	if (!urb)
+ 		return -ENOMEM;
+ 
+-	/* Use maximum HCI Event size so the USB stack handles
+-	 * ZPL/short-transfer automatically.
+-	 */
+-	size = HCI_MAX_EVENT_SIZE;
++	if (le16_to_cpu(data->udev->descriptor.idVendor)  == 0x0a12 &&
++	    le16_to_cpu(data->udev->descriptor.idProduct) == 0x0001)
++		/* Fake CSR devices don't seem to support sort-transter */
++		size = le16_to_cpu(data->intr_ep->wMaxPacketSize);
++	else
++		/* Use maximum HCI Event size so the USB stack handles
++		 * ZPL/short-transfer automatically.
++		 */
++		size = HCI_MAX_EVENT_SIZE;
+ 
+ 	buf = kmalloc(size, mem_flags);
+ 	if (!buf) {
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+index 7abcd618e70bd1..13c97ba7a820b4 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+@@ -265,7 +265,7 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
+ 
+ 			/* Only a single BO list is allowed to simplify handling. */
+ 			if (p->bo_list)
+-				ret = -EINVAL;
++				goto free_partial_kdata;
+ 
+ 			ret = amdgpu_cs_p1_bo_handles(p, p->chunks[i].kdata);
+ 			if (ret)
+diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+index c0d7fe5102e6d3..4d17b6958397ed 100644
+--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
++++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+@@ -1843,7 +1843,7 @@ static int smu_bump_power_profile_mode(struct smu_context *smu,
+ static int smu_adjust_power_state_dynamic(struct smu_context *smu,
+ 					  enum amd_dpm_forced_level level,
+ 					  bool skip_display_settings,
+-					  bool force_update)
++					  bool init)
+ {
+ 	int ret = 0;
+ 	int index = 0;
+@@ -1872,7 +1872,7 @@ static int smu_adjust_power_state_dynamic(struct smu_context *smu,
+ 		}
+ 	}
+ 
+-	if (force_update || smu_dpm_ctx->dpm_level != level) {
++	if (smu_dpm_ctx->dpm_level != level) {
+ 		ret = smu_asic_set_performance_level(smu, level);
+ 		if (ret) {
+ 			dev_err(smu->adev->dev, "Failed to set performance level!");
+@@ -1889,7 +1889,7 @@ static int smu_adjust_power_state_dynamic(struct smu_context *smu,
+ 		index = index > 0 && index <= WORKLOAD_POLICY_MAX ? index - 1 : 0;
+ 		workload[0] = smu->workload_setting[index];
+ 
+-		if (force_update || smu->power_profile_mode != workload[0])
++		if (init || smu->power_profile_mode != workload[0])
+ 			smu_bump_power_profile_mode(smu, workload, 0);
+ 	}
+ 
+diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
+index 9cb6401fe97ed3..bb908f125269dc 100644
+--- a/drivers/gpu/drm/radeon/radeon_encoders.c
++++ b/drivers/gpu/drm/radeon/radeon_encoders.c
+@@ -42,7 +42,7 @@ static uint32_t radeon_encoder_clones(struct drm_encoder *encoder)
+ 	struct radeon_device *rdev = dev->dev_private;
+ 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+ 	struct drm_encoder *clone_encoder;
+-	uint32_t index_mask = 0;
++	uint32_t index_mask = drm_encoder_mask(encoder);
+ 	int count;
+ 
+ 	/* DIG routing gets problematic */
+diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+index 08f2470edab275..11f7c0e5420e04 100644
+--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+@@ -1659,6 +1659,7 @@ static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev,
+ 		DRM_ERROR("Surface size cannot exceed %dx%d\n",
+ 			dev_priv->texture_max_width,
+ 			dev_priv->texture_max_height);
++		ret = -EINVAL;
+ 		goto err_out;
+ 	}
+ 
+diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
+index 0398974c9d2b09..df60986d98369e 100644
+--- a/drivers/iio/accel/Kconfig
++++ b/drivers/iio/accel/Kconfig
+@@ -415,6 +415,8 @@ config IIO_ST_ACCEL_SPI_3AXIS
+ 
+ config IIO_KX022A
+ 	tristate
++	select IIO_BUFFER
++	select IIO_TRIGGERED_BUFFER
+ 
+ config IIO_KX022A_SPI
+ 	tristate "Kionix KX022A tri-axis digital accelerometer SPI interface"
+diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
+index dfb925cfe38ef2..e46817cb5581cf 100644
+--- a/drivers/iio/adc/Kconfig
++++ b/drivers/iio/adc/Kconfig
+@@ -1286,6 +1286,8 @@ config TI_ADS8344
+ config TI_ADS8688
+ 	tristate "Texas Instruments ADS8688"
+ 	depends on SPI
++	select IIO_BUFFER
++	select IIO_TRIGGERED_BUFFER
+ 	help
+ 	  If you say yes here you get support for Texas Instruments ADS8684 and
+ 	  and ADS8688 ADC chips
+@@ -1296,6 +1298,8 @@ config TI_ADS8688
+ config TI_ADS124S08
+ 	tristate "Texas Instruments ADS124S08"
+ 	depends on SPI
++	select IIO_BUFFER
++	select IIO_TRIGGERED_BUFFER
+ 	help
+ 	  If you say yes here you get support for Texas Instruments ADS124S08
+ 	  and ADS124S06 ADC chips
+@@ -1330,6 +1334,7 @@ config TI_AM335X_ADC
+ config TI_LMP92064
+ 	tristate "Texas Instruments LMP92064 ADC driver"
+ 	depends on SPI
++	select REGMAP_SPI
+ 	help
+ 	  Say yes here to build support for the LMP92064 Precision Current and Voltage
+ 	  sensor.
+diff --git a/drivers/iio/amplifiers/Kconfig b/drivers/iio/amplifiers/Kconfig
+index b54fe01734b0d7..55eb16b32f6c9a 100644
+--- a/drivers/iio/amplifiers/Kconfig
++++ b/drivers/iio/amplifiers/Kconfig
+@@ -27,6 +27,7 @@ config AD8366
+ config ADA4250
+ 	tristate "Analog Devices ADA4250 Instrumentation Amplifier"
+ 	depends on SPI
++	select REGMAP_SPI
+ 	help
+ 	  Say yes here to build support for Analog Devices ADA4250
+ 	  SPI Amplifier's support. The driver provides direct access via
+diff --git a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
+index ad8910e6ad59df..abb09fefc792c5 100644
+--- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
++++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
+@@ -32,7 +32,7 @@ static ssize_t _hid_sensor_set_report_latency(struct device *dev,
+ 	latency = integer * 1000 + fract / 1000;
+ 	ret = hid_sensor_set_report_latency(attrb, latency);
+ 	if (ret < 0)
+-		return len;
++		return ret;
+ 
+ 	attrb->latency_ms = hid_sensor_get_report_latency(attrb);
+ 
+diff --git a/drivers/iio/dac/Kconfig b/drivers/iio/dac/Kconfig
+index 93b8be183de6b4..b8ff547bc4dada 100644
+--- a/drivers/iio/dac/Kconfig
++++ b/drivers/iio/dac/Kconfig
+@@ -9,6 +9,8 @@ menu "Digital to analog converters"
+ config AD3552R
+ 	tristate "Analog Devices AD3552R DAC driver"
+ 	depends on SPI_MASTER
++	select IIO_BUFFER
++	select IIO_TRIGGERED_BUFFER
+ 	help
+ 	  Say yes here to build support for Analog Devices AD3552R
+ 	  Digital to Analog Converter.
+@@ -214,6 +216,8 @@ config AD5764
+ config AD5766
+ 	tristate "Analog Devices AD5766/AD5767 DAC driver"
+ 	depends on SPI_MASTER
++	select IIO_BUFFER
++	select IIO_TRIGGERED_BUFFER
+ 	help
+ 	  Say yes here to build support for Analog Devices AD5766, AD5767
+ 	  Digital to Analog Converter.
+@@ -224,6 +228,7 @@ config AD5766
+ config AD5770R
+ 	tristate "Analog Devices AD5770R IDAC driver"
+ 	depends on SPI_MASTER
++	select REGMAP_SPI
+ 	help
+ 	  Say yes here to build support for Analog Devices AD5770R Digital to
+ 	  Analog Converter.
+@@ -315,6 +320,7 @@ config LPC18XX_DAC
+ config LTC1660
+ 	tristate "Linear Technology LTC1660/LTC1665 DAC SPI driver"
+ 	depends on SPI
++	select REGMAP_SPI
+ 	help
+ 	  Say yes here to build support for Linear Technology
+ 	  LTC1660 and LTC1665 Digital to Analog Converters.
+@@ -424,6 +430,7 @@ config STM32_DAC
+ 
+ config STM32_DAC_CORE
+ 	tristate
++	select REGMAP_MMIO
+ 
+ config TI_DAC082S085
+ 	tristate "Texas Instruments 8/10/12-bit 2/4-channel DAC driver"
+diff --git a/drivers/iio/frequency/Kconfig b/drivers/iio/frequency/Kconfig
+index 9e85dfa585081c..71de6cc4a1584f 100644
+--- a/drivers/iio/frequency/Kconfig
++++ b/drivers/iio/frequency/Kconfig
+@@ -53,6 +53,7 @@ config ADF4371
+ config ADF4377
+ 	tristate "Analog Devices ADF4377 Microwave Wideband Synthesizer"
+ 	depends on SPI && COMMON_CLK
++	select REGMAP_SPI
+ 	help
+ 	  Say yes here to build support for Analog Devices ADF4377 Microwave
+ 	  Wideband Synthesizer.
+diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
+index 45edba797e4c7e..ddbd1838650ec8 100644
+--- a/drivers/iio/light/Kconfig
++++ b/drivers/iio/light/Kconfig
+@@ -294,6 +294,8 @@ config ROHM_BU27008
+ 	depends on I2C
+ 	select REGMAP_I2C
+ 	select IIO_GTS_HELPER
++	select IIO_BUFFER
++	select IIO_TRIGGERED_BUFFER
+ 	help
+ 	  Enable support for the ROHM BU27008 color sensor.
+ 	  The ROHM BU27008 is a sensor with 5 photodiodes (red, green,
+diff --git a/drivers/iio/light/opt3001.c b/drivers/iio/light/opt3001.c
+index cb41e5ee8ec10b..dc529cbe3805e2 100644
+--- a/drivers/iio/light/opt3001.c
++++ b/drivers/iio/light/opt3001.c
+@@ -138,6 +138,10 @@ static const struct opt3001_scale opt3001_scales[] = {
+ 		.val = 20966,
+ 		.val2 = 400000,
+ 	},
++	{
++		.val = 41932,
++		.val2 = 800000,
++	},
+ 	{
+ 		.val = 83865,
+ 		.val2 = 600000,
+diff --git a/drivers/iio/light/veml6030.c b/drivers/iio/light/veml6030.c
+index 043f233d9bdb06..433f58e1dd66c5 100644
+--- a/drivers/iio/light/veml6030.c
++++ b/drivers/iio/light/veml6030.c
+@@ -99,9 +99,8 @@ static const char * const period_values[] = {
+ static ssize_t in_illuminance_period_available_show(struct device *dev,
+ 				struct device_attribute *attr, char *buf)
+ {
++	struct veml6030_data *data = iio_priv(dev_to_iio_dev(dev));
+ 	int ret, reg, x;
+-	struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
+-	struct veml6030_data *data = iio_priv(indio_dev);
+ 
+ 	ret = regmap_read(data->regmap, VEML6030_REG_ALS_CONF, &reg);
+ 	if (ret) {
+@@ -780,7 +779,7 @@ static int veml6030_hw_init(struct iio_dev *indio_dev)
+ 
+ 	/* Cache currently active measurement parameters */
+ 	data->cur_gain = 3;
+-	data->cur_resolution = 4608;
++	data->cur_resolution = 5376;
+ 	data->cur_integration_time = 3;
+ 
+ 	return ret;
+diff --git a/drivers/iio/proximity/Kconfig b/drivers/iio/proximity/Kconfig
+index 2ca3b0bc5eba10..931eaea046b328 100644
+--- a/drivers/iio/proximity/Kconfig
++++ b/drivers/iio/proximity/Kconfig
+@@ -72,6 +72,8 @@ config LIDAR_LITE_V2
+ config MB1232
+ 	tristate "MaxSonar I2CXL family ultrasonic sensors"
+ 	depends on I2C
++	select IIO_BUFFER
++	select IIO_TRIGGERED_BUFFER
+ 	help
+ 	  Say Y to build a driver for the ultrasonic sensors I2CXL of
+ 	  MaxBotix which have an i2c interface. It can be used to measure
+diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
+index daf2a46521f018..1cb47488375be4 100644
+--- a/drivers/input/joystick/xpad.c
++++ b/drivers/input/joystick/xpad.c
+@@ -217,6 +217,7 @@ static const struct xpad_device {
+ 	{ 0x0c12, 0x8810, "Zeroplus Xbox Controller", 0, XTYPE_XBOX },
+ 	{ 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", 0, XTYPE_XBOX },
+ 	{ 0x0d2f, 0x0002, "Andamiro Pump It Up pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
++	{ 0x0db0, 0x1901, "Micro Star International Xbox360 Controller for Windows", 0, XTYPE_XBOX360 },
+ 	{ 0x0e4c, 0x1097, "Radica Gamester Controller", 0, XTYPE_XBOX },
+ 	{ 0x0e4c, 0x1103, "Radica Gamester Reflex", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX },
+ 	{ 0x0e4c, 0x2390, "Radica Games Jtech Controller", 0, XTYPE_XBOX },
+@@ -486,6 +487,7 @@ static const struct usb_device_id xpad_table[] = {
+ 	XPAD_XBOX360_VENDOR(0x07ff),		/* Mad Catz Gamepad */
+ 	XPAD_XBOXONE_VENDOR(0x0b05),		/* ASUS controllers */
+ 	XPAD_XBOX360_VENDOR(0x0c12),		/* Zeroplus X-Box 360 controllers */
++	XPAD_XBOX360_VENDOR(0x0db0),		/* Micro Star International X-Box 360 controllers */
+ 	XPAD_XBOX360_VENDOR(0x0e6f),		/* 0x0e6f Xbox 360 controllers */
+ 	XPAD_XBOXONE_VENDOR(0x0e6f),		/* 0x0e6f Xbox One controllers */
+ 	XPAD_XBOX360_VENDOR(0x0f0d),		/* Hori controllers */
+diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
+index b7317016834cf1..3a7c647d3affa8 100644
+--- a/drivers/iommu/intel/iommu.c
++++ b/drivers/iommu/intel/iommu.c
+@@ -3925,8 +3925,10 @@ static int domain_context_clear_one_cb(struct pci_dev *pdev, u16 alias, void *op
+  */
+ static void domain_context_clear(struct device_domain_info *info)
+ {
+-	if (!dev_is_pci(info->dev))
++	if (!dev_is_pci(info->dev)) {
+ 		domain_context_clear_one(info, info->bus, info->devfn);
++		return;
++	}
+ 
+ 	pci_for_each_dma_alias(to_pci_dev(info->dev),
+ 			       &domain_context_clear_one_cb, info);
+diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
+index 350abbb36e04bb..b1e60c13c1e1e7 100644
+--- a/drivers/irqchip/irq-gic-v3-its.c
++++ b/drivers/irqchip/irq-gic-v3-its.c
+@@ -786,6 +786,7 @@ static struct its_vpe *its_build_vmapp_cmd(struct its_node *its,
+ 					   struct its_cmd_block *cmd,
+ 					   struct its_cmd_desc *desc)
+ {
++	struct its_vpe *vpe = valid_vpe(its, desc->its_vmapp_cmd.vpe);
+ 	unsigned long vpt_addr, vconf_addr;
+ 	u64 target;
+ 	bool alloc;
+@@ -795,9 +796,14 @@ static struct its_vpe *its_build_vmapp_cmd(struct its_node *its,
+ 	its_encode_valid(cmd, desc->its_vmapp_cmd.valid);
+ 
+ 	if (!desc->its_vmapp_cmd.valid) {
++		alloc = !atomic_dec_return(&desc->its_vmapp_cmd.vpe->vmapp_count);
+ 		if (is_v4_1(its)) {
+-			alloc = !atomic_dec_return(&desc->its_vmapp_cmd.vpe->vmapp_count);
+ 			its_encode_alloc(cmd, alloc);
++			/*
++			 * Unmapping a VPE is self-synchronizing on GICv4.1,
++			 * no need to issue a VSYNC.
++			 */
++			vpe = NULL;
+ 		}
+ 
+ 		goto out;
+@@ -810,13 +816,13 @@ static struct its_vpe *its_build_vmapp_cmd(struct its_node *its,
+ 	its_encode_vpt_addr(cmd, vpt_addr);
+ 	its_encode_vpt_size(cmd, LPI_NRBITS - 1);
+ 
++	alloc = !atomic_fetch_inc(&desc->its_vmapp_cmd.vpe->vmapp_count);
++
+ 	if (!is_v4_1(its))
+ 		goto out;
+ 
+ 	vconf_addr = virt_to_phys(page_address(desc->its_vmapp_cmd.vpe->its_vm->vprop_page));
+ 
+-	alloc = !atomic_fetch_inc(&desc->its_vmapp_cmd.vpe->vmapp_count);
+-
+ 	its_encode_alloc(cmd, alloc);
+ 
+ 	/*
+@@ -832,7 +838,7 @@ static struct its_vpe *its_build_vmapp_cmd(struct its_node *its,
+ out:
+ 	its_fixup_cmd(cmd);
+ 
+-	return valid_vpe(its, desc->its_vmapp_cmd.vpe);
++	return vpe;
+ }
+ 
+ static struct its_vpe *its_build_vmapti_cmd(struct its_node *its,
+@@ -3810,6 +3816,13 @@ static int its_vpe_set_affinity(struct irq_data *d,
+ 	unsigned long flags;
+ 	int from, cpu;
+ 
++	/*
++	 * Check if we're racing against a VPE being destroyed, for
++	 * which we don't want to allow a VMOVP.
++	 */
++	if (!atomic_read(&vpe->vmapp_count))
++		return -EINVAL;
++
+ 	/*
+ 	 * Changing affinity is mega expensive, so let's be as lazy as
+ 	 * we can and only do it if we really have to. Also, if mapped
+@@ -4450,9 +4463,8 @@ static int its_vpe_init(struct its_vpe *vpe)
+ 	raw_spin_lock_init(&vpe->vpe_lock);
+ 	vpe->vpe_id = vpe_id;
+ 	vpe->vpt_page = vpt_page;
+-	if (gic_rdists->has_rvpeid)
+-		atomic_set(&vpe->vmapp_count, 0);
+-	else
++	atomic_set(&vpe->vmapp_count, 0);
++	if (!gic_rdists->has_rvpeid)
+ 		vpe->vpe_proxy_event = -1;
+ 
+ 	return 0;
+diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c
+index bf0b40b0fad4b2..57289966915492 100644
+--- a/drivers/irqchip/irq-sifive-plic.c
++++ b/drivers/irqchip/irq-sifive-plic.c
+@@ -120,16 +120,6 @@ static inline void plic_irq_toggle(const struct cpumask *mask,
+ 	}
+ }
+ 
+-static void plic_irq_enable(struct irq_data *d)
+-{
+-	plic_irq_toggle(irq_data_get_effective_affinity_mask(d), d, 1);
+-}
+-
+-static void plic_irq_disable(struct irq_data *d)
+-{
+-	plic_irq_toggle(irq_data_get_effective_affinity_mask(d), d, 0);
+-}
+-
+ static void plic_irq_unmask(struct irq_data *d)
+ {
+ 	struct plic_priv *priv = irq_data_get_irq_chip_data(d);
+@@ -144,6 +134,17 @@ static void plic_irq_mask(struct irq_data *d)
+ 	writel(0, priv->regs + PRIORITY_BASE + d->hwirq * PRIORITY_PER_ID);
+ }
+ 
++static void plic_irq_enable(struct irq_data *d)
++{
++	plic_irq_toggle(irq_data_get_effective_affinity_mask(d), d, 1);
++	plic_irq_unmask(d);
++}
++
++static void plic_irq_disable(struct irq_data *d)
++{
++	plic_irq_toggle(irq_data_get_effective_affinity_mask(d), d, 0);
++}
++
+ static void plic_irq_eoi(struct irq_data *d)
+ {
+ 	struct plic_handler *handler = this_cpu_ptr(&plic_handlers);
+diff --git a/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c b/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c
+index 7c3d8bedf90ba2..a2ed477e0370bc 100644
+--- a/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c
++++ b/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c
+@@ -364,6 +364,7 @@ static int pci1xxxx_otp_eeprom_probe(struct auxiliary_device *aux_dev,
+ 	if (is_eeprom_responsive(priv)) {
+ 		priv->nvmem_config_eeprom.type = NVMEM_TYPE_EEPROM;
+ 		priv->nvmem_config_eeprom.name = EEPROM_NAME;
++		priv->nvmem_config_eeprom.id = NVMEM_DEVID_AUTO;
+ 		priv->nvmem_config_eeprom.dev = &aux_dev->dev;
+ 		priv->nvmem_config_eeprom.owner = THIS_MODULE;
+ 		priv->nvmem_config_eeprom.reg_read = pci1xxxx_eeprom_read;
+@@ -383,6 +384,7 @@ static int pci1xxxx_otp_eeprom_probe(struct auxiliary_device *aux_dev,
+ 
+ 	priv->nvmem_config_otp.type = NVMEM_TYPE_OTP;
+ 	priv->nvmem_config_otp.name = OTP_NAME;
++	priv->nvmem_config_otp.id = NVMEM_DEVID_AUTO;
+ 	priv->nvmem_config_otp.dev = &aux_dev->dev;
+ 	priv->nvmem_config_otp.owner = THIS_MODULE;
+ 	priv->nvmem_config_otp.reg_read = pci1xxxx_otp_read;
+diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
+index b940dcd3ace681..8f61731e4554ba 100644
+--- a/drivers/net/ethernet/cadence/macb_main.c
++++ b/drivers/net/ethernet/cadence/macb_main.c
+@@ -930,9 +930,6 @@ static int macb_mdiobus_register(struct macb *bp)
+ 		return ret;
+ 	}
+ 
+-	if (of_phy_is_fixed_link(np))
+-		return mdiobus_register(bp->mii_bus);
+-
+ 	/* Only create the PHY from the device tree if at least one PHY is
+ 	 * described. Otherwise scan the entire MDIO bus. We do this to support
+ 	 * old device tree that did not follow the best practices and did not
+@@ -953,8 +950,19 @@ static int macb_mdiobus_register(struct macb *bp)
+ 
+ static int macb_mii_init(struct macb *bp)
+ {
++	struct device_node *child, *np = bp->pdev->dev.of_node;
+ 	int err = -ENXIO;
+ 
++	/* With fixed-link, we don't need to register the MDIO bus,
++	 * except if we have a child named "mdio" in the device tree.
++	 * In that case, some devices may be attached to the MACB's MDIO bus.
++	 */
++	child = of_get_child_by_name(np, "mdio");
++	if (child)
++		of_node_put(child);
++	else if (of_phy_is_fixed_link(np))
++		return macb_mii_probe(bp->dev);
++
+ 	/* Enable management port */
+ 	macb_writel(bp, NCR, MACB_BIT(MPE));
+ 
+diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
+index 18e3a9cd4fc017..c17b9e3385168f 100644
+--- a/drivers/net/ethernet/freescale/enetc/enetc.c
++++ b/drivers/net/ethernet/freescale/enetc/enetc.c
+@@ -902,6 +902,7 @@ static bool enetc_clean_tx_ring(struct enetc_bdr *tx_ring, int napi_budget)
+ 
+ 	if (unlikely(tx_frm_cnt && netif_carrier_ok(ndev) &&
+ 		     __netif_subqueue_stopped(ndev, tx_ring->index) &&
++		     !test_bit(ENETC_TX_DOWN, &priv->flags) &&
+ 		     (enetc_bd_unused(tx_ring) >= ENETC_TXBDS_MAX_NEEDED))) {
+ 		netif_wake_subqueue(ndev, tx_ring->index);
+ 	}
+@@ -1380,6 +1381,9 @@ int enetc_xdp_xmit(struct net_device *ndev, int num_frames,
+ 	int xdp_tx_bd_cnt, i, k;
+ 	int xdp_tx_frm_cnt = 0;
+ 
++	if (unlikely(test_bit(ENETC_TX_DOWN, &priv->flags)))
++		return -ENETDOWN;
++
+ 	enetc_lock_mdio();
+ 
+ 	tx_ring = priv->xdp_tx_ring[smp_processor_id()];
+@@ -1524,7 +1528,6 @@ static void enetc_xdp_drop(struct enetc_bdr *rx_ring, int rx_ring_first,
+ 				  &rx_ring->rx_swbd[rx_ring_first]);
+ 		enetc_bdr_idx_inc(rx_ring, &rx_ring_first);
+ 	}
+-	rx_ring->stats.xdp_drops++;
+ }
+ 
+ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring,
+@@ -1589,6 +1592,7 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring,
+ 			fallthrough;
+ 		case XDP_DROP:
+ 			enetc_xdp_drop(rx_ring, orig_i, i);
++			rx_ring->stats.xdp_drops++;
+ 			break;
+ 		case XDP_PASS:
+ 			rxbd = orig_rxbd;
+@@ -1605,6 +1609,12 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring,
+ 			break;
+ 		case XDP_TX:
+ 			tx_ring = priv->xdp_tx_ring[rx_ring->index];
++			if (unlikely(test_bit(ENETC_TX_DOWN, &priv->flags))) {
++				enetc_xdp_drop(rx_ring, orig_i, i);
++				tx_ring->stats.xdp_tx_drops++;
++				break;
++			}
++
+ 			xdp_tx_bd_cnt = enetc_rx_swbd_to_xdp_tx_swbd(xdp_tx_arr,
+ 								     rx_ring,
+ 								     orig_i, i);
+@@ -2226,18 +2236,24 @@ static void enetc_enable_rxbdr(struct enetc_hw *hw, struct enetc_bdr *rx_ring)
+ 	enetc_rxbdr_wr(hw, idx, ENETC_RBMR, rbmr);
+ }
+ 
+-static void enetc_enable_bdrs(struct enetc_ndev_priv *priv)
++static void enetc_enable_rx_bdrs(struct enetc_ndev_priv *priv)
+ {
+ 	struct enetc_hw *hw = &priv->si->hw;
+ 	int i;
+ 
+-	for (i = 0; i < priv->num_tx_rings; i++)
+-		enetc_enable_txbdr(hw, priv->tx_ring[i]);
+-
+ 	for (i = 0; i < priv->num_rx_rings; i++)
+ 		enetc_enable_rxbdr(hw, priv->rx_ring[i]);
+ }
+ 
++static void enetc_enable_tx_bdrs(struct enetc_ndev_priv *priv)
++{
++	struct enetc_hw *hw = &priv->si->hw;
++	int i;
++
++	for (i = 0; i < priv->num_tx_rings; i++)
++		enetc_enable_txbdr(hw, priv->tx_ring[i]);
++}
++
+ static void enetc_disable_rxbdr(struct enetc_hw *hw, struct enetc_bdr *rx_ring)
+ {
+ 	int idx = rx_ring->index;
+@@ -2254,18 +2270,24 @@ static void enetc_disable_txbdr(struct enetc_hw *hw, struct enetc_bdr *rx_ring)
+ 	enetc_txbdr_wr(hw, idx, ENETC_TBMR, 0);
+ }
+ 
+-static void enetc_disable_bdrs(struct enetc_ndev_priv *priv)
++static void enetc_disable_rx_bdrs(struct enetc_ndev_priv *priv)
+ {
+ 	struct enetc_hw *hw = &priv->si->hw;
+ 	int i;
+ 
+-	for (i = 0; i < priv->num_tx_rings; i++)
+-		enetc_disable_txbdr(hw, priv->tx_ring[i]);
+-
+ 	for (i = 0; i < priv->num_rx_rings; i++)
+ 		enetc_disable_rxbdr(hw, priv->rx_ring[i]);
+ }
+ 
++static void enetc_disable_tx_bdrs(struct enetc_ndev_priv *priv)
++{
++	struct enetc_hw *hw = &priv->si->hw;
++	int i;
++
++	for (i = 0; i < priv->num_tx_rings; i++)
++		enetc_disable_txbdr(hw, priv->tx_ring[i]);
++}
++
+ static void enetc_wait_txbdr(struct enetc_hw *hw, struct enetc_bdr *tx_ring)
+ {
+ 	int delay = 8, timeout = 100;
+@@ -2463,9 +2485,13 @@ void enetc_start(struct net_device *ndev)
+ 		enable_irq(irq);
+ 	}
+ 
+-	enetc_enable_bdrs(priv);
++	enetc_enable_tx_bdrs(priv);
++
++	enetc_enable_rx_bdrs(priv);
+ 
+ 	netif_tx_start_all_queues(ndev);
++
++	clear_bit(ENETC_TX_DOWN, &priv->flags);
+ }
+ EXPORT_SYMBOL_GPL(enetc_start);
+ 
+@@ -2523,9 +2549,15 @@ void enetc_stop(struct net_device *ndev)
+ 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
+ 	int i;
+ 
++	set_bit(ENETC_TX_DOWN, &priv->flags);
++
+ 	netif_tx_stop_all_queues(ndev);
+ 
+-	enetc_disable_bdrs(priv);
++	enetc_disable_rx_bdrs(priv);
++
++	enetc_wait_bdrs(priv);
++
++	enetc_disable_tx_bdrs(priv);
+ 
+ 	for (i = 0; i < priv->bdr_int_num; i++) {
+ 		int irq = pci_irq_vector(priv->si->pdev,
+@@ -2536,8 +2568,6 @@ void enetc_stop(struct net_device *ndev)
+ 		napi_disable(&priv->int_vector[i]->napi);
+ 	}
+ 
+-	enetc_wait_bdrs(priv);
+-
+ 	enetc_clear_interrupts(priv);
+ }
+ EXPORT_SYMBOL_GPL(enetc_stop);
+diff --git a/drivers/net/ethernet/freescale/enetc/enetc.h b/drivers/net/ethernet/freescale/enetc/enetc.h
+index 7439739cd81a23..fcadb0848d2541 100644
+--- a/drivers/net/ethernet/freescale/enetc/enetc.h
++++ b/drivers/net/ethernet/freescale/enetc/enetc.h
+@@ -328,6 +328,7 @@ enum enetc_active_offloads {
+ 
+ enum enetc_flags_bit {
+ 	ENETC_TX_ONESTEP_TSTAMP_IN_PROGRESS = 0,
++	ENETC_TX_DOWN,
+ };
+ 
+ /* interrupt coalescing modes */
+diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
+index 5e8fac50f945d4..a4eb6edb850add 100644
+--- a/drivers/net/ethernet/freescale/fec_ptp.c
++++ b/drivers/net/ethernet/freescale/fec_ptp.c
+@@ -90,6 +90,30 @@
+ #define FEC_PTP_MAX_NSEC_PERIOD		4000000000ULL
+ #define FEC_PTP_MAX_NSEC_COUNTER	0x80000000ULL
+ 
++/**
++ * fec_ptp_read - read raw cycle counter (to be used by time counter)
++ * @cc: the cyclecounter structure
++ *
++ * this function reads the cyclecounter registers and is called by the
++ * cyclecounter structure used to construct a ns counter from the
++ * arbitrary fixed point registers
++ */
++static u64 fec_ptp_read(const struct cyclecounter *cc)
++{
++	struct fec_enet_private *fep =
++		container_of(cc, struct fec_enet_private, cc);
++	u32 tempval;
++
++	tempval = readl(fep->hwp + FEC_ATIME_CTRL);
++	tempval |= FEC_T_CTRL_CAPTURE;
++	writel(tempval, fep->hwp + FEC_ATIME_CTRL);
++
++	if (fep->quirks & FEC_QUIRK_BUG_CAPTURE)
++		udelay(1);
++
++	return readl(fep->hwp + FEC_ATIME);
++}
++
+ /**
+  * fec_ptp_enable_pps
+  * @fep: the fec_enet_private structure handle
+@@ -136,7 +160,7 @@ static int fec_ptp_enable_pps(struct fec_enet_private *fep, uint enable)
+ 		 * NSEC_PER_SEC - ts.tv_nsec. Add the remaining nanoseconds
+ 		 * to current timer would be next second.
+ 		 */
+-		tempval = fep->cc.read(&fep->cc);
++		tempval = fec_ptp_read(&fep->cc);
+ 		/* Convert the ptp local counter to 1588 timestamp */
+ 		ns = timecounter_cyc2time(&fep->tc, tempval);
+ 		ts = ns_to_timespec64(ns);
+@@ -211,13 +235,7 @@ static int fec_ptp_pps_perout(struct fec_enet_private *fep)
+ 	timecounter_read(&fep->tc);
+ 
+ 	/* Get the current ptp hardware time counter */
+-	temp_val = readl(fep->hwp + FEC_ATIME_CTRL);
+-	temp_val |= FEC_T_CTRL_CAPTURE;
+-	writel(temp_val, fep->hwp + FEC_ATIME_CTRL);
+-	if (fep->quirks & FEC_QUIRK_BUG_CAPTURE)
+-		udelay(1);
+-
+-	ptp_hc = readl(fep->hwp + FEC_ATIME);
++	ptp_hc = fec_ptp_read(&fep->cc);
+ 
+ 	/* Convert the ptp local counter to 1588 timestamp */
+ 	curr_time = timecounter_cyc2time(&fep->tc, ptp_hc);
+@@ -271,30 +289,6 @@ static enum hrtimer_restart fec_ptp_pps_perout_handler(struct hrtimer *timer)
+ 	return HRTIMER_NORESTART;
+ }
+ 
+-/**
+- * fec_ptp_read - read raw cycle counter (to be used by time counter)
+- * @cc: the cyclecounter structure
+- *
+- * this function reads the cyclecounter registers and is called by the
+- * cyclecounter structure used to construct a ns counter from the
+- * arbitrary fixed point registers
+- */
+-static u64 fec_ptp_read(const struct cyclecounter *cc)
+-{
+-	struct fec_enet_private *fep =
+-		container_of(cc, struct fec_enet_private, cc);
+-	u32 tempval;
+-
+-	tempval = readl(fep->hwp + FEC_ATIME_CTRL);
+-	tempval |= FEC_T_CTRL_CAPTURE;
+-	writel(tempval, fep->hwp + FEC_ATIME_CTRL);
+-
+-	if (fep->quirks & FEC_QUIRK_BUG_CAPTURE)
+-		udelay(1);
+-
+-	return readl(fep->hwp + FEC_ATIME);
+-}
+-
+ /**
+  * fec_ptp_start_cyclecounter - create the cycle counter from hw
+  * @ndev: network device
+diff --git a/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c b/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c
+index 79276bc3d49519..66ef14d95bf6f7 100644
+--- a/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c
++++ b/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c
+@@ -1444,6 +1444,8 @@ static void vcap_api_encode_rule_test(struct kunit *test)
+ 
+ 	ret = vcap_del_rule(&test_vctrl, &test_netdev, id);
+ 	KUNIT_EXPECT_EQ(test, 0, ret);
++
++	vcap_free_rule(rule);
+ }
+ 
+ static void vcap_api_set_rule_counter_test(struct kunit *test)
+diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
+index c334ef6e3b3ff4..3b7d7e23602af2 100644
+--- a/drivers/parport/procfs.c
++++ b/drivers/parport/procfs.c
+@@ -58,12 +58,12 @@ static int do_active_device(struct ctl_table *table, int write,
+ 	
+ 	for (dev = port->devices; dev ; dev = dev->next) {
+ 		if(dev == port->cad) {
+-			len += snprintf(buffer, sizeof(buffer), "%s\n", dev->name);
++			len += scnprintf(buffer, sizeof(buffer), "%s\n", dev->name);
+ 		}
+ 	}
+ 
+ 	if(!len) {
+-		len += snprintf(buffer, sizeof(buffer), "%s\n", "none");
++		len += scnprintf(buffer, sizeof(buffer), "%s\n", "none");
+ 	}
+ 
+ 	if (len > *lenp)
+@@ -94,19 +94,19 @@ static int do_autoprobe(struct ctl_table *table, int write,
+ 	}
+ 	
+ 	if ((str = info->class_name) != NULL)
+-		len += snprintf (buffer + len, sizeof(buffer) - len, "CLASS:%s;\n", str);
++		len += scnprintf (buffer + len, sizeof(buffer) - len, "CLASS:%s;\n", str);
+ 
+ 	if ((str = info->model) != NULL)
+-		len += snprintf (buffer + len, sizeof(buffer) - len, "MODEL:%s;\n", str);
++		len += scnprintf (buffer + len, sizeof(buffer) - len, "MODEL:%s;\n", str);
+ 
+ 	if ((str = info->mfr) != NULL)
+-		len += snprintf (buffer + len, sizeof(buffer) - len, "MANUFACTURER:%s;\n", str);
++		len += scnprintf (buffer + len, sizeof(buffer) - len, "MANUFACTURER:%s;\n", str);
+ 
+ 	if ((str = info->description) != NULL)
+-		len += snprintf (buffer + len, sizeof(buffer) - len, "DESCRIPTION:%s;\n", str);
++		len += scnprintf (buffer + len, sizeof(buffer) - len, "DESCRIPTION:%s;\n", str);
+ 
+ 	if ((str = info->cmdset) != NULL)
+-		len += snprintf (buffer + len, sizeof(buffer) - len, "COMMAND SET:%s;\n", str);
++		len += scnprintf (buffer + len, sizeof(buffer) - len, "COMMAND SET:%s;\n", str);
+ 
+ 	if (len > *lenp)
+ 		len = *lenp;
+@@ -135,7 +135,7 @@ static int do_hardware_base_addr(struct ctl_table *table, int write,
+ 	if (write) /* permissions prevent this anyway */
+ 		return -EACCES;
+ 
+-	len += snprintf (buffer, sizeof(buffer), "%lu\t%lu\n", port->base, port->base_hi);
++	len += scnprintf (buffer, sizeof(buffer), "%lu\t%lu\n", port->base, port->base_hi);
+ 
+ 	if (len > *lenp)
+ 		len = *lenp;
+@@ -162,7 +162,7 @@ static int do_hardware_irq(struct ctl_table *table, int write,
+ 	if (write) /* permissions prevent this anyway */
+ 		return -EACCES;
+ 
+-	len += snprintf (buffer, sizeof(buffer), "%d\n", port->irq);
++	len += scnprintf (buffer, sizeof(buffer), "%d\n", port->irq);
+ 
+ 	if (len > *lenp)
+ 		len = *lenp;
+@@ -189,7 +189,7 @@ static int do_hardware_dma(struct ctl_table *table, int write,
+ 	if (write) /* permissions prevent this anyway */
+ 		return -EACCES;
+ 
+-	len += snprintf (buffer, sizeof(buffer), "%d\n", port->dma);
++	len += scnprintf (buffer, sizeof(buffer), "%d\n", port->dma);
+ 
+ 	if (len > *lenp)
+ 		len = *lenp;
+@@ -220,7 +220,7 @@ static int do_hardware_modes(struct ctl_table *table, int write,
+ #define printmode(x)							\
+ do {									\
+ 	if (port->modes & PARPORT_MODE_##x)				\
+-		len += snprintf(buffer + len, sizeof(buffer) - len, "%s%s", f++ ? "," : "", #x); \
++		len += scnprintf(buffer + len, sizeof(buffer) - len, "%s%s", f++ ? "," : "", #x); \
+ } while (0)
+ 		int f = 0;
+ 		printmode(PCSPP);
+diff --git a/drivers/pinctrl/pinctrl-apple-gpio.c b/drivers/pinctrl/pinctrl-apple-gpio.c
+index 3751c7de37aa9f..f861e63f411521 100644
+--- a/drivers/pinctrl/pinctrl-apple-gpio.c
++++ b/drivers/pinctrl/pinctrl-apple-gpio.c
+@@ -474,6 +474,9 @@ static int apple_gpio_pinctrl_probe(struct platform_device *pdev)
+ 	for (i = 0; i < npins; i++) {
+ 		pins[i].number = i;
+ 		pins[i].name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "PIN%u", i);
++		if (!pins[i].name)
++			return -ENOMEM;
++
+ 		pins[i].drv_data = pctl;
+ 		pin_names[i] = pins[i].name;
+ 		pin_nums[i] = i;
+diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c
+index f8ae2e9742217c..8d26c8061c77eb 100644
+--- a/drivers/pinctrl/pinctrl-ocelot.c
++++ b/drivers/pinctrl/pinctrl-ocelot.c
+@@ -1962,21 +1962,21 @@ static void ocelot_irq_handler(struct irq_desc *desc)
+ 	unsigned int reg = 0, irq, i;
+ 	unsigned long irqs;
+ 
++	chained_irq_enter(parent_chip, desc);
++
+ 	for (i = 0; i < info->stride; i++) {
+ 		regmap_read(info->map, id_reg + 4 * i, &reg);
+ 		if (!reg)
+ 			continue;
+ 
+-		chained_irq_enter(parent_chip, desc);
+-
+ 		irqs = reg;
+ 
+ 		for_each_set_bit(irq, &irqs,
+ 				 min(32U, info->desc->npins - 32 * i))
+ 			generic_handle_domain_irq(chip->irq.domain, irq + 32 * i);
+-
+-		chained_irq_exit(parent_chip, desc);
+ 	}
++
++	chained_irq_exit(parent_chip, desc);
+ }
+ 
+ static int ocelot_gpiochip_register(struct platform_device *pdev,
+diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
+index 346a31f31bba80..5e91def6078474 100644
+--- a/drivers/pinctrl/stm32/pinctrl-stm32.c
++++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
+@@ -1387,10 +1387,15 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl, struct fwnode
+ 
+ 	for (i = 0; i < npins; i++) {
+ 		stm32_pin = stm32_pctrl_get_desc_pin_from_gpio(pctl, bank, i);
+-		if (stm32_pin && stm32_pin->pin.name)
++		if (stm32_pin && stm32_pin->pin.name) {
+ 			names[i] = devm_kasprintf(dev, GFP_KERNEL, "%s", stm32_pin->pin.name);
+-		else
++			if (!names[i]) {
++				err = -ENOMEM;
++				goto err_clk;
++			}
++		} else {
+ 			names[i] = NULL;
++		}
+ 	}
+ 
+ 	bank->gpio_chip.names = (const char * const *)names;
+diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
+index ba10f9b8fac724..6fa0fb35e5210f 100644
+--- a/drivers/s390/char/sclp.c
++++ b/drivers/s390/char/sclp.c
+@@ -1195,7 +1195,8 @@ sclp_reboot_event(struct notifier_block *this, unsigned long event, void *ptr)
+ }
+ 
+ static struct notifier_block sclp_reboot_notifier = {
+-	.notifier_call = sclp_reboot_event
++	.notifier_call = sclp_reboot_event,
++	.priority      = INT_MIN,
+ };
+ 
+ static ssize_t con_pages_show(struct device_driver *dev, char *buf)
+diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
+index 218ae604f737ff..33b9c968dbcba6 100644
+--- a/drivers/s390/char/sclp_vt220.c
++++ b/drivers/s390/char/sclp_vt220.c
+@@ -319,7 +319,7 @@ sclp_vt220_add_msg(struct sclp_vt220_request *request,
+ 	buffer = (void *) ((addr_t) sccb + sccb->header.length);
+ 
+ 	if (convertlf) {
+-		/* Perform Linefeed conversion (0x0a -> 0x0a 0x0d)*/
++		/* Perform Linefeed conversion (0x0a -> 0x0d 0x0a)*/
+ 		for (from=0, to=0;
+ 		     (from < count) && (to < sclp_vt220_space_left(request));
+ 		     from++) {
+@@ -328,8 +328,8 @@ sclp_vt220_add_msg(struct sclp_vt220_request *request,
+ 			/* Perform conversion */
+ 			if (c == 0x0a) {
+ 				if (to + 1 < sclp_vt220_space_left(request)) {
+-					((unsigned char *) buffer)[to++] = c;
+ 					((unsigned char *) buffer)[to++] = 0x0d;
++					((unsigned char *) buffer)[to++] = c;
+ 				} else
+ 					break;
+ 
+diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
+index 5fc8540a83e315..8559ba1361c645 100644
+--- a/drivers/tty/n_gsm.c
++++ b/drivers/tty/n_gsm.c
+@@ -3156,6 +3156,8 @@ static void gsm_cleanup_mux(struct gsm_mux *gsm, bool disc)
+ 	mutex_unlock(&gsm->mutex);
+ 	/* Now wipe the queues */
+ 	tty_ldisc_flush(gsm->tty);
++
++	guard(spinlock_irqsave)(&gsm->tx_lock);
+ 	list_for_each_entry_safe(txq, ntxq, &gsm->tx_ctrl_list, list)
+ 		kfree(txq);
+ 	INIT_LIST_HEAD(&gsm->tx_ctrl_list);
+diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
+index a5d0df2ba5c556..349d4849ba5e3b 100644
+--- a/drivers/tty/serial/imx.c
++++ b/drivers/tty/serial/imx.c
+@@ -771,6 +771,21 @@ static irqreturn_t __imx_uart_rtsint(int irq, void *dev_id)
+ 
+ 	imx_uart_writel(sport, USR1_RTSD, USR1);
+ 	usr1 = imx_uart_readl(sport, USR1) & USR1_RTSS;
++	/*
++	 * Update sport->old_status here, so any follow-up calls to
++	 * imx_uart_mctrl_check() will be able to recognize that RTS
++	 * state changed since last imx_uart_mctrl_check() call.
++	 *
++	 * In case RTS has been detected as asserted here and later on
++	 * deasserted by the time imx_uart_mctrl_check() was called,
++	 * imx_uart_mctrl_check() can detect the RTS state change and
++	 * trigger uart_handle_cts_change() to unblock the port for
++	 * further TX transfers.
++	 */
++	if (usr1 & USR1_RTSS)
++		sport->old_status |= TIOCM_CTS;
++	else
++		sport->old_status &= ~TIOCM_CTS;
+ 	uart_handle_cts_change(&sport->port, usr1);
+ 	wake_up_interruptible(&sport->port.state->port.delta_msr_wait);
+ 
+diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
+index f798ef3c41309e..f820a09cb5c39b 100644
+--- a/drivers/tty/serial/qcom_geni_serial.c
++++ b/drivers/tty/serial/qcom_geni_serial.c
+@@ -144,6 +144,8 @@ static const struct uart_ops qcom_geni_uart_pops;
+ static struct uart_driver qcom_geni_console_driver;
+ static struct uart_driver qcom_geni_uart_driver;
+ 
++static int qcom_geni_serial_port_setup(struct uart_port *uport);
++
+ static inline struct qcom_geni_serial_port *to_dev_port(struct uart_port *uport)
+ {
+ 	return container_of(uport, struct qcom_geni_serial_port, uport);
+@@ -385,6 +387,23 @@ static void qcom_geni_serial_poll_put_char(struct uart_port *uport,
+ 	writel(M_TX_FIFO_WATERMARK_EN, uport->membase + SE_GENI_M_IRQ_CLEAR);
+ 	qcom_geni_serial_poll_tx_done(uport);
+ }
++
++static int qcom_geni_serial_poll_init(struct uart_port *uport)
++{
++	struct qcom_geni_serial_port *port = to_dev_port(uport);
++	int ret;
++
++	if (!port->setup) {
++		ret = qcom_geni_serial_port_setup(uport);
++		if (ret)
++			return ret;
++	}
++
++	if (!qcom_geni_serial_secondary_active(uport))
++		geni_se_setup_s_cmd(&port->se, UART_START_READ, 0);
++
++	return 0;
++}
+ #endif
+ 
+ #ifdef CONFIG_SERIAL_QCOM_GENI_CONSOLE
+@@ -756,17 +775,27 @@ static void qcom_geni_serial_start_rx_fifo(struct uart_port *uport)
+ static void qcom_geni_serial_stop_rx_dma(struct uart_port *uport)
+ {
+ 	struct qcom_geni_serial_port *port = to_dev_port(uport);
++	bool done;
+ 
+ 	if (!qcom_geni_serial_secondary_active(uport))
+ 		return;
+ 
+ 	geni_se_cancel_s_cmd(&port->se);
+-	qcom_geni_serial_poll_bit(uport, SE_GENI_S_IRQ_STATUS,
+-				  S_CMD_CANCEL_EN, true);
+-
+-	if (qcom_geni_serial_secondary_active(uport))
++	done = qcom_geni_serial_poll_bit(uport, SE_DMA_RX_IRQ_STAT,
++			RX_EOT, true);
++	if (done) {
++		writel(RX_EOT | RX_DMA_DONE,
++				uport->membase + SE_DMA_RX_IRQ_CLR);
++	} else {
+ 		qcom_geni_serial_abort_rx(uport);
+ 
++		writel(1, uport->membase + SE_DMA_RX_FSM_RST);
++		qcom_geni_serial_poll_bit(uport, SE_DMA_RX_IRQ_STAT,
++				RX_RESET_DONE, true);
++		writel(RX_RESET_DONE | RX_DMA_DONE,
++				uport->membase + SE_DMA_RX_IRQ_CLR);
++	}
++
+ 	if (port->rx_dma_addr) {
+ 		geni_se_rx_dma_unprep(&port->se, port->rx_dma_addr,
+ 				      DMA_RX_BUF_SIZE);
+@@ -1115,7 +1144,6 @@ static int qcom_geni_serial_port_setup(struct uart_port *uport)
+ 			       false, true, true);
+ 	geni_se_init(&port->se, UART_RX_WM, port->rx_fifo_depth - 2);
+ 	geni_se_select_mode(&port->se, port->dev_data->mode);
+-	qcom_geni_serial_start_rx(uport);
+ 	port->setup = true;
+ 
+ 	return 0;
+@@ -1131,6 +1159,11 @@ static int qcom_geni_serial_startup(struct uart_port *uport)
+ 		if (ret)
+ 			return ret;
+ 	}
++
++	uart_port_lock_irq(uport);
++	qcom_geni_serial_start_rx(uport);
++	uart_port_unlock_irq(uport);
++
+ 	enable_irq(uport->irq);
+ 
+ 	return 0;
+@@ -1216,7 +1249,6 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport,
+ 	unsigned int avg_bw_core;
+ 	unsigned long timeout;
+ 
+-	qcom_geni_serial_stop_rx(uport);
+ 	/* baud rate */
+ 	baud = uart_get_baud_rate(uport, termios, old, 300, 4000000);
+ 
+@@ -1232,7 +1264,7 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport,
+ 		dev_err(port->se.dev,
+ 			"Couldn't find suitable clock rate for %u\n",
+ 			baud * sampling_rate);
+-		goto out_restart_rx;
++		return;
+ 	}
+ 
+ 	dev_dbg(port->se.dev, "desired_rate = %u, clk_rate = %lu, clk_div = %u\n",
+@@ -1323,8 +1355,6 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport,
+ 	writel(stop_bit_len, uport->membase + SE_UART_TX_STOP_BIT_LEN);
+ 	writel(ser_clk_cfg, uport->membase + GENI_SER_M_CLK_CFG);
+ 	writel(ser_clk_cfg, uport->membase + GENI_SER_S_CLK_CFG);
+-out_restart_rx:
+-	qcom_geni_serial_start_rx(uport);
+ }
+ 
+ #ifdef CONFIG_SERIAL_QCOM_GENI_CONSOLE
+@@ -1544,7 +1574,7 @@ static const struct uart_ops qcom_geni_console_pops = {
+ #ifdef CONFIG_CONSOLE_POLL
+ 	.poll_get_char	= qcom_geni_serial_get_char,
+ 	.poll_put_char	= qcom_geni_serial_poll_put_char,
+-	.poll_init = qcom_geni_serial_port_setup,
++	.poll_init = qcom_geni_serial_poll_init,
+ #endif
+ 	.pm = qcom_geni_serial_pm,
+ };
+@@ -1745,38 +1775,6 @@ static int qcom_geni_serial_sys_resume(struct device *dev)
+ 	return ret;
+ }
+ 
+-static int qcom_geni_serial_sys_hib_resume(struct device *dev)
+-{
+-	int ret = 0;
+-	struct uart_port *uport;
+-	struct qcom_geni_private_data *private_data;
+-	struct qcom_geni_serial_port *port = dev_get_drvdata(dev);
+-
+-	uport = &port->uport;
+-	private_data = uport->private_data;
+-
+-	if (uart_console(uport)) {
+-		geni_icc_set_tag(&port->se, QCOM_ICC_TAG_ALWAYS);
+-		geni_icc_set_bw(&port->se);
+-		ret = uart_resume_port(private_data->drv, uport);
+-		/*
+-		 * For hibernation usecase clients for
+-		 * console UART won't call port setup during restore,
+-		 * hence call port setup for console uart.
+-		 */
+-		qcom_geni_serial_port_setup(uport);
+-	} else {
+-		/*
+-		 * Peripheral register settings are lost during hibernation.
+-		 * Update setup flag such that port setup happens again
+-		 * during next session. Clients of HS-UART will close and
+-		 * open the port during hibernation.
+-		 */
+-		port->setup = false;
+-	}
+-	return ret;
+-}
+-
+ static const struct qcom_geni_device_data qcom_geni_console_data = {
+ 	.console = true,
+ 	.mode = GENI_SE_FIFO,
+@@ -1788,12 +1786,8 @@ static const struct qcom_geni_device_data qcom_geni_uart_data = {
+ };
+ 
+ static const struct dev_pm_ops qcom_geni_serial_pm_ops = {
+-	.suspend = pm_sleep_ptr(qcom_geni_serial_sys_suspend),
+-	.resume = pm_sleep_ptr(qcom_geni_serial_sys_resume),
+-	.freeze = pm_sleep_ptr(qcom_geni_serial_sys_suspend),
+-	.poweroff = pm_sleep_ptr(qcom_geni_serial_sys_suspend),
+-	.restore = pm_sleep_ptr(qcom_geni_serial_sys_hib_resume),
+-	.thaw = pm_sleep_ptr(qcom_geni_serial_sys_hib_resume),
++	SYSTEM_SLEEP_PM_OPS(qcom_geni_serial_sys_suspend,
++					qcom_geni_serial_sys_resume)
+ };
+ 
+ static const struct of_device_id qcom_geni_serial_match_table[] = {
+diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
+index a22da757ca6d18..6bd1a7785e888c 100644
+--- a/drivers/tty/vt/vt.c
++++ b/drivers/tty/vt/vt.c
+@@ -4550,7 +4550,7 @@ static int con_font_get(struct vc_data *vc, struct console_font_op *op)
+ 		return -EINVAL;
+ 
+ 	if (op->data) {
+-		font.data = kvmalloc(max_font_size, GFP_KERNEL);
++		font.data = kvzalloc(max_font_size, GFP_KERNEL);
+ 		if (!font.data)
+ 			return -ENOMEM;
+ 	} else
+diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c
+index af5ce45315b3c9..da8c1734d33358 100644
+--- a/drivers/ufs/core/ufs-mcq.c
++++ b/drivers/ufs/core/ufs-mcq.c
+@@ -498,7 +498,7 @@ int ufshcd_mcq_sq_cleanup(struct ufs_hba *hba, int task_tag)
+ 	struct scsi_cmnd *cmd = lrbp->cmd;
+ 	struct ufs_hw_queue *hwq;
+ 	void __iomem *reg, *opr_sqd_base;
+-	u32 nexus, id, val;
++	u32 nexus, id, val, rtc;
+ 	int err;
+ 
+ 	if (hba->quirks & UFSHCD_QUIRK_MCQ_BROKEN_RTC)
+@@ -528,17 +528,18 @@ int ufshcd_mcq_sq_cleanup(struct ufs_hba *hba, int task_tag)
+ 	opr_sqd_base = mcq_opr_base(hba, OPR_SQD, id);
+ 	writel(nexus, opr_sqd_base + REG_SQCTI);
+ 
+-	/* SQRTCy.ICU = 1 */
+-	writel(SQ_ICU, opr_sqd_base + REG_SQRTC);
++	/* Initiate Cleanup */
++	writel(readl(opr_sqd_base + REG_SQRTC) | SQ_ICU,
++		opr_sqd_base + REG_SQRTC);
+ 
+ 	/* Poll SQRTSy.CUS = 1. Return result from SQRTSy.RTC */
+ 	reg = opr_sqd_base + REG_SQRTS;
+ 	err = read_poll_timeout(readl, val, val & SQ_CUS, 20,
+ 				MCQ_POLL_US, false, reg);
+-	if (err)
+-		dev_err(hba->dev, "%s: failed. hwq=%d, tag=%d err=%ld\n",
+-			__func__, id, task_tag,
+-			FIELD_GET(SQ_ICU_ERR_CODE_MASK, readl(reg)));
++	rtc = FIELD_GET(SQ_ICU_ERR_CODE_MASK, readl(reg));
++	if (err || rtc)
++		dev_err(hba->dev, "%s: failed. hwq=%d, tag=%d err=%d RTC=%d\n",
++			__func__, id, task_tag, err, rtc);
+ 
+ 	if (ufshcd_mcq_sq_start(hba, hwq))
+ 		err = -ETIMEDOUT;
+diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
+index 59d53ea100c003..db4044358e22d8 100644
+--- a/drivers/ufs/core/ufshcd.c
++++ b/drivers/ufs/core/ufshcd.c
+@@ -10100,7 +10100,9 @@ static void ufshcd_wl_shutdown(struct device *dev)
+ 	shost_for_each_device(sdev, hba->host) {
+ 		if (sdev == hba->ufs_device_wlun)
+ 			continue;
+-		scsi_device_quiesce(sdev);
++		mutex_lock(&sdev->state_mutex);
++		scsi_device_set_state(sdev, SDEV_OFFLINE);
++		mutex_unlock(&sdev->state_mutex);
+ 	}
+ 	__ufshcd_wl_suspend(hba, UFS_SHUTDOWN_PM);
+ 
+diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
+index 6d439aba646008..867000cdeb9653 100644
+--- a/drivers/usb/dwc3/gadget.c
++++ b/drivers/usb/dwc3/gadget.c
+@@ -438,6 +438,10 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd,
+ 			dwc3_gadget_ep_get_transfer_index(dep);
+ 	}
+ 
++	if (DWC3_DEPCMD_CMD(cmd) == DWC3_DEPCMD_ENDTRANSFER &&
++	    !(cmd & DWC3_DEPCMD_CMDIOC))
++		mdelay(1);
++
+ 	if (saved_config) {
+ 		reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));
+ 		reg |= saved_config;
+@@ -1734,12 +1738,10 @@ static int __dwc3_stop_active_transfer(struct dwc3_ep *dep, bool force, bool int
+ 	WARN_ON_ONCE(ret);
+ 	dep->resource_index = 0;
+ 
+-	if (!interrupt) {
+-		mdelay(1);
++	if (!interrupt)
+ 		dep->flags &= ~DWC3_EP_TRANSFER_STARTED;
+-	} else if (!ret) {
++	else if (!ret)
+ 		dep->flags |= DWC3_EP_END_TRANSFER_PENDING;
+-	}
+ 
+ 	dep->flags &= ~DWC3_EP_DELAY_STOP;
+ 	return ret;
+diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
+index 95d8cf24b01546..7d959e2753f906 100644
+--- a/drivers/usb/host/xhci-ring.c
++++ b/drivers/usb/host/xhci-ring.c
+@@ -1046,7 +1046,7 @@ static int xhci_invalidate_cancelled_tds(struct xhci_virt_ep *ep)
+ 					td_to_noop(xhci, ring, cached_td, false);
+ 					cached_td->cancel_status = TD_CLEARED;
+ 				}
+-
++				td_to_noop(xhci, ring, td, false);
+ 				td->cancel_status = TD_CLEARING_CACHE;
+ 				cached_td = td;
+ 				break;
+diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
+index 6246d5ad146848..76f228e7443cb6 100644
+--- a/drivers/usb/host/xhci-tegra.c
++++ b/drivers/usb/host/xhci-tegra.c
+@@ -2183,7 +2183,7 @@ static int tegra_xusb_enter_elpg(struct tegra_xusb *tegra, bool runtime)
+ 		goto out;
+ 	}
+ 
+-	for (i = 0; i < tegra->num_usb_phys; i++) {
++	for (i = 0; i < xhci->usb2_rhub.num_ports; i++) {
+ 		if (!xhci->usb2_rhub.ports[i])
+ 			continue;
+ 		portsc = readl(xhci->usb2_rhub.ports[i]->addr);
+diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
+index f5efee06ff0674..7754ed55d220b3 100644
+--- a/drivers/usb/host/xhci.h
++++ b/drivers/usb/host/xhci.h
+@@ -1286,7 +1286,7 @@ enum xhci_setup_dev {
+ /* Set TR Dequeue Pointer command TRB fields, 6.4.3.9 */
+ #define TRB_TO_STREAM_ID(p)		((((p) & (0xffff << 16)) >> 16))
+ #define STREAM_ID_FOR_TRB(p)		((((p)) & 0xffff) << 16)
+-#define SCT_FOR_TRB(p)			(((p) << 1) & 0x7)
++#define SCT_FOR_TRB(p)			(((p) & 0x7) << 1)
+ 
+ /* Link TRB specific fields */
+ #define TRB_TC			(1<<1)
+diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
+index 176f38750ad589..55886b64cadd83 100644
+--- a/drivers/usb/serial/option.c
++++ b/drivers/usb/serial/option.c
+@@ -279,6 +279,7 @@ static void option_instat_callback(struct urb *urb);
+ #define QUECTEL_PRODUCT_EG912Y			0x6001
+ #define QUECTEL_PRODUCT_EC200S_CN		0x6002
+ #define QUECTEL_PRODUCT_EC200A			0x6005
++#define QUECTEL_PRODUCT_EG916Q			0x6007
+ #define QUECTEL_PRODUCT_EM061K_LWW		0x6008
+ #define QUECTEL_PRODUCT_EM061K_LCN		0x6009
+ #define QUECTEL_PRODUCT_EC200T			0x6026
+@@ -1270,6 +1271,7 @@ static const struct usb_device_id option_ids[] = {
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) },
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) },
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG912Y, 0xff, 0, 0) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG916Q, 0xff, 0x00, 0x00) },
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) },
+ 
+ 	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },
+@@ -1380,10 +1382,16 @@ static const struct usb_device_id option_ids[] = {
+ 	  .driver_info = NCTRL(0) | RSVD(1) },
+ 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a0, 0xff),	/* Telit FN20C04 (rmnet) */
+ 	  .driver_info = RSVD(0) | NCTRL(3) },
++	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a2, 0xff),	/* Telit FN920C04 (MBIM) */
++	  .driver_info = NCTRL(4) },
+ 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a4, 0xff),	/* Telit FN20C04 (rmnet) */
+ 	  .driver_info = RSVD(0) | NCTRL(3) },
++	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a7, 0xff),	/* Telit FN920C04 (MBIM) */
++	  .driver_info = NCTRL(4) },
+ 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a9, 0xff),	/* Telit FN20C04 (rmnet) */
+ 	  .driver_info = RSVD(0) | NCTRL(2) | RSVD(3) | RSVD(4) },
++	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10aa, 0xff),	/* Telit FN920C04 (MBIM) */
++	  .driver_info = NCTRL(3) | RSVD(4) | RSVD(5) },
+ 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910),
+ 	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(3) },
+ 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910_DUAL_MODEM),
+diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c
+index a8f3f4d3a4509d..d6607491fcef48 100644
+--- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c
++++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c
+@@ -252,7 +252,6 @@ int qcom_pmic_typec_port_get_cc(struct pmic_typec_port *pmic_typec_port,
+ 			val = TYPEC_CC_RP_DEF;
+ 			break;
+ 		}
+-		val = TYPEC_CC_RP_DEF;
+ 	}
+ 
+ 	if (misc & CC_ORIENTATION)
+diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
+index e0037665aa9279..cc9a2f8a4ae3b7 100644
+--- a/fs/btrfs/tree-log.c
++++ b/fs/btrfs/tree-log.c
+@@ -1374,7 +1374,7 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,
+ 	struct inode *inode = NULL;
+ 	unsigned long ref_ptr;
+ 	unsigned long ref_end;
+-	struct fscrypt_str name;
++	struct fscrypt_str name = { 0 };
+ 	int ret;
+ 	int log_ref_ver = 0;
+ 	u64 parent_objectid;
+@@ -1846,7 +1846,7 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans,
+ 				    struct btrfs_dir_item *di,
+ 				    struct btrfs_key *key)
+ {
+-	struct fscrypt_str name;
++	struct fscrypt_str name = { 0 };
+ 	struct btrfs_dir_item *dir_dst_di;
+ 	struct btrfs_dir_item *index_dst_di;
+ 	bool dir_dst_matches = false;
+@@ -2126,7 +2126,7 @@ static noinline int check_item_in_log(struct btrfs_trans_handle *trans,
+ 	struct extent_buffer *eb;
+ 	int slot;
+ 	struct btrfs_dir_item *di;
+-	struct fscrypt_str name;
++	struct fscrypt_str name = { 0 };
+ 	struct inode *inode = NULL;
+ 	struct btrfs_key location;
+ 
+diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
+index c4d00999a43300..3cf22a6727f1b6 100644
+--- a/fs/fat/namei_vfat.c
++++ b/fs/fat/namei_vfat.c
+@@ -1037,7 +1037,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
+ 	if (corrupt < 0) {
+ 		fat_fs_error(new_dir->i_sb,
+ 			     "%s: Filesystem corrupted (i_pos %lld)",
+-			     __func__, sinfo.i_pos);
++			     __func__, new_i_pos);
+ 	}
+ 	goto out;
+ }
+diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c
+index 53e4e63c607e7c..ddf8e575e489ca 100644
+--- a/fs/nilfs2/dir.c
++++ b/fs/nilfs2/dir.c
+@@ -331,6 +331,8 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx)
+  * returns the page in which the entry was found, and the entry itself
+  * (as a parameter - res_dir). Page is returned mapped and unlocked.
+  * Entry is guaranteed to be valid.
++ *
++ * On failure, returns an error pointer and the caller should ignore res_page.
+  */
+ struct nilfs_dir_entry *
+ nilfs_find_entry(struct inode *dir, const struct qstr *qstr,
+@@ -358,22 +360,24 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr,
+ 	do {
+ 		char *kaddr = nilfs_get_page(dir, n, &page);
+ 
+-		if (!IS_ERR(kaddr)) {
+-			de = (struct nilfs_dir_entry *)kaddr;
+-			kaddr += nilfs_last_byte(dir, n) - reclen;
+-			while ((char *) de <= kaddr) {
+-				if (de->rec_len == 0) {
+-					nilfs_error(dir->i_sb,
+-						"zero-length directory entry");
+-					nilfs_put_page(page);
+-					goto out;
+-				}
+-				if (nilfs_match(namelen, name, de))
+-					goto found;
+-				de = nilfs_next_entry(de);
++		if (IS_ERR(kaddr))
++			return ERR_CAST(kaddr);
++
++		de = (struct nilfs_dir_entry *)kaddr;
++		kaddr += nilfs_last_byte(dir, n) - reclen;
++		while ((char *)de <= kaddr) {
++			if (de->rec_len == 0) {
++				nilfs_error(dir->i_sb,
++					    "zero-length directory entry");
++				nilfs_put_page(page);
++				goto out;
+ 			}
+-			nilfs_put_page(page);
++			if (nilfs_match(namelen, name, de))
++				goto found;
++			de = nilfs_next_entry(de);
+ 		}
++		nilfs_put_page(page);
++
+ 		if (++n >= npages)
+ 			n = 0;
+ 		/* next page is past the blocks we've got */
+@@ -386,7 +390,7 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr,
+ 		}
+ 	} while (n != start);
+ out:
+-	return NULL;
++	return ERR_PTR(-ENOENT);
+ 
+ found:
+ 	*res_page = page;
+@@ -431,19 +435,19 @@ struct nilfs_dir_entry *nilfs_dotdot(struct inode *dir, struct page **p)
+ 	return NULL;
+ }
+ 
+-ino_t nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr)
++int nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr, ino_t *ino)
+ {
+-	ino_t res = 0;
+ 	struct nilfs_dir_entry *de;
+ 	struct page *page;
+ 
+ 	de = nilfs_find_entry(dir, qstr, &page);
+-	if (de) {
+-		res = le64_to_cpu(de->inode);
+-		kunmap(page);
+-		put_page(page);
+-	}
+-	return res;
++	if (IS_ERR(de))
++		return PTR_ERR(de);
++
++	*ino = le64_to_cpu(de->inode);
++	kunmap(page);
++	put_page(page);
++	return 0;
+ }
+ 
+ /* Releases the page */
+diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c
+index 2a4e7f4a8102f6..9f9b0762ff6901 100644
+--- a/fs/nilfs2/namei.c
++++ b/fs/nilfs2/namei.c
+@@ -55,12 +55,20 @@ nilfs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
+ {
+ 	struct inode *inode;
+ 	ino_t ino;
++	int res;
+ 
+ 	if (dentry->d_name.len > NILFS_NAME_LEN)
+ 		return ERR_PTR(-ENAMETOOLONG);
+ 
+-	ino = nilfs_inode_by_name(dir, &dentry->d_name);
+-	inode = ino ? nilfs_iget(dir->i_sb, NILFS_I(dir)->i_root, ino) : NULL;
++	res = nilfs_inode_by_name(dir, &dentry->d_name, &ino);
++	if (res) {
++		if (res != -ENOENT)
++			return ERR_PTR(res);
++		inode = NULL;
++	} else {
++		inode = nilfs_iget(dir->i_sb, NILFS_I(dir)->i_root, ino);
++	}
++
+ 	return d_splice_alias(inode, dentry);
+ }
+ 
+@@ -263,10 +271,11 @@ static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry)
+ 	struct page *page;
+ 	int err;
+ 
+-	err = -ENOENT;
+ 	de = nilfs_find_entry(dir, &dentry->d_name, &page);
+-	if (!de)
++	if (IS_ERR(de)) {
++		err = PTR_ERR(de);
+ 		goto out;
++	}
+ 
+ 	inode = d_inode(dentry);
+ 	err = -EIO;
+@@ -361,10 +370,11 @@ static int nilfs_rename(struct mnt_idmap *idmap,
+ 	if (unlikely(err))
+ 		return err;
+ 
+-	err = -ENOENT;
+ 	old_de = nilfs_find_entry(old_dir, &old_dentry->d_name, &old_page);
+-	if (!old_de)
++	if (IS_ERR(old_de)) {
++		err = PTR_ERR(old_de);
+ 		goto out;
++	}
+ 
+ 	if (S_ISDIR(old_inode->i_mode)) {
+ 		err = -EIO;
+@@ -381,10 +391,12 @@ static int nilfs_rename(struct mnt_idmap *idmap,
+ 		if (dir_de && !nilfs_empty_dir(new_inode))
+ 			goto out_dir;
+ 
+-		err = -ENOENT;
+-		new_de = nilfs_find_entry(new_dir, &new_dentry->d_name, &new_page);
+-		if (!new_de)
++		new_de = nilfs_find_entry(new_dir, &new_dentry->d_name,
++					  &new_page);
++		if (IS_ERR(new_de)) {
++			err = PTR_ERR(new_de);
+ 			goto out_dir;
++		}
+ 		nilfs_set_link(new_dir, new_de, new_page, old_inode);
+ 		nilfs_mark_inode_dirty(new_dir);
+ 		inode_set_ctime_current(new_inode);
+@@ -438,13 +450,14 @@ static int nilfs_rename(struct mnt_idmap *idmap,
+  */
+ static struct dentry *nilfs_get_parent(struct dentry *child)
+ {
+-	unsigned long ino;
++	ino_t ino;
++	int res;
+ 	struct inode *inode;
+ 	struct nilfs_root *root;
+ 
+-	ino = nilfs_inode_by_name(d_inode(child), &dotdot_name);
+-	if (!ino)
+-		return ERR_PTR(-ENOENT);
++	res = nilfs_inode_by_name(d_inode(child), &dotdot_name, &ino);
++	if (res)
++		return ERR_PTR(res);
+ 
+ 	root = NILFS_I(d_inode(child))->i_root;
+ 
+diff --git a/fs/nilfs2/nilfs.h b/fs/nilfs2/nilfs.h
+index 9a157e5051d0c4..ad13e74af65f92 100644
+--- a/fs/nilfs2/nilfs.h
++++ b/fs/nilfs2/nilfs.h
+@@ -233,7 +233,7 @@ static inline __u32 nilfs_mask_flags(umode_t mode, __u32 flags)
+ 
+ /* dir.c */
+ extern int nilfs_add_link(struct dentry *, struct inode *);
+-extern ino_t nilfs_inode_by_name(struct inode *, const struct qstr *);
++int nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr, ino_t *ino);
+ extern int nilfs_make_empty(struct inode *, struct inode *);
+ extern struct nilfs_dir_entry *
+ nilfs_find_entry(struct inode *, const struct qstr *, struct page **);
+diff --git a/fs/smb/server/mgmt/user_session.c b/fs/smb/server/mgmt/user_session.c
+index dac5f984f17544..9f40b9c473ba42 100644
+--- a/fs/smb/server/mgmt/user_session.c
++++ b/fs/smb/server/mgmt/user_session.c
+@@ -176,9 +176,10 @@ static void ksmbd_expire_session(struct ksmbd_conn *conn)
+ 
+ 	down_write(&conn->session_lock);
+ 	xa_for_each(&conn->sessions, id, sess) {
+-		if (sess->state != SMB2_SESSION_VALID ||
+-		    time_after(jiffies,
+-			       sess->last_active + SMB2_SESSION_TIMEOUT)) {
++		if (atomic_read(&sess->refcnt) == 0 &&
++		    (sess->state != SMB2_SESSION_VALID ||
++		     time_after(jiffies,
++			       sess->last_active + SMB2_SESSION_TIMEOUT))) {
+ 			xa_erase(&conn->sessions, sess->id);
+ 			hash_del(&sess->hlist);
+ 			ksmbd_session_destroy(sess);
+@@ -268,8 +269,6 @@ struct ksmbd_session *ksmbd_session_lookup_slowpath(unsigned long long id)
+ 
+ 	down_read(&sessions_table_lock);
+ 	sess = __session_lookup(id);
+-	if (sess)
+-		sess->last_active = jiffies;
+ 	up_read(&sessions_table_lock);
+ 
+ 	return sess;
+@@ -288,6 +287,22 @@ struct ksmbd_session *ksmbd_session_lookup_all(struct ksmbd_conn *conn,
+ 	return sess;
+ }
+ 
++void ksmbd_user_session_get(struct ksmbd_session *sess)
++{
++	atomic_inc(&sess->refcnt);
++}
++
++void ksmbd_user_session_put(struct ksmbd_session *sess)
++{
++	if (!sess)
++		return;
++
++	if (atomic_read(&sess->refcnt) <= 0)
++		WARN_ON(1);
++	else
++		atomic_dec(&sess->refcnt);
++}
++
+ struct preauth_session *ksmbd_preauth_session_alloc(struct ksmbd_conn *conn,
+ 						    u64 sess_id)
+ {
+@@ -390,6 +405,7 @@ static struct ksmbd_session *__session_create(int protocol)
+ 	xa_init(&sess->rpc_handle_list);
+ 	sess->sequence_number = 1;
+ 	rwlock_init(&sess->tree_conns_lock);
++	atomic_set(&sess->refcnt, 1);
+ 
+ 	ret = __init_smb2_session(sess);
+ 	if (ret)
+diff --git a/fs/smb/server/mgmt/user_session.h b/fs/smb/server/mgmt/user_session.h
+index dc9fded2cd4379..c1c4b20bd5c6cf 100644
+--- a/fs/smb/server/mgmt/user_session.h
++++ b/fs/smb/server/mgmt/user_session.h
+@@ -61,6 +61,8 @@ struct ksmbd_session {
+ 	struct ksmbd_file_table		file_table;
+ 	unsigned long			last_active;
+ 	rwlock_t			tree_conns_lock;
++
++	atomic_t			refcnt;
+ };
+ 
+ static inline int test_session_flag(struct ksmbd_session *sess, int bit)
+@@ -104,4 +106,6 @@ void ksmbd_release_tree_conn_id(struct ksmbd_session *sess, int id);
+ int ksmbd_session_rpc_open(struct ksmbd_session *sess, char *rpc_name);
+ void ksmbd_session_rpc_close(struct ksmbd_session *sess, int id);
+ int ksmbd_session_rpc_method(struct ksmbd_session *sess, int id);
++void ksmbd_user_session_get(struct ksmbd_session *sess);
++void ksmbd_user_session_put(struct ksmbd_session *sess);
+ #endif /* __USER_SESSION_MANAGEMENT_H__ */
+diff --git a/fs/smb/server/server.c b/fs/smb/server/server.c
+index 2bbc3c3316f0ff..d5d85300560d03 100644
+--- a/fs/smb/server/server.c
++++ b/fs/smb/server/server.c
+@@ -238,6 +238,8 @@ static void __handle_ksmbd_work(struct ksmbd_work *work,
+ 	} while (is_chained == true);
+ 
+ send:
++	if (work->sess)
++		ksmbd_user_session_put(work->sess);
+ 	if (work->tcon)
+ 		ksmbd_tree_connect_put(work->tcon);
+ 	smb3_preauth_hash_rsp(work);
+diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
+index c6473b08b1f358..cac9eb4663aadc 100644
+--- a/fs/smb/server/smb2pdu.c
++++ b/fs/smb/server/smb2pdu.c
+@@ -605,8 +605,10 @@ int smb2_check_user_session(struct ksmbd_work *work)
+ 
+ 	/* Check for validity of user session */
+ 	work->sess = ksmbd_session_lookup_all(conn, sess_id);
+-	if (work->sess)
++	if (work->sess) {
++		ksmbd_user_session_get(work->sess);
+ 		return 1;
++	}
+ 	ksmbd_debug(SMB, "Invalid user session, Uid %llu\n", sess_id);
+ 	return -ENOENT;
+ }
+@@ -1743,6 +1745,7 @@ int smb2_sess_setup(struct ksmbd_work *work)
+ 		}
+ 
+ 		conn->binding = true;
++		ksmbd_user_session_get(sess);
+ 	} else if ((conn->dialect < SMB30_PROT_ID ||
+ 		    server_conf.flags & KSMBD_GLOBAL_FLAG_SMB3_MULTICHANNEL) &&
+ 		   (req->Flags & SMB2_SESSION_REQ_FLAG_BINDING)) {
+@@ -1769,6 +1772,7 @@ int smb2_sess_setup(struct ksmbd_work *work)
+ 		}
+ 
+ 		conn->binding = false;
++		ksmbd_user_session_get(sess);
+ 	}
+ 	work->sess = sess;
+ 
+@@ -2229,7 +2233,9 @@ int smb2_session_logoff(struct ksmbd_work *work)
+ 	}
+ 
+ 	ksmbd_destroy_file_table(&sess->file_table);
++	down_write(&conn->session_lock);
+ 	sess->state = SMB2_SESSION_EXPIRED;
++	up_write(&conn->session_lock);
+ 
+ 	ksmbd_free_user(sess->user);
+ 	sess->user = NULL;
+diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
+index 32d350e97e0f66..33edf047e0ad2f 100644
+--- a/fs/xfs/libxfs/xfs_attr.c
++++ b/fs/xfs/libxfs/xfs_attr.c
+@@ -1565,12 +1565,23 @@ xfs_attr_node_get(
+ 	return error;
+ }
+ 
++/* Enforce that there is at most one namespace bit per attr. */
++inline bool xfs_attr_check_namespace(unsigned int attr_flags)
++{
++	return hweight32(attr_flags & XFS_ATTR_NSP_ONDISK_MASK) < 2;
++}
++
+ /* Returns true if the attribute entry name is valid. */
+ bool
+ xfs_attr_namecheck(
++	unsigned int	attr_flags,
+ 	const void	*name,
+ 	size_t		length)
+ {
++	/* Only one namespace bit allowed. */
++	if (!xfs_attr_check_namespace(attr_flags))
++		return false;
++
+ 	/*
+ 	 * MAXNAMELEN includes the trailing null, but (name/length) leave it
+ 	 * out, so use >= for the length check.
+diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
+index 81be9b3e40047b..c877f05e3cd1a4 100644
+--- a/fs/xfs/libxfs/xfs_attr.h
++++ b/fs/xfs/libxfs/xfs_attr.h
+@@ -547,7 +547,9 @@ int xfs_attr_get(struct xfs_da_args *args);
+ int xfs_attr_set(struct xfs_da_args *args);
+ int xfs_attr_set_iter(struct xfs_attr_intent *attr);
+ int xfs_attr_remove_iter(struct xfs_attr_intent *attr);
+-bool xfs_attr_namecheck(const void *name, size_t length);
++bool xfs_attr_check_namespace(unsigned int attr_flags);
++bool xfs_attr_namecheck(unsigned int attr_flags, const void *name,
++		size_t length);
+ int xfs_attr_calc_size(struct xfs_da_args *args, int *local);
+ void xfs_init_attr_trans(struct xfs_da_args *args, struct xfs_trans_res *tres,
+ 			 unsigned int *total);
+diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c
+index 2580ae47209a6b..51ff4406867539 100644
+--- a/fs/xfs/libxfs/xfs_attr_leaf.c
++++ b/fs/xfs/libxfs/xfs_attr_leaf.c
+@@ -984,6 +984,10 @@ xfs_attr_shortform_to_leaf(
+ 		nargs.hashval = xfs_da_hashname(sfe->nameval,
+ 						sfe->namelen);
+ 		nargs.attr_filter = sfe->flags & XFS_ATTR_NSP_ONDISK_MASK;
++		if (!xfs_attr_check_namespace(sfe->flags)) {
++			error = -EFSCORRUPTED;
++			goto out;
++		}
+ 		error = xfs_attr3_leaf_lookup_int(bp, &nargs); /* set a->index */
+ 		ASSERT(error == -ENOATTR);
+ 		error = xfs_attr3_leaf_add(bp, &nargs);
+@@ -1105,7 +1109,7 @@ xfs_attr_shortform_verify(
+ 		 * one namespace flag per xattr, so we can just count the
+ 		 * bits (i.e. hweight) here.
+ 		 */
+-		if (hweight8(sfep->flags & XFS_ATTR_NSP_ONDISK_MASK) > 1)
++		if (!xfs_attr_check_namespace(sfep->flags))
+ 			return __this_address;
+ 
+ 		sfep = next_sfep;
+diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c
+index d440393b40eb8e..54de405cbab5ac 100644
+--- a/fs/xfs/libxfs/xfs_attr_remote.c
++++ b/fs/xfs/libxfs/xfs_attr_remote.c
+@@ -619,7 +619,6 @@ xfs_attr_rmtval_set_blk(
+ 	if (error)
+ 		return error;
+ 
+-	ASSERT(nmap == 1);
+ 	ASSERT((map->br_startblock != DELAYSTARTBLOCK) &&
+ 	       (map->br_startblock != HOLESTARTBLOCK));
+ 
+diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
+index 48f0d0698ec438..e6ea35098e07f8 100644
+--- a/fs/xfs/libxfs/xfs_bmap.c
++++ b/fs/xfs/libxfs/xfs_bmap.c
+@@ -1549,6 +1549,7 @@ xfs_bmap_add_extent_delay_real(
+ 			if (error)
+ 				goto done;
+ 		}
++		ASSERT(da_new <= da_old);
+ 		break;
+ 
+ 	case BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING | BMAP_LEFT_CONTIG:
+@@ -1578,6 +1579,7 @@ xfs_bmap_add_extent_delay_real(
+ 			if (error)
+ 				goto done;
+ 		}
++		ASSERT(da_new <= da_old);
+ 		break;
+ 
+ 	case BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING | BMAP_RIGHT_CONTIG:
+@@ -1611,6 +1613,7 @@ xfs_bmap_add_extent_delay_real(
+ 			if (error)
+ 				goto done;
+ 		}
++		ASSERT(da_new <= da_old);
+ 		break;
+ 
+ 	case BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING:
+@@ -1643,6 +1646,7 @@ xfs_bmap_add_extent_delay_real(
+ 				goto done;
+ 			}
+ 		}
++		ASSERT(da_new <= da_old);
+ 		break;
+ 
+ 	case BMAP_LEFT_FILLING | BMAP_LEFT_CONTIG:
+@@ -1680,6 +1684,7 @@ xfs_bmap_add_extent_delay_real(
+ 			if (error)
+ 				goto done;
+ 		}
++		ASSERT(da_new <= da_old);
+ 		break;
+ 
+ 	case BMAP_LEFT_FILLING:
+@@ -1767,6 +1772,7 @@ xfs_bmap_add_extent_delay_real(
+ 		xfs_iext_update_extent(bma->ip, state, &bma->icur, &PREV);
+ 		xfs_iext_next(ifp, &bma->icur);
+ 		xfs_iext_update_extent(bma->ip, state, &bma->icur, &RIGHT);
++		ASSERT(da_new <= da_old);
+ 		break;
+ 
+ 	case BMAP_RIGHT_FILLING:
+@@ -1814,6 +1820,7 @@ xfs_bmap_add_extent_delay_real(
+ 		PREV.br_blockcount = temp;
+ 		xfs_iext_insert(bma->ip, &bma->icur, &PREV, state);
+ 		xfs_iext_next(ifp, &bma->icur);
++		ASSERT(da_new <= da_old);
+ 		break;
+ 
+ 	case 0:
+@@ -1934,11 +1941,9 @@ xfs_bmap_add_extent_delay_real(
+ 	}
+ 
+ 	/* adjust for changes in reserved delayed indirect blocks */
+-	if (da_new != da_old) {
+-		ASSERT(state == 0 || da_new < da_old);
++	if (da_new != da_old)
+ 		error = xfs_mod_fdblocks(mp, (int64_t)(da_old - da_new),
+-				false);
+-	}
++				true);
+ 
+ 	xfs_bmap_check_leaf_extents(bma->cur, bma->ip, whichfork);
+ done:
+@@ -3969,20 +3974,32 @@ xfs_bmapi_reserve_delalloc(
+ 	xfs_extlen_t		alen;
+ 	xfs_extlen_t		indlen;
+ 	int			error;
+-	xfs_fileoff_t		aoff = off;
++	xfs_fileoff_t		aoff;
++	bool			use_cowextszhint =
++					whichfork == XFS_COW_FORK && !prealloc;
+ 
++retry:
+ 	/*
+ 	 * Cap the alloc length. Keep track of prealloc so we know whether to
+ 	 * tag the inode before we return.
+ 	 */
++	aoff = off;
+ 	alen = XFS_FILBLKS_MIN(len + prealloc, XFS_MAX_BMBT_EXTLEN);
+ 	if (!eof)
+ 		alen = XFS_FILBLKS_MIN(alen, got->br_startoff - aoff);
+ 	if (prealloc && alen >= len)
+ 		prealloc = alen - len;
+ 
+-	/* Figure out the extent size, adjust alen */
+-	if (whichfork == XFS_COW_FORK) {
++	/*
++	 * If we're targetting the COW fork but aren't creating a speculative
++	 * posteof preallocation, try to expand the reservation to align with
++	 * the COW extent size hint if there's sufficient free space.
++	 *
++	 * Unlike the data fork, the CoW cancellation functions will free all
++	 * the reservations at inactivation, so we don't require that every
++	 * delalloc reservation have a dirty pagecache.
++	 */
++	if (use_cowextszhint) {
+ 		struct xfs_bmbt_irec	prev;
+ 		xfs_extlen_t		extsz = xfs_get_cowextsz_hint(ip);
+ 
+@@ -4001,7 +4018,7 @@ xfs_bmapi_reserve_delalloc(
+ 	 */
+ 	error = xfs_quota_reserve_blkres(ip, alen);
+ 	if (error)
+-		return error;
++		goto out;
+ 
+ 	/*
+ 	 * Split changing sb for alen and indlen since they could be coming
+@@ -4046,6 +4063,17 @@ xfs_bmapi_reserve_delalloc(
+ out_unreserve_quota:
+ 	if (XFS_IS_QUOTA_ON(mp))
+ 		xfs_quota_unreserve_blkres(ip, alen);
++out:
++	if (error == -ENOSPC || error == -EDQUOT) {
++		trace_xfs_delalloc_enospc(ip, off, len);
++
++		if (prealloc || use_cowextszhint) {
++			/* retry without any preallocation */
++			use_cowextszhint = false;
++			prealloc = 0;
++			goto retry;
++		}
++	}
+ 	return error;
+ }
+ 
+@@ -4128,8 +4156,10 @@ xfs_bmapi_allocate(
+ 	} else {
+ 		error = xfs_bmap_alloc_userdata(bma);
+ 	}
+-	if (error || bma->blkno == NULLFSBLOCK)
++	if (error)
+ 		return error;
++	if (bma->blkno == NULLFSBLOCK)
++		return -ENOSPC;
+ 
+ 	if (bma->flags & XFS_BMAPI_ZERO) {
+ 		error = xfs_zero_extent(bma->ip, bma->blkno, bma->length);
+@@ -4309,6 +4339,15 @@ xfs_bmapi_finish(
+  * extent state if necessary.  Details behaviour is controlled by the flags
+  * parameter.  Only allocates blocks from a single allocation group, to avoid
+  * locking problems.
++ *
++ * Returns 0 on success and places the extent mappings in mval.  nmaps is used
++ * as an input/output parameter where the caller specifies the maximum number
++ * of mappings that may be returned and xfs_bmapi_write passes back the number
++ * of mappings (including existing mappings) it found.
++ *
++ * Returns a negative error code on failure, including -ENOSPC when it could not
++ * allocate any blocks and -ENOSR when it did allocate blocks to convert a
++ * delalloc range, but those blocks were before the passed in range.
+  */
+ int
+ xfs_bmapi_write(
+@@ -4436,10 +4475,16 @@ xfs_bmapi_write(
+ 			ASSERT(len > 0);
+ 			ASSERT(bma.length > 0);
+ 			error = xfs_bmapi_allocate(&bma);
+-			if (error)
++			if (error) {
++				/*
++				 * If we already allocated space in a previous
++				 * iteration return what we go so far when
++				 * running out of space.
++				 */
++				if (error == -ENOSPC && bma.nallocs)
++					break;
+ 				goto error0;
+-			if (bma.blkno == NULLFSBLOCK)
+-				break;
++			}
+ 
+ 			/*
+ 			 * If this is a CoW allocation, record the data in
+@@ -4477,7 +4522,6 @@ xfs_bmapi_write(
+ 		if (!xfs_iext_next_extent(ifp, &bma.icur, &bma.got))
+ 			eof = true;
+ 	}
+-	*nmap = n;
+ 
+ 	error = xfs_bmap_btree_to_extents(tp, ip, bma.cur, &bma.logflags,
+ 			whichfork);
+@@ -4488,7 +4532,22 @@ xfs_bmapi_write(
+ 	       ifp->if_nextents > XFS_IFORK_MAXEXT(ip, whichfork));
+ 	xfs_bmapi_finish(&bma, whichfork, 0);
+ 	xfs_bmap_validate_ret(orig_bno, orig_len, orig_flags, orig_mval,
+-		orig_nmap, *nmap);
++		orig_nmap, n);
++
++	/*
++	 * When converting delayed allocations, xfs_bmapi_allocate ignores
++	 * the passed in bno and always converts from the start of the found
++	 * delalloc extent.
++	 *
++	 * To avoid a successful return with *nmap set to 0, return the magic
++	 * -ENOSR error code for this particular case so that the caller can
++	 * handle it.
++	 */
++	if (!n) {
++		ASSERT(bma.nallocs >= *nmap);
++		return -ENOSR;
++	}
++	*nmap = n;
+ 	return 0;
+ error0:
+ 	xfs_bmapi_finish(&bma, whichfork, error);
+@@ -4501,8 +4560,8 @@ xfs_bmapi_write(
+  * invocations to allocate the target offset if a large enough physical extent
+  * is not available.
+  */
+-int
+-xfs_bmapi_convert_delalloc(
++static int
++xfs_bmapi_convert_one_delalloc(
+ 	struct xfs_inode	*ip,
+ 	int			whichfork,
+ 	xfs_off_t		offset,
+@@ -4559,7 +4618,8 @@ xfs_bmapi_convert_delalloc(
+ 	if (!isnullstartblock(bma.got.br_startblock)) {
+ 		xfs_bmbt_to_iomap(ip, iomap, &bma.got, 0, flags,
+ 				xfs_iomap_inode_sequence(ip, flags));
+-		*seq = READ_ONCE(ifp->if_seq);
++		if (seq)
++			*seq = READ_ONCE(ifp->if_seq);
+ 		goto out_trans_cancel;
+ 	}
+ 
+@@ -4595,9 +4655,6 @@ xfs_bmapi_convert_delalloc(
+ 	if (error)
+ 		goto out_finish;
+ 
+-	error = -ENOSPC;
+-	if (WARN_ON_ONCE(bma.blkno == NULLFSBLOCK))
+-		goto out_finish;
+ 	error = -EFSCORRUPTED;
+ 	if (WARN_ON_ONCE(!xfs_valid_startblock(ip, bma.got.br_startblock)))
+ 		goto out_finish;
+@@ -4608,7 +4665,8 @@ xfs_bmapi_convert_delalloc(
+ 	ASSERT(!isnullstartblock(bma.got.br_startblock));
+ 	xfs_bmbt_to_iomap(ip, iomap, &bma.got, 0, flags,
+ 				xfs_iomap_inode_sequence(ip, flags));
+-	*seq = READ_ONCE(ifp->if_seq);
++	if (seq)
++		*seq = READ_ONCE(ifp->if_seq);
+ 
+ 	if (whichfork == XFS_COW_FORK)
+ 		xfs_refcount_alloc_cow_extent(tp, bma.blkno, bma.length);
+@@ -4631,6 +4689,36 @@ xfs_bmapi_convert_delalloc(
+ 	return error;
+ }
+ 
++/*
++ * Pass in a dellalloc extent and convert it to real extents, return the real
++ * extent that maps offset_fsb in iomap.
++ */
++int
++xfs_bmapi_convert_delalloc(
++	struct xfs_inode	*ip,
++	int			whichfork,
++	loff_t			offset,
++	struct iomap		*iomap,
++	unsigned int		*seq)
++{
++	int			error;
++
++	/*
++	 * Attempt to allocate whatever delalloc extent currently backs offset
++	 * and put the result into iomap.  Allocate in a loop because it may
++	 * take several attempts to allocate real blocks for a contiguous
++	 * delalloc extent if free space is sufficiently fragmented.
++	 */
++	do {
++		error = xfs_bmapi_convert_one_delalloc(ip, whichfork, offset,
++					iomap, seq);
++		if (error)
++			return error;
++	} while (iomap->offset + iomap->length <= offset);
++
++	return 0;
++}
++
+ int
+ xfs_bmapi_remap(
+ 	struct xfs_trans	*tp,
+diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c
+index 282c7cf032f406..12e3cca804b7ec 100644
+--- a/fs/xfs/libxfs/xfs_da_btree.c
++++ b/fs/xfs/libxfs/xfs_da_btree.c
+@@ -2158,8 +2158,8 @@ xfs_da_grow_inode_int(
+ 	struct xfs_inode	*dp = args->dp;
+ 	int			w = args->whichfork;
+ 	xfs_rfsblock_t		nblks = dp->i_nblocks;
+-	struct xfs_bmbt_irec	map, *mapp;
+-	int			nmap, error, got, i, mapi;
++	struct xfs_bmbt_irec	map, *mapp = &map;
++	int			nmap, error, got, i, mapi = 1;
+ 
+ 	/*
+ 	 * Find a spot in the file space to put the new block.
+@@ -2175,14 +2175,7 @@ xfs_da_grow_inode_int(
+ 	error = xfs_bmapi_write(tp, dp, *bno, count,
+ 			xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA|XFS_BMAPI_CONTIG,
+ 			args->total, &map, &nmap);
+-	if (error)
+-		return error;
+-
+-	ASSERT(nmap <= 1);
+-	if (nmap == 1) {
+-		mapp = &map;
+-		mapi = 1;
+-	} else if (nmap == 0 && count > 1) {
++	if (error == -ENOSPC && count > 1) {
+ 		xfs_fileoff_t		b;
+ 		int			c;
+ 
+@@ -2199,16 +2192,13 @@ xfs_da_grow_inode_int(
+ 					args->total, &mapp[mapi], &nmap);
+ 			if (error)
+ 				goto out_free_map;
+-			if (nmap < 1)
+-				break;
+ 			mapi += nmap;
+ 			b = mapp[mapi - 1].br_startoff +
+ 			    mapp[mapi - 1].br_blockcount;
+ 		}
+-	} else {
+-		mapi = 0;
+-		mapp = NULL;
+ 	}
++	if (error)
++		goto out_free_map;
+ 
+ 	/*
+ 	 * Count the blocks we got, make sure it matches the total.
+diff --git a/fs/xfs/libxfs/xfs_da_format.h b/fs/xfs/libxfs/xfs_da_format.h
+index f9015f88eca706..ebcb9066398f47 100644
+--- a/fs/xfs/libxfs/xfs_da_format.h
++++ b/fs/xfs/libxfs/xfs_da_format.h
+@@ -703,8 +703,13 @@ struct xfs_attr3_leafblock {
+ #define XFS_ATTR_ROOT		(1u << XFS_ATTR_ROOT_BIT)
+ #define XFS_ATTR_SECURE		(1u << XFS_ATTR_SECURE_BIT)
+ #define XFS_ATTR_INCOMPLETE	(1u << XFS_ATTR_INCOMPLETE_BIT)
++
+ #define XFS_ATTR_NSP_ONDISK_MASK	(XFS_ATTR_ROOT | XFS_ATTR_SECURE)
+ 
++#define XFS_ATTR_ONDISK_MASK	(XFS_ATTR_NSP_ONDISK_MASK | \
++				 XFS_ATTR_LOCAL | \
++				 XFS_ATTR_INCOMPLETE)
++
+ /*
+  * Alignment for namelist and valuelist entries (since they are mixed
+  * there can be only one alignment value)
+diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
+index 0f970a0b33824c..423d39b6b91744 100644
+--- a/fs/xfs/libxfs/xfs_inode_buf.c
++++ b/fs/xfs/libxfs/xfs_inode_buf.c
+@@ -366,17 +366,40 @@ xfs_dinode_verify_fork(
+ 	/*
+ 	 * For fork types that can contain local data, check that the fork
+ 	 * format matches the size of local data contained within the fork.
+-	 *
+-	 * For all types, check that when the size says the should be in extent
+-	 * or btree format, the inode isn't claiming it is in local format.
+ 	 */
+ 	if (whichfork == XFS_DATA_FORK) {
+-		if (S_ISDIR(mode) || S_ISLNK(mode)) {
++		/*
++		 * A directory small enough to fit in the inode must be stored
++		 * in local format.  The directory sf <-> extents conversion
++		 * code updates the directory size accordingly.  Directories
++		 * being truncated have zero size and are not subject to this
++		 * check.
++		 */
++		if (S_ISDIR(mode)) {
++			if (dip->di_size &&
++			    be64_to_cpu(dip->di_size) <= fork_size &&
++			    fork_format != XFS_DINODE_FMT_LOCAL)
++				return __this_address;
++		}
++
++		/*
++		 * A symlink with a target small enough to fit in the inode can
++		 * be stored in extents format if xattrs were added (thus
++		 * converting the data fork from shortform to remote format)
++		 * and then removed.
++		 */
++		if (S_ISLNK(mode)) {
+ 			if (be64_to_cpu(dip->di_size) <= fork_size &&
++			    fork_format != XFS_DINODE_FMT_EXTENTS &&
+ 			    fork_format != XFS_DINODE_FMT_LOCAL)
+ 				return __this_address;
+ 		}
+ 
++		/*
++		 * For all types, check that when the size says the fork should
++		 * be in extent or btree format, the inode isn't claiming to be
++		 * in local format.
++		 */
+ 		if (be64_to_cpu(dip->di_size) > fork_size &&
+ 		    fork_format == XFS_DINODE_FMT_LOCAL)
+ 			return __this_address;
+@@ -492,9 +515,19 @@ xfs_dinode_verify(
+ 	if (mode && xfs_mode_to_ftype(mode) == XFS_DIR3_FT_UNKNOWN)
+ 		return __this_address;
+ 
+-	/* No zero-length symlinks/dirs. */
+-	if ((S_ISLNK(mode) || S_ISDIR(mode)) && di_size == 0)
+-		return __this_address;
++	/*
++	 * No zero-length symlinks/dirs unless they're unlinked and hence being
++	 * inactivated.
++	 */
++	if ((S_ISLNK(mode) || S_ISDIR(mode)) && di_size == 0) {
++		if (dip->di_version > 1) {
++			if (dip->di_nlink)
++				return __this_address;
++		} else {
++			if (dip->di_onlink)
++				return __this_address;
++		}
++	}
+ 
+ 	fa = xfs_dinode_verify_nrext64(mp, dip);
+ 	if (fa)
+diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c
+index 59c4804e4d790a..424acdd4b0fca4 100644
+--- a/fs/xfs/libxfs/xfs_sb.c
++++ b/fs/xfs/libxfs/xfs_sb.c
+@@ -1031,11 +1031,12 @@ xfs_log_sb(
+ 	 * and hence we don't need have to update it here.
+ 	 */
+ 	if (xfs_has_lazysbcount(mp)) {
+-		mp->m_sb.sb_icount = percpu_counter_sum(&mp->m_icount);
++		mp->m_sb.sb_icount = percpu_counter_sum_positive(&mp->m_icount);
+ 		mp->m_sb.sb_ifree = min_t(uint64_t,
+-				percpu_counter_sum(&mp->m_ifree),
++				percpu_counter_sum_positive(&mp->m_ifree),
+ 				mp->m_sb.sb_icount);
+-		mp->m_sb.sb_fdblocks = percpu_counter_sum(&mp->m_fdblocks);
++		mp->m_sb.sb_fdblocks =
++				percpu_counter_sum_positive(&mp->m_fdblocks);
+ 	}
+ 
+ 	xfs_sb_to_disk(bp->b_addr, &mp->m_sb);
+diff --git a/fs/xfs/scrub/attr.c b/fs/xfs/scrub/attr.c
+index 6c16d9530ccaca..147babe738d201 100644
+--- a/fs/xfs/scrub/attr.c
++++ b/fs/xfs/scrub/attr.c
+@@ -182,32 +182,23 @@ xchk_xattr_listent(
+ 		return;
+ 	}
+ 
++	if (flags & ~XFS_ATTR_ONDISK_MASK) {
++		xchk_fblock_set_corrupt(sx->sc, XFS_ATTR_FORK, args.blkno);
++		goto fail_xref;
++	}
++
+ 	if (flags & XFS_ATTR_INCOMPLETE) {
+ 		/* Incomplete attr key, just mark the inode for preening. */
+ 		xchk_ino_set_preen(sx->sc, context->dp->i_ino);
+ 		return;
+ 	}
+ 
+-	/* Only one namespace bit allowed. */
+-	if (hweight32(flags & XFS_ATTR_NSP_ONDISK_MASK) > 1) {
+-		xchk_fblock_set_corrupt(sx->sc, XFS_ATTR_FORK, args.blkno);
+-		goto fail_xref;
+-	}
+-
+ 	/* Does this name make sense? */
+-	if (!xfs_attr_namecheck(name, namelen)) {
++	if (!xfs_attr_namecheck(flags, name, namelen)) {
+ 		xchk_fblock_set_corrupt(sx->sc, XFS_ATTR_FORK, args.blkno);
+ 		goto fail_xref;
+ 	}
+ 
+-	/*
+-	 * Local xattr values are stored in the attr leaf block, so we don't
+-	 * need to retrieve the value from a remote block to detect corruption
+-	 * problems.
+-	 */
+-	if (flags & XFS_ATTR_LOCAL)
+-		goto fail_xref;
+-
+ 	/*
+ 	 * Try to allocate enough memory to extrat the attr value.  If that
+ 	 * doesn't work, we overload the seen_enough variable to convey
+@@ -223,6 +214,11 @@ xchk_xattr_listent(
+ 
+ 	args.value = ab->value;
+ 
++	/*
++	 * Get the attr value to ensure that lookup can find this attribute
++	 * through the dabtree indexing and that remote value retrieval also
++	 * works correctly.
++	 */
+ 	error = xfs_attr_get_ilocked(&args);
+ 	/* ENODATA means the hash lookup failed and the attr is bad */
+ 	if (error == -ENODATA)
+@@ -463,7 +459,6 @@ xchk_xattr_rec(
+ 	xfs_dahash_t			hash;
+ 	int				nameidx;
+ 	int				hdrsize;
+-	unsigned int			badflags;
+ 	int				error;
+ 
+ 	ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC);
+@@ -493,10 +488,15 @@ xchk_xattr_rec(
+ 
+ 	/* Retrieve the entry and check it. */
+ 	hash = be32_to_cpu(ent->hashval);
+-	badflags = ~(XFS_ATTR_LOCAL | XFS_ATTR_ROOT | XFS_ATTR_SECURE |
+-			XFS_ATTR_INCOMPLETE);
+-	if ((ent->flags & badflags) != 0)
++	if (ent->flags & ~XFS_ATTR_ONDISK_MASK) {
++		xchk_da_set_corrupt(ds, level);
++		return 0;
++	}
++	if (!xfs_attr_check_namespace(ent->flags)) {
+ 		xchk_da_set_corrupt(ds, level);
++		return 0;
++	}
++
+ 	if (ent->flags & XFS_ATTR_LOCAL) {
+ 		lentry = (struct xfs_attr_leaf_name_local *)
+ 				(((char *)bp->b_addr) + nameidx);
+@@ -561,6 +561,15 @@ xchk_xattr_check_sf(
+ 			break;
+ 		}
+ 
++		/*
++		 * Shortform entries do not set LOCAL or INCOMPLETE, so the
++		 * only valid flag bits here are for namespaces.
++		 */
++		if (sfe->flags & ~XFS_ATTR_NSP_ONDISK_MASK) {
++			xchk_fblock_set_corrupt(sc, XFS_ATTR_FORK, 0);
++			break;
++		}
++
+ 		if (!xchk_xattr_set_map(sc, ab->usedmap,
+ 				(char *)sfe - (char *)sf,
+ 				sizeof(struct xfs_attr_sf_entry))) {
+diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c
+index 08e29248526881..f10cd4fb0abd0d 100644
+--- a/fs/xfs/scrub/common.c
++++ b/fs/xfs/scrub/common.c
+@@ -735,7 +735,7 @@ xchk_iget(
+ {
+ 	ASSERT(sc->tp != NULL);
+ 
+-	return xfs_iget(sc->mp, sc->tp, inum, XFS_IGET_UNTRUSTED, 0, ipp);
++	return xfs_iget(sc->mp, sc->tp, inum, XCHK_IGET_FLAGS, 0, ipp);
+ }
+ 
+ /*
+@@ -786,8 +786,8 @@ xchk_iget_agi(
+ 	if (error)
+ 		return error;
+ 
+-	error = xfs_iget(mp, tp, inum,
+-			XFS_IGET_NORETRY | XFS_IGET_UNTRUSTED, 0, ipp);
++	error = xfs_iget(mp, tp, inum, XFS_IGET_NORETRY | XCHK_IGET_FLAGS, 0,
++			ipp);
+ 	if (error == -EAGAIN) {
+ 		/*
+ 		 * The inode may be in core but temporarily unavailable and may
+@@ -994,12 +994,6 @@ xchk_irele(
+ 		spin_lock(&VFS_I(ip)->i_lock);
+ 		VFS_I(ip)->i_state &= ~I_DONTCACHE;
+ 		spin_unlock(&VFS_I(ip)->i_lock);
+-	} else if (atomic_read(&VFS_I(ip)->i_count) == 1) {
+-		/*
+-		 * If this is the last reference to the inode and the caller
+-		 * permits it, set DONTCACHE to avoid thrashing.
+-		 */
+-		d_mark_dontcache(VFS_I(ip));
+ 	}
+ 
+ 	xfs_irele(ip);
+diff --git a/fs/xfs/scrub/scrub.h b/fs/xfs/scrub/scrub.h
+index 1ef9c6b4842a13..869a10fe9d7d77 100644
+--- a/fs/xfs/scrub/scrub.h
++++ b/fs/xfs/scrub/scrub.h
+@@ -17,6 +17,13 @@ struct xfs_scrub;
+ #define XCHK_GFP_FLAGS	((__force gfp_t)(GFP_KERNEL | __GFP_NOWARN | \
+ 					 __GFP_RETRY_MAYFAIL))
+ 
++/*
++ * For opening files by handle for fsck operations, we don't trust the inumber
++ * or the allocation state; therefore, perform an untrusted lookup.  We don't
++ * want these inodes to pollute the cache, so mark them for immediate removal.
++ */
++#define XCHK_IGET_FLAGS	(XFS_IGET_UNTRUSTED | XFS_IGET_DONTCACHE)
++
+ /* Type info and names for the scrub types. */
+ enum xchk_type {
+ 	ST_NONE = 1,	/* disabled */
+diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
+index e74097e58097b9..688ac031d3a1c0 100644
+--- a/fs/xfs/xfs_aops.c
++++ b/fs/xfs/xfs_aops.c
+@@ -233,45 +233,6 @@ xfs_imap_valid(
+ 	return true;
+ }
+ 
+-/*
+- * Pass in a dellalloc extent and convert it to real extents, return the real
+- * extent that maps offset_fsb in wpc->iomap.
+- *
+- * The current page is held locked so nothing could have removed the block
+- * backing offset_fsb, although it could have moved from the COW to the data
+- * fork by another thread.
+- */
+-static int
+-xfs_convert_blocks(
+-	struct iomap_writepage_ctx *wpc,
+-	struct xfs_inode	*ip,
+-	int			whichfork,
+-	loff_t			offset)
+-{
+-	int			error;
+-	unsigned		*seq;
+-
+-	if (whichfork == XFS_COW_FORK)
+-		seq = &XFS_WPC(wpc)->cow_seq;
+-	else
+-		seq = &XFS_WPC(wpc)->data_seq;
+-
+-	/*
+-	 * Attempt to allocate whatever delalloc extent currently backs offset
+-	 * and put the result into wpc->iomap.  Allocate in a loop because it
+-	 * may take several attempts to allocate real blocks for a contiguous
+-	 * delalloc extent if free space is sufficiently fragmented.
+-	 */
+-	do {
+-		error = xfs_bmapi_convert_delalloc(ip, whichfork, offset,
+-				&wpc->iomap, seq);
+-		if (error)
+-			return error;
+-	} while (wpc->iomap.offset + wpc->iomap.length <= offset);
+-
+-	return 0;
+-}
+-
+ static int
+ xfs_map_blocks(
+ 	struct iomap_writepage_ctx *wpc,
+@@ -289,6 +250,7 @@ xfs_map_blocks(
+ 	struct xfs_iext_cursor	icur;
+ 	int			retries = 0;
+ 	int			error = 0;
++	unsigned int		*seq;
+ 
+ 	if (xfs_is_shutdown(mp))
+ 		return -EIO;
+@@ -386,7 +348,19 @@ xfs_map_blocks(
+ 	trace_xfs_map_blocks_found(ip, offset, count, whichfork, &imap);
+ 	return 0;
+ allocate_blocks:
+-	error = xfs_convert_blocks(wpc, ip, whichfork, offset);
++	/*
++	 * Convert a dellalloc extent to a real one. The current page is held
++	 * locked so nothing could have removed the block backing offset_fsb,
++	 * although it could have moved from the COW to the data fork by another
++	 * thread.
++	 */
++	if (whichfork == XFS_COW_FORK)
++		seq = &XFS_WPC(wpc)->cow_seq;
++	else
++		seq = &XFS_WPC(wpc)->data_seq;
++
++	error = xfs_bmapi_convert_delalloc(ip, whichfork, offset,
++				&wpc->iomap, seq);
+ 	if (error) {
+ 		/*
+ 		 * If we failed to find the extent in the COW fork we might have
+diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
+index 82775e9537df8b..df86c9c097209e 100644
+--- a/fs/xfs/xfs_attr_item.c
++++ b/fs/xfs/xfs_attr_item.c
+@@ -510,6 +510,9 @@ xfs_attri_validate(
+ 	unsigned int			op = attrp->alfi_op_flags &
+ 					     XFS_ATTRI_OP_FLAGS_TYPE_MASK;
+ 
++	if (!xfs_sb_version_haslogxattrs(&mp->m_sb))
++		return false;
++
+ 	if (attrp->__pad != 0)
+ 		return false;
+ 
+@@ -519,6 +522,10 @@ xfs_attri_validate(
+ 	if (attrp->alfi_attr_filter & ~XFS_ATTRI_FILTER_MASK)
+ 		return false;
+ 
++	if (!xfs_attr_check_namespace(attrp->alfi_attr_filter &
++				      XFS_ATTR_NSP_ONDISK_MASK))
++		return false;
++
+ 	/* alfi_op_flags should be either a set or remove */
+ 	switch (op) {
+ 	case XFS_ATTRI_OP_FLAGS_SET:
+@@ -569,7 +576,8 @@ xfs_attri_item_recover(
+ 	 */
+ 	attrp = &attrip->attri_format;
+ 	if (!xfs_attri_validate(mp, attrp) ||
+-	    !xfs_attr_namecheck(nv->name.i_addr, nv->name.i_len))
++	    !xfs_attr_namecheck(attrp->alfi_attr_filter, nv->name.i_addr,
++				nv->name.i_len))
+ 		return -EFSCORRUPTED;
+ 
+ 	error = xlog_recover_iget(mp,  attrp->alfi_ino, &ip);
+@@ -602,8 +610,6 @@ xfs_attri_item_recover(
+ 	args->op_flags = XFS_DA_OP_RECOVERY | XFS_DA_OP_OKNOENT |
+ 			 XFS_DA_OP_LOGGED;
+ 
+-	ASSERT(xfs_sb_version_haslogxattrs(&mp->m_sb));
+-
+ 	switch (attr->xattri_op_flags) {
+ 	case XFS_ATTRI_OP_FLAGS_SET:
+ 	case XFS_ATTRI_OP_FLAGS_REPLACE:
+@@ -718,48 +724,112 @@ xlog_recover_attri_commit_pass2(
+ 	const void			*attr_value = NULL;
+ 	const void			*attr_name;
+ 	size_t				len;
+-
+-	attri_formatp = item->ri_buf[0].i_addr;
+-	attr_name = item->ri_buf[1].i_addr;
++	unsigned int			op, i = 0;
+ 
+ 	/* Validate xfs_attri_log_format before the large memory allocation */
+ 	len = sizeof(struct xfs_attri_log_format);
+-	if (item->ri_buf[0].i_len != len) {
++	if (item->ri_buf[i].i_len != len) {
+ 		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
+ 				item->ri_buf[0].i_addr, item->ri_buf[0].i_len);
+ 		return -EFSCORRUPTED;
+ 	}
+ 
++	attri_formatp = item->ri_buf[i].i_addr;
+ 	if (!xfs_attri_validate(mp, attri_formatp)) {
+ 		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
+-				item->ri_buf[0].i_addr, item->ri_buf[0].i_len);
++				attri_formatp, len);
++		return -EFSCORRUPTED;
++	}
++
++	/* Check the number of log iovecs makes sense for the op code. */
++	op = attri_formatp->alfi_op_flags & XFS_ATTRI_OP_FLAGS_TYPE_MASK;
++	switch (op) {
++	case XFS_ATTRI_OP_FLAGS_SET:
++	case XFS_ATTRI_OP_FLAGS_REPLACE:
++		/* Log item, attr name, attr value */
++		if (item->ri_total != 3) {
++			XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
++					     attri_formatp, len);
++			return -EFSCORRUPTED;
++		}
++		break;
++	case XFS_ATTRI_OP_FLAGS_REMOVE:
++		/* Log item, attr name */
++		if (item->ri_total != 2) {
++			XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
++					     attri_formatp, len);
++			return -EFSCORRUPTED;
++		}
++		break;
++	default:
++		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
++				     attri_formatp, len);
+ 		return -EFSCORRUPTED;
+ 	}
++	i++;
+ 
+ 	/* Validate the attr name */
+-	if (item->ri_buf[1].i_len !=
++	if (item->ri_buf[i].i_len !=
+ 			xlog_calc_iovec_len(attri_formatp->alfi_name_len)) {
+ 		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
+-				item->ri_buf[0].i_addr, item->ri_buf[0].i_len);
++				attri_formatp, len);
+ 		return -EFSCORRUPTED;
+ 	}
+ 
+-	if (!xfs_attr_namecheck(attr_name, attri_formatp->alfi_name_len)) {
++	attr_name = item->ri_buf[i].i_addr;
++	if (!xfs_attr_namecheck(attri_formatp->alfi_attr_filter, attr_name,
++				attri_formatp->alfi_name_len)) {
+ 		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
+-				item->ri_buf[1].i_addr, item->ri_buf[1].i_len);
++				attri_formatp, len);
+ 		return -EFSCORRUPTED;
+ 	}
++	i++;
+ 
+ 	/* Validate the attr value, if present */
+ 	if (attri_formatp->alfi_value_len != 0) {
+-		if (item->ri_buf[2].i_len != xlog_calc_iovec_len(attri_formatp->alfi_value_len)) {
++		if (item->ri_buf[i].i_len != xlog_calc_iovec_len(attri_formatp->alfi_value_len)) {
+ 			XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
+ 					item->ri_buf[0].i_addr,
+ 					item->ri_buf[0].i_len);
+ 			return -EFSCORRUPTED;
+ 		}
+ 
+-		attr_value = item->ri_buf[2].i_addr;
++		attr_value = item->ri_buf[i].i_addr;
++		i++;
++	}
++
++	/*
++	 * Make sure we got the correct number of buffers for the operation
++	 * that we just loaded.
++	 */
++	if (i != item->ri_total) {
++		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
++				attri_formatp, len);
++		return -EFSCORRUPTED;
++	}
++
++	switch (op) {
++	case XFS_ATTRI_OP_FLAGS_REMOVE:
++		/* Regular remove operations operate only on names. */
++		if (attr_value != NULL || attri_formatp->alfi_value_len != 0) {
++			XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
++					     attri_formatp, len);
++			return -EFSCORRUPTED;
++		}
++		fallthrough;
++	case XFS_ATTRI_OP_FLAGS_SET:
++	case XFS_ATTRI_OP_FLAGS_REPLACE:
++		/*
++		 * Regular xattr set/remove/replace operations require a name
++		 * and do not take a newname.  Values are optional for set and
++		 * replace.
++		 */
++		if (attr_name == NULL || attri_formatp->alfi_name_len == 0) {
++			XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
++					     attri_formatp, len);
++			return -EFSCORRUPTED;
++		}
++		break;
+ 	}
+ 
+ 	/*
+diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
+index 99bbbe1a0e4478..9ee1d7d2ba76c2 100644
+--- a/fs/xfs/xfs_attr_list.c
++++ b/fs/xfs/xfs_attr_list.c
+@@ -82,7 +82,8 @@ xfs_attr_shortform_list(
+ 	     (dp->i_af.if_bytes + sf->hdr.count * 16) < context->bufsize)) {
+ 		for (i = 0, sfe = &sf->list[0]; i < sf->hdr.count; i++) {
+ 			if (XFS_IS_CORRUPT(context->dp->i_mount,
+-					   !xfs_attr_namecheck(sfe->nameval,
++					   !xfs_attr_namecheck(sfe->flags,
++							       sfe->nameval,
+ 							       sfe->namelen)))
+ 				return -EFSCORRUPTED;
+ 			context->put_listent(context,
+@@ -120,7 +121,8 @@ xfs_attr_shortform_list(
+ 	for (i = 0, sfe = &sf->list[0]; i < sf->hdr.count; i++) {
+ 		if (unlikely(
+ 		    ((char *)sfe < (char *)sf) ||
+-		    ((char *)sfe >= ((char *)sf + dp->i_af.if_bytes)))) {
++		    ((char *)sfe >= ((char *)sf + dp->i_af.if_bytes)) ||
++		    !xfs_attr_check_namespace(sfe->flags))) {
+ 			XFS_CORRUPTION_ERROR("xfs_attr_shortform_list",
+ 					     XFS_ERRLEVEL_LOW,
+ 					     context->dp->i_mount, sfe,
+@@ -174,7 +176,7 @@ xfs_attr_shortform_list(
+ 			cursor->offset = 0;
+ 		}
+ 		if (XFS_IS_CORRUPT(context->dp->i_mount,
+-				   !xfs_attr_namecheck(sbp->name,
++				   !xfs_attr_namecheck(sbp->flags, sbp->name,
+ 						       sbp->namelen))) {
+ 			error = -EFSCORRUPTED;
+ 			goto out;
+@@ -465,7 +467,8 @@ xfs_attr3_leaf_list_int(
+ 		}
+ 
+ 		if (XFS_IS_CORRUPT(context->dp->i_mount,
+-				   !xfs_attr_namecheck(name, namelen)))
++				   !xfs_attr_namecheck(entry->flags, name,
++						       namelen)))
+ 			return -EFSCORRUPTED;
+ 		context->put_listent(context, entry->flags,
+ 					      name, namelen, valuelen);
+diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
+index ad4aba5002c12d..f9d72d8e3c3599 100644
+--- a/fs/xfs/xfs_bmap_util.c
++++ b/fs/xfs/xfs_bmap_util.c
+@@ -636,13 +636,11 @@ xfs_bmap_punch_delalloc_range(
+ 
+ /*
+  * Test whether it is appropriate to check an inode for and free post EOF
+- * blocks. The 'force' parameter determines whether we should also consider
+- * regular files that are marked preallocated or append-only.
++ * blocks.
+  */
+ bool
+ xfs_can_free_eofblocks(
+-	struct xfs_inode	*ip,
+-	bool			force)
++	struct xfs_inode	*ip)
+ {
+ 	struct xfs_bmbt_irec	imap;
+ 	struct xfs_mount	*mp = ip->i_mount;
+@@ -676,11 +674,11 @@ xfs_can_free_eofblocks(
+ 		return false;
+ 
+ 	/*
+-	 * Do not free real preallocated or append-only files unless the file
+-	 * has delalloc blocks and we are forced to remove them.
++	 * Only free real extents for inodes with persistent preallocations or
++	 * the append-only flag.
+ 	 */
+ 	if (ip->i_diflags & (XFS_DIFLAG_PREALLOC | XFS_DIFLAG_APPEND))
+-		if (!force || ip->i_delayed_blks == 0)
++		if (ip->i_delayed_blks == 0)
+ 			return false;
+ 
+ 	/*
+@@ -734,6 +732,22 @@ xfs_free_eofblocks(
+ 	/* Wait on dio to ensure i_size has settled. */
+ 	inode_dio_wait(VFS_I(ip));
+ 
++	/*
++	 * For preallocated files only free delayed allocations.
++	 *
++	 * Note that this means we also leave speculative preallocations in
++	 * place for preallocated files.
++	 */
++	if (ip->i_diflags & (XFS_DIFLAG_PREALLOC | XFS_DIFLAG_APPEND)) {
++		if (ip->i_delayed_blks) {
++			xfs_bmap_punch_delalloc_range(ip,
++				round_up(XFS_ISIZE(ip), mp->m_sb.sb_blocksize),
++				LLONG_MAX);
++		}
++		xfs_inode_clear_eofblocks_tag(ip);
++		return 0;
++	}
++
+ 	error = xfs_trans_alloc(mp, &M_RES(mp)->tr_itruncate, 0, 0, 0, &tp);
+ 	if (error) {
+ 		ASSERT(xfs_is_shutdown(mp));
+@@ -868,33 +882,32 @@ xfs_alloc_file_space(
+ 		if (error)
+ 			goto error;
+ 
+-		error = xfs_bmapi_write(tp, ip, startoffset_fsb,
+-				allocatesize_fsb, XFS_BMAPI_PREALLOC, 0, imapp,
+-				&nimaps);
+-		if (error)
+-			goto error;
+-
+-		ip->i_diflags |= XFS_DIFLAG_PREALLOC;
+-		xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
+-
+-		error = xfs_trans_commit(tp);
+-		xfs_iunlock(ip, XFS_ILOCK_EXCL);
+-		if (error)
+-			break;
+-
+ 		/*
+ 		 * If the allocator cannot find a single free extent large
+ 		 * enough to cover the start block of the requested range,
+-		 * xfs_bmapi_write will return 0 but leave *nimaps set to 0.
++		 * xfs_bmapi_write will return -ENOSR.
+ 		 *
+ 		 * In that case we simply need to keep looping with the same
+ 		 * startoffset_fsb so that one of the following allocations
+ 		 * will eventually reach the requested range.
+ 		 */
+-		if (nimaps) {
++		error = xfs_bmapi_write(tp, ip, startoffset_fsb,
++				allocatesize_fsb, XFS_BMAPI_PREALLOC, 0, imapp,
++				&nimaps);
++		if (error) {
++			if (error != -ENOSR)
++				goto error;
++			error = 0;
++		} else {
+ 			startoffset_fsb += imapp->br_blockcount;
+ 			allocatesize_fsb -= imapp->br_blockcount;
+ 		}
++
++		ip->i_diflags |= XFS_DIFLAG_PREALLOC;
++		xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
++
++		error = xfs_trans_commit(tp);
++		xfs_iunlock(ip, XFS_ILOCK_EXCL);
+ 	}
+ 
+ 	return error;
+@@ -1049,7 +1062,7 @@ xfs_prepare_shift(
+ 	 * Trim eofblocks to avoid shifting uninitialized post-eof preallocation
+ 	 * into the accessible region of the file.
+ 	 */
+-	if (xfs_can_free_eofblocks(ip, true)) {
++	if (xfs_can_free_eofblocks(ip)) {
+ 		error = xfs_free_eofblocks(ip);
+ 		if (error)
+ 			return error;
+diff --git a/fs/xfs/xfs_bmap_util.h b/fs/xfs/xfs_bmap_util.h
+index 6888078f5c31e0..1383019ccdb755 100644
+--- a/fs/xfs/xfs_bmap_util.h
++++ b/fs/xfs/xfs_bmap_util.h
+@@ -63,7 +63,7 @@ int	xfs_insert_file_space(struct xfs_inode *, xfs_off_t offset,
+ 				xfs_off_t len);
+ 
+ /* EOF block manipulation functions */
+-bool	xfs_can_free_eofblocks(struct xfs_inode *ip, bool force);
++bool	xfs_can_free_eofblocks(struct xfs_inode *ip);
+ int	xfs_free_eofblocks(struct xfs_inode *ip);
+ 
+ int	xfs_swap_extents(struct xfs_inode *ip, struct xfs_inode *tip,
+diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
+index a013b87ab8d5e5..9b67f05d92a193 100644
+--- a/fs/xfs/xfs_dquot.c
++++ b/fs/xfs/xfs_dquot.c
+@@ -333,7 +333,6 @@ xfs_dquot_disk_alloc(
+ 		goto err_cancel;
+ 
+ 	ASSERT(map.br_blockcount == XFS_DQUOT_CLUSTER_SIZE_FSB);
+-	ASSERT(nmaps == 1);
+ 	ASSERT((map.br_startblock != DELAYSTARTBLOCK) &&
+ 	       (map.br_startblock != HOLESTARTBLOCK));
+ 
+diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
+index db88f41c94c6ba..57a9f23175250a 100644
+--- a/fs/xfs/xfs_icache.c
++++ b/fs/xfs/xfs_icache.c
+@@ -1149,7 +1149,7 @@ xfs_inode_free_eofblocks(
+ 	}
+ 	*lockflags |= XFS_IOLOCK_EXCL;
+ 
+-	if (xfs_can_free_eofblocks(ip, false))
++	if (xfs_can_free_eofblocks(ip))
+ 		return xfs_free_eofblocks(ip);
+ 
+ 	/* inode could be preallocated or append-only */
+diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
+index efb6b8f3561743..7aa73855fab65a 100644
+--- a/fs/xfs/xfs_inode.c
++++ b/fs/xfs/xfs_inode.c
+@@ -1469,7 +1469,7 @@ xfs_release(
+ 	if (!xfs_ilock_nowait(ip, XFS_IOLOCK_EXCL))
+ 		return 0;
+ 
+-	if (xfs_can_free_eofblocks(ip, false)) {
++	if (xfs_can_free_eofblocks(ip)) {
+ 		/*
+ 		 * Check if the inode is being opened, written and closed
+ 		 * frequently and we have delayed allocation blocks outstanding
+@@ -1685,15 +1685,13 @@ xfs_inode_needs_inactive(
+ 
+ 	/*
+ 	 * This file isn't being freed, so check if there are post-eof blocks
+-	 * to free.  @force is true because we are evicting an inode from the
+-	 * cache.  Post-eof blocks must be freed, lest we end up with broken
+-	 * free space accounting.
++	 * to free.
+ 	 *
+ 	 * Note: don't bother with iolock here since lockdep complains about
+ 	 * acquiring it in reclaim context. We have the only reference to the
+ 	 * inode at this point anyways.
+ 	 */
+-	return xfs_can_free_eofblocks(ip, true);
++	return xfs_can_free_eofblocks(ip);
+ }
+ 
+ /*
+@@ -1741,15 +1739,11 @@ xfs_inactive(
+ 
+ 	if (VFS_I(ip)->i_nlink != 0) {
+ 		/*
+-		 * force is true because we are evicting an inode from the
+-		 * cache. Post-eof blocks must be freed, lest we end up with
+-		 * broken free space accounting.
+-		 *
+ 		 * Note: don't bother with iolock here since lockdep complains
+ 		 * about acquiring it in reclaim context. We have the only
+ 		 * reference to the inode at this point anyways.
+ 		 */
+-		if (xfs_can_free_eofblocks(ip, true))
++		if (xfs_can_free_eofblocks(ip))
+ 			error = xfs_free_eofblocks(ip);
+ 
+ 		goto out;
+@@ -2329,11 +2323,26 @@ xfs_ifree_cluster(
+ 		 * This buffer may not have been correctly initialised as we
+ 		 * didn't read it from disk. That's not important because we are
+ 		 * only using to mark the buffer as stale in the log, and to
+-		 * attach stale cached inodes on it. That means it will never be
+-		 * dispatched for IO. If it is, we want to know about it, and we
+-		 * want it to fail. We can acheive this by adding a write
+-		 * verifier to the buffer.
++		 * attach stale cached inodes on it.
++		 *
++		 * For the inode that triggered the cluster freeing, this
++		 * attachment may occur in xfs_inode_item_precommit() after we
++		 * have marked this buffer stale.  If this buffer was not in
++		 * memory before xfs_ifree_cluster() started, it will not be
++		 * marked XBF_DONE and this will cause problems later in
++		 * xfs_inode_item_precommit() when we trip over a (stale, !done)
++		 * buffer to attached to the transaction.
++		 *
++		 * Hence we have to mark the buffer as XFS_DONE here. This is
++		 * safe because we are also marking the buffer as XBF_STALE and
++		 * XFS_BLI_STALE. That means it will never be dispatched for
++		 * IO and it won't be unlocked until the cluster freeing has
++		 * been committed to the journal and the buffer unpinned. If it
++		 * is written, we want to know about it, and we want it to
++		 * fail. We can acheive this by adding a write verifier to the
++		 * buffer.
+ 		 */
++		bp->b_flags |= XBF_DONE;
+ 		bp->b_ops = &xfs_inode_buf_ops;
+ 
+ 		/*
+diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
+index 055cdec2e9ad64..9ce2f48b4ebc01 100644
+--- a/fs/xfs/xfs_iomap.c
++++ b/fs/xfs/xfs_iomap.c
+@@ -317,14 +317,6 @@ xfs_iomap_write_direct(
+ 	if (error)
+ 		goto out_unlock;
+ 
+-	/*
+-	 * Copy any maps to caller's array and return any error.
+-	 */
+-	if (nimaps == 0) {
+-		error = -ENOSPC;
+-		goto out_unlock;
+-	}
+-
+ 	if (unlikely(!xfs_valid_startblock(ip, imap->br_startblock)))
+ 		error = xfs_alert_fsblock_zero(ip, imap);
+ 
+@@ -1013,6 +1005,24 @@ xfs_buffered_write_iomap_begin(
+ 		goto out_unlock;
+ 	}
+ 
++	/*
++	 * For zeroing, trim a delalloc extent that extends beyond the EOF
++	 * block.  If it starts beyond the EOF block, convert it to an
++	 * unwritten extent.
++	 */
++	if ((flags & IOMAP_ZERO) && imap.br_startoff <= offset_fsb &&
++	    isnullstartblock(imap.br_startblock)) {
++		xfs_fileoff_t eof_fsb = XFS_B_TO_FSB(mp, XFS_ISIZE(ip));
++
++		if (offset_fsb >= eof_fsb)
++			goto convert_delay;
++		if (end_fsb > eof_fsb) {
++			end_fsb = eof_fsb;
++			xfs_trim_extent(&imap, offset_fsb,
++					end_fsb - offset_fsb);
++		}
++	}
++
+ 	/*
+ 	 * Search the COW fork extent list even if we did not find a data fork
+ 	 * extent.  This serves two purposes: first this implements the
+@@ -1117,47 +1127,48 @@ xfs_buffered_write_iomap_begin(
+ 		}
+ 	}
+ 
+-retry:
+-	error = xfs_bmapi_reserve_delalloc(ip, allocfork, offset_fsb,
+-			end_fsb - offset_fsb, prealloc_blocks,
+-			allocfork == XFS_DATA_FORK ? &imap : &cmap,
+-			allocfork == XFS_DATA_FORK ? &icur : &ccur,
+-			allocfork == XFS_DATA_FORK ? eof : cow_eof);
+-	switch (error) {
+-	case 0:
+-		break;
+-	case -ENOSPC:
+-	case -EDQUOT:
+-		/* retry without any preallocation */
+-		trace_xfs_delalloc_enospc(ip, offset, count);
+-		if (prealloc_blocks) {
+-			prealloc_blocks = 0;
+-			goto retry;
+-		}
+-		fallthrough;
+-	default:
+-		goto out_unlock;
+-	}
+-
+ 	if (allocfork == XFS_COW_FORK) {
++		error = xfs_bmapi_reserve_delalloc(ip, allocfork, offset_fsb,
++				end_fsb - offset_fsb, prealloc_blocks, &cmap,
++				&ccur, cow_eof);
++		if (error)
++			goto out_unlock;
++
+ 		trace_xfs_iomap_alloc(ip, offset, count, allocfork, &cmap);
+ 		goto found_cow;
+ 	}
+ 
++	error = xfs_bmapi_reserve_delalloc(ip, allocfork, offset_fsb,
++			end_fsb - offset_fsb, prealloc_blocks, &imap, &icur,
++			eof);
++	if (error)
++		goto out_unlock;
++
+ 	/*
+ 	 * Flag newly allocated delalloc blocks with IOMAP_F_NEW so we punch
+ 	 * them out if the write happens to fail.
+ 	 */
+ 	seq = xfs_iomap_inode_sequence(ip, IOMAP_F_NEW);
+-	xfs_iunlock(ip, XFS_ILOCK_EXCL);
++	xfs_iunlock(ip, lockmode);
+ 	trace_xfs_iomap_alloc(ip, offset, count, allocfork, &imap);
+ 	return xfs_bmbt_to_iomap(ip, iomap, &imap, flags, IOMAP_F_NEW, seq);
+ 
+ found_imap:
+ 	seq = xfs_iomap_inode_sequence(ip, 0);
+-	xfs_iunlock(ip, XFS_ILOCK_EXCL);
++	xfs_iunlock(ip, lockmode);
+ 	return xfs_bmbt_to_iomap(ip, iomap, &imap, flags, 0, seq);
+ 
++convert_delay:
++	xfs_iunlock(ip, lockmode);
++	truncate_pagecache(inode, offset);
++	error = xfs_bmapi_convert_delalloc(ip, XFS_DATA_FORK, offset,
++					   iomap, NULL);
++	if (error)
++		return error;
++
++	trace_xfs_iomap_alloc(ip, offset, count, XFS_DATA_FORK, &imap);
++	return 0;
++
+ found_cow:
+ 	seq = xfs_iomap_inode_sequence(ip, 0);
+ 	if (imap.br_startoff <= offset_fsb) {
+@@ -1165,17 +1176,17 @@ xfs_buffered_write_iomap_begin(
+ 		if (error)
+ 			goto out_unlock;
+ 		seq = xfs_iomap_inode_sequence(ip, IOMAP_F_SHARED);
+-		xfs_iunlock(ip, XFS_ILOCK_EXCL);
++		xfs_iunlock(ip, lockmode);
+ 		return xfs_bmbt_to_iomap(ip, iomap, &cmap, flags,
+ 					 IOMAP_F_SHARED, seq);
+ 	}
+ 
+ 	xfs_trim_extent(&cmap, offset_fsb, imap.br_startoff - offset_fsb);
+-	xfs_iunlock(ip, XFS_ILOCK_EXCL);
++	xfs_iunlock(ip, lockmode);
+ 	return xfs_bmbt_to_iomap(ip, iomap, &cmap, flags, 0, seq);
+ 
+ out_unlock:
+-	xfs_iunlock(ip, XFS_ILOCK_EXCL);
++	xfs_iunlock(ip, lockmode);
+ 	return error;
+ }
+ 
+diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
+index e5b62dc2846644..3431d0d8b6f3a1 100644
+--- a/fs/xfs/xfs_reflink.c
++++ b/fs/xfs/xfs_reflink.c
+@@ -429,13 +429,6 @@ xfs_reflink_fill_cow_hole(
+ 	if (error)
+ 		return error;
+ 
+-	/*
+-	 * Allocation succeeded but the requested range was not even partially
+-	 * satisfied?  Bail out!
+-	 */
+-	if (nimaps == 0)
+-		return -ENOSPC;
+-
+ convert:
+ 	return xfs_reflink_convert_unwritten(ip, imap, cmap, convert_now);
+ 
+@@ -498,13 +491,6 @@ xfs_reflink_fill_delalloc(
+ 		error = xfs_trans_commit(tp);
+ 		if (error)
+ 			return error;
+-
+-		/*
+-		 * Allocation succeeded but the requested range was not even
+-		 * partially satisfied?  Bail out!
+-		 */
+-		if (nimaps == 0)
+-			return -ENOSPC;
+ 	} while (cmap->br_startoff + cmap->br_blockcount <= imap->br_startoff);
+ 
+ 	return xfs_reflink_convert_unwritten(ip, imap, cmap, convert_now);
+@@ -730,12 +716,6 @@ xfs_reflink_end_cow_extent(
+ 	int			nmaps;
+ 	int			error;
+ 
+-	/* No COW extents?  That's easy! */
+-	if (ifp->if_bytes == 0) {
+-		*offset_fsb = end_fsb;
+-		return 0;
+-	}
+-
+ 	resblks = XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK);
+ 	error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, resblks, 0,
+ 			XFS_TRANS_RESERVE, &tp);
+diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
+index 4bec890d93d2c5..608db1ab88a485 100644
+--- a/fs/xfs/xfs_rtalloc.c
++++ b/fs/xfs/xfs_rtalloc.c
+@@ -840,8 +840,6 @@ xfs_growfs_rt_alloc(
+ 		nmap = 1;
+ 		error = xfs_bmapi_write(tp, ip, oblocks, nblocks - oblocks,
+ 					XFS_BMAPI_METADATA, 0, &map, &nmap);
+-		if (!error && nmap < 1)
+-			error = -ENOSPC;
+ 		if (error)
+ 			goto out_trans_cancel;
+ 		/*
+diff --git a/include/linux/fsl/enetc_mdio.h b/include/linux/fsl/enetc_mdio.h
+index df25fffdc0ae71..623ccfcbf39c35 100644
+--- a/include/linux/fsl/enetc_mdio.h
++++ b/include/linux/fsl/enetc_mdio.h
+@@ -59,7 +59,8 @@ static inline int enetc_mdio_read_c45(struct mii_bus *bus, int phy_id,
+ static inline int enetc_mdio_write_c45(struct mii_bus *bus, int phy_id,
+ 				       int devad, int regnum, u16 value)
+ { return -EINVAL; }
+-struct enetc_hw *enetc_hw_alloc(struct device *dev, void __iomem *port_regs)
++static inline struct enetc_hw *enetc_hw_alloc(struct device *dev,
++					      void __iomem *port_regs)
+ { return ERR_PTR(-EINVAL); }
+ 
+ #endif
+diff --git a/include/linux/irqchip/arm-gic-v4.h b/include/linux/irqchip/arm-gic-v4.h
+index 2c63375bbd43f4..bf9e0640288d1d 100644
+--- a/include/linux/irqchip/arm-gic-v4.h
++++ b/include/linux/irqchip/arm-gic-v4.h
+@@ -58,10 +58,12 @@ struct its_vpe {
+ 				bool	enabled;
+ 				bool	group;
+ 			}			sgi_config[16];
+-			atomic_t vmapp_count;
+ 		};
+ 	};
+ 
++	/* Track the VPE being mapped */
++	atomic_t vmapp_count;
++
+ 	/*
+ 	 * Ensures mutual exclusion between affinity setting of the
+ 	 * vPE and vLPI operations using vpe->col_idx.
+diff --git a/include/uapi/linux/ublk_cmd.h b/include/uapi/linux/ublk_cmd.h
+index b9cfc5c9626823..3830b428ecf19d 100644
+--- a/include/uapi/linux/ublk_cmd.h
++++ b/include/uapi/linux/ublk_cmd.h
+@@ -173,7 +173,13 @@
+ /* use ioctl encoding for uring command */
+ #define UBLK_F_CMD_IOCTL_ENCODE	(1UL << 6)
+ 
+-/* Copy between request and user buffer by pread()/pwrite() */
++/*
++ *  Copy between request and user buffer by pread()/pwrite()
++ *
++ *  Not available for UBLK_F_UNPRIVILEGED_DEV, otherwise userspace may
++ *  deceive us by not filling request buffer, then kernel uninitialized
++ *  data may be leaked.
++ */
+ #define UBLK_F_USER_COPY	(1UL << 7)
+ 
+ /*
+diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h
+index 19ac1b2f1ea45d..8242820742eef3 100644
+--- a/io_uring/io_uring.h
++++ b/io_uring/io_uring.h
+@@ -262,7 +262,14 @@ static inline bool io_sqring_full(struct io_ring_ctx *ctx)
+ {
+ 	struct io_rings *r = ctx->rings;
+ 
+-	return READ_ONCE(r->sq.tail) - ctx->cached_sq_head == ctx->sq_entries;
++	/*
++	 * SQPOLL must use the actual sqring head, as using the cached_sq_head
++	 * is race prone if the SQPOLL thread has grabbed entries but not yet
++	 * committed them to the ring. For !SQPOLL, this doesn't matter, but
++	 * since this helper is just used for SQPOLL sqring waits (or POLLOUT),
++	 * just read the actual sqring head unconditionally.
++	 */
++	return READ_ONCE(r->sq.tail) - READ_ONCE(r->sq.head) == ctx->sq_entries;
+ }
+ 
+ static inline unsigned int io_sqring_entries(struct io_ring_ctx *ctx)
+diff --git a/kernel/time/posix-clock.c b/kernel/time/posix-clock.c
+index 77c0c2370b6d1d..8127673bfc45e6 100644
+--- a/kernel/time/posix-clock.c
++++ b/kernel/time/posix-clock.c
+@@ -299,6 +299,9 @@ static int pc_clock_settime(clockid_t id, const struct timespec64 *ts)
+ 		goto out;
+ 	}
+ 
++	if (!timespec64_valid_strict(ts))
++		return -EINVAL;
++
+ 	if (cd.clk->ops.clock_settime)
+ 		err = cd.clk->ops.clock_settime(cd.clk, ts);
+ 	else
+diff --git a/lib/maple_tree.c b/lib/maple_tree.c
+index 41ef91590761b1..4e05511c8d1eba 100644
+--- a/lib/maple_tree.c
++++ b/lib/maple_tree.c
+@@ -2228,6 +2228,8 @@ static inline struct maple_enode *mte_node_or_none(struct maple_enode *enode)
+ 
+ /*
+  * mas_wr_node_walk() - Find the correct offset for the index in the @mas.
++ *                      If @mas->index cannot be found within the containing
++ *                      node, we traverse to the last entry in the node.
+  * @wr_mas: The maple write state
+  *
+  * Uses mas_slot_locked() and does not need to worry about dead nodes.
+@@ -3643,7 +3645,7 @@ static bool mas_wr_walk(struct ma_wr_state *wr_mas)
+ 	return true;
+ }
+ 
+-static bool mas_wr_walk_index(struct ma_wr_state *wr_mas)
++static void mas_wr_walk_index(struct ma_wr_state *wr_mas)
+ {
+ 	struct ma_state *mas = wr_mas->mas;
+ 
+@@ -3652,11 +3654,9 @@ static bool mas_wr_walk_index(struct ma_wr_state *wr_mas)
+ 		wr_mas->content = mas_slot_locked(mas, wr_mas->slots,
+ 						  mas->offset);
+ 		if (ma_is_leaf(wr_mas->type))
+-			return true;
++			return;
+ 		mas_wr_walk_traverse(wr_mas);
+-
+ 	}
+-	return true;
+ }
+ /*
+  * mas_extend_spanning_null() - Extend a store of a %NULL to include surrounding %NULLs.
+@@ -3892,8 +3892,8 @@ static inline int mas_wr_spanning_store(struct ma_wr_state *wr_mas)
+ 	memset(&b_node, 0, sizeof(struct maple_big_node));
+ 	/* Copy l_mas and store the value in b_node. */
+ 	mas_store_b_node(&l_wr_mas, &b_node, l_wr_mas.node_end);
+-	/* Copy r_mas into b_node. */
+-	if (r_mas.offset <= r_wr_mas.node_end)
++	/* Copy r_mas into b_node if there is anything to copy. */
++	if (r_mas.max > r_mas.last)
+ 		mas_mab_cp(&r_mas, r_mas.offset, r_wr_mas.node_end,
+ 			   &b_node, b_node.b_end + 1);
+ 	else
+diff --git a/mm/mremap.c b/mm/mremap.c
+index 382e81c33fc437..df71010baabe7e 100644
+--- a/mm/mremap.c
++++ b/mm/mremap.c
+@@ -238,6 +238,7 @@ static bool move_normal_pmd(struct vm_area_struct *vma, unsigned long old_addr,
+ {
+ 	spinlock_t *old_ptl, *new_ptl;
+ 	struct mm_struct *mm = vma->vm_mm;
++	bool res = false;
+ 	pmd_t pmd;
+ 
+ 	if (!arch_supports_page_table_move())
+@@ -277,19 +278,25 @@ static bool move_normal_pmd(struct vm_area_struct *vma, unsigned long old_addr,
+ 	if (new_ptl != old_ptl)
+ 		spin_lock_nested(new_ptl, SINGLE_DEPTH_NESTING);
+ 
+-	/* Clear the pmd */
+ 	pmd = *old_pmd;
++
++	/* Racing with collapse? */
++	if (unlikely(!pmd_present(pmd) || pmd_leaf(pmd)))
++		goto out_unlock;
++	/* Clear the pmd */
+ 	pmd_clear(old_pmd);
++	res = true;
+ 
+ 	VM_BUG_ON(!pmd_none(*new_pmd));
+ 
+ 	pmd_populate(mm, new_pmd, pmd_pgtable(pmd));
+ 	flush_tlb_range(vma, old_addr, old_addr + PMD_SIZE);
++out_unlock:
+ 	if (new_ptl != old_ptl)
+ 		spin_unlock(new_ptl);
+ 	spin_unlock(old_ptl);
+ 
+-	return true;
++	return res;
+ }
+ #else
+ static inline bool move_normal_pmd(struct vm_area_struct *vma,
+diff --git a/mm/swapfile.c b/mm/swapfile.c
+index eada1351753e34..c856d6bb2daf3c 100644
+--- a/mm/swapfile.c
++++ b/mm/swapfile.c
+@@ -2003,7 +2003,7 @@ static int unuse_mm(struct mm_struct *mm, unsigned int type)
+ 
+ 	mmap_read_lock(mm);
+ 	for_each_vma(vmi, vma) {
+-		if (vma->anon_vma) {
++		if (vma->anon_vma && !is_vm_hugetlb_page(vma)) {
+ 			ret = unuse_vma(vma, type);
+ 			if (ret)
+ 				break;
+diff --git a/mm/vmscan.c b/mm/vmscan.c
+index 81533bed0b4629..3c91b86d59e935 100644
+--- a/mm/vmscan.c
++++ b/mm/vmscan.c
+@@ -5603,8 +5603,8 @@ static void lru_gen_shrink_node(struct pglist_data *pgdat, struct scan_control *
+ 
+ 	blk_finish_plug(&plug);
+ done:
+-	/* kswapd should never fail */
+-	pgdat->kswapd_failures = 0;
++	if (sc->nr_reclaimed > reclaimed)
++		pgdat->kswapd_failures = 0;
+ }
+ 
+ /******************************************************************************
+diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
+index 67604ccec2f427..e39fba5565c5d4 100644
+--- a/net/bluetooth/af_bluetooth.c
++++ b/net/bluetooth/af_bluetooth.c
+@@ -825,11 +825,14 @@ static int __init bt_init(void)
+ 	bt_sysfs_cleanup();
+ cleanup_led:
+ 	bt_leds_cleanup();
++	debugfs_remove_recursive(bt_debugfs);
+ 	return err;
+ }
+ 
+ static void __exit bt_exit(void)
+ {
++	iso_exit();
++
+ 	mgmt_exit();
+ 
+ 	sco_exit();
+diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
+index c46d123c30e14a..9b365fb44fac6d 100644
+--- a/net/bluetooth/iso.c
++++ b/net/bluetooth/iso.c
+@@ -2112,13 +2112,9 @@ int iso_init(void)
+ 
+ 	hci_register_cb(&iso_cb);
+ 
+-	if (IS_ERR_OR_NULL(bt_debugfs))
+-		return 0;
+-
+-	if (!iso_debugfs) {
++	if (!IS_ERR_OR_NULL(bt_debugfs))
+ 		iso_debugfs = debugfs_create_file("iso", 0444, bt_debugfs,
+ 						  NULL, &iso_debugfs_fops);
+-	}
+ 
+ 	iso_inited = true;
+ 
+diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
+index 15c49d559db536..328640d9b60762 100644
+--- a/net/ipv4/tcp_output.c
++++ b/net/ipv4/tcp_output.c
+@@ -2314,9 +2314,7 @@ static bool tcp_can_coalesce_send_queue_head(struct sock *sk, int len)
+ 		if (len <= skb->len)
+ 			break;
+ 
+-		if (unlikely(TCP_SKB_CB(skb)->eor) ||
+-		    tcp_has_tx_tstamp(skb) ||
+-		    !skb_pure_zcopy_same(skb, next))
++		if (tcp_has_tx_tstamp(skb) || !tcp_skb_can_collapse(skb, next))
+ 			return false;
+ 
+ 		len -= skb->len;
+diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c
+index 79f2278434b950..3dc49c3169f20e 100644
+--- a/net/mptcp/mib.c
++++ b/net/mptcp/mib.c
+@@ -15,6 +15,7 @@ static const struct snmp_mib mptcp_snmp_list[] = {
+ 	SNMP_MIB_ITEM("MPCapableACKRX", MPTCP_MIB_MPCAPABLEPASSIVEACK),
+ 	SNMP_MIB_ITEM("MPCapableFallbackACK", MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK),
+ 	SNMP_MIB_ITEM("MPCapableFallbackSYNACK", MPTCP_MIB_MPCAPABLEACTIVEFALLBACK),
++	SNMP_MIB_ITEM("MPCapableEndpAttempt", MPTCP_MIB_MPCAPABLEENDPATTEMPT),
+ 	SNMP_MIB_ITEM("MPFallbackTokenInit", MPTCP_MIB_TOKENFALLBACKINIT),
+ 	SNMP_MIB_ITEM("MPTCPRetrans", MPTCP_MIB_RETRANSSEGS),
+ 	SNMP_MIB_ITEM("MPJoinNoTokenFound", MPTCP_MIB_JOINNOTOKEN),
+diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h
+index e6e570251d32a4..007d7a74947272 100644
+--- a/net/mptcp/mib.h
++++ b/net/mptcp/mib.h
+@@ -8,6 +8,7 @@ enum linux_mptcp_mib_field {
+ 	MPTCP_MIB_MPCAPABLEPASSIVEACK,	/* Received third ACK with MP_CAPABLE */
+ 	MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK,/* Server-side fallback during 3-way handshake */
+ 	MPTCP_MIB_MPCAPABLEACTIVEFALLBACK, /* Client-side fallback during 3-way handshake */
++	MPTCP_MIB_MPCAPABLEENDPATTEMPT,	/* Prohibited MPC to port-based endp */
+ 	MPTCP_MIB_TOKENFALLBACKINIT,	/* Could not init/allocate token */
+ 	MPTCP_MIB_RETRANSSEGS,		/* Segments retransmitted at the MPTCP-level */
+ 	MPTCP_MIB_JOINNOTOKEN,		/* Received MP_JOIN but the token was not found */
+diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
+index 131af6be4b678a..d8c47ca86de4fb 100644
+--- a/net/mptcp/pm_netlink.c
++++ b/net/mptcp/pm_netlink.c
+@@ -877,12 +877,12 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk,
+ 				 i, rm_id, id, remote_id, msk->mpc_endpoint_id);
+ 			spin_unlock_bh(&msk->pm.lock);
+ 			mptcp_subflow_shutdown(sk, ssk, how);
++			removed |= subflow->request_join;
+ 
+ 			/* the following takes care of updating the subflows counter */
+ 			mptcp_close_ssk(sk, ssk, subflow);
+ 			spin_lock_bh(&msk->pm.lock);
+ 
+-			removed |= subflow->request_join;
+ 			if (rm_type == MPTCP_MIB_RMSUBFLOW)
+ 				__MPTCP_INC_STATS(sock_net(sk), rm_type);
+ 		}
+@@ -1125,6 +1125,7 @@ static int mptcp_pm_nl_create_listen_socket(struct sock *sk,
+ 	 */
+ 	inet_sk_state_store(newsk, TCP_LISTEN);
+ 	lock_sock(ssk);
++	WRITE_ONCE(mptcp_subflow_ctx(ssk)->pm_listener, true);
+ 	err = __inet_listen_sk(ssk, backlog);
+ 	if (!err)
+ 		mptcp_event_pm_listener(ssk, MPTCP_EVENT_LISTENER_CREATED);
+diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
+index b9a4f6364b7859..89d1c299ff2b9f 100644
+--- a/net/mptcp/protocol.h
++++ b/net/mptcp/protocol.h
+@@ -504,6 +504,7 @@ struct mptcp_subflow_context {
+ 		__unused : 9;
+ 	enum mptcp_data_avail data_avail;
+ 	bool	scheduled;
++	bool	pm_listener;	    /* a listener managed by the kernel PM? */
+ 	u32	remote_nonce;
+ 	u64	thmac;
+ 	u32	local_nonce;
+diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
+index 38f46502d76e04..282ecc8bf75e80 100644
+--- a/net/mptcp/subflow.c
++++ b/net/mptcp/subflow.c
+@@ -132,6 +132,13 @@ static void subflow_add_reset_reason(struct sk_buff *skb, u8 reason)
+ 	}
+ }
+ 
++static int subflow_reset_req_endp(struct request_sock *req, struct sk_buff *skb)
++{
++	SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_MPCAPABLEENDPATTEMPT);
++	subflow_add_reset_reason(skb, MPTCP_RST_EPROHIBIT);
++	return -EPERM;
++}
++
+ /* Init mptcp request socket.
+  *
+  * Returns an error code if a JOIN has failed and a TCP reset
+@@ -163,6 +170,8 @@ static int subflow_check_req(struct request_sock *req,
+ 	if (opt_mp_capable) {
+ 		SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_MPCAPABLEPASSIVE);
+ 
++		if (unlikely(listener->pm_listener))
++			return subflow_reset_req_endp(req, skb);
+ 		if (opt_mp_join)
+ 			return 0;
+ 	} else if (opt_mp_join) {
+@@ -170,6 +179,8 @@ static int subflow_check_req(struct request_sock *req,
+ 
+ 		if (mp_opt.backup)
+ 			SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINSYNBACKUPRX);
++	} else if (unlikely(listener->pm_listener)) {
++		return subflow_reset_req_endp(req, skb);
+ 	}
+ 
+ 	if (opt_mp_capable && listener->request_mptcp) {
+diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
+index 8a3abd4babba6e..5833623f6ffafd 100644
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -307,6 +307,7 @@ enum {
+ 	CXT_FIXUP_HP_SPECTRE,
+ 	CXT_FIXUP_HP_GATE_MIC,
+ 	CXT_FIXUP_MUTE_LED_GPIO,
++	CXT_FIXUP_HP_ELITEONE_OUT_DIS,
+ 	CXT_FIXUP_HP_ZBOOK_MUTE_LED,
+ 	CXT_FIXUP_HEADSET_MIC,
+ 	CXT_FIXUP_HP_MIC_NO_PRESENCE,
+@@ -324,6 +325,19 @@ static void cxt_fixup_stereo_dmic(struct hda_codec *codec,
+ 	spec->gen.inv_dmic_split = 1;
+ }
+ 
++/* fix widget control pin settings */
++static void cxt_fixup_update_pinctl(struct hda_codec *codec,
++				   const struct hda_fixup *fix, int action)
++{
++	if (action == HDA_FIXUP_ACT_PROBE) {
++		/* Unset OUT_EN for this Node pin, leaving only HP_EN.
++		 * This is the value stored in the codec register after
++		 * the correct initialization of the previous windows boot.
++		 */
++		snd_hda_set_pin_ctl_cache(codec, 0x1d, AC_PINCTL_HP_EN);
++	}
++}
++
+ static void cxt5066_increase_mic_boost(struct hda_codec *codec,
+ 				   const struct hda_fixup *fix, int action)
+ {
+@@ -975,6 +989,10 @@ static const struct hda_fixup cxt_fixups[] = {
+ 		.type = HDA_FIXUP_FUNC,
+ 		.v.func = cxt_fixup_mute_led_gpio,
+ 	},
++	[CXT_FIXUP_HP_ELITEONE_OUT_DIS] = {
++		.type = HDA_FIXUP_FUNC,
++		.v.func = cxt_fixup_update_pinctl,
++	},
+ 	[CXT_FIXUP_HP_ZBOOK_MUTE_LED] = {
+ 		.type = HDA_FIXUP_FUNC,
+ 		.v.func = cxt_fixup_hp_zbook_mute_led,
+@@ -1065,6 +1083,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
+ 	SND_PCI_QUIRK(0x103c, 0x83b2, "HP EliteBook 840 G5", CXT_FIXUP_HP_DOCK),
+ 	SND_PCI_QUIRK(0x103c, 0x83b3, "HP EliteBook 830 G5", CXT_FIXUP_HP_DOCK),
+ 	SND_PCI_QUIRK(0x103c, 0x83d3, "HP ProBook 640 G4", CXT_FIXUP_HP_DOCK),
++	SND_PCI_QUIRK(0x103c, 0x83e5, "HP EliteOne 1000 G2", CXT_FIXUP_HP_ELITEONE_OUT_DIS),
+ 	SND_PCI_QUIRK(0x103c, 0x8402, "HP ProBook 645 G4", CXT_FIXUP_MUTE_LED_GPIO),
+ 	SND_PCI_QUIRK(0x103c, 0x8427, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),
+ 	SND_PCI_QUIRK(0x103c, 0x844f, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),
+diff --git a/tools/testing/selftests/hid/Makefile b/tools/testing/selftests/hid/Makefile
+index 87b6f5f83d7e0b..2e75fb30f3a5e0 100644
+--- a/tools/testing/selftests/hid/Makefile
++++ b/tools/testing/selftests/hid/Makefile
+@@ -18,6 +18,7 @@ TEST_PROGS += hid-usb_crash.sh
+ TEST_PROGS += hid-wacom.sh
+ 
+ TEST_FILES := run-hid-tools-tests.sh
++TEST_FILES += tests
+ 
+ CXX ?= $(CROSS_COMPILE)g++
+ 
+diff --git a/tools/testing/selftests/mm/uffd-common.c b/tools/testing/selftests/mm/uffd-common.c
+index ba6777cdf42358..3bdae35e0add01 100644
+--- a/tools/testing/selftests/mm/uffd-common.c
++++ b/tools/testing/selftests/mm/uffd-common.c
+@@ -17,7 +17,7 @@ bool map_shared;
+ bool test_uffdio_wp = true;
+ unsigned long long *count_verify;
+ uffd_test_ops_t *uffd_test_ops;
+-atomic_bool ready_for_fork;
++pthread_barrier_t ready_for_fork;
+ 
+ static int uffd_mem_fd_create(off_t mem_size, bool hugetlb)
+ {
+@@ -508,7 +508,8 @@ void *uffd_poll_thread(void *arg)
+ 	pollfd[1].fd = pipefd[cpu*2];
+ 	pollfd[1].events = POLLIN;
+ 
+-	ready_for_fork = true;
++	/* Ready for parent thread to fork */
++	pthread_barrier_wait(&ready_for_fork);
+ 
+ 	for (;;) {
+ 		ret = poll(pollfd, 2, -1);
+diff --git a/tools/testing/selftests/mm/uffd-common.h b/tools/testing/selftests/mm/uffd-common.h
+index 2832669bd9fd54..2d78ae0daf0650 100644
+--- a/tools/testing/selftests/mm/uffd-common.h
++++ b/tools/testing/selftests/mm/uffd-common.h
+@@ -33,7 +33,6 @@
+ #include <inttypes.h>
+ #include <stdint.h>
+ #include <sys/random.h>
+-#include <stdatomic.h>
+ 
+ #include "../kselftest.h"
+ #include "vm_util.h"
+@@ -99,7 +98,7 @@ extern bool map_shared;
+ extern bool test_uffdio_wp;
+ extern unsigned long long *count_verify;
+ extern volatile bool test_uffdio_copy_eexist;
+-extern atomic_bool ready_for_fork;
++extern pthread_barrier_t ready_for_fork;
+ 
+ extern uffd_test_ops_t anon_uffd_test_ops;
+ extern uffd_test_ops_t shmem_uffd_test_ops;
+diff --git a/tools/testing/selftests/mm/uffd-unit-tests.c b/tools/testing/selftests/mm/uffd-unit-tests.c
+index 92d51768b7be15..42cdba544f81bd 100644
+--- a/tools/testing/selftests/mm/uffd-unit-tests.c
++++ b/tools/testing/selftests/mm/uffd-unit-tests.c
+@@ -237,6 +237,9 @@ static void *fork_event_consumer(void *data)
+ 	fork_event_args *args = data;
+ 	struct uffd_msg msg = { 0 };
+ 
++	/* Ready for parent thread to fork */
++	pthread_barrier_wait(&ready_for_fork);
++
+ 	/* Read until a full msg received */
+ 	while (uffd_read_msg(args->parent_uffd, &msg));
+ 
+@@ -304,8 +307,12 @@ static int pagemap_test_fork(int uffd, bool with_event, bool test_pin)
+ 
+ 	/* Prepare a thread to resolve EVENT_FORK */
+ 	if (with_event) {
++		pthread_barrier_init(&ready_for_fork, NULL, 2);
+ 		if (pthread_create(&thread, NULL, fork_event_consumer, &args))
+ 			err("pthread_create()");
++		/* Wait for child thread to start before forking */
++		pthread_barrier_wait(&ready_for_fork);
++		pthread_barrier_destroy(&ready_for_fork);
+ 	}
+ 
+ 	child = fork();
+@@ -770,7 +777,7 @@ static void uffd_sigbus_test_common(bool wp)
+ 	char c;
+ 	struct uffd_args args = { 0 };
+ 
+-	ready_for_fork = false;
++	pthread_barrier_init(&ready_for_fork, NULL, 2);
+ 
+ 	fcntl(uffd, F_SETFL, uffd_flags | O_NONBLOCK);
+ 
+@@ -787,8 +794,9 @@ static void uffd_sigbus_test_common(bool wp)
+ 	if (pthread_create(&uffd_mon, NULL, uffd_poll_thread, &args))
+ 		err("uffd_poll_thread create");
+ 
+-	while (!ready_for_fork)
+-		; /* Wait for the poll_thread to start executing before forking */
++	/* Wait for child thread to start before forking */
++	pthread_barrier_wait(&ready_for_fork);
++	pthread_barrier_destroy(&ready_for_fork);
+ 
+ 	pid = fork();
+ 	if (pid < 0)
+@@ -829,7 +837,7 @@ static void uffd_events_test_common(bool wp)
+ 	char c;
+ 	struct uffd_args args = { 0 };
+ 
+-	ready_for_fork = false;
++	pthread_barrier_init(&ready_for_fork, NULL, 2);
+ 
+ 	fcntl(uffd, F_SETFL, uffd_flags | O_NONBLOCK);
+ 	if (uffd_register(uffd, area_dst, nr_pages * page_size,
+@@ -840,8 +848,9 @@ static void uffd_events_test_common(bool wp)
+ 	if (pthread_create(&uffd_mon, NULL, uffd_poll_thread, &args))
+ 		err("uffd_poll_thread create");
+ 
+-	while (!ready_for_fork)
+-		; /* Wait for the poll_thread to start executing before forking */
++	/* Wait for child thread to start before forking */
++	pthread_barrier_wait(&ready_for_fork);
++	pthread_barrier_destroy(&ready_for_fork);
+ 
+ 	pid = fork();
+ 	if (pid < 0)
+diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
+index 3c286fba8d5dc5..17ace5627ce365 100755
+--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
++++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
+@@ -23,6 +23,7 @@ tmpfile=""
+ cout=""
+ err=""
+ capout=""
++cappid=""
+ ns1=""
+ ns2=""
+ ksft_skip=4
+@@ -30,11 +31,11 @@ iptables="iptables"
+ ip6tables="ip6tables"
+ timeout_poll=30
+ timeout_test=$((timeout_poll * 2 + 1))
+-capture=0
+-checksum=0
++capture=false
++checksum=false
+ ip_mptcp=0
+ check_invert=0
+-validate_checksum=0
++validate_checksum=false
+ init=0
+ evts_ns1=""
+ evts_ns2=""
+@@ -99,7 +100,7 @@ init_partial()
+ 		ip netns exec $netns sysctl -q net.mptcp.pm_type=0 2>/dev/null || true
+ 		ip netns exec $netns sysctl -q net.ipv4.conf.all.rp_filter=0
+ 		ip netns exec $netns sysctl -q net.ipv4.conf.default.rp_filter=0
+-		if [ $checksum -eq 1 ]; then
++		if $checksum; then
+ 			ip netns exec $netns sysctl -q net.mptcp.checksum_enabled=1
+ 		fi
+ 	done
+@@ -386,7 +387,7 @@ reset_with_checksum()
+ 	ip netns exec $ns1 sysctl -q net.mptcp.checksum_enabled=$ns1_enable
+ 	ip netns exec $ns2 sysctl -q net.mptcp.checksum_enabled=$ns2_enable
+ 
+-	validate_checksum=1
++	validate_checksum=true
+ }
+ 
+ reset_with_allow_join_id0()
+@@ -419,7 +420,7 @@ reset_with_allow_join_id0()
+ setup_fail_rules()
+ {
+ 	check_invert=1
+-	validate_checksum=1
++	validate_checksum=true
+ 	local i="$1"
+ 	local ip="${2:-4}"
+ 	local tables
+@@ -1006,40 +1007,62 @@ pm_nl_set_endpoint()
+ 	fi
+ }
+ 
+-do_transfer()
++cond_start_capture()
+ {
+-	local listener_ns="$1"
+-	local connector_ns="$2"
+-	local cl_proto="$3"
+-	local srv_proto="$4"
+-	local connect_addr="$5"
+-
+-	local port=$((10000 + TEST_COUNT - 1))
+-	local cappid
+-	local FAILING_LINKS=${FAILING_LINKS:-""}
+-	local fastclose=${fastclose:-""}
+-	local speed=${speed:-"fast"}
++	local ns="$1"
+ 
+-	:> "$cout"
+-	:> "$sout"
+ 	:> "$capout"
+ 
+-	if [ $capture -eq 1 ]; then
+-		local capuser
+-		if [ -z $SUDO_USER ] ; then
++	if $capture; then
++		local capuser capfile
++		if [ -z $SUDO_USER ]; then
+ 			capuser=""
+ 		else
+ 			capuser="-Z $SUDO_USER"
+ 		fi
+ 
+-		capfile=$(printf "mp_join-%02u-%s.pcap" "$TEST_COUNT" "${listener_ns}")
++		capfile=$(printf "mp_join-%02u-%s.pcap" "$TEST_COUNT" "$ns")
+ 
+ 		echo "Capturing traffic for test $TEST_COUNT into $capfile"
+-		ip netns exec ${listener_ns} tcpdump -i any -s 65535 -B 32768 $capuser -w $capfile > "$capout" 2>&1 &
++		ip netns exec "$ns" tcpdump -i any -s 65535 -B 32768 $capuser -w "$capfile" > "$capout" 2>&1 &
+ 		cappid=$!
+ 
+ 		sleep 1
+ 	fi
++}
++
++cond_stop_capture()
++{
++	if $capture; then
++		sleep 1
++		kill $cappid
++		cat "$capout"
++	fi
++}
++
++get_port()
++{
++	echo "$((10000 + TEST_COUNT - 1))"
++}
++
++do_transfer()
++{
++	local listener_ns="$1"
++	local connector_ns="$2"
++	local cl_proto="$3"
++	local srv_proto="$4"
++	local connect_addr="$5"
++	local port
++
++	local FAILING_LINKS=${FAILING_LINKS:-""}
++	local fastclose=${fastclose:-""}
++	local speed=${speed:-"fast"}
++	port=$(get_port)
++
++	:> "$cout"
++	:> "$sout"
++
++	cond_start_capture ${listener_ns}
+ 
+ 	NSTAT_HISTORY=/tmp/${listener_ns}.nstat ip netns exec ${listener_ns} \
+ 		nstat -n
+@@ -1125,10 +1148,7 @@ do_transfer()
+ 	wait $spid
+ 	local rets=$?
+ 
+-	if [ $capture -eq 1 ]; then
+-	    sleep 1
+-	    kill $cappid
+-	fi
++	cond_stop_capture
+ 
+ 	NSTAT_HISTORY=/tmp/${listener_ns}.nstat ip netns exec ${listener_ns} \
+ 		nstat | grep Tcp > /tmp/${listener_ns}.out
+@@ -1144,7 +1164,6 @@ do_transfer()
+ 		ip netns exec ${connector_ns} ss -Menita 1>&2 -o "dport = :$port"
+ 		cat /tmp/${connector_ns}.out
+ 
+-		cat "$capout"
+ 		return 1
+ 	fi
+ 
+@@ -1161,13 +1180,7 @@ do_transfer()
+ 	fi
+ 	rets=$?
+ 
+-	if [ $retc -eq 0 ] && [ $rets -eq 0 ];then
+-		cat "$capout"
+-		return 0
+-	fi
+-
+-	cat "$capout"
+-	return 1
++	[ $retc -eq 0 ] && [ $rets -eq 0 ]
+ }
+ 
+ make_file()
+@@ -1514,7 +1527,7 @@ chk_join_nr()
+ 	else
+ 		print_ok
+ 	fi
+-	if [ $validate_checksum -eq 1 ]; then
++	if $validate_checksum; then
+ 		chk_csum_nr $csum_ns1 $csum_ns2
+ 		chk_fail_nr $fail_nr $fail_nr
+ 		chk_rst_nr $rst_nr $rst_nr
+@@ -2944,6 +2957,32 @@ verify_listener_events()
+ 	fail_test "$e_type:$type $e_family:$family $e_saddr:$saddr $e_sport:$sport"
+ }
+ 
++chk_mpc_endp_attempt()
++{
++	local retl=$1
++	local attempts=$2
++
++	print_check "Connect"
++
++	if [ ${retl} = 124 ]; then
++		fail_test "timeout on connect"
++	elif [ ${retl} = 0 ]; then
++		fail_test "unexpected successful connect"
++	else
++		print_ok
++
++		print_check "Attempts"
++		count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPCapableEndpAttempt")
++		if [ -z "$count" ]; then
++			print_skip
++		elif [ "$count" != "$attempts" ]; then
++			fail_test "got ${count} MPC attempt[s] on port-based endpoint, expected ${attempts}"
++		else
++			print_ok
++		fi
++	fi
++}
++
+ add_addr_ports_tests()
+ {
+ 	# signal address with port
+@@ -3034,6 +3073,22 @@ add_addr_ports_tests()
+ 		chk_join_nr 2 2 2
+ 		chk_add_nr 2 2 2
+ 	fi
++
++	if reset "port-based signal endpoint must not accept mpc"; then
++		local port retl count
++		port=$(get_port)
++
++		cond_start_capture ${ns1}
++		pm_nl_add_endpoint ${ns1} 10.0.2.1 flags signal port ${port}
++		mptcp_lib_wait_local_port_listen ${ns1} ${port}
++
++		timeout 1 ip netns exec ${ns2} \
++			./mptcp_connect -t ${timeout_poll} -p $port -s MPTCP 10.0.2.1 >/dev/null 2>&1
++		retl=$?
++		cond_stop_capture
++
++		chk_mpc_endp_attempt ${retl} 1
++	fi
+ }
+ 
+ syncookies_tests()
+@@ -3960,10 +4015,10 @@ while getopts "${all_tests_args}cCih" opt; do
+ 			tests+=("${all_tests[${opt}]}")
+ 			;;
+ 		c)
+-			capture=1
++			capture=true
+ 			;;
+ 		C)
+-			checksum=1
++			checksum=true
+ 			;;
+ 		i)
+ 			ip_mptcp=1
+diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+index 869c8eda4bc34d..d98c89f31afe8a 100644
+--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
++++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+@@ -8,17 +8,6 @@ readonly KSFT_SKIP=4
+ # shellcheck disable=SC2155 # declare and assign separately
+ readonly KSFT_TEST="${MPTCP_LIB_KSFT_TEST:-$(basename "${0}" .sh)}"
+ 
+-# These variables are used in some selftests, read-only
+-declare -rx MPTCP_LIB_EVENT_ANNOUNCED=6         # MPTCP_EVENT_ANNOUNCED
+-declare -rx MPTCP_LIB_EVENT_REMOVED=7           # MPTCP_EVENT_REMOVED
+-declare -rx MPTCP_LIB_EVENT_SUB_ESTABLISHED=10  # MPTCP_EVENT_SUB_ESTABLISHED
+-declare -rx MPTCP_LIB_EVENT_SUB_CLOSED=11       # MPTCP_EVENT_SUB_CLOSED
+-declare -rx MPTCP_LIB_EVENT_LISTENER_CREATED=15 # MPTCP_EVENT_LISTENER_CREATED
+-declare -rx MPTCP_LIB_EVENT_LISTENER_CLOSED=16  # MPTCP_EVENT_LISTENER_CLOSED
+-
+-declare -rx MPTCP_LIB_AF_INET=2
+-declare -rx MPTCP_LIB_AF_INET6=10
+-
+ # These variables are used in some selftests, read-only
+ declare -rx MPTCP_LIB_EVENT_CREATED=1           # MPTCP_EVENT_CREATED
+ declare -rx MPTCP_LIB_EVENT_ESTABLISHED=2       # MPTCP_EVENT_ESTABLISHED
diff --git a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.58-59.patch b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.58-59.patch
new file mode 100644
index 000000000000..aa89d7dfc4ba
--- /dev/null
+++ b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.58-59.patch
@@ -0,0 +1,10051 @@
+diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
+index 7735e08d35ba14..beef193aaaeba0 100644
+--- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
++++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
+@@ -102,21 +102,21 @@ properties:
+     default: 2
+ 
+   interrupts:
+-    anyOf:
+-      - minItems: 1
+-        items:
+-          - description: TX interrupt
+-          - description: RX interrupt
+-      - items:
+-          - description: common/combined interrupt
++    minItems: 1
++    maxItems: 2
+ 
+   interrupt-names:
+     oneOf:
+-      - minItems: 1
++      - description: TX interrupt
++        const: tx
++      - description: RX interrupt
++        const: rx
++      - description: TX and RX interrupts
+         items:
+           - const: tx
+           - const: rx
+-      - const: common
++      - description: Common/combined interrupt
++        const: common
+ 
+   fck_parent:
+     $ref: /schemas/types.yaml#/definitions/string
+diff --git a/Makefile b/Makefile
+index f80e78c7cf2006..8a55af189f369a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ VERSION = 6
+ PATCHLEVEL = 6
+-SUBLEVEL = 58
++SUBLEVEL = 59
+ EXTRAVERSION =
+ NAME = Pinguïn Aangedreven
+ 
+diff --git a/arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts b/arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts
+index 72d26d130efaa4..85f54fa595aa8f 100644
+--- a/arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts
++++ b/arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts
+@@ -77,7 +77,7 @@ &gpio {
+ };
+ 
+ &hdmi {
+-	hpd-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
++	hpd-gpios = <&expgpio 0 GPIO_ACTIVE_LOW>;
+ 	power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
+ 	status = "okay";
+ };
+diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
+index 9a2d3723cd0fa9..11782860717fae 100644
+--- a/arch/arm64/Makefile
++++ b/arch/arm64/Makefile
+@@ -10,7 +10,7 @@
+ #
+ # Copyright (C) 1995-2001 by Russell King
+ 
+-LDFLAGS_vmlinux	:=--no-undefined -X
++LDFLAGS_vmlinux	:=--no-undefined -X --pic-veneer
+ 
+ ifeq ($(CONFIG_RELOCATABLE), y)
+ # Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour
+diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
+index 685cc436146a5a..18413d869cca1a 100644
+--- a/arch/arm64/kvm/arm.c
++++ b/arch/arm64/kvm/arm.c
+@@ -777,6 +777,9 @@ static int kvm_vcpu_suspend(struct kvm_vcpu *vcpu)
+ static int check_vcpu_requests(struct kvm_vcpu *vcpu)
+ {
+ 	if (kvm_request_pending(vcpu)) {
++		if (kvm_check_request(KVM_REQ_VM_DEAD, vcpu))
++			return -EIO;
++
+ 		if (kvm_check_request(KVM_REQ_SLEEP, vcpu))
+ 			kvm_vcpu_sleep(vcpu);
+ 
+diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
+index b233a64df2956a..370a1a7bd369dc 100644
+--- a/arch/arm64/kvm/sys_regs.c
++++ b/arch/arm64/kvm/sys_regs.c
+@@ -1708,7 +1708,7 @@ static u64 reset_clidr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
+ 	 * one cache line.
+ 	 */
+ 	if (kvm_has_mte(vcpu->kvm))
+-		clidr |= 2 << CLIDR_TTYPE_SHIFT(loc);
++		clidr |= 2ULL << CLIDR_TTYPE_SHIFT(loc);
+ 
+ 	__vcpu_sys_reg(vcpu, r->reg) = clidr;
+ 
+diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c
+index a2b439ad387c80..b7306c588d9d34 100644
+--- a/arch/arm64/kvm/vgic/vgic-init.c
++++ b/arch/arm64/kvm/vgic/vgic-init.c
+@@ -494,10 +494,10 @@ int kvm_vgic_map_resources(struct kvm *kvm)
+ out:
+ 	mutex_unlock(&kvm->arch.config_lock);
+ out_slots:
+-	mutex_unlock(&kvm->slots_lock);
+-
+ 	if (ret)
+-		kvm_vgic_destroy(kvm);
++		kvm_vm_dead(kvm);
++
++	mutex_unlock(&kvm->slots_lock);
+ 
+ 	return ret;
+ }
+diff --git a/arch/loongarch/include/asm/bootinfo.h b/arch/loongarch/include/asm/bootinfo.h
+index c60796869b2b80..d2317fa6a766d6 100644
+--- a/arch/loongarch/include/asm/bootinfo.h
++++ b/arch/loongarch/include/asm/bootinfo.h
+@@ -24,6 +24,10 @@ struct loongson_board_info {
+ 	const char *board_vendor;
+ };
+ 
++/*
++ * The "core" of cores_per_node and cores_per_package stands for a
++ * logical core, which means in a SMT system it stands for a thread.
++ */
+ struct loongson_system_configuration {
+ 	int nr_cpus;
+ 	int nr_nodes;
+diff --git a/arch/loongarch/include/asm/kasan.h b/arch/loongarch/include/asm/kasan.h
+index cd6084f4e153fe..c6bce5fbff57b0 100644
+--- a/arch/loongarch/include/asm/kasan.h
++++ b/arch/loongarch/include/asm/kasan.h
+@@ -16,7 +16,7 @@
+ #define XRANGE_SHIFT (48)
+ 
+ /* Valid address length */
+-#define XRANGE_SHADOW_SHIFT	(PGDIR_SHIFT + PAGE_SHIFT - 3)
++#define XRANGE_SHADOW_SHIFT	min(cpu_vabits, VA_BITS)
+ /* Used for taking out the valid address */
+ #define XRANGE_SHADOW_MASK	GENMASK_ULL(XRANGE_SHADOW_SHIFT - 1, 0)
+ /* One segment whole address space size */
+diff --git a/arch/loongarch/kernel/process.c b/arch/loongarch/kernel/process.c
+index f2ff8b5d591e4f..6e58f65455c7ca 100644
+--- a/arch/loongarch/kernel/process.c
++++ b/arch/loongarch/kernel/process.c
+@@ -293,13 +293,15 @@ unsigned long stack_top(void)
+ {
+ 	unsigned long top = TASK_SIZE & PAGE_MASK;
+ 
+-	/* Space for the VDSO & data page */
+-	top -= PAGE_ALIGN(current->thread.vdso->size);
+-	top -= VVAR_SIZE;
+-
+-	/* Space to randomize the VDSO base */
+-	if (current->flags & PF_RANDOMIZE)
+-		top -= VDSO_RANDOMIZE_SIZE;
++	if (current->thread.vdso) {
++		/* Space for the VDSO & data page */
++		top -= PAGE_ALIGN(current->thread.vdso->size);
++		top -= VVAR_SIZE;
++
++		/* Space to randomize the VDSO base */
++		if (current->flags & PF_RANDOMIZE)
++			top -= VDSO_RANDOMIZE_SIZE;
++	}
+ 
+ 	return top;
+ }
+diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c
+index 6748d7f3f22198..065f2db57c0992 100644
+--- a/arch/loongarch/kernel/setup.c
++++ b/arch/loongarch/kernel/setup.c
+@@ -55,6 +55,7 @@
+ #define SMBIOS_FREQHIGH_OFFSET		0x17
+ #define SMBIOS_FREQLOW_MASK		0xFF
+ #define SMBIOS_CORE_PACKAGE_OFFSET	0x23
++#define SMBIOS_THREAD_PACKAGE_OFFSET	0x25
+ #define LOONGSON_EFI_ENABLE		(1 << 3)
+ 
+ #ifdef CONFIG_EFI
+@@ -129,7 +130,7 @@ static void __init parse_cpu_table(const struct dmi_header *dm)
+ 	cpu_clock_freq = freq_temp * 1000000;
+ 
+ 	loongson_sysconf.cpuname = (void *)dmi_string_parse(dm, dmi_data[16]);
+-	loongson_sysconf.cores_per_package = *(dmi_data + SMBIOS_CORE_PACKAGE_OFFSET);
++	loongson_sysconf.cores_per_package = *(dmi_data + SMBIOS_THREAD_PACKAGE_OFFSET);
+ 
+ 	pr_info("CpuClock = %llu\n", cpu_clock_freq);
+ }
+diff --git a/arch/loongarch/kernel/traps.c b/arch/loongarch/kernel/traps.c
+index aebfc3733a7607..d59052c03d9b7e 100644
+--- a/arch/loongarch/kernel/traps.c
++++ b/arch/loongarch/kernel/traps.c
+@@ -529,6 +529,9 @@ asmlinkage void noinstr do_ale(struct pt_regs *regs)
+ #else
+ 	unsigned int *pc;
+ 
++	if (regs->csr_prmd & CSR_PRMD_PIE)
++		local_irq_enable();
++
+ 	perf_sw_event(PERF_COUNT_SW_ALIGNMENT_FAULTS, 1, regs, regs->csr_badvaddr);
+ 
+ 	/*
+@@ -553,6 +556,8 @@ asmlinkage void noinstr do_ale(struct pt_regs *regs)
+ 	die_if_kernel("Kernel ale access", regs);
+ 	force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)regs->csr_badvaddr);
+ out:
++	if (regs->csr_prmd & CSR_PRMD_PIE)
++		local_irq_disable();
+ #endif
+ 	irqentry_exit(regs, state);
+ }
+diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
+index 2f041b5cea970e..26eeb397363193 100644
+--- a/arch/riscv/net/bpf_jit_comp64.c
++++ b/arch/riscv/net/bpf_jit_comp64.c
+@@ -555,8 +555,8 @@ static void emit_atomic(u8 rd, u8 rs, s16 off, s32 imm, bool is64,
+ 		     rv_lr_w(r0, 0, rd, 0, 0), ctx);
+ 		jmp_offset = ninsns_rvoff(8);
+ 		emit(rv_bne(RV_REG_T2, r0, jmp_offset >> 1), ctx);
+-		emit(is64 ? rv_sc_d(RV_REG_T3, rs, rd, 0, 0) :
+-		     rv_sc_w(RV_REG_T3, rs, rd, 0, 0), ctx);
++		emit(is64 ? rv_sc_d(RV_REG_T3, rs, rd, 0, 1) :
++		     rv_sc_w(RV_REG_T3, rs, rd, 0, 1), ctx);
+ 		jmp_offset = ninsns_rvoff(-6);
+ 		emit(rv_bne(RV_REG_T3, 0, jmp_offset >> 1), ctx);
+ 		emit(rv_fence(0x3, 0x3), ctx);
+diff --git a/arch/s390/include/asm/perf_event.h b/arch/s390/include/asm/perf_event.h
+index 9917e2717b2b42..66aff768f8151d 100644
+--- a/arch/s390/include/asm/perf_event.h
++++ b/arch/s390/include/asm/perf_event.h
+@@ -73,6 +73,7 @@ struct perf_sf_sde_regs {
+ #define SAMPLE_FREQ_MODE(hwc)	(SAMPL_FLAGS(hwc) & PERF_CPUM_SF_FREQ_MODE)
+ 
+ #define perf_arch_fetch_caller_regs(regs, __ip) do {			\
++	(regs)->psw.mask = 0;						\
+ 	(regs)->psw.addr = (__ip);					\
+ 	(regs)->gprs[15] = (unsigned long)__builtin_frame_address(0) -	\
+ 		offsetof(struct stack_frame, back_chain);		\
+diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c
+index b9324ca2eb9403..b3961f1016ea0b 100644
+--- a/arch/s390/pci/pci_event.c
++++ b/arch/s390/pci/pci_event.c
+@@ -272,18 +272,19 @@ static void __zpci_event_error(struct zpci_ccdf_err *ccdf)
+ 		goto no_pdev;
+ 
+ 	switch (ccdf->pec) {
+-	case 0x003a: /* Service Action or Error Recovery Successful */
++	case 0x002a: /* Error event concerns FMB */
++	case 0x002b:
++	case 0x002c:
++		break;
++	case 0x0040: /* Service Action or Error Recovery Failed */
++	case 0x003b:
++		zpci_event_io_failure(pdev, pci_channel_io_perm_failure);
++		break;
++	default: /* PCI function left in the error state attempt to recover */
+ 		ers_res = zpci_event_attempt_error_recovery(pdev);
+ 		if (ers_res != PCI_ERS_RESULT_RECOVERED)
+ 			zpci_event_io_failure(pdev, pci_channel_io_perm_failure);
+ 		break;
+-	default:
+-		/*
+-		 * Mark as frozen not permanently failed because the device
+-		 * could be subsequently recovered by the platform.
+-		 */
+-		zpci_event_io_failure(pdev, pci_channel_io_frozen);
+-		break;
+ 	}
+ 	pci_dev_put(pdev);
+ no_pdev:
+diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
+index 82d12c93feabe6..05c82fd5d0f60b 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -2217,6 +2217,7 @@ config RANDOMIZE_MEMORY_PHYSICAL_PADDING
+ config ADDRESS_MASKING
+ 	bool "Linear Address Masking support"
+ 	depends on X86_64
++	depends on COMPILE_TEST || !CPU_MITIGATIONS # wait for LASS
+ 	help
+ 	  Linear Address Masking (LAM) modifies the checking that is applied
+ 	  to 64-bit linear addresses, allowing software to use of the
+diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
+index b44c487727d456..a701e7921ea5c7 100644
+--- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
++++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
+@@ -27,10 +27,10 @@
+  * hardware. The allocated bandwidth percentage is rounded to the next
+  * control step available on the hardware.
+  */
+-static bool bw_validate(char *buf, unsigned long *data, struct rdt_resource *r)
++static bool bw_validate(char *buf, u32 *data, struct rdt_resource *r)
+ {
+-	unsigned long bw;
+ 	int ret;
++	u32 bw;
+ 
+ 	/*
+ 	 * Only linear delay values is supported for current Intel SKUs.
+@@ -40,16 +40,21 @@ static bool bw_validate(char *buf, unsigned long *data, struct rdt_resource *r)
+ 		return false;
+ 	}
+ 
+-	ret = kstrtoul(buf, 10, &bw);
++	ret = kstrtou32(buf, 10, &bw);
+ 	if (ret) {
+-		rdt_last_cmd_printf("Non-decimal digit in MB value %s\n", buf);
++		rdt_last_cmd_printf("Invalid MB value %s\n", buf);
+ 		return false;
+ 	}
+ 
+-	if ((bw < r->membw.min_bw || bw > r->default_ctrl) &&
+-	    !is_mba_sc(r)) {
+-		rdt_last_cmd_printf("MB value %ld out of range [%d,%d]\n", bw,
+-				    r->membw.min_bw, r->default_ctrl);
++	/* Nothing else to do if software controller is enabled. */
++	if (is_mba_sc(r)) {
++		*data = bw;
++		return true;
++	}
++
++	if (bw < r->membw.min_bw || bw > r->default_ctrl) {
++		rdt_last_cmd_printf("MB value %u out of range [%d,%d]\n",
++				    bw, r->membw.min_bw, r->default_ctrl);
+ 		return false;
+ 	}
+ 
+@@ -63,7 +68,7 @@ int parse_bw(struct rdt_parse_data *data, struct resctrl_schema *s,
+ 	struct resctrl_staged_config *cfg;
+ 	u32 closid = data->rdtgrp->closid;
+ 	struct rdt_resource *r = s->res;
+-	unsigned long bw_val;
++	u32 bw_val;
+ 
+ 	cfg = &d->staged_config[s->conf_type];
+ 	if (cfg->have_new_ctrl) {
+diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
+index 60891b9ce25f61..acf22bd99efcd8 100644
+--- a/arch/x86/kvm/svm/nested.c
++++ b/arch/x86/kvm/svm/nested.c
+@@ -63,8 +63,12 @@ static u64 nested_svm_get_tdp_pdptr(struct kvm_vcpu *vcpu, int index)
+ 	u64 pdpte;
+ 	int ret;
+ 
++	/*
++	 * Note, nCR3 is "assumed" to be 32-byte aligned, i.e. the CPU ignores
++	 * nCR3[4:0] when loading PDPTEs from memory.
++	 */
+ 	ret = kvm_vcpu_read_guest_page(vcpu, gpa_to_gfn(cr3), &pdpte,
+-				       offset_in_page(cr3) + index * 8, 8);
++				       (cr3 & GENMASK(11, 5)) + index * 8, 8);
+ 	if (ret)
+ 		return 0;
+ 	return pdpte;
+diff --git a/drivers/accel/qaic/qaic_control.c b/drivers/accel/qaic/qaic_control.c
+index 388abd40024ba4..f3db3fa91dd52e 100644
+--- a/drivers/accel/qaic/qaic_control.c
++++ b/drivers/accel/qaic/qaic_control.c
+@@ -496,7 +496,7 @@ static int encode_addr_size_pairs(struct dma_xfer *xfer, struct wrapper_list *wr
+ 	nents = sgt->nents;
+ 	nents_dma = nents;
+ 	*size = QAIC_MANAGE_EXT_MSG_LENGTH - msg_hdr_len - sizeof(**out_trans);
+-	for_each_sgtable_sg(sgt, sg, i) {
++	for_each_sgtable_dma_sg(sgt, sg, i) {
+ 		*size -= sizeof(*asp);
+ 		/* Save 1K for possible follow-up transactions. */
+ 		if (*size < SZ_1K) {
+diff --git a/drivers/accel/qaic/qaic_data.c b/drivers/accel/qaic/qaic_data.c
+index ed1a5af434f246..d2f8c70a77a5b4 100644
+--- a/drivers/accel/qaic/qaic_data.c
++++ b/drivers/accel/qaic/qaic_data.c
+@@ -177,7 +177,7 @@ static int clone_range_of_sgt_for_slice(struct qaic_device *qdev, struct sg_tabl
+ 	nents = 0;
+ 
+ 	size = size ? size : PAGE_SIZE;
+-	for (sg = sgt_in->sgl; sg; sg = sg_next(sg)) {
++	for_each_sgtable_dma_sg(sgt_in, sg, j) {
+ 		len = sg_dma_len(sg);
+ 
+ 		if (!len)
+@@ -214,7 +214,7 @@ static int clone_range_of_sgt_for_slice(struct qaic_device *qdev, struct sg_tabl
+ 
+ 	/* copy relevant sg node and fix page and length */
+ 	sgn = sgf;
+-	for_each_sgtable_sg(sgt, sg, j) {
++	for_each_sgtable_dma_sg(sgt, sg, j) {
+ 		memcpy(sg, sgn, sizeof(*sg));
+ 		if (sgn == sgf) {
+ 			sg_dma_address(sg) += offf;
+@@ -294,7 +294,7 @@ static int encode_reqs(struct qaic_device *qdev, struct bo_slice *slice,
+ 	 * fence.
+ 	 */
+ 	dev_addr = req->dev_addr;
+-	for_each_sgtable_sg(slice->sgt, sg, i) {
++	for_each_sgtable_dma_sg(slice->sgt, sg, i) {
+ 		slice->reqs[i].cmd = cmd;
+ 		slice->reqs[i].src_addr = cpu_to_le64(slice->dir == DMA_TO_DEVICE ?
+ 						      sg_dma_address(sg) : dev_addr);
+diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
+index 1e76a64cce0a91..906a7bfa448b31 100644
+--- a/drivers/acpi/button.c
++++ b/drivers/acpi/button.c
+@@ -130,6 +130,17 @@ static const struct dmi_system_id dmi_lid_quirks[] = {
+ 		},
+ 		.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_OPEN,
+ 	},
++	{
++		/*
++		 * Samsung galaxybook2 ,initial _LID device notification returns
++		 * lid closed.
++		 */
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
++			DMI_MATCH(DMI_PRODUCT_NAME, "750XED"),
++		},
++		.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_OPEN,
++	},
+ 	{}
+ };
+ 
+diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c
+index 7aced0b9bad7cc..5df417626fd109 100644
+--- a/drivers/acpi/cppc_acpi.c
++++ b/drivers/acpi/cppc_acpi.c
+@@ -39,6 +39,9 @@
+ #include <linux/rwsem.h>
+ #include <linux/wait.h>
+ #include <linux/topology.h>
++#include <linux/dmi.h>
++#include <linux/units.h>
++#include <asm/unaligned.h>
+ 
+ #include <acpi/cppc_acpi.h>
+ 
+@@ -1858,3 +1861,116 @@ unsigned int cppc_get_transition_latency(int cpu_num)
+ 	return latency_ns;
+ }
+ EXPORT_SYMBOL_GPL(cppc_get_transition_latency);
++
++/* Minimum struct length needed for the DMI processor entry we want */
++#define DMI_ENTRY_PROCESSOR_MIN_LENGTH	48
++
++/* Offset in the DMI processor structure for the max frequency */
++#define DMI_PROCESSOR_MAX_SPEED		0x14
++
++/* Callback function used to retrieve the max frequency from DMI */
++static void cppc_find_dmi_mhz(const struct dmi_header *dm, void *private)
++{
++	const u8 *dmi_data = (const u8 *)dm;
++	u16 *mhz = (u16 *)private;
++
++	if (dm->type == DMI_ENTRY_PROCESSOR &&
++	    dm->length >= DMI_ENTRY_PROCESSOR_MIN_LENGTH) {
++		u16 val = (u16)get_unaligned((const u16 *)
++				(dmi_data + DMI_PROCESSOR_MAX_SPEED));
++		*mhz = val > *mhz ? val : *mhz;
++	}
++}
++
++/* Look up the max frequency in DMI */
++static u64 cppc_get_dmi_max_khz(void)
++{
++	u16 mhz = 0;
++
++	dmi_walk(cppc_find_dmi_mhz, &mhz);
++
++	/*
++	 * Real stupid fallback value, just in case there is no
++	 * actual value set.
++	 */
++	mhz = mhz ? mhz : 1;
++
++	return KHZ_PER_MHZ * mhz;
++}
++
++/*
++ * If CPPC lowest_freq and nominal_freq registers are exposed then we can
++ * use them to convert perf to freq and vice versa. The conversion is
++ * extrapolated as an affine function passing by the 2 points:
++ *  - (Low perf, Low freq)
++ *  - (Nominal perf, Nominal freq)
++ */
++unsigned int cppc_perf_to_khz(struct cppc_perf_caps *caps, unsigned int perf)
++{
++	s64 retval, offset = 0;
++	static u64 max_khz;
++	u64 mul, div;
++
++	if (caps->lowest_freq && caps->nominal_freq) {
++		/* Avoid special case when nominal_freq is equal to lowest_freq */
++		if (caps->lowest_freq == caps->nominal_freq) {
++			mul = caps->nominal_freq;
++			div = caps->nominal_perf;
++		} else {
++			mul = caps->nominal_freq - caps->lowest_freq;
++			div = caps->nominal_perf - caps->lowest_perf;
++		}
++		mul *= KHZ_PER_MHZ;
++		offset = caps->nominal_freq * KHZ_PER_MHZ -
++			 div64_u64(caps->nominal_perf * mul, div);
++	} else {
++		if (!max_khz)
++			max_khz = cppc_get_dmi_max_khz();
++		mul = max_khz;
++		div = caps->highest_perf;
++	}
++
++	retval = offset + div64_u64(perf * mul, div);
++	if (retval >= 0)
++		return retval;
++	return 0;
++}
++EXPORT_SYMBOL_GPL(cppc_perf_to_khz);
++
++unsigned int cppc_khz_to_perf(struct cppc_perf_caps *caps, unsigned int freq)
++{
++	s64 retval, offset = 0;
++	static u64 max_khz;
++	u64 mul, div;
++
++	if (caps->lowest_freq && caps->nominal_freq) {
++		/* Avoid special case when nominal_freq is equal to lowest_freq */
++		if (caps->lowest_freq == caps->nominal_freq) {
++			mul = caps->nominal_perf;
++			div = caps->nominal_freq;
++		} else {
++			mul = caps->nominal_perf - caps->lowest_perf;
++			div = caps->nominal_freq - caps->lowest_freq;
++		}
++		/*
++		 * We don't need to convert to kHz for computing offset and can
++		 * directly use nominal_freq and lowest_freq as the div64_u64
++		 * will remove the frequency unit.
++		 */
++		offset = caps->nominal_perf -
++			 div64_u64(caps->nominal_freq * mul, div);
++		/* But we need it for computing the perf level. */
++		div *= KHZ_PER_MHZ;
++	} else {
++		if (!max_khz)
++			max_khz = cppc_get_dmi_max_khz();
++		mul = caps->highest_perf;
++		div = max_khz;
++	}
++
++	retval = offset + div64_u64(freq * mul, div);
++	if (retval >= 0)
++		return retval;
++	return 0;
++}
++EXPORT_SYMBOL_GPL(cppc_khz_to_perf);
+diff --git a/drivers/acpi/prmt.c b/drivers/acpi/prmt.c
+index 7020584096bfaa..8b391f12853bb6 100644
+--- a/drivers/acpi/prmt.c
++++ b/drivers/acpi/prmt.c
+@@ -52,7 +52,7 @@ struct prm_context_buffer {
+ static LIST_HEAD(prm_module_list);
+ 
+ struct prm_handler_info {
+-	guid_t guid;
++	efi_guid_t guid;
+ 	efi_status_t (__efiapi *handler_addr)(u64, void *);
+ 	u64 static_data_buffer_addr;
+ 	u64 acpi_param_buffer_addr;
+@@ -72,17 +72,21 @@ struct prm_module_info {
+ 	struct prm_handler_info handlers[];
+ };
+ 
+-static u64 efi_pa_va_lookup(u64 pa)
++static u64 efi_pa_va_lookup(efi_guid_t *guid, u64 pa)
+ {
+ 	efi_memory_desc_t *md;
+ 	u64 pa_offset = pa & ~PAGE_MASK;
+ 	u64 page = pa & PAGE_MASK;
+ 
+ 	for_each_efi_memory_desc(md) {
+-		if (md->phys_addr < pa && pa < md->phys_addr + PAGE_SIZE * md->num_pages)
++		if ((md->attribute & EFI_MEMORY_RUNTIME) &&
++		    (md->phys_addr < pa && pa < md->phys_addr + PAGE_SIZE * md->num_pages)) {
+ 			return pa_offset + md->virt_addr + page - md->phys_addr;
++		}
+ 	}
+ 
++	pr_warn("Failed to find VA for GUID: %pUL, PA: 0x%llx", guid, pa);
++
+ 	return 0;
+ }
+ 
+@@ -148,9 +152,15 @@ acpi_parse_prmt(union acpi_subtable_headers *header, const unsigned long end)
+ 		th = &tm->handlers[cur_handler];
+ 
+ 		guid_copy(&th->guid, (guid_t *)handler_info->handler_guid);
+-		th->handler_addr = (void *)efi_pa_va_lookup(handler_info->handler_address);
+-		th->static_data_buffer_addr = efi_pa_va_lookup(handler_info->static_data_buffer_address);
+-		th->acpi_param_buffer_addr = efi_pa_va_lookup(handler_info->acpi_param_buffer_address);
++		th->handler_addr =
++			(void *)efi_pa_va_lookup(&th->guid, handler_info->handler_address);
++
++		th->static_data_buffer_addr =
++			efi_pa_va_lookup(&th->guid, handler_info->static_data_buffer_address);
++
++		th->acpi_param_buffer_addr =
++			efi_pa_va_lookup(&th->guid, handler_info->acpi_param_buffer_address);
++
+ 	} while (++cur_handler < tm->handler_count && (handler_info = get_next_handler(handler_info)));
+ 
+ 	return 0;
+@@ -253,6 +263,13 @@ static acpi_status acpi_platformrt_space_handler(u32 function,
+ 		if (!handler || !module)
+ 			goto invalid_guid;
+ 
++		if (!handler->handler_addr ||
++		    !handler->static_data_buffer_addr ||
++		    !handler->acpi_param_buffer_addr) {
++			buffer->prm_status = PRM_HANDLER_ERROR;
++			return AE_OK;
++		}
++
+ 		ACPI_COPY_NAMESEG(context.signature, "PRMC");
+ 		context.revision = 0x0;
+ 		context.reserved = 0x0;
+diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
+index 95233b413c1ac5..d3d776d4fb5a74 100644
+--- a/drivers/acpi/resource.c
++++ b/drivers/acpi/resource.c
+@@ -498,6 +498,13 @@ static const struct dmi_system_id tongfang_gm_rg[] = {
+ 			DMI_MATCH(DMI_BOARD_NAME, "GMxRGxx"),
+ 		},
+ 	},
++	{
++		/* LG Electronics 16T90SP */
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "LG Electronics"),
++			DMI_MATCH(DMI_BOARD_NAME, "16T90SP"),
++		},
++	},
+ 	{ }
+ };
+ 
+diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
+index a96566e1b2b84c..9cc02252218497 100644
+--- a/drivers/ata/libata-eh.c
++++ b/drivers/ata/libata-eh.c
+@@ -636,6 +636,7 @@ void ata_scsi_cmd_error_handler(struct Scsi_Host *host, struct ata_port *ap,
+ 			/* the scmd has an associated qc */
+ 			if (!(qc->flags & ATA_QCFLAG_EH)) {
+ 				/* which hasn't failed yet, timeout */
++				set_host_byte(scmd, DID_TIME_OUT);
+ 				qc->err_mask |= AC_ERR_TIMEOUT;
+ 				qc->flags |= ATA_QCFLAG_EH;
+ 				nr_timedout++;
+diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
+index 01f46caf1f88b7..54b80911f3e286 100644
+--- a/drivers/cdrom/cdrom.c
++++ b/drivers/cdrom/cdrom.c
+@@ -2313,7 +2313,7 @@ static int cdrom_ioctl_media_changed(struct cdrom_device_info *cdi,
+ 		return -EINVAL;
+ 
+ 	/* Prevent arg from speculatively bypassing the length check */
+-	barrier_nospec();
++	arg = array_index_nospec(arg, cdi->capacity);
+ 
+ 	info = kmalloc(sizeof(*info), GFP_KERNEL);
+ 	if (!info)
+diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
+index f461f99eb040c6..8c16d67b98bfe4 100644
+--- a/drivers/cpufreq/amd-pstate.c
++++ b/drivers/cpufreq/amd-pstate.c
+@@ -1061,11 +1061,21 @@ static int amd_pstate_register_driver(int mode)
+ 		return -EINVAL;
+ 
+ 	cppc_state = mode;
++
++	ret = amd_pstate_enable(true);
++	if (ret) {
++		pr_err("failed to enable cppc during amd-pstate driver registration, return %d\n",
++		       ret);
++		amd_pstate_driver_cleanup();
++		return ret;
++	}
++
+ 	ret = cpufreq_register_driver(current_pstate_driver);
+ 	if (ret) {
+ 		amd_pstate_driver_cleanup();
+ 		return ret;
+ 	}
++
+ 	return 0;
+ }
+ 
+diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c
+index 1ba3943be8a3dd..15f1d41920a339 100644
+--- a/drivers/cpufreq/cppc_cpufreq.c
++++ b/drivers/cpufreq/cppc_cpufreq.c
+@@ -16,7 +16,6 @@
+ #include <linux/delay.h>
+ #include <linux/cpu.h>
+ #include <linux/cpufreq.h>
+-#include <linux/dmi.h>
+ #include <linux/irq_work.h>
+ #include <linux/kthread.h>
+ #include <linux/time.h>
+@@ -27,12 +26,6 @@
+ 
+ #include <acpi/cppc_acpi.h>
+ 
+-/* Minimum struct length needed for the DMI processor entry we want */
+-#define DMI_ENTRY_PROCESSOR_MIN_LENGTH	48
+-
+-/* Offset in the DMI processor structure for the max frequency */
+-#define DMI_PROCESSOR_MAX_SPEED		0x14
+-
+ /*
+  * This list contains information parsed from per CPU ACPI _CPC and _PSD
+  * structures: e.g. the highest and lowest supported performance, capabilities,
+@@ -291,97 +284,9 @@ static inline void cppc_freq_invariance_exit(void)
+ }
+ #endif /* CONFIG_ACPI_CPPC_CPUFREQ_FIE */
+ 
+-/* Callback function used to retrieve the max frequency from DMI */
+-static void cppc_find_dmi_mhz(const struct dmi_header *dm, void *private)
+-{
+-	const u8 *dmi_data = (const u8 *)dm;
+-	u16 *mhz = (u16 *)private;
+-
+-	if (dm->type == DMI_ENTRY_PROCESSOR &&
+-	    dm->length >= DMI_ENTRY_PROCESSOR_MIN_LENGTH) {
+-		u16 val = (u16)get_unaligned((const u16 *)
+-				(dmi_data + DMI_PROCESSOR_MAX_SPEED));
+-		*mhz = val > *mhz ? val : *mhz;
+-	}
+-}
+-
+-/* Look up the max frequency in DMI */
+-static u64 cppc_get_dmi_max_khz(void)
+-{
+-	u16 mhz = 0;
+-
+-	dmi_walk(cppc_find_dmi_mhz, &mhz);
+-
+-	/*
+-	 * Real stupid fallback value, just in case there is no
+-	 * actual value set.
+-	 */
+-	mhz = mhz ? mhz : 1;
+-
+-	return (1000 * mhz);
+-}
+-
+-/*
+- * If CPPC lowest_freq and nominal_freq registers are exposed then we can
+- * use them to convert perf to freq and vice versa. The conversion is
+- * extrapolated as an affine function passing by the 2 points:
+- *  - (Low perf, Low freq)
+- *  - (Nominal perf, Nominal perf)
+- */
+-static unsigned int cppc_cpufreq_perf_to_khz(struct cppc_cpudata *cpu_data,
+-					     unsigned int perf)
+-{
+-	struct cppc_perf_caps *caps = &cpu_data->perf_caps;
+-	s64 retval, offset = 0;
+-	static u64 max_khz;
+-	u64 mul, div;
+-
+-	if (caps->lowest_freq && caps->nominal_freq) {
+-		mul = caps->nominal_freq - caps->lowest_freq;
+-		div = caps->nominal_perf - caps->lowest_perf;
+-		offset = caps->nominal_freq - div64_u64(caps->nominal_perf * mul, div);
+-	} else {
+-		if (!max_khz)
+-			max_khz = cppc_get_dmi_max_khz();
+-		mul = max_khz;
+-		div = caps->highest_perf;
+-	}
+-
+-	retval = offset + div64_u64(perf * mul, div);
+-	if (retval >= 0)
+-		return retval;
+-	return 0;
+-}
+-
+-static unsigned int cppc_cpufreq_khz_to_perf(struct cppc_cpudata *cpu_data,
+-					     unsigned int freq)
+-{
+-	struct cppc_perf_caps *caps = &cpu_data->perf_caps;
+-	s64 retval, offset = 0;
+-	static u64 max_khz;
+-	u64  mul, div;
+-
+-	if (caps->lowest_freq && caps->nominal_freq) {
+-		mul = caps->nominal_perf - caps->lowest_perf;
+-		div = caps->nominal_freq - caps->lowest_freq;
+-		offset = caps->nominal_perf - div64_u64(caps->nominal_freq * mul, div);
+-	} else {
+-		if (!max_khz)
+-			max_khz = cppc_get_dmi_max_khz();
+-		mul = caps->highest_perf;
+-		div = max_khz;
+-	}
+-
+-	retval = offset + div64_u64(freq * mul, div);
+-	if (retval >= 0)
+-		return retval;
+-	return 0;
+-}
+-
+ static int cppc_cpufreq_set_target(struct cpufreq_policy *policy,
+ 				   unsigned int target_freq,
+ 				   unsigned int relation)
+-
+ {
+ 	struct cppc_cpudata *cpu_data = policy->driver_data;
+ 	unsigned int cpu = policy->cpu;
+@@ -389,7 +294,7 @@ static int cppc_cpufreq_set_target(struct cpufreq_policy *policy,
+ 	u32 desired_perf;
+ 	int ret = 0;
+ 
+-	desired_perf = cppc_cpufreq_khz_to_perf(cpu_data, target_freq);
++	desired_perf = cppc_khz_to_perf(&cpu_data->perf_caps, target_freq);
+ 	/* Return if it is exactly the same perf */
+ 	if (desired_perf == cpu_data->perf_ctrls.desired_perf)
+ 		return ret;
+@@ -417,7 +322,7 @@ static unsigned int cppc_cpufreq_fast_switch(struct cpufreq_policy *policy,
+ 	u32 desired_perf;
+ 	int ret;
+ 
+-	desired_perf = cppc_cpufreq_khz_to_perf(cpu_data, target_freq);
++	desired_perf = cppc_khz_to_perf(&cpu_data->perf_caps, target_freq);
+ 	cpu_data->perf_ctrls.desired_perf = desired_perf;
+ 	ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls);
+ 
+@@ -530,7 +435,7 @@ static int cppc_get_cpu_power(struct device *cpu_dev,
+ 	min_step = min_cap / CPPC_EM_CAP_STEP;
+ 	max_step = max_cap / CPPC_EM_CAP_STEP;
+ 
+-	perf_prev = cppc_cpufreq_khz_to_perf(cpu_data, *KHz);
++	perf_prev = cppc_khz_to_perf(perf_caps, *KHz);
+ 	step = perf_prev / perf_step;
+ 
+ 	if (step > max_step)
+@@ -550,8 +455,8 @@ static int cppc_get_cpu_power(struct device *cpu_dev,
+ 			perf = step * perf_step;
+ 	}
+ 
+-	*KHz = cppc_cpufreq_perf_to_khz(cpu_data, perf);
+-	perf_check = cppc_cpufreq_khz_to_perf(cpu_data, *KHz);
++	*KHz = cppc_perf_to_khz(perf_caps, perf);
++	perf_check = cppc_khz_to_perf(perf_caps, *KHz);
+ 	step_check = perf_check / perf_step;
+ 
+ 	/*
+@@ -561,8 +466,8 @@ static int cppc_get_cpu_power(struct device *cpu_dev,
+ 	 */
+ 	while ((*KHz == prev_freq) || (step_check != step)) {
+ 		perf++;
+-		*KHz = cppc_cpufreq_perf_to_khz(cpu_data, perf);
+-		perf_check = cppc_cpufreq_khz_to_perf(cpu_data, *KHz);
++		*KHz = cppc_perf_to_khz(perf_caps, perf);
++		perf_check = cppc_khz_to_perf(perf_caps, *KHz);
+ 		step_check = perf_check / perf_step;
+ 	}
+ 
+@@ -591,7 +496,7 @@ static int cppc_get_cpu_cost(struct device *cpu_dev, unsigned long KHz,
+ 	perf_caps = &cpu_data->perf_caps;
+ 	max_cap = arch_scale_cpu_capacity(cpu_dev->id);
+ 
+-	perf_prev = cppc_cpufreq_khz_to_perf(cpu_data, KHz);
++	perf_prev = cppc_khz_to_perf(perf_caps, KHz);
+ 	perf_step = CPPC_EM_CAP_STEP * perf_caps->highest_perf / max_cap;
+ 	step = perf_prev / perf_step;
+ 
+@@ -679,10 +584,6 @@ static struct cppc_cpudata *cppc_cpufreq_get_cpu_data(unsigned int cpu)
+ 		goto free_mask;
+ 	}
+ 
+-	/* Convert the lowest and nominal freq from MHz to KHz */
+-	cpu_data->perf_caps.lowest_freq *= 1000;
+-	cpu_data->perf_caps.nominal_freq *= 1000;
+-
+ 	list_add(&cpu_data->node, &cpu_data_list);
+ 
+ 	return cpu_data;
+@@ -724,20 +625,16 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
+ 	 * Set min to lowest nonlinear perf to avoid any efficiency penalty (see
+ 	 * Section 8.4.7.1.1.5 of ACPI 6.1 spec)
+ 	 */
+-	policy->min = cppc_cpufreq_perf_to_khz(cpu_data,
+-					       caps->lowest_nonlinear_perf);
+-	policy->max = cppc_cpufreq_perf_to_khz(cpu_data,
+-					       caps->nominal_perf);
++	policy->min = cppc_perf_to_khz(caps, caps->lowest_nonlinear_perf);
++	policy->max = cppc_perf_to_khz(caps, caps->nominal_perf);
+ 
+ 	/*
+ 	 * Set cpuinfo.min_freq to Lowest to make the full range of performance
+ 	 * available if userspace wants to use any perf between lowest & lowest
+ 	 * nonlinear perf
+ 	 */
+-	policy->cpuinfo.min_freq = cppc_cpufreq_perf_to_khz(cpu_data,
+-							    caps->lowest_perf);
+-	policy->cpuinfo.max_freq = cppc_cpufreq_perf_to_khz(cpu_data,
+-							    caps->nominal_perf);
++	policy->cpuinfo.min_freq = cppc_perf_to_khz(caps, caps->lowest_perf);
++	policy->cpuinfo.max_freq = cppc_perf_to_khz(caps, caps->nominal_perf);
+ 
+ 	policy->transition_delay_us = cppc_cpufreq_get_transition_delay_us(cpu);
+ 	policy->shared_type = cpu_data->shared_type;
+@@ -773,7 +670,7 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
+ 		boost_supported = true;
+ 
+ 	/* Set policy->cur to max now. The governors will adjust later. */
+-	policy->cur = cppc_cpufreq_perf_to_khz(cpu_data, caps->highest_perf);
++	policy->cur = cppc_perf_to_khz(caps, caps->highest_perf);
+ 	cpu_data->perf_ctrls.desired_perf =  caps->highest_perf;
+ 
+ 	ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls);
+@@ -868,7 +765,7 @@ static unsigned int cppc_cpufreq_get_rate(unsigned int cpu)
+ 	delivered_perf = cppc_perf_from_fbctrs(cpu_data, &fb_ctrs_t0,
+ 					       &fb_ctrs_t1);
+ 
+-	return cppc_cpufreq_perf_to_khz(cpu_data, delivered_perf);
++	return cppc_perf_to_khz(&cpu_data->perf_caps, delivered_perf);
+ }
+ 
+ static int cppc_cpufreq_set_boost(struct cpufreq_policy *policy, int state)
+@@ -883,11 +780,9 @@ static int cppc_cpufreq_set_boost(struct cpufreq_policy *policy, int state)
+ 	}
+ 
+ 	if (state)
+-		policy->max = cppc_cpufreq_perf_to_khz(cpu_data,
+-						       caps->highest_perf);
++		policy->max = cppc_perf_to_khz(caps, caps->highest_perf);
+ 	else
+-		policy->max = cppc_cpufreq_perf_to_khz(cpu_data,
+-						       caps->nominal_perf);
++		policy->max = cppc_perf_to_khz(caps, caps->nominal_perf);
+ 	policy->cpuinfo.max_freq = policy->max;
+ 
+ 	ret = freq_qos_update_request(policy->max_freq_req, policy->max);
+@@ -947,7 +842,7 @@ static unsigned int hisi_cppc_cpufreq_get_rate(unsigned int cpu)
+ 	if (ret < 0)
+ 		return -EIO;
+ 
+-	return cppc_cpufreq_perf_to_khz(cpu_data, desired_perf);
++	return cppc_perf_to_khz(&cpu_data->perf_caps, desired_perf);
+ }
+ 
+ static void cppc_check_hisi_workaround(void)
+diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
+index 87383c05424bdf..3962683e2af9d4 100644
+--- a/drivers/firmware/arm_scmi/driver.c
++++ b/drivers/firmware/arm_scmi/driver.c
+@@ -2603,10 +2603,8 @@ static struct scmi_debug_info *scmi_debugfs_common_setup(struct scmi_info *info)
+ 	dbg->top_dentry = top_dentry;
+ 
+ 	if (devm_add_action_or_reset(info->dev,
+-				     scmi_debugfs_common_cleanup, dbg)) {
+-		scmi_debugfs_common_cleanup(dbg);
++				     scmi_debugfs_common_cleanup, dbg))
+ 		return NULL;
+-	}
+ 
+ 	return dbg;
+ }
+diff --git a/drivers/firmware/arm_scmi/mailbox.c b/drivers/firmware/arm_scmi/mailbox.c
+index b8d470417e8f99..8e513f70b75d4c 100644
+--- a/drivers/firmware/arm_scmi/mailbox.c
++++ b/drivers/firmware/arm_scmi/mailbox.c
+@@ -23,6 +23,7 @@
+  * @chan_receiver: Optional Receiver mailbox unidirectional channel
+  * @cinfo: SCMI channel info
+  * @shmem: Transmit/Receive shared memory area
++ * @chan_lock: Lock that prevents multiple xfers from being queued
+  */
+ struct scmi_mailbox {
+ 	struct mbox_client cl;
+@@ -30,6 +31,7 @@ struct scmi_mailbox {
+ 	struct mbox_chan *chan_receiver;
+ 	struct scmi_chan_info *cinfo;
+ 	struct scmi_shared_mem __iomem *shmem;
++	struct mutex chan_lock;
+ };
+ 
+ #define client_to_scmi_mailbox(c) container_of(c, struct scmi_mailbox, cl)
+@@ -228,6 +230,7 @@ static int mailbox_chan_setup(struct scmi_chan_info *cinfo, struct device *dev,
+ 
+ 	cinfo->transport_info = smbox;
+ 	smbox->cinfo = cinfo;
++	mutex_init(&smbox->chan_lock);
+ 
+ 	return 0;
+ }
+@@ -255,13 +258,23 @@ static int mailbox_send_message(struct scmi_chan_info *cinfo,
+ 	struct scmi_mailbox *smbox = cinfo->transport_info;
+ 	int ret;
+ 
+-	ret = mbox_send_message(smbox->chan, xfer);
++	/*
++	 * The mailbox layer has its own queue. However the mailbox queue
++	 * confuses the per message SCMI timeouts since the clock starts when
++	 * the message is submitted into the mailbox queue. So when multiple
++	 * messages are queued up the clock starts on all messages instead of
++	 * only the one inflight.
++	 */
++	mutex_lock(&smbox->chan_lock);
+ 
+-	/* mbox_send_message returns non-negative value on success, so reset */
+-	if (ret > 0)
+-		ret = 0;
++	ret = mbox_send_message(smbox->chan, xfer);
++	/* mbox_send_message returns non-negative value on success */
++	if (ret < 0) {
++		mutex_unlock(&smbox->chan_lock);
++		return ret;
++	}
+ 
+-	return ret;
++	return 0;
+ }
+ 
+ static void mailbox_mark_txdone(struct scmi_chan_info *cinfo, int ret,
+@@ -269,13 +282,10 @@ static void mailbox_mark_txdone(struct scmi_chan_info *cinfo, int ret,
+ {
+ 	struct scmi_mailbox *smbox = cinfo->transport_info;
+ 
+-	/*
+-	 * NOTE: we might prefer not to need the mailbox ticker to manage the
+-	 * transfer queueing since the protocol layer queues things by itself.
+-	 * Unfortunately, we have to kick the mailbox framework after we have
+-	 * received our message.
+-	 */
+ 	mbox_client_txdone(smbox->chan, ret);
++
++	/* Release channel */
++	mutex_unlock(&smbox->chan_lock);
+ }
+ 
+ static void mailbox_fetch_response(struct scmi_chan_info *cinfo,
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
+index 2bca37044ad0fb..fac204d6e0ea2c 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
+@@ -147,6 +147,7 @@ static union acpi_object *amdgpu_atif_call(struct amdgpu_atif *atif,
+ 					   struct acpi_buffer *params)
+ {
+ 	acpi_status status;
++	union acpi_object *obj;
+ 	union acpi_object atif_arg_elements[2];
+ 	struct acpi_object_list atif_arg;
+ 	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+@@ -169,16 +170,24 @@ static union acpi_object *amdgpu_atif_call(struct amdgpu_atif *atif,
+ 
+ 	status = acpi_evaluate_object(atif->handle, NULL, &atif_arg,
+ 				      &buffer);
++	obj = (union acpi_object *)buffer.pointer;
+ 
+-	/* Fail only if calling the method fails and ATIF is supported */
++	/* Fail if calling the method fails and ATIF is supported */
+ 	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+ 		DRM_DEBUG_DRIVER("failed to evaluate ATIF got %s\n",
+ 				 acpi_format_exception(status));
+-		kfree(buffer.pointer);
++		kfree(obj);
+ 		return NULL;
+ 	}
+ 
+-	return buffer.pointer;
++	if (obj->type != ACPI_TYPE_BUFFER) {
++		DRM_DEBUG_DRIVER("bad object returned from ATIF: %d\n",
++				 obj->type);
++		kfree(obj);
++		return NULL;
++	}
++
++	return obj;
+ }
+ 
+ /**
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
+index c5c55e132af21d..5e3abdd0805b6d 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
+@@ -1053,8 +1053,10 @@ int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id,
+ 
+ 	r = amdgpu_ring_init(adev, ring, 1024, NULL, 0,
+ 			     AMDGPU_RING_PRIO_DEFAULT, NULL);
+-	if (r)
++	if (r) {
++		amdgpu_mes_unlock(&adev->mes);
+ 		goto clean_up_memory;
++	}
+ 
+ 	amdgpu_mes_ring_to_queue_props(adev, ring, &qprops);
+ 
+@@ -1087,7 +1089,6 @@ int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id,
+ 	amdgpu_ring_fini(ring);
+ clean_up_memory:
+ 	kfree(ring);
+-	amdgpu_mes_unlock(&adev->mes);
+ 	return r;
+ }
+ 
+diff --git a/drivers/gpu/drm/amd/display/modules/power/power_helpers.c b/drivers/gpu/drm/amd/display/modules/power/power_helpers.c
+index 2b3d5183818aca..4887a360ead4f2 100644
+--- a/drivers/gpu/drm/amd/display/modules/power/power_helpers.c
++++ b/drivers/gpu/drm/amd/display/modules/power/power_helpers.c
+@@ -841,6 +841,8 @@ bool is_psr_su_specific_panel(struct dc_link *link)
+ 				isPSRSUSupported = false;
+ 			else if (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x03)
+ 				isPSRSUSupported = false;
++			else if (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x01)
++				isPSRSUSupported = false;
+ 			else if (dpcd_caps->psr_info.force_psrsu_cap == 0x1)
+ 				isPSRSUSupported = true;
+ 		}
+diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+index e238e4e8116caf..ad57368dc13f03 100644
+--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
++++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+@@ -722,12 +722,13 @@ void dpu_crtc_complete_commit(struct drm_crtc *crtc)
+ 	_dpu_crtc_complete_flip(crtc);
+ }
+ 
+-static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc,
++static int _dpu_crtc_check_and_setup_lm_bounds(struct drm_crtc *crtc,
+ 		struct drm_crtc_state *state)
+ {
+ 	struct dpu_crtc_state *cstate = to_dpu_crtc_state(state);
+ 	struct drm_display_mode *adj_mode = &state->adjusted_mode;
+ 	u32 crtc_split_width = adj_mode->hdisplay / cstate->num_mixers;
++	struct dpu_kms *dpu_kms = _dpu_crtc_get_kms(crtc);
+ 	int i;
+ 
+ 	for (i = 0; i < cstate->num_mixers; i++) {
+@@ -738,7 +739,12 @@ static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc,
+ 		r->y2 = adj_mode->vdisplay;
+ 
+ 		trace_dpu_crtc_setup_lm_bounds(DRMID(crtc), i, r);
++
++		if (drm_rect_width(r) > dpu_kms->catalog->caps->max_mixer_width)
++			return -E2BIG;
+ 	}
++
++	return 0;
+ }
+ 
+ static void _dpu_crtc_get_pcc_coeff(struct drm_crtc_state *state,
+@@ -814,7 +820,7 @@ static void dpu_crtc_atomic_begin(struct drm_crtc *crtc,
+ 
+ 	DRM_DEBUG_ATOMIC("crtc%d\n", crtc->base.id);
+ 
+-	_dpu_crtc_setup_lm_bounds(crtc, crtc->state);
++	_dpu_crtc_check_and_setup_lm_bounds(crtc, crtc->state);
+ 
+ 	/* encoder will trigger pending mask now */
+ 	drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask)
+@@ -1208,8 +1214,11 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
+ 	if (crtc_state->active_changed)
+ 		crtc_state->mode_changed = true;
+ 
+-	if (cstate->num_mixers)
+-		_dpu_crtc_setup_lm_bounds(crtc, crtc_state);
++	if (cstate->num_mixers) {
++		rc = _dpu_crtc_check_and_setup_lm_bounds(crtc, crtc_state);
++		if (rc)
++			return rc;
++	}
+ 
+ 	/* FIXME: move this to dpu_plane_atomic_check? */
+ 	drm_atomic_crtc_state_for_each_plane_state(plane, pstate, crtc_state) {
+diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+index 6262ec5e40204c..10c68de1bf22ca 100644
+--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
++++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+@@ -1122,21 +1122,20 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc,
+ 	for (i = 0; i < dpu_enc->num_phys_encs; i++) {
+ 		struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
+ 
+-		if (!dpu_enc->hw_pp[i]) {
++		phys->hw_pp = dpu_enc->hw_pp[i];
++		if (!phys->hw_pp) {
+ 			DPU_ERROR_ENC(dpu_enc,
+ 				"no pp block assigned at idx: %d\n", i);
+ 			return;
+ 		}
+ 
+-		if (!hw_ctl[i]) {
++		phys->hw_ctl = i < num_ctl ? to_dpu_hw_ctl(hw_ctl[i]) : NULL;
++		if (!phys->hw_ctl) {
+ 			DPU_ERROR_ENC(dpu_enc,
+ 				"no ctl block assigned at idx: %d\n", i);
+ 			return;
+ 		}
+ 
+-		phys->hw_pp = dpu_enc->hw_pp[i];
+-		phys->hw_ctl = to_dpu_hw_ctl(hw_ctl[i]);
+-
+ 		phys->cached_mode = crtc_state->adjusted_mode;
+ 		if (phys->ops.atomic_mode_set)
+ 			phys->ops.atomic_mode_set(phys, crtc_state, conn_state);
+diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
+index daaf0e60475380..20c8b9af7a2199 100644
+--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
++++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
+@@ -280,7 +280,7 @@ static void dpu_encoder_phys_vid_setup_timing_engine(
+ 	intf_cfg.stream_sel = 0; /* Don't care value for video mode */
+ 	intf_cfg.mode_3d = dpu_encoder_helper_get_3d_blend_mode(phys_enc);
+ 	intf_cfg.dsc = dpu_encoder_helper_get_dsc(phys_enc);
+-	if (phys_enc->hw_pp->merge_3d)
++	if (intf_cfg.mode_3d && phys_enc->hw_pp->merge_3d)
+ 		intf_cfg.merge_3d = phys_enc->hw_pp->merge_3d->idx;
+ 
+ 	spin_lock_irqsave(phys_enc->enc_spinlock, lock_flags);
+diff --git a/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c b/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c
+index add72bbc28b176..4d55e3cf570f0b 100644
+--- a/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c
++++ b/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c
+@@ -26,7 +26,7 @@ static void msm_disp_state_dump_regs(u32 **reg, u32 aligned_len, void __iomem *b
+ 	end_addr = base_addr + aligned_len;
+ 
+ 	if (!(*reg))
+-		*reg = kzalloc(len_padded, GFP_KERNEL);
++		*reg = kvzalloc(len_padded, GFP_KERNEL);
+ 
+ 	if (*reg)
+ 		dump_addr = *reg;
+@@ -48,20 +48,21 @@ static void msm_disp_state_dump_regs(u32 **reg, u32 aligned_len, void __iomem *b
+ 	}
+ }
+ 
+-static void msm_disp_state_print_regs(u32 **reg, u32 len, void __iomem *base_addr,
+-		struct drm_printer *p)
++static void msm_disp_state_print_regs(const u32 *dump_addr, u32 len,
++		void __iomem *base_addr, struct drm_printer *p)
+ {
+ 	int i;
+-	u32 *dump_addr = NULL;
+ 	void __iomem *addr;
+ 	u32 num_rows;
+ 
++	if (!dump_addr) {
++		drm_printf(p, "Registers not stored\n");
++		return;
++	}
++
+ 	addr = base_addr;
+ 	num_rows = len / REG_DUMP_ALIGN;
+ 
+-	if (*reg)
+-		dump_addr = *reg;
+-
+ 	for (i = 0; i < num_rows; i++) {
+ 		drm_printf(p, "0x%lx : %08x %08x %08x %08x\n",
+ 				(unsigned long)(addr - base_addr),
+@@ -89,7 +90,7 @@ void msm_disp_state_print(struct msm_disp_state *state, struct drm_printer *p)
+ 
+ 	list_for_each_entry_safe(block, tmp, &state->blocks, node) {
+ 		drm_printf(p, "====================%s================\n", block->name);
+-		msm_disp_state_print_regs(&block->state, block->size, block->base_addr, p);
++		msm_disp_state_print_regs(block->state, block->size, block->base_addr, p);
+ 	}
+ 
+ 	drm_printf(p, "===================dpu drm state================\n");
+@@ -161,7 +162,7 @@ void msm_disp_state_free(void *data)
+ 
+ 	list_for_each_entry_safe(block, tmp, &disp_state->blocks, node) {
+ 		list_del(&block->node);
+-		kfree(block->state);
++		kvfree(block->state);
+ 		kfree(block);
+ 	}
+ 
+diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
+index 77b805eacb1b18..f920329fe2e090 100644
+--- a/drivers/gpu/drm/msm/dsi/dsi_host.c
++++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
+@@ -537,7 +537,7 @@ static unsigned long dsi_adjust_pclk_for_compression(const struct drm_display_mo
+ 
+ 	int new_htotal = mode->htotal - mode->hdisplay + new_hdisplay;
+ 
+-	return new_htotal * mode->vtotal * drm_mode_vrefresh(mode);
++	return mult_frac(mode->clock * 1000u, new_htotal, mode->htotal);
+ }
+ 
+ static unsigned long dsi_get_pclk_rate(const struct drm_display_mode *mode,
+@@ -545,7 +545,7 @@ static unsigned long dsi_get_pclk_rate(const struct drm_display_mode *mode,
+ {
+ 	unsigned long pclk_rate;
+ 
+-	pclk_rate = mode->clock * 1000;
++	pclk_rate = mode->clock * 1000u;
+ 
+ 	if (dsc)
+ 		pclk_rate = dsi_adjust_pclk_for_compression(mode, dsc);
+diff --git a/drivers/gpu/drm/vboxvideo/hgsmi_base.c b/drivers/gpu/drm/vboxvideo/hgsmi_base.c
+index 8c041d7ce4f1bd..87dccaecc3e57d 100644
+--- a/drivers/gpu/drm/vboxvideo/hgsmi_base.c
++++ b/drivers/gpu/drm/vboxvideo/hgsmi_base.c
+@@ -139,7 +139,15 @@ int hgsmi_update_pointer_shape(struct gen_pool *ctx, u32 flags,
+ 		flags |= VBOX_MOUSE_POINTER_VISIBLE;
+ 	}
+ 
+-	p = hgsmi_buffer_alloc(ctx, sizeof(*p) + pixel_len, HGSMI_CH_VBVA,
++	/*
++	 * The 4 extra bytes come from switching struct vbva_mouse_pointer_shape
++	 * from having a 4 bytes fixed array at the end to using a proper VLA
++	 * at the end. These 4 extra bytes were not subtracted from sizeof(*p)
++	 * before the switch to the VLA, so this way the behavior is unchanged.
++	 * Chances are these 4 extra bytes are not necessary but they are kept
++	 * to avoid regressions.
++	 */
++	p = hgsmi_buffer_alloc(ctx, sizeof(*p) + pixel_len + 4, HGSMI_CH_VBVA,
+ 			       VBVA_MOUSE_POINTER_SHAPE);
+ 	if (!p)
+ 		return -ENOMEM;
+diff --git a/drivers/gpu/drm/vboxvideo/vboxvideo.h b/drivers/gpu/drm/vboxvideo/vboxvideo.h
+index f60d82504da02c..79ec8481de0e48 100644
+--- a/drivers/gpu/drm/vboxvideo/vboxvideo.h
++++ b/drivers/gpu/drm/vboxvideo/vboxvideo.h
+@@ -351,10 +351,8 @@ struct vbva_mouse_pointer_shape {
+ 	 * Bytes in the gap between the AND and the XOR mask are undefined.
+ 	 * XOR mask scanlines have no gap between them and size of XOR mask is:
+ 	 * xor_len = width * 4 * height.
+-	 *
+-	 * Preallocate 4 bytes for accessing actual data as p->data.
+ 	 */
+-	u8 data[4];
++	u8 data[];
+ } __packed;
+ 
+ /* pointer is visible */
+diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
+index b22ae25db4e17c..52ea0c50c852ce 100644
+--- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
+@@ -881,6 +881,10 @@ static int vmw_stdu_connector_atomic_check(struct drm_connector *conn,
+ 	struct drm_crtc_state *new_crtc_state;
+ 
+ 	conn_state = drm_atomic_get_connector_state(state, conn);
++
++	if (IS_ERR(conn_state))
++		return PTR_ERR(conn_state);
++
+ 	du = vmw_connector_to_stdu(conn);
+ 
+ 	if (!conn_state->crtc)
+diff --git a/drivers/iio/accel/bma400_core.c b/drivers/iio/accel/bma400_core.c
+index e90e2f01550ad3..04083b7395ab8c 100644
+--- a/drivers/iio/accel/bma400_core.c
++++ b/drivers/iio/accel/bma400_core.c
+@@ -1219,7 +1219,8 @@ static int bma400_activity_event_en(struct bma400_data *data,
+ static int bma400_tap_event_en(struct bma400_data *data,
+ 			       enum iio_event_direction dir, int state)
+ {
+-	unsigned int mask, field_value;
++	unsigned int mask;
++	unsigned int field_value = 0;
+ 	int ret;
+ 
+ 	/*
+diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
+index e46817cb5581cf..6dee3b686effdc 100644
+--- a/drivers/iio/adc/Kconfig
++++ b/drivers/iio/adc/Kconfig
+@@ -1335,6 +1335,8 @@ config TI_LMP92064
+ 	tristate "Texas Instruments LMP92064 ADC driver"
+ 	depends on SPI
+ 	select REGMAP_SPI
++	select IIO_BUFFER
++	select IIO_TRIGGERED_BUFFER
+ 	help
+ 	  Say yes here to build support for the LMP92064 Precision Current and Voltage
+ 	  sensor.
+diff --git a/drivers/iio/frequency/Kconfig b/drivers/iio/frequency/Kconfig
+index 71de6cc4a1584f..036763d3e84c6b 100644
+--- a/drivers/iio/frequency/Kconfig
++++ b/drivers/iio/frequency/Kconfig
+@@ -82,25 +82,26 @@ config ADMV1014
+ 	  module will be called admv1014.
+ 
+ config ADMV4420
+-       tristate "Analog Devices ADMV4420 K Band Downconverter"
+-       depends on SPI
+-       help
+-         Say yes here to build support for Analog Devices K Band
+-         Downconverter with integrated Fractional-N PLL and VCO.
++	tristate "Analog Devices ADMV4420 K Band Downconverter"
++	depends on SPI
++	select REGMAP_SPI
++	help
++	  Say yes here to build support for Analog Devices K Band
++	  Downconverter with integrated Fractional-N PLL and VCO.
+ 
+-         To compile this driver as a module, choose M here: the
+-         module will be called admv4420.
++	  To compile this driver as a module, choose M here: the
++	  module will be called admv4420.
+ 
+ config ADRF6780
+-        tristate "Analog Devices ADRF6780 Microwave Upconverter"
+-        depends on SPI
+-        depends on COMMON_CLK
+-        help
+-          Say yes here to build support for Analog Devices ADRF6780
+-          5.9 GHz to 23.6 GHz, Wideband, Microwave Upconverter.
+-
+-          To compile this driver as a module, choose M here: the
+-          module will be called adrf6780.
++	tristate "Analog Devices ADRF6780 Microwave Upconverter"
++	depends on SPI
++	depends on COMMON_CLK
++	help
++	  Say yes here to build support for Analog Devices ADRF6780
++	  5.9 GHz to 23.6 GHz, Wideband, Microwave Upconverter.
++
++	  To compile this driver as a module, choose M here: the
++	  module will be called adrf6780.
+ 
+ endmenu
+ endmenu
+diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
+index f253295795f0a4..fd78d678877c47 100644
+--- a/drivers/infiniband/core/addr.c
++++ b/drivers/infiniband/core/addr.c
+@@ -269,6 +269,8 @@ rdma_find_ndev_for_src_ip_rcu(struct net *net, const struct sockaddr *src_in)
+ 		break;
+ #endif
+ 	}
++	if (!ret && dev && is_vlan_dev(dev))
++		dev = vlan_dev_real_dev(dev);
+ 	return ret ? ERR_PTR(ret) : dev;
+ }
+ 
+diff --git a/drivers/infiniband/hw/bnxt_re/hw_counters.c b/drivers/infiniband/hw/bnxt_re/hw_counters.c
+index 93572405d6fae7..1e63f809174837 100644
+--- a/drivers/infiniband/hw/bnxt_re/hw_counters.c
++++ b/drivers/infiniband/hw/bnxt_re/hw_counters.c
+@@ -366,12 +366,12 @@ int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev,
+ 				goto done;
+ 			}
+ 		}
+-		if (rdev->pacing.dbr_pacing)
++		if (rdev->pacing.dbr_pacing && bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))
+ 			bnxt_re_copy_db_pacing_stats(rdev, stats);
+ 	}
+ 
+ done:
+-	return bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx) ?
++	return bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx) ?
+ 		BNXT_RE_NUM_EXT_COUNTERS : BNXT_RE_NUM_STD_COUNTERS;
+ }
+ 
+@@ -381,7 +381,7 @@ struct rdma_hw_stats *bnxt_re_ib_alloc_hw_port_stats(struct ib_device *ibdev,
+ 	struct bnxt_re_dev *rdev = to_bnxt_re_dev(ibdev, ibdev);
+ 	int num_counters = 0;
+ 
+-	if (bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx))
++	if (bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))
+ 		num_counters = BNXT_RE_NUM_EXT_COUNTERS;
+ 	else
+ 		num_counters = BNXT_RE_NUM_STD_COUNTERS;
+diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
+index b4d3e7dfc939f6..f20da108fb2978 100644
+--- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
++++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
+@@ -400,6 +400,10 @@ static void bnxt_re_create_fence_wqe(struct bnxt_re_pd *pd)
+ 	struct bnxt_re_fence_data *fence = &pd->fence;
+ 	struct ib_mr *ib_mr = &fence->mr->ib_mr;
+ 	struct bnxt_qplib_swqe *wqe = &fence->bind_wqe;
++	struct bnxt_re_dev *rdev = pd->rdev;
++
++	if (bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))
++		return;
+ 
+ 	memset(wqe, 0, sizeof(*wqe));
+ 	wqe->type = BNXT_QPLIB_SWQE_TYPE_BIND_MW;
+@@ -454,6 +458,9 @@ static void bnxt_re_destroy_fence_mr(struct bnxt_re_pd *pd)
+ 	struct device *dev = &rdev->en_dev->pdev->dev;
+ 	struct bnxt_re_mr *mr = fence->mr;
+ 
++	if (bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))
++		return;
++
+ 	if (fence->mw) {
+ 		bnxt_re_dealloc_mw(fence->mw);
+ 		fence->mw = NULL;
+@@ -485,6 +492,9 @@ static int bnxt_re_create_fence_mr(struct bnxt_re_pd *pd)
+ 	struct ib_mw *mw;
+ 	int rc;
+ 
++	if (bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))
++		return 0;
++
+ 	dma_addr = dma_map_single(dev, fence->va, BNXT_RE_FENCE_BYTES,
+ 				  DMA_BIDIRECTIONAL);
+ 	rc = dma_mapping_error(dev, dma_addr);
+@@ -1023,7 +1033,7 @@ static int bnxt_re_init_user_qp(struct bnxt_re_dev *rdev, struct bnxt_re_pd *pd,
+ 	bytes = (qplib_qp->sq.max_wqe * qplib_qp->sq.wqe_size);
+ 	/* Consider mapping PSN search memory only for RC QPs. */
+ 	if (qplib_qp->type == CMDQ_CREATE_QP_TYPE_RC) {
+-		psn_sz = bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx) ?
++		psn_sz = bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx) ?
+ 						   sizeof(struct sq_psn_search_ext) :
+ 						   sizeof(struct sq_psn_search);
+ 		psn_nume = (qplib_qp->wqe_mode == BNXT_QPLIB_WQE_MODE_STATIC) ?
+@@ -1234,7 +1244,7 @@ static void bnxt_re_adjust_gsi_rq_attr(struct bnxt_re_qp *qp)
+ 	qplqp = &qp->qplib_qp;
+ 	dev_attr = &rdev->dev_attr;
+ 
+-	if (!bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx)) {
++	if (!bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx)) {
+ 		qplqp->rq.max_sge = dev_attr->max_qp_sges;
+ 		if (qplqp->rq.max_sge > dev_attr->max_qp_sges)
+ 			qplqp->rq.max_sge = dev_attr->max_qp_sges;
+@@ -1301,7 +1311,7 @@ static void bnxt_re_adjust_gsi_sq_attr(struct bnxt_re_qp *qp,
+ 	qplqp = &qp->qplib_qp;
+ 	dev_attr = &rdev->dev_attr;
+ 
+-	if (!bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx)) {
++	if (!bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx)) {
+ 		entries = bnxt_re_init_depth(init_attr->cap.max_send_wr + 1, uctx);
+ 		qplqp->sq.max_wqe = min_t(u32, entries,
+ 					  dev_attr->max_qp_wqes + 1);
+@@ -1328,7 +1338,7 @@ static int bnxt_re_init_qp_type(struct bnxt_re_dev *rdev,
+ 		goto out;
+ 	}
+ 
+-	if (bnxt_qplib_is_chip_gen_p5(chip_ctx) &&
++	if (bnxt_qplib_is_chip_gen_p5_p7(chip_ctx) &&
+ 	    init_attr->qp_type == IB_QPT_GSI)
+ 		qptype = CMDQ_CREATE_QP_TYPE_GSI;
+ out:
+@@ -1527,7 +1537,7 @@ int bnxt_re_create_qp(struct ib_qp *ib_qp, struct ib_qp_init_attr *qp_init_attr,
+ 		goto fail;
+ 
+ 	if (qp_init_attr->qp_type == IB_QPT_GSI &&
+-	    !(bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx))) {
++	    !(bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))) {
+ 		rc = bnxt_re_create_gsi_qp(qp, pd, qp_init_attr);
+ 		if (rc == -ENODEV)
+ 			goto qp_destroy;
+@@ -2553,11 +2563,6 @@ static int bnxt_re_build_inv_wqe(const struct ib_send_wr *wr,
+ 	wqe->type = BNXT_QPLIB_SWQE_TYPE_LOCAL_INV;
+ 	wqe->local_inv.inv_l_key = wr->ex.invalidate_rkey;
+ 
+-	/* Need unconditional fence for local invalidate
+-	 * opcode to work as expected.
+-	 */
+-	wqe->flags |= BNXT_QPLIB_SWQE_FLAGS_UC_FENCE;
+-
+ 	if (wr->send_flags & IB_SEND_SIGNALED)
+ 		wqe->flags |= BNXT_QPLIB_SWQE_FLAGS_SIGNAL_COMP;
+ 	if (wr->send_flags & IB_SEND_SOLICITED)
+@@ -2580,12 +2585,6 @@ static int bnxt_re_build_reg_wqe(const struct ib_reg_wr *wr,
+ 	wqe->frmr.levels = qplib_frpl->hwq.level;
+ 	wqe->type = BNXT_QPLIB_SWQE_TYPE_REG_MR;
+ 
+-	/* Need unconditional fence for reg_mr
+-	 * opcode to function as expected.
+-	 */
+-
+-	wqe->flags |= BNXT_QPLIB_SWQE_FLAGS_UC_FENCE;
+-
+ 	if (wr->wr.send_flags & IB_SEND_SIGNALED)
+ 		wqe->flags |= BNXT_QPLIB_SWQE_FLAGS_SIGNAL_COMP;
+ 
+@@ -2716,6 +2715,18 @@ static int bnxt_re_post_send_shadow_qp(struct bnxt_re_dev *rdev,
+ 	return rc;
+ }
+ 
++static void bnxt_re_legacy_set_uc_fence(struct bnxt_qplib_swqe *wqe)
++{
++	/* Need unconditional fence for non-wire memory opcode
++	 * to work as expected.
++	 */
++	if (wqe->type == BNXT_QPLIB_SWQE_TYPE_LOCAL_INV ||
++	    wqe->type == BNXT_QPLIB_SWQE_TYPE_FAST_REG_MR ||
++	    wqe->type == BNXT_QPLIB_SWQE_TYPE_REG_MR ||
++	    wqe->type == BNXT_QPLIB_SWQE_TYPE_BIND_MW)
++		wqe->flags |= BNXT_QPLIB_SWQE_FLAGS_UC_FENCE;
++}
++
+ int bnxt_re_post_send(struct ib_qp *ib_qp, const struct ib_send_wr *wr,
+ 		      const struct ib_send_wr **bad_wr)
+ {
+@@ -2795,8 +2806,11 @@ int bnxt_re_post_send(struct ib_qp *ib_qp, const struct ib_send_wr *wr,
+ 			rc = -EINVAL;
+ 			goto bad;
+ 		}
+-		if (!rc)
++		if (!rc) {
++			if (!bnxt_qplib_is_chip_gen_p5_p7(qp->rdev->chip_ctx))
++				bnxt_re_legacy_set_uc_fence(&wqe);
+ 			rc = bnxt_qplib_post_send(&qp->qplib_qp, &wqe);
++		}
+ bad:
+ 		if (rc) {
+ 			ibdev_err(&qp->rdev->ibdev,
+diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
+index 039801d93ed8aa..0373d0e9db6329 100644
+--- a/drivers/infiniband/hw/bnxt_re/main.c
++++ b/drivers/infiniband/hw/bnxt_re/main.c
+@@ -107,9 +107,14 @@ static void bnxt_re_set_db_offset(struct bnxt_re_dev *rdev)
+ 		dev_info(rdev_to_dev(rdev),
+ 			 "Couldn't get DB bar size, Low latency framework is disabled\n");
+ 	/* set register offsets for both UC and WC */
+-	res->dpi_tbl.ucreg.offset = res->is_vf ? BNXT_QPLIB_DBR_VF_DB_OFFSET :
+-						 BNXT_QPLIB_DBR_PF_DB_OFFSET;
+-	res->dpi_tbl.wcreg.offset = res->dpi_tbl.ucreg.offset;
++	if (bnxt_qplib_is_chip_gen_p7(cctx)) {
++		res->dpi_tbl.ucreg.offset = offset;
++		res->dpi_tbl.wcreg.offset = en_dev->l2_db_size;
++	} else {
++		res->dpi_tbl.ucreg.offset = res->is_vf ? BNXT_QPLIB_DBR_VF_DB_OFFSET :
++							 BNXT_QPLIB_DBR_PF_DB_OFFSET;
++		res->dpi_tbl.wcreg.offset = res->dpi_tbl.ucreg.offset;
++	}
+ 
+ 	/* If WC mapping is disabled by L2 driver then en_dev->l2_db_size
+ 	 * is equal to the DB-Bar actual size. This indicates that L2
+@@ -128,7 +133,7 @@ static void bnxt_re_set_drv_mode(struct bnxt_re_dev *rdev, u8 mode)
+ 	struct bnxt_qplib_chip_ctx *cctx;
+ 
+ 	cctx = rdev->chip_ctx;
+-	cctx->modes.wqe_mode = bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx) ?
++	cctx->modes.wqe_mode = bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx) ?
+ 			       mode : BNXT_QPLIB_WQE_MODE_STATIC;
+ 	if (bnxt_re_hwrm_qcaps(rdev))
+ 		dev_err(rdev_to_dev(rdev),
+@@ -176,8 +181,11 @@ static int bnxt_re_setup_chip_ctx(struct bnxt_re_dev *rdev, u8 wqe_mode)
+ 
+ 	bnxt_re_set_db_offset(rdev);
+ 	rc = bnxt_qplib_map_db_bar(&rdev->qplib_res);
+-	if (rc)
++	if (rc) {
++		kfree(rdev->chip_ctx);
++		rdev->chip_ctx = NULL;
+ 		return rc;
++	}
+ 
+ 	if (bnxt_qplib_determine_atomics(en_dev->pdev))
+ 		ibdev_info(&rdev->ibdev,
+@@ -215,7 +223,7 @@ static void bnxt_re_limit_pf_res(struct bnxt_re_dev *rdev)
+ 	ctx->srqc_count = min_t(u32, BNXT_RE_MAX_SRQC_COUNT,
+ 				attr->max_srq);
+ 	ctx->cq_count = min_t(u32, BNXT_RE_MAX_CQ_COUNT, attr->max_cq);
+-	if (!bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx))
++	if (!bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))
+ 		for (i = 0; i < MAX_TQM_ALLOC_REQ; i++)
+ 			rdev->qplib_ctx.tqm_ctx.qcount[i] =
+ 			rdev->dev_attr.tqm_alloc_reqs[i];
+@@ -264,7 +272,7 @@ static void bnxt_re_set_resource_limits(struct bnxt_re_dev *rdev)
+ 	memset(&rdev->qplib_ctx.vf_res, 0, sizeof(struct bnxt_qplib_vf_res));
+ 	bnxt_re_limit_pf_res(rdev);
+ 
+-	num_vfs =  bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx) ?
++	num_vfs =  bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx) ?
+ 			BNXT_RE_GEN_P5_MAX_VF : rdev->num_vfs;
+ 	if (num_vfs)
+ 		bnxt_re_limit_vf_res(&rdev->qplib_ctx, num_vfs);
+@@ -276,7 +284,7 @@ static void bnxt_re_vf_res_config(struct bnxt_re_dev *rdev)
+ 	if (test_bit(BNXT_RE_FLAG_ERR_DEVICE_DETACHED, &rdev->flags))
+ 		return;
+ 	rdev->num_vfs = pci_sriov_get_totalvfs(rdev->en_dev->pdev);
+-	if (!bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx)) {
++	if (!bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx)) {
+ 		bnxt_re_set_resource_limits(rdev);
+ 		bnxt_qplib_set_func_resources(&rdev->qplib_res, &rdev->rcfw,
+ 					      &rdev->qplib_ctx);
+@@ -1067,16 +1075,6 @@ static int bnxt_re_cqn_handler(struct bnxt_qplib_nq *nq,
+ 	return 0;
+ }
+ 
+-#define BNXT_RE_GEN_P5_PF_NQ_DB		0x10000
+-#define BNXT_RE_GEN_P5_VF_NQ_DB		0x4000
+-static u32 bnxt_re_get_nqdb_offset(struct bnxt_re_dev *rdev, u16 indx)
+-{
+-	return bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx) ?
+-		(rdev->is_virtfn ? BNXT_RE_GEN_P5_VF_NQ_DB :
+-				   BNXT_RE_GEN_P5_PF_NQ_DB) :
+-				   rdev->en_dev->msix_entries[indx].db_offset;
+-}
+-
+ static void bnxt_re_cleanup_res(struct bnxt_re_dev *rdev)
+ {
+ 	int i;
+@@ -1097,7 +1095,7 @@ static int bnxt_re_init_res(struct bnxt_re_dev *rdev)
+ 	bnxt_qplib_init_res(&rdev->qplib_res);
+ 
+ 	for (i = 1; i < rdev->num_msix ; i++) {
+-		db_offt = bnxt_re_get_nqdb_offset(rdev, i);
++		db_offt = rdev->en_dev->msix_entries[i].db_offset;
+ 		rc = bnxt_qplib_enable_nq(rdev->en_dev->pdev, &rdev->nq[i - 1],
+ 					  i - 1, rdev->en_dev->msix_entries[i].vector,
+ 					  db_offt, &bnxt_re_cqn_handler,
+@@ -1508,7 +1506,7 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 wqe_mode)
+ 		ibdev_err(&rdev->ibdev, "Failed to allocate CREQ: %#x\n", rc);
+ 		goto free_rcfw;
+ 	}
+-	db_offt = bnxt_re_get_nqdb_offset(rdev, BNXT_RE_AEQ_IDX);
++	db_offt = rdev->en_dev->msix_entries[BNXT_RE_AEQ_IDX].db_offset;
+ 	vid = rdev->en_dev->msix_entries[BNXT_RE_AEQ_IDX].vector;
+ 	rc = bnxt_qplib_enable_rcfw_channel(&rdev->rcfw,
+ 					    vid, db_offt,
+@@ -1536,7 +1534,7 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 wqe_mode)
+ 	bnxt_re_set_resource_limits(rdev);
+ 
+ 	rc = bnxt_qplib_alloc_ctx(&rdev->qplib_res, &rdev->qplib_ctx, 0,
+-				  bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx));
++				  bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx));
+ 	if (rc) {
+ 		ibdev_err(&rdev->ibdev,
+ 			  "Failed to allocate QPLIB context: %#x\n", rc);
+@@ -1659,7 +1657,7 @@ static void bnxt_re_setup_cc(struct bnxt_re_dev *rdev, bool enable)
+ 		return;
+ 
+ 	/* Currently enabling only for GenP5 adapters */
+-	if (!bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx))
++	if (!bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))
+ 		return;
+ 
+ 	if (enable) {
+diff --git a/drivers/infiniband/hw/bnxt_re/qplib_fp.c b/drivers/infiniband/hw/bnxt_re/qplib_fp.c
+index 3b28878f62062f..4ee11cb4f2bd38 100644
+--- a/drivers/infiniband/hw/bnxt_re/qplib_fp.c
++++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.c
+@@ -995,7 +995,7 @@ int bnxt_qplib_create_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp)
+ 
+ 	/* SQ */
+ 	if (qp->type == CMDQ_CREATE_QP_TYPE_RC) {
+-		psn_sz = bnxt_qplib_is_chip_gen_p5(res->cctx) ?
++		psn_sz = bnxt_qplib_is_chip_gen_p5_p7(res->cctx) ?
+ 			 sizeof(struct sq_psn_search_ext) :
+ 			 sizeof(struct sq_psn_search);
+ 
+@@ -1649,7 +1649,7 @@ static void bnxt_qplib_fill_psn_search(struct bnxt_qplib_qp *qp,
+ 	flg_npsn = ((swq->next_psn << SQ_PSN_SEARCH_NEXT_PSN_SFT) &
+ 		     SQ_PSN_SEARCH_NEXT_PSN_MASK);
+ 
+-	if (bnxt_qplib_is_chip_gen_p5(qp->cctx)) {
++	if (bnxt_qplib_is_chip_gen_p5_p7(qp->cctx)) {
+ 		psns_ext->opcode_start_psn = cpu_to_le32(op_spsn);
+ 		psns_ext->flags_next_psn = cpu_to_le32(flg_npsn);
+ 		psns_ext->start_slot_idx = cpu_to_le16(swq->slot_idx);
+diff --git a/drivers/infiniband/hw/bnxt_re/qplib_fp.h b/drivers/infiniband/hw/bnxt_re/qplib_fp.h
+index a6f38d8f12efe2..56ddff96b5083b 100644
+--- a/drivers/infiniband/hw/bnxt_re/qplib_fp.h
++++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.h
+@@ -169,7 +169,7 @@ struct bnxt_qplib_swqe {
+ 			};
+ 			u32		q_key;
+ 			u32		dst_qp;
+-			u16		avid;
++			u32		avid;
+ 		} send;
+ 
+ 		/* Send Raw Ethernet and QP1 */
+diff --git a/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c b/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c
+index 5680fe8b890ad1..7294221b3316cf 100644
+--- a/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c
++++ b/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c
+@@ -525,7 +525,7 @@ static int __bnxt_qplib_rcfw_send_message(struct bnxt_qplib_rcfw *rcfw,
+ 		/* failed with status */
+ 		dev_err(&rcfw->pdev->dev, "cmdq[%#x]=%#x status %#x\n",
+ 			cookie, opcode, evnt->status);
+-		rc = -EFAULT;
++		rc = -EIO;
+ 	}
+ 
+ 	return rc;
+@@ -852,7 +852,7 @@ int bnxt_qplib_init_rcfw(struct bnxt_qplib_rcfw *rcfw,
+ 	 */
+ 	if (is_virtfn)
+ 		goto skip_ctx_setup;
+-	if (bnxt_qplib_is_chip_gen_p5(rcfw->res->cctx))
++	if (bnxt_qplib_is_chip_gen_p5_p7(rcfw->res->cctx))
+ 		goto config_vf_res;
+ 
+ 	lvl = ctx->qpc_tbl.level;
+diff --git a/drivers/infiniband/hw/bnxt_re/qplib_res.c b/drivers/infiniband/hw/bnxt_re/qplib_res.c
+index ae2bde34e785b7..96ceec1e8199a6 100644
+--- a/drivers/infiniband/hw/bnxt_re/qplib_res.c
++++ b/drivers/infiniband/hw/bnxt_re/qplib_res.c
+@@ -244,6 +244,8 @@ int bnxt_qplib_alloc_init_hwq(struct bnxt_qplib_hwq *hwq,
+ 			sginfo.pgsize = npde * pg_size;
+ 			sginfo.npages = 1;
+ 			rc = __alloc_pbl(res, &hwq->pbl[PBL_LVL_0], &sginfo);
++			if (rc)
++				goto fail;
+ 
+ 			/* Alloc PBL pages */
+ 			sginfo.npages = npbl;
+@@ -255,22 +257,9 @@ int bnxt_qplib_alloc_init_hwq(struct bnxt_qplib_hwq *hwq,
+ 			dst_virt_ptr =
+ 				(dma_addr_t **)hwq->pbl[PBL_LVL_0].pg_arr;
+ 			src_phys_ptr = hwq->pbl[PBL_LVL_1].pg_map_arr;
+-			if (hwq_attr->type == HWQ_TYPE_MR) {
+-			/* For MR it is expected that we supply only 1 contigous
+-			 * page i.e only 1 entry in the PDL that will contain
+-			 * all the PBLs for the user supplied memory region
+-			 */
+-				for (i = 0; i < hwq->pbl[PBL_LVL_1].pg_count;
+-				     i++)
+-					dst_virt_ptr[0][i] = src_phys_ptr[i] |
+-						flag;
+-			} else {
+-				for (i = 0; i < hwq->pbl[PBL_LVL_1].pg_count;
+-				     i++)
+-					dst_virt_ptr[PTR_PG(i)][PTR_IDX(i)] =
+-						src_phys_ptr[i] |
+-						PTU_PDE_VALID;
+-			}
++			for (i = 0; i < hwq->pbl[PBL_LVL_1].pg_count; i++)
++				dst_virt_ptr[0][i] = src_phys_ptr[i] | flag;
++
+ 			/* Alloc or init PTEs */
+ 			rc = __alloc_pbl(res, &hwq->pbl[PBL_LVL_2],
+ 					 hwq_attr->sginfo);
+@@ -805,7 +794,7 @@ static int bnxt_qplib_alloc_dpi_tbl(struct bnxt_qplib_res *res,
+ 	dpit = &res->dpi_tbl;
+ 	reg = &dpit->wcreg;
+ 
+-	if (!bnxt_qplib_is_chip_gen_p5(res->cctx)) {
++	if (!bnxt_qplib_is_chip_gen_p5_p7(res->cctx)) {
+ 		/* Offest should come from L2 driver */
+ 		dbr_offset = dev_attr->l2_db_size;
+ 		dpit->ucreg.offset = dbr_offset;
+diff --git a/drivers/infiniband/hw/bnxt_re/qplib_res.h b/drivers/infiniband/hw/bnxt_re/qplib_res.h
+index 534db462216ac9..f9e7aa3757cfb2 100644
+--- a/drivers/infiniband/hw/bnxt_re/qplib_res.h
++++ b/drivers/infiniband/hw/bnxt_re/qplib_res.h
+@@ -44,6 +44,9 @@ extern const struct bnxt_qplib_gid bnxt_qplib_gid_zero;
+ #define CHIP_NUM_57508		0x1750
+ #define CHIP_NUM_57504		0x1751
+ #define CHIP_NUM_57502		0x1752
++#define CHIP_NUM_58818          0xd818
++#define CHIP_NUM_57608          0x1760
++
+ 
+ struct bnxt_qplib_drv_modes {
+ 	u8	wqe_mode;
+@@ -296,6 +299,12 @@ struct bnxt_qplib_res {
+ 	struct bnxt_qplib_db_pacing_data *pacing_data;
+ };
+ 
++static inline bool bnxt_qplib_is_chip_gen_p7(struct bnxt_qplib_chip_ctx *cctx)
++{
++	return (cctx->chip_num == CHIP_NUM_58818 ||
++		cctx->chip_num == CHIP_NUM_57608);
++}
++
+ static inline bool bnxt_qplib_is_chip_gen_p5(struct bnxt_qplib_chip_ctx *cctx)
+ {
+ 	return (cctx->chip_num == CHIP_NUM_57508 ||
+@@ -303,15 +312,20 @@ static inline bool bnxt_qplib_is_chip_gen_p5(struct bnxt_qplib_chip_ctx *cctx)
+ 		cctx->chip_num == CHIP_NUM_57502);
+ }
+ 
++static inline bool bnxt_qplib_is_chip_gen_p5_p7(struct bnxt_qplib_chip_ctx *cctx)
++{
++	return bnxt_qplib_is_chip_gen_p5(cctx) || bnxt_qplib_is_chip_gen_p7(cctx);
++}
++
+ static inline u8 bnxt_qplib_get_hwq_type(struct bnxt_qplib_res *res)
+ {
+-	return bnxt_qplib_is_chip_gen_p5(res->cctx) ?
++	return bnxt_qplib_is_chip_gen_p5_p7(res->cctx) ?
+ 					HWQ_TYPE_QUEUE : HWQ_TYPE_L2_CMPL;
+ }
+ 
+ static inline u8 bnxt_qplib_get_ring_type(struct bnxt_qplib_chip_ctx *cctx)
+ {
+-	return bnxt_qplib_is_chip_gen_p5(cctx) ?
++	return bnxt_qplib_is_chip_gen_p5_p7(cctx) ?
+ 	       RING_ALLOC_REQ_RING_TYPE_NQ :
+ 	       RING_ALLOC_REQ_RING_TYPE_ROCE_CMPL;
+ }
+@@ -488,7 +502,7 @@ static inline void bnxt_qplib_ring_nq_db(struct bnxt_qplib_db_info *info,
+ 	u32 type;
+ 
+ 	type = arm ? DBC_DBC_TYPE_NQ_ARM : DBC_DBC_TYPE_NQ;
+-	if (bnxt_qplib_is_chip_gen_p5(cctx))
++	if (bnxt_qplib_is_chip_gen_p5_p7(cctx))
+ 		bnxt_qplib_ring_db(info, type);
+ 	else
+ 		bnxt_qplib_ring_db32(info, arm);
+diff --git a/drivers/infiniband/hw/bnxt_re/qplib_sp.c b/drivers/infiniband/hw/bnxt_re/qplib_sp.c
+index a27b6851516477..0b98577cd7082e 100644
+--- a/drivers/infiniband/hw/bnxt_re/qplib_sp.c
++++ b/drivers/infiniband/hw/bnxt_re/qplib_sp.c
+@@ -59,7 +59,7 @@ static bool bnxt_qplib_is_atomic_cap(struct bnxt_qplib_rcfw *rcfw)
+ {
+ 	u16 pcie_ctl2 = 0;
+ 
+-	if (!bnxt_qplib_is_chip_gen_p5(rcfw->res->cctx))
++	if (!bnxt_qplib_is_chip_gen_p5_p7(rcfw->res->cctx))
+ 		return false;
+ 
+ 	pcie_capability_read_word(rcfw->pdev, PCI_EXP_DEVCTL2, &pcie_ctl2);
+@@ -133,10 +133,12 @@ int bnxt_qplib_get_dev_attr(struct bnxt_qplib_rcfw *rcfw,
+ 	 * reporting the max number
+ 	 */
+ 	attr->max_qp_wqes -= BNXT_QPLIB_RESERVED_QP_WRS + 1;
+-	attr->max_qp_sges = bnxt_qplib_is_chip_gen_p5(rcfw->res->cctx) ?
++	attr->max_qp_sges = bnxt_qplib_is_chip_gen_p5_p7(rcfw->res->cctx) ?
+ 			    6 : sb->max_sge;
+ 	attr->max_cq = le32_to_cpu(sb->max_cq);
+ 	attr->max_cq_wqes = le32_to_cpu(sb->max_cqe);
++	if (!bnxt_qplib_is_chip_gen_p7(rcfw->res->cctx))
++		attr->max_cq_wqes = min_t(u32, BNXT_QPLIB_MAX_CQ_WQES, attr->max_cq_wqes);
+ 	attr->max_cq_sges = attr->max_qp_sges;
+ 	attr->max_mr = le32_to_cpu(sb->max_mr);
+ 	attr->max_mw = le32_to_cpu(sb->max_mw);
+@@ -151,9 +153,17 @@ int bnxt_qplib_get_dev_attr(struct bnxt_qplib_rcfw *rcfw,
+ 	attr->max_srq_sges = sb->max_srq_sge;
+ 	attr->max_pkey = 1;
+ 	attr->max_inline_data = le32_to_cpu(sb->max_inline_data);
+-	attr->l2_db_size = (sb->l2_db_space_size + 1) *
+-			    (0x01 << RCFW_DBR_BASE_PAGE_SHIFT);
+-	attr->max_sgid = BNXT_QPLIB_NUM_GIDS_SUPPORTED;
++	if (!bnxt_qplib_is_chip_gen_p7(rcfw->res->cctx))
++		attr->l2_db_size = (sb->l2_db_space_size + 1) *
++				    (0x01 << RCFW_DBR_BASE_PAGE_SHIFT);
++	/*
++	 * Read the max gid supported by HW.
++	 * For each entry in HW  GID in HW table, we consume 2
++	 * GID entries in the kernel GID table.  So max_gid reported
++	 * to stack can be up to twice the value reported by the HW, up to 256 gids.
++	 */
++	attr->max_sgid = le32_to_cpu(sb->max_gid);
++	attr->max_sgid = min_t(u32, BNXT_QPLIB_NUM_GIDS_SUPPORTED, 2 * attr->max_sgid);
+ 	attr->dev_cap_flags = le16_to_cpu(sb->dev_cap_flags);
+ 
+ 	bnxt_qplib_query_version(rcfw, attr->fw_ver);
+@@ -934,7 +944,7 @@ int bnxt_qplib_modify_cc(struct bnxt_qplib_res *res,
+ 	req->inactivity_th = cpu_to_le16(cc_param->inact_th);
+ 
+ 	/* For chip gen P5 onwards fill extended cmd and header */
+-	if (bnxt_qplib_is_chip_gen_p5(res->cctx)) {
++	if (bnxt_qplib_is_chip_gen_p5_p7(res->cctx)) {
+ 		struct roce_tlv *hdr;
+ 		u32 payload;
+ 		u32 chunks;
+diff --git a/drivers/infiniband/hw/bnxt_re/qplib_sp.h b/drivers/infiniband/hw/bnxt_re/qplib_sp.h
+index d33c78b96217a8..755765e68eaab2 100644
+--- a/drivers/infiniband/hw/bnxt_re/qplib_sp.h
++++ b/drivers/infiniband/hw/bnxt_re/qplib_sp.h
+@@ -55,6 +55,7 @@ struct bnxt_qplib_dev_attr {
+ 	u32				max_qp_wqes;
+ 	u32				max_qp_sges;
+ 	u32				max_cq;
++#define BNXT_QPLIB_MAX_CQ_WQES          0xfffff
+ 	u32				max_cq_wqes;
+ 	u32				max_cq_sges;
+ 	u32				max_mr;
+diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
+index b3757c6a0457a1..8d753e6e0c7190 100644
+--- a/drivers/infiniband/hw/cxgb4/cm.c
++++ b/drivers/infiniband/hw/cxgb4/cm.c
+@@ -2086,7 +2086,7 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip,
+ 	err = -ENOMEM;
+ 	if (n->dev->flags & IFF_LOOPBACK) {
+ 		if (iptype == 4)
+-			pdev = ip_dev_find(&init_net, *(__be32 *)peer_ip);
++			pdev = __ip_dev_find(&init_net, *(__be32 *)peer_ip, false);
+ 		else if (IS_ENABLED(CONFIG_IPV6))
+ 			for_each_netdev(&init_net, pdev) {
+ 				if (ipv6_chk_addr(&init_net,
+@@ -2101,12 +2101,12 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip,
+ 			err = -ENODEV;
+ 			goto out;
+ 		}
++		if (is_vlan_dev(pdev))
++			pdev = vlan_dev_real_dev(pdev);
+ 		ep->l2t = cxgb4_l2t_get(cdev->rdev.lldi.l2t,
+ 					n, pdev, rt_tos2priority(tos));
+-		if (!ep->l2t) {
+-			dev_put(pdev);
++		if (!ep->l2t)
+ 			goto out;
+-		}
+ 		ep->mtu = pdev->mtu;
+ 		ep->tx_chan = cxgb4_port_chan(pdev);
+ 		ep->smac_idx = ((struct port_info *)netdev_priv(pdev))->smt_idx;
+@@ -2119,7 +2119,6 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip,
+ 		ep->rss_qid = cdev->rdev.lldi.rxq_ids[
+ 			cxgb4_port_idx(pdev) * step];
+ 		set_tcp_window(ep, (struct port_info *)netdev_priv(pdev));
+-		dev_put(pdev);
+ 	} else {
+ 		pdev = get_real_dev(n->dev);
+ 		ep->l2t = cxgb4_l2t_get(cdev->rdev.lldi.l2t,
+diff --git a/drivers/infiniband/hw/irdma/cm.c b/drivers/infiniband/hw/irdma/cm.c
+index 42d1e977106696..1916daa8c33230 100644
+--- a/drivers/infiniband/hw/irdma/cm.c
++++ b/drivers/infiniband/hw/irdma/cm.c
+@@ -3630,7 +3630,7 @@ void irdma_free_lsmm_rsrc(struct irdma_qp *iwqp)
+ /**
+  * irdma_accept - registered call for connection to be accepted
+  * @cm_id: cm information for passive connection
+- * @conn_param: accpet parameters
++ * @conn_param: accept parameters
+  */
+ int irdma_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
+ {
+diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
+index 45547bf281e312..4bebc34a2929b1 100644
+--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
++++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
+@@ -68,6 +68,8 @@ MODULE_LICENSE("Dual BSD/GPL");
+ static u64 srpt_service_guid;
+ static DEFINE_SPINLOCK(srpt_dev_lock);	/* Protects srpt_dev_list. */
+ static LIST_HEAD(srpt_dev_list);	/* List of srpt_device structures. */
++static DEFINE_MUTEX(srpt_mc_mutex);	/* Protects srpt_memory_caches. */
++static DEFINE_XARRAY(srpt_memory_caches); /* See also srpt_memory_cache_entry */
+ 
+ static unsigned srp_max_req_size = DEFAULT_MAX_REQ_SIZE;
+ module_param(srp_max_req_size, int, 0444);
+@@ -105,6 +107,63 @@ static void srpt_recv_done(struct ib_cq *cq, struct ib_wc *wc);
+ static void srpt_send_done(struct ib_cq *cq, struct ib_wc *wc);
+ static void srpt_process_wait_list(struct srpt_rdma_ch *ch);
+ 
++/* Type of the entries in srpt_memory_caches. */
++struct srpt_memory_cache_entry {
++	refcount_t ref;
++	struct kmem_cache *c;
++};
++
++static struct kmem_cache *srpt_cache_get(unsigned int object_size)
++{
++	struct srpt_memory_cache_entry *e;
++	char name[32];
++	void *res;
++
++	guard(mutex)(&srpt_mc_mutex);
++	e = xa_load(&srpt_memory_caches, object_size);
++	if (e) {
++		refcount_inc(&e->ref);
++		return e->c;
++	}
++	snprintf(name, sizeof(name), "srpt-%u", object_size);
++	e = kmalloc(sizeof(*e), GFP_KERNEL);
++	if (!e)
++		return NULL;
++	refcount_set(&e->ref, 1);
++	e->c = kmem_cache_create(name, object_size, /*align=*/512, 0, NULL);
++	if (!e->c)
++		goto free_entry;
++	res = xa_store(&srpt_memory_caches, object_size, e, GFP_KERNEL);
++	if (xa_is_err(res))
++		goto destroy_cache;
++	return e->c;
++
++destroy_cache:
++	kmem_cache_destroy(e->c);
++
++free_entry:
++	kfree(e);
++	return NULL;
++}
++
++static void srpt_cache_put(struct kmem_cache *c)
++{
++	struct srpt_memory_cache_entry *e = NULL;
++	unsigned long object_size;
++
++	guard(mutex)(&srpt_mc_mutex);
++	xa_for_each(&srpt_memory_caches, object_size, e)
++		if (e->c == c)
++			break;
++	if (WARN_ON_ONCE(!e))
++		return;
++	if (!refcount_dec_and_test(&e->ref))
++		return;
++	WARN_ON_ONCE(xa_erase(&srpt_memory_caches, object_size) != e);
++	kmem_cache_destroy(e->c);
++	kfree(e);
++}
++
+ /*
+  * The only allowed channel state changes are those that change the channel
+  * state into a state with a higher numerical value. Hence the new > prev test.
+@@ -2119,13 +2178,13 @@ static void srpt_release_channel_work(struct work_struct *w)
+ 			     ch->sport->sdev, ch->rq_size,
+ 			     ch->rsp_buf_cache, DMA_TO_DEVICE);
+ 
+-	kmem_cache_destroy(ch->rsp_buf_cache);
++	srpt_cache_put(ch->rsp_buf_cache);
+ 
+ 	srpt_free_ioctx_ring((struct srpt_ioctx **)ch->ioctx_recv_ring,
+ 			     sdev, ch->rq_size,
+ 			     ch->req_buf_cache, DMA_FROM_DEVICE);
+ 
+-	kmem_cache_destroy(ch->req_buf_cache);
++	srpt_cache_put(ch->req_buf_cache);
+ 
+ 	kref_put(&ch->kref, srpt_free_ch);
+ }
+@@ -2245,8 +2304,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
+ 	INIT_LIST_HEAD(&ch->cmd_wait_list);
+ 	ch->max_rsp_size = ch->sport->port_attrib.srp_max_rsp_size;
+ 
+-	ch->rsp_buf_cache = kmem_cache_create("srpt-rsp-buf", ch->max_rsp_size,
+-					      512, 0, NULL);
++	ch->rsp_buf_cache = srpt_cache_get(ch->max_rsp_size);
+ 	if (!ch->rsp_buf_cache)
+ 		goto free_ch;
+ 
+@@ -2280,8 +2338,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
+ 		alignment_offset = round_up(imm_data_offset, 512) -
+ 			imm_data_offset;
+ 		req_sz = alignment_offset + imm_data_offset + srp_max_req_size;
+-		ch->req_buf_cache = kmem_cache_create("srpt-req-buf", req_sz,
+-						      512, 0, NULL);
++		ch->req_buf_cache = srpt_cache_get(req_sz);
+ 		if (!ch->req_buf_cache)
+ 			goto free_rsp_ring;
+ 
+@@ -2478,7 +2535,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
+ 			     ch->req_buf_cache, DMA_FROM_DEVICE);
+ 
+ free_recv_cache:
+-	kmem_cache_destroy(ch->req_buf_cache);
++	srpt_cache_put(ch->req_buf_cache);
+ 
+ free_rsp_ring:
+ 	srpt_free_ioctx_ring((struct srpt_ioctx **)ch->ioctx_ring,
+@@ -2486,7 +2543,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
+ 			     ch->rsp_buf_cache, DMA_TO_DEVICE);
+ 
+ free_rsp_cache:
+-	kmem_cache_destroy(ch->rsp_buf_cache);
++	srpt_cache_put(ch->rsp_buf_cache);
+ 
+ free_ch:
+ 	if (rdma_cm_id)
+@@ -3055,7 +3112,7 @@ static void srpt_free_srq(struct srpt_device *sdev)
+ 	srpt_free_ioctx_ring((struct srpt_ioctx **)sdev->ioctx_ring, sdev,
+ 			     sdev->srq_size, sdev->req_buf_cache,
+ 			     DMA_FROM_DEVICE);
+-	kmem_cache_destroy(sdev->req_buf_cache);
++	srpt_cache_put(sdev->req_buf_cache);
+ 	sdev->srq = NULL;
+ }
+ 
+@@ -3082,8 +3139,7 @@ static int srpt_alloc_srq(struct srpt_device *sdev)
+ 	pr_debug("create SRQ #wr= %d max_allow=%d dev= %s\n", sdev->srq_size,
+ 		 sdev->device->attrs.max_srq_wr, dev_name(&device->dev));
+ 
+-	sdev->req_buf_cache = kmem_cache_create("srpt-srq-req-buf",
+-						srp_max_req_size, 0, 0, NULL);
++	sdev->req_buf_cache = srpt_cache_get(srp_max_req_size);
+ 	if (!sdev->req_buf_cache)
+ 		goto free_srq;
+ 
+@@ -3105,7 +3161,7 @@ static int srpt_alloc_srq(struct srpt_device *sdev)
+ 	return 0;
+ 
+ free_cache:
+-	kmem_cache_destroy(sdev->req_buf_cache);
++	srpt_cache_put(sdev->req_buf_cache);
+ 
+ free_srq:
+ 	ib_destroy_srq(srq);
+diff --git a/drivers/irqchip/irq-renesas-rzg2l.c b/drivers/irqchip/irq-renesas-rzg2l.c
+index ea4b921e5e1588..5a7836186fd414 100644
+--- a/drivers/irqchip/irq-renesas-rzg2l.c
++++ b/drivers/irqchip/irq-renesas-rzg2l.c
+@@ -8,6 +8,7 @@
+  */
+ 
+ #include <linux/bitfield.h>
++#include <linux/cleanup.h>
+ #include <linux/clk.h>
+ #include <linux/err.h>
+ #include <linux/io.h>
+@@ -18,6 +19,7 @@
+ #include <linux/pm_runtime.h>
+ #include <linux/reset.h>
+ #include <linux/spinlock.h>
++#include <linux/syscore_ops.h>
+ 
+ #define IRQC_IRQ_START			1
+ #define IRQC_IRQ_COUNT			8
+@@ -55,12 +57,30 @@
+ #define TINT_EXTRACT_HWIRQ(x)           FIELD_GET(GENMASK(15, 0), (x))
+ #define TINT_EXTRACT_GPIOINT(x)         FIELD_GET(GENMASK(31, 16), (x))
+ 
+-struct rzg2l_irqc_priv {
+-	void __iomem *base;
+-	struct irq_fwspec fwspec[IRQC_NUM_IRQ];
+-	raw_spinlock_t lock;
++/**
++ * struct rzg2l_irqc_reg_cache - registers cache (necessary for suspend/resume)
++ * @iitsr: IITSR register
++ * @titsr: TITSR registers
++ */
++struct rzg2l_irqc_reg_cache {
++	u32	iitsr;
++	u32	titsr[2];
+ };
+ 
++/**
++ * struct rzg2l_irqc_priv - IRQ controller private data structure
++ * @base:	Controller's base address
++ * @fwspec:	IRQ firmware specific data
++ * @lock:	Lock to serialize access to hardware registers
++ * @cache:	Registers cache for suspend/resume
++ */
++static struct rzg2l_irqc_priv {
++	void __iomem			*base;
++	struct irq_fwspec		fwspec[IRQC_NUM_IRQ];
++	raw_spinlock_t			lock;
++	struct rzg2l_irqc_reg_cache	cache;
++} *rzg2l_irqc_data;
++
+ static struct rzg2l_irqc_priv *irq_data_to_priv(struct irq_data *data)
+ {
+ 	return data->domain->host_data;
+@@ -276,6 +296,38 @@ static int rzg2l_irqc_set_type(struct irq_data *d, unsigned int type)
+ 	return irq_chip_set_type_parent(d, IRQ_TYPE_LEVEL_HIGH);
+ }
+ 
++static int rzg2l_irqc_irq_suspend(void)
++{
++	struct rzg2l_irqc_reg_cache *cache = &rzg2l_irqc_data->cache;
++	void __iomem *base = rzg2l_irqc_data->base;
++
++	cache->iitsr = readl_relaxed(base + IITSR);
++	for (u8 i = 0; i < 2; i++)
++		cache->titsr[i] = readl_relaxed(base + TITSR(i));
++
++	return 0;
++}
++
++static void rzg2l_irqc_irq_resume(void)
++{
++	struct rzg2l_irqc_reg_cache *cache = &rzg2l_irqc_data->cache;
++	void __iomem *base = rzg2l_irqc_data->base;
++
++	/*
++	 * Restore only interrupt type. TSSRx will be restored at the
++	 * request of pin controller to avoid spurious interrupts due
++	 * to invalid PIN states.
++	 */
++	for (u8 i = 0; i < 2; i++)
++		writel_relaxed(cache->titsr[i], base + TITSR(i));
++	writel_relaxed(cache->iitsr, base + IITSR);
++}
++
++static struct syscore_ops rzg2l_irqc_syscore_ops = {
++	.suspend	= rzg2l_irqc_irq_suspend,
++	.resume		= rzg2l_irqc_irq_resume,
++};
++
+ static const struct irq_chip irqc_chip = {
+ 	.name			= "rzg2l-irqc",
+ 	.irq_eoi		= rzg2l_irqc_eoi,
+@@ -357,13 +409,12 @@ static int rzg2l_irqc_parse_interrupts(struct rzg2l_irqc_priv *priv,
+ 
+ static int rzg2l_irqc_init(struct device_node *node, struct device_node *parent)
+ {
++	struct platform_device *pdev = of_find_device_by_node(node);
++	struct device *dev __free(put_device) = pdev ? &pdev->dev : NULL;
+ 	struct irq_domain *irq_domain, *parent_domain;
+-	struct platform_device *pdev;
+ 	struct reset_control *resetn;
+-	struct rzg2l_irqc_priv *priv;
+ 	int ret;
+ 
+-	pdev = of_find_device_by_node(node);
+ 	if (!pdev)
+ 		return -ENODEV;
+ 
+@@ -373,15 +424,15 @@ static int rzg2l_irqc_init(struct device_node *node, struct device_node *parent)
+ 		return -ENODEV;
+ 	}
+ 
+-	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
+-	if (!priv)
++	rzg2l_irqc_data = devm_kzalloc(&pdev->dev, sizeof(*rzg2l_irqc_data), GFP_KERNEL);
++	if (!rzg2l_irqc_data)
+ 		return -ENOMEM;
+ 
+-	priv->base = devm_of_iomap(&pdev->dev, pdev->dev.of_node, 0, NULL);
+-	if (IS_ERR(priv->base))
+-		return PTR_ERR(priv->base);
++	rzg2l_irqc_data->base = devm_of_iomap(&pdev->dev, pdev->dev.of_node, 0, NULL);
++	if (IS_ERR(rzg2l_irqc_data->base))
++		return PTR_ERR(rzg2l_irqc_data->base);
+ 
+-	ret = rzg2l_irqc_parse_interrupts(priv, node);
++	ret = rzg2l_irqc_parse_interrupts(rzg2l_irqc_data, node);
+ 	if (ret) {
+ 		dev_err(&pdev->dev, "cannot parse interrupts: %d\n", ret);
+ 		return ret;
+@@ -404,17 +455,30 @@ static int rzg2l_irqc_init(struct device_node *node, struct device_node *parent)
+ 		goto pm_disable;
+ 	}
+ 
+-	raw_spin_lock_init(&priv->lock);
++	raw_spin_lock_init(&rzg2l_irqc_data->lock);
+ 
+ 	irq_domain = irq_domain_add_hierarchy(parent_domain, 0, IRQC_NUM_IRQ,
+ 					      node, &rzg2l_irqc_domain_ops,
+-					      priv);
++					      rzg2l_irqc_data);
+ 	if (!irq_domain) {
+ 		dev_err(&pdev->dev, "failed to add irq domain\n");
+ 		ret = -ENOMEM;
+ 		goto pm_put;
+ 	}
+ 
++	register_syscore_ops(&rzg2l_irqc_syscore_ops);
++
++	/*
++	 * Prevent the cleanup function from invoking put_device by assigning
++	 * NULL to dev.
++	 *
++	 * make coccicheck will complain about missing put_device calls, but
++	 * those are false positives, as dev will be automatically "put" via
++	 * __free_put_device on the failing path.
++	 * On the successful path we don't actually want to "put" dev.
++	 */
++	dev = NULL;
++
+ 	return 0;
+ 
+ pm_put:
+diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
+index 3877744193e2a0..062bcbe6255cff 100644
+--- a/drivers/net/dsa/mv88e6xxx/chip.c
++++ b/drivers/net/dsa/mv88e6xxx/chip.c
+@@ -6208,7 +6208,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
+ 		.invalid_port_mask = BIT(1) | BIT(2) | BIT(8),
+ 		.num_internal_phys = 5,
+ 		.internal_phys_offset = 3,
+-		.max_vid = 4095,
++		.max_vid = 8191,
+ 		.max_sid = 63,
+ 		.port_base_addr = 0x0,
+ 		.phy_base_addr = 0x0,
+diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h
+index f48a3c0ac7f968..f02518e93b60dc 100644
+--- a/drivers/net/dsa/mv88e6xxx/chip.h
++++ b/drivers/net/dsa/mv88e6xxx/chip.h
+@@ -206,6 +206,7 @@ struct mv88e6xxx_gpio_ops;
+ struct mv88e6xxx_avb_ops;
+ struct mv88e6xxx_ptp_ops;
+ struct mv88e6xxx_pcs_ops;
++struct mv88e6xxx_cc_coeffs;
+ 
+ struct mv88e6xxx_irq {
+ 	u16 masked;
+@@ -397,6 +398,7 @@ struct mv88e6xxx_chip {
+ 	struct cyclecounter	tstamp_cc;
+ 	struct timecounter	tstamp_tc;
+ 	struct delayed_work	overflow_work;
++	const struct mv88e6xxx_cc_coeffs *cc_coeffs;
+ 
+ 	struct ptp_clock	*ptp_clock;
+ 	struct ptp_clock_info	ptp_clock_info;
+@@ -719,10 +721,6 @@ struct mv88e6xxx_ptp_ops {
+ 	int arr1_sts_reg;
+ 	int dep_sts_reg;
+ 	u32 rx_filters;
+-	u32 cc_shift;
+-	u32 cc_mult;
+-	u32 cc_mult_num;
+-	u32 cc_mult_dem;
+ };
+ 
+ struct mv88e6xxx_pcs_ops {
+diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c
+index 5394a8cf7bf1d4..04053fdc6489af 100644
+--- a/drivers/net/dsa/mv88e6xxx/port.c
++++ b/drivers/net/dsa/mv88e6xxx/port.c
+@@ -1713,6 +1713,7 @@ int mv88e6393x_port_set_policy(struct mv88e6xxx_chip *chip, int port,
+ 	ptr = shift / 8;
+ 	shift %= 8;
+ 	mask >>= ptr * 8;
++	ptr <<= 8;
+ 
+ 	err = mv88e6393x_port_policy_read(chip, port, ptr, &reg);
+ 	if (err)
+diff --git a/drivers/net/dsa/mv88e6xxx/ptp.c b/drivers/net/dsa/mv88e6xxx/ptp.c
+index ea17231dc34e3e..5980bb4ce43e0a 100644
+--- a/drivers/net/dsa/mv88e6xxx/ptp.c
++++ b/drivers/net/dsa/mv88e6xxx/ptp.c
+@@ -18,6 +18,13 @@
+ 
+ #define MV88E6XXX_MAX_ADJ_PPB	1000000
+ 
++struct mv88e6xxx_cc_coeffs {
++	u32 cc_shift;
++	u32 cc_mult;
++	u32 cc_mult_num;
++	u32 cc_mult_dem;
++};
++
+ /* Family MV88E6250:
+  * Raw timestamps are in units of 10-ns clock periods.
+  *
+@@ -25,22 +32,43 @@
+  * simplifies to
+  * clkadj = scaled_ppm * 2^7 / 5^5
+  */
+-#define MV88E6250_CC_SHIFT	28
+-#define MV88E6250_CC_MULT	(10 << MV88E6250_CC_SHIFT)
+-#define MV88E6250_CC_MULT_NUM	(1 << 7)
+-#define MV88E6250_CC_MULT_DEM	3125ULL
++#define MV88E6XXX_CC_10NS_SHIFT 28
++static const struct mv88e6xxx_cc_coeffs mv88e6xxx_cc_10ns_coeffs = {
++	.cc_shift = MV88E6XXX_CC_10NS_SHIFT,
++	.cc_mult = 10 << MV88E6XXX_CC_10NS_SHIFT,
++	.cc_mult_num = 1 << 7,
++	.cc_mult_dem = 3125ULL,
++};
+ 
+-/* Other families:
++/* Other families except MV88E6393X in internal clock mode:
+  * Raw timestamps are in units of 8-ns clock periods.
+  *
+  * clkadj = scaled_ppm * 8*2^28 / (10^6 * 2^16)
+  * simplifies to
+  * clkadj = scaled_ppm * 2^9 / 5^6
+  */
+-#define MV88E6XXX_CC_SHIFT	28
+-#define MV88E6XXX_CC_MULT	(8 << MV88E6XXX_CC_SHIFT)
+-#define MV88E6XXX_CC_MULT_NUM	(1 << 9)
+-#define MV88E6XXX_CC_MULT_DEM	15625ULL
++#define MV88E6XXX_CC_8NS_SHIFT 28
++static const struct mv88e6xxx_cc_coeffs mv88e6xxx_cc_8ns_coeffs = {
++	.cc_shift = MV88E6XXX_CC_8NS_SHIFT,
++	.cc_mult = 8 << MV88E6XXX_CC_8NS_SHIFT,
++	.cc_mult_num = 1 << 9,
++	.cc_mult_dem = 15625ULL
++};
++
++/* Family MV88E6393X using internal clock:
++ * Raw timestamps are in units of 4-ns clock periods.
++ *
++ * clkadj = scaled_ppm * 4*2^28 / (10^6 * 2^16)
++ * simplifies to
++ * clkadj = scaled_ppm * 2^8 / 5^6
++ */
++#define MV88E6XXX_CC_4NS_SHIFT 28
++static const struct mv88e6xxx_cc_coeffs mv88e6xxx_cc_4ns_coeffs = {
++	.cc_shift = MV88E6XXX_CC_4NS_SHIFT,
++	.cc_mult = 4 << MV88E6XXX_CC_4NS_SHIFT,
++	.cc_mult_num = 1 << 8,
++	.cc_mult_dem = 15625ULL
++};
+ 
+ #define TAI_EVENT_WORK_INTERVAL msecs_to_jiffies(100)
+ 
+@@ -83,6 +111,33 @@ static int mv88e6352_set_gpio_func(struct mv88e6xxx_chip *chip, int pin,
+ 	return chip->info->ops->gpio_ops->set_pctl(chip, pin, func);
+ }
+ 
++static const struct mv88e6xxx_cc_coeffs *
++mv88e6xxx_cc_coeff_get(struct mv88e6xxx_chip *chip)
++{
++	u16 period_ps;
++	int err;
++
++	err = mv88e6xxx_tai_read(chip, MV88E6XXX_TAI_CLOCK_PERIOD, &period_ps, 1);
++	if (err) {
++		dev_err(chip->dev, "failed to read cycle counter period: %d\n",
++			err);
++		return ERR_PTR(err);
++	}
++
++	switch (period_ps) {
++	case 4000:
++		return &mv88e6xxx_cc_4ns_coeffs;
++	case 8000:
++		return &mv88e6xxx_cc_8ns_coeffs;
++	case 10000:
++		return &mv88e6xxx_cc_10ns_coeffs;
++	default:
++		dev_err(chip->dev, "unexpected cycle counter period of %u ps\n",
++			period_ps);
++		return ERR_PTR(-ENODEV);
++	}
++}
++
+ static u64 mv88e6352_ptp_clock_read(const struct cyclecounter *cc)
+ {
+ 	struct mv88e6xxx_chip *chip = cc_to_chip(cc);
+@@ -200,7 +255,6 @@ static void mv88e6352_tai_event_work(struct work_struct *ugly)
+ static int mv88e6xxx_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)
+ {
+ 	struct mv88e6xxx_chip *chip = ptp_to_chip(ptp);
+-	const struct mv88e6xxx_ptp_ops *ptp_ops = chip->info->ops->ptp_ops;
+ 	int neg_adj = 0;
+ 	u32 diff, mult;
+ 	u64 adj;
+@@ -210,10 +264,10 @@ static int mv88e6xxx_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)
+ 		scaled_ppm = -scaled_ppm;
+ 	}
+ 
+-	mult = ptp_ops->cc_mult;
+-	adj = ptp_ops->cc_mult_num;
++	mult = chip->cc_coeffs->cc_mult;
++	adj = chip->cc_coeffs->cc_mult_num;
+ 	adj *= scaled_ppm;
+-	diff = div_u64(adj, ptp_ops->cc_mult_dem);
++	diff = div_u64(adj, chip->cc_coeffs->cc_mult_dem);
+ 
+ 	mv88e6xxx_reg_lock(chip);
+ 
+@@ -360,10 +414,6 @@ const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops = {
+ 		(1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |
+ 		(1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |
+ 		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),
+-	.cc_shift = MV88E6XXX_CC_SHIFT,
+-	.cc_mult = MV88E6XXX_CC_MULT,
+-	.cc_mult_num = MV88E6XXX_CC_MULT_NUM,
+-	.cc_mult_dem = MV88E6XXX_CC_MULT_DEM,
+ };
+ 
+ const struct mv88e6xxx_ptp_ops mv88e6250_ptp_ops = {
+@@ -387,10 +437,6 @@ const struct mv88e6xxx_ptp_ops mv88e6250_ptp_ops = {
+ 		(1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |
+ 		(1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |
+ 		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),
+-	.cc_shift = MV88E6250_CC_SHIFT,
+-	.cc_mult = MV88E6250_CC_MULT,
+-	.cc_mult_num = MV88E6250_CC_MULT_NUM,
+-	.cc_mult_dem = MV88E6250_CC_MULT_DEM,
+ };
+ 
+ const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops = {
+@@ -414,10 +460,6 @@ const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops = {
+ 		(1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |
+ 		(1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |
+ 		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),
+-	.cc_shift = MV88E6XXX_CC_SHIFT,
+-	.cc_mult = MV88E6XXX_CC_MULT,
+-	.cc_mult_num = MV88E6XXX_CC_MULT_NUM,
+-	.cc_mult_dem = MV88E6XXX_CC_MULT_DEM,
+ };
+ 
+ const struct mv88e6xxx_ptp_ops mv88e6390_ptp_ops = {
+@@ -442,10 +484,6 @@ const struct mv88e6xxx_ptp_ops mv88e6390_ptp_ops = {
+ 		(1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |
+ 		(1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |
+ 		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),
+-	.cc_shift = MV88E6XXX_CC_SHIFT,
+-	.cc_mult = MV88E6XXX_CC_MULT,
+-	.cc_mult_num = MV88E6XXX_CC_MULT_NUM,
+-	.cc_mult_dem = MV88E6XXX_CC_MULT_DEM,
+ };
+ 
+ static u64 mv88e6xxx_ptp_clock_read(const struct cyclecounter *cc)
+@@ -458,10 +496,10 @@ static u64 mv88e6xxx_ptp_clock_read(const struct cyclecounter *cc)
+ 	return 0;
+ }
+ 
+-/* With a 125MHz input clock, the 32-bit timestamp counter overflows in ~34.3
++/* With a 250MHz input clock, the 32-bit timestamp counter overflows in ~17.2
+  * seconds; this task forces periodic reads so that we don't miss any.
+  */
+-#define MV88E6XXX_TAI_OVERFLOW_PERIOD (HZ * 16)
++#define MV88E6XXX_TAI_OVERFLOW_PERIOD (HZ * 8)
+ static void mv88e6xxx_ptp_overflow_check(struct work_struct *work)
+ {
+ 	struct delayed_work *dw = to_delayed_work(work);
+@@ -480,11 +518,15 @@ int mv88e6xxx_ptp_setup(struct mv88e6xxx_chip *chip)
+ 	int i;
+ 
+ 	/* Set up the cycle counter */
++	chip->cc_coeffs = mv88e6xxx_cc_coeff_get(chip);
++	if (IS_ERR(chip->cc_coeffs))
++		return PTR_ERR(chip->cc_coeffs);
++
+ 	memset(&chip->tstamp_cc, 0, sizeof(chip->tstamp_cc));
+ 	chip->tstamp_cc.read	= mv88e6xxx_ptp_clock_read;
+ 	chip->tstamp_cc.mask	= CYCLECOUNTER_MASK(32);
+-	chip->tstamp_cc.mult	= ptp_ops->cc_mult;
+-	chip->tstamp_cc.shift	= ptp_ops->cc_shift;
++	chip->tstamp_cc.mult	= chip->cc_coeffs->cc_mult;
++	chip->tstamp_cc.shift	= chip->cc_coeffs->cc_shift;
+ 
+ 	timecounter_init(&chip->tstamp_tc, &chip->tstamp_cc,
+ 			 ktime_to_ns(ktime_get_real()));
+diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
+index 597a02c75d527f..e624d31d20d891 100644
+--- a/drivers/net/ethernet/aeroflex/greth.c
++++ b/drivers/net/ethernet/aeroflex/greth.c
+@@ -484,7 +484,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
+ 
+ 	if (unlikely(skb->len > MAX_FRAME_SIZE)) {
+ 		dev->stats.tx_errors++;
+-		goto out;
++		goto len_error;
+ 	}
+ 
+ 	/* Save skb pointer. */
+@@ -575,6 +575,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
+ map_error:
+ 	if (net_ratelimit())
+ 		dev_warn(greth->dev, "Could not create TX DMA mapping\n");
++len_error:
+ 	dev_kfree_skb(skb);
+ out:
+ 	return err;
+diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
+index 6bf149d6459418..f0647286c68b25 100644
+--- a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
++++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
+@@ -322,6 +322,7 @@ static netdev_tx_t bcmasp_xmit(struct sk_buff *skb, struct net_device *dev)
+ 			}
+ 			/* Rewind so we do not have a hole */
+ 			spb_index = intf->tx_spb_index;
++			dev_kfree_skb(skb);
+ 			return NETDEV_TX_OK;
+ 		}
+ 
+diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
+index bf1611cce974a9..49e890a7e04a37 100644
+--- a/drivers/net/ethernet/broadcom/bcmsysport.c
++++ b/drivers/net/ethernet/broadcom/bcmsysport.c
+@@ -1359,6 +1359,7 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,
+ 		netif_err(priv, tx_err, dev, "DMA map failed at %p (len=%d)\n",
+ 			  skb->data, skb_len);
+ 		ret = NETDEV_TX_OK;
++		dev_kfree_skb_any(skb);
+ 		goto out;
+ 	}
+ 
+diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
+index ad862ed7888ac4..9d425ece33fd2a 100644
+--- a/drivers/net/ethernet/emulex/benet/be_main.c
++++ b/drivers/net/ethernet/emulex/benet/be_main.c
+@@ -1381,10 +1381,8 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev)
+ 	be_get_wrb_params_from_skb(adapter, skb, &wrb_params);
+ 
+ 	wrb_cnt = be_xmit_enqueue(adapter, txo, skb, &wrb_params);
+-	if (unlikely(!wrb_cnt)) {
+-		dev_kfree_skb_any(skb);
+-		goto drop;
+-	}
++	if (unlikely(!wrb_cnt))
++		goto drop_skb;
+ 
+ 	/* if os2bmc is enabled and if the pkt is destined to bmc,
+ 	 * enqueue the pkt a 2nd time with mgmt bit set.
+@@ -1393,7 +1391,7 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev)
+ 		BE_WRB_F_SET(wrb_params.features, OS2BMC, 1);
+ 		wrb_cnt = be_xmit_enqueue(adapter, txo, skb, &wrb_params);
+ 		if (unlikely(!wrb_cnt))
+-			goto drop;
++			goto drop_skb;
+ 		else
+ 			skb_get(skb);
+ 	}
+@@ -1407,6 +1405,8 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev)
+ 		be_xmit_flush(adapter, txo);
+ 
+ 	return NETDEV_TX_OK;
++drop_skb:
++	dev_kfree_skb_any(skb);
+ drop:
+ 	tx_stats(txo)->tx_drv_drops++;
+ 	/* Flush the already enqueued tx requests */
+diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c
+index 9767586b4eb329..11da139082e1bf 100644
+--- a/drivers/net/ethernet/freescale/fman/mac.c
++++ b/drivers/net/ethernet/freescale/fman/mac.c
+@@ -197,55 +197,67 @@ static int mac_probe(struct platform_device *_of_dev)
+ 		err = -EINVAL;
+ 		goto _return_of_node_put;
+ 	}
++	mac_dev->fman_dev = &of_dev->dev;
+ 
+ 	/* Get the FMan cell-index */
+ 	err = of_property_read_u32(dev_node, "cell-index", &val);
+ 	if (err) {
+ 		dev_err(dev, "failed to read cell-index for %pOF\n", dev_node);
+ 		err = -EINVAL;
+-		goto _return_of_node_put;
++		goto _return_dev_put;
+ 	}
+ 	/* cell-index 0 => FMan id 1 */
+ 	fman_id = (u8)(val + 1);
+ 
+-	priv->fman = fman_bind(&of_dev->dev);
++	priv->fman = fman_bind(mac_dev->fman_dev);
+ 	if (!priv->fman) {
+ 		dev_err(dev, "fman_bind(%pOF) failed\n", dev_node);
+ 		err = -ENODEV;
+-		goto _return_of_node_put;
++		goto _return_dev_put;
+ 	}
+ 
++	/* Two references have been taken in of_find_device_by_node()
++	 * and fman_bind(). Release one of them here. The second one
++	 * will be released in mac_remove().
++	 */
++	put_device(mac_dev->fman_dev);
+ 	of_node_put(dev_node);
++	dev_node = NULL;
+ 
+ 	/* Get the address of the memory mapped registers */
+ 	mac_dev->res = platform_get_mem_or_io(_of_dev, 0);
+ 	if (!mac_dev->res) {
+ 		dev_err(dev, "could not get registers\n");
+-		return -EINVAL;
++		err = -EINVAL;
++		goto _return_dev_put;
+ 	}
+ 
+ 	err = devm_request_resource(dev, fman_get_mem_region(priv->fman),
+ 				    mac_dev->res);
+ 	if (err) {
+ 		dev_err_probe(dev, err, "could not request resource\n");
+-		return err;
++		goto _return_dev_put;
+ 	}
+ 
+ 	mac_dev->vaddr = devm_ioremap(dev, mac_dev->res->start,
+ 				      resource_size(mac_dev->res));
+ 	if (!mac_dev->vaddr) {
+ 		dev_err(dev, "devm_ioremap() failed\n");
+-		return -EIO;
++		err = -EIO;
++		goto _return_dev_put;
+ 	}
+ 
+-	if (!of_device_is_available(mac_node))
+-		return -ENODEV;
++	if (!of_device_is_available(mac_node)) {
++		err = -ENODEV;
++		goto _return_dev_put;
++	}
+ 
+ 	/* Get the cell-index */
+ 	err = of_property_read_u32(mac_node, "cell-index", &val);
+ 	if (err) {
+ 		dev_err(dev, "failed to read cell-index for %pOF\n", mac_node);
+-		return -EINVAL;
++		err = -EINVAL;
++		goto _return_dev_put;
+ 	}
+ 	priv->cell_index = (u8)val;
+ 
+@@ -259,22 +271,26 @@ static int mac_probe(struct platform_device *_of_dev)
+ 	if (unlikely(nph < 0)) {
+ 		dev_err(dev, "of_count_phandle_with_args(%pOF, fsl,fman-ports) failed\n",
+ 			mac_node);
+-		return nph;
++		err = nph;
++		goto _return_dev_put;
+ 	}
+ 
+ 	if (nph != ARRAY_SIZE(mac_dev->port)) {
+ 		dev_err(dev, "Not supported number of fman-ports handles of mac node %pOF from device tree\n",
+ 			mac_node);
+-		return -EINVAL;
++		err = -EINVAL;
++		goto _return_dev_put;
+ 	}
+ 
+-	for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) {
++	/* PORT_NUM determines the size of the port array */
++	for (i = 0; i < PORT_NUM; i++) {
+ 		/* Find the port node */
+ 		dev_node = of_parse_phandle(mac_node, "fsl,fman-ports", i);
+ 		if (!dev_node) {
+ 			dev_err(dev, "of_parse_phandle(%pOF, fsl,fman-ports) failed\n",
+ 				mac_node);
+-			return -EINVAL;
++			err = -EINVAL;
++			goto _return_dev_arr_put;
+ 		}
+ 
+ 		of_dev = of_find_device_by_node(dev_node);
+@@ -282,17 +298,24 @@ static int mac_probe(struct platform_device *_of_dev)
+ 			dev_err(dev, "of_find_device_by_node(%pOF) failed\n",
+ 				dev_node);
+ 			err = -EINVAL;
+-			goto _return_of_node_put;
++			goto _return_dev_arr_put;
+ 		}
++		mac_dev->fman_port_devs[i] = &of_dev->dev;
+ 
+-		mac_dev->port[i] = fman_port_bind(&of_dev->dev);
++		mac_dev->port[i] = fman_port_bind(mac_dev->fman_port_devs[i]);
+ 		if (!mac_dev->port[i]) {
+ 			dev_err(dev, "dev_get_drvdata(%pOF) failed\n",
+ 				dev_node);
+ 			err = -EINVAL;
+-			goto _return_of_node_put;
++			goto _return_dev_arr_put;
+ 		}
++		/* Two references have been taken in of_find_device_by_node()
++		 * and fman_port_bind(). Release one of them here. The second
++		 * one will be released in mac_remove().
++		 */
++		put_device(mac_dev->fman_port_devs[i]);
+ 		of_node_put(dev_node);
++		dev_node = NULL;
+ 	}
+ 
+ 	/* Get the PHY connection type */
+@@ -312,7 +335,7 @@ static int mac_probe(struct platform_device *_of_dev)
+ 
+ 	err = init(mac_dev, mac_node, &params);
+ 	if (err < 0)
+-		return err;
++		goto _return_dev_arr_put;
+ 
+ 	if (!is_zero_ether_addr(mac_dev->addr))
+ 		dev_info(dev, "FMan MAC address: %pM\n", mac_dev->addr);
+@@ -327,6 +350,12 @@ static int mac_probe(struct platform_device *_of_dev)
+ 
+ 	return err;
+ 
++_return_dev_arr_put:
++	/* mac_dev is kzalloc'ed */
++	for (i = 0; i < PORT_NUM; i++)
++		put_device(mac_dev->fman_port_devs[i]);
++_return_dev_put:
++	put_device(mac_dev->fman_dev);
+ _return_of_node_put:
+ 	of_node_put(dev_node);
+ 	return err;
+@@ -335,6 +364,11 @@ static int mac_probe(struct platform_device *_of_dev)
+ static void mac_remove(struct platform_device *pdev)
+ {
+ 	struct mac_device *mac_dev = platform_get_drvdata(pdev);
++	int		   i;
++
++	for (i = 0; i < PORT_NUM; i++)
++		put_device(mac_dev->fman_port_devs[i]);
++	put_device(mac_dev->fman_dev);
+ 
+ 	platform_device_unregister(mac_dev->priv->eth_dev);
+ }
+diff --git a/drivers/net/ethernet/freescale/fman/mac.h b/drivers/net/ethernet/freescale/fman/mac.h
+index fe747915cc7379..8b5b43d50f8efb 100644
+--- a/drivers/net/ethernet/freescale/fman/mac.h
++++ b/drivers/net/ethernet/freescale/fman/mac.h
+@@ -19,12 +19,13 @@
+ struct fman_mac;
+ struct mac_priv_s;
+ 
++#define PORT_NUM 2
+ struct mac_device {
+ 	void __iomem		*vaddr;
+ 	struct device		*dev;
+ 	struct resource		*res;
+ 	u8			 addr[ETH_ALEN];
+-	struct fman_port	*port[2];
++	struct fman_port	*port[PORT_NUM];
+ 	struct phylink		*phylink;
+ 	struct phylink_config	phylink_config;
+ 	phy_interface_t		phy_if;
+@@ -52,6 +53,9 @@ struct mac_device {
+ 
+ 	struct fman_mac		*fman_mac;
+ 	struct mac_priv_s	*priv;
++
++	struct device		*fman_dev;
++	struct device		*fman_port_devs[PORT_NUM];
+ };
+ 
+ static inline struct mac_device
+diff --git a/drivers/net/ethernet/i825xx/sun3_82586.c b/drivers/net/ethernet/i825xx/sun3_82586.c
+index f2d4669c81cf29..58a3d28d938c32 100644
+--- a/drivers/net/ethernet/i825xx/sun3_82586.c
++++ b/drivers/net/ethernet/i825xx/sun3_82586.c
+@@ -1012,6 +1012,7 @@ sun3_82586_send_packet(struct sk_buff *skb, struct net_device *dev)
+ 	if(skb->len > XMIT_BUFF_SIZE)
+ 	{
+ 		printk("%s: Sorry, max. framelength is %d bytes. The length of your frame is %d bytes.\n",dev->name,XMIT_BUFF_SIZE,skb->len);
++		dev_kfree_skb(skb);
+ 		return NETDEV_TX_OK;
+ 	}
+ 
+diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c b/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c
+index 3c43f807852850..c7f4e3c058b7fa 100644
+--- a/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c
++++ b/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c
+@@ -336,6 +336,51 @@ static int octep_oq_check_hw_for_pkts(struct octep_device *oct,
+ 	return new_pkts;
+ }
+ 
++/**
++ * octep_oq_next_pkt() - Move to the next packet in Rx queue.
++ *
++ * @oq: Octeon Rx queue data structure.
++ * @buff_info: Current packet buffer info.
++ * @read_idx: Current packet index in the ring.
++ * @desc_used: Current packet descriptor number.
++ *
++ * Free the resources associated with a packet.
++ * Increment packet index in the ring and packet descriptor number.
++ */
++static void octep_oq_next_pkt(struct octep_oq *oq,
++			      struct octep_rx_buffer *buff_info,
++			      u32 *read_idx, u32 *desc_used)
++{
++	dma_unmap_page(oq->dev, oq->desc_ring[*read_idx].buffer_ptr,
++		       PAGE_SIZE, DMA_FROM_DEVICE);
++	buff_info->page = NULL;
++	(*read_idx)++;
++	(*desc_used)++;
++	if (*read_idx == oq->max_count)
++		*read_idx = 0;
++}
++
++/**
++ * octep_oq_drop_rx() - Free the resources associated with a packet.
++ *
++ * @oq: Octeon Rx queue data structure.
++ * @buff_info: Current packet buffer info.
++ * @read_idx: Current packet index in the ring.
++ * @desc_used: Current packet descriptor number.
++ *
++ */
++static void octep_oq_drop_rx(struct octep_oq *oq,
++			     struct octep_rx_buffer *buff_info,
++			     u32 *read_idx, u32 *desc_used)
++{
++	int data_len = buff_info->len - oq->max_single_buffer_size;
++
++	while (data_len > 0) {
++		octep_oq_next_pkt(oq, buff_info, read_idx, desc_used);
++		data_len -= oq->buffer_size;
++	};
++}
++
+ /**
+  * __octep_oq_process_rx() - Process hardware Rx queue and push to stack.
+  *
+@@ -365,10 +410,7 @@ static int __octep_oq_process_rx(struct octep_device *oct,
+ 	desc_used = 0;
+ 	for (pkt = 0; pkt < pkts_to_process; pkt++) {
+ 		buff_info = (struct octep_rx_buffer *)&oq->buff_info[read_idx];
+-		dma_unmap_page(oq->dev, oq->desc_ring[read_idx].buffer_ptr,
+-			       PAGE_SIZE, DMA_FROM_DEVICE);
+ 		resp_hw = page_address(buff_info->page);
+-		buff_info->page = NULL;
+ 
+ 		/* Swap the length field that is in Big-Endian to CPU */
+ 		buff_info->len = be64_to_cpu(resp_hw->length);
+@@ -390,36 +432,33 @@ static int __octep_oq_process_rx(struct octep_device *oct,
+ 			 */
+ 			data_offset = OCTEP_OQ_RESP_HW_SIZE;
+ 		}
++
++		octep_oq_next_pkt(oq, buff_info, &read_idx, &desc_used);
++
++		skb = build_skb((void *)resp_hw, PAGE_SIZE);
++		if (!skb) {
++			octep_oq_drop_rx(oq, buff_info,
++					 &read_idx, &desc_used);
++			oq->stats.alloc_failures++;
++			continue;
++		}
++		skb_reserve(skb, data_offset);
++
+ 		rx_bytes += buff_info->len;
+ 
+ 		if (buff_info->len <= oq->max_single_buffer_size) {
+-			skb = build_skb((void *)resp_hw, PAGE_SIZE);
+-			skb_reserve(skb, data_offset);
+ 			skb_put(skb, buff_info->len);
+-			read_idx++;
+-			desc_used++;
+-			if (read_idx == oq->max_count)
+-				read_idx = 0;
+ 		} else {
+ 			struct skb_shared_info *shinfo;
+ 			u16 data_len;
+ 
+-			skb = build_skb((void *)resp_hw, PAGE_SIZE);
+-			skb_reserve(skb, data_offset);
+ 			/* Head fragment includes response header(s);
+ 			 * subsequent fragments contains only data.
+ 			 */
+ 			skb_put(skb, oq->max_single_buffer_size);
+-			read_idx++;
+-			desc_used++;
+-			if (read_idx == oq->max_count)
+-				read_idx = 0;
+-
+ 			shinfo = skb_shinfo(skb);
+ 			data_len = buff_info->len - oq->max_single_buffer_size;
+ 			while (data_len) {
+-				dma_unmap_page(oq->dev, oq->desc_ring[read_idx].buffer_ptr,
+-					       PAGE_SIZE, DMA_FROM_DEVICE);
+ 				buff_info = (struct octep_rx_buffer *)
+ 					    &oq->buff_info[read_idx];
+ 				if (data_len < oq->buffer_size) {
+@@ -434,11 +473,8 @@ static int __octep_oq_process_rx(struct octep_device *oct,
+ 						buff_info->page, 0,
+ 						buff_info->len,
+ 						buff_info->len);
+-				buff_info->page = NULL;
+-				read_idx++;
+-				desc_used++;
+-				if (read_idx == oq->max_count)
+-					read_idx = 0;
++
++				octep_oq_next_pkt(oq, buff_info, &read_idx, &desc_used);
+ 			}
+ 		}
+ 
+diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
+index 224a025283ca7d..29487518ca6724 100644
+--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
++++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
+@@ -2298,7 +2298,7 @@ static int nix_smq_flush(struct rvu *rvu, int blkaddr,
+ 				 NIX_AF_TL3_TL2X_LINKX_CFG(tl2_tl3_link_schq, link));
+ 		if (!(cfg & BIT_ULL(12)))
+ 			continue;
+-		bmap |= (1 << i);
++		bmap |= BIT_ULL(i);
+ 		cfg &= ~BIT_ULL(12);
+ 		rvu_write64(rvu, blkaddr,
+ 			    NIX_AF_TL3_TL2X_LINKX_CFG(tl2_tl3_link_schq, link), cfg);
+@@ -2319,7 +2319,7 @@ static int nix_smq_flush(struct rvu *rvu, int blkaddr,
+ 
+ 	/* Set NIX_AF_TL3_TL2_LINKX_CFG[ENA] for the TL3/TL2 queue */
+ 	for (i = 0; i < (rvu->hw->cgx_links + rvu->hw->lbk_links); i++) {
+-		if (!(bmap & (1 << i)))
++		if (!(bmap & BIT_ULL(i)))
+ 			continue;
+ 		cfg = rvu_read64(rvu, blkaddr,
+ 				 NIX_AF_TL3_TL2X_LINKX_CFG(tl2_tl3_link_schq, link));
+diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+index 48dc4ae87af092..80af0fc7101fdc 100644
+--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
++++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+@@ -1758,6 +1758,10 @@ static void mlx5_cmd_comp_handler(struct mlx5_core_dev *dev, u64 vec, bool force
+ 	}
+ }
+ 
++#define MLX5_MAX_MANAGE_PAGES_CMD_ENT 1
++#define MLX5_CMD_MASK ((1UL << (cmd->vars.max_reg_cmds + \
++			   MLX5_MAX_MANAGE_PAGES_CMD_ENT)) - 1)
++
+ static void mlx5_cmd_trigger_completions(struct mlx5_core_dev *dev)
+ {
+ 	struct mlx5_cmd *cmd = &dev->cmd;
+@@ -1769,7 +1773,7 @@ static void mlx5_cmd_trigger_completions(struct mlx5_core_dev *dev)
+ 	/* wait for pending handlers to complete */
+ 	mlx5_eq_synchronize_cmd_irq(dev);
+ 	spin_lock_irqsave(&dev->cmd.alloc_lock, flags);
+-	vector = ~dev->cmd.vars.bitmask & ((1ul << (1 << dev->cmd.vars.log_sz)) - 1);
++	vector = ~dev->cmd.vars.bitmask & MLX5_CMD_MASK;
+ 	if (!vector)
+ 		goto no_trig;
+ 
+@@ -2275,7 +2279,7 @@ int mlx5_cmd_enable(struct mlx5_core_dev *dev)
+ 
+ 	cmd->state = MLX5_CMDIF_STATE_DOWN;
+ 	cmd->vars.max_reg_cmds = (1 << cmd->vars.log_sz) - 1;
+-	cmd->vars.bitmask = (1UL << cmd->vars.max_reg_cmds) - 1;
++	cmd->vars.bitmask = MLX5_CMD_MASK;
+ 
+ 	sema_init(&cmd->vars.sem, cmd->vars.max_reg_cmds);
+ 	sema_init(&cmd->vars.pages_sem, 1);
+diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
+index 40a6cb052a2da3..07a04195490920 100644
+--- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c
++++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
+@@ -1073,6 +1073,12 @@ int mlx5_comp_eqn_get(struct mlx5_core_dev *dev, u16 vecidx, int *eqn)
+ 	struct mlx5_eq_comp *eq;
+ 	int ret = 0;
+ 
++	if (vecidx >= table->max_comp_eqs) {
++		mlx5_core_dbg(dev, "Requested vector index %u should be less than %u",
++			      vecidx, table->max_comp_eqs);
++		return -EINVAL;
++	}
++
+ 	mutex_lock(&table->comp_lock);
+ 	eq = xa_load(&table->comp_eqs, vecidx);
+ 	if (eq) {
+diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+index 1789800faaeb62..f6022c135ec023 100644
+--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
++++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+@@ -1489,7 +1489,7 @@ int mlx5_eswitch_enable_locked(struct mlx5_eswitch *esw, int num_vfs)
+ 	}
+ 
+ 	if (err)
+-		goto abort;
++		goto err_esw_enable;
+ 
+ 	esw->fdb_table.flags |= MLX5_ESW_FDB_CREATED;
+ 
+@@ -1503,7 +1503,8 @@ int mlx5_eswitch_enable_locked(struct mlx5_eswitch *esw, int num_vfs)
+ 
+ 	return 0;
+ 
+-abort:
++err_esw_enable:
++	mlx5_eq_notifier_unregister(esw->dev, &esw->nb);
+ 	mlx5_esw_acls_ns_cleanup(esw);
+ 	return err;
+ }
+diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
+index b499d8ea6d216f..6856eb602f8260 100644
+--- a/drivers/net/ethernet/realtek/r8169_main.c
++++ b/drivers/net/ethernet/realtek/r8169_main.c
+@@ -4576,7 +4576,9 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
+ 	if ((status & 0xffff) == 0xffff || !(status & tp->irq_mask))
+ 		return IRQ_NONE;
+ 
+-	if (unlikely(status & SYSErr)) {
++	/* At least RTL8168fp may unexpectedly set the SYSErr bit */
++	if (unlikely(status & SYSErr &&
++	    tp->mac_version <= RTL_GIGA_MAC_VER_06)) {
+ 		rtl8169_pcierr_interrupt(tp->dev);
+ 		goto out;
+ 	}
+diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
+index c6897e6ea362d9..58fdc4f8dd4835 100644
+--- a/drivers/net/ethernet/renesas/ravb_main.c
++++ b/drivers/net/ethernet/renesas/ravb_main.c
+@@ -1673,20 +1673,19 @@ static int ravb_get_ts_info(struct net_device *ndev,
+ 	struct ravb_private *priv = netdev_priv(ndev);
+ 	const struct ravb_hw_info *hw_info = priv->info;
+ 
+-	info->so_timestamping =
+-		SOF_TIMESTAMPING_TX_SOFTWARE |
+-		SOF_TIMESTAMPING_RX_SOFTWARE |
+-		SOF_TIMESTAMPING_SOFTWARE |
+-		SOF_TIMESTAMPING_TX_HARDWARE |
+-		SOF_TIMESTAMPING_RX_HARDWARE |
+-		SOF_TIMESTAMPING_RAW_HARDWARE;
+-	info->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON);
+-	info->rx_filters =
+-		(1 << HWTSTAMP_FILTER_NONE) |
+-		(1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |
+-		(1 << HWTSTAMP_FILTER_ALL);
+-	if (hw_info->gptp || hw_info->ccc_gac)
++	if (hw_info->gptp || hw_info->ccc_gac) {
++		info->so_timestamping =
++			SOF_TIMESTAMPING_TX_SOFTWARE |
++			SOF_TIMESTAMPING_TX_HARDWARE |
++			SOF_TIMESTAMPING_RX_HARDWARE |
++			SOF_TIMESTAMPING_RAW_HARDWARE;
++		info->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON);
++		info->rx_filters =
++			(1 << HWTSTAMP_FILTER_NONE) |
++			(1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |
++			(1 << HWTSTAMP_FILTER_ALL);
+ 		info->phc_index = ptp_clock_index(priv->ptp.clock);
++	}
+ 
+ 	return 0;
+ }
+diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c
+index e0f3cbd36852e3..e2d61a3a7712d3 100644
+--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c
++++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c
+@@ -127,10 +127,12 @@ static int mgbe_uphy_lane_bringup_serdes_up(struct net_device *ndev, void *mgbe_
+ 	value &= ~XPCS_WRAP_UPHY_RX_CONTROL_AUX_RX_IDDQ;
+ 	writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
+ 
++	usleep_range(10, 20);  /* 50ns min delay needed as per HW design */
+ 	value = readl(mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
+ 	value &= ~XPCS_WRAP_UPHY_RX_CONTROL_RX_SLEEP;
+ 	writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
+ 
++	usleep_range(10, 20);  /* 500ns min delay needed as per HW design */
+ 	value = readl(mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
+ 	value |= XPCS_WRAP_UPHY_RX_CONTROL_RX_CAL_EN;
+ 	writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
+@@ -143,22 +145,30 @@ static int mgbe_uphy_lane_bringup_serdes_up(struct net_device *ndev, void *mgbe_
+ 		return err;
+ 	}
+ 
++	usleep_range(10, 20);  /* 50ns min delay needed as per HW design */
+ 	value = readl(mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
+ 	value |= XPCS_WRAP_UPHY_RX_CONTROL_RX_DATA_EN;
+ 	writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
+ 
+ 	value = readl(mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
+-	value |= XPCS_WRAP_UPHY_RX_CONTROL_RX_CDR_RESET;
++	value &= ~XPCS_WRAP_UPHY_RX_CONTROL_RX_PCS_PHY_RDY;
+ 	writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
+ 
++	usleep_range(10, 20);  /* 50ns min delay needed as per HW design */
+ 	value = readl(mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
+-	value &= ~XPCS_WRAP_UPHY_RX_CONTROL_RX_CDR_RESET;
++	value |= XPCS_WRAP_UPHY_RX_CONTROL_RX_CDR_RESET;
+ 	writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
+ 
++	usleep_range(10, 20);  /* 50ns min delay needed as per HW design */
+ 	value = readl(mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
+ 	value |= XPCS_WRAP_UPHY_RX_CONTROL_RX_PCS_PHY_RDY;
+ 	writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
+ 
++	msleep(30);  /* 30ms delay needed as per HW design */
++	value = readl(mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
++	value &= ~XPCS_WRAP_UPHY_RX_CONTROL_RX_CDR_RESET;
++	writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
++
+ 	err = readl_poll_timeout(mgbe->xpcs + XPCS_WRAP_IRQ_STATUS, value,
+ 				 value & XPCS_WRAP_IRQ_STATUS_PCS_LINK_STS,
+ 				 500, 500 * 2000);
+diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+index 62c10eb4f0adf1..9f779653ed6225 100644
+--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
++++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+@@ -845,6 +845,7 @@ axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
+ 		if (net_ratelimit())
+ 			netdev_err(ndev, "TX DMA mapping error\n");
+ 		ndev->stats.tx_dropped++;
++		dev_kfree_skb_any(skb);
+ 		return NETDEV_TX_OK;
+ 	}
+ 	desc_set_phys_addr(lp, phys, cur_p);
+@@ -865,6 +866,7 @@ axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
+ 			ndev->stats.tx_dropped++;
+ 			axienet_free_tx_chain(lp, orig_tail_ptr, ii + 1,
+ 					      true, NULL, 0);
++			dev_kfree_skb_any(skb);
+ 			return NETDEV_TX_OK;
+ 		}
+ 		desc_set_phys_addr(lp, phys, cur_p);
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 9d2d66a4aafd56..8698d2db3dc8e1 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -2795,6 +2795,31 @@ static struct  hv_driver netvsc_drv = {
+ 	},
+ };
+ 
++/* Set VF's namespace same as the synthetic NIC */
++static void netvsc_event_set_vf_ns(struct net_device *ndev)
++{
++	struct net_device_context *ndev_ctx = netdev_priv(ndev);
++	struct net_device *vf_netdev;
++	int ret;
++
++	vf_netdev = rtnl_dereference(ndev_ctx->vf_netdev);
++	if (!vf_netdev)
++		return;
++
++	if (!net_eq(dev_net(ndev), dev_net(vf_netdev))) {
++		ret = dev_change_net_namespace(vf_netdev, dev_net(ndev),
++					       "eth%d");
++		if (ret)
++			netdev_err(vf_netdev,
++				   "Cannot move to same namespace as %s: %d\n",
++				   ndev->name, ret);
++		else
++			netdev_info(vf_netdev,
++				    "Moved VF to namespace with: %s\n",
++				    ndev->name);
++	}
++}
++
+ /*
+  * On Hyper-V, every VF interface is matched with a corresponding
+  * synthetic interface. The synthetic interface is presented first
+@@ -2807,6 +2832,11 @@ static int netvsc_netdev_event(struct notifier_block *this,
+ 	struct net_device *event_dev = netdev_notifier_info_to_dev(ptr);
+ 	int ret = 0;
+ 
++	if (event_dev->netdev_ops == &device_ops && event == NETDEV_REGISTER) {
++		netvsc_event_set_vf_ns(event_dev);
++		return NOTIFY_DONE;
++	}
++
+ 	ret = check_dev_is_matching_vf(event_dev);
+ 	if (ret != 0)
+ 		return NOTIFY_DONE;
+diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
+index 778fb77c5a9372..2ada8baf815b15 100644
+--- a/drivers/net/macsec.c
++++ b/drivers/net/macsec.c
+@@ -151,19 +151,6 @@ static struct macsec_rx_sa *macsec_rxsa_get(struct macsec_rx_sa __rcu *ptr)
+ 	return sa;
+ }
+ 
+-static struct macsec_rx_sa *macsec_active_rxsa_get(struct macsec_rx_sc *rx_sc)
+-{
+-	struct macsec_rx_sa *sa = NULL;
+-	int an;
+-
+-	for (an = 0; an < MACSEC_NUM_AN; an++)	{
+-		sa = macsec_rxsa_get(rx_sc->sa[an]);
+-		if (sa)
+-			break;
+-	}
+-	return sa;
+-}
+-
+ static void free_rx_sc_rcu(struct rcu_head *head)
+ {
+ 	struct macsec_rx_sc *rx_sc = container_of(head, struct macsec_rx_sc, rcu_head);
+@@ -1205,15 +1192,12 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb)
+ 		/* If validateFrames is Strict or the C bit in the
+ 		 * SecTAG is set, discard
+ 		 */
+-		struct macsec_rx_sa *active_rx_sa = macsec_active_rxsa_get(rx_sc);
+ 		if (hdr->tci_an & MACSEC_TCI_C ||
+ 		    secy->validate_frames == MACSEC_VALIDATE_STRICT) {
+ 			u64_stats_update_begin(&rxsc_stats->syncp);
+ 			rxsc_stats->stats.InPktsNotUsingSA++;
+ 			u64_stats_update_end(&rxsc_stats->syncp);
+ 			DEV_STATS_INC(secy->netdev, rx_errors);
+-			if (active_rx_sa)
+-				this_cpu_inc(active_rx_sa->stats->InPktsNotUsingSA);
+ 			goto drop_nosa;
+ 		}
+ 
+@@ -1223,8 +1207,6 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb)
+ 		u64_stats_update_begin(&rxsc_stats->syncp);
+ 		rxsc_stats->stats.InPktsUnusedSA++;
+ 		u64_stats_update_end(&rxsc_stats->syncp);
+-		if (active_rx_sa)
+-			this_cpu_inc(active_rx_sa->stats->InPktsUnusedSA);
+ 		goto deliver;
+ 	}
+ 
+diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
+index 92a7a36b93ac0c..3e0b61202f0c98 100644
+--- a/drivers/net/netdevsim/dev.c
++++ b/drivers/net/netdevsim/dev.c
+@@ -836,7 +836,8 @@ static void nsim_dev_trap_report_work(struct work_struct *work)
+ 	nsim_dev = nsim_trap_data->nsim_dev;
+ 
+ 	if (!devl_trylock(priv_to_devlink(nsim_dev))) {
+-		schedule_delayed_work(&nsim_dev->trap_data->trap_report_dw, 1);
++		queue_delayed_work(system_unbound_wq,
++				   &nsim_dev->trap_data->trap_report_dw, 1);
+ 		return;
+ 	}
+ 
+@@ -848,11 +849,12 @@ static void nsim_dev_trap_report_work(struct work_struct *work)
+ 			continue;
+ 
+ 		nsim_dev_trap_report(nsim_dev_port);
++		cond_resched();
+ 	}
+ 	devl_unlock(priv_to_devlink(nsim_dev));
+-
+-	schedule_delayed_work(&nsim_dev->trap_data->trap_report_dw,
+-			      msecs_to_jiffies(NSIM_TRAP_REPORT_INTERVAL_MS));
++	queue_delayed_work(system_unbound_wq,
++			   &nsim_dev->trap_data->trap_report_dw,
++			   msecs_to_jiffies(NSIM_TRAP_REPORT_INTERVAL_MS));
+ }
+ 
+ static int nsim_dev_traps_init(struct devlink *devlink)
+@@ -907,8 +909,9 @@ static int nsim_dev_traps_init(struct devlink *devlink)
+ 
+ 	INIT_DELAYED_WORK(&nsim_dev->trap_data->trap_report_dw,
+ 			  nsim_dev_trap_report_work);
+-	schedule_delayed_work(&nsim_dev->trap_data->trap_report_dw,
+-			      msecs_to_jiffies(NSIM_TRAP_REPORT_INTERVAL_MS));
++	queue_delayed_work(system_unbound_wq,
++			   &nsim_dev->trap_data->trap_report_dw,
++			   msecs_to_jiffies(NSIM_TRAP_REPORT_INTERVAL_MS));
+ 
+ 	return 0;
+ 
+diff --git a/drivers/net/phy/dp83822.c b/drivers/net/phy/dp83822.c
+index 29e1cbea6dc0c3..507726a08f82d1 100644
+--- a/drivers/net/phy/dp83822.c
++++ b/drivers/net/phy/dp83822.c
+@@ -40,8 +40,8 @@
+ /* Control Register 2 bits */
+ #define DP83822_FX_ENABLE	BIT(14)
+ 
+-#define DP83822_HW_RESET	BIT(15)
+-#define DP83822_SW_RESET	BIT(14)
++#define DP83822_SW_RESET	BIT(15)
++#define DP83822_DIG_RESTART	BIT(14)
+ 
+ /* PHY STS bits */
+ #define DP83822_PHYSTS_DUPLEX			BIT(2)
+diff --git a/drivers/net/plip/plip.c b/drivers/net/plip/plip.c
+index 40ce8abe699954..6019811920a441 100644
+--- a/drivers/net/plip/plip.c
++++ b/drivers/net/plip/plip.c
+@@ -815,7 +815,7 @@ plip_send_packet(struct net_device *dev, struct net_local *nl,
+ 				return HS_TIMEOUT;
+ 			}
+ 		}
+-		break;
++		fallthrough;
+ 
+ 	case PLIP_PK_LENGTH_LSB:
+ 		if (plip_send(nibble_timeout, dev,
+diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
+index 60c58dd6d25311..9f66c47dc58bc7 100644
+--- a/drivers/net/usb/usbnet.c
++++ b/drivers/net/usb/usbnet.c
+@@ -1771,7 +1771,8 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
+ 		// can rename the link if it knows better.
+ 		if ((dev->driver_info->flags & FLAG_ETHER) != 0 &&
+ 		    ((dev->driver_info->flags & FLAG_POINTTOPOINT) == 0 ||
+-		     (net->dev_addr [0] & 0x02) == 0))
++		     /* somebody touched it*/
++		     !is_zero_ether_addr(net->dev_addr)))
+ 			strscpy(net->name, "eth%d", sizeof(net->name));
+ 		/* WLAN devices should always be named "wlan%d" */
+ 		if ((dev->driver_info->flags & FLAG_WLAN) != 0)
+@@ -1874,6 +1875,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
+ 	 * may trigger an error resubmitting itself and, worse,
+ 	 * schedule a timer. So we kill it all just in case.
+ 	 */
++	usbnet_mark_going_away(dev);
+ 	cancel_work_sync(&dev->kevent);
+ 	del_timer_sync(&dev->delay);
+ 	free_percpu(net->tstats);
+diff --git a/drivers/net/vmxnet3/vmxnet3_xdp.c b/drivers/net/vmxnet3/vmxnet3_xdp.c
+index a6c787454a1aeb..1341374a4588a0 100644
+--- a/drivers/net/vmxnet3/vmxnet3_xdp.c
++++ b/drivers/net/vmxnet3/vmxnet3_xdp.c
+@@ -148,7 +148,7 @@ vmxnet3_xdp_xmit_frame(struct vmxnet3_adapter *adapter,
+ 	} else { /* XDP buffer from page pool */
+ 		page = virt_to_page(xdpf->data);
+ 		tbi->dma_addr = page_pool_get_dma_addr(page) +
+-				VMXNET3_XDP_HEADROOM;
++				(xdpf->data - (void *)xdpf);
+ 		dma_sync_single_for_device(&adapter->pdev->dev,
+ 					   tbi->dma_addr, buf_size,
+ 					   DMA_TO_DEVICE);
+diff --git a/drivers/net/wwan/wwan_core.c b/drivers/net/wwan/wwan_core.c
+index 284ab1f56391aa..45ed3afc443df9 100644
+--- a/drivers/net/wwan/wwan_core.c
++++ b/drivers/net/wwan/wwan_core.c
+@@ -1031,7 +1031,7 @@ static const struct nla_policy wwan_rtnl_policy[IFLA_WWAN_MAX + 1] = {
+ 
+ static struct rtnl_link_ops wwan_rtnl_link_ops __read_mostly = {
+ 	.kind = "wwan",
+-	.maxtype = __IFLA_WWAN_MAX,
++	.maxtype = IFLA_WWAN_MAX,
+ 	.alloc = wwan_rtnl_alloc,
+ 	.validate = wwan_rtnl_validate,
+ 	.newlink = wwan_rtnl_newlink,
+diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
+index 32b5cc76a0223c..b701969cf1c2aa 100644
+--- a/drivers/nvme/host/pci.c
++++ b/drivers/nvme/host/pci.c
+@@ -2469,17 +2469,29 @@ static unsigned int nvme_pci_nr_maps(struct nvme_dev *dev)
+ 	return 1;
+ }
+ 
+-static void nvme_pci_update_nr_queues(struct nvme_dev *dev)
++static bool nvme_pci_update_nr_queues(struct nvme_dev *dev)
+ {
+ 	if (!dev->ctrl.tagset) {
+ 		nvme_alloc_io_tag_set(&dev->ctrl, &dev->tagset, &nvme_mq_ops,
+ 				nvme_pci_nr_maps(dev), sizeof(struct nvme_iod));
+-		return;
++		return true;
++	}
++
++	/* Give up if we are racing with nvme_dev_disable() */
++	if (!mutex_trylock(&dev->shutdown_lock))
++		return false;
++
++	/* Check if nvme_dev_disable() has been executed already */
++	if (!dev->online_queues) {
++		mutex_unlock(&dev->shutdown_lock);
++		return false;
+ 	}
+ 
+ 	blk_mq_update_nr_hw_queues(&dev->tagset, dev->online_queues - 1);
+ 	/* free previously allocated queues that are no longer usable */
+ 	nvme_free_queues(dev, dev->online_queues);
++	mutex_unlock(&dev->shutdown_lock);
++	return true;
+ }
+ 
+ static int nvme_pci_enable(struct nvme_dev *dev)
+@@ -2757,10 +2769,11 @@ static void nvme_reset_work(struct work_struct *work)
+ 	 * controller around but remove all namespaces.
+ 	 */
+ 	if (dev->online_queues > 1) {
++		nvme_dbbuf_set(dev);
+ 		nvme_unquiesce_io_queues(&dev->ctrl);
+ 		nvme_wait_freeze(&dev->ctrl);
+-		nvme_pci_update_nr_queues(dev);
+-		nvme_dbbuf_set(dev);
++		if (!nvme_pci_update_nr_queues(dev))
++			goto out;
+ 		nvme_unfreeze(&dev->ctrl);
+ 	} else {
+ 		dev_warn(dev->ctrl.device, "IO queues lost\n");
+diff --git a/drivers/platform/x86/dell/dell-wmi-base.c b/drivers/platform/x86/dell/dell-wmi-base.c
+index 502783a7adb118..24fd7ffadda952 100644
+--- a/drivers/platform/x86/dell/dell-wmi-base.c
++++ b/drivers/platform/x86/dell/dell-wmi-base.c
+@@ -264,6 +264,15 @@ static const struct key_entry dell_wmi_keymap_type_0010[] = {
+ 	/*Speaker Mute*/
+ 	{ KE_KEY, 0x109, { KEY_MUTE} },
+ 
++	/* S2Idle screen off */
++	{ KE_IGNORE, 0x120, { KEY_RESERVED }},
++
++	/* Leaving S4 or S2Idle suspend */
++	{ KE_IGNORE, 0x130, { KEY_RESERVED }},
++
++	/* Entering S2Idle suspend */
++	{ KE_IGNORE, 0x140, { KEY_RESERVED }},
++
+ 	/* Mic mute */
+ 	{ KE_KEY, 0x150, { KEY_MICMUTE } },
+ 
+diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
+index b929b4f824205e..af49dd6b31ade7 100644
+--- a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
++++ b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
+@@ -521,6 +521,7 @@ static int __init sysman_init(void)
+ 	int ret = 0;
+ 
+ 	if (!dmi_find_device(DMI_DEV_TYPE_OEM_STRING, "Dell System", NULL) &&
++	    !dmi_find_device(DMI_DEV_TYPE_OEM_STRING, "Alienware", NULL) &&
+ 	    !dmi_find_device(DMI_DEV_TYPE_OEM_STRING, "www.dell.com", NULL)) {
+ 		pr_err("Unable to run on non-Dell system\n");
+ 		return -ENODEV;
+diff --git a/drivers/powercap/dtpm_devfreq.c b/drivers/powercap/dtpm_devfreq.c
+index 612c3b59dd5bef..0ca53db7a90eb3 100644
+--- a/drivers/powercap/dtpm_devfreq.c
++++ b/drivers/powercap/dtpm_devfreq.c
+@@ -166,7 +166,7 @@ static int __dtpm_devfreq_setup(struct devfreq *devfreq, struct dtpm *parent)
+ 	ret = dev_pm_qos_add_request(dev, &dtpm_devfreq->qos_req,
+ 				     DEV_PM_QOS_MAX_FREQUENCY,
+ 				     PM_QOS_MAX_FREQUENCY_DEFAULT_VALUE);
+-	if (ret) {
++	if (ret < 0) {
+ 		pr_err("Failed to add QoS request: %d\n", ret);
+ 		goto out_dtpm_unregister;
+ 	}
+diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
+index 86590a7e29f6ae..dd041ee18ac9be 100644
+--- a/drivers/target/target_core_device.c
++++ b/drivers/target/target_core_device.c
+@@ -692,7 +692,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
+ 
+ 	dev->queues = kcalloc(nr_cpu_ids, sizeof(*dev->queues), GFP_KERNEL);
+ 	if (!dev->queues) {
+-		dev->transport->free_device(dev);
++		hba->backend->ops->free_device(dev);
+ 		return NULL;
+ 	}
+ 
+diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
+index 22cc6cac0ba2b5..2e100b76914a06 100644
+--- a/drivers/target/target_core_user.c
++++ b/drivers/target/target_core_user.c
+@@ -2130,7 +2130,7 @@ static int tcmu_netlink_event_send(struct tcmu_dev *udev,
+ 	}
+ 
+ 	ret = genlmsg_multicast_allns(&tcmu_genl_family, skb, 0,
+-				      TCMU_MCGRP_CONFIG, GFP_KERNEL);
++				      TCMU_MCGRP_CONFIG);
+ 
+ 	/* Wait during an add as the listener may not be up yet */
+ 	if (ret == 0 ||
+diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
+index af851e4e8c8a76..8cbe19574bbcbc 100644
+--- a/drivers/usb/dwc3/core.c
++++ b/drivers/usb/dwc3/core.c
+@@ -2106,6 +2106,11 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
+ {
+ 	u32 reg;
+ 
++	dwc->susphy_state = (dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)) &
++			    DWC3_GUSB2PHYCFG_SUSPHY) ||
++			    (dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0)) &
++			    DWC3_GUSB3PIPECTL_SUSPHY);
++
+ 	switch (dwc->current_dr_role) {
+ 	case DWC3_GCTL_PRTCAP_DEVICE:
+ 		if (pm_runtime_suspended(dwc->dev))
+@@ -2153,6 +2158,15 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
+ 		break;
+ 	}
+ 
++	if (!PMSG_IS_AUTO(msg)) {
++		/*
++		 * TI AM62 platform requires SUSPHY to be
++		 * enabled for system suspend to work.
++		 */
++		if (!dwc->susphy_state)
++			dwc3_enable_susphy(dwc, true);
++	}
++
+ 	return 0;
+ }
+ 
+@@ -2215,6 +2229,11 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg)
+ 		break;
+ 	}
+ 
++	if (!PMSG_IS_AUTO(msg)) {
++		/* restore SUSPHY state to that before system suspend. */
++		dwc3_enable_susphy(dwc, dwc->susphy_state);
++	}
++
+ 	return 0;
+ }
+ 
+diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
+index 420753205fafa1..3325796f3cb451 100644
+--- a/drivers/usb/dwc3/core.h
++++ b/drivers/usb/dwc3/core.h
+@@ -1127,6 +1127,8 @@ struct dwc3_scratchpad_array {
+  * @sys_wakeup: set if the device may do system wakeup.
+  * @wakeup_configured: set if the device is configured for remote wakeup.
+  * @suspended: set to track suspend event due to U3/L2.
++ * @susphy_state: state of DWC3_GUSB2PHYCFG_SUSPHY + DWC3_GUSB3PIPECTL_SUSPHY
++ *		  before PM suspend.
+  * @imod_interval: set the interrupt moderation interval in 250ns
+  *			increments or 0 to disable.
+  * @max_cfg_eps: current max number of IN eps used across all USB configs.
+@@ -1351,6 +1353,7 @@ struct dwc3 {
+ 	unsigned		sys_wakeup:1;
+ 	unsigned		wakeup_configured:1;
+ 	unsigned		suspended:1;
++	unsigned		susphy_state:1;
+ 
+ 	u16			imod_interval;
+ 
+diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c
+index 0219cd79493a73..b3dc5f5164f42c 100644
+--- a/drivers/usb/gadget/function/f_uac2.c
++++ b/drivers/usb/gadget/function/f_uac2.c
+@@ -2042,7 +2042,7 @@ static ssize_t f_uac2_opts_##name##_show(struct config_item *item,	\
+ 	int result;							\
+ 									\
+ 	mutex_lock(&opts->lock);					\
+-	result = snprintf(page, sizeof(opts->name), "%s", opts->name);	\
++	result = scnprintf(page, sizeof(opts->name), "%s", opts->name);	\
+ 	mutex_unlock(&opts->lock);					\
+ 									\
+ 	return result;							\
+@@ -2052,7 +2052,7 @@ static ssize_t f_uac2_opts_##name##_store(struct config_item *item,	\
+ 					  const char *page, size_t len)	\
+ {									\
+ 	struct f_uac2_opts *opts = to_f_uac2_opts(item);		\
+-	int ret = 0;							\
++	int ret = len;							\
+ 									\
+ 	mutex_lock(&opts->lock);					\
+ 	if (opts->refcnt) {						\
+@@ -2060,8 +2060,11 @@ static ssize_t f_uac2_opts_##name##_store(struct config_item *item,	\
+ 		goto end;						\
+ 	}								\
+ 									\
+-	ret = snprintf(opts->name, min(sizeof(opts->name), len),	\
+-			"%s", page);					\
++	if (len && page[len - 1] == '\n')				\
++		len--;							\
++									\
++	scnprintf(opts->name, min(sizeof(opts->name), len + 1),		\
++		  "%s", page);						\
+ 									\
+ end:									\
+ 	mutex_unlock(&opts->lock);					\
+@@ -2178,7 +2181,7 @@ static struct usb_function_instance *afunc_alloc_inst(void)
+ 	opts->req_number = UAC2_DEF_REQ_NUM;
+ 	opts->fb_max = FBACK_FAST_MAX;
+ 
+-	snprintf(opts->function_name, sizeof(opts->function_name), "Source/Sink");
++	scnprintf(opts->function_name, sizeof(opts->function_name), "Source/Sink");
+ 
+ 	return &opts->func_inst;
+ }
+diff --git a/drivers/usb/host/xhci-caps.h b/drivers/usb/host/xhci-caps.h
+new file mode 100644
+index 00000000000000..9e94cebf4a56d1
+--- /dev/null
++++ b/drivers/usb/host/xhci-caps.h
+@@ -0,0 +1,85 @@
++/* SPDX-License-Identifier: GPL-2.0 */
++
++/* hc_capbase bitmasks */
++/* bits 7:0 - how long is the Capabilities register */
++#define HC_LENGTH(p)		XHCI_HC_LENGTH(p)
++/* bits 31:16	*/
++#define HC_VERSION(p)		(((p) >> 16) & 0xffff)
++
++/* HCSPARAMS1 - hcs_params1 - bitmasks */
++/* bits 0:7, Max Device Slots */
++#define HCS_MAX_SLOTS(p)	(((p) >> 0) & 0xff)
++#define HCS_SLOTS_MASK		0xff
++/* bits 8:18, Max Interrupters */
++#define HCS_MAX_INTRS(p)	(((p) >> 8) & 0x7ff)
++/* bits 24:31, Max Ports - max value is 0x7F = 127 ports */
++#define HCS_MAX_PORTS(p)	(((p) >> 24) & 0x7f)
++
++/* HCSPARAMS2 - hcs_params2 - bitmasks */
++/* bits 0:3, frames or uframes that SW needs to queue transactions
++ * ahead of the HW to meet periodic deadlines */
++#define HCS_IST(p)		(((p) >> 0) & 0xf)
++/* bits 4:7, max number of Event Ring segments */
++#define HCS_ERST_MAX(p)		(((p) >> 4) & 0xf)
++/* bits 21:25 Hi 5 bits of Scratchpad buffers SW must allocate for the HW */
++/* bit 26 Scratchpad restore - for save/restore HW state - not used yet */
++/* bits 27:31 Lo 5 bits of Scratchpad buffers SW must allocate for the HW */
++#define HCS_MAX_SCRATCHPAD(p)   ((((p) >> 16) & 0x3e0) | (((p) >> 27) & 0x1f))
++
++/* HCSPARAMS3 - hcs_params3 - bitmasks */
++/* bits 0:7, Max U1 to U0 latency for the roothub ports */
++#define HCS_U1_LATENCY(p)	(((p) >> 0) & 0xff)
++/* bits 16:31, Max U2 to U0 latency for the roothub ports */
++#define HCS_U2_LATENCY(p)	(((p) >> 16) & 0xffff)
++
++/* HCCPARAMS - hcc_params - bitmasks */
++/* true: HC can use 64-bit address pointers */
++#define HCC_64BIT_ADDR(p)	((p) & (1 << 0))
++/* true: HC can do bandwidth negotiation */
++#define HCC_BANDWIDTH_NEG(p)	((p) & (1 << 1))
++/* true: HC uses 64-byte Device Context structures
++ * FIXME 64-byte context structures aren't supported yet.
++ */
++#define HCC_64BYTE_CONTEXT(p)	((p) & (1 << 2))
++/* true: HC has port power switches */
++#define HCC_PPC(p)		((p) & (1 << 3))
++/* true: HC has port indicators */
++#define HCS_INDICATOR(p)	((p) & (1 << 4))
++/* true: HC has Light HC Reset Capability */
++#define HCC_LIGHT_RESET(p)	((p) & (1 << 5))
++/* true: HC supports latency tolerance messaging */
++#define HCC_LTC(p)		((p) & (1 << 6))
++/* true: no secondary Stream ID Support */
++#define HCC_NSS(p)		((p) & (1 << 7))
++/* true: HC supports Stopped - Short Packet */
++#define HCC_SPC(p)		((p) & (1 << 9))
++/* true: HC has Contiguous Frame ID Capability */
++#define HCC_CFC(p)		((p) & (1 << 11))
++/* Max size for Primary Stream Arrays - 2^(n+1), where n is bits 12:15 */
++#define HCC_MAX_PSA(p)		(1 << ((((p) >> 12) & 0xf) + 1))
++/* Extended Capabilities pointer from PCI base - section 5.3.6 */
++#define HCC_EXT_CAPS(p)		XHCI_HCC_EXT_CAPS(p)
++
++#define CTX_SIZE(_hcc)		(HCC_64BYTE_CONTEXT(_hcc) ? 64 : 32)
++
++/* db_off bitmask - bits 0:1 reserved */
++#define	DBOFF_MASK	(~0x3)
++
++/* run_regs_off bitmask - bits 0:4 reserved */
++#define	RTSOFF_MASK	(~0x1f)
++
++/* HCCPARAMS2 - hcc_params2 - bitmasks */
++/* true: HC supports U3 entry Capability */
++#define	HCC2_U3C(p)		((p) & (1 << 0))
++/* true: HC supports Configure endpoint command Max exit latency too large */
++#define	HCC2_CMC(p)		((p) & (1 << 1))
++/* true: HC supports Force Save context Capability */
++#define	HCC2_FSC(p)		((p) & (1 << 2))
++/* true: HC supports Compliance Transition Capability */
++#define	HCC2_CTC(p)		((p) & (1 << 3))
++/* true: HC support Large ESIT payload Capability > 48k */
++#define	HCC2_LEC(p)		((p) & (1 << 4))
++/* true: HC support Configuration Information Capability */
++#define	HCC2_CIC(p)		((p) & (1 << 5))
++/* true: HC support Extended TBC Capability, Isoc burst count > 65535 */
++#define	HCC2_ETC(p)		((p) & (1 << 6))
+diff --git a/drivers/usb/host/xhci-dbgcap.h b/drivers/usb/host/xhci-dbgcap.h
+index 51a7ab3ba0cac0..76170d7a7e7c35 100644
+--- a/drivers/usb/host/xhci-dbgcap.h
++++ b/drivers/usb/host/xhci-dbgcap.h
+@@ -108,7 +108,7 @@ struct dbc_port {
+ 	struct tasklet_struct		push;
+ 
+ 	struct list_head		write_pool;
+-	struct kfifo			write_fifo;
++	unsigned int			tx_boundary;
+ 
+ 	bool				registered;
+ };
+diff --git a/drivers/usb/host/xhci-dbgtty.c b/drivers/usb/host/xhci-dbgtty.c
+index b74e98e9439326..0266c2f5bc0d8e 100644
+--- a/drivers/usb/host/xhci-dbgtty.c
++++ b/drivers/usb/host/xhci-dbgtty.c
+@@ -25,16 +25,26 @@ static inline struct dbc_port *dbc_to_port(struct xhci_dbc *dbc)
+ }
+ 
+ static unsigned int
+-dbc_send_packet(struct dbc_port *port, char *packet, unsigned int size)
++dbc_kfifo_to_req(struct dbc_port *port, char *packet)
+ {
+-	unsigned int		len;
+-
+-	len = kfifo_len(&port->write_fifo);
+-	if (len < size)
+-		size = len;
+-	if (size != 0)
+-		size = kfifo_out(&port->write_fifo, packet, size);
+-	return size;
++	unsigned int	len;
++
++	len = kfifo_len(&port->port.xmit_fifo);
++
++	if (len == 0)
++		return 0;
++
++	len = min(len, DBC_MAX_PACKET);
++
++	if (port->tx_boundary)
++		len = min(port->tx_boundary, len);
++
++	len = kfifo_out(&port->port.xmit_fifo, packet, len);
++
++	if (port->tx_boundary)
++		port->tx_boundary -= len;
++
++	return len;
+ }
+ 
+ static int dbc_start_tx(struct dbc_port *port)
+@@ -49,7 +59,7 @@ static int dbc_start_tx(struct dbc_port *port)
+ 
+ 	while (!list_empty(pool)) {
+ 		req = list_entry(pool->next, struct dbc_request, list_pool);
+-		len = dbc_send_packet(port, req->buf, DBC_MAX_PACKET);
++		len = dbc_kfifo_to_req(port, req->buf);
+ 		if (len == 0)
+ 			break;
+ 		do_tty_wake = true;
+@@ -213,14 +223,32 @@ static ssize_t dbc_tty_write(struct tty_struct *tty, const u8 *buf,
+ {
+ 	struct dbc_port		*port = tty->driver_data;
+ 	unsigned long		flags;
++	unsigned int		written = 0;
+ 
+ 	spin_lock_irqsave(&port->port_lock, flags);
+-	if (count)
+-		count = kfifo_in(&port->write_fifo, buf, count);
+-	dbc_start_tx(port);
++
++	/*
++	 * Treat tty write as one usb transfer. Make sure the writes are turned
++	 * into TRB request having the same size boundaries as the tty writes.
++	 * Don't add data to kfifo before previous write is turned into TRBs
++	 */
++	if (port->tx_boundary) {
++		spin_unlock_irqrestore(&port->port_lock, flags);
++		return 0;
++	}
++
++	if (count) {
++		written = kfifo_in(&port->port.xmit_fifo, buf, count);
++
++		if (written == count)
++			port->tx_boundary = kfifo_len(&port->port.xmit_fifo);
++
++		dbc_start_tx(port);
++	}
++
+ 	spin_unlock_irqrestore(&port->port_lock, flags);
+ 
+-	return count;
++	return written;
+ }
+ 
+ static int dbc_tty_put_char(struct tty_struct *tty, u8 ch)
+@@ -230,7 +258,7 @@ static int dbc_tty_put_char(struct tty_struct *tty, u8 ch)
+ 	int			status;
+ 
+ 	spin_lock_irqsave(&port->port_lock, flags);
+-	status = kfifo_put(&port->write_fifo, ch);
++	status = kfifo_put(&port->port.xmit_fifo, ch);
+ 	spin_unlock_irqrestore(&port->port_lock, flags);
+ 
+ 	return status;
+@@ -253,7 +281,11 @@ static unsigned int dbc_tty_write_room(struct tty_struct *tty)
+ 	unsigned int		room;
+ 
+ 	spin_lock_irqsave(&port->port_lock, flags);
+-	room = kfifo_avail(&port->write_fifo);
++	room = kfifo_avail(&port->port.xmit_fifo);
++
++	if (port->tx_boundary)
++		room = 0;
++
+ 	spin_unlock_irqrestore(&port->port_lock, flags);
+ 
+ 	return room;
+@@ -266,7 +298,7 @@ static unsigned int dbc_tty_chars_in_buffer(struct tty_struct *tty)
+ 	unsigned int		chars;
+ 
+ 	spin_lock_irqsave(&port->port_lock, flags);
+-	chars = kfifo_len(&port->write_fifo);
++	chars = kfifo_len(&port->port.xmit_fifo);
+ 	spin_unlock_irqrestore(&port->port_lock, flags);
+ 
+ 	return chars;
+@@ -424,7 +456,8 @@ static int xhci_dbc_tty_register_device(struct xhci_dbc *dbc)
+ 		goto err_idr;
+ 	}
+ 
+-	ret = kfifo_alloc(&port->write_fifo, DBC_WRITE_BUF_SIZE, GFP_KERNEL);
++	ret = kfifo_alloc(&port->port.xmit_fifo, DBC_WRITE_BUF_SIZE,
++			  GFP_KERNEL);
+ 	if (ret)
+ 		goto err_exit_port;
+ 
+@@ -453,7 +486,7 @@ static int xhci_dbc_tty_register_device(struct xhci_dbc *dbc)
+ 	xhci_dbc_free_requests(&port->read_pool);
+ 	xhci_dbc_free_requests(&port->write_pool);
+ err_free_fifo:
+-	kfifo_free(&port->write_fifo);
++	kfifo_free(&port->port.xmit_fifo);
+ err_exit_port:
+ 	idr_remove(&dbc_tty_minors, port->minor);
+ err_idr:
+@@ -478,7 +511,7 @@ static void xhci_dbc_tty_unregister_device(struct xhci_dbc *dbc)
+ 	idr_remove(&dbc_tty_minors, port->minor);
+ 	mutex_unlock(&dbc_tty_minors_lock);
+ 
+-	kfifo_free(&port->write_fifo);
++	kfifo_free(&port->port.xmit_fifo);
+ 	xhci_dbc_free_requests(&port->read_pool);
+ 	xhci_dbc_free_requests(&port->read_queue);
+ 	xhci_dbc_free_requests(&port->write_pool);
+diff --git a/drivers/usb/host/xhci-port.h b/drivers/usb/host/xhci-port.h
+new file mode 100644
+index 00000000000000..f19efb966d180c
+--- /dev/null
++++ b/drivers/usb/host/xhci-port.h
+@@ -0,0 +1,176 @@
++/* SPDX-License-Identifier: GPL-2.0 */
++
++/* PORTSC - Port Status and Control Register - port_status_base bitmasks */
++/* true: device connected */
++#define PORT_CONNECT	(1 << 0)
++/* true: port enabled */
++#define PORT_PE		(1 << 1)
++/* bit 2 reserved and zeroed */
++/* true: port has an over-current condition */
++#define PORT_OC		(1 << 3)
++/* true: port reset signaling asserted */
++#define PORT_RESET	(1 << 4)
++/* Port Link State - bits 5:8
++ * A read gives the current link PM state of the port,
++ * a write with Link State Write Strobe set sets the link state.
++ */
++#define PORT_PLS_MASK	(0xf << 5)
++#define XDEV_U0		(0x0 << 5)
++#define XDEV_U1		(0x1 << 5)
++#define XDEV_U2		(0x2 << 5)
++#define XDEV_U3		(0x3 << 5)
++#define XDEV_DISABLED	(0x4 << 5)
++#define XDEV_RXDETECT	(0x5 << 5)
++#define XDEV_INACTIVE	(0x6 << 5)
++#define XDEV_POLLING	(0x7 << 5)
++#define XDEV_RECOVERY	(0x8 << 5)
++#define XDEV_HOT_RESET	(0x9 << 5)
++#define XDEV_COMP_MODE	(0xa << 5)
++#define XDEV_TEST_MODE	(0xb << 5)
++#define XDEV_RESUME	(0xf << 5)
++
++/* true: port has power (see HCC_PPC) */
++#define PORT_POWER	(1 << 9)
++/* bits 10:13 indicate device speed:
++ * 0 - undefined speed - port hasn't be initialized by a reset yet
++ * 1 - full speed
++ * 2 - low speed
++ * 3 - high speed
++ * 4 - super speed
++ * 5-15 reserved
++ */
++#define DEV_SPEED_MASK		(0xf << 10)
++#define	XDEV_FS			(0x1 << 10)
++#define	XDEV_LS			(0x2 << 10)
++#define	XDEV_HS			(0x3 << 10)
++#define	XDEV_SS			(0x4 << 10)
++#define	XDEV_SSP		(0x5 << 10)
++#define DEV_UNDEFSPEED(p)	(((p) & DEV_SPEED_MASK) == (0x0<<10))
++#define DEV_FULLSPEED(p)	(((p) & DEV_SPEED_MASK) == XDEV_FS)
++#define DEV_LOWSPEED(p)		(((p) & DEV_SPEED_MASK) == XDEV_LS)
++#define DEV_HIGHSPEED(p)	(((p) & DEV_SPEED_MASK) == XDEV_HS)
++#define DEV_SUPERSPEED(p)	(((p) & DEV_SPEED_MASK) == XDEV_SS)
++#define DEV_SUPERSPEEDPLUS(p)	(((p) & DEV_SPEED_MASK) == XDEV_SSP)
++#define DEV_SUPERSPEED_ANY(p)	(((p) & DEV_SPEED_MASK) >= XDEV_SS)
++#define DEV_PORT_SPEED(p)	(((p) >> 10) & 0x0f)
++
++/* Bits 20:23 in the Slot Context are the speed for the device */
++#define	SLOT_SPEED_FS		(XDEV_FS << 10)
++#define	SLOT_SPEED_LS		(XDEV_LS << 10)
++#define	SLOT_SPEED_HS		(XDEV_HS << 10)
++#define	SLOT_SPEED_SS		(XDEV_SS << 10)
++#define	SLOT_SPEED_SSP		(XDEV_SSP << 10)
++/* Port Indicator Control */
++#define PORT_LED_OFF	(0 << 14)
++#define PORT_LED_AMBER	(1 << 14)
++#define PORT_LED_GREEN	(2 << 14)
++#define PORT_LED_MASK	(3 << 14)
++/* Port Link State Write Strobe - set this when changing link state */
++#define PORT_LINK_STROBE	(1 << 16)
++/* true: connect status change */
++#define PORT_CSC	(1 << 17)
++/* true: port enable change */
++#define PORT_PEC	(1 << 18)
++/* true: warm reset for a USB 3.0 device is done.  A "hot" reset puts the port
++ * into an enabled state, and the device into the default state.  A "warm" reset
++ * also resets the link, forcing the device through the link training sequence.
++ * SW can also look at the Port Reset register to see when warm reset is done.
++ */
++#define PORT_WRC	(1 << 19)
++/* true: over-current change */
++#define PORT_OCC	(1 << 20)
++/* true: reset change - 1 to 0 transition of PORT_RESET */
++#define PORT_RC		(1 << 21)
++/* port link status change - set on some port link state transitions:
++ *  Transition				Reason
++ *  ------------------------------------------------------------------------------
++ *  - U3 to Resume			Wakeup signaling from a device
++ *  - Resume to Recovery to U0		USB 3.0 device resume
++ *  - Resume to U0			USB 2.0 device resume
++ *  - U3 to Recovery to U0		Software resume of USB 3.0 device complete
++ *  - U3 to U0				Software resume of USB 2.0 device complete
++ *  - U2 to U0				L1 resume of USB 2.1 device complete
++ *  - U0 to U0 (???)			L1 entry rejection by USB 2.1 device
++ *  - U0 to disabled			L1 entry error with USB 2.1 device
++ *  - Any state to inactive		Error on USB 3.0 port
++ */
++#define PORT_PLC	(1 << 22)
++/* port configure error change - port failed to configure its link partner */
++#define PORT_CEC	(1 << 23)
++#define PORT_CHANGE_MASK	(PORT_CSC | PORT_PEC | PORT_WRC | PORT_OCC | \
++				 PORT_RC | PORT_PLC | PORT_CEC)
++
++
++/* Cold Attach Status - xHC can set this bit to report device attached during
++ * Sx state. Warm port reset should be perfomed to clear this bit and move port
++ * to connected state.
++ */
++#define PORT_CAS	(1 << 24)
++/* wake on connect (enable) */
++#define PORT_WKCONN_E	(1 << 25)
++/* wake on disconnect (enable) */
++#define PORT_WKDISC_E	(1 << 26)
++/* wake on over-current (enable) */
++#define PORT_WKOC_E	(1 << 27)
++/* bits 28:29 reserved */
++/* true: device is non-removable - for USB 3.0 roothub emulation */
++#define PORT_DEV_REMOVE	(1 << 30)
++/* Initiate a warm port reset - complete when PORT_WRC is '1' */
++#define PORT_WR		(1 << 31)
++
++/* We mark duplicate entries with -1 */
++#define DUPLICATE_ENTRY ((u8)(-1))
++
++/* Port Power Management Status and Control - port_power_base bitmasks */
++/* Inactivity timer value for transitions into U1, in microseconds.
++ * Timeout can be up to 127us.  0xFF means an infinite timeout.
++ */
++#define PORT_U1_TIMEOUT(p)	((p) & 0xff)
++#define PORT_U1_TIMEOUT_MASK	0xff
++/* Inactivity timer value for transitions into U2 */
++#define PORT_U2_TIMEOUT(p)	(((p) & 0xff) << 8)
++#define PORT_U2_TIMEOUT_MASK	(0xff << 8)
++/* Bits 24:31 for port testing */
++
++/* USB2 Protocol PORTSPMSC */
++#define	PORT_L1S_MASK		7
++#define	PORT_L1S_SUCCESS	1
++#define	PORT_RWE		(1 << 3)
++#define	PORT_HIRD(p)		(((p) & 0xf) << 4)
++#define	PORT_HIRD_MASK		(0xf << 4)
++#define	PORT_L1DS_MASK		(0xff << 8)
++#define	PORT_L1DS(p)		(((p) & 0xff) << 8)
++#define	PORT_HLE		(1 << 16)
++#define PORT_TEST_MODE_SHIFT	28
++
++/* USB3 Protocol PORTLI  Port Link Information */
++#define PORT_RX_LANES(p)	(((p) >> 16) & 0xf)
++#define PORT_TX_LANES(p)	(((p) >> 20) & 0xf)
++
++/* USB2 Protocol PORTHLPMC */
++#define PORT_HIRDM(p)((p) & 3)
++#define PORT_L1_TIMEOUT(p)(((p) & 0xff) << 2)
++#define PORT_BESLD(p)(((p) & 0xf) << 10)
++
++/* use 512 microseconds as USB2 LPM L1 default timeout. */
++#define XHCI_L1_TIMEOUT		512
++
++/* Set default HIRD/BESL value to 4 (350/400us) for USB2 L1 LPM resume latency.
++ * Safe to use with mixed HIRD and BESL systems (host and device) and is used
++ * by other operating systems.
++ *
++ * XHCI 1.0 errata 8/14/12 Table 13 notes:
++ * "Software should choose xHC BESL/BESLD field values that do not violate a
++ * device's resume latency requirements,
++ * e.g. not program values > '4' if BLC = '1' and a HIRD device is attached,
++ * or not program values < '4' if BLC = '0' and a BESL device is attached.
++ */
++#define XHCI_DEFAULT_BESL	4
++
++/*
++ * USB3 specification define a 360ms tPollingLFPSTiemout for USB3 ports
++ * to complete link training. usually link trainig completes much faster
++ * so check status 10 times with 36ms sleep in places we need to wait for
++ * polling to complete.
++ */
++#define XHCI_PORT_POLLING_LFPS_TIME  36
+diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
+index 7754ed55d220b3..f2190d121233b2 100644
+--- a/drivers/usb/host/xhci.h
++++ b/drivers/usb/host/xhci.h
+@@ -23,6 +23,9 @@
+ #include	"xhci-ext-caps.h"
+ #include "pci-quirks.h"
+ 
++#include "xhci-port.h"
++#include "xhci-caps.h"
++
+ /* max buffer size for trace and debug messages */
+ #define XHCI_MSG_MAX		500
+ 
+@@ -63,90 +66,6 @@ struct xhci_cap_regs {
+ 	/* Reserved up to (CAPLENGTH - 0x1C) */
+ };
+ 
+-/* hc_capbase bitmasks */
+-/* bits 7:0 - how long is the Capabilities register */
+-#define HC_LENGTH(p)		XHCI_HC_LENGTH(p)
+-/* bits 31:16	*/
+-#define HC_VERSION(p)		(((p) >> 16) & 0xffff)
+-
+-/* HCSPARAMS1 - hcs_params1 - bitmasks */
+-/* bits 0:7, Max Device Slots */
+-#define HCS_MAX_SLOTS(p)	(((p) >> 0) & 0xff)
+-#define HCS_SLOTS_MASK		0xff
+-/* bits 8:18, Max Interrupters */
+-#define HCS_MAX_INTRS(p)	(((p) >> 8) & 0x7ff)
+-/* bits 24:31, Max Ports - max value is 0x7F = 127 ports */
+-#define HCS_MAX_PORTS(p)	(((p) >> 24) & 0x7f)
+-
+-/* HCSPARAMS2 - hcs_params2 - bitmasks */
+-/* bits 0:3, frames or uframes that SW needs to queue transactions
+- * ahead of the HW to meet periodic deadlines */
+-#define HCS_IST(p)		(((p) >> 0) & 0xf)
+-/* bits 4:7, max number of Event Ring segments */
+-#define HCS_ERST_MAX(p)		(((p) >> 4) & 0xf)
+-/* bits 21:25 Hi 5 bits of Scratchpad buffers SW must allocate for the HW */
+-/* bit 26 Scratchpad restore - for save/restore HW state - not used yet */
+-/* bits 27:31 Lo 5 bits of Scratchpad buffers SW must allocate for the HW */
+-#define HCS_MAX_SCRATCHPAD(p)   ((((p) >> 16) & 0x3e0) | (((p) >> 27) & 0x1f))
+-
+-/* HCSPARAMS3 - hcs_params3 - bitmasks */
+-/* bits 0:7, Max U1 to U0 latency for the roothub ports */
+-#define HCS_U1_LATENCY(p)	(((p) >> 0) & 0xff)
+-/* bits 16:31, Max U2 to U0 latency for the roothub ports */
+-#define HCS_U2_LATENCY(p)	(((p) >> 16) & 0xffff)
+-
+-/* HCCPARAMS - hcc_params - bitmasks */
+-/* true: HC can use 64-bit address pointers */
+-#define HCC_64BIT_ADDR(p)	((p) & (1 << 0))
+-/* true: HC can do bandwidth negotiation */
+-#define HCC_BANDWIDTH_NEG(p)	((p) & (1 << 1))
+-/* true: HC uses 64-byte Device Context structures
+- * FIXME 64-byte context structures aren't supported yet.
+- */
+-#define HCC_64BYTE_CONTEXT(p)	((p) & (1 << 2))
+-/* true: HC has port power switches */
+-#define HCC_PPC(p)		((p) & (1 << 3))
+-/* true: HC has port indicators */
+-#define HCS_INDICATOR(p)	((p) & (1 << 4))
+-/* true: HC has Light HC Reset Capability */
+-#define HCC_LIGHT_RESET(p)	((p) & (1 << 5))
+-/* true: HC supports latency tolerance messaging */
+-#define HCC_LTC(p)		((p) & (1 << 6))
+-/* true: no secondary Stream ID Support */
+-#define HCC_NSS(p)		((p) & (1 << 7))
+-/* true: HC supports Stopped - Short Packet */
+-#define HCC_SPC(p)		((p) & (1 << 9))
+-/* true: HC has Contiguous Frame ID Capability */
+-#define HCC_CFC(p)		((p) & (1 << 11))
+-/* Max size for Primary Stream Arrays - 2^(n+1), where n is bits 12:15 */
+-#define HCC_MAX_PSA(p)		(1 << ((((p) >> 12) & 0xf) + 1))
+-/* Extended Capabilities pointer from PCI base - section 5.3.6 */
+-#define HCC_EXT_CAPS(p)		XHCI_HCC_EXT_CAPS(p)
+-
+-#define CTX_SIZE(_hcc)		(HCC_64BYTE_CONTEXT(_hcc) ? 64 : 32)
+-
+-/* db_off bitmask - bits 0:1 reserved */
+-#define	DBOFF_MASK	(~0x3)
+-
+-/* run_regs_off bitmask - bits 0:4 reserved */
+-#define	RTSOFF_MASK	(~0x1f)
+-
+-/* HCCPARAMS2 - hcc_params2 - bitmasks */
+-/* true: HC supports U3 entry Capability */
+-#define	HCC2_U3C(p)		((p) & (1 << 0))
+-/* true: HC supports Configure endpoint command Max exit latency too large */
+-#define	HCC2_CMC(p)		((p) & (1 << 1))
+-/* true: HC supports Force Save context Capability */
+-#define	HCC2_FSC(p)		((p) & (1 << 2))
+-/* true: HC supports Compliance Transition Capability */
+-#define	HCC2_CTC(p)		((p) & (1 << 3))
+-/* true: HC support Large ESIT payload Capability > 48k */
+-#define	HCC2_LEC(p)		((p) & (1 << 4))
+-/* true: HC support Configuration Information Capability */
+-#define	HCC2_CIC(p)		((p) & (1 << 5))
+-/* true: HC support Extended TBC Capability, Isoc burst count > 65535 */
+-#define	HCC2_ETC(p)		((p) & (1 << 6))
+-
+ /* Number of registers per port */
+ #define	NUM_PORT_REGS	4
+ 
+@@ -292,181 +211,6 @@ struct xhci_op_regs {
+ #define CONFIG_CIE		(1 << 9)
+ /* bits 10:31 - reserved and should be preserved */
+ 
+-/* PORTSC - Port Status and Control Register - port_status_base bitmasks */
+-/* true: device connected */
+-#define PORT_CONNECT	(1 << 0)
+-/* true: port enabled */
+-#define PORT_PE		(1 << 1)
+-/* bit 2 reserved and zeroed */
+-/* true: port has an over-current condition */
+-#define PORT_OC		(1 << 3)
+-/* true: port reset signaling asserted */
+-#define PORT_RESET	(1 << 4)
+-/* Port Link State - bits 5:8
+- * A read gives the current link PM state of the port,
+- * a write with Link State Write Strobe set sets the link state.
+- */
+-#define PORT_PLS_MASK	(0xf << 5)
+-#define XDEV_U0		(0x0 << 5)
+-#define XDEV_U1		(0x1 << 5)
+-#define XDEV_U2		(0x2 << 5)
+-#define XDEV_U3		(0x3 << 5)
+-#define XDEV_DISABLED	(0x4 << 5)
+-#define XDEV_RXDETECT	(0x5 << 5)
+-#define XDEV_INACTIVE	(0x6 << 5)
+-#define XDEV_POLLING	(0x7 << 5)
+-#define XDEV_RECOVERY	(0x8 << 5)
+-#define XDEV_HOT_RESET	(0x9 << 5)
+-#define XDEV_COMP_MODE	(0xa << 5)
+-#define XDEV_TEST_MODE	(0xb << 5)
+-#define XDEV_RESUME	(0xf << 5)
+-
+-/* true: port has power (see HCC_PPC) */
+-#define PORT_POWER	(1 << 9)
+-/* bits 10:13 indicate device speed:
+- * 0 - undefined speed - port hasn't be initialized by a reset yet
+- * 1 - full speed
+- * 2 - low speed
+- * 3 - high speed
+- * 4 - super speed
+- * 5-15 reserved
+- */
+-#define DEV_SPEED_MASK		(0xf << 10)
+-#define	XDEV_FS			(0x1 << 10)
+-#define	XDEV_LS			(0x2 << 10)
+-#define	XDEV_HS			(0x3 << 10)
+-#define	XDEV_SS			(0x4 << 10)
+-#define	XDEV_SSP		(0x5 << 10)
+-#define DEV_UNDEFSPEED(p)	(((p) & DEV_SPEED_MASK) == (0x0<<10))
+-#define DEV_FULLSPEED(p)	(((p) & DEV_SPEED_MASK) == XDEV_FS)
+-#define DEV_LOWSPEED(p)		(((p) & DEV_SPEED_MASK) == XDEV_LS)
+-#define DEV_HIGHSPEED(p)	(((p) & DEV_SPEED_MASK) == XDEV_HS)
+-#define DEV_SUPERSPEED(p)	(((p) & DEV_SPEED_MASK) == XDEV_SS)
+-#define DEV_SUPERSPEEDPLUS(p)	(((p) & DEV_SPEED_MASK) == XDEV_SSP)
+-#define DEV_SUPERSPEED_ANY(p)	(((p) & DEV_SPEED_MASK) >= XDEV_SS)
+-#define DEV_PORT_SPEED(p)	(((p) >> 10) & 0x0f)
+-
+-/* Bits 20:23 in the Slot Context are the speed for the device */
+-#define	SLOT_SPEED_FS		(XDEV_FS << 10)
+-#define	SLOT_SPEED_LS		(XDEV_LS << 10)
+-#define	SLOT_SPEED_HS		(XDEV_HS << 10)
+-#define	SLOT_SPEED_SS		(XDEV_SS << 10)
+-#define	SLOT_SPEED_SSP		(XDEV_SSP << 10)
+-/* Port Indicator Control */
+-#define PORT_LED_OFF	(0 << 14)
+-#define PORT_LED_AMBER	(1 << 14)
+-#define PORT_LED_GREEN	(2 << 14)
+-#define PORT_LED_MASK	(3 << 14)
+-/* Port Link State Write Strobe - set this when changing link state */
+-#define PORT_LINK_STROBE	(1 << 16)
+-/* true: connect status change */
+-#define PORT_CSC	(1 << 17)
+-/* true: port enable change */
+-#define PORT_PEC	(1 << 18)
+-/* true: warm reset for a USB 3.0 device is done.  A "hot" reset puts the port
+- * into an enabled state, and the device into the default state.  A "warm" reset
+- * also resets the link, forcing the device through the link training sequence.
+- * SW can also look at the Port Reset register to see when warm reset is done.
+- */
+-#define PORT_WRC	(1 << 19)
+-/* true: over-current change */
+-#define PORT_OCC	(1 << 20)
+-/* true: reset change - 1 to 0 transition of PORT_RESET */
+-#define PORT_RC		(1 << 21)
+-/* port link status change - set on some port link state transitions:
+- *  Transition				Reason
+- *  ------------------------------------------------------------------------------
+- *  - U3 to Resume			Wakeup signaling from a device
+- *  - Resume to Recovery to U0		USB 3.0 device resume
+- *  - Resume to U0			USB 2.0 device resume
+- *  - U3 to Recovery to U0		Software resume of USB 3.0 device complete
+- *  - U3 to U0				Software resume of USB 2.0 device complete
+- *  - U2 to U0				L1 resume of USB 2.1 device complete
+- *  - U0 to U0 (???)			L1 entry rejection by USB 2.1 device
+- *  - U0 to disabled			L1 entry error with USB 2.1 device
+- *  - Any state to inactive		Error on USB 3.0 port
+- */
+-#define PORT_PLC	(1 << 22)
+-/* port configure error change - port failed to configure its link partner */
+-#define PORT_CEC	(1 << 23)
+-#define PORT_CHANGE_MASK	(PORT_CSC | PORT_PEC | PORT_WRC | PORT_OCC | \
+-				 PORT_RC | PORT_PLC | PORT_CEC)
+-
+-
+-/* Cold Attach Status - xHC can set this bit to report device attached during
+- * Sx state. Warm port reset should be perfomed to clear this bit and move port
+- * to connected state.
+- */
+-#define PORT_CAS	(1 << 24)
+-/* wake on connect (enable) */
+-#define PORT_WKCONN_E	(1 << 25)
+-/* wake on disconnect (enable) */
+-#define PORT_WKDISC_E	(1 << 26)
+-/* wake on over-current (enable) */
+-#define PORT_WKOC_E	(1 << 27)
+-/* bits 28:29 reserved */
+-/* true: device is non-removable - for USB 3.0 roothub emulation */
+-#define PORT_DEV_REMOVE	(1 << 30)
+-/* Initiate a warm port reset - complete when PORT_WRC is '1' */
+-#define PORT_WR		(1 << 31)
+-
+-/* We mark duplicate entries with -1 */
+-#define DUPLICATE_ENTRY ((u8)(-1))
+-
+-/* Port Power Management Status and Control - port_power_base bitmasks */
+-/* Inactivity timer value for transitions into U1, in microseconds.
+- * Timeout can be up to 127us.  0xFF means an infinite timeout.
+- */
+-#define PORT_U1_TIMEOUT(p)	((p) & 0xff)
+-#define PORT_U1_TIMEOUT_MASK	0xff
+-/* Inactivity timer value for transitions into U2 */
+-#define PORT_U2_TIMEOUT(p)	(((p) & 0xff) << 8)
+-#define PORT_U2_TIMEOUT_MASK	(0xff << 8)
+-/* Bits 24:31 for port testing */
+-
+-/* USB2 Protocol PORTSPMSC */
+-#define	PORT_L1S_MASK		7
+-#define	PORT_L1S_SUCCESS	1
+-#define	PORT_RWE		(1 << 3)
+-#define	PORT_HIRD(p)		(((p) & 0xf) << 4)
+-#define	PORT_HIRD_MASK		(0xf << 4)
+-#define	PORT_L1DS_MASK		(0xff << 8)
+-#define	PORT_L1DS(p)		(((p) & 0xff) << 8)
+-#define	PORT_HLE		(1 << 16)
+-#define PORT_TEST_MODE_SHIFT	28
+-
+-/* USB3 Protocol PORTLI  Port Link Information */
+-#define PORT_RX_LANES(p)	(((p) >> 16) & 0xf)
+-#define PORT_TX_LANES(p)	(((p) >> 20) & 0xf)
+-
+-/* USB2 Protocol PORTHLPMC */
+-#define PORT_HIRDM(p)((p) & 3)
+-#define PORT_L1_TIMEOUT(p)(((p) & 0xff) << 2)
+-#define PORT_BESLD(p)(((p) & 0xf) << 10)
+-
+-/* use 512 microseconds as USB2 LPM L1 default timeout. */
+-#define XHCI_L1_TIMEOUT		512
+-
+-/* Set default HIRD/BESL value to 4 (350/400us) for USB2 L1 LPM resume latency.
+- * Safe to use with mixed HIRD and BESL systems (host and device) and is used
+- * by other operating systems.
+- *
+- * XHCI 1.0 errata 8/14/12 Table 13 notes:
+- * "Software should choose xHC BESL/BESLD field values that do not violate a
+- * device's resume latency requirements,
+- * e.g. not program values > '4' if BLC = '1' and a HIRD device is attached,
+- * or not program values < '4' if BLC = '0' and a BESL device is attached.
+- */
+-#define XHCI_DEFAULT_BESL	4
+-
+-/*
+- * USB3 specification define a 360ms tPollingLFPSTiemout for USB3 ports
+- * to complete link training. usually link trainig completes much faster
+- * so check status 10 times with 36ms sleep in places we need to wait for
+- * polling to complete.
+- */
+-#define XHCI_PORT_POLLING_LFPS_TIME  36
+-
+ /**
+  * struct xhci_intr_reg - Interrupt Register Set
+  * @irq_pending:	IMAN - Interrupt Management Register.  Used to enable
+diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c
+index f92fc2acfcba04..79cad8d61dacdd 100644
+--- a/drivers/usb/typec/class.c
++++ b/drivers/usb/typec/class.c
+@@ -502,6 +502,7 @@ static void typec_altmode_release(struct device *dev)
+ 		typec_altmode_put_partner(alt);
+ 
+ 	altmode_id_remove(alt->adev.dev.parent, alt->id);
++	put_device(alt->adev.dev.parent);
+ 	kfree(alt);
+ }
+ 
+@@ -551,6 +552,8 @@ typec_register_altmode(struct device *parent,
+ 	alt->adev.dev.type = &typec_altmode_dev_type;
+ 	dev_set_name(&alt->adev.dev, "%s.%u", dev_name(parent), id);
+ 
++	get_device(alt->adev.dev.parent);
++
+ 	/* Link partners and plugs with the ports */
+ 	if (!is_port)
+ 		typec_altmode_set_partner(alt);
+diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
+index 4e999e1c14075d..434cf3d5f4cf18 100644
+--- a/fs/btrfs/block-group.c
++++ b/fs/btrfs/block-group.c
+@@ -3794,6 +3794,8 @@ void btrfs_free_reserved_bytes(struct btrfs_block_group *cache,
+ 	spin_lock(&cache->lock);
+ 	if (cache->ro)
+ 		space_info->bytes_readonly += num_bytes;
++	else if (btrfs_is_zoned(cache->fs_info))
++		space_info->bytes_zone_unusable += num_bytes;
+ 	cache->reserved -= num_bytes;
+ 	space_info->bytes_reserved -= num_bytes;
+ 	space_info->max_extent_size = 0;
+diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
+index 9c07d5c3e5ad29..7066414be6ee8a 100644
+--- a/fs/btrfs/dir-item.c
++++ b/fs/btrfs/dir-item.c
+@@ -347,8 +347,8 @@ btrfs_search_dir_index_item(struct btrfs_root *root, struct btrfs_path *path,
+ 			return di;
+ 	}
+ 	/* Adjust return code if the key was not found in the next leaf. */
+-	if (ret > 0)
+-		ret = 0;
++	if (ret >= 0)
++		ret = -ENOENT;
+ 
+ 	return ERR_PTR(ret);
+ }
+diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
+index ee04185d8e0f58..ea19ea75674d2f 100644
+--- a/fs/btrfs/inode.c
++++ b/fs/btrfs/inode.c
+@@ -4293,11 +4293,8 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans,
+ 	 */
+ 	if (btrfs_ino(inode) == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID) {
+ 		di = btrfs_search_dir_index_item(root, path, dir_ino, &fname.disk_name);
+-		if (IS_ERR_OR_NULL(di)) {
+-			if (!di)
+-				ret = -ENOENT;
+-			else
+-				ret = PTR_ERR(di);
++		if (IS_ERR(di)) {
++			ret = PTR_ERR(di);
+ 			btrfs_abort_transaction(trans, ret);
+ 			goto out;
+ 		}
+diff --git a/fs/exec.c b/fs/exec.c
+index f49b352a60323a..7776209d98c10b 100644
+--- a/fs/exec.c
++++ b/fs/exec.c
+@@ -143,13 +143,11 @@ SYSCALL_DEFINE1(uselib, const char __user *, library)
+ 		goto out;
+ 
+ 	/*
+-	 * may_open() has already checked for this, so it should be
+-	 * impossible to trip now. But we need to be extra cautious
+-	 * and check again at the very end too.
++	 * Check do_open_execat() for an explanation.
+ 	 */
+ 	error = -EACCES;
+-	if (WARN_ON_ONCE(!S_ISREG(file_inode(file)->i_mode) ||
+-			 path_noexec(&file->f_path)))
++	if (WARN_ON_ONCE(!S_ISREG(file_inode(file)->i_mode)) ||
++	    path_noexec(&file->f_path))
+ 		goto exit;
+ 
+ 	error = -ENOEXEC;
+@@ -925,23 +923,22 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)
+ 
+ 	file = do_filp_open(fd, name, &open_exec_flags);
+ 	if (IS_ERR(file))
+-		goto out;
++		return file;
+ 
+ 	/*
+-	 * may_open() has already checked for this, so it should be
+-	 * impossible to trip now. But we need to be extra cautious
+-	 * and check again at the very end too.
++	 * In the past the regular type check was here. It moved to may_open() in
++	 * 633fb6ac3980 ("exec: move S_ISREG() check earlier"). Since then it is
++	 * an invariant that all non-regular files error out before we get here.
+ 	 */
+ 	err = -EACCES;
+-	if (WARN_ON_ONCE(!S_ISREG(file_inode(file)->i_mode) ||
+-			 path_noexec(&file->f_path)))
++	if (WARN_ON_ONCE(!S_ISREG(file_inode(file)->i_mode)) ||
++	    path_noexec(&file->f_path))
+ 		goto exit;
+ 
+ 	err = deny_write_access(file);
+ 	if (err)
+ 		goto exit;
+ 
+-out:
+ 	return file;
+ 
+ exit:
+diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
+index 974ecf5e0d9522..3ab410059dc202 100644
+--- a/fs/jfs/jfs_dmap.c
++++ b/fs/jfs/jfs_dmap.c
+@@ -187,7 +187,7 @@ int dbMount(struct inode *ipbmap)
+ 	}
+ 
+ 	bmp->db_numag = le32_to_cpu(dbmp_le->dn_numag);
+-	if (!bmp->db_numag || bmp->db_numag >= MAXAG) {
++	if (!bmp->db_numag || bmp->db_numag > MAXAG) {
+ 		err = -EINVAL;
+ 		goto err_release_metapage;
+ 	}
+diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
+index f16bbbfcf672c8..975dd74a7a4db4 100644
+--- a/fs/nfsd/nfs4state.c
++++ b/fs/nfsd/nfs4state.c
+@@ -8254,7 +8254,7 @@ nfs4_state_shutdown_net(struct net *net)
+ 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+ 
+ 	unregister_shrinker(&nn->nfsd_client_shrinker);
+-	cancel_work(&nn->nfsd_shrinker_work);
++	cancel_work_sync(&nn->nfsd_shrinker_work);
+ 	cancel_delayed_work_sync(&nn->laundromat_work);
+ 	locks_end_grace(&nn->nfsd4_manager);
+ 
+diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c
+index b4e54d079b7d03..36d29c183bb7fa 100644
+--- a/fs/nilfs2/page.c
++++ b/fs/nilfs2/page.c
+@@ -77,7 +77,8 @@ void nilfs_forget_buffer(struct buffer_head *bh)
+ 	const unsigned long clear_bits =
+ 		(BIT(BH_Uptodate) | BIT(BH_Dirty) | BIT(BH_Mapped) |
+ 		 BIT(BH_Async_Write) | BIT(BH_NILFS_Volatile) |
+-		 BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected));
++		 BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected) |
++		 BIT(BH_Delay));
+ 
+ 	lock_buffer(bh);
+ 	set_mask_bits(&bh->b_state, clear_bits, 0);
+@@ -410,7 +411,8 @@ void nilfs_clear_dirty_page(struct page *page, bool silent)
+ 		const unsigned long clear_bits =
+ 			(BIT(BH_Uptodate) | BIT(BH_Dirty) | BIT(BH_Mapped) |
+ 			 BIT(BH_Async_Write) | BIT(BH_NILFS_Volatile) |
+-			 BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected));
++			 BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected) |
++			 BIT(BH_Delay));
+ 
+ 		bh = head = page_buffers(page);
+ 		do {
+diff --git a/fs/open.c b/fs/open.c
+index 59db720693f9a0..f9ac703ec1b2d3 100644
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -1461,6 +1461,8 @@ SYSCALL_DEFINE4(openat2, int, dfd, const char __user *, filename,
+ 
+ 	if (unlikely(usize < OPEN_HOW_SIZE_VER0))
+ 		return -EINVAL;
++	if (unlikely(usize > PAGE_SIZE))
++		return -E2BIG;
+ 
+ 	err = copy_struct_from_user(&tmp, sizeof(tmp), how, usize);
+ 	if (err)
+diff --git a/fs/smb/client/fs_context.c b/fs/smb/client/fs_context.c
+index 3bbac925d0766b..8d7484400fe8e1 100644
+--- a/fs/smb/client/fs_context.c
++++ b/fs/smb/client/fs_context.c
+@@ -918,8 +918,15 @@ static int smb3_reconfigure(struct fs_context *fc)
+ 	else  {
+ 		kfree_sensitive(ses->password);
+ 		ses->password = kstrdup(ctx->password, GFP_KERNEL);
++		if (!ses->password)
++			return -ENOMEM;
+ 		kfree_sensitive(ses->password2);
+ 		ses->password2 = kstrdup(ctx->password2, GFP_KERNEL);
++		if (!ses->password2) {
++			kfree_sensitive(ses->password);
++			ses->password = NULL;
++			return -ENOMEM;
++		}
+ 	}
+ 	STEAL_STRING(cifs_sb, ctx, domainname);
+ 	STEAL_STRING(cifs_sb, ctx, nodename);
+diff --git a/fs/smb/client/reparse.c b/fs/smb/client/reparse.c
+index ad0e0de9a165d4..7429b96a6ae5ef 100644
+--- a/fs/smb/client/reparse.c
++++ b/fs/smb/client/reparse.c
+@@ -330,6 +330,18 @@ static int parse_reparse_posix(struct reparse_posix_data *buf,
+ 
+ 	switch ((type = le64_to_cpu(buf->InodeType))) {
+ 	case NFS_SPECFILE_LNK:
++		if (len == 0 || (len % 2)) {
++			cifs_dbg(VFS, "srv returned malformed nfs symlink buffer\n");
++			return -EIO;
++		}
++		/*
++		 * Check that buffer does not contain UTF-16 null codepoint
++		 * because Linux cannot process symlink with null byte.
++		 */
++		if (UniStrnlen((wchar_t *)buf->DataBuffer, len/2) != len/2) {
++			cifs_dbg(VFS, "srv returned null byte in nfs symlink target location\n");
++			return -EIO;
++		}
+ 		data->symlink_target = cifs_strndup_from_utf16(buf->DataBuffer,
+ 							       len, true,
+ 							       cifs_sb->local_nls);
+@@ -340,8 +352,19 @@ static int parse_reparse_posix(struct reparse_posix_data *buf,
+ 		break;
+ 	case NFS_SPECFILE_CHR:
+ 	case NFS_SPECFILE_BLK:
++		/* DataBuffer for block and char devices contains two 32-bit numbers */
++		if (len != 8) {
++			cifs_dbg(VFS, "srv returned malformed nfs buffer for type: 0x%llx\n", type);
++			return -EIO;
++		}
++		break;
+ 	case NFS_SPECFILE_FIFO:
+ 	case NFS_SPECFILE_SOCK:
++		/* DataBuffer for fifos and sockets is empty */
++		if (len != 0) {
++			cifs_dbg(VFS, "srv returned malformed nfs buffer for type: 0x%llx\n", type);
++			return -EIO;
++		}
+ 		break;
+ 	default:
+ 		cifs_dbg(VFS, "%s: unhandled inode type: 0x%llx\n",
+diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
+index 450e3050324c6c..ab6e79be2c15dd 100644
+--- a/fs/smb/client/smb2ops.c
++++ b/fs/smb/client/smb2ops.c
+@@ -1122,7 +1122,7 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
+ 	struct cifs_fid fid;
+ 	unsigned int size[1];
+ 	void *data[1];
+-	struct smb2_file_full_ea_info *ea = NULL;
++	struct smb2_file_full_ea_info *ea;
+ 	struct smb2_query_info_rsp *rsp;
+ 	int rc, used_len = 0;
+ 	int retries = 0, cur_sleep = 1;
+@@ -1143,6 +1143,7 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
+ 	if (!utf16_path)
+ 		return -ENOMEM;
+ 
++	ea = NULL;
+ 	resp_buftype[0] = resp_buftype[1] = resp_buftype[2] = CIFS_NO_BUFFER;
+ 	vars = kzalloc(sizeof(*vars), GFP_KERNEL);
+ 	if (!vars) {
+diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c
+index 83a03201bb8628..a86a3fbfb5a49c 100644
+--- a/fs/smb/client/smb2pdu.c
++++ b/fs/smb/client/smb2pdu.c
+@@ -3300,6 +3300,15 @@ SMB2_ioctl_init(struct cifs_tcon *tcon, struct TCP_Server_Info *server,
+ 		return rc;
+ 
+ 	if (indatalen) {
++		unsigned int len;
++
++		if (WARN_ON_ONCE(smb3_encryption_required(tcon) &&
++				 (check_add_overflow(total_len - 1,
++						     ALIGN(indatalen, 8), &len) ||
++				  len > MAX_CIFS_SMALL_BUFFER_SIZE))) {
++			cifs_small_buf_release(req);
++			return -EIO;
++		}
+ 		/*
+ 		 * indatalen is usually small at a couple of bytes max, so
+ 		 * just allocate through generic pool
+diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
+index bb471ec3640467..f5de2030e769a4 100644
+--- a/fs/udf/balloc.c
++++ b/fs/udf/balloc.c
+@@ -387,6 +387,7 @@ static void udf_table_free_blocks(struct super_block *sb,
+ 	struct extent_position oepos, epos;
+ 	int8_t etype;
+ 	struct udf_inode_info *iinfo;
++	int ret = 0;
+ 
+ 	mutex_lock(&sbi->s_alloc_mutex);
+ 	iinfo = UDF_I(table);
+@@ -400,8 +401,12 @@ static void udf_table_free_blocks(struct super_block *sb,
+ 	epos.block = oepos.block = iinfo->i_location;
+ 	epos.bh = oepos.bh = NULL;
+ 
+-	while (count &&
+-	       (etype = udf_next_aext(table, &epos, &eloc, &elen, 1)) != -1) {
++	while (count) {
++		ret = udf_next_aext(table, &epos, &eloc, &elen, &etype, 1);
++		if (ret < 0)
++			goto error_return;
++		if (ret == 0)
++			break;
+ 		if (((eloc.logicalBlockNum +
+ 			(elen >> sb->s_blocksize_bits)) == start)) {
+ 			if ((0x3FFFFFFF - elen) <
+@@ -476,11 +481,8 @@ static void udf_table_free_blocks(struct super_block *sb,
+ 			adsize = sizeof(struct short_ad);
+ 		else if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_LONG)
+ 			adsize = sizeof(struct long_ad);
+-		else {
+-			brelse(oepos.bh);
+-			brelse(epos.bh);
++		else
+ 			goto error_return;
+-		}
+ 
+ 		if (epos.offset + (2 * adsize) > sb->s_blocksize) {
+ 			/* Steal a block from the extent being free'd */
+@@ -496,10 +498,10 @@ static void udf_table_free_blocks(struct super_block *sb,
+ 			__udf_add_aext(table, &epos, &eloc, elen, 1);
+ 	}
+ 
++error_return:
+ 	brelse(epos.bh);
+ 	brelse(oepos.bh);
+ 
+-error_return:
+ 	mutex_unlock(&sbi->s_alloc_mutex);
+ 	return;
+ }
+@@ -515,6 +517,7 @@ static int udf_table_prealloc_blocks(struct super_block *sb,
+ 	struct extent_position epos;
+ 	int8_t etype = -1;
+ 	struct udf_inode_info *iinfo;
++	int ret = 0;
+ 
+ 	if (first_block >= sbi->s_partmaps[partition].s_partition_len)
+ 		return 0;
+@@ -533,11 +536,14 @@ static int udf_table_prealloc_blocks(struct super_block *sb,
+ 	epos.bh = NULL;
+ 	eloc.logicalBlockNum = 0xFFFFFFFF;
+ 
+-	while (first_block != eloc.logicalBlockNum &&
+-	       (etype = udf_next_aext(table, &epos, &eloc, &elen, 1)) != -1) {
++	while (first_block != eloc.logicalBlockNum) {
++		ret = udf_next_aext(table, &epos, &eloc, &elen, &etype, 1);
++		if (ret < 0)
++			goto err_out;
++		if (ret == 0)
++			break;
+ 		udf_debug("eloc=%u, elen=%u, first_block=%u\n",
+ 			  eloc.logicalBlockNum, elen, first_block);
+-		; /* empty loop body */
+ 	}
+ 
+ 	if (first_block == eloc.logicalBlockNum) {
+@@ -556,6 +562,7 @@ static int udf_table_prealloc_blocks(struct super_block *sb,
+ 		alloc_count = 0;
+ 	}
+ 
++err_out:
+ 	brelse(epos.bh);
+ 
+ 	if (alloc_count)
+@@ -577,6 +584,7 @@ static udf_pblk_t udf_table_new_block(struct super_block *sb,
+ 	struct extent_position epos, goal_epos;
+ 	int8_t etype;
+ 	struct udf_inode_info *iinfo = UDF_I(table);
++	int ret = 0;
+ 
+ 	*err = -ENOSPC;
+ 
+@@ -600,8 +608,10 @@ static udf_pblk_t udf_table_new_block(struct super_block *sb,
+ 	epos.block = iinfo->i_location;
+ 	epos.bh = goal_epos.bh = NULL;
+ 
+-	while (spread &&
+-	       (etype = udf_next_aext(table, &epos, &eloc, &elen, 1)) != -1) {
++	while (spread) {
++		ret = udf_next_aext(table, &epos, &eloc, &elen, &etype, 1);
++		if (ret <= 0)
++			break;
+ 		if (goal >= eloc.logicalBlockNum) {
+ 			if (goal < eloc.logicalBlockNum +
+ 					(elen >> sb->s_blocksize_bits))
+@@ -629,9 +639,11 @@ static udf_pblk_t udf_table_new_block(struct super_block *sb,
+ 
+ 	brelse(epos.bh);
+ 
+-	if (spread == 0xFFFFFFFF) {
++	if (ret < 0 || spread == 0xFFFFFFFF) {
+ 		brelse(goal_epos.bh);
+ 		mutex_unlock(&sbi->s_alloc_mutex);
++		if (ret < 0)
++			*err = ret;
+ 		return 0;
+ 	}
+ 
+diff --git a/fs/udf/directory.c b/fs/udf/directory.c
+index 93153665eb3747..632453aa38934a 100644
+--- a/fs/udf/directory.c
++++ b/fs/udf/directory.c
+@@ -166,13 +166,19 @@ static struct buffer_head *udf_fiiter_bread_blk(struct udf_fileident_iter *iter)
+  */
+ static int udf_fiiter_advance_blk(struct udf_fileident_iter *iter)
+ {
++	int8_t etype = -1;
++	int err = 0;
++
+ 	iter->loffset++;
+ 	if (iter->loffset < DIV_ROUND_UP(iter->elen, 1<<iter->dir->i_blkbits))
+ 		return 0;
+ 
+ 	iter->loffset = 0;
+-	if (udf_next_aext(iter->dir, &iter->epos, &iter->eloc, &iter->elen, 1)
+-			!= (EXT_RECORDED_ALLOCATED >> 30)) {
++	err = udf_next_aext(iter->dir, &iter->epos, &iter->eloc,
++			    &iter->elen, &etype, 1);
++	if (err < 0)
++		return err;
++	else if (err == 0 || etype != (EXT_RECORDED_ALLOCATED >> 30)) {
+ 		if (iter->pos == iter->dir->i_size) {
+ 			iter->elen = 0;
+ 			return 0;
+@@ -240,6 +246,7 @@ int udf_fiiter_init(struct udf_fileident_iter *iter, struct inode *dir,
+ {
+ 	struct udf_inode_info *iinfo = UDF_I(dir);
+ 	int err = 0;
++	int8_t etype;
+ 
+ 	iter->dir = dir;
+ 	iter->bh[0] = iter->bh[1] = NULL;
+@@ -259,9 +266,9 @@ int udf_fiiter_init(struct udf_fileident_iter *iter, struct inode *dir,
+ 		goto out;
+ 	}
+ 
+-	if (inode_bmap(dir, iter->pos >> dir->i_blkbits, &iter->epos,
+-		       &iter->eloc, &iter->elen, &iter->loffset) !=
+-	    (EXT_RECORDED_ALLOCATED >> 30)) {
++	err = inode_bmap(dir, iter->pos >> dir->i_blkbits, &iter->epos,
++			 &iter->eloc, &iter->elen, &iter->loffset, &etype);
++	if (err <= 0 || etype != (EXT_RECORDED_ALLOCATED >> 30)) {
+ 		if (pos == dir->i_size)
+ 			return 0;
+ 		udf_err(dir->i_sb,
+@@ -457,6 +464,7 @@ int udf_fiiter_append_blk(struct udf_fileident_iter *iter)
+ 	sector_t block;
+ 	uint32_t old_elen = iter->elen;
+ 	int err;
++	int8_t etype;
+ 
+ 	if (WARN_ON_ONCE(iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB))
+ 		return -EINVAL;
+@@ -471,8 +479,9 @@ int udf_fiiter_append_blk(struct udf_fileident_iter *iter)
+ 		udf_fiiter_update_elen(iter, old_elen);
+ 		return err;
+ 	}
+-	if (inode_bmap(iter->dir, block, &iter->epos, &iter->eloc, &iter->elen,
+-		       &iter->loffset) != (EXT_RECORDED_ALLOCATED >> 30)) {
++	err = inode_bmap(iter->dir, block, &iter->epos, &iter->eloc, &iter->elen,
++		   &iter->loffset, &etype);
++	if (err <= 0 || etype != (EXT_RECORDED_ALLOCATED >> 30)) {
+ 		udf_err(iter->dir->i_sb,
+ 			"block %llu not allocated in directory (ino %lu)\n",
+ 			(unsigned long long)block, iter->dir->i_ino);
+diff --git a/fs/udf/inode.c b/fs/udf/inode.c
+index 8db07d1f56bc94..e98c198f85b964 100644
+--- a/fs/udf/inode.c
++++ b/fs/udf/inode.c
+@@ -408,7 +408,7 @@ struct udf_map_rq {
+ 
+ static int udf_map_block(struct inode *inode, struct udf_map_rq *map)
+ {
+-	int err;
++	int ret;
+ 	struct udf_inode_info *iinfo = UDF_I(inode);
+ 
+ 	if (WARN_ON_ONCE(iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB))
+@@ -420,18 +420,24 @@ static int udf_map_block(struct inode *inode, struct udf_map_rq *map)
+ 		uint32_t elen;
+ 		sector_t offset;
+ 		struct extent_position epos = {};
++		int8_t etype;
+ 
+ 		down_read(&iinfo->i_data_sem);
+-		if (inode_bmap(inode, map->lblk, &epos, &eloc, &elen, &offset)
+-				== (EXT_RECORDED_ALLOCATED >> 30)) {
++		ret = inode_bmap(inode, map->lblk, &epos, &eloc, &elen, &offset,
++				 &etype);
++		if (ret < 0)
++			goto out_read;
++		if (ret > 0 && etype == (EXT_RECORDED_ALLOCATED >> 30)) {
+ 			map->pblk = udf_get_lb_pblock(inode->i_sb, &eloc,
+ 							offset);
+ 			map->oflags |= UDF_BLK_MAPPED;
++			ret = 0;
+ 		}
++out_read:
+ 		up_read(&iinfo->i_data_sem);
+ 		brelse(epos.bh);
+ 
+-		return 0;
++		return ret;
+ 	}
+ 
+ 	down_write(&iinfo->i_data_sem);
+@@ -442,9 +448,9 @@ static int udf_map_block(struct inode *inode, struct udf_map_rq *map)
+ 	if (((loff_t)map->lblk) << inode->i_blkbits >= iinfo->i_lenExtents)
+ 		udf_discard_prealloc(inode);
+ 	udf_clear_extent_cache(inode);
+-	err = inode_getblk(inode, map);
++	ret = inode_getblk(inode, map);
+ 	up_write(&iinfo->i_data_sem);
+-	return err;
++	return ret;
+ }
+ 
+ static int __udf_get_block(struct inode *inode, sector_t block,
+@@ -547,6 +553,7 @@ static int udf_do_extend_file(struct inode *inode,
+ 	} else {
+ 		struct kernel_lb_addr tmploc;
+ 		uint32_t tmplen;
++		int8_t tmptype;
+ 
+ 		udf_write_aext(inode, last_pos, &last_ext->extLocation,
+ 				last_ext->extLength, 1);
+@@ -556,8 +563,12 @@ static int udf_do_extend_file(struct inode *inode,
+ 		 * more extents, we may need to enter possible following
+ 		 * empty indirect extent.
+ 		 */
+-		if (new_block_bytes)
+-			udf_next_aext(inode, last_pos, &tmploc, &tmplen, 0);
++		if (new_block_bytes) {
++			err = udf_next_aext(inode, last_pos, &tmploc, &tmplen,
++					    &tmptype, 0);
++			if (err < 0)
++				goto out_err;
++		}
+ 	}
+ 	iinfo->i_lenExtents += add;
+ 
+@@ -661,8 +672,10 @@ static int udf_extend_file(struct inode *inode, loff_t newsize)
+ 	 */
+ 	udf_discard_prealloc(inode);
+ 
+-	etype = inode_bmap(inode, first_block, &epos, &eloc, &elen, &offset);
+-	within_last_ext = (etype != -1);
++	err = inode_bmap(inode, first_block, &epos, &eloc, &elen, &offset, &etype);
++	if (err < 0)
++		goto out;
++	within_last_ext = (err == 1);
+ 	/* We don't expect extents past EOF... */
+ 	WARN_ON_ONCE(within_last_ext &&
+ 		     elen > ((loff_t)offset + 1) << inode->i_blkbits);
+@@ -676,8 +689,10 @@ static int udf_extend_file(struct inode *inode, loff_t newsize)
+ 		extent.extLength = EXT_NOT_RECORDED_NOT_ALLOCATED;
+ 	} else {
+ 		epos.offset -= adsize;
+-		etype = udf_next_aext(inode, &epos, &extent.extLocation,
+-				      &extent.extLength, 0);
++		err = udf_next_aext(inode, &epos, &extent.extLocation,
++				    &extent.extLength, &etype, 0);
++		if (err <= 0)
++			goto out;
+ 		extent.extLength |= etype << 30;
+ 	}
+ 
+@@ -714,11 +729,11 @@ static int inode_getblk(struct inode *inode, struct udf_map_rq *map)
+ 	loff_t lbcount = 0, b_off = 0;
+ 	udf_pblk_t newblocknum;
+ 	sector_t offset = 0;
+-	int8_t etype;
++	int8_t etype, tmpetype;
+ 	struct udf_inode_info *iinfo = UDF_I(inode);
+ 	udf_pblk_t goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
+ 	int lastblock = 0;
+-	bool isBeyondEOF;
++	bool isBeyondEOF = false;
+ 	int ret = 0;
+ 
+ 	prev_epos.offset = udf_file_entry_alloc_offset(inode);
+@@ -750,9 +765,13 @@ static int inode_getblk(struct inode *inode, struct udf_map_rq *map)
+ 		prev_epos.offset = cur_epos.offset;
+ 		cur_epos.offset = next_epos.offset;
+ 
+-		etype = udf_next_aext(inode, &next_epos, &eloc, &elen, 1);
+-		if (etype == -1)
++		ret = udf_next_aext(inode, &next_epos, &eloc, &elen, &etype, 1);
++		if (ret < 0) {
++			goto out_free;
++		} else if (ret == 0) {
++			isBeyondEOF = true;
+ 			break;
++		}
+ 
+ 		c = !c;
+ 
+@@ -773,13 +792,17 @@ static int inode_getblk(struct inode *inode, struct udf_map_rq *map)
+ 	 * Move prev_epos and cur_epos into indirect extent if we are at
+ 	 * the pointer to it
+ 	 */
+-	udf_next_aext(inode, &prev_epos, &tmpeloc, &tmpelen, 0);
+-	udf_next_aext(inode, &cur_epos, &tmpeloc, &tmpelen, 0);
++	ret = udf_next_aext(inode, &prev_epos, &tmpeloc, &tmpelen, &tmpetype, 0);
++	if (ret < 0)
++		goto out_free;
++	ret = udf_next_aext(inode, &cur_epos, &tmpeloc, &tmpelen, &tmpetype, 0);
++	if (ret < 0)
++		goto out_free;
+ 
+ 	/* if the extent is allocated and recorded, return the block
+ 	   if the extent is not a multiple of the blocksize, round up */
+ 
+-	if (etype == (EXT_RECORDED_ALLOCATED >> 30)) {
++	if (!isBeyondEOF && etype == (EXT_RECORDED_ALLOCATED >> 30)) {
+ 		if (elen & (inode->i_sb->s_blocksize - 1)) {
+ 			elen = EXT_RECORDED_ALLOCATED |
+ 				((elen + inode->i_sb->s_blocksize - 1) &
+@@ -795,10 +818,9 @@ static int inode_getblk(struct inode *inode, struct udf_map_rq *map)
+ 	}
+ 
+ 	/* Are we beyond EOF and preallocated extent? */
+-	if (etype == -1) {
++	if (isBeyondEOF) {
+ 		loff_t hole_len;
+ 
+-		isBeyondEOF = true;
+ 		if (count) {
+ 			if (c)
+ 				laarr[0] = laarr[1];
+@@ -834,7 +856,6 @@ static int inode_getblk(struct inode *inode, struct udf_map_rq *map)
+ 		endnum = c + 1;
+ 		lastblock = 1;
+ 	} else {
+-		isBeyondEOF = false;
+ 		endnum = startnum = ((count > 2) ? 2 : count);
+ 
+ 		/* if the current extent is in position 0,
+@@ -848,15 +869,17 @@ static int inode_getblk(struct inode *inode, struct udf_map_rq *map)
+ 
+ 		/* if the current block is located in an extent,
+ 		   read the next extent */
+-		etype = udf_next_aext(inode, &next_epos, &eloc, &elen, 0);
+-		if (etype != -1) {
++		ret = udf_next_aext(inode, &next_epos, &eloc, &elen, &etype, 0);
++		if (ret > 0) {
+ 			laarr[c + 1].extLength = (etype << 30) | elen;
+ 			laarr[c + 1].extLocation = eloc;
+ 			count++;
+ 			startnum++;
+ 			endnum++;
+-		} else
++		} else if (ret == 0)
+ 			lastblock = 1;
++		else
++			goto out_free;
+ 	}
+ 
+ 	/* if the current extent is not recorded but allocated, get the
+@@ -1174,6 +1197,7 @@ static int udf_update_extents(struct inode *inode, struct kernel_long_ad *laarr,
+ 	int start = 0, i;
+ 	struct kernel_lb_addr tmploc;
+ 	uint32_t tmplen;
++	int8_t tmpetype;
+ 	int err;
+ 
+ 	if (startnum > endnum) {
+@@ -1191,14 +1215,19 @@ static int udf_update_extents(struct inode *inode, struct kernel_long_ad *laarr,
+ 			 */
+ 			if (err < 0)
+ 				return err;
+-			udf_next_aext(inode, epos, &laarr[i].extLocation,
+-				      &laarr[i].extLength, 1);
++			err = udf_next_aext(inode, epos, &laarr[i].extLocation,
++				      &laarr[i].extLength, &tmpetype, 1);
++			if (err < 0)
++				return err;
+ 			start++;
+ 		}
+ 	}
+ 
+ 	for (i = start; i < endnum; i++) {
+-		udf_next_aext(inode, epos, &tmploc, &tmplen, 0);
++		err = udf_next_aext(inode, epos, &tmploc, &tmplen, &tmpetype, 0);
++		if (err < 0)
++			return err;
++
+ 		udf_write_aext(inode, epos, &laarr[i].extLocation,
+ 			       laarr[i].extLength, 1);
+ 	}
+@@ -1953,6 +1982,7 @@ int udf_setup_indirect_aext(struct inode *inode, udf_pblk_t block,
+ 	struct extent_position nepos;
+ 	struct kernel_lb_addr neloc;
+ 	int ver, adsize;
++	int err = 0;
+ 
+ 	if (UDF_I(inode)->i_alloc_type == ICBTAG_FLAG_AD_SHORT)
+ 		adsize = sizeof(struct short_ad);
+@@ -1997,10 +2027,12 @@ int udf_setup_indirect_aext(struct inode *inode, udf_pblk_t block,
+ 	if (epos->offset + adsize > sb->s_blocksize) {
+ 		struct kernel_lb_addr cp_loc;
+ 		uint32_t cp_len;
+-		int cp_type;
++		int8_t cp_type;
+ 
+ 		epos->offset -= adsize;
+-		cp_type = udf_current_aext(inode, epos, &cp_loc, &cp_len, 0);
++		err = udf_current_aext(inode, epos, &cp_loc, &cp_len, &cp_type, 0);
++		if (err <= 0)
++			goto err_out;
+ 		cp_len |= ((uint32_t)cp_type) << 30;
+ 
+ 		__udf_add_aext(inode, &nepos, &cp_loc, cp_len, 1);
+@@ -2015,6 +2047,9 @@ int udf_setup_indirect_aext(struct inode *inode, udf_pblk_t block,
+ 	*epos = nepos;
+ 
+ 	return 0;
++err_out:
++	brelse(bh);
++	return err;
+ }
+ 
+ /*
+@@ -2160,21 +2195,30 @@ void udf_write_aext(struct inode *inode, struct extent_position *epos,
+  */
+ #define UDF_MAX_INDIR_EXTS 16
+ 
+-int8_t udf_next_aext(struct inode *inode, struct extent_position *epos,
+-		     struct kernel_lb_addr *eloc, uint32_t *elen, int inc)
++/*
++ * Returns 1 on success, -errno on error, 0 on hit EOF.
++ */
++int udf_next_aext(struct inode *inode, struct extent_position *epos,
++		  struct kernel_lb_addr *eloc, uint32_t *elen, int8_t *etype,
++		  int inc)
+ {
+-	int8_t etype;
+ 	unsigned int indirections = 0;
++	int ret = 0;
++	udf_pblk_t block;
+ 
+-	while ((etype = udf_current_aext(inode, epos, eloc, elen, inc)) ==
+-	       (EXT_NEXT_EXTENT_ALLOCDESCS >> 30)) {
+-		udf_pblk_t block;
++	while (1) {
++		ret = udf_current_aext(inode, epos, eloc, elen,
++				       etype, inc);
++		if (ret <= 0)
++			return ret;
++		if (*etype != (EXT_NEXT_EXTENT_ALLOCDESCS >> 30))
++			return ret;
+ 
+ 		if (++indirections > UDF_MAX_INDIR_EXTS) {
+ 			udf_err(inode->i_sb,
+ 				"too many indirect extents in inode %lu\n",
+ 				inode->i_ino);
+-			return -1;
++			return -EFSCORRUPTED;
+ 		}
+ 
+ 		epos->block = *eloc;
+@@ -2184,18 +2228,19 @@ int8_t udf_next_aext(struct inode *inode, struct extent_position *epos,
+ 		epos->bh = sb_bread(inode->i_sb, block);
+ 		if (!epos->bh) {
+ 			udf_debug("reading block %u failed!\n", block);
+-			return -1;
++			return -EIO;
+ 		}
+ 	}
+-
+-	return etype;
+ }
+ 
+-int8_t udf_current_aext(struct inode *inode, struct extent_position *epos,
+-			struct kernel_lb_addr *eloc, uint32_t *elen, int inc)
++/*
++ * Returns 1 on success, -errno on error, 0 on hit EOF.
++ */
++int udf_current_aext(struct inode *inode, struct extent_position *epos,
++		     struct kernel_lb_addr *eloc, uint32_t *elen, int8_t *etype,
++		     int inc)
+ {
+ 	int alen;
+-	int8_t etype;
+ 	uint8_t *ptr;
+ 	struct short_ad *sad;
+ 	struct long_ad *lad;
+@@ -2210,20 +2255,23 @@ int8_t udf_current_aext(struct inode *inode, struct extent_position *epos,
+ 		alen = udf_file_entry_alloc_offset(inode) +
+ 							iinfo->i_lenAlloc;
+ 	} else {
++		struct allocExtDesc *header =
++			(struct allocExtDesc *)epos->bh->b_data;
++
+ 		if (!epos->offset)
+ 			epos->offset = sizeof(struct allocExtDesc);
+ 		ptr = epos->bh->b_data + epos->offset;
+-		alen = sizeof(struct allocExtDesc) +
+-			le32_to_cpu(((struct allocExtDesc *)epos->bh->b_data)->
+-							lengthAllocDescs);
++		if (check_add_overflow(sizeof(struct allocExtDesc),
++				le32_to_cpu(header->lengthAllocDescs), &alen))
++			return -1;
+ 	}
+ 
+ 	switch (iinfo->i_alloc_type) {
+ 	case ICBTAG_FLAG_AD_SHORT:
+ 		sad = udf_get_fileshortad(ptr, alen, &epos->offset, inc);
+ 		if (!sad)
+-			return -1;
+-		etype = le32_to_cpu(sad->extLength) >> 30;
++			return 0;
++		*etype = le32_to_cpu(sad->extLength) >> 30;
+ 		eloc->logicalBlockNum = le32_to_cpu(sad->extPosition);
+ 		eloc->partitionReferenceNum =
+ 				iinfo->i_location.partitionReferenceNum;
+@@ -2232,17 +2280,17 @@ int8_t udf_current_aext(struct inode *inode, struct extent_position *epos,
+ 	case ICBTAG_FLAG_AD_LONG:
+ 		lad = udf_get_filelongad(ptr, alen, &epos->offset, inc);
+ 		if (!lad)
+-			return -1;
+-		etype = le32_to_cpu(lad->extLength) >> 30;
++			return 0;
++		*etype = le32_to_cpu(lad->extLength) >> 30;
+ 		*eloc = lelb_to_cpu(lad->extLocation);
+ 		*elen = le32_to_cpu(lad->extLength) & UDF_EXTENT_LENGTH_MASK;
+ 		break;
+ 	default:
+ 		udf_debug("alloc_type = %u unsupported\n", iinfo->i_alloc_type);
+-		return -1;
++		return -EINVAL;
+ 	}
+ 
+-	return etype;
++	return 1;
+ }
+ 
+ static int udf_insert_aext(struct inode *inode, struct extent_position epos,
+@@ -2251,20 +2299,24 @@ static int udf_insert_aext(struct inode *inode, struct extent_position epos,
+ 	struct kernel_lb_addr oeloc;
+ 	uint32_t oelen;
+ 	int8_t etype;
+-	int err;
++	int ret;
+ 
+ 	if (epos.bh)
+ 		get_bh(epos.bh);
+ 
+-	while ((etype = udf_next_aext(inode, &epos, &oeloc, &oelen, 0)) != -1) {
++	while (1) {
++		ret = udf_next_aext(inode, &epos, &oeloc, &oelen, &etype, 0);
++		if (ret <= 0)
++			break;
+ 		udf_write_aext(inode, &epos, &neloc, nelen, 1);
+ 		neloc = oeloc;
+ 		nelen = (etype << 30) | oelen;
+ 	}
+-	err = udf_add_aext(inode, &epos, &neloc, nelen, 1);
++	if (ret == 0)
++		ret = udf_add_aext(inode, &epos, &neloc, nelen, 1);
+ 	brelse(epos.bh);
+ 
+-	return err;
++	return ret;
+ }
+ 
+ int8_t udf_delete_aext(struct inode *inode, struct extent_position epos)
+@@ -2276,6 +2328,7 @@ int8_t udf_delete_aext(struct inode *inode, struct extent_position epos)
+ 	struct udf_inode_info *iinfo;
+ 	struct kernel_lb_addr eloc;
+ 	uint32_t elen;
++	int ret;
+ 
+ 	if (epos.bh) {
+ 		get_bh(epos.bh);
+@@ -2291,10 +2344,18 @@ int8_t udf_delete_aext(struct inode *inode, struct extent_position epos)
+ 		adsize = 0;
+ 
+ 	oepos = epos;
+-	if (udf_next_aext(inode, &epos, &eloc, &elen, 1) == -1)
++	if (udf_next_aext(inode, &epos, &eloc, &elen, &etype, 1) <= 0)
+ 		return -1;
+ 
+-	while ((etype = udf_next_aext(inode, &epos, &eloc, &elen, 1)) != -1) {
++	while (1) {
++		ret = udf_next_aext(inode, &epos, &eloc, &elen, &etype, 1);
++		if (ret < 0) {
++			brelse(epos.bh);
++			brelse(oepos.bh);
++			return -1;
++		}
++		if (ret == 0)
++			break;
+ 		udf_write_aext(inode, &oepos, &eloc, (etype << 30) | elen, 1);
+ 		if (oepos.bh != epos.bh) {
+ 			oepos.block = epos.block;
+@@ -2351,14 +2412,17 @@ int8_t udf_delete_aext(struct inode *inode, struct extent_position epos)
+ 	return (elen >> 30);
+ }
+ 
+-int8_t inode_bmap(struct inode *inode, sector_t block,
+-		  struct extent_position *pos, struct kernel_lb_addr *eloc,
+-		  uint32_t *elen, sector_t *offset)
++/*
++ * Returns 1 on success, -errno on error, 0 on hit EOF.
++ */
++int inode_bmap(struct inode *inode, sector_t block, struct extent_position *pos,
++	       struct kernel_lb_addr *eloc, uint32_t *elen, sector_t *offset,
++	       int8_t *etype)
+ {
+ 	unsigned char blocksize_bits = inode->i_sb->s_blocksize_bits;
+ 	loff_t lbcount = 0, bcount = (loff_t) block << blocksize_bits;
+-	int8_t etype;
+ 	struct udf_inode_info *iinfo;
++	int err = 0;
+ 
+ 	iinfo = UDF_I(inode);
+ 	if (!udf_read_extent_cache(inode, bcount, &lbcount, pos)) {
+@@ -2368,11 +2432,13 @@ int8_t inode_bmap(struct inode *inode, sector_t block,
+ 	}
+ 	*elen = 0;
+ 	do {
+-		etype = udf_next_aext(inode, pos, eloc, elen, 1);
+-		if (etype == -1) {
+-			*offset = (bcount - lbcount) >> blocksize_bits;
+-			iinfo->i_lenExtents = lbcount;
+-			return -1;
++		err = udf_next_aext(inode, pos, eloc, elen, etype, 1);
++		if (err <= 0) {
++			if (err == 0) {
++				*offset = (bcount - lbcount) >> blocksize_bits;
++				iinfo->i_lenExtents = lbcount;
++			}
++			return err;
+ 		}
+ 		lbcount += *elen;
+ 	} while (lbcount <= bcount);
+@@ -2380,5 +2446,5 @@ int8_t inode_bmap(struct inode *inode, sector_t block,
+ 	udf_update_extent_cache(inode, lbcount - *elen, pos);
+ 	*offset = (bcount + *elen - lbcount) >> blocksize_bits;
+ 
+-	return etype;
++	return 1;
+ }
+diff --git a/fs/udf/partition.c b/fs/udf/partition.c
+index af877991edc13a..2b85c9501bed89 100644
+--- a/fs/udf/partition.c
++++ b/fs/udf/partition.c
+@@ -282,9 +282,11 @@ static uint32_t udf_try_read_meta(struct inode *inode, uint32_t block,
+ 	sector_t ext_offset;
+ 	struct extent_position epos = {};
+ 	uint32_t phyblock;
++	int8_t etype;
++	int err = 0;
+ 
+-	if (inode_bmap(inode, block, &epos, &eloc, &elen, &ext_offset) !=
+-						(EXT_RECORDED_ALLOCATED >> 30))
++	err = inode_bmap(inode, block, &epos, &eloc, &elen, &ext_offset, &etype);
++	if (err <= 0 || etype != (EXT_RECORDED_ALLOCATED >> 30))
+ 		phyblock = 0xFFFFFFFF;
+ 	else {
+ 		map = &UDF_SB(sb)->s_partmaps[partition];
+diff --git a/fs/udf/super.c b/fs/udf/super.c
+index 3c78535f406b00..20dff9ed2471da 100644
+--- a/fs/udf/super.c
++++ b/fs/udf/super.c
+@@ -2454,13 +2454,14 @@ static unsigned int udf_count_free_table(struct super_block *sb,
+ 	uint32_t elen;
+ 	struct kernel_lb_addr eloc;
+ 	struct extent_position epos;
++	int8_t etype;
+ 
+ 	mutex_lock(&UDF_SB(sb)->s_alloc_mutex);
+ 	epos.block = UDF_I(table)->i_location;
+ 	epos.offset = sizeof(struct unallocSpaceEntry);
+ 	epos.bh = NULL;
+ 
+-	while (udf_next_aext(table, &epos, &eloc, &elen, 1) != -1)
++	while (udf_next_aext(table, &epos, &eloc, &elen, &etype, 1) > 0)
+ 		accum += (elen >> table->i_sb->s_blocksize_bits);
+ 
+ 	brelse(epos.bh);
+diff --git a/fs/udf/truncate.c b/fs/udf/truncate.c
+index a686c10fd709d1..4f33a4a4888613 100644
+--- a/fs/udf/truncate.c
++++ b/fs/udf/truncate.c
+@@ -69,6 +69,7 @@ void udf_truncate_tail_extent(struct inode *inode)
+ 	int8_t etype = -1, netype;
+ 	int adsize;
+ 	struct udf_inode_info *iinfo = UDF_I(inode);
++	int ret;
+ 
+ 	if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB ||
+ 	    inode->i_size == iinfo->i_lenExtents)
+@@ -85,7 +86,10 @@ void udf_truncate_tail_extent(struct inode *inode)
+ 		BUG();
+ 
+ 	/* Find the last extent in the file */
+-	while ((netype = udf_next_aext(inode, &epos, &eloc, &elen, 1)) != -1) {
++	while (1) {
++		ret = udf_next_aext(inode, &epos, &eloc, &elen, &netype, 1);
++		if (ret <= 0)
++			break;
+ 		etype = netype;
+ 		lbcount += elen;
+ 		if (lbcount > inode->i_size) {
+@@ -101,7 +105,8 @@ void udf_truncate_tail_extent(struct inode *inode)
+ 			epos.offset -= adsize;
+ 			extent_trunc(inode, &epos, &eloc, etype, elen, nelen);
+ 			epos.offset += adsize;
+-			if (udf_next_aext(inode, &epos, &eloc, &elen, 1) != -1)
++			if (udf_next_aext(inode, &epos, &eloc, &elen,
++					  &netype, 1) > 0)
+ 				udf_err(inode->i_sb,
+ 					"Extent after EOF in inode %u\n",
+ 					(unsigned)inode->i_ino);
+@@ -110,7 +115,8 @@ void udf_truncate_tail_extent(struct inode *inode)
+ 	}
+ 	/* This inode entry is in-memory only and thus we don't have to mark
+ 	 * the inode dirty */
+-	iinfo->i_lenExtents = inode->i_size;
++	if (ret == 0)
++		iinfo->i_lenExtents = inode->i_size;
+ 	brelse(epos.bh);
+ }
+ 
+@@ -124,6 +130,8 @@ void udf_discard_prealloc(struct inode *inode)
+ 	int8_t etype = -1;
+ 	struct udf_inode_info *iinfo = UDF_I(inode);
+ 	int bsize = i_blocksize(inode);
++	int8_t tmpetype = -1;
++	int ret;
+ 
+ 	if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB ||
+ 	    ALIGN(inode->i_size, bsize) == ALIGN(iinfo->i_lenExtents, bsize))
+@@ -132,15 +140,23 @@ void udf_discard_prealloc(struct inode *inode)
+ 	epos.block = iinfo->i_location;
+ 
+ 	/* Find the last extent in the file */
+-	while (udf_next_aext(inode, &epos, &eloc, &elen, 0) != -1) {
++	while (1) {
++		ret = udf_next_aext(inode, &epos, &eloc, &elen, &tmpetype, 0);
++		if (ret < 0)
++			goto out;
++		if (ret == 0)
++			break;
+ 		brelse(prev_epos.bh);
+ 		prev_epos = epos;
+ 		if (prev_epos.bh)
+ 			get_bh(prev_epos.bh);
+ 
+-		etype = udf_next_aext(inode, &epos, &eloc, &elen, 1);
++		ret = udf_next_aext(inode, &epos, &eloc, &elen, &etype, 1);
++		if (ret < 0)
++			goto out;
+ 		lbcount += elen;
+ 	}
++
+ 	if (etype == (EXT_NOT_RECORDED_ALLOCATED >> 30)) {
+ 		lbcount -= elen;
+ 		udf_delete_aext(inode, prev_epos);
+@@ -150,6 +166,7 @@ void udf_discard_prealloc(struct inode *inode)
+ 	/* This inode entry is in-memory only and thus we don't have to mark
+ 	 * the inode dirty */
+ 	iinfo->i_lenExtents = lbcount;
++out:
+ 	brelse(epos.bh);
+ 	brelse(prev_epos.bh);
+ }
+@@ -188,6 +205,7 @@ int udf_truncate_extents(struct inode *inode)
+ 	loff_t byte_offset;
+ 	int adsize;
+ 	struct udf_inode_info *iinfo = UDF_I(inode);
++	int ret = 0;
+ 
+ 	if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_SHORT)
+ 		adsize = sizeof(struct short_ad);
+@@ -196,10 +214,12 @@ int udf_truncate_extents(struct inode *inode)
+ 	else
+ 		BUG();
+ 
+-	etype = inode_bmap(inode, first_block, &epos, &eloc, &elen, &offset);
++	ret = inode_bmap(inode, first_block, &epos, &eloc, &elen, &offset, &etype);
++	if (ret < 0)
++		return ret;
+ 	byte_offset = (offset << sb->s_blocksize_bits) +
+ 		(inode->i_size & (sb->s_blocksize - 1));
+-	if (etype == -1) {
++	if (ret == 0) {
+ 		/* We should extend the file? */
+ 		WARN_ON(byte_offset);
+ 		return 0;
+@@ -217,8 +237,8 @@ int udf_truncate_extents(struct inode *inode)
+ 	else
+ 		lenalloc -= sizeof(struct allocExtDesc);
+ 
+-	while ((etype = udf_current_aext(inode, &epos, &eloc,
+-					 &elen, 0)) != -1) {
++	while ((ret = udf_current_aext(inode, &epos, &eloc,
++				       &elen, &etype, 0)) > 0) {
+ 		if (etype == (EXT_NEXT_EXTENT_ALLOCDESCS >> 30)) {
+ 			udf_write_aext(inode, &epos, &neloc, nelen, 0);
+ 			if (indirect_ext_len) {
+@@ -253,6 +273,11 @@ int udf_truncate_extents(struct inode *inode)
+ 		}
+ 	}
+ 
++	if (ret < 0) {
++		brelse(epos.bh);
++		return ret;
++	}
++
+ 	if (indirect_ext_len) {
+ 		BUG_ON(!epos.bh);
+ 		udf_free_blocks(sb, NULL, &epos.block, 0, indirect_ext_len);
+diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
+index 88692512a46687..d159f20d61e89a 100644
+--- a/fs/udf/udfdecl.h
++++ b/fs/udf/udfdecl.h
+@@ -157,8 +157,9 @@ extern struct buffer_head *udf_bread(struct inode *inode, udf_pblk_t block,
+ extern int udf_setsize(struct inode *, loff_t);
+ extern void udf_evict_inode(struct inode *);
+ extern int udf_write_inode(struct inode *, struct writeback_control *wbc);
+-extern int8_t inode_bmap(struct inode *, sector_t, struct extent_position *,
+-			 struct kernel_lb_addr *, uint32_t *, sector_t *);
++extern int inode_bmap(struct inode *inode, sector_t block,
++		      struct extent_position *pos, struct kernel_lb_addr *eloc,
++		      uint32_t *elen, sector_t *offset, int8_t *etype);
+ int udf_get_block(struct inode *, sector_t, struct buffer_head *, int);
+ extern int udf_setup_indirect_aext(struct inode *inode, udf_pblk_t block,
+ 				   struct extent_position *epos);
+@@ -169,10 +170,12 @@ extern int udf_add_aext(struct inode *, struct extent_position *,
+ extern void udf_write_aext(struct inode *, struct extent_position *,
+ 			   struct kernel_lb_addr *, uint32_t, int);
+ extern int8_t udf_delete_aext(struct inode *, struct extent_position);
+-extern int8_t udf_next_aext(struct inode *, struct extent_position *,
+-			    struct kernel_lb_addr *, uint32_t *, int);
+-extern int8_t udf_current_aext(struct inode *, struct extent_position *,
+-			       struct kernel_lb_addr *, uint32_t *, int);
++extern int udf_next_aext(struct inode *inode, struct extent_position *epos,
++			 struct kernel_lb_addr *eloc, uint32_t *elen,
++			 int8_t *etype, int inc);
++extern int udf_current_aext(struct inode *inode, struct extent_position *epos,
++			    struct kernel_lb_addr *eloc, uint32_t *elen,
++			    int8_t *etype, int inc);
+ extern void udf_update_extra_perms(struct inode *inode, umode_t mode);
+ 
+ /* misc.c */
+diff --git a/include/acpi/cppc_acpi.h b/include/acpi/cppc_acpi.h
+index ec425d2834f869..e1720d93066695 100644
+--- a/include/acpi/cppc_acpi.h
++++ b/include/acpi/cppc_acpi.h
+@@ -147,6 +147,8 @@ extern int cppc_set_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls);
+ extern int cppc_set_enable(int cpu, bool enable);
+ extern int cppc_get_perf_caps(int cpu, struct cppc_perf_caps *caps);
+ extern bool cppc_perf_ctrs_in_pcc(void);
++extern unsigned int cppc_perf_to_khz(struct cppc_perf_caps *caps, unsigned int perf);
++extern unsigned int cppc_khz_to_perf(struct cppc_perf_caps *caps, unsigned int freq);
+ extern bool acpi_cpc_valid(void);
+ extern bool cppc_allow_fast_switch(void);
+ extern int acpi_get_psd_map(unsigned int cpu, struct cppc_cpudata *cpu_data);
+diff --git a/include/linux/bpf.h b/include/linux/bpf.h
+index 1e05cc80e0485f..5a27fd533fabc8 100644
+--- a/include/linux/bpf.h
++++ b/include/linux/bpf.h
+@@ -616,6 +616,7 @@ enum bpf_type_flag {
+ 	 */
+ 	PTR_UNTRUSTED		= BIT(6 + BPF_BASE_TYPE_BITS),
+ 
++	/* MEM can be uninitialized. */
+ 	MEM_UNINIT		= BIT(7 + BPF_BASE_TYPE_BITS),
+ 
+ 	/* DYNPTR points to memory local to the bpf program. */
+@@ -681,6 +682,13 @@ enum bpf_type_flag {
+ 	 */
+ 	MEM_ALIGNED		= BIT(17 + BPF_BASE_TYPE_BITS),
+ 
++	/* MEM is being written to, often combined with MEM_UNINIT. Non-presence
++	 * of MEM_WRITE means that MEM is only being read. MEM_WRITE without the
++	 * MEM_UNINIT means that memory needs to be initialized since it is also
++	 * read.
++	 */
++	MEM_WRITE		= BIT(18 + BPF_BASE_TYPE_BITS),
++
+ 	__BPF_TYPE_FLAG_MAX,
+ 	__BPF_TYPE_LAST_FLAG	= __BPF_TYPE_FLAG_MAX - 1,
+ };
+@@ -738,10 +746,10 @@ enum bpf_arg_type {
+ 	ARG_PTR_TO_SOCKET_OR_NULL	= PTR_MAYBE_NULL | ARG_PTR_TO_SOCKET,
+ 	ARG_PTR_TO_STACK_OR_NULL	= PTR_MAYBE_NULL | ARG_PTR_TO_STACK,
+ 	ARG_PTR_TO_BTF_ID_OR_NULL	= PTR_MAYBE_NULL | ARG_PTR_TO_BTF_ID,
+-	/* pointer to memory does not need to be initialized, helper function must fill
+-	 * all bytes or clear them in error case.
++	/* Pointer to memory does not need to be initialized, since helper function
++	 * fills all bytes or clears them in error case.
+ 	 */
+-	ARG_PTR_TO_UNINIT_MEM		= MEM_UNINIT | ARG_PTR_TO_MEM,
++	ARG_PTR_TO_UNINIT_MEM		= MEM_UNINIT | MEM_WRITE | ARG_PTR_TO_MEM,
+ 	/* Pointer to valid memory of size known at compile time. */
+ 	ARG_PTR_TO_FIXED_SIZE_MEM	= MEM_FIXED_SIZE | ARG_PTR_TO_MEM,
+ 
+diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
+index e4e24da16d2c39..b1fdb1554f2f9c 100644
+--- a/include/linux/memcontrol.h
++++ b/include/linux/memcontrol.h
+@@ -1080,15 +1080,6 @@ static inline void count_memcg_events(struct mem_cgroup *memcg,
+ 	local_irq_restore(flags);
+ }
+ 
+-static inline void count_memcg_page_event(struct page *page,
+-					  enum vm_event_item idx)
+-{
+-	struct mem_cgroup *memcg = page_memcg(page);
+-
+-	if (memcg)
+-		count_memcg_events(memcg, idx, 1);
+-}
+-
+ static inline void count_memcg_folio_events(struct folio *folio,
+ 		enum vm_event_item idx, unsigned long nr)
+ {
+@@ -1565,11 +1556,6 @@ static inline void __count_memcg_events(struct mem_cgroup *memcg,
+ {
+ }
+ 
+-static inline void count_memcg_page_event(struct page *page,
+-					  int idx)
+-{
+-}
+-
+ static inline void count_memcg_folio_events(struct folio *folio,
+ 		enum vm_event_item idx, unsigned long nr)
+ {
+diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
+index 8f5ac20b4c03d9..1576e7443eee50 100644
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -3363,6 +3363,12 @@ static inline void netif_tx_wake_all_queues(struct net_device *dev)
+ 
+ static __always_inline void netif_tx_stop_queue(struct netdev_queue *dev_queue)
+ {
++	/* Paired with READ_ONCE() from dev_watchdog() */
++	WRITE_ONCE(dev_queue->trans_start, jiffies);
++
++	/* This barrier is paired with smp_mb() from dev_watchdog() */
++	smp_mb__before_atomic();
++
+ 	/* Must be an atomic op see netif_txq_try_stop() */
+ 	set_bit(__QUEUE_STATE_DRV_XOFF, &dev_queue->state);
+ }
+@@ -3479,6 +3485,12 @@ static inline void netdev_tx_sent_queue(struct netdev_queue *dev_queue,
+ 	if (likely(dql_avail(&dev_queue->dql) >= 0))
+ 		return;
+ 
++	/* Paired with READ_ONCE() from dev_watchdog() */
++	WRITE_ONCE(dev_queue->trans_start, jiffies);
++
++	/* This barrier is paired with smp_mb() from dev_watchdog() */
++	smp_mb__before_atomic();
++
+ 	set_bit(__QUEUE_STATE_STACK_XOFF, &dev_queue->state);
+ 
+ 	/*
+diff --git a/include/linux/task_work.h b/include/linux/task_work.h
+index 26b8a47f41fcac..2964171856e00d 100644
+--- a/include/linux/task_work.h
++++ b/include/linux/task_work.h
+@@ -14,10 +14,14 @@ init_task_work(struct callback_head *twork, task_work_func_t func)
+ }
+ 
+ enum task_work_notify_mode {
+-	TWA_NONE,
++	TWA_NONE = 0,
+ 	TWA_RESUME,
+ 	TWA_SIGNAL,
+ 	TWA_SIGNAL_NO_IPI,
++	TWA_NMI_CURRENT,
++
++	TWA_FLAGS = 0xff00,
++	TWAF_NO_ALLOC = 0x0100,
+ };
+ 
+ static inline bool task_work_pending(struct task_struct *task)
+diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
+index cb8bd759e80057..9d799777c333c0 100644
+--- a/include/linux/trace_events.h
++++ b/include/linux/trace_events.h
+@@ -765,7 +765,8 @@ struct bpf_raw_event_map *bpf_get_raw_tracepoint(const char *name);
+ void bpf_put_raw_tracepoint(struct bpf_raw_event_map *btp);
+ int bpf_get_perf_event_info(const struct perf_event *event, u32 *prog_id,
+ 			    u32 *fd_type, const char **buf,
+-			    u64 *probe_offset, u64 *probe_addr);
++			    u64 *probe_offset, u64 *probe_addr,
++			    unsigned long *missed);
+ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *prog);
+ int bpf_uprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *prog);
+ #else
+@@ -805,7 +806,7 @@ static inline void bpf_put_raw_tracepoint(struct bpf_raw_event_map *btp)
+ static inline int bpf_get_perf_event_info(const struct perf_event *event,
+ 					  u32 *prog_id, u32 *fd_type,
+ 					  const char **buf, u64 *probe_offset,
+-					  u64 *probe_addr)
++					  u64 *probe_addr, unsigned long *missed)
+ {
+ 	return -EOPNOTSUPP;
+ }
+@@ -880,6 +881,7 @@ extern void perf_kprobe_destroy(struct perf_event *event);
+ extern int bpf_get_kprobe_info(const struct perf_event *event,
+ 			       u32 *fd_type, const char **symbol,
+ 			       u64 *probe_offset, u64 *probe_addr,
++			       unsigned long *missed,
+ 			       bool perf_type_tracepoint);
+ #endif
+ #ifdef CONFIG_UPROBE_EVENTS
+diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
+index e4a6831133f818..4763a47bf8c8a8 100644
+--- a/include/net/bluetooth/bluetooth.h
++++ b/include/net/bluetooth/bluetooth.h
+@@ -403,6 +403,7 @@ int  bt_sock_register(int proto, const struct net_proto_family *ops);
+ void bt_sock_unregister(int proto);
+ void bt_sock_link(struct bt_sock_list *l, struct sock *s);
+ void bt_sock_unlink(struct bt_sock_list *l, struct sock *s);
++bool bt_sock_linked(struct bt_sock_list *l, struct sock *s);
+ struct sock *bt_sock_alloc(struct net *net, struct socket *sock,
+ 			   struct proto *prot, int proto, gfp_t prio, int kern);
+ int  bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
+diff --git a/include/net/genetlink.h b/include/net/genetlink.h
+index c53244f2043704..e8c34aa4a640db 100644
+--- a/include/net/genetlink.h
++++ b/include/net/genetlink.h
+@@ -478,13 +478,12 @@ static inline int genlmsg_multicast(const struct genl_family *family,
+  * @skb: netlink message as socket buffer
+  * @portid: own netlink portid to avoid sending to yourself
+  * @group: offset of multicast group in groups array
+- * @flags: allocation flags
+  *
+  * This function must hold the RTNL or rcu_read_lock().
+  */
+ int genlmsg_multicast_allns(const struct genl_family *family,
+ 			    struct sk_buff *skb, u32 portid,
+-			    unsigned int group, gfp_t flags);
++			    unsigned int group);
+ 
+ /**
+  * genlmsg_unicast - unicast a netlink message
+diff --git a/include/net/sock.h b/include/net/sock.h
+index c3961050b8e394..e0be8bd9839602 100644
+--- a/include/net/sock.h
++++ b/include/net/sock.h
+@@ -2826,6 +2826,11 @@ static inline bool sk_is_stream_unix(const struct sock *sk)
+ 	return sk->sk_family == AF_UNIX && sk->sk_type == SOCK_STREAM;
+ }
+ 
++static inline bool sk_is_vsock(const struct sock *sk)
++{
++	return sk->sk_family == AF_VSOCK;
++}
++
+ /**
+  * sk_eat_skb - Release a skb if it is no longer needed
+  * @sk: socket to eat this skb from
+diff --git a/include/net/xfrm.h b/include/net/xfrm.h
+index b280e7c4601160..93a9866ee481fa 100644
+--- a/include/net/xfrm.h
++++ b/include/net/xfrm.h
+@@ -342,20 +342,25 @@ struct xfrm_if_cb {
+ void xfrm_if_register_cb(const struct xfrm_if_cb *ifcb);
+ void xfrm_if_unregister_cb(void);
+ 
++struct xfrm_dst_lookup_params {
++	struct net *net;
++	int tos;
++	int oif;
++	xfrm_address_t *saddr;
++	xfrm_address_t *daddr;
++	u32 mark;
++	__u8 ipproto;
++	union flowi_uli uli;
++};
++
+ struct net_device;
+ struct xfrm_type;
+ struct xfrm_dst;
+ struct xfrm_policy_afinfo {
+ 	struct dst_ops		*dst_ops;
+-	struct dst_entry	*(*dst_lookup)(struct net *net,
+-					       int tos, int oif,
+-					       const xfrm_address_t *saddr,
+-					       const xfrm_address_t *daddr,
+-					       u32 mark);
+-	int			(*get_saddr)(struct net *net, int oif,
+-					     xfrm_address_t *saddr,
+-					     xfrm_address_t *daddr,
+-					     u32 mark);
++	struct dst_entry	*(*dst_lookup)(const struct xfrm_dst_lookup_params *params);
++	int			(*get_saddr)(xfrm_address_t *saddr,
++					     const struct xfrm_dst_lookup_params *params);
+ 	int			(*fill_dst)(struct xfrm_dst *xdst,
+ 					    struct net_device *dev,
+ 					    const struct flowi *fl);
+@@ -1728,10 +1733,7 @@ static inline int xfrm_user_policy(struct sock *sk, int optname,
+ }
+ #endif
+ 
+-struct dst_entry *__xfrm_dst_lookup(struct net *net, int tos, int oif,
+-				    const xfrm_address_t *saddr,
+-				    const xfrm_address_t *daddr,
+-				    int family, u32 mark);
++struct dst_entry *__xfrm_dst_lookup(int family, const struct xfrm_dst_lookup_params *params);
+ 
+ struct xfrm_policy *xfrm_policy_alloc(struct net *net, gfp_t gfp);
+ 
+diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h
+index 6e2ef1d4b0028d..37f2443b3cdb0f 100644
+--- a/include/trace/events/huge_memory.h
++++ b/include/trace/events/huge_memory.h
+@@ -207,10 +207,10 @@ TRACE_EVENT(mm_khugepaged_scan_file,
+ );
+ 
+ TRACE_EVENT(mm_khugepaged_collapse_file,
+-	TP_PROTO(struct mm_struct *mm, struct page *hpage, pgoff_t index,
+-			bool is_shmem, unsigned long addr, struct file *file,
++	TP_PROTO(struct mm_struct *mm, struct folio *new_folio, pgoff_t index,
++			unsigned long addr, bool is_shmem, struct file *file,
+ 			int nr, int result),
+-	TP_ARGS(mm, hpage, index, addr, is_shmem, file, nr, result),
++	TP_ARGS(mm, new_folio, index, addr, is_shmem, file, nr, result),
+ 	TP_STRUCT__entry(
+ 		__field(struct mm_struct *, mm)
+ 		__field(unsigned long, hpfn)
+@@ -224,7 +224,7 @@ TRACE_EVENT(mm_khugepaged_collapse_file,
+ 
+ 	TP_fast_assign(
+ 		__entry->mm = mm;
+-		__entry->hpfn = hpage ? page_to_pfn(hpage) : -1;
++		__entry->hpfn = new_folio ? folio_pfn(new_folio) : -1;
+ 		__entry->index = index;
+ 		__entry->addr = addr;
+ 		__entry->is_shmem = is_shmem;
+@@ -233,7 +233,7 @@ TRACE_EVENT(mm_khugepaged_collapse_file,
+ 		__entry->result = result;
+ 	),
+ 
+-	TP_printk("mm=%p, hpage_pfn=0x%lx, index=%ld, addr=%ld, is_shmem=%d, filename=%s, nr=%d, result=%s",
++	TP_printk("mm=%p, hpage_pfn=0x%lx, index=%ld, addr=%lx, is_shmem=%d, filename=%s, nr=%d, result=%s",
+ 		__entry->mm,
+ 		__entry->hpfn,
+ 		__entry->index,
+diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
+index ba6e346c8d669a..431bc700bcfb93 100644
+--- a/include/uapi/linux/bpf.h
++++ b/include/uapi/linux/bpf.h
+@@ -5921,11 +5921,6 @@ enum {
+ 	BPF_F_MARK_ENFORCE		= (1ULL << 6),
+ };
+ 
+-/* BPF_FUNC_clone_redirect and BPF_FUNC_redirect flags. */
+-enum {
+-	BPF_F_INGRESS			= (1ULL << 0),
+-};
+-
+ /* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
+ enum {
+ 	BPF_F_TUNINFO_IPV6		= (1ULL << 0),
+@@ -6072,10 +6067,12 @@ enum {
+ 	BPF_F_BPRM_SECUREEXEC	= (1ULL << 0),
+ };
+ 
+-/* Flags for bpf_redirect_map helper */
++/* Flags for bpf_redirect and bpf_redirect_map helpers */
+ enum {
+-	BPF_F_BROADCAST		= (1ULL << 3),
+-	BPF_F_EXCLUDE_INGRESS	= (1ULL << 4),
++	BPF_F_INGRESS		= (1ULL << 0), /* used for skb path */
++	BPF_F_BROADCAST		= (1ULL << 3), /* used for XDP path */
++	BPF_F_EXCLUDE_INGRESS	= (1ULL << 4), /* used for XDP path */
++#define BPF_F_REDIRECT_FLAGS (BPF_F_INGRESS | BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS)
+ };
+ 
+ #define __bpf_md_ptr(type, name)	\
+@@ -6559,20 +6556,27 @@ struct bpf_link_info {
+ 					__aligned_u64 file_name; /* in/out */
+ 					__u32 name_len;
+ 					__u32 offset; /* offset from file_name */
++					__u64 cookie;
+ 				} uprobe; /* BPF_PERF_EVENT_UPROBE, BPF_PERF_EVENT_URETPROBE */
+ 				struct {
+ 					__aligned_u64 func_name; /* in/out */
+ 					__u32 name_len;
+ 					__u32 offset; /* offset from func_name */
+ 					__u64 addr;
++					__u64 missed;
++					__u64 cookie;
+ 				} kprobe; /* BPF_PERF_EVENT_KPROBE, BPF_PERF_EVENT_KRETPROBE */
+ 				struct {
+ 					__aligned_u64 tp_name;   /* in/out */
+ 					__u32 name_len;
++					__u32 :32;
++					__u64 cookie;
+ 				} tracepoint; /* BPF_PERF_EVENT_TRACEPOINT */
+ 				struct {
+ 					__u64 config;
+ 					__u32 type;
++					__u32 :32;
++					__u64 cookie;
+ 				} event; /* BPF_PERF_EVENT_EVENT */
+ 			};
+ 		} perf_event;
+diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
+index e0e4d4f490e87c..c8828016a66fdc 100644
+--- a/kernel/bpf/btf.c
++++ b/kernel/bpf/btf.c
+@@ -8435,6 +8435,7 @@ int bpf_core_apply(struct bpf_core_ctx *ctx, const struct bpf_core_relo *relo,
+ 	if (!type) {
+ 		bpf_log(ctx->log, "relo #%u: bad type id %u\n",
+ 			relo_idx, relo->type_id);
++		kfree(specs);
+ 		return -EINVAL;
+ 	}
+ 
+diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
+index 69e78dc4bb18e8..96b0345f76c2ce 100644
+--- a/kernel/bpf/devmap.c
++++ b/kernel/bpf/devmap.c
+@@ -322,9 +322,11 @@ static int dev_map_hash_get_next_key(struct bpf_map *map, void *key,
+ 
+ static int dev_map_bpf_prog_run(struct bpf_prog *xdp_prog,
+ 				struct xdp_frame **frames, int n,
+-				struct net_device *dev)
++				struct net_device *tx_dev,
++				struct net_device *rx_dev)
+ {
+-	struct xdp_txq_info txq = { .dev = dev };
++	struct xdp_txq_info txq = { .dev = tx_dev };
++	struct xdp_rxq_info rxq = { .dev = rx_dev };
+ 	struct xdp_buff xdp;
+ 	int i, nframes = 0;
+ 
+@@ -335,6 +337,7 @@ static int dev_map_bpf_prog_run(struct bpf_prog *xdp_prog,
+ 
+ 		xdp_convert_frame_to_buff(xdpf, &xdp);
+ 		xdp.txq = &txq;
++		xdp.rxq = &rxq;
+ 
+ 		act = bpf_prog_run_xdp(xdp_prog, &xdp);
+ 		switch (act) {
+@@ -349,7 +352,7 @@ static int dev_map_bpf_prog_run(struct bpf_prog *xdp_prog,
+ 			bpf_warn_invalid_xdp_action(NULL, xdp_prog, act);
+ 			fallthrough;
+ 		case XDP_ABORTED:
+-			trace_xdp_exception(dev, xdp_prog, act);
++			trace_xdp_exception(tx_dev, xdp_prog, act);
+ 			fallthrough;
+ 		case XDP_DROP:
+ 			xdp_return_frame_rx_napi(xdpf);
+@@ -377,7 +380,7 @@ static void bq_xmit_all(struct xdp_dev_bulk_queue *bq, u32 flags)
+ 	}
+ 
+ 	if (bq->xdp_prog) {
+-		to_send = dev_map_bpf_prog_run(bq->xdp_prog, bq->q, cnt, dev);
++		to_send = dev_map_bpf_prog_run(bq->xdp_prog, bq->q, cnt, dev, bq->dev_rx);
+ 		if (!to_send)
+ 			goto out;
+ 	}
+diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c
+index 3dba5bb294d8e4..41d62405c85214 100644
+--- a/kernel/bpf/helpers.c
++++ b/kernel/bpf/helpers.c
+@@ -110,7 +110,7 @@ const struct bpf_func_proto bpf_map_pop_elem_proto = {
+ 	.gpl_only	= false,
+ 	.ret_type	= RET_INTEGER,
+ 	.arg1_type	= ARG_CONST_MAP_PTR,
+-	.arg2_type	= ARG_PTR_TO_MAP_VALUE | MEM_UNINIT,
++	.arg2_type	= ARG_PTR_TO_MAP_VALUE | MEM_UNINIT | MEM_WRITE,
+ };
+ 
+ BPF_CALL_2(bpf_map_peek_elem, struct bpf_map *, map, void *, value)
+@@ -123,7 +123,7 @@ const struct bpf_func_proto bpf_map_peek_elem_proto = {
+ 	.gpl_only	= false,
+ 	.ret_type	= RET_INTEGER,
+ 	.arg1_type	= ARG_CONST_MAP_PTR,
+-	.arg2_type	= ARG_PTR_TO_MAP_VALUE | MEM_UNINIT,
++	.arg2_type	= ARG_PTR_TO_MAP_VALUE | MEM_UNINIT | MEM_WRITE,
+ };
+ 
+ BPF_CALL_3(bpf_map_lookup_percpu_elem, struct bpf_map *, map, void *, key, u32, cpu)
+@@ -538,7 +538,7 @@ const struct bpf_func_proto bpf_strtol_proto = {
+ 	.arg1_type	= ARG_PTR_TO_MEM | MEM_RDONLY,
+ 	.arg2_type	= ARG_CONST_SIZE,
+ 	.arg3_type	= ARG_ANYTHING,
+-	.arg4_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_ALIGNED,
++	.arg4_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_WRITE | MEM_ALIGNED,
+ 	.arg4_size	= sizeof(s64),
+ };
+ 
+@@ -568,7 +568,7 @@ const struct bpf_func_proto bpf_strtoul_proto = {
+ 	.arg1_type	= ARG_PTR_TO_MEM | MEM_RDONLY,
+ 	.arg2_type	= ARG_CONST_SIZE,
+ 	.arg3_type	= ARG_ANYTHING,
+-	.arg4_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_ALIGNED,
++	.arg4_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_WRITE | MEM_ALIGNED,
+ 	.arg4_size	= sizeof(u64),
+ };
+ 
+@@ -1607,7 +1607,7 @@ static const struct bpf_func_proto bpf_dynptr_from_mem_proto = {
+ 	.arg1_type	= ARG_PTR_TO_UNINIT_MEM,
+ 	.arg2_type	= ARG_CONST_SIZE_OR_ZERO,
+ 	.arg3_type	= ARG_ANYTHING,
+-	.arg4_type	= ARG_PTR_TO_DYNPTR | DYNPTR_TYPE_LOCAL | MEM_UNINIT,
++	.arg4_type	= ARG_PTR_TO_DYNPTR | DYNPTR_TYPE_LOCAL | MEM_UNINIT | MEM_WRITE,
+ };
+ 
+ BPF_CALL_5(bpf_dynptr_read, void *, dst, u32, len, const struct bpf_dynptr_kern *, src,
+diff --git a/kernel/bpf/ringbuf.c b/kernel/bpf/ringbuf.c
+index 238d9b206bbdec..246559c3e93d0d 100644
+--- a/kernel/bpf/ringbuf.c
++++ b/kernel/bpf/ringbuf.c
+@@ -632,7 +632,7 @@ const struct bpf_func_proto bpf_ringbuf_reserve_dynptr_proto = {
+ 	.arg1_type	= ARG_CONST_MAP_PTR,
+ 	.arg2_type	= ARG_ANYTHING,
+ 	.arg3_type	= ARG_ANYTHING,
+-	.arg4_type	= ARG_PTR_TO_DYNPTR | DYNPTR_TYPE_RINGBUF | MEM_UNINIT,
++	.arg4_type	= ARG_PTR_TO_DYNPTR | DYNPTR_TYPE_RINGBUF | MEM_UNINIT | MEM_WRITE,
+ };
+ 
+ BPF_CALL_2(bpf_ringbuf_submit_dynptr, struct bpf_dynptr_kern *, ptr, u64, flags)
+diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
+index b1933d074f0519..8a1cadc1ff9dd9 100644
+--- a/kernel/bpf/syscall.c
++++ b/kernel/bpf/syscall.c
+@@ -3442,26 +3442,34 @@ static void bpf_perf_link_dealloc(struct bpf_link *link)
+ }
+ 
+ static int bpf_perf_link_fill_common(const struct perf_event *event,
+-				     char __user *uname, u32 ulen,
++				     char __user *uname, u32 *ulenp,
+ 				     u64 *probe_offset, u64 *probe_addr,
+-				     u32 *fd_type)
++				     u32 *fd_type, unsigned long *missed)
+ {
+ 	const char *buf;
+-	u32 prog_id;
++	u32 prog_id, ulen;
+ 	size_t len;
+ 	int err;
+ 
++	ulen = *ulenp;
+ 	if (!ulen ^ !uname)
+ 		return -EINVAL;
+ 
+ 	err = bpf_get_perf_event_info(event, &prog_id, fd_type, &buf,
+-				      probe_offset, probe_addr);
++				      probe_offset, probe_addr, missed);
+ 	if (err)
+ 		return err;
++
++	if (buf) {
++		len = strlen(buf);
++		*ulenp = len + 1;
++	} else {
++		*ulenp = 1;
++	}
+ 	if (!uname)
+ 		return 0;
++
+ 	if (buf) {
+-		len = strlen(buf);
+ 		err = bpf_copy_to_user(uname, buf, ulen, len);
+ 		if (err)
+ 			return err;
+@@ -3478,6 +3486,7 @@ static int bpf_perf_link_fill_common(const struct perf_event *event,
+ static int bpf_perf_link_fill_kprobe(const struct perf_event *event,
+ 				     struct bpf_link_info *info)
+ {
++	unsigned long missed;
+ 	char __user *uname;
+ 	u64 addr, offset;
+ 	u32 ulen, type;
+@@ -3485,19 +3494,21 @@ static int bpf_perf_link_fill_kprobe(const struct perf_event *event,
+ 
+ 	uname = u64_to_user_ptr(info->perf_event.kprobe.func_name);
+ 	ulen = info->perf_event.kprobe.name_len;
+-	err = bpf_perf_link_fill_common(event, uname, ulen, &offset, &addr,
+-					&type);
++	err = bpf_perf_link_fill_common(event, uname, &ulen, &offset, &addr,
++					&type, &missed);
+ 	if (err)
+ 		return err;
+ 	if (type == BPF_FD_TYPE_KRETPROBE)
+ 		info->perf_event.type = BPF_PERF_EVENT_KRETPROBE;
+ 	else
+ 		info->perf_event.type = BPF_PERF_EVENT_KPROBE;
+-
++	info->perf_event.kprobe.name_len = ulen;
+ 	info->perf_event.kprobe.offset = offset;
++	info->perf_event.kprobe.missed = missed;
+ 	if (!kallsyms_show_value(current_cred()))
+ 		addr = 0;
+ 	info->perf_event.kprobe.addr = addr;
++	info->perf_event.kprobe.cookie = event->bpf_cookie;
+ 	return 0;
+ }
+ #endif
+@@ -3513,8 +3524,8 @@ static int bpf_perf_link_fill_uprobe(const struct perf_event *event,
+ 
+ 	uname = u64_to_user_ptr(info->perf_event.uprobe.file_name);
+ 	ulen = info->perf_event.uprobe.name_len;
+-	err = bpf_perf_link_fill_common(event, uname, ulen, &offset, &addr,
+-					&type);
++	err = bpf_perf_link_fill_common(event, uname, &ulen, &offset, &addr,
++					&type, NULL);
+ 	if (err)
+ 		return err;
+ 
+@@ -3522,7 +3533,9 @@ static int bpf_perf_link_fill_uprobe(const struct perf_event *event,
+ 		info->perf_event.type = BPF_PERF_EVENT_URETPROBE;
+ 	else
+ 		info->perf_event.type = BPF_PERF_EVENT_UPROBE;
++	info->perf_event.uprobe.name_len = ulen;
+ 	info->perf_event.uprobe.offset = offset;
++	info->perf_event.uprobe.cookie = event->bpf_cookie;
+ 	return 0;
+ }
+ #endif
+@@ -3546,11 +3559,18 @@ static int bpf_perf_link_fill_tracepoint(const struct perf_event *event,
+ {
+ 	char __user *uname;
+ 	u32 ulen;
++	int err;
+ 
+ 	uname = u64_to_user_ptr(info->perf_event.tracepoint.tp_name);
+ 	ulen = info->perf_event.tracepoint.name_len;
++	err = bpf_perf_link_fill_common(event, uname, &ulen, NULL, NULL, NULL, NULL);
++	if (err)
++		return err;
++
+ 	info->perf_event.type = BPF_PERF_EVENT_TRACEPOINT;
+-	return bpf_perf_link_fill_common(event, uname, ulen, NULL, NULL, NULL);
++	info->perf_event.tracepoint.name_len = ulen;
++	info->perf_event.tracepoint.cookie = event->bpf_cookie;
++	return 0;
+ }
+ 
+ static int bpf_perf_link_fill_perf_event(const struct perf_event *event,
+@@ -3558,6 +3578,7 @@ static int bpf_perf_link_fill_perf_event(const struct perf_event *event,
+ {
+ 	info->perf_event.event.type = event->attr.type;
+ 	info->perf_event.event.config = event->attr.config;
++	info->perf_event.event.cookie = event->bpf_cookie;
+ 	info->perf_event.type = BPF_PERF_EVENT_EVENT;
+ 	return 0;
+ }
+@@ -4897,7 +4918,7 @@ static int bpf_task_fd_query(const union bpf_attr *attr,
+ 
+ 		err = bpf_get_perf_event_info(event, &prog_id, &fd_type,
+ 					      &buf, &probe_offset,
+-					      &probe_addr);
++					      &probe_addr, NULL);
+ 		if (!err)
+ 			err = bpf_task_fd_query_copy(attr, uattr, prog_id,
+ 						     fd_type, buf,
+@@ -5668,7 +5689,7 @@ static const struct bpf_func_proto bpf_kallsyms_lookup_name_proto = {
+ 	.arg1_type	= ARG_PTR_TO_MEM,
+ 	.arg2_type	= ARG_CONST_SIZE_OR_ZERO,
+ 	.arg3_type	= ARG_ANYTHING,
+-	.arg4_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_ALIGNED,
++	.arg4_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_WRITE | MEM_ALIGNED,
+ 	.arg4_size	= sizeof(u64),
+ };
+ 
+diff --git a/kernel/bpf/task_iter.c b/kernel/bpf/task_iter.c
+index c4ab9d6cdbe9c8..f7ef58090c7d0b 100644
+--- a/kernel/bpf/task_iter.c
++++ b/kernel/bpf/task_iter.c
+@@ -119,7 +119,7 @@ static struct task_struct *task_seq_get_next(struct bpf_iter_seq_task_common *co
+ 		rcu_read_lock();
+ 		pid = find_pid_ns(common->pid, common->ns);
+ 		if (pid) {
+-			task = get_pid_task(pid, PIDTYPE_TGID);
++			task = get_pid_task(pid, PIDTYPE_PID);
+ 			*tid = common->pid;
+ 		}
+ 		rcu_read_unlock();
+diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
+index 3032a464d31bbf..03b5797b8fca9e 100644
+--- a/kernel/bpf/verifier.c
++++ b/kernel/bpf/verifier.c
+@@ -2799,10 +2799,16 @@ static struct btf *__find_kfunc_desc_btf(struct bpf_verifier_env *env,
+ 		b->module = mod;
+ 		b->offset = offset;
+ 
++		/* sort() reorders entries by value, so b may no longer point
++		 * to the right entry after this
++		 */
+ 		sort(tab->descs, tab->nr_descs, sizeof(tab->descs[0]),
+ 		     kfunc_btf_cmp_by_off, NULL);
++	} else {
++		btf = b->btf;
+ 	}
+-	return b->btf;
++
++	return btf;
+ }
+ 
+ void bpf_free_kfunc_btf_tab(struct bpf_kfunc_btf_tab *tab)
+@@ -6137,10 +6143,10 @@ static void coerce_reg_to_size_sx(struct bpf_reg_state *reg, int size)
+ 
+ 	/* both of s64_max/s64_min positive or negative */
+ 	if ((s64_max >= 0) == (s64_min >= 0)) {
+-		reg->smin_value = reg->s32_min_value = s64_min;
+-		reg->smax_value = reg->s32_max_value = s64_max;
+-		reg->umin_value = reg->u32_min_value = s64_min;
+-		reg->umax_value = reg->u32_max_value = s64_max;
++		reg->s32_min_value = reg->smin_value = s64_min;
++		reg->s32_max_value = reg->smax_value = s64_max;
++		reg->u32_min_value = reg->umin_value = s64_min;
++		reg->u32_max_value = reg->umax_value = s64_max;
+ 		reg->var_off = tnum_range(s64_min, s64_max);
+ 		return;
+ 	}
+@@ -7192,7 +7198,8 @@ static int check_stack_range_initialized(
+ }
+ 
+ static int check_helper_mem_access(struct bpf_verifier_env *env, int regno,
+-				   int access_size, bool zero_size_allowed,
++				   int access_size, enum bpf_access_type access_type,
++				   bool zero_size_allowed,
+ 				   struct bpf_call_arg_meta *meta)
+ {
+ 	struct bpf_reg_state *regs = cur_regs(env), *reg = &regs[regno];
+@@ -7204,7 +7211,7 @@ static int check_helper_mem_access(struct bpf_verifier_env *env, int regno,
+ 		return check_packet_access(env, regno, reg->off, access_size,
+ 					   zero_size_allowed);
+ 	case PTR_TO_MAP_KEY:
+-		if (meta && meta->raw_mode) {
++		if (access_type == BPF_WRITE) {
+ 			verbose(env, "R%d cannot write into %s\n", regno,
+ 				reg_type_str(env, reg->type));
+ 			return -EACCES;
+@@ -7212,15 +7219,13 @@ static int check_helper_mem_access(struct bpf_verifier_env *env, int regno,
+ 		return check_mem_region_access(env, regno, reg->off, access_size,
+ 					       reg->map_ptr->key_size, false);
+ 	case PTR_TO_MAP_VALUE:
+-		if (check_map_access_type(env, regno, reg->off, access_size,
+-					  meta && meta->raw_mode ? BPF_WRITE :
+-					  BPF_READ))
++		if (check_map_access_type(env, regno, reg->off, access_size, access_type))
+ 			return -EACCES;
+ 		return check_map_access(env, regno, reg->off, access_size,
+ 					zero_size_allowed, ACCESS_HELPER);
+ 	case PTR_TO_MEM:
+ 		if (type_is_rdonly_mem(reg->type)) {
+-			if (meta && meta->raw_mode) {
++			if (access_type == BPF_WRITE) {
+ 				verbose(env, "R%d cannot write into %s\n", regno,
+ 					reg_type_str(env, reg->type));
+ 				return -EACCES;
+@@ -7231,7 +7236,7 @@ static int check_helper_mem_access(struct bpf_verifier_env *env, int regno,
+ 					       zero_size_allowed);
+ 	case PTR_TO_BUF:
+ 		if (type_is_rdonly_mem(reg->type)) {
+-			if (meta && meta->raw_mode) {
++			if (access_type == BPF_WRITE) {
+ 				verbose(env, "R%d cannot write into %s\n", regno,
+ 					reg_type_str(env, reg->type));
+ 				return -EACCES;
+@@ -7259,7 +7264,6 @@ static int check_helper_mem_access(struct bpf_verifier_env *env, int regno,
+ 		 * Dynamically check it now.
+ 		 */
+ 		if (!env->ops->convert_ctx_access) {
+-			enum bpf_access_type atype = meta && meta->raw_mode ? BPF_WRITE : BPF_READ;
+ 			int offset = access_size - 1;
+ 
+ 			/* Allow zero-byte read from PTR_TO_CTX */
+@@ -7267,7 +7271,7 @@ static int check_helper_mem_access(struct bpf_verifier_env *env, int regno,
+ 				return zero_size_allowed ? 0 : -EACCES;
+ 
+ 			return check_mem_access(env, env->insn_idx, regno, offset, BPF_B,
+-						atype, -1, false, false);
++						access_type, -1, false, false);
+ 		}
+ 
+ 		fallthrough;
+@@ -7286,6 +7290,7 @@ static int check_helper_mem_access(struct bpf_verifier_env *env, int regno,
+ 
+ static int check_mem_size_reg(struct bpf_verifier_env *env,
+ 			      struct bpf_reg_state *reg, u32 regno,
++			      enum bpf_access_type access_type,
+ 			      bool zero_size_allowed,
+ 			      struct bpf_call_arg_meta *meta)
+ {
+@@ -7301,15 +7306,12 @@ static int check_mem_size_reg(struct bpf_verifier_env *env,
+ 	 */
+ 	meta->msize_max_value = reg->umax_value;
+ 
+-	/* The register is SCALAR_VALUE; the access check
+-	 * happens using its boundaries.
++	/* The register is SCALAR_VALUE; the access check happens using
++	 * its boundaries. For unprivileged variable accesses, disable
++	 * raw mode so that the program is required to initialize all
++	 * the memory that the helper could just partially fill up.
+ 	 */
+ 	if (!tnum_is_const(reg->var_off))
+-		/* For unprivileged variable accesses, disable raw
+-		 * mode so that the program is required to
+-		 * initialize all the memory that the helper could
+-		 * just partially fill up.
+-		 */
+ 		meta = NULL;
+ 
+ 	if (reg->smin_value < 0) {
+@@ -7318,12 +7320,10 @@ static int check_mem_size_reg(struct bpf_verifier_env *env,
+ 		return -EACCES;
+ 	}
+ 
+-	if (reg->umin_value == 0) {
+-		err = check_helper_mem_access(env, regno - 1, 0,
+-					      zero_size_allowed,
+-					      meta);
+-		if (err)
+-			return err;
++	if (reg->umin_value == 0 && !zero_size_allowed) {
++		verbose(env, "R%d invalid zero-sized read: u64=[%lld,%lld]\n",
++			regno, reg->umin_value, reg->umax_value);
++		return -EACCES;
+ 	}
+ 
+ 	if (reg->umax_value >= BPF_MAX_VAR_SIZ) {
+@@ -7331,9 +7331,8 @@ static int check_mem_size_reg(struct bpf_verifier_env *env,
+ 			regno);
+ 		return -EACCES;
+ 	}
+-	err = check_helper_mem_access(env, regno - 1,
+-				      reg->umax_value,
+-				      zero_size_allowed, meta);
++	err = check_helper_mem_access(env, regno - 1, reg->umax_value,
++				      access_type, zero_size_allowed, meta);
+ 	if (!err)
+ 		err = mark_chain_precision(env, regno);
+ 	return err;
+@@ -7344,13 +7343,11 @@ int check_mem_reg(struct bpf_verifier_env *env, struct bpf_reg_state *reg,
+ {
+ 	bool may_be_null = type_may_be_null(reg->type);
+ 	struct bpf_reg_state saved_reg;
+-	struct bpf_call_arg_meta meta;
+ 	int err;
+ 
+ 	if (register_is_null(reg))
+ 		return 0;
+ 
+-	memset(&meta, 0, sizeof(meta));
+ 	/* Assuming that the register contains a value check if the memory
+ 	 * access is safe. Temporarily save and restore the register's state as
+ 	 * the conversion shouldn't be visible to a caller.
+@@ -7360,10 +7357,8 @@ int check_mem_reg(struct bpf_verifier_env *env, struct bpf_reg_state *reg,
+ 		mark_ptr_not_null_reg(reg);
+ 	}
+ 
+-	err = check_helper_mem_access(env, regno, mem_size, true, &meta);
+-	/* Check access for BPF_WRITE */
+-	meta.raw_mode = true;
+-	err = err ?: check_helper_mem_access(env, regno, mem_size, true, &meta);
++	err = check_helper_mem_access(env, regno, mem_size, BPF_READ, true, NULL);
++	err = err ?: check_helper_mem_access(env, regno, mem_size, BPF_WRITE, true, NULL);
+ 
+ 	if (may_be_null)
+ 		*reg = saved_reg;
+@@ -7389,13 +7384,12 @@ static int check_kfunc_mem_size_reg(struct bpf_verifier_env *env, struct bpf_reg
+ 		mark_ptr_not_null_reg(mem_reg);
+ 	}
+ 
+-	err = check_mem_size_reg(env, reg, regno, true, &meta);
+-	/* Check access for BPF_WRITE */
+-	meta.raw_mode = true;
+-	err = err ?: check_mem_size_reg(env, reg, regno, true, &meta);
++	err = check_mem_size_reg(env, reg, regno, BPF_READ, true, &meta);
++	err = err ?: check_mem_size_reg(env, reg, regno, BPF_WRITE, true, &meta);
+ 
+ 	if (may_be_null)
+ 		*mem_reg = saved_reg;
++
+ 	return err;
+ }
+ 
+@@ -8581,9 +8575,8 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 arg,
+ 			verbose(env, "invalid map_ptr to access map->key\n");
+ 			return -EACCES;
+ 		}
+-		err = check_helper_mem_access(env, regno,
+-					      meta->map_ptr->key_size, false,
+-					      NULL);
++		err = check_helper_mem_access(env, regno, meta->map_ptr->key_size,
++					      BPF_READ, false, NULL);
+ 		break;
+ 	case ARG_PTR_TO_MAP_VALUE:
+ 		if (type_may_be_null(arg_type) && register_is_null(reg))
+@@ -8598,9 +8591,9 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 arg,
+ 			return -EACCES;
+ 		}
+ 		meta->raw_mode = arg_type & MEM_UNINIT;
+-		err = check_helper_mem_access(env, regno,
+-					      meta->map_ptr->value_size, false,
+-					      meta);
++		err = check_helper_mem_access(env, regno, meta->map_ptr->value_size,
++					      arg_type & MEM_WRITE ? BPF_WRITE : BPF_READ,
++					      false, meta);
+ 		break;
+ 	case ARG_PTR_TO_PERCPU_BTF_ID:
+ 		if (!reg->btf_id) {
+@@ -8642,7 +8635,9 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 arg,
+ 		 */
+ 		meta->raw_mode = arg_type & MEM_UNINIT;
+ 		if (arg_type & MEM_FIXED_SIZE) {
+-			err = check_helper_mem_access(env, regno, fn->arg_size[arg], false, meta);
++			err = check_helper_mem_access(env, regno, fn->arg_size[arg],
++						      arg_type & MEM_WRITE ? BPF_WRITE : BPF_READ,
++						      false, meta);
+ 			if (err)
+ 				return err;
+ 			if (arg_type & MEM_ALIGNED)
+@@ -8650,10 +8645,16 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 arg,
+ 		}
+ 		break;
+ 	case ARG_CONST_SIZE:
+-		err = check_mem_size_reg(env, reg, regno, false, meta);
++		err = check_mem_size_reg(env, reg, regno,
++					 fn->arg_type[arg - 1] & MEM_WRITE ?
++					 BPF_WRITE : BPF_READ,
++					 false, meta);
+ 		break;
+ 	case ARG_CONST_SIZE_OR_ZERO:
+-		err = check_mem_size_reg(env, reg, regno, true, meta);
++		err = check_mem_size_reg(env, reg, regno,
++					 fn->arg_type[arg - 1] & MEM_WRITE ?
++					 BPF_WRITE : BPF_READ,
++					 true, meta);
+ 		break;
+ 	case ARG_PTR_TO_DYNPTR:
+ 		err = process_dynptr_func(env, regno, insn_idx, arg_type, 0);
+diff --git a/kernel/sched/core.c b/kernel/sched/core.c
+index 9b406d9886541b..b6f922a20f83a5 100644
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -12050,7 +12050,9 @@ void task_tick_mm_cid(struct rq *rq, struct task_struct *curr)
+ 		return;
+ 	if (time_before(now, READ_ONCE(curr->mm->mm_cid_next_scan)))
+ 		return;
+-	task_work_add(curr, work, TWA_RESUME);
++
++	/* No page allocation under rq lock */
++	task_work_add(curr, work, TWA_RESUME | TWAF_NO_ALLOC);
+ }
+ 
+ void sched_mm_cid_exit_signals(struct task_struct *t)
+diff --git a/kernel/task_work.c b/kernel/task_work.c
+index 2134ac8057a94e..c969f1f26be58a 100644
+--- a/kernel/task_work.c
++++ b/kernel/task_work.c
+@@ -1,10 +1,20 @@
+ // SPDX-License-Identifier: GPL-2.0
++#include <linux/irq_work.h>
+ #include <linux/spinlock.h>
+ #include <linux/task_work.h>
+ #include <linux/resume_user_mode.h>
+ 
+ static struct callback_head work_exited; /* all we need is ->next == NULL */
+ 
++#ifdef CONFIG_IRQ_WORK
++static void task_work_set_notify_irq(struct irq_work *entry)
++{
++	test_and_set_tsk_thread_flag(current, TIF_NOTIFY_RESUME);
++}
++static DEFINE_PER_CPU(struct irq_work, irq_work_NMI_resume) =
++	IRQ_WORK_INIT_HARD(task_work_set_notify_irq);
++#endif
++
+ /**
+  * task_work_add - ask the @task to execute @work->func()
+  * @task: the task which should run the callback
+@@ -12,7 +22,7 @@ static struct callback_head work_exited; /* all we need is ->next == NULL */
+  * @notify: how to notify the targeted task
+  *
+  * Queue @work for task_work_run() below and notify the @task if @notify
+- * is @TWA_RESUME, @TWA_SIGNAL, or @TWA_SIGNAL_NO_IPI.
++ * is @TWA_RESUME, @TWA_SIGNAL, @TWA_SIGNAL_NO_IPI or @TWA_NMI_CURRENT.
+  *
+  * @TWA_SIGNAL works like signals, in that the it will interrupt the targeted
+  * task and run the task_work, regardless of whether the task is currently
+@@ -24,6 +34,8 @@ static struct callback_head work_exited; /* all we need is ->next == NULL */
+  * kernel anyway.
+  * @TWA_RESUME work is run only when the task exits the kernel and returns to
+  * user mode, or before entering guest mode.
++ * @TWA_NMI_CURRENT works like @TWA_RESUME, except it can only be used for the
++ * current @task and if the current context is NMI.
+  *
+  * Fails if the @task is exiting/exited and thus it can't process this @work.
+  * Otherwise @work->func() will be called when the @task goes through one of
+@@ -43,9 +55,27 @@ int task_work_add(struct task_struct *task, struct callback_head *work,
+ 		  enum task_work_notify_mode notify)
+ {
+ 	struct callback_head *head;
+-
+-	/* record the work call stack in order to print it in KASAN reports */
+-	kasan_record_aux_stack(work);
++	int flags = notify & TWA_FLAGS;
++
++	notify &= ~TWA_FLAGS;
++	if (notify == TWA_NMI_CURRENT) {
++		if (WARN_ON_ONCE(task != current))
++			return -EINVAL;
++		if (!IS_ENABLED(CONFIG_IRQ_WORK))
++			return -EINVAL;
++	} else {
++		/*
++		 * Record the work call stack in order to print it in KASAN
++		 * reports.
++		 *
++		 * Note that stack allocation can fail if TWAF_NO_ALLOC flag
++		 * is set and new page is needed to expand the stack buffer.
++		 */
++		if (flags & TWAF_NO_ALLOC)
++			kasan_record_aux_stack_noalloc(work);
++		else
++			kasan_record_aux_stack(work);
++	}
+ 
+ 	head = READ_ONCE(task->task_works);
+ 	do {
+@@ -66,6 +96,11 @@ int task_work_add(struct task_struct *task, struct callback_head *work,
+ 	case TWA_SIGNAL_NO_IPI:
+ 		__set_notify_signal(task);
+ 		break;
++#ifdef CONFIG_IRQ_WORK
++	case TWA_NMI_CURRENT:
++		irq_work_queue(this_cpu_ptr(&irq_work_NMI_resume));
++		break;
++#endif
+ 	default:
+ 		WARN_ON_ONCE(1);
+ 		break;
+diff --git a/kernel/time/posix-clock.c b/kernel/time/posix-clock.c
+index 8127673bfc45e6..05e73d209aa87e 100644
+--- a/kernel/time/posix-clock.c
++++ b/kernel/time/posix-clock.c
+@@ -290,6 +290,9 @@ static int pc_clock_settime(clockid_t id, const struct timespec64 *ts)
+ 	struct posix_clock_desc cd;
+ 	int err;
+ 
++	if (!timespec64_valid_strict(ts))
++		return -EINVAL;
++
+ 	err = get_clock_desc(id, &cd);
+ 	if (err)
+ 		return err;
+@@ -299,9 +302,6 @@ static int pc_clock_settime(clockid_t id, const struct timespec64 *ts)
+ 		goto out;
+ 	}
+ 
+-	if (!timespec64_valid_strict(ts))
+-		return -EINVAL;
+-
+ 	if (cd.clk->ops.clock_settime)
+ 		err = cd.clk->ops.clock_settime(cd.clk, ts);
+ 	else
+diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
+index eca858bde80470..9064f75de7e468 100644
+--- a/kernel/trace/bpf_trace.c
++++ b/kernel/trace/bpf_trace.c
+@@ -1220,7 +1220,7 @@ static const struct bpf_func_proto bpf_get_func_arg_proto = {
+ 	.ret_type	= RET_INTEGER,
+ 	.arg1_type	= ARG_PTR_TO_CTX,
+ 	.arg2_type	= ARG_ANYTHING,
+-	.arg3_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_ALIGNED,
++	.arg3_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_WRITE | MEM_ALIGNED,
+ 	.arg3_size	= sizeof(u64),
+ };
+ 
+@@ -1237,7 +1237,7 @@ static const struct bpf_func_proto bpf_get_func_ret_proto = {
+ 	.func		= get_func_ret,
+ 	.ret_type	= RET_INTEGER,
+ 	.arg1_type	= ARG_PTR_TO_CTX,
+-	.arg2_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_ALIGNED,
++	.arg2_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_WRITE | MEM_ALIGNED,
+ 	.arg2_size	= sizeof(u64),
+ };
+ 
+@@ -2217,8 +2217,6 @@ void perf_event_detach_bpf_prog(struct perf_event *event)
+ 
+ 	old_array = bpf_event_rcu_dereference(event->tp_event->prog_array);
+ 	ret = bpf_prog_array_copy(old_array, event->prog, NULL, 0, &new_array);
+-	if (ret == -ENOENT)
+-		goto unlock;
+ 	if (ret < 0) {
+ 		bpf_prog_array_delete_safe(old_array, event->prog);
+ 	} else {
+@@ -2389,7 +2387,8 @@ int bpf_probe_unregister(struct bpf_raw_event_map *btp, struct bpf_prog *prog)
+ 
+ int bpf_get_perf_event_info(const struct perf_event *event, u32 *prog_id,
+ 			    u32 *fd_type, const char **buf,
+-			    u64 *probe_offset, u64 *probe_addr)
++			    u64 *probe_offset, u64 *probe_addr,
++			    unsigned long *missed)
+ {
+ 	bool is_tracepoint, is_syscall_tp;
+ 	struct bpf_prog *prog;
+@@ -2424,7 +2423,7 @@ int bpf_get_perf_event_info(const struct perf_event *event, u32 *prog_id,
+ #ifdef CONFIG_KPROBE_EVENTS
+ 		if (flags & TRACE_EVENT_FL_KPROBE)
+ 			err = bpf_get_kprobe_info(event, fd_type, buf,
+-						  probe_offset, probe_addr,
++						  probe_offset, probe_addr, missed,
+ 						  event->attr.type == PERF_TYPE_TRACEPOINT);
+ #endif
+ #ifdef CONFIG_UPROBE_EVENTS
+diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
+index 4f93d57cc02990..ecd869ed27670c 100644
+--- a/kernel/trace/trace.c
++++ b/kernel/trace/trace.c
+@@ -5757,6 +5757,7 @@ static const char readme_msg[] =
+ 	"\t           $stack<index>, $stack, $retval, $comm,\n"
+ #endif
+ 	"\t           +|-[u]<offset>(<fetcharg>), \\imm-value, \\\"imm-string\"\n"
++	"\t     kernel return probes support: $retval, $arg<N>, $comm\n"
+ 	"\t     type: s8/16/32/64, u8/16/32/64, x8/16/32/64, char, string, symbol,\n"
+ 	"\t           b<bit-width>@<bit-offset>/<container-size>, ustring,\n"
+ 	"\t           symstr, <type>\\[<array-size>\\]\n"
+diff --git a/kernel/trace/trace_eprobe.c b/kernel/trace/trace_eprobe.c
+index 72714cbf475c78..31bb977670bdfb 100644
+--- a/kernel/trace/trace_eprobe.c
++++ b/kernel/trace/trace_eprobe.c
+@@ -220,7 +220,7 @@ static struct trace_eprobe *alloc_event_probe(const char *group,
+ 	if (!ep->event_system)
+ 		goto error;
+ 
+-	ret = trace_probe_init(&ep->tp, this_event, group, false);
++	ret = trace_probe_init(&ep->tp, this_event, group, false, nargs);
+ 	if (ret < 0)
+ 		goto error;
+ 
+@@ -390,8 +390,8 @@ static int get_eprobe_size(struct trace_probe *tp, void *rec)
+ 
+ /* Note that we don't verify it, since the code does not come from user space */
+ static int
+-process_fetch_insn(struct fetch_insn *code, void *rec, void *dest,
+-		   void *base)
++process_fetch_insn(struct fetch_insn *code, void *rec, void *edata,
++		   void *dest, void *base)
+ {
+ 	unsigned long val;
+ 	int ret;
+@@ -438,7 +438,7 @@ __eprobe_trace_func(struct eprobe_data *edata, void *rec)
+ 		return;
+ 
+ 	entry = fbuffer.entry = ring_buffer_event_data(fbuffer.event);
+-	store_trace_args(&entry[1], &edata->ep->tp, rec, sizeof(*entry), dsize);
++	store_trace_args(&entry[1], &edata->ep->tp, rec, NULL, sizeof(*entry), dsize);
+ 
+ 	trace_event_buffer_commit(&fbuffer);
+ }
+@@ -915,6 +915,11 @@ static int __trace_eprobe_create(int argc, const char *argv[])
+ 		}
+ 	}
+ 
++	if (argc - 2 > MAX_TRACE_ARGS) {
++		ret = -E2BIG;
++		goto error;
++	}
++
+ 	mutex_lock(&event_mutex);
+ 	event_call = find_and_get_event(sys_name, sys_event);
+ 	ep = alloc_event_probe(group, event, event_call, argc - 2);
+@@ -940,7 +945,7 @@ static int __trace_eprobe_create(int argc, const char *argv[])
+ 
+ 	argc -= 2; argv += 2;
+ 	/* parse arguments */
+-	for (i = 0; i < argc && i < MAX_TRACE_ARGS; i++) {
++	for (i = 0; i < argc; i++) {
+ 		trace_probe_log_set_index(i + 2);
+ 		ret = trace_eprobe_tp_update_arg(ep, argv, i);
+ 		if (ret)
+diff --git a/kernel/trace/trace_fprobe.c b/kernel/trace/trace_fprobe.c
+index 7d2ddbcfa377cf..f26bb8a90cb541 100644
+--- a/kernel/trace/trace_fprobe.c
++++ b/kernel/trace/trace_fprobe.c
+@@ -4,6 +4,7 @@
+  * Copyright (C) 2022 Google LLC.
+  */
+ #define pr_fmt(fmt)	"trace_fprobe: " fmt
++#include <asm/ptrace.h>
+ 
+ #include <linux/fprobe.h>
+ #include <linux/module.h>
+@@ -129,8 +130,8 @@ static bool trace_fprobe_is_registered(struct trace_fprobe *tf)
+  * from user space.
+  */
+ static int
+-process_fetch_insn(struct fetch_insn *code, void *rec, void *dest,
+-		   void *base)
++process_fetch_insn(struct fetch_insn *code, void *rec, void *edata,
++		   void *dest, void *base)
+ {
+ 	struct pt_regs *regs = rec;
+ 	unsigned long val;
+@@ -152,6 +153,9 @@ process_fetch_insn(struct fetch_insn *code, void *rec, void *dest,
+ 	case FETCH_OP_ARG:
+ 		val = regs_get_kernel_argument(regs, code->param);
+ 		break;
++	case FETCH_OP_EDATA:
++		val = *(unsigned long *)((unsigned long)edata + code->offset);
++		break;
+ #endif
+ 	case FETCH_NOP_SYMBOL:	/* Ignore a place holder */
+ 		code++;
+@@ -184,7 +188,7 @@ __fentry_trace_func(struct trace_fprobe *tf, unsigned long entry_ip,
+ 	if (trace_trigger_soft_disabled(trace_file))
+ 		return;
+ 
+-	dsize = __get_data_size(&tf->tp, regs);
++	dsize = __get_data_size(&tf->tp, regs, NULL);
+ 
+ 	entry = trace_event_buffer_reserve(&fbuffer, trace_file,
+ 					   sizeof(*entry) + tf->tp.size + dsize);
+@@ -194,7 +198,7 @@ __fentry_trace_func(struct trace_fprobe *tf, unsigned long entry_ip,
+ 	fbuffer.regs = regs;
+ 	entry = fbuffer.entry = ring_buffer_event_data(fbuffer.event);
+ 	entry->ip = entry_ip;
+-	store_trace_args(&entry[1], &tf->tp, regs, sizeof(*entry), dsize);
++	store_trace_args(&entry[1], &tf->tp, regs, NULL, sizeof(*entry), dsize);
+ 
+ 	trace_event_buffer_commit(&fbuffer);
+ }
+@@ -210,11 +214,24 @@ fentry_trace_func(struct trace_fprobe *tf, unsigned long entry_ip,
+ }
+ NOKPROBE_SYMBOL(fentry_trace_func);
+ 
+-/* Kretprobe handler */
++/* function exit handler */
++static int trace_fprobe_entry_handler(struct fprobe *fp, unsigned long entry_ip,
++				unsigned long ret_ip, struct pt_regs *regs,
++				void *entry_data)
++{
++	struct trace_fprobe *tf = container_of(fp, struct trace_fprobe, fp);
++
++	if (tf->tp.entry_arg)
++		store_trace_entry_data(entry_data, &tf->tp, regs);
++
++	return 0;
++}
++NOKPROBE_SYMBOL(trace_fprobe_entry_handler)
++
+ static nokprobe_inline void
+ __fexit_trace_func(struct trace_fprobe *tf, unsigned long entry_ip,
+ 		   unsigned long ret_ip, struct pt_regs *regs,
+-		   struct trace_event_file *trace_file)
++		   void *entry_data, struct trace_event_file *trace_file)
+ {
+ 	struct fexit_trace_entry_head *entry;
+ 	struct trace_event_buffer fbuffer;
+@@ -227,7 +244,7 @@ __fexit_trace_func(struct trace_fprobe *tf, unsigned long entry_ip,
+ 	if (trace_trigger_soft_disabled(trace_file))
+ 		return;
+ 
+-	dsize = __get_data_size(&tf->tp, regs);
++	dsize = __get_data_size(&tf->tp, regs, entry_data);
+ 
+ 	entry = trace_event_buffer_reserve(&fbuffer, trace_file,
+ 					   sizeof(*entry) + tf->tp.size + dsize);
+@@ -238,19 +255,19 @@ __fexit_trace_func(struct trace_fprobe *tf, unsigned long entry_ip,
+ 	entry = fbuffer.entry = ring_buffer_event_data(fbuffer.event);
+ 	entry->func = entry_ip;
+ 	entry->ret_ip = ret_ip;
+-	store_trace_args(&entry[1], &tf->tp, regs, sizeof(*entry), dsize);
++	store_trace_args(&entry[1], &tf->tp, regs, entry_data, sizeof(*entry), dsize);
+ 
+ 	trace_event_buffer_commit(&fbuffer);
+ }
+ 
+ static void
+ fexit_trace_func(struct trace_fprobe *tf, unsigned long entry_ip,
+-		 unsigned long ret_ip, struct pt_regs *regs)
++		 unsigned long ret_ip, struct pt_regs *regs, void *entry_data)
+ {
+ 	struct event_file_link *link;
+ 
+ 	trace_probe_for_each_link_rcu(link, &tf->tp)
+-		__fexit_trace_func(tf, entry_ip, ret_ip, regs, link->file);
++		__fexit_trace_func(tf, entry_ip, ret_ip, regs, entry_data, link->file);
+ }
+ NOKPROBE_SYMBOL(fexit_trace_func);
+ 
+@@ -269,7 +286,7 @@ static int fentry_perf_func(struct trace_fprobe *tf, unsigned long entry_ip,
+ 	if (hlist_empty(head))
+ 		return 0;
+ 
+-	dsize = __get_data_size(&tf->tp, regs);
++	dsize = __get_data_size(&tf->tp, regs, NULL);
+ 	__size = sizeof(*entry) + tf->tp.size + dsize;
+ 	size = ALIGN(__size + sizeof(u32), sizeof(u64));
+ 	size -= sizeof(u32);
+@@ -280,7 +297,7 @@ static int fentry_perf_func(struct trace_fprobe *tf, unsigned long entry_ip,
+ 
+ 	entry->ip = entry_ip;
+ 	memset(&entry[1], 0, dsize);
+-	store_trace_args(&entry[1], &tf->tp, regs, sizeof(*entry), dsize);
++	store_trace_args(&entry[1], &tf->tp, regs, NULL, sizeof(*entry), dsize);
+ 	perf_trace_buf_submit(entry, size, rctx, call->event.type, 1, regs,
+ 			      head, NULL);
+ 	return 0;
+@@ -289,7 +306,8 @@ NOKPROBE_SYMBOL(fentry_perf_func);
+ 
+ static void
+ fexit_perf_func(struct trace_fprobe *tf, unsigned long entry_ip,
+-		unsigned long ret_ip, struct pt_regs *regs)
++		unsigned long ret_ip, struct pt_regs *regs,
++		void *entry_data)
+ {
+ 	struct trace_event_call *call = trace_probe_event_call(&tf->tp);
+ 	struct fexit_trace_entry_head *entry;
+@@ -301,7 +319,7 @@ fexit_perf_func(struct trace_fprobe *tf, unsigned long entry_ip,
+ 	if (hlist_empty(head))
+ 		return;
+ 
+-	dsize = __get_data_size(&tf->tp, regs);
++	dsize = __get_data_size(&tf->tp, regs, entry_data);
+ 	__size = sizeof(*entry) + tf->tp.size + dsize;
+ 	size = ALIGN(__size + sizeof(u32), sizeof(u64));
+ 	size -= sizeof(u32);
+@@ -312,7 +330,7 @@ fexit_perf_func(struct trace_fprobe *tf, unsigned long entry_ip,
+ 
+ 	entry->func = entry_ip;
+ 	entry->ret_ip = ret_ip;
+-	store_trace_args(&entry[1], &tf->tp, regs, sizeof(*entry), dsize);
++	store_trace_args(&entry[1], &tf->tp, regs, entry_data, sizeof(*entry), dsize);
+ 	perf_trace_buf_submit(entry, size, rctx, call->event.type, 1, regs,
+ 			      head, NULL);
+ }
+@@ -343,10 +361,10 @@ static void fexit_dispatcher(struct fprobe *fp, unsigned long entry_ip,
+ 	struct trace_fprobe *tf = container_of(fp, struct trace_fprobe, fp);
+ 
+ 	if (trace_probe_test_flag(&tf->tp, TP_FLAG_TRACE))
+-		fexit_trace_func(tf, entry_ip, ret_ip, regs);
++		fexit_trace_func(tf, entry_ip, ret_ip, regs, entry_data);
+ #ifdef CONFIG_PERF_EVENTS
+ 	if (trace_probe_test_flag(&tf->tp, TP_FLAG_PROFILE))
+-		fexit_perf_func(tf, entry_ip, ret_ip, regs);
++		fexit_perf_func(tf, entry_ip, ret_ip, regs, entry_data);
+ #endif
+ }
+ NOKPROBE_SYMBOL(fexit_dispatcher);
+@@ -389,7 +407,7 @@ static struct trace_fprobe *alloc_trace_fprobe(const char *group,
+ 	tf->tpoint = tpoint;
+ 	tf->fp.nr_maxactive = maxactive;
+ 
+-	ret = trace_probe_init(&tf->tp, event, group, false);
++	ret = trace_probe_init(&tf->tp, event, group, false, nargs);
+ 	if (ret < 0)
+ 		goto error;
+ 
+@@ -1085,6 +1103,10 @@ static int __trace_fprobe_create(int argc, const char *argv[])
+ 		argc = new_argc;
+ 		argv = new_argv;
+ 	}
++	if (argc > MAX_TRACE_ARGS) {
++		ret = -E2BIG;
++		goto out;
++	}
+ 
+ 	/* setup a probe */
+ 	tf = alloc_trace_fprobe(group, event, symbol, tpoint, maxactive,
+@@ -1101,7 +1123,7 @@ static int __trace_fprobe_create(int argc, const char *argv[])
+ 				(unsigned long)tf->tpoint->probestub);
+ 
+ 	/* parse arguments */
+-	for (i = 0; i < argc && i < MAX_TRACE_ARGS; i++) {
++	for (i = 0; i < argc; i++) {
+ 		trace_probe_log_set_index(i + 2);
+ 		ctx.offset = 0;
+ 		ret = traceprobe_parse_probe_arg(&tf->tp, i, argv[i], &ctx);
+@@ -1109,6 +1131,11 @@ static int __trace_fprobe_create(int argc, const char *argv[])
+ 			goto error;	/* This can be -ENOMEM */
+ 	}
+ 
++	if (is_return && tf->tp.entry_arg) {
++		tf->fp.entry_handler = trace_fprobe_entry_handler;
++		tf->fp.entry_data_size = traceprobe_get_entry_data_size(&tf->tp);
++	}
++
+ 	ret = traceprobe_set_print_fmt(&tf->tp,
+ 			is_return ? PROBE_PRINT_RETURN : PROBE_PRINT_NORMAL);
+ 	if (ret < 0)
+diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
+index 47812aa16bb574..12d997bb3e789b 100644
+--- a/kernel/trace/trace_kprobe.c
++++ b/kernel/trace/trace_kprobe.c
+@@ -290,7 +290,7 @@ static struct trace_kprobe *alloc_trace_kprobe(const char *group,
+ 	INIT_HLIST_NODE(&tk->rp.kp.hlist);
+ 	INIT_LIST_HEAD(&tk->rp.kp.list);
+ 
+-	ret = trace_probe_init(&tk->tp, event, group, false);
++	ret = trace_probe_init(&tk->tp, event, group, false, nargs);
+ 	if (ret < 0)
+ 		goto error;
+ 
+@@ -740,6 +740,9 @@ static unsigned int number_of_same_symbols(char *func_name)
+ 	return ctx.count;
+ }
+ 
++static int trace_kprobe_entry_handler(struct kretprobe_instance *ri,
++				      struct pt_regs *regs);
++
+ static int __trace_kprobe_create(int argc, const char *argv[])
+ {
+ 	/*
+@@ -929,6 +932,10 @@ static int __trace_kprobe_create(int argc, const char *argv[])
+ 		argc = new_argc;
+ 		argv = new_argv;
+ 	}
++	if (argc > MAX_TRACE_ARGS) {
++		ret = -E2BIG;
++		goto out;
++	}
+ 
+ 	/* setup a probe */
+ 	tk = alloc_trace_kprobe(group, event, addr, symbol, offset, maxactive,
+@@ -941,13 +948,18 @@ static int __trace_kprobe_create(int argc, const char *argv[])
+ 	}
+ 
+ 	/* parse arguments */
+-	for (i = 0; i < argc && i < MAX_TRACE_ARGS; i++) {
++	for (i = 0; i < argc; i++) {
+ 		trace_probe_log_set_index(i + 2);
+ 		ctx.offset = 0;
+ 		ret = traceprobe_parse_probe_arg(&tk->tp, i, argv[i], &ctx);
+ 		if (ret)
+ 			goto error;	/* This can be -ENOMEM */
+ 	}
++	/* entry handler for kretprobe */
++	if (is_return && tk->tp.entry_arg) {
++		tk->rp.entry_handler = trace_kprobe_entry_handler;
++		tk->rp.data_size = traceprobe_get_entry_data_size(&tk->tp);
++	}
+ 
+ 	ptype = is_return ? PROBE_PRINT_RETURN : PROBE_PRINT_NORMAL;
+ 	ret = traceprobe_set_print_fmt(&tk->tp, ptype);
+@@ -1249,6 +1261,12 @@ static const struct file_operations kprobe_events_ops = {
+ 	.write		= probes_write,
+ };
+ 
++static unsigned long trace_kprobe_missed(struct trace_kprobe *tk)
++{
++	return trace_kprobe_is_return(tk) ?
++		tk->rp.kp.nmissed + tk->rp.nmissed : tk->rp.kp.nmissed;
++}
++
+ /* Probes profiling interfaces */
+ static int probes_profile_seq_show(struct seq_file *m, void *v)
+ {
+@@ -1260,8 +1278,7 @@ static int probes_profile_seq_show(struct seq_file *m, void *v)
+ 		return 0;
+ 
+ 	tk = to_trace_kprobe(ev);
+-	nmissed = trace_kprobe_is_return(tk) ?
+-		tk->rp.kp.nmissed + tk->rp.nmissed : tk->rp.kp.nmissed;
++	nmissed = trace_kprobe_missed(tk);
+ 	seq_printf(m, "  %-44s %15lu %15lu\n",
+ 		   trace_probe_name(&tk->tp),
+ 		   trace_kprobe_nhit(tk),
+@@ -1298,8 +1315,8 @@ static const struct file_operations kprobe_profile_ops = {
+ 
+ /* Note that we don't verify it, since the code does not come from user space */
+ static int
+-process_fetch_insn(struct fetch_insn *code, void *rec, void *dest,
+-		   void *base)
++process_fetch_insn(struct fetch_insn *code, void *rec, void *edata,
++		   void *dest, void *base)
+ {
+ 	struct pt_regs *regs = rec;
+ 	unsigned long val;
+@@ -1324,6 +1341,9 @@ process_fetch_insn(struct fetch_insn *code, void *rec, void *dest,
+ 	case FETCH_OP_ARG:
+ 		val = regs_get_kernel_argument(regs, code->param);
+ 		break;
++	case FETCH_OP_EDATA:
++		val = *(unsigned long *)((unsigned long)edata + code->offset);
++		break;
+ #endif
+ 	case FETCH_NOP_SYMBOL:	/* Ignore a place holder */
+ 		code++;
+@@ -1354,7 +1374,7 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs,
+ 	if (trace_trigger_soft_disabled(trace_file))
+ 		return;
+ 
+-	dsize = __get_data_size(&tk->tp, regs);
++	dsize = __get_data_size(&tk->tp, regs, NULL);
+ 
+ 	entry = trace_event_buffer_reserve(&fbuffer, trace_file,
+ 					   sizeof(*entry) + tk->tp.size + dsize);
+@@ -1363,7 +1383,7 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs,
+ 
+ 	fbuffer.regs = regs;
+ 	entry->ip = (unsigned long)tk->rp.kp.addr;
+-	store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize);
++	store_trace_args(&entry[1], &tk->tp, regs, NULL, sizeof(*entry), dsize);
+ 
+ 	trace_event_buffer_commit(&fbuffer);
+ }
+@@ -1379,6 +1399,31 @@ kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs)
+ NOKPROBE_SYMBOL(kprobe_trace_func);
+ 
+ /* Kretprobe handler */
++
++static int trace_kprobe_entry_handler(struct kretprobe_instance *ri,
++				      struct pt_regs *regs)
++{
++	struct kretprobe *rp = get_kretprobe(ri);
++	struct trace_kprobe *tk;
++
++	/*
++	 * There is a small chance that get_kretprobe(ri) returns NULL when
++	 * the kretprobe is unregister on another CPU between kretprobe's
++	 * trampoline_handler and this function.
++	 */
++	if (unlikely(!rp))
++		return -ENOENT;
++
++	tk = container_of(rp, struct trace_kprobe, rp);
++
++	/* store argument values into ri->data as entry data */
++	if (tk->tp.entry_arg)
++		store_trace_entry_data(ri->data, &tk->tp, regs);
++
++	return 0;
++}
++
++
+ static nokprobe_inline void
+ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
+ 		       struct pt_regs *regs,
+@@ -1394,7 +1439,7 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
+ 	if (trace_trigger_soft_disabled(trace_file))
+ 		return;
+ 
+-	dsize = __get_data_size(&tk->tp, regs);
++	dsize = __get_data_size(&tk->tp, regs, ri->data);
+ 
+ 	entry = trace_event_buffer_reserve(&fbuffer, trace_file,
+ 					   sizeof(*entry) + tk->tp.size + dsize);
+@@ -1404,7 +1449,7 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
+ 	fbuffer.regs = regs;
+ 	entry->func = (unsigned long)tk->rp.kp.addr;
+ 	entry->ret_ip = get_kretprobe_retaddr(ri);
+-	store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize);
++	store_trace_args(&entry[1], &tk->tp, regs, ri->data, sizeof(*entry), dsize);
+ 
+ 	trace_event_buffer_commit(&fbuffer);
+ }
+@@ -1552,7 +1597,7 @@ kprobe_perf_func(struct trace_kprobe *tk, struct pt_regs *regs)
+ 	if (hlist_empty(head))
+ 		return 0;
+ 
+-	dsize = __get_data_size(&tk->tp, regs);
++	dsize = __get_data_size(&tk->tp, regs, NULL);
+ 	__size = sizeof(*entry) + tk->tp.size + dsize;
+ 	size = ALIGN(__size + sizeof(u32), sizeof(u64));
+ 	size -= sizeof(u32);
+@@ -1563,7 +1608,7 @@ kprobe_perf_func(struct trace_kprobe *tk, struct pt_regs *regs)
+ 
+ 	entry->ip = (unsigned long)tk->rp.kp.addr;
+ 	memset(&entry[1], 0, dsize);
+-	store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize);
++	store_trace_args(&entry[1], &tk->tp, regs, NULL, sizeof(*entry), dsize);
+ 	perf_trace_buf_submit(entry, size, rctx, call->event.type, 1, regs,
+ 			      head, NULL);
+ 	return 0;
+@@ -1588,7 +1633,7 @@ kretprobe_perf_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
+ 	if (hlist_empty(head))
+ 		return;
+ 
+-	dsize = __get_data_size(&tk->tp, regs);
++	dsize = __get_data_size(&tk->tp, regs, ri->data);
+ 	__size = sizeof(*entry) + tk->tp.size + dsize;
+ 	size = ALIGN(__size + sizeof(u32), sizeof(u64));
+ 	size -= sizeof(u32);
+@@ -1599,7 +1644,7 @@ kretprobe_perf_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
+ 
+ 	entry->func = (unsigned long)tk->rp.kp.addr;
+ 	entry->ret_ip = get_kretprobe_retaddr(ri);
+-	store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize);
++	store_trace_args(&entry[1], &tk->tp, regs, ri->data, sizeof(*entry), dsize);
+ 	perf_trace_buf_submit(entry, size, rctx, call->event.type, 1, regs,
+ 			      head, NULL);
+ }
+@@ -1607,7 +1652,8 @@ NOKPROBE_SYMBOL(kretprobe_perf_func);
+ 
+ int bpf_get_kprobe_info(const struct perf_event *event, u32 *fd_type,
+ 			const char **symbol, u64 *probe_offset,
+-			u64 *probe_addr, bool perf_type_tracepoint)
++			u64 *probe_addr, unsigned long *missed,
++			bool perf_type_tracepoint)
+ {
+ 	const char *pevent = trace_event_name(event->tp_event);
+ 	const char *group = event->tp_event->class->system;
+@@ -1626,6 +1672,8 @@ int bpf_get_kprobe_info(const struct perf_event *event, u32 *fd_type,
+ 	*probe_addr = kallsyms_show_value(current_cred()) ?
+ 		      (unsigned long)tk->rp.kp.addr : 0;
+ 	*symbol = tk->symbol;
++	if (missed)
++		*missed = trace_kprobe_missed(tk);
+ 	return 0;
+ }
+ #endif	/* CONFIG_PERF_EVENTS */
+diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
+index ae162ba36a4803..8c73156a7eb94c 100644
+--- a/kernel/trace/trace_probe.c
++++ b/kernel/trace/trace_probe.c
+@@ -275,7 +275,7 @@ int traceprobe_parse_event_name(const char **pevent, const char **pgroup,
+ 		}
+ 		trace_probe_log_err(offset, NO_EVENT_NAME);
+ 		return -EINVAL;
+-	} else if (len > MAX_EVENT_NAME_LEN) {
++	} else if (len >= MAX_EVENT_NAME_LEN) {
+ 		trace_probe_log_err(offset, EVENT_TOO_LONG);
+ 		return -EINVAL;
+ 	}
+@@ -598,6 +598,8 @@ static int parse_btf_field(char *fieldname, const struct btf_type *type,
+ 	return 0;
+ }
+ 
++static int __store_entry_arg(struct trace_probe *tp, int argnum);
++
+ static int parse_btf_arg(char *varname,
+ 			 struct fetch_insn **pcode, struct fetch_insn *end,
+ 			 struct traceprobe_parse_context *ctx)
+@@ -622,11 +624,7 @@ static int parse_btf_arg(char *varname,
+ 		return -EOPNOTSUPP;
+ 	}
+ 
+-	if (ctx->flags & TPARG_FL_RETURN) {
+-		if (strcmp(varname, "$retval") != 0) {
+-			trace_probe_log_err(ctx->offset, NO_BTFARG);
+-			return -ENOENT;
+-		}
++	if (ctx->flags & TPARG_FL_RETURN && !strcmp(varname, "$retval")) {
+ 		code->op = FETCH_OP_RETVAL;
+ 		/* Check whether the function return type is not void */
+ 		if (query_btf_context(ctx) == 0) {
+@@ -658,11 +656,21 @@ static int parse_btf_arg(char *varname,
+ 		const char *name = btf_name_by_offset(ctx->btf, params[i].name_off);
+ 
+ 		if (name && !strcmp(name, varname)) {
+-			code->op = FETCH_OP_ARG;
+-			if (ctx->flags & TPARG_FL_TPOINT)
+-				code->param = i + 1;
+-			else
+-				code->param = i;
++			if (tparg_is_function_entry(ctx->flags)) {
++				code->op = FETCH_OP_ARG;
++				if (ctx->flags & TPARG_FL_TPOINT)
++					code->param = i + 1;
++				else
++					code->param = i;
++			} else if (tparg_is_function_return(ctx->flags)) {
++				code->op = FETCH_OP_EDATA;
++				ret = __store_entry_arg(ctx->tp, i);
++				if (ret < 0) {
++					/* internal error */
++					return ret;
++				}
++				code->offset = ret;
++			}
+ 			tid = params[i].type;
+ 			goto found;
+ 		}
+@@ -759,6 +767,110 @@ static int check_prepare_btf_string_fetch(char *typename,
+ 
+ #endif
+ 
++#ifdef CONFIG_HAVE_FUNCTION_ARG_ACCESS_API
++
++static int __store_entry_arg(struct trace_probe *tp, int argnum)
++{
++	struct probe_entry_arg *earg = tp->entry_arg;
++	bool match = false;
++	int i, offset;
++
++	if (!earg) {
++		earg = kzalloc(sizeof(*tp->entry_arg), GFP_KERNEL);
++		if (!earg)
++			return -ENOMEM;
++		earg->size = 2 * tp->nr_args + 1;
++		earg->code = kcalloc(earg->size, sizeof(struct fetch_insn),
++				     GFP_KERNEL);
++		if (!earg->code) {
++			kfree(earg);
++			return -ENOMEM;
++		}
++		/* Fill the code buffer with 'end' to simplify it */
++		for (i = 0; i < earg->size; i++)
++			earg->code[i].op = FETCH_OP_END;
++		tp->entry_arg = earg;
++	}
++
++	offset = 0;
++	for (i = 0; i < earg->size - 1; i++) {
++		switch (earg->code[i].op) {
++		case FETCH_OP_END:
++			earg->code[i].op = FETCH_OP_ARG;
++			earg->code[i].param = argnum;
++			earg->code[i + 1].op = FETCH_OP_ST_EDATA;
++			earg->code[i + 1].offset = offset;
++			return offset;
++		case FETCH_OP_ARG:
++			match = (earg->code[i].param == argnum);
++			break;
++		case FETCH_OP_ST_EDATA:
++			offset = earg->code[i].offset;
++			if (match)
++				return offset;
++			offset += sizeof(unsigned long);
++			break;
++		default:
++			break;
++		}
++	}
++	return -ENOSPC;
++}
++
++int traceprobe_get_entry_data_size(struct trace_probe *tp)
++{
++	struct probe_entry_arg *earg = tp->entry_arg;
++	int i, size = 0;
++
++	if (!earg)
++		return 0;
++
++	for (i = 0; i < earg->size; i++) {
++		switch (earg->code[i].op) {
++		case FETCH_OP_END:
++			goto out;
++		case FETCH_OP_ST_EDATA:
++			size = earg->code[i].offset + sizeof(unsigned long);
++			break;
++		default:
++			break;
++		}
++	}
++out:
++	return size;
++}
++
++void store_trace_entry_data(void *edata, struct trace_probe *tp, struct pt_regs *regs)
++{
++	struct probe_entry_arg *earg = tp->entry_arg;
++	unsigned long val = 0;
++	int i;
++
++	if (!earg)
++		return;
++
++	for (i = 0; i < earg->size; i++) {
++		struct fetch_insn *code = &earg->code[i];
++
++		switch (code->op) {
++		case FETCH_OP_ARG:
++			val = regs_get_kernel_argument(regs, code->param);
++			break;
++		case FETCH_OP_ST_EDATA:
++			*(unsigned long *)((unsigned long)edata + code->offset) = val;
++			break;
++		case FETCH_OP_END:
++			goto end;
++		default:
++			break;
++		}
++	}
++end:
++	return;
++}
++NOKPROBE_SYMBOL(store_trace_entry_data)
++#endif
++
+ #define PARAM_MAX_STACK (THREAD_SIZE / sizeof(unsigned long))
+ 
+ /* Parse $vars. @orig_arg points '$', which syncs to @ctx->offset */
+@@ -834,7 +946,7 @@ static int parse_probe_vars(char *orig_arg, const struct fetch_type *t,
+ 
+ #ifdef CONFIG_HAVE_FUNCTION_ARG_ACCESS_API
+ 	len = str_has_prefix(arg, "arg");
+-	if (len && tparg_is_function_entry(ctx->flags)) {
++	if (len) {
+ 		ret = kstrtoul(arg + len, 10, &param);
+ 		if (ret)
+ 			goto inval;
+@@ -843,15 +955,29 @@ static int parse_probe_vars(char *orig_arg, const struct fetch_type *t,
+ 			err = TP_ERR_BAD_ARG_NUM;
+ 			goto inval;
+ 		}
++		param--; /* argN starts from 1, but internal arg[N] starts from 0 */
+ 
+-		code->op = FETCH_OP_ARG;
+-		code->param = (unsigned int)param - 1;
+-		/*
+-		 * The tracepoint probe will probe a stub function, and the
+-		 * first parameter of the stub is a dummy and should be ignored.
+-		 */
+-		if (ctx->flags & TPARG_FL_TPOINT)
+-			code->param++;
++		if (tparg_is_function_entry(ctx->flags)) {
++			code->op = FETCH_OP_ARG;
++			code->param = (unsigned int)param;
++			/*
++			 * The tracepoint probe will probe a stub function, and the
++			 * first parameter of the stub is a dummy and should be ignored.
++			 */
++			if (ctx->flags & TPARG_FL_TPOINT)
++				code->param++;
++		} else if (tparg_is_function_return(ctx->flags)) {
++			/* function entry argument access from return probe */
++			ret = __store_entry_arg(ctx->tp, param);
++			if (ret < 0)	/* This error should be an internal error */
++				return ret;
++
++			code->op = FETCH_OP_EDATA;
++			code->offset = ret;
++		} else {
++			err = TP_ERR_NOFENTRY_ARGS;
++			goto inval;
++		}
+ 		return 0;
+ 	}
+ #endif
+@@ -1041,7 +1167,8 @@ parse_probe_arg(char *arg, const struct fetch_type *type,
+ 		break;
+ 	default:
+ 		if (isalpha(arg[0]) || arg[0] == '_') {	/* BTF variable */
+-			if (!tparg_is_function_entry(ctx->flags)) {
++			if (!tparg_is_function_entry(ctx->flags) &&
++			    !tparg_is_function_return(ctx->flags)) {
+ 				trace_probe_log_err(ctx->offset, NOSUP_BTFARG);
+ 				return -EINVAL;
+ 			}
+@@ -1383,9 +1510,7 @@ int traceprobe_parse_probe_arg(struct trace_probe *tp, int i, const char *arg,
+ 	struct probe_arg *parg = &tp->args[i];
+ 	const char *body;
+ 
+-	/* Increment count for freeing args in error case */
+-	tp->nr_args++;
+-
++	ctx->tp = tp;
+ 	body = strchr(arg, '=');
+ 	if (body) {
+ 		if (body - arg > MAX_ARG_NAME_LEN) {
+@@ -1442,7 +1567,8 @@ static int argv_has_var_arg(int argc, const char *argv[], int *args_idx,
+ 		if (str_has_prefix(argv[i], "$arg")) {
+ 			trace_probe_log_set_index(i + 2);
+ 
+-			if (!tparg_is_function_entry(ctx->flags)) {
++			if (!tparg_is_function_entry(ctx->flags) &&
++			    !tparg_is_function_return(ctx->flags)) {
+ 				trace_probe_log_err(0, NOFENTRY_ARGS);
+ 				return -EINVAL;
+ 			}
+@@ -1765,12 +1891,18 @@ void trace_probe_cleanup(struct trace_probe *tp)
+ 	for (i = 0; i < tp->nr_args; i++)
+ 		traceprobe_free_probe_arg(&tp->args[i]);
+ 
++	if (tp->entry_arg) {
++		kfree(tp->entry_arg->code);
++		kfree(tp->entry_arg);
++		tp->entry_arg = NULL;
++	}
++
+ 	if (tp->event)
+ 		trace_probe_unlink(tp);
+ }
+ 
+ int trace_probe_init(struct trace_probe *tp, const char *event,
+-		     const char *group, bool alloc_filter)
++		     const char *group, bool alloc_filter, int nargs)
+ {
+ 	struct trace_event_call *call;
+ 	size_t size = sizeof(struct trace_probe_event);
+@@ -1806,6 +1938,11 @@ int trace_probe_init(struct trace_probe *tp, const char *event,
+ 		goto error;
+ 	}
+ 
++	tp->nr_args = nargs;
++	/* Make sure pointers in args[] are NULL */
++	if (nargs)
++		memset(tp->args, 0, sizeof(tp->args[0]) * nargs);
++
+ 	return 0;
+ 
+ error:
+diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h
+index c1877d0182691c..cef3a50628a3e4 100644
+--- a/kernel/trace/trace_probe.h
++++ b/kernel/trace/trace_probe.h
+@@ -92,6 +92,7 @@ enum fetch_op {
+ 	FETCH_OP_ARG,		/* Function argument : .param */
+ 	FETCH_OP_FOFFS,		/* File offset: .immediate */
+ 	FETCH_OP_DATA,		/* Allocated data: .data */
++	FETCH_OP_EDATA,		/* Entry data: .offset */
+ 	// Stage 2 (dereference) op
+ 	FETCH_OP_DEREF,		/* Dereference: .offset */
+ 	FETCH_OP_UDEREF,	/* User-space Dereference: .offset */
+@@ -102,6 +103,7 @@ enum fetch_op {
+ 	FETCH_OP_ST_STRING,	/* String: .offset, .size */
+ 	FETCH_OP_ST_USTRING,	/* User String: .offset, .size */
+ 	FETCH_OP_ST_SYMSTR,	/* Kernel Symbol String: .offset, .size */
++	FETCH_OP_ST_EDATA,	/* Store Entry Data: .offset */
+ 	// Stage 4 (modify) op
+ 	FETCH_OP_MOD_BF,	/* Bitfield: .basesize, .lshift, .rshift */
+ 	// Stage 5 (loop) op
+@@ -232,6 +234,11 @@ struct probe_arg {
+ 	const struct fetch_type	*type;	/* Type of this argument */
+ };
+ 
++struct probe_entry_arg {
++	struct fetch_insn	*code;
++	unsigned int		size;	/* The entry data size */
++};
++
+ struct trace_uprobe_filter {
+ 	rwlock_t		rwlock;
+ 	int			nr_systemwide;
+@@ -253,6 +260,7 @@ struct trace_probe {
+ 	struct trace_probe_event	*event;
+ 	ssize_t				size;	/* trace entry size */
+ 	unsigned int			nr_args;
++	struct probe_entry_arg		*entry_arg;	/* This is only for return probe */
+ 	struct probe_arg		args[];
+ };
+ 
+@@ -338,7 +346,7 @@ static inline bool trace_probe_has_single_file(struct trace_probe *tp)
+ }
+ 
+ int trace_probe_init(struct trace_probe *tp, const char *event,
+-		     const char *group, bool alloc_filter);
++		     const char *group, bool alloc_filter, int nargs);
+ void trace_probe_cleanup(struct trace_probe *tp);
+ int trace_probe_append(struct trace_probe *tp, struct trace_probe *to);
+ void trace_probe_unlink(struct trace_probe *tp);
+@@ -355,6 +363,18 @@ int trace_probe_create(const char *raw_command, int (*createfn)(int, const char
+ int trace_probe_print_args(struct trace_seq *s, struct probe_arg *args, int nr_args,
+ 		 u8 *data, void *field);
+ 
++#ifdef CONFIG_HAVE_FUNCTION_ARG_ACCESS_API
++int traceprobe_get_entry_data_size(struct trace_probe *tp);
++/* This is a runtime function to store entry data */
++void store_trace_entry_data(void *edata, struct trace_probe *tp, struct pt_regs *regs);
++#else /* !CONFIG_HAVE_FUNCTION_ARG_ACCESS_API */
++static inline int traceprobe_get_entry_data_size(struct trace_probe *tp)
++{
++	return 0;
++}
++#define store_trace_entry_data(edata, tp, regs) do { } while (0)
++#endif
++
+ #define trace_probe_for_each_link(pos, tp)	\
+ 	list_for_each_entry(pos, &(tp)->event->files, list)
+ #define trace_probe_for_each_link_rcu(pos, tp)	\
+@@ -381,6 +401,11 @@ static inline bool tparg_is_function_entry(unsigned int flags)
+ 	return (flags & TPARG_FL_LOC_MASK) == (TPARG_FL_KERNEL | TPARG_FL_FENTRY);
+ }
+ 
++static inline bool tparg_is_function_return(unsigned int flags)
++{
++	return (flags & TPARG_FL_LOC_MASK) == (TPARG_FL_KERNEL | TPARG_FL_RETURN);
++}
++
+ struct traceprobe_parse_context {
+ 	struct trace_event_call *event;
+ 	/* BTF related parameters */
+@@ -392,6 +417,7 @@ struct traceprobe_parse_context {
+ 	const struct btf_type *last_type;	/* Saved type */
+ 	u32 last_bitoffs;		/* Saved bitoffs */
+ 	u32 last_bitsize;		/* Saved bitsize */
++	struct trace_probe *tp;
+ 	unsigned int flags;
+ 	int offset;
+ };
+@@ -506,7 +532,7 @@ extern int traceprobe_define_arg_fields(struct trace_event_call *event_call,
+ 	C(NO_BTFARG,		"This variable is not found at this probe point"),\
+ 	C(NO_BTF_ENTRY,		"No BTF entry for this probe point"),	\
+ 	C(BAD_VAR_ARGS,		"$arg* must be an independent parameter without name etc."),\
+-	C(NOFENTRY_ARGS,	"$arg* can be used only on function entry"),	\
++	C(NOFENTRY_ARGS,	"$arg* can be used only on function entry or exit"),	\
+ 	C(DOUBLE_ARGS,		"$arg* can be used only once in the parameters"),	\
+ 	C(ARGS_2LONG,		"$arg* failed because the argument list is too long"),	\
+ 	C(ARGIDX_2BIG,		"$argN index is too big"),		\
+diff --git a/kernel/trace/trace_probe_tmpl.h b/kernel/trace/trace_probe_tmpl.h
+index 3935b347f874bc..2caf0d2afb3228 100644
+--- a/kernel/trace/trace_probe_tmpl.h
++++ b/kernel/trace/trace_probe_tmpl.h
+@@ -54,7 +54,7 @@ fetch_apply_bitfield(struct fetch_insn *code, void *buf)
+  * If dest is NULL, don't store result and return required dynamic data size.
+  */
+ static int
+-process_fetch_insn(struct fetch_insn *code, void *rec,
++process_fetch_insn(struct fetch_insn *code, void *rec, void *edata,
+ 		   void *dest, void *base);
+ static nokprobe_inline int fetch_store_strlen(unsigned long addr);
+ static nokprobe_inline int
+@@ -232,7 +232,7 @@ process_fetch_insn_bottom(struct fetch_insn *code, unsigned long val,
+ 
+ /* Sum up total data length for dynamic arrays (strings) */
+ static nokprobe_inline int
+-__get_data_size(struct trace_probe *tp, struct pt_regs *regs)
++__get_data_size(struct trace_probe *tp, struct pt_regs *regs, void *edata)
+ {
+ 	struct probe_arg *arg;
+ 	int i, len, ret = 0;
+@@ -240,7 +240,7 @@ __get_data_size(struct trace_probe *tp, struct pt_regs *regs)
+ 	for (i = 0; i < tp->nr_args; i++) {
+ 		arg = tp->args + i;
+ 		if (unlikely(arg->dynamic)) {
+-			len = process_fetch_insn(arg->code, regs, NULL, NULL);
++			len = process_fetch_insn(arg->code, regs, edata, NULL, NULL);
+ 			if (len > 0)
+ 				ret += len;
+ 		}
+@@ -251,7 +251,7 @@ __get_data_size(struct trace_probe *tp, struct pt_regs *regs)
+ 
+ /* Store the value of each argument */
+ static nokprobe_inline void
+-store_trace_args(void *data, struct trace_probe *tp, void *rec,
++store_trace_args(void *data, struct trace_probe *tp, void *rec, void *edata,
+ 		 int header_size, int maxlen)
+ {
+ 	struct probe_arg *arg;
+@@ -266,7 +266,7 @@ store_trace_args(void *data, struct trace_probe *tp, void *rec,
+ 		/* Point the dynamic data area if needed */
+ 		if (unlikely(arg->dynamic))
+ 			*dl = make_data_loc(maxlen, dyndata - base);
+-		ret = process_fetch_insn(arg->code, rec, dl, base);
++		ret = process_fetch_insn(arg->code, rec, edata, dl, base);
+ 		if (arg->dynamic && likely(ret > 0)) {
+ 			dyndata += ret;
+ 			maxlen -= ret;
+diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
+index 99c051de412afa..3e7d92d2650bcc 100644
+--- a/kernel/trace/trace_uprobe.c
++++ b/kernel/trace/trace_uprobe.c
+@@ -211,8 +211,8 @@ static unsigned long translate_user_vaddr(unsigned long file_offset)
+ 
+ /* Note that we don't verify it, since the code does not come from user space */
+ static int
+-process_fetch_insn(struct fetch_insn *code, void *rec, void *dest,
+-		   void *base)
++process_fetch_insn(struct fetch_insn *code, void *rec, void *edata,
++		   void *dest, void *base)
+ {
+ 	struct pt_regs *regs = rec;
+ 	unsigned long val;
+@@ -337,7 +337,7 @@ alloc_trace_uprobe(const char *group, const char *event, int nargs, bool is_ret)
+ 	if (!tu)
+ 		return ERR_PTR(-ENOMEM);
+ 
+-	ret = trace_probe_init(&tu->tp, event, group, true);
++	ret = trace_probe_init(&tu->tp, event, group, true, nargs);
+ 	if (ret < 0)
+ 		goto error;
+ 
+@@ -556,6 +556,8 @@ static int __trace_uprobe_create(int argc, const char **argv)
+ 
+ 	if (argc < 2)
+ 		return -ECANCELED;
++	if (argc - 2 > MAX_TRACE_ARGS)
++		return -E2BIG;
+ 
+ 	if (argv[0][1] == ':')
+ 		event = &argv[0][2];
+@@ -681,7 +683,7 @@ static int __trace_uprobe_create(int argc, const char **argv)
+ 	tu->filename = filename;
+ 
+ 	/* parse arguments */
+-	for (i = 0; i < argc && i < MAX_TRACE_ARGS; i++) {
++	for (i = 0; i < argc; i++) {
+ 		struct traceprobe_parse_context ctx = {
+ 			.flags = (is_return ? TPARG_FL_RETURN : 0) | TPARG_FL_USER,
+ 		};
+@@ -854,9 +856,11 @@ static const struct file_operations uprobe_profile_ops = {
+ struct uprobe_cpu_buffer {
+ 	struct mutex mutex;
+ 	void *buf;
++	int dsize;
+ };
+ static struct uprobe_cpu_buffer __percpu *uprobe_cpu_buffer;
+ static int uprobe_buffer_refcnt;
++#define MAX_UCB_BUFFER_SIZE PAGE_SIZE
+ 
+ static int uprobe_buffer_init(void)
+ {
+@@ -940,12 +944,41 @@ static struct uprobe_cpu_buffer *uprobe_buffer_get(void)
+ 
+ static void uprobe_buffer_put(struct uprobe_cpu_buffer *ucb)
+ {
++	if (!ucb)
++		return;
+ 	mutex_unlock(&ucb->mutex);
+ }
+ 
++static struct uprobe_cpu_buffer *prepare_uprobe_buffer(struct trace_uprobe *tu,
++						       struct pt_regs *regs,
++						       struct uprobe_cpu_buffer **ucbp)
++{
++	struct uprobe_cpu_buffer *ucb;
++	int dsize, esize;
++
++	if (*ucbp)
++		return *ucbp;
++
++	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));
++	dsize = __get_data_size(&tu->tp, regs, NULL);
++
++	ucb = uprobe_buffer_get();
++	ucb->dsize = tu->tp.size + dsize;
++
++	if (WARN_ON_ONCE(ucb->dsize > MAX_UCB_BUFFER_SIZE)) {
++		ucb->dsize = MAX_UCB_BUFFER_SIZE;
++		dsize = MAX_UCB_BUFFER_SIZE - tu->tp.size;
++	}
++
++	store_trace_args(ucb->buf, &tu->tp, regs, NULL, esize, dsize);
++
++	*ucbp = ucb;
++	return ucb;
++}
++
+ static void __uprobe_trace_func(struct trace_uprobe *tu,
+ 				unsigned long func, struct pt_regs *regs,
+-				struct uprobe_cpu_buffer *ucb, int dsize,
++				struct uprobe_cpu_buffer *ucb,
+ 				struct trace_event_file *trace_file)
+ {
+ 	struct uprobe_trace_entry_head *entry;
+@@ -956,14 +989,11 @@ static void __uprobe_trace_func(struct trace_uprobe *tu,
+ 
+ 	WARN_ON(call != trace_file->event_call);
+ 
+-	if (WARN_ON_ONCE(tu->tp.size + dsize > PAGE_SIZE))
+-		return;
+-
+ 	if (trace_trigger_soft_disabled(trace_file))
+ 		return;
+ 
+ 	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));
+-	size = esize + tu->tp.size + dsize;
++	size = esize + ucb->dsize;
+ 	entry = trace_event_buffer_reserve(&fbuffer, trace_file, size);
+ 	if (!entry)
+ 		return;
+@@ -977,23 +1007,26 @@ static void __uprobe_trace_func(struct trace_uprobe *tu,
+ 		data = DATAOF_TRACE_ENTRY(entry, false);
+ 	}
+ 
+-	memcpy(data, ucb->buf, tu->tp.size + dsize);
++	memcpy(data, ucb->buf, ucb->dsize);
+ 
+ 	trace_event_buffer_commit(&fbuffer);
+ }
+ 
+ /* uprobe handler */
+ static int uprobe_trace_func(struct trace_uprobe *tu, struct pt_regs *regs,
+-			     struct uprobe_cpu_buffer *ucb, int dsize)
++			     struct uprobe_cpu_buffer **ucbp)
+ {
+ 	struct event_file_link *link;
++	struct uprobe_cpu_buffer *ucb;
+ 
+ 	if (is_ret_probe(tu))
+ 		return 0;
+ 
++	ucb = prepare_uprobe_buffer(tu, regs, ucbp);
++
+ 	rcu_read_lock();
+ 	trace_probe_for_each_link_rcu(link, &tu->tp)
+-		__uprobe_trace_func(tu, 0, regs, ucb, dsize, link->file);
++		__uprobe_trace_func(tu, 0, regs, ucb, link->file);
+ 	rcu_read_unlock();
+ 
+ 	return 0;
+@@ -1001,13 +1034,16 @@ static int uprobe_trace_func(struct trace_uprobe *tu, struct pt_regs *regs,
+ 
+ static void uretprobe_trace_func(struct trace_uprobe *tu, unsigned long func,
+ 				 struct pt_regs *regs,
+-				 struct uprobe_cpu_buffer *ucb, int dsize)
++				 struct uprobe_cpu_buffer **ucbp)
+ {
+ 	struct event_file_link *link;
++	struct uprobe_cpu_buffer *ucb;
++
++	ucb = prepare_uprobe_buffer(tu, regs, ucbp);
+ 
+ 	rcu_read_lock();
+ 	trace_probe_for_each_link_rcu(link, &tu->tp)
+-		__uprobe_trace_func(tu, func, regs, ucb, dsize, link->file);
++		__uprobe_trace_func(tu, func, regs, ucb, link->file);
+ 	rcu_read_unlock();
+ }
+ 
+@@ -1335,10 +1371,11 @@ static bool uprobe_perf_filter(struct uprobe_consumer *uc,
+ 
+ static void __uprobe_perf_func(struct trace_uprobe *tu,
+ 			       unsigned long func, struct pt_regs *regs,
+-			       struct uprobe_cpu_buffer *ucb, int dsize)
++			       struct uprobe_cpu_buffer **ucbp)
+ {
+ 	struct trace_event_call *call = trace_probe_event_call(&tu->tp);
+ 	struct uprobe_trace_entry_head *entry;
++	struct uprobe_cpu_buffer *ucb;
+ 	struct hlist_head *head;
+ 	void *data;
+ 	int size, esize;
+@@ -1356,7 +1393,8 @@ static void __uprobe_perf_func(struct trace_uprobe *tu,
+ 
+ 	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));
+ 
+-	size = esize + tu->tp.size + dsize;
++	ucb = prepare_uprobe_buffer(tu, regs, ucbp);
++	size = esize + ucb->dsize;
+ 	size = ALIGN(size + sizeof(u32), sizeof(u64)) - sizeof(u32);
+ 	if (WARN_ONCE(size > PERF_MAX_TRACE_SIZE, "profile buffer not large enough"))
+ 		return;
+@@ -1379,13 +1417,10 @@ static void __uprobe_perf_func(struct trace_uprobe *tu,
+ 		data = DATAOF_TRACE_ENTRY(entry, false);
+ 	}
+ 
+-	memcpy(data, ucb->buf, tu->tp.size + dsize);
+-
+-	if (size - esize > tu->tp.size + dsize) {
+-		int len = tu->tp.size + dsize;
++	memcpy(data, ucb->buf, ucb->dsize);
+ 
+-		memset(data + len, 0, size - esize - len);
+-	}
++	if (size - esize > ucb->dsize)
++		memset(data + ucb->dsize, 0, size - esize - ucb->dsize);
+ 
+ 	perf_trace_buf_submit(entry, size, rctx, call->event.type, 1, regs,
+ 			      head, NULL);
+@@ -1395,21 +1430,21 @@ static void __uprobe_perf_func(struct trace_uprobe *tu,
+ 
+ /* uprobe profile handler */
+ static int uprobe_perf_func(struct trace_uprobe *tu, struct pt_regs *regs,
+-			    struct uprobe_cpu_buffer *ucb, int dsize)
++			    struct uprobe_cpu_buffer **ucbp)
+ {
+ 	if (!uprobe_perf_filter(&tu->consumer, 0, current->mm))
+ 		return UPROBE_HANDLER_REMOVE;
+ 
+ 	if (!is_ret_probe(tu))
+-		__uprobe_perf_func(tu, 0, regs, ucb, dsize);
++		__uprobe_perf_func(tu, 0, regs, ucbp);
+ 	return 0;
+ }
+ 
+ static void uretprobe_perf_func(struct trace_uprobe *tu, unsigned long func,
+ 				struct pt_regs *regs,
+-				struct uprobe_cpu_buffer *ucb, int dsize)
++				struct uprobe_cpu_buffer **ucbp)
+ {
+-	__uprobe_perf_func(tu, func, regs, ucb, dsize);
++	__uprobe_perf_func(tu, func, regs, ucbp);
+ }
+ 
+ int bpf_get_uprobe_info(const struct perf_event *event, u32 *fd_type,
+@@ -1474,11 +1509,9 @@ static int uprobe_dispatcher(struct uprobe_consumer *con, struct pt_regs *regs)
+ {
+ 	struct trace_uprobe *tu;
+ 	struct uprobe_dispatch_data udd;
+-	struct uprobe_cpu_buffer *ucb;
+-	int dsize, esize;
++	struct uprobe_cpu_buffer *ucb = NULL;
+ 	int ret = 0;
+ 
+-
+ 	tu = container_of(con, struct trace_uprobe, consumer);
+ 	tu->nhit++;
+ 
+@@ -1490,18 +1523,12 @@ static int uprobe_dispatcher(struct uprobe_consumer *con, struct pt_regs *regs)
+ 	if (WARN_ON_ONCE(!uprobe_cpu_buffer))
+ 		return 0;
+ 
+-	dsize = __get_data_size(&tu->tp, regs);
+-	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));
+-
+-	ucb = uprobe_buffer_get();
+-	store_trace_args(ucb->buf, &tu->tp, regs, esize, dsize);
+-
+ 	if (trace_probe_test_flag(&tu->tp, TP_FLAG_TRACE))
+-		ret |= uprobe_trace_func(tu, regs, ucb, dsize);
++		ret |= uprobe_trace_func(tu, regs, &ucb);
+ 
+ #ifdef CONFIG_PERF_EVENTS
+ 	if (trace_probe_test_flag(&tu->tp, TP_FLAG_PROFILE))
+-		ret |= uprobe_perf_func(tu, regs, ucb, dsize);
++		ret |= uprobe_perf_func(tu, regs, &ucb);
+ #endif
+ 	uprobe_buffer_put(ucb);
+ 	return ret;
+@@ -1512,8 +1539,7 @@ static int uretprobe_dispatcher(struct uprobe_consumer *con,
+ {
+ 	struct trace_uprobe *tu;
+ 	struct uprobe_dispatch_data udd;
+-	struct uprobe_cpu_buffer *ucb;
+-	int dsize, esize;
++	struct uprobe_cpu_buffer *ucb = NULL;
+ 
+ 	tu = container_of(con, struct trace_uprobe, consumer);
+ 
+@@ -1525,18 +1551,12 @@ static int uretprobe_dispatcher(struct uprobe_consumer *con,
+ 	if (WARN_ON_ONCE(!uprobe_cpu_buffer))
+ 		return 0;
+ 
+-	dsize = __get_data_size(&tu->tp, regs);
+-	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));
+-
+-	ucb = uprobe_buffer_get();
+-	store_trace_args(ucb->buf, &tu->tp, regs, esize, dsize);
+-
+ 	if (trace_probe_test_flag(&tu->tp, TP_FLAG_TRACE))
+-		uretprobe_trace_func(tu, func, regs, ucb, dsize);
++		uretprobe_trace_func(tu, func, regs, &ucb);
+ 
+ #ifdef CONFIG_PERF_EVENTS
+ 	if (trace_probe_test_flag(&tu->tp, TP_FLAG_PROFILE))
+-		uretprobe_perf_func(tu, func, regs, ucb, dsize);
++		uretprobe_perf_func(tu, func, regs, &ucb);
+ #endif
+ 	uprobe_buffer_put(ucb);
+ 	return 0;
+diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
+index da5513cfc12588..f94c3e957b8298 100644
+--- a/lib/Kconfig.debug
++++ b/lib/Kconfig.debug
+@@ -2999,7 +2999,7 @@ config RUST_BUILD_ASSERT_ALLOW
+ 	bool "Allow unoptimized build-time assertions"
+ 	depends on RUST
+ 	help
+-	  Controls how are `build_error!` and `build_assert!` handled during build.
++	  Controls how `build_error!` and `build_assert!` are handled during the build.
+ 
+ 	  If calls to them exist in the binary, it may indicate a violated invariant
+ 	  or that the optimizer failed to verify the invariant during compilation.
+diff --git a/mm/khugepaged.c b/mm/khugepaged.c
+index 88433cc25d8a5a..a87cfe1d4b7beb 100644
+--- a/mm/khugepaged.c
++++ b/mm/khugepaged.c
+@@ -887,20 +887,6 @@ static int hpage_collapse_find_target_node(struct collapse_control *cc)
+ }
+ #endif
+ 
+-static bool hpage_collapse_alloc_page(struct page **hpage, gfp_t gfp, int node,
+-				      nodemask_t *nmask)
+-{
+-	*hpage = __alloc_pages(gfp, HPAGE_PMD_ORDER, node, nmask);
+-	if (unlikely(!*hpage)) {
+-		count_vm_event(THP_COLLAPSE_ALLOC_FAILED);
+-		return false;
+-	}
+-
+-	folio_prep_large_rmappable((struct folio *)*hpage);
+-	count_vm_event(THP_COLLAPSE_ALLOC);
+-	return true;
+-}
+-
+ /*
+  * If mmap_lock temporarily dropped, revalidate vma
+  * before taking mmap_lock.
+@@ -1055,7 +1041,7 @@ static int __collapse_huge_page_swapin(struct mm_struct *mm,
+ 	return result;
+ }
+ 
+-static int alloc_charge_hpage(struct page **hpage, struct mm_struct *mm,
++static int alloc_charge_folio(struct folio **foliop, struct mm_struct *mm,
+ 			      struct collapse_control *cc)
+ {
+ 	gfp_t gfp = (cc->is_khugepaged ? alloc_hugepage_khugepaged_gfpmask() :
+@@ -1063,17 +1049,23 @@ static int alloc_charge_hpage(struct page **hpage, struct mm_struct *mm,
+ 	int node = hpage_collapse_find_target_node(cc);
+ 	struct folio *folio;
+ 
+-	if (!hpage_collapse_alloc_page(hpage, gfp, node, &cc->alloc_nmask))
++	folio = __folio_alloc(gfp, HPAGE_PMD_ORDER, node, &cc->alloc_nmask);
++	if (!folio) {
++		*foliop = NULL;
++		count_vm_event(THP_COLLAPSE_ALLOC_FAILED);
+ 		return SCAN_ALLOC_HUGE_PAGE_FAIL;
++	}
+ 
+-	folio = page_folio(*hpage);
++	count_vm_event(THP_COLLAPSE_ALLOC);
+ 	if (unlikely(mem_cgroup_charge(folio, mm, gfp))) {
+ 		folio_put(folio);
+-		*hpage = NULL;
++		*foliop = NULL;
+ 		return SCAN_CGROUP_CHARGE_FAIL;
+ 	}
+-	count_memcg_page_event(*hpage, THP_COLLAPSE_ALLOC);
+ 
++	count_memcg_folio_events(folio, THP_COLLAPSE_ALLOC, 1);
++
++	*foliop = folio;
+ 	return SCAN_SUCCEED;
+ }
+ 
+@@ -1085,6 +1077,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address,
+ 	pmd_t *pmd, _pmd;
+ 	pte_t *pte;
+ 	pgtable_t pgtable;
++	struct folio *folio;
+ 	struct page *hpage;
+ 	spinlock_t *pmd_ptl, *pte_ptl;
+ 	int result = SCAN_FAIL;
+@@ -1101,7 +1094,8 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address,
+ 	 */
+ 	mmap_read_unlock(mm);
+ 
+-	result = alloc_charge_hpage(&hpage, mm, cc);
++	result = alloc_charge_folio(&folio, mm, cc);
++	hpage = &folio->page;
+ 	if (result != SCAN_SUCCEED)
+ 		goto out_nolock;
+ 
+@@ -1205,12 +1199,11 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address,
+ 		goto out_up_write;
+ 
+ 	/*
+-	 * spin_lock() below is not the equivalent of smp_wmb(), but
+-	 * the smp_wmb() inside __SetPageUptodate() can be reused to
+-	 * avoid the copy_huge_page writes to become visible after
+-	 * the set_pmd_at() write.
++	 * The smp_wmb() inside __folio_mark_uptodate() ensures the
++	 * copy_huge_page writes become visible before the set_pmd_at()
++	 * write.
+ 	 */
+-	__SetPageUptodate(hpage);
++	__folio_mark_uptodate(folio);
+ 	pgtable = pmd_pgtable(_pmd);
+ 
+ 	_pmd = mk_huge_pmd(hpage, vma->vm_page_prot);
+@@ -1218,8 +1211,8 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address,
+ 
+ 	spin_lock(pmd_ptl);
+ 	BUG_ON(!pmd_none(*pmd));
+-	page_add_new_anon_rmap(hpage, vma, address);
+-	lru_cache_add_inactive_or_unevictable(hpage, vma);
++	folio_add_new_anon_rmap(folio, vma, address);
++	folio_add_lru_vma(folio, vma);
+ 	pgtable_trans_huge_deposit(mm, pmd, pgtable);
+ 	set_pmd_at(mm, address, pmd, _pmd);
+ 	update_mmu_cache_pmd(vma, address, pmd);
+@@ -1790,29 +1783,27 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr,
+ 			 struct collapse_control *cc)
+ {
+ 	struct address_space *mapping = file->f_mapping;
+-	struct page *hpage;
+ 	struct page *page;
+-	struct page *tmp;
+-	struct folio *folio;
++	struct page *tmp, *dst;
++	struct folio *folio, *new_folio;
+ 	pgoff_t index = 0, end = start + HPAGE_PMD_NR;
+ 	LIST_HEAD(pagelist);
+ 	XA_STATE_ORDER(xas, &mapping->i_pages, start, HPAGE_PMD_ORDER);
+ 	int nr_none = 0, result = SCAN_SUCCEED;
+ 	bool is_shmem = shmem_file(file);
+-	int nr = 0;
+ 
+ 	VM_BUG_ON(!IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS) && !is_shmem);
+ 	VM_BUG_ON(start & (HPAGE_PMD_NR - 1));
+ 
+-	result = alloc_charge_hpage(&hpage, mm, cc);
++	result = alloc_charge_folio(&new_folio, mm, cc);
+ 	if (result != SCAN_SUCCEED)
+ 		goto out;
+ 
+-	__SetPageLocked(hpage);
++	__folio_set_locked(new_folio);
+ 	if (is_shmem)
+-		__SetPageSwapBacked(hpage);
+-	hpage->index = start;
+-	hpage->mapping = mapping;
++		__folio_set_swapbacked(new_folio);
++	new_folio->index = start;
++	new_folio->mapping = mapping;
+ 
+ 	/*
+ 	 * Ensure we have slots for all the pages in the range.  This is
+@@ -2045,20 +2036,24 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr,
+ 	 * The old pages are locked, so they won't change anymore.
+ 	 */
+ 	index = start;
++	dst = folio_page(new_folio, 0);
+ 	list_for_each_entry(page, &pagelist, lru) {
+ 		while (index < page->index) {
+-			clear_highpage(hpage + (index % HPAGE_PMD_NR));
++			clear_highpage(dst);
+ 			index++;
++			dst++;
+ 		}
+-		if (copy_mc_highpage(hpage + (page->index % HPAGE_PMD_NR), page) > 0) {
++		if (copy_mc_highpage(dst, page) > 0) {
+ 			result = SCAN_COPY_MC;
+ 			goto rollback;
+ 		}
+ 		index++;
++		dst++;
+ 	}
+ 	while (index < end) {
+-		clear_highpage(hpage + (index % HPAGE_PMD_NR));
++		clear_highpage(dst);
+ 		index++;
++		dst++;
+ 	}
+ 
+ 	if (nr_none) {
+@@ -2086,16 +2081,17 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr,
+ 		}
+ 
+ 		/*
+-		 * If userspace observed a missing page in a VMA with a MODE_MISSING
+-		 * userfaultfd, then it might expect a UFFD_EVENT_PAGEFAULT for that
+-		 * page. If so, we need to roll back to avoid suppressing such an
+-		 * event. Since wp/minor userfaultfds don't give userspace any
+-		 * guarantees that the kernel doesn't fill a missing page with a zero
+-		 * page, so they don't matter here.
++		 * If userspace observed a missing page in a VMA with
++		 * a MODE_MISSING userfaultfd, then it might expect a
++		 * UFFD_EVENT_PAGEFAULT for that page. If so, we need to
++		 * roll back to avoid suppressing such an event. Since
++		 * wp/minor userfaultfds don't give userspace any
++		 * guarantees that the kernel doesn't fill a missing
++		 * page with a zero page, so they don't matter here.
+ 		 *
+-		 * Any userfaultfds registered after this point will not be able to
+-		 * observe any missing pages due to the previously inserted retry
+-		 * entries.
++		 * Any userfaultfds registered after this point will
++		 * not be able to observe any missing pages due to the
++		 * previously inserted retry entries.
+ 		 */
+ 		vma_interval_tree_foreach(vma, &mapping->i_mmap, start, end) {
+ 			if (userfaultfd_missing(vma)) {
+@@ -2120,33 +2116,32 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr,
+ 		xas_lock_irq(&xas);
+ 	}
+ 
+-	nr = thp_nr_pages(hpage);
+ 	if (is_shmem)
+-		__mod_lruvec_page_state(hpage, NR_SHMEM_THPS, nr);
++		__lruvec_stat_mod_folio(new_folio, NR_SHMEM_THPS, HPAGE_PMD_NR);
+ 	else
+-		__mod_lruvec_page_state(hpage, NR_FILE_THPS, nr);
++		__lruvec_stat_mod_folio(new_folio, NR_FILE_THPS, HPAGE_PMD_NR);
+ 
+ 	if (nr_none) {
+-		__mod_lruvec_page_state(hpage, NR_FILE_PAGES, nr_none);
++		__lruvec_stat_mod_folio(new_folio, NR_FILE_PAGES, nr_none);
+ 		/* nr_none is always 0 for non-shmem. */
+-		__mod_lruvec_page_state(hpage, NR_SHMEM, nr_none);
++		__lruvec_stat_mod_folio(new_folio, NR_SHMEM, nr_none);
+ 	}
+ 
+ 	/*
+-	 * Mark hpage as uptodate before inserting it into the page cache so
+-	 * that it isn't mistaken for an fallocated but unwritten page.
++	 * Mark new_folio as uptodate before inserting it into the
++	 * page cache so that it isn't mistaken for an fallocated but
++	 * unwritten page.
+ 	 */
+-	folio = page_folio(hpage);
+-	folio_mark_uptodate(folio);
+-	folio_ref_add(folio, HPAGE_PMD_NR - 1);
++	folio_mark_uptodate(new_folio);
++	folio_ref_add(new_folio, HPAGE_PMD_NR - 1);
+ 
+ 	if (is_shmem)
+-		folio_mark_dirty(folio);
+-	folio_add_lru(folio);
++		folio_mark_dirty(new_folio);
++	folio_add_lru(new_folio);
+ 
+ 	/* Join all the small entries into a single multi-index entry. */
+ 	xas_set_order(&xas, start, HPAGE_PMD_ORDER);
+-	xas_store(&xas, hpage);
++	xas_store(&xas, new_folio);
+ 	WARN_ON_ONCE(xas_error(&xas));
+ 	xas_unlock_irq(&xas);
+ 
+@@ -2157,7 +2152,7 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr,
+ 	retract_page_tables(mapping, start);
+ 	if (cc && !cc->is_khugepaged)
+ 		result = SCAN_PTE_MAPPED_HUGEPAGE;
+-	unlock_page(hpage);
++	folio_unlock(new_folio);
+ 
+ 	/*
+ 	 * The collapse has succeeded, so free the old pages.
+@@ -2202,13 +2197,13 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr,
+ 		smp_mb();
+ 	}
+ 
+-	hpage->mapping = NULL;
++	new_folio->mapping = NULL;
+ 
+-	unlock_page(hpage);
+-	put_page(hpage);
++	folio_unlock(new_folio);
++	folio_put(new_folio);
+ out:
+ 	VM_BUG_ON(!list_empty(&pagelist));
+-	trace_mm_khugepaged_collapse_file(mm, hpage, index, is_shmem, addr, file, nr, result);
++	trace_mm_khugepaged_collapse_file(mm, new_folio, index, addr, is_shmem, file, HPAGE_PMD_NR, result);
+ 	return result;
+ }
+ 
+diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
+index e39fba5565c5d4..0b4d0a8bd36141 100644
+--- a/net/bluetooth/af_bluetooth.c
++++ b/net/bluetooth/af_bluetooth.c
+@@ -185,6 +185,28 @@ void bt_sock_unlink(struct bt_sock_list *l, struct sock *sk)
+ }
+ EXPORT_SYMBOL(bt_sock_unlink);
+ 
++bool bt_sock_linked(struct bt_sock_list *l, struct sock *s)
++{
++	struct sock *sk;
++
++	if (!l || !s)
++		return false;
++
++	read_lock(&l->lock);
++
++	sk_for_each(sk, &l->head) {
++		if (s == sk) {
++			read_unlock(&l->lock);
++			return true;
++		}
++	}
++
++	read_unlock(&l->lock);
++
++	return false;
++}
++EXPORT_SYMBOL(bt_sock_linked);
++
+ void bt_accept_enqueue(struct sock *parent, struct sock *sk, bool bh)
+ {
+ 	const struct cred *old_cred;
+diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
+index a660c428e2207c..38f542665f1962 100644
+--- a/net/bluetooth/bnep/core.c
++++ b/net/bluetooth/bnep/core.c
+@@ -745,8 +745,7 @@ static int __init bnep_init(void)
+ 	if (flt[0])
+ 		BT_INFO("BNEP filters: %s", flt);
+ 
+-	bnep_sock_init();
+-	return 0;
++	return bnep_sock_init();
+ }
+ 
+ static void __exit bnep_exit(void)
+diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
+index 9b365fb44fac6d..c2c80d6000836b 100644
+--- a/net/bluetooth/iso.c
++++ b/net/bluetooth/iso.c
+@@ -90,6 +90,16 @@ static struct sock *iso_get_sock_listen(bdaddr_t *src, bdaddr_t *dst,
+ #define ISO_CONN_TIMEOUT	(HZ * 40)
+ #define ISO_DISCONN_TIMEOUT	(HZ * 2)
+ 
++static struct sock *iso_sock_hold(struct iso_conn *conn)
++{
++	if (!conn || !bt_sock_linked(&iso_sk_list, conn->sk))
++		return NULL;
++
++	sock_hold(conn->sk);
++
++	return conn->sk;
++}
++
+ static void iso_sock_timeout(struct work_struct *work)
+ {
+ 	struct iso_conn *conn = container_of(work, struct iso_conn,
+@@ -97,9 +107,7 @@ static void iso_sock_timeout(struct work_struct *work)
+ 	struct sock *sk;
+ 
+ 	iso_conn_lock(conn);
+-	sk = conn->sk;
+-	if (sk)
+-		sock_hold(sk);
++	sk = iso_sock_hold(conn);
+ 	iso_conn_unlock(conn);
+ 
+ 	if (!sk)
+@@ -217,9 +225,7 @@ static void iso_conn_del(struct hci_conn *hcon, int err)
+ 
+ 	/* Kill socket */
+ 	iso_conn_lock(conn);
+-	sk = conn->sk;
+-	if (sk)
+-		sock_hold(sk);
++	sk = iso_sock_hold(conn);
+ 	iso_conn_unlock(conn);
+ 
+ 	if (sk) {
+diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
+index 3c3650902c8396..fb368540139a18 100644
+--- a/net/bluetooth/sco.c
++++ b/net/bluetooth/sco.c
+@@ -76,6 +76,16 @@ struct sco_pinfo {
+ #define SCO_CONN_TIMEOUT	(HZ * 40)
+ #define SCO_DISCONN_TIMEOUT	(HZ * 2)
+ 
++static struct sock *sco_sock_hold(struct sco_conn *conn)
++{
++	if (!conn || !bt_sock_linked(&sco_sk_list, conn->sk))
++		return NULL;
++
++	sock_hold(conn->sk);
++
++	return conn->sk;
++}
++
+ static void sco_sock_timeout(struct work_struct *work)
+ {
+ 	struct sco_conn *conn = container_of(work, struct sco_conn,
+@@ -87,9 +97,7 @@ static void sco_sock_timeout(struct work_struct *work)
+ 		sco_conn_unlock(conn);
+ 		return;
+ 	}
+-	sk = conn->sk;
+-	if (sk)
+-		sock_hold(sk);
++	sk = sco_sock_hold(conn);
+ 	sco_conn_unlock(conn);
+ 
+ 	if (!sk)
+@@ -194,9 +202,7 @@ static void sco_conn_del(struct hci_conn *hcon, int err)
+ 
+ 	/* Kill socket */
+ 	sco_conn_lock(conn);
+-	sk = conn->sk;
+-	if (sk)
+-		sock_hold(sk);
++	sk = sco_sock_hold(conn);
+ 	sco_conn_unlock(conn);
+ 
+ 	if (sk) {
+diff --git a/net/core/filter.c b/net/core/filter.c
+index 8bfd46a070c167..a2467a7c01f9ed 100644
+--- a/net/core/filter.c
++++ b/net/core/filter.c
+@@ -2423,9 +2423,9 @@ static int __bpf_redirect_neigh(struct sk_buff *skb, struct net_device *dev,
+ 
+ /* Internal, non-exposed redirect flags. */
+ enum {
+-	BPF_F_NEIGH	= (1ULL << 1),
+-	BPF_F_PEER	= (1ULL << 2),
+-	BPF_F_NEXTHOP	= (1ULL << 3),
++	BPF_F_NEIGH	= (1ULL << 16),
++	BPF_F_PEER	= (1ULL << 17),
++	BPF_F_NEXTHOP	= (1ULL << 18),
+ #define BPF_F_REDIRECT_INTERNAL	(BPF_F_NEIGH | BPF_F_PEER | BPF_F_NEXTHOP)
+ };
+ 
+@@ -2435,6 +2435,8 @@ BPF_CALL_3(bpf_clone_redirect, struct sk_buff *, skb, u32, ifindex, u64, flags)
+ 	struct sk_buff *clone;
+ 	int ret;
+ 
++	BUILD_BUG_ON(BPF_F_REDIRECT_INTERNAL & BPF_F_REDIRECT_FLAGS);
++
+ 	if (unlikely(flags & (~(BPF_F_INGRESS) | BPF_F_REDIRECT_INTERNAL)))
+ 		return -EINVAL;
+ 
+@@ -6221,24 +6223,16 @@ BPF_CALL_5(bpf_skb_check_mtu, struct sk_buff *, skb,
+ {
+ 	int ret = BPF_MTU_CHK_RET_FRAG_NEEDED;
+ 	struct net_device *dev = skb->dev;
+-	int skb_len, dev_len;
+-	int mtu = 0;
+-
+-	if (unlikely(flags & ~(BPF_MTU_CHK_SEGS))) {
+-		ret = -EINVAL;
+-		goto out;
+-	}
++	int mtu, dev_len, skb_len;
+ 
+-	if (unlikely(flags & BPF_MTU_CHK_SEGS && (len_diff || *mtu_len))) {
+-		ret = -EINVAL;
+-		goto out;
+-	}
++	if (unlikely(flags & ~(BPF_MTU_CHK_SEGS)))
++		return -EINVAL;
++	if (unlikely(flags & BPF_MTU_CHK_SEGS && (len_diff || *mtu_len)))
++		return -EINVAL;
+ 
+ 	dev = __dev_via_ifindex(dev, ifindex);
+-	if (unlikely(!dev)) {
+-		ret = -ENODEV;
+-		goto out;
+-	}
++	if (unlikely(!dev))
++		return -ENODEV;
+ 
+ 	mtu = READ_ONCE(dev->mtu);
+ 	dev_len = mtu + dev->hard_header_len;
+@@ -6273,19 +6267,15 @@ BPF_CALL_5(bpf_xdp_check_mtu, struct xdp_buff *, xdp,
+ 	struct net_device *dev = xdp->rxq->dev;
+ 	int xdp_len = xdp->data_end - xdp->data;
+ 	int ret = BPF_MTU_CHK_RET_SUCCESS;
+-	int mtu = 0, dev_len;
++	int mtu, dev_len;
+ 
+ 	/* XDP variant doesn't support multi-buffer segment check (yet) */
+-	if (unlikely(flags)) {
+-		ret = -EINVAL;
+-		goto out;
+-	}
++	if (unlikely(flags))
++		return -EINVAL;
+ 
+ 	dev = __dev_via_ifindex(dev, ifindex);
+-	if (unlikely(!dev)) {
+-		ret = -ENODEV;
+-		goto out;
+-	}
++	if (unlikely(!dev))
++		return -ENODEV;
+ 
+ 	mtu = READ_ONCE(dev->mtu);
+ 	dev_len = mtu + dev->hard_header_len;
+@@ -6297,7 +6287,7 @@ BPF_CALL_5(bpf_xdp_check_mtu, struct xdp_buff *, xdp,
+ 	xdp_len += len_diff; /* minus result pass check */
+ 	if (xdp_len > dev_len)
+ 		ret = BPF_MTU_CHK_RET_FRAG_NEEDED;
+-out:
++
+ 	*mtu_len = mtu;
+ 	return ret;
+ }
+@@ -6308,7 +6298,7 @@ static const struct bpf_func_proto bpf_skb_check_mtu_proto = {
+ 	.ret_type	= RET_INTEGER,
+ 	.arg1_type      = ARG_PTR_TO_CTX,
+ 	.arg2_type      = ARG_ANYTHING,
+-	.arg3_type      = ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_ALIGNED,
++	.arg3_type      = ARG_PTR_TO_FIXED_SIZE_MEM | MEM_WRITE | MEM_ALIGNED,
+ 	.arg3_size	= sizeof(u32),
+ 	.arg4_type      = ARG_ANYTHING,
+ 	.arg5_type      = ARG_ANYTHING,
+@@ -6320,7 +6310,7 @@ static const struct bpf_func_proto bpf_xdp_check_mtu_proto = {
+ 	.ret_type	= RET_INTEGER,
+ 	.arg1_type      = ARG_PTR_TO_CTX,
+ 	.arg2_type      = ARG_ANYTHING,
+-	.arg3_type      = ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_ALIGNED,
++	.arg3_type      = ARG_PTR_TO_FIXED_SIZE_MEM | MEM_WRITE | MEM_ALIGNED,
+ 	.arg3_size	= sizeof(u32),
+ 	.arg4_type      = ARG_ANYTHING,
+ 	.arg5_type      = ARG_ANYTHING,
+diff --git a/net/core/sock_map.c b/net/core/sock_map.c
+index 2afac40bb83ca1..2da881a8e7983a 100644
+--- a/net/core/sock_map.c
++++ b/net/core/sock_map.c
+@@ -644,6 +644,8 @@ BPF_CALL_4(bpf_sk_redirect_map, struct sk_buff *, skb,
+ 	sk = __sock_map_lookup_elem(map, key);
+ 	if (unlikely(!sk || !sock_map_redirect_allowed(sk)))
+ 		return SK_DROP;
++	if ((flags & BPF_F_INGRESS) && sk_is_vsock(sk))
++		return SK_DROP;
+ 
+ 	skb_bpf_set_redir(skb, sk, flags & BPF_F_INGRESS);
+ 	return SK_PASS;
+@@ -672,6 +674,8 @@ BPF_CALL_4(bpf_msg_redirect_map, struct sk_msg *, msg,
+ 		return SK_DROP;
+ 	if (!(flags & BPF_F_INGRESS) && !sk_is_tcp(sk))
+ 		return SK_DROP;
++	if (sk_is_vsock(sk))
++		return SK_DROP;
+ 
+ 	msg->flags = flags;
+ 	msg->sk_redir = sk;
+@@ -1246,6 +1250,8 @@ BPF_CALL_4(bpf_sk_redirect_hash, struct sk_buff *, skb,
+ 	sk = __sock_hash_lookup_elem(map, key);
+ 	if (unlikely(!sk || !sock_map_redirect_allowed(sk)))
+ 		return SK_DROP;
++	if ((flags & BPF_F_INGRESS) && sk_is_vsock(sk))
++		return SK_DROP;
+ 
+ 	skb_bpf_set_redir(skb, sk, flags & BPF_F_INGRESS);
+ 	return SK_PASS;
+@@ -1274,6 +1280,8 @@ BPF_CALL_4(bpf_msg_redirect_hash, struct sk_msg *, msg,
+ 		return SK_DROP;
+ 	if (!(flags & BPF_F_INGRESS) && !sk_is_tcp(sk))
+ 		return SK_DROP;
++	if (sk_is_vsock(sk))
++		return SK_DROP;
+ 
+ 	msg->flags = flags;
+ 	msg->sk_redir = sk;
+diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
+index cb0c80328eebf3..4822f68edbf08b 100644
+--- a/net/ipv4/devinet.c
++++ b/net/ipv4/devinet.c
+@@ -283,17 +283,19 @@ static struct in_device *inetdev_init(struct net_device *dev)
+ 	/* Account for reference dev->ip_ptr (below) */
+ 	refcount_set(&in_dev->refcnt, 1);
+ 
+-	err = devinet_sysctl_register(in_dev);
+-	if (err) {
+-		in_dev->dead = 1;
+-		neigh_parms_release(&arp_tbl, in_dev->arp_parms);
+-		in_dev_put(in_dev);
+-		in_dev = NULL;
+-		goto out;
++	if (dev != blackhole_netdev) {
++		err = devinet_sysctl_register(in_dev);
++		if (err) {
++			in_dev->dead = 1;
++			neigh_parms_release(&arp_tbl, in_dev->arp_parms);
++			in_dev_put(in_dev);
++			in_dev = NULL;
++			goto out;
++		}
++		ip_mc_init_dev(in_dev);
++		if (dev->flags & IFF_UP)
++			ip_mc_up(in_dev);
+ 	}
+-	ip_mc_init_dev(in_dev);
+-	if (dev->flags & IFF_UP)
+-		ip_mc_up(in_dev);
+ 
+ 	/* we can receive as soon as ip_ptr is set -- do this last */
+ 	rcu_assign_pointer(dev->ip_ptr, in_dev);
+@@ -332,6 +334,19 @@ static void inetdev_destroy(struct in_device *in_dev)
+ 	in_dev_put(in_dev);
+ }
+ 
++static int __init inet_blackhole_dev_init(void)
++{
++	int err = 0;
++
++	rtnl_lock();
++	if (!inetdev_init(blackhole_netdev))
++		err = -ENOMEM;
++	rtnl_unlock();
++
++	return err;
++}
++late_initcall(inet_blackhole_dev_init);
++
+ int inet_addr_onlink(struct in_device *in_dev, __be32 a, __be32 b)
+ {
+ 	const struct in_ifaddr *ifa;
+diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
+index 8720f3840b6985..ca8cc0988b618c 100644
+--- a/net/ipv4/inet_connection_sock.c
++++ b/net/ipv4/inet_connection_sock.c
+@@ -980,21 +980,31 @@ static bool reqsk_queue_unlink(struct request_sock *req)
+ 		found = __sk_nulls_del_node_init_rcu(sk);
+ 		spin_unlock(lock);
+ 	}
+-	if (timer_pending(&req->rsk_timer) && del_timer_sync(&req->rsk_timer))
+-		reqsk_put(req);
++
+ 	return found;
+ }
+ 
+-bool inet_csk_reqsk_queue_drop(struct sock *sk, struct request_sock *req)
++static bool __inet_csk_reqsk_queue_drop(struct sock *sk,
++					struct request_sock *req,
++					bool from_timer)
+ {
+ 	bool unlinked = reqsk_queue_unlink(req);
+ 
++	if (!from_timer && timer_delete_sync(&req->rsk_timer))
++		reqsk_put(req);
++
+ 	if (unlinked) {
+ 		reqsk_queue_removed(&inet_csk(sk)->icsk_accept_queue, req);
+ 		reqsk_put(req);
+ 	}
++
+ 	return unlinked;
+ }
++
++bool inet_csk_reqsk_queue_drop(struct sock *sk, struct request_sock *req)
++{
++	return __inet_csk_reqsk_queue_drop(sk, req, false);
++}
+ EXPORT_SYMBOL(inet_csk_reqsk_queue_drop);
+ 
+ void inet_csk_reqsk_queue_drop_and_put(struct sock *sk, struct request_sock *req)
+@@ -1087,7 +1097,7 @@ static void reqsk_timer_handler(struct timer_list *t)
+ 
+ 		if (!inet_ehash_insert(req_to_sk(nreq), req_to_sk(oreq), NULL)) {
+ 			/* delete timer */
+-			inet_csk_reqsk_queue_drop(sk_listener, nreq);
++			__inet_csk_reqsk_queue_drop(sk_listener, nreq, true);
+ 			goto no_ownership;
+ 		}
+ 
+@@ -1113,7 +1123,8 @@ static void reqsk_timer_handler(struct timer_list *t)
+ 	}
+ 
+ drop:
+-	inet_csk_reqsk_queue_drop_and_put(oreq->rsk_listener, oreq);
++	__inet_csk_reqsk_queue_drop(sk_listener, oreq, true);
++	reqsk_put(req);
+ }
+ 
+ static bool reqsk_queue_hash_req(struct request_sock *req,
+diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
+index c33bca2c384154..63bbc7f6a5a883 100644
+--- a/net/ipv4/xfrm4_policy.c
++++ b/net/ipv4/xfrm4_policy.c
+@@ -17,47 +17,43 @@
+ #include <net/ip.h>
+ #include <net/l3mdev.h>
+ 
+-static struct dst_entry *__xfrm4_dst_lookup(struct net *net, struct flowi4 *fl4,
+-					    int tos, int oif,
+-					    const xfrm_address_t *saddr,
+-					    const xfrm_address_t *daddr,
+-					    u32 mark)
++static struct dst_entry *__xfrm4_dst_lookup(struct flowi4 *fl4,
++					    const struct xfrm_dst_lookup_params *params)
+ {
+ 	struct rtable *rt;
+ 
+ 	memset(fl4, 0, sizeof(*fl4));
+-	fl4->daddr = daddr->a4;
+-	fl4->flowi4_tos = tos;
+-	fl4->flowi4_l3mdev = l3mdev_master_ifindex_by_index(net, oif);
+-	fl4->flowi4_mark = mark;
+-	if (saddr)
+-		fl4->saddr = saddr->a4;
+-
+-	rt = __ip_route_output_key(net, fl4);
++	fl4->daddr = params->daddr->a4;
++	fl4->flowi4_tos = params->tos;
++	fl4->flowi4_l3mdev = l3mdev_master_ifindex_by_index(params->net,
++							    params->oif);
++	fl4->flowi4_mark = params->mark;
++	if (params->saddr)
++		fl4->saddr = params->saddr->a4;
++	fl4->flowi4_proto = params->ipproto;
++	fl4->uli = params->uli;
++
++	rt = __ip_route_output_key(params->net, fl4);
+ 	if (!IS_ERR(rt))
+ 		return &rt->dst;
+ 
+ 	return ERR_CAST(rt);
+ }
+ 
+-static struct dst_entry *xfrm4_dst_lookup(struct net *net, int tos, int oif,
+-					  const xfrm_address_t *saddr,
+-					  const xfrm_address_t *daddr,
+-					  u32 mark)
++static struct dst_entry *xfrm4_dst_lookup(const struct xfrm_dst_lookup_params *params)
+ {
+ 	struct flowi4 fl4;
+ 
+-	return __xfrm4_dst_lookup(net, &fl4, tos, oif, saddr, daddr, mark);
++	return __xfrm4_dst_lookup(&fl4, params);
+ }
+ 
+-static int xfrm4_get_saddr(struct net *net, int oif,
+-			   xfrm_address_t *saddr, xfrm_address_t *daddr,
+-			   u32 mark)
++static int xfrm4_get_saddr(xfrm_address_t *saddr,
++			   const struct xfrm_dst_lookup_params *params)
+ {
+ 	struct dst_entry *dst;
+ 	struct flowi4 fl4;
+ 
+-	dst = __xfrm4_dst_lookup(net, &fl4, 0, oif, NULL, daddr, mark);
++	dst = __xfrm4_dst_lookup(&fl4, params);
+ 	if (IS_ERR(dst))
+ 		return -EHOSTUNREACH;
+ 
+diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
+index 444b0b4469a49e..4cd625af91e6ce 100644
+--- a/net/ipv6/xfrm6_policy.c
++++ b/net/ipv6/xfrm6_policy.c
+@@ -23,23 +23,24 @@
+ #include <net/ip6_route.h>
+ #include <net/l3mdev.h>
+ 
+-static struct dst_entry *xfrm6_dst_lookup(struct net *net, int tos, int oif,
+-					  const xfrm_address_t *saddr,
+-					  const xfrm_address_t *daddr,
+-					  u32 mark)
++static struct dst_entry *xfrm6_dst_lookup(const struct xfrm_dst_lookup_params *params)
+ {
+ 	struct flowi6 fl6;
+ 	struct dst_entry *dst;
+ 	int err;
+ 
+ 	memset(&fl6, 0, sizeof(fl6));
+-	fl6.flowi6_l3mdev = l3mdev_master_ifindex_by_index(net, oif);
+-	fl6.flowi6_mark = mark;
+-	memcpy(&fl6.daddr, daddr, sizeof(fl6.daddr));
+-	if (saddr)
+-		memcpy(&fl6.saddr, saddr, sizeof(fl6.saddr));
++	fl6.flowi6_l3mdev = l3mdev_master_ifindex_by_index(params->net,
++							   params->oif);
++	fl6.flowi6_mark = params->mark;
++	memcpy(&fl6.daddr, params->daddr, sizeof(fl6.daddr));
++	if (params->saddr)
++		memcpy(&fl6.saddr, params->saddr, sizeof(fl6.saddr));
+ 
+-	dst = ip6_route_output(net, NULL, &fl6);
++	fl6.flowi4_proto = params->ipproto;
++	fl6.uli = params->uli;
++
++	dst = ip6_route_output(params->net, NULL, &fl6);
+ 
+ 	err = dst->error;
+ 	if (dst->error) {
+@@ -50,15 +51,14 @@ static struct dst_entry *xfrm6_dst_lookup(struct net *net, int tos, int oif,
+ 	return dst;
+ }
+ 
+-static int xfrm6_get_saddr(struct net *net, int oif,
+-			   xfrm_address_t *saddr, xfrm_address_t *daddr,
+-			   u32 mark)
++static int xfrm6_get_saddr(xfrm_address_t *saddr,
++			   const struct xfrm_dst_lookup_params *params)
+ {
+ 	struct dst_entry *dst;
+ 	struct net_device *dev;
+ 	struct inet6_dev *idev;
+ 
+-	dst = xfrm6_dst_lookup(net, 0, oif, NULL, daddr, mark);
++	dst = xfrm6_dst_lookup(params);
+ 	if (IS_ERR(dst))
+ 		return -EHOSTUNREACH;
+ 
+@@ -68,7 +68,8 @@ static int xfrm6_get_saddr(struct net *net, int oif,
+ 		return -EHOSTUNREACH;
+ 	}
+ 	dev = idev->dev;
+-	ipv6_dev_get_saddr(dev_net(dev), dev, &daddr->in6, 0, &saddr->in6);
++	ipv6_dev_get_saddr(dev_net(dev), dev, &params->daddr->in6, 0,
++			   &saddr->in6);
+ 	dst_release(dst);
+ 	return 0;
+ }
+diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c
+index a901fd14fe3bfe..e27e00cb16c6b1 100644
+--- a/net/l2tp/l2tp_netlink.c
++++ b/net/l2tp/l2tp_netlink.c
+@@ -115,7 +115,7 @@ static int l2tp_tunnel_notify(struct genl_family *family,
+ 				  NLM_F_ACK, tunnel, cmd);
+ 
+ 	if (ret >= 0) {
+-		ret = genlmsg_multicast_allns(family, msg, 0, 0, GFP_ATOMIC);
++		ret = genlmsg_multicast_allns(family, msg, 0, 0);
+ 		/* We don't care if no one is listening */
+ 		if (ret == -ESRCH)
+ 			ret = 0;
+@@ -143,7 +143,7 @@ static int l2tp_session_notify(struct genl_family *family,
+ 				   NLM_F_ACK, session, cmd);
+ 
+ 	if (ret >= 0) {
+-		ret = genlmsg_multicast_allns(family, msg, 0, 0, GFP_ATOMIC);
++		ret = genlmsg_multicast_allns(family, msg, 0, 0);
+ 		/* We don't care if no one is listening */
+ 		if (ret == -ESRCH)
+ 			ret = 0;
+diff --git a/net/netfilter/nf_bpf_link.c b/net/netfilter/nf_bpf_link.c
+index 0e4beae421f830..2aad0562a41351 100644
+--- a/net/netfilter/nf_bpf_link.c
++++ b/net/netfilter/nf_bpf_link.c
+@@ -23,6 +23,7 @@ static unsigned int nf_hook_run_bpf(void *bpf_prog, struct sk_buff *skb,
+ struct bpf_nf_link {
+ 	struct bpf_link link;
+ 	struct nf_hook_ops hook_ops;
++	netns_tracker ns_tracker;
+ 	struct net *net;
+ 	u32 dead;
+ 	const struct nf_defrag_hook *defrag_hook;
+@@ -120,6 +121,7 @@ static void bpf_nf_link_release(struct bpf_link *link)
+ 	if (!cmpxchg(&nf_link->dead, 0, 1)) {
+ 		nf_unregister_net_hook(nf_link->net, &nf_link->hook_ops);
+ 		bpf_nf_disable_defrag(nf_link);
++		put_net_track(nf_link->net, &nf_link->ns_tracker);
+ 	}
+ }
+ 
+@@ -150,11 +152,12 @@ static int bpf_nf_link_fill_link_info(const struct bpf_link *link,
+ 				      struct bpf_link_info *info)
+ {
+ 	struct bpf_nf_link *nf_link = container_of(link, struct bpf_nf_link, link);
++	const struct nf_defrag_hook *hook = nf_link->defrag_hook;
+ 
+ 	info->netfilter.pf = nf_link->hook_ops.pf;
+ 	info->netfilter.hooknum = nf_link->hook_ops.hooknum;
+ 	info->netfilter.priority = nf_link->hook_ops.priority;
+-	info->netfilter.flags = 0;
++	info->netfilter.flags = hook ? BPF_F_NETFILTER_IP_DEFRAG : 0;
+ 
+ 	return 0;
+ }
+@@ -257,6 +260,8 @@ int bpf_nf_link_attach(const union bpf_attr *attr, struct bpf_prog *prog)
+ 		return err;
+ 	}
+ 
++	get_net_track(net, &link->ns_tracker, GFP_KERNEL);
++
+ 	return bpf_link_settle(&link_primer);
+ }
+ 
+diff --git a/net/netfilter/xt_NFLOG.c b/net/netfilter/xt_NFLOG.c
+index d80abd6ccaf8f7..6dcf4bc7e30b2a 100644
+--- a/net/netfilter/xt_NFLOG.c
++++ b/net/netfilter/xt_NFLOG.c
+@@ -79,7 +79,7 @@ static struct xt_target nflog_tg_reg[] __read_mostly = {
+ 	{
+ 		.name       = "NFLOG",
+ 		.revision   = 0,
+-		.family     = NFPROTO_IPV4,
++		.family     = NFPROTO_IPV6,
+ 		.checkentry = nflog_tg_check,
+ 		.destroy    = nflog_tg_destroy,
+ 		.target     = nflog_tg,
+diff --git a/net/netfilter/xt_TRACE.c b/net/netfilter/xt_TRACE.c
+index f3fa4f11348cd8..a642ff09fc8e8c 100644
+--- a/net/netfilter/xt_TRACE.c
++++ b/net/netfilter/xt_TRACE.c
+@@ -49,6 +49,7 @@ static struct xt_target trace_tg_reg[] __read_mostly = {
+ 		.target		= trace_tg,
+ 		.checkentry	= trace_tg_check,
+ 		.destroy	= trace_tg_destroy,
++		.me		= THIS_MODULE,
+ 	},
+ #endif
+ };
+diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
+index f76fe04fc9a4e1..65b965ca40ea7e 100644
+--- a/net/netfilter/xt_mark.c
++++ b/net/netfilter/xt_mark.c
+@@ -62,7 +62,7 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
+ 	{
+ 		.name           = "MARK",
+ 		.revision       = 2,
+-		.family         = NFPROTO_IPV4,
++		.family         = NFPROTO_IPV6,
+ 		.target         = mark_tg,
+ 		.targetsize     = sizeof(struct xt_mark_tginfo2),
+ 		.me             = THIS_MODULE,
+diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
+index d41c4a936ad0c9..d6eee5140c8be1 100644
+--- a/net/netlink/genetlink.c
++++ b/net/netlink/genetlink.c
+@@ -1355,15 +1355,11 @@ static int genl_ctrl_event(int event, const struct genl_family *family,
+ 	if (IS_ERR(msg))
+ 		return PTR_ERR(msg);
+ 
+-	if (!family->netnsok) {
++	if (!family->netnsok)
+ 		genlmsg_multicast_netns(&genl_ctrl, &init_net, msg, 0,
+ 					0, GFP_KERNEL);
+-	} else {
+-		rcu_read_lock();
+-		genlmsg_multicast_allns(&genl_ctrl, msg, 0,
+-					0, GFP_ATOMIC);
+-		rcu_read_unlock();
+-	}
++	else
++		genlmsg_multicast_allns(&genl_ctrl, msg, 0, 0);
+ 
+ 	return 0;
+ }
+@@ -1752,23 +1748,23 @@ static int __init genl_init(void)
+ 
+ core_initcall(genl_init);
+ 
+-static int genlmsg_mcast(struct sk_buff *skb, u32 portid, unsigned long group,
+-			 gfp_t flags)
++static int genlmsg_mcast(struct sk_buff *skb, u32 portid, unsigned long group)
+ {
+ 	struct sk_buff *tmp;
+ 	struct net *net, *prev = NULL;
+ 	bool delivered = false;
+ 	int err;
+ 
++	rcu_read_lock();
+ 	for_each_net_rcu(net) {
+ 		if (prev) {
+-			tmp = skb_clone(skb, flags);
++			tmp = skb_clone(skb, GFP_ATOMIC);
+ 			if (!tmp) {
+ 				err = -ENOMEM;
+ 				goto error;
+ 			}
+ 			err = nlmsg_multicast(prev->genl_sock, tmp,
+-					      portid, group, flags);
++					      portid, group, GFP_ATOMIC);
+ 			if (!err)
+ 				delivered = true;
+ 			else if (err != -ESRCH)
+@@ -1777,27 +1773,31 @@ static int genlmsg_mcast(struct sk_buff *skb, u32 portid, unsigned long group,
+ 
+ 		prev = net;
+ 	}
++	err = nlmsg_multicast(prev->genl_sock, skb, portid, group, GFP_ATOMIC);
++
++	rcu_read_unlock();
+ 
+-	err = nlmsg_multicast(prev->genl_sock, skb, portid, group, flags);
+ 	if (!err)
+ 		delivered = true;
+ 	else if (err != -ESRCH)
+ 		return err;
+ 	return delivered ? 0 : -ESRCH;
+  error:
++	rcu_read_unlock();
++
+ 	kfree_skb(skb);
+ 	return err;
+ }
+ 
+ int genlmsg_multicast_allns(const struct genl_family *family,
+ 			    struct sk_buff *skb, u32 portid,
+-			    unsigned int group, gfp_t flags)
++			    unsigned int group)
+ {
+ 	if (WARN_ON_ONCE(group >= family->n_mcgrps))
+ 		return -EINVAL;
+ 
+ 	group = family->mcgrp_offset + group;
+-	return genlmsg_mcast(skb, portid, group, flags);
++	return genlmsg_mcast(skb, portid, group);
+ }
+ EXPORT_SYMBOL(genlmsg_multicast_allns);
+ 
+diff --git a/net/sched/act_api.c b/net/sched/act_api.c
+index 2d6d58e1b278a1..4572aa6e0273f8 100644
+--- a/net/sched/act_api.c
++++ b/net/sched/act_api.c
+@@ -1489,8 +1489,29 @@ int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla,
+ 			bool skip_sw = tc_skip_sw(fl_flags);
+ 			bool skip_hw = tc_skip_hw(fl_flags);
+ 
+-			if (tc_act_bind(act->tcfa_flags))
++			if (tc_act_bind(act->tcfa_flags)) {
++				/* Action is created by classifier and is not
++				 * standalone. Check that the user did not set
++				 * any action flags different than the
++				 * classifier flags, and inherit the flags from
++				 * the classifier for the compatibility case
++				 * where no flags were specified at all.
++				 */
++				if ((tc_act_skip_sw(act->tcfa_flags) && !skip_sw) ||
++				    (tc_act_skip_hw(act->tcfa_flags) && !skip_hw)) {
++					NL_SET_ERR_MSG(extack,
++						       "Mismatch between action and filter offload flags");
++					err = -EINVAL;
++					goto err;
++				}
++				if (skip_sw)
++					act->tcfa_flags |= TCA_ACT_FLAGS_SKIP_SW;
++				if (skip_hw)
++					act->tcfa_flags |= TCA_ACT_FLAGS_SKIP_HW;
+ 				continue;
++			}
++
++			/* Action is standalone */
+ 			if (skip_sw != tc_act_skip_sw(act->tcfa_flags) ||
+ 			    skip_hw != tc_act_skip_hw(act->tcfa_flags)) {
+ 				NL_SET_ERR_MSG(extack,
+diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
+index 6ab9359c1706f1..b51af871a621ca 100644
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -505,19 +505,28 @@ static void dev_watchdog(struct timer_list *t)
+ 			unsigned int timedout_ms = 0;
+ 			unsigned int i;
+ 			unsigned long trans_start;
++			unsigned long oldest_start = jiffies;
+ 
+ 			for (i = 0; i < dev->num_tx_queues; i++) {
+ 				struct netdev_queue *txq;
+ 
+ 				txq = netdev_get_tx_queue(dev, i);
++				if (!netif_xmit_stopped(txq))
++					continue;
++
++				/* Paired with WRITE_ONCE() + smp_mb...() in
++				 * netdev_tx_sent_queue() and netif_tx_stop_queue().
++				 */
++				smp_mb();
+ 				trans_start = READ_ONCE(txq->trans_start);
+-				if (netif_xmit_stopped(txq) &&
+-				    time_after(jiffies, (trans_start +
+-							 dev->watchdog_timeo))) {
++
++				if (time_after(jiffies, trans_start + dev->watchdog_timeo)) {
+ 					timedout_ms = jiffies_to_msecs(jiffies - trans_start);
+ 					atomic_long_inc(&txq->trans_timeout);
+ 					break;
+ 				}
++				if (time_after(oldest_start, trans_start))
++					oldest_start = trans_start;
+ 			}
+ 
+ 			if (unlikely(timedout_ms)) {
+@@ -530,7 +539,7 @@ static void dev_watchdog(struct timer_list *t)
+ 				netif_unfreeze_queues(dev);
+ 			}
+ 			if (!mod_timer(&dev->watchdog_timer,
+-				       round_jiffies(jiffies +
++				       round_jiffies(oldest_start +
+ 						     dev->watchdog_timeo)))
+ 				release = false;
+ 		}
+diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
+index 87090d67903621..951a87909c2974 100644
+--- a/net/sched/sch_taprio.c
++++ b/net/sched/sch_taprio.c
+@@ -1988,7 +1988,8 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt,
+ 
+ 		taprio_start_sched(sch, start, new_admin);
+ 
+-		rcu_assign_pointer(q->admin_sched, new_admin);
++		admin = rcu_replace_pointer(q->admin_sched, new_admin,
++					    lockdep_rtnl_is_held());
+ 		if (admin)
+ 			call_rcu(&admin->rcu, taprio_free_sched_cb);
+ 
+@@ -2396,9 +2397,6 @@ static int taprio_dump(struct Qdisc *sch, struct sk_buff *skb)
+ 	struct tc_mqprio_qopt opt = { 0 };
+ 	struct nlattr *nest, *sched_nest;
+ 
+-	oper = rtnl_dereference(q->oper_sched);
+-	admin = rtnl_dereference(q->admin_sched);
+-
+ 	mqprio_qopt_reconstruct(dev, &opt);
+ 
+ 	nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
+@@ -2419,18 +2417,23 @@ static int taprio_dump(struct Qdisc *sch, struct sk_buff *skb)
+ 	    nla_put_u32(skb, TCA_TAPRIO_ATTR_TXTIME_DELAY, q->txtime_delay))
+ 		goto options_error;
+ 
++	rcu_read_lock();
++
++	oper = rtnl_dereference(q->oper_sched);
++	admin = rtnl_dereference(q->admin_sched);
++
+ 	if (oper && taprio_dump_tc_entries(skb, q, oper))
+-		goto options_error;
++		goto options_error_rcu;
+ 
+ 	if (oper && dump_schedule(skb, oper))
+-		goto options_error;
++		goto options_error_rcu;
+ 
+ 	if (!admin)
+ 		goto done;
+ 
+ 	sched_nest = nla_nest_start_noflag(skb, TCA_TAPRIO_ATTR_ADMIN_SCHED);
+ 	if (!sched_nest)
+-		goto options_error;
++		goto options_error_rcu;
+ 
+ 	if (dump_schedule(skb, admin))
+ 		goto admin_error;
+@@ -2438,11 +2441,15 @@ static int taprio_dump(struct Qdisc *sch, struct sk_buff *skb)
+ 	nla_nest_end(skb, sched_nest);
+ 
+ done:
++	rcu_read_unlock();
+ 	return nla_nest_end(skb, nest);
+ 
+ admin_error:
+ 	nla_nest_cancel(skb, sched_nest);
+ 
++options_error_rcu:
++	rcu_read_unlock();
++
+ options_error:
+ 	nla_nest_cancel(skb, nest);
+ 
+diff --git a/net/smc/smc_pnet.c b/net/smc/smc_pnet.c
+index 306b536fa89e98..284cec1e20ec11 100644
+--- a/net/smc/smc_pnet.c
++++ b/net/smc/smc_pnet.c
+@@ -753,7 +753,7 @@ static int smc_pnet_add_pnetid(struct net *net, u8 *pnetid)
+ 
+ 	write_lock(&sn->pnetids_ndev.lock);
+ 	list_for_each_entry(pi, &sn->pnetids_ndev.list, list) {
+-		if (smc_pnet_match(pnetid, pe->pnetid)) {
++		if (smc_pnet_match(pnetid, pi->pnetid)) {
+ 			refcount_inc(&pi->refcnt);
+ 			kfree(pe);
+ 			goto unlock;
+diff --git a/net/smc/smc_wr.c b/net/smc/smc_wr.c
+index 0021065a600a03..994c0cd4fddbf1 100644
+--- a/net/smc/smc_wr.c
++++ b/net/smc/smc_wr.c
+@@ -648,8 +648,10 @@ void smc_wr_free_link(struct smc_link *lnk)
+ 	smc_wr_tx_wait_no_pending_sends(lnk);
+ 	percpu_ref_kill(&lnk->wr_reg_refs);
+ 	wait_for_completion(&lnk->reg_ref_comp);
++	percpu_ref_exit(&lnk->wr_reg_refs);
+ 	percpu_ref_kill(&lnk->wr_tx_refs);
+ 	wait_for_completion(&lnk->tx_ref_comp);
++	percpu_ref_exit(&lnk->wr_tx_refs);
+ 
+ 	if (lnk->wr_rx_dma_addr) {
+ 		ib_dma_unmap_single(ibdev, lnk->wr_rx_dma_addr,
+@@ -912,11 +914,13 @@ int smc_wr_create_link(struct smc_link *lnk)
+ 	init_waitqueue_head(&lnk->wr_reg_wait);
+ 	rc = percpu_ref_init(&lnk->wr_reg_refs, smcr_wr_reg_refs_free, 0, GFP_KERNEL);
+ 	if (rc)
+-		goto dma_unmap;
++		goto cancel_ref;
+ 	init_completion(&lnk->reg_ref_comp);
+ 	init_waitqueue_head(&lnk->wr_rx_empty_wait);
+ 	return rc;
+ 
++cancel_ref:
++	percpu_ref_exit(&lnk->wr_tx_refs);
+ dma_unmap:
+ 	if (lnk->wr_rx_v2_dma_addr) {
+ 		ib_dma_unmap_single(ibdev, lnk->wr_rx_v2_dma_addr,
+diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
+index e87fd9480acdac..78b5f4f8808b92 100644
+--- a/net/vmw_vsock/virtio_transport_common.c
++++ b/net/vmw_vsock/virtio_transport_common.c
+@@ -1508,6 +1508,7 @@ int virtio_transport_read_skb(struct vsock_sock *vsk, skb_read_actor_t recv_acto
+ {
+ 	struct virtio_vsock_sock *vvs = vsk->trans;
+ 	struct sock *sk = sk_vsock(vsk);
++	struct virtio_vsock_hdr *hdr;
+ 	struct sk_buff *skb;
+ 	int off = 0;
+ 	int err;
+@@ -1517,10 +1518,19 @@ int virtio_transport_read_skb(struct vsock_sock *vsk, skb_read_actor_t recv_acto
+ 	 * works for types other than dgrams.
+ 	 */
+ 	skb = __skb_recv_datagram(sk, &vvs->rx_queue, MSG_DONTWAIT, &off, &err);
++	if (!skb) {
++		spin_unlock_bh(&vvs->rx_lock);
++		return err;
++	}
++
++	hdr = virtio_vsock_hdr(skb);
++	if (le32_to_cpu(hdr->flags) & VIRTIO_VSOCK_SEQ_EOM)
++		vvs->msg_count--;
++
++	virtio_transport_dec_rx_pkt(vvs, le32_to_cpu(hdr->len));
+ 	spin_unlock_bh(&vvs->rx_lock);
+ 
+-	if (!skb)
+-		return err;
++	virtio_transport_send_credit_update(vsk);
+ 
+ 	return recv_actor(sk, skb);
+ }
+diff --git a/net/vmw_vsock/vsock_bpf.c b/net/vmw_vsock/vsock_bpf.c
+index c42c5cc18f3241..4aa6e74ec2957b 100644
+--- a/net/vmw_vsock/vsock_bpf.c
++++ b/net/vmw_vsock/vsock_bpf.c
+@@ -114,14 +114,6 @@ static int vsock_bpf_recvmsg(struct sock *sk, struct msghdr *msg,
+ 	return copied;
+ }
+ 
+-/* Copy of original proto with updated sock_map methods */
+-static struct proto vsock_bpf_prot = {
+-	.close = sock_map_close,
+-	.recvmsg = vsock_bpf_recvmsg,
+-	.sock_is_readable = sk_msg_is_readable,
+-	.unhash = sock_map_unhash,
+-};
+-
+ static void vsock_bpf_rebuild_protos(struct proto *prot, const struct proto *base)
+ {
+ 	*prot        = *base;
+diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
+index 9e74f249cb45f1..79790730366985 100644
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -17905,10 +17905,8 @@ void nl80211_common_reg_change_event(enum nl80211_commands cmd_id,
+ 
+ 	genlmsg_end(msg, hdr);
+ 
+-	rcu_read_lock();
+ 	genlmsg_multicast_allns(&nl80211_fam, msg, 0,
+-				NL80211_MCGRP_REGULATORY, GFP_ATOMIC);
+-	rcu_read_unlock();
++				NL80211_MCGRP_REGULATORY);
+ 
+ 	return;
+ 
+@@ -18605,10 +18603,8 @@ void nl80211_send_beacon_hint_event(struct wiphy *wiphy,
+ 
+ 	genlmsg_end(msg, hdr);
+ 
+-	rcu_read_lock();
+ 	genlmsg_multicast_allns(&nl80211_fam, msg, 0,
+-				NL80211_MCGRP_REGULATORY, GFP_ATOMIC);
+-	rcu_read_unlock();
++				NL80211_MCGRP_REGULATORY);
+ 
+ 	return;
+ 
+diff --git a/net/xfrm/xfrm_device.c b/net/xfrm/xfrm_device.c
+index 6346690d5c699d..04dc0c8a837076 100644
+--- a/net/xfrm/xfrm_device.c
++++ b/net/xfrm/xfrm_device.c
+@@ -263,6 +263,8 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x,
+ 
+ 	dev = dev_get_by_index(net, xuo->ifindex);
+ 	if (!dev) {
++		struct xfrm_dst_lookup_params params;
++
+ 		if (!(xuo->flags & XFRM_OFFLOAD_INBOUND)) {
+ 			saddr = &x->props.saddr;
+ 			daddr = &x->id.daddr;
+@@ -271,9 +273,12 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x,
+ 			daddr = &x->props.saddr;
+ 		}
+ 
+-		dst = __xfrm_dst_lookup(net, 0, 0, saddr, daddr,
+-					x->props.family,
+-					xfrm_smark_get(0, x));
++		memset(&params, 0, sizeof(params));
++		params.net = net;
++		params.saddr = saddr;
++		params.daddr = daddr;
++		params.mark = xfrm_smark_get(0, x);
++		dst = __xfrm_dst_lookup(x->props.family, &params);
+ 		if (IS_ERR(dst))
+ 			return (is_packet_offload) ? -EINVAL : 0;
+ 
+diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
+index b699cc2ec35ac3..d788baffbf104e 100644
+--- a/net/xfrm/xfrm_policy.c
++++ b/net/xfrm/xfrm_policy.c
+@@ -251,10 +251,8 @@ static const struct xfrm_if_cb *xfrm_if_get_cb(void)
+ 	return rcu_dereference(xfrm_if_cb);
+ }
+ 
+-struct dst_entry *__xfrm_dst_lookup(struct net *net, int tos, int oif,
+-				    const xfrm_address_t *saddr,
+-				    const xfrm_address_t *daddr,
+-				    int family, u32 mark)
++struct dst_entry *__xfrm_dst_lookup(int family,
++				    const struct xfrm_dst_lookup_params *params)
+ {
+ 	const struct xfrm_policy_afinfo *afinfo;
+ 	struct dst_entry *dst;
+@@ -263,7 +261,7 @@ struct dst_entry *__xfrm_dst_lookup(struct net *net, int tos, int oif,
+ 	if (unlikely(afinfo == NULL))
+ 		return ERR_PTR(-EAFNOSUPPORT);
+ 
+-	dst = afinfo->dst_lookup(net, tos, oif, saddr, daddr, mark);
++	dst = afinfo->dst_lookup(params);
+ 
+ 	rcu_read_unlock();
+ 
+@@ -277,6 +275,7 @@ static inline struct dst_entry *xfrm_dst_lookup(struct xfrm_state *x,
+ 						xfrm_address_t *prev_daddr,
+ 						int family, u32 mark)
+ {
++	struct xfrm_dst_lookup_params params;
+ 	struct net *net = xs_net(x);
+ 	xfrm_address_t *saddr = &x->props.saddr;
+ 	xfrm_address_t *daddr = &x->id.daddr;
+@@ -291,7 +290,29 @@ static inline struct dst_entry *xfrm_dst_lookup(struct xfrm_state *x,
+ 		daddr = x->coaddr;
+ 	}
+ 
+-	dst = __xfrm_dst_lookup(net, tos, oif, saddr, daddr, family, mark);
++	params.net = net;
++	params.saddr = saddr;
++	params.daddr = daddr;
++	params.tos = tos;
++	params.oif = oif;
++	params.mark = mark;
++	params.ipproto = x->id.proto;
++	if (x->encap) {
++		switch (x->encap->encap_type) {
++		case UDP_ENCAP_ESPINUDP:
++			params.ipproto = IPPROTO_UDP;
++			params.uli.ports.sport = x->encap->encap_sport;
++			params.uli.ports.dport = x->encap->encap_dport;
++			break;
++		case TCP_ENCAP_ESPINTCP:
++			params.ipproto = IPPROTO_TCP;
++			params.uli.ports.sport = x->encap->encap_sport;
++			params.uli.ports.dport = x->encap->encap_dport;
++			break;
++		}
++	}
++
++	dst = __xfrm_dst_lookup(family, &params);
+ 
+ 	if (!IS_ERR(dst)) {
+ 		if (prev_saddr != saddr)
+@@ -2424,15 +2445,15 @@ int __xfrm_sk_clone_policy(struct sock *sk, const struct sock *osk)
+ }
+ 
+ static int
+-xfrm_get_saddr(struct net *net, int oif, xfrm_address_t *local,
+-	       xfrm_address_t *remote, unsigned short family, u32 mark)
++xfrm_get_saddr(unsigned short family, xfrm_address_t *saddr,
++	       const struct xfrm_dst_lookup_params *params)
+ {
+ 	int err;
+ 	const struct xfrm_policy_afinfo *afinfo = xfrm_policy_get_afinfo(family);
+ 
+ 	if (unlikely(afinfo == NULL))
+ 		return -EINVAL;
+-	err = afinfo->get_saddr(net, oif, local, remote, mark);
++	err = afinfo->get_saddr(saddr, params);
+ 	rcu_read_unlock();
+ 	return err;
+ }
+@@ -2461,9 +2482,14 @@ xfrm_tmpl_resolve_one(struct xfrm_policy *policy, const struct flowi *fl,
+ 			remote = &tmpl->id.daddr;
+ 			local = &tmpl->saddr;
+ 			if (xfrm_addr_any(local, tmpl->encap_family)) {
+-				error = xfrm_get_saddr(net, fl->flowi_oif,
+-						       &tmp, remote,
+-						       tmpl->encap_family, 0);
++				struct xfrm_dst_lookup_params params;
++
++				memset(&params, 0, sizeof(params));
++				params.net = net;
++				params.oif = fl->flowi_oif;
++				params.daddr = remote;
++				error = xfrm_get_saddr(tmpl->encap_family, &tmp,
++						       &params);
+ 				if (error)
+ 					goto fail;
+ 				local = &tmp;
+diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
+index 979f23cded401a..1d91b42e799710 100644
+--- a/net/xfrm/xfrm_user.c
++++ b/net/xfrm/xfrm_user.c
+@@ -176,6 +176,7 @@ static int verify_newsa_info(struct xfrm_usersa_info *p,
+ 			     struct netlink_ext_ack *extack)
+ {
+ 	int err;
++	u16 family = p->sel.family;
+ 
+ 	err = -EINVAL;
+ 	switch (p->family) {
+@@ -196,7 +197,10 @@ static int verify_newsa_info(struct xfrm_usersa_info *p,
+ 		goto out;
+ 	}
+ 
+-	switch (p->sel.family) {
++	if (!family && !(p->flags & XFRM_STATE_AF_UNSPEC))
++		family = p->family;
++
++	switch (family) {
+ 	case AF_UNSPEC:
+ 		break;
+ 
+@@ -995,7 +999,9 @@ static int copy_to_user_auth(struct xfrm_algo_auth *auth, struct sk_buff *skb)
+ 	if (!nla)
+ 		return -EMSGSIZE;
+ 	ap = nla_data(nla);
+-	memcpy(ap, auth, sizeof(struct xfrm_algo_auth));
++	strscpy_pad(ap->alg_name, auth->alg_name, sizeof(ap->alg_name));
++	ap->alg_key_len = auth->alg_key_len;
++	ap->alg_trunc_len = auth->alg_trunc_len;
+ 	if (redact_secret && auth->alg_key_len)
+ 		memset(ap->alg_key, 0, (auth->alg_key_len + 7) / 8);
+ 	else
+diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
+index 2c23a5a2860860..54bc18e8164b32 100644
+--- a/security/selinux/selinuxfs.c
++++ b/security/selinux/selinuxfs.c
+@@ -582,11 +582,18 @@ static ssize_t sel_write_load(struct file *file, const char __user *buf,
+ 			      size_t count, loff_t *ppos)
+ 
+ {
+-	struct selinux_fs_info *fsi = file_inode(file)->i_sb->s_fs_info;
++	struct selinux_fs_info *fsi;
+ 	struct selinux_load_state load_state;
+ 	ssize_t length;
+ 	void *data = NULL;
+ 
++	/* no partial writes */
++	if (*ppos)
++		return -EINVAL;
++	/* no empty policies */
++	if (!count)
++		return -EINVAL;
++
+ 	mutex_lock(&selinux_state.policy_mutex);
+ 
+ 	length = avc_has_perm(current_sid(), SECINITSID_SECURITY,
+@@ -594,26 +601,22 @@ static ssize_t sel_write_load(struct file *file, const char __user *buf,
+ 	if (length)
+ 		goto out;
+ 
+-	/* No partial writes. */
+-	length = -EINVAL;
+-	if (*ppos != 0)
+-		goto out;
+-
+-	length = -ENOMEM;
+ 	data = vmalloc(count);
+-	if (!data)
++	if (!data) {
++		length = -ENOMEM;
+ 		goto out;
+-
+-	length = -EFAULT;
+-	if (copy_from_user(data, buf, count) != 0)
++	}
++	if (copy_from_user(data, buf, count) != 0) {
++		length = -EFAULT;
+ 		goto out;
++	}
+ 
+ 	length = security_load_policy(data, count, &load_state);
+ 	if (length) {
+ 		pr_warn_ratelimited("SELinux: failed to load policy\n");
+ 		goto out;
+ 	}
+-
++	fsi = file_inode(file)->i_sb->s_fs_info;
+ 	length = sel_make_policy_nodes(fsi, load_state.policy);
+ 	if (length) {
+ 		pr_warn_ratelimited("SELinux: failed to initialize selinuxfs\n");
+@@ -622,13 +625,12 @@ static ssize_t sel_write_load(struct file *file, const char __user *buf,
+ 	}
+ 
+ 	selinux_policy_commit(&load_state);
+-
+ 	length = count;
+-
+ 	audit_log(audit_context(), GFP_KERNEL, AUDIT_MAC_POLICY_LOAD,
+ 		"auid=%u ses=%u lsm=selinux res=1",
+ 		from_kuid(&init_user_ns, audit_get_loginuid(current)),
+ 		audit_get_sessionid(current));
++
+ out:
+ 	mutex_unlock(&selinux_state.policy_mutex);
+ 	vfree(data);
+diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c
+index 5f0f8d9c08d1e7..8c6254ff143eb4 100644
+--- a/sound/firewire/amdtp-stream.c
++++ b/sound/firewire/amdtp-stream.c
+@@ -172,6 +172,9 @@ static int apply_constraint_to_size(struct snd_pcm_hw_params *params,
+ 			step = max(step, amdtp_syt_intervals[i]);
+ 	}
+ 
++	if (step == 0)
++		return -EINVAL;
++
+ 	t.min = roundup(s->min, step);
+ 	t.max = rounddown(s->max, step);
+ 	t.integer = 1;
+diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
+index 9698ebe3fbc2e7..233b03bb4f9869 100644
+--- a/sound/pci/hda/Kconfig
++++ b/sound/pci/hda/Kconfig
+@@ -173,7 +173,7 @@ config SND_HDA_SCODEC_TAS2781_I2C
+ 	depends on SND_SOC
+ 	select SND_SOC_TAS2781_COMLIB
+ 	select SND_SOC_TAS2781_FMWLIB
+-	select CRC32_SARWATE
++	select CRC32
+ 	help
+ 	  Say Y or M here to include TAS2781 I2C HD-audio side codec support
+ 	  in snd-hda-intel driver, such as ALC287.
+diff --git a/sound/pci/hda/patch_cs8409.c b/sound/pci/hda/patch_cs8409.c
+index e41316e2e98338..892223d9e64aba 100644
+--- a/sound/pci/hda/patch_cs8409.c
++++ b/sound/pci/hda/patch_cs8409.c
+@@ -1411,8 +1411,9 @@ void dolphin_fixups(struct hda_codec *codec, const struct hda_fixup *fix, int ac
+ 		kctrl = snd_hda_gen_add_kctl(&spec->gen, "Line Out Playback Volume",
+ 					     &cs42l42_dac_volume_mixer);
+ 		/* Update Line Out kcontrol template */
+-		kctrl->private_value = HDA_COMPOSE_AMP_VAL_OFS(DOLPHIN_HP_PIN_NID, 3, CS8409_CODEC1,
+-				       HDA_OUTPUT, CS42L42_VOL_DAC) | HDA_AMP_VAL_MIN_MUTE;
++		if (kctrl)
++			kctrl->private_value = HDA_COMPOSE_AMP_VAL_OFS(DOLPHIN_HP_PIN_NID, 3, CS8409_CODEC1,
++					       HDA_OUTPUT, CS42L42_VOL_DAC) | HDA_AMP_VAL_MIN_MUTE;
+ 		cs8409_enable_ur(codec, 0);
+ 		snd_hda_codec_set_name(codec, "CS8409/CS42L42");
+ 		break;
+diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
+index 07e1547fff2e51..9be5a5c509f09a 100644
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -3857,20 +3857,18 @@ static void alc_default_init(struct hda_codec *codec)
+ 
+ 	hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);
+ 
+-	if (hp_pin_sense)
++	if (hp_pin_sense) {
+ 		msleep(2);
+ 
+-	snd_hda_codec_write(codec, hp_pin, 0,
+-			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
+-
+-	if (hp_pin_sense)
+-		msleep(85);
++		snd_hda_codec_write(codec, hp_pin, 0,
++				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
+ 
+-	snd_hda_codec_write(codec, hp_pin, 0,
+-			    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
++		msleep(75);
+ 
+-	if (hp_pin_sense)
+-		msleep(100);
++		snd_hda_codec_write(codec, hp_pin, 0,
++				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
++		msleep(75);
++	}
+ }
+ 
+ static void alc_default_shutup(struct hda_codec *codec)
+@@ -3886,22 +3884,20 @@ static void alc_default_shutup(struct hda_codec *codec)
+ 
+ 	hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);
+ 
+-	if (hp_pin_sense)
++	if (hp_pin_sense) {
+ 		msleep(2);
+ 
+-	snd_hda_codec_write(codec, hp_pin, 0,
+-			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
+-
+-	if (hp_pin_sense)
+-		msleep(85);
+-
+-	if (!spec->no_shutup_pins)
+ 		snd_hda_codec_write(codec, hp_pin, 0,
+-				    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
++				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
+ 
+-	if (hp_pin_sense)
+-		msleep(100);
++		msleep(75);
+ 
++		if (!spec->no_shutup_pins)
++			snd_hda_codec_write(codec, hp_pin, 0,
++					    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
++
++		msleep(75);
++	}
+ 	alc_auto_setup_eapd(codec, false);
+ 	alc_shutup_pins(codec);
+ }
+@@ -7362,6 +7358,7 @@ enum {
+ 	ALC286_FIXUP_ACER_AIO_HEADSET_MIC,
+ 	ALC256_FIXUP_ASUS_HEADSET_MIC,
+ 	ALC256_FIXUP_ASUS_MIC_NO_PRESENCE,
++	ALC255_FIXUP_PREDATOR_SUBWOOFER,
+ 	ALC299_FIXUP_PREDATOR_SPK,
+ 	ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE,
+ 	ALC289_FIXUP_DELL_SPK1,
+@@ -8709,6 +8706,13 @@ static const struct hda_fixup alc269_fixups[] = {
+ 		.chained = true,
+ 		.chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE
+ 	},
++	[ALC255_FIXUP_PREDATOR_SUBWOOFER] = {
++		.type = HDA_FIXUP_PINS,
++		.v.pins = (const struct hda_pintbl[]) {
++			{ 0x17, 0x90170151 }, /* use as internal speaker (LFE) */
++			{ 0x1b, 0x90170152 } /* use as internal speaker (back) */
++		}
++	},
+ 	[ALC299_FIXUP_PREDATOR_SPK] = {
+ 		.type = HDA_FIXUP_PINS,
+ 		.v.pins = (const struct hda_pintbl[]) {
+@@ -9682,6 +9686,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+ 	SND_PCI_QUIRK(0x1025, 0x110e, "Acer Aspire ES1-432", ALC255_FIXUP_ACER_MIC_NO_PRESENCE),
+ 	SND_PCI_QUIRK(0x1025, 0x1166, "Acer Veriton N4640G", ALC269_FIXUP_LIFEBOOK),
+ 	SND_PCI_QUIRK(0x1025, 0x1167, "Acer Veriton N6640G", ALC269_FIXUP_LIFEBOOK),
++	SND_PCI_QUIRK(0x1025, 0x1177, "Acer Predator G9-593", ALC255_FIXUP_PREDATOR_SUBWOOFER),
++	SND_PCI_QUIRK(0x1025, 0x1178, "Acer Predator G9-593", ALC255_FIXUP_PREDATOR_SUBWOOFER),
+ 	SND_PCI_QUIRK(0x1025, 0x1246, "Acer Predator Helios 500", ALC299_FIXUP_PREDATOR_SPK),
+ 	SND_PCI_QUIRK(0x1025, 0x1247, "Acer vCopperbox", ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS),
+ 	SND_PCI_QUIRK(0x1025, 0x1248, "Acer Veriton N4660G", ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE),
+diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c
+index 248e3bcbf386b0..76f5d926d1eac1 100644
+--- a/sound/soc/amd/yc/acp6x-mach.c
++++ b/sound/soc/amd/yc/acp6x-mach.c
+@@ -444,6 +444,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {
+ 			DMI_MATCH(DMI_BOARD_NAME, "8A3E"),
+ 		}
+ 	},
++	{
++		.driver_data = &acp6x_card,
++		.matches = {
++			DMI_MATCH(DMI_BOARD_VENDOR, "HP"),
++			DMI_MATCH(DMI_BOARD_NAME, "8A7F"),
++		}
++	},
+ 	{
+ 		.driver_data = &acp6x_card,
+ 		.matches = {
+diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c
+index 29197d34ec099d..7e9f0ab9141245 100644
+--- a/sound/soc/codecs/lpass-rx-macro.c
++++ b/sound/soc/codecs/lpass-rx-macro.c
+@@ -909,7 +909,7 @@ static const struct reg_default rx_defaults[] = {
+ 	{ CDC_RX_BCL_VBAT_PK_EST2, 0x01 },
+ 	{ CDC_RX_BCL_VBAT_PK_EST3, 0x40 },
+ 	{ CDC_RX_BCL_VBAT_RF_PROC1, 0x2A },
+-	{ CDC_RX_BCL_VBAT_RF_PROC1, 0x00 },
++	{ CDC_RX_BCL_VBAT_RF_PROC2, 0x00 },
+ 	{ CDC_RX_BCL_VBAT_TAC1, 0x00 },
+ 	{ CDC_RX_BCL_VBAT_TAC2, 0x18 },
+ 	{ CDC_RX_BCL_VBAT_TAC3, 0x18 },
+diff --git a/sound/soc/codecs/max98388.c b/sound/soc/codecs/max98388.c
+index cde5e85946cb88..87386404129d92 100644
+--- a/sound/soc/codecs/max98388.c
++++ b/sound/soc/codecs/max98388.c
+@@ -764,6 +764,7 @@ static int max98388_dai_tdm_slot(struct snd_soc_dai *dai,
+ 			addr = MAX98388_R2044_PCM_TX_CTRL1 + (cnt / 8);
+ 			bits = cnt % 8;
+ 			regmap_update_bits(max98388->regmap, addr, bits, bits);
++			slot_found++;
+ 			if (slot_found >= MAX_NUM_CH)
+ 				break;
+ 		}
+diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c
+index 0d37edb70261cb..9407179af5d574 100644
+--- a/sound/soc/fsl/fsl_micfil.c
++++ b/sound/soc/fsl/fsl_micfil.c
+@@ -67,6 +67,7 @@ struct fsl_micfil_soc_data {
+ 	bool imx;
+ 	bool use_edma;
+ 	bool use_verid;
++	bool volume_sx;
+ 	u64  formats;
+ };
+ 
+@@ -76,6 +77,7 @@ static struct fsl_micfil_soc_data fsl_micfil_imx8mm = {
+ 	.fifo_depth = 8,
+ 	.dataline =  0xf,
+ 	.formats = SNDRV_PCM_FMTBIT_S16_LE,
++	.volume_sx = true,
+ };
+ 
+ static struct fsl_micfil_soc_data fsl_micfil_imx8mp = {
+@@ -84,6 +86,7 @@ static struct fsl_micfil_soc_data fsl_micfil_imx8mp = {
+ 	.fifo_depth = 32,
+ 	.dataline =  0xf,
+ 	.formats = SNDRV_PCM_FMTBIT_S32_LE,
++	.volume_sx = false,
+ };
+ 
+ static struct fsl_micfil_soc_data fsl_micfil_imx93 = {
+@@ -94,6 +97,7 @@ static struct fsl_micfil_soc_data fsl_micfil_imx93 = {
+ 	.formats = SNDRV_PCM_FMTBIT_S32_LE,
+ 	.use_edma = true,
+ 	.use_verid = true,
++	.volume_sx = false,
+ };
+ 
+ static const struct of_device_id fsl_micfil_dt_ids[] = {
+@@ -317,7 +321,26 @@ static int hwvad_detected(struct snd_kcontrol *kcontrol,
+ 	return 0;
+ }
+ 
+-static const struct snd_kcontrol_new fsl_micfil_snd_controls[] = {
++static const struct snd_kcontrol_new fsl_micfil_volume_controls[] = {
++	SOC_SINGLE_TLV("CH0 Volume", REG_MICFIL_OUT_CTRL,
++		       MICFIL_OUTGAIN_CHX_SHIFT(0), 0xF, 0, gain_tlv),
++	SOC_SINGLE_TLV("CH1 Volume", REG_MICFIL_OUT_CTRL,
++		       MICFIL_OUTGAIN_CHX_SHIFT(1), 0xF, 0, gain_tlv),
++	SOC_SINGLE_TLV("CH2 Volume", REG_MICFIL_OUT_CTRL,
++		       MICFIL_OUTGAIN_CHX_SHIFT(2), 0xF, 0, gain_tlv),
++	SOC_SINGLE_TLV("CH3 Volume", REG_MICFIL_OUT_CTRL,
++		       MICFIL_OUTGAIN_CHX_SHIFT(3), 0xF, 0, gain_tlv),
++	SOC_SINGLE_TLV("CH4 Volume", REG_MICFIL_OUT_CTRL,
++		       MICFIL_OUTGAIN_CHX_SHIFT(4), 0xF, 0, gain_tlv),
++	SOC_SINGLE_TLV("CH5 Volume", REG_MICFIL_OUT_CTRL,
++		       MICFIL_OUTGAIN_CHX_SHIFT(5), 0xF, 0, gain_tlv),
++	SOC_SINGLE_TLV("CH6 Volume", REG_MICFIL_OUT_CTRL,
++		       MICFIL_OUTGAIN_CHX_SHIFT(6), 0xF, 0, gain_tlv),
++	SOC_SINGLE_TLV("CH7 Volume", REG_MICFIL_OUT_CTRL,
++		       MICFIL_OUTGAIN_CHX_SHIFT(7), 0xF, 0, gain_tlv),
++};
++
++static const struct snd_kcontrol_new fsl_micfil_volume_sx_controls[] = {
+ 	SOC_SINGLE_SX_TLV("CH0 Volume", REG_MICFIL_OUT_CTRL,
+ 			  MICFIL_OUTGAIN_CHX_SHIFT(0), 0x8, 0xF, gain_tlv),
+ 	SOC_SINGLE_SX_TLV("CH1 Volume", REG_MICFIL_OUT_CTRL,
+@@ -334,6 +357,9 @@ static const struct snd_kcontrol_new fsl_micfil_snd_controls[] = {
+ 			  MICFIL_OUTGAIN_CHX_SHIFT(6), 0x8, 0xF, gain_tlv),
+ 	SOC_SINGLE_SX_TLV("CH7 Volume", REG_MICFIL_OUT_CTRL,
+ 			  MICFIL_OUTGAIN_CHX_SHIFT(7), 0x8, 0xF, gain_tlv),
++};
++
++static const struct snd_kcontrol_new fsl_micfil_snd_controls[] = {
+ 	SOC_ENUM_EXT("MICFIL Quality Select",
+ 		     fsl_micfil_quality_enum,
+ 		     micfil_quality_get, micfil_quality_set),
+@@ -801,6 +827,20 @@ static int fsl_micfil_dai_probe(struct snd_soc_dai *cpu_dai)
+ 	return 0;
+ }
+ 
++static int fsl_micfil_component_probe(struct snd_soc_component *component)
++{
++	struct fsl_micfil *micfil = snd_soc_component_get_drvdata(component);
++
++	if (micfil->soc->volume_sx)
++		snd_soc_add_component_controls(component, fsl_micfil_volume_sx_controls,
++					       ARRAY_SIZE(fsl_micfil_volume_sx_controls));
++	else
++		snd_soc_add_component_controls(component, fsl_micfil_volume_controls,
++					       ARRAY_SIZE(fsl_micfil_volume_controls));
++
++	return 0;
++}
++
+ static const struct snd_soc_dai_ops fsl_micfil_dai_ops = {
+ 	.probe		= fsl_micfil_dai_probe,
+ 	.startup	= fsl_micfil_startup,
+@@ -821,6 +861,7 @@ static struct snd_soc_dai_driver fsl_micfil_dai = {
+ 
+ static const struct snd_soc_component_driver fsl_micfil_component = {
+ 	.name		= "fsl-micfil-dai",
++	.probe		= fsl_micfil_component_probe,
+ 	.controls       = fsl_micfil_snd_controls,
+ 	.num_controls   = ARRAY_SIZE(fsl_micfil_snd_controls),
+ 	.legacy_dai_naming      = 1,
+diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
+index 3d202398c5411b..aa15f56ca139d2 100644
+--- a/sound/soc/fsl/fsl_sai.c
++++ b/sound/soc/fsl/fsl_sai.c
+@@ -604,6 +604,9 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
+ 
+ 	val_cr4 |= FSL_SAI_CR4_FRSZ(slots);
+ 
++	/* Set to avoid channel swap */
++	val_cr4 |= FSL_SAI_CR4_FCONT;
++
+ 	/* Set to output mode to avoid tri-stated data pins */
+ 	if (tx)
+ 		val_cr4 |= FSL_SAI_CR4_CHMOD;
+@@ -690,7 +693,7 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
+ 
+ 	regmap_update_bits(sai->regmap, FSL_SAI_xCR4(tx, ofs),
+ 			   FSL_SAI_CR4_SYWD_MASK | FSL_SAI_CR4_FRSZ_MASK |
+-			   FSL_SAI_CR4_CHMOD_MASK,
++			   FSL_SAI_CR4_CHMOD_MASK | FSL_SAI_CR4_FCONT_MASK,
+ 			   val_cr4);
+ 	regmap_update_bits(sai->regmap, FSL_SAI_xCR5(tx, ofs),
+ 			   FSL_SAI_CR5_WNW_MASK | FSL_SAI_CR5_W0W_MASK |
+diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h
+index 550df87b6a068c..eba465c2387b6e 100644
+--- a/sound/soc/fsl/fsl_sai.h
++++ b/sound/soc/fsl/fsl_sai.h
+@@ -137,6 +137,7 @@
+ 
+ /* SAI Transmit and Receive Configuration 4 Register */
+ 
++#define FSL_SAI_CR4_FCONT_MASK	BIT(28)
+ #define FSL_SAI_CR4_FCONT	BIT(28)
+ #define FSL_SAI_CR4_FCOMB_SHIFT BIT(26)
+ #define FSL_SAI_CR4_FCOMB_SOFT  BIT(27)
+diff --git a/sound/soc/loongson/loongson_card.c b/sound/soc/loongson/loongson_card.c
+index 8cc54aedd00242..010e959d4c69a8 100644
+--- a/sound/soc/loongson/loongson_card.c
++++ b/sound/soc/loongson/loongson_card.c
+@@ -137,6 +137,7 @@ static int loongson_card_parse_of(struct loongson_card_data *data)
+ 			dev_err(dev, "getting cpu dlc error (%d)\n", ret);
+ 			goto err;
+ 		}
++		loongson_dai_links[i].platforms->of_node = loongson_dai_links[i].cpus->of_node;
+ 
+ 		ret = snd_soc_of_get_dlc(codec, NULL, loongson_dai_links[i].codecs, 0);
+ 		if (ret < 0) {
+diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c
+index 73b42d9ee24471..e587455dc40a0e 100644
+--- a/sound/soc/qcom/lpass-cpu.c
++++ b/sound/soc/qcom/lpass-cpu.c
+@@ -1246,6 +1246,8 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev)
+ 	/* Allocation for i2sctl regmap fields */
+ 	drvdata->i2sctl = devm_kzalloc(&pdev->dev, sizeof(struct lpaif_i2sctl),
+ 					GFP_KERNEL);
++	if (!drvdata->i2sctl)
++		return -ENOMEM;
+ 
+ 	/* Initialize bitfields for dai I2SCTL register */
+ 	ret = lpass_cpu_init_i2sctl_bitfields(dev, drvdata->i2sctl,
+diff --git a/sound/soc/qcom/sm8250.c b/sound/soc/qcom/sm8250.c
+index 6558bf2e14e83d..9eb8ae0196d91f 100644
+--- a/sound/soc/qcom/sm8250.c
++++ b/sound/soc/qcom/sm8250.c
+@@ -153,6 +153,7 @@ static int sm8250_platform_probe(struct platform_device *pdev)
+ 
+ static const struct of_device_id snd_sm8250_dt_match[] = {
+ 	{.compatible = "qcom,sm8250-sndcard"},
++	{.compatible = "qcom,qrb4210-rb2-sndcard"},
+ 	{.compatible = "qcom,qrb5165-rb5-sndcard"},
+ 	{}
+ };
+diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
+index 1bd7114c472a8b..98c7be340a536d 100644
+--- a/sound/soc/sh/rcar/core.c
++++ b/sound/soc/sh/rcar/core.c
+@@ -1297,7 +1297,9 @@ static int rsnd_dai_of_node(struct rsnd_priv *priv, int *is_graph)
+ 		if (!of_node_name_eq(ports, "ports") &&
+ 		    !of_node_name_eq(ports, "port"))
+ 			continue;
+-		priv->component_dais[i] = of_graph_get_endpoint_count(ports);
++		priv->component_dais[i] =
++			of_graph_get_endpoint_count(of_node_name_eq(ports, "ports") ?
++						    ports : np);
+ 		nr += priv->component_dais[i];
+ 		i++;
+ 		if (i >= RSND_MAX_COMPONENT) {
+@@ -1510,7 +1512,8 @@ static int rsnd_dai_probe(struct rsnd_priv *priv)
+ 			if (!of_node_name_eq(ports, "ports") &&
+ 			    !of_node_name_eq(ports, "port"))
+ 				continue;
+-			for_each_endpoint_of_node(ports, dai_np) {
++			for_each_endpoint_of_node(of_node_name_eq(ports, "ports") ?
++						  ports : np, dai_np) {
+ 				__rsnd_dai_probe(priv, dai_np, dai_np, 0, dai_i);
+ 				if (rsnd_is_gen3(priv) || rsnd_is_gen4(priv)) {
+ 					rdai = rsnd_rdai_get(priv, dai_i);
+diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
+index ba6e346c8d669a..977ec094bc2a6c 100644
+--- a/tools/include/uapi/linux/bpf.h
++++ b/tools/include/uapi/linux/bpf.h
+@@ -6559,20 +6559,27 @@ struct bpf_link_info {
+ 					__aligned_u64 file_name; /* in/out */
+ 					__u32 name_len;
+ 					__u32 offset; /* offset from file_name */
++					__u64 cookie;
+ 				} uprobe; /* BPF_PERF_EVENT_UPROBE, BPF_PERF_EVENT_URETPROBE */
+ 				struct {
+ 					__aligned_u64 func_name; /* in/out */
+ 					__u32 name_len;
+ 					__u32 offset; /* offset from func_name */
+ 					__u64 addr;
++					__u64 missed;
++					__u64 cookie;
+ 				} kprobe; /* BPF_PERF_EVENT_KPROBE, BPF_PERF_EVENT_KRETPROBE */
+ 				struct {
+ 					__aligned_u64 tp_name;   /* in/out */
+ 					__u32 name_len;
++					__u32 :32;
++					__u64 cookie;
+ 				} tracepoint; /* BPF_PERF_EVENT_TRACEPOINT */
+ 				struct {
+ 					__u64 config;
+ 					__u32 type;
++					__u32 :32;
++					__u64 cookie;
+ 				} event; /* BPF_PERF_EVENT_EVENT */
+ 			};
+ 		} perf_event;
+diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
+index ab364e95a9b23e..f5a3a84fac955b 100644
+--- a/tools/testing/selftests/bpf/Makefile
++++ b/tools/testing/selftests/bpf/Makefile
+@@ -200,7 +200,7 @@ $(OUTPUT)/%:%.c
+ ifeq ($(SRCARCH),x86)
+ LLD := lld
+ else
+-LLD := ld
++LLD := $(shell command -v $(LD))
+ endif
+ 
+ # Filter out -static for liburandom_read.so and its dependent targets so that static builds
+diff --git a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c
+index 9d768e08371495..5b0c6a04cdbfe0 100644
+--- a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c
++++ b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c
+@@ -30,6 +30,8 @@ static noinline void uprobe_func(void)
+ 	asm volatile ("");
+ }
+ 
++#define PERF_EVENT_COOKIE 0xdeadbeef
++
+ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long addr,
+ 				 ssize_t offset, ssize_t entry_offset)
+ {
+@@ -61,8 +63,11 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add
+ 			ASSERT_EQ(info.perf_event.kprobe.addr, addr + entry_offset,
+ 				  "kprobe_addr");
+ 
++		ASSERT_EQ(info.perf_event.kprobe.cookie, PERF_EVENT_COOKIE, "kprobe_cookie");
++
++		ASSERT_EQ(info.perf_event.kprobe.name_len, strlen(KPROBE_FUNC) + 1,
++				  "name_len");
+ 		if (!info.perf_event.kprobe.func_name) {
+-			ASSERT_EQ(info.perf_event.kprobe.name_len, 0, "name_len");
+ 			info.perf_event.kprobe.func_name = ptr_to_u64(&buf);
+ 			info.perf_event.kprobe.name_len = sizeof(buf);
+ 			goto again;
+@@ -73,13 +78,16 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add
+ 		ASSERT_EQ(err, 0, "cmp_kprobe_func_name");
+ 		break;
+ 	case BPF_PERF_EVENT_TRACEPOINT:
++		ASSERT_EQ(info.perf_event.tracepoint.name_len, strlen(TP_NAME) + 1,
++				  "name_len");
+ 		if (!info.perf_event.tracepoint.tp_name) {
+-			ASSERT_EQ(info.perf_event.tracepoint.name_len, 0, "name_len");
+ 			info.perf_event.tracepoint.tp_name = ptr_to_u64(&buf);
+ 			info.perf_event.tracepoint.name_len = sizeof(buf);
+ 			goto again;
+ 		}
+ 
++		ASSERT_EQ(info.perf_event.tracepoint.cookie, PERF_EVENT_COOKIE, "tracepoint_cookie");
++
+ 		err = strncmp(u64_to_ptr(info.perf_event.tracepoint.tp_name), TP_NAME,
+ 			      strlen(TP_NAME));
+ 		ASSERT_EQ(err, 0, "cmp_tp_name");
+@@ -88,13 +96,16 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add
+ 	case BPF_PERF_EVENT_URETPROBE:
+ 		ASSERT_EQ(info.perf_event.uprobe.offset, offset, "uprobe_offset");
+ 
++		ASSERT_EQ(info.perf_event.uprobe.name_len, strlen(UPROBE_FILE) + 1,
++				  "name_len");
+ 		if (!info.perf_event.uprobe.file_name) {
+-			ASSERT_EQ(info.perf_event.uprobe.name_len, 0, "name_len");
+ 			info.perf_event.uprobe.file_name = ptr_to_u64(&buf);
+ 			info.perf_event.uprobe.name_len = sizeof(buf);
+ 			goto again;
+ 		}
+ 
++		ASSERT_EQ(info.perf_event.uprobe.cookie, PERF_EVENT_COOKIE, "uprobe_cookie");
++
+ 		err = strncmp(u64_to_ptr(info.perf_event.uprobe.file_name), UPROBE_FILE,
+ 			      strlen(UPROBE_FILE));
+ 			ASSERT_EQ(err, 0, "cmp_file_name");
+@@ -138,16 +149,17 @@ static void test_kprobe_fill_link_info(struct test_fill_link_info *skel,
+ 	DECLARE_LIBBPF_OPTS(bpf_kprobe_opts, opts,
+ 		.attach_mode = PROBE_ATTACH_MODE_LINK,
+ 		.retprobe = type == BPF_PERF_EVENT_KRETPROBE,
++		.bpf_cookie = PERF_EVENT_COOKIE,
+ 	);
+ 	ssize_t entry_offset = 0;
++	struct bpf_link *link;
+ 	int link_fd, err;
+ 
+-	skel->links.kprobe_run = bpf_program__attach_kprobe_opts(skel->progs.kprobe_run,
+-								 KPROBE_FUNC, &opts);
+-	if (!ASSERT_OK_PTR(skel->links.kprobe_run, "attach_kprobe"))
++	link = bpf_program__attach_kprobe_opts(skel->progs.kprobe_run, KPROBE_FUNC, &opts);
++	if (!ASSERT_OK_PTR(link, "attach_kprobe"))
+ 		return;
+ 
+-	link_fd = bpf_link__fd(skel->links.kprobe_run);
++	link_fd = bpf_link__fd(link);
+ 	if (!invalid) {
+ 		/* See also arch_adjust_kprobe_addr(). */
+ 		if (skel->kconfig->CONFIG_X86_KERNEL_IBT)
+@@ -157,39 +169,48 @@ static void test_kprobe_fill_link_info(struct test_fill_link_info *skel,
+ 	} else {
+ 		kprobe_fill_invalid_user_buffer(link_fd);
+ 	}
+-	bpf_link__detach(skel->links.kprobe_run);
++	bpf_link__destroy(link);
+ }
+ 
+ static void test_tp_fill_link_info(struct test_fill_link_info *skel)
+ {
++	DECLARE_LIBBPF_OPTS(bpf_tracepoint_opts, opts,
++		.bpf_cookie = PERF_EVENT_COOKIE,
++	);
++	struct bpf_link *link;
+ 	int link_fd, err;
+ 
+-	skel->links.tp_run = bpf_program__attach_tracepoint(skel->progs.tp_run, TP_CAT, TP_NAME);
+-	if (!ASSERT_OK_PTR(skel->links.tp_run, "attach_tp"))
++	link = bpf_program__attach_tracepoint_opts(skel->progs.tp_run, TP_CAT, TP_NAME, &opts);
++	if (!ASSERT_OK_PTR(link, "attach_tp"))
+ 		return;
+ 
+-	link_fd = bpf_link__fd(skel->links.tp_run);
++	link_fd = bpf_link__fd(link);
+ 	err = verify_perf_link_info(link_fd, BPF_PERF_EVENT_TRACEPOINT, 0, 0, 0);
+ 	ASSERT_OK(err, "verify_perf_link_info");
+-	bpf_link__detach(skel->links.tp_run);
++	bpf_link__destroy(link);
+ }
+ 
+ static void test_uprobe_fill_link_info(struct test_fill_link_info *skel,
+ 				       enum bpf_perf_event_type type)
+ {
++	DECLARE_LIBBPF_OPTS(bpf_uprobe_opts, opts,
++		.retprobe = type == BPF_PERF_EVENT_URETPROBE,
++		.bpf_cookie = PERF_EVENT_COOKIE,
++	);
++	struct bpf_link *link;
+ 	int link_fd, err;
+ 
+-	skel->links.uprobe_run = bpf_program__attach_uprobe(skel->progs.uprobe_run,
+-							    type == BPF_PERF_EVENT_URETPROBE,
+-							    0, /* self pid */
+-							    UPROBE_FILE, uprobe_offset);
+-	if (!ASSERT_OK_PTR(skel->links.uprobe_run, "attach_uprobe"))
++	link = bpf_program__attach_uprobe_opts(skel->progs.uprobe_run,
++					       0, /* self pid */
++					       UPROBE_FILE, uprobe_offset,
++					       &opts);
++	if (!ASSERT_OK_PTR(link, "attach_uprobe"))
+ 		return;
+ 
+-	link_fd = bpf_link__fd(skel->links.uprobe_run);
++	link_fd = bpf_link__fd(link);
+ 	err = verify_perf_link_info(link_fd, type, 0, uprobe_offset, 0);
+ 	ASSERT_OK(err, "verify_perf_link_info");
+-	bpf_link__detach(skel->links.uprobe_run);
++	bpf_link__destroy(link);
+ }
+ 
+ static int verify_kmulti_link_info(int fd, bool retprobe)
+@@ -278,24 +299,24 @@ static void test_kprobe_multi_fill_link_info(struct test_fill_link_info *skel,
+ 					     bool retprobe, bool invalid)
+ {
+ 	LIBBPF_OPTS(bpf_kprobe_multi_opts, opts);
++	struct bpf_link *link;
+ 	int link_fd, err;
+ 
+ 	opts.syms = kmulti_syms;
+ 	opts.cnt = KMULTI_CNT;
+ 	opts.retprobe = retprobe;
+-	skel->links.kmulti_run = bpf_program__attach_kprobe_multi_opts(skel->progs.kmulti_run,
+-								       NULL, &opts);
+-	if (!ASSERT_OK_PTR(skel->links.kmulti_run, "attach_kprobe_multi"))
++	link = bpf_program__attach_kprobe_multi_opts(skel->progs.kmulti_run, NULL, &opts);
++	if (!ASSERT_OK_PTR(link, "attach_kprobe_multi"))
+ 		return;
+ 
+-	link_fd = bpf_link__fd(skel->links.kmulti_run);
++	link_fd = bpf_link__fd(link);
+ 	if (!invalid) {
+ 		err = verify_kmulti_link_info(link_fd, retprobe);
+ 		ASSERT_OK(err, "verify_kmulti_link_info");
+ 	} else {
+ 		verify_kmulti_invalid_user_buffer(link_fd);
+ 	}
+-	bpf_link__detach(skel->links.kmulti_run);
++	bpf_link__destroy(link);
+ }
+ 
+ void test_fill_link_info(void)
+diff --git a/tools/testing/selftests/bpf/progs/verifier_helper_value_access.c b/tools/testing/selftests/bpf/progs/verifier_helper_value_access.c
+index 692216c0ad3d45..3e8340c2408f37 100644
+--- a/tools/testing/selftests/bpf/progs/verifier_helper_value_access.c
++++ b/tools/testing/selftests/bpf/progs/verifier_helper_value_access.c
+@@ -91,7 +91,7 @@ l0_%=:	exit;						\
+ 
+ SEC("tracepoint")
+ __description("helper access to map: empty range")
+-__failure __msg("invalid access to map value, value_size=48 off=0 size=0")
++__failure __msg("R2 invalid zero-sized read")
+ __naked void access_to_map_empty_range(void)
+ {
+ 	asm volatile ("					\
+@@ -221,7 +221,7 @@ l0_%=:	exit;						\
+ 
+ SEC("tracepoint")
+ __description("helper access to adjusted map (via const imm): empty range")
+-__failure __msg("invalid access to map value, value_size=48 off=4 size=0")
++__failure __msg("R2 invalid zero-sized read")
+ __naked void via_const_imm_empty_range(void)
+ {
+ 	asm volatile ("					\
+@@ -386,7 +386,7 @@ l0_%=:	exit;						\
+ 
+ SEC("tracepoint")
+ __description("helper access to adjusted map (via const reg): empty range")
+-__failure __msg("R1 min value is outside of the allowed memory range")
++__failure __msg("R2 invalid zero-sized read")
+ __naked void via_const_reg_empty_range(void)
+ {
+ 	asm volatile ("					\
+@@ -556,7 +556,7 @@ l0_%=:	exit;						\
+ 
+ SEC("tracepoint")
+ __description("helper access to adjusted map (via variable): empty range")
+-__failure __msg("R1 min value is outside of the allowed memory range")
++__failure __msg("R2 invalid zero-sized read")
+ __naked void map_via_variable_empty_range(void)
+ {
+ 	asm volatile ("					\
+diff --git a/tools/testing/selftests/bpf/progs/verifier_raw_stack.c b/tools/testing/selftests/bpf/progs/verifier_raw_stack.c
+index f67390224a9cf9..7cc83acac7271d 100644
+--- a/tools/testing/selftests/bpf/progs/verifier_raw_stack.c
++++ b/tools/testing/selftests/bpf/progs/verifier_raw_stack.c
+@@ -64,7 +64,7 @@ __naked void load_bytes_negative_len_2(void)
+ 
+ SEC("tc")
+ __description("raw_stack: skb_load_bytes, zero len")
+-__failure __msg("invalid zero-sized read")
++__failure __msg("R4 invalid zero-sized read: u64=[0,0]")
+ __naked void skb_load_bytes_zero_len(void)
+ {
+ 	asm volatile ("					\
+diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc b/tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc
+index 20e42c030095b0..61877d16645112 100644
+--- a/tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc
++++ b/tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc
+@@ -34,7 +34,9 @@ check_error 'f vfs_read ^$stack10000'	# BAD_STACK_NUM
+ 
+ check_error 'f vfs_read ^$arg10000'	# BAD_ARG_NUM
+ 
++if !grep -q 'kernel return probes support:' README; then
+ check_error 'f vfs_read $retval ^$arg1' # BAD_VAR
++fi
+ check_error 'f vfs_read ^$none_var'	# BAD_VAR
+ check_error 'f vfs_read ^'$REG		# BAD_VAR
+ 
+@@ -99,7 +101,9 @@ if grep -q "<argname>" README; then
+ check_error 'f vfs_read args=^$arg*'		# BAD_VAR_ARGS
+ check_error 'f vfs_read +0(^$arg*)'		# BAD_VAR_ARGS
+ check_error 'f vfs_read $arg* ^$arg*'		# DOUBLE_ARGS
++if !grep -q 'kernel return probes support:' README; then
+ check_error 'f vfs_read%return ^$arg*'		# NOFENTRY_ARGS
++fi
+ check_error 'f vfs_read ^hoge'			# NO_BTFARG
+ check_error 'f kfree ^$arg10'			# NO_BTFARG (exceed the number of parameters)
+ check_error 'f kfree%return ^$retval'		# NO_RETVAL
+diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc
+index 65fbb26fd58c10..a16c6a6f6055cf 100644
+--- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc
++++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc
+@@ -108,7 +108,9 @@ if grep -q "<argname>" README; then
+ check_error 'p vfs_read args=^$arg*'		# BAD_VAR_ARGS
+ check_error 'p vfs_read +0(^$arg*)'		# BAD_VAR_ARGS
+ check_error 'p vfs_read $arg* ^$arg*'		# DOUBLE_ARGS
++if !grep -q 'kernel return probes support:' README; then
+ check_error 'r vfs_read ^$arg*'			# NOFENTRY_ARGS
++fi
+ check_error 'p vfs_read+8 ^$arg*'		# NOFENTRY_ARGS
+ check_error 'p vfs_read ^hoge'			# NO_BTFARG
+ check_error 'p kfree ^$arg10'			# NO_BTFARG (exceed the number of parameters)

From 110fda1e4d8baff2b092922b9f23591e0cb73710 Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Sun, 3 Nov 2024 00:08:53 +0800
Subject: [PATCH 042/107] rockchip-rk3588: use rkvdec2 patch from rockchip64

---
 .../0027-RK3588-Add-rkvdec2-Support-v3.patch  | 3888 +----------------
 1 file changed, 1 insertion(+), 3887 deletions(-)
 mode change 100644 => 120000 patch/kernel/archive/rockchip-rk3588-6.11/0027-RK3588-Add-rkvdec2-Support-v3.patch

diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0027-RK3588-Add-rkvdec2-Support-v3.patch b/patch/kernel/archive/rockchip-rk3588-6.11/0027-RK3588-Add-rkvdec2-Support-v3.patch
deleted file mode 100644
index 5687b1fb8a1a..000000000000
--- a/patch/kernel/archive/rockchip-rk3588-6.11/0027-RK3588-Add-rkvdec2-Support-v3.patch
+++ /dev/null
@@ -1,3887 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Detlev Casanova <detlev.casanova@collabora.com>
-Date: Tue, 18 Jun 2024 12:41:51 -0400
-Subject: media: rockchip: Move H264 CABAC table to header file
-
-The table will be shared with the rkvdec2 driver in following commits.
-
-As HW formatted CABAC tables can be shared between drivers, it makes sense
-to group them in an include folder.
-
-Each driver can include the tables they need so that all tables are not
-built in the kernel, but rather in each driver, if the driver is enabled.
-
-Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>
----
- drivers/staging/media/rkvdec/rkvdec-h264.c | 500 +--------
- include/media/v4l2-cabac/rkvdec-cabac.h    | 509 ++++++++++
- 2 files changed, 510 insertions(+), 499 deletions(-)
-
-diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c
-index 111111111111..222222222222 100644
---- a/drivers/staging/media/rkvdec/rkvdec-h264.c
-+++ b/drivers/staging/media/rkvdec/rkvdec-h264.c
-@@ -11,6 +11,7 @@
- 
- #include <media/v4l2-h264.h>
- #include <media/v4l2-mem2mem.h>
-+#include <media/v4l2-cabac/rkvdec-cabac.h>
- 
- #include "rkvdec.h"
- #include "rkvdec-regs.h"
-@@ -117,505 +118,6 @@ struct rkvdec_h264_ctx {
- 	struct rkvdec_h264_reflists reflists;
- };
- 
--#define CABAC_ENTRY(ctxidx, idc0_m, idc0_n, idc1_m, idc1_n,		\
--	    idc2_m, idc2_n, intra_m, intra_n)			\
--	[0][(ctxidx)] = {idc0_m, idc0_n},			\
--	[1][(ctxidx)] = {idc1_m, idc1_n},			\
--	[2][(ctxidx)] = {idc2_m, idc2_n},			\
--	[3][(ctxidx)] = {intra_m, intra_n}
--
--/*
-- * Constant CABAC table.
-- * Built from the tables described in section '9.3.1.1 Initialisation process
-- * for context variables' of the H264 spec.
-- */
--static const s8 rkvdec_h264_cabac_table[4][464][2] = {
--	/* Table 9-12 – Values of variables m and n for ctxIdx from 0 to 10 */
--	CABAC_ENTRY(0, 20, -15, 20, -15, 20, -15, 20, -15),
--	CABAC_ENTRY(1, 2, 54, 2, 54, 2, 54, 2, 54),
--	CABAC_ENTRY(2, 3, 74, 3, 74, 3, 74, 3, 74),
--	CABAC_ENTRY(3, 20, -15, 20, -15, 20, -15, 20, -15),
--	CABAC_ENTRY(4, 2, 54, 2, 54, 2, 54, 2, 54),
--	CABAC_ENTRY(5, 3, 74, 3, 74, 3, 74, 3, 74),
--	CABAC_ENTRY(6, -28, 127, -28, 127, -28, 127, -28, 127),
--	CABAC_ENTRY(7, -23, 104, -23, 104, -23, 104, -23, 104),
--	CABAC_ENTRY(8, -6, 53, -6, 53, -6, 53, -6, 53),
--	CABAC_ENTRY(9, -1, 54, -1, 54, -1, 54, -1, 54),
--	CABAC_ENTRY(10, 7, 51, 7, 51, 7, 51, 7, 51),
--
--	/* Table 9-13 – Values of variables m and n for ctxIdx from 11 to 23 */
--	CABAC_ENTRY(11, 23, 33, 22, 25, 29, 16, 0, 0),
--	CABAC_ENTRY(12, 23, 2, 34, 0, 25, 0, 0, 0),
--	CABAC_ENTRY(13, 21, 0, 16, 0, 14, 0, 0, 0),
--	CABAC_ENTRY(14, 1, 9, -2, 9, -10, 51, 0, 0),
--	CABAC_ENTRY(15, 0, 49, 4, 41, -3, 62, 0, 0),
--	CABAC_ENTRY(16, -37, 118, -29, 118, -27, 99, 0, 0),
--	CABAC_ENTRY(17, 5, 57, 2, 65, 26, 16, 0, 0),
--	CABAC_ENTRY(18, -13, 78, -6, 71, -4, 85, 0, 0),
--	CABAC_ENTRY(19, -11, 65, -13, 79, -24, 102, 0, 0),
--	CABAC_ENTRY(20, 1, 62, 5, 52, 5, 57, 0, 0),
--	CABAC_ENTRY(21, 12, 49, 9, 50, 6, 57, 0, 0),
--	CABAC_ENTRY(22, -4, 73, -3, 70, -17, 73, 0, 0),
--	CABAC_ENTRY(23, 17, 50, 10, 54, 14, 57, 0, 0),
--
--	/* Table 9-14 – Values of variables m and n for ctxIdx from 24 to 39 */
--	CABAC_ENTRY(24, 18, 64, 26, 34, 20, 40, 0, 0),
--	CABAC_ENTRY(25, 9, 43, 19, 22, 20, 10, 0, 0),
--	CABAC_ENTRY(26, 29, 0, 40, 0, 29, 0, 0, 0),
--	CABAC_ENTRY(27, 26, 67, 57, 2, 54, 0, 0, 0),
--	CABAC_ENTRY(28, 16, 90, 41, 36, 37, 42, 0, 0),
--	CABAC_ENTRY(29, 9, 104, 26, 69, 12, 97, 0, 0),
--	CABAC_ENTRY(30, -46, 127, -45, 127, -32, 127, 0, 0),
--	CABAC_ENTRY(31, -20, 104, -15, 101, -22, 117, 0, 0),
--	CABAC_ENTRY(32, 1, 67, -4, 76, -2, 74, 0, 0),
--	CABAC_ENTRY(33, -13, 78, -6, 71, -4, 85, 0, 0),
--	CABAC_ENTRY(34, -11, 65, -13, 79, -24, 102, 0, 0),
--	CABAC_ENTRY(35, 1, 62, 5, 52, 5, 57, 0, 0),
--	CABAC_ENTRY(36, -6, 86, 6, 69, -6, 93, 0, 0),
--	CABAC_ENTRY(37, -17, 95, -13, 90, -14, 88, 0, 0),
--	CABAC_ENTRY(38, -6, 61, 0, 52, -6, 44, 0, 0),
--	CABAC_ENTRY(39, 9, 45, 8, 43, 4, 55, 0, 0),
--
--	/* Table 9-15 – Values of variables m and n for ctxIdx from 40 to 53 */
--	CABAC_ENTRY(40, -3, 69, -2, 69, -11, 89, 0, 0),
--	CABAC_ENTRY(41, -6, 81, -5, 82, -15, 103, 0, 0),
--	CABAC_ENTRY(42, -11, 96, -10, 96, -21, 116, 0, 0),
--	CABAC_ENTRY(43, 6, 55, 2, 59, 19, 57, 0, 0),
--	CABAC_ENTRY(44, 7, 67, 2, 75, 20, 58, 0, 0),
--	CABAC_ENTRY(45, -5, 86, -3, 87, 4, 84, 0, 0),
--	CABAC_ENTRY(46, 2, 88, -3, 100, 6, 96, 0, 0),
--	CABAC_ENTRY(47, 0, 58, 1, 56, 1, 63, 0, 0),
--	CABAC_ENTRY(48, -3, 76, -3, 74, -5, 85, 0, 0),
--	CABAC_ENTRY(49, -10, 94, -6, 85, -13, 106, 0, 0),
--	CABAC_ENTRY(50, 5, 54, 0, 59, 5, 63, 0, 0),
--	CABAC_ENTRY(51, 4, 69, -3, 81, 6, 75, 0, 0),
--	CABAC_ENTRY(52, -3, 81, -7, 86, -3, 90, 0, 0),
--	CABAC_ENTRY(53, 0, 88, -5, 95, -1, 101, 0, 0),
--
--	/* Table 9-16 – Values of variables m and n for ctxIdx from 54 to 59 */
--	CABAC_ENTRY(54, -7, 67, -1, 66, 3, 55, 0, 0),
--	CABAC_ENTRY(55, -5, 74, -1, 77, -4, 79, 0, 0),
--	CABAC_ENTRY(56, -4, 74, 1, 70, -2, 75, 0, 0),
--	CABAC_ENTRY(57, -5, 80, -2, 86, -12, 97, 0, 0),
--	CABAC_ENTRY(58, -7, 72, -5, 72, -7, 50, 0, 0),
--	CABAC_ENTRY(59, 1, 58, 0, 61, 1, 60, 0, 0),
--
--	/* Table 9-17 – Values of variables m and n for ctxIdx from 60 to 69 */
--	CABAC_ENTRY(60, 0, 41, 0, 41, 0, 41, 0, 41),
--	CABAC_ENTRY(61, 0, 63, 0, 63, 0, 63, 0, 63),
--	CABAC_ENTRY(62, 0, 63, 0, 63, 0, 63, 0, 63),
--	CABAC_ENTRY(63, 0, 63, 0, 63, 0, 63, 0, 63),
--	CABAC_ENTRY(64, -9, 83, -9, 83, -9, 83, -9, 83),
--	CABAC_ENTRY(65, 4, 86, 4, 86, 4, 86, 4, 86),
--	CABAC_ENTRY(66, 0, 97, 0, 97, 0, 97, 0, 97),
--	CABAC_ENTRY(67, -7, 72, -7, 72, -7, 72, -7, 72),
--	CABAC_ENTRY(68, 13, 41, 13, 41, 13, 41, 13, 41),
--	CABAC_ENTRY(69, 3, 62, 3, 62, 3, 62, 3, 62),
--
--	/* Table 9-18 – Values of variables m and n for ctxIdx from 70 to 104 */
--	CABAC_ENTRY(70, 0, 45, 13, 15, 7, 34, 0, 11),
--	CABAC_ENTRY(71, -4, 78, 7, 51, -9, 88, 1, 55),
--	CABAC_ENTRY(72, -3, 96, 2, 80, -20, 127, 0, 69),
--	CABAC_ENTRY(73, -27, 126, -39, 127, -36, 127, -17, 127),
--	CABAC_ENTRY(74, -28, 98, -18, 91, -17, 91, -13, 102),
--	CABAC_ENTRY(75, -25, 101, -17, 96, -14, 95, 0, 82),
--	CABAC_ENTRY(76, -23, 67, -26, 81, -25, 84, -7, 74),
--	CABAC_ENTRY(77, -28, 82, -35, 98, -25, 86, -21, 107),
--	CABAC_ENTRY(78, -20, 94, -24, 102, -12, 89, -27, 127),
--	CABAC_ENTRY(79, -16, 83, -23, 97, -17, 91, -31, 127),
--	CABAC_ENTRY(80, -22, 110, -27, 119, -31, 127, -24, 127),
--	CABAC_ENTRY(81, -21, 91, -24, 99, -14, 76, -18, 95),
--	CABAC_ENTRY(82, -18, 102, -21, 110, -18, 103, -27, 127),
--	CABAC_ENTRY(83, -13, 93, -18, 102, -13, 90, -21, 114),
--	CABAC_ENTRY(84, -29, 127, -36, 127, -37, 127, -30, 127),
--	CABAC_ENTRY(85, -7, 92, 0, 80, 11, 80, -17, 123),
--	CABAC_ENTRY(86, -5, 89, -5, 89, 5, 76, -12, 115),
--	CABAC_ENTRY(87, -7, 96, -7, 94, 2, 84, -16, 122),
--	CABAC_ENTRY(88, -13, 108, -4, 92, 5, 78, -11, 115),
--	CABAC_ENTRY(89, -3, 46, 0, 39, -6, 55, -12, 63),
--	CABAC_ENTRY(90, -1, 65, 0, 65, 4, 61, -2, 68),
--	CABAC_ENTRY(91, -1, 57, -15, 84, -14, 83, -15, 84),
--	CABAC_ENTRY(92, -9, 93, -35, 127, -37, 127, -13, 104),
--	CABAC_ENTRY(93, -3, 74, -2, 73, -5, 79, -3, 70),
--	CABAC_ENTRY(94, -9, 92, -12, 104, -11, 104, -8, 93),
--	CABAC_ENTRY(95, -8, 87, -9, 91, -11, 91, -10, 90),
--	CABAC_ENTRY(96, -23, 126, -31, 127, -30, 127, -30, 127),
--	CABAC_ENTRY(97, 5, 54, 3, 55, 0, 65, -1, 74),
--	CABAC_ENTRY(98, 6, 60, 7, 56, -2, 79, -6, 97),
--	CABAC_ENTRY(99, 6, 59, 7, 55, 0, 72, -7, 91),
--	CABAC_ENTRY(100, 6, 69, 8, 61, -4, 92, -20, 127),
--	CABAC_ENTRY(101, -1, 48, -3, 53, -6, 56, -4, 56),
--	CABAC_ENTRY(102, 0, 68, 0, 68, 3, 68, -5, 82),
--	CABAC_ENTRY(103, -4, 69, -7, 74, -8, 71, -7, 76),
--	CABAC_ENTRY(104, -8, 88, -9, 88, -13, 98, -22, 125),
--
--	/* Table 9-19 – Values of variables m and n for ctxIdx from 105 to 165 */
--	CABAC_ENTRY(105, -2, 85, -13, 103, -4, 86, -7, 93),
--	CABAC_ENTRY(106, -6, 78, -13, 91, -12, 88, -11, 87),
--	CABAC_ENTRY(107, -1, 75, -9, 89, -5, 82, -3, 77),
--	CABAC_ENTRY(108, -7, 77, -14, 92, -3, 72, -5, 71),
--	CABAC_ENTRY(109, 2, 54, -8, 76, -4, 67, -4, 63),
--	CABAC_ENTRY(110, 5, 50, -12, 87, -8, 72, -4, 68),
--	CABAC_ENTRY(111, -3, 68, -23, 110, -16, 89, -12, 84),
--	CABAC_ENTRY(112, 1, 50, -24, 105, -9, 69, -7, 62),
--	CABAC_ENTRY(113, 6, 42, -10, 78, -1, 59, -7, 65),
--	CABAC_ENTRY(114, -4, 81, -20, 112, 5, 66, 8, 61),
--	CABAC_ENTRY(115, 1, 63, -17, 99, 4, 57, 5, 56),
--	CABAC_ENTRY(116, -4, 70, -78, 127, -4, 71, -2, 66),
--	CABAC_ENTRY(117, 0, 67, -70, 127, -2, 71, 1, 64),
--	CABAC_ENTRY(118, 2, 57, -50, 127, 2, 58, 0, 61),
--	CABAC_ENTRY(119, -2, 76, -46, 127, -1, 74, -2, 78),
--	CABAC_ENTRY(120, 11, 35, -4, 66, -4, 44, 1, 50),
--	CABAC_ENTRY(121, 4, 64, -5, 78, -1, 69, 7, 52),
--	CABAC_ENTRY(122, 1, 61, -4, 71, 0, 62, 10, 35),
--	CABAC_ENTRY(123, 11, 35, -8, 72, -7, 51, 0, 44),
--	CABAC_ENTRY(124, 18, 25, 2, 59, -4, 47, 11, 38),
--	CABAC_ENTRY(125, 12, 24, -1, 55, -6, 42, 1, 45),
--	CABAC_ENTRY(126, 13, 29, -7, 70, -3, 41, 0, 46),
--	CABAC_ENTRY(127, 13, 36, -6, 75, -6, 53, 5, 44),
--	CABAC_ENTRY(128, -10, 93, -8, 89, 8, 76, 31, 17),
--	CABAC_ENTRY(129, -7, 73, -34, 119, -9, 78, 1, 51),
--	CABAC_ENTRY(130, -2, 73, -3, 75, -11, 83, 7, 50),
--	CABAC_ENTRY(131, 13, 46, 32, 20, 9, 52, 28, 19),
--	CABAC_ENTRY(132, 9, 49, 30, 22, 0, 67, 16, 33),
--	CABAC_ENTRY(133, -7, 100, -44, 127, -5, 90, 14, 62),
--	CABAC_ENTRY(134, 9, 53, 0, 54, 1, 67, -13, 108),
--	CABAC_ENTRY(135, 2, 53, -5, 61, -15, 72, -15, 100),
--	CABAC_ENTRY(136, 5, 53, 0, 58, -5, 75, -13, 101),
--	CABAC_ENTRY(137, -2, 61, -1, 60, -8, 80, -13, 91),
--	CABAC_ENTRY(138, 0, 56, -3, 61, -21, 83, -12, 94),
--	CABAC_ENTRY(139, 0, 56, -8, 67, -21, 64, -10, 88),
--	CABAC_ENTRY(140, -13, 63, -25, 84, -13, 31, -16, 84),
--	CABAC_ENTRY(141, -5, 60, -14, 74, -25, 64, -10, 86),
--	CABAC_ENTRY(142, -1, 62, -5, 65, -29, 94, -7, 83),
--	CABAC_ENTRY(143, 4, 57, 5, 52, 9, 75, -13, 87),
--	CABAC_ENTRY(144, -6, 69, 2, 57, 17, 63, -19, 94),
--	CABAC_ENTRY(145, 4, 57, 0, 61, -8, 74, 1, 70),
--	CABAC_ENTRY(146, 14, 39, -9, 69, -5, 35, 0, 72),
--	CABAC_ENTRY(147, 4, 51, -11, 70, -2, 27, -5, 74),
--	CABAC_ENTRY(148, 13, 68, 18, 55, 13, 91, 18, 59),
--	CABAC_ENTRY(149, 3, 64, -4, 71, 3, 65, -8, 102),
--	CABAC_ENTRY(150, 1, 61, 0, 58, -7, 69, -15, 100),
--	CABAC_ENTRY(151, 9, 63, 7, 61, 8, 77, 0, 95),
--	CABAC_ENTRY(152, 7, 50, 9, 41, -10, 66, -4, 75),
--	CABAC_ENTRY(153, 16, 39, 18, 25, 3, 62, 2, 72),
--	CABAC_ENTRY(154, 5, 44, 9, 32, -3, 68, -11, 75),
--	CABAC_ENTRY(155, 4, 52, 5, 43, -20, 81, -3, 71),
--	CABAC_ENTRY(156, 11, 48, 9, 47, 0, 30, 15, 46),
--	CABAC_ENTRY(157, -5, 60, 0, 44, 1, 7, -13, 69),
--	CABAC_ENTRY(158, -1, 59, 0, 51, -3, 23, 0, 62),
--	CABAC_ENTRY(159, 0, 59, 2, 46, -21, 74, 0, 65),
--	CABAC_ENTRY(160, 22, 33, 19, 38, 16, 66, 21, 37),
--	CABAC_ENTRY(161, 5, 44, -4, 66, -23, 124, -15, 72),
--	CABAC_ENTRY(162, 14, 43, 15, 38, 17, 37, 9, 57),
--	CABAC_ENTRY(163, -1, 78, 12, 42, 44, -18, 16, 54),
--	CABAC_ENTRY(164, 0, 60, 9, 34, 50, -34, 0, 62),
--	CABAC_ENTRY(165, 9, 69, 0, 89, -22, 127, 12, 72),
--
--	/* Table 9-20 – Values of variables m and n for ctxIdx from 166 to 226 */
--	CABAC_ENTRY(166, 11, 28, 4, 45, 4, 39, 24, 0),
--	CABAC_ENTRY(167, 2, 40, 10, 28, 0, 42, 15, 9),
--	CABAC_ENTRY(168, 3, 44, 10, 31, 7, 34, 8, 25),
--	CABAC_ENTRY(169, 0, 49, 33, -11, 11, 29, 13, 18),
--	CABAC_ENTRY(170, 0, 46, 52, -43, 8, 31, 15, 9),
--	CABAC_ENTRY(171, 2, 44, 18, 15, 6, 37, 13, 19),
--	CABAC_ENTRY(172, 2, 51, 28, 0, 7, 42, 10, 37),
--	CABAC_ENTRY(173, 0, 47, 35, -22, 3, 40, 12, 18),
--	CABAC_ENTRY(174, 4, 39, 38, -25, 8, 33, 6, 29),
--	CABAC_ENTRY(175, 2, 62, 34, 0, 13, 43, 20, 33),
--	CABAC_ENTRY(176, 6, 46, 39, -18, 13, 36, 15, 30),
--	CABAC_ENTRY(177, 0, 54, 32, -12, 4, 47, 4, 45),
--	CABAC_ENTRY(178, 3, 54, 102, -94, 3, 55, 1, 58),
--	CABAC_ENTRY(179, 2, 58, 0, 0, 2, 58, 0, 62),
--	CABAC_ENTRY(180, 4, 63, 56, -15, 6, 60, 7, 61),
--	CABAC_ENTRY(181, 6, 51, 33, -4, 8, 44, 12, 38),
--	CABAC_ENTRY(182, 6, 57, 29, 10, 11, 44, 11, 45),
--	CABAC_ENTRY(183, 7, 53, 37, -5, 14, 42, 15, 39),
--	CABAC_ENTRY(184, 6, 52, 51, -29, 7, 48, 11, 42),
--	CABAC_ENTRY(185, 6, 55, 39, -9, 4, 56, 13, 44),
--	CABAC_ENTRY(186, 11, 45, 52, -34, 4, 52, 16, 45),
--	CABAC_ENTRY(187, 14, 36, 69, -58, 13, 37, 12, 41),
--	CABAC_ENTRY(188, 8, 53, 67, -63, 9, 49, 10, 49),
--	CABAC_ENTRY(189, -1, 82, 44, -5, 19, 58, 30, 34),
--	CABAC_ENTRY(190, 7, 55, 32, 7, 10, 48, 18, 42),
--	CABAC_ENTRY(191, -3, 78, 55, -29, 12, 45, 10, 55),
--	CABAC_ENTRY(192, 15, 46, 32, 1, 0, 69, 17, 51),
--	CABAC_ENTRY(193, 22, 31, 0, 0, 20, 33, 17, 46),
--	CABAC_ENTRY(194, -1, 84, 27, 36, 8, 63, 0, 89),
--	CABAC_ENTRY(195, 25, 7, 33, -25, 35, -18, 26, -19),
--	CABAC_ENTRY(196, 30, -7, 34, -30, 33, -25, 22, -17),
--	CABAC_ENTRY(197, 28, 3, 36, -28, 28, -3, 26, -17),
--	CABAC_ENTRY(198, 28, 4, 38, -28, 24, 10, 30, -25),
--	CABAC_ENTRY(199, 32, 0, 38, -27, 27, 0, 28, -20),
--	CABAC_ENTRY(200, 34, -1, 34, -18, 34, -14, 33, -23),
--	CABAC_ENTRY(201, 30, 6, 35, -16, 52, -44, 37, -27),
--	CABAC_ENTRY(202, 30, 6, 34, -14, 39, -24, 33, -23),
--	CABAC_ENTRY(203, 32, 9, 32, -8, 19, 17, 40, -28),
--	CABAC_ENTRY(204, 31, 19, 37, -6, 31, 25, 38, -17),
--	CABAC_ENTRY(205, 26, 27, 35, 0, 36, 29, 33, -11),
--	CABAC_ENTRY(206, 26, 30, 30, 10, 24, 33, 40, -15),
--	CABAC_ENTRY(207, 37, 20, 28, 18, 34, 15, 41, -6),
--	CABAC_ENTRY(208, 28, 34, 26, 25, 30, 20, 38, 1),
--	CABAC_ENTRY(209, 17, 70, 29, 41, 22, 73, 41, 17),
--	CABAC_ENTRY(210, 1, 67, 0, 75, 20, 34, 30, -6),
--	CABAC_ENTRY(211, 5, 59, 2, 72, 19, 31, 27, 3),
--	CABAC_ENTRY(212, 9, 67, 8, 77, 27, 44, 26, 22),
--	CABAC_ENTRY(213, 16, 30, 14, 35, 19, 16, 37, -16),
--	CABAC_ENTRY(214, 18, 32, 18, 31, 15, 36, 35, -4),
--	CABAC_ENTRY(215, 18, 35, 17, 35, 15, 36, 38, -8),
--	CABAC_ENTRY(216, 22, 29, 21, 30, 21, 28, 38, -3),
--	CABAC_ENTRY(217, 24, 31, 17, 45, 25, 21, 37, 3),
--	CABAC_ENTRY(218, 23, 38, 20, 42, 30, 20, 38, 5),
--	CABAC_ENTRY(219, 18, 43, 18, 45, 31, 12, 42, 0),
--	CABAC_ENTRY(220, 20, 41, 27, 26, 27, 16, 35, 16),
--	CABAC_ENTRY(221, 11, 63, 16, 54, 24, 42, 39, 22),
--	CABAC_ENTRY(222, 9, 59, 7, 66, 0, 93, 14, 48),
--	CABAC_ENTRY(223, 9, 64, 16, 56, 14, 56, 27, 37),
--	CABAC_ENTRY(224, -1, 94, 11, 73, 15, 57, 21, 60),
--	CABAC_ENTRY(225, -2, 89, 10, 67, 26, 38, 12, 68),
--	CABAC_ENTRY(226, -9, 108, -10, 116, -24, 127, 2, 97),
--
--	/* Table 9-21 – Values of variables m and n for ctxIdx from 227 to 275 */
--	CABAC_ENTRY(227, -6, 76, -23, 112, -24, 115, -3, 71),
--	CABAC_ENTRY(228, -2, 44, -15, 71, -22, 82, -6, 42),
--	CABAC_ENTRY(229, 0, 45, -7, 61, -9, 62, -5, 50),
--	CABAC_ENTRY(230, 0, 52, 0, 53, 0, 53, -3, 54),
--	CABAC_ENTRY(231, -3, 64, -5, 66, 0, 59, -2, 62),
--	CABAC_ENTRY(232, -2, 59, -11, 77, -14, 85, 0, 58),
--	CABAC_ENTRY(233, -4, 70, -9, 80, -13, 89, 1, 63),
--	CABAC_ENTRY(234, -4, 75, -9, 84, -13, 94, -2, 72),
--	CABAC_ENTRY(235, -8, 82, -10, 87, -11, 92, -1, 74),
--	CABAC_ENTRY(236, -17, 102, -34, 127, -29, 127, -9, 91),
--	CABAC_ENTRY(237, -9, 77, -21, 101, -21, 100, -5, 67),
--	CABAC_ENTRY(238, 3, 24, -3, 39, -14, 57, -5, 27),
--	CABAC_ENTRY(239, 0, 42, -5, 53, -12, 67, -3, 39),
--	CABAC_ENTRY(240, 0, 48, -7, 61, -11, 71, -2, 44),
--	CABAC_ENTRY(241, 0, 55, -11, 75, -10, 77, 0, 46),
--	CABAC_ENTRY(242, -6, 59, -15, 77, -21, 85, -16, 64),
--	CABAC_ENTRY(243, -7, 71, -17, 91, -16, 88, -8, 68),
--	CABAC_ENTRY(244, -12, 83, -25, 107, -23, 104, -10, 78),
--	CABAC_ENTRY(245, -11, 87, -25, 111, -15, 98, -6, 77),
--	CABAC_ENTRY(246, -30, 119, -28, 122, -37, 127, -10, 86),
--	CABAC_ENTRY(247, 1, 58, -11, 76, -10, 82, -12, 92),
--	CABAC_ENTRY(248, -3, 29, -10, 44, -8, 48, -15, 55),
--	CABAC_ENTRY(249, -1, 36, -10, 52, -8, 61, -10, 60),
--	CABAC_ENTRY(250, 1, 38, -10, 57, -8, 66, -6, 62),
--	CABAC_ENTRY(251, 2, 43, -9, 58, -7, 70, -4, 65),
--	CABAC_ENTRY(252, -6, 55, -16, 72, -14, 75, -12, 73),
--	CABAC_ENTRY(253, 0, 58, -7, 69, -10, 79, -8, 76),
--	CABAC_ENTRY(254, 0, 64, -4, 69, -9, 83, -7, 80),
--	CABAC_ENTRY(255, -3, 74, -5, 74, -12, 92, -9, 88),
--	CABAC_ENTRY(256, -10, 90, -9, 86, -18, 108, -17, 110),
--	CABAC_ENTRY(257, 0, 70, 2, 66, -4, 79, -11, 97),
--	CABAC_ENTRY(258, -4, 29, -9, 34, -22, 69, -20, 84),
--	CABAC_ENTRY(259, 5, 31, 1, 32, -16, 75, -11, 79),
--	CABAC_ENTRY(260, 7, 42, 11, 31, -2, 58, -6, 73),
--	CABAC_ENTRY(261, 1, 59, 5, 52, 1, 58, -4, 74),
--	CABAC_ENTRY(262, -2, 58, -2, 55, -13, 78, -13, 86),
--	CABAC_ENTRY(263, -3, 72, -2, 67, -9, 83, -13, 96),
--	CABAC_ENTRY(264, -3, 81, 0, 73, -4, 81, -11, 97),
--	CABAC_ENTRY(265, -11, 97, -8, 89, -13, 99, -19, 117),
--	CABAC_ENTRY(266, 0, 58, 3, 52, -13, 81, -8, 78),
--	CABAC_ENTRY(267, 8, 5, 7, 4, -6, 38, -5, 33),
--	CABAC_ENTRY(268, 10, 14, 10, 8, -13, 62, -4, 48),
--	CABAC_ENTRY(269, 14, 18, 17, 8, -6, 58, -2, 53),
--	CABAC_ENTRY(270, 13, 27, 16, 19, -2, 59, -3, 62),
--	CABAC_ENTRY(271, 2, 40, 3, 37, -16, 73, -13, 71),
--	CABAC_ENTRY(272, 0, 58, -1, 61, -10, 76, -10, 79),
--	CABAC_ENTRY(273, -3, 70, -5, 73, -13, 86, -12, 86),
--	CABAC_ENTRY(274, -6, 79, -1, 70, -9, 83, -13, 90),
--	CABAC_ENTRY(275, -8, 85, -4, 78, -10, 87, -14, 97),
--
--	/* Table 9-22 – Values of variables m and n for ctxIdx from 277 to 337 */
--	CABAC_ENTRY(277, -13, 106, -21, 126, -22, 127, -6, 93),
--	CABAC_ENTRY(278, -16, 106, -23, 124, -25, 127, -6, 84),
--	CABAC_ENTRY(279, -10, 87, -20, 110, -25, 120, -8, 79),
--	CABAC_ENTRY(280, -21, 114, -26, 126, -27, 127, 0, 66),
--	CABAC_ENTRY(281, -18, 110, -25, 124, -19, 114, -1, 71),
--	CABAC_ENTRY(282, -14, 98, -17, 105, -23, 117, 0, 62),
--	CABAC_ENTRY(283, -22, 110, -27, 121, -25, 118, -2, 60),
--	CABAC_ENTRY(284, -21, 106, -27, 117, -26, 117, -2, 59),
--	CABAC_ENTRY(285, -18, 103, -17, 102, -24, 113, -5, 75),
--	CABAC_ENTRY(286, -21, 107, -26, 117, -28, 118, -3, 62),
--	CABAC_ENTRY(287, -23, 108, -27, 116, -31, 120, -4, 58),
--	CABAC_ENTRY(288, -26, 112, -33, 122, -37, 124, -9, 66),
--	CABAC_ENTRY(289, -10, 96, -10, 95, -10, 94, -1, 79),
--	CABAC_ENTRY(290, -12, 95, -14, 100, -15, 102, 0, 71),
--	CABAC_ENTRY(291, -5, 91, -8, 95, -10, 99, 3, 68),
--	CABAC_ENTRY(292, -9, 93, -17, 111, -13, 106, 10, 44),
--	CABAC_ENTRY(293, -22, 94, -28, 114, -50, 127, -7, 62),
--	CABAC_ENTRY(294, -5, 86, -6, 89, -5, 92, 15, 36),
--	CABAC_ENTRY(295, 9, 67, -2, 80, 17, 57, 14, 40),
--	CABAC_ENTRY(296, -4, 80, -4, 82, -5, 86, 16, 27),
--	CABAC_ENTRY(297, -10, 85, -9, 85, -13, 94, 12, 29),
--	CABAC_ENTRY(298, -1, 70, -8, 81, -12, 91, 1, 44),
--	CABAC_ENTRY(299, 7, 60, -1, 72, -2, 77, 20, 36),
--	CABAC_ENTRY(300, 9, 58, 5, 64, 0, 71, 18, 32),
--	CABAC_ENTRY(301, 5, 61, 1, 67, -1, 73, 5, 42),
--	CABAC_ENTRY(302, 12, 50, 9, 56, 4, 64, 1, 48),
--	CABAC_ENTRY(303, 15, 50, 0, 69, -7, 81, 10, 62),
--	CABAC_ENTRY(304, 18, 49, 1, 69, 5, 64, 17, 46),
--	CABAC_ENTRY(305, 17, 54, 7, 69, 15, 57, 9, 64),
--	CABAC_ENTRY(306, 10, 41, -7, 69, 1, 67, -12, 104),
--	CABAC_ENTRY(307, 7, 46, -6, 67, 0, 68, -11, 97),
--	CABAC_ENTRY(308, -1, 51, -16, 77, -10, 67, -16, 96),
--	CABAC_ENTRY(309, 7, 49, -2, 64, 1, 68, -7, 88),
--	CABAC_ENTRY(310, 8, 52, 2, 61, 0, 77, -8, 85),
--	CABAC_ENTRY(311, 9, 41, -6, 67, 2, 64, -7, 85),
--	CABAC_ENTRY(312, 6, 47, -3, 64, 0, 68, -9, 85),
--	CABAC_ENTRY(313, 2, 55, 2, 57, -5, 78, -13, 88),
--	CABAC_ENTRY(314, 13, 41, -3, 65, 7, 55, 4, 66),
--	CABAC_ENTRY(315, 10, 44, -3, 66, 5, 59, -3, 77),
--	CABAC_ENTRY(316, 6, 50, 0, 62, 2, 65, -3, 76),
--	CABAC_ENTRY(317, 5, 53, 9, 51, 14, 54, -6, 76),
--	CABAC_ENTRY(318, 13, 49, -1, 66, 15, 44, 10, 58),
--	CABAC_ENTRY(319, 4, 63, -2, 71, 5, 60, -1, 76),
--	CABAC_ENTRY(320, 6, 64, -2, 75, 2, 70, -1, 83),
--	CABAC_ENTRY(321, -2, 69, -1, 70, -2, 76, -7, 99),
--	CABAC_ENTRY(322, -2, 59, -9, 72, -18, 86, -14, 95),
--	CABAC_ENTRY(323, 6, 70, 14, 60, 12, 70, 2, 95),
--	CABAC_ENTRY(324, 10, 44, 16, 37, 5, 64, 0, 76),
--	CABAC_ENTRY(325, 9, 31, 0, 47, -12, 70, -5, 74),
--	CABAC_ENTRY(326, 12, 43, 18, 35, 11, 55, 0, 70),
--	CABAC_ENTRY(327, 3, 53, 11, 37, 5, 56, -11, 75),
--	CABAC_ENTRY(328, 14, 34, 12, 41, 0, 69, 1, 68),
--	CABAC_ENTRY(329, 10, 38, 10, 41, 2, 65, 0, 65),
--	CABAC_ENTRY(330, -3, 52, 2, 48, -6, 74, -14, 73),
--	CABAC_ENTRY(331, 13, 40, 12, 41, 5, 54, 3, 62),
--	CABAC_ENTRY(332, 17, 32, 13, 41, 7, 54, 4, 62),
--	CABAC_ENTRY(333, 7, 44, 0, 59, -6, 76, -1, 68),
--	CABAC_ENTRY(334, 7, 38, 3, 50, -11, 82, -13, 75),
--	CABAC_ENTRY(335, 13, 50, 19, 40, -2, 77, 11, 55),
--	CABAC_ENTRY(336, 10, 57, 3, 66, -2, 77, 5, 64),
--	CABAC_ENTRY(337, 26, 43, 18, 50, 25, 42, 12, 70),
--
--	/* Table 9-23 – Values of variables m and n for ctxIdx from 338 to 398 */
--	CABAC_ENTRY(338, 14, 11, 19, -6, 17, -13, 15, 6),
--	CABAC_ENTRY(339, 11, 14, 18, -6, 16, -9, 6, 19),
--	CABAC_ENTRY(340, 9, 11, 14, 0, 17, -12, 7, 16),
--	CABAC_ENTRY(341, 18, 11, 26, -12, 27, -21, 12, 14),
--	CABAC_ENTRY(342, 21, 9, 31, -16, 37, -30, 18, 13),
--	CABAC_ENTRY(343, 23, -2, 33, -25, 41, -40, 13, 11),
--	CABAC_ENTRY(344, 32, -15, 33, -22, 42, -41, 13, 15),
--	CABAC_ENTRY(345, 32, -15, 37, -28, 48, -47, 15, 16),
--	CABAC_ENTRY(346, 34, -21, 39, -30, 39, -32, 12, 23),
--	CABAC_ENTRY(347, 39, -23, 42, -30, 46, -40, 13, 23),
--	CABAC_ENTRY(348, 42, -33, 47, -42, 52, -51, 15, 20),
--	CABAC_ENTRY(349, 41, -31, 45, -36, 46, -41, 14, 26),
--	CABAC_ENTRY(350, 46, -28, 49, -34, 52, -39, 14, 44),
--	CABAC_ENTRY(351, 38, -12, 41, -17, 43, -19, 17, 40),
--	CABAC_ENTRY(352, 21, 29, 32, 9, 32, 11, 17, 47),
--	CABAC_ENTRY(353, 45, -24, 69, -71, 61, -55, 24, 17),
--	CABAC_ENTRY(354, 53, -45, 63, -63, 56, -46, 21, 21),
--	CABAC_ENTRY(355, 48, -26, 66, -64, 62, -50, 25, 22),
--	CABAC_ENTRY(356, 65, -43, 77, -74, 81, -67, 31, 27),
--	CABAC_ENTRY(357, 43, -19, 54, -39, 45, -20, 22, 29),
--	CABAC_ENTRY(358, 39, -10, 52, -35, 35, -2, 19, 35),
--	CABAC_ENTRY(359, 30, 9, 41, -10, 28, 15, 14, 50),
--	CABAC_ENTRY(360, 18, 26, 36, 0, 34, 1, 10, 57),
--	CABAC_ENTRY(361, 20, 27, 40, -1, 39, 1, 7, 63),
--	CABAC_ENTRY(362, 0, 57, 30, 14, 30, 17, -2, 77),
--	CABAC_ENTRY(363, -14, 82, 28, 26, 20, 38, -4, 82),
--	CABAC_ENTRY(364, -5, 75, 23, 37, 18, 45, -3, 94),
--	CABAC_ENTRY(365, -19, 97, 12, 55, 15, 54, 9, 69),
--	CABAC_ENTRY(366, -35, 125, 11, 65, 0, 79, -12, 109),
--	CABAC_ENTRY(367, 27, 0, 37, -33, 36, -16, 36, -35),
--	CABAC_ENTRY(368, 28, 0, 39, -36, 37, -14, 36, -34),
--	CABAC_ENTRY(369, 31, -4, 40, -37, 37, -17, 32, -26),
--	CABAC_ENTRY(370, 27, 6, 38, -30, 32, 1, 37, -30),
--	CABAC_ENTRY(371, 34, 8, 46, -33, 34, 15, 44, -32),
--	CABAC_ENTRY(372, 30, 10, 42, -30, 29, 15, 34, -18),
--	CABAC_ENTRY(373, 24, 22, 40, -24, 24, 25, 34, -15),
--	CABAC_ENTRY(374, 33, 19, 49, -29, 34, 22, 40, -15),
--	CABAC_ENTRY(375, 22, 32, 38, -12, 31, 16, 33, -7),
--	CABAC_ENTRY(376, 26, 31, 40, -10, 35, 18, 35, -5),
--	CABAC_ENTRY(377, 21, 41, 38, -3, 31, 28, 33, 0),
--	CABAC_ENTRY(378, 26, 44, 46, -5, 33, 41, 38, 2),
--	CABAC_ENTRY(379, 23, 47, 31, 20, 36, 28, 33, 13),
--	CABAC_ENTRY(380, 16, 65, 29, 30, 27, 47, 23, 35),
--	CABAC_ENTRY(381, 14, 71, 25, 44, 21, 62, 13, 58),
--	CABAC_ENTRY(382, 8, 60, 12, 48, 18, 31, 29, -3),
--	CABAC_ENTRY(383, 6, 63, 11, 49, 19, 26, 26, 0),
--	CABAC_ENTRY(384, 17, 65, 26, 45, 36, 24, 22, 30),
--	CABAC_ENTRY(385, 21, 24, 22, 22, 24, 23, 31, -7),
--	CABAC_ENTRY(386, 23, 20, 23, 22, 27, 16, 35, -15),
--	CABAC_ENTRY(387, 26, 23, 27, 21, 24, 30, 34, -3),
--	CABAC_ENTRY(388, 27, 32, 33, 20, 31, 29, 34, 3),
--	CABAC_ENTRY(389, 28, 23, 26, 28, 22, 41, 36, -1),
--	CABAC_ENTRY(390, 28, 24, 30, 24, 22, 42, 34, 5),
--	CABAC_ENTRY(391, 23, 40, 27, 34, 16, 60, 32, 11),
--	CABAC_ENTRY(392, 24, 32, 18, 42, 15, 52, 35, 5),
--	CABAC_ENTRY(393, 28, 29, 25, 39, 14, 60, 34, 12),
--	CABAC_ENTRY(394, 23, 42, 18, 50, 3, 78, 39, 11),
--	CABAC_ENTRY(395, 19, 57, 12, 70, -16, 123, 30, 29),
--	CABAC_ENTRY(396, 22, 53, 21, 54, 21, 53, 34, 26),
--	CABAC_ENTRY(397, 22, 61, 14, 71, 22, 56, 29, 39),
--	CABAC_ENTRY(398, 11, 86, 11, 83, 25, 61, 19, 66),
--
--	/* Values of variables m and n for ctxIdx from 399 to 463 (not documented) */
--	CABAC_ENTRY(399, 12, 40, 25, 32, 21, 33, 31, 21),
--	CABAC_ENTRY(400, 11, 51, 21, 49, 19, 50, 31, 31),
--	CABAC_ENTRY(401, 14, 59, 21, 54, 17, 61, 25, 50),
--	CABAC_ENTRY(402, -4, 79, -5, 85, -3, 78, -17, 120),
--	CABAC_ENTRY(403, -7, 71, -6, 81, -8, 74, -20, 112),
--	CABAC_ENTRY(404, -5, 69, -10, 77, -9, 72, -18, 114),
--	CABAC_ENTRY(405, -9, 70, -7, 81, -10, 72, -11, 85),
--	CABAC_ENTRY(406, -8, 66, -17, 80, -18, 75, -15, 92),
--	CABAC_ENTRY(407, -10, 68, -18, 73, -12, 71, -14, 89),
--	CABAC_ENTRY(408, -19, 73, -4, 74, -11, 63, -26, 71),
--	CABAC_ENTRY(409, -12, 69, -10, 83, -5, 70, -15, 81),
--	CABAC_ENTRY(410, -16, 70, -9, 71, -17, 75, -14, 80),
--	CABAC_ENTRY(411, -15, 67, -9, 67, -14, 72, 0, 68),
--	CABAC_ENTRY(412, -20, 62, -1, 61, -16, 67, -14, 70),
--	CABAC_ENTRY(413, -19, 70, -8, 66, -8, 53, -24, 56),
--	CABAC_ENTRY(414, -16, 66, -14, 66, -14, 59, -23, 68),
--	CABAC_ENTRY(415, -22, 65, 0, 59, -9, 52, -24, 50),
--	CABAC_ENTRY(416, -20, 63, 2, 59, -11, 68, -11, 74),
--	CABAC_ENTRY(417, 9, -2, 17, -10, 9, -2, 23, -13),
--	CABAC_ENTRY(418, 26, -9, 32, -13, 30, -10, 26, -13),
--	CABAC_ENTRY(419, 33, -9, 42, -9, 31, -4, 40, -15),
--	CABAC_ENTRY(420, 39, -7, 49, -5, 33, -1, 49, -14),
--	CABAC_ENTRY(421, 41, -2, 53, 0, 33, 7, 44, 3),
--	CABAC_ENTRY(422, 45, 3, 64, 3, 31, 12, 45, 6),
--	CABAC_ENTRY(423, 49, 9, 68, 10, 37, 23, 44, 34),
--	CABAC_ENTRY(424, 45, 27, 66, 27, 31, 38, 33, 54),
--	CABAC_ENTRY(425, 36, 59, 47, 57, 20, 64, 19, 82),
--	CABAC_ENTRY(426, -6, 66, -5, 71, -9, 71, -3, 75),
--	CABAC_ENTRY(427, -7, 35, 0, 24, -7, 37, -1, 23),
--	CABAC_ENTRY(428, -7, 42, -1, 36, -8, 44, 1, 34),
--	CABAC_ENTRY(429, -8, 45, -2, 42, -11, 49, 1, 43),
--	CABAC_ENTRY(430, -5, 48, -2, 52, -10, 56, 0, 54),
--	CABAC_ENTRY(431, -12, 56, -9, 57, -12, 59, -2, 55),
--	CABAC_ENTRY(432, -6, 60, -6, 63, -8, 63, 0, 61),
--	CABAC_ENTRY(433, -5, 62, -4, 65, -9, 67, 1, 64),
--	CABAC_ENTRY(434, -8, 66, -4, 67, -6, 68, 0, 68),
--	CABAC_ENTRY(435, -8, 76, -7, 82, -10, 79, -9, 92),
--	CABAC_ENTRY(436, -5, 85, -3, 81, -3, 78, -14, 106),
--	CABAC_ENTRY(437, -6, 81, -3, 76, -8, 74, -13, 97),
--	CABAC_ENTRY(438, -10, 77, -7, 72, -9, 72, -15, 90),
--	CABAC_ENTRY(439, -7, 81, -6, 78, -10, 72, -12, 90),
--	CABAC_ENTRY(440, -17, 80, -12, 72, -18, 75, -18, 88),
--	CABAC_ENTRY(441, -18, 73, -14, 68, -12, 71, -10, 73),
--	CABAC_ENTRY(442, -4, 74, -3, 70, -11, 63, -9, 79),
--	CABAC_ENTRY(443, -10, 83, -6, 76, -5, 70, -14, 86),
--	CABAC_ENTRY(444, -9, 71, -5, 66, -17, 75, -10, 73),
--	CABAC_ENTRY(445, -9, 67, -5, 62, -14, 72, -10, 70),
--	CABAC_ENTRY(446, -1, 61, 0, 57, -16, 67, -10, 69),
--	CABAC_ENTRY(447, -8, 66, -4, 61, -8, 53, -5, 66),
--	CABAC_ENTRY(448, -14, 66, -9, 60, -14, 59, -9, 64),
--	CABAC_ENTRY(449, 0, 59, 1, 54, -9, 52, -5, 58),
--	CABAC_ENTRY(450, 2, 59, 2, 58, -11, 68, 2, 59),
--	CABAC_ENTRY(451, 21, -13, 17, -10, 9, -2, 21, -10),
--	CABAC_ENTRY(452, 33, -14, 32, -13, 30, -10, 24, -11),
--	CABAC_ENTRY(453, 39, -7, 42, -9, 31, -4, 28, -8),
--	CABAC_ENTRY(454, 46, -2, 49, -5, 33, -1, 28, -1),
--	CABAC_ENTRY(455, 51, 2, 53, 0, 33, 7, 29, 3),
--	CABAC_ENTRY(456, 60, 6, 64, 3, 31, 12, 29, 9),
--	CABAC_ENTRY(457, 61, 17, 68, 10, 37, 23, 35, 20),
--	CABAC_ENTRY(458, 55, 34, 66, 27, 31, 38, 29, 36),
--	CABAC_ENTRY(459, 42, 62, 47, 57, 20, 64, 14, 67),
--};
--
- static void set_ps_field(u32 *buf, struct rkvdec_ps_field field, u32 value)
- {
- 	u8 bit = field.offset % 32, word = field.offset / 32;
-diff --git a/include/media/v4l2-cabac/rkvdec-cabac.h b/include/media/v4l2-cabac/rkvdec-cabac.h
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/include/media/v4l2-cabac/rkvdec-cabac.h
-@@ -0,0 +1,509 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+
-+/*
-+ * Define the H264 CABAC table common to rkvdec and rkvdec2 drivers.
-+ */
-+
-+#ifndef RKVDEC_H264_CABAC_H_
-+#define RKVDEC_H264_CABAC_H_
-+
-+#define CABAC_ENTRY(ctxidx, idc0_m, idc0_n, idc1_m, idc1_n,	\
-+		    idc2_m, idc2_n, intra_m, intra_n)		\
-+	[0][(ctxidx)] = {idc0_m, idc0_n},			\
-+	[1][(ctxidx)] = {idc1_m, idc1_n},			\
-+	[2][(ctxidx)] = {idc2_m, idc2_n},			\
-+	[3][(ctxidx)] = {intra_m, intra_n}
-+
-+/*
-+ * Constant CABAC table.
-+ * Built from the tables described in section '9.3.1.1 Initialisation process
-+ * for context variables' of the H264 spec.
-+ */
-+static const s8 rkvdec_h264_cabac_table[4][464][2] = {
-+	/* Table 9-12 – Values of variables m and n for ctxIdx from 0 to 10 */
-+	CABAC_ENTRY(0, 20, -15, 20, -15, 20, -15, 20, -15),
-+	CABAC_ENTRY(1, 2, 54, 2, 54, 2, 54, 2, 54),
-+	CABAC_ENTRY(2, 3, 74, 3, 74, 3, 74, 3, 74),
-+	CABAC_ENTRY(3, 20, -15, 20, -15, 20, -15, 20, -15),
-+	CABAC_ENTRY(4, 2, 54, 2, 54, 2, 54, 2, 54),
-+	CABAC_ENTRY(5, 3, 74, 3, 74, 3, 74, 3, 74),
-+	CABAC_ENTRY(6, -28, 127, -28, 127, -28, 127, -28, 127),
-+	CABAC_ENTRY(7, -23, 104, -23, 104, -23, 104, -23, 104),
-+	CABAC_ENTRY(8, -6, 53, -6, 53, -6, 53, -6, 53),
-+	CABAC_ENTRY(9, -1, 54, -1, 54, -1, 54, -1, 54),
-+	CABAC_ENTRY(10, 7, 51, 7, 51, 7, 51, 7, 51),
-+
-+	/* Table 9-13 – Values of variables m and n for ctxIdx from 11 to 23 */
-+	CABAC_ENTRY(11, 23, 33, 22, 25, 29, 16, 0, 0),
-+	CABAC_ENTRY(12, 23, 2, 34, 0, 25, 0, 0, 0),
-+	CABAC_ENTRY(13, 21, 0, 16, 0, 14, 0, 0, 0),
-+	CABAC_ENTRY(14, 1, 9, -2, 9, -10, 51, 0, 0),
-+	CABAC_ENTRY(15, 0, 49, 4, 41, -3, 62, 0, 0),
-+	CABAC_ENTRY(16, -37, 118, -29, 118, -27, 99, 0, 0),
-+	CABAC_ENTRY(17, 5, 57, 2, 65, 26, 16, 0, 0),
-+	CABAC_ENTRY(18, -13, 78, -6, 71, -4, 85, 0, 0),
-+	CABAC_ENTRY(19, -11, 65, -13, 79, -24, 102, 0, 0),
-+	CABAC_ENTRY(20, 1, 62, 5, 52, 5, 57, 0, 0),
-+	CABAC_ENTRY(21, 12, 49, 9, 50, 6, 57, 0, 0),
-+	CABAC_ENTRY(22, -4, 73, -3, 70, -17, 73, 0, 0),
-+	CABAC_ENTRY(23, 17, 50, 10, 54, 14, 57, 0, 0),
-+
-+	/* Table 9-14 – Values of variables m and n for ctxIdx from 24 to 39 */
-+	CABAC_ENTRY(24, 18, 64, 26, 34, 20, 40, 0, 0),
-+	CABAC_ENTRY(25, 9, 43, 19, 22, 20, 10, 0, 0),
-+	CABAC_ENTRY(26, 29, 0, 40, 0, 29, 0, 0, 0),
-+	CABAC_ENTRY(27, 26, 67, 57, 2, 54, 0, 0, 0),
-+	CABAC_ENTRY(28, 16, 90, 41, 36, 37, 42, 0, 0),
-+	CABAC_ENTRY(29, 9, 104, 26, 69, 12, 97, 0, 0),
-+	CABAC_ENTRY(30, -46, 127, -45, 127, -32, 127, 0, 0),
-+	CABAC_ENTRY(31, -20, 104, -15, 101, -22, 117, 0, 0),
-+	CABAC_ENTRY(32, 1, 67, -4, 76, -2, 74, 0, 0),
-+	CABAC_ENTRY(33, -13, 78, -6, 71, -4, 85, 0, 0),
-+	CABAC_ENTRY(34, -11, 65, -13, 79, -24, 102, 0, 0),
-+	CABAC_ENTRY(35, 1, 62, 5, 52, 5, 57, 0, 0),
-+	CABAC_ENTRY(36, -6, 86, 6, 69, -6, 93, 0, 0),
-+	CABAC_ENTRY(37, -17, 95, -13, 90, -14, 88, 0, 0),
-+	CABAC_ENTRY(38, -6, 61, 0, 52, -6, 44, 0, 0),
-+	CABAC_ENTRY(39, 9, 45, 8, 43, 4, 55, 0, 0),
-+
-+	/* Table 9-15 – Values of variables m and n for ctxIdx from 40 to 53 */
-+	CABAC_ENTRY(40, -3, 69, -2, 69, -11, 89, 0, 0),
-+	CABAC_ENTRY(41, -6, 81, -5, 82, -15, 103, 0, 0),
-+	CABAC_ENTRY(42, -11, 96, -10, 96, -21, 116, 0, 0),
-+	CABAC_ENTRY(43, 6, 55, 2, 59, 19, 57, 0, 0),
-+	CABAC_ENTRY(44, 7, 67, 2, 75, 20, 58, 0, 0),
-+	CABAC_ENTRY(45, -5, 86, -3, 87, 4, 84, 0, 0),
-+	CABAC_ENTRY(46, 2, 88, -3, 100, 6, 96, 0, 0),
-+	CABAC_ENTRY(47, 0, 58, 1, 56, 1, 63, 0, 0),
-+	CABAC_ENTRY(48, -3, 76, -3, 74, -5, 85, 0, 0),
-+	CABAC_ENTRY(49, -10, 94, -6, 85, -13, 106, 0, 0),
-+	CABAC_ENTRY(50, 5, 54, 0, 59, 5, 63, 0, 0),
-+	CABAC_ENTRY(51, 4, 69, -3, 81, 6, 75, 0, 0),
-+	CABAC_ENTRY(52, -3, 81, -7, 86, -3, 90, 0, 0),
-+	CABAC_ENTRY(53, 0, 88, -5, 95, -1, 101, 0, 0),
-+
-+	/* Table 9-16 – Values of variables m and n for ctxIdx from 54 to 59 */
-+	CABAC_ENTRY(54, -7, 67, -1, 66, 3, 55, 0, 0),
-+	CABAC_ENTRY(55, -5, 74, -1, 77, -4, 79, 0, 0),
-+	CABAC_ENTRY(56, -4, 74, 1, 70, -2, 75, 0, 0),
-+	CABAC_ENTRY(57, -5, 80, -2, 86, -12, 97, 0, 0),
-+	CABAC_ENTRY(58, -7, 72, -5, 72, -7, 50, 0, 0),
-+	CABAC_ENTRY(59, 1, 58, 0, 61, 1, 60, 0, 0),
-+
-+	/* Table 9-17 – Values of variables m and n for ctxIdx from 60 to 69 */
-+	CABAC_ENTRY(60, 0, 41, 0, 41, 0, 41, 0, 41),
-+	CABAC_ENTRY(61, 0, 63, 0, 63, 0, 63, 0, 63),
-+	CABAC_ENTRY(62, 0, 63, 0, 63, 0, 63, 0, 63),
-+	CABAC_ENTRY(63, 0, 63, 0, 63, 0, 63, 0, 63),
-+	CABAC_ENTRY(64, -9, 83, -9, 83, -9, 83, -9, 83),
-+	CABAC_ENTRY(65, 4, 86, 4, 86, 4, 86, 4, 86),
-+	CABAC_ENTRY(66, 0, 97, 0, 97, 0, 97, 0, 97),
-+	CABAC_ENTRY(67, -7, 72, -7, 72, -7, 72, -7, 72),
-+	CABAC_ENTRY(68, 13, 41, 13, 41, 13, 41, 13, 41),
-+	CABAC_ENTRY(69, 3, 62, 3, 62, 3, 62, 3, 62),
-+
-+	/* Table 9-18 – Values of variables m and n for ctxIdx from 70 to 104 */
-+	CABAC_ENTRY(70, 0, 45, 13, 15, 7, 34, 0, 11),
-+	CABAC_ENTRY(71, -4, 78, 7, 51, -9, 88, 1, 55),
-+	CABAC_ENTRY(72, -3, 96, 2, 80, -20, 127, 0, 69),
-+	CABAC_ENTRY(73, -27, 126, -39, 127, -36, 127, -17, 127),
-+	CABAC_ENTRY(74, -28, 98, -18, 91, -17, 91, -13, 102),
-+	CABAC_ENTRY(75, -25, 101, -17, 96, -14, 95, 0, 82),
-+	CABAC_ENTRY(76, -23, 67, -26, 81, -25, 84, -7, 74),
-+	CABAC_ENTRY(77, -28, 82, -35, 98, -25, 86, -21, 107),
-+	CABAC_ENTRY(78, -20, 94, -24, 102, -12, 89, -27, 127),
-+	CABAC_ENTRY(79, -16, 83, -23, 97, -17, 91, -31, 127),
-+	CABAC_ENTRY(80, -22, 110, -27, 119, -31, 127, -24, 127),
-+	CABAC_ENTRY(81, -21, 91, -24, 99, -14, 76, -18, 95),
-+	CABAC_ENTRY(82, -18, 102, -21, 110, -18, 103, -27, 127),
-+	CABAC_ENTRY(83, -13, 93, -18, 102, -13, 90, -21, 114),
-+	CABAC_ENTRY(84, -29, 127, -36, 127, -37, 127, -30, 127),
-+	CABAC_ENTRY(85, -7, 92, 0, 80, 11, 80, -17, 123),
-+	CABAC_ENTRY(86, -5, 89, -5, 89, 5, 76, -12, 115),
-+	CABAC_ENTRY(87, -7, 96, -7, 94, 2, 84, -16, 122),
-+	CABAC_ENTRY(88, -13, 108, -4, 92, 5, 78, -11, 115),
-+	CABAC_ENTRY(89, -3, 46, 0, 39, -6, 55, -12, 63),
-+	CABAC_ENTRY(90, -1, 65, 0, 65, 4, 61, -2, 68),
-+	CABAC_ENTRY(91, -1, 57, -15, 84, -14, 83, -15, 84),
-+	CABAC_ENTRY(92, -9, 93, -35, 127, -37, 127, -13, 104),
-+	CABAC_ENTRY(93, -3, 74, -2, 73, -5, 79, -3, 70),
-+	CABAC_ENTRY(94, -9, 92, -12, 104, -11, 104, -8, 93),
-+	CABAC_ENTRY(95, -8, 87, -9, 91, -11, 91, -10, 90),
-+	CABAC_ENTRY(96, -23, 126, -31, 127, -30, 127, -30, 127),
-+	CABAC_ENTRY(97, 5, 54, 3, 55, 0, 65, -1, 74),
-+	CABAC_ENTRY(98, 6, 60, 7, 56, -2, 79, -6, 97),
-+	CABAC_ENTRY(99, 6, 59, 7, 55, 0, 72, -7, 91),
-+	CABAC_ENTRY(100, 6, 69, 8, 61, -4, 92, -20, 127),
-+	CABAC_ENTRY(101, -1, 48, -3, 53, -6, 56, -4, 56),
-+	CABAC_ENTRY(102, 0, 68, 0, 68, 3, 68, -5, 82),
-+	CABAC_ENTRY(103, -4, 69, -7, 74, -8, 71, -7, 76),
-+	CABAC_ENTRY(104, -8, 88, -9, 88, -13, 98, -22, 125),
-+
-+	/* Table 9-19 – Values of variables m and n for ctxIdx from 105 to 165 */
-+	CABAC_ENTRY(105, -2, 85, -13, 103, -4, 86, -7, 93),
-+	CABAC_ENTRY(106, -6, 78, -13, 91, -12, 88, -11, 87),
-+	CABAC_ENTRY(107, -1, 75, -9, 89, -5, 82, -3, 77),
-+	CABAC_ENTRY(108, -7, 77, -14, 92, -3, 72, -5, 71),
-+	CABAC_ENTRY(109, 2, 54, -8, 76, -4, 67, -4, 63),
-+	CABAC_ENTRY(110, 5, 50, -12, 87, -8, 72, -4, 68),
-+	CABAC_ENTRY(111, -3, 68, -23, 110, -16, 89, -12, 84),
-+	CABAC_ENTRY(112, 1, 50, -24, 105, -9, 69, -7, 62),
-+	CABAC_ENTRY(113, 6, 42, -10, 78, -1, 59, -7, 65),
-+	CABAC_ENTRY(114, -4, 81, -20, 112, 5, 66, 8, 61),
-+	CABAC_ENTRY(115, 1, 63, -17, 99, 4, 57, 5, 56),
-+	CABAC_ENTRY(116, -4, 70, -78, 127, -4, 71, -2, 66),
-+	CABAC_ENTRY(117, 0, 67, -70, 127, -2, 71, 1, 64),
-+	CABAC_ENTRY(118, 2, 57, -50, 127, 2, 58, 0, 61),
-+	CABAC_ENTRY(119, -2, 76, -46, 127, -1, 74, -2, 78),
-+	CABAC_ENTRY(120, 11, 35, -4, 66, -4, 44, 1, 50),
-+	CABAC_ENTRY(121, 4, 64, -5, 78, -1, 69, 7, 52),
-+	CABAC_ENTRY(122, 1, 61, -4, 71, 0, 62, 10, 35),
-+	CABAC_ENTRY(123, 11, 35, -8, 72, -7, 51, 0, 44),
-+	CABAC_ENTRY(124, 18, 25, 2, 59, -4, 47, 11, 38),
-+	CABAC_ENTRY(125, 12, 24, -1, 55, -6, 42, 1, 45),
-+	CABAC_ENTRY(126, 13, 29, -7, 70, -3, 41, 0, 46),
-+	CABAC_ENTRY(127, 13, 36, -6, 75, -6, 53, 5, 44),
-+	CABAC_ENTRY(128, -10, 93, -8, 89, 8, 76, 31, 17),
-+	CABAC_ENTRY(129, -7, 73, -34, 119, -9, 78, 1, 51),
-+	CABAC_ENTRY(130, -2, 73, -3, 75, -11, 83, 7, 50),
-+	CABAC_ENTRY(131, 13, 46, 32, 20, 9, 52, 28, 19),
-+	CABAC_ENTRY(132, 9, 49, 30, 22, 0, 67, 16, 33),
-+	CABAC_ENTRY(133, -7, 100, -44, 127, -5, 90, 14, 62),
-+	CABAC_ENTRY(134, 9, 53, 0, 54, 1, 67, -13, 108),
-+	CABAC_ENTRY(135, 2, 53, -5, 61, -15, 72, -15, 100),
-+	CABAC_ENTRY(136, 5, 53, 0, 58, -5, 75, -13, 101),
-+	CABAC_ENTRY(137, -2, 61, -1, 60, -8, 80, -13, 91),
-+	CABAC_ENTRY(138, 0, 56, -3, 61, -21, 83, -12, 94),
-+	CABAC_ENTRY(139, 0, 56, -8, 67, -21, 64, -10, 88),
-+	CABAC_ENTRY(140, -13, 63, -25, 84, -13, 31, -16, 84),
-+	CABAC_ENTRY(141, -5, 60, -14, 74, -25, 64, -10, 86),
-+	CABAC_ENTRY(142, -1, 62, -5, 65, -29, 94, -7, 83),
-+	CABAC_ENTRY(143, 4, 57, 5, 52, 9, 75, -13, 87),
-+	CABAC_ENTRY(144, -6, 69, 2, 57, 17, 63, -19, 94),
-+	CABAC_ENTRY(145, 4, 57, 0, 61, -8, 74, 1, 70),
-+	CABAC_ENTRY(146, 14, 39, -9, 69, -5, 35, 0, 72),
-+	CABAC_ENTRY(147, 4, 51, -11, 70, -2, 27, -5, 74),
-+	CABAC_ENTRY(148, 13, 68, 18, 55, 13, 91, 18, 59),
-+	CABAC_ENTRY(149, 3, 64, -4, 71, 3, 65, -8, 102),
-+	CABAC_ENTRY(150, 1, 61, 0, 58, -7, 69, -15, 100),
-+	CABAC_ENTRY(151, 9, 63, 7, 61, 8, 77, 0, 95),
-+	CABAC_ENTRY(152, 7, 50, 9, 41, -10, 66, -4, 75),
-+	CABAC_ENTRY(153, 16, 39, 18, 25, 3, 62, 2, 72),
-+	CABAC_ENTRY(154, 5, 44, 9, 32, -3, 68, -11, 75),
-+	CABAC_ENTRY(155, 4, 52, 5, 43, -20, 81, -3, 71),
-+	CABAC_ENTRY(156, 11, 48, 9, 47, 0, 30, 15, 46),
-+	CABAC_ENTRY(157, -5, 60, 0, 44, 1, 7, -13, 69),
-+	CABAC_ENTRY(158, -1, 59, 0, 51, -3, 23, 0, 62),
-+	CABAC_ENTRY(159, 0, 59, 2, 46, -21, 74, 0, 65),
-+	CABAC_ENTRY(160, 22, 33, 19, 38, 16, 66, 21, 37),
-+	CABAC_ENTRY(161, 5, 44, -4, 66, -23, 124, -15, 72),
-+	CABAC_ENTRY(162, 14, 43, 15, 38, 17, 37, 9, 57),
-+	CABAC_ENTRY(163, -1, 78, 12, 42, 44, -18, 16, 54),
-+	CABAC_ENTRY(164, 0, 60, 9, 34, 50, -34, 0, 62),
-+	CABAC_ENTRY(165, 9, 69, 0, 89, -22, 127, 12, 72),
-+
-+	/* Table 9-20 – Values of variables m and n for ctxIdx from 166 to 226 */
-+	CABAC_ENTRY(166, 11, 28, 4, 45, 4, 39, 24, 0),
-+	CABAC_ENTRY(167, 2, 40, 10, 28, 0, 42, 15, 9),
-+	CABAC_ENTRY(168, 3, 44, 10, 31, 7, 34, 8, 25),
-+	CABAC_ENTRY(169, 0, 49, 33, -11, 11, 29, 13, 18),
-+	CABAC_ENTRY(170, 0, 46, 52, -43, 8, 31, 15, 9),
-+	CABAC_ENTRY(171, 2, 44, 18, 15, 6, 37, 13, 19),
-+	CABAC_ENTRY(172, 2, 51, 28, 0, 7, 42, 10, 37),
-+	CABAC_ENTRY(173, 0, 47, 35, -22, 3, 40, 12, 18),
-+	CABAC_ENTRY(174, 4, 39, 38, -25, 8, 33, 6, 29),
-+	CABAC_ENTRY(175, 2, 62, 34, 0, 13, 43, 20, 33),
-+	CABAC_ENTRY(176, 6, 46, 39, -18, 13, 36, 15, 30),
-+	CABAC_ENTRY(177, 0, 54, 32, -12, 4, 47, 4, 45),
-+	CABAC_ENTRY(178, 3, 54, 102, -94, 3, 55, 1, 58),
-+	CABAC_ENTRY(179, 2, 58, 0, 0, 2, 58, 0, 62),
-+	CABAC_ENTRY(180, 4, 63, 56, -15, 6, 60, 7, 61),
-+	CABAC_ENTRY(181, 6, 51, 33, -4, 8, 44, 12, 38),
-+	CABAC_ENTRY(182, 6, 57, 29, 10, 11, 44, 11, 45),
-+	CABAC_ENTRY(183, 7, 53, 37, -5, 14, 42, 15, 39),
-+	CABAC_ENTRY(184, 6, 52, 51, -29, 7, 48, 11, 42),
-+	CABAC_ENTRY(185, 6, 55, 39, -9, 4, 56, 13, 44),
-+	CABAC_ENTRY(186, 11, 45, 52, -34, 4, 52, 16, 45),
-+	CABAC_ENTRY(187, 14, 36, 69, -58, 13, 37, 12, 41),
-+	CABAC_ENTRY(188, 8, 53, 67, -63, 9, 49, 10, 49),
-+	CABAC_ENTRY(189, -1, 82, 44, -5, 19, 58, 30, 34),
-+	CABAC_ENTRY(190, 7, 55, 32, 7, 10, 48, 18, 42),
-+	CABAC_ENTRY(191, -3, 78, 55, -29, 12, 45, 10, 55),
-+	CABAC_ENTRY(192, 15, 46, 32, 1, 0, 69, 17, 51),
-+	CABAC_ENTRY(193, 22, 31, 0, 0, 20, 33, 17, 46),
-+	CABAC_ENTRY(194, -1, 84, 27, 36, 8, 63, 0, 89),
-+	CABAC_ENTRY(195, 25, 7, 33, -25, 35, -18, 26, -19),
-+	CABAC_ENTRY(196, 30, -7, 34, -30, 33, -25, 22, -17),
-+	CABAC_ENTRY(197, 28, 3, 36, -28, 28, -3, 26, -17),
-+	CABAC_ENTRY(198, 28, 4, 38, -28, 24, 10, 30, -25),
-+	CABAC_ENTRY(199, 32, 0, 38, -27, 27, 0, 28, -20),
-+	CABAC_ENTRY(200, 34, -1, 34, -18, 34, -14, 33, -23),
-+	CABAC_ENTRY(201, 30, 6, 35, -16, 52, -44, 37, -27),
-+	CABAC_ENTRY(202, 30, 6, 34, -14, 39, -24, 33, -23),
-+	CABAC_ENTRY(203, 32, 9, 32, -8, 19, 17, 40, -28),
-+	CABAC_ENTRY(204, 31, 19, 37, -6, 31, 25, 38, -17),
-+	CABAC_ENTRY(205, 26, 27, 35, 0, 36, 29, 33, -11),
-+	CABAC_ENTRY(206, 26, 30, 30, 10, 24, 33, 40, -15),
-+	CABAC_ENTRY(207, 37, 20, 28, 18, 34, 15, 41, -6),
-+	CABAC_ENTRY(208, 28, 34, 26, 25, 30, 20, 38, 1),
-+	CABAC_ENTRY(209, 17, 70, 29, 41, 22, 73, 41, 17),
-+	CABAC_ENTRY(210, 1, 67, 0, 75, 20, 34, 30, -6),
-+	CABAC_ENTRY(211, 5, 59, 2, 72, 19, 31, 27, 3),
-+	CABAC_ENTRY(212, 9, 67, 8, 77, 27, 44, 26, 22),
-+	CABAC_ENTRY(213, 16, 30, 14, 35, 19, 16, 37, -16),
-+	CABAC_ENTRY(214, 18, 32, 18, 31, 15, 36, 35, -4),
-+	CABAC_ENTRY(215, 18, 35, 17, 35, 15, 36, 38, -8),
-+	CABAC_ENTRY(216, 22, 29, 21, 30, 21, 28, 38, -3),
-+	CABAC_ENTRY(217, 24, 31, 17, 45, 25, 21, 37, 3),
-+	CABAC_ENTRY(218, 23, 38, 20, 42, 30, 20, 38, 5),
-+	CABAC_ENTRY(219, 18, 43, 18, 45, 31, 12, 42, 0),
-+	CABAC_ENTRY(220, 20, 41, 27, 26, 27, 16, 35, 16),
-+	CABAC_ENTRY(221, 11, 63, 16, 54, 24, 42, 39, 22),
-+	CABAC_ENTRY(222, 9, 59, 7, 66, 0, 93, 14, 48),
-+	CABAC_ENTRY(223, 9, 64, 16, 56, 14, 56, 27, 37),
-+	CABAC_ENTRY(224, -1, 94, 11, 73, 15, 57, 21, 60),
-+	CABAC_ENTRY(225, -2, 89, 10, 67, 26, 38, 12, 68),
-+	CABAC_ENTRY(226, -9, 108, -10, 116, -24, 127, 2, 97),
-+
-+	/* Table 9-21 – Values of variables m and n for ctxIdx from 227 to 275 */
-+	CABAC_ENTRY(227, -6, 76, -23, 112, -24, 115, -3, 71),
-+	CABAC_ENTRY(228, -2, 44, -15, 71, -22, 82, -6, 42),
-+	CABAC_ENTRY(229, 0, 45, -7, 61, -9, 62, -5, 50),
-+	CABAC_ENTRY(230, 0, 52, 0, 53, 0, 53, -3, 54),
-+	CABAC_ENTRY(231, -3, 64, -5, 66, 0, 59, -2, 62),
-+	CABAC_ENTRY(232, -2, 59, -11, 77, -14, 85, 0, 58),
-+	CABAC_ENTRY(233, -4, 70, -9, 80, -13, 89, 1, 63),
-+	CABAC_ENTRY(234, -4, 75, -9, 84, -13, 94, -2, 72),
-+	CABAC_ENTRY(235, -8, 82, -10, 87, -11, 92, -1, 74),
-+	CABAC_ENTRY(236, -17, 102, -34, 127, -29, 127, -9, 91),
-+	CABAC_ENTRY(237, -9, 77, -21, 101, -21, 100, -5, 67),
-+	CABAC_ENTRY(238, 3, 24, -3, 39, -14, 57, -5, 27),
-+	CABAC_ENTRY(239, 0, 42, -5, 53, -12, 67, -3, 39),
-+	CABAC_ENTRY(240, 0, 48, -7, 61, -11, 71, -2, 44),
-+	CABAC_ENTRY(241, 0, 55, -11, 75, -10, 77, 0, 46),
-+	CABAC_ENTRY(242, -6, 59, -15, 77, -21, 85, -16, 64),
-+	CABAC_ENTRY(243, -7, 71, -17, 91, -16, 88, -8, 68),
-+	CABAC_ENTRY(244, -12, 83, -25, 107, -23, 104, -10, 78),
-+	CABAC_ENTRY(245, -11, 87, -25, 111, -15, 98, -6, 77),
-+	CABAC_ENTRY(246, -30, 119, -28, 122, -37, 127, -10, 86),
-+	CABAC_ENTRY(247, 1, 58, -11, 76, -10, 82, -12, 92),
-+	CABAC_ENTRY(248, -3, 29, -10, 44, -8, 48, -15, 55),
-+	CABAC_ENTRY(249, -1, 36, -10, 52, -8, 61, -10, 60),
-+	CABAC_ENTRY(250, 1, 38, -10, 57, -8, 66, -6, 62),
-+	CABAC_ENTRY(251, 2, 43, -9, 58, -7, 70, -4, 65),
-+	CABAC_ENTRY(252, -6, 55, -16, 72, -14, 75, -12, 73),
-+	CABAC_ENTRY(253, 0, 58, -7, 69, -10, 79, -8, 76),
-+	CABAC_ENTRY(254, 0, 64, -4, 69, -9, 83, -7, 80),
-+	CABAC_ENTRY(255, -3, 74, -5, 74, -12, 92, -9, 88),
-+	CABAC_ENTRY(256, -10, 90, -9, 86, -18, 108, -17, 110),
-+	CABAC_ENTRY(257, 0, 70, 2, 66, -4, 79, -11, 97),
-+	CABAC_ENTRY(258, -4, 29, -9, 34, -22, 69, -20, 84),
-+	CABAC_ENTRY(259, 5, 31, 1, 32, -16, 75, -11, 79),
-+	CABAC_ENTRY(260, 7, 42, 11, 31, -2, 58, -6, 73),
-+	CABAC_ENTRY(261, 1, 59, 5, 52, 1, 58, -4, 74),
-+	CABAC_ENTRY(262, -2, 58, -2, 55, -13, 78, -13, 86),
-+	CABAC_ENTRY(263, -3, 72, -2, 67, -9, 83, -13, 96),
-+	CABAC_ENTRY(264, -3, 81, 0, 73, -4, 81, -11, 97),
-+	CABAC_ENTRY(265, -11, 97, -8, 89, -13, 99, -19, 117),
-+	CABAC_ENTRY(266, 0, 58, 3, 52, -13, 81, -8, 78),
-+	CABAC_ENTRY(267, 8, 5, 7, 4, -6, 38, -5, 33),
-+	CABAC_ENTRY(268, 10, 14, 10, 8, -13, 62, -4, 48),
-+	CABAC_ENTRY(269, 14, 18, 17, 8, -6, 58, -2, 53),
-+	CABAC_ENTRY(270, 13, 27, 16, 19, -2, 59, -3, 62),
-+	CABAC_ENTRY(271, 2, 40, 3, 37, -16, 73, -13, 71),
-+	CABAC_ENTRY(272, 0, 58, -1, 61, -10, 76, -10, 79),
-+	CABAC_ENTRY(273, -3, 70, -5, 73, -13, 86, -12, 86),
-+	CABAC_ENTRY(274, -6, 79, -1, 70, -9, 83, -13, 90),
-+	CABAC_ENTRY(275, -8, 85, -4, 78, -10, 87, -14, 97),
-+
-+	/* Table 9-22 – Values of variables m and n for ctxIdx from 277 to 337 */
-+	CABAC_ENTRY(277, -13, 106, -21, 126, -22, 127, -6, 93),
-+	CABAC_ENTRY(278, -16, 106, -23, 124, -25, 127, -6, 84),
-+	CABAC_ENTRY(279, -10, 87, -20, 110, -25, 120, -8, 79),
-+	CABAC_ENTRY(280, -21, 114, -26, 126, -27, 127, 0, 66),
-+	CABAC_ENTRY(281, -18, 110, -25, 124, -19, 114, -1, 71),
-+	CABAC_ENTRY(282, -14, 98, -17, 105, -23, 117, 0, 62),
-+	CABAC_ENTRY(283, -22, 110, -27, 121, -25, 118, -2, 60),
-+	CABAC_ENTRY(284, -21, 106, -27, 117, -26, 117, -2, 59),
-+	CABAC_ENTRY(285, -18, 103, -17, 102, -24, 113, -5, 75),
-+	CABAC_ENTRY(286, -21, 107, -26, 117, -28, 118, -3, 62),
-+	CABAC_ENTRY(287, -23, 108, -27, 116, -31, 120, -4, 58),
-+	CABAC_ENTRY(288, -26, 112, -33, 122, -37, 124, -9, 66),
-+	CABAC_ENTRY(289, -10, 96, -10, 95, -10, 94, -1, 79),
-+	CABAC_ENTRY(290, -12, 95, -14, 100, -15, 102, 0, 71),
-+	CABAC_ENTRY(291, -5, 91, -8, 95, -10, 99, 3, 68),
-+	CABAC_ENTRY(292, -9, 93, -17, 111, -13, 106, 10, 44),
-+	CABAC_ENTRY(293, -22, 94, -28, 114, -50, 127, -7, 62),
-+	CABAC_ENTRY(294, -5, 86, -6, 89, -5, 92, 15, 36),
-+	CABAC_ENTRY(295, 9, 67, -2, 80, 17, 57, 14, 40),
-+	CABAC_ENTRY(296, -4, 80, -4, 82, -5, 86, 16, 27),
-+	CABAC_ENTRY(297, -10, 85, -9, 85, -13, 94, 12, 29),
-+	CABAC_ENTRY(298, -1, 70, -8, 81, -12, 91, 1, 44),
-+	CABAC_ENTRY(299, 7, 60, -1, 72, -2, 77, 20, 36),
-+	CABAC_ENTRY(300, 9, 58, 5, 64, 0, 71, 18, 32),
-+	CABAC_ENTRY(301, 5, 61, 1, 67, -1, 73, 5, 42),
-+	CABAC_ENTRY(302, 12, 50, 9, 56, 4, 64, 1, 48),
-+	CABAC_ENTRY(303, 15, 50, 0, 69, -7, 81, 10, 62),
-+	CABAC_ENTRY(304, 18, 49, 1, 69, 5, 64, 17, 46),
-+	CABAC_ENTRY(305, 17, 54, 7, 69, 15, 57, 9, 64),
-+	CABAC_ENTRY(306, 10, 41, -7, 69, 1, 67, -12, 104),
-+	CABAC_ENTRY(307, 7, 46, -6, 67, 0, 68, -11, 97),
-+	CABAC_ENTRY(308, -1, 51, -16, 77, -10, 67, -16, 96),
-+	CABAC_ENTRY(309, 7, 49, -2, 64, 1, 68, -7, 88),
-+	CABAC_ENTRY(310, 8, 52, 2, 61, 0, 77, -8, 85),
-+	CABAC_ENTRY(311, 9, 41, -6, 67, 2, 64, -7, 85),
-+	CABAC_ENTRY(312, 6, 47, -3, 64, 0, 68, -9, 85),
-+	CABAC_ENTRY(313, 2, 55, 2, 57, -5, 78, -13, 88),
-+	CABAC_ENTRY(314, 13, 41, -3, 65, 7, 55, 4, 66),
-+	CABAC_ENTRY(315, 10, 44, -3, 66, 5, 59, -3, 77),
-+	CABAC_ENTRY(316, 6, 50, 0, 62, 2, 65, -3, 76),
-+	CABAC_ENTRY(317, 5, 53, 9, 51, 14, 54, -6, 76),
-+	CABAC_ENTRY(318, 13, 49, -1, 66, 15, 44, 10, 58),
-+	CABAC_ENTRY(319, 4, 63, -2, 71, 5, 60, -1, 76),
-+	CABAC_ENTRY(320, 6, 64, -2, 75, 2, 70, -1, 83),
-+	CABAC_ENTRY(321, -2, 69, -1, 70, -2, 76, -7, 99),
-+	CABAC_ENTRY(322, -2, 59, -9, 72, -18, 86, -14, 95),
-+	CABAC_ENTRY(323, 6, 70, 14, 60, 12, 70, 2, 95),
-+	CABAC_ENTRY(324, 10, 44, 16, 37, 5, 64, 0, 76),
-+	CABAC_ENTRY(325, 9, 31, 0, 47, -12, 70, -5, 74),
-+	CABAC_ENTRY(326, 12, 43, 18, 35, 11, 55, 0, 70),
-+	CABAC_ENTRY(327, 3, 53, 11, 37, 5, 56, -11, 75),
-+	CABAC_ENTRY(328, 14, 34, 12, 41, 0, 69, 1, 68),
-+	CABAC_ENTRY(329, 10, 38, 10, 41, 2, 65, 0, 65),
-+	CABAC_ENTRY(330, -3, 52, 2, 48, -6, 74, -14, 73),
-+	CABAC_ENTRY(331, 13, 40, 12, 41, 5, 54, 3, 62),
-+	CABAC_ENTRY(332, 17, 32, 13, 41, 7, 54, 4, 62),
-+	CABAC_ENTRY(333, 7, 44, 0, 59, -6, 76, -1, 68),
-+	CABAC_ENTRY(334, 7, 38, 3, 50, -11, 82, -13, 75),
-+	CABAC_ENTRY(335, 13, 50, 19, 40, -2, 77, 11, 55),
-+	CABAC_ENTRY(336, 10, 57, 3, 66, -2, 77, 5, 64),
-+	CABAC_ENTRY(337, 26, 43, 18, 50, 25, 42, 12, 70),
-+
-+	/* Table 9-23 – Values of variables m and n for ctxIdx from 338 to 398 */
-+	CABAC_ENTRY(338, 14, 11, 19, -6, 17, -13, 15, 6),
-+	CABAC_ENTRY(339, 11, 14, 18, -6, 16, -9, 6, 19),
-+	CABAC_ENTRY(340, 9, 11, 14, 0, 17, -12, 7, 16),
-+	CABAC_ENTRY(341, 18, 11, 26, -12, 27, -21, 12, 14),
-+	CABAC_ENTRY(342, 21, 9, 31, -16, 37, -30, 18, 13),
-+	CABAC_ENTRY(343, 23, -2, 33, -25, 41, -40, 13, 11),
-+	CABAC_ENTRY(344, 32, -15, 33, -22, 42, -41, 13, 15),
-+	CABAC_ENTRY(345, 32, -15, 37, -28, 48, -47, 15, 16),
-+	CABAC_ENTRY(346, 34, -21, 39, -30, 39, -32, 12, 23),
-+	CABAC_ENTRY(347, 39, -23, 42, -30, 46, -40, 13, 23),
-+	CABAC_ENTRY(348, 42, -33, 47, -42, 52, -51, 15, 20),
-+	CABAC_ENTRY(349, 41, -31, 45, -36, 46, -41, 14, 26),
-+	CABAC_ENTRY(350, 46, -28, 49, -34, 52, -39, 14, 44),
-+	CABAC_ENTRY(351, 38, -12, 41, -17, 43, -19, 17, 40),
-+	CABAC_ENTRY(352, 21, 29, 32, 9, 32, 11, 17, 47),
-+	CABAC_ENTRY(353, 45, -24, 69, -71, 61, -55, 24, 17),
-+	CABAC_ENTRY(354, 53, -45, 63, -63, 56, -46, 21, 21),
-+	CABAC_ENTRY(355, 48, -26, 66, -64, 62, -50, 25, 22),
-+	CABAC_ENTRY(356, 65, -43, 77, -74, 81, -67, 31, 27),
-+	CABAC_ENTRY(357, 43, -19, 54, -39, 45, -20, 22, 29),
-+	CABAC_ENTRY(358, 39, -10, 52, -35, 35, -2, 19, 35),
-+	CABAC_ENTRY(359, 30, 9, 41, -10, 28, 15, 14, 50),
-+	CABAC_ENTRY(360, 18, 26, 36, 0, 34, 1, 10, 57),
-+	CABAC_ENTRY(361, 20, 27, 40, -1, 39, 1, 7, 63),
-+	CABAC_ENTRY(362, 0, 57, 30, 14, 30, 17, -2, 77),
-+	CABAC_ENTRY(363, -14, 82, 28, 26, 20, 38, -4, 82),
-+	CABAC_ENTRY(364, -5, 75, 23, 37, 18, 45, -3, 94),
-+	CABAC_ENTRY(365, -19, 97, 12, 55, 15, 54, 9, 69),
-+	CABAC_ENTRY(366, -35, 125, 11, 65, 0, 79, -12, 109),
-+	CABAC_ENTRY(367, 27, 0, 37, -33, 36, -16, 36, -35),
-+	CABAC_ENTRY(368, 28, 0, 39, -36, 37, -14, 36, -34),
-+	CABAC_ENTRY(369, 31, -4, 40, -37, 37, -17, 32, -26),
-+	CABAC_ENTRY(370, 27, 6, 38, -30, 32, 1, 37, -30),
-+	CABAC_ENTRY(371, 34, 8, 46, -33, 34, 15, 44, -32),
-+	CABAC_ENTRY(372, 30, 10, 42, -30, 29, 15, 34, -18),
-+	CABAC_ENTRY(373, 24, 22, 40, -24, 24, 25, 34, -15),
-+	CABAC_ENTRY(374, 33, 19, 49, -29, 34, 22, 40, -15),
-+	CABAC_ENTRY(375, 22, 32, 38, -12, 31, 16, 33, -7),
-+	CABAC_ENTRY(376, 26, 31, 40, -10, 35, 18, 35, -5),
-+	CABAC_ENTRY(377, 21, 41, 38, -3, 31, 28, 33, 0),
-+	CABAC_ENTRY(378, 26, 44, 46, -5, 33, 41, 38, 2),
-+	CABAC_ENTRY(379, 23, 47, 31, 20, 36, 28, 33, 13),
-+	CABAC_ENTRY(380, 16, 65, 29, 30, 27, 47, 23, 35),
-+	CABAC_ENTRY(381, 14, 71, 25, 44, 21, 62, 13, 58),
-+	CABAC_ENTRY(382, 8, 60, 12, 48, 18, 31, 29, -3),
-+	CABAC_ENTRY(383, 6, 63, 11, 49, 19, 26, 26, 0),
-+	CABAC_ENTRY(384, 17, 65, 26, 45, 36, 24, 22, 30),
-+	CABAC_ENTRY(385, 21, 24, 22, 22, 24, 23, 31, -7),
-+	CABAC_ENTRY(386, 23, 20, 23, 22, 27, 16, 35, -15),
-+	CABAC_ENTRY(387, 26, 23, 27, 21, 24, 30, 34, -3),
-+	CABAC_ENTRY(388, 27, 32, 33, 20, 31, 29, 34, 3),
-+	CABAC_ENTRY(389, 28, 23, 26, 28, 22, 41, 36, -1),
-+	CABAC_ENTRY(390, 28, 24, 30, 24, 22, 42, 34, 5),
-+	CABAC_ENTRY(391, 23, 40, 27, 34, 16, 60, 32, 11),
-+	CABAC_ENTRY(392, 24, 32, 18, 42, 15, 52, 35, 5),
-+	CABAC_ENTRY(393, 28, 29, 25, 39, 14, 60, 34, 12),
-+	CABAC_ENTRY(394, 23, 42, 18, 50, 3, 78, 39, 11),
-+	CABAC_ENTRY(395, 19, 57, 12, 70, -16, 123, 30, 29),
-+	CABAC_ENTRY(396, 22, 53, 21, 54, 21, 53, 34, 26),
-+	CABAC_ENTRY(397, 22, 61, 14, 71, 22, 56, 29, 39),
-+	CABAC_ENTRY(398, 11, 86, 11, 83, 25, 61, 19, 66),
-+
-+	/* Values of variables m and n for ctxIdx from 399 to 463 (not documented) */
-+	CABAC_ENTRY(399, 12, 40, 25, 32, 21, 33, 31, 21),
-+	CABAC_ENTRY(400, 11, 51, 21, 49, 19, 50, 31, 31),
-+	CABAC_ENTRY(401, 14, 59, 21, 54, 17, 61, 25, 50),
-+	CABAC_ENTRY(402, -4, 79, -5, 85, -3, 78, -17, 120),
-+	CABAC_ENTRY(403, -7, 71, -6, 81, -8, 74, -20, 112),
-+	CABAC_ENTRY(404, -5, 69, -10, 77, -9, 72, -18, 114),
-+	CABAC_ENTRY(405, -9, 70, -7, 81, -10, 72, -11, 85),
-+	CABAC_ENTRY(406, -8, 66, -17, 80, -18, 75, -15, 92),
-+	CABAC_ENTRY(407, -10, 68, -18, 73, -12, 71, -14, 89),
-+	CABAC_ENTRY(408, -19, 73, -4, 74, -11, 63, -26, 71),
-+	CABAC_ENTRY(409, -12, 69, -10, 83, -5, 70, -15, 81),
-+	CABAC_ENTRY(410, -16, 70, -9, 71, -17, 75, -14, 80),
-+	CABAC_ENTRY(411, -15, 67, -9, 67, -14, 72, 0, 68),
-+	CABAC_ENTRY(412, -20, 62, -1, 61, -16, 67, -14, 70),
-+	CABAC_ENTRY(413, -19, 70, -8, 66, -8, 53, -24, 56),
-+	CABAC_ENTRY(414, -16, 66, -14, 66, -14, 59, -23, 68),
-+	CABAC_ENTRY(415, -22, 65, 0, 59, -9, 52, -24, 50),
-+	CABAC_ENTRY(416, -20, 63, 2, 59, -11, 68, -11, 74),
-+	CABAC_ENTRY(417, 9, -2, 17, -10, 9, -2, 23, -13),
-+	CABAC_ENTRY(418, 26, -9, 32, -13, 30, -10, 26, -13),
-+	CABAC_ENTRY(419, 33, -9, 42, -9, 31, -4, 40, -15),
-+	CABAC_ENTRY(420, 39, -7, 49, -5, 33, -1, 49, -14),
-+	CABAC_ENTRY(421, 41, -2, 53, 0, 33, 7, 44, 3),
-+	CABAC_ENTRY(422, 45, 3, 64, 3, 31, 12, 45, 6),
-+	CABAC_ENTRY(423, 49, 9, 68, 10, 37, 23, 44, 34),
-+	CABAC_ENTRY(424, 45, 27, 66, 27, 31, 38, 33, 54),
-+	CABAC_ENTRY(425, 36, 59, 47, 57, 20, 64, 19, 82),
-+	CABAC_ENTRY(426, -6, 66, -5, 71, -9, 71, -3, 75),
-+	CABAC_ENTRY(427, -7, 35, 0, 24, -7, 37, -1, 23),
-+	CABAC_ENTRY(428, -7, 42, -1, 36, -8, 44, 1, 34),
-+	CABAC_ENTRY(429, -8, 45, -2, 42, -11, 49, 1, 43),
-+	CABAC_ENTRY(430, -5, 48, -2, 52, -10, 56, 0, 54),
-+	CABAC_ENTRY(431, -12, 56, -9, 57, -12, 59, -2, 55),
-+	CABAC_ENTRY(432, -6, 60, -6, 63, -8, 63, 0, 61),
-+	CABAC_ENTRY(433, -5, 62, -4, 65, -9, 67, 1, 64),
-+	CABAC_ENTRY(434, -8, 66, -4, 67, -6, 68, 0, 68),
-+	CABAC_ENTRY(435, -8, 76, -7, 82, -10, 79, -9, 92),
-+	CABAC_ENTRY(436, -5, 85, -3, 81, -3, 78, -14, 106),
-+	CABAC_ENTRY(437, -6, 81, -3, 76, -8, 74, -13, 97),
-+	CABAC_ENTRY(438, -10, 77, -7, 72, -9, 72, -15, 90),
-+	CABAC_ENTRY(439, -7, 81, -6, 78, -10, 72, -12, 90),
-+	CABAC_ENTRY(440, -17, 80, -12, 72, -18, 75, -18, 88),
-+	CABAC_ENTRY(441, -18, 73, -14, 68, -12, 71, -10, 73),
-+	CABAC_ENTRY(442, -4, 74, -3, 70, -11, 63, -9, 79),
-+	CABAC_ENTRY(443, -10, 83, -6, 76, -5, 70, -14, 86),
-+	CABAC_ENTRY(444, -9, 71, -5, 66, -17, 75, -10, 73),
-+	CABAC_ENTRY(445, -9, 67, -5, 62, -14, 72, -10, 70),
-+	CABAC_ENTRY(446, -1, 61, 0, 57, -16, 67, -10, 69),
-+	CABAC_ENTRY(447, -8, 66, -4, 61, -8, 53, -5, 66),
-+	CABAC_ENTRY(448, -14, 66, -9, 60, -14, 59, -9, 64),
-+	CABAC_ENTRY(449, 0, 59, 1, 54, -9, 52, -5, 58),
-+	CABAC_ENTRY(450, 2, 59, 2, 58, -11, 68, 2, 59),
-+	CABAC_ENTRY(451, 21, -13, 17, -10, 9, -2, 21, -10),
-+	CABAC_ENTRY(452, 33, -14, 32, -13, 30, -10, 24, -11),
-+	CABAC_ENTRY(453, 39, -7, 42, -9, 31, -4, 28, -8),
-+	CABAC_ENTRY(454, 46, -2, 49, -5, 33, -1, 28, -1),
-+	CABAC_ENTRY(455, 51, 2, 53, 0, 33, 7, 29, 3),
-+	CABAC_ENTRY(456, 60, 6, 64, 3, 31, 12, 29, 9),
-+	CABAC_ENTRY(457, 61, 17, 68, 10, 37, 23, 35, 20),
-+	CABAC_ENTRY(458, 55, 34, 66, 27, 31, 38, 29, 36),
-+	CABAC_ENTRY(459, 42, 62, 47, 57, 20, 64, 14, 67),
-+};
-+
-+#endif /* RKVDEC_H264_CABAC_H_ */
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Detlev Casanova <detlev.casanova@collabora.com>
-Date: Fri, 14 Jun 2024 19:52:12 -0400
-Subject: media: rockchip: Introduce the rkvdec2 driver
-
-This driver supports the second generation of the Rockchip Video
-decoder, also known as vdpu34x.
-It is currently only used on the RK3588(s) SoC.
-
-There are 2 decoders on the RK3588 SoC that can work in pair to decode
-8K video at 30 FPS but currently, only using one core at a time is
-supported.
-
-Scheduling requests between the two cores will be implemented later.
-
-The core supports H264, HEVC, VP9 and AVS2 decoding but this driver
-currently only supports H264.
-
-The driver is based on rkvdec and they may share some code in the
-future.
-The decision to make a different driver is mainly because rkvdec2 has
-more features and can work with multiple cores.
-
-The registers are mapped in a struct in RAM using bitfields. It is IO
-copied to the HW when all values are configured.
-The decision to use such a struct instead of writing buffers one by one
-is based on the following reasons:
- - Rockchip cores are known to misbehave when registers are not written
-   in address order,
- - Those cores also need the software to write all registers, even if
-   they are written their default values or are not related to the task
-   (this core will not start decoding some H264 frames if some VP9
-   registers are not written to 0)
- - In the future, to support multiple cores, the scheduler could be
-   optimized by storing the precomputed registers values and copy them
-   to the HW as soos as a core becomes available.
-
-This makes the code more readable and may bring performance improvements
-in future features.
-
-Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>
----
- drivers/media/platform/rockchip/Kconfig                |    1 +
- drivers/media/platform/rockchip/Makefile               |    1 +
- drivers/media/platform/rockchip/rkvdec2/Kconfig        |   15 +
- drivers/media/platform/rockchip/rkvdec2/Makefile       |    3 +
- drivers/media/platform/rockchip/rkvdec2/rkvdec2-h264.c |  744 ++++++
- drivers/media/platform/rockchip/rkvdec2/rkvdec2-regs.h |  346 +++
- drivers/media/platform/rockchip/rkvdec2/rkvdec2.c      | 1263 ++++++++++
- drivers/media/platform/rockchip/rkvdec2/rkvdec2.h      |  130 +
- 8 files changed, 2503 insertions(+)
-
-diff --git a/drivers/media/platform/rockchip/Kconfig b/drivers/media/platform/rockchip/Kconfig
-index 111111111111..222222222222 100644
---- a/drivers/media/platform/rockchip/Kconfig
-+++ b/drivers/media/platform/rockchip/Kconfig
-@@ -4,3 +4,4 @@ comment "Rockchip media platform drivers"
- 
- source "drivers/media/platform/rockchip/rga/Kconfig"
- source "drivers/media/platform/rockchip/rkisp1/Kconfig"
-+source "drivers/media/platform/rockchip/rkvdec2/Kconfig"
-diff --git a/drivers/media/platform/rockchip/Makefile b/drivers/media/platform/rockchip/Makefile
-index 111111111111..222222222222 100644
---- a/drivers/media/platform/rockchip/Makefile
-+++ b/drivers/media/platform/rockchip/Makefile
-@@ -1,3 +1,4 @@
- # SPDX-License-Identifier: GPL-2.0-only
- obj-y += rga/
- obj-y += rkisp1/
-+obj-$(CONFIG_VIDEO_ROCKCHIP_VDEC2)	+= rkvdec2/
-diff --git a/drivers/media/platform/rockchip/rkvdec2/Kconfig b/drivers/media/platform/rockchip/rkvdec2/Kconfig
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/drivers/media/platform/rockchip/rkvdec2/Kconfig
-@@ -0,0 +1,15 @@
-+# SPDX-License-Identifier: GPL-2.0
-+config VIDEO_ROCKCHIP_VDEC2
-+	tristate "Rockchip Video Decoder driver 2"
-+	depends on ARCH_ROCKCHIP || COMPILE_TEST
-+	depends on VIDEO_DEV
-+	select MEDIA_CONTROLLER
-+	select VIDEOBUF2_DMA_CONTIG
-+	select VIDEOBUF2_VMALLOC
-+	select V4L2_MEM2MEM_DEV
-+	select V4L2_H264
-+	help
-+	  Support for the Rockchip Video Decoder 2 IP present on Rockchip SoCs,
-+	  which accelerates video decoding.
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called rockchip-vdec2.
-diff --git a/drivers/media/platform/rockchip/rkvdec2/Makefile b/drivers/media/platform/rockchip/rkvdec2/Makefile
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/drivers/media/platform/rockchip/rkvdec2/Makefile
-@@ -0,0 +1,3 @@
-+obj-$(CONFIG_VIDEO_ROCKCHIP_VDEC2) += rockchip-vdec2.o
-+
-+rockchip-vdec2-y += rkvdec2.o rkvdec2-h264.o
-diff --git a/drivers/media/platform/rockchip/rkvdec2/rkvdec2-h264.c b/drivers/media/platform/rockchip/rkvdec2/rkvdec2-h264.c
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/drivers/media/platform/rockchip/rkvdec2/rkvdec2-h264.c
-@@ -0,0 +1,744 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Rockchip Video Decoder 2 H264 backend
-+ *
-+ * Copyright (C) 2024 Collabora, Ltd.
-+ *  Detlev Casanova <detlev.casanova@collabora.com>
-+ *
-+ * Based on rkvdec driver by Boris Brezillon <boris.brezillon@collabora.com>
-+ */
-+
-+#include <media/v4l2-h264.h>
-+#include <media/v4l2-mem2mem.h>
-+#include <media/v4l2-cabac/rkvdec-cabac.h>
-+
-+#include "rkvdec2.h"
-+#include "rkvdec2-regs.h"
-+
-+#define RKVDEC_NUM_REFLIST		3
-+
-+struct rkvdec2_h264_scaling_list {
-+	u8 scaling_list_4x4[6][16];
-+	u8 scaling_list_8x8[6][64];
-+	u8 padding[128];
-+};
-+
-+struct rkvdec2_sps {
-+	u16 seq_parameter_set_id:			4;
-+	u16 profile_idc:				8;
-+	u16 constraint_set3_flag:			1;
-+	u16 chroma_format_idc:				2;
-+	u16 bit_depth_luma:				3;
-+	u16 bit_depth_chroma:				3;
-+	u16 qpprime_y_zero_transform_bypass_flag:	1;
-+	u16 log2_max_frame_num_minus4:			4;
-+	u16 max_num_ref_frames:				5;
-+	u16 pic_order_cnt_type:				2;
-+	u16 log2_max_pic_order_cnt_lsb_minus4:		4;
-+	u16 delta_pic_order_always_zero_flag:		1;
-+	u16 pic_width_in_mbs:				12;
-+	u16 pic_height_in_mbs:				12;
-+	u16 frame_mbs_only_flag:			1;
-+	u16 mb_adaptive_frame_field_flag:		1;
-+	u16 direct_8x8_inference_flag:			1;
-+	u16 mvc_extension_enable:			1;
-+	u16 num_views:					2;
-+
-+	u16 reserved_bits:				12;
-+	u16 reserved[11];
-+} __packed;
-+
-+struct rkvdec2_pps {
-+	u16 pic_parameter_set_id:				8;
-+	u16 pps_seq_parameter_set_id:				5;
-+	u16 entropy_coding_mode_flag:				1;
-+	u16 bottom_field_pic_order_in_frame_present_flag:	1;
-+	u16 num_ref_idx_l0_default_active_minus1:		5;
-+	u16 num_ref_idx_l1_default_active_minus1:		5;
-+	u16 weighted_pred_flag:					1;
-+	u16 weighted_bipred_idc:				2;
-+	u16 pic_init_qp_minus26:				7;
-+	u16 pic_init_qs_minus26:				6;
-+	u16 chroma_qp_index_offset:				5;
-+	u16 deblocking_filter_control_present_flag:		1;
-+	u16 constrained_intra_pred_flag:			1;
-+	u16 redundant_pic_cnt_present:				1;
-+	u16 transform_8x8_mode_flag:				1;
-+	u16 second_chroma_qp_index_offset:			5;
-+	u16 scaling_list_enable_flag:				1;
-+	u32 scaling_list_address;
-+	u16 is_longterm;
-+
-+	u8 reserved[3];
-+} __packed;
-+
-+struct rkvdec2_rps_entry {
-+	u32 dpb_info0:		5;
-+	u32 bottom_flag0:	1;
-+	u32 view_index_off0:	1;
-+	u32 dpb_info1:		5;
-+	u32 bottom_flag1:	1;
-+	u32 view_index_off1:	1;
-+	u32 dpb_info2:		5;
-+	u32 bottom_flag2:	1;
-+	u32 view_index_off2:	1;
-+	u32 dpb_info3:		5;
-+	u32 bottom_flag3:	1;
-+	u32 view_index_off3:	1;
-+	u32 dpb_info4:		5;
-+	u32 bottom_flag4:	1;
-+	u32 view_index_off4:	1;
-+	u32 dpb_info5:		5;
-+	u32 bottom_flag5:	1;
-+	u32 view_index_off5:	1;
-+	u32 dpb_info6:		5;
-+	u32 bottom_flag6:	1;
-+	u32 view_index_off6:	1;
-+	u32 dpb_info7:		5;
-+	u32 bottom_flag7:	1;
-+	u32 view_index_off7:	1;
-+} __packed;
-+
-+struct rkvdec2_rps {
-+	u16 frame_num[16];
-+	u32 reserved0;
-+	struct rkvdec2_rps_entry entries[12];
-+	u32 reserved1[66];
-+}  __packed;
-+
-+struct rkvdec2_sps_pps {
-+	struct rkvdec2_sps sps;
-+	struct rkvdec2_pps pps;
-+}  __packed;
-+
-+/* Data structure describing auxiliary buffer format. */
-+struct rkvdec2_h264_priv_tbl {
-+	u32 cabac_table[4][464][2];
-+	struct rkvdec2_h264_scaling_list scaling_list;
-+	struct rkvdec2_sps_pps param_set[256];
-+	struct rkvdec2_rps rps;
-+};
-+
-+struct rkvdec2_h264_reflists {
-+	struct v4l2_h264_reference p[V4L2_H264_REF_LIST_LEN];
-+	struct v4l2_h264_reference b0[V4L2_H264_REF_LIST_LEN];
-+	struct v4l2_h264_reference b1[V4L2_H264_REF_LIST_LEN];
-+};
-+
-+struct rkvdec2_h264_run {
-+	struct rkvdec2_run base;
-+	const struct v4l2_ctrl_h264_decode_params *decode_params;
-+	const struct v4l2_ctrl_h264_sps *sps;
-+	const struct v4l2_ctrl_h264_pps *pps;
-+	const struct v4l2_ctrl_h264_scaling_matrix *scaling_matrix;
-+	struct vb2_buffer *ref_buf[V4L2_H264_NUM_DPB_ENTRIES];
-+};
-+
-+struct rkvdec2_h264_ctx {
-+	struct rkvdec2_aux_buf priv_tbl;
-+	struct rkvdec2_h264_reflists reflists;
-+	struct rkvdec2_regs_h264 regs;
-+};
-+
-+static void assemble_hw_pps(struct rkvdec2_ctx *ctx,
-+			    struct rkvdec2_h264_run *run)
-+{
-+	struct rkvdec2_h264_ctx *h264_ctx = ctx->priv;
-+	const struct v4l2_ctrl_h264_sps *sps = run->sps;
-+	const struct v4l2_ctrl_h264_pps *pps = run->pps;
-+	const struct v4l2_ctrl_h264_decode_params *dec_params = run->decode_params;
-+	const struct v4l2_h264_dpb_entry *dpb = dec_params->dpb;
-+	struct rkvdec2_h264_priv_tbl *priv_tbl = h264_ctx->priv_tbl.cpu;
-+	struct rkvdec2_sps_pps *hw_ps;
-+	dma_addr_t scaling_list_address;
-+	u32 scaling_distance;
-+	u32 i;
-+
-+	/*
-+	 * HW read the SPS/PPS information from PPS packet index by PPS id.
-+	 * offset from the base can be calculated by PPS_id * 32 (size per PPS
-+	 * packet unit). so the driver copy SPS/PPS information to the exact PPS
-+	 * packet unit for HW accessing.
-+	 */
-+	hw_ps = &priv_tbl->param_set[pps->pic_parameter_set_id];
-+	memset(hw_ps, 0, sizeof(*hw_ps));
-+
-+	/* write sps */
-+	hw_ps->sps.seq_parameter_set_id = sps->seq_parameter_set_id;
-+	hw_ps->sps.profile_idc = sps->profile_idc;
-+	hw_ps->sps.constraint_set3_flag = !!(sps->constraint_set_flags & (1 << 3));
-+	hw_ps->sps.chroma_format_idc = sps->chroma_format_idc;
-+	hw_ps->sps.bit_depth_luma = sps->bit_depth_luma_minus8;
-+	hw_ps->sps.bit_depth_chroma = sps->bit_depth_chroma_minus8;
-+	hw_ps->sps.qpprime_y_zero_transform_bypass_flag = !!(sps->flags & V4L2_H264_SPS_FLAG_QPPRIME_Y_ZERO_TRANSFORM_BYPASS);
-+	hw_ps->sps.log2_max_frame_num_minus4 = sps->log2_max_frame_num_minus4;
-+	hw_ps->sps.max_num_ref_frames = sps->max_num_ref_frames;
-+	hw_ps->sps.pic_order_cnt_type = sps->pic_order_cnt_type;
-+	hw_ps->sps.log2_max_pic_order_cnt_lsb_minus4 =
-+		sps->log2_max_pic_order_cnt_lsb_minus4;
-+	hw_ps->sps.delta_pic_order_always_zero_flag =
-+		!!(sps->flags & V4L2_H264_SPS_FLAG_DELTA_PIC_ORDER_ALWAYS_ZERO);
-+	hw_ps->sps.mvc_extension_enable = 1;
-+	hw_ps->sps.num_views = 1;
-+
-+	/*
-+	 * Use the SPS values since they are already in macroblocks
-+	 * dimensions, height can be field height (halved) if
-+	 * V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY is not set and also it allows
-+	 * decoding smaller images into larger allocation which can be used
-+	 * to implementing SVC spatial layer support.
-+	 */
-+	hw_ps->sps.pic_width_in_mbs = sps->pic_width_in_mbs_minus1 + 1;
-+	hw_ps->sps.pic_height_in_mbs = sps->pic_height_in_map_units_minus1 + 1;
-+	hw_ps->sps.frame_mbs_only_flag =
-+		!!(sps->flags & V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY);
-+	hw_ps->sps.mb_adaptive_frame_field_flag =
-+		!!(sps->flags & V4L2_H264_SPS_FLAG_MB_ADAPTIVE_FRAME_FIELD);
-+	hw_ps->sps.direct_8x8_inference_flag =
-+		!!(sps->flags & V4L2_H264_SPS_FLAG_DIRECT_8X8_INFERENCE);
-+
-+	/* write pps */
-+	hw_ps->pps.pic_parameter_set_id = pps->pic_parameter_set_id;
-+	hw_ps->pps.pps_seq_parameter_set_id = pps->seq_parameter_set_id;
-+	hw_ps->pps.entropy_coding_mode_flag =
-+		!!(pps->flags & V4L2_H264_PPS_FLAG_ENTROPY_CODING_MODE);
-+	hw_ps->pps.bottom_field_pic_order_in_frame_present_flag =
-+		!!(pps->flags & V4L2_H264_PPS_FLAG_BOTTOM_FIELD_PIC_ORDER_IN_FRAME_PRESENT);
-+	hw_ps->pps.num_ref_idx_l0_default_active_minus1 =
-+		pps->num_ref_idx_l0_default_active_minus1;
-+	hw_ps->pps.num_ref_idx_l1_default_active_minus1 =
-+		pps->num_ref_idx_l1_default_active_minus1;
-+	hw_ps->pps.weighted_pred_flag =
-+		!!(pps->flags & V4L2_H264_PPS_FLAG_WEIGHTED_PRED);
-+	hw_ps->pps.weighted_bipred_idc = pps->weighted_bipred_idc;
-+	hw_ps->pps.pic_init_qp_minus26 = pps->pic_init_qp_minus26;
-+	hw_ps->pps.pic_init_qs_minus26 = pps->pic_init_qs_minus26;
-+	hw_ps->pps.chroma_qp_index_offset = pps->chroma_qp_index_offset;
-+	hw_ps->pps.deblocking_filter_control_present_flag =
-+		!!(pps->flags & V4L2_H264_PPS_FLAG_DEBLOCKING_FILTER_CONTROL_PRESENT);
-+	hw_ps->pps.constrained_intra_pred_flag =
-+		!!(pps->flags & V4L2_H264_PPS_FLAG_CONSTRAINED_INTRA_PRED);
-+	hw_ps->pps.redundant_pic_cnt_present =
-+		!!(pps->flags & V4L2_H264_PPS_FLAG_REDUNDANT_PIC_CNT_PRESENT);
-+	hw_ps->pps.transform_8x8_mode_flag =
-+		!!(pps->flags & V4L2_H264_PPS_FLAG_TRANSFORM_8X8_MODE);
-+	hw_ps->pps.second_chroma_qp_index_offset = pps->second_chroma_qp_index_offset;
-+	hw_ps->pps.scaling_list_enable_flag =
-+		!!(pps->flags & V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT);
-+
-+	/*
-+	 * To be on the safe side, program the scaling matrix address
-+	 *
-+	 * With this set here,
-+	 *  RKVDEC_SWREG12_SENCODARY_EN:sw_scanlist_addr_valid_en
-+	 * can stay at 0
-+	 */
-+	scaling_distance = offsetof(struct rkvdec2_h264_priv_tbl, scaling_list);
-+	scaling_list_address = h264_ctx->priv_tbl.dma + scaling_distance;
-+	hw_ps->pps.scaling_list_address = scaling_list_address;
-+
-+	for (i = 0; i < ARRAY_SIZE(dec_params->dpb); i++) {
-+		if (dpb[i].flags & V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM)
-+			hw_ps->pps.is_longterm |= (1 << i);
-+	}
-+}
-+
-+static void lookup_ref_buf_idx(struct rkvdec2_ctx *ctx,
-+			       struct rkvdec2_h264_run *run)
-+{
-+	const struct v4l2_ctrl_h264_decode_params *dec_params = run->decode_params;
-+	u32 i;
-+
-+	for (i = 0; i < ARRAY_SIZE(dec_params->dpb); i++) {
-+		struct v4l2_m2m_ctx *m2m_ctx = ctx->fh.m2m_ctx;
-+		const struct v4l2_h264_dpb_entry *dpb = run->decode_params->dpb;
-+		struct vb2_queue *cap_q = &m2m_ctx->cap_q_ctx.q;
-+		struct vb2_buffer *buf = NULL;
-+
-+		if (dpb[i].flags & V4L2_H264_DPB_ENTRY_FLAG_ACTIVE) {
-+			buf = vb2_find_buffer(cap_q, dpb[i].reference_ts);
-+			if (!buf) {
-+				dev_dbg(ctx->dev->dev, "No buffer for reference_ts %llu",
-+					dpb[i].reference_ts);
-+			}
-+		}
-+
-+		run->ref_buf[i] = buf;
-+	}
-+}
-+
-+static void set_dpb_info(struct rkvdec2_rps_entry *entries,
-+			 u8 reflist,
-+			 u8 refnum,
-+			 u8 info,
-+			 bool bottom)
-+{
-+	struct rkvdec2_rps_entry *entry = &entries[(reflist * 4) + refnum / 8];
-+	u8 idx = refnum % 8;
-+
-+	switch (idx) {
-+	case 0:
-+		entry->dpb_info0 = info;
-+		entry->bottom_flag0 = bottom;
-+		break;
-+	case 1:
-+		entry->dpb_info1 = info;
-+		entry->bottom_flag1 = bottom;
-+		break;
-+	case 2:
-+		entry->dpb_info2 = info;
-+		entry->bottom_flag2 = bottom;
-+		break;
-+	case 3:
-+		entry->dpb_info3 = info;
-+		entry->bottom_flag3 = bottom;
-+		break;
-+	case 4:
-+		entry->dpb_info4 = info;
-+		entry->bottom_flag4 = bottom;
-+		break;
-+	case 5:
-+		entry->dpb_info5 = info;
-+		entry->bottom_flag5 = bottom;
-+		break;
-+	case 6:
-+		entry->dpb_info6 = info;
-+		entry->bottom_flag6 = bottom;
-+		break;
-+	case 7:
-+		entry->dpb_info7 = info;
-+		entry->bottom_flag7 = bottom;
-+		break;
-+	}
-+}
-+
-+static void assemble_hw_rps(struct rkvdec2_ctx *ctx,
-+			    struct v4l2_h264_reflist_builder *builder,
-+			    struct rkvdec2_h264_run *run)
-+{
-+	const struct v4l2_ctrl_h264_decode_params *dec_params = run->decode_params;
-+	const struct v4l2_h264_dpb_entry *dpb = dec_params->dpb;
-+	struct rkvdec2_h264_ctx *h264_ctx = ctx->priv;
-+	struct rkvdec2_h264_priv_tbl *priv_tbl = h264_ctx->priv_tbl.cpu;
-+
-+	struct rkvdec2_rps *hw_rps = &priv_tbl->rps;
-+	u32 i, j;
-+
-+	memset(hw_rps, 0, sizeof(priv_tbl->rps));
-+
-+	/*
-+	 * Assign an invalid pic_num if DPB entry at that position is inactive.
-+	 * If we assign 0 in that position hardware will treat that as a real
-+	 * reference picture with pic_num 0, triggering output picture
-+	 * corruption.
-+	 */
-+	for (i = 0; i < ARRAY_SIZE(dec_params->dpb); i++) {
-+		if (!(dpb[i].flags & V4L2_H264_DPB_ENTRY_FLAG_ACTIVE))
-+			continue;
-+
-+		hw_rps->frame_num[i] = builder->refs[i].frame_num;
-+	}
-+
-+	for (j = 0; j < RKVDEC_NUM_REFLIST; j++) {
-+		for (i = 0; i < builder->num_valid; i++) {
-+			struct v4l2_h264_reference *ref;
-+			bool dpb_valid;
-+			bool bottom;
-+
-+			switch (j) {
-+			case 0:
-+				ref = &h264_ctx->reflists.p[i];
-+				break;
-+			case 1:
-+				ref = &h264_ctx->reflists.b0[i];
-+				break;
-+			case 2:
-+				ref = &h264_ctx->reflists.b1[i];
-+				break;
-+			}
-+
-+			if (WARN_ON(ref->index >= ARRAY_SIZE(dec_params->dpb)))
-+				continue;
-+
-+			dpb_valid = !!(run->ref_buf[ref->index]);
-+			bottom = ref->fields == V4L2_H264_BOTTOM_FIELD_REF;
-+
-+			set_dpb_info(hw_rps->entries, j, i, ref->index | (dpb_valid << 4), bottom);
-+		}
-+	}
-+}
-+
-+static void assemble_hw_scaling_list(struct rkvdec2_ctx *ctx,
-+				     struct rkvdec2_h264_run *run)
-+{
-+	const struct v4l2_ctrl_h264_scaling_matrix *scaling = run->scaling_matrix;
-+	const struct v4l2_ctrl_h264_pps *pps = run->pps;
-+	struct rkvdec2_h264_ctx *h264_ctx = ctx->priv;
-+	struct rkvdec2_h264_priv_tbl *tbl = h264_ctx->priv_tbl.cpu;
-+
-+	if (!(pps->flags & V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT))
-+		return;
-+
-+	BUILD_BUG_ON(sizeof(tbl->scaling_list.scaling_list_4x4) !=
-+		     sizeof(scaling->scaling_list_4x4));
-+	BUILD_BUG_ON(sizeof(tbl->scaling_list.scaling_list_8x8) !=
-+		     sizeof(scaling->scaling_list_8x8));
-+
-+	memcpy(tbl->scaling_list.scaling_list_4x4,
-+	       scaling->scaling_list_4x4,
-+	       sizeof(scaling->scaling_list_4x4));
-+
-+	memcpy(tbl->scaling_list.scaling_list_8x8,
-+	       scaling->scaling_list_8x8,
-+	       sizeof(scaling->scaling_list_8x8));
-+}
-+
-+static inline void rkvdec2_memcpy_toio(void __iomem *dst, void *src, size_t len)
-+{
-+#ifdef CONFIG_ARM64
-+	__iowrite32_copy(dst, src, len);
-+#else
-+	memcpy_toio(dst, src, len);
-+#endif
-+}
-+
-+static void rkvdec2_write_regs(struct rkvdec2_ctx *ctx)
-+{
-+	struct rkvdec2_dev *rkvdec = ctx->dev;
-+	struct rkvdec2_h264_ctx *h264_ctx = ctx->priv;
-+
-+	rkvdec2_memcpy_toio(rkvdec->regs + OFFSET_COMMON_REGS,
-+			    &h264_ctx->regs.common,
-+			    sizeof(h264_ctx->regs.common));
-+	rkvdec2_memcpy_toio(rkvdec->regs + OFFSET_CODEC_PARAMS_REGS,
-+			    &h264_ctx->regs.h264_param,
-+			    sizeof(h264_ctx->regs.h264_param));
-+	rkvdec2_memcpy_toio(rkvdec->regs + OFFSET_COMMON_ADDR_REGS,
-+			    &h264_ctx->regs.common_addr,
-+			    sizeof(h264_ctx->regs.common_addr));
-+	rkvdec2_memcpy_toio(rkvdec->regs + OFFSET_CODEC_ADDR_REGS,
-+			    &h264_ctx->regs.h264_addr,
-+			    sizeof(h264_ctx->regs.h264_addr));
-+	rkvdec2_memcpy_toio(rkvdec->regs + OFFSET_POC_HIGHBIT_REGS,
-+			    &h264_ctx->regs.h264_highpoc,
-+			    sizeof(h264_ctx->regs.h264_highpoc));
-+}
-+
-+static void config_registers(struct rkvdec2_ctx *ctx,
-+			     struct rkvdec2_h264_run *run)
-+{
-+	const struct v4l2_ctrl_h264_decode_params *dec_params = run->decode_params;
-+	const struct v4l2_ctrl_h264_sps *sps = run->sps;
-+	const struct v4l2_h264_dpb_entry *dpb = dec_params->dpb;
-+	struct rkvdec2_h264_ctx *h264_ctx = ctx->priv;
-+	dma_addr_t priv_start_addr = h264_ctx->priv_tbl.dma;
-+	const struct v4l2_pix_format_mplane *dst_fmt;
-+	struct vb2_v4l2_buffer *src_buf = run->base.bufs.src;
-+	struct vb2_v4l2_buffer *dst_buf = run->base.bufs.dst;
-+	struct rkvdec2_regs_h264 *regs = &h264_ctx->regs;
-+	const struct v4l2_format *f;
-+	dma_addr_t rlc_addr;
-+	dma_addr_t dst_addr;
-+	u32 hor_virstride = 0;
-+	u32 ver_virstride = 0;
-+	u32 y_virstride = 0;
-+	u32 offset;
-+	u32 pixels;
-+	u32 i;
-+
-+	memset(regs, 0, sizeof(*regs));
-+
-+	/* Set H264 mode */
-+	regs->common.reg009.dec_mode = RKVDEC2_MODE_H264;
-+
-+	/* Set config */
-+	regs->common.reg011.buf_empty_en = 1;
-+	regs->common.reg011.dec_clkgate_e = 1;
-+	regs->common.reg011.dec_timeout_e = 1;
-+	regs->common.reg011.pix_range_detection_e = 1;
-+
-+	/* Set IDR flag */
-+	regs->common.reg013.cur_pic_is_idr =
-+		!!(dec_params->flags & V4L2_H264_DECODE_PARAM_FLAG_IDR_PIC);
-+
-+	/* Set input stream length */
-+	regs->common.stream_len = vb2_get_plane_payload(&src_buf->vb2_buf, 0);
-+
-+	/* Set max slice number */
-+	regs->common.reg017.slice_num = MAX_SLICE_NUMBER;
-+
-+	/* Set strides */
-+	f = &ctx->decoded_fmt;
-+	dst_fmt = &f->fmt.pix_mp;
-+	hor_virstride = (sps->bit_depth_luma_minus8 + 8) * dst_fmt->width / 8;
-+	ver_virstride = round_up(dst_fmt->height, 16);
-+	y_virstride = hor_virstride * ver_virstride;
-+	pixels = dst_fmt->height * dst_fmt->width;
-+
-+	regs->common.reg018.y_hor_virstride = hor_virstride / 16;
-+	regs->common.reg019.uv_hor_virstride = hor_virstride / 16;
-+	regs->common.reg020.y_virstride = y_virstride / 16;
-+
-+	/* Activate block gating */
-+	regs->common.reg026.swreg_block_gating_e = 0xfffef;
-+	regs->common.reg026.reg_cfg_gating_en = 1;
-+
-+	/* Set timeout threshold */
-+	if (pixels < RKVDEC2_1080P_PIXELS)
-+		regs->common.timeout_threshold = RKVDEC2_TIMEOUT_1080p;
-+	else if (pixels < RKVDEC2_4K_PIXELS)
-+		regs->common.timeout_threshold = RKVDEC2_TIMEOUT_4K;
-+	else if (pixels < RKVDEC2_8K_PIXELS)
-+		regs->common.timeout_threshold = RKVDEC2_TIMEOUT_8K;
-+	else
-+		regs->common.timeout_threshold = RKVDEC2_TIMEOUT_MAX;
-+
-+	/* Set TOP and BOTTOM POCs */
-+	regs->h264_param.cur_top_poc = dec_params->top_field_order_cnt;
-+	regs->h264_param.cur_bot_poc = dec_params->bottom_field_order_cnt;
-+
-+	/* Set ref pic address & poc */
-+	for (i = 0; i < ARRAY_SIZE(dec_params->dpb); i++) {
-+		struct vb2_buffer *vb_buf = run->ref_buf[i];
-+		dma_addr_t buf_dma;
-+
-+		/*
-+		 * If a DPB entry is unused or invalid, address of current destination
-+		 * buffer is returned.
-+		 */
-+		if (!vb_buf)
-+			vb_buf = &dst_buf->vb2_buf;
-+
-+		buf_dma = vb2_dma_contig_plane_dma_addr(vb_buf, 0);
-+
-+		/* Set reference addresses */
-+		regs->h264_addr.ref_base[i] = buf_dma;
-+
-+		/* Set COLMV addresses */
-+		regs->h264_addr.colmv_base[i] = buf_dma + ctx->colmv_offset;
-+
-+		struct rkvdec2_h264_ref_info *ref_info =
-+			&regs->h264_param.ref_info_regs[i / 4].ref_info[i % 4];
-+
-+		ref_info->ref_field =
-+			!!(dpb[i].flags & V4L2_H264_DPB_ENTRY_FLAG_FIELD);
-+		ref_info->ref_colmv_use_flag =
-+			!!(dpb[i].flags & V4L2_H264_DPB_ENTRY_FLAG_ACTIVE);
-+		ref_info->ref_topfield_used =
-+			!!(dpb[i].fields & V4L2_H264_TOP_FIELD_REF);
-+		ref_info->ref_botfield_used =
-+			!!(dpb[i].fields & V4L2_H264_BOTTOM_FIELD_REF);
-+
-+		regs->h264_param.ref_pocs[i * 2] =
-+			dpb[i].top_field_order_cnt;
-+		regs->h264_param.ref_pocs[i * 2 + 1] =
-+			dpb[i].bottom_field_order_cnt;
-+	}
-+
-+	/* Set rlc base address (input stream) */
-+	rlc_addr = vb2_dma_contig_plane_dma_addr(&src_buf->vb2_buf, 0);
-+	regs->common_addr.rlc_base = rlc_addr;
-+	regs->common_addr.rlcwrite_base = rlc_addr;
-+
-+	/* Set output base address */
-+	dst_addr = vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf, 0);
-+	regs->common_addr.decout_base = dst_addr;
-+
-+	/* Set colmv address */
-+	regs->common_addr.colmv_cur_base = dst_addr + ctx->colmv_offset;
-+
-+	/* Set RCB addresses */
-+	for (i = 0; i < RKVDEC2_RCB_COUNT; i++)
-+		regs->common_addr.rcb_base[i] = ctx->rcb_bufs[i].dma;
-+
-+	/* Set hw pps address */
-+	offset = offsetof(struct rkvdec2_h264_priv_tbl, param_set);
-+	regs->h264_addr.pps_base = priv_start_addr + offset;
-+
-+	/* Set hw rps address */
-+	offset = offsetof(struct rkvdec2_h264_priv_tbl, rps);
-+	regs->h264_addr.rps_base = priv_start_addr + offset;
-+
-+	/* Set cabac table */
-+	offset = offsetof(struct rkvdec2_h264_priv_tbl, cabac_table);
-+	regs->h264_addr.cabactbl_base = priv_start_addr + offset;
-+
-+	rkvdec2_write_regs(ctx);
-+}
-+
-+#define RKVDEC_H264_MAX_DEPTH_IN_BYTES		2
-+
-+static int rkvdec2_h264_adjust_fmt(struct rkvdec2_ctx *ctx,
-+				   struct v4l2_format *f)
-+{
-+	struct v4l2_pix_format_mplane *fmt = &f->fmt.pix_mp;
-+
-+	fmt->num_planes = 1;
-+	if (!fmt->plane_fmt[0].sizeimage)
-+		fmt->plane_fmt[0].sizeimage = fmt->width * fmt->height *
-+					      RKVDEC_H264_MAX_DEPTH_IN_BYTES;
-+	return 0;
-+}
-+
-+static int rkvdec2_h264_validate_sps(struct rkvdec2_ctx *ctx,
-+				     const struct v4l2_ctrl_h264_sps *sps)
-+{
-+	unsigned int width, height;
-+
-+	/*
-+	 * TODO: The hardware supports 10-bit and 4:2:2 profiles,
-+	 * but it's currently broken in the driver.
-+	 * Reject them for now, until it's fixed.
-+	 */
-+	if (sps->chroma_format_idc > 1)
-+		/* Only 4:0:0 and 4:2:0 are supported */
-+		return -EINVAL;
-+	if (sps->bit_depth_luma_minus8 != sps->bit_depth_chroma_minus8)
-+		/* Luma and chroma bit depth mismatch */
-+		return -EINVAL;
-+	if (sps->bit_depth_luma_minus8 != 0)
-+		/* Only 8-bit is supported */
-+		return -EINVAL;
-+
-+	width = (sps->pic_width_in_mbs_minus1 + 1) * 16;
-+	height = (sps->pic_height_in_map_units_minus1 + 1) * 16;
-+
-+	/*
-+	 * When frame_mbs_only_flag is not set, this is field height,
-+	 * which is half the final height (see (7-8) in the
-+	 * specification)
-+	 */
-+	if (!(sps->flags & V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY))
-+		height *= 2;
-+
-+	if (width > ctx->coded_fmt.fmt.pix_mp.width ||
-+	    height > ctx->coded_fmt.fmt.pix_mp.height)
-+		return -EINVAL;
-+
-+	return 0;
-+}
-+
-+static int rkvdec2_h264_start(struct rkvdec2_ctx *ctx)
-+{
-+	struct rkvdec2_dev *rkvdec = ctx->dev;
-+	struct rkvdec2_h264_priv_tbl *priv_tbl;
-+	struct rkvdec2_h264_ctx *h264_ctx;
-+	struct v4l2_ctrl *ctrl;
-+	int ret;
-+
-+	ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl,
-+			      V4L2_CID_STATELESS_H264_SPS);
-+	if (!ctrl)
-+		return -EINVAL;
-+
-+	ret = rkvdec2_h264_validate_sps(ctx, ctrl->p_new.p_h264_sps);
-+	if (ret)
-+		return ret;
-+
-+	h264_ctx = kzalloc(sizeof(*h264_ctx), GFP_KERNEL);
-+	if (!h264_ctx)
-+		return -ENOMEM;
-+
-+	priv_tbl = dma_alloc_coherent(rkvdec->dev, sizeof(*priv_tbl),
-+				      &h264_ctx->priv_tbl.dma, GFP_KERNEL);
-+	if (!priv_tbl) {
-+		ret = -ENOMEM;
-+		goto err_free_ctx;
-+	}
-+
-+	h264_ctx->priv_tbl.size = sizeof(*priv_tbl);
-+	h264_ctx->priv_tbl.cpu = priv_tbl;
-+	memcpy(priv_tbl->cabac_table, rkvdec_h264_cabac_table,
-+	       sizeof(rkvdec_h264_cabac_table));
-+
-+	ctx->priv = h264_ctx;
-+	return 0;
-+
-+err_free_ctx:
-+	kfree(h264_ctx);
-+	return ret;
-+}
-+
-+static void rkvdec2_h264_stop(struct rkvdec2_ctx *ctx)
-+{
-+	struct rkvdec2_h264_ctx *h264_ctx = ctx->priv;
-+	struct rkvdec2_dev *rkvdec = ctx->dev;
-+
-+	dma_free_coherent(rkvdec->dev, h264_ctx->priv_tbl.size,
-+			  h264_ctx->priv_tbl.cpu, h264_ctx->priv_tbl.dma);
-+	kfree(h264_ctx);
-+}
-+
-+static void rkvdec2_h264_run_preamble(struct rkvdec2_ctx *ctx,
-+				      struct rkvdec2_h264_run *run)
-+{
-+	struct v4l2_ctrl *ctrl;
-+
-+	ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl,
-+			      V4L2_CID_STATELESS_H264_DECODE_PARAMS);
-+	run->decode_params = ctrl ? ctrl->p_cur.p : NULL;
-+	ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl,
-+			      V4L2_CID_STATELESS_H264_SPS);
-+	run->sps = ctrl ? ctrl->p_cur.p : NULL;
-+	ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl,
-+			      V4L2_CID_STATELESS_H264_PPS);
-+	run->pps = ctrl ? ctrl->p_cur.p : NULL;
-+	ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl,
-+			      V4L2_CID_STATELESS_H264_SCALING_MATRIX);
-+	run->scaling_matrix = ctrl ? ctrl->p_cur.p : NULL;
-+
-+	rkvdec2_run_preamble(ctx, &run->base);
-+}
-+
-+static int rkvdec2_h264_run(struct rkvdec2_ctx *ctx)
-+{
-+	struct v4l2_h264_reflist_builder reflist_builder;
-+	struct rkvdec2_dev *rkvdec = ctx->dev;
-+	struct rkvdec2_h264_ctx *h264_ctx = ctx->priv;
-+	struct rkvdec2_h264_run run;
-+	uint32_t watchdog_time;
-+
-+	rkvdec2_h264_run_preamble(ctx, &run);
-+
-+	/* Build the P/B{0,1} ref lists. */
-+	v4l2_h264_init_reflist_builder(&reflist_builder, run.decode_params,
-+				       run.sps, run.decode_params->dpb);
-+	v4l2_h264_build_p_ref_list(&reflist_builder, h264_ctx->reflists.p);
-+	v4l2_h264_build_b_ref_lists(&reflist_builder, h264_ctx->reflists.b0,
-+				    h264_ctx->reflists.b1);
-+
-+	assemble_hw_scaling_list(ctx, &run);
-+	assemble_hw_pps(ctx, &run);
-+	lookup_ref_buf_idx(ctx, &run);
-+	assemble_hw_rps(ctx, &reflist_builder, &run);
-+
-+	config_registers(ctx, &run);
-+
-+	rkvdec2_run_postamble(ctx, &run.base);
-+
-+	/* Set watchdog at 2 times the hardware timeout threshold */
-+	u64 timeout_threshold = h264_ctx->regs.common.timeout_threshold;
-+	watchdog_time = 2 * (1000 * timeout_threshold) / clk_get_rate(rkvdec->clocks[0].clk);
-+	schedule_delayed_work(&rkvdec->watchdog_work, msecs_to_jiffies(watchdog_time));
-+
-+	/* Start decoding! */
-+	writel(RKVDEC2_REG_DEC_E_BIT, rkvdec->regs + RKVDEC2_REG_DEC_E);
-+
-+	return 0;
-+}
-+
-+static int rkvdec2_h264_try_ctrl(struct rkvdec2_ctx *ctx, struct v4l2_ctrl *ctrl)
-+{
-+	if (ctrl->id == V4L2_CID_STATELESS_H264_SPS)
-+		return rkvdec2_h264_validate_sps(ctx, ctrl->p_new.p_h264_sps);
-+
-+	return 0;
-+}
-+
-+const struct rkvdec2_coded_fmt_ops rkvdec2_h264_fmt_ops = {
-+	.adjust_fmt = rkvdec2_h264_adjust_fmt,
-+	.start = rkvdec2_h264_start,
-+	.stop = rkvdec2_h264_stop,
-+	.run = rkvdec2_h264_run,
-+	.try_ctrl = rkvdec2_h264_try_ctrl,
-+};
-diff --git a/drivers/media/platform/rockchip/rkvdec2/rkvdec2-regs.h b/drivers/media/platform/rockchip/rkvdec2/rkvdec2-regs.h
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/drivers/media/platform/rockchip/rkvdec2/rkvdec2-regs.h
-@@ -0,0 +1,346 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Rockchip Video Decoder 2 driver registers description
-+ *
-+ * Copyright (C) 2024 Collabora, Ltd.
-+ *  Detlev Casanova <detlev.casanova@collabora.com>
-+ */
-+
-+#ifndef _RKVDEC_REGS_H_
-+#define _RKVDEC_REGS_H_
-+
-+#define OFFSET_COMMON_REGS		(8 * sizeof(u32))
-+#define OFFSET_CODEC_PARAMS_REGS	(64 * sizeof(u32))
-+#define OFFSET_COMMON_ADDR_REGS		(128 * sizeof(u32))
-+#define OFFSET_CODEC_ADDR_REGS		(160 * sizeof(u32))
-+#define OFFSET_POC_HIGHBIT_REGS		(200 * sizeof(u32))
-+
-+#define RKVDEC2_MODE_HEVC	0
-+#define RKVDEC2_MODE_H264	1
-+#define RKVDEC2_MODE_VP9	2
-+#define RKVDEC2_MODE_AVS2	3
-+
-+#define MAX_SLICE_NUMBER	0x3fff
-+
-+#define RKVDEC2_1080P_PIXELS		(1920 * 1080)
-+#define RKVDEC2_4K_PIXELS		(4096 * 2304)
-+#define RKVDEC2_8K_PIXELS		(7680 * 4320)
-+#define RKVDEC2_TIMEOUT_1080p		(0xefffff)
-+#define RKVDEC2_TIMEOUT_4K		(0x2cfffff)
-+#define RKVDEC2_TIMEOUT_8K		(0x4ffffff)
-+#define RKVDEC2_TIMEOUT_MAX		(0xffffffff)
-+
-+#define RKVDEC2_REG_DEC_E		0x028
-+#define RKVDEC2_REG_DEC_E_BIT		1
-+
-+#define RKVDEC2_REG_IMPORTANT_EN	0x02c
-+#define RKVDEC2_REG_DEC_IRQ_DISABLE	BIT(4)
-+
-+#define RKVDEC2_REG_STA_INT		0x380
-+#define STA_INT_DEC_RDY_STA		BIT(2)
-+
-+/* base: OFFSET_COMMON_REGS */
-+struct rkvdec2_regs_common {
-+	struct rkvdec2_in_out {
-+		u32 in_endian		: 1;
-+		u32 in_swap32_e		: 1;
-+		u32 in_swap64_e		: 1;
-+		u32 str_endian		: 1;
-+		u32 str_swap32_e	: 1;
-+		u32 str_swap64_e	: 1;
-+		u32 out_endian		: 1;
-+		u32 out_swap32_e	: 1;
-+		u32 out_cbcr_swap	: 1;
-+		u32 out_swap64_e	: 1;
-+		u32 reserved		: 22;
-+	} reg008;
-+
-+	struct rkvdec2_dec_mode {
-+		u32 dec_mode	: 10;
-+		u32 reserved	: 22;
-+	} reg009;
-+
-+	struct rkvdec2_dec_e {
-+		u32 dec_e	: 1;
-+		u32 reserved	: 31;
-+	} reg010;
-+
-+	struct rkvdec2_important_en {
-+		u32 reserved			: 1;
-+		u32 dec_clkgate_e		: 1;
-+		u32 dec_e_strmd_clkgate_dis	: 1;
-+		u32 reserved0			: 1;
-+
-+		u32 dec_irq_dis			: 1;
-+		u32 dec_timeout_e		: 1;
-+		u32 buf_empty_en		: 1;
-+		u32 reserved1			: 3;
-+
-+		u32 dec_e_rewrite_valid		: 1;
-+		u32 reserved2			: 9;
-+		u32 softrst_en_p		: 1;
-+		u32 force_softreset_valid	: 1;
-+		u32 reserved3			: 2;
-+		u32 pix_range_detection_e	: 1;
-+		u32 reserved4			: 7;
-+	} reg011;
-+
-+	struct rkvdec2_sencodary_en {
-+		u32 wr_ddr_align_en		: 1;
-+		u32 colmv_compress_en		: 1;
-+		u32 fbc_e			: 1;
-+		u32 reserved0			: 1;
-+
-+		u32 buspr_slot_disable		: 1;
-+		u32 error_info_en		: 1;
-+		u32 info_collect_en		: 1;
-+		u32 wait_reset_en		: 1;
-+
-+		u32 scanlist_addr_valid_en	: 1;
-+		u32 scale_down_en		: 1;
-+		u32 error_cfg_wr_disable	: 1;
-+		u32 reserved1			: 21;
-+	} reg012;
-+
-+	struct rkvdec2_en_mode_set {
-+		u32 timeout_mode		: 1;
-+		u32 req_timeout_rst_sel		: 1;
-+		u32 reserved0			: 1;
-+		u32 dec_commonirq_mode		: 1;
-+		u32 reserved1			: 2;
-+		u32 stmerror_waitdecfifo_empty	: 1;
-+		u32 reserved2			: 2;
-+		u32 h26x_streamd_error_mode	: 1;
-+		u32 reserved3			: 2;
-+		u32 allow_not_wr_unref_bframe	: 1;
-+		u32 fbc_output_wr_disable	: 1;
-+		u32 reserved4			: 1;
-+		u32 colmv_error_mode		: 1;
-+
-+		u32 reserved5			: 2;
-+		u32 h26x_error_mode		: 1;
-+		u32 reserved6			: 2;
-+		u32 ycacherd_prior		: 1;
-+		u32 reserved7			: 2;
-+		u32 cur_pic_is_idr		: 1;
-+		u32 reserved8			: 1;
-+		u32 right_auto_rst_disable	: 1;
-+		u32 frame_end_err_rst_flag	: 1;
-+		u32 rd_prior_mode		: 1;
-+		u32 rd_ctrl_prior_mode		: 1;
-+		u32 reserved9			: 1;
-+		u32 filter_outbuf_mode		: 1;
-+	} reg013;
-+
-+	struct rkvdec2_fbc_param_set {
-+		u32 fbc_force_uncompress	: 1;
-+
-+		u32 reserved0			: 2;
-+		u32 allow_16x8_cp_flag		: 1;
-+		u32 reserved1			: 2;
-+
-+		u32 fbc_h264_exten_4or8_flag	: 1;
-+		u32 reserved2			: 25;
-+	} reg014;
-+
-+	struct rkvdec2_stream_param_set {
-+		u32 rlc_mode_direct_write	: 1;
-+		u32 rlc_mode			: 1;
-+		u32 reserved0			: 3;
-+
-+		u32 strm_start_bit		: 7;
-+		u32 reserved1			: 20;
-+	} reg015;
-+
-+	u32 stream_len;
-+
-+	struct rkvdec2_slice_number {
-+		u32 slice_num	: 25;
-+		u32 reserved	: 7;
-+	} reg017;
-+
-+	struct rkvdec2_y_hor_stride {
-+		u32 y_hor_virstride	: 16;
-+		u32 reserved		: 16;
-+	} reg018;
-+
-+	struct rkvdec2_uv_hor_stride {
-+		u32 uv_hor_virstride	: 16;
-+		u32 reserved		: 16;
-+	} reg019;
-+
-+	struct rkvdec2_y_stride {
-+		u32 y_virstride		: 28;
-+		u32 reserved		: 4;
-+	} reg020;
-+
-+	struct rkvdec2_error_ctrl_set {
-+		u32 inter_error_prc_mode		: 1;
-+		u32 error_intra_mode			: 1;
-+		u32 error_deb_en			: 1;
-+		u32 picidx_replace			: 5;
-+		u32 error_spread_e			: 1;
-+		u32 reserved0				: 3;
-+		u32 error_inter_pred_cross_slice	: 1;
-+		u32 reserved1				: 11;
-+		u32 roi_error_ctu_cal_en		: 1;
-+		u32 reserved2				: 7;
-+	} reg021;
-+
-+	struct rkvdec2_err_roi_ctu_offset_start {
-+		u32 roi_x_ctu_offset_st	: 12;
-+		u32 reserved0		: 4;
-+		u32 roi_y_ctu_offset_st	: 12;
-+		u32 reserved1		: 4;
-+	} reg022;
-+
-+	struct rkvdec2_err_roi_ctu_offset_end {
-+		u32 roi_x_ctu_offset_end	: 12;
-+		u32 reserved0			: 4;
-+		u32 roi_y_ctu_offset_end	: 12;
-+		u32 reserved1			: 4;
-+	} reg023;
-+
-+	struct rkvdec2_cabac_error_en_lowbits {
-+		u32 cabac_err_en_lowbits	: 32;
-+	} reg024;
-+
-+	struct rkvdec2_cabac_error_en_highbits {
-+		u32 cabac_err_en_highbits	: 30;
-+		u32 reserved			: 2;
-+	} reg025;
-+
-+	struct rkvdec2_block_gating_en {
-+		u32 swreg_block_gating_e	: 20;
-+		u32 reserved			: 11;
-+		u32 reg_cfg_gating_en		: 1;
-+	} reg026;
-+
-+	struct SW027_CORE_SAFE_PIXELS {
-+		u32 core_safe_x_pixels	: 16;
-+		u32 core_safe_y_pixels	: 16;
-+	} reg027;
-+
-+	struct rkvdec2_multiply_core_ctrl {
-+		u32 swreg_vp9_wr_prob_idx	: 3;
-+		u32 reserved0			: 1;
-+		u32 swreg_vp9_rd_prob_idx	: 3;
-+		u32 reserved1			: 1;
-+
-+		u32 swreg_ref_req_advance_flag	: 1;
-+		u32 sw_colmv_req_advance_flag	: 1;
-+		u32 sw_poc_only_highbit_flag	: 1;
-+		u32 sw_poc_arb_flag		: 1;
-+
-+		u32 reserved2			: 4;
-+		u32 sw_film_idx			: 10;
-+		u32 reserved3			: 2;
-+		u32 sw_pu_req_mismatch_dis	: 1;
-+		u32 sw_colmv_req_mismatch_dis	: 1;
-+		u32 reserved4			: 2;
-+	} reg028;
-+
-+	struct SW029_SCALE_DOWN_CTRL {
-+		u32 scale_down_hor_ratio	: 2;
-+		u32 reserved0			: 6;
-+		u32 scale_down_vrz_ratio	: 2;
-+		u32 reserved1			: 22;
-+	} reg029;
-+
-+	struct SW032_Y_SCALE_DOWN_TILE8x8_HOR_STRIDE {
-+		u32 y_scale_down_hor_stride	: 20;
-+		u32 reserved0			: 12;
-+	} reg030;
-+
-+	struct SW031_UV_SCALE_DOWN_TILE8x8_HOR_STRIDE {
-+		u32 uv_scale_down_hor_stride	: 20;
-+		u32 reserved0			: 12;
-+	} reg031;
-+
-+	u32 timeout_threshold;
-+} __packed;
-+
-+/* base: OFFSET_COMMON_ADDR_REGS */
-+struct rkvdec2_regs_common_addr {
-+	u32 rlc_base;
-+	u32 rlcwrite_base;
-+	u32 decout_base;
-+	u32 colmv_cur_base;
-+	u32 error_ref_base;
-+	u32 rcb_base[10];
-+} __packed;
-+
-+/* base: OFFSET_CODEC_PARAMS_REGS */
-+struct rkvdec2_regs_h264_params {
-+	struct rkvdec2_h26x_set {
-+		u32 h26x_frame_orslice		: 1;
-+		u32 h26x_rps_mode		: 1;
-+		u32 h26x_stream_mode		: 1;
-+		u32 h26x_stream_lastpacket	: 1;
-+		u32 h264_firstslice_flag	: 1;
-+		u32 reserved			: 27;
-+	} reg064;
-+
-+	u32 cur_top_poc;
-+	u32 cur_bot_poc;
-+	u32 ref_pocs[32];
-+
-+	struct rkvdec2_h264_info {
-+		struct rkvdec2_h264_ref_info {
-+			u32 ref_field		: 1;
-+			u32 ref_topfield_used	: 1;
-+			u32 ref_botfield_used	: 1;
-+			u32 ref_colmv_use_flag	: 1;
-+			u32 ref_reserved	: 4;
-+		} __packed ref_info[4];
-+	} __packed ref_info_regs[4];
-+
-+	u32 reserved_103_111[9];
-+
-+	struct rkvdec2_error_ref_info {
-+		u32 avs2_ref_error_field	: 1;
-+		u32 avs2_ref_error_topfield	: 1;
-+		u32 ref_error_topfield_used	: 1;
-+		u32 ref_error_botfield_used	: 1;
-+		u32 reserved			: 28;
-+	} reg112;
-+} __packed;
-+
-+/* base: OFFSET_CODEC_ADDR_REGS */
-+struct rkvdec2_regs_h264_addr {
-+	u32 reserved_160;
-+	u32 pps_base;
-+	u32 reserved_162;
-+	u32 rps_base;
-+	u32 ref_base[16];
-+	u32 scanlist_addr;
-+	u32 colmv_base[16];
-+	u32 cabactbl_base;
-+} __packed;
-+
-+struct rkvdec2_regs_h264_highpoc {
-+	struct rkvdec2_ref_poc_highbit {
-+		u32 ref0_poc_highbit	: 4;
-+		u32 ref1_poc_highbit	: 4;
-+		u32 ref2_poc_highbit	: 4;
-+		u32 ref3_poc_highbit	: 4;
-+		u32 ref4_poc_highbit	: 4;
-+		u32 ref5_poc_highbit	: 4;
-+		u32 ref6_poc_highbit	: 4;
-+		u32 ref7_poc_highbit	: 4;
-+	} reg200[4];
-+	struct rkvdec2_cur_poc_highbit {
-+		u32 cur_poc_highbit	: 4;
-+		u32 reserved		: 28;
-+	} reg204;
-+} __packed;
-+
-+struct rkvdec2_regs_h264 {
-+	struct rkvdec2_regs_common		common;
-+	struct rkvdec2_regs_h264_params		h264_param;
-+	struct rkvdec2_regs_common_addr		common_addr;
-+	struct rkvdec2_regs_h264_addr		h264_addr;
-+	struct rkvdec2_regs_h264_highpoc	h264_highpoc;
-+} __packed;
-+
-+#endif /* __RKVDEC_REGS_H__ */
-diff --git a/drivers/media/platform/rockchip/rkvdec2/rkvdec2.c b/drivers/media/platform/rockchip/rkvdec2/rkvdec2.c
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/drivers/media/platform/rockchip/rkvdec2/rkvdec2.c
-@@ -0,0 +1,1263 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Rockchip Video Decoder 2 driver
-+ *
-+ * Copyright (C) 2024 Collabora, Ltd.
-+ *  Detlev Casanova <detlev.casanova@collabora.com>
-+ *
-+ * Based on rkvdec driver by Boris Brezillon <boris.brezillon@collabora.com>
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/genalloc.h>
-+#include <linux/interrupt.h>
-+#include <linux/iommu.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+#include <linux/pm.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/slab.h>
-+#include <linux/videodev2.h>
-+#include <linux/workqueue.h>
-+#include <media/v4l2-event.h>
-+#include <media/v4l2-mem2mem.h>
-+#include <media/videobuf2-core.h>
-+#include <media/videobuf2-vmalloc.h>
-+
-+#include "rkvdec2.h"
-+
-+static int rkvdec2_try_ctrl(struct v4l2_ctrl *ctrl)
-+{
-+	struct rkvdec2_ctx *ctx = container_of(ctrl->handler, struct rkvdec2_ctx, ctrl_hdl);
-+	const struct rkvdec2_coded_fmt_desc *desc = ctx->coded_fmt_desc;
-+
-+	if (desc->ops->try_ctrl)
-+		return desc->ops->try_ctrl(ctx, ctrl);
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_ctrl_ops rkvdec2_ctrl_ops = {
-+	.try_ctrl = rkvdec2_try_ctrl,
-+};
-+
-+static const struct rkvdec2_ctrl_desc rkvdec2_h264_ctrl_descs[] = {
-+	{
-+		.cfg.id = V4L2_CID_STATELESS_H264_DECODE_PARAMS,
-+	},
-+	{
-+		.cfg.id = V4L2_CID_STATELESS_H264_SPS,
-+		.cfg.ops = &rkvdec2_ctrl_ops,
-+	},
-+	{
-+		.cfg.id = V4L2_CID_STATELESS_H264_PPS,
-+	},
-+	{
-+		.cfg.id = V4L2_CID_STATELESS_H264_SCALING_MATRIX,
-+	},
-+	{
-+		.cfg.id = V4L2_CID_STATELESS_H264_DECODE_MODE,
-+		.cfg.min = V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED,
-+		.cfg.max = V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED,
-+		.cfg.def = V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED,
-+	},
-+	{
-+		.cfg.id = V4L2_CID_STATELESS_H264_START_CODE,
-+		.cfg.min = V4L2_STATELESS_H264_START_CODE_ANNEX_B,
-+		.cfg.def = V4L2_STATELESS_H264_START_CODE_ANNEX_B,
-+		.cfg.max = V4L2_STATELESS_H264_START_CODE_ANNEX_B,
-+	},
-+	{
-+		.cfg.id = V4L2_CID_MPEG_VIDEO_H264_PROFILE,
-+		.cfg.min = V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE,
-+		.cfg.max = V4L2_MPEG_VIDEO_H264_PROFILE_HIGH,
-+		.cfg.menu_skip_mask =
-+			BIT(V4L2_MPEG_VIDEO_H264_PROFILE_EXTENDED),
-+		.cfg.def = V4L2_MPEG_VIDEO_H264_PROFILE_MAIN,
-+	},
-+	{
-+		.cfg.id = V4L2_CID_MPEG_VIDEO_H264_LEVEL,
-+		.cfg.min = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,
-+		.cfg.max = V4L2_MPEG_VIDEO_H264_LEVEL_6_1,
-+	},
-+};
-+
-+static const struct rkvdec2_ctrls rkvdec2_h264_ctrls = {
-+	.ctrls = rkvdec2_h264_ctrl_descs,
-+	.num_ctrls = ARRAY_SIZE(rkvdec2_h264_ctrl_descs),
-+};
-+
-+static const u32 rkvdec2_h264_decoded_fmts[] = {
-+	V4L2_PIX_FMT_NV12
-+};
-+
-+static const struct rkvdec2_coded_fmt_desc rkvdec2_coded_fmts[] = {
-+	{
-+		.fourcc = V4L2_PIX_FMT_H264_SLICE,
-+		.frmsize = {
-+			.min_width = 16,
-+			.max_width =  65520,
-+			.step_width = 16,
-+			.min_height = 16,
-+			.max_height =  65520,
-+			.step_height = 16,
-+		},
-+		.ctrls = &rkvdec2_h264_ctrls,
-+		.ops = &rkvdec2_h264_fmt_ops,
-+		.num_decoded_fmts = ARRAY_SIZE(rkvdec2_h264_decoded_fmts),
-+		.decoded_fmts = rkvdec2_h264_decoded_fmts,
-+		.subsystem_flags = VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF,
-+	},
-+};
-+
-+enum rcb_axis {
-+	PIC_WIDTH = 0,
-+	PIC_HEIGHT = 1
-+};
-+
-+struct rcb_size_info {
-+	u8 multiplier;
-+	enum rcb_axis axis;
-+};
-+
-+static struct rcb_size_info rcb_sizes[] = {
-+	{6,	PIC_WIDTH},	// intrar
-+	{1,	PIC_WIDTH},	// transdr (Is actually 0.4*pic_width)
-+	{1,	PIC_HEIGHT},	// transdc (Is actually 0.1*pic_height)
-+	{3,	PIC_WIDTH},	// streamdr
-+	{6,	PIC_WIDTH},	// interr
-+	{3,	PIC_HEIGHT},	// interc
-+	{22,	PIC_WIDTH},	// dblkr
-+	{6,	PIC_WIDTH},	// saor
-+	{11,	PIC_WIDTH},	// fbcr
-+	{67,	PIC_HEIGHT},	// filtc col
-+};
-+
-+#define RCB_SIZE(n,w,h) (rcb_sizes[(n)].multiplier * (rcb_sizes[(n)].axis ? (h) : (w)))
-+
-+static const struct rkvdec2_coded_fmt_desc *
-+rkvdec2_find_coded_fmt_desc(u32 fourcc)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(rkvdec2_coded_fmts); i++) {
-+		if (rkvdec2_coded_fmts[i].fourcc == fourcc)
-+			return &rkvdec2_coded_fmts[i];
-+	}
-+
-+	return NULL;
-+}
-+
-+static void rkvdec2_reset_fmt(struct rkvdec2_ctx *ctx, struct v4l2_format *f,
-+			      u32 fourcc)
-+{
-+	memset(f, 0, sizeof(*f));
-+	f->fmt.pix_mp.pixelformat = fourcc;
-+	f->fmt.pix_mp.field = V4L2_FIELD_NONE;
-+	f->fmt.pix_mp.colorspace = V4L2_COLORSPACE_REC709;
-+	f->fmt.pix_mp.ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
-+	f->fmt.pix_mp.quantization = V4L2_QUANTIZATION_DEFAULT;
-+	f->fmt.pix_mp.xfer_func = V4L2_XFER_FUNC_DEFAULT;
-+}
-+
-+static void rkvdec2_reset_coded_fmt(struct rkvdec2_ctx *ctx)
-+{
-+	struct v4l2_format *f = &ctx->coded_fmt;
-+
-+	ctx->coded_fmt_desc = &rkvdec2_coded_fmts[0];
-+	rkvdec2_reset_fmt(ctx, f, ctx->coded_fmt_desc->fourcc);
-+
-+	f->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
-+	f->fmt.pix_mp.width = ctx->coded_fmt_desc->frmsize.min_width;
-+	f->fmt.pix_mp.height = ctx->coded_fmt_desc->frmsize.min_height;
-+
-+	if (ctx->coded_fmt_desc->ops->adjust_fmt)
-+		ctx->coded_fmt_desc->ops->adjust_fmt(ctx, f);
-+}
-+
-+static void rkvdec2_reset_decoded_fmt(struct rkvdec2_ctx *ctx)
-+{
-+	struct v4l2_format *f = &ctx->decoded_fmt;
-+
-+	rkvdec2_reset_fmt(ctx, f, ctx->coded_fmt_desc->decoded_fmts[0]);
-+	f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-+	v4l2_fill_pixfmt_mp(&f->fmt.pix_mp,
-+			    ctx->coded_fmt_desc->decoded_fmts[0],
-+			    ctx->coded_fmt.fmt.pix_mp.width,
-+			    ctx->coded_fmt.fmt.pix_mp.height);
-+
-+	ctx->colmv_offset = f->fmt.pix_mp.plane_fmt[0].sizeimage;
-+
-+	f->fmt.pix_mp.plane_fmt[0].sizeimage += 128 *
-+		DIV_ROUND_UP(f->fmt.pix_mp.width, 16) *
-+		DIV_ROUND_UP(f->fmt.pix_mp.height, 16);
-+}
-+
-+static int rkvdec2_enum_framesizes(struct file *file, void *priv,
-+				   struct v4l2_frmsizeenum *fsize)
-+{
-+	const struct rkvdec2_coded_fmt_desc *desc;
-+
-+	if (fsize->index != 0)
-+		return -EINVAL;
-+
-+	desc = rkvdec2_find_coded_fmt_desc(fsize->pixel_format);
-+	if (!desc)
-+		return -EINVAL;
-+
-+	fsize->type = V4L2_FRMSIZE_TYPE_CONTINUOUS;
-+	
-+	fsize->stepwise.min_height = 1;
-+	fsize->stepwise.min_width = 1;
-+	fsize->stepwise.step_height = 1;
-+	fsize->stepwise.step_width = 1;
-+	fsize->stepwise.max_height = desc->frmsize.max_height;
-+	fsize->stepwise.max_width = desc->frmsize.max_width;
-+	
-+	return 0;
-+}
-+
-+static int rkvdec2_querycap(struct file *file, void *priv,
-+			    struct v4l2_capability *cap)
-+{
-+	struct rkvdec2_dev *rkvdec = video_drvdata(file);
-+	struct video_device *vdev = video_devdata(file);
-+
-+	strscpy(cap->driver, rkvdec->dev->driver->name,
-+		sizeof(cap->driver));
-+	strscpy(cap->card, vdev->name, sizeof(cap->card));
-+	snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s",
-+		 rkvdec->dev->driver->name);
-+	return 0;
-+}
-+
-+static int rkvdec2_try_capture_fmt(struct file *file, void *priv,
-+				   struct v4l2_format *f)
-+{
-+	struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
-+	struct rkvdec2_ctx *ctx = fh_to_rkvdec2_ctx(priv);
-+	const struct rkvdec2_coded_fmt_desc *coded_desc;
-+	unsigned int i;
-+
-+	/*
-+	 * The codec context should point to a coded format desc, if the format
-+	 * on the coded end has not been set yet, it should point to the
-+	 * default value.
-+	 */
-+	coded_desc = ctx->coded_fmt_desc;
-+	if (WARN_ON(!coded_desc))
-+		return -EINVAL;
-+
-+	for (i = 0; i < coded_desc->num_decoded_fmts; i++) {
-+		if (coded_desc->decoded_fmts[i] == pix_mp->pixelformat)
-+			break;
-+	}
-+
-+	if (i == coded_desc->num_decoded_fmts)
-+		pix_mp->pixelformat = coded_desc->decoded_fmts[0];
-+
-+	/* Always apply the frmsize constraint of the coded end. */
-+	pix_mp->width = max(pix_mp->width, ctx->coded_fmt.fmt.pix_mp.width);
-+	pix_mp->height = max(pix_mp->height, ctx->coded_fmt.fmt.pix_mp.height);
-+	v4l2_apply_frmsize_constraints(&pix_mp->width,
-+				       &pix_mp->height,
-+				       &coded_desc->frmsize);
-+
-+	v4l2_fill_pixfmt_mp(pix_mp, pix_mp->pixelformat,
-+			    pix_mp->width, pix_mp->height);
-+
-+	pix_mp->plane_fmt[0].sizeimage +=
-+		128 *
-+		DIV_ROUND_UP(pix_mp->width, 16) *
-+		DIV_ROUND_UP(pix_mp->height, 16);
-+
-+	pix_mp->field = V4L2_FIELD_NONE;
-+
-+	return 0;
-+}
-+
-+static int rkvdec2_try_output_fmt(struct file *file, void *priv,
-+				  struct v4l2_format *f)
-+{
-+	struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
-+	struct rkvdec2_ctx *ctx = fh_to_rkvdec2_ctx(priv);
-+	const struct rkvdec2_coded_fmt_desc *desc;
-+
-+	desc = rkvdec2_find_coded_fmt_desc(pix_mp->pixelformat);
-+	if (!desc) {
-+		pix_mp->pixelformat = rkvdec2_coded_fmts[0].fourcc;
-+		desc = &rkvdec2_coded_fmts[0];
-+	}
-+
-+	v4l2_apply_frmsize_constraints(&pix_mp->width,
-+				       &pix_mp->height,
-+				       &desc->frmsize);
-+
-+	pix_mp->field = V4L2_FIELD_NONE;
-+	/* All coded formats are considered single planar for now. */
-+	pix_mp->num_planes = 1;
-+
-+	if (desc->ops->adjust_fmt) {
-+		int ret;
-+
-+		ret = desc->ops->adjust_fmt(ctx, f);
-+		if (ret)
-+			return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int rkvdec2_s_capture_fmt(struct file *file, void *priv,
-+				 struct v4l2_format *f)
-+{
-+	struct rkvdec2_ctx *ctx = fh_to_rkvdec2_ctx(priv);
-+	struct vb2_queue *vq;
-+	int ret;
-+
-+	/* Change not allowed if queue is busy */
-+	vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx,
-+			     V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
-+	if (vb2_is_busy(vq))
-+		return -EBUSY;
-+
-+	ret = rkvdec2_try_capture_fmt(file, priv, f);
-+	if (ret)
-+		return ret;
-+
-+	ctx->decoded_fmt = *f;
-+	return 0;
-+}
-+
-+static int rkvdec2_s_output_fmt(struct file *file, void *priv,
-+				struct v4l2_format *f)
-+{
-+	struct rkvdec2_ctx *ctx = fh_to_rkvdec2_ctx(priv);
-+	struct v4l2_m2m_ctx *m2m_ctx = ctx->fh.m2m_ctx;
-+	const struct rkvdec2_coded_fmt_desc *desc;
-+	struct v4l2_format *cap_fmt;
-+	struct vb2_queue *peer_vq, *vq;
-+	int ret;
-+
-+	/*
-+	 * In order to support dynamic resolution change, the decoder admits
-+	 * a resolution change, as long as the pixelformat remains. Can't be
-+	 * done if streaming.
-+	 */
-+	vq = v4l2_m2m_get_vq(m2m_ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
-+	if (vb2_is_streaming(vq) ||
-+	    (vb2_is_busy(vq) &&
-+	     f->fmt.pix_mp.pixelformat != ctx->coded_fmt.fmt.pix_mp.pixelformat))
-+		return -EBUSY;
-+
-+	/*
-+	 * Since format change on the OUTPUT queue will reset the CAPTURE
-+	 * queue, we can't allow doing so when the CAPTURE queue has buffers
-+	 * allocated.
-+	 */
-+	peer_vq = v4l2_m2m_get_vq(m2m_ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
-+	if (vb2_is_busy(peer_vq))
-+		return -EBUSY;
-+
-+	ret = rkvdec2_try_output_fmt(file, priv, f);
-+	if (ret)
-+		return ret;
-+
-+	desc = rkvdec2_find_coded_fmt_desc(f->fmt.pix_mp.pixelformat);
-+	if (!desc)
-+		return -EINVAL;
-+	ctx->coded_fmt_desc = desc;
-+	ctx->coded_fmt = *f;
-+
-+	/*
-+	 * Current decoded format might have become invalid with newly
-+	 * selected codec, so reset it to default just to be safe and
-+	 * keep internal driver state sane. User is mandated to set
-+	 * the decoded format again after we return, so we don't need
-+	 * anything smarter.
-+	 *
-+	 * Note that this will propagate any size changes to the decoded format.
-+	 */
-+	rkvdec2_reset_decoded_fmt(ctx);
-+
-+	/* Propagate colorspace information to capture. */
-+	cap_fmt = &ctx->decoded_fmt;
-+	cap_fmt->fmt.pix_mp.colorspace = f->fmt.pix_mp.colorspace;
-+	cap_fmt->fmt.pix_mp.xfer_func = f->fmt.pix_mp.xfer_func;
-+	cap_fmt->fmt.pix_mp.ycbcr_enc = f->fmt.pix_mp.ycbcr_enc;
-+	cap_fmt->fmt.pix_mp.quantization = f->fmt.pix_mp.quantization;
-+
-+	/* Enable format specific queue features */
-+	vq->subsystem_flags |= desc->subsystem_flags;
-+
-+	return 0;
-+}
-+
-+static int rkvdec2_g_output_fmt(struct file *file, void *priv,
-+				struct v4l2_format *f)
-+{
-+	struct rkvdec2_ctx *ctx = fh_to_rkvdec2_ctx(priv);
-+
-+	*f = ctx->coded_fmt;
-+	return 0;
-+}
-+
-+static int rkvdec2_g_capture_fmt(struct file *file, void *priv,
-+				 struct v4l2_format *f)
-+{
-+	struct rkvdec2_ctx *ctx = fh_to_rkvdec2_ctx(priv);
-+
-+	*f = ctx->decoded_fmt;
-+	return 0;
-+}
-+
-+static int rkvdec2_enum_output_fmt(struct file *file, void *priv,
-+				   struct v4l2_fmtdesc *f)
-+{
-+	if (f->index >= ARRAY_SIZE(rkvdec2_coded_fmts))
-+		return -EINVAL;
-+
-+	f->pixelformat = rkvdec2_coded_fmts[f->index].fourcc;
-+	return 0;
-+}
-+
-+static int rkvdec2_enum_capture_fmt(struct file *file, void *priv,
-+				    struct v4l2_fmtdesc *f)
-+{
-+	struct rkvdec2_ctx *ctx = fh_to_rkvdec2_ctx(priv);
-+
-+	if (WARN_ON(!ctx->coded_fmt_desc))
-+		return -EINVAL;
-+
-+	if (f->index >= ctx->coded_fmt_desc->num_decoded_fmts)
-+		return -EINVAL;
-+
-+	f->pixelformat = ctx->coded_fmt_desc->decoded_fmts[f->index];
-+	return 0;
-+}
-+
-+static const struct v4l2_ioctl_ops rkvdec2_ioctl_ops = {
-+	.vidioc_querycap = rkvdec2_querycap,
-+	.vidioc_enum_framesizes = rkvdec2_enum_framesizes,
-+
-+	.vidioc_try_fmt_vid_cap_mplane = rkvdec2_try_capture_fmt,
-+	.vidioc_try_fmt_vid_out_mplane = rkvdec2_try_output_fmt,
-+	.vidioc_s_fmt_vid_out_mplane = rkvdec2_s_output_fmt,
-+	.vidioc_s_fmt_vid_cap_mplane = rkvdec2_s_capture_fmt,
-+	.vidioc_g_fmt_vid_out_mplane = rkvdec2_g_output_fmt,
-+	.vidioc_g_fmt_vid_cap_mplane = rkvdec2_g_capture_fmt,
-+	.vidioc_enum_fmt_vid_out = rkvdec2_enum_output_fmt,
-+	.vidioc_enum_fmt_vid_cap = rkvdec2_enum_capture_fmt,
-+
-+	.vidioc_reqbufs = v4l2_m2m_ioctl_reqbufs,
-+	.vidioc_querybuf = v4l2_m2m_ioctl_querybuf,
-+	.vidioc_qbuf = v4l2_m2m_ioctl_qbuf,
-+	.vidioc_dqbuf = v4l2_m2m_ioctl_dqbuf,
-+	.vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf,
-+	.vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs,
-+	.vidioc_expbuf = v4l2_m2m_ioctl_expbuf,
-+
-+	.vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
-+	.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
-+
-+	.vidioc_streamon = v4l2_m2m_ioctl_streamon,
-+	.vidioc_streamoff = v4l2_m2m_ioctl_streamoff,
-+
-+	.vidioc_decoder_cmd = v4l2_m2m_ioctl_stateless_decoder_cmd,
-+	.vidioc_try_decoder_cmd = v4l2_m2m_ioctl_stateless_try_decoder_cmd,
-+};
-+
-+static int rkvdec2_queue_setup(struct vb2_queue *vq, unsigned int *num_buffers,
-+			       unsigned int *num_planes, unsigned int sizes[],
-+			      struct device *alloc_devs[])
-+{
-+	struct rkvdec2_ctx *ctx = vb2_get_drv_priv(vq);
-+	struct v4l2_format *f;
-+	unsigned int i;
-+
-+	if (V4L2_TYPE_IS_OUTPUT(vq->type))
-+		f = &ctx->coded_fmt;
-+	else
-+		f = &ctx->decoded_fmt;
-+
-+	if (*num_planes) {
-+		if (*num_planes != f->fmt.pix_mp.num_planes)
-+			return -EINVAL;
-+
-+		for (i = 0; i < f->fmt.pix_mp.num_planes; i++) {
-+			if (sizes[i] < f->fmt.pix_mp.plane_fmt[i].sizeimage)
-+				return -EINVAL;
-+		}
-+	} else {
-+		*num_planes = f->fmt.pix_mp.num_planes;
-+		for (i = 0; i < f->fmt.pix_mp.num_planes; i++)
-+			sizes[i] = f->fmt.pix_mp.plane_fmt[i].sizeimage;
-+	}
-+
-+	return 0;
-+}
-+
-+static int rkvdec2_buf_prepare(struct vb2_buffer *vb)
-+{
-+	struct vb2_queue *vq = vb->vb2_queue;
-+	struct rkvdec2_ctx *ctx = vb2_get_drv_priv(vq);
-+	struct v4l2_format *f;
-+	unsigned int i;
-+
-+	if (V4L2_TYPE_IS_OUTPUT(vq->type))
-+		f = &ctx->coded_fmt;
-+	else
-+		f = &ctx->decoded_fmt;
-+
-+	for (i = 0; i < f->fmt.pix_mp.num_planes; ++i) {
-+		u32 sizeimage = f->fmt.pix_mp.plane_fmt[i].sizeimage;
-+
-+		if (vb2_plane_size(vb, i) < sizeimage)
-+			return -EINVAL;
-+	}
-+
-+	/*
-+	 * Buffer's bytesused must be written by driver for CAPTURE buffers.
-+	 * (for OUTPUT buffers, if userspace passes 0 bytesused, v4l2-core sets
-+	 * it to buffer length).
-+	 */
-+	if (V4L2_TYPE_IS_CAPTURE(vq->type))
-+		vb2_set_plane_payload(vb, 0, f->fmt.pix_mp.plane_fmt[0].sizeimage);
-+
-+	return 0;
-+}
-+
-+static void rkvdec2_buf_queue(struct vb2_buffer *vb)
-+{
-+	struct rkvdec2_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
-+	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
-+
-+	v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
-+}
-+
-+static int rkvdec2_buf_out_validate(struct vb2_buffer *vb)
-+{
-+	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
-+
-+	vbuf->field = V4L2_FIELD_NONE;
-+	return 0;
-+}
-+
-+static void rkvdec2_buf_request_complete(struct vb2_buffer *vb)
-+{
-+	struct rkvdec2_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
-+
-+	v4l2_ctrl_request_complete(vb->req_obj.req, &ctx->ctrl_hdl);
-+}
-+
-+static void rkvdec2_free_rcb(struct rkvdec2_ctx *ctx)
-+{
-+	u32 width, height;
-+	int i;
-+
-+	width = ctx->decoded_fmt.fmt.pix_mp.width;
-+	height = ctx->decoded_fmt.fmt.pix_mp.height;
-+
-+	for (i = 0; i < RKVDEC2_RCB_COUNT; i++) {
-+		size_t rcb_size = RCB_SIZE(i, width, height);
-+
-+		if (!ctx->rcb_bufs[i].cpu)
-+			continue;
-+
-+		switch (ctx->rcb_bufs[i].type) {
-+		case RKVDEC2_ALLOC_SRAM:
-+			gen_pool_free(ctx->dev->sram_pool,
-+				      (unsigned long)ctx->rcb_bufs[i].cpu,
-+				      rcb_size);
-+			break;
-+		case RKVDEC2_ALLOC_DMA:
-+			dma_free_coherent(ctx->dev->dev,
-+					  rcb_size,
-+					  ctx->rcb_bufs[i].cpu,
-+					  ctx->rcb_bufs[i].dma);
-+			break;
-+		}
-+	}
-+}
-+
-+static int rkvdec2_allocate_rcb(struct rkvdec2_ctx *ctx)
-+{
-+	int ret, i;
-+	u32 width, height;
-+
-+	memset(ctx->rcb_bufs, 0, sizeof(*ctx->rcb_bufs));
-+
-+	width = ctx->decoded_fmt.fmt.pix_mp.width;
-+	height = ctx->decoded_fmt.fmt.pix_mp.height;
-+
-+	for (i = 0; i < RKVDEC2_RCB_COUNT; i++) {
-+		void *cpu = NULL;
-+		dma_addr_t dma;
-+		size_t rcb_size = RCB_SIZE(i, width, height);
-+		enum rkvdec2_alloc_type alloc_type = RKVDEC2_ALLOC_SRAM;
-+
-+		if (ctx->dev->sram_pool) {
-+			cpu = gen_pool_dma_zalloc_align(ctx->dev->sram_pool,
-+							rcb_size,
-+							&dma,
-+							64);
-+		}
-+
-+		/* Fallback to RAM */
-+		if (!cpu) {
-+			cpu = dma_alloc_coherent(ctx->dev->dev,
-+						 rcb_size,
-+						 &dma,
-+						 GFP_KERNEL);
-+			alloc_type = RKVDEC2_ALLOC_DMA;
-+		}
-+
-+		if (!cpu) {
-+			ret = -ENOMEM;
-+			goto err_alloc;
-+		}
-+
-+		ctx->rcb_bufs[i].cpu = cpu;
-+		ctx->rcb_bufs[i].dma = dma;
-+		ctx->rcb_bufs[i].size = rcb_size;
-+		ctx->rcb_bufs[i].type = alloc_type;
-+	}
-+
-+	return 0;
-+
-+err_alloc:
-+	rkvdec2_free_rcb(ctx);
-+
-+	return ret;
-+}
-+
-+static int rkvdec2_start_streaming(struct vb2_queue *q, unsigned int count)
-+{
-+	struct rkvdec2_ctx *ctx = vb2_get_drv_priv(q);
-+	const struct rkvdec2_coded_fmt_desc *desc;
-+	int ret;
-+
-+	if (V4L2_TYPE_IS_CAPTURE(q->type))
-+		return 0;
-+
-+	desc = ctx->coded_fmt_desc;
-+	if (WARN_ON(!desc))
-+		return -EINVAL;
-+
-+	ret = rkvdec2_allocate_rcb(ctx);
-+	if (ret)
-+		return ret;
-+
-+	if (desc->ops->start) {
-+		ret = desc->ops->start(ctx);
-+		if (ret)
-+			goto err_ops_start;
-+	}
-+
-+	return 0;
-+
-+err_ops_start:
-+	rkvdec2_free_rcb(ctx);
-+
-+	return ret;
-+}
-+
-+static void rkvdec2_queue_cleanup(struct vb2_queue *vq, u32 state)
-+{
-+	struct rkvdec2_ctx *ctx = vb2_get_drv_priv(vq);
-+
-+	while (true) {
-+		struct vb2_v4l2_buffer *vbuf;
-+
-+		if (V4L2_TYPE_IS_OUTPUT(vq->type))
-+			vbuf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
-+		else
-+			vbuf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
-+
-+		if (!vbuf)
-+			break;
-+
-+		v4l2_ctrl_request_complete(vbuf->vb2_buf.req_obj.req,
-+					   &ctx->ctrl_hdl);
-+		v4l2_m2m_buf_done(vbuf, state);
-+	}
-+}
-+
-+static void rkvdec2_stop_streaming(struct vb2_queue *q)
-+{
-+	struct rkvdec2_ctx *ctx = vb2_get_drv_priv(q);
-+
-+	if (V4L2_TYPE_IS_OUTPUT(q->type)) {
-+		const struct rkvdec2_coded_fmt_desc *desc = ctx->coded_fmt_desc;
-+
-+		if (WARN_ON(!desc))
-+			return;
-+
-+		if (desc->ops->stop)
-+			desc->ops->stop(ctx);
-+
-+		rkvdec2_free_rcb(ctx);
-+	}
-+
-+	rkvdec2_queue_cleanup(q, VB2_BUF_STATE_ERROR);
-+}
-+
-+static const struct vb2_ops rkvdec2_queue_ops = {
-+	.queue_setup = rkvdec2_queue_setup,
-+	.buf_prepare = rkvdec2_buf_prepare,
-+	.buf_queue = rkvdec2_buf_queue,
-+	.buf_out_validate = rkvdec2_buf_out_validate,
-+	.buf_request_complete = rkvdec2_buf_request_complete,
-+	.start_streaming = rkvdec2_start_streaming,
-+	.stop_streaming = rkvdec2_stop_streaming,
-+	.wait_prepare = vb2_ops_wait_prepare,
-+	.wait_finish = vb2_ops_wait_finish,
-+};
-+
-+static int rkvdec2_request_validate(struct media_request *req)
-+{
-+	unsigned int count;
-+
-+	count = vb2_request_buffer_cnt(req);
-+	if (!count)
-+		return -ENOENT;
-+	else if (count > 1)
-+		return -EINVAL;
-+
-+	return vb2_request_validate(req);
-+}
-+
-+static const struct media_device_ops rkvdec2_media_ops = {
-+	.req_validate = rkvdec2_request_validate,
-+	.req_queue = v4l2_m2m_request_queue,
-+};
-+
-+static void rkvdec2_job_finish_no_pm(struct rkvdec2_ctx *ctx,
-+				     enum vb2_buffer_state result)
-+{
-+	if (ctx->coded_fmt_desc->ops->done) {
-+		struct vb2_v4l2_buffer *src_buf, *dst_buf;
-+
-+		src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
-+		dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
-+		ctx->coded_fmt_desc->ops->done(ctx, src_buf, dst_buf, result);
-+	}
-+
-+	v4l2_m2m_buf_done_and_job_finish(ctx->dev->m2m_dev, ctx->fh.m2m_ctx,
-+					 result);
-+}
-+
-+static void rkvdec2_job_finish(struct rkvdec2_ctx *ctx,
-+			       enum vb2_buffer_state result)
-+{
-+	struct rkvdec2_dev *rkvdec = ctx->dev;
-+
-+	pm_runtime_mark_last_busy(rkvdec->dev);
-+	pm_runtime_put_autosuspend(rkvdec->dev);
-+	rkvdec2_job_finish_no_pm(ctx, result);
-+}
-+
-+void rkvdec2_run_preamble(struct rkvdec2_ctx *ctx, struct rkvdec2_run *run)
-+{
-+	struct media_request *src_req;
-+
-+	memset(run, 0, sizeof(*run));
-+
-+	run->bufs.src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
-+	run->bufs.dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
-+
-+	/* Apply request(s) controls if needed. */
-+	src_req = run->bufs.src->vb2_buf.req_obj.req;
-+	if (src_req)
-+		v4l2_ctrl_request_setup(src_req, &ctx->ctrl_hdl);
-+
-+	v4l2_m2m_buf_copy_metadata(run->bufs.src, run->bufs.dst, true);
-+}
-+
-+void rkvdec2_run_postamble(struct rkvdec2_ctx *ctx, struct rkvdec2_run *run)
-+{
-+	struct media_request *src_req = run->bufs.src->vb2_buf.req_obj.req;
-+
-+	if (src_req)
-+		v4l2_ctrl_request_complete(src_req, &ctx->ctrl_hdl);
-+}
-+
-+static void rkvdec2_device_run(void *priv)
-+{
-+	struct rkvdec2_ctx *ctx = priv;
-+	struct rkvdec2_dev *rkvdec = ctx->dev;
-+	const struct rkvdec2_coded_fmt_desc *desc = ctx->coded_fmt_desc;
-+	int ret;
-+
-+	if (WARN_ON(!desc))
-+		return;
-+
-+	ret = pm_runtime_resume_and_get(rkvdec->dev);
-+	if (ret < 0) {
-+		rkvdec2_job_finish_no_pm(ctx, VB2_BUF_STATE_ERROR);
-+		return;
-+	}
-+
-+	ret = desc->ops->run(ctx);
-+	if (ret)
-+		rkvdec2_job_finish(ctx, VB2_BUF_STATE_ERROR);
-+}
-+
-+static const struct v4l2_m2m_ops rkvdec2_m2m_ops = {
-+	.device_run = rkvdec2_device_run,
-+};
-+
-+static int rkvdec2_queue_init(void *priv,
-+			      struct vb2_queue *src_vq,
-+			      struct vb2_queue *dst_vq)
-+{
-+	struct rkvdec2_ctx *ctx = priv;
-+	struct rkvdec2_dev *rkvdec = ctx->dev;
-+	int ret;
-+
-+	src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
-+	src_vq->io_modes = VB2_MMAP | VB2_DMABUF;
-+	src_vq->drv_priv = ctx;
-+	src_vq->ops = &rkvdec2_queue_ops;
-+	src_vq->mem_ops = &vb2_dma_contig_memops;
-+
-+	/*
-+	 * No CPU access on the queues, so no kernel mapping needed.
-+	 */
-+	src_vq->dma_attrs = DMA_ATTR_NO_KERNEL_MAPPING;
-+	src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
-+	src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
-+	src_vq->lock = &rkvdec->vdev_lock;
-+	src_vq->dev = rkvdec->v4l2_dev.dev;
-+	src_vq->supports_requests = true;
-+	src_vq->requires_requests = true;
-+
-+	ret = vb2_queue_init(src_vq);
-+	if (ret)
-+		return ret;
-+
-+	dst_vq->bidirectional = true;
-+	dst_vq->mem_ops = &vb2_dma_contig_memops;
-+	dst_vq->dma_attrs = DMA_ATTR_NO_KERNEL_MAPPING;
-+	dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-+	dst_vq->io_modes = VB2_MMAP | VB2_DMABUF;
-+	dst_vq->drv_priv = ctx;
-+	dst_vq->ops = &rkvdec2_queue_ops;
-+	dst_vq->buf_struct_size = sizeof(struct rkvdec2_decoded_buffer);
-+	dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
-+	dst_vq->lock = &rkvdec->vdev_lock;
-+	dst_vq->dev = rkvdec->v4l2_dev.dev;
-+
-+	return vb2_queue_init(dst_vq);
-+}
-+
-+static int rkvdec2_add_ctrls(struct rkvdec2_ctx *ctx,
-+			     const struct rkvdec2_ctrls *ctrls)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < ctrls->num_ctrls; i++) {
-+		const struct v4l2_ctrl_config *cfg = &ctrls->ctrls[i].cfg;
-+
-+		v4l2_ctrl_new_custom(&ctx->ctrl_hdl, cfg, ctx);
-+		if (ctx->ctrl_hdl.error)
-+			return ctx->ctrl_hdl.error;
-+	}
-+
-+	return 0;
-+}
-+
-+static int rkvdec2_init_ctrls(struct rkvdec2_ctx *ctx)
-+{
-+	unsigned int i, nctrls = 0;
-+	int ret;
-+
-+	for (i = 0; i < ARRAY_SIZE(rkvdec2_coded_fmts); i++)
-+		nctrls += rkvdec2_coded_fmts[i].ctrls->num_ctrls;
-+
-+	v4l2_ctrl_handler_init(&ctx->ctrl_hdl, nctrls);
-+
-+	for (i = 0; i < ARRAY_SIZE(rkvdec2_coded_fmts); i++) {
-+		ret = rkvdec2_add_ctrls(ctx, rkvdec2_coded_fmts[i].ctrls);
-+		if (ret)
-+			goto err_free_handler;
-+	}
-+
-+	ret = v4l2_ctrl_handler_setup(&ctx->ctrl_hdl);
-+	if (ret)
-+		goto err_free_handler;
-+
-+	ctx->fh.ctrl_handler = &ctx->ctrl_hdl;
-+	return 0;
-+
-+err_free_handler:
-+	v4l2_ctrl_handler_free(&ctx->ctrl_hdl);
-+	return ret;
-+}
-+
-+static int rkvdec2_open(struct file *filp)
-+{
-+	struct rkvdec2_dev *rkvdec = video_drvdata(filp);
-+	struct rkvdec2_ctx *ctx;
-+	int ret;
-+
-+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
-+	if (!ctx)
-+		return -ENOMEM;
-+
-+	ctx->dev = rkvdec;
-+	rkvdec2_reset_coded_fmt(ctx);
-+	rkvdec2_reset_decoded_fmt(ctx);
-+	v4l2_fh_init(&ctx->fh, video_devdata(filp));
-+
-+	ret = rkvdec2_init_ctrls(ctx);
-+	if (ret)
-+		goto err_free_ctx;
-+
-+	ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(rkvdec->m2m_dev, ctx,
-+					    rkvdec2_queue_init);
-+	if (IS_ERR(ctx->fh.m2m_ctx)) {
-+		ret = PTR_ERR(ctx->fh.m2m_ctx);
-+		goto err_cleanup_ctrls;
-+	}
-+
-+	filp->private_data = &ctx->fh;
-+	v4l2_fh_add(&ctx->fh);
-+
-+	return 0;
-+
-+err_cleanup_ctrls:
-+	v4l2_ctrl_handler_free(&ctx->ctrl_hdl);
-+
-+err_free_ctx:
-+	kfree(ctx);
-+	return ret;
-+}
-+
-+static int rkvdec2_release(struct file *filp)
-+{
-+	struct rkvdec2_ctx *ctx = fh_to_rkvdec2_ctx(filp->private_data);
-+
-+	v4l2_fh_del(&ctx->fh);
-+	v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);
-+	v4l2_ctrl_handler_free(&ctx->ctrl_hdl);
-+	v4l2_fh_exit(&ctx->fh);
-+	kfree(ctx);
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_file_operations rkvdec2_fops = {
-+	.owner = THIS_MODULE,
-+	.open = rkvdec2_open,
-+	.release = rkvdec2_release,
-+	.poll = v4l2_m2m_fop_poll,
-+	.unlocked_ioctl = video_ioctl2,
-+	.mmap = v4l2_m2m_fop_mmap,
-+};
-+
-+static int rkvdec2_v4l2_init(struct rkvdec2_dev *rkvdec)
-+{
-+	int ret;
-+
-+	ret = v4l2_device_register(rkvdec->dev, &rkvdec->v4l2_dev);
-+	if (ret) {
-+		dev_err(rkvdec->dev, "Failed to register V4L2 device\n");
-+		return ret;
-+	}
-+
-+	rkvdec->m2m_dev = v4l2_m2m_init(&rkvdec2_m2m_ops);
-+	if (IS_ERR(rkvdec->m2m_dev)) {
-+		v4l2_err(&rkvdec->v4l2_dev, "Failed to init mem2mem device\n");
-+		ret = PTR_ERR(rkvdec->m2m_dev);
-+		goto err_unregister_v4l2;
-+	}
-+
-+	rkvdec->mdev.dev = rkvdec->dev;
-+	strscpy(rkvdec->mdev.model, "rkvdec2", sizeof(rkvdec->mdev.model));
-+	strscpy(rkvdec->mdev.bus_info, "platform:rkvdec2",
-+		sizeof(rkvdec->mdev.bus_info));
-+	media_device_init(&rkvdec->mdev);
-+	rkvdec->mdev.ops = &rkvdec2_media_ops;
-+	rkvdec->v4l2_dev.mdev = &rkvdec->mdev;
-+
-+	rkvdec->vdev.lock = &rkvdec->vdev_lock;
-+	rkvdec->vdev.v4l2_dev = &rkvdec->v4l2_dev;
-+	rkvdec->vdev.fops = &rkvdec2_fops;
-+	rkvdec->vdev.release = video_device_release_empty;
-+	rkvdec->vdev.vfl_dir = VFL_DIR_M2M;
-+	rkvdec->vdev.device_caps = V4L2_CAP_STREAMING |
-+				   V4L2_CAP_VIDEO_M2M_MPLANE;
-+	rkvdec->vdev.ioctl_ops = &rkvdec2_ioctl_ops;
-+	video_set_drvdata(&rkvdec->vdev, rkvdec);
-+	strscpy(rkvdec->vdev.name, "rkvdec2", sizeof(rkvdec->vdev.name));
-+
-+	ret = video_register_device(&rkvdec->vdev, VFL_TYPE_VIDEO, -1);
-+	if (ret) {
-+		v4l2_err(&rkvdec->v4l2_dev, "Failed to register video device\n");
-+		goto err_cleanup_mc;
-+	}
-+
-+	ret = v4l2_m2m_register_media_controller(rkvdec->m2m_dev, &rkvdec->vdev,
-+						 MEDIA_ENT_F_PROC_VIDEO_DECODER);
-+	if (ret) {
-+		v4l2_err(&rkvdec->v4l2_dev,
-+			 "Failed to initialize V4L2 M2M media controller\n");
-+		goto err_unregister_vdev;
-+	}
-+
-+	ret = media_device_register(&rkvdec->mdev);
-+	if (ret) {
-+		v4l2_err(&rkvdec->v4l2_dev, "Failed to register media device\n");
-+		goto err_unregister_mc;
-+	}
-+
-+	return 0;
-+
-+err_unregister_mc:
-+	v4l2_m2m_unregister_media_controller(rkvdec->m2m_dev);
-+
-+err_unregister_vdev:
-+	video_unregister_device(&rkvdec->vdev);
-+
-+err_cleanup_mc:
-+	media_device_cleanup(&rkvdec->mdev);
-+	v4l2_m2m_release(rkvdec->m2m_dev);
-+
-+err_unregister_v4l2:
-+	v4l2_device_unregister(&rkvdec->v4l2_dev);
-+	return ret;
-+}
-+
-+static void rkvdec2_v4l2_cleanup(struct rkvdec2_dev *rkvdec)
-+{
-+	media_device_unregister(&rkvdec->mdev);
-+	v4l2_m2m_unregister_media_controller(rkvdec->m2m_dev);
-+	video_unregister_device(&rkvdec->vdev);
-+	media_device_cleanup(&rkvdec->mdev);
-+	v4l2_m2m_release(rkvdec->m2m_dev);
-+	v4l2_device_unregister(&rkvdec->v4l2_dev);
-+}
-+
-+static irqreturn_t rkvdec2_irq_handler(int irq, void *priv)
-+{
-+	struct rkvdec2_dev *rkvdec = priv;
-+	enum vb2_buffer_state state;
-+	u32 status;
-+
-+	status = readl(rkvdec->regs + RKVDEC2_REG_STA_INT);
-+	state = (status & STA_INT_DEC_RDY_STA) ?
-+		VB2_BUF_STATE_DONE : VB2_BUF_STATE_ERROR;
-+
-+	/* Clear interrupt status */
-+	writel(0, rkvdec->regs + RKVDEC2_REG_STA_INT);
-+	if (cancel_delayed_work(&rkvdec->watchdog_work)) {
-+		struct rkvdec2_ctx *ctx;
-+
-+		ctx = v4l2_m2m_get_curr_priv(rkvdec->m2m_dev);
-+		rkvdec2_job_finish(ctx, state);
-+	}
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static void rkvdec2_watchdog_func(struct work_struct *work)
-+{
-+	struct rkvdec2_dev *rkvdec = container_of(to_delayed_work(work), struct rkvdec2_dev,
-+			      watchdog_work);
-+	struct rkvdec2_ctx *ctx;
-+
-+	ctx = v4l2_m2m_get_curr_priv(rkvdec->m2m_dev);
-+	if (ctx) {
-+		dev_err(rkvdec->dev, "Frame processing timed out!\n");
-+		writel(RKVDEC2_REG_DEC_IRQ_DISABLE, rkvdec->regs + RKVDEC2_REG_IMPORTANT_EN);
-+		writel(0, rkvdec->regs + RKVDEC2_REG_DEC_E);
-+		rkvdec2_job_finish(ctx, VB2_BUF_STATE_ERROR);
-+	}
-+}
-+
-+static const struct of_device_id of_rkvdec2_match[] = {
-+	{ .compatible = "rockchip,rk3588-vdec" },
-+	{ /* sentinel */ }
-+};
-+MODULE_DEVICE_TABLE(of, of_rkvdec2_match);
-+
-+static const char * const rkvdec2_clk_names[] = {
-+	"axi",
-+	"ahb",
-+	"core",
-+	"cabac",
-+	"hevc_cabac",
-+};
-+
-+/*
-+ * Some SoCs, like RK3588 have multiple identical vdpu34x cores, but the
-+ * kernel is currently missing support for multi-core handling. Exposing
-+ * separate devices for each core to userspace is bad, since that does
-+ * not allow scheduling tasks properly (and creates ABI). With this workaround
-+ * the driver will only probe for the first core and early exit for the other
-+ * cores. Once the driver gains multi-core support, the same technique
-+ * for detecting the main core can be used to cluster all cores together.
-+ */
-+static int rkvdec2_disable_multicore(struct rkvdec2_dev *rkvdec)
-+{
-+	const char *compatible;
-+	struct device_node *node;
-+	int ret;
-+
-+	/* Intentionally ignores the fallback strings */
-+	ret = of_property_read_string(rkvdec->dev->of_node, "compatible", &compatible);
-+	if (ret)
-+		return ret;
-+
-+	/* first compatible node found from the root node is considered the main core */
-+	node = of_find_compatible_node(NULL, NULL, compatible);
-+	if (!node)
-+		return -EINVAL; /* broken DT? */
-+
-+	if (rkvdec->dev->of_node != node) {
-+		dev_info(rkvdec->dev, "missing multi-core support, ignoring this instance\n");
-+		return -ENODEV;
-+	}
-+
-+	return 0;
-+}
-+
-+static int rkvdec2_probe(struct platform_device *pdev)
-+{
-+	struct rkvdec2_dev *rkvdec;
-+	unsigned int i;
-+	int ret, irq;
-+
-+	rkvdec = devm_kzalloc(&pdev->dev, sizeof(*rkvdec), GFP_KERNEL);
-+	if (!rkvdec)
-+		return -ENOMEM;
-+
-+	platform_set_drvdata(pdev, rkvdec);
-+	rkvdec->dev = &pdev->dev;
-+
-+	ret = rkvdec2_disable_multicore(rkvdec);
-+	if (ret)
-+		return ret;
-+
-+	mutex_init(&rkvdec->vdev_lock);
-+	INIT_DELAYED_WORK(&rkvdec->watchdog_work, rkvdec2_watchdog_func);
-+
-+	rkvdec->clocks = devm_kcalloc(&pdev->dev, ARRAY_SIZE(rkvdec2_clk_names),
-+				      sizeof(*rkvdec->clocks), GFP_KERNEL);
-+	if (!rkvdec->clocks)
-+		return -ENOMEM;
-+
-+	for (i = 0; i < ARRAY_SIZE(rkvdec2_clk_names); i++)
-+		rkvdec->clocks[i].id = rkvdec2_clk_names[i];
-+
-+	ret = devm_clk_bulk_get(&pdev->dev, ARRAY_SIZE(rkvdec2_clk_names),
-+				rkvdec->clocks);
-+	if (ret)
-+		return ret;
-+
-+	rkvdec->regs = devm_platform_ioremap_resource_byname(pdev, "function");
-+	if (IS_ERR(rkvdec->regs))
-+		return PTR_ERR(rkvdec->regs);
-+
-+	/*
-+	 * Without IOMMU support, keep DMA in the lower 32 bits.
-+	 */
-+	ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
-+	if (ret) {
-+		dev_err(&pdev->dev, "Could not set DMA coherent mask.\n");
-+		return ret;
-+	}
-+
-+	vb2_dma_contig_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));
-+
-+	irq = platform_get_irq(pdev, 0);
-+	if (irq <= 0)
-+		return -ENXIO;
-+
-+	ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
-+					rkvdec2_irq_handler, IRQF_ONESHOT,
-+					dev_name(&pdev->dev), rkvdec);
-+	if (ret) {
-+		dev_err(&pdev->dev, "Could not request vdec2 IRQ\n");
-+		return ret;
-+	}
-+
-+	rkvdec->sram_pool = of_gen_pool_get(pdev->dev.of_node, "sram", 0);
-+	if (!rkvdec->sram_pool)
-+		dev_info(&pdev->dev, "No sram node, RCB will be stored in RAM\n");
-+
-+	pm_runtime_set_autosuspend_delay(&pdev->dev, 100);
-+	pm_runtime_use_autosuspend(&pdev->dev);
-+	pm_runtime_enable(&pdev->dev);
-+
-+	ret = rkvdec2_v4l2_init(rkvdec);
-+	if (ret)
-+		goto err_disable_runtime_pm;
-+
-+	return 0;
-+
-+err_disable_runtime_pm:
-+	pm_runtime_dont_use_autosuspend(&pdev->dev);
-+	pm_runtime_disable(&pdev->dev);
-+
-+	if (rkvdec->sram_pool)
-+		gen_pool_destroy(rkvdec->sram_pool);
-+
-+	return ret;
-+}
-+
-+static void rkvdec2_remove(struct platform_device *pdev)
-+{
-+	struct rkvdec2_dev *rkvdec = platform_get_drvdata(pdev);
-+
-+	cancel_delayed_work_sync(&rkvdec->watchdog_work);
-+
-+	rkvdec2_v4l2_cleanup(rkvdec);
-+	pm_runtime_disable(&pdev->dev);
-+	pm_runtime_dont_use_autosuspend(&pdev->dev);
-+
-+	if (rkvdec->sram_pool)
-+		gen_pool_destroy(rkvdec->sram_pool);
-+}
-+
-+#ifdef CONFIG_PM
-+static int rkvdec2_runtime_resume(struct device *dev)
-+{
-+	struct rkvdec2_dev *rkvdec = dev_get_drvdata(dev);
-+
-+	return clk_bulk_prepare_enable(ARRAY_SIZE(rkvdec2_clk_names),
-+				       rkvdec->clocks);
-+}
-+
-+static int rkvdec2_runtime_suspend(struct device *dev)
-+{
-+	struct rkvdec2_dev *rkvdec = dev_get_drvdata(dev);
-+
-+	clk_bulk_disable_unprepare(ARRAY_SIZE(rkvdec2_clk_names),
-+				   rkvdec->clocks);
-+	return 0;
-+}
-+#endif
-+
-+static const struct dev_pm_ops rkvdec2_pm_ops = {
-+	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
-+				pm_runtime_force_resume)
-+	SET_RUNTIME_PM_OPS(rkvdec2_runtime_suspend, rkvdec2_runtime_resume, NULL)
-+};
-+
-+static struct platform_driver rkvdec2_driver = {
-+	.probe = rkvdec2_probe,
-+	.remove_new = rkvdec2_remove,
-+	.driver = {
-+		   .name = "rkvdec2",
-+		   .of_match_table = of_rkvdec2_match,
-+		   .pm = &rkvdec2_pm_ops,
-+	},
-+};
-+module_platform_driver(rkvdec2_driver);
-+
-+MODULE_AUTHOR("Detlev Casanova <detlev.casanova@collabora.com>");
-+MODULE_DESCRIPTION("Rockchip Video Decoder 2 driver");
-+MODULE_LICENSE("GPL");
-diff --git a/drivers/media/platform/rockchip/rkvdec2/rkvdec2.h b/drivers/media/platform/rockchip/rkvdec2/rkvdec2.h
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/drivers/media/platform/rockchip/rkvdec2/rkvdec2.h
-@@ -0,0 +1,130 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Rockchip Video Decoder 2 driver
-+ *
-+ * Copyright (C) 2024 Collabora, Ltd.
-+ *  Detlev Casanova <detlev.casanova@collabora.com>
-+ *
-+ * Based on rkvdec driver by Boris Brezillon <boris.brezillon@collabora.com>
-+ */
-+#ifndef RKVDEC_H_
-+#define RKVDEC_H_
-+
-+#include <linux/platform_device.h>
-+#include <linux/videodev2.h>
-+#include <linux/wait.h>
-+#include <linux/clk.h>
-+#include <linux/dma-mapping.h>
-+
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-ioctl.h>
-+#include <media/videobuf2-core.h>
-+#include <media/videobuf2-dma-contig.h>
-+
-+#include "rkvdec2-regs.h"
-+
-+#define RKVDEC2_RCB_COUNT	10
-+
-+struct rkvdec2_ctx;
-+
-+enum rkvdec2_alloc_type {
-+	RKVDEC2_ALLOC_SRAM,
-+	RKVDEC2_ALLOC_DMA,
-+};
-+
-+struct rkvdec2_aux_buf {
-+	void *cpu;
-+	dma_addr_t dma;
-+	size_t size;
-+	enum rkvdec2_alloc_type type;
-+};
-+
-+struct rkvdec2_ctrl_desc {
-+	struct v4l2_ctrl_config cfg;
-+};
-+
-+struct rkvdec2_ctrls {
-+	const struct rkvdec2_ctrl_desc *ctrls;
-+	unsigned int num_ctrls;
-+};
-+
-+struct rkvdec2_run {
-+	struct {
-+		struct vb2_v4l2_buffer *src;
-+		struct vb2_v4l2_buffer *dst;
-+	} bufs;
-+};
-+
-+struct rkvdec2_decoded_buffer {
-+	/* Must be the first field in this struct. */
-+	struct v4l2_m2m_buffer base;
-+};
-+
-+static inline struct rkvdec2_decoded_buffer *
-+vb2_to_rkvdec2_decoded_buf(struct vb2_buffer *buf)
-+{
-+	return container_of(buf, struct rkvdec2_decoded_buffer,
-+			    base.vb.vb2_buf);
-+}
-+
-+struct rkvdec2_coded_fmt_ops {
-+	int (*adjust_fmt)(struct rkvdec2_ctx *ctx,
-+			  struct v4l2_format *f);
-+	int (*start)(struct rkvdec2_ctx *ctx);
-+	void (*stop)(struct rkvdec2_ctx *ctx);
-+	int (*run)(struct rkvdec2_ctx *ctx);
-+	void (*done)(struct rkvdec2_ctx *ctx, struct vb2_v4l2_buffer *src_buf,
-+		     struct vb2_v4l2_buffer *dst_buf,
-+		     enum vb2_buffer_state result);
-+	int (*try_ctrl)(struct rkvdec2_ctx *ctx, struct v4l2_ctrl *ctrl);
-+};
-+
-+struct rkvdec2_coded_fmt_desc {
-+	u32 fourcc;
-+	struct v4l2_frmsize_stepwise frmsize;
-+	const struct rkvdec2_ctrls *ctrls;
-+	const struct rkvdec2_coded_fmt_ops *ops;
-+	unsigned int num_decoded_fmts;
-+	const u32 *decoded_fmts;
-+	u32 subsystem_flags;
-+};
-+
-+struct rkvdec2_dev {
-+	struct v4l2_device v4l2_dev;
-+	struct media_device mdev;
-+	struct video_device vdev;
-+	struct v4l2_m2m_dev *m2m_dev;
-+	struct device *dev;
-+	struct clk_bulk_data *clocks;
-+	void __iomem *regs;
-+	struct gen_pool *sram_pool;
-+	struct mutex vdev_lock; /* serializes ioctls */
-+	struct delayed_work watchdog_work;
-+};
-+
-+struct rkvdec2_ctx {
-+	struct v4l2_fh fh;
-+	struct v4l2_format coded_fmt;
-+	struct v4l2_format decoded_fmt;
-+	const struct rkvdec2_coded_fmt_desc *coded_fmt_desc;
-+	struct v4l2_ctrl_handler ctrl_hdl;
-+	struct rkvdec2_dev *dev;
-+	struct rkvdec2_aux_buf rcb_bufs[RKVDEC2_RCB_COUNT];
-+
-+	u32 colmv_offset;
-+
-+	void *priv;
-+};
-+
-+static inline struct rkvdec2_ctx *fh_to_rkvdec2_ctx(struct v4l2_fh *fh)
-+{
-+	return container_of(fh, struct rkvdec2_ctx, fh);
-+}
-+
-+void rkvdec2_run_preamble(struct rkvdec2_ctx *ctx, struct rkvdec2_run *run);
-+void rkvdec2_run_postamble(struct rkvdec2_ctx *ctx, struct rkvdec2_run *run);
-+
-+extern const struct rkvdec2_coded_fmt_ops rkvdec2_h264_fmt_ops;
-+
-+#endif /* RKVDEC_H_ */
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Detlev Casanova <detlev.casanova@collabora.com>
-Date: Fri, 14 Jun 2024 19:53:40 -0400
-Subject: media: dt-bindings: rockchip: Document RK3588 Video Decoder bindings
-
-Document the Rockchip RK3588 Video Decoder bindings.
-
-Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>
----
- Documentation/devicetree/bindings/media/rockchip,vdec.yaml | 73 +++++++++-
- 1 file changed, 72 insertions(+), 1 deletion(-)
-
-diff --git a/Documentation/devicetree/bindings/media/rockchip,vdec.yaml b/Documentation/devicetree/bindings/media/rockchip,vdec.yaml
-index 111111111111..222222222222 100644
---- a/Documentation/devicetree/bindings/media/rockchip,vdec.yaml
-+++ b/Documentation/devicetree/bindings/media/rockchip,vdec.yaml
-@@ -17,6 +17,7 @@ properties:
-   compatible:
-     oneOf:
-       - const: rockchip,rk3399-vdec
-+      - const: rockchip,rk3588-vdec
-       - items:
-           - enum:
-               - rockchip,rk3228-vdec
-@@ -24,35 +25,72 @@ properties:
-           - const: rockchip,rk3399-vdec
- 
-   reg:
--    maxItems: 1
-+    minItems: 1
-+    items:
-+      - description: The link table configuration registers base
-+      - description: The function configuration registers base
-+      - description: The cache configuration registers base
-+
-+  reg-names:
-+    items:
-+      - const: link
-+      - const: function
-+      - const: cache
- 
-   interrupts:
-     maxItems: 1
- 
-   clocks:
-+    minItems: 4
-     items:
-       - description: The Video Decoder AXI interface clock
-       - description: The Video Decoder AHB interface clock
-       - description: The Video Decoded CABAC clock
-       - description: The Video Decoder core clock
-+      - description: The Video decoder HEVC CABAC clock
- 
-   clock-names:
-+    minItems: 4
-     items:
-       - const: axi
-       - const: ahb
-       - const: cabac
-       - const: core
-+      - const: hevc_cabac
- 
-   assigned-clocks: true
- 
-   assigned-clock-rates: true
- 
-+  resets:
-+    items:
-+      - description: The Video Decoder AXI interface reset
-+      - description: The Video Decoder AHB interface reset
-+      - description: The Video Decoded CABAC reset
-+      - description: The Video Decoder core reset
-+      - description: The Video decoder HEVC CABAC reset
-+
-+  reset-names:
-+    items:
-+      - const: axi
-+      - const: ahb
-+      - const: cabac
-+      - const: core
-+      - const: hevc_cabac
-+
-   power-domains:
-     maxItems: 1
- 
-   iommus:
-     maxItems: 1
- 
-+  sram:
-+    $ref: /schemas/types.yaml#/definitions/phandle
-+    description: |
-+      phandle to a reserved on-chip SRAM regions.
-+      Some SoCs, like rk3588 provide on-chip SRAM to store temporary
-+      buffers during decoding.
-+
- required:
-   - compatible
-   - reg
-@@ -61,6 +99,39 @@ required:
-   - clock-names
-   - power-domains
- 
-+allOf:
-+  - if:
-+      properties:
-+        compatible:
-+          contains:
-+            const: rockchip,rk3588-vdec
-+    then:
-+      properties:
-+        reg:
-+          minItems: 3
-+        reg-names:
-+          minItems: 3
-+        clocks:
-+          minItems: 5
-+        clock-names:
-+          minItems: 5
-+        resets:
-+          minItems: 5
-+        reset-names:
-+          minItems: 5
-+    else:
-+      properties:
-+        reg:
-+          maxItems: 1
-+        reg-names: false
-+        clocks:
-+          maxItems: 4
-+        clock-names:
-+          maxItems: 4
-+        resets: false
-+        reset-names: false
-+        sram: false
-+
- additionalProperties: false
- 
- examples:
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Detlev Casanova <detlev.casanova@collabora.com>
-Date: Fri, 14 Jun 2024 19:56:19 -0400
-Subject: arm64: dts: rockchip: Add rkvdec2 Video Decoder on rk3588(s)
-
-Add the rkvdec2 Video Decoder to the RK3588s devicetree.
-
-Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>
----
- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 48 ++++++++++
- 1 file changed, 48 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-@@ -1224,6 +1224,44 @@ vepu121_3_mmu: iommu@fdbac800 {
- 		#iommu-cells = <0>;
- 	};
- 
-+	vdec0: video-decoder@fdc38000 {
-+		compatible = "rockchip,rk3588-vdec";
-+		reg = <0x0 0xfdc38000 0x0 0x100>, <0x0 0xfdc38100 0x0 0x500>, <0x0 0xfdc38600 0x0 0x100>;
-+		reg-names = "link", "function", "cache";
-+		interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH 0>;
-+		clocks = <&cru ACLK_RKVDEC0>, <&cru HCLK_RKVDEC0>, <&cru CLK_RKVDEC0_CA>,
-+			 <&cru CLK_RKVDEC0_CORE>, <&cru CLK_RKVDEC0_HEVC_CA>;
-+		clock-names = "axi", "ahb", "cabac", "core", "hevc_cabac";
-+		assigned-clocks = <&cru ACLK_RKVDEC0>, <&cru CLK_RKVDEC0_CORE>,
-+				  <&cru CLK_RKVDEC0_CA>, <&cru CLK_RKVDEC0_HEVC_CA>;
-+		assigned-clock-rates = <800000000>, <600000000>,
-+				       <600000000>, <1000000000>;
-+		resets = <&cru SRST_A_RKVDEC0>, <&cru SRST_H_RKVDEC0>, <&cru SRST_RKVDEC0_CA>,
-+			 <&cru SRST_RKVDEC0_CORE>, <&cru SRST_RKVDEC0_HEVC_CA>;
-+		reset-names = "axi", "ahb", "cabac", "core", "hevc_cabac";
-+		power-domains = <&power RK3588_PD_RKVDEC0>;
-+		sram = <&vdec0_sram>;
-+	};
-+
-+	vdec1: video-decoder@fdc40000 {
-+		compatible = "rockchip,rk3588-vdec";
-+		reg = <0x0 0xfdc40000 0x0 0x100>, <0x0 0xfdc40100 0x0 0x500>, <0x0 0xfdc40600 0x0 0x100>;
-+		reg-names = "link", "function", "cache";
-+		interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH 0>;
-+		clocks = <&cru ACLK_RKVDEC1>, <&cru HCLK_RKVDEC1>, <&cru CLK_RKVDEC1_CA>,
-+			 <&cru CLK_RKVDEC1_CORE>, <&cru CLK_RKVDEC1_HEVC_CA>;
-+		clock-names = "axi", "ahb", "cabac", "core", "hevc_cabac";
-+		assigned-clocks = <&cru ACLK_RKVDEC1>, <&cru CLK_RKVDEC1_CORE>,
-+				  <&cru CLK_RKVDEC1_CA>, <&cru CLK_RKVDEC1_HEVC_CA>;
-+		assigned-clock-rates = <800000000>, <600000000>,
-+				       <600000000>, <1000000000>;
-+		resets = <&cru SRST_A_RKVDEC1>, <&cru SRST_H_RKVDEC1>, <&cru SRST_RKVDEC1_CA>,
-+			 <&cru SRST_RKVDEC1_CORE>, <&cru SRST_RKVDEC1_HEVC_CA>;
-+		reset-names = "axi", "ahb", "cabac", "core", "hevc_cabac";
-+		power-domains = <&power RK3588_PD_RKVDEC1>;
-+		sram = <&vdec1_sram>;
-+	};
-+
- 	av1d: video-codec@fdc70000 {
- 		compatible = "rockchip,rk3588-av1-vpu";
- 		reg = <0x0 0xfdc70000 0x0 0x800>;
-@@ -2848,6 +2886,16 @@ system_sram2: sram@ff001000 {
- 		ranges = <0x0 0x0 0xff001000 0xef000>;
- 		#address-cells = <1>;
- 		#size-cells = <1>;
-+
-+		vdec0_sram: codec-sram@0 {
-+			reg = <0x0 0x78000>;
-+			pool;
-+		};
-+
-+		vdec1_sram: codec-sram@78000 {
-+			reg = <0x78000 0x77000>;
-+			pool;
-+		};
- 	};
- 
- 	pinctrl: pinctrl {
--- 
-Armbian
-
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0027-RK3588-Add-rkvdec2-Support-v3.patch b/patch/kernel/archive/rockchip-rk3588-6.11/0027-RK3588-Add-rkvdec2-Support-v3.patch
new file mode 120000
index 000000000000..23f230de04ea
--- /dev/null
+++ b/patch/kernel/archive/rockchip-rk3588-6.11/0027-RK3588-Add-rkvdec2-Support-v3.patch
@@ -0,0 +1 @@
+../rockchip64-6.11/media-0001-Add-rkvdec2-Support-v3.patch
\ No newline at end of file

From 345cf3466aa079167989f5334104ab1cf1b88fd7 Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Mon, 4 Nov 2024 15:48:57 +0800
Subject: [PATCH 043/107] rkvdec2: update reg in devicetree according to
 mailing list

---
 .../media-0001-Add-rkvdec2-Support-v3.patch        | 14 ++++++++------
 .../rk356x-add-rkvdec2-support.patch               |  5 +++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/patch/kernel/archive/rockchip64-6.11/media-0001-Add-rkvdec2-Support-v3.patch b/patch/kernel/archive/rockchip64-6.11/media-0001-Add-rkvdec2-Support-v3.patch
index f302aec11e9b..e5b46b474a06 100644
--- a/patch/kernel/archive/rockchip64-6.11/media-0001-Add-rkvdec2-Support-v3.patch
+++ b/patch/kernel/archive/rockchip64-6.11/media-0001-Add-rkvdec2-Support-v3.patch
@@ -3420,7 +3420,7 @@ index 000000000000..111111111111
 +	if (ret)
 +		return ret;
 +
-+	rkvdec->regs = devm_platform_ioremap_resource(pdev, 0);
++	rkvdec->regs = devm_platform_ioremap_resource_byname(pdev, "function");
 +	if (IS_ERR(rkvdec->regs))
 +		return PTR_ERR(rkvdec->regs);
 +
@@ -3696,14 +3696,15 @@ index 111111111111..222222222222 100644
  	};
  
  	pinctrl: pinctrl {
-@@ -2794,6 +2804,44 @@ gpio4: gpio@fec50000 {
+@@ -2794,6 +2804,46 @@ gpio4: gpio@fec50000 {
  			#interrupt-cells = <2>;
  		};
  	};
 +
-+	vdec0: video-decoder@fdc38100 {
++	vdec0: video-decoder@fdc38000 {
 +		compatible = "rockchip,rk3588-vdec";
-+		reg = <0x0 0xfdc38100 0x0 0x500>;
++		reg = <0x0 0xfdc38000 0x0 0x100>, <0x0 0xfdc38100 0x0 0x500>, <0x0 0xfdc38600 0x0 0x100>;
++		reg-names = "link", "function", "cache";
 +		interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH 0>;
 +		clocks = <&cru ACLK_RKVDEC0>, <&cru HCLK_RKVDEC0>, <&cru CLK_RKVDEC0_CA>,
 +			 <&cru CLK_RKVDEC0_CORE>, <&cru CLK_RKVDEC0_HEVC_CA>;
@@ -3720,9 +3721,10 @@ index 111111111111..222222222222 100644
 +		sram = <&vdec0_sram>;
 +	};
 +
-+	vdec1: video-decoder@fdc40100 {
++	vdec1: video-decoder@fdc40000 {
 +		compatible = "rockchip,rk3588-vdec";
-+		reg = <0x0 0xfdc40100 0x0 0x500>;
++		reg = <0x0 0xfdc40000 0x0 0x100>, <0x0 0xfdc40100 0x0 0x500>, <0x0 0xfdc40600 0x0 0x100>;
++		reg-names = "link", "function", "cache";
 +		interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH 0>;
 +		clocks = <&cru ACLK_RKVDEC1>, <&cru HCLK_RKVDEC1>, <&cru CLK_RKVDEC1_CA>,
 +			 <&cru CLK_RKVDEC1_CORE>, <&cru CLK_RKVDEC1_HEVC_CA>;
diff --git a/patch/kernel/archive/rockchip64-6.11/rk356x-add-rkvdec2-support.patch b/patch/kernel/archive/rockchip64-6.11/rk356x-add-rkvdec2-support.patch
index a7708f16ec69..56ac9bee41f2 100644
--- a/patch/kernel/archive/rockchip64-6.11/rk356x-add-rkvdec2-support.patch
+++ b/patch/kernel/archive/rockchip64-6.11/rk356x-add-rkvdec2-support.patch
@@ -45,13 +45,14 @@ index 111111111111..222222222222 100644
  		reg = <0x0 0xfdea0000 0x0 0x800>;
  		interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
  		interrupt-names = "vdpu";
-@@ -686,6 +699,25 @@ vepu_mmu: iommu@fdee0800 {
+@@ -686,6 +699,26 @@ vepu_mmu: iommu@fdee0800 {
  		#iommu-cells = <0>;
  	};
  
 +	vdec: video-codec@fdf80200 {
 +		compatible = "rockchip,rk3588-vdec";
-+		reg = <0x0 0xfdf80200 0x0 0x500>;
++		reg = <0x0 0xfdf80100 0x0 0x100>, <0x0 0xfdf80200 0x0 0x500>, <0x0 0xfdf80700 0x0 0x100>;
++		reg-names = "link", "function", "cache";
 +		interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH 0>;
 +		clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>, <&cru CLK_RKVDEC_CA>,
 +			 <&cru CLK_RKVDEC_CORE>, <&cru CLK_RKVDEC_HEVC_CA>;

From 49269d68f7d5a3fc027218fbe86f27b0ba6e45f1 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Mon, 4 Nov 2024 18:43:03 +0100
Subject: [PATCH 044/107] Revert "Update odroidxu4-current to 6.6.59"

This reverts commit d7a6047ceae60bca9413b97d7c57240d50633a96.
---
 .../odroidxu4-6.6/patch-6.6.54-55.patch       | 19054 ----------------
 .../odroidxu4-6.6/patch-6.6.55-56.patch       |   101 -
 .../odroidxu4-6.6/patch-6.6.56-57.patch       | 16701 --------------
 .../odroidxu4-6.6/patch-6.6.57-58.patch       |  4422 ----
 .../odroidxu4-6.6/patch-6.6.58-59.patch       | 10051 --------
 5 files changed, 50329 deletions(-)
 delete mode 100644 patch/kernel/archive/odroidxu4-6.6/patch-6.6.54-55.patch
 delete mode 100644 patch/kernel/archive/odroidxu4-6.6/patch-6.6.55-56.patch
 delete mode 100644 patch/kernel/archive/odroidxu4-6.6/patch-6.6.56-57.patch
 delete mode 100644 patch/kernel/archive/odroidxu4-6.6/patch-6.6.57-58.patch
 delete mode 100644 patch/kernel/archive/odroidxu4-6.6/patch-6.6.58-59.patch

diff --git a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.54-55.patch b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.54-55.patch
deleted file mode 100644
index e5fd421f282e..000000000000
--- a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.54-55.patch
+++ /dev/null
@@ -1,19054 +0,0 @@
-diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index a7fe1138973611..d83a3f47e20074 100644
---- a/Documentation/admin-guide/kernel-parameters.txt
-+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -4639,6 +4639,16 @@
- 	printk.time=	Show timing data prefixed to each printk message line
- 			Format: <bool>  (1/Y/y=enable, 0/N/n=disable)
- 
-+	proc_mem.force_override= [KNL]
-+			Format: {always | ptrace | never}
-+			Traditionally /proc/pid/mem allows memory permissions to be
-+			overridden without restrictions. This option may be set to
-+			restrict that. Can be one of:
-+			- 'always': traditional behavior always allows mem overrides.
-+			- 'ptrace': only allow mem overrides for active ptracers.
-+			- 'never':  never allow mem overrides.
-+			If not specified, default is the CONFIG_PROC_MEM_* choice.
-+
- 	processor.max_cstate=	[HW,ACPI]
- 			Limit processor to maximum C-state
- 			max_cstate=9 overrides any DMI blacklist limit.
-diff --git a/Documentation/arch/arm64/silicon-errata.rst b/Documentation/arch/arm64/silicon-errata.rst
-index 3084f5cf5e40db..3cf806733083c7 100644
---- a/Documentation/arch/arm64/silicon-errata.rst
-+++ b/Documentation/arch/arm64/silicon-errata.rst
-@@ -141,6 +141,8 @@ stable kernels.
- +----------------+-----------------+-----------------+-----------------------------+
- | ARM            | Cortex-A715     | #2645198        | ARM64_ERRATUM_2645198       |
- +----------------+-----------------+-----------------+-----------------------------+
-+| ARM            | Cortex-A715     | #3456084        | ARM64_ERRATUM_3194386       |
-++----------------+-----------------+-----------------+-----------------------------+
- | ARM            | Cortex-A720     | #3456091        | ARM64_ERRATUM_3194386       |
- +----------------+-----------------+-----------------+-----------------------------+
- | ARM            | Cortex-A725     | #3456106        | ARM64_ERRATUM_3194386       |
-@@ -177,6 +179,8 @@ stable kernels.
- +----------------+-----------------+-----------------+-----------------------------+
- | ARM            | Neoverse-N2     | #3324339        | ARM64_ERRATUM_3194386       |
- +----------------+-----------------+-----------------+-----------------------------+
-+| ARM            | Neoverse-N3     | #3456111        | ARM64_ERRATUM_3194386       |
-++----------------+-----------------+-----------------+-----------------------------+
- | ARM            | Neoverse-V1     | #3324341        | ARM64_ERRATUM_3194386       |
- +----------------+-----------------+-----------------+-----------------------------+
- | ARM            | Neoverse-V2     | #3324336        | ARM64_ERRATUM_3194386       |
-@@ -280,3 +284,5 @@ stable kernels.
- +----------------+-----------------+-----------------+-----------------------------+
- | Microsoft      | Azure Cobalt 100| #2253138        | ARM64_ERRATUM_2253138       |
- +----------------+-----------------+-----------------+-----------------------------+
-+| Microsoft      | Azure Cobalt 100| #3324339        | ARM64_ERRATUM_3194386       |
-++----------------+-----------------+-----------------+-----------------------------+
-diff --git a/Documentation/devicetree/bindings/net/xlnx,axi-ethernet.yaml b/Documentation/devicetree/bindings/net/xlnx,axi-ethernet.yaml
-index 1d33d80af11c3c..652d696bc9e90b 100644
---- a/Documentation/devicetree/bindings/net/xlnx,axi-ethernet.yaml
-+++ b/Documentation/devicetree/bindings/net/xlnx,axi-ethernet.yaml
-@@ -34,6 +34,7 @@ properties:
-       and length of the AXI DMA controller IO space, unless
-       axistream-connected is specified, in which case the reg
-       attribute of the node referenced by it is used.
-+    minItems: 1
-     maxItems: 2
- 
-   interrupts:
-@@ -165,7 +166,7 @@ examples:
-         clock-names = "s_axi_lite_clk", "axis_clk", "ref_clk", "mgt_clk";
-         clocks = <&axi_clk>, <&axi_clk>, <&pl_enet_ref_clk>, <&mgt_clk>;
-         phy-mode = "mii";
--        reg = <0x00 0x40000000 0x00 0x40000>;
-+        reg = <0x40000000 0x40000>;
-         xlnx,rxcsum = <0x2>;
-         xlnx,rxmem = <0x800>;
-         xlnx,txcsum = <0x2>;
-diff --git a/Makefile b/Makefile
-index 1e382bacd8eac0..6e297758842d9c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- VERSION = 6
- PATCHLEVEL = 6
--SUBLEVEL = 54
-+SUBLEVEL = 55
- EXTRAVERSION =
- NAME = Hurr durr I'ma ninja sloth
- 
-diff --git a/arch/arm/crypto/aes-ce-glue.c b/arch/arm/crypto/aes-ce-glue.c
-index b668c97663ec0c..f5b66f4cf45d96 100644
---- a/arch/arm/crypto/aes-ce-glue.c
-+++ b/arch/arm/crypto/aes-ce-glue.c
-@@ -711,7 +711,7 @@ static int __init aes_init(void)
- 		algname = aes_algs[i].base.cra_name + 2;
- 		drvname = aes_algs[i].base.cra_driver_name + 2;
- 		basename = aes_algs[i].base.cra_driver_name;
--		simd = simd_skcipher_create_compat(algname, drvname, basename);
-+		simd = simd_skcipher_create_compat(aes_algs + i, algname, drvname, basename);
- 		err = PTR_ERR(simd);
- 		if (IS_ERR(simd))
- 			goto unregister_simds;
-diff --git a/arch/arm/crypto/aes-neonbs-glue.c b/arch/arm/crypto/aes-neonbs-glue.c
-index f00f042ef3570e..0ca94b90bc4ec5 100644
---- a/arch/arm/crypto/aes-neonbs-glue.c
-+++ b/arch/arm/crypto/aes-neonbs-glue.c
-@@ -539,7 +539,7 @@ static int __init aes_init(void)
- 		algname = aes_algs[i].base.cra_name + 2;
- 		drvname = aes_algs[i].base.cra_driver_name + 2;
- 		basename = aes_algs[i].base.cra_driver_name;
--		simd = simd_skcipher_create_compat(algname, drvname, basename);
-+		simd = simd_skcipher_create_compat(aes_algs + i, algname, drvname, basename);
- 		err = PTR_ERR(simd);
- 		if (IS_ERR(simd))
- 			goto unregister_simds;
-diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 5ea7b331967108..eab866d6903347 100644
---- a/arch/arm64/Kconfig
-+++ b/arch/arm64/Kconfig
-@@ -191,7 +191,8 @@ config ARM64
- 	select HAVE_DMA_CONTIGUOUS
- 	select HAVE_DYNAMIC_FTRACE
- 	select HAVE_DYNAMIC_FTRACE_WITH_ARGS \
--		if $(cc-option,-fpatchable-function-entry=2)
-+		if (GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS || \
-+		    CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS)
- 	select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS \
- 		if DYNAMIC_FTRACE_WITH_ARGS && DYNAMIC_FTRACE_WITH_CALL_OPS
- 	select HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS \
-@@ -262,12 +263,10 @@ config CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS
- 	def_bool CC_IS_CLANG
- 	# https://github.com/ClangBuiltLinux/linux/issues/1507
- 	depends on AS_IS_GNU || (AS_IS_LLVM && (LD_IS_LLD || LD_VERSION >= 23600))
--	select HAVE_DYNAMIC_FTRACE_WITH_ARGS
- 
- config GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS
- 	def_bool CC_IS_GCC
- 	depends on $(cc-option,-fpatchable-function-entry=2)
--	select HAVE_DYNAMIC_FTRACE_WITH_ARGS
- 
- config 64BIT
- 	def_bool y
-@@ -1080,6 +1079,7 @@ config ARM64_ERRATUM_3194386
- 	  * ARM Cortex-A78C erratum 3324346
- 	  * ARM Cortex-A78C erratum 3324347
- 	  * ARM Cortex-A710 erratam 3324338
-+	  * ARM Cortex-A715 errartum 3456084
- 	  * ARM Cortex-A720 erratum 3456091
- 	  * ARM Cortex-A725 erratum 3456106
- 	  * ARM Cortex-X1 erratum 3324344
-@@ -1090,6 +1090,7 @@ config ARM64_ERRATUM_3194386
- 	  * ARM Cortex-X925 erratum 3324334
- 	  * ARM Neoverse-N1 erratum 3324349
- 	  * ARM Neoverse N2 erratum 3324339
-+	  * ARM Neoverse-N3 erratum 3456111
- 	  * ARM Neoverse-V1 erratum 3324341
- 	  * ARM Neoverse V2 erratum 3324336
- 	  * ARM Neoverse-V3 erratum 3312417
-diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h
-index 5a7dfeb8e8eb55..488f8e75134959 100644
---- a/arch/arm64/include/asm/cputype.h
-+++ b/arch/arm64/include/asm/cputype.h
-@@ -94,6 +94,7 @@
- #define ARM_CPU_PART_NEOVERSE_V3	0xD84
- #define ARM_CPU_PART_CORTEX_X925	0xD85
- #define ARM_CPU_PART_CORTEX_A725	0xD87
-+#define ARM_CPU_PART_NEOVERSE_N3	0xD8E
- 
- #define APM_CPU_PART_XGENE		0x000
- #define APM_CPU_VAR_POTENZA		0x00
-@@ -176,6 +177,7 @@
- #define MIDR_NEOVERSE_V3 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_V3)
- #define MIDR_CORTEX_X925 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X925)
- #define MIDR_CORTEX_A725 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A725)
-+#define MIDR_NEOVERSE_N3 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N3)
- #define MIDR_THUNDERX	MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX)
- #define MIDR_THUNDERX_81XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_81XX)
- #define MIDR_THUNDERX_83XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_83XX)
-diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
-index f8d94902fbb59c..463b48d0f92500 100644
---- a/arch/arm64/kernel/cpu_errata.c
-+++ b/arch/arm64/kernel/cpu_errata.c
-@@ -455,6 +455,7 @@ static const struct midr_range erratum_spec_ssbs_list[] = {
- 	MIDR_ALL_VERSIONS(MIDR_CORTEX_A78),
- 	MIDR_ALL_VERSIONS(MIDR_CORTEX_A78C),
- 	MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
-+	MIDR_ALL_VERSIONS(MIDR_CORTEX_A715),
- 	MIDR_ALL_VERSIONS(MIDR_CORTEX_A720),
- 	MIDR_ALL_VERSIONS(MIDR_CORTEX_A725),
- 	MIDR_ALL_VERSIONS(MIDR_CORTEX_X1),
-@@ -463,8 +464,10 @@ static const struct midr_range erratum_spec_ssbs_list[] = {
- 	MIDR_ALL_VERSIONS(MIDR_CORTEX_X3),
- 	MIDR_ALL_VERSIONS(MIDR_CORTEX_X4),
- 	MIDR_ALL_VERSIONS(MIDR_CORTEX_X925),
-+	MIDR_ALL_VERSIONS(MIDR_MICROSOFT_AZURE_COBALT_100),
- 	MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N1),
- 	MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N2),
-+	MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N3),
- 	MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V1),
- 	MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V2),
- 	MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3),
-diff --git a/arch/loongarch/configs/loongson3_defconfig b/arch/loongarch/configs/loongson3_defconfig
-index a3b52aaa83b336..e5f70642ed2062 100644
---- a/arch/loongarch/configs/loongson3_defconfig
-+++ b/arch/loongarch/configs/loongson3_defconfig
-@@ -83,7 +83,6 @@ CONFIG_ZPOOL=y
- CONFIG_ZSWAP=y
- CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y
- CONFIG_ZBUD=y
--CONFIG_Z3FOLD=y
- CONFIG_ZSMALLOC=m
- # CONFIG_COMPAT_BRK is not set
- CONFIG_MEMORY_HOTPLUG=y
-diff --git a/arch/parisc/include/asm/mman.h b/arch/parisc/include/asm/mman.h
-index 47c5a1991d1034..89b6beeda0b869 100644
---- a/arch/parisc/include/asm/mman.h
-+++ b/arch/parisc/include/asm/mman.h
-@@ -11,4 +11,18 @@ static inline bool arch_memory_deny_write_exec_supported(void)
- }
- #define arch_memory_deny_write_exec_supported arch_memory_deny_write_exec_supported
- 
-+static inline unsigned long arch_calc_vm_flag_bits(unsigned long flags)
-+{
-+	/*
-+	 * The stack on parisc grows upwards, so if userspace requests memory
-+	 * for a stack, mark it with VM_GROWSUP so that the stack expansion in
-+	 * the fault handler will work.
-+	 */
-+	if (flags & MAP_STACK)
-+		return VM_GROWSUP;
-+
-+	return 0;
-+}
-+#define arch_calc_vm_flag_bits(flags) arch_calc_vm_flag_bits(flags)
-+
- #endif /* __ASM_MMAN_H__ */
-diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
-index ab23e61a6f016a..ea57bcc21dc5fe 100644
---- a/arch/parisc/kernel/entry.S
-+++ b/arch/parisc/kernel/entry.S
-@@ -1051,8 +1051,7 @@ ENTRY_CFI(intr_save)		/* for os_hpmc */
- 	STREG           %r16, PT_ISR(%r29)
- 	STREG           %r17, PT_IOR(%r29)
- 
--#if 0 && defined(CONFIG_64BIT)
--	/* Revisit when we have 64-bit code above 4Gb */
-+#if defined(CONFIG_64BIT)
- 	b,n		intr_save2
- 
- skip_save_ior:
-@@ -1060,8 +1059,7 @@ skip_save_ior:
- 	 * need to adjust iasq/iaoq here in the same way we adjusted isr/ior
- 	 * above.
- 	 */
--	extrd,u,*	%r8,PSW_W_BIT,1,%r1
--	cmpib,COND(=),n	1,%r1,intr_save2
-+	bb,COND(>=),n	%r8,PSW_W_BIT,intr_save2
- 	LDREG		PT_IASQ0(%r29), %r16
- 	LDREG		PT_IAOQ0(%r29), %r17
- 	/* adjust iasq/iaoq */
-diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
-index 1f51aa9c8230cc..0fa81bf1466b15 100644
---- a/arch/parisc/kernel/syscall.S
-+++ b/arch/parisc/kernel/syscall.S
-@@ -243,10 +243,10 @@ linux_gateway_entry:
- 
- #ifdef CONFIG_64BIT
- 	ldil	L%sys_call_table, %r1
--	or,=	%r2,%r2,%r2
--	addil	L%(sys_call_table64-sys_call_table), %r1
-+	or,ev	%r2,%r2,%r2
-+	ldil	L%sys_call_table64, %r1
- 	ldo	R%sys_call_table(%r1), %r19
--	or,=	%r2,%r2,%r2
-+	or,ev	%r2,%r2,%r2
- 	ldo	R%sys_call_table64(%r1), %r19
- #else
- 	load32	sys_call_table, %r19
-@@ -379,10 +379,10 @@ tracesys_next:
- 	extrd,u	%r19,63,1,%r2			/* W hidden in bottom bit */
- 
- 	ldil	L%sys_call_table, %r1
--	or,=	%r2,%r2,%r2
--	addil	L%(sys_call_table64-sys_call_table), %r1
-+	or,ev	%r2,%r2,%r2
-+	ldil	L%sys_call_table64, %r1
- 	ldo	R%sys_call_table(%r1), %r19
--	or,=	%r2,%r2,%r2
-+	or,ev	%r2,%r2,%r2
- 	ldo	R%sys_call_table64(%r1), %r19
- #else
- 	load32	sys_call_table, %r19
-@@ -1327,6 +1327,8 @@ ENTRY(sys_call_table)
- END(sys_call_table)
- 
- #ifdef CONFIG_64BIT
-+#undef __SYSCALL_WITH_COMPAT
-+#define __SYSCALL_WITH_COMPAT(nr, native, compat)	__SYSCALL(nr, native)
- 	.align 8
- ENTRY(sys_call_table64)
- #include <asm/syscall_table_64.h>    /* 64-bit syscalls */
-diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
-index 6e7b9e8fd2251a..65e518dde2c2fe 100644
---- a/arch/powerpc/configs/ppc64_defconfig
-+++ b/arch/powerpc/configs/ppc64_defconfig
-@@ -81,7 +81,6 @@ CONFIG_MODULE_SIG_SHA512=y
- CONFIG_PARTITION_ADVANCED=y
- CONFIG_BINFMT_MISC=m
- CONFIG_ZSWAP=y
--CONFIG_Z3FOLD=y
- CONFIG_ZSMALLOC=y
- # CONFIG_SLAB_MERGE_DEFAULT is not set
- CONFIG_SLAB_FREELIST_RANDOM=y
-diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h
-index a585c8e538ff0f..939daf6b695ef1 100644
---- a/arch/powerpc/include/asm/vdso_datapage.h
-+++ b/arch/powerpc/include/asm/vdso_datapage.h
-@@ -111,6 +111,21 @@ extern struct vdso_arch_data *vdso_data;
- 	addi	\ptr, \ptr, (_vdso_datapage - 999b)@l
- .endm
- 
-+#include <asm/asm-offsets.h>
-+#include <asm/page.h>
-+
-+.macro get_realdatapage ptr scratch
-+	get_datapage \ptr
-+#ifdef CONFIG_TIME_NS
-+	lwz	\scratch, VDSO_CLOCKMODE_OFFSET(\ptr)
-+	xoris	\scratch, \scratch, VDSO_CLOCKMODE_TIMENS@h
-+	xori	\scratch, \scratch, VDSO_CLOCKMODE_TIMENS@l
-+	cntlzw	\scratch, \scratch
-+	rlwinm	\scratch, \scratch, PAGE_SHIFT - 5, 1 << PAGE_SHIFT
-+	add	\ptr, \ptr, \scratch
-+#endif
-+.endm
-+
- #endif /* __ASSEMBLY__ */
- 
- #endif /* __KERNEL__ */
-diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
-index 9f14d95b8b32fd..2affd30468bc4c 100644
---- a/arch/powerpc/kernel/asm-offsets.c
-+++ b/arch/powerpc/kernel/asm-offsets.c
-@@ -348,6 +348,8 @@ int main(void)
- #else
- 	OFFSET(CFG_SYSCALL_MAP32, vdso_arch_data, syscall_map);
- #endif
-+	OFFSET(VDSO_CLOCKMODE_OFFSET, vdso_arch_data, data[0].clock_mode);
-+	DEFINE(VDSO_CLOCKMODE_TIMENS, VDSO_CLOCKMODE_TIMENS);
- 
- #ifdef CONFIG_BUG
- 	DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));
-diff --git a/arch/powerpc/kernel/vdso/cacheflush.S b/arch/powerpc/kernel/vdso/cacheflush.S
-index 0085ae464dac9c..3b2479bd2f9a1d 100644
---- a/arch/powerpc/kernel/vdso/cacheflush.S
-+++ b/arch/powerpc/kernel/vdso/cacheflush.S
-@@ -30,7 +30,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE)
- #ifdef CONFIG_PPC64
- 	mflr	r12
-   .cfi_register lr,r12
--	get_datapage	r10
-+	get_realdatapage	r10, r11
- 	mtlr	r12
-   .cfi_restore	lr
- #endif
-diff --git a/arch/powerpc/kernel/vdso/datapage.S b/arch/powerpc/kernel/vdso/datapage.S
-index db8e167f01667e..2b19b6201a33a8 100644
---- a/arch/powerpc/kernel/vdso/datapage.S
-+++ b/arch/powerpc/kernel/vdso/datapage.S
-@@ -28,7 +28,7 @@ V_FUNCTION_BEGIN(__kernel_get_syscall_map)
- 	mflr	r12
-   .cfi_register lr,r12
- 	mr.	r4,r3
--	get_datapage	r3
-+	get_realdatapage	r3, r11
- 	mtlr	r12
- #ifdef __powerpc64__
- 	addi	r3,r3,CFG_SYSCALL_MAP64
-@@ -52,7 +52,7 @@ V_FUNCTION_BEGIN(__kernel_get_tbfreq)
-   .cfi_startproc
- 	mflr	r12
-   .cfi_register lr,r12
--	get_datapage	r3
-+	get_realdatapage	r3, r11
- #ifndef __powerpc64__
- 	lwz	r4,(CFG_TB_TICKS_PER_SEC + 4)(r3)
- #endif
-diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
-index 47f8eabd1bee31..9873b916b23704 100644
---- a/arch/powerpc/platforms/pseries/dlpar.c
-+++ b/arch/powerpc/platforms/pseries/dlpar.c
-@@ -334,23 +334,6 @@ int handle_dlpar_errorlog(struct pseries_hp_errorlog *hp_elog)
- {
- 	int rc;
- 
--	/* pseries error logs are in BE format, convert to cpu type */
--	switch (hp_elog->id_type) {
--	case PSERIES_HP_ELOG_ID_DRC_COUNT:
--		hp_elog->_drc_u.drc_count =
--				be32_to_cpu(hp_elog->_drc_u.drc_count);
--		break;
--	case PSERIES_HP_ELOG_ID_DRC_INDEX:
--		hp_elog->_drc_u.drc_index =
--				be32_to_cpu(hp_elog->_drc_u.drc_index);
--		break;
--	case PSERIES_HP_ELOG_ID_DRC_IC:
--		hp_elog->_drc_u.ic.count =
--				be32_to_cpu(hp_elog->_drc_u.ic.count);
--		hp_elog->_drc_u.ic.index =
--				be32_to_cpu(hp_elog->_drc_u.ic.index);
--	}
--
- 	switch (hp_elog->resource) {
- 	case PSERIES_HP_ELOG_RESOURCE_MEM:
- 		rc = dlpar_memory(hp_elog);
-diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
-index e62835a12d73fc..6838a0fcda296b 100644
---- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
-+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
-@@ -757,7 +757,7 @@ int dlpar_cpu(struct pseries_hp_errorlog *hp_elog)
- 	u32 drc_index;
- 	int rc;
- 
--	drc_index = hp_elog->_drc_u.drc_index;
-+	drc_index = be32_to_cpu(hp_elog->_drc_u.drc_index);
- 
- 	lock_device_hotplug();
- 
-diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
-index 4adca5b61daba8..95ff84c55cb144 100644
---- a/arch/powerpc/platforms/pseries/hotplug-memory.c
-+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
-@@ -811,16 +811,16 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
- 	case PSERIES_HP_ELOG_ACTION_ADD:
- 		switch (hp_elog->id_type) {
- 		case PSERIES_HP_ELOG_ID_DRC_COUNT:
--			count = hp_elog->_drc_u.drc_count;
-+			count = be32_to_cpu(hp_elog->_drc_u.drc_count);
- 			rc = dlpar_memory_add_by_count(count);
- 			break;
- 		case PSERIES_HP_ELOG_ID_DRC_INDEX:
--			drc_index = hp_elog->_drc_u.drc_index;
-+			drc_index = be32_to_cpu(hp_elog->_drc_u.drc_index);
- 			rc = dlpar_memory_add_by_index(drc_index);
- 			break;
- 		case PSERIES_HP_ELOG_ID_DRC_IC:
--			count = hp_elog->_drc_u.ic.count;
--			drc_index = hp_elog->_drc_u.ic.index;
-+			count = be32_to_cpu(hp_elog->_drc_u.ic.count);
-+			drc_index = be32_to_cpu(hp_elog->_drc_u.ic.index);
- 			rc = dlpar_memory_add_by_ic(count, drc_index);
- 			break;
- 		default:
-@@ -832,16 +832,16 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
- 	case PSERIES_HP_ELOG_ACTION_REMOVE:
- 		switch (hp_elog->id_type) {
- 		case PSERIES_HP_ELOG_ID_DRC_COUNT:
--			count = hp_elog->_drc_u.drc_count;
-+			count = be32_to_cpu(hp_elog->_drc_u.drc_count);
- 			rc = dlpar_memory_remove_by_count(count);
- 			break;
- 		case PSERIES_HP_ELOG_ID_DRC_INDEX:
--			drc_index = hp_elog->_drc_u.drc_index;
-+			drc_index = be32_to_cpu(hp_elog->_drc_u.drc_index);
- 			rc = dlpar_memory_remove_by_index(drc_index);
- 			break;
- 		case PSERIES_HP_ELOG_ID_DRC_IC:
--			count = hp_elog->_drc_u.ic.count;
--			drc_index = hp_elog->_drc_u.ic.index;
-+			count = be32_to_cpu(hp_elog->_drc_u.ic.count);
-+			drc_index = be32_to_cpu(hp_elog->_drc_u.ic.index);
- 			rc = dlpar_memory_remove_by_ic(count, drc_index);
- 			break;
- 		default:
-diff --git a/arch/powerpc/platforms/pseries/pmem.c b/arch/powerpc/platforms/pseries/pmem.c
-index 3c290b9ed01b39..0f1d45f32e4a44 100644
---- a/arch/powerpc/platforms/pseries/pmem.c
-+++ b/arch/powerpc/platforms/pseries/pmem.c
-@@ -121,7 +121,7 @@ int dlpar_hp_pmem(struct pseries_hp_errorlog *hp_elog)
- 		return -EINVAL;
- 	}
- 
--	drc_index = hp_elog->_drc_u.drc_index;
-+	drc_index = be32_to_cpu(hp_elog->_drc_u.drc_index);
- 
- 	lock_device_hotplug();
- 
-diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
-index fe30b24d52e189..1304992232adbe 100644
---- a/arch/riscv/Kconfig
-+++ b/arch/riscv/Kconfig
-@@ -259,6 +259,11 @@ config GENERIC_HWEIGHT
- config FIX_EARLYCON_MEM
- 	def_bool MMU
- 
-+config ILLEGAL_POINTER_VALUE
-+	hex
-+	default 0 if 32BIT
-+	default 0xdead000000000000 if 64BIT
-+
- config PGTABLE_LEVELS
- 	int
- 	default 5 if 64BIT
-@@ -628,8 +633,7 @@ config IRQ_STACKS
- config THREAD_SIZE_ORDER
- 	int "Kernel stack size (in power-of-two numbers of page size)" if VMAP_STACK && EXPERT
- 	range 0 4
--	default 1 if 32BIT && !KASAN
--	default 3 if 64BIT && KASAN
-+	default 1 if 32BIT
- 	default 2
- 	help
- 	  Specify the Pages of thread stack size (from 4KB to 64KB), which also
-diff --git a/arch/riscv/include/asm/thread_info.h b/arch/riscv/include/asm/thread_info.h
-index d18ce0113ca1f1..4fb84c2e94c650 100644
---- a/arch/riscv/include/asm/thread_info.h
-+++ b/arch/riscv/include/asm/thread_info.h
-@@ -12,7 +12,12 @@
- #include <linux/const.h>
- 
- /* thread information allocation */
--#define THREAD_SIZE_ORDER	CONFIG_THREAD_SIZE_ORDER
-+#ifdef CONFIG_KASAN
-+#define KASAN_STACK_ORDER	1
-+#else
-+#define KASAN_STACK_ORDER	0
-+#endif
-+#define THREAD_SIZE_ORDER	(CONFIG_THREAD_SIZE_ORDER + KASAN_STACK_ORDER)
- #define THREAD_SIZE		(PAGE_SIZE << THREAD_SIZE_ORDER)
- 
- /*
-diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
-index 0ffb072be95615..0bbec1c75cd0be 100644
---- a/arch/x86/crypto/sha256-avx2-asm.S
-+++ b/arch/x86/crypto/sha256-avx2-asm.S
-@@ -592,22 +592,22 @@ SYM_TYPED_FUNC_START(sha256_transform_rorx)
- 	leaq	K256+0*32(%rip), INP		## reuse INP as scratch reg
- 	vpaddd	(INP, SRND), X0, XFER
- 	vmovdqa XFER, 0*32+_XFER(%rsp, SRND)
--	FOUR_ROUNDS_AND_SCHED	_XFER + 0*32
-+	FOUR_ROUNDS_AND_SCHED	(_XFER + 0*32)
- 
- 	leaq	K256+1*32(%rip), INP
- 	vpaddd	(INP, SRND), X0, XFER
- 	vmovdqa XFER, 1*32+_XFER(%rsp, SRND)
--	FOUR_ROUNDS_AND_SCHED	_XFER + 1*32
-+	FOUR_ROUNDS_AND_SCHED	(_XFER + 1*32)
- 
- 	leaq	K256+2*32(%rip), INP
- 	vpaddd	(INP, SRND), X0, XFER
- 	vmovdqa XFER, 2*32+_XFER(%rsp, SRND)
--	FOUR_ROUNDS_AND_SCHED	_XFER + 2*32
-+	FOUR_ROUNDS_AND_SCHED	(_XFER + 2*32)
- 
- 	leaq	K256+3*32(%rip), INP
- 	vpaddd	(INP, SRND), X0, XFER
- 	vmovdqa XFER, 3*32+_XFER(%rsp, SRND)
--	FOUR_ROUNDS_AND_SCHED	_XFER + 3*32
-+	FOUR_ROUNDS_AND_SCHED	(_XFER + 3*32)
- 
- 	add	$4*32, SRND
- 	cmp	$3*4*32, SRND
-@@ -618,12 +618,12 @@ SYM_TYPED_FUNC_START(sha256_transform_rorx)
- 	leaq	K256+0*32(%rip), INP
- 	vpaddd	(INP, SRND), X0, XFER
- 	vmovdqa XFER, 0*32+_XFER(%rsp, SRND)
--	DO_4ROUNDS	_XFER + 0*32
-+	DO_4ROUNDS	(_XFER + 0*32)
- 
- 	leaq	K256+1*32(%rip), INP
- 	vpaddd	(INP, SRND), X1, XFER
- 	vmovdqa XFER, 1*32+_XFER(%rsp, SRND)
--	DO_4ROUNDS	_XFER + 1*32
-+	DO_4ROUNDS	(_XFER + 1*32)
- 	add	$2*32, SRND
- 
- 	vmovdqa	X2, X0
-@@ -651,8 +651,8 @@ SYM_TYPED_FUNC_START(sha256_transform_rorx)
- 	xor	SRND, SRND
- .align 16
- .Lloop3:
--	DO_4ROUNDS	 _XFER + 0*32 + 16
--	DO_4ROUNDS	 _XFER + 1*32 + 16
-+	DO_4ROUNDS	(_XFER + 0*32 + 16)
-+	DO_4ROUNDS	(_XFER + 1*32 + 16)
- 	add	$2*32, SRND
- 	cmp	$4*4*32, SRND
- 	jb	.Lloop3
-diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
-index 8811fedc9776a2..150a365b4fbc89 100644
---- a/arch/x86/events/core.c
-+++ b/arch/x86/events/core.c
-@@ -41,6 +41,8 @@
- #include <asm/desc.h>
- #include <asm/ldt.h>
- #include <asm/unwind.h>
-+#include <asm/uprobes.h>
-+#include <asm/ibt.h>
- 
- #include "perf_event.h"
- 
-@@ -2816,6 +2818,46 @@ static unsigned long get_segment_base(unsigned int segment)
- 	return get_desc_base(desc);
- }
- 
-+#ifdef CONFIG_UPROBES
-+/*
-+ * Heuristic-based check if uprobe is installed at the function entry.
-+ *
-+ * Under assumption of user code being compiled with frame pointers,
-+ * `push %rbp/%ebp` is a good indicator that we indeed are.
-+ *
-+ * Similarly, `endbr64` (assuming 64-bit mode) is also a common pattern.
-+ * If we get this wrong, captured stack trace might have one extra bogus
-+ * entry, but the rest of stack trace will still be meaningful.
-+ */
-+static bool is_uprobe_at_func_entry(struct pt_regs *regs)
-+{
-+	struct arch_uprobe *auprobe;
-+
-+	if (!current->utask)
-+		return false;
-+
-+	auprobe = current->utask->auprobe;
-+	if (!auprobe)
-+		return false;
-+
-+	/* push %rbp/%ebp */
-+	if (auprobe->insn[0] == 0x55)
-+		return true;
-+
-+	/* endbr64 (64-bit only) */
-+	if (user_64bit_mode(regs) && is_endbr(*(u32 *)auprobe->insn))
-+		return true;
-+
-+	return false;
-+}
-+
-+#else
-+static bool is_uprobe_at_func_entry(struct pt_regs *regs)
-+{
-+	return false;
-+}
-+#endif /* CONFIG_UPROBES */
-+
- #ifdef CONFIG_IA32_EMULATION
- 
- #include <linux/compat.h>
-@@ -2827,6 +2869,7 @@ perf_callchain_user32(struct pt_regs *regs, struct perf_callchain_entry_ctx *ent
- 	unsigned long ss_base, cs_base;
- 	struct stack_frame_ia32 frame;
- 	const struct stack_frame_ia32 __user *fp;
-+	u32 ret_addr;
- 
- 	if (user_64bit_mode(regs))
- 		return 0;
-@@ -2836,6 +2879,12 @@ perf_callchain_user32(struct pt_regs *regs, struct perf_callchain_entry_ctx *ent
- 
- 	fp = compat_ptr(ss_base + regs->bp);
- 	pagefault_disable();
-+
-+	/* see perf_callchain_user() below for why we do this */
-+	if (is_uprobe_at_func_entry(regs) &&
-+	    !get_user(ret_addr, (const u32 __user *)regs->sp))
-+		perf_callchain_store(entry, ret_addr);
-+
- 	while (entry->nr < entry->max_stack) {
- 		if (!valid_user_frame(fp, sizeof(frame)))
- 			break;
-@@ -2864,6 +2913,7 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs
- {
- 	struct stack_frame frame;
- 	const struct stack_frame __user *fp;
-+	unsigned long ret_addr;
- 
- 	if (perf_guest_state()) {
- 		/* TODO: We don't support guest os callchain now */
-@@ -2887,6 +2937,19 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs
- 		return;
- 
- 	pagefault_disable();
-+
-+	/*
-+	 * If we are called from uprobe handler, and we are indeed at the very
-+	 * entry to user function (which is normally a `push %rbp` instruction,
-+	 * under assumption of application being compiled with frame pointers),
-+	 * we should read return address from *regs->sp before proceeding
-+	 * to follow frame pointers, otherwise we'll skip immediate caller
-+	 * as %rbp is not yet setup.
-+	 */
-+	if (is_uprobe_at_func_entry(regs) &&
-+	    !get_user(ret_addr, (const unsigned long __user *)regs->sp))
-+		perf_callchain_store(entry, ret_addr);
-+
- 	while (entry->nr < entry->max_stack) {
- 		if (!valid_user_frame(fp, sizeof(frame)))
- 			break;
-diff --git a/arch/x86/include/asm/fpu/signal.h b/arch/x86/include/asm/fpu/signal.h
-index 611fa41711affd..eccc75bc9c4f3d 100644
---- a/arch/x86/include/asm/fpu/signal.h
-+++ b/arch/x86/include/asm/fpu/signal.h
-@@ -29,7 +29,7 @@ fpu__alloc_mathframe(unsigned long sp, int ia32_frame,
- 
- unsigned long fpu__get_fpstate_size(void);
- 
--extern bool copy_fpstate_to_sigframe(void __user *buf, void __user *fp, int size);
-+extern bool copy_fpstate_to_sigframe(void __user *buf, void __user *fp, int size, u32 pkru);
- extern void fpu__clear_user_states(struct fpu *fpu);
- extern bool fpu__restore_sig(void __user *buf, int ia32_frame);
- 
-diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h
-index 03bb950eba690f..228a42585d5c97 100644
---- a/arch/x86/include/asm/syscall.h
-+++ b/arch/x86/include/asm/syscall.h
-@@ -82,7 +82,12 @@ static inline void syscall_get_arguments(struct task_struct *task,
- 					 struct pt_regs *regs,
- 					 unsigned long *args)
- {
--	memcpy(args, &regs->bx, 6 * sizeof(args[0]));
-+	args[0] = regs->bx;
-+	args[1] = regs->cx;
-+	args[2] = regs->dx;
-+	args[3] = regs->si;
-+	args[4] = regs->di;
-+	args[5] = regs->bp;
- }
- 
- static inline int syscall_get_arch(struct task_struct *task)
-diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index 00da6cf6b07dcb..d0c5325d175102 100644
---- a/arch/x86/kernel/apic/io_apic.c
-+++ b/arch/x86/kernel/apic/io_apic.c
-@@ -352,27 +352,26 @@ static void ioapic_mask_entry(int apic, int pin)
-  * shared ISA-space IRQs, so we have to support them. We are super
-  * fast in the common case, and fast for shared ISA-space IRQs.
-  */
--static int __add_pin_to_irq_node(struct mp_chip_data *data,
--				 int node, int apic, int pin)
-+static bool add_pin_to_irq_node(struct mp_chip_data *data, int node, int apic, int pin)
- {
- 	struct irq_pin_list *entry;
- 
--	/* don't allow duplicates */
--	for_each_irq_pin(entry, data->irq_2_pin)
-+	/* Don't allow duplicates */
-+	for_each_irq_pin(entry, data->irq_2_pin) {
- 		if (entry->apic == apic && entry->pin == pin)
--			return 0;
-+			return true;
-+	}
- 
- 	entry = kzalloc_node(sizeof(struct irq_pin_list), GFP_ATOMIC, node);
- 	if (!entry) {
--		pr_err("can not alloc irq_pin_list (%d,%d,%d)\n",
--		       node, apic, pin);
--		return -ENOMEM;
-+		pr_err("Cannot allocate irq_pin_list (%d,%d,%d)\n", node, apic, pin);
-+		return false;
- 	}
-+
- 	entry->apic = apic;
- 	entry->pin = pin;
- 	list_add_tail(&entry->list, &data->irq_2_pin);
--
--	return 0;
-+	return true;
- }
- 
- static void __remove_pin_from_irq(struct mp_chip_data *data, int apic, int pin)
-@@ -387,13 +386,6 @@ static void __remove_pin_from_irq(struct mp_chip_data *data, int apic, int pin)
- 		}
- }
- 
--static void add_pin_to_irq_node(struct mp_chip_data *data,
--				int node, int apic, int pin)
--{
--	if (__add_pin_to_irq_node(data, node, apic, pin))
--		panic("IO-APIC: failed to add irq-pin. Can not proceed\n");
--}
--
- /*
-  * Reroute an IRQ to a different pin.
-  */
-@@ -1002,8 +994,7 @@ static int alloc_isa_irq_from_domain(struct irq_domain *domain,
- 	if (irq_data && irq_data->parent_data) {
- 		if (!mp_check_pin_attr(irq, info))
- 			return -EBUSY;
--		if (__add_pin_to_irq_node(irq_data->chip_data, node, ioapic,
--					  info->ioapic.pin))
-+		if (!add_pin_to_irq_node(irq_data->chip_data, node, ioapic, info->ioapic.pin))
- 			return -ENOMEM;
- 	} else {
- 		info->flags |= X86_IRQ_ALLOC_LEGACY;
-@@ -3037,10 +3028,8 @@ int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq,
- 		return -ENOMEM;
- 
- 	ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, info);
--	if (ret < 0) {
--		kfree(data);
--		return ret;
--	}
-+	if (ret < 0)
-+		goto free_data;
- 
- 	INIT_LIST_HEAD(&data->irq_2_pin);
- 	irq_data->hwirq = info->ioapic.pin;
-@@ -3049,7 +3038,10 @@ int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq,
- 	irq_data->chip_data = data;
- 	mp_irqdomain_get_attr(mp_pin_to_gsi(ioapic, pin), data, info);
- 
--	add_pin_to_irq_node(data, ioapic_alloc_attr_node(info), ioapic, pin);
-+	if (!add_pin_to_irq_node(data, ioapic_alloc_attr_node(info), ioapic, pin)) {
-+		ret = -ENOMEM;
-+		goto free_irqs;
-+	}
- 
- 	mp_preconfigure_entry(data);
- 	mp_register_handler(virq, data->is_level);
-@@ -3064,6 +3056,12 @@ int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq,
- 		    ioapic, mpc_ioapic_id(ioapic), pin, virq,
- 		    data->is_level, data->active_low);
- 	return 0;
-+
-+free_irqs:
-+	irq_domain_free_irqs_parent(domain, virq, nr_irqs);
-+free_data:
-+	kfree(data);
-+	return ret;
- }
- 
- void mp_irqdomain_free(struct irq_domain *domain, unsigned int virq,
-diff --git a/arch/x86/kernel/fpu/signal.c b/arch/x86/kernel/fpu/signal.c
-index 247f2225aa9f36..2b3b9e140dd41b 100644
---- a/arch/x86/kernel/fpu/signal.c
-+++ b/arch/x86/kernel/fpu/signal.c
-@@ -156,7 +156,7 @@ static inline bool save_xstate_epilog(void __user *buf, int ia32_frame,
- 	return !err;
- }
- 
--static inline int copy_fpregs_to_sigframe(struct xregs_state __user *buf)
-+static inline int copy_fpregs_to_sigframe(struct xregs_state __user *buf, u32 pkru)
- {
- 	if (use_xsave())
- 		return xsave_to_user_sigframe(buf);
-@@ -185,7 +185,7 @@ static inline int copy_fpregs_to_sigframe(struct xregs_state __user *buf)
-  * For [f]xsave state, update the SW reserved fields in the [f]xsave frame
-  * indicating the absence/presence of the extended state to the user.
-  */
--bool copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size)
-+bool copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size, u32 pkru)
- {
- 	struct task_struct *tsk = current;
- 	struct fpstate *fpstate = tsk->thread.fpu.fpstate;
-@@ -228,7 +228,7 @@ bool copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size)
- 		fpregs_restore_userregs();
- 
- 	pagefault_disable();
--	ret = copy_fpregs_to_sigframe(buf_fx);
-+	ret = copy_fpregs_to_sigframe(buf_fx, pkru);
- 	pagefault_enable();
- 	fpregs_unlock();
- 
-diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c
-index d287fe290c9ab5..2fa12d1dc67602 100644
---- a/arch/x86/kernel/machine_kexec_64.c
-+++ b/arch/x86/kernel/machine_kexec_64.c
-@@ -28,6 +28,7 @@
- #include <asm/setup.h>
- #include <asm/set_memory.h>
- #include <asm/cpu.h>
-+#include <asm/efi.h>
- 
- #ifdef CONFIG_ACPI
- /*
-@@ -90,6 +91,8 @@ map_efi_systab(struct x86_mapping_info *info, pgd_t *level4p)
- {
- #ifdef CONFIG_EFI
- 	unsigned long mstart, mend;
-+	void *kaddr;
-+	int ret;
- 
- 	if (!efi_enabled(EFI_BOOT))
- 		return 0;
-@@ -105,6 +108,30 @@ map_efi_systab(struct x86_mapping_info *info, pgd_t *level4p)
- 	if (!mstart)
- 		return 0;
- 
-+	ret = kernel_ident_mapping_init(info, level4p, mstart, mend);
-+	if (ret)
-+		return ret;
-+
-+	kaddr = memremap(mstart, mend - mstart, MEMREMAP_WB);
-+	if (!kaddr) {
-+		pr_err("Could not map UEFI system table\n");
-+		return -ENOMEM;
-+	}
-+
-+	mstart = efi_config_table;
-+
-+	if (efi_enabled(EFI_64BIT)) {
-+		efi_system_table_64_t *stbl = (efi_system_table_64_t *)kaddr;
-+
-+		mend = mstart + sizeof(efi_config_table_64_t) * stbl->nr_tables;
-+	} else {
-+		efi_system_table_32_t *stbl = (efi_system_table_32_t *)kaddr;
-+
-+		mend = mstart + sizeof(efi_config_table_32_t) * stbl->nr_tables;
-+	}
-+
-+	memunmap(kaddr);
-+
- 	return kernel_ident_mapping_init(info, level4p, mstart, mend);
- #endif
- 	return 0;
-diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
-index 65fe2094da59b8..876d3b30c2c774 100644
---- a/arch/x86/kernel/signal.c
-+++ b/arch/x86/kernel/signal.c
-@@ -83,6 +83,7 @@ get_sigframe(struct ksignal *ksig, struct pt_regs *regs, size_t frame_size,
- 	unsigned long math_size = 0;
- 	unsigned long sp = regs->sp;
- 	unsigned long buf_fx = 0;
-+	u32 pkru = read_pkru();
- 
- 	/* redzone */
- 	if (!ia32_frame)
-@@ -138,7 +139,7 @@ get_sigframe(struct ksignal *ksig, struct pt_regs *regs, size_t frame_size,
- 	}
- 
- 	/* save i387 and extended state */
--	if (!copy_fpstate_to_sigframe(*fpstate, (void __user *)buf_fx, math_size))
-+	if (!copy_fpstate_to_sigframe(*fpstate, (void __user *)buf_fx, math_size, pkru))
- 		return (void __user *)-1L;
- 
- 	return (void __user *)sp;
-diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
-index 23d8aaf8d9fd19..449a6ed0b8c982 100644
---- a/arch/x86/kernel/signal_64.c
-+++ b/arch/x86/kernel/signal_64.c
-@@ -260,13 +260,13 @@ SYSCALL_DEFINE0(rt_sigreturn)
- 
- 	set_current_blocked(&set);
- 
--	if (!restore_sigcontext(regs, &frame->uc.uc_mcontext, uc_flags))
-+	if (restore_altstack(&frame->uc.uc_stack))
- 		goto badframe;
- 
--	if (restore_signal_shadow_stack())
-+	if (!restore_sigcontext(regs, &frame->uc.uc_mcontext, uc_flags))
- 		goto badframe;
- 
--	if (restore_altstack(&frame->uc.uc_stack))
-+	if (restore_signal_shadow_stack())
- 		goto badframe;
- 
- 	return regs->ax;
-diff --git a/block/blk-iocost.c b/block/blk-iocost.c
-index 0dca77591d66c9..c3cb9c20b306cf 100644
---- a/block/blk-iocost.c
-+++ b/block/blk-iocost.c
-@@ -2076,7 +2076,7 @@ static void ioc_forgive_debts(struct ioc *ioc, u64 usage_us_sum, int nr_debtors,
- 			      struct ioc_now *now)
- {
- 	struct ioc_gq *iocg;
--	u64 dur, usage_pct, nr_cycles;
-+	u64 dur, usage_pct, nr_cycles, nr_cycles_shift;
- 
- 	/* if no debtor, reset the cycle */
- 	if (!nr_debtors) {
-@@ -2138,10 +2138,12 @@ static void ioc_forgive_debts(struct ioc *ioc, u64 usage_us_sum, int nr_debtors,
- 		old_debt = iocg->abs_vdebt;
- 		old_delay = iocg->delay;
- 
-+		nr_cycles_shift = min_t(u64, nr_cycles, BITS_PER_LONG - 1);
- 		if (iocg->abs_vdebt)
--			iocg->abs_vdebt = iocg->abs_vdebt >> nr_cycles ?: 1;
-+			iocg->abs_vdebt = iocg->abs_vdebt >> nr_cycles_shift ?: 1;
-+
- 		if (iocg->delay)
--			iocg->delay = iocg->delay >> nr_cycles ?: 1;
-+			iocg->delay = iocg->delay >> nr_cycles_shift ?: 1;
- 
- 		iocg_kick_waitq(iocg, true, now);
- 
-diff --git a/crypto/simd.c b/crypto/simd.c
-index edaa479a1ec5e5..d109866641a265 100644
---- a/crypto/simd.c
-+++ b/crypto/simd.c
-@@ -136,27 +136,19 @@ static int simd_skcipher_init(struct crypto_skcipher *tfm)
- 	return 0;
- }
- 
--struct simd_skcipher_alg *simd_skcipher_create_compat(const char *algname,
-+struct simd_skcipher_alg *simd_skcipher_create_compat(struct skcipher_alg *ialg,
-+						      const char *algname,
- 						      const char *drvname,
- 						      const char *basename)
- {
- 	struct simd_skcipher_alg *salg;
--	struct crypto_skcipher *tfm;
--	struct skcipher_alg *ialg;
- 	struct skcipher_alg *alg;
- 	int err;
- 
--	tfm = crypto_alloc_skcipher(basename, CRYPTO_ALG_INTERNAL,
--				    CRYPTO_ALG_INTERNAL | CRYPTO_ALG_ASYNC);
--	if (IS_ERR(tfm))
--		return ERR_CAST(tfm);
--
--	ialg = crypto_skcipher_alg(tfm);
--
- 	salg = kzalloc(sizeof(*salg), GFP_KERNEL);
- 	if (!salg) {
- 		salg = ERR_PTR(-ENOMEM);
--		goto out_put_tfm;
-+		goto out;
- 	}
- 
- 	salg->ialg_name = basename;
-@@ -195,30 +187,16 @@ struct simd_skcipher_alg *simd_skcipher_create_compat(const char *algname,
- 	if (err)
- 		goto out_free_salg;
- 
--out_put_tfm:
--	crypto_free_skcipher(tfm);
-+out:
- 	return salg;
- 
- out_free_salg:
- 	kfree(salg);
- 	salg = ERR_PTR(err);
--	goto out_put_tfm;
-+	goto out;
- }
- EXPORT_SYMBOL_GPL(simd_skcipher_create_compat);
- 
--struct simd_skcipher_alg *simd_skcipher_create(const char *algname,
--					       const char *basename)
--{
--	char drvname[CRYPTO_MAX_ALG_NAME];
--
--	if (snprintf(drvname, CRYPTO_MAX_ALG_NAME, "simd-%s", basename) >=
--	    CRYPTO_MAX_ALG_NAME)
--		return ERR_PTR(-ENAMETOOLONG);
--
--	return simd_skcipher_create_compat(algname, drvname, basename);
--}
--EXPORT_SYMBOL_GPL(simd_skcipher_create);
--
- void simd_skcipher_free(struct simd_skcipher_alg *salg)
- {
- 	crypto_unregister_skcipher(&salg->alg);
-@@ -246,7 +224,7 @@ int simd_register_skciphers_compat(struct skcipher_alg *algs, int count,
- 		algname = algs[i].base.cra_name + 2;
- 		drvname = algs[i].base.cra_driver_name + 2;
- 		basename = algs[i].base.cra_driver_name;
--		simd = simd_skcipher_create_compat(algname, drvname, basename);
-+		simd = simd_skcipher_create_compat(algs + i, algname, drvname, basename);
- 		err = PTR_ERR(simd);
- 		if (IS_ERR(simd))
- 			goto err_unregister;
-@@ -383,27 +361,19 @@ static int simd_aead_init(struct crypto_aead *tfm)
- 	return 0;
- }
- 
--struct simd_aead_alg *simd_aead_create_compat(const char *algname,
--					      const char *drvname,
--					      const char *basename)
-+static struct simd_aead_alg *simd_aead_create_compat(struct aead_alg *ialg,
-+						     const char *algname,
-+						     const char *drvname,
-+						     const char *basename)
- {
- 	struct simd_aead_alg *salg;
--	struct crypto_aead *tfm;
--	struct aead_alg *ialg;
- 	struct aead_alg *alg;
- 	int err;
- 
--	tfm = crypto_alloc_aead(basename, CRYPTO_ALG_INTERNAL,
--				CRYPTO_ALG_INTERNAL | CRYPTO_ALG_ASYNC);
--	if (IS_ERR(tfm))
--		return ERR_CAST(tfm);
--
--	ialg = crypto_aead_alg(tfm);
--
- 	salg = kzalloc(sizeof(*salg), GFP_KERNEL);
- 	if (!salg) {
- 		salg = ERR_PTR(-ENOMEM);
--		goto out_put_tfm;
-+		goto out;
- 	}
- 
- 	salg->ialg_name = basename;
-@@ -442,36 +412,20 @@ struct simd_aead_alg *simd_aead_create_compat(const char *algname,
- 	if (err)
- 		goto out_free_salg;
- 
--out_put_tfm:
--	crypto_free_aead(tfm);
-+out:
- 	return salg;
- 
- out_free_salg:
- 	kfree(salg);
- 	salg = ERR_PTR(err);
--	goto out_put_tfm;
--}
--EXPORT_SYMBOL_GPL(simd_aead_create_compat);
--
--struct simd_aead_alg *simd_aead_create(const char *algname,
--				       const char *basename)
--{
--	char drvname[CRYPTO_MAX_ALG_NAME];
--
--	if (snprintf(drvname, CRYPTO_MAX_ALG_NAME, "simd-%s", basename) >=
--	    CRYPTO_MAX_ALG_NAME)
--		return ERR_PTR(-ENAMETOOLONG);
--
--	return simd_aead_create_compat(algname, drvname, basename);
-+	goto out;
- }
--EXPORT_SYMBOL_GPL(simd_aead_create);
- 
--void simd_aead_free(struct simd_aead_alg *salg)
-+static void simd_aead_free(struct simd_aead_alg *salg)
- {
- 	crypto_unregister_aead(&salg->alg);
- 	kfree(salg);
- }
--EXPORT_SYMBOL_GPL(simd_aead_free);
- 
- int simd_register_aeads_compat(struct aead_alg *algs, int count,
- 			       struct simd_aead_alg **simd_algs)
-@@ -493,7 +447,7 @@ int simd_register_aeads_compat(struct aead_alg *algs, int count,
- 		algname = algs[i].base.cra_name + 2;
- 		drvname = algs[i].base.cra_driver_name + 2;
- 		basename = algs[i].base.cra_driver_name;
--		simd = simd_aead_create_compat(algname, drvname, basename);
-+		simd = simd_aead_create_compat(algs + i, algname, drvname, basename);
- 		err = PTR_ERR(simd);
- 		if (IS_ERR(simd))
- 			goto err_unregister;
-diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/ivpu_fw.c
-index a277bbae78fc45..3b35d262ddd43a 100644
---- a/drivers/accel/ivpu/ivpu_fw.c
-+++ b/drivers/accel/ivpu/ivpu_fw.c
-@@ -55,6 +55,10 @@ static struct {
- 	{ IVPU_HW_40XX, "intel/vpu/vpu_40xx_v0.0.bin" },
- };
- 
-+/* Production fw_names from the table above */
-+MODULE_FIRMWARE("intel/vpu/vpu_37xx_v0.0.bin");
-+MODULE_FIRMWARE("intel/vpu/vpu_40xx_v0.0.bin");
-+
- static int ivpu_fw_request(struct ivpu_device *vdev)
- {
- 	int ret = -ENOENT;
-diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
-index 7a453c5ff303a9..71e25c79897628 100644
---- a/drivers/acpi/acpi_pad.c
-+++ b/drivers/acpi/acpi_pad.c
-@@ -131,8 +131,10 @@ static void exit_round_robin(unsigned int tsk_index)
- {
- 	struct cpumask *pad_busy_cpus = to_cpumask(pad_busy_cpus_bits);
- 
--	cpumask_clear_cpu(tsk_in_cpu[tsk_index], pad_busy_cpus);
--	tsk_in_cpu[tsk_index] = -1;
-+	if (tsk_in_cpu[tsk_index] != -1) {
-+		cpumask_clear_cpu(tsk_in_cpu[tsk_index], pad_busy_cpus);
-+		tsk_in_cpu[tsk_index] = -1;
-+	}
- }
- 
- static unsigned int idle_pct = 5; /* percentage */
-diff --git a/drivers/acpi/acpica/dbconvert.c b/drivers/acpi/acpica/dbconvert.c
-index 2b84ac093698a3..8dbab693204998 100644
---- a/drivers/acpi/acpica/dbconvert.c
-+++ b/drivers/acpi/acpica/dbconvert.c
-@@ -174,6 +174,8 @@ acpi_status acpi_db_convert_to_package(char *string, union acpi_object *object)
- 	elements =
- 	    ACPI_ALLOCATE_ZEROED(DB_DEFAULT_PKG_ELEMENTS *
- 				 sizeof(union acpi_object));
-+	if (!elements)
-+		return (AE_NO_MEMORY);
- 
- 	this = string;
- 	for (i = 0; i < (DB_DEFAULT_PKG_ELEMENTS - 1); i++) {
-diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c
-index 08196fa17080e2..82b1fa2d201fed 100644
---- a/drivers/acpi/acpica/exprep.c
-+++ b/drivers/acpi/acpica/exprep.c
-@@ -437,6 +437,9 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
- 
- 		if (info->connection_node) {
- 			second_desc = info->connection_node->object;
-+			if (second_desc == NULL) {
-+				break;
-+			}
- 			if (!(second_desc->common.flags & AOPOBJ_DATA_VALID)) {
- 				status =
- 				    acpi_ds_get_buffer_arguments(second_desc);
-diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c
-index 422c074ed2897b..28582adfc0acaf 100644
---- a/drivers/acpi/acpica/psargs.c
-+++ b/drivers/acpi/acpica/psargs.c
-@@ -25,6 +25,8 @@ acpi_ps_get_next_package_length(struct acpi_parse_state *parser_state);
- static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
- 						       *parser_state);
- 
-+static void acpi_ps_free_field_list(union acpi_parse_object *start);
-+
- /*******************************************************************************
-  *
-  * FUNCTION:    acpi_ps_get_next_package_length
-@@ -683,6 +685,39 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
- 	return_PTR(field);
- }
- 
-+/*******************************************************************************
-+ *
-+ * FUNCTION:    acpi_ps_free_field_list
-+ *
-+ * PARAMETERS:  start               - First Op in field list
-+ *
-+ * RETURN:      None.
-+ *
-+ * DESCRIPTION: Free all Op objects inside a field list.
-+ *
-+ ******************************************************************************/
-+
-+static void acpi_ps_free_field_list(union acpi_parse_object *start)
-+{
-+	union acpi_parse_object *cur = start;
-+	union acpi_parse_object *next;
-+	union acpi_parse_object *arg;
-+
-+	while (cur) {
-+		next = cur->common.next;
-+
-+		/* AML_INT_CONNECTION_OP can have a single argument */
-+
-+		arg = acpi_ps_get_arg(cur, 0);
-+		if (arg) {
-+			acpi_ps_free_op(arg);
-+		}
-+
-+		acpi_ps_free_op(cur);
-+		cur = next;
-+	}
-+}
-+
- /*******************************************************************************
-  *
-  * FUNCTION:    acpi_ps_get_next_arg
-@@ -751,6 +786,10 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
- 			while (parser_state->aml < parser_state->pkg_end) {
- 				field = acpi_ps_get_next_field(parser_state);
- 				if (!field) {
-+					if (arg) {
-+						acpi_ps_free_field_list(arg);
-+					}
-+
- 					return_ACPI_STATUS(AE_NO_MEMORY);
- 				}
- 
-@@ -820,6 +859,10 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
- 			    acpi_ps_get_next_namepath(walk_state, parser_state,
- 						      arg,
- 						      ACPI_NOT_METHOD_CALL);
-+			if (ACPI_FAILURE(status)) {
-+				acpi_ps_free_op(arg);
-+				return_ACPI_STATUS(status);
-+			}
- 		} else {
- 			/* Single complex argument, nothing returned */
- 
-@@ -854,6 +897,10 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
- 			    acpi_ps_get_next_namepath(walk_state, parser_state,
- 						      arg,
- 						      ACPI_POSSIBLE_METHOD_CALL);
-+			if (ACPI_FAILURE(status)) {
-+				acpi_ps_free_op(arg);
-+				return_ACPI_STATUS(status);
-+			}
- 
- 			if (arg->common.aml_opcode == AML_INT_METHODCALL_OP) {
- 
-diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
-index 7f7ad94f22b911..e3cbaf3c3bbc15 100644
---- a/drivers/acpi/battery.c
-+++ b/drivers/acpi/battery.c
-@@ -703,28 +703,35 @@ static LIST_HEAD(acpi_battery_list);
- static LIST_HEAD(battery_hook_list);
- static DEFINE_MUTEX(hook_mutex);
- 
--static void __battery_hook_unregister(struct acpi_battery_hook *hook, int lock)
-+static void battery_hook_unregister_unlocked(struct acpi_battery_hook *hook)
- {
- 	struct acpi_battery *battery;
-+
- 	/*
- 	 * In order to remove a hook, we first need to
- 	 * de-register all the batteries that are registered.
- 	 */
--	if (lock)
--		mutex_lock(&hook_mutex);
- 	list_for_each_entry(battery, &acpi_battery_list, list) {
- 		if (!hook->remove_battery(battery->bat, hook))
- 			power_supply_changed(battery->bat);
- 	}
--	list_del(&hook->list);
--	if (lock)
--		mutex_unlock(&hook_mutex);
-+	list_del_init(&hook->list);
-+
- 	pr_info("extension unregistered: %s\n", hook->name);
- }
- 
- void battery_hook_unregister(struct acpi_battery_hook *hook)
- {
--	__battery_hook_unregister(hook, 1);
-+	mutex_lock(&hook_mutex);
-+	/*
-+	 * Ignore already unregistered battery hooks. This might happen
-+	 * if a battery hook was previously unloaded due to an error when
-+	 * adding a new battery.
-+	 */
-+	if (!list_empty(&hook->list))
-+		battery_hook_unregister_unlocked(hook);
-+
-+	mutex_unlock(&hook_mutex);
- }
- EXPORT_SYMBOL_GPL(battery_hook_unregister);
- 
-@@ -733,7 +740,6 @@ void battery_hook_register(struct acpi_battery_hook *hook)
- 	struct acpi_battery *battery;
- 
- 	mutex_lock(&hook_mutex);
--	INIT_LIST_HEAD(&hook->list);
- 	list_add(&hook->list, &battery_hook_list);
- 	/*
- 	 * Now that the driver is registered, we need
-@@ -750,7 +756,7 @@ void battery_hook_register(struct acpi_battery_hook *hook)
- 			 * hooks.
- 			 */
- 			pr_err("extension failed to load: %s", hook->name);
--			__battery_hook_unregister(hook, 0);
-+			battery_hook_unregister_unlocked(hook);
- 			goto end;
- 		}
- 
-@@ -789,7 +795,7 @@ static void battery_hook_add_battery(struct acpi_battery *battery)
- 			 */
- 			pr_err("error in extension, unloading: %s",
- 					hook_node->name);
--			__battery_hook_unregister(hook_node, 0);
-+			battery_hook_unregister_unlocked(hook_node);
- 		}
- 	}
- 	mutex_unlock(&hook_mutex);
-@@ -822,7 +828,7 @@ static void __exit battery_hook_exit(void)
- 	 * need to remove the hooks.
- 	 */
- 	list_for_each_entry_safe(hook, ptr, &battery_hook_list, list) {
--		__battery_hook_unregister(hook, 1);
-+		battery_hook_unregister(hook);
- 	}
- 	mutex_destroy(&hook_mutex);
- }
-diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c
-index 28217a995f795c..7aced0b9bad7cc 100644
---- a/drivers/acpi/cppc_acpi.c
-+++ b/drivers/acpi/cppc_acpi.c
-@@ -100,6 +100,11 @@ static DEFINE_PER_CPU(struct cpc_desc *, cpc_desc_ptr);
- 				(cpc)->cpc_entry.reg.space_id ==	\
- 				ACPI_ADR_SPACE_PLATFORM_COMM)
- 
-+/* Check if a CPC register is in FFH */
-+#define CPC_IN_FFH(cpc) ((cpc)->type == ACPI_TYPE_BUFFER &&		\
-+				(cpc)->cpc_entry.reg.space_id ==	\
-+				ACPI_ADR_SPACE_FIXED_HARDWARE)
-+
- /* Check if a CPC register is in SystemMemory */
- #define CPC_IN_SYSTEM_MEMORY(cpc) ((cpc)->type == ACPI_TYPE_BUFFER &&	\
- 				(cpc)->cpc_entry.reg.space_id ==	\
-@@ -1514,9 +1519,12 @@ int cppc_set_epp_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls, bool enable)
- 		/* after writing CPC, transfer the ownership of PCC to platform */
- 		ret = send_pcc_cmd(pcc_ss_id, CMD_WRITE);
- 		up_write(&pcc_ss_data->pcc_lock);
-+	} else if (osc_cpc_flexible_adr_space_confirmed &&
-+		   CPC_SUPPORTED(epp_set_reg) && CPC_IN_FFH(epp_set_reg)) {
-+		ret = cpc_write(cpu, epp_set_reg, perf_ctrls->energy_perf);
- 	} else {
- 		ret = -ENOTSUPP;
--		pr_debug("_CPC in PCC is not supported\n");
-+		pr_debug("_CPC in PCC and _CPC in FFH are not supported\n");
- 	}
- 
- 	return ret;
-diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
-index 35e22a2af4e4b9..115994dfefec1e 100644
---- a/drivers/acpi/ec.c
-+++ b/drivers/acpi/ec.c
-@@ -783,6 +783,9 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec,
- 	unsigned long tmp;
- 	int ret = 0;
- 
-+	if (t->rdata)
-+		memset(t->rdata, 0, t->rlen);
-+
- 	/* start transaction */
- 	spin_lock_irqsave(&ec->lock, tmp);
- 	/* Enable GPE for command processing (IBF=0/OBF=1) */
-@@ -819,8 +822,6 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t)
- 
- 	if (!ec || (!t) || (t->wlen && !t->wdata) || (t->rlen && !t->rdata))
- 		return -EINVAL;
--	if (t->rdata)
--		memset(t->rdata, 0, t->rlen);
- 
- 	mutex_lock(&ec->mutex);
- 	if (ec->global_lock) {
-@@ -847,7 +848,7 @@ static int acpi_ec_burst_enable(struct acpi_ec *ec)
- 				.wdata = NULL, .rdata = &d,
- 				.wlen = 0, .rlen = 1};
- 
--	return acpi_ec_transaction(ec, &t);
-+	return acpi_ec_transaction_unlocked(ec, &t);
- }
- 
- static int acpi_ec_burst_disable(struct acpi_ec *ec)
-@@ -857,7 +858,7 @@ static int acpi_ec_burst_disable(struct acpi_ec *ec)
- 				.wlen = 0, .rlen = 0};
- 
- 	return (acpi_ec_read_status(ec) & ACPI_EC_FLAG_BURST) ?
--				acpi_ec_transaction(ec, &t) : 0;
-+				acpi_ec_transaction_unlocked(ec, &t) : 0;
- }
- 
- static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 *data)
-@@ -873,6 +874,19 @@ static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 *data)
- 	return result;
- }
- 
-+static int acpi_ec_read_unlocked(struct acpi_ec *ec, u8 address, u8 *data)
-+{
-+	int result;
-+	u8 d;
-+	struct transaction t = {.command = ACPI_EC_COMMAND_READ,
-+				.wdata = &address, .rdata = &d,
-+				.wlen = 1, .rlen = 1};
-+
-+	result = acpi_ec_transaction_unlocked(ec, &t);
-+	*data = d;
-+	return result;
-+}
-+
- static int acpi_ec_write(struct acpi_ec *ec, u8 address, u8 data)
- {
- 	u8 wdata[2] = { address, data };
-@@ -883,6 +897,16 @@ static int acpi_ec_write(struct acpi_ec *ec, u8 address, u8 data)
- 	return acpi_ec_transaction(ec, &t);
- }
- 
-+static int acpi_ec_write_unlocked(struct acpi_ec *ec, u8 address, u8 data)
-+{
-+	u8 wdata[2] = { address, data };
-+	struct transaction t = {.command = ACPI_EC_COMMAND_WRITE,
-+				.wdata = wdata, .rdata = NULL,
-+				.wlen = 2, .rlen = 0};
-+
-+	return acpi_ec_transaction_unlocked(ec, &t);
-+}
-+
- int ec_read(u8 addr, u8 *val)
- {
- 	int err;
-@@ -1323,6 +1347,7 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
- 	struct acpi_ec *ec = handler_context;
- 	int result = 0, i, bytes = bits / 8;
- 	u8 *value = (u8 *)value64;
-+	u32 glk;
- 
- 	if ((address > 0xFF) || !value || !handler_context)
- 		return AE_BAD_PARAMETER;
-@@ -1330,13 +1355,25 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
- 	if (function != ACPI_READ && function != ACPI_WRITE)
- 		return AE_BAD_PARAMETER;
- 
-+	mutex_lock(&ec->mutex);
-+
-+	if (ec->global_lock) {
-+		acpi_status status;
-+
-+		status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &glk);
-+		if (ACPI_FAILURE(status)) {
-+			result = -ENODEV;
-+			goto unlock;
-+		}
-+	}
-+
- 	if (ec->busy_polling || bits > 8)
- 		acpi_ec_burst_enable(ec);
- 
- 	for (i = 0; i < bytes; ++i, ++address, ++value) {
- 		result = (function == ACPI_READ) ?
--			acpi_ec_read(ec, address, value) :
--			acpi_ec_write(ec, address, *value);
-+			acpi_ec_read_unlocked(ec, address, value) :
-+			acpi_ec_write_unlocked(ec, address, *value);
- 		if (result < 0)
- 			break;
- 	}
-@@ -1344,6 +1381,12 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
- 	if (ec->busy_polling || bits > 8)
- 		acpi_ec_burst_disable(ec);
- 
-+	if (ec->global_lock)
-+		acpi_release_global_lock(glk);
-+
-+unlock:
-+	mutex_unlock(&ec->mutex);
-+
- 	switch (result) {
- 	case -EINVAL:
- 		return AE_BAD_PARAMETER;
-diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
-index 3a13b22c8d9a54..95233b413c1ac5 100644
---- a/drivers/acpi/resource.c
-+++ b/drivers/acpi/resource.c
-@@ -439,6 +439,13 @@ static const struct dmi_system_id asus_laptop[] = {
- 			DMI_MATCH(DMI_BOARD_NAME, "S5602ZA"),
- 		},
- 	},
-+	{
-+		/* Asus Vivobook X1704VAP */
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+			DMI_MATCH(DMI_BOARD_NAME, "X1704VAP"),
-+		},
-+	},
- 	{
- 		.ident = "Asus ExpertBook B1402CBA",
- 		.matches = {
-@@ -502,6 +509,13 @@ static const struct dmi_system_id maingear_laptop[] = {
- 			DMI_MATCH(DMI_PRODUCT_NAME, "MG-VCP2-15A3070T"),
- 		}
- 	},
-+	{
-+		/* Asus ExpertBook B2502CVA */
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-+			DMI_MATCH(DMI_BOARD_NAME, "B2502CVA"),
-+		},
-+	},
- 	{
- 		/* TongFang GMxXGxx/TUXEDO Polaris 15 Gen5 AMD */
- 		.matches = {
-diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
-index 16ab2d9ef67f34..e96afb1622f95f 100644
---- a/drivers/acpi/video_detect.c
-+++ b/drivers/acpi/video_detect.c
-@@ -260,6 +260,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
- 		DMI_MATCH(DMI_PRODUCT_NAME, "PCG-FRV35"),
- 		},
- 	},
-+	{
-+	 .callback = video_detect_force_vendor,
-+	 /* Panasonic Toughbook CF-18 */
-+	 .matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "Matsushita Electric Industrial"),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "CF-18"),
-+		},
-+	},
- 
- 	/*
- 	 * Toshiba models with Transflective display, these need to use
-diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
-index 549ff24a982311..4edddf6bcc1507 100644
---- a/drivers/ata/pata_serverworks.c
-+++ b/drivers/ata/pata_serverworks.c
-@@ -46,10 +46,11 @@
- #define SVWKS_CSB5_REVISION_NEW	0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */
- #define SVWKS_CSB6_REVISION	0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */
- 
--/* Seagate Barracuda ATA IV Family drives in UDMA mode 5
-- * can overrun their FIFOs when used with the CSB5 */
--
--static const char *csb_bad_ata100[] = {
-+/*
-+ * Seagate Barracuda ATA IV Family drives in UDMA mode 5
-+ * can overrun their FIFOs when used with the CSB5.
-+ */
-+static const char * const csb_bad_ata100[] = {
- 	"ST320011A",
- 	"ST340016A",
- 	"ST360021A",
-@@ -163,10 +164,11 @@ static unsigned int serverworks_osb4_filter(struct ata_device *adev, unsigned in
-  *	@adev: ATA device
-  *	@mask: Mask of proposed modes
-  *
-- *	Check the blacklist and disable UDMA5 if matched
-+ *	Check the list of devices with broken UDMA5 and
-+ *	disable UDMA5 if matched.
-  */
--
--static unsigned int serverworks_csb_filter(struct ata_device *adev, unsigned int mask)
-+static unsigned int serverworks_csb_filter(struct ata_device *adev,
-+					   unsigned int mask)
- {
- 	const char *p;
- 	char model_num[ATA_ID_PROD_LEN + 1];
-diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
-index cc77c024828431..df095659bae0f5 100644
---- a/drivers/ata/sata_sil.c
-+++ b/drivers/ata/sata_sil.c
-@@ -128,7 +128,7 @@ static const struct pci_device_id sil_pci_tbl[] = {
- static const struct sil_drivelist {
- 	const char *product;
- 	unsigned int quirk;
--} sil_blacklist [] = {
-+} sil_quirks[] = {
- 	{ "ST320012AS",		SIL_QUIRK_MOD15WRITE },
- 	{ "ST330013AS",		SIL_QUIRK_MOD15WRITE },
- 	{ "ST340017AS",		SIL_QUIRK_MOD15WRITE },
-@@ -600,8 +600,8 @@ static void sil_thaw(struct ata_port *ap)
-  *	list, and apply the fixups to only the specific
-  *	devices/hosts/firmwares that need it.
-  *
-- *	20040111 - Seagate drives affected by the Mod15Write bug are blacklisted
-- *	The Maxtor quirk is in the blacklist, but I'm keeping the original
-+ *	20040111 - Seagate drives affected by the Mod15Write bug are quirked
-+ *	The Maxtor quirk is in sil_quirks, but I'm keeping the original
-  *	pessimistic fix for the following reasons...
-  *	- There seems to be less info on it, only one device gleaned off the
-  *	Windows	driver, maybe only one is affected.  More info would be greatly
-@@ -620,9 +620,9 @@ static void sil_dev_config(struct ata_device *dev)
- 
- 	ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
- 
--	for (n = 0; sil_blacklist[n].product; n++)
--		if (!strcmp(sil_blacklist[n].product, model_num)) {
--			quirks = sil_blacklist[n].quirk;
-+	for (n = 0; sil_quirks[n].product; n++)
-+		if (!strcmp(sil_quirks[n].product, model_num)) {
-+			quirks = sil_quirks[n].quirk;
- 			break;
- 		}
- 
-diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
-index cc9077b588d7e7..d1f4ddc576451a 100644
---- a/drivers/block/aoe/aoecmd.c
-+++ b/drivers/block/aoe/aoecmd.c
-@@ -361,6 +361,7 @@ ata_rw_frameinit(struct frame *f)
- 	}
- 
- 	ah->cmdstat = ATA_CMD_PIO_READ | writebit | extbit;
-+	dev_hold(t->ifp->nd);
- 	skb->dev = t->ifp->nd;
- }
- 
-@@ -401,6 +402,8 @@ aoecmd_ata_rw(struct aoedev *d)
- 		__skb_queue_head_init(&queue);
- 		__skb_queue_tail(&queue, skb);
- 		aoenet_xmit(&queue);
-+	} else {
-+		dev_put(f->t->ifp->nd);
- 	}
- 	return 1;
- }
-@@ -483,10 +486,13 @@ resend(struct aoedev *d, struct frame *f)
- 	memcpy(h->dst, t->addr, sizeof h->dst);
- 	memcpy(h->src, t->ifp->nd->dev_addr, sizeof h->src);
- 
-+	dev_hold(t->ifp->nd);
- 	skb->dev = t->ifp->nd;
- 	skb = skb_clone(skb, GFP_ATOMIC);
--	if (skb == NULL)
-+	if (skb == NULL) {
-+		dev_put(t->ifp->nd);
- 		return;
-+	}
- 	f->sent = ktime_get();
- 	__skb_queue_head_init(&queue);
- 	__skb_queue_tail(&queue, skb);
-@@ -617,6 +623,8 @@ probe(struct aoetgt *t)
- 		__skb_queue_head_init(&queue);
- 		__skb_queue_tail(&queue, skb);
- 		aoenet_xmit(&queue);
-+	} else {
-+		dev_put(f->t->ifp->nd);
- 	}
- }
- 
-@@ -1395,6 +1403,7 @@ aoecmd_ata_id(struct aoedev *d)
- 	ah->cmdstat = ATA_CMD_ID_ATA;
- 	ah->lba3 = 0xa0;
- 
-+	dev_hold(t->ifp->nd);
- 	skb->dev = t->ifp->nd;
- 
- 	d->rttavg = RTTAVG_INIT;
-@@ -1404,6 +1413,8 @@ aoecmd_ata_id(struct aoedev *d)
- 	skb = skb_clone(skb, GFP_ATOMIC);
- 	if (skb)
- 		f->sent = ktime_get();
-+	else
-+		dev_put(t->ifp->nd);
- 
- 	return skb;
- }
-diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 552f56a84a7eb2..886c6359903779 100644
---- a/drivers/block/loop.c
-+++ b/drivers/block/loop.c
-@@ -211,13 +211,10 @@ static void __loop_update_dio(struct loop_device *lo, bool dio)
- 	if (lo->lo_state == Lo_bound)
- 		blk_mq_freeze_queue(lo->lo_queue);
- 	lo->use_dio = use_dio;
--	if (use_dio) {
--		blk_queue_flag_clear(QUEUE_FLAG_NOMERGES, lo->lo_queue);
-+	if (use_dio)
- 		lo->lo_flags |= LO_FLAGS_DIRECT_IO;
--	} else {
--		blk_queue_flag_set(QUEUE_FLAG_NOMERGES, lo->lo_queue);
-+	else
- 		lo->lo_flags &= ~LO_FLAGS_DIRECT_IO;
--	}
- 	if (lo->lo_state == Lo_bound)
- 		blk_mq_unfreeze_queue(lo->lo_queue);
- }
-@@ -2038,14 +2035,6 @@ static int loop_add(int i)
- 
- 	blk_queue_max_hw_sectors(lo->lo_queue, BLK_DEF_MAX_SECTORS);
- 
--	/*
--	 * By default, we do buffer IO, so it doesn't make sense to enable
--	 * merge because the I/O submitted to backing file is handled page by
--	 * page. For directio mode, merge does help to dispatch bigger request
--	 * to underlayer disk. We will enable merge once directio is enabled.
--	 */
--	blk_queue_flag_set(QUEUE_FLAG_NOMERGES, lo->lo_queue);
--
- 	/*
- 	 * Disable partition scanning by default. The in-kernel partition
- 	 * scanning can be requested individually per-device during its
-diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c
-index f1b7d7fdffec84..97ed3bd9707f41 100644
---- a/drivers/block/null_blk/main.c
-+++ b/drivers/block/null_blk/main.c
-@@ -392,13 +392,25 @@ static int nullb_update_nr_hw_queues(struct nullb_device *dev,
- static int nullb_apply_submit_queues(struct nullb_device *dev,
- 				     unsigned int submit_queues)
- {
--	return nullb_update_nr_hw_queues(dev, submit_queues, dev->poll_queues);
-+	int ret;
-+
-+	mutex_lock(&lock);
-+	ret = nullb_update_nr_hw_queues(dev, submit_queues, dev->poll_queues);
-+	mutex_unlock(&lock);
-+
-+	return ret;
- }
- 
- static int nullb_apply_poll_queues(struct nullb_device *dev,
- 				   unsigned int poll_queues)
- {
--	return nullb_update_nr_hw_queues(dev, dev->submit_queues, poll_queues);
-+	int ret;
-+
-+	mutex_lock(&lock);
-+	ret = nullb_update_nr_hw_queues(dev, dev->submit_queues, poll_queues);
-+	mutex_unlock(&lock);
-+
-+	return ret;
- }
- 
- NULLB_DEVICE_ATTR(size, ulong, NULL);
-@@ -444,28 +456,32 @@ static ssize_t nullb_device_power_store(struct config_item *item,
- 	if (ret < 0)
- 		return ret;
- 
-+	ret = count;
-+	mutex_lock(&lock);
- 	if (!dev->power && newp) {
- 		if (test_and_set_bit(NULLB_DEV_FL_UP, &dev->flags))
--			return count;
-+			goto out;
-+
- 		ret = null_add_dev(dev);
- 		if (ret) {
- 			clear_bit(NULLB_DEV_FL_UP, &dev->flags);
--			return ret;
-+			goto out;
- 		}
- 
- 		set_bit(NULLB_DEV_FL_CONFIGURED, &dev->flags);
- 		dev->power = newp;
-+		ret = count;
- 	} else if (dev->power && !newp) {
- 		if (test_and_clear_bit(NULLB_DEV_FL_UP, &dev->flags)) {
--			mutex_lock(&lock);
- 			dev->power = newp;
- 			null_del_dev(dev->nullb);
--			mutex_unlock(&lock);
- 		}
- 		clear_bit(NULLB_DEV_FL_CONFIGURED, &dev->flags);
- 	}
- 
--	return count;
-+out:
-+	mutex_unlock(&lock);
-+	return ret;
- }
- 
- CONFIGFS_ATTR(nullb_device_, power);
-@@ -1819,7 +1835,7 @@ static void null_del_dev(struct nullb *nullb)
- 
- 	dev = nullb->dev;
- 
--	ida_simple_remove(&nullb_indexes, nullb->index);
-+	ida_free(&nullb_indexes, nullb->index);
- 
- 	list_del_init(&nullb->list);
- 
-@@ -2153,15 +2169,12 @@ static int null_add_dev(struct nullb_device *dev)
- 	nullb->q->queuedata = nullb;
- 	blk_queue_flag_set(QUEUE_FLAG_NONROT, nullb->q);
- 
--	mutex_lock(&lock);
--	rv = ida_simple_get(&nullb_indexes, 0, 0, GFP_KERNEL);
--	if (rv < 0) {
--		mutex_unlock(&lock);
-+	rv = ida_alloc(&nullb_indexes, GFP_KERNEL);
-+	if (rv < 0)
- 		goto out_cleanup_zone;
--	}
-+
- 	nullb->index = rv;
- 	dev->index = rv;
--	mutex_unlock(&lock);
- 
- 	blk_queue_logical_block_size(nullb->q, dev->blocksize);
- 	blk_queue_physical_block_size(nullb->q, dev->blocksize);
-@@ -2185,9 +2198,7 @@ static int null_add_dev(struct nullb_device *dev)
- 	if (rv)
- 		goto out_ida_free;
- 
--	mutex_lock(&lock);
- 	list_add_tail(&nullb->list, &nullb_list);
--	mutex_unlock(&lock);
- 
- 	pr_info("disk %s created\n", nullb->disk_name);
- 
-@@ -2236,7 +2247,9 @@ static int null_create_dev(void)
- 	if (!dev)
- 		return -ENOMEM;
- 
-+	mutex_lock(&lock);
- 	ret = null_add_dev(dev);
-+	mutex_unlock(&lock);
- 	if (ret) {
- 		null_free_dev(dev);
- 		return ret;
-diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
-index d76c799553aaa1..468e4165c7cc0e 100644
---- a/drivers/bluetooth/btmrvl_sdio.c
-+++ b/drivers/bluetooth/btmrvl_sdio.c
-@@ -92,7 +92,7 @@ static int btmrvl_sdio_probe_of(struct device *dev,
- 		} else {
- 			ret = devm_request_irq(dev, cfg->irq_bt,
- 					       btmrvl_wake_irq_bt,
--					       0, "bt_wake", card);
-+					       IRQF_NO_AUTOEN, "bt_wake", card);
- 			if (ret) {
- 				dev_err(dev,
- 					"Failed to request irq_bt %d (%d)\n",
-@@ -101,7 +101,6 @@ static int btmrvl_sdio_probe_of(struct device *dev,
- 
- 			/* Configure wakeup (enabled by default) */
- 			device_init_wakeup(dev, true);
--			disable_irq(cfg->irq_bt);
- 		}
- 	}
- 
-diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
-index 277d039ecbb429..1e7c1f9db9e4b9 100644
---- a/drivers/bluetooth/btrtl.c
-+++ b/drivers/bluetooth/btrtl.c
-@@ -1285,6 +1285,7 @@ void btrtl_set_quirks(struct hci_dev *hdev, struct btrtl_device_info *btrtl_dev)
- 			btrealtek_set_flag(hdev, REALTEK_ALT6_CONTINUOUS_TX_CHIP);
- 
- 		if (btrtl_dev->project_id == CHIP_ID_8852A ||
-+		    btrtl_dev->project_id == CHIP_ID_8852B ||
- 		    btrtl_dev->project_id == CHIP_ID_8852C)
- 			set_bit(HCI_QUIRK_USE_MSFT_EXT_ADDRESS_FILTER, &hdev->quirks);
- 
-diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index 0a58106207b0c3..bc53da383f855a 100644
---- a/drivers/bluetooth/btusb.c
-+++ b/drivers/bluetooth/btusb.c
-@@ -537,6 +537,8 @@ static const struct usb_device_id quirks_table[] = {
- 						     BTUSB_WIDEBAND_SPEECH },
- 	{ USB_DEVICE(0x13d3, 0x3592), .driver_info = BTUSB_REALTEK |
- 						     BTUSB_WIDEBAND_SPEECH },
-+	{ USB_DEVICE(0x0489, 0xe122), .driver_info = BTUSB_REALTEK |
-+						     BTUSB_WIDEBAND_SPEECH },
- 
- 	/* Realtek 8852BE Bluetooth devices */
- 	{ USB_DEVICE(0x0cb8, 0xc559), .driver_info = BTUSB_REALTEK |
-diff --git a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c
-index 7464cf64803fd7..8b3e5f84e89a77 100644
---- a/drivers/clk/qcom/clk-alpha-pll.c
-+++ b/drivers/clk/qcom/clk-alpha-pll.c
-@@ -1638,7 +1638,7 @@ static int __alpha_pll_trion_set_rate(struct clk_hw *hw, unsigned long rate,
- 	if (ret < 0)
- 		return ret;
- 
--	regmap_write(pll->clkr.regmap, PLL_L_VAL(pll), l);
-+	regmap_update_bits(pll->clkr.regmap, PLL_L_VAL(pll), LUCID_EVO_PLL_L_VAL_MASK,  l);
- 	regmap_write(pll->clkr.regmap, PLL_ALPHA_VAL(pll), a);
- 
- 	/* Latch the PLL input */
-diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
-index 4c5b552b47b6a1..a556c9e77d192d 100644
---- a/drivers/clk/qcom/clk-rpmh.c
-+++ b/drivers/clk/qcom/clk-rpmh.c
-@@ -263,6 +263,8 @@ static int clk_rpmh_bcm_send_cmd(struct clk_rpmh *c, bool enable)
- 		cmd_state = 0;
- 	}
- 
-+	cmd_state = min(cmd_state, BCM_TCS_CMD_VOTE_MASK);
-+
- 	if (c->last_sent_aggr_state != cmd_state) {
- 		cmd.addr = c->res_addr;
- 		cmd.data = BCM_TCS_CMD(1, enable, 0, cmd_state);
-diff --git a/drivers/clk/qcom/dispcc-sm8250.c b/drivers/clk/qcom/dispcc-sm8250.c
-index 9a9e0852c91f23..317a7e2b50bfbc 100644
---- a/drivers/clk/qcom/dispcc-sm8250.c
-+++ b/drivers/clk/qcom/dispcc-sm8250.c
-@@ -851,6 +851,7 @@ static struct clk_branch disp_cc_mdss_dp_link1_intf_clk = {
- 				&disp_cc_mdss_dp_link1_div_clk_src.clkr.hw,
- 			},
- 			.num_parents = 1,
-+			.flags = CLK_SET_RATE_PARENT,
- 			.ops = &clk_branch2_ops,
- 		},
- 	},
-@@ -886,6 +887,7 @@ static struct clk_branch disp_cc_mdss_dp_link_intf_clk = {
- 				&disp_cc_mdss_dp_link_div_clk_src.clkr.hw,
- 			},
- 			.num_parents = 1,
-+			.flags = CLK_SET_RATE_PARENT,
- 			.ops = &clk_branch2_ops,
- 		},
- 	},
-@@ -1011,6 +1013,7 @@ static struct clk_branch disp_cc_mdss_mdp_lut_clk = {
- 				&disp_cc_mdss_mdp_clk_src.clkr.hw,
- 			},
- 			.num_parents = 1,
-+			.flags = CLK_SET_RATE_PARENT,
- 			.ops = &clk_branch2_ops,
- 		},
- 	},
-diff --git a/drivers/clk/qcom/gcc-sc8180x.c b/drivers/clk/qcom/gcc-sc8180x.c
-index ae21473815596d..ec0c45881c67a7 100644
---- a/drivers/clk/qcom/gcc-sc8180x.c
-+++ b/drivers/clk/qcom/gcc-sc8180x.c
-@@ -142,6 +142,23 @@ static struct clk_alpha_pll gpll7 = {
- 	},
- };
- 
-+static struct clk_alpha_pll gpll9 = {
-+	.offset = 0x1c000,
-+	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_TRION],
-+	.clkr = {
-+		.enable_reg = 0x52000,
-+		.enable_mask = BIT(9),
-+		.hw.init = &(const struct clk_init_data) {
-+			.name = "gpll9",
-+			.parent_data = &(const struct clk_parent_data) {
-+				.fw_name = "bi_tcxo",
-+			},
-+			.num_parents = 1,
-+			.ops = &clk_alpha_pll_fixed_trion_ops,
-+		},
-+	},
-+};
-+
- static const struct parent_map gcc_parent_map_0[] = {
- 	{ P_BI_TCXO, 0 },
- 	{ P_GPLL0_OUT_MAIN, 1 },
-@@ -241,7 +258,7 @@ static const struct parent_map gcc_parent_map_7[] = {
- static const struct clk_parent_data gcc_parents_7[] = {
- 	{ .fw_name = "bi_tcxo", },
- 	{ .hw = &gpll0.clkr.hw },
--	{ .name = "gppl9" },
-+	{ .hw = &gpll9.clkr.hw },
- 	{ .hw = &gpll4.clkr.hw },
- 	{ .hw = &gpll0_out_even.clkr.hw },
- };
-@@ -260,28 +277,6 @@ static const struct clk_parent_data gcc_parents_8[] = {
- 	{ .hw = &gpll0_out_even.clkr.hw },
- };
- 
--static const struct freq_tbl ftbl_gcc_cpuss_ahb_clk_src[] = {
--	F(19200000, P_BI_TCXO, 1, 0, 0),
--	F(50000000, P_GPLL0_OUT_MAIN, 12, 0, 0),
--	F(100000000, P_GPLL0_OUT_MAIN, 6, 0, 0),
--	{ }
--};
--
--static struct clk_rcg2 gcc_cpuss_ahb_clk_src = {
--	.cmd_rcgr = 0x48014,
--	.mnd_width = 0,
--	.hid_width = 5,
--	.parent_map = gcc_parent_map_0,
--	.freq_tbl = ftbl_gcc_cpuss_ahb_clk_src,
--	.clkr.hw.init = &(struct clk_init_data){
--		.name = "gcc_cpuss_ahb_clk_src",
--		.parent_data = gcc_parents_0,
--		.num_parents = ARRAY_SIZE(gcc_parents_0),
--		.flags = CLK_SET_RATE_PARENT,
--		.ops = &clk_rcg2_ops,
--	},
--};
--
- static const struct freq_tbl ftbl_gcc_emac_ptp_clk_src[] = {
- 	F(19200000, P_BI_TCXO, 1, 0, 0),
- 	F(50000000, P_GPLL0_OUT_EVEN, 6, 0, 0),
-@@ -916,7 +911,7 @@ static const struct freq_tbl ftbl_gcc_sdcc2_apps_clk_src[] = {
- 	F(25000000, P_GPLL0_OUT_MAIN, 12, 1, 2),
- 	F(50000000, P_GPLL0_OUT_MAIN, 12, 0, 0),
- 	F(100000000, P_GPLL0_OUT_MAIN, 6, 0, 0),
--	F(200000000, P_GPLL0_OUT_MAIN, 3, 0, 0),
-+	F(202000000, P_GPLL9_OUT_MAIN, 4, 0, 0),
- 	{ }
- };
- 
-@@ -939,9 +934,8 @@ static const struct freq_tbl ftbl_gcc_sdcc4_apps_clk_src[] = {
- 	F(400000, P_BI_TCXO, 12, 1, 4),
- 	F(9600000, P_BI_TCXO, 2, 0, 0),
- 	F(19200000, P_BI_TCXO, 1, 0, 0),
--	F(37500000, P_GPLL0_OUT_MAIN, 16, 0, 0),
- 	F(50000000, P_GPLL0_OUT_MAIN, 12, 0, 0),
--	F(75000000, P_GPLL0_OUT_MAIN, 8, 0, 0),
-+	F(100000000, P_GPLL0_OUT_MAIN, 6, 0, 0),
- 	{ }
- };
- 
-@@ -1599,25 +1593,6 @@ static struct clk_branch gcc_cfg_noc_usb3_sec_axi_clk = {
- 	},
- };
- 
--/* For CPUSS functionality the AHB clock needs to be left enabled */
--static struct clk_branch gcc_cpuss_ahb_clk = {
--	.halt_reg = 0x48000,
--	.halt_check = BRANCH_HALT_VOTED,
--	.clkr = {
--		.enable_reg = 0x52004,
--		.enable_mask = BIT(21),
--		.hw.init = &(struct clk_init_data){
--			.name = "gcc_cpuss_ahb_clk",
--			.parent_hws = (const struct clk_hw *[]){
--				      &gcc_cpuss_ahb_clk_src.clkr.hw
--			},
--			.num_parents = 1,
--			.flags = CLK_IS_CRITICAL | CLK_SET_RATE_PARENT,
--			.ops = &clk_branch2_ops,
--		},
--	},
--};
--
- static struct clk_branch gcc_cpuss_rbcpr_clk = {
- 	.halt_reg = 0x48008,
- 	.halt_check = BRANCH_HALT,
-@@ -3150,25 +3125,6 @@ static struct clk_branch gcc_sdcc4_apps_clk = {
- 	},
- };
- 
--/* For CPUSS functionality the SYS NOC clock needs to be left enabled */
--static struct clk_branch gcc_sys_noc_cpuss_ahb_clk = {
--	.halt_reg = 0x4819c,
--	.halt_check = BRANCH_HALT_VOTED,
--	.clkr = {
--		.enable_reg = 0x52004,
--		.enable_mask = BIT(0),
--		.hw.init = &(struct clk_init_data){
--			.name = "gcc_sys_noc_cpuss_ahb_clk",
--			.parent_hws = (const struct clk_hw *[]){
--				      &gcc_cpuss_ahb_clk_src.clkr.hw
--			},
--			.num_parents = 1,
--			.flags = CLK_IS_CRITICAL | CLK_SET_RATE_PARENT,
--			.ops = &clk_branch2_ops,
--		},
--	},
--};
--
- static struct clk_branch gcc_tsif_ahb_clk = {
- 	.halt_reg = 0x36004,
- 	.halt_check = BRANCH_HALT,
-@@ -4258,8 +4214,6 @@ static struct clk_regmap *gcc_sc8180x_clocks[] = {
- 	[GCC_CFG_NOC_USB3_MP_AXI_CLK] = &gcc_cfg_noc_usb3_mp_axi_clk.clkr,
- 	[GCC_CFG_NOC_USB3_PRIM_AXI_CLK] = &gcc_cfg_noc_usb3_prim_axi_clk.clkr,
- 	[GCC_CFG_NOC_USB3_SEC_AXI_CLK] = &gcc_cfg_noc_usb3_sec_axi_clk.clkr,
--	[GCC_CPUSS_AHB_CLK] = &gcc_cpuss_ahb_clk.clkr,
--	[GCC_CPUSS_AHB_CLK_SRC] = &gcc_cpuss_ahb_clk_src.clkr,
- 	[GCC_CPUSS_RBCPR_CLK] = &gcc_cpuss_rbcpr_clk.clkr,
- 	[GCC_DDRSS_GPU_AXI_CLK] = &gcc_ddrss_gpu_axi_clk.clkr,
- 	[GCC_DISP_HF_AXI_CLK] = &gcc_disp_hf_axi_clk.clkr,
-@@ -4396,7 +4350,6 @@ static struct clk_regmap *gcc_sc8180x_clocks[] = {
- 	[GCC_SDCC4_AHB_CLK] = &gcc_sdcc4_ahb_clk.clkr,
- 	[GCC_SDCC4_APPS_CLK] = &gcc_sdcc4_apps_clk.clkr,
- 	[GCC_SDCC4_APPS_CLK_SRC] = &gcc_sdcc4_apps_clk_src.clkr,
--	[GCC_SYS_NOC_CPUSS_AHB_CLK] = &gcc_sys_noc_cpuss_ahb_clk.clkr,
- 	[GCC_TSIF_AHB_CLK] = &gcc_tsif_ahb_clk.clkr,
- 	[GCC_TSIF_INACTIVITY_TIMERS_CLK] = &gcc_tsif_inactivity_timers_clk.clkr,
- 	[GCC_TSIF_REF_CLK] = &gcc_tsif_ref_clk.clkr,
-@@ -4483,6 +4436,7 @@ static struct clk_regmap *gcc_sc8180x_clocks[] = {
- 	[GPLL1] = &gpll1.clkr,
- 	[GPLL4] = &gpll4.clkr,
- 	[GPLL7] = &gpll7.clkr,
-+	[GPLL9] = &gpll9.clkr,
- };
- 
- static const struct qcom_reset_map gcc_sc8180x_resets[] = {
-diff --git a/drivers/clk/qcom/gcc-sm8250.c b/drivers/clk/qcom/gcc-sm8250.c
-index c6c5261264f118..272da807c6945d 100644
---- a/drivers/clk/qcom/gcc-sm8250.c
-+++ b/drivers/clk/qcom/gcc-sm8250.c
-@@ -3226,7 +3226,7 @@ static struct gdsc pcie_0_gdsc = {
- 	.pd = {
- 		.name = "pcie_0_gdsc",
- 	},
--	.pwrsts = PWRSTS_OFF_ON,
-+	.pwrsts = PWRSTS_RET_ON,
- };
- 
- static struct gdsc pcie_1_gdsc = {
-@@ -3234,7 +3234,7 @@ static struct gdsc pcie_1_gdsc = {
- 	.pd = {
- 		.name = "pcie_1_gdsc",
- 	},
--	.pwrsts = PWRSTS_OFF_ON,
-+	.pwrsts = PWRSTS_RET_ON,
- };
- 
- static struct gdsc pcie_2_gdsc = {
-@@ -3242,7 +3242,7 @@ static struct gdsc pcie_2_gdsc = {
- 	.pd = {
- 		.name = "pcie_2_gdsc",
- 	},
--	.pwrsts = PWRSTS_OFF_ON,
-+	.pwrsts = PWRSTS_RET_ON,
- };
- 
- static struct gdsc ufs_card_gdsc = {
-diff --git a/drivers/clk/qcom/gcc-sm8450.c b/drivers/clk/qcom/gcc-sm8450.c
-index 56354298255160..4c55df89ddca7d 100644
---- a/drivers/clk/qcom/gcc-sm8450.c
-+++ b/drivers/clk/qcom/gcc-sm8450.c
-@@ -2974,7 +2974,7 @@ static struct gdsc pcie_0_gdsc = {
- 	.pd = {
- 		.name = "pcie_0_gdsc",
- 	},
--	.pwrsts = PWRSTS_OFF_ON,
-+	.pwrsts = PWRSTS_RET_ON,
- };
- 
- static struct gdsc pcie_1_gdsc = {
-@@ -2982,7 +2982,7 @@ static struct gdsc pcie_1_gdsc = {
- 	.pd = {
- 		.name = "pcie_1_gdsc",
- 	},
--	.pwrsts = PWRSTS_OFF_ON,
-+	.pwrsts = PWRSTS_RET_ON,
- };
- 
- static struct gdsc ufs_phy_gdsc = {
-diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c
-index 4059d9365ae642..b9d6ffcb340912 100644
---- a/drivers/clk/rockchip/clk.c
-+++ b/drivers/clk/rockchip/clk.c
-@@ -433,12 +433,13 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx,
- 				    struct rockchip_clk_branch *list,
- 				    unsigned int nr_clk)
- {
--	struct clk *clk = NULL;
-+	struct clk *clk;
- 	unsigned int idx;
- 	unsigned long flags;
- 
- 	for (idx = 0; idx < nr_clk; idx++, list++) {
- 		flags = list->flags;
-+		clk = NULL;
- 
- 		/* catch simple muxes */
- 		switch (list->branch_type) {
-diff --git a/drivers/clk/samsung/clk-exynos7885.c b/drivers/clk/samsung/clk-exynos7885.c
-index f7d7427a558ba0..87387d4cbf48a2 100644
---- a/drivers/clk/samsung/clk-exynos7885.c
-+++ b/drivers/clk/samsung/clk-exynos7885.c
-@@ -20,7 +20,7 @@
- #define CLKS_NR_TOP			(CLK_GOUT_FSYS_USB30DRD + 1)
- #define CLKS_NR_CORE			(CLK_GOUT_TREX_P_CORE_PCLK_P_CORE + 1)
- #define CLKS_NR_PERI			(CLK_GOUT_WDT1_PCLK + 1)
--#define CLKS_NR_FSYS			(CLK_GOUT_MMC_SDIO_SDCLKIN + 1)
-+#define CLKS_NR_FSYS			(CLK_MOUT_FSYS_USB30DRD_USER + 1)
- 
- /* ---- CMU_TOP ------------------------------------------------------------- */
- 
-diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
-index 0ee3a04bb1022f..8a4fdf212ce0de 100644
---- a/drivers/cpufreq/intel_pstate.c
-+++ b/drivers/cpufreq/intel_pstate.c
-@@ -1632,7 +1632,7 @@ static void intel_pstate_notify_work(struct work_struct *work)
- 	wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_STATUS, 0);
- }
- 
--static DEFINE_SPINLOCK(hwp_notify_lock);
-+static DEFINE_RAW_SPINLOCK(hwp_notify_lock);
- static cpumask_t hwp_intr_enable_mask;
- 
- void notify_hwp_interrupt(void)
-@@ -1649,7 +1649,7 @@ void notify_hwp_interrupt(void)
- 	if (!(value & 0x01))
- 		return;
- 
--	spin_lock_irqsave(&hwp_notify_lock, flags);
-+	raw_spin_lock_irqsave(&hwp_notify_lock, flags);
- 
- 	if (!cpumask_test_cpu(this_cpu, &hwp_intr_enable_mask))
- 		goto ack_intr;
-@@ -1673,13 +1673,13 @@ void notify_hwp_interrupt(void)
- 
- 	schedule_delayed_work(&cpudata->hwp_notify_work, msecs_to_jiffies(10));
- 
--	spin_unlock_irqrestore(&hwp_notify_lock, flags);
-+	raw_spin_unlock_irqrestore(&hwp_notify_lock, flags);
- 
- 	return;
- 
- ack_intr:
- 	wrmsrl_safe(MSR_HWP_STATUS, 0);
--	spin_unlock_irqrestore(&hwp_notify_lock, flags);
-+	raw_spin_unlock_irqrestore(&hwp_notify_lock, flags);
- }
- 
- static void intel_pstate_disable_hwp_interrupt(struct cpudata *cpudata)
-@@ -1692,10 +1692,10 @@ static void intel_pstate_disable_hwp_interrupt(struct cpudata *cpudata)
- 	/* wrmsrl_on_cpu has to be outside spinlock as this can result in IPC */
- 	wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_INTERRUPT, 0x00);
- 
--	spin_lock_irqsave(&hwp_notify_lock, flags);
-+	raw_spin_lock_irqsave(&hwp_notify_lock, flags);
- 	if (cpumask_test_and_clear_cpu(cpudata->cpu, &hwp_intr_enable_mask))
- 		cancel_delayed_work(&cpudata->hwp_notify_work);
--	spin_unlock_irqrestore(&hwp_notify_lock, flags);
-+	raw_spin_unlock_irqrestore(&hwp_notify_lock, flags);
- }
- 
- static void intel_pstate_enable_hwp_interrupt(struct cpudata *cpudata)
-@@ -1704,10 +1704,10 @@ static void intel_pstate_enable_hwp_interrupt(struct cpudata *cpudata)
- 	if (boot_cpu_has(X86_FEATURE_HWP_NOTIFY)) {
- 		unsigned long flags;
- 
--		spin_lock_irqsave(&hwp_notify_lock, flags);
-+		raw_spin_lock_irqsave(&hwp_notify_lock, flags);
- 		INIT_DELAYED_WORK(&cpudata->hwp_notify_work, intel_pstate_notify_work);
- 		cpumask_set_cpu(cpudata->cpu, &hwp_intr_enable_mask);
--		spin_unlock_irqrestore(&hwp_notify_lock, flags);
-+		raw_spin_unlock_irqrestore(&hwp_notify_lock, flags);
- 
- 		/* wrmsrl_on_cpu has to be outside spinlock as this can result in IPC */
- 		wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_INTERRUPT, 0x01);
-@@ -3136,10 +3136,10 @@ static void intel_pstate_driver_cleanup(void)
- 			if (intel_pstate_driver == &intel_pstate)
- 				intel_pstate_clear_update_util_hook(cpu);
- 
--			spin_lock(&hwp_notify_lock);
-+			raw_spin_lock(&hwp_notify_lock);
- 			kfree(all_cpu_data[cpu]);
- 			WRITE_ONCE(all_cpu_data[cpu], NULL);
--			spin_unlock(&hwp_notify_lock);
-+			raw_spin_unlock(&hwp_notify_lock);
- 		}
- 	}
- 	cpus_read_unlock();
-diff --git a/drivers/crypto/marvell/Kconfig b/drivers/crypto/marvell/Kconfig
-index a48591af12d025..78217577aa5403 100644
---- a/drivers/crypto/marvell/Kconfig
-+++ b/drivers/crypto/marvell/Kconfig
-@@ -28,6 +28,7 @@ config CRYPTO_DEV_OCTEONTX_CPT
- 	select CRYPTO_SKCIPHER
- 	select CRYPTO_HASH
- 	select CRYPTO_AEAD
-+	select CRYPTO_AUTHENC
- 	select CRYPTO_DEV_MARVELL
- 	help
- 		This driver allows you to utilize the Marvell Cryptographic
-@@ -47,6 +48,7 @@ config CRYPTO_DEV_OCTEONTX2_CPT
- 	select CRYPTO_SKCIPHER
- 	select CRYPTO_HASH
- 	select CRYPTO_AEAD
-+	select CRYPTO_AUTHENC
- 	select NET_DEVLINK
- 	help
- 		This driver allows you to utilize the Marvell Cryptographic
-diff --git a/drivers/crypto/marvell/octeontx/otx_cptvf_algs.c b/drivers/crypto/marvell/octeontx/otx_cptvf_algs.c
-index 1c2c870e887aab..f64b72398eced9 100644
---- a/drivers/crypto/marvell/octeontx/otx_cptvf_algs.c
-+++ b/drivers/crypto/marvell/octeontx/otx_cptvf_algs.c
-@@ -17,7 +17,6 @@
- #include <crypto/sha2.h>
- #include <crypto/xts.h>
- #include <crypto/scatterwalk.h>
--#include <linux/rtnetlink.h>
- #include <linux/sort.h>
- #include <linux/module.h>
- #include "otx_cptvf.h"
-@@ -66,6 +65,8 @@ static struct cpt_device_table ae_devices = {
- 	.count = ATOMIC_INIT(0)
- };
- 
-+static struct otx_cpt_sdesc *alloc_sdesc(struct crypto_shash *alg);
-+
- static inline int get_se_device(struct pci_dev **pdev, int *cpu_num)
- {
- 	int count, ret = 0;
-@@ -515,44 +516,61 @@ static int cpt_aead_init(struct crypto_aead *tfm, u8 cipher_type, u8 mac_type)
- 	ctx->cipher_type = cipher_type;
- 	ctx->mac_type = mac_type;
- 
-+	switch (ctx->mac_type) {
-+	case OTX_CPT_SHA1:
-+		ctx->hashalg = crypto_alloc_shash("sha1", 0, 0);
-+		break;
-+
-+	case OTX_CPT_SHA256:
-+		ctx->hashalg = crypto_alloc_shash("sha256", 0, 0);
-+		break;
-+
-+	case OTX_CPT_SHA384:
-+		ctx->hashalg = crypto_alloc_shash("sha384", 0, 0);
-+		break;
-+
-+	case OTX_CPT_SHA512:
-+		ctx->hashalg = crypto_alloc_shash("sha512", 0, 0);
-+		break;
-+	}
-+
-+	if (IS_ERR(ctx->hashalg))
-+		return PTR_ERR(ctx->hashalg);
-+
-+	crypto_aead_set_reqsize_dma(tfm, sizeof(struct otx_cpt_req_ctx));
-+
-+	if (!ctx->hashalg)
-+		return 0;
-+
- 	/*
- 	 * When selected cipher is NULL we use HMAC opcode instead of
- 	 * FLEXICRYPTO opcode therefore we don't need to use HASH algorithms
- 	 * for calculating ipad and opad
- 	 */
- 	if (ctx->cipher_type != OTX_CPT_CIPHER_NULL) {
--		switch (ctx->mac_type) {
--		case OTX_CPT_SHA1:
--			ctx->hashalg = crypto_alloc_shash("sha1", 0,
--							  CRYPTO_ALG_ASYNC);
--			if (IS_ERR(ctx->hashalg))
--				return PTR_ERR(ctx->hashalg);
--			break;
--
--		case OTX_CPT_SHA256:
--			ctx->hashalg = crypto_alloc_shash("sha256", 0,
--							  CRYPTO_ALG_ASYNC);
--			if (IS_ERR(ctx->hashalg))
--				return PTR_ERR(ctx->hashalg);
--			break;
-+		int ss = crypto_shash_statesize(ctx->hashalg);
- 
--		case OTX_CPT_SHA384:
--			ctx->hashalg = crypto_alloc_shash("sha384", 0,
--							  CRYPTO_ALG_ASYNC);
--			if (IS_ERR(ctx->hashalg))
--				return PTR_ERR(ctx->hashalg);
--			break;
-+		ctx->ipad = kzalloc(ss, GFP_KERNEL);
-+		if (!ctx->ipad) {
-+			crypto_free_shash(ctx->hashalg);
-+			return -ENOMEM;
-+		}
- 
--		case OTX_CPT_SHA512:
--			ctx->hashalg = crypto_alloc_shash("sha512", 0,
--							  CRYPTO_ALG_ASYNC);
--			if (IS_ERR(ctx->hashalg))
--				return PTR_ERR(ctx->hashalg);
--			break;
-+		ctx->opad = kzalloc(ss, GFP_KERNEL);
-+		if (!ctx->opad) {
-+			kfree(ctx->ipad);
-+			crypto_free_shash(ctx->hashalg);
-+			return -ENOMEM;
- 		}
- 	}
- 
--	crypto_aead_set_reqsize_dma(tfm, sizeof(struct otx_cpt_req_ctx));
-+	ctx->sdesc = alloc_sdesc(ctx->hashalg);
-+	if (!ctx->sdesc) {
-+		kfree(ctx->opad);
-+		kfree(ctx->ipad);
-+		crypto_free_shash(ctx->hashalg);
-+		return -ENOMEM;
-+	}
- 
- 	return 0;
- }
-@@ -608,8 +626,7 @@ static void otx_cpt_aead_exit(struct crypto_aead *tfm)
- 
- 	kfree(ctx->ipad);
- 	kfree(ctx->opad);
--	if (ctx->hashalg)
--		crypto_free_shash(ctx->hashalg);
-+	crypto_free_shash(ctx->hashalg);
- 	kfree(ctx->sdesc);
- }
- 
-@@ -705,7 +722,7 @@ static inline void swap_data64(void *buf, u32 len)
- 		*dst = cpu_to_be64p(src);
- }
- 
--static int copy_pad(u8 mac_type, u8 *out_pad, u8 *in_pad)
-+static int swap_pad(u8 mac_type, u8 *pad)
- {
- 	struct sha512_state *sha512;
- 	struct sha256_state *sha256;
-@@ -713,22 +730,19 @@ static int copy_pad(u8 mac_type, u8 *out_pad, u8 *in_pad)
- 
- 	switch (mac_type) {
- 	case OTX_CPT_SHA1:
--		sha1 = (struct sha1_state *) in_pad;
-+		sha1 = (struct sha1_state *)pad;
- 		swap_data32(sha1->state, SHA1_DIGEST_SIZE);
--		memcpy(out_pad, &sha1->state, SHA1_DIGEST_SIZE);
- 		break;
- 
- 	case OTX_CPT_SHA256:
--		sha256 = (struct sha256_state *) in_pad;
-+		sha256 = (struct sha256_state *)pad;
- 		swap_data32(sha256->state, SHA256_DIGEST_SIZE);
--		memcpy(out_pad, &sha256->state, SHA256_DIGEST_SIZE);
- 		break;
- 
- 	case OTX_CPT_SHA384:
- 	case OTX_CPT_SHA512:
--		sha512 = (struct sha512_state *) in_pad;
-+		sha512 = (struct sha512_state *)pad;
- 		swap_data64(sha512->state, SHA512_DIGEST_SIZE);
--		memcpy(out_pad, &sha512->state, SHA512_DIGEST_SIZE);
- 		break;
- 
- 	default:
-@@ -738,55 +752,53 @@ static int copy_pad(u8 mac_type, u8 *out_pad, u8 *in_pad)
- 	return 0;
- }
- 
--static int aead_hmac_init(struct crypto_aead *cipher)
-+static int aead_hmac_init(struct crypto_aead *cipher,
-+			  struct crypto_authenc_keys *keys)
- {
- 	struct otx_cpt_aead_ctx *ctx = crypto_aead_ctx_dma(cipher);
--	int state_size = crypto_shash_statesize(ctx->hashalg);
- 	int ds = crypto_shash_digestsize(ctx->hashalg);
- 	int bs = crypto_shash_blocksize(ctx->hashalg);
--	int authkeylen = ctx->auth_key_len;
-+	int authkeylen = keys->authkeylen;
- 	u8 *ipad = NULL, *opad = NULL;
--	int ret = 0, icount = 0;
-+	int icount = 0;
-+	int ret;
- 
--	ctx->sdesc = alloc_sdesc(ctx->hashalg);
--	if (!ctx->sdesc)
--		return -ENOMEM;
-+	if (authkeylen > bs) {
-+		ret = crypto_shash_digest(&ctx->sdesc->shash, keys->authkey,
-+					  authkeylen, ctx->key);
-+		if (ret)
-+			return ret;
-+		authkeylen = ds;
-+	} else
-+		memcpy(ctx->key, keys->authkey, authkeylen);
- 
--	ctx->ipad = kzalloc(bs, GFP_KERNEL);
--	if (!ctx->ipad) {
--		ret = -ENOMEM;
--		goto calc_fail;
--	}
-+	ctx->enc_key_len = keys->enckeylen;
-+	ctx->auth_key_len = authkeylen;
- 
--	ctx->opad = kzalloc(bs, GFP_KERNEL);
--	if (!ctx->opad) {
--		ret = -ENOMEM;
--		goto calc_fail;
--	}
-+	if (ctx->cipher_type == OTX_CPT_CIPHER_NULL)
-+		return keys->enckeylen ? -EINVAL : 0;
- 
--	ipad = kzalloc(state_size, GFP_KERNEL);
--	if (!ipad) {
--		ret = -ENOMEM;
--		goto calc_fail;
-+	switch (keys->enckeylen) {
-+	case AES_KEYSIZE_128:
-+		ctx->key_type = OTX_CPT_AES_128_BIT;
-+		break;
-+	case AES_KEYSIZE_192:
-+		ctx->key_type = OTX_CPT_AES_192_BIT;
-+		break;
-+	case AES_KEYSIZE_256:
-+		ctx->key_type = OTX_CPT_AES_256_BIT;
-+		break;
-+	default:
-+		/* Invalid key length */
-+		return -EINVAL;
- 	}
- 
--	opad = kzalloc(state_size, GFP_KERNEL);
--	if (!opad) {
--		ret = -ENOMEM;
--		goto calc_fail;
--	}
-+	memcpy(ctx->key + authkeylen, keys->enckey, keys->enckeylen);
- 
--	if (authkeylen > bs) {
--		ret = crypto_shash_digest(&ctx->sdesc->shash, ctx->key,
--					  authkeylen, ipad);
--		if (ret)
--			goto calc_fail;
--
--		authkeylen = ds;
--	} else {
--		memcpy(ipad, ctx->key, authkeylen);
--	}
-+	ipad = ctx->ipad;
-+	opad = ctx->opad;
- 
-+	memcpy(ipad, ctx->key, authkeylen);
- 	memset(ipad + authkeylen, 0, bs - authkeylen);
- 	memcpy(opad, ipad, bs);
- 
-@@ -804,7 +816,7 @@ static int aead_hmac_init(struct crypto_aead *cipher)
- 	crypto_shash_init(&ctx->sdesc->shash);
- 	crypto_shash_update(&ctx->sdesc->shash, ipad, bs);
- 	crypto_shash_export(&ctx->sdesc->shash, ipad);
--	ret = copy_pad(ctx->mac_type, ctx->ipad, ipad);
-+	ret = swap_pad(ctx->mac_type, ipad);
- 	if (ret)
- 		goto calc_fail;
- 
-@@ -812,25 +824,9 @@ static int aead_hmac_init(struct crypto_aead *cipher)
- 	crypto_shash_init(&ctx->sdesc->shash);
- 	crypto_shash_update(&ctx->sdesc->shash, opad, bs);
- 	crypto_shash_export(&ctx->sdesc->shash, opad);
--	ret = copy_pad(ctx->mac_type, ctx->opad, opad);
--	if (ret)
--		goto calc_fail;
--
--	kfree(ipad);
--	kfree(opad);
--
--	return 0;
-+	ret = swap_pad(ctx->mac_type, opad);
- 
- calc_fail:
--	kfree(ctx->ipad);
--	ctx->ipad = NULL;
--	kfree(ctx->opad);
--	ctx->opad = NULL;
--	kfree(ipad);
--	kfree(opad);
--	kfree(ctx->sdesc);
--	ctx->sdesc = NULL;
--
- 	return ret;
- }
- 
-@@ -838,57 +834,15 @@ static int otx_cpt_aead_cbc_aes_sha_setkey(struct crypto_aead *cipher,
- 					   const unsigned char *key,
- 					   unsigned int keylen)
- {
--	struct otx_cpt_aead_ctx *ctx = crypto_aead_ctx_dma(cipher);
--	struct crypto_authenc_key_param *param;
--	int enckeylen = 0, authkeylen = 0;
--	struct rtattr *rta = (void *)key;
--	int status = -EINVAL;
--
--	if (!RTA_OK(rta, keylen))
--		goto badkey;
--
--	if (rta->rta_type != CRYPTO_AUTHENC_KEYA_PARAM)
--		goto badkey;
--
--	if (RTA_PAYLOAD(rta) < sizeof(*param))
--		goto badkey;
--
--	param = RTA_DATA(rta);
--	enckeylen = be32_to_cpu(param->enckeylen);
--	key += RTA_ALIGN(rta->rta_len);
--	keylen -= RTA_ALIGN(rta->rta_len);
--	if (keylen < enckeylen)
--		goto badkey;
-+	struct crypto_authenc_keys authenc_keys;
-+	int status;
- 
--	if (keylen > OTX_CPT_MAX_KEY_SIZE)
--		goto badkey;
--
--	authkeylen = keylen - enckeylen;
--	memcpy(ctx->key, key, keylen);
--
--	switch (enckeylen) {
--	case AES_KEYSIZE_128:
--		ctx->key_type = OTX_CPT_AES_128_BIT;
--		break;
--	case AES_KEYSIZE_192:
--		ctx->key_type = OTX_CPT_AES_192_BIT;
--		break;
--	case AES_KEYSIZE_256:
--		ctx->key_type = OTX_CPT_AES_256_BIT;
--		break;
--	default:
--		/* Invalid key length */
--		goto badkey;
--	}
--
--	ctx->enc_key_len = enckeylen;
--	ctx->auth_key_len = authkeylen;
--
--	status = aead_hmac_init(cipher);
-+	status = crypto_authenc_extractkeys(&authenc_keys, key, keylen);
- 	if (status)
- 		goto badkey;
- 
--	return 0;
-+	status = aead_hmac_init(cipher, &authenc_keys);
-+
- badkey:
- 	return status;
- }
-@@ -897,36 +851,7 @@ static int otx_cpt_aead_ecb_null_sha_setkey(struct crypto_aead *cipher,
- 					    const unsigned char *key,
- 					    unsigned int keylen)
- {
--	struct otx_cpt_aead_ctx *ctx = crypto_aead_ctx_dma(cipher);
--	struct crypto_authenc_key_param *param;
--	struct rtattr *rta = (void *)key;
--	int enckeylen = 0;
--
--	if (!RTA_OK(rta, keylen))
--		goto badkey;
--
--	if (rta->rta_type != CRYPTO_AUTHENC_KEYA_PARAM)
--		goto badkey;
--
--	if (RTA_PAYLOAD(rta) < sizeof(*param))
--		goto badkey;
--
--	param = RTA_DATA(rta);
--	enckeylen = be32_to_cpu(param->enckeylen);
--	key += RTA_ALIGN(rta->rta_len);
--	keylen -= RTA_ALIGN(rta->rta_len);
--	if (enckeylen != 0)
--		goto badkey;
--
--	if (keylen > OTX_CPT_MAX_KEY_SIZE)
--		goto badkey;
--
--	memcpy(ctx->key, key, keylen);
--	ctx->enc_key_len = enckeylen;
--	ctx->auth_key_len = keylen;
--	return 0;
--badkey:
--	return -EINVAL;
-+	return otx_cpt_aead_cbc_aes_sha_setkey(cipher, key, keylen);
- }
- 
- static int otx_cpt_aead_gcm_aes_setkey(struct crypto_aead *cipher,
-diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c b/drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c
-index e27ddd3c4e5581..4385d3df52b4d4 100644
---- a/drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c
-+++ b/drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c
-@@ -11,7 +11,6 @@
- #include <crypto/xts.h>
- #include <crypto/gcm.h>
- #include <crypto/scatterwalk.h>
--#include <linux/rtnetlink.h>
- #include <linux/sort.h>
- #include <linux/module.h>
- #include "otx2_cptvf.h"
-@@ -54,6 +53,8 @@ static struct cpt_device_table se_devices = {
- 	.count = ATOMIC_INIT(0)
- };
- 
-+static struct otx2_cpt_sdesc *alloc_sdesc(struct crypto_shash *alg);
-+
- static inline int get_se_device(struct pci_dev **pdev, int *cpu_num)
- {
- 	int count;
-@@ -580,40 +581,56 @@ static int cpt_aead_init(struct crypto_aead *atfm, u8 cipher_type, u8 mac_type)
- 	ctx->cipher_type = cipher_type;
- 	ctx->mac_type = mac_type;
- 
-+	switch (ctx->mac_type) {
-+	case OTX2_CPT_SHA1:
-+		ctx->hashalg = crypto_alloc_shash("sha1", 0, 0);
-+		break;
-+
-+	case OTX2_CPT_SHA256:
-+		ctx->hashalg = crypto_alloc_shash("sha256", 0, 0);
-+		break;
-+
-+	case OTX2_CPT_SHA384:
-+		ctx->hashalg = crypto_alloc_shash("sha384", 0, 0);
-+		break;
-+
-+	case OTX2_CPT_SHA512:
-+		ctx->hashalg = crypto_alloc_shash("sha512", 0, 0);
-+		break;
-+	}
-+
-+	if (IS_ERR(ctx->hashalg))
-+		return PTR_ERR(ctx->hashalg);
-+
-+	if (ctx->hashalg) {
-+		ctx->sdesc = alloc_sdesc(ctx->hashalg);
-+		if (!ctx->sdesc) {
-+			crypto_free_shash(ctx->hashalg);
-+			return -ENOMEM;
-+		}
-+	}
-+
- 	/*
- 	 * When selected cipher is NULL we use HMAC opcode instead of
- 	 * FLEXICRYPTO opcode therefore we don't need to use HASH algorithms
- 	 * for calculating ipad and opad
- 	 */
--	if (ctx->cipher_type != OTX2_CPT_CIPHER_NULL) {
--		switch (ctx->mac_type) {
--		case OTX2_CPT_SHA1:
--			ctx->hashalg = crypto_alloc_shash("sha1", 0,
--							  CRYPTO_ALG_ASYNC);
--			if (IS_ERR(ctx->hashalg))
--				return PTR_ERR(ctx->hashalg);
--			break;
--
--		case OTX2_CPT_SHA256:
--			ctx->hashalg = crypto_alloc_shash("sha256", 0,
--							  CRYPTO_ALG_ASYNC);
--			if (IS_ERR(ctx->hashalg))
--				return PTR_ERR(ctx->hashalg);
--			break;
-+	if (ctx->cipher_type != OTX2_CPT_CIPHER_NULL && ctx->hashalg) {
-+		int ss = crypto_shash_statesize(ctx->hashalg);
- 
--		case OTX2_CPT_SHA384:
--			ctx->hashalg = crypto_alloc_shash("sha384", 0,
--							  CRYPTO_ALG_ASYNC);
--			if (IS_ERR(ctx->hashalg))
--				return PTR_ERR(ctx->hashalg);
--			break;
-+		ctx->ipad = kzalloc(ss, GFP_KERNEL);
-+		if (!ctx->ipad) {
-+			kfree(ctx->sdesc);
-+			crypto_free_shash(ctx->hashalg);
-+			return -ENOMEM;
-+		}
- 
--		case OTX2_CPT_SHA512:
--			ctx->hashalg = crypto_alloc_shash("sha512", 0,
--							  CRYPTO_ALG_ASYNC);
--			if (IS_ERR(ctx->hashalg))
--				return PTR_ERR(ctx->hashalg);
--			break;
-+		ctx->opad = kzalloc(ss, GFP_KERNEL);
-+		if (!ctx->opad) {
-+			kfree(ctx->ipad);
-+			kfree(ctx->sdesc);
-+			crypto_free_shash(ctx->hashalg);
-+			return -ENOMEM;
- 		}
- 	}
- 	switch (ctx->cipher_type) {
-@@ -686,8 +703,7 @@ static void otx2_cpt_aead_exit(struct crypto_aead *tfm)
- 
- 	kfree(ctx->ipad);
- 	kfree(ctx->opad);
--	if (ctx->hashalg)
--		crypto_free_shash(ctx->hashalg);
-+	crypto_free_shash(ctx->hashalg);
- 	kfree(ctx->sdesc);
- 
- 	if (ctx->fbk_cipher) {
-@@ -760,7 +776,7 @@ static inline void swap_data64(void *buf, u32 len)
- 		cpu_to_be64s(src);
- }
- 
--static int copy_pad(u8 mac_type, u8 *out_pad, u8 *in_pad)
-+static int swap_pad(u8 mac_type, u8 *pad)
- {
- 	struct sha512_state *sha512;
- 	struct sha256_state *sha256;
-@@ -768,22 +784,19 @@ static int copy_pad(u8 mac_type, u8 *out_pad, u8 *in_pad)
- 
- 	switch (mac_type) {
- 	case OTX2_CPT_SHA1:
--		sha1 = (struct sha1_state *) in_pad;
-+		sha1 = (struct sha1_state *)pad;
- 		swap_data32(sha1->state, SHA1_DIGEST_SIZE);
--		memcpy(out_pad, &sha1->state, SHA1_DIGEST_SIZE);
- 		break;
- 
- 	case OTX2_CPT_SHA256:
--		sha256 = (struct sha256_state *) in_pad;
-+		sha256 = (struct sha256_state *)pad;
- 		swap_data32(sha256->state, SHA256_DIGEST_SIZE);
--		memcpy(out_pad, &sha256->state, SHA256_DIGEST_SIZE);
- 		break;
- 
- 	case OTX2_CPT_SHA384:
- 	case OTX2_CPT_SHA512:
--		sha512 = (struct sha512_state *) in_pad;
-+		sha512 = (struct sha512_state *)pad;
- 		swap_data64(sha512->state, SHA512_DIGEST_SIZE);
--		memcpy(out_pad, &sha512->state, SHA512_DIGEST_SIZE);
- 		break;
- 
- 	default:
-@@ -793,55 +806,54 @@ static int copy_pad(u8 mac_type, u8 *out_pad, u8 *in_pad)
- 	return 0;
- }
- 
--static int aead_hmac_init(struct crypto_aead *cipher)
-+static int aead_hmac_init(struct crypto_aead *cipher,
-+			  struct crypto_authenc_keys *keys)
- {
- 	struct otx2_cpt_aead_ctx *ctx = crypto_aead_ctx_dma(cipher);
--	int state_size = crypto_shash_statesize(ctx->hashalg);
- 	int ds = crypto_shash_digestsize(ctx->hashalg);
- 	int bs = crypto_shash_blocksize(ctx->hashalg);
--	int authkeylen = ctx->auth_key_len;
-+	int authkeylen = keys->authkeylen;
- 	u8 *ipad = NULL, *opad = NULL;
--	int ret = 0, icount = 0;
-+	int icount = 0;
-+	int ret;
- 
--	ctx->sdesc = alloc_sdesc(ctx->hashalg);
--	if (!ctx->sdesc)
--		return -ENOMEM;
-+	if (authkeylen > bs) {
-+		ret = crypto_shash_digest(&ctx->sdesc->shash, keys->authkey,
-+					  authkeylen, ctx->key);
-+		if (ret)
-+			goto calc_fail;
- 
--	ctx->ipad = kzalloc(bs, GFP_KERNEL);
--	if (!ctx->ipad) {
--		ret = -ENOMEM;
--		goto calc_fail;
--	}
-+		authkeylen = ds;
-+	} else
-+		memcpy(ctx->key, keys->authkey, authkeylen);
- 
--	ctx->opad = kzalloc(bs, GFP_KERNEL);
--	if (!ctx->opad) {
--		ret = -ENOMEM;
--		goto calc_fail;
--	}
-+	ctx->enc_key_len = keys->enckeylen;
-+	ctx->auth_key_len = authkeylen;
- 
--	ipad = kzalloc(state_size, GFP_KERNEL);
--	if (!ipad) {
--		ret = -ENOMEM;
--		goto calc_fail;
--	}
-+	if (ctx->cipher_type == OTX2_CPT_CIPHER_NULL)
-+		return keys->enckeylen ? -EINVAL : 0;
- 
--	opad = kzalloc(state_size, GFP_KERNEL);
--	if (!opad) {
--		ret = -ENOMEM;
--		goto calc_fail;
-+	switch (keys->enckeylen) {
-+	case AES_KEYSIZE_128:
-+		ctx->key_type = OTX2_CPT_AES_128_BIT;
-+		break;
-+	case AES_KEYSIZE_192:
-+		ctx->key_type = OTX2_CPT_AES_192_BIT;
-+		break;
-+	case AES_KEYSIZE_256:
-+		ctx->key_type = OTX2_CPT_AES_256_BIT;
-+		break;
-+	default:
-+		/* Invalid key length */
-+		return -EINVAL;
- 	}
- 
--	if (authkeylen > bs) {
--		ret = crypto_shash_digest(&ctx->sdesc->shash, ctx->key,
--					  authkeylen, ipad);
--		if (ret)
--			goto calc_fail;
-+	memcpy(ctx->key + authkeylen, keys->enckey, keys->enckeylen);
- 
--		authkeylen = ds;
--	} else {
--		memcpy(ipad, ctx->key, authkeylen);
--	}
-+	ipad = ctx->ipad;
-+	opad = ctx->opad;
- 
-+	memcpy(ipad, ctx->key, authkeylen);
- 	memset(ipad + authkeylen, 0, bs - authkeylen);
- 	memcpy(opad, ipad, bs);
- 
-@@ -859,7 +871,7 @@ static int aead_hmac_init(struct crypto_aead *cipher)
- 	crypto_shash_init(&ctx->sdesc->shash);
- 	crypto_shash_update(&ctx->sdesc->shash, ipad, bs);
- 	crypto_shash_export(&ctx->sdesc->shash, ipad);
--	ret = copy_pad(ctx->mac_type, ctx->ipad, ipad);
-+	ret = swap_pad(ctx->mac_type, ipad);
- 	if (ret)
- 		goto calc_fail;
- 
-@@ -867,25 +879,9 @@ static int aead_hmac_init(struct crypto_aead *cipher)
- 	crypto_shash_init(&ctx->sdesc->shash);
- 	crypto_shash_update(&ctx->sdesc->shash, opad, bs);
- 	crypto_shash_export(&ctx->sdesc->shash, opad);
--	ret = copy_pad(ctx->mac_type, ctx->opad, opad);
--	if (ret)
--		goto calc_fail;
--
--	kfree(ipad);
--	kfree(opad);
--
--	return 0;
-+	ret = swap_pad(ctx->mac_type, opad);
- 
- calc_fail:
--	kfree(ctx->ipad);
--	ctx->ipad = NULL;
--	kfree(ctx->opad);
--	ctx->opad = NULL;
--	kfree(ipad);
--	kfree(opad);
--	kfree(ctx->sdesc);
--	ctx->sdesc = NULL;
--
- 	return ret;
- }
- 
-@@ -893,87 +889,17 @@ static int otx2_cpt_aead_cbc_aes_sha_setkey(struct crypto_aead *cipher,
- 					    const unsigned char *key,
- 					    unsigned int keylen)
- {
--	struct otx2_cpt_aead_ctx *ctx = crypto_aead_ctx_dma(cipher);
--	struct crypto_authenc_key_param *param;
--	int enckeylen = 0, authkeylen = 0;
--	struct rtattr *rta = (void *)key;
--
--	if (!RTA_OK(rta, keylen))
--		return -EINVAL;
-+	struct crypto_authenc_keys authenc_keys;
- 
--	if (rta->rta_type != CRYPTO_AUTHENC_KEYA_PARAM)
--		return -EINVAL;
--
--	if (RTA_PAYLOAD(rta) < sizeof(*param))
--		return -EINVAL;
--
--	param = RTA_DATA(rta);
--	enckeylen = be32_to_cpu(param->enckeylen);
--	key += RTA_ALIGN(rta->rta_len);
--	keylen -= RTA_ALIGN(rta->rta_len);
--	if (keylen < enckeylen)
--		return -EINVAL;
--
--	if (keylen > OTX2_CPT_MAX_KEY_SIZE)
--		return -EINVAL;
--
--	authkeylen = keylen - enckeylen;
--	memcpy(ctx->key, key, keylen);
--
--	switch (enckeylen) {
--	case AES_KEYSIZE_128:
--		ctx->key_type = OTX2_CPT_AES_128_BIT;
--		break;
--	case AES_KEYSIZE_192:
--		ctx->key_type = OTX2_CPT_AES_192_BIT;
--		break;
--	case AES_KEYSIZE_256:
--		ctx->key_type = OTX2_CPT_AES_256_BIT;
--		break;
--	default:
--		/* Invalid key length */
--		return -EINVAL;
--	}
--
--	ctx->enc_key_len = enckeylen;
--	ctx->auth_key_len = authkeylen;
--
--	return aead_hmac_init(cipher);
-+	return crypto_authenc_extractkeys(&authenc_keys, key, keylen) ?:
-+	       aead_hmac_init(cipher, &authenc_keys);
- }
- 
- static int otx2_cpt_aead_ecb_null_sha_setkey(struct crypto_aead *cipher,
- 					     const unsigned char *key,
- 					     unsigned int keylen)
- {
--	struct otx2_cpt_aead_ctx *ctx = crypto_aead_ctx_dma(cipher);
--	struct crypto_authenc_key_param *param;
--	struct rtattr *rta = (void *)key;
--	int enckeylen = 0;
--
--	if (!RTA_OK(rta, keylen))
--		return -EINVAL;
--
--	if (rta->rta_type != CRYPTO_AUTHENC_KEYA_PARAM)
--		return -EINVAL;
--
--	if (RTA_PAYLOAD(rta) < sizeof(*param))
--		return -EINVAL;
--
--	param = RTA_DATA(rta);
--	enckeylen = be32_to_cpu(param->enckeylen);
--	key += RTA_ALIGN(rta->rta_len);
--	keylen -= RTA_ALIGN(rta->rta_len);
--	if (enckeylen != 0)
--		return -EINVAL;
--
--	if (keylen > OTX2_CPT_MAX_KEY_SIZE)
--		return -EINVAL;
--
--	memcpy(ctx->key, key, keylen);
--	ctx->enc_key_len = enckeylen;
--	ctx->auth_key_len = keylen;
--
--	return 0;
-+	return otx2_cpt_aead_cbc_aes_sha_setkey(cipher, key, keylen);
- }
- 
- static int otx2_cpt_aead_gcm_aes_setkey(struct crypto_aead *cipher,
-diff --git a/drivers/firmware/efi/unaccepted_memory.c b/drivers/firmware/efi/unaccepted_memory.c
-index 79fb687bb90f96..6c3d84d9bcc16f 100644
---- a/drivers/firmware/efi/unaccepted_memory.c
-+++ b/drivers/firmware/efi/unaccepted_memory.c
-@@ -3,6 +3,7 @@
- #include <linux/efi.h>
- #include <linux/memblock.h>
- #include <linux/spinlock.h>
-+#include <linux/nmi.h>
- #include <asm/unaccepted_memory.h>
- 
- /* Protects unaccepted memory bitmap and accepting_list */
-@@ -148,6 +149,9 @@ void accept_memory(phys_addr_t start, phys_addr_t end)
- 	}
- 
- 	list_del(&range.list);
-+
-+	touch_softlockup_watchdog();
-+
- 	spin_unlock_irqrestore(&unaccepted_memory_lock, flags);
- }
- 
-diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c
-index c1590d3aa9cb78..c3a1dc3449617f 100644
---- a/drivers/firmware/tegra/bpmp.c
-+++ b/drivers/firmware/tegra/bpmp.c
-@@ -24,12 +24,6 @@
- #define MSG_RING	BIT(1)
- #define TAG_SZ		32
- 
--static inline struct tegra_bpmp *
--mbox_client_to_bpmp(struct mbox_client *client)
--{
--	return container_of(client, struct tegra_bpmp, mbox.client);
--}
--
- static inline const struct tegra_bpmp_ops *
- channel_to_ops(struct tegra_bpmp_channel *channel)
- {
-diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
-index aa3ce8aa99dc83..75107ede3bf8f4 100644
---- a/drivers/gpio/gpio-davinci.c
-+++ b/drivers/gpio/gpio-davinci.c
-@@ -289,7 +289,7 @@ static int davinci_gpio_probe(struct platform_device *pdev)
-  * serve as EDMA event triggers.
-  */
- 
--static void gpio_irq_disable(struct irq_data *d)
-+static void gpio_irq_mask(struct irq_data *d)
- {
- 	struct davinci_gpio_regs __iomem *g = irq2regs(d);
- 	uintptr_t mask = (uintptr_t)irq_data_get_irq_handler_data(d);
-@@ -298,7 +298,7 @@ static void gpio_irq_disable(struct irq_data *d)
- 	writel_relaxed(mask, &g->clr_rising);
- }
- 
--static void gpio_irq_enable(struct irq_data *d)
-+static void gpio_irq_unmask(struct irq_data *d)
- {
- 	struct davinci_gpio_regs __iomem *g = irq2regs(d);
- 	uintptr_t mask = (uintptr_t)irq_data_get_irq_handler_data(d);
-@@ -324,8 +324,8 @@ static int gpio_irq_type(struct irq_data *d, unsigned trigger)
- 
- static struct irq_chip gpio_irqchip = {
- 	.name		= "GPIO",
--	.irq_enable	= gpio_irq_enable,
--	.irq_disable	= gpio_irq_disable,
-+	.irq_unmask	= gpio_irq_unmask,
-+	.irq_mask	= gpio_irq_mask,
- 	.irq_set_type	= gpio_irq_type,
- 	.flags		= IRQCHIP_SET_TYPE_MASKED | IRQCHIP_SKIP_SET_WAKE,
- };
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
-index 25d5fda5b243e3..af6c6d89e63afb 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
-@@ -335,15 +335,15 @@ int amdgpu_amdkfd_alloc_gtt_mem(struct amdgpu_device *adev, size_t size,
- 	return r;
- }
- 
--void amdgpu_amdkfd_free_gtt_mem(struct amdgpu_device *adev, void *mem_obj)
-+void amdgpu_amdkfd_free_gtt_mem(struct amdgpu_device *adev, void **mem_obj)
- {
--	struct amdgpu_bo *bo = (struct amdgpu_bo *) mem_obj;
-+	struct amdgpu_bo **bo = (struct amdgpu_bo **) mem_obj;
- 
--	amdgpu_bo_reserve(bo, true);
--	amdgpu_bo_kunmap(bo);
--	amdgpu_bo_unpin(bo);
--	amdgpu_bo_unreserve(bo);
--	amdgpu_bo_unref(&(bo));
-+	amdgpu_bo_reserve(*bo, true);
-+	amdgpu_bo_kunmap(*bo);
-+	amdgpu_bo_unpin(*bo);
-+	amdgpu_bo_unreserve(*bo);
-+	amdgpu_bo_unref(bo);
- }
- 
- int amdgpu_amdkfd_alloc_gws(struct amdgpu_device *adev, size_t size,
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
-index db5b1c6beba75b..3134e6ad81d1d4 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
-@@ -221,7 +221,7 @@ int amdgpu_amdkfd_evict_userptr(struct mmu_interval_notifier *mni,
- int amdgpu_amdkfd_alloc_gtt_mem(struct amdgpu_device *adev, size_t size,
- 				void **mem_obj, uint64_t *gpu_addr,
- 				void **cpu_ptr, bool mqd_gfx9);
--void amdgpu_amdkfd_free_gtt_mem(struct amdgpu_device *adev, void *mem_obj);
-+void amdgpu_amdkfd_free_gtt_mem(struct amdgpu_device *adev, void **mem_obj);
- int amdgpu_amdkfd_alloc_gws(struct amdgpu_device *adev, size_t size,
- 				void **mem_obj);
- void amdgpu_amdkfd_free_gws(struct amdgpu_device *adev, void *mem_obj);
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-index e361dc37a0890b..7abcd618e70bd1 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-@@ -263,6 +263,10 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
- 			if (size < sizeof(struct drm_amdgpu_bo_list_in))
- 				goto free_partial_kdata;
- 
-+			/* Only a single BO list is allowed to simplify handling. */
-+			if (p->bo_list)
-+				ret = -EINVAL;
-+
- 			ret = amdgpu_cs_p1_bo_handles(p, p->chunks[i].kdata);
- 			if (ret)
- 				goto free_partial_kdata;
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
-index 0ca51df46cc0d3..e7b053898f9e90 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
-@@ -793,8 +793,11 @@ int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *r
- 	int r;
- 
- 	if (amdgpu_ras_is_supported(adev, ras_block->block)) {
--		if (!amdgpu_persistent_edc_harvesting_supported(adev))
--			amdgpu_ras_reset_error_status(adev, AMDGPU_RAS_BLOCK__GFX);
-+		if (!amdgpu_persistent_edc_harvesting_supported(adev)) {
-+			r = amdgpu_ras_reset_error_status(adev, AMDGPU_RAS_BLOCK__GFX);
-+			if (r)
-+				return r;
-+		}
- 
- 		r = amdgpu_ras_block_late_init(adev, ras_block);
- 		if (r)
-@@ -938,7 +941,10 @@ uint32_t amdgpu_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)
- 		pr_err("critical bug! too many kiq readers\n");
- 		goto failed_unlock;
- 	}
--	amdgpu_ring_alloc(ring, 32);
-+	r = amdgpu_ring_alloc(ring, 32);
-+	if (r)
-+		goto failed_unlock;
-+
- 	amdgpu_ring_emit_rreg(ring, reg, reg_val_offs);
- 	r = amdgpu_fence_emit_polling(ring, &seq, MAX_KIQ_REG_WAIT);
- 	if (r)
-@@ -1004,7 +1010,10 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v)
- 	}
- 
- 	spin_lock_irqsave(&kiq->ring_lock, flags);
--	amdgpu_ring_alloc(ring, 32);
-+	r = amdgpu_ring_alloc(ring, 32);
-+	if (r)
-+		goto failed_unlock;
-+
- 	amdgpu_ring_emit_wreg(ring, reg, v);
- 	r = amdgpu_fence_emit_polling(ring, &seq, MAX_KIQ_REG_WAIT);
- 	if (r)
-@@ -1040,6 +1049,7 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v)
- 
- failed_undo:
- 	amdgpu_ring_undo(ring);
-+failed_unlock:
- 	spin_unlock_irqrestore(&kiq->ring_lock, flags);
- failed_kiq_write:
- 	dev_err(adev->dev, "failed to write reg:%x\n", reg);
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
-index 58dab4f73a9a2a..5797055b1148f7 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
-@@ -43,6 +43,7 @@
- #include "amdgpu_gem.h"
- #include "amdgpu_display.h"
- #include "amdgpu_ras.h"
-+#include "amdgpu_reset.h"
- #include "amd_pcie.h"
- 
- void amdgpu_unregister_gpu_instance(struct amdgpu_device *adev)
-@@ -722,6 +723,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
- 				    ? -EFAULT : 0;
- 	}
- 	case AMDGPU_INFO_READ_MMR_REG: {
-+		int ret = 0;
- 		unsigned int n, alloc_size;
- 		uint32_t *regs;
- 		unsigned int se_num = (info->read_mmr_reg.instance >>
-@@ -731,24 +733,37 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
- 				   AMDGPU_INFO_MMR_SH_INDEX_SHIFT) &
- 				  AMDGPU_INFO_MMR_SH_INDEX_MASK;
- 
-+		if (!down_read_trylock(&adev->reset_domain->sem))
-+			return -ENOENT;
-+
- 		/* set full masks if the userspace set all bits
- 		 * in the bitfields
- 		 */
--		if (se_num == AMDGPU_INFO_MMR_SE_INDEX_MASK)
-+		if (se_num == AMDGPU_INFO_MMR_SE_INDEX_MASK) {
- 			se_num = 0xffffffff;
--		else if (se_num >= AMDGPU_GFX_MAX_SE)
--			return -EINVAL;
--		if (sh_num == AMDGPU_INFO_MMR_SH_INDEX_MASK)
-+		} else if (se_num >= AMDGPU_GFX_MAX_SE) {
-+			ret = -EINVAL;
-+			goto out;
-+		}
-+
-+		if (sh_num == AMDGPU_INFO_MMR_SH_INDEX_MASK) {
- 			sh_num = 0xffffffff;
--		else if (sh_num >= AMDGPU_GFX_MAX_SH_PER_SE)
--			return -EINVAL;
-+		} else if (sh_num >= AMDGPU_GFX_MAX_SH_PER_SE) {
-+			ret = -EINVAL;
-+			goto out;
-+		}
- 
--		if (info->read_mmr_reg.count > 128)
--			return -EINVAL;
-+		if (info->read_mmr_reg.count > 128) {
-+			ret = -EINVAL;
-+			goto out;
-+		}
- 
- 		regs = kmalloc_array(info->read_mmr_reg.count, sizeof(*regs), GFP_KERNEL);
--		if (!regs)
--			return -ENOMEM;
-+		if (!regs) {
-+			ret = -ENOMEM;
-+			goto out;
-+		}
-+
- 		alloc_size = info->read_mmr_reg.count * sizeof(*regs);
- 
- 		amdgpu_gfx_off_ctrl(adev, false);
-@@ -760,13 +775,17 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
- 					      info->read_mmr_reg.dword_offset + i);
- 				kfree(regs);
- 				amdgpu_gfx_off_ctrl(adev, true);
--				return -EFAULT;
-+				ret = -EFAULT;
-+				goto out;
- 			}
- 		}
- 		amdgpu_gfx_off_ctrl(adev, true);
- 		n = copy_to_user(out, regs, min(size, alloc_size));
- 		kfree(regs);
--		return n ? -EFAULT : 0;
-+		ret = (n ? -EFAULT : 0);
-+out:
-+		up_read(&adev->reset_domain->sem);
-+		return ret;
- 	}
- 	case AMDGPU_INFO_DEV_INFO: {
- 		struct drm_amdgpu_info_device *dev_info;
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h
-index 9a1036aeec2a0b..9142238e7791a5 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h
-@@ -179,6 +179,6 @@ amdgpu_get_next_xcp(struct amdgpu_xcp_mgr *xcp_mgr, int *from)
- 
- #define for_each_xcp(xcp_mgr, xcp, i)                            \
- 	for (i = 0, xcp = amdgpu_get_next_xcp(xcp_mgr, &i); xcp; \
--	     xcp = amdgpu_get_next_xcp(xcp_mgr, &i))
-+	     ++i, xcp = amdgpu_get_next_xcp(xcp_mgr, &i))
- 
- #endif
-diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
-index cd594b92c61298..53c99bc6abb333 100644
---- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
-@@ -8748,7 +8748,9 @@ static void gfx_v10_0_ring_soft_recovery(struct amdgpu_ring *ring,
- 	value = REG_SET_FIELD(value, SQ_CMD, MODE, 0x01);
- 	value = REG_SET_FIELD(value, SQ_CMD, CHECK_VMID, 1);
- 	value = REG_SET_FIELD(value, SQ_CMD, VM_ID, vmid);
-+	amdgpu_gfx_rlc_enter_safe_mode(adev, 0);
- 	WREG32_SOC15(GC, 0, mmSQ_CMD, value);
-+	amdgpu_gfx_rlc_exit_safe_mode(adev, 0);
- }
- 
- static void
-diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
-index c813cd7b015e14..54ec9b32562c28 100644
---- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
-@@ -5701,7 +5701,9 @@ static void gfx_v11_0_ring_soft_recovery(struct amdgpu_ring *ring,
- 	value = REG_SET_FIELD(value, SQ_CMD, MODE, 0x01);
- 	value = REG_SET_FIELD(value, SQ_CMD, CHECK_VMID, 1);
- 	value = REG_SET_FIELD(value, SQ_CMD, VM_ID, vmid);
-+	amdgpu_gfx_rlc_enter_safe_mode(adev, 0);
- 	WREG32_SOC15(GC, 0, regSQ_CMD, value);
-+	amdgpu_gfx_rlc_exit_safe_mode(adev, 0);
- }
- 
- static void
-diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
-index 8168836a08d2ef..895060f6948f30 100644
---- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
-@@ -1172,6 +1172,10 @@ static const struct amdgpu_gfxoff_quirk amdgpu_gfxoff_quirk_list[] = {
- 	{ 0x1002, 0x15dd, 0x1002, 0x15dd, 0xc6 },
- 	/* Apple MacBook Pro (15-inch, 2019) Radeon Pro Vega 20 4 GB */
- 	{ 0x1002, 0x69af, 0x106b, 0x019a, 0xc0 },
-+	/* https://bbs.openkylin.top/t/topic/171497 */
-+	{ 0x1002, 0x15d8, 0x19e5, 0x3e14, 0xc2 },
-+	/* HP 705G4 DM with R5 2400G */
-+	{ 0x1002, 0x15dd, 0x103c, 0x8464, 0xd6 },
- 	{ 0, 0, 0, 0, 0 },
- };
- 
-@@ -5705,7 +5709,9 @@ static void gfx_v9_0_ring_soft_recovery(struct amdgpu_ring *ring, unsigned vmid)
- 	value = REG_SET_FIELD(value, SQ_CMD, MODE, 0x01);
- 	value = REG_SET_FIELD(value, SQ_CMD, CHECK_VMID, 1);
- 	value = REG_SET_FIELD(value, SQ_CMD, VM_ID, vmid);
-+	amdgpu_gfx_rlc_enter_safe_mode(adev, 0);
- 	WREG32_SOC15(GC, 0, mmSQ_CMD, value);
-+	amdgpu_gfx_rlc_exit_safe_mode(adev, 0);
- }
- 
- static void gfx_v9_0_set_gfx_eop_interrupt_state(struct amdgpu_device *adev,
-diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
-index 9d105302837054..19d46be6394295 100644
---- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
-+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
-@@ -417,7 +417,7 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p,
- 
- err_create_queue:
- 	if (wptr_bo)
--		amdgpu_amdkfd_free_gtt_mem(dev->adev, wptr_bo);
-+		amdgpu_amdkfd_free_gtt_mem(dev->adev, (void **)&wptr_bo);
- err_wptr_map_gart:
- err_bind_process:
- err_pdd:
-diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
-index 0c94bdfadaabf7..9d0b0bf70ad1ea 100644
---- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
-+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
-@@ -838,7 +838,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
- kfd_doorbell_error:
- 	kfd_gtt_sa_fini(kfd);
- kfd_gtt_sa_init_error:
--	amdgpu_amdkfd_free_gtt_mem(kfd->adev, kfd->gtt_mem);
-+	amdgpu_amdkfd_free_gtt_mem(kfd->adev, &kfd->gtt_mem);
- alloc_gtt_mem_failure:
- 	dev_err(kfd_device,
- 		"device %x:%x NOT added due to errors\n",
-@@ -856,7 +856,7 @@ void kgd2kfd_device_exit(struct kfd_dev *kfd)
- 		kfd_doorbell_fini(kfd);
- 		ida_destroy(&kfd->doorbell_ida);
- 		kfd_gtt_sa_fini(kfd);
--		amdgpu_amdkfd_free_gtt_mem(kfd->adev, kfd->gtt_mem);
-+		amdgpu_amdkfd_free_gtt_mem(kfd->adev, &kfd->gtt_mem);
- 	}
- 
- 	kfree(kfd);
-diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
-index 60d98301ef0418..4d9a406925e189 100644
---- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
-+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
-@@ -2610,7 +2610,7 @@ static void deallocate_hiq_sdma_mqd(struct kfd_node *dev,
- {
- 	WARN(!mqd, "No hiq sdma mqd trunk to free");
- 
--	amdgpu_amdkfd_free_gtt_mem(dev->adev, mqd->gtt_mem);
-+	amdgpu_amdkfd_free_gtt_mem(dev->adev, &mqd->gtt_mem);
- }
- 
- void device_queue_manager_uninit(struct device_queue_manager *dqm)
-diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
-index 447829c22295c6..4c3f379803117e 100644
---- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
-+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
-@@ -223,7 +223,7 @@ void kfd_free_mqd_cp(struct mqd_manager *mm, void *mqd,
- 	      struct kfd_mem_obj *mqd_mem_obj)
- {
- 	if (mqd_mem_obj->gtt_mem) {
--		amdgpu_amdkfd_free_gtt_mem(mm->dev->adev, mqd_mem_obj->gtt_mem);
-+		amdgpu_amdkfd_free_gtt_mem(mm->dev->adev, &mqd_mem_obj->gtt_mem);
- 		kfree(mqd_mem_obj);
- 	} else {
- 		kfd_gtt_sa_free(mm->dev, mqd_mem_obj);
-diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
-index d98e45aec76b45..43f520b3796700 100644
---- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
-+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
-@@ -1047,7 +1047,7 @@ static void kfd_process_destroy_pdds(struct kfd_process *p)
- 
- 		if (pdd->dev->kfd->shared_resources.enable_mes)
- 			amdgpu_amdkfd_free_gtt_mem(pdd->dev->adev,
--						   pdd->proc_ctx_bo);
-+						   &pdd->proc_ctx_bo);
- 		/*
- 		 * before destroying pdd, make sure to report availability
- 		 * for auto suspend
-diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
-index 8aca92624a77ea..0583af4e84fa3f 100644
---- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
-+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
-@@ -199,9 +199,9 @@ static void pqm_clean_queue_resource(struct process_queue_manager *pqm,
- 	}
- 
- 	if (dev->kfd->shared_resources.enable_mes) {
--		amdgpu_amdkfd_free_gtt_mem(dev->adev, pqn->q->gang_ctx_bo);
-+		amdgpu_amdkfd_free_gtt_mem(dev->adev, &pqn->q->gang_ctx_bo);
- 		if (pqn->q->wptr_bo)
--			amdgpu_amdkfd_free_gtt_mem(dev->adev, pqn->q->wptr_bo);
-+			amdgpu_amdkfd_free_gtt_mem(dev->adev, (void **)&pqn->q->wptr_bo);
- 	}
- }
- 
-@@ -982,6 +982,7 @@ int kfd_criu_restore_queue(struct kfd_process *p,
- 		pr_debug("Queue id %d was restored successfully\n", queue_id);
- 
- 	kfree(q_data);
-+	kfree(q_extra_data);
- 
- 	return ret;
- }
-diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-index 7731ce7762b77d..a3f17c572bf06e 100644
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -714,6 +714,12 @@ static void dmub_hpd_callback(struct amdgpu_device *adev,
- 		return;
- 	}
- 
-+	/* Skip DMUB HPD IRQ in suspend/resume. We will probe them later. */
-+	if (notify->type == DMUB_NOTIFICATION_HPD && adev->in_suspend) {
-+		DRM_INFO("Skip DMUB HPD IRQ callback in suspend/resume\n");
-+		return;
-+	}
-+
- 	link_index = notify->link_index;
- 	link = adev->dm.dc->links[link_index];
- 	dev = adev->dm.ddev;
-@@ -4058,7 +4064,7 @@ static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm,
- 		int spread = caps.max_input_signal - caps.min_input_signal;
- 
- 		if (caps.max_input_signal > AMDGPU_DM_DEFAULT_MAX_BACKLIGHT ||
--		    caps.min_input_signal < AMDGPU_DM_DEFAULT_MIN_BACKLIGHT ||
-+		    caps.min_input_signal < 0 ||
- 		    spread > AMDGPU_DM_DEFAULT_MAX_BACKLIGHT ||
- 		    spread < AMDGPU_DM_MIN_SPREAD) {
- 			DRM_DEBUG_KMS("DM: Invalid backlight caps: min=%d, max=%d\n",
-@@ -6153,12 +6159,21 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
- 	if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT ||
- 	    stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST ||
- 	    stream->signal == SIGNAL_TYPE_EDP) {
-+		const struct dc_edid_caps *edid_caps;
-+		unsigned int disable_colorimetry = 0;
-+
-+		if (aconnector->dc_sink) {
-+			edid_caps = &aconnector->dc_sink->edid_caps;
-+			disable_colorimetry = edid_caps->panel_patch.disable_colorimetry;
-+		}
-+
- 		//
- 		// should decide stream support vsc sdp colorimetry capability
- 		// before building vsc info packet
- 		//
- 		stream->use_vsc_sdp_for_colorimetry = stream->link->dpcd_caps.dpcd_rev.raw >= 0x14 &&
--						      stream->link->dpcd_caps.dprx_feature.bits.VSC_SDP_COLORIMETRY_SUPPORTED;
-+						      stream->link->dpcd_caps.dprx_feature.bits.VSC_SDP_COLORIMETRY_SUPPORTED &&
-+						      !disable_colorimetry;
- 
- 		if (stream->out_transfer_func->tf == TRANSFER_FUNCTION_GAMMA22)
- 			tf = TRANSFER_FUNC_GAMMA_22;
-diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
-index fdd2d16b859f21..227a148b0f82a5 100644
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
-@@ -71,6 +71,10 @@ static void apply_edid_quirks(struct edid *edid, struct dc_edid_caps *edid_caps)
- 		DRM_DEBUG_DRIVER("Clearing DPCD 0x317 on monitor with panel id %X\n", panel_id);
- 		edid_caps->panel_patch.remove_sink_ext_caps = true;
- 		break;
-+	case drm_edid_encode_panel_id('S', 'D', 'C', 0x4154):
-+		DRM_DEBUG_DRIVER("Disabling VSC on monitor with panel id %X\n", panel_id);
-+		edid_caps->panel_patch.disable_colorimetry = true;
-+		break;
- 	default:
- 		return;
- 	}
-diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
-index 7fb11445a28fa5..d390e3d62e56e3 100644
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
-@@ -1266,9 +1266,6 @@ static bool is_dsc_need_re_compute(
- 		}
- 	}
- 
--	if (new_stream_on_link_num == 0)
--		return false;
--
- 	if (new_stream_on_link_num == 0)
- 		return false;
- 
-diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
-index fa9f53b3107938..d1329f20b7bd4b 100644
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
-@@ -1281,7 +1281,8 @@ void amdgpu_dm_plane_handle_cursor_update(struct drm_plane *plane,
- 	    adev->dm.dc->caps.color.dpp.gamma_corr)
- 		attributes.attribute_flags.bits.ENABLE_CURSOR_DEGAMMA = 1;
- 
--	attributes.pitch = afb->base.pitches[0] / afb->base.format->cpp[0];
-+	if (afb)
-+		attributes.pitch = afb->base.pitches[0] / afb->base.format->cpp[0];
- 
- 	if (crtc_state->stream) {
- 		mutex_lock(&adev->dm.dc_lock);
-diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
-index 50e643bfdfbad1..a7a6f6c5c76556 100644
---- a/drivers/gpu/drm/amd/display/dc/core/dc.c
-+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
-@@ -3797,7 +3797,8 @@ static void commit_planes_for_stream(struct dc *dc,
- 	}
- 
- 	if ((update_type != UPDATE_TYPE_FAST) && stream->update_flags.bits.dsc_changed)
--		if (top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable) {
-+		if (top_pipe_to_program &&
-+		    top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable) {
- 			top_pipe_to_program->stream_res.tg->funcs->wait_for_state(
- 				top_pipe_to_program->stream_res.tg,
- 				CRTC_STATE_VACTIVE);
-@@ -4715,7 +4716,8 @@ void dc_allow_idle_optimizations(struct dc *dc, bool allow)
- 	if (allow == dc->idle_optimizations_allowed)
- 		return;
- 
--	if (dc->hwss.apply_idle_power_optimizations && dc->hwss.apply_idle_power_optimizations(dc, allow))
-+	if (dc->hwss.apply_idle_power_optimizations && dc->clk_mgr != NULL &&
-+	    dc->hwss.apply_idle_power_optimizations(dc, allow))
- 		dc->idle_optimizations_allowed = allow;
- }
- 
-diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
-index 733e445331ea50..99fcd39bb15e0d 100644
---- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
-+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
-@@ -2154,6 +2154,8 @@ static bool are_stream_backends_same(
- bool dc_is_stream_unchanged(
- 	struct dc_stream_state *old_stream, struct dc_stream_state *stream)
- {
-+	if (!old_stream || !stream)
-+		return false;
- 
- 	if (!are_stream_backends_same(old_stream, stream))
- 		return false;
-@@ -2877,8 +2879,10 @@ static bool planes_changed_for_existing_stream(struct dc_state *context,
- 		}
- 	}
- 
--	if (!stream_status)
-+	if (!stream_status) {
- 		ASSERT(0);
-+		return false;
-+	}
- 
- 	for (i = 0; i < set_count; i++)
- 		if (set[i].stream == stream)
-diff --git a/drivers/gpu/drm/amd/display/dc/dc_types.h b/drivers/gpu/drm/amd/display/dc/dc_types.h
-index cc173ecf78e0cf..6eaa02a80344bc 100644
---- a/drivers/gpu/drm/amd/display/dc/dc_types.h
-+++ b/drivers/gpu/drm/amd/display/dc/dc_types.h
-@@ -190,6 +190,7 @@ struct dc_panel_patch {
- 	unsigned int skip_avmute;
- 	unsigned int mst_start_top_delay;
- 	unsigned int remove_sink_ext_caps;
-+	unsigned int disable_colorimetry;
- };
- 
- struct dc_edid_caps {
-diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c
-index c0372aa4ec8380..684e30f9cf8985 100644
---- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c
-+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c
-@@ -571,6 +571,8 @@ bool cm_helper_translate_curve_to_degamma_hw_format(
- 				i += increment) {
- 			if (j == hw_points - 1)
- 				break;
-+			if (i >= TRANSFER_FUNC_POINTS)
-+				return false;
- 			rgb_resulted[j].red = output_tf->tf_pts.red[i];
- 			rgb_resulted[j].green = output_tf->tf_pts.green[i];
- 			rgb_resulted[j].blue = output_tf->tf_pts.blue[i];
-diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c
-index e0df9b0065f9c0..62c02adae7e76e 100644
---- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c
-+++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c
-@@ -178,6 +178,8 @@ bool cm3_helper_translate_curve_to_hw_format(
- 				i += increment) {
- 			if (j == hw_points - 1)
- 				break;
-+			if (i >= TRANSFER_FUNC_POINTS)
-+				return false;
- 			rgb_resulted[j].red = output_tf->tf_pts.red[i];
- 			rgb_resulted[j].green = output_tf->tf_pts.green[i];
- 			rgb_resulted[j].blue = output_tf->tf_pts.blue[i];
-@@ -355,6 +357,8 @@ bool cm3_helper_translate_curve_to_degamma_hw_format(
- 				i += increment) {
- 			if (j == hw_points - 1)
- 				break;
-+			if (i >= TRANSFER_FUNC_POINTS)
-+				return false;
- 			rgb_resulted[j].red = output_tf->tf_pts.red[i];
- 			rgb_resulted[j].green = output_tf->tf_pts.green[i];
- 			rgb_resulted[j].blue = output_tf->tf_pts.blue[i];
-diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c
-index 0fc9f3e3ffaefd..f603486af6e306 100644
---- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c
-+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c
-@@ -78,7 +78,7 @@ static void calculate_ttu_cursor(struct display_mode_lib *mode_lib,
- 
- static unsigned int get_bytes_per_element(enum source_format_class source_format, bool is_chroma)
- {
--	unsigned int ret_val = 0;
-+	unsigned int ret_val = 1;
- 
- 	if (source_format == dm_444_16) {
- 		if (!is_chroma)
-diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c
-index 618f4b682ab1b1..9f28e4d3c664c7 100644
---- a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c
-+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c
-@@ -53,7 +53,7 @@ static void calculate_ttu_cursor(
- 
- static unsigned int get_bytes_per_element(enum source_format_class source_format, bool is_chroma)
- {
--	unsigned int ret_val = 0;
-+	unsigned int ret_val = 1;
- 
- 	if (source_format == dm_444_16) {
- 		if (!is_chroma)
-diff --git a/drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_hpo_dp.c b/drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_hpo_dp.c
-index e1257404357b11..cec68c5dba1322 100644
---- a/drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_hpo_dp.c
-+++ b/drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_hpo_dp.c
-@@ -28,6 +28,8 @@
- #include "dccg.h"
- #include "clk_mgr.h"
- 
-+#define DC_LOGGER link->ctx->logger
-+
- void set_hpo_dp_throttled_vcp_size(struct pipe_ctx *pipe_ctx,
- 		struct fixed31_32 throttled_vcp_size)
- {
-@@ -108,6 +110,11 @@ void enable_hpo_dp_link_output(struct dc_link *link,
- 		enum clock_source_id clock_source,
- 		const struct dc_link_settings *link_settings)
- {
-+	if (!link_res->hpo_dp_link_enc) {
-+		DC_LOG_ERROR("%s: invalid hpo_dp_link_enc\n", __func__);
-+		return;
-+	}
-+
- 	if (link->dc->res_pool->dccg->funcs->set_symclk32_le_root_clock_gating)
- 		link->dc->res_pool->dccg->funcs->set_symclk32_le_root_clock_gating(
- 				link->dc->res_pool->dccg,
-@@ -124,6 +131,11 @@ void disable_hpo_dp_link_output(struct dc_link *link,
- 		const struct link_resource *link_res,
- 		enum signal_type signal)
- {
-+	if (!link_res->hpo_dp_link_enc) {
-+		DC_LOG_ERROR("%s: invalid hpo_dp_link_enc\n", __func__);
-+		return;
-+	}
-+
- 		link_res->hpo_dp_link_enc->funcs->link_disable(link_res->hpo_dp_link_enc);
- 		link_res->hpo_dp_link_enc->funcs->disable_link_phy(
- 				link_res->hpo_dp_link_enc, signal);
-diff --git a/drivers/gpu/drm/amd/display/dc/link/link_factory.c b/drivers/gpu/drm/amd/display/dc/link/link_factory.c
-index 33bb96f770b866..eb7c9f226af5cb 100644
---- a/drivers/gpu/drm/amd/display/dc/link/link_factory.c
-+++ b/drivers/gpu/drm/amd/display/dc/link/link_factory.c
-@@ -403,7 +403,7 @@ static void link_destruct(struct dc_link *link)
- 	if (link->panel_cntl)
- 		link->panel_cntl->funcs->destroy(&link->panel_cntl);
- 
--	if (link->link_enc) {
-+	if (link->link_enc && !link->is_dig_mapping_flexible) {
- 		/* Update link encoder resource tracking variables. These are used for
- 		 * the dynamic assignment of link encoders to streams. Virtual links
- 		 * are not assigned encoder resources on creation.
-diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/processpptables.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/processpptables.c
-index 5794b64507bf94..56a22575258064 100644
---- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/processpptables.c
-+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/processpptables.c
-@@ -1185,6 +1185,8 @@ static int init_overdrive_limits(struct pp_hwmgr *hwmgr,
- 	fw_info = smu_atom_get_data_table(hwmgr->adev,
- 			 GetIndexIntoMasterTable(DATA, FirmwareInfo),
- 			 &size, &frev, &crev);
-+	PP_ASSERT_WITH_CODE(fw_info != NULL,
-+			    "Missing firmware info!", return -EINVAL);
- 
- 	if ((fw_info->ucTableFormatRevision == 1)
- 	    && (le16_to_cpu(fw_info->usStructureSize) >= sizeof(ATOM_FIRMWARE_INFO_V1_4)))
-diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
-index 2611afd2c1c136..ef2b6ce544d0a8 100644
---- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
-+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
-@@ -1291,17 +1291,6 @@ static int adv7511_probe(struct i2c_client *i2c)
- 
- 	INIT_WORK(&adv7511->hpd_work, adv7511_hpd_work);
- 
--	if (i2c->irq) {
--		init_waitqueue_head(&adv7511->wq);
--
--		ret = devm_request_threaded_irq(dev, i2c->irq, NULL,
--						adv7511_irq_handler,
--						IRQF_ONESHOT, dev_name(dev),
--						adv7511);
--		if (ret)
--			goto err_unregister_cec;
--	}
--
- 	adv7511_power_off(adv7511);
- 
- 	i2c_set_clientdata(i2c, adv7511);
-@@ -1325,6 +1314,17 @@ static int adv7511_probe(struct i2c_client *i2c)
- 
- 	adv7511_audio_init(dev, adv7511);
- 
-+	if (i2c->irq) {
-+		init_waitqueue_head(&adv7511->wq);
-+
-+		ret = devm_request_threaded_irq(dev, i2c->irq, NULL,
-+						adv7511_irq_handler,
-+						IRQF_ONESHOT, dev_name(dev),
-+						adv7511);
-+		if (ret)
-+			goto err_unregister_audio;
-+	}
-+
- 	if (adv7511->type == ADV7533 || adv7511->type == ADV7535) {
- 		ret = adv7533_attach_dsi(adv7511);
- 		if (ret)
-diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c
-index 98d3b10c08ae19..ab03b08433f8f3 100644
---- a/drivers/gpu/drm/drm_atomic_uapi.c
-+++ b/drivers/gpu/drm/drm_atomic_uapi.c
-@@ -585,7 +585,7 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane,
- 					&state->fb_damage_clips,
- 					val,
- 					-1,
--					sizeof(struct drm_rect),
-+					sizeof(struct drm_mode_rect),
- 					&replaced);
- 		return ret;
- 	} else if (property == plane->scaling_filter_property) {
-diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
-index 5b93c11895bb1e..aab76334083e8a 100644
---- a/drivers/gpu/drm/drm_print.c
-+++ b/drivers/gpu/drm/drm_print.c
-@@ -100,8 +100,9 @@ void __drm_puts_coredump(struct drm_printer *p, const char *str)
- 			copy = iterator->remain;
- 
- 		/* Copy out the bit of the string that we need */
--		memcpy(iterator->data,
--			str + (iterator->start - iterator->offset), copy);
-+		if (iterator->data)
-+			memcpy(iterator->data,
-+			       str + (iterator->start - iterator->offset), copy);
- 
- 		iterator->offset = iterator->start + copy;
- 		iterator->remain -= copy;
-@@ -110,7 +111,8 @@ void __drm_puts_coredump(struct drm_printer *p, const char *str)
- 
- 		len = min_t(ssize_t, strlen(str), iterator->remain);
- 
--		memcpy(iterator->data + pos, str, len);
-+		if (iterator->data)
-+			memcpy(iterator->data + pos, str, len);
- 
- 		iterator->offset += len;
- 		iterator->remain -= len;
-@@ -140,8 +142,9 @@ void __drm_printfn_coredump(struct drm_printer *p, struct va_format *vaf)
- 	if ((iterator->offset >= iterator->start) && (len < iterator->remain)) {
- 		ssize_t pos = iterator->offset - iterator->start;
- 
--		snprintf(((char *) iterator->data) + pos,
--			iterator->remain, "%pV", vaf);
-+		if (iterator->data)
-+			snprintf(((char *) iterator->data) + pos,
-+				 iterator->remain, "%pV", vaf);
- 
- 		iterator->offset += len;
- 		iterator->remain -= len;
-diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
-index 9227f8146a583f..6dc097a2ac07b3 100644
---- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
-+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
-@@ -1136,7 +1136,7 @@ static vm_fault_t vm_fault_ttm(struct vm_fault *vmf)
- 		GEM_WARN_ON(!i915_ttm_cpu_maps_iomem(bo->resource));
- 	}
- 
--	if (wakeref & CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND)
-+	if (wakeref && CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND != 0)
- 		intel_wakeref_auto(&to_i915(obj->base.dev)->runtime_pm.userfault_wakeref,
- 				   msecs_to_jiffies_timeout(CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND));
- 
-diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
-index 8f0c47e8687485..036028b8f5248d 100644
---- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
-+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
-@@ -436,8 +436,10 @@ static int ovl_adaptor_comp_init(struct device *dev, struct component_match **ma
- 		}
- 
- 		comp_pdev = of_find_device_by_node(node);
--		if (!comp_pdev)
-+		if (!comp_pdev) {
-+			of_node_put(node);
- 			return -EPROBE_DEFER;
-+		}
- 
- 		priv->ovl_adaptor_comp[id] = &comp_pdev->dev;
- 
-diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
-index 4127e2762dcd10..a2df8bd7aa940f 100644
---- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
-+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
-@@ -1071,6 +1071,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
- 	adreno_gpu->chip_id = config->chip_id;
- 
- 	gpu->allow_relocs = config->info->family < ADRENO_6XX_GEN1;
-+	gpu->pdev = pdev;
- 
- 	/* Only handle the core clock when GMU is not in use (or is absent). */
- 	if (adreno_has_gmu_wrapper(adreno_gpu) ||
-diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
-index 5c10b559a5957a..5a7541597d0ce8 100644
---- a/drivers/gpu/drm/msm/msm_gpu.c
-+++ b/drivers/gpu/drm/msm/msm_gpu.c
-@@ -927,7 +927,6 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
- 	if (IS_ERR(gpu->gpu_cx))
- 		gpu->gpu_cx = NULL;
- 
--	gpu->pdev = pdev;
- 	platform_set_drvdata(pdev, &gpu->adreno_smmu);
- 
- 	msm_devfreq_init(gpu);
-diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
-index e000577a95dd75..21996b713d1c3a 100644
---- a/drivers/gpu/drm/omapdrm/omap_drv.c
-+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
-@@ -695,6 +695,10 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev)
- 	soc = soc_device_match(omapdrm_soc_devices);
- 	priv->omaprev = soc ? (uintptr_t)soc->data : 0;
- 	priv->wq = alloc_ordered_workqueue("omapdrm", 0);
-+	if (!priv->wq) {
-+		ret = -ENOMEM;
-+		goto err_alloc_workqueue;
-+	}
- 
- 	mutex_init(&priv->list_lock);
- 	INIT_LIST_HEAD(&priv->obj_list);
-@@ -753,6 +757,7 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev)
- 	drm_mode_config_cleanup(ddev);
- 	omap_gem_deinit(ddev);
- 	destroy_workqueue(priv->wq);
-+err_alloc_workqueue:
- 	omap_disconnect_pipelines(ddev);
- 	drm_dev_put(ddev);
- 	return ret;
-diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
-index cfeca2694d5f91..b63b6b4e9b2818 100644
---- a/drivers/gpu/drm/radeon/r100.c
-+++ b/drivers/gpu/drm/radeon/r100.c
-@@ -1015,45 +1015,65 @@ static int r100_cp_init_microcode(struct radeon_device *rdev)
- 
- 	DRM_DEBUG_KMS("\n");
- 
--	if ((rdev->family == CHIP_R100) || (rdev->family == CHIP_RV100) ||
--	    (rdev->family == CHIP_RV200) || (rdev->family == CHIP_RS100) ||
--	    (rdev->family == CHIP_RS200)) {
-+	switch (rdev->family) {
-+	case CHIP_R100:
-+	case CHIP_RV100:
-+	case CHIP_RV200:
-+	case CHIP_RS100:
-+	case CHIP_RS200:
- 		DRM_INFO("Loading R100 Microcode\n");
- 		fw_name = FIRMWARE_R100;
--	} else if ((rdev->family == CHIP_R200) ||
--		   (rdev->family == CHIP_RV250) ||
--		   (rdev->family == CHIP_RV280) ||
--		   (rdev->family == CHIP_RS300)) {
-+		break;
-+
-+	case CHIP_R200:
-+	case CHIP_RV250:
-+	case CHIP_RV280:
-+	case CHIP_RS300:
- 		DRM_INFO("Loading R200 Microcode\n");
- 		fw_name = FIRMWARE_R200;
--	} else if ((rdev->family == CHIP_R300) ||
--		   (rdev->family == CHIP_R350) ||
--		   (rdev->family == CHIP_RV350) ||
--		   (rdev->family == CHIP_RV380) ||
--		   (rdev->family == CHIP_RS400) ||
--		   (rdev->family == CHIP_RS480)) {
-+		break;
-+
-+	case CHIP_R300:
-+	case CHIP_R350:
-+	case CHIP_RV350:
-+	case CHIP_RV380:
-+	case CHIP_RS400:
-+	case CHIP_RS480:
- 		DRM_INFO("Loading R300 Microcode\n");
- 		fw_name = FIRMWARE_R300;
--	} else if ((rdev->family == CHIP_R420) ||
--		   (rdev->family == CHIP_R423) ||
--		   (rdev->family == CHIP_RV410)) {
-+		break;
-+
-+	case CHIP_R420:
-+	case CHIP_R423:
-+	case CHIP_RV410:
- 		DRM_INFO("Loading R400 Microcode\n");
- 		fw_name = FIRMWARE_R420;
--	} else if ((rdev->family == CHIP_RS690) ||
--		   (rdev->family == CHIP_RS740)) {
-+		break;
-+
-+	case CHIP_RS690:
-+	case CHIP_RS740:
- 		DRM_INFO("Loading RS690/RS740 Microcode\n");
- 		fw_name = FIRMWARE_RS690;
--	} else if (rdev->family == CHIP_RS600) {
-+		break;
-+
-+	case CHIP_RS600:
- 		DRM_INFO("Loading RS600 Microcode\n");
- 		fw_name = FIRMWARE_RS600;
--	} else if ((rdev->family == CHIP_RV515) ||
--		   (rdev->family == CHIP_R520) ||
--		   (rdev->family == CHIP_RV530) ||
--		   (rdev->family == CHIP_R580) ||
--		   (rdev->family == CHIP_RV560) ||
--		   (rdev->family == CHIP_RV570)) {
-+		break;
-+
-+	case CHIP_RV515:
-+	case CHIP_R520:
-+	case CHIP_RV530:
-+	case CHIP_R580:
-+	case CHIP_RV560:
-+	case CHIP_RV570:
- 		DRM_INFO("Loading R500 Microcode\n");
- 		fw_name = FIRMWARE_R520;
-+		break;
-+
-+	default:
-+		DRM_ERROR("Unsupported Radeon family %u\n", rdev->family);
-+		return -EINVAL;
- 	}
- 
- 	err = request_firmware(&rdev->me_fw, fw_name, rdev->dev);
-diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-index c6fbfc0baeccd4..ee72e8c6ad69bd 100644
---- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-@@ -1566,6 +1566,10 @@ static void vop_crtc_atomic_flush(struct drm_crtc *crtc,
- 	VOP_AFBC_SET(vop, enable, s->enable_afbc);
- 	vop_cfg_done(vop);
- 
-+	/* Ack the DMA transfer of the previous frame (RK3066). */
-+	if (VOP_HAS_REG(vop, common, dma_stop))
-+		VOP_REG_SET(vop, common, dma_stop, 0);
-+
- 	spin_unlock(&vop->reg_lock);
- 
- 	/*
-diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
-index 5f56e0597df84a..c5c716a69171a8 100644
---- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
-+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
-@@ -122,6 +122,7 @@ struct vop_common {
- 	struct vop_reg lut_buffer_index;
- 	struct vop_reg gate_en;
- 	struct vop_reg mmu_en;
-+	struct vop_reg dma_stop;
- 	struct vop_reg out_mode;
- 	struct vop_reg standby;
- };
-diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
-index 7b28050067769d..f7d0edd762b36c 100644
---- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
-+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
-@@ -435,6 +435,7 @@ static const struct vop_output rk3066_output = {
- };
- 
- static const struct vop_common rk3066_common = {
-+	.dma_stop = VOP_REG(RK3066_SYS_CTRL0, 0x1, 0),
- 	.standby = VOP_REG(RK3066_SYS_CTRL0, 0x1, 1),
- 	.out_mode = VOP_REG(RK3066_DSP_CTRL0, 0xf, 0),
- 	.cfg_done = VOP_REG(RK3066_REG_CFG_DONE, 0x1, 0),
-@@ -483,6 +484,7 @@ static const struct vop_data rk3066_vop = {
- 	.output = &rk3066_output,
- 	.win = rk3066_vop_win_data,
- 	.win_size = ARRAY_SIZE(rk3066_vop_win_data),
-+	.feature = VOP_FEATURE_INTERNAL_RGB,
- 	.max_output = { 1920, 1080 },
- };
- 
-diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c
-index a42763e1429dc1..d3462be7493037 100644
---- a/drivers/gpu/drm/scheduler/sched_entity.c
-+++ b/drivers/gpu/drm/scheduler/sched_entity.c
-@@ -111,8 +111,10 @@ void drm_sched_entity_modify_sched(struct drm_sched_entity *entity,
- {
- 	WARN_ON(!num_sched_list || !sched_list);
- 
-+	spin_lock(&entity->rq_lock);
- 	entity->sched_list = sched_list;
- 	entity->num_sched_list = num_sched_list;
-+	spin_unlock(&entity->rq_lock);
- }
- EXPORT_SYMBOL(drm_sched_entity_modify_sched);
- 
-diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c
-index 4d2db079ad4ff3..e1232f74dfa537 100644
---- a/drivers/gpu/drm/stm/drv.c
-+++ b/drivers/gpu/drm/stm/drv.c
-@@ -25,6 +25,7 @@
- #include <drm/drm_module.h>
- #include <drm/drm_probe_helper.h>
- #include <drm/drm_vblank.h>
-+#include <drm/drm_managed.h>
- 
- #include "ltdc.h"
- 
-@@ -75,7 +76,7 @@ static int drv_load(struct drm_device *ddev)
- 
- 	DRM_DEBUG("%s\n", __func__);
- 
--	ldev = devm_kzalloc(ddev->dev, sizeof(*ldev), GFP_KERNEL);
-+	ldev = drmm_kzalloc(ddev, sizeof(*ldev), GFP_KERNEL);
- 	if (!ldev)
- 		return -ENOMEM;
- 
-diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
-index 5aec1e58c968c2..0832b749b66e7f 100644
---- a/drivers/gpu/drm/stm/ltdc.c
-+++ b/drivers/gpu/drm/stm/ltdc.c
-@@ -36,6 +36,7 @@
- #include <drm/drm_probe_helper.h>
- #include <drm/drm_simple_kms_helper.h>
- #include <drm/drm_vblank.h>
-+#include <drm/drm_managed.h>
- 
- #include <video/videomode.h>
- 
-@@ -1199,7 +1200,6 @@ static void ltdc_crtc_atomic_print_state(struct drm_printer *p,
- }
- 
- static const struct drm_crtc_funcs ltdc_crtc_funcs = {
--	.destroy = drm_crtc_cleanup,
- 	.set_config = drm_atomic_helper_set_config,
- 	.page_flip = drm_atomic_helper_page_flip,
- 	.reset = drm_atomic_helper_crtc_reset,
-@@ -1212,7 +1212,6 @@ static const struct drm_crtc_funcs ltdc_crtc_funcs = {
- };
- 
- static const struct drm_crtc_funcs ltdc_crtc_with_crc_support_funcs = {
--	.destroy = drm_crtc_cleanup,
- 	.set_config = drm_atomic_helper_set_config,
- 	.page_flip = drm_atomic_helper_page_flip,
- 	.reset = drm_atomic_helper_crtc_reset,
-@@ -1514,6 +1513,9 @@ static void ltdc_plane_atomic_disable(struct drm_plane *plane,
- 	/* Disable layer */
- 	regmap_write_bits(ldev->regmap, LTDC_L1CR + lofs, LXCR_LEN | LXCR_CLUTEN |  LXCR_HMEN, 0);
- 
-+	/* Reset the layer transparency to hide any related background color */
-+	regmap_write_bits(ldev->regmap, LTDC_L1CACR + lofs, LXCACR_CONSTA, 0x00);
-+
- 	/* Commit shadow registers = update plane at next vblank */
- 	if (ldev->caps.plane_reg_shadow)
- 		regmap_write_bits(ldev->regmap, LTDC_L1RCR + lofs,
-@@ -1545,7 +1547,6 @@ static void ltdc_plane_atomic_print_state(struct drm_printer *p,
- static const struct drm_plane_funcs ltdc_plane_funcs = {
- 	.update_plane = drm_atomic_helper_update_plane,
- 	.disable_plane = drm_atomic_helper_disable_plane,
--	.destroy = drm_plane_cleanup,
- 	.reset = drm_atomic_helper_plane_reset,
- 	.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
- 	.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
-@@ -1572,7 +1573,6 @@ static struct drm_plane *ltdc_plane_create(struct drm_device *ddev,
- 	const u64 *modifiers = ltdc_format_modifiers;
- 	u32 lofs = index * LAY_OFS;
- 	u32 val;
--	int ret;
- 
- 	/* Allocate the biggest size according to supported color formats */
- 	formats = devm_kzalloc(dev, (ldev->caps.pix_fmt_nb +
-@@ -1615,14 +1615,10 @@ static struct drm_plane *ltdc_plane_create(struct drm_device *ddev,
- 		}
- 	}
- 
--	plane = devm_kzalloc(dev, sizeof(*plane), GFP_KERNEL);
--	if (!plane)
--		return NULL;
--
--	ret = drm_universal_plane_init(ddev, plane, possible_crtcs,
--				       &ltdc_plane_funcs, formats, nb_fmt,
--				       modifiers, type, NULL);
--	if (ret < 0)
-+	plane = drmm_universal_plane_alloc(ddev, struct drm_plane, dev,
-+					   possible_crtcs, &ltdc_plane_funcs, formats,
-+					   nb_fmt, modifiers, type, NULL);
-+	if (IS_ERR(plane))
- 		return NULL;
- 
- 	if (ldev->caps.ycbcr_input) {
-@@ -1645,15 +1641,6 @@ static struct drm_plane *ltdc_plane_create(struct drm_device *ddev,
- 	return plane;
- }
- 
--static void ltdc_plane_destroy_all(struct drm_device *ddev)
--{
--	struct drm_plane *plane, *plane_temp;
--
--	list_for_each_entry_safe(plane, plane_temp,
--				 &ddev->mode_config.plane_list, head)
--		drm_plane_cleanup(plane);
--}
--
- static int ltdc_crtc_init(struct drm_device *ddev, struct drm_crtc *crtc)
- {
- 	struct ltdc_device *ldev = ddev->dev_private;
-@@ -1679,14 +1666,14 @@ static int ltdc_crtc_init(struct drm_device *ddev, struct drm_crtc *crtc)
- 
- 	/* Init CRTC according to its hardware features */
- 	if (ldev->caps.crc)
--		ret = drm_crtc_init_with_planes(ddev, crtc, primary, NULL,
--						&ltdc_crtc_with_crc_support_funcs, NULL);
-+		ret = drmm_crtc_init_with_planes(ddev, crtc, primary, NULL,
-+						 &ltdc_crtc_with_crc_support_funcs, NULL);
- 	else
--		ret = drm_crtc_init_with_planes(ddev, crtc, primary, NULL,
--						&ltdc_crtc_funcs, NULL);
-+		ret = drmm_crtc_init_with_planes(ddev, crtc, primary, NULL,
-+						 &ltdc_crtc_funcs, NULL);
- 	if (ret) {
- 		DRM_ERROR("Can not initialize CRTC\n");
--		goto cleanup;
-+		return ret;
- 	}
- 
- 	drm_crtc_helper_add(crtc, &ltdc_crtc_helper_funcs);
-@@ -1700,9 +1687,8 @@ static int ltdc_crtc_init(struct drm_device *ddev, struct drm_crtc *crtc)
- 	for (i = 1; i < ldev->caps.nb_layers; i++) {
- 		overlay = ltdc_plane_create(ddev, DRM_PLANE_TYPE_OVERLAY, i);
- 		if (!overlay) {
--			ret = -ENOMEM;
- 			DRM_ERROR("Can not create overlay plane %d\n", i);
--			goto cleanup;
-+			return -ENOMEM;
- 		}
- 		if (ldev->caps.dynamic_zorder)
- 			drm_plane_create_zpos_property(overlay, i, 0, ldev->caps.nb_layers - 1);
-@@ -1715,10 +1701,6 @@ static int ltdc_crtc_init(struct drm_device *ddev, struct drm_crtc *crtc)
- 	}
- 
- 	return 0;
--
--cleanup:
--	ltdc_plane_destroy_all(ddev);
--	return ret;
- }
- 
- static void ltdc_encoder_disable(struct drm_encoder *encoder)
-@@ -1778,23 +1760,19 @@ static int ltdc_encoder_init(struct drm_device *ddev, struct drm_bridge *bridge)
- 	struct drm_encoder *encoder;
- 	int ret;
- 
--	encoder = devm_kzalloc(ddev->dev, sizeof(*encoder), GFP_KERNEL);
--	if (!encoder)
--		return -ENOMEM;
-+	encoder = drmm_simple_encoder_alloc(ddev, struct drm_encoder, dev,
-+					    DRM_MODE_ENCODER_DPI);
-+	if (IS_ERR(encoder))
-+		return PTR_ERR(encoder);
- 
- 	encoder->possible_crtcs = CRTC_MASK;
- 	encoder->possible_clones = 0;	/* No cloning support */
- 
--	drm_simple_encoder_init(ddev, encoder, DRM_MODE_ENCODER_DPI);
--
- 	drm_encoder_helper_add(encoder, &ltdc_encoder_helper_funcs);
- 
- 	ret = drm_bridge_attach(encoder, bridge, NULL, 0);
--	if (ret) {
--		if (ret != -EPROBE_DEFER)
--			drm_encoder_cleanup(encoder);
-+	if (ret)
- 		return ret;
--	}
- 
- 	DRM_DEBUG_DRIVER("Bridge encoder:%d created\n", encoder->base.id);
- 
-@@ -1964,8 +1942,7 @@ int ltdc_load(struct drm_device *ddev)
- 			goto err;
- 
- 		if (panel) {
--			bridge = drm_panel_bridge_add_typed(panel,
--							    DRM_MODE_CONNECTOR_DPI);
-+			bridge = drmm_panel_bridge_add(ddev, panel);
- 			if (IS_ERR(bridge)) {
- 				DRM_ERROR("panel-bridge endpoint %d\n", i);
- 				ret = PTR_ERR(bridge);
-@@ -2047,7 +2024,7 @@ int ltdc_load(struct drm_device *ddev)
- 		}
- 	}
- 
--	crtc = devm_kzalloc(dev, sizeof(*crtc), GFP_KERNEL);
-+	crtc = drmm_kzalloc(ddev, sizeof(*crtc), GFP_KERNEL);
- 	if (!crtc) {
- 		DRM_ERROR("Failed to allocate crtc\n");
- 		ret = -ENOMEM;
-@@ -2074,9 +2051,6 @@ int ltdc_load(struct drm_device *ddev)
- 
- 	return 0;
- err:
--	for (i = 0; i < nb_endpoints; i++)
--		drm_of_panel_bridge_remove(ddev->dev->of_node, 0, i);
--
- 	clk_disable_unprepare(ldev->pixel_clk);
- 
- 	return ret;
-@@ -2084,16 +2058,8 @@ int ltdc_load(struct drm_device *ddev)
- 
- void ltdc_unload(struct drm_device *ddev)
- {
--	struct device *dev = ddev->dev;
--	int nb_endpoints, i;
--
- 	DRM_DEBUG_DRIVER("\n");
- 
--	nb_endpoints = of_graph_get_endpoint_count(dev->of_node);
--
--	for (i = 0; i < nb_endpoints; i++)
--		drm_of_panel_bridge_remove(ddev->dev->of_node, 0, i);
--
- 	pm_runtime_disable(ddev->dev);
- }
- 
-diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index a5987fafbedde4..f2e8fb357590ff 100644
---- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -411,24 +411,8 @@
- #define USB_DEVICE_ID_TOSHIBA_CLICK_L9W	0x0401
- #define USB_DEVICE_ID_HP_X2		0x074d
- #define USB_DEVICE_ID_HP_X2_10_COVER	0x0755
--#define I2C_DEVICE_ID_HP_ENVY_X360_15	0x2d05
--#define I2C_DEVICE_ID_HP_ENVY_X360_15T_DR100	0x29CF
--#define I2C_DEVICE_ID_HP_ENVY_X360_EU0009NV	0x2CF9
--#define I2C_DEVICE_ID_HP_SPECTRE_X360_15	0x2817
--#define I2C_DEVICE_ID_HP_SPECTRE_X360_13_AW0020NG  0x29DF
--#define I2C_DEVICE_ID_ASUS_TP420IA_TOUCHSCREEN 0x2BC8
--#define I2C_DEVICE_ID_ASUS_GV301RA_TOUCHSCREEN 0x2C82
--#define I2C_DEVICE_ID_ASUS_UX3402_TOUCHSCREEN 0x2F2C
--#define I2C_DEVICE_ID_ASUS_UX6404_TOUCHSCREEN 0x4116
- #define USB_DEVICE_ID_ASUS_UX550VE_TOUCHSCREEN	0x2544
- #define USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN	0x2706
--#define I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN	0x261A
--#define I2C_DEVICE_ID_SURFACE_GO2_TOUCHSCREEN	0x2A1C
--#define I2C_DEVICE_ID_LENOVO_YOGA_C630_TOUCHSCREEN	0x279F
--#define I2C_DEVICE_ID_HP_SPECTRE_X360_13T_AW100	0x29F5
--#define I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V1	0x2BED
--#define I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V2	0x2BEE
--#define I2C_DEVICE_ID_HP_ENVY_X360_15_EU0556NG		0x2D02
- #define I2C_DEVICE_ID_CHROMEBOOK_TROGDOR_POMPOM	0x2F81
- 
- #define USB_VENDOR_ID_ELECOM		0x056e
-@@ -804,6 +788,7 @@
- #define USB_DEVICE_ID_LENOVO_X1_TAB	0x60a3
- #define USB_DEVICE_ID_LENOVO_X1_TAB3	0x60b5
- #define USB_DEVICE_ID_LENOVO_X12_TAB	0x60fe
-+#define USB_DEVICE_ID_LENOVO_X12_TAB2	0x61ae
- #define USB_DEVICE_ID_LENOVO_OPTICAL_USB_MOUSE_600E	0x600e
- #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D	0x608d
- #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6019	0x6019
-diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
-index c9094a4f281e90..fda9dce3da9980 100644
---- a/drivers/hid/hid-input.c
-+++ b/drivers/hid/hid-input.c
-@@ -373,14 +373,6 @@ static const struct hid_device_id hid_battery_quirks[] = {
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH,
- 		USB_DEVICE_ID_LOGITECH_DINOVO_EDGE_KBD),
- 	  HID_BATTERY_QUIRK_IGNORE },
--	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_ASUS_TP420IA_TOUCHSCREEN),
--	  HID_BATTERY_QUIRK_IGNORE },
--	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_ASUS_GV301RA_TOUCHSCREEN),
--	  HID_BATTERY_QUIRK_IGNORE },
--	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_ASUS_UX3402_TOUCHSCREEN),
--	  HID_BATTERY_QUIRK_IGNORE },
--	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_ASUS_UX6404_TOUCHSCREEN),
--	  HID_BATTERY_QUIRK_IGNORE },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN),
- 	  HID_BATTERY_QUIRK_IGNORE },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ASUS_UX550VE_TOUCHSCREEN),
-@@ -391,32 +383,13 @@ static const struct hid_device_id hid_battery_quirks[] = {
- 	  HID_BATTERY_QUIRK_AVOID_QUERY },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_SW),
- 	  HID_BATTERY_QUIRK_AVOID_QUERY },
--	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15),
--	  HID_BATTERY_QUIRK_IGNORE },
--	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15T_DR100),
--	  HID_BATTERY_QUIRK_IGNORE },
--	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_EU0009NV),
--	  HID_BATTERY_QUIRK_IGNORE },
--	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_15),
--	  HID_BATTERY_QUIRK_IGNORE },
--	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_13_AW0020NG),
--	  HID_BATTERY_QUIRK_IGNORE },
--	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN),
--	  HID_BATTERY_QUIRK_IGNORE },
--	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_SURFACE_GO2_TOUCHSCREEN),
--	  HID_BATTERY_QUIRK_IGNORE },
--	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_LENOVO_YOGA_C630_TOUCHSCREEN),
--	  HID_BATTERY_QUIRK_IGNORE },
--	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_13T_AW100),
--	  HID_BATTERY_QUIRK_IGNORE },
--	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V1),
--	  HID_BATTERY_QUIRK_IGNORE },
--	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V2),
--	  HID_BATTERY_QUIRK_IGNORE },
--	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15_EU0556NG),
--	  HID_BATTERY_QUIRK_IGNORE },
- 	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_CHROMEBOOK_TROGDOR_POMPOM),
- 	  HID_BATTERY_QUIRK_AVOID_QUERY },
-+	/*
-+	 * Elan I2C-HID touchscreens seem to all report a non present battery,
-+	 * set HID_BATTERY_QUIRK_IGNORE for all Elan I2C-HID devices.
-+	 */
-+	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, HID_ANY_ID), HID_BATTERY_QUIRK_IGNORE },
- 	{}
- };
- 
-diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index 8ef41d6e71d421..6d76463f5896f3 100644
---- a/drivers/hid/hid-multitouch.c
-+++ b/drivers/hid/hid-multitouch.c
-@@ -2116,6 +2116,12 @@ static const struct hid_device_id mt_devices[] = {
- 			   USB_VENDOR_ID_LENOVO,
- 			   USB_DEVICE_ID_LENOVO_X12_TAB) },
- 
-+	/* Lenovo X12 TAB Gen 2 */
-+	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT_NSMU,
-+		HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,
-+			   USB_VENDOR_ID_LENOVO,
-+			   USB_DEVICE_ID_LENOVO_X12_TAB2) },
-+
- 	/* Logitech devices */
- 	{ .driver_data = MT_CLS_NSMU,
- 		HID_DEVICE(BUS_BLUETOOTH, HID_GROUP_MULTITOUCH_WIN_8,
-diff --git a/drivers/hwmon/nct6775-platform.c b/drivers/hwmon/nct6775-platform.c
-index 81bf03dad6bbc5..706a662dd077d1 100644
---- a/drivers/hwmon/nct6775-platform.c
-+++ b/drivers/hwmon/nct6775-platform.c
-@@ -1269,6 +1269,7 @@ static const char * const asus_msi_boards[] = {
- 	"EX-B760M-V5 D4",
- 	"EX-H510M-V3",
- 	"EX-H610M-V3 D4",
-+	"G15CF",
- 	"PRIME A620M-A",
- 	"PRIME B560-PLUS",
- 	"PRIME B560-PLUS AC-HES",
-diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c
-index 35f762872b8a58..58562700c85ee4 100644
---- a/drivers/i2c/busses/i2c-designware-common.c
-+++ b/drivers/i2c/busses/i2c-designware-common.c
-@@ -441,6 +441,7 @@ int i2c_dw_set_sda_hold(struct dw_i2c_dev *dev)
- 
- void __i2c_dw_disable(struct dw_i2c_dev *dev)
- {
-+	struct i2c_timings *t = &dev->timings;
- 	unsigned int raw_intr_stats;
- 	unsigned int enable;
- 	int timeout = 100;
-@@ -453,6 +454,19 @@ void __i2c_dw_disable(struct dw_i2c_dev *dev)
- 
- 	abort_needed = raw_intr_stats & DW_IC_INTR_MST_ON_HOLD;
- 	if (abort_needed) {
-+		if (!(enable & DW_IC_ENABLE_ENABLE)) {
-+			regmap_write(dev->map, DW_IC_ENABLE, DW_IC_ENABLE_ENABLE);
-+			/*
-+			 * Wait 10 times the signaling period of the highest I2C
-+			 * transfer supported by the driver (for 400KHz this is
-+			 * 25us) to ensure the I2C ENABLE bit is already set
-+			 * as described in the DesignWare I2C databook.
-+			 */
-+			fsleep(DIV_ROUND_CLOSEST_ULL(10 * MICRO, t->bus_freq_hz));
-+			/* Set ENABLE bit before setting ABORT */
-+			enable |= DW_IC_ENABLE_ENABLE;
-+		}
-+
- 		regmap_write(dev->map, DW_IC_ENABLE, enable | DW_IC_ENABLE_ABORT);
- 		ret = regmap_read_poll_timeout(dev->map, DW_IC_ENABLE, enable,
- 					       !(enable & DW_IC_ENABLE_ABORT), 10,
-diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h
-index ae835000fd32ae..99d8c6bbc0320d 100644
---- a/drivers/i2c/busses/i2c-designware-core.h
-+++ b/drivers/i2c/busses/i2c-designware-core.h
-@@ -109,6 +109,7 @@
- 						 DW_IC_INTR_RX_UNDER | \
- 						 DW_IC_INTR_RD_REQ)
- 
-+#define DW_IC_ENABLE_ENABLE			BIT(0)
- #define DW_IC_ENABLE_ABORT			BIT(1)
- 
- #define DW_IC_STATUS_ACTIVITY			BIT(0)
-diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c
-index 85dbd0eb5392c5..579c668cb78a6d 100644
---- a/drivers/i2c/busses/i2c-designware-master.c
-+++ b/drivers/i2c/busses/i2c-designware-master.c
-@@ -253,6 +253,34 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev)
- 	regmap_write(dev->map, DW_IC_INTR_MASK, DW_IC_INTR_MASTER_MASK);
- }
- 
-+/*
-+ * This function waits for the controller to be idle before disabling I2C
-+ * When the controller is not in the IDLE state, the MST_ACTIVITY bit
-+ * (IC_STATUS[5]) is set.
-+ *
-+ * Values:
-+ * 0x1 (ACTIVE): Controller not idle
-+ * 0x0 (IDLE): Controller is idle
-+ *
-+ * The function is called after completing the current transfer.
-+ *
-+ * Returns:
-+ * False when the controller is in the IDLE state.
-+ * True when the controller is in the ACTIVE state.
-+ */
-+static bool i2c_dw_is_controller_active(struct dw_i2c_dev *dev)
-+{
-+	u32 status;
-+
-+	regmap_read(dev->map, DW_IC_STATUS, &status);
-+	if (!(status & DW_IC_STATUS_MASTER_ACTIVITY))
-+		return false;
-+
-+	return regmap_read_poll_timeout(dev->map, DW_IC_STATUS, status,
-+				       !(status & DW_IC_STATUS_MASTER_ACTIVITY),
-+				       1100, 20000) != 0;
-+}
-+
- static int i2c_dw_check_stopbit(struct dw_i2c_dev *dev)
- {
- 	u32 val;
-@@ -694,6 +722,16 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
- 		goto done;
- 	}
- 
-+	/*
-+	 * This happens rarely (~1:500) and is hard to reproduce. Debug trace
-+	 * showed that IC_STATUS had value of 0x23 when STOP_DET occurred,
-+	 * if disable IC_ENABLE.ENABLE immediately that can result in
-+	 * IC_RAW_INTR_STAT.MASTER_ON_HOLD holding SCL low. Check if
-+	 * controller is still ACTIVE before disabling I2C.
-+	 */
-+	if (i2c_dw_is_controller_active(dev))
-+		dev_err(dev->dev, "controller active\n");
-+
- 	/*
- 	 * We must disable the adapter before returning and signaling the end
- 	 * of the current transfer. Otherwise the hardware might continue
-diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c
-index d665c1c7c3274b..350f7827fbacaa 100644
---- a/drivers/i2c/busses/i2c-qcom-geni.c
-+++ b/drivers/i2c/busses/i2c-qcom-geni.c
-@@ -819,15 +819,13 @@ static int geni_i2c_probe(struct platform_device *pdev)
- 	init_completion(&gi2c->done);
- 	spin_lock_init(&gi2c->lock);
- 	platform_set_drvdata(pdev, gi2c);
--	ret = devm_request_irq(dev, gi2c->irq, geni_i2c_irq, 0,
-+	ret = devm_request_irq(dev, gi2c->irq, geni_i2c_irq, IRQF_NO_AUTOEN,
- 			       dev_name(dev), gi2c);
- 	if (ret) {
- 		dev_err(dev, "Request_irq failed:%d: err:%d\n",
- 			gi2c->irq, ret);
- 		return ret;
- 	}
--	/* Disable the interrupt so that the system can enter low-power mode */
--	disable_irq(gi2c->irq);
- 	i2c_set_adapdata(&gi2c->adap, gi2c);
- 	gi2c->adap.dev.parent = dev;
- 	gi2c->adap.dev.of_node = dev->of_node;
-diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
-index 887d55ae409691..b4f10ff31102b6 100644
---- a/drivers/i2c/busses/i2c-stm32f7.c
-+++ b/drivers/i2c/busses/i2c-stm32f7.c
-@@ -2394,7 +2394,7 @@ static int __maybe_unused stm32f7_i2c_runtime_suspend(struct device *dev)
- 	struct stm32f7_i2c_dev *i2c_dev = dev_get_drvdata(dev);
- 
- 	if (!stm32f7_i2c_is_slave_registered(i2c_dev))
--		clk_disable_unprepare(i2c_dev->clk);
-+		clk_disable(i2c_dev->clk);
- 
- 	return 0;
- }
-@@ -2405,9 +2405,9 @@ static int __maybe_unused stm32f7_i2c_runtime_resume(struct device *dev)
- 	int ret;
- 
- 	if (!stm32f7_i2c_is_slave_registered(i2c_dev)) {
--		ret = clk_prepare_enable(i2c_dev->clk);
-+		ret = clk_enable(i2c_dev->clk);
- 		if (ret) {
--			dev_err(dev, "failed to prepare_enable clock\n");
-+			dev_err(dev, "failed to enable clock\n");
- 			return ret;
- 		}
- 	}
-diff --git a/drivers/i2c/busses/i2c-synquacer.c b/drivers/i2c/busses/i2c-synquacer.c
-index a73f5bb9a16456..9bb69a8ab6582e 100644
---- a/drivers/i2c/busses/i2c-synquacer.c
-+++ b/drivers/i2c/busses/i2c-synquacer.c
-@@ -138,7 +138,6 @@ struct synquacer_i2c {
- 	int			irq;
- 	struct device		*dev;
- 	void __iomem		*base;
--	struct clk		*pclk;
- 	u32			pclkrate;
- 	u32			speed_khz;
- 	u32			timeout_ms;
-@@ -535,6 +534,7 @@ static const struct i2c_adapter synquacer_i2c_ops = {
- static int synquacer_i2c_probe(struct platform_device *pdev)
- {
- 	struct synquacer_i2c *i2c;
-+	struct clk *pclk;
- 	u32 bus_speed;
- 	int ret;
- 
-@@ -550,13 +550,13 @@ static int synquacer_i2c_probe(struct platform_device *pdev)
- 	device_property_read_u32(&pdev->dev, "socionext,pclk-rate",
- 				 &i2c->pclkrate);
- 
--	i2c->pclk = devm_clk_get_enabled(&pdev->dev, "pclk");
--	if (IS_ERR(i2c->pclk))
--		return dev_err_probe(&pdev->dev, PTR_ERR(i2c->pclk),
-+	pclk = devm_clk_get_optional_enabled(&pdev->dev, "pclk");
-+	if (IS_ERR(pclk))
-+		return dev_err_probe(&pdev->dev, PTR_ERR(pclk),
- 				     "failed to get and enable clock\n");
- 
--	dev_dbg(&pdev->dev, "clock source %p\n", i2c->pclk);
--	i2c->pclkrate = clk_get_rate(i2c->pclk);
-+	if (pclk)
-+		i2c->pclkrate = clk_get_rate(pclk);
- 
- 	if (i2c->pclkrate < SYNQUACER_I2C_MIN_CLK_RATE ||
- 	    i2c->pclkrate > SYNQUACER_I2C_MAX_CLK_RATE)
-diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
-index 71391b590adaeb..1d68177241a6b3 100644
---- a/drivers/i2c/busses/i2c-xiic.c
-+++ b/drivers/i2c/busses/i2c-xiic.c
-@@ -772,14 +772,17 @@ static irqreturn_t xiic_process(int irq, void *dev_id)
- 			goto out;
- 		}
- 
--		xiic_fill_tx_fifo(i2c);
--
--		/* current message sent and there is space in the fifo */
--		if (!xiic_tx_space(i2c) && xiic_tx_fifo_space(i2c) >= 2) {
-+		if (xiic_tx_space(i2c)) {
-+			xiic_fill_tx_fifo(i2c);
-+		} else {
-+			/* current message fully written */
- 			dev_dbg(i2c->adap.dev.parent,
- 				"%s end of message sent, nmsgs: %d\n",
- 				__func__, i2c->nmsgs);
--			if (i2c->nmsgs > 1) {
-+			/* Don't move onto the next message until the TX FIFO empties,
-+			 * to ensure that a NAK is not missed.
-+			 */
-+			if (i2c->nmsgs > 1 && (pend & XIIC_INTR_TX_EMPTY_MASK)) {
- 				i2c->nmsgs--;
- 				i2c->tx_msg++;
- 				xfer_more = 1;
-@@ -790,11 +793,7 @@ static irqreturn_t xiic_process(int irq, void *dev_id)
- 					"%s Got TX IRQ but no more to do...\n",
- 					__func__);
- 			}
--		} else if (!xiic_tx_space(i2c) && (i2c->nmsgs == 1))
--			/* current frame is sent and is last,
--			 * make sure to disable tx half
--			 */
--			xiic_irq_dis(i2c, XIIC_INTR_TX_HALF_MASK);
-+		}
- 	}
- 
- 	if (pend & XIIC_INTR_BNB_MASK) {
-@@ -844,23 +843,11 @@ static int xiic_bus_busy(struct xiic_i2c *i2c)
- 	return (sr & XIIC_SR_BUS_BUSY_MASK) ? -EBUSY : 0;
- }
- 
--static int xiic_busy(struct xiic_i2c *i2c)
-+static int xiic_wait_not_busy(struct xiic_i2c *i2c)
- {
- 	int tries = 3;
- 	int err;
- 
--	if (i2c->tx_msg || i2c->rx_msg)
--		return -EBUSY;
--
--	/* In single master mode bus can only be busy, when in use by this
--	 * driver. If the register indicates bus being busy for some reason we
--	 * should ignore it, since bus will never be released and i2c will be
--	 * stuck forever.
--	 */
--	if (i2c->singlemaster) {
--		return 0;
--	}
--
- 	/* for instance if previous transfer was terminated due to TX error
- 	 * it might be that the bus is on it's way to become available
- 	 * give it at most 3 ms to wake
-@@ -1104,9 +1091,35 @@ static int xiic_start_xfer(struct xiic_i2c *i2c, struct i2c_msg *msgs, int num)
- 
- 	mutex_lock(&i2c->lock);
- 
--	ret = xiic_busy(i2c);
--	if (ret)
-+	if (i2c->tx_msg || i2c->rx_msg) {
-+		dev_err(i2c->adap.dev.parent,
-+			"cannot start a transfer while busy\n");
-+		ret = -EBUSY;
- 		goto out;
-+	}
-+
-+	/* In single master mode bus can only be busy, when in use by this
-+	 * driver. If the register indicates bus being busy for some reason we
-+	 * should ignore it, since bus will never be released and i2c will be
-+	 * stuck forever.
-+	 */
-+	if (!i2c->singlemaster) {
-+		ret = xiic_wait_not_busy(i2c);
-+		if (ret) {
-+			/* If the bus is stuck in a busy state, such as due to spurious low
-+			 * pulses on the bus causing a false start condition to be detected,
-+			 * then try to recover by re-initializing the controller and check
-+			 * again if the bus is still busy.
-+			 */
-+			dev_warn(i2c->adap.dev.parent, "I2C bus busy timeout, reinitializing\n");
-+			ret = xiic_reinit(i2c);
-+			if (ret)
-+				goto out;
-+			ret = xiic_wait_not_busy(i2c);
-+			if (ret)
-+				goto out;
-+		}
-+	}
- 
- 	i2c->tx_msg = msgs;
- 	i2c->rx_msg = NULL;
-@@ -1164,10 +1177,8 @@ static int xiic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
- 		return err;
- 
- 	err = xiic_start_xfer(i2c, msgs, num);
--	if (err < 0) {
--		dev_err(adap->dev.parent, "Error xiic_start_xfer\n");
-+	if (err < 0)
- 		goto out;
--	}
- 
- 	err = wait_for_completion_timeout(&i2c->completion, XIIC_XFER_TIMEOUT);
- 	mutex_lock(&i2c->lock);
-@@ -1326,8 +1337,8 @@ static int xiic_i2c_probe(struct platform_device *pdev)
- 	return 0;
- 
- err_pm_disable:
--	pm_runtime_set_suspended(&pdev->dev);
- 	pm_runtime_disable(&pdev->dev);
-+	pm_runtime_set_suspended(&pdev->dev);
- 
- 	return ret;
- }
-diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
-index 1e873ff0a624d9..943f0021d6a2c1 100644
---- a/drivers/i2c/i2c-core-base.c
-+++ b/drivers/i2c/i2c-core-base.c
-@@ -16,6 +16,7 @@
- #include <linux/acpi.h>
- #include <linux/clk/clk-conf.h>
- #include <linux/completion.h>
-+#include <linux/debugfs.h>
- #include <linux/delay.h>
- #include <linux/err.h>
- #include <linux/errno.h>
-@@ -67,6 +68,8 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver);
- static DEFINE_STATIC_KEY_FALSE(i2c_trace_msg_key);
- static bool is_registered;
- 
-+static struct dentry *i2c_debugfs_root;
-+
- int i2c_transfer_trace_reg(void)
- {
- 	static_branch_inc(&i2c_trace_msg_key);
-@@ -912,6 +915,27 @@ int i2c_dev_irq_from_resources(const struct resource *resources,
- 	return 0;
- }
- 
-+/*
-+ * Serialize device instantiation in case it can be instantiated explicitly
-+ * and by auto-detection
-+ */
-+static int i2c_lock_addr(struct i2c_adapter *adap, unsigned short addr,
-+			 unsigned short flags)
-+{
-+	if (!(flags & I2C_CLIENT_TEN) &&
-+	    test_and_set_bit(addr, adap->addrs_in_instantiation))
-+		return -EBUSY;
-+
-+	return 0;
-+}
-+
-+static void i2c_unlock_addr(struct i2c_adapter *adap, unsigned short addr,
-+			    unsigned short flags)
-+{
-+	if (!(flags & I2C_CLIENT_TEN))
-+		clear_bit(addr, adap->addrs_in_instantiation);
-+}
-+
- /**
-  * i2c_new_client_device - instantiate an i2c device
-  * @adap: the adapter managing the device
-@@ -959,6 +983,10 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf
- 		goto out_err_silent;
- 	}
- 
-+	status = i2c_lock_addr(adap, client->addr, client->flags);
-+	if (status)
-+		goto out_err_silent;
-+
- 	/* Check for address business */
- 	status = i2c_check_addr_busy(adap, i2c_encode_flags_to_addr(client));
- 	if (status)
-@@ -990,6 +1018,8 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf
- 	dev_dbg(&adap->dev, "client [%s] registered with bus id %s\n",
- 		client->name, dev_name(&client->dev));
- 
-+	i2c_unlock_addr(adap, client->addr, client->flags);
-+
- 	return client;
- 
- out_remove_swnode:
-@@ -1001,6 +1031,7 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf
- 	dev_err(&adap->dev,
- 		"Failed to register i2c client %s at 0x%02x (%d)\n",
- 		client->name, client->addr, status);
-+	i2c_unlock_addr(adap, client->addr, client->flags);
- out_err_silent:
- 	if (need_put)
- 		put_device(&client->dev);
-@@ -1523,6 +1554,8 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
- 		goto out_list;
- 	}
- 
-+	adap->debugfs = debugfs_create_dir(dev_name(&adap->dev), i2c_debugfs_root);
-+
- 	res = i2c_setup_smbus_alert(adap);
- 	if (res)
- 		goto out_reg;
-@@ -1562,6 +1595,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
- 	return 0;
- 
- out_reg:
-+	debugfs_remove_recursive(adap->debugfs);
- 	init_completion(&adap->dev_released);
- 	device_unregister(&adap->dev);
- 	wait_for_completion(&adap->dev_released);
-@@ -1763,6 +1797,8 @@ void i2c_del_adapter(struct i2c_adapter *adap)
- 
- 	i2c_host_notify_irq_teardown(adap);
- 
-+	debugfs_remove_recursive(adap->debugfs);
-+
- 	/* wait until all references to the device are gone
- 	 *
- 	 * FIXME: This is old code and should ideally be replaced by an
-@@ -2060,6 +2096,8 @@ static int __init i2c_init(void)
- 
- 	is_registered = true;
- 
-+	i2c_debugfs_root = debugfs_create_dir("i2c", NULL);
-+
- #ifdef CONFIG_I2C_COMPAT
- 	i2c_adapter_compat_class = class_compat_register("i2c-adapter");
- 	if (!i2c_adapter_compat_class) {
-@@ -2098,6 +2136,7 @@ static void __exit i2c_exit(void)
- #ifdef CONFIG_I2C_COMPAT
- 	class_compat_unregister(i2c_adapter_compat_class);
- #endif
-+	debugfs_remove_recursive(i2c_debugfs_root);
- 	bus_unregister(&i2c_bus_type);
- 	tracepoint_synchronize_unregister();
- }
-diff --git a/drivers/i3c/master/svc-i3c-master.c b/drivers/i3c/master/svc-i3c-master.c
-index acc937275c184c..f344f8733f8324 100644
---- a/drivers/i3c/master/svc-i3c-master.c
-+++ b/drivers/i3c/master/svc-i3c-master.c
-@@ -1697,6 +1697,7 @@ static void svc_i3c_master_remove(struct platform_device *pdev)
- {
- 	struct svc_i3c_master *master = platform_get_drvdata(pdev);
- 
-+	cancel_work_sync(&master->hj_work);
- 	i3c_master_unregister(&master->base);
- 
- 	pm_runtime_dont_use_autosuspend(&pdev->dev);
-diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
-index 3b7984fd129d7d..3a98d6bae1b203 100644
---- a/drivers/iio/magnetometer/ak8975.c
-+++ b/drivers/iio/magnetometer/ak8975.c
-@@ -692,22 +692,8 @@ static int ak8975_start_read_axis(struct ak8975_data *data,
- 	if (ret < 0)
- 		return ret;
- 
--	/* This will be executed only for non-interrupt based waiting case */
--	if (ret & data->def->ctrl_masks[ST1_DRDY]) {
--		ret = i2c_smbus_read_byte_data(client,
--					       data->def->ctrl_regs[ST2]);
--		if (ret < 0) {
--			dev_err(&client->dev, "Error in reading ST2\n");
--			return ret;
--		}
--		if (ret & (data->def->ctrl_masks[ST2_DERR] |
--			   data->def->ctrl_masks[ST2_HOFL])) {
--			dev_err(&client->dev, "ST2 status error 0x%x\n", ret);
--			return -EINVAL;
--		}
--	}
--
--	return 0;
-+	/* Return with zero if the data is ready. */
-+	return !data->def->ctrl_regs[ST1_DRDY];
- }
- 
- /* Retrieve raw flux value for one of the x, y, or z axis.  */
-@@ -734,6 +720,20 @@ static int ak8975_read_axis(struct iio_dev *indio_dev, int index, int *val)
- 	if (ret < 0)
- 		goto exit;
- 
-+	/* Read out ST2 for release lock on measurment data. */
-+	ret = i2c_smbus_read_byte_data(client, data->def->ctrl_regs[ST2]);
-+	if (ret < 0) {
-+		dev_err(&client->dev, "Error in reading ST2\n");
-+		goto exit;
-+	}
-+
-+	if (ret & (data->def->ctrl_masks[ST2_DERR] |
-+		   data->def->ctrl_masks[ST2_HOFL])) {
-+		dev_err(&client->dev, "ST2 status error 0x%x\n", ret);
-+		ret = -EINVAL;
-+		goto exit;
-+	}
-+
- 	mutex_unlock(&data->lock);
- 
- 	pm_runtime_mark_last_busy(&data->client->dev);
-diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
-index a65630d5742f01..84f6b333c91958 100644
---- a/drivers/iio/pressure/bmp280-core.c
-+++ b/drivers/iio/pressure/bmp280-core.c
-@@ -51,7 +51,6 @@
-  */
- enum { AC1, AC2, AC3, AC4, AC5, AC6, B1, B2, MB, MC, MD };
- 
--
- enum bmp380_odr {
- 	BMP380_ODR_200HZ,
- 	BMP380_ODR_100HZ,
-@@ -180,18 +179,19 @@ static int bmp280_read_calib(struct bmp280_data *data)
- 	struct bmp280_calib *calib = &data->calib.bmp280;
- 	int ret;
- 
--
- 	/* Read temperature and pressure calibration values. */
- 	ret = regmap_bulk_read(data->regmap, BMP280_REG_COMP_TEMP_START,
--			       data->bmp280_cal_buf, sizeof(data->bmp280_cal_buf));
-+			       data->bmp280_cal_buf,
-+			       sizeof(data->bmp280_cal_buf));
- 	if (ret < 0) {
- 		dev_err(data->dev,
--			"failed to read temperature and pressure calibration parameters\n");
-+			"failed to read calibration parameters\n");
- 		return ret;
- 	}
- 
--	/* Toss the temperature and pressure calibration data into the entropy pool */
--	add_device_randomness(data->bmp280_cal_buf, sizeof(data->bmp280_cal_buf));
-+	/* Toss calibration data into the entropy pool */
-+	add_device_randomness(data->bmp280_cal_buf,
-+			      sizeof(data->bmp280_cal_buf));
- 
- 	/* Parse temperature calibration values. */
- 	calib->T1 = le16_to_cpu(data->bmp280_cal_buf[T1]);
-@@ -222,7 +222,7 @@ static int bme280_read_calib(struct bmp280_data *data)
- 	/* Load shared calibration params with bmp280 first */
- 	ret = bmp280_read_calib(data);
- 	if  (ret < 0) {
--		dev_err(dev, "failed to read common bmp280 calibration parameters\n");
-+		dev_err(dev, "failed to read calibration parameters\n");
- 		return ret;
- 	}
- 
-@@ -234,14 +234,14 @@ static int bme280_read_calib(struct bmp280_data *data)
- 	 * Humidity data is only available on BME280.
- 	 */
- 
--	ret = regmap_read(data->regmap, BMP280_REG_COMP_H1, &tmp);
-+	ret = regmap_read(data->regmap, BME280_REG_COMP_H1, &tmp);
- 	if (ret < 0) {
- 		dev_err(dev, "failed to read H1 comp value\n");
- 		return ret;
- 	}
- 	calib->H1 = tmp;
- 
--	ret = regmap_bulk_read(data->regmap, BMP280_REG_COMP_H2,
-+	ret = regmap_bulk_read(data->regmap, BME280_REG_COMP_H2,
- 			       &data->le16, sizeof(data->le16));
- 	if (ret < 0) {
- 		dev_err(dev, "failed to read H2 comp value\n");
-@@ -249,14 +249,14 @@ static int bme280_read_calib(struct bmp280_data *data)
- 	}
- 	calib->H2 = sign_extend32(le16_to_cpu(data->le16), 15);
- 
--	ret = regmap_read(data->regmap, BMP280_REG_COMP_H3, &tmp);
-+	ret = regmap_read(data->regmap, BME280_REG_COMP_H3, &tmp);
- 	if (ret < 0) {
- 		dev_err(dev, "failed to read H3 comp value\n");
- 		return ret;
- 	}
- 	calib->H3 = tmp;
- 
--	ret = regmap_bulk_read(data->regmap, BMP280_REG_COMP_H4,
-+	ret = regmap_bulk_read(data->regmap, BME280_REG_COMP_H4,
- 			       &data->be16, sizeof(data->be16));
- 	if (ret < 0) {
- 		dev_err(dev, "failed to read H4 comp value\n");
-@@ -265,15 +265,15 @@ static int bme280_read_calib(struct bmp280_data *data)
- 	calib->H4 = sign_extend32(((be16_to_cpu(data->be16) >> 4) & 0xff0) |
- 				  (be16_to_cpu(data->be16) & 0xf), 11);
- 
--	ret = regmap_bulk_read(data->regmap, BMP280_REG_COMP_H5,
-+	ret = regmap_bulk_read(data->regmap, BME280_REG_COMP_H5,
- 			       &data->le16, sizeof(data->le16));
- 	if (ret < 0) {
- 		dev_err(dev, "failed to read H5 comp value\n");
- 		return ret;
- 	}
--	calib->H5 = sign_extend32(FIELD_GET(BMP280_COMP_H5_MASK, le16_to_cpu(data->le16)), 11);
-+	calib->H5 = sign_extend32(FIELD_GET(BME280_COMP_H5_MASK, le16_to_cpu(data->le16)), 11);
- 
--	ret = regmap_read(data->regmap, BMP280_REG_COMP_H6, &tmp);
-+	ret = regmap_read(data->regmap, BME280_REG_COMP_H6, &tmp);
- 	if (ret < 0) {
- 		dev_err(dev, "failed to read H6 comp value\n");
- 		return ret;
-@@ -282,13 +282,14 @@ static int bme280_read_calib(struct bmp280_data *data)
- 
- 	return 0;
- }
-+
- /*
-  * Returns humidity in percent, resolution is 0.01 percent. Output value of
-  * "47445" represents 47445/1024 = 46.333 %RH.
-  *
-  * Taken from BME280 datasheet, Section 4.2.3, "Compensation formula".
-  */
--static u32 bmp280_compensate_humidity(struct bmp280_data *data,
-+static u32 bme280_compensate_humidity(struct bmp280_data *data,
- 				      s32 adc_humidity)
- {
- 	struct bmp280_calib *calib = &data->calib.bmp280;
-@@ -304,7 +305,7 @@ static u32 bmp280_compensate_humidity(struct bmp280_data *data,
- 	var = clamp_val(var, 0, 419430400);
- 
- 	return var >> 12;
--};
-+}
- 
- /*
-  * Returns temperature in DegC, resolution is 0.01 DegC.  Output value of
-@@ -428,7 +429,7 @@ static int bmp280_read_press(struct bmp280_data *data,
- 	return IIO_VAL_FRACTIONAL;
- }
- 
--static int bmp280_read_humid(struct bmp280_data *data, int *val, int *val2)
-+static int bme280_read_humid(struct bmp280_data *data, int *val, int *val2)
- {
- 	u32 comp_humidity;
- 	s32 adc_humidity;
-@@ -439,7 +440,7 @@ static int bmp280_read_humid(struct bmp280_data *data, int *val, int *val2)
- 	if (ret < 0)
- 		return ret;
- 
--	ret = regmap_bulk_read(data->regmap, BMP280_REG_HUMIDITY_MSB,
-+	ret = regmap_bulk_read(data->regmap, BME280_REG_HUMIDITY_MSB,
- 			       &data->be16, sizeof(data->be16));
- 	if (ret < 0) {
- 		dev_err(data->dev, "failed to read humidity\n");
-@@ -452,7 +453,7 @@ static int bmp280_read_humid(struct bmp280_data *data, int *val, int *val2)
- 		dev_err(data->dev, "reading humidity skipped\n");
- 		return -EIO;
- 	}
--	comp_humidity = bmp280_compensate_humidity(data, adc_humidity);
-+	comp_humidity = bme280_compensate_humidity(data, adc_humidity);
- 
- 	*val = comp_humidity * 1000 / 1024;
- 
-@@ -536,8 +537,8 @@ static int bmp280_read_raw(struct iio_dev *indio_dev,
- 	return ret;
- }
- 
--static int bmp280_write_oversampling_ratio_humid(struct bmp280_data *data,
--					       int val)
-+static int bme280_write_oversampling_ratio_humid(struct bmp280_data *data,
-+						 int val)
- {
- 	const int *avail = data->chip_info->oversampling_humid_avail;
- 	const int n = data->chip_info->num_oversampling_humid_avail;
-@@ -562,7 +563,7 @@ static int bmp280_write_oversampling_ratio_humid(struct bmp280_data *data,
- }
- 
- static int bmp280_write_oversampling_ratio_temp(struct bmp280_data *data,
--					       int val)
-+						int val)
- {
- 	const int *avail = data->chip_info->oversampling_temp_avail;
- 	const int n = data->chip_info->num_oversampling_temp_avail;
-@@ -587,7 +588,7 @@ static int bmp280_write_oversampling_ratio_temp(struct bmp280_data *data,
- }
- 
- static int bmp280_write_oversampling_ratio_press(struct bmp280_data *data,
--					       int val)
-+						 int val)
- {
- 	const int *avail = data->chip_info->oversampling_press_avail;
- 	const int n = data->chip_info->num_oversampling_press_avail;
-@@ -680,7 +681,7 @@ static int bmp280_write_raw(struct iio_dev *indio_dev,
- 		mutex_lock(&data->lock);
- 		switch (chan->type) {
- 		case IIO_HUMIDITYRELATIVE:
--			ret = bmp280_write_oversampling_ratio_humid(data, val);
-+			ret = bme280_write_oversampling_ratio_humid(data, val);
- 			break;
- 		case IIO_PRESSURE:
- 			ret = bmp280_write_oversampling_ratio_press(data, val);
-@@ -771,13 +772,12 @@ static int bmp280_chip_config(struct bmp280_data *data)
- 	int ret;
- 
- 	ret = regmap_write_bits(data->regmap, BMP280_REG_CTRL_MEAS,
--				 BMP280_OSRS_TEMP_MASK |
--				 BMP280_OSRS_PRESS_MASK |
--				 BMP280_MODE_MASK,
--				 osrs | BMP280_MODE_NORMAL);
-+				BMP280_OSRS_TEMP_MASK |
-+				BMP280_OSRS_PRESS_MASK |
-+				BMP280_MODE_MASK,
-+				osrs | BMP280_MODE_NORMAL);
- 	if (ret < 0) {
--		dev_err(data->dev,
--			"failed to write ctrl_meas register\n");
-+		dev_err(data->dev, "failed to write ctrl_meas register\n");
- 		return ret;
- 	}
- 
-@@ -785,8 +785,7 @@ static int bmp280_chip_config(struct bmp280_data *data)
- 				 BMP280_FILTER_MASK,
- 				 BMP280_FILTER_4X);
- 	if (ret < 0) {
--		dev_err(data->dev,
--			"failed to write config register\n");
-+		dev_err(data->dev, "failed to write config register\n");
- 		return ret;
- 	}
- 
-@@ -794,10 +793,12 @@ static int bmp280_chip_config(struct bmp280_data *data)
- }
- 
- static const int bmp280_oversampling_avail[] = { 1, 2, 4, 8, 16 };
-+static const u8 bmp280_chip_ids[] = { BMP280_CHIP_ID };
- 
- const struct bmp280_chip_info bmp280_chip_info = {
- 	.id_reg = BMP280_REG_ID,
--	.chip_id = BMP280_CHIP_ID,
-+	.chip_id = bmp280_chip_ids,
-+	.num_chip_id = ARRAY_SIZE(bmp280_chip_ids),
- 	.regmap_config = &bmp280_regmap_config,
- 	.start_up_time = 2000,
- 	.channels = bmp280_channels,
-@@ -830,26 +831,28 @@ EXPORT_SYMBOL_NS(bmp280_chip_info, IIO_BMP280);
- 
- static int bme280_chip_config(struct bmp280_data *data)
- {
--	u8 osrs = FIELD_PREP(BMP280_OSRS_HUMIDITY_MASK, data->oversampling_humid + 1);
-+	u8 osrs = FIELD_PREP(BME280_OSRS_HUMIDITY_MASK, data->oversampling_humid + 1);
- 	int ret;
- 
- 	/*
- 	 * Oversampling of humidity must be set before oversampling of
- 	 * temperature/pressure is set to become effective.
- 	 */
--	ret = regmap_update_bits(data->regmap, BMP280_REG_CTRL_HUMIDITY,
--				  BMP280_OSRS_HUMIDITY_MASK, osrs);
--
-+	ret = regmap_update_bits(data->regmap, BME280_REG_CTRL_HUMIDITY,
-+				 BME280_OSRS_HUMIDITY_MASK, osrs);
- 	if (ret < 0)
- 		return ret;
- 
- 	return bmp280_chip_config(data);
- }
- 
-+static const u8 bme280_chip_ids[] = { BME280_CHIP_ID };
-+
- const struct bmp280_chip_info bme280_chip_info = {
- 	.id_reg = BMP280_REG_ID,
--	.chip_id = BME280_CHIP_ID,
--	.regmap_config = &bmp280_regmap_config,
-+	.chip_id = bme280_chip_ids,
-+	.num_chip_id = ARRAY_SIZE(bme280_chip_ids),
-+	.regmap_config = &bme280_regmap_config,
- 	.start_up_time = 2000,
- 	.channels = bmp280_channels,
- 	.num_channels = 3,
-@@ -864,12 +867,12 @@ const struct bmp280_chip_info bme280_chip_info = {
- 
- 	.oversampling_humid_avail = bmp280_oversampling_avail,
- 	.num_oversampling_humid_avail = ARRAY_SIZE(bmp280_oversampling_avail),
--	.oversampling_humid_default = BMP280_OSRS_HUMIDITY_16X - 1,
-+	.oversampling_humid_default = BME280_OSRS_HUMIDITY_16X - 1,
- 
- 	.chip_config = bme280_chip_config,
- 	.read_temp = bmp280_read_temp,
- 	.read_press = bmp280_read_press,
--	.read_humid = bmp280_read_humid,
-+	.read_humid = bme280_read_humid,
- 	.read_calib = bme280_read_calib,
- };
- EXPORT_SYMBOL_NS(bme280_chip_info, IIO_BMP280);
-@@ -920,8 +923,8 @@ static int bmp380_cmd(struct bmp280_data *data, u8 cmd)
- }
- 
- /*
-- * Returns temperature in Celsius degrees, resolution is 0.01º C. Output value of
-- * "5123" equals 51.2º C. t_fine carries fine temperature as global value.
-+ * Returns temperature in Celsius degrees, resolution is 0.01º C. Output value
-+ * of "5123" equals 51.2º C. t_fine carries fine temperature as global value.
-  *
-  * Taken from datasheet, Section Appendix 9, "Compensation formula" and repo
-  * https://github.com/BoschSensortec/BMP3-Sensor-API.
-@@ -1063,7 +1066,8 @@ static int bmp380_read_calib(struct bmp280_data *data)
- 
- 	/* Read temperature and pressure calibration data */
- 	ret = regmap_bulk_read(data->regmap, BMP380_REG_CALIB_TEMP_START,
--			       data->bmp380_cal_buf, sizeof(data->bmp380_cal_buf));
-+			       data->bmp380_cal_buf,
-+			       sizeof(data->bmp380_cal_buf));
- 	if (ret) {
- 		dev_err(data->dev,
- 			"failed to read temperature calibration parameters\n");
-@@ -1071,7 +1075,8 @@ static int bmp380_read_calib(struct bmp280_data *data)
- 	}
- 
- 	/* Toss the temperature calibration data into the entropy pool */
--	add_device_randomness(data->bmp380_cal_buf, sizeof(data->bmp380_cal_buf));
-+	add_device_randomness(data->bmp380_cal_buf,
-+			      sizeof(data->bmp380_cal_buf));
- 
- 	/* Parse calibration values */
- 	calib->T1 = get_unaligned_le16(&data->bmp380_cal_buf[BMP380_T1]);
-@@ -1153,7 +1158,8 @@ static int bmp380_chip_config(struct bmp280_data *data)
- 
- 	/* Configure output data rate */
- 	ret = regmap_update_bits_check(data->regmap, BMP380_REG_ODR,
--				       BMP380_ODRS_MASK, data->sampling_freq, &aux);
-+				       BMP380_ODRS_MASK, data->sampling_freq,
-+				       &aux);
- 	if (ret) {
- 		dev_err(data->dev, "failed to write ODR selection register\n");
- 		return ret;
-@@ -1172,12 +1178,13 @@ static int bmp380_chip_config(struct bmp280_data *data)
- 
- 	if (change) {
- 		/*
--		 * The configurations errors are detected on the fly during a measurement
--		 * cycle. If the sampling frequency is too low, it's faster to reset
--		 * the measurement loop than wait until the next measurement is due.
-+		 * The configurations errors are detected on the fly during a
-+		 * measurement cycle. If the sampling frequency is too low, it's
-+		 * faster to reset the measurement loop than wait until the next
-+		 * measurement is due.
- 		 *
--		 * Resets sensor measurement loop toggling between sleep and normal
--		 * operating modes.
-+		 * Resets sensor measurement loop toggling between sleep and
-+		 * normal operating modes.
- 		 */
- 		ret = regmap_write_bits(data->regmap, BMP380_REG_POWER_CONTROL,
- 					BMP380_MODE_MASK,
-@@ -1195,22 +1202,22 @@ static int bmp380_chip_config(struct bmp280_data *data)
- 			return ret;
- 		}
- 		/*
--		 * Waits for measurement before checking configuration error flag.
--		 * Selected longest measure time indicated in section 3.9.1
--		 * in the datasheet.
-+		 * Waits for measurement before checking configuration error
-+		 * flag. Selected longest measurement time, calculated from
-+		 * formula in datasheet section 3.9.2 with an offset of ~+15%
-+		 * as it seen as well in table 3.9.1.
- 		 */
--		msleep(80);
-+		msleep(150);
- 
- 		/* Check config error flag */
- 		ret = regmap_read(data->regmap, BMP380_REG_ERROR, &tmp);
- 		if (ret) {
--			dev_err(data->dev,
--				"failed to read error register\n");
-+			dev_err(data->dev, "failed to read error register\n");
- 			return ret;
- 		}
- 		if (tmp & BMP380_ERR_CONF_MASK) {
- 			dev_warn(data->dev,
--				"sensor flagged configuration as incompatible\n");
-+				 "sensor flagged configuration as incompatible\n");
- 			return -EINVAL;
- 		}
- 	}
-@@ -1220,10 +1227,12 @@ static int bmp380_chip_config(struct bmp280_data *data)
- 
- static const int bmp380_oversampling_avail[] = { 1, 2, 4, 8, 16, 32 };
- static const int bmp380_iir_filter_coeffs_avail[] = { 1, 2, 4, 8, 16, 32, 64, 128};
-+static const u8 bmp380_chip_ids[] = { BMP380_CHIP_ID };
- 
- const struct bmp280_chip_info bmp380_chip_info = {
- 	.id_reg = BMP380_REG_ID,
--	.chip_id = BMP380_CHIP_ID,
-+	.chip_id = bmp380_chip_ids,
-+	.num_chip_id = ARRAY_SIZE(bmp380_chip_ids),
- 	.regmap_config = &bmp380_regmap_config,
- 	.start_up_time = 2000,
- 	.channels = bmp380_channels,
-@@ -1308,9 +1317,11 @@ static int bmp580_nvm_operation(struct bmp280_data *data, bool is_write)
- 	}
- 
- 	/* Start NVM operation sequence */
--	ret = regmap_write(data->regmap, BMP580_REG_CMD, BMP580_CMD_NVM_OP_SEQ_0);
-+	ret = regmap_write(data->regmap, BMP580_REG_CMD,
-+			   BMP580_CMD_NVM_OP_SEQ_0);
- 	if (ret) {
--		dev_err(data->dev, "failed to send nvm operation's first sequence\n");
-+		dev_err(data->dev,
-+			"failed to send nvm operation's first sequence\n");
- 		return ret;
- 	}
- 	if (is_write) {
-@@ -1318,7 +1329,8 @@ static int bmp580_nvm_operation(struct bmp280_data *data, bool is_write)
- 		ret = regmap_write(data->regmap, BMP580_REG_CMD,
- 				   BMP580_CMD_NVM_WRITE_SEQ_1);
- 		if (ret) {
--			dev_err(data->dev, "failed to send nvm write sequence\n");
-+			dev_err(data->dev,
-+				"failed to send nvm write sequence\n");
- 			return ret;
- 		}
- 		/* Datasheet says on 4.8.1.2 it takes approximately 10ms */
-@@ -1329,7 +1341,8 @@ static int bmp580_nvm_operation(struct bmp280_data *data, bool is_write)
- 		ret = regmap_write(data->regmap, BMP580_REG_CMD,
- 				   BMP580_CMD_NVM_READ_SEQ_1);
- 		if (ret) {
--			dev_err(data->dev, "failed to send nvm read sequence\n");
-+			dev_err(data->dev,
-+				"failed to send nvm read sequence\n");
- 			return ret;
- 		}
- 		/* Datasheet says on 4.8.1.1 it takes approximately 200us */
-@@ -1492,8 +1505,8 @@ static int bmp580_nvmem_read(void *priv, unsigned int offset, void *val,
- 		if (ret)
- 			goto exit;
- 
--		ret = regmap_bulk_read(data->regmap, BMP580_REG_NVM_DATA_LSB, &data->le16,
--				       sizeof(data->le16));
-+		ret = regmap_bulk_read(data->regmap, BMP580_REG_NVM_DATA_LSB,
-+				       &data->le16, sizeof(data->le16));
- 		if (ret) {
- 			dev_err(data->dev, "error reading nvm data regs\n");
- 			goto exit;
-@@ -1537,7 +1550,8 @@ static int bmp580_nvmem_write(void *priv, unsigned int offset, void *val,
- 	while (bytes >= sizeof(*buf)) {
- 		addr = bmp580_nvmem_addrs[offset / sizeof(*buf)];
- 
--		ret = regmap_write(data->regmap, BMP580_REG_NVM_ADDR, BMP580_NVM_PROG_EN |
-+		ret = regmap_write(data->regmap, BMP580_REG_NVM_ADDR,
-+				   BMP580_NVM_PROG_EN |
- 				   FIELD_PREP(BMP580_NVM_ROW_ADDR_MASK, addr));
- 		if (ret) {
- 			dev_err(data->dev, "error writing nvm address\n");
-@@ -1545,8 +1559,8 @@ static int bmp580_nvmem_write(void *priv, unsigned int offset, void *val,
- 		}
- 		data->le16 = cpu_to_le16(*buf++);
- 
--		ret = regmap_bulk_write(data->regmap, BMP580_REG_NVM_DATA_LSB, &data->le16,
--					sizeof(data->le16));
-+		ret = regmap_bulk_write(data->regmap, BMP580_REG_NVM_DATA_LSB,
-+					&data->le16, sizeof(data->le16));
- 		if (ret) {
- 			dev_err(data->dev, "error writing LSB NVM data regs\n");
- 			goto exit;
-@@ -1653,7 +1667,8 @@ static int bmp580_chip_config(struct bmp280_data *data)
- 		  BMP580_OSR_PRESS_EN;
- 
- 	ret = regmap_update_bits_check(data->regmap, BMP580_REG_OSR_CONFIG,
--				       BMP580_OSR_TEMP_MASK | BMP580_OSR_PRESS_MASK |
-+				       BMP580_OSR_TEMP_MASK |
-+				       BMP580_OSR_PRESS_MASK |
- 				       BMP580_OSR_PRESS_EN,
- 				       reg_val, &aux);
- 	if (ret) {
-@@ -1704,7 +1719,8 @@ static int bmp580_chip_config(struct bmp280_data *data)
- 		 */
- 		ret = regmap_read(data->regmap, BMP580_REG_EFF_OSR, &tmp);
- 		if (ret) {
--			dev_err(data->dev, "error reading effective OSR register\n");
-+			dev_err(data->dev,
-+				"error reading effective OSR register\n");
- 			return ret;
- 		}
- 		if (!(tmp & BMP580_EFF_OSR_VALID_ODR)) {
-@@ -1720,10 +1736,12 @@ static int bmp580_chip_config(struct bmp280_data *data)
- }
- 
- static const int bmp580_oversampling_avail[] = { 1, 2, 4, 8, 16, 32, 64, 128 };
-+static const u8 bmp580_chip_ids[] = { BMP580_CHIP_ID, BMP580_CHIP_ID_ALT };
- 
- const struct bmp280_chip_info bmp580_chip_info = {
- 	.id_reg = BMP580_REG_CHIP_ID,
--	.chip_id = BMP580_CHIP_ID,
-+	.chip_id = bmp580_chip_ids,
-+	.num_chip_id = ARRAY_SIZE(bmp580_chip_ids),
- 	.regmap_config = &bmp580_regmap_config,
- 	.start_up_time = 2000,
- 	.channels = bmp380_channels,
-@@ -1837,7 +1855,8 @@ static int bmp180_read_calib(struct bmp280_data *data)
- 	}
- 
- 	/* Toss the calibration data into the entropy pool */
--	add_device_randomness(data->bmp180_cal_buf, sizeof(data->bmp180_cal_buf));
-+	add_device_randomness(data->bmp180_cal_buf,
-+			      sizeof(data->bmp180_cal_buf));
- 
- 	calib->AC1 = be16_to_cpu(data->bmp180_cal_buf[AC1]);
- 	calib->AC2 = be16_to_cpu(data->bmp180_cal_buf[AC2]);
-@@ -1952,8 +1971,7 @@ static u32 bmp180_compensate_press(struct bmp280_data *data, s32 adc_press)
- 	return p + ((x1 + x2 + 3791) >> 4);
- }
- 
--static int bmp180_read_press(struct bmp280_data *data,
--			     int *val, int *val2)
-+static int bmp180_read_press(struct bmp280_data *data, int *val, int *val2)
- {
- 	u32 comp_press;
- 	s32 adc_press;
-@@ -1983,10 +2001,12 @@ static int bmp180_chip_config(struct bmp280_data *data)
- 
- static const int bmp180_oversampling_temp_avail[] = { 1 };
- static const int bmp180_oversampling_press_avail[] = { 1, 2, 4, 8 };
-+static const u8 bmp180_chip_ids[] = { BMP180_CHIP_ID };
- 
- const struct bmp280_chip_info bmp180_chip_info = {
- 	.id_reg = BMP280_REG_ID,
--	.chip_id = BMP180_CHIP_ID,
-+	.chip_id = bmp180_chip_ids,
-+	.num_chip_id = ARRAY_SIZE(bmp180_chip_ids),
- 	.regmap_config = &bmp180_regmap_config,
- 	.start_up_time = 2000,
- 	.channels = bmp280_channels,
-@@ -2077,6 +2097,7 @@ int bmp280_common_probe(struct device *dev,
- 	struct bmp280_data *data;
- 	struct gpio_desc *gpiod;
- 	unsigned int chip_id;
-+	unsigned int i;
- 	int ret;
- 
- 	indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
-@@ -2142,12 +2163,17 @@ int bmp280_common_probe(struct device *dev,
- 	ret = regmap_read(regmap, data->chip_info->id_reg, &chip_id);
- 	if (ret < 0)
- 		return ret;
--	if (chip_id != data->chip_info->chip_id) {
--		dev_err(dev, "bad chip id: expected %x got %x\n",
--			data->chip_info->chip_id, chip_id);
--		return -EINVAL;
-+
-+	for (i = 0; i < data->chip_info->num_chip_id; i++) {
-+		if (chip_id == data->chip_info->chip_id[i]) {
-+			dev_info(dev, "0x%x is a known chip id for %s\n", chip_id, name);
-+			break;
-+		}
- 	}
- 
-+	if (i == data->chip_info->num_chip_id)
-+		dev_warn(dev, "bad chip id: 0x%x is not a known chip id\n", chip_id);
-+
- 	if (data->chip_info->preinit) {
- 		ret = data->chip_info->preinit(data);
- 		if (ret)
-@@ -2222,6 +2248,7 @@ static int bmp280_runtime_resume(struct device *dev)
- 	ret = regulator_bulk_enable(BMP280_NUM_SUPPLIES, data->supplies);
- 	if (ret)
- 		return ret;
-+
- 	usleep_range(data->start_up_time, data->start_up_time + 100);
- 	return data->chip_info->chip_config(data);
- }
-diff --git a/drivers/iio/pressure/bmp280-regmap.c b/drivers/iio/pressure/bmp280-regmap.c
-index 3ee56720428c5d..d27d68edd90656 100644
---- a/drivers/iio/pressure/bmp280-regmap.c
-+++ b/drivers/iio/pressure/bmp280-regmap.c
-@@ -41,11 +41,23 @@ const struct regmap_config bmp180_regmap_config = {
- };
- EXPORT_SYMBOL_NS(bmp180_regmap_config, IIO_BMP280);
- 
-+static bool bme280_is_writeable_reg(struct device *dev, unsigned int reg)
-+{
-+	switch (reg) {
-+	case BMP280_REG_CONFIG:
-+	case BME280_REG_CTRL_HUMIDITY:
-+	case BMP280_REG_CTRL_MEAS:
-+	case BMP280_REG_RESET:
-+		return true;
-+	default:
-+		return false;
-+	}
-+}
-+
- static bool bmp280_is_writeable_reg(struct device *dev, unsigned int reg)
- {
- 	switch (reg) {
- 	case BMP280_REG_CONFIG:
--	case BMP280_REG_CTRL_HUMIDITY:
- 	case BMP280_REG_CTRL_MEAS:
- 	case BMP280_REG_RESET:
- 		return true;
-@@ -57,8 +69,6 @@ static bool bmp280_is_writeable_reg(struct device *dev, unsigned int reg)
- static bool bmp280_is_volatile_reg(struct device *dev, unsigned int reg)
- {
- 	switch (reg) {
--	case BMP280_REG_HUMIDITY_LSB:
--	case BMP280_REG_HUMIDITY_MSB:
- 	case BMP280_REG_TEMP_XLSB:
- 	case BMP280_REG_TEMP_LSB:
- 	case BMP280_REG_TEMP_MSB:
-@@ -72,6 +82,23 @@ static bool bmp280_is_volatile_reg(struct device *dev, unsigned int reg)
- 	}
- }
- 
-+static bool bme280_is_volatile_reg(struct device *dev, unsigned int reg)
-+{
-+	switch (reg) {
-+	case BME280_REG_HUMIDITY_LSB:
-+	case BME280_REG_HUMIDITY_MSB:
-+	case BMP280_REG_TEMP_XLSB:
-+	case BMP280_REG_TEMP_LSB:
-+	case BMP280_REG_TEMP_MSB:
-+	case BMP280_REG_PRESS_XLSB:
-+	case BMP280_REG_PRESS_LSB:
-+	case BMP280_REG_PRESS_MSB:
-+	case BMP280_REG_STATUS:
-+		return true;
-+	default:
-+		return false;
-+	}
-+}
- static bool bmp380_is_writeable_reg(struct device *dev, unsigned int reg)
- {
- 	switch (reg) {
-@@ -167,7 +194,7 @@ const struct regmap_config bmp280_regmap_config = {
- 	.reg_bits = 8,
- 	.val_bits = 8,
- 
--	.max_register = BMP280_REG_HUMIDITY_LSB,
-+	.max_register = BMP280_REG_TEMP_XLSB,
- 	.cache_type = REGCACHE_RBTREE,
- 
- 	.writeable_reg = bmp280_is_writeable_reg,
-@@ -175,6 +202,18 @@ const struct regmap_config bmp280_regmap_config = {
- };
- EXPORT_SYMBOL_NS(bmp280_regmap_config, IIO_BMP280);
- 
-+const struct regmap_config bme280_regmap_config = {
-+	.reg_bits = 8,
-+	.val_bits = 8,
-+
-+	.max_register = BME280_REG_HUMIDITY_LSB,
-+	.cache_type = REGCACHE_RBTREE,
-+
-+	.writeable_reg = bme280_is_writeable_reg,
-+	.volatile_reg = bme280_is_volatile_reg,
-+};
-+EXPORT_SYMBOL_NS(bme280_regmap_config, IIO_BMP280);
-+
- const struct regmap_config bmp380_regmap_config = {
- 	.reg_bits = 8,
- 	.val_bits = 8,
-diff --git a/drivers/iio/pressure/bmp280-spi.c b/drivers/iio/pressure/bmp280-spi.c
-index 9de923228a9f4c..47122da8e716df 100644
---- a/drivers/iio/pressure/bmp280-spi.c
-+++ b/drivers/iio/pressure/bmp280-spi.c
-@@ -12,7 +12,7 @@
- #include "bmp280.h"
- 
- static int bmp280_regmap_spi_write(void *context, const void *data,
--                                   size_t count)
-+				   size_t count)
- {
- 	struct device *dev = context;
- 	struct spi_device *spi = to_spi_device(dev);
-@@ -29,7 +29,7 @@ static int bmp280_regmap_spi_write(void *context, const void *data,
- }
- 
- static int bmp280_regmap_spi_read(void *context, const void *reg,
--                                  size_t reg_size, void *val, size_t val_size)
-+				  size_t reg_size, void *val, size_t val_size)
- {
- 	struct device *dev = context;
- 	struct spi_device *spi = to_spi_device(dev);
-diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h
-index 9d9f4ce2baa6e8..b60e551b7d3185 100644
---- a/drivers/iio/pressure/bmp280.h
-+++ b/drivers/iio/pressure/bmp280.h
-@@ -192,8 +192,6 @@
- #define BMP380_PRESS_SKIPPED		0x800000
- 
- /* BMP280 specific registers */
--#define BMP280_REG_HUMIDITY_LSB		0xFE
--#define BMP280_REG_HUMIDITY_MSB		0xFD
- #define BMP280_REG_TEMP_XLSB		0xFC
- #define BMP280_REG_TEMP_LSB		0xFB
- #define BMP280_REG_TEMP_MSB		0xFA
-@@ -207,15 +205,6 @@
- #define BMP280_REG_CONFIG		0xF5
- #define BMP280_REG_CTRL_MEAS		0xF4
- #define BMP280_REG_STATUS		0xF3
--#define BMP280_REG_CTRL_HUMIDITY	0xF2
--
--/* Due to non linear mapping, and data sizes we can't do a bulk read */
--#define BMP280_REG_COMP_H1		0xA1
--#define BMP280_REG_COMP_H2		0xE1
--#define BMP280_REG_COMP_H3		0xE3
--#define BMP280_REG_COMP_H4		0xE4
--#define BMP280_REG_COMP_H5		0xE5
--#define BMP280_REG_COMP_H6		0xE7
- 
- #define BMP280_REG_COMP_TEMP_START	0x88
- #define BMP280_COMP_TEMP_REG_COUNT	6
-@@ -223,8 +212,6 @@
- #define BMP280_REG_COMP_PRESS_START	0x8E
- #define BMP280_COMP_PRESS_REG_COUNT	18
- 
--#define BMP280_COMP_H5_MASK		GENMASK(15, 4)
--
- #define BMP280_CONTIGUOUS_CALIB_REGS	(BMP280_COMP_TEMP_REG_COUNT + \
- 					 BMP280_COMP_PRESS_REG_COUNT)
- 
-@@ -235,14 +222,6 @@
- #define BMP280_FILTER_8X		3
- #define BMP280_FILTER_16X		4
- 
--#define BMP280_OSRS_HUMIDITY_MASK	GENMASK(2, 0)
--#define BMP280_OSRS_HUMIDITY_SKIP	0
--#define BMP280_OSRS_HUMIDITY_1X		1
--#define BMP280_OSRS_HUMIDITY_2X		2
--#define BMP280_OSRS_HUMIDITY_4X		3
--#define BMP280_OSRS_HUMIDITY_8X		4
--#define BMP280_OSRS_HUMIDITY_16X	5
--
- #define BMP280_OSRS_TEMP_MASK		GENMASK(7, 5)
- #define BMP280_OSRS_TEMP_SKIP		0
- #define BMP280_OSRS_TEMP_1X		1
-@@ -264,6 +243,30 @@
- #define BMP280_MODE_FORCED		1
- #define BMP280_MODE_NORMAL		3
- 
-+/* BME280 specific registers */
-+#define BME280_REG_HUMIDITY_LSB		0xFE
-+#define BME280_REG_HUMIDITY_MSB		0xFD
-+
-+#define BME280_REG_CTRL_HUMIDITY	0xF2
-+
-+/* Due to non linear mapping, and data sizes we can't do a bulk read */
-+#define BME280_REG_COMP_H1		0xA1
-+#define BME280_REG_COMP_H2		0xE1
-+#define BME280_REG_COMP_H3		0xE3
-+#define BME280_REG_COMP_H4		0xE4
-+#define BME280_REG_COMP_H5		0xE5
-+#define BME280_REG_COMP_H6		0xE7
-+
-+#define BME280_COMP_H5_MASK		GENMASK(15, 4)
-+
-+#define BME280_OSRS_HUMIDITY_MASK	GENMASK(2, 0)
-+#define BME280_OSRS_HUMIDITY_SKIP	0
-+#define BME280_OSRS_HUMIDITY_1X		1
-+#define BME280_OSRS_HUMIDITY_2X		2
-+#define BME280_OSRS_HUMIDITY_4X		3
-+#define BME280_OSRS_HUMIDITY_8X		4
-+#define BME280_OSRS_HUMIDITY_16X	5
-+
- /* BMP180 specific registers */
- #define BMP180_REG_OUT_XLSB		0xF8
- #define BMP180_REG_OUT_LSB		0xF7
-@@ -418,7 +421,8 @@ struct bmp280_data {
- 
- struct bmp280_chip_info {
- 	unsigned int id_reg;
--	const unsigned int chip_id;
-+	const u8 *chip_id;
-+	int num_chip_id;
- 
- 	const struct regmap_config *regmap_config;
- 
-@@ -464,6 +468,7 @@ extern const struct bmp280_chip_info bmp580_chip_info;
- /* Regmap configurations */
- extern const struct regmap_config bmp180_regmap_config;
- extern const struct regmap_config bmp280_regmap_config;
-+extern const struct regmap_config bme280_regmap_config;
- extern const struct regmap_config bmp380_regmap_config;
- extern const struct regmap_config bmp580_regmap_config;
- 
-diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c
-index ab91009aea8837..85717482a616e7 100644
---- a/drivers/infiniband/hw/mana/main.c
-+++ b/drivers/infiniband/hw/mana/main.c
-@@ -359,7 +359,7 @@ int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem,
- 
- 	create_req->length = umem->length;
- 	create_req->offset_in_page = ib_umem_dma_offset(umem, page_sz);
--	create_req->gdma_page_type = order_base_2(page_sz) - PAGE_SHIFT;
-+	create_req->gdma_page_type = order_base_2(page_sz) - MANA_PAGE_SHIFT;
- 	create_req->page_count = num_pages_total;
- 
- 	ibdev_dbg(&dev->ib_dev, "size_dma_region %lu num_pages_total %lu\n",
-@@ -460,13 +460,13 @@ int mana_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vma)
- 	      PAGE_SHIFT;
- 	prot = pgprot_writecombine(vma->vm_page_prot);
- 
--	ret = rdma_user_mmap_io(ibcontext, vma, pfn, gc->db_page_size, prot,
-+	ret = rdma_user_mmap_io(ibcontext, vma, pfn, PAGE_SIZE, prot,
- 				NULL);
- 	if (ret)
- 		ibdev_dbg(ibdev, "can't rdma_user_mmap_io ret %d\n", ret);
- 	else
--		ibdev_dbg(ibdev, "mapped I/O pfn 0x%llx page_size %u, ret %d\n",
--			  pfn, gc->db_page_size, ret);
-+		ibdev_dbg(ibdev, "mapped I/O pfn 0x%llx page_size %lu, ret %d\n",
-+			  pfn, PAGE_SIZE, ret);
- 
- 	return ret;
- }
-diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c
-index 8996e00cd63a82..922d3ab998f3a5 100644
---- a/drivers/input/keyboard/adp5589-keys.c
-+++ b/drivers/input/keyboard/adp5589-keys.c
-@@ -391,10 +391,17 @@ static int adp5589_gpio_get_value(struct gpio_chip *chip, unsigned off)
- 	struct adp5589_kpad *kpad = gpiochip_get_data(chip);
- 	unsigned int bank = kpad->var->bank(kpad->gpiomap[off]);
- 	unsigned int bit = kpad->var->bit(kpad->gpiomap[off]);
-+	int val;
- 
--	return !!(adp5589_read(kpad->client,
--			       kpad->var->reg(ADP5589_GPI_STATUS_A) + bank) &
--			       bit);
-+	mutex_lock(&kpad->gpio_lock);
-+	if (kpad->dir[bank] & bit)
-+		val = kpad->dat_out[bank];
-+	else
-+		val = adp5589_read(kpad->client,
-+				   kpad->var->reg(ADP5589_GPI_STATUS_A) + bank);
-+	mutex_unlock(&kpad->gpio_lock);
-+
-+	return !!(val & bit);
- }
- 
- static void adp5589_gpio_set_value(struct gpio_chip *chip,
-@@ -936,10 +943,9 @@ static int adp5589_keypad_add(struct adp5589_kpad *kpad, unsigned int revid)
- 
- static void adp5589_clear_config(void *data)
- {
--	struct i2c_client *client = data;
--	struct adp5589_kpad *kpad = i2c_get_clientdata(client);
-+	struct adp5589_kpad *kpad = data;
- 
--	adp5589_write(client, kpad->var->reg(ADP5589_GENERAL_CFG), 0);
-+	adp5589_write(kpad->client, kpad->var->reg(ADP5589_GENERAL_CFG), 0);
- }
- 
- static int adp5589_probe(struct i2c_client *client)
-@@ -983,7 +989,7 @@ static int adp5589_probe(struct i2c_client *client)
- 	}
- 
- 	error = devm_add_action_or_reset(&client->dev, adp5589_clear_config,
--					 client);
-+					 kpad);
- 	if (error)
- 		return error;
- 
-@@ -1010,8 +1016,6 @@ static int adp5589_probe(struct i2c_client *client)
- 	if (error)
- 		return error;
- 
--	i2c_set_clientdata(client, kpad);
--
- 	dev_info(&client->dev, "Rev.%d keypad, irq %d\n", revid, client->irq);
- 	return 0;
- }
-diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c
-index 84f0459e503cfd..7a38e18b18196b 100644
---- a/drivers/iommu/intel/dmar.c
-+++ b/drivers/iommu/intel/dmar.c
-@@ -1202,9 +1202,7 @@ static void free_iommu(struct intel_iommu *iommu)
-  */
- static inline void reclaim_free_desc(struct q_inval *qi)
- {
--	while (qi->desc_status[qi->free_tail] == QI_DONE ||
--	       qi->desc_status[qi->free_tail] == QI_ABORT) {
--		qi->desc_status[qi->free_tail] = QI_FREE;
-+	while (qi->desc_status[qi->free_tail] == QI_FREE && qi->free_tail != qi->free_head) {
- 		qi->free_tail = (qi->free_tail + 1) % QI_LENGTH;
- 		qi->free_cnt++;
- 	}
-@@ -1439,8 +1437,16 @@ int qi_submit_sync(struct intel_iommu *iommu, struct qi_desc *desc,
- 		raw_spin_lock(&qi->q_lock);
- 	}
- 
--	for (i = 0; i < count; i++)
--		qi->desc_status[(index + i) % QI_LENGTH] = QI_DONE;
-+	/*
-+	 * The reclaim code can free descriptors from multiple submissions
-+	 * starting from the tail of the queue. When count == 0, the
-+	 * status of the standalone wait descriptor at the tail of the queue
-+	 * must be set to QI_FREE to allow the reclaim code to proceed.
-+	 * It is also possible that descriptors from one of the previous
-+	 * submissions has to be reclaimed by a subsequent submission.
-+	 */
-+	for (i = 0; i <= count; i++)
-+		qi->desc_status[(index + i) % QI_LENGTH] = QI_FREE;
- 
- 	reclaim_free_desc(qi);
- 	raw_spin_unlock_irqrestore(&qi->q_lock, flags);
-diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
-index 9918af222c516a..b7317016834cf1 100644
---- a/drivers/iommu/intel/iommu.c
-+++ b/drivers/iommu/intel/iommu.c
-@@ -1692,10 +1692,10 @@ static int iommu_init_domains(struct intel_iommu *iommu)
- 	 * entry for first-level or pass-through translation modes should
- 	 * be programmed with a domain id different from those used for
- 	 * second-level or nested translation. We reserve a domain id for
--	 * this purpose.
-+	 * this purpose. This domain id is also used for identity domain
-+	 * in legacy mode.
- 	 */
--	if (sm_supported(iommu))
--		set_bit(FLPT_DEFAULT_DID, iommu->domain_ids);
-+	set_bit(FLPT_DEFAULT_DID, iommu->domain_ids);
- 
- 	return 0;
- }
-diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
-index 56506d5753f15c..00b794d74e03be 100644
---- a/drivers/iommu/iommufd/selftest.c
-+++ b/drivers/iommu/iommufd/selftest.c
-@@ -44,8 +44,8 @@ enum {
-  * In syzkaller mode the 64 bit IOVA is converted into an nth area and offset
-  * value. This has a much smaller randomization space and syzkaller can hit it.
-  */
--static unsigned long iommufd_test_syz_conv_iova(struct io_pagetable *iopt,
--						u64 *iova)
-+static unsigned long __iommufd_test_syz_conv_iova(struct io_pagetable *iopt,
-+						  u64 *iova)
- {
- 	struct syz_layout {
- 		__u32 nth_area;
-@@ -69,6 +69,21 @@ static unsigned long iommufd_test_syz_conv_iova(struct io_pagetable *iopt,
- 	return 0;
- }
- 
-+static unsigned long iommufd_test_syz_conv_iova(struct iommufd_access *access,
-+						u64 *iova)
-+{
-+	unsigned long ret;
-+
-+	mutex_lock(&access->ioas_lock);
-+	if (!access->ioas) {
-+		mutex_unlock(&access->ioas_lock);
-+		return 0;
-+	}
-+	ret = __iommufd_test_syz_conv_iova(&access->ioas->iopt, iova);
-+	mutex_unlock(&access->ioas_lock);
-+	return ret;
-+}
-+
- void iommufd_test_syz_conv_iova_id(struct iommufd_ucmd *ucmd,
- 				   unsigned int ioas_id, u64 *iova, u32 *flags)
- {
-@@ -81,7 +96,7 @@ void iommufd_test_syz_conv_iova_id(struct iommufd_ucmd *ucmd,
- 	ioas = iommufd_get_ioas(ucmd->ictx, ioas_id);
- 	if (IS_ERR(ioas))
- 		return;
--	*iova = iommufd_test_syz_conv_iova(&ioas->iopt, iova);
-+	*iova = __iommufd_test_syz_conv_iova(&ioas->iopt, iova);
- 	iommufd_put_object(&ioas->obj);
- }
- 
-@@ -852,7 +867,7 @@ static int iommufd_test_access_pages(struct iommufd_ucmd *ucmd,
- 	}
- 
- 	if (flags & MOCK_FLAGS_ACCESS_SYZ)
--		iova = iommufd_test_syz_conv_iova(&staccess->access->ioas->iopt,
-+		iova = iommufd_test_syz_conv_iova(staccess->access,
- 					&cmd->access_pages.iova);
- 
- 	npages = (ALIGN(iova + length, PAGE_SIZE) -
-@@ -954,8 +969,8 @@ static int iommufd_test_access_rw(struct iommufd_ucmd *ucmd,
- 	}
- 
- 	if (flags & MOCK_FLAGS_ACCESS_SYZ)
--		iova = iommufd_test_syz_conv_iova(&staccess->access->ioas->iopt,
--					&cmd->access_rw.iova);
-+		iova = iommufd_test_syz_conv_iova(staccess->access,
-+				&cmd->access_rw.iova);
- 
- 	rc = iommufd_access_rw(staccess->access, iova, tmp, length, flags);
- 	if (rc)
-diff --git a/drivers/mailbox/bcm2835-mailbox.c b/drivers/mailbox/bcm2835-mailbox.c
-index fbfd0202047c37..ea12fb8d24015c 100644
---- a/drivers/mailbox/bcm2835-mailbox.c
-+++ b/drivers/mailbox/bcm2835-mailbox.c
-@@ -145,7 +145,8 @@ static int bcm2835_mbox_probe(struct platform_device *pdev)
- 	spin_lock_init(&mbox->lock);
- 
- 	ret = devm_request_irq(dev, irq_of_parse_and_map(dev->of_node, 0),
--			       bcm2835_mbox_irq, 0, dev_name(dev), mbox);
-+			       bcm2835_mbox_irq, IRQF_NO_SUSPEND, dev_name(dev),
-+			       mbox);
- 	if (ret) {
- 		dev_err(dev, "Failed to register a mailbox IRQ handler: %d\n",
- 			ret);
-diff --git a/drivers/mailbox/rockchip-mailbox.c b/drivers/mailbox/rockchip-mailbox.c
-index 8ffad059e8984e..4d966cb2ed0367 100644
---- a/drivers/mailbox/rockchip-mailbox.c
-+++ b/drivers/mailbox/rockchip-mailbox.c
-@@ -159,7 +159,7 @@ static const struct of_device_id rockchip_mbox_of_match[] = {
- 	{ .compatible = "rockchip,rk3368-mailbox", .data = &rk3368_drv_data},
- 	{ },
- };
--MODULE_DEVICE_TABLE(of, rockchp_mbox_of_match);
-+MODULE_DEVICE_TABLE(of, rockchip_mbox_of_match);
- 
- static int rockchip_mbox_probe(struct platform_device *pdev)
- {
-diff --git a/drivers/media/i2c/ar0521.c b/drivers/media/i2c/ar0521.c
-index a4e39871e8f75c..375284a59fd1ce 100644
---- a/drivers/media/i2c/ar0521.c
-+++ b/drivers/media/i2c/ar0521.c
-@@ -847,7 +847,8 @@ static int ar0521_power_off(struct device *dev)
- 	clk_disable_unprepare(sensor->extclk);
- 
- 	if (sensor->reset_gpio)
--		gpiod_set_value(sensor->reset_gpio, 1); /* assert RESET signal */
-+		/* assert RESET signal */
-+		gpiod_set_value_cansleep(sensor->reset_gpio, 1);
- 
- 	for (i = ARRAY_SIZE(ar0521_supply_names) - 1; i >= 0; i--) {
- 		if (sensor->supplies[i])
-@@ -881,7 +882,7 @@ static int ar0521_power_on(struct device *dev)
- 
- 	if (sensor->reset_gpio)
- 		/* deassert RESET signal */
--		gpiod_set_value(sensor->reset_gpio, 0);
-+		gpiod_set_value_cansleep(sensor->reset_gpio, 0);
- 	usleep_range(4500, 5000); /* min 45000 clocks */
- 
- 	for (cnt = 0; cnt < ARRAY_SIZE(initial_regs); cnt++) {
-diff --git a/drivers/media/i2c/imx335.c b/drivers/media/i2c/imx335.c
-index 26869abd77a678..cb3f4fc66a1740 100644
---- a/drivers/media/i2c/imx335.c
-+++ b/drivers/media/i2c/imx335.c
-@@ -75,6 +75,12 @@ struct imx335_reg_list {
- 	const struct imx335_reg *regs;
- };
- 
-+static const char * const imx335_supply_name[] = {
-+	"avdd", /* Analog (2.9V) supply */
-+	"ovdd", /* Digital I/O (1.8V) supply */
-+	"dvdd", /* Digital Core (1.2V) supply */
-+};
-+
- /**
-  * struct imx335_mode - imx335 sensor mode structure
-  * @width: Frame width
-@@ -108,6 +114,7 @@ struct imx335_mode {
-  * @sd: V4L2 sub-device
-  * @pad: Media pad. Only one pad supported
-  * @reset_gpio: Sensor reset gpio
-+ * @supplies: Regulator supplies to handle power control
-  * @inclk: Sensor input clock
-  * @ctrl_handler: V4L2 control handler
-  * @link_freq_ctrl: Pointer to link frequency control
-@@ -127,6 +134,8 @@ struct imx335 {
- 	struct v4l2_subdev sd;
- 	struct media_pad pad;
- 	struct gpio_desc *reset_gpio;
-+	struct regulator_bulk_data supplies[ARRAY_SIZE(imx335_supply_name)];
-+
- 	struct clk *inclk;
- 	struct v4l2_ctrl_handler ctrl_handler;
- 	struct v4l2_ctrl *link_freq_ctrl;
-@@ -783,13 +792,24 @@ static int imx335_parse_hw_config(struct imx335 *imx335)
- 
- 	/* Request optional reset pin */
- 	imx335->reset_gpio = devm_gpiod_get_optional(imx335->dev, "reset",
--						     GPIOD_OUT_LOW);
-+						     GPIOD_OUT_HIGH);
- 	if (IS_ERR(imx335->reset_gpio)) {
- 		dev_err(imx335->dev, "failed to get reset gpio %ld",
- 			PTR_ERR(imx335->reset_gpio));
- 		return PTR_ERR(imx335->reset_gpio);
- 	}
- 
-+	for (i = 0; i < ARRAY_SIZE(imx335_supply_name); i++)
-+		imx335->supplies[i].supply = imx335_supply_name[i];
-+
-+	ret = devm_regulator_bulk_get(imx335->dev,
-+				      ARRAY_SIZE(imx335_supply_name),
-+				      imx335->supplies);
-+	if (ret) {
-+		dev_err(imx335->dev, "Failed to get regulators\n");
-+		return ret;
-+	}
-+
- 	/* Get sensor input clock */
- 	imx335->inclk = devm_clk_get(imx335->dev, NULL);
- 	if (IS_ERR(imx335->inclk)) {
-@@ -868,7 +888,17 @@ static int imx335_power_on(struct device *dev)
- 	struct imx335 *imx335 = to_imx335(sd);
- 	int ret;
- 
--	gpiod_set_value_cansleep(imx335->reset_gpio, 1);
-+	ret = regulator_bulk_enable(ARRAY_SIZE(imx335_supply_name),
-+				    imx335->supplies);
-+	if (ret) {
-+		dev_err(dev, "%s: failed to enable regulators\n",
-+			__func__);
-+		return ret;
-+	}
-+
-+	usleep_range(500, 550); /* Tlow */
-+
-+	gpiod_set_value_cansleep(imx335->reset_gpio, 0);
- 
- 	ret = clk_prepare_enable(imx335->inclk);
- 	if (ret) {
-@@ -876,12 +906,13 @@ static int imx335_power_on(struct device *dev)
- 		goto error_reset;
- 	}
- 
--	usleep_range(20, 22);
-+	usleep_range(20, 22); /* T4 */
- 
- 	return 0;
- 
- error_reset:
--	gpiod_set_value_cansleep(imx335->reset_gpio, 0);
-+	gpiod_set_value_cansleep(imx335->reset_gpio, 1);
-+	regulator_bulk_disable(ARRAY_SIZE(imx335_supply_name), imx335->supplies);
- 
- 	return ret;
- }
-@@ -897,9 +928,9 @@ static int imx335_power_off(struct device *dev)
- 	struct v4l2_subdev *sd = dev_get_drvdata(dev);
- 	struct imx335 *imx335 = to_imx335(sd);
- 
--	gpiod_set_value_cansleep(imx335->reset_gpio, 0);
--
-+	gpiod_set_value_cansleep(imx335->reset_gpio, 1);
- 	clk_disable_unprepare(imx335->inclk);
-+	regulator_bulk_disable(ARRAY_SIZE(imx335_supply_name), imx335->supplies);
- 
- 	return 0;
- }
-diff --git a/drivers/media/i2c/ov5675.c b/drivers/media/i2c/ov5675.c
-index d5a2a5f823124b..c499e7e93c54b9 100644
---- a/drivers/media/i2c/ov5675.c
-+++ b/drivers/media/i2c/ov5675.c
-@@ -979,12 +979,10 @@ static int ov5675_set_stream(struct v4l2_subdev *sd, int enable)
- 
- static int ov5675_power_off(struct device *dev)
- {
--	/* 512 xvclk cycles after the last SCCB transation or MIPI frame end */
--	u32 delay_us = DIV_ROUND_UP(512, OV5675_XVCLK_19_2 / 1000 / 1000);
- 	struct v4l2_subdev *sd = dev_get_drvdata(dev);
- 	struct ov5675 *ov5675 = to_ov5675(sd);
- 
--	usleep_range(delay_us, delay_us * 2);
-+	usleep_range(90, 100);
- 
- 	clk_disable_unprepare(ov5675->xvclk);
- 	gpiod_set_value_cansleep(ov5675->reset_gpio, 1);
-@@ -995,7 +993,6 @@ static int ov5675_power_off(struct device *dev)
- 
- static int ov5675_power_on(struct device *dev)
- {
--	u32 delay_us = DIV_ROUND_UP(8192, OV5675_XVCLK_19_2 / 1000 / 1000);
- 	struct v4l2_subdev *sd = dev_get_drvdata(dev);
- 	struct ov5675 *ov5675 = to_ov5675(sd);
- 	int ret;
-@@ -1021,8 +1018,11 @@ static int ov5675_power_on(struct device *dev)
- 
- 	gpiod_set_value_cansleep(ov5675->reset_gpio, 0);
- 
--	/* 8192 xvclk cycles prior to the first SCCB transation */
--	usleep_range(delay_us, delay_us * 2);
-+	/* Worst case quiesence gap is 1.365 milliseconds @ 6MHz XVCLK
-+	 * Add an additional threshold grace period to ensure reset
-+	 * completion before initiating our first I2C transaction.
-+	 */
-+	usleep_range(1500, 1600);
- 
- 	return 0;
- }
-diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c
-index 8640db30602680..184a8062580c87 100644
---- a/drivers/media/platform/qcom/camss/camss-video.c
-+++ b/drivers/media/platform/qcom/camss/camss-video.c
-@@ -557,12 +557,6 @@ static void video_stop_streaming(struct vb2_queue *q)
- 
- 		ret = v4l2_subdev_call(subdev, video, s_stream, 0);
- 
--		if (entity->use_count > 1) {
--			/* Don't stop if other instances of the pipeline are still running */
--			dev_dbg(video->camss->dev, "Video pipeline still used, don't stop streaming.\n");
--			return;
--		}
--
- 		if (ret) {
- 			dev_err(video->camss->dev, "Video pipeline stop failed: %d\n", ret);
- 			return;
-diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
-index 8fa6750b5b421b..0754645d26acba 100644
---- a/drivers/media/platform/qcom/camss/camss.c
-+++ b/drivers/media/platform/qcom/camss/camss.c
-@@ -1665,6 +1665,8 @@ static int camss_probe(struct platform_device *pdev)
- 
- 	v4l2_async_nf_init(&camss->notifier, &camss->v4l2_dev);
- 
-+	pm_runtime_enable(dev);
-+
- 	num_subdevs = camss_of_parse_ports(camss);
- 	if (num_subdevs < 0) {
- 		ret = num_subdevs;
-@@ -1701,8 +1703,6 @@ static int camss_probe(struct platform_device *pdev)
- 		}
- 	}
- 
--	pm_runtime_enable(dev);
--
- 	return 0;
- 
- err_register_subdevs:
-@@ -1710,6 +1710,7 @@ static int camss_probe(struct platform_device *pdev)
- err_v4l2_device_unregister:
- 	v4l2_device_unregister(&camss->v4l2_dev);
- 	v4l2_async_nf_cleanup(&camss->notifier);
-+	pm_runtime_disable(dev);
- err_genpd_cleanup:
- 	camss_genpd_cleanup(camss);
- 
-diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
-index 054b8e74ba4f51..0fc9414f8f1849 100644
---- a/drivers/media/platform/qcom/venus/core.c
-+++ b/drivers/media/platform/qcom/venus/core.c
-@@ -424,6 +424,7 @@ static void venus_remove(struct platform_device *pdev)
- 	struct device *dev = core->dev;
- 	int ret;
- 
-+	cancel_delayed_work_sync(&core->work);
- 	ret = pm_runtime_get_sync(dev);
- 	WARN_ON(ret < 0);
- 
-diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
-index ad13d447d48346..aa1df66d5ac62d 100644
---- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
-+++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
-@@ -39,6 +39,10 @@ static const struct media_entity_operations sun4i_csi_video_entity_ops = {
- 	.link_validate = v4l2_subdev_link_validate,
- };
- 
-+static const struct media_entity_operations sun4i_csi_subdev_entity_ops = {
-+	.link_validate = v4l2_subdev_link_validate,
-+};
-+
- static int sun4i_csi_notify_bound(struct v4l2_async_notifier *notifier,
- 				  struct v4l2_subdev *subdev,
- 				  struct v4l2_async_connection *asd)
-@@ -213,6 +217,7 @@ static int sun4i_csi_probe(struct platform_device *pdev)
- 	v4l2_subdev_init(subdev, &sun4i_csi_subdev_ops);
- 	subdev->flags = V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS;
- 	subdev->entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;
-+	subdev->entity.ops = &sun4i_csi_subdev_entity_ops;
- 	subdev->owner = THIS_MODULE;
- 	snprintf(subdev->name, sizeof(subdev->name), "sun4i-csi-0");
- 	v4l2_set_subdevdata(subdev, csi);
-diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c
-index 1e30e05953dc64..7495df6b519125 100644
---- a/drivers/media/usb/usbtv/usbtv-video.c
-+++ b/drivers/media/usb/usbtv/usbtv-video.c
-@@ -962,15 +962,8 @@ int usbtv_video_init(struct usbtv *usbtv)
- 
- void usbtv_video_free(struct usbtv *usbtv)
- {
--	mutex_lock(&usbtv->vb2q_lock);
--	mutex_lock(&usbtv->v4l2_lock);
--
--	usbtv_stop(usbtv);
- 	vb2_video_unregister_device(&usbtv->vdev);
- 	v4l2_device_disconnect(&usbtv->v4l2_dev);
- 
--	mutex_unlock(&usbtv->v4l2_lock);
--	mutex_unlock(&usbtv->vb2q_lock);
--
- 	v4l2_device_put(&usbtv->v4l2_dev);
- }
-diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c
-index 4007f4e16d74f0..909b15ad207556 100644
---- a/drivers/memory/tegra/tegra186-emc.c
-+++ b/drivers/memory/tegra/tegra186-emc.c
-@@ -35,11 +35,6 @@ struct tegra186_emc {
- 	struct icc_provider provider;
- };
- 
--static inline struct tegra186_emc *to_tegra186_emc(struct icc_provider *provider)
--{
--	return container_of(provider, struct tegra186_emc, provider);
--}
--
- /*
-  * debugfs interface
-  *
-diff --git a/drivers/net/can/dev/netlink.c b/drivers/net/can/dev/netlink.c
-index dfdc039d92a6c1..01aacdcda26066 100644
---- a/drivers/net/can/dev/netlink.c
-+++ b/drivers/net/can/dev/netlink.c
-@@ -65,15 +65,6 @@ static int can_validate(struct nlattr *tb[], struct nlattr *data[],
- 	if (!data)
- 		return 0;
- 
--	if (data[IFLA_CAN_BITTIMING]) {
--		struct can_bittiming bt;
--
--		memcpy(&bt, nla_data(data[IFLA_CAN_BITTIMING]), sizeof(bt));
--		err = can_validate_bittiming(&bt, extack);
--		if (err)
--			return err;
--	}
--
- 	if (data[IFLA_CAN_CTRLMODE]) {
- 		struct can_ctrlmode *cm = nla_data(data[IFLA_CAN_CTRLMODE]);
- 		u32 tdc_flags = cm->flags & CAN_CTRLMODE_TDC_MASK;
-@@ -114,6 +105,15 @@ static int can_validate(struct nlattr *tb[], struct nlattr *data[],
- 		}
- 	}
- 
-+	if (data[IFLA_CAN_BITTIMING]) {
-+		struct can_bittiming bt;
-+
-+		memcpy(&bt, nla_data(data[IFLA_CAN_BITTIMING]), sizeof(bt));
-+		err = can_validate_bittiming(&bt, extack);
-+		if (err)
-+			return err;
-+	}
-+
- 	if (is_can_fd) {
- 		if (!data[IFLA_CAN_BITTIMING] || !data[IFLA_CAN_DATA_BITTIMING])
- 			return -EOPNOTSUPP;
-@@ -195,48 +195,6 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[],
- 	/* We need synchronization with dev->stop() */
- 	ASSERT_RTNL();
- 
--	if (data[IFLA_CAN_BITTIMING]) {
--		struct can_bittiming bt;
--
--		/* Do not allow changing bittiming while running */
--		if (dev->flags & IFF_UP)
--			return -EBUSY;
--
--		/* Calculate bittiming parameters based on
--		 * bittiming_const if set, otherwise pass bitrate
--		 * directly via do_set_bitrate(). Bail out if neither
--		 * is given.
--		 */
--		if (!priv->bittiming_const && !priv->do_set_bittiming &&
--		    !priv->bitrate_const)
--			return -EOPNOTSUPP;
--
--		memcpy(&bt, nla_data(data[IFLA_CAN_BITTIMING]), sizeof(bt));
--		err = can_get_bittiming(dev, &bt,
--					priv->bittiming_const,
--					priv->bitrate_const,
--					priv->bitrate_const_cnt,
--					extack);
--		if (err)
--			return err;
--
--		if (priv->bitrate_max && bt.bitrate > priv->bitrate_max) {
--			NL_SET_ERR_MSG_FMT(extack,
--					   "arbitration bitrate %u bps surpasses transceiver capabilities of %u bps",
--					   bt.bitrate, priv->bitrate_max);
--			return -EINVAL;
--		}
--
--		memcpy(&priv->bittiming, &bt, sizeof(bt));
--
--		if (priv->do_set_bittiming) {
--			/* Finally, set the bit-timing registers */
--			err = priv->do_set_bittiming(dev);
--			if (err)
--				return err;
--		}
--	}
--
- 	if (data[IFLA_CAN_CTRLMODE]) {
- 		struct can_ctrlmode *cm;
- 		u32 ctrlstatic;
-@@ -284,6 +242,48 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[],
- 			priv->ctrlmode &= cm->flags | ~CAN_CTRLMODE_TDC_MASK;
- 	}
- 
-+	if (data[IFLA_CAN_BITTIMING]) {
-+		struct can_bittiming bt;
-+
-+		/* Do not allow changing bittiming while running */
-+		if (dev->flags & IFF_UP)
-+			return -EBUSY;
-+
-+		/* Calculate bittiming parameters based on
-+		 * bittiming_const if set, otherwise pass bitrate
-+		 * directly via do_set_bitrate(). Bail out if neither
-+		 * is given.
-+		 */
-+		if (!priv->bittiming_const && !priv->do_set_bittiming &&
-+		    !priv->bitrate_const)
-+			return -EOPNOTSUPP;
-+
-+		memcpy(&bt, nla_data(data[IFLA_CAN_BITTIMING]), sizeof(bt));
-+		err = can_get_bittiming(dev, &bt,
-+					priv->bittiming_const,
-+					priv->bitrate_const,
-+					priv->bitrate_const_cnt,
-+					extack);
-+		if (err)
-+			return err;
-+
-+		if (priv->bitrate_max && bt.bitrate > priv->bitrate_max) {
-+			NL_SET_ERR_MSG_FMT(extack,
-+					   "arbitration bitrate %u bps surpasses transceiver capabilities of %u bps",
-+					   bt.bitrate, priv->bitrate_max);
-+			return -EINVAL;
-+		}
-+
-+		memcpy(&priv->bittiming, &bt, sizeof(bt));
-+
-+		if (priv->do_set_bittiming) {
-+			/* Finally, set the bit-timing registers */
-+			err = priv->do_set_bittiming(dev);
-+			if (err)
-+				return err;
-+		}
-+	}
-+
- 	if (data[IFLA_CAN_RESTART_MS]) {
- 		/* Do not allow changing restart delay while running */
- 		if (dev->flags & IFF_UP)
-diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
-index ac4ea93bd8ddad..eaef14ea5dd2e0 100644
---- a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
-+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
-@@ -265,7 +265,7 @@ static void aq_ethtool_get_strings(struct net_device *ndev,
- 		const int rx_stat_cnt = ARRAY_SIZE(aq_ethtool_queue_rx_stat_names);
- 		const int tx_stat_cnt = ARRAY_SIZE(aq_ethtool_queue_tx_stat_names);
- 		char tc_string[8];
--		int tc;
-+		unsigned int tc;
- 
- 		memset(tc_string, 0, sizeof(tc_string));
- 		memcpy(p, aq_ethtool_stat_names,
-@@ -274,7 +274,7 @@ static void aq_ethtool_get_strings(struct net_device *ndev,
- 
- 		for (tc = 0; tc < cfg->tcs; tc++) {
- 			if (cfg->is_qos)
--				snprintf(tc_string, 8, "TC%d ", tc);
-+				snprintf(tc_string, 8, "TC%u ", tc);
- 
- 			for (i = 0; i < cfg->vecs; i++) {
- 				for (si = 0; si < rx_stat_cnt; si++) {
-diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
-index 3c36dd8051485e..2e7ddbca9d53b1 100644
---- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
-+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
-@@ -3021,7 +3021,7 @@ static void bnxt_get_pkgver(struct net_device *dev)
- 
- 	if (!bnxt_get_pkginfo(dev, buf, sizeof(buf))) {
- 		len = strlen(bp->fw_ver_str);
--		snprintf(bp->fw_ver_str + len, FW_VER_STR_LEN - len - 1,
-+		snprintf(bp->fw_ver_str + len, FW_VER_STR_LEN - len,
- 			 "/pkg %s", buf);
- 	}
- }
-diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
-index a8fbcada6b01ff..733af928caffc6 100644
---- a/drivers/net/ethernet/freescale/fec.h
-+++ b/drivers/net/ethernet/freescale/fec.h
-@@ -691,10 +691,19 @@ struct fec_enet_private {
- 	/* XDP BPF Program */
- 	struct bpf_prog *xdp_prog;
- 
-+	struct {
-+		int pps_enable;
-+		u64 ns_sys, ns_phc;
-+		u32 at_corr;
-+		u8 at_inc_corr;
-+	} ptp_saved_state;
-+
- 	u64 ethtool_stats[];
- };
- 
- void fec_ptp_init(struct platform_device *pdev, int irq_idx);
-+void fec_ptp_restore_state(struct fec_enet_private *fep);
-+void fec_ptp_save_state(struct fec_enet_private *fep);
- void fec_ptp_stop(struct platform_device *pdev);
- void fec_ptp_start_cyclecounter(struct net_device *ndev);
- int fec_ptp_set(struct net_device *ndev, struct kernel_hwtstamp_config *config,
-diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
-index 5604a47b35b2a2..81e3173521589d 100644
---- a/drivers/net/ethernet/freescale/fec_main.c
-+++ b/drivers/net/ethernet/freescale/fec_main.c
-@@ -1058,6 +1058,8 @@ fec_restart(struct net_device *ndev)
- 	u32 rcntl = OPT_FRAME_SIZE | 0x04;
- 	u32 ecntl = FEC_ECR_ETHEREN;
- 
-+	fec_ptp_save_state(fep);
-+
- 	/* Whack a reset.  We should wait for this.
- 	 * For i.MX6SX SOC, enet use AXI bus, we use disable MAC
- 	 * instead of reset MAC itself.
-@@ -1225,8 +1227,10 @@ fec_restart(struct net_device *ndev)
- 	writel(ecntl, fep->hwp + FEC_ECNTRL);
- 	fec_enet_active_rxring(ndev);
- 
--	if (fep->bufdesc_ex)
-+	if (fep->bufdesc_ex) {
- 		fec_ptp_start_cyclecounter(ndev);
-+		fec_ptp_restore_state(fep);
-+	}
- 
- 	/* Enable interrupts we wish to service */
- 	if (fep->link)
-@@ -1317,6 +1321,8 @@ fec_stop(struct net_device *ndev)
- 			netdev_err(ndev, "Graceful transmit stop did not complete!\n");
- 	}
- 
-+	fec_ptp_save_state(fep);
-+
- 	/* Whack a reset.  We should wait for this.
- 	 * For i.MX6SX SOC, enet use AXI bus, we use disable MAC
- 	 * instead of reset MAC itself.
-@@ -1347,6 +1353,9 @@ fec_stop(struct net_device *ndev)
- 		val = readl(fep->hwp + FEC_ECNTRL);
- 		val |= FEC_ECR_EN1588;
- 		writel(val, fep->hwp + FEC_ECNTRL);
-+
-+		fec_ptp_start_cyclecounter(ndev);
-+		fec_ptp_restore_state(fep);
- 	}
- }
- 
-diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
-index 2e4f3e1782a252..5e8fac50f945d4 100644
---- a/drivers/net/ethernet/freescale/fec_ptp.c
-+++ b/drivers/net/ethernet/freescale/fec_ptp.c
-@@ -770,6 +770,56 @@ void fec_ptp_init(struct platform_device *pdev, int irq_idx)
- 	schedule_delayed_work(&fep->time_keep, HZ);
- }
- 
-+void fec_ptp_save_state(struct fec_enet_private *fep)
-+{
-+	unsigned long flags;
-+	u32 atime_inc_corr;
-+
-+	spin_lock_irqsave(&fep->tmreg_lock, flags);
-+
-+	fep->ptp_saved_state.pps_enable = fep->pps_enable;
-+
-+	fep->ptp_saved_state.ns_phc = timecounter_read(&fep->tc);
-+	fep->ptp_saved_state.ns_sys = ktime_get_ns();
-+
-+	fep->ptp_saved_state.at_corr = readl(fep->hwp + FEC_ATIME_CORR);
-+	atime_inc_corr = readl(fep->hwp + FEC_ATIME_INC) & FEC_T_INC_CORR_MASK;
-+	fep->ptp_saved_state.at_inc_corr = (u8)(atime_inc_corr >> FEC_T_INC_CORR_OFFSET);
-+
-+	spin_unlock_irqrestore(&fep->tmreg_lock, flags);
-+}
-+
-+/* Restore PTP functionality after a reset */
-+void fec_ptp_restore_state(struct fec_enet_private *fep)
-+{
-+	u32 atime_inc = readl(fep->hwp + FEC_ATIME_INC) & FEC_T_INC_MASK;
-+	unsigned long flags;
-+	u32 counter;
-+	u64 ns;
-+
-+	spin_lock_irqsave(&fep->tmreg_lock, flags);
-+
-+	/* Reset turned it off, so adjust our status flag */
-+	fep->pps_enable = 0;
-+
-+	writel(fep->ptp_saved_state.at_corr, fep->hwp + FEC_ATIME_CORR);
-+	atime_inc |= ((u32)fep->ptp_saved_state.at_inc_corr) << FEC_T_INC_CORR_OFFSET;
-+	writel(atime_inc, fep->hwp + FEC_ATIME_INC);
-+
-+	ns = ktime_get_ns() - fep->ptp_saved_state.ns_sys + fep->ptp_saved_state.ns_phc;
-+	counter = ns & fep->cc.mask;
-+	writel(counter, fep->hwp + FEC_ATIME);
-+	timecounter_init(&fep->tc, &fep->cc, ns);
-+
-+	spin_unlock_irqrestore(&fep->tmreg_lock, flags);
-+
-+	/* Restart PPS if needed */
-+	if (fep->ptp_saved_state.pps_enable) {
-+		/* Re-enable PPS */
-+		fec_ptp_enable_pps(fep, 1);
-+	}
-+}
-+
- void fec_ptp_stop(struct platform_device *pdev)
- {
- 	struct net_device *ndev = platform_get_drvdata(pdev);
-diff --git a/drivers/net/ethernet/hisilicon/hip04_eth.c b/drivers/net/ethernet/hisilicon/hip04_eth.c
-index ecf92a5d56bbf2..4b893d162e85d0 100644
---- a/drivers/net/ethernet/hisilicon/hip04_eth.c
-+++ b/drivers/net/ethernet/hisilicon/hip04_eth.c
-@@ -947,6 +947,7 @@ static int hip04_mac_probe(struct platform_device *pdev)
- 	priv->tx_coalesce_timer.function = tx_done;
- 
- 	priv->map = syscon_node_to_regmap(arg.np);
-+	of_node_put(arg.np);
- 	if (IS_ERR(priv->map)) {
- 		dev_warn(d, "no syscon hisilicon,hip04-ppe\n");
- 		ret = PTR_ERR(priv->map);
-diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
-index f75668c4793519..616a2768e5048a 100644
---- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
-+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
-@@ -933,6 +933,7 @@ static int hns_mac_get_info(struct hns_mac_cb *mac_cb)
- 			mac_cb->cpld_ctrl = NULL;
- 		} else {
- 			syscon = syscon_node_to_regmap(cpld_args.np);
-+			of_node_put(cpld_args.np);
- 			if (IS_ERR_OR_NULL(syscon)) {
- 				dev_dbg(mac_cb->dev, "no cpld-syscon found!\n");
- 				mac_cb->cpld_ctrl = NULL;
-diff --git a/drivers/net/ethernet/hisilicon/hns_mdio.c b/drivers/net/ethernet/hisilicon/hns_mdio.c
-index 409a89d8022087..9ffd479c750881 100644
---- a/drivers/net/ethernet/hisilicon/hns_mdio.c
-+++ b/drivers/net/ethernet/hisilicon/hns_mdio.c
-@@ -575,6 +575,7 @@ static int hns_mdio_probe(struct platform_device *pdev)
- 						MDIO_SC_RESET_ST;
- 				}
- 			}
-+			of_node_put(reg_args.np);
- 		} else {
- 			dev_warn(&pdev->dev, "find syscon ret = %#x\n", ret);
- 			mdio_dev->subctrl_vbase = NULL;
-diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
-index 334f652c60601f..d377a286c0e1bf 100644
---- a/drivers/net/ethernet/intel/e1000e/netdev.c
-+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
-@@ -6672,8 +6672,10 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
- 		if (adapter->flags2 & FLAG2_HAS_PHY_WAKEUP) {
- 			/* enable wakeup by the PHY */
- 			retval = e1000_init_phy_wakeup(adapter, wufc);
--			if (retval)
--				return retval;
-+			if (retval) {
-+				e_err("Failed to enable wakeup\n");
-+				goto skip_phy_configurations;
-+			}
- 		} else {
- 			/* enable wakeup by the MAC */
- 			ew32(WUFC, wufc);
-@@ -6694,8 +6696,10 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
- 			 * or broadcast.
- 			 */
- 			retval = e1000_enable_ulp_lpt_lp(hw, !runtime);
--			if (retval)
--				return retval;
-+			if (retval) {
-+				e_err("Failed to enable ULP\n");
-+				goto skip_phy_configurations;
-+			}
- 		}
- 
- 		/* Force SMBUS to allow WOL */
-@@ -6744,6 +6748,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
- 		hw->phy.ops.release(hw);
- 	}
- 
-+skip_phy_configurations:
- 	/* Release control of h/w to f/w.  If f/w is AMT enabled, this
- 	 * would have already happened in close and is redundant.
- 	 */
-@@ -6986,15 +6991,13 @@ static __maybe_unused int e1000e_pm_suspend(struct device *dev)
- 	e1000e_pm_freeze(dev);
- 
- 	rc = __e1000_shutdown(pdev, false);
--	if (rc) {
--		e1000e_pm_thaw(dev);
--	} else {
-+	if (!rc) {
- 		/* Introduce S0ix implementation */
- 		if (adapter->flags2 & FLAG2_ENABLE_S0IX_FLOWS)
- 			e1000e_s0ix_entry_flow(adapter);
- 	}
- 
--	return rc;
-+	return 0;
- }
- 
- static __maybe_unused int e1000e_pm_resume(struct device *dev)
-diff --git a/drivers/net/ethernet/intel/ice/ice_sched.c b/drivers/net/ethernet/intel/ice/ice_sched.c
-index c0533d7b66b996..908bcd07380333 100644
---- a/drivers/net/ethernet/intel/ice/ice_sched.c
-+++ b/drivers/net/ethernet/intel/ice/ice_sched.c
-@@ -28,9 +28,8 @@ ice_sched_add_root_node(struct ice_port_info *pi,
- 	if (!root)
- 		return -ENOMEM;
- 
--	/* coverity[suspicious_sizeof] */
- 	root->children = devm_kcalloc(ice_hw_to_dev(hw), hw->max_children[0],
--				      sizeof(*root), GFP_KERNEL);
-+				      sizeof(*root->children), GFP_KERNEL);
- 	if (!root->children) {
- 		devm_kfree(ice_hw_to_dev(hw), root);
- 		return -ENOMEM;
-@@ -186,10 +185,9 @@ ice_sched_add_node(struct ice_port_info *pi, u8 layer,
- 	if (!node)
- 		return -ENOMEM;
- 	if (hw->max_children[layer]) {
--		/* coverity[suspicious_sizeof] */
- 		node->children = devm_kcalloc(ice_hw_to_dev(hw),
- 					      hw->max_children[layer],
--					      sizeof(*node), GFP_KERNEL);
-+					      sizeof(*node->children), GFP_KERNEL);
- 		if (!node->children) {
- 			devm_kfree(ice_hw_to_dev(hw), node);
- 			return -ENOMEM;
-diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
-index 61baf1da76eea7..c33c31019562f6 100644
---- a/drivers/net/ethernet/lantiq_etop.c
-+++ b/drivers/net/ethernet/lantiq_etop.c
-@@ -482,7 +482,9 @@ ltq_etop_tx(struct sk_buff *skb, struct net_device *dev)
- 	unsigned long flags;
- 	u32 byte_offset;
- 
--	len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
-+	if (skb_put_padto(skb, ETH_ZLEN))
-+		return NETDEV_TX_OK;
-+	len = skb->len;
- 
- 	if ((desc->ctl & (LTQ_DMA_OWN | LTQ_DMA_C)) || ch->skb[ch->dma.desc]) {
- 		netdev_err(dev, "tx ring full\n");
-diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
-index e809f91c08fb9d..9e02e4367bec81 100644
---- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
-+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
-@@ -1088,7 +1088,7 @@ struct mvpp2 {
- 	unsigned int max_port_rxqs;
- 
- 	/* Workqueue to gather hardware statistics */
--	char queue_name[30];
-+	char queue_name[31];
- 	struct workqueue_struct *stats_queue;
- 
- 	/* Debugfs root entry */
-diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c
-index d4239e3b3c88ef..11f724ad90dbfb 100644
---- a/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c
-+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c
-@@ -23,6 +23,9 @@ struct mlx5e_tir_builder *mlx5e_tir_builder_alloc(bool modify)
- 	struct mlx5e_tir_builder *builder;
- 
- 	builder = kvzalloc(sizeof(*builder), GFP_KERNEL);
-+	if (!builder)
-+		return NULL;
-+
- 	builder->modify = modify;
- 
- 	return builder;
-diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
-index e2ffc572de188b..015faddabc8e09 100644
---- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
-+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
-@@ -67,7 +67,6 @@ static void mlx5e_ipsec_handle_tx_limit(struct work_struct *_work)
- 		return;
- 
- 	spin_lock_bh(&x->lock);
--	xfrm_state_check_expire(x);
- 	if (x->km.state == XFRM_STATE_EXPIRED) {
- 		sa_entry->attrs.drop = true;
- 		spin_unlock_bh(&x->lock);
-@@ -75,6 +74,13 @@ static void mlx5e_ipsec_handle_tx_limit(struct work_struct *_work)
- 		mlx5e_accel_ipsec_fs_modify(sa_entry);
- 		return;
- 	}
-+
-+	if (x->km.state != XFRM_STATE_VALID) {
-+		spin_unlock_bh(&x->lock);
-+		return;
-+	}
-+
-+	xfrm_state_check_expire(x);
- 	spin_unlock_bh(&x->lock);
- 
- 	queue_delayed_work(sa_entry->ipsec->wq, &dwork->dwork,
-diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
-index 3001a52e1ac2ec..85d6334308e318 100644
---- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
-+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
-@@ -642,7 +642,6 @@ mlx5e_sq_xmit_mpwqe(struct mlx5e_txqsq *sq, struct sk_buff *skb,
- 	return;
- 
- err_unmap:
--	mlx5e_dma_unmap_wqe_err(sq, 1);
- 	sq->stats->dropped++;
- 	dev_kfree_skb_any(skb);
- 	mlx5e_tx_flush(sq);
-diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/pci_vsc.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/pci_vsc.c
-index d0b595ba611014..432c98f2626db9 100644
---- a/drivers/net/ethernet/mellanox/mlx5/core/lib/pci_vsc.c
-+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/pci_vsc.c
-@@ -24,6 +24,11 @@
- 	pci_write_config_dword((dev)->pdev, (dev)->vsc_addr + (offset), (val))
- #define VSC_MAX_RETRIES 2048
- 
-+/* Reading VSC registers can take relatively long time.
-+ * Yield the cpu every 128 registers read.
-+ */
-+#define VSC_GW_READ_BLOCK_COUNT 128
-+
- enum {
- 	VSC_CTRL_OFFSET = 0x4,
- 	VSC_COUNTER_OFFSET = 0x8,
-@@ -273,6 +278,7 @@ int mlx5_vsc_gw_read_block_fast(struct mlx5_core_dev *dev, u32 *data,
- {
- 	unsigned int next_read_addr = 0;
- 	unsigned int read_addr = 0;
-+	unsigned int count = 0;
- 
- 	while (read_addr < length) {
- 		if (mlx5_vsc_gw_read_fast(dev, read_addr, &next_read_addr,
-@@ -280,6 +286,10 @@ int mlx5_vsc_gw_read_block_fast(struct mlx5_core_dev *dev, u32 *data,
- 			return read_addr;
- 
- 		read_addr = next_read_addr;
-+		if (++count == VSC_GW_READ_BLOCK_COUNT) {
-+			cond_resched();
-+			count = 0;
-+		}
- 	}
- 	return length;
- }
-diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c b/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c
-index ac7e1cffbcecf0..dcf2e342fc14ad 100644
---- a/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c
-+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c
-@@ -45,8 +45,12 @@ void sparx5_ifh_parse(u32 *ifh, struct frame_info *info)
- 	fwd = (fwd >> 5);
- 	info->src_port = FIELD_GET(GENMASK(7, 1), fwd);
- 
-+	/*
-+	 * Bit 270-271 are occasionally unexpectedly set by the hardware,
-+	 * clear bits before extracting timestamp
-+	 */
- 	info->timestamp =
--		((u64)xtr_hdr[2] << 24) |
-+		((u64)(xtr_hdr[2] & GENMASK(5, 0)) << 24) |
- 		((u64)xtr_hdr[3] << 16) |
- 		((u64)xtr_hdr[4] <<  8) |
- 		((u64)xtr_hdr[5] <<  0);
-diff --git a/drivers/net/ethernet/microsoft/Kconfig b/drivers/net/ethernet/microsoft/Kconfig
-index 01eb7445ead951..901fbffbf718ee 100644
---- a/drivers/net/ethernet/microsoft/Kconfig
-+++ b/drivers/net/ethernet/microsoft/Kconfig
-@@ -17,7 +17,8 @@ if NET_VENDOR_MICROSOFT
- 
- config MICROSOFT_MANA
- 	tristate "Microsoft Azure Network Adapter (MANA) support"
--	depends on PCI_MSI && X86_64
-+	depends on PCI_MSI
-+	depends on X86_64 || (ARM64 && !CPU_BIG_ENDIAN)
- 	depends on PCI_HYPERV
- 	select AUXILIARY_BUS
- 	select PAGE_POOL
-diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c
-index 6367de0c2c2e8f..ae014e21eb6056 100644
---- a/drivers/net/ethernet/microsoft/mana/gdma_main.c
-+++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c
-@@ -179,7 +179,7 @@ int mana_gd_alloc_memory(struct gdma_context *gc, unsigned int length,
- 	dma_addr_t dma_handle;
- 	void *buf;
- 
--	if (length < PAGE_SIZE || !is_power_of_2(length))
-+	if (length < MANA_PAGE_SIZE || !is_power_of_2(length))
- 		return -EINVAL;
- 
- 	gmi->dev = gc->dev;
-@@ -720,7 +720,7 @@ EXPORT_SYMBOL_NS(mana_gd_destroy_dma_region, NET_MANA);
- static int mana_gd_create_dma_region(struct gdma_dev *gd,
- 				     struct gdma_mem_info *gmi)
- {
--	unsigned int num_page = gmi->length / PAGE_SIZE;
-+	unsigned int num_page = gmi->length / MANA_PAGE_SIZE;
- 	struct gdma_create_dma_region_req *req = NULL;
- 	struct gdma_create_dma_region_resp resp = {};
- 	struct gdma_context *gc = gd->gdma_context;
-@@ -730,10 +730,10 @@ static int mana_gd_create_dma_region(struct gdma_dev *gd,
- 	int err;
- 	int i;
- 
--	if (length < PAGE_SIZE || !is_power_of_2(length))
-+	if (length < MANA_PAGE_SIZE || !is_power_of_2(length))
- 		return -EINVAL;
- 
--	if (offset_in_page(gmi->virt_addr) != 0)
-+	if (!MANA_PAGE_ALIGNED(gmi->virt_addr))
- 		return -EINVAL;
- 
- 	hwc = gc->hwc.driver_data;
-@@ -754,7 +754,7 @@ static int mana_gd_create_dma_region(struct gdma_dev *gd,
- 	req->page_addr_list_len = num_page;
- 
- 	for (i = 0; i < num_page; i++)
--		req->page_addr_list[i] = gmi->dma_handle +  i * PAGE_SIZE;
-+		req->page_addr_list[i] = gmi->dma_handle +  i * MANA_PAGE_SIZE;
- 
- 	err = mana_gd_send_request(gc, req_msg_size, req, sizeof(resp), &resp);
- 	if (err)
-diff --git a/drivers/net/ethernet/microsoft/mana/hw_channel.c b/drivers/net/ethernet/microsoft/mana/hw_channel.c
-index 236daa0535ba00..9d6426d4158e31 100644
---- a/drivers/net/ethernet/microsoft/mana/hw_channel.c
-+++ b/drivers/net/ethernet/microsoft/mana/hw_channel.c
-@@ -366,12 +366,12 @@ static int mana_hwc_create_cq(struct hw_channel_context *hwc, u16 q_depth,
- 	int err;
- 
- 	eq_size = roundup_pow_of_two(GDMA_EQE_SIZE * q_depth);
--	if (eq_size < MINIMUM_SUPPORTED_PAGE_SIZE)
--		eq_size = MINIMUM_SUPPORTED_PAGE_SIZE;
-+	if (eq_size < MANA_MIN_QSIZE)
-+		eq_size = MANA_MIN_QSIZE;
- 
- 	cq_size = roundup_pow_of_two(GDMA_CQE_SIZE * q_depth);
--	if (cq_size < MINIMUM_SUPPORTED_PAGE_SIZE)
--		cq_size = MINIMUM_SUPPORTED_PAGE_SIZE;
-+	if (cq_size < MANA_MIN_QSIZE)
-+		cq_size = MANA_MIN_QSIZE;
- 
- 	hwc_cq = kzalloc(sizeof(*hwc_cq), GFP_KERNEL);
- 	if (!hwc_cq)
-@@ -433,7 +433,7 @@ static int mana_hwc_alloc_dma_buf(struct hw_channel_context *hwc, u16 q_depth,
- 
- 	dma_buf->num_reqs = q_depth;
- 
--	buf_size = PAGE_ALIGN(q_depth * max_msg_size);
-+	buf_size = MANA_PAGE_ALIGN(q_depth * max_msg_size);
- 
- 	gmi = &dma_buf->mem_info;
- 	err = mana_gd_alloc_memory(gc, buf_size, gmi);
-@@ -501,8 +501,8 @@ static int mana_hwc_create_wq(struct hw_channel_context *hwc,
- 	else
- 		queue_size = roundup_pow_of_two(GDMA_MAX_SQE_SIZE * q_depth);
- 
--	if (queue_size < MINIMUM_SUPPORTED_PAGE_SIZE)
--		queue_size = MINIMUM_SUPPORTED_PAGE_SIZE;
-+	if (queue_size < MANA_MIN_QSIZE)
-+		queue_size = MANA_MIN_QSIZE;
- 
- 	hwc_wq = kzalloc(sizeof(*hwc_wq), GFP_KERNEL);
- 	if (!hwc_wq)
-diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
-index d8cce3771af213..89852bbc877c11 100644
---- a/drivers/net/ethernet/microsoft/mana/mana_en.c
-+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
-@@ -1902,10 +1902,10 @@ static int mana_create_txq(struct mana_port_context *apc,
- 	 *  to prevent overflow.
- 	 */
- 	txq_size = MAX_SEND_BUFFERS_PER_QUEUE * 32;
--	BUILD_BUG_ON(!PAGE_ALIGNED(txq_size));
-+	BUILD_BUG_ON(!MANA_PAGE_ALIGNED(txq_size));
- 
- 	cq_size = MAX_SEND_BUFFERS_PER_QUEUE * COMP_ENTRY_SIZE;
--	cq_size = PAGE_ALIGN(cq_size);
-+	cq_size = MANA_PAGE_ALIGN(cq_size);
- 
- 	gc = gd->gdma_context;
- 
-@@ -2203,8 +2203,8 @@ static struct mana_rxq *mana_create_rxq(struct mana_port_context *apc,
- 	if (err)
- 		goto out;
- 
--	rq_size = PAGE_ALIGN(rq_size);
--	cq_size = PAGE_ALIGN(cq_size);
-+	rq_size = MANA_PAGE_ALIGN(rq_size);
-+	cq_size = MANA_PAGE_ALIGN(cq_size);
- 
- 	/* Create RQ */
- 	memset(&spec, 0, sizeof(spec));
-diff --git a/drivers/net/ethernet/microsoft/mana/shm_channel.c b/drivers/net/ethernet/microsoft/mana/shm_channel.c
-index 5553af9c8085a1..0f1679ebad96ba 100644
---- a/drivers/net/ethernet/microsoft/mana/shm_channel.c
-+++ b/drivers/net/ethernet/microsoft/mana/shm_channel.c
-@@ -6,6 +6,7 @@
- #include <linux/io.h>
- #include <linux/mm.h>
- 
-+#include <net/mana/gdma.h>
- #include <net/mana/shm_channel.h>
- 
- #define PAGE_FRAME_L48_WIDTH_BYTES 6
-@@ -155,8 +156,8 @@ int mana_smc_setup_hwc(struct shm_channel *sc, bool reset_vf, u64 eq_addr,
- 		return err;
- 	}
- 
--	if (!PAGE_ALIGNED(eq_addr) || !PAGE_ALIGNED(cq_addr) ||
--	    !PAGE_ALIGNED(rq_addr) || !PAGE_ALIGNED(sq_addr))
-+	if (!MANA_PAGE_ALIGNED(eq_addr) || !MANA_PAGE_ALIGNED(cq_addr) ||
-+	    !MANA_PAGE_ALIGNED(rq_addr) || !MANA_PAGE_ALIGNED(sq_addr))
- 		return -EINVAL;
- 
- 	if ((eq_msix_index & VECTOR_MASK) != eq_msix_index)
-@@ -183,7 +184,7 @@ int mana_smc_setup_hwc(struct shm_channel *sc, bool reset_vf, u64 eq_addr,
- 
- 	/* EQ addr: low 48 bits of frame address */
- 	shmem = (u64 *)ptr;
--	frame_addr = PHYS_PFN(eq_addr);
-+	frame_addr = MANA_PFN(eq_addr);
- 	*shmem = frame_addr & PAGE_FRAME_L48_MASK;
- 	all_addr_h4bits |= (frame_addr >> PAGE_FRAME_L48_WIDTH_BITS) <<
- 		(frame_addr_seq++ * PAGE_FRAME_H4_WIDTH_BITS);
-@@ -191,7 +192,7 @@ int mana_smc_setup_hwc(struct shm_channel *sc, bool reset_vf, u64 eq_addr,
- 
- 	/* CQ addr: low 48 bits of frame address */
- 	shmem = (u64 *)ptr;
--	frame_addr = PHYS_PFN(cq_addr);
-+	frame_addr = MANA_PFN(cq_addr);
- 	*shmem = frame_addr & PAGE_FRAME_L48_MASK;
- 	all_addr_h4bits |= (frame_addr >> PAGE_FRAME_L48_WIDTH_BITS) <<
- 		(frame_addr_seq++ * PAGE_FRAME_H4_WIDTH_BITS);
-@@ -199,7 +200,7 @@ int mana_smc_setup_hwc(struct shm_channel *sc, bool reset_vf, u64 eq_addr,
- 
- 	/* RQ addr: low 48 bits of frame address */
- 	shmem = (u64 *)ptr;
--	frame_addr = PHYS_PFN(rq_addr);
-+	frame_addr = MANA_PFN(rq_addr);
- 	*shmem = frame_addr & PAGE_FRAME_L48_MASK;
- 	all_addr_h4bits |= (frame_addr >> PAGE_FRAME_L48_WIDTH_BITS) <<
- 		(frame_addr_seq++ * PAGE_FRAME_H4_WIDTH_BITS);
-@@ -207,7 +208,7 @@ int mana_smc_setup_hwc(struct shm_channel *sc, bool reset_vf, u64 eq_addr,
- 
- 	/* SQ addr: low 48 bits of frame address */
- 	shmem = (u64 *)ptr;
--	frame_addr = PHYS_PFN(sq_addr);
-+	frame_addr = MANA_PFN(sq_addr);
- 	*shmem = frame_addr & PAGE_FRAME_L48_MASK;
- 	all_addr_h4bits |= (frame_addr >> PAGE_FRAME_L48_WIDTH_BITS) <<
- 		(frame_addr_seq++ * PAGE_FRAME_H4_WIDTH_BITS);
-diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
-index f2085340a1cfeb..fceb4abea2365d 100644
---- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
-+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
-@@ -821,14 +821,13 @@ nfp_net_prepare_vector(struct nfp_net *nn, struct nfp_net_r_vector *r_vec,
- 
- 	snprintf(r_vec->name, sizeof(r_vec->name),
- 		 "%s-rxtx-%d", nfp_net_name(nn), idx);
--	err = request_irq(r_vec->irq_vector, r_vec->handler, 0, r_vec->name,
--			  r_vec);
-+	err = request_irq(r_vec->irq_vector, r_vec->handler, IRQF_NO_AUTOEN,
-+			  r_vec->name, r_vec);
- 	if (err) {
- 		nfp_net_napi_del(&nn->dp, r_vec);
- 		nn_err(nn, "Error requesting IRQ %d\n", r_vec->irq_vector);
- 		return err;
- 	}
--	disable_irq(r_vec->irq_vector);
- 
- 	irq_set_affinity_hint(r_vec->irq_vector, &r_vec->affinity_mask);
- 
-diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
-index 8a732edac15a02..b499d8ea6d216f 100644
---- a/drivers/net/ethernet/realtek/r8169_main.c
-+++ b/drivers/net/ethernet/realtek/r8169_main.c
-@@ -566,7 +566,34 @@ struct rtl8169_counters {
- 	__le64	rx_broadcast;
- 	__le32	rx_multicast;
- 	__le16	tx_aborted;
--	__le16	tx_underun;
-+	__le16	tx_underrun;
-+	/* new since RTL8125 */
-+	__le64 tx_octets;
-+	__le64 rx_octets;
-+	__le64 rx_multicast64;
-+	__le64 tx_unicast64;
-+	__le64 tx_broadcast64;
-+	__le64 tx_multicast64;
-+	__le32 tx_pause_on;
-+	__le32 tx_pause_off;
-+	__le32 tx_pause_all;
-+	__le32 tx_deferred;
-+	__le32 tx_late_collision;
-+	__le32 tx_all_collision;
-+	__le32 tx_aborted32;
-+	__le32 align_errors32;
-+	__le32 rx_frame_too_long;
-+	__le32 rx_runt;
-+	__le32 rx_pause_on;
-+	__le32 rx_pause_off;
-+	__le32 rx_pause_all;
-+	__le32 rx_unknown_opcode;
-+	__le32 rx_mac_error;
-+	__le32 tx_underrun32;
-+	__le32 rx_mac_missed;
-+	__le32 rx_tcam_dropped;
-+	__le32 tdu;
-+	__le32 rdu;
- };
- 
- struct rtl8169_tc_offsets {
-@@ -1726,7 +1753,7 @@ static void rtl8169_get_ethtool_stats(struct net_device *dev,
- 	data[9] = le64_to_cpu(counters->rx_broadcast);
- 	data[10] = le32_to_cpu(counters->rx_multicast);
- 	data[11] = le16_to_cpu(counters->tx_aborted);
--	data[12] = le16_to_cpu(counters->tx_underun);
-+	data[12] = le16_to_cpu(counters->tx_underrun);
- }
- 
- static void rtl8169_get_strings(struct net_device *dev, u32 stringset, u8 *data)
-diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
-index bf99495b51a9c5..a9837985a483d8 100644
---- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
-@@ -14,6 +14,7 @@
- #include <linux/slab.h>
- #include <linux/ethtool.h>
- #include <linux/io.h>
-+#include <linux/iopoll.h>
- #include "stmmac.h"
- #include "stmmac_pcs.h"
- #include "dwmac4.h"
-@@ -475,7 +476,7 @@ static int dwmac4_write_vlan_filter(struct net_device *dev,
- 				    u8 index, u32 data)
- {
- 	void __iomem *ioaddr = (void __iomem *)dev->base_addr;
--	int i, timeout = 10;
-+	int ret;
- 	u32 val;
- 
- 	if (index >= hw->num_vlan)
-@@ -491,16 +492,15 @@ static int dwmac4_write_vlan_filter(struct net_device *dev,
- 
- 	writel(val, ioaddr + GMAC_VLAN_TAG);
- 
--	for (i = 0; i < timeout; i++) {
--		val = readl(ioaddr + GMAC_VLAN_TAG);
--		if (!(val & GMAC_VLAN_TAG_CTRL_OB))
--			return 0;
--		udelay(1);
-+	ret = readl_poll_timeout(ioaddr + GMAC_VLAN_TAG, val,
-+				 !(val & GMAC_VLAN_TAG_CTRL_OB),
-+				 1000, 500000);
-+	if (ret) {
-+		netdev_err(dev, "Timeout accessing MAC_VLAN_Tag_Filter\n");
-+		return -EBUSY;
- 	}
- 
--	netdev_err(dev, "Timeout accessing MAC_VLAN_Tag_Filter\n");
--
--	return -EBUSY;
-+	return 0;
- }
- 
- static int dwmac4_add_hw_vlan_rx_fltr(struct net_device *dev,
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
-index b8c93b881a6533..85a55f459af018 100644
---- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
-+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
-@@ -248,6 +248,8 @@ struct stmmac_priv {
- 	struct stmmac_extra_stats xstats ____cacheline_aligned_in_smp;
- 	struct stmmac_safety_stats sstats;
- 	struct plat_stmmacenet_data *plat;
-+	/* Protect est parameters */
-+	struct mutex est_lock;
- 	struct dma_features dma_cap;
- 	struct stmmac_counters mmc;
- 	int hw_cap_support;
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
-index 3d7825cb30bb1d..a04bb2e42c4ee1 100644
---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
-@@ -70,11 +70,11 @@ static int stmmac_adjust_time(struct ptp_clock_info *ptp, s64 delta)
- 	/* If EST is enabled, disabled it before adjust ptp time. */
- 	if (priv->plat->est && priv->plat->est->enable) {
- 		est_rst = true;
--		mutex_lock(&priv->plat->est->lock);
-+		mutex_lock(&priv->est_lock);
- 		priv->plat->est->enable = false;
- 		stmmac_est_configure(priv, priv->ioaddr, priv->plat->est,
- 				     priv->plat->clk_ptp_rate);
--		mutex_unlock(&priv->plat->est->lock);
-+		mutex_unlock(&priv->est_lock);
- 	}
- 
- 	write_lock_irqsave(&priv->ptp_lock, flags);
-@@ -87,7 +87,7 @@ static int stmmac_adjust_time(struct ptp_clock_info *ptp, s64 delta)
- 		ktime_t current_time_ns, basetime;
- 		u64 cycle_time;
- 
--		mutex_lock(&priv->plat->est->lock);
-+		mutex_lock(&priv->est_lock);
- 		priv->ptp_clock_ops.gettime64(&priv->ptp_clock_ops, &current_time);
- 		current_time_ns = timespec64_to_ktime(current_time);
- 		time.tv_nsec = priv->plat->est->btr_reserve[0];
-@@ -104,7 +104,7 @@ static int stmmac_adjust_time(struct ptp_clock_info *ptp, s64 delta)
- 		priv->plat->est->enable = true;
- 		ret = stmmac_est_configure(priv, priv->ioaddr, priv->plat->est,
- 					   priv->plat->clk_ptp_rate);
--		mutex_unlock(&priv->plat->est->lock);
-+		mutex_unlock(&priv->est_lock);
- 		if (ret)
- 			netdev_err(priv->dev, "failed to configure EST\n");
- 	}
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
-index 77245f856dd0e3..97ff2dd8f2aecd 100644
---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
-@@ -396,6 +396,7 @@ static int tc_setup_cbs(struct stmmac_priv *priv,
- 			return ret;
- 
- 		priv->plat->tx_queues_cfg[queue].mode_to_use = MTL_QUEUE_DCB;
-+		return 0;
- 	}
- 
- 	/* Final adjustments for HW */
-@@ -983,17 +984,19 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
- 		if (!plat->est)
- 			return -ENOMEM;
- 
--		mutex_init(&priv->plat->est->lock);
-+		mutex_init(&priv->est_lock);
- 	} else {
-+		mutex_lock(&priv->est_lock);
- 		memset(plat->est, 0, sizeof(*plat->est));
-+		mutex_unlock(&priv->est_lock);
- 	}
- 
- 	size = qopt->num_entries;
- 
--	mutex_lock(&priv->plat->est->lock);
-+	mutex_lock(&priv->est_lock);
- 	priv->plat->est->gcl_size = size;
- 	priv->plat->est->enable = qopt->cmd == TAPRIO_CMD_REPLACE;
--	mutex_unlock(&priv->plat->est->lock);
-+	mutex_unlock(&priv->est_lock);
- 
- 	for (i = 0; i < size; i++) {
- 		s64 delta_ns = qopt->entries[i].interval;
-@@ -1024,7 +1027,7 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
- 		priv->plat->est->gcl[i] = delta_ns | (gates << wid);
- 	}
- 
--	mutex_lock(&priv->plat->est->lock);
-+	mutex_lock(&priv->est_lock);
- 	/* Adjust for real system time */
- 	priv->ptp_clock_ops.gettime64(&priv->ptp_clock_ops, &current_time);
- 	current_time_ns = timespec64_to_ktime(current_time);
-@@ -1043,7 +1046,7 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
- 	priv->plat->est->ctr[1] = (u32)ctr;
- 
- 	if (fpe && !priv->dma_cap.fpesel) {
--		mutex_unlock(&priv->plat->est->lock);
-+		mutex_unlock(&priv->est_lock);
- 		return -EOPNOTSUPP;
- 	}
- 
-@@ -1054,7 +1057,7 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
- 
- 	ret = stmmac_est_configure(priv, priv->ioaddr, priv->plat->est,
- 				   priv->plat->clk_ptp_rate);
--	mutex_unlock(&priv->plat->est->lock);
-+	mutex_unlock(&priv->est_lock);
- 	if (ret) {
- 		netdev_err(priv->dev, "failed to configure EST\n");
- 		goto disable;
-@@ -1071,11 +1074,11 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
- 
- disable:
- 	if (priv->plat->est) {
--		mutex_lock(&priv->plat->est->lock);
-+		mutex_lock(&priv->est_lock);
- 		priv->plat->est->enable = false;
- 		stmmac_est_configure(priv, priv->ioaddr, priv->plat->est,
- 				     priv->plat->clk_ptp_rate);
--		mutex_unlock(&priv->plat->est->lock);
-+		mutex_unlock(&priv->est_lock);
- 	}
- 
- 	priv->plat->fpe_cfg->enable = false;
-diff --git a/drivers/net/ieee802154/Kconfig b/drivers/net/ieee802154/Kconfig
-index 95da876c561384..1075e24b11defc 100644
---- a/drivers/net/ieee802154/Kconfig
-+++ b/drivers/net/ieee802154/Kconfig
-@@ -101,6 +101,7 @@ config IEEE802154_CA8210_DEBUGFS
- 
- config IEEE802154_MCR20A
- 	tristate "MCR20A transceiver driver"
-+	select REGMAP_SPI
- 	depends on IEEE802154_DRIVERS && MAC802154
- 	depends on SPI
- 	help
-diff --git a/drivers/net/ieee802154/mcr20a.c b/drivers/net/ieee802154/mcr20a.c
-index 87abe3b46316e4..bab92f19c4f48e 100644
---- a/drivers/net/ieee802154/mcr20a.c
-+++ b/drivers/net/ieee802154/mcr20a.c
-@@ -1303,16 +1303,13 @@ mcr20a_probe(struct spi_device *spi)
- 		irq_type = IRQF_TRIGGER_FALLING;
- 
- 	ret = devm_request_irq(&spi->dev, spi->irq, mcr20a_irq_isr,
--			       irq_type, dev_name(&spi->dev), lp);
-+			       irq_type | IRQF_NO_AUTOEN, dev_name(&spi->dev), lp);
- 	if (ret) {
- 		dev_err(&spi->dev, "could not request_irq for mcr20a\n");
- 		ret = -ENODEV;
- 		goto free_dev;
- 	}
- 
--	/* disable_irq by default and wait for starting hardware */
--	disable_irq(spi->irq);
--
- 	ret = ieee802154_register_hw(hw);
- 	if (ret) {
- 		dev_crit(&spi->dev, "ieee802154_register_hw failed\n");
-diff --git a/drivers/net/pcs/pcs-xpcs-wx.c b/drivers/net/pcs/pcs-xpcs-wx.c
-index 19c75886f070ea..5f5cd3596cb846 100644
---- a/drivers/net/pcs/pcs-xpcs-wx.c
-+++ b/drivers/net/pcs/pcs-xpcs-wx.c
-@@ -109,7 +109,7 @@ static void txgbe_pma_config_1g(struct dw_xpcs *xpcs)
- 	txgbe_write_pma(xpcs, TXGBE_DFE_TAP_CTL0, 0);
- 	val = txgbe_read_pma(xpcs, TXGBE_RX_GEN_CTL3);
- 	val = u16_replace_bits(val, 0x4, TXGBE_RX_GEN_CTL3_LOS_TRSHLD0);
--	txgbe_write_pma(xpcs, TXGBE_RX_EQ_ATTN_CTL, val);
-+	txgbe_write_pma(xpcs, TXGBE_RX_GEN_CTL3, val);
- 
- 	txgbe_write_pma(xpcs, TXGBE_MPLLA_CTL0, 0x20);
- 	txgbe_write_pma(xpcs, TXGBE_MPLLA_CTL3, 0x46);
-diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
-index 370c84f393759a..90f1cfbc7c50b3 100644
---- a/drivers/net/ppp/ppp_generic.c
-+++ b/drivers/net/ppp/ppp_generic.c
-@@ -2269,7 +2269,7 @@ static bool ppp_channel_bridge_input(struct channel *pch, struct sk_buff *skb)
- 	if (!pchb)
- 		goto out_rcu;
- 
--	spin_lock(&pchb->downl);
-+	spin_lock_bh(&pchb->downl);
- 	if (!pchb->chan) {
- 		/* channel got unregistered */
- 		kfree_skb(skb);
-@@ -2281,7 +2281,7 @@ static bool ppp_channel_bridge_input(struct channel *pch, struct sk_buff *skb)
- 		kfree_skb(skb);
- 
- outl:
--	spin_unlock(&pchb->downl);
-+	spin_unlock_bh(&pchb->downl);
- out_rcu:
- 	rcu_read_unlock();
- 
-diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
-index b90dccdc2d33cd..27761a884dc627 100644
---- a/drivers/net/vrf.c
-+++ b/drivers/net/vrf.c
-@@ -628,7 +628,9 @@ static void vrf_finish_direct(struct sk_buff *skb)
- 		eth_zero_addr(eth->h_dest);
- 		eth->h_proto = skb->protocol;
- 
-+		rcu_read_lock_bh();
- 		dev_queue_xmit_nit(skb, vrf_dev);
-+		rcu_read_unlock_bh();
- 
- 		skb_pull(skb, ETH_HLEN);
- 	}
-diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c
-index b3499f966a9d6a..a4d56136f42f7e 100644
---- a/drivers/net/wireless/ath/ath11k/dp_rx.c
-+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c
-@@ -2700,7 +2700,7 @@ int ath11k_dp_process_rx(struct ath11k_base *ab, int ring_id,
- 		if (unlikely(push_reason !=
- 			     HAL_REO_DEST_RING_PUSH_REASON_ROUTING_INSTRUCTION)) {
- 			dev_kfree_skb_any(msdu);
--			ab->soc_stats.hal_reo_error[dp->reo_dst_ring[ring_id].ring_id]++;
-+			ab->soc_stats.hal_reo_error[ring_id]++;
- 			continue;
- 		}
- 
-diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.c b/drivers/net/wireless/ath/ath12k/dp_rx.c
-index d9bc07844fb719..70ad035acac755 100644
---- a/drivers/net/wireless/ath/ath12k/dp_rx.c
-+++ b/drivers/net/wireless/ath/ath12k/dp_rx.c
-@@ -2670,7 +2670,7 @@ int ath12k_dp_rx_process(struct ath12k_base *ab, int ring_id,
- 		if (push_reason !=
- 		    HAL_REO_DEST_RING_PUSH_REASON_ROUTING_INSTRUCTION) {
- 			dev_kfree_skb_any(msdu);
--			ab->soc_stats.hal_reo_error[dp->reo_dst_ring[ring_id].ring_id]++;
-+			ab->soc_stats.hal_reo_error[ring_id]++;
- 			continue;
- 		}
- 
-diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
-index 808fb6747a7f78..7791f4df6d4840 100644
---- a/drivers/net/wireless/ath/ath9k/debug.c
-+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1325,11 +1325,11 @@ void ath9k_get_et_stats(struct ieee80211_hw *hw,
- 	struct ath_softc *sc = hw->priv;
- 	int i = 0;
- 
--	data[i++] = (sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_BE)].tx_pkts_all +
-+	data[i++] = ((u64)sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_BE)].tx_pkts_all +
- 		     sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_BK)].tx_pkts_all +
- 		     sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_VI)].tx_pkts_all +
- 		     sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_VO)].tx_pkts_all);
--	data[i++] = (sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_BE)].tx_bytes_all +
-+	data[i++] = ((u64)sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_BE)].tx_bytes_all +
- 		     sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_BK)].tx_bytes_all +
- 		     sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_VI)].tx_bytes_all +
- 		     sc->debug.stats.txstats[PR_QNUM(IEEE80211_AC_VO)].tx_bytes_all);
-diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
-index e5414435b14140..ab728a70ed2796 100644
---- a/drivers/net/wireless/ath/ath9k/hif_usb.c
-+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
-@@ -716,8 +716,7 @@ static void ath9k_hif_usb_rx_cb(struct urb *urb)
- 	}
- 
- resubmit:
--	skb_reset_tail_pointer(skb);
--	skb_trim(skb, 0);
-+	__skb_set_length(skb, 0);
- 
- 	usb_anchor_urb(urb, &hif_dev->rx_submitted);
- 	ret = usb_submit_urb(urb, GFP_ATOMIC);
-@@ -754,8 +753,7 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb)
- 	case -ESHUTDOWN:
- 		goto free_skb;
- 	default:
--		skb_reset_tail_pointer(skb);
--		skb_trim(skb, 0);
-+		__skb_set_length(skb, 0);
- 
- 		goto resubmit;
- 	}
-diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
-index 93078f8cc08c03..af487a2738f826 100644
---- a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
-+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
-@@ -1123,6 +1123,19 @@ struct iwl_umac_scan_abort {
- 	__le32 flags;
- } __packed; /* SCAN_ABORT_CMD_UMAC_API_S_VER_1 */
- 
-+/**
-+ * enum iwl_umac_scan_abort_status
-+ *
-+ * @IWL_UMAC_SCAN_ABORT_STATUS_SUCCESS: scan was successfully aborted
-+ * @IWL_UMAC_SCAN_ABORT_STATUS_IN_PROGRESS: scan abort is in progress
-+ * @IWL_UMAC_SCAN_ABORT_STATUS_NOT_FOUND: nothing to abort
-+ */
-+enum iwl_umac_scan_abort_status {
-+	IWL_UMAC_SCAN_ABORT_STATUS_SUCCESS = 0,
-+	IWL_UMAC_SCAN_ABORT_STATUS_IN_PROGRESS,
-+	IWL_UMAC_SCAN_ABORT_STATUS_NOT_FOUND,
-+};
-+
- /**
-  * struct iwl_umac_scan_complete
-  * @uid: scan id, &enum iwl_umac_scan_uid_offsets
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
-index d2daea3b1f38ad..2d35a8865d00b3 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
-@@ -766,20 +766,10 @@ void iwl_mvm_mac_tx(struct ieee80211_hw *hw,
- 	if (ieee80211_is_mgmt(hdr->frame_control))
- 		sta = NULL;
- 
--	/* If there is no sta, and it's not offchannel - send through AP */
-+	/* this shouldn't even happen: just drop */
- 	if (!sta && info->control.vif->type == NL80211_IFTYPE_STATION &&
--	    !offchannel) {
--		struct iwl_mvm_vif *mvmvif =
--			iwl_mvm_vif_from_mac80211(info->control.vif);
--		u8 ap_sta_id = READ_ONCE(mvmvif->deflink.ap_sta_id);
--
--		if (ap_sta_id < mvm->fw->ucode_capa.num_stations) {
--			/* mac80211 holds rcu read lock */
--			sta = rcu_dereference(mvm->fw_id_to_mac_id[ap_sta_id]);
--			if (IS_ERR_OR_NULL(sta))
--				goto drop;
--		}
--	}
-+	    !offchannel)
-+		goto drop;
- 
- 	if (tmp_sta && !sta && link_id != IEEE80211_LINK_UNSPECIFIED &&
- 	    !ieee80211_is_probe_resp(hdr->frame_control)) {
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c
-index fe4b39b19a6128..7c9234929b4f1b 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c
-@@ -141,7 +141,7 @@ static void iwl_mvm_mld_update_sta_key(struct ieee80211_hw *hw,
- 	if (sta != data->sta || key->link_id >= 0)
- 		return;
- 
--	err = iwl_mvm_send_cmd_pdu(mvm, cmd_id, CMD_ASYNC, sizeof(cmd), &cmd);
-+	err = iwl_mvm_send_cmd_pdu(mvm, cmd_id, 0, sizeof(cmd), &cmd);
- 
- 	if (err)
- 		data->err = err;
-@@ -159,8 +159,8 @@ int iwl_mvm_mld_update_sta_keys(struct iwl_mvm *mvm,
- 		.new_sta_mask = new_sta_mask,
- 	};
- 
--	ieee80211_iter_keys_rcu(mvm->hw, vif, iwl_mvm_mld_update_sta_key,
--				&data);
-+	ieee80211_iter_keys(mvm->hw, vif, iwl_mvm_mld_update_sta_key,
-+			    &data);
- 	return data.err;
- }
- 
-@@ -384,7 +384,7 @@ void iwl_mvm_sec_key_remove_ap(struct iwl_mvm *mvm,
- 	if (!sec_key_ver)
- 		return;
- 
--	ieee80211_iter_keys_rcu(mvm->hw, vif,
--				iwl_mvm_sec_key_remove_ap_iter,
--				(void *)(uintptr_t)link_id);
-+	ieee80211_iter_keys(mvm->hw, vif,
-+			    iwl_mvm_sec_key_remove_ap_iter,
-+			    (void *)(uintptr_t)link_id);
- }
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
-index 626620cd892f00..ded06602f6ced3 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
-@@ -3222,13 +3222,23 @@ void iwl_mvm_rx_umac_scan_iter_complete_notif(struct iwl_mvm *mvm,
- 		       mvm->scan_start);
- }
- 
--static int iwl_mvm_umac_scan_abort(struct iwl_mvm *mvm, int type)
-+static int iwl_mvm_umac_scan_abort(struct iwl_mvm *mvm, int type, bool *wait)
- {
--	struct iwl_umac_scan_abort cmd = {};
-+	struct iwl_umac_scan_abort abort_cmd = {};
-+	struct iwl_host_cmd cmd = {
-+		.id = WIDE_ID(IWL_ALWAYS_LONG_GROUP, SCAN_ABORT_UMAC),
-+		.len = { sizeof(abort_cmd), },
-+		.data = { &abort_cmd, },
-+		.flags = CMD_SEND_IN_RFKILL,
-+	};
-+
- 	int uid, ret;
-+	u32 status = IWL_UMAC_SCAN_ABORT_STATUS_NOT_FOUND;
- 
- 	lockdep_assert_held(&mvm->mutex);
- 
-+	*wait = true;
-+
- 	/* We should always get a valid index here, because we already
- 	 * checked that this type of scan was running in the generic
- 	 * code.
-@@ -3237,17 +3247,28 @@ static int iwl_mvm_umac_scan_abort(struct iwl_mvm *mvm, int type)
- 	if (WARN_ON_ONCE(uid < 0))
- 		return uid;
- 
--	cmd.uid = cpu_to_le32(uid);
-+	abort_cmd.uid = cpu_to_le32(uid);
- 
- 	IWL_DEBUG_SCAN(mvm, "Sending scan abort, uid %u\n", uid);
- 
--	ret = iwl_mvm_send_cmd_pdu(mvm,
--				   WIDE_ID(IWL_ALWAYS_LONG_GROUP, SCAN_ABORT_UMAC),
--				   CMD_SEND_IN_RFKILL, sizeof(cmd), &cmd);
-+	ret = iwl_mvm_send_cmd_status(mvm, &cmd, &status);
-+
-+	IWL_DEBUG_SCAN(mvm, "Scan abort: ret=%d, status=%u\n", ret, status);
- 	if (!ret)
- 		mvm->scan_uid_status[uid] = type << IWL_MVM_SCAN_STOPPING_SHIFT;
- 
--	IWL_DEBUG_SCAN(mvm, "Scan abort: ret=%d\n", ret);
-+	/* Handle the case that the FW is no longer familiar with the scan that
-+	 * is to be stopped. In such a case, it is expected that the scan
-+	 * complete notification was already received but not yet processed.
-+	 * In such a case, there is no need to wait for a scan complete
-+	 * notification and the flow should continue similar to the case that
-+	 * the scan was really aborted.
-+	 */
-+	if (status == IWL_UMAC_SCAN_ABORT_STATUS_NOT_FOUND) {
-+		mvm->scan_uid_status[uid] = type << IWL_MVM_SCAN_STOPPING_SHIFT;
-+		*wait = false;
-+	}
-+
- 	return ret;
- }
- 
-@@ -3257,6 +3278,7 @@ static int iwl_mvm_scan_stop_wait(struct iwl_mvm *mvm, int type)
- 	static const u16 scan_done_notif[] = { SCAN_COMPLETE_UMAC,
- 					      SCAN_OFFLOAD_COMPLETE, };
- 	int ret;
-+	bool wait = true;
- 
- 	lockdep_assert_held(&mvm->mutex);
- 
-@@ -3268,7 +3290,7 @@ static int iwl_mvm_scan_stop_wait(struct iwl_mvm *mvm, int type)
- 	IWL_DEBUG_SCAN(mvm, "Preparing to stop scan, type %x\n", type);
- 
- 	if (fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_UMAC_SCAN))
--		ret = iwl_mvm_umac_scan_abort(mvm, type);
-+		ret = iwl_mvm_umac_scan_abort(mvm, type, &wait);
- 	else
- 		ret = iwl_mvm_lmac_scan_abort(mvm);
- 
-@@ -3276,6 +3298,10 @@ static int iwl_mvm_scan_stop_wait(struct iwl_mvm *mvm, int type)
- 		IWL_DEBUG_SCAN(mvm, "couldn't stop scan type %d\n", type);
- 		iwl_remove_notification(&mvm->notif_wait, &wait_scan_done);
- 		return ret;
-+	} else if (!wait) {
-+		IWL_DEBUG_SCAN(mvm, "no need to wait for scan type %d\n", type);
-+		iwl_remove_notification(&mvm->notif_wait, &wait_scan_done);
-+		return 0;
- 	}
- 
- 	return iwl_wait_notification(&mvm->notif_wait, &wait_scan_done,
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
-index 3adb1acc071918..ce5f2bdde13888 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
-@@ -1145,6 +1145,9 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,
- 	bool is_ampdu = false;
- 	int hdrlen;
- 
-+	if (WARN_ON_ONCE(!sta))
-+		return -1;
-+
- 	mvmsta = iwl_mvm_sta_from_mac80211(sta);
- 	fc = hdr->frame_control;
- 	hdrlen = ieee80211_hdrlen(fc);
-@@ -1152,9 +1155,6 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,
- 	if (IWL_MVM_NON_TRANSMITTING_AP && ieee80211_is_probe_resp(fc))
- 		return -1;
- 
--	if (WARN_ON_ONCE(!mvmsta))
--		return -1;
--
- 	if (WARN_ON_ONCE(mvmsta->deflink.sta_id == IWL_MVM_INVALID_STA))
- 		return -1;
- 
-@@ -1285,7 +1285,7 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,
- int iwl_mvm_tx_skb_sta(struct iwl_mvm *mvm, struct sk_buff *skb,
- 		       struct ieee80211_sta *sta)
- {
--	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
-+	struct iwl_mvm_sta *mvmsta;
- 	struct ieee80211_tx_info info;
- 	struct sk_buff_head mpdus_skbs;
- 	struct ieee80211_vif *vif;
-@@ -1294,9 +1294,11 @@ int iwl_mvm_tx_skb_sta(struct iwl_mvm *mvm, struct sk_buff *skb,
- 	struct sk_buff *orig_skb = skb;
- 	const u8 *addr3;
- 
--	if (WARN_ON_ONCE(!mvmsta))
-+	if (WARN_ON_ONCE(!sta))
- 		return -1;
- 
-+	mvmsta = iwl_mvm_sta_from_mac80211(sta);
-+
- 	if (WARN_ON_ONCE(mvmsta->deflink.sta_id == IWL_MVM_INVALID_STA))
- 		return -1;
- 
-diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
-index 62f3c9a52a1d5c..a3be37526697b4 100644
---- a/drivers/net/wireless/marvell/mwifiex/fw.h
-+++ b/drivers/net/wireless/marvell/mwifiex/fw.h
-@@ -1587,7 +1587,7 @@ struct host_cmd_ds_802_11_scan_rsp {
- 
- struct host_cmd_ds_802_11_scan_ext {
- 	u32   reserved;
--	u8    tlv_buffer[1];
-+	u8    tlv_buffer[];
- } __packed;
- 
- struct mwifiex_ie_types_bss_mode {
-diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c
-index 72904c275461e6..5be817d9854a68 100644
---- a/drivers/net/wireless/marvell/mwifiex/scan.c
-+++ b/drivers/net/wireless/marvell/mwifiex/scan.c
-@@ -2543,8 +2543,7 @@ int mwifiex_ret_802_11_scan_ext(struct mwifiex_private *priv,
- 	ext_scan_resp = &resp->params.ext_scan;
- 
- 	tlv = (void *)ext_scan_resp->tlv_buffer;
--	buf_left = le16_to_cpu(resp->size) - (sizeof(*ext_scan_resp) + S_DS_GEN
--					      - 1);
-+	buf_left = le16_to_cpu(resp->size) - (sizeof(*ext_scan_resp) + S_DS_GEN);
- 
- 	while (buf_left >= sizeof(struct mwifiex_ie_types_header)) {
- 		type = le16_to_cpu(tlv->type);
-diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
-index e6af7318a9e38a..5ff260319282c6 100644
---- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
-+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
-@@ -388,6 +388,7 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
- 	ieee80211_hw_set(hw, SUPPORTS_RX_DECAP_OFFLOAD);
- 	ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);
- 	ieee80211_hw_set(hw, WANT_MONITOR_VIF);
-+	ieee80211_hw_set(hw, SUPPORTS_TX_FRAG);
- 
- 	hw->max_tx_fragments = 4;
- 
-diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
-index 2222fb9aa103ef..38d27f87217336 100644
---- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
-+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
-@@ -1538,12 +1538,14 @@ void mt7915_mac_reset_work(struct work_struct *work)
- 		set_bit(MT76_RESET, &phy2->mt76->state);
- 		cancel_delayed_work_sync(&phy2->mt76->mac_work);
- 	}
-+
-+	mutex_lock(&dev->mt76.mutex);
-+
- 	mt76_worker_disable(&dev->mt76.tx_worker);
- 	mt76_for_each_q_rx(&dev->mt76, i)
- 		napi_disable(&dev->mt76.napi[i]);
- 	napi_disable(&dev->mt76.tx_napi);
- 
--	mutex_lock(&dev->mt76.mutex);
- 
- 	mt76_wr(dev, MT_MCU_INT_EVENT, MT_MCU_INT_EVENT_DMA_STOPPED);
- 
-diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
-index 27655dcb791427..4fd5fd555191a4 100644
---- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
-+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
-@@ -1561,6 +1561,12 @@ mt7915_twt_teardown_request(struct ieee80211_hw *hw,
- 	mutex_unlock(&dev->mt76.mutex);
- }
- 
-+static int
-+mt7915_set_frag_threshold(struct ieee80211_hw *hw, u32 val)
-+{
-+	return 0;
-+}
-+
- static int
- mt7915_set_radar_background(struct ieee80211_hw *hw,
- 			    struct cfg80211_chan_def *chandef)
-@@ -1687,6 +1693,7 @@ const struct ieee80211_ops mt7915_ops = {
- 	.sta_set_decap_offload = mt7915_sta_set_decap_offload,
- 	.add_twt_setup = mt7915_mac_add_twt_setup,
- 	.twt_teardown_request = mt7915_twt_teardown_request,
-+	.set_frag_threshold = mt7915_set_frag_threshold,
- 	CFG80211_TESTMODE_CMD(mt76_testmode_cmd)
- 	CFG80211_TESTMODE_DUMP(mt76_testmode_dump)
- #ifdef CONFIG_MAC80211_DEBUGFS
-diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
-index 272e55ef8e2d29..5fba103bfd65d5 100644
---- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
-+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
-@@ -688,13 +688,17 @@ int mt7915_mcu_add_tx_ba(struct mt7915_dev *dev,
- {
- 	struct mt7915_sta *msta = (struct mt7915_sta *)params->sta->drv_priv;
- 	struct mt7915_vif *mvif = msta->vif;
-+	int ret;
- 
-+	mt76_worker_disable(&dev->mt76.tx_worker);
- 	if (enable && !params->amsdu)
- 		msta->wcid.amsdu = false;
-+	ret = mt76_connac_mcu_sta_ba(&dev->mt76, &mvif->mt76, params,
-+				     MCU_EXT_CMD(STA_REC_UPDATE),
-+				     enable, true);
-+	mt76_worker_enable(&dev->mt76.tx_worker);
- 
--	return mt76_connac_mcu_sta_ba(&dev->mt76, &mvif->mt76, params,
--				      MCU_EXT_CMD(STA_REC_UPDATE),
--				      enable, true);
-+	return ret;
- }
- 
- int mt7915_mcu_add_rx_ba(struct mt7915_dev *dev,
-diff --git a/drivers/net/wireless/realtek/rtw88/Kconfig b/drivers/net/wireless/realtek/rtw88/Kconfig
-index cffad1c012499e..2af2bc613458d4 100644
---- a/drivers/net/wireless/realtek/rtw88/Kconfig
-+++ b/drivers/net/wireless/realtek/rtw88/Kconfig
-@@ -12,6 +12,7 @@ if RTW88
- 
- config RTW88_CORE
- 	tristate
-+	select WANT_DEV_COREDUMP
- 
- config RTW88_PCI
- 	tristate
-diff --git a/drivers/net/wireless/realtek/rtw89/mac80211.c b/drivers/net/wireless/realtek/rtw89/mac80211.c
-index 487d79938bc716..5b9de1f41dc780 100644
---- a/drivers/net/wireless/realtek/rtw89/mac80211.c
-+++ b/drivers/net/wireless/realtek/rtw89/mac80211.c
-@@ -126,7 +126,9 @@ static int rtw89_ops_add_interface(struct ieee80211_hw *hw,
- 	rtwvif->rtwdev = rtwdev;
- 	rtwvif->roc.state = RTW89_ROC_IDLE;
- 	rtwvif->offchan = false;
--	list_add_tail(&rtwvif->list, &rtwdev->rtwvifs_list);
-+	if (!rtw89_rtwvif_in_list(rtwdev, rtwvif))
-+		list_add_tail(&rtwvif->list, &rtwdev->rtwvifs_list);
-+
- 	INIT_WORK(&rtwvif->update_beacon_work, rtw89_core_update_beacon_work);
- 	INIT_DELAYED_WORK(&rtwvif->roc.roc_work, rtw89_roc_work);
- 	rtw89_leave_ps_mode(rtwdev);
-diff --git a/drivers/net/wireless/realtek/rtw89/phy.c b/drivers/net/wireless/realtek/rtw89/phy.c
-index 7139146cb3fad2..fac83b718a30cd 100644
---- a/drivers/net/wireless/realtek/rtw89/phy.c
-+++ b/drivers/net/wireless/realtek/rtw89/phy.c
-@@ -284,8 +284,8 @@ static void rtw89_phy_ra_sta_update(struct rtw89_dev *rtwdev,
- 		csi_mode = RTW89_RA_RPT_MODE_HT;
- 		ra_mask |= ((u64)sta->deflink.ht_cap.mcs.rx_mask[3] << 48) |
- 			   ((u64)sta->deflink.ht_cap.mcs.rx_mask[2] << 36) |
--			   (sta->deflink.ht_cap.mcs.rx_mask[1] << 24) |
--			   (sta->deflink.ht_cap.mcs.rx_mask[0] << 12);
-+			   ((u64)sta->deflink.ht_cap.mcs.rx_mask[1] << 24) |
-+			   ((u64)sta->deflink.ht_cap.mcs.rx_mask[0] << 12);
- 		high_rate_masks = rtw89_ra_mask_ht_rates;
- 		if (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_RX_STBC)
- 			stbc_en = 1;
-diff --git a/drivers/net/wireless/realtek/rtw89/util.h b/drivers/net/wireless/realtek/rtw89/util.h
-index e2ed4565025dda..d4ee9078a4f48c 100644
---- a/drivers/net/wireless/realtek/rtw89/util.h
-+++ b/drivers/net/wireless/realtek/rtw89/util.h
-@@ -14,6 +14,24 @@
- #define rtw89_for_each_rtwvif(rtwdev, rtwvif)				       \
- 	list_for_each_entry(rtwvif, &(rtwdev)->rtwvifs_list, list)
- 
-+/* Before adding rtwvif to list, we need to check if it already exist, beacase
-+ * in some case such as SER L2 happen during WoWLAN flow, calling reconfig
-+ * twice cause the list to be added twice.
-+ */
-+static inline bool rtw89_rtwvif_in_list(struct rtw89_dev *rtwdev,
-+					struct rtw89_vif *new)
-+{
-+	struct rtw89_vif *rtwvif;
-+
-+	lockdep_assert_held(&rtwdev->mutex);
-+
-+	rtw89_for_each_rtwvif(rtwdev, rtwvif)
-+		if (rtwvif == new)
-+			return true;
-+
-+	return false;
-+}
-+
- /* The result of negative dividend and positive divisor is undefined, but it
-  * should be one case of round-down or round-up. So, make it round-down if the
-  * result is round-up.
-diff --git a/drivers/net/wwan/qcom_bam_dmux.c b/drivers/net/wwan/qcom_bam_dmux.c
-index 17d46f4d291390..174a9156b3233d 100644
---- a/drivers/net/wwan/qcom_bam_dmux.c
-+++ b/drivers/net/wwan/qcom_bam_dmux.c
-@@ -823,17 +823,17 @@ static int bam_dmux_probe(struct platform_device *pdev)
- 	ret = devm_request_threaded_irq(dev, pc_ack_irq, NULL, bam_dmux_pc_ack_irq,
- 					IRQF_ONESHOT, NULL, dmux);
- 	if (ret)
--		return ret;
-+		goto err_disable_pm;
- 
- 	ret = devm_request_threaded_irq(dev, dmux->pc_irq, NULL, bam_dmux_pc_irq,
- 					IRQF_ONESHOT, NULL, dmux);
- 	if (ret)
--		return ret;
-+		goto err_disable_pm;
- 
- 	ret = irq_get_irqchip_state(dmux->pc_irq, IRQCHIP_STATE_LINE_LEVEL,
- 				    &dmux->pc_state);
- 	if (ret)
--		return ret;
-+		goto err_disable_pm;
- 
- 	/* Check if remote finished initialization before us */
- 	if (dmux->pc_state) {
-@@ -844,6 +844,11 @@ static int bam_dmux_probe(struct platform_device *pdev)
- 	}
- 
- 	return 0;
-+
-+err_disable_pm:
-+	pm_runtime_disable(dev);
-+	pm_runtime_dont_use_autosuspend(dev);
-+	return ret;
- }
- 
- static int bam_dmux_remove(struct platform_device *pdev)
-diff --git a/drivers/net/xen-netback/hash.c b/drivers/net/xen-netback/hash.c
-index ff96f22648efde..45ddce35f6d2c6 100644
---- a/drivers/net/xen-netback/hash.c
-+++ b/drivers/net/xen-netback/hash.c
-@@ -95,7 +95,7 @@ static u32 xenvif_new_hash(struct xenvif *vif, const u8 *data,
- 
- static void xenvif_flush_hash(struct xenvif *vif)
- {
--	struct xenvif_hash_cache_entry *entry;
-+	struct xenvif_hash_cache_entry *entry, *n;
- 	unsigned long flags;
- 
- 	if (xenvif_hash_cache_size == 0)
-@@ -103,8 +103,7 @@ static void xenvif_flush_hash(struct xenvif *vif)
- 
- 	spin_lock_irqsave(&vif->hash.cache.lock, flags);
- 
--	list_for_each_entry_rcu(entry, &vif->hash.cache.list, link,
--				lockdep_is_held(&vif->hash.cache.lock)) {
-+	list_for_each_entry_safe(entry, n, &vif->hash.cache.list, link) {
- 		list_del_rcu(&entry->link);
- 		vif->hash.cache.count--;
- 		kfree_rcu(entry, rcu);
-diff --git a/drivers/of/address.c b/drivers/of/address.c
-index 3219c51777507a..f323e53816e196 100644
---- a/drivers/of/address.c
-+++ b/drivers/of/address.c
-@@ -8,6 +8,7 @@
- #include <linux/logic_pio.h>
- #include <linux/module.h>
- #include <linux/of_address.h>
-+#include <linux/overflow.h>
- #include <linux/pci.h>
- #include <linux/pci_regs.h>
- #include <linux/sizes.h>
-@@ -1142,7 +1143,11 @@ static int __of_address_to_resource(struct device_node *dev, int index, int bar_
- 	if (of_mmio_is_nonposted(dev))
- 		flags |= IORESOURCE_MEM_NONPOSTED;
- 
-+	if (overflows_type(taddr, r->start))
-+		return -EOVERFLOW;
- 	r->start = taddr;
-+	if (overflows_type(taddr + size - 1, r->end))
-+		return -EOVERFLOW;
- 	r->end = taddr + size - 1;
- 	r->flags = flags;
- 	r->name = name ? name : dev->full_name;
-diff --git a/drivers/of/irq.c b/drivers/of/irq.c
-index 8fd63100ba8f08..36351ad6115eb1 100644
---- a/drivers/of/irq.c
-+++ b/drivers/of/irq.c
-@@ -357,8 +357,8 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_ar
- 	addr = of_get_property(device, "reg", &addr_len);
- 
- 	/* Prevent out-of-bounds read in case of longer interrupt parent address size */
--	if (addr_len > (3 * sizeof(__be32)))
--		addr_len = 3 * sizeof(__be32);
-+	if (addr_len > sizeof(addr_buf))
-+		addr_len = sizeof(addr_buf);
- 	if (addr)
- 		memcpy(addr_buf, addr, addr_len);
- 
-@@ -716,8 +716,7 @@ struct irq_domain *of_msi_map_get_device_domain(struct device *dev, u32 id,
-  * @np: device node for @dev
-  * @token: bus type for this domain
-  *
-- * Parse the msi-parent property (both the simple and the complex
-- * versions), and returns the corresponding MSI domain.
-+ * Parse the msi-parent property and returns the corresponding MSI domain.
-  *
-  * Returns: the MSI domain for this device (or NULL on failure).
-  */
-@@ -725,33 +724,14 @@ struct irq_domain *of_msi_get_domain(struct device *dev,
- 				     struct device_node *np,
- 				     enum irq_domain_bus_token token)
- {
--	struct device_node *msi_np;
-+	struct of_phandle_iterator it;
- 	struct irq_domain *d;
-+	int err;
- 
--	/* Check for a single msi-parent property */
--	msi_np = of_parse_phandle(np, "msi-parent", 0);
--	if (msi_np && !of_property_read_bool(msi_np, "#msi-cells")) {
--		d = irq_find_matching_host(msi_np, token);
--		if (!d)
--			of_node_put(msi_np);
--		return d;
--	}
--
--	if (token == DOMAIN_BUS_PLATFORM_MSI) {
--		/* Check for the complex msi-parent version */
--		struct of_phandle_args args;
--		int index = 0;
--
--		while (!of_parse_phandle_with_args(np, "msi-parent",
--						   "#msi-cells",
--						   index, &args)) {
--			d = irq_find_matching_host(args.np, token);
--			if (d)
--				return d;
--
--			of_node_put(args.np);
--			index++;
--		}
-+	of_for_each_phandle(&it, err, np, "msi-parent", "#msi-cells", 0) {
-+		d = irq_find_matching_host(it.node, token);
-+		if (d)
-+			return d;
- 	}
- 
- 	return NULL;
-diff --git a/drivers/perf/arm_spe_pmu.c b/drivers/perf/arm_spe_pmu.c
-index d2b0cbf0e0c41e..2bec2e3af0bd62 100644
---- a/drivers/perf/arm_spe_pmu.c
-+++ b/drivers/perf/arm_spe_pmu.c
-@@ -41,7 +41,7 @@
- 
- /*
-  * Cache if the event is allowed to trace Context information.
-- * This allows us to perform the check, i.e, perfmon_capable(),
-+ * This allows us to perform the check, i.e, perf_allow_kernel(),
-  * in the context of the event owner, once, during the event_init().
-  */
- #define SPE_PMU_HW_FLAGS_CX			0x00001
-@@ -50,7 +50,7 @@ static_assert((PERF_EVENT_FLAG_ARCH & SPE_PMU_HW_FLAGS_CX) == SPE_PMU_HW_FLAGS_C
- 
- static void set_spe_event_has_cx(struct perf_event *event)
- {
--	if (IS_ENABLED(CONFIG_PID_IN_CONTEXTIDR) && perfmon_capable())
-+	if (IS_ENABLED(CONFIG_PID_IN_CONTEXTIDR) && !perf_allow_kernel(&event->attr))
- 		event->hw.flags |= SPE_PMU_HW_FLAGS_CX;
- }
- 
-@@ -767,9 +767,8 @@ static int arm_spe_pmu_event_init(struct perf_event *event)
- 
- 	set_spe_event_has_cx(event);
- 	reg = arm_spe_event_to_pmscr(event);
--	if (!perfmon_capable() &&
--	    (reg & (PMSCR_EL1_PA | PMSCR_EL1_PCT)))
--		return -EACCES;
-+	if (reg & (PMSCR_EL1_PA | PMSCR_EL1_PCT))
-+		return perf_allow_kernel(&event->attr);
- 
- 	return 0;
- }
-diff --git a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
-index 1accdaaf282c53..9040a3d39924bb 100644
---- a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
-+++ b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
-@@ -316,7 +316,9 @@ static struct pci_dev *_isst_if_get_pci_dev(int cpu, int bus_no, int dev, int fn
- 	    cpu >= nr_cpu_ids || cpu >= num_possible_cpus())
- 		return NULL;
- 
--	pkg_id = topology_physical_package_id(cpu);
-+	pkg_id = topology_logical_package_id(cpu);
-+	if (pkg_id >= topology_max_packages())
-+		return NULL;
- 
- 	bus_number = isst_cpu_info[cpu].bus_info[bus_no];
- 	if (bus_number < 0)
-diff --git a/drivers/platform/x86/lenovo-ymc.c b/drivers/platform/x86/lenovo-ymc.c
-index e1fbc35504d498..ef2c267ab485cd 100644
---- a/drivers/platform/x86/lenovo-ymc.c
-+++ b/drivers/platform/x86/lenovo-ymc.c
-@@ -78,6 +78,8 @@ static void lenovo_ymc_trigger_ec(struct wmi_device *wdev, struct lenovo_ymc_pri
- }
- 
- static const struct key_entry lenovo_ymc_keymap[] = {
-+	/* Ignore the uninitialized state */
-+	{ KE_IGNORE, 0x00 },
- 	/* Laptop */
- 	{ KE_SW, 0x01, { .sw = { SW_TABLET_MODE, 0 } } },
- 	/* Tablet */
-diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c
-index aee869769843f5..2396decdb3cb3f 100644
---- a/drivers/platform/x86/think-lmi.c
-+++ b/drivers/platform/x86/think-lmi.c
-@@ -1021,7 +1021,16 @@ static ssize_t current_value_store(struct kobject *kobj,
- 		 * Note - this sets the variable and then the password as separate
- 		 * WMI calls. Function tlmi_save_bios_settings will error if the
- 		 * password is incorrect.
-+		 * Workstation's require the opcode to be set before changing the
-+		 * attribute.
- 		 */
-+		if (tlmi_priv.pwd_admin->valid && tlmi_priv.pwd_admin->password[0]) {
-+			ret = tlmi_opcode_setting("WmiOpcodePasswordAdmin",
-+						  tlmi_priv.pwd_admin->password);
-+			if (ret)
-+				goto out;
-+		}
-+
- 		set_str = kasprintf(GFP_KERNEL, "%s,%s;", setting->display_name,
- 				    new_setting);
- 		if (!set_str) {
-@@ -1033,13 +1042,6 @@ static ssize_t current_value_store(struct kobject *kobj,
- 		if (ret)
- 			goto out;
- 
--		if (tlmi_priv.pwd_admin->valid && tlmi_priv.pwd_admin->password[0]) {
--			ret = tlmi_opcode_setting("WmiOpcodePasswordAdmin",
--						  tlmi_priv.pwd_admin->password);
--			if (ret)
--				goto out;
--		}
--
- 		ret = tlmi_save_bios_settings("");
- 	} else { /* old non-opcode based authentication method (deprecated) */
- 		if (tlmi_priv.pwd_admin->valid && tlmi_priv.pwd_admin->password[0]) {
-diff --git a/drivers/platform/x86/touchscreen_dmi.c b/drivers/platform/x86/touchscreen_dmi.c
-index 06ebab520f2711..30c05a9948319d 100644
---- a/drivers/platform/x86/touchscreen_dmi.c
-+++ b/drivers/platform/x86/touchscreen_dmi.c
-@@ -885,6 +885,21 @@ static const struct ts_dmi_data rwc_nanote_p8_data = {
- 	.properties = rwc_nanote_p8_props,
- };
- 
-+static const struct property_entry rwc_nanote_next_props[] = {
-+	PROPERTY_ENTRY_U32("touchscreen-min-x", 5),
-+	PROPERTY_ENTRY_U32("touchscreen-min-y", 5),
-+	PROPERTY_ENTRY_U32("touchscreen-size-x", 1785),
-+	PROPERTY_ENTRY_U32("touchscreen-size-y", 1145),
-+	PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
-+	PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-rwc-nanote-next.fw"),
-+	{ }
-+};
-+
-+static const struct ts_dmi_data rwc_nanote_next_data = {
-+	.acpi_name = "MSSL1680:00",
-+	.properties = rwc_nanote_next_props,
-+};
-+
- static const struct property_entry schneider_sct101ctm_props[] = {
- 	PROPERTY_ENTRY_U32("touchscreen-size-x", 1715),
- 	PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),
-@@ -1648,6 +1663,17 @@ const struct dmi_system_id touchscreen_dmi_table[] = {
- 			DMI_MATCH(DMI_PRODUCT_SKU, "0001")
- 		},
- 	},
-+	{
-+		/* RWC NANOTE NEXT */
-+		.driver_data = (void *)&rwc_nanote_next_data,
-+		.matches = {
-+			DMI_MATCH(DMI_PRODUCT_NAME, "To be filled by O.E.M."),
-+			DMI_MATCH(DMI_BOARD_NAME, "To be filled by O.E.M."),
-+			DMI_MATCH(DMI_BOARD_VENDOR, "To be filled by O.E.M."),
-+			/* Above matches are too generic, add bios-version match */
-+			DMI_MATCH(DMI_BIOS_VERSION, "S8A70R100-V005"),
-+		},
-+	},
- 	{
- 		/* Schneider SCT101CTM */
- 		.driver_data = (void *)&schneider_sct101ctm_data,
-diff --git a/drivers/platform/x86/x86-android-tablets/core.c b/drivers/platform/x86/x86-android-tablets/core.c
-index 2fd6060a31bb0b..a0fa0b6859c9ca 100644
---- a/drivers/platform/x86/x86-android-tablets/core.c
-+++ b/drivers/platform/x86/x86-android-tablets/core.c
-@@ -25,6 +25,8 @@
- #include "../../../gpio/gpiolib.h"
- #include "../../../gpio/gpiolib-acpi.h"
- 
-+static struct platform_device *x86_android_tablet_device;
-+
- static int gpiochip_find_match_label(struct gpio_chip *gc, void *data)
- {
- 	return gc->label && !strcmp(gc->label, data);
-@@ -224,7 +226,7 @@ static __init int x86_instantiate_serdev(const struct x86_serdev_info *info, int
- 	return ret;
- }
- 
--static void x86_android_tablet_cleanup(void)
-+static void x86_android_tablet_remove(struct platform_device *pdev)
- {
- 	int i;
- 
-@@ -255,7 +257,7 @@ static void x86_android_tablet_cleanup(void)
- 	software_node_unregister(bat_swnode);
- }
- 
--static __init int x86_android_tablet_init(void)
-+static __init int x86_android_tablet_probe(struct platform_device *pdev)
- {
- 	const struct x86_dev_info *dev_info;
- 	const struct dmi_system_id *id;
-@@ -267,6 +269,8 @@ static __init int x86_android_tablet_init(void)
- 		return -ENODEV;
- 
- 	dev_info = id->driver_data;
-+	/* Allow x86_android_tablet_device use before probe() exits */
-+	x86_android_tablet_device = pdev;
- 
- 	/*
- 	 * The broken DSDTs on these devices often also include broken
-@@ -303,7 +307,7 @@ static __init int x86_android_tablet_init(void)
- 	if (dev_info->init) {
- 		ret = dev_info->init();
- 		if (ret < 0) {
--			x86_android_tablet_cleanup();
-+			x86_android_tablet_remove(pdev);
- 			return ret;
- 		}
- 		exit_handler = dev_info->exit;
-@@ -311,7 +315,7 @@ static __init int x86_android_tablet_init(void)
- 
- 	i2c_clients = kcalloc(dev_info->i2c_client_count, sizeof(*i2c_clients), GFP_KERNEL);
- 	if (!i2c_clients) {
--		x86_android_tablet_cleanup();
-+		x86_android_tablet_remove(pdev);
- 		return -ENOMEM;
- 	}
- 
-@@ -319,7 +323,7 @@ static __init int x86_android_tablet_init(void)
- 	for (i = 0; i < i2c_client_count; i++) {
- 		ret = x86_instantiate_i2c_client(dev_info, i);
- 		if (ret < 0) {
--			x86_android_tablet_cleanup();
-+			x86_android_tablet_remove(pdev);
- 			return ret;
- 		}
- 	}
-@@ -327,7 +331,7 @@ static __init int x86_android_tablet_init(void)
- 	/* + 1 to make space for (optional) gpio_keys_button pdev */
- 	pdevs = kcalloc(dev_info->pdev_count + 1, sizeof(*pdevs), GFP_KERNEL);
- 	if (!pdevs) {
--		x86_android_tablet_cleanup();
-+		x86_android_tablet_remove(pdev);
- 		return -ENOMEM;
- 	}
- 
-@@ -335,14 +339,15 @@ static __init int x86_android_tablet_init(void)
- 	for (i = 0; i < pdev_count; i++) {
- 		pdevs[i] = platform_device_register_full(&dev_info->pdev_info[i]);
- 		if (IS_ERR(pdevs[i])) {
--			x86_android_tablet_cleanup();
--			return PTR_ERR(pdevs[i]);
-+			ret = PTR_ERR(pdevs[i]);
-+			x86_android_tablet_remove(pdev);
-+			return ret;
- 		}
- 	}
- 
- 	serdevs = kcalloc(dev_info->serdev_count, sizeof(*serdevs), GFP_KERNEL);
- 	if (!serdevs) {
--		x86_android_tablet_cleanup();
-+		x86_android_tablet_remove(pdev);
- 		return -ENOMEM;
- 	}
- 
-@@ -350,7 +355,7 @@ static __init int x86_android_tablet_init(void)
- 	for (i = 0; i < serdev_count; i++) {
- 		ret = x86_instantiate_serdev(&dev_info->serdev_info[i], i);
- 		if (ret < 0) {
--			x86_android_tablet_cleanup();
-+			x86_android_tablet_remove(pdev);
- 			return ret;
- 		}
- 	}
-@@ -361,7 +366,7 @@ static __init int x86_android_tablet_init(void)
- 
- 		buttons = kcalloc(dev_info->gpio_button_count, sizeof(*buttons), GFP_KERNEL);
- 		if (!buttons) {
--			x86_android_tablet_cleanup();
-+			x86_android_tablet_remove(pdev);
- 			return -ENOMEM;
- 		}
- 
-@@ -369,7 +374,7 @@ static __init int x86_android_tablet_init(void)
- 			ret = x86_android_tablet_get_gpiod(dev_info->gpio_button[i].chip,
- 							   dev_info->gpio_button[i].pin, &gpiod);
- 			if (ret < 0) {
--				x86_android_tablet_cleanup();
-+				x86_android_tablet_remove(pdev);
- 				return ret;
- 			}
- 
-@@ -384,8 +389,9 @@ static __init int x86_android_tablet_init(void)
- 								  PLATFORM_DEVID_AUTO,
- 								  &pdata, sizeof(pdata));
- 		if (IS_ERR(pdevs[pdev_count])) {
--			x86_android_tablet_cleanup();
--			return PTR_ERR(pdevs[pdev_count]);
-+			ret = PTR_ERR(pdevs[pdev_count]);
-+			x86_android_tablet_remove(pdev);
-+			return ret;
- 		}
- 		pdev_count++;
- 	}
-@@ -393,8 +399,29 @@ static __init int x86_android_tablet_init(void)
- 	return 0;
- }
- 
-+static struct platform_driver x86_android_tablet_driver = {
-+	.driver = {
-+		.name = KBUILD_MODNAME,
-+	},
-+	.remove_new = x86_android_tablet_remove,
-+};
-+
-+static int __init x86_android_tablet_init(void)
-+{
-+	x86_android_tablet_device = platform_create_bundle(&x86_android_tablet_driver,
-+						   x86_android_tablet_probe,
-+						   NULL, 0, NULL, 0);
-+
-+	return PTR_ERR_OR_ZERO(x86_android_tablet_device);
-+}
- module_init(x86_android_tablet_init);
--module_exit(x86_android_tablet_cleanup);
-+
-+static void __exit x86_android_tablet_exit(void)
-+{
-+	platform_device_unregister(x86_android_tablet_device);
-+	platform_driver_unregister(&x86_android_tablet_driver);
-+}
-+module_exit(x86_android_tablet_exit);
- 
- MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
- MODULE_DESCRIPTION("X86 Android tablets DSDT fixups driver");
-diff --git a/drivers/power/reset/brcmstb-reboot.c b/drivers/power/reset/brcmstb-reboot.c
-index 0f2944dc935516..a04713f191a112 100644
---- a/drivers/power/reset/brcmstb-reboot.c
-+++ b/drivers/power/reset/brcmstb-reboot.c
-@@ -62,9 +62,6 @@ static int brcmstb_restart_handler(struct notifier_block *this,
- 		return NOTIFY_DONE;
- 	}
- 
--	while (1)
--		;
--
- 	return NOTIFY_DONE;
- }
- 
-diff --git a/drivers/power/supply/power_supply_hwmon.c b/drivers/power/supply/power_supply_hwmon.c
-index c97893d4c25eb1..6465b5e4a3879c 100644
---- a/drivers/power/supply/power_supply_hwmon.c
-+++ b/drivers/power/supply/power_supply_hwmon.c
-@@ -299,7 +299,8 @@ static const struct hwmon_channel_info * const power_supply_hwmon_info[] = {
- 			   HWMON_T_INPUT     |
- 			   HWMON_T_MAX       |
- 			   HWMON_T_MIN       |
--			   HWMON_T_MIN_ALARM,
-+			   HWMON_T_MIN_ALARM |
-+			   HWMON_T_MAX_ALARM,
- 
- 			   HWMON_T_LABEL     |
- 			   HWMON_T_INPUT     |
-diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c
-index 50e486bcfa1035..5491b1b17ca368 100644
---- a/drivers/remoteproc/ti_k3_r5_remoteproc.c
-+++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c
-@@ -194,6 +194,10 @@ static void k3_r5_rproc_mbox_callback(struct mbox_client *client, void *data)
- 	const char *name = kproc->rproc->name;
- 	u32 msg = omap_mbox_message(data);
- 
-+	/* Do not forward message from a detached core */
-+	if (kproc->rproc->state == RPROC_DETACHED)
-+		return;
-+
- 	dev_dbg(dev, "mbox msg: 0x%x\n", msg);
- 
- 	switch (msg) {
-@@ -229,6 +233,10 @@ static void k3_r5_rproc_kick(struct rproc *rproc, int vqid)
- 	mbox_msg_t msg = (mbox_msg_t)vqid;
- 	int ret;
- 
-+	/* Do not forward message to a detached core */
-+	if (kproc->rproc->state == RPROC_DETACHED)
-+		return;
-+
- 	/* send the index of the triggered virtqueue in the mailbox payload */
- 	ret = mbox_send_message(kproc->mbox, (void *)msg);
- 	if (ret < 0)
-@@ -399,12 +407,9 @@ static int k3_r5_rproc_request_mbox(struct rproc *rproc)
- 	client->knows_txdone = false;
- 
- 	kproc->mbox = mbox_request_channel(client, 0);
--	if (IS_ERR(kproc->mbox)) {
--		ret = -EBUSY;
--		dev_err(dev, "mbox_request_channel failed: %ld\n",
--			PTR_ERR(kproc->mbox));
--		return ret;
--	}
-+	if (IS_ERR(kproc->mbox))
-+		return dev_err_probe(dev, PTR_ERR(kproc->mbox),
-+				     "mbox_request_channel failed\n");
- 
- 	/*
- 	 * Ping the remote processor, this is only for sanity-sake for now;
-@@ -464,8 +469,6 @@ static int k3_r5_rproc_prepare(struct rproc *rproc)
- 			ret);
- 		return ret;
- 	}
--	core->released_from_reset = true;
--	wake_up_interruptible(&cluster->core_transition);
- 
- 	/*
- 	 * Newer IP revisions like on J7200 SoCs support h/w auto-initialization
-@@ -552,10 +555,6 @@ static int k3_r5_rproc_start(struct rproc *rproc)
- 	u32 boot_addr;
- 	int ret;
- 
--	ret = k3_r5_rproc_request_mbox(rproc);
--	if (ret)
--		return ret;
--
- 	boot_addr = rproc->bootaddr;
- 	/* TODO: add boot_addr sanity checking */
- 	dev_dbg(dev, "booting R5F core using boot addr = 0x%x\n", boot_addr);
-@@ -564,7 +563,7 @@ static int k3_r5_rproc_start(struct rproc *rproc)
- 	core = kproc->core;
- 	ret = ti_sci_proc_set_config(core->tsp, boot_addr, 0, 0);
- 	if (ret)
--		goto put_mbox;
-+		return ret;
- 
- 	/* unhalt/run all applicable cores */
- 	if (cluster->mode == CLUSTER_MODE_LOCKSTEP) {
-@@ -580,13 +579,15 @@ static int k3_r5_rproc_start(struct rproc *rproc)
- 		if (core != core0 && core0->rproc->state == RPROC_OFFLINE) {
- 			dev_err(dev, "%s: can not start core 1 before core 0\n",
- 				__func__);
--			ret = -EPERM;
--			goto put_mbox;
-+			return -EPERM;
- 		}
- 
- 		ret = k3_r5_core_run(core);
- 		if (ret)
--			goto put_mbox;
-+			return ret;
-+
-+		core->released_from_reset = true;
-+		wake_up_interruptible(&cluster->core_transition);
- 	}
- 
- 	return 0;
-@@ -596,8 +597,6 @@ static int k3_r5_rproc_start(struct rproc *rproc)
- 		if (k3_r5_core_halt(core))
- 			dev_warn(core->dev, "core halt back failed\n");
- 	}
--put_mbox:
--	mbox_free_channel(kproc->mbox);
- 	return ret;
- }
- 
-@@ -658,8 +657,6 @@ static int k3_r5_rproc_stop(struct rproc *rproc)
- 			goto out;
- 	}
- 
--	mbox_free_channel(kproc->mbox);
--
- 	return 0;
- 
- unroll_core_halt:
-@@ -674,42 +671,22 @@ static int k3_r5_rproc_stop(struct rproc *rproc)
- /*
-  * Attach to a running R5F remote processor (IPC-only mode)
-  *
-- * The R5F attach callback only needs to request the mailbox, the remote
-- * processor is already booted, so there is no need to issue any TI-SCI
-- * commands to boot the R5F cores in IPC-only mode. This callback is invoked
-- * only in IPC-only mode.
-+ * The R5F attach callback is a NOP. The remote processor is already booted, and
-+ * all required resources have been acquired during probe routine, so there is
-+ * no need to issue any TI-SCI commands to boot the R5F cores in IPC-only mode.
-+ * This callback is invoked only in IPC-only mode and exists because
-+ * rproc_validate() checks for its existence.
-  */
--static int k3_r5_rproc_attach(struct rproc *rproc)
--{
--	struct k3_r5_rproc *kproc = rproc->priv;
--	struct device *dev = kproc->dev;
--	int ret;
--
--	ret = k3_r5_rproc_request_mbox(rproc);
--	if (ret)
--		return ret;
--
--	dev_info(dev, "R5F core initialized in IPC-only mode\n");
--	return 0;
--}
-+static int k3_r5_rproc_attach(struct rproc *rproc) { return 0; }
- 
- /*
-  * Detach from a running R5F remote processor (IPC-only mode)
-  *
-- * The R5F detach callback performs the opposite operation to attach callback
-- * and only needs to release the mailbox, the R5F cores are not stopped and
-- * will be left in booted state in IPC-only mode. This callback is invoked
-- * only in IPC-only mode.
-+ * The R5F detach callback is a NOP. The R5F cores are not stopped and will be
-+ * left in booted state in IPC-only mode. This callback is invoked only in
-+ * IPC-only mode and exists for sanity sake.
-  */
--static int k3_r5_rproc_detach(struct rproc *rproc)
--{
--	struct k3_r5_rproc *kproc = rproc->priv;
--	struct device *dev = kproc->dev;
--
--	mbox_free_channel(kproc->mbox);
--	dev_info(dev, "R5F core deinitialized in IPC-only mode\n");
--	return 0;
--}
-+static int k3_r5_rproc_detach(struct rproc *rproc) { return 0; }
- 
- /*
-  * This function implements the .get_loaded_rsc_table() callback and is used
-@@ -1277,6 +1254,10 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
- 		kproc->rproc = rproc;
- 		core->rproc = rproc;
- 
-+		ret = k3_r5_rproc_request_mbox(rproc);
-+		if (ret)
-+			return ret;
-+
- 		ret = k3_r5_rproc_configure_mode(kproc);
- 		if (ret < 0)
- 			goto err_config;
-@@ -1331,7 +1312,7 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
- 			dev_err(dev,
- 				"Timed out waiting for %s core to power up!\n",
- 				rproc->name);
--			return ret;
-+			goto err_powerup;
- 		}
- 	}
- 
-@@ -1347,6 +1328,7 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
- 		}
- 	}
- 
-+err_powerup:
- 	rproc_del(rproc);
- err_add:
- 	k3_r5_reserved_mem_exit(kproc);
-@@ -1394,6 +1376,8 @@ static void k3_r5_cluster_rproc_exit(void *data)
- 			}
- 		}
- 
-+		mbox_free_channel(kproc->mbox);
-+
- 		rproc_del(rproc);
- 
- 		k3_r5_reserved_mem_exit(kproc);
-diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
-index f93bee96e36233..993c0878fb6606 100644
---- a/drivers/rtc/rtc-at91sam9.c
-+++ b/drivers/rtc/rtc-at91sam9.c
-@@ -368,6 +368,7 @@ static int at91_rtc_probe(struct platform_device *pdev)
- 		return ret;
- 
- 	rtc->gpbr = syscon_node_to_regmap(args.np);
-+	of_node_put(args.np);
- 	rtc->gpbr_offset = args.args[0];
- 	if (IS_ERR(rtc->gpbr)) {
- 		dev_err(&pdev->dev, "failed to retrieve gpbr regmap, aborting.\n");
-diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
-index 00e245173320c3..4fcb73b727aa5d 100644
---- a/drivers/scsi/NCR5380.c
-+++ b/drivers/scsi/NCR5380.c
-@@ -1807,8 +1807,11 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
- 				return;
- 			case PHASE_MSGIN:
- 				len = 1;
-+				tmp = 0xff;
- 				data = &tmp;
- 				NCR5380_transfer_pio(instance, &phase, &len, &data, 0);
-+				if (tmp == 0xff)
-+					break;
- 				ncmd->message = tmp;
- 
- 				switch (tmp) {
-@@ -1996,6 +1999,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
- 				break;
- 			case PHASE_STATIN:
- 				len = 1;
-+				tmp = ncmd->status;
- 				data = &tmp;
- 				NCR5380_transfer_pio(instance, &phase, &len, &data, 0);
- 				ncmd->status = tmp;
-diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
-index 7d5a155073c627..9b66fa29fb05ca 100644
---- a/drivers/scsi/aacraid/aacraid.h
-+++ b/drivers/scsi/aacraid/aacraid.h
-@@ -2029,8 +2029,8 @@ struct aac_srb_reply
- };
- 
- struct aac_srb_unit {
--	struct aac_srb		srb;
- 	struct aac_srb_reply	srb_reply;
-+	struct aac_srb		srb;
- };
- 
- /*
-diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
-index 44d3ada9fbbcb1..f67d72160d36ed 100644
---- a/drivers/scsi/lpfc/lpfc_els.c
-+++ b/drivers/scsi/lpfc/lpfc_els.c
-@@ -5228,9 +5228,10 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
- 	/* ACC to LOGO completes to NPort <nlp_DID> */
- 	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
- 			 "0109 ACC to LOGO completes to NPort x%x refcnt %d "
--			 "Data: x%x x%x x%x\n",
--			 ndlp->nlp_DID, kref_read(&ndlp->kref), ndlp->nlp_flag,
--			 ndlp->nlp_state, ndlp->nlp_rpi);
-+			 "last els x%x Data: x%x x%x x%x\n",
-+			 ndlp->nlp_DID, kref_read(&ndlp->kref),
-+			 ndlp->nlp_last_elscmd, ndlp->nlp_flag, ndlp->nlp_state,
-+			 ndlp->nlp_rpi);
- 
- 	/* This clause allows the LOGO ACC to complete and free resources
- 	 * for the Fabric Domain Controller.  It does deliberately skip
-@@ -5242,18 +5243,22 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
- 		goto out;
- 
- 	if (ndlp->nlp_state == NLP_STE_NPR_NODE) {
--		/* If PLOGI is being retried, PLOGI completion will cleanup the
--		 * node. The NLP_NPR_2B_DISC flag needs to be retained to make
--		 * progress on nodes discovered from last RSCN.
--		 */
--		if ((ndlp->nlp_flag & NLP_DELAY_TMO) &&
--		    (ndlp->nlp_last_elscmd == ELS_CMD_PLOGI))
--			goto out;
--
- 		if (ndlp->nlp_flag & NLP_RPI_REGISTERED)
- 			lpfc_unreg_rpi(vport, ndlp);
- 
-+		/* If came from PRLO, then PRLO_ACC is done.
-+		 * Start rediscovery now.
-+		 */
-+		if (ndlp->nlp_last_elscmd == ELS_CMD_PRLO) {
-+			spin_lock_irq(&ndlp->lock);
-+			ndlp->nlp_flag |= NLP_NPR_2B_DISC;
-+			spin_unlock_irq(&ndlp->lock);
-+			ndlp->nlp_prev_state = ndlp->nlp_state;
-+			lpfc_nlp_set_state(vport, ndlp, NLP_STE_PLOGI_ISSUE);
-+			lpfc_issue_els_plogi(vport, ndlp->nlp_DID, 0);
-+		}
- 	}
-+
-  out:
- 	/*
- 	 * The driver received a LOGO from the rport and has ACK'd it.
-diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
-index 3ed211d093dd1e..fe174062e49460 100644
---- a/drivers/scsi/lpfc/lpfc_nportdisc.c
-+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
-@@ -2635,8 +2635,26 @@ lpfc_rcv_prlo_mapped_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
- 	/* flush the target */
- 	lpfc_sli_abort_iocb(vport, ndlp->nlp_sid, 0, LPFC_CTX_TGT);
- 
--	/* Treat like rcv logo */
--	lpfc_rcv_logo(vport, ndlp, cmdiocb, ELS_CMD_PRLO);
-+	/* Send PRLO_ACC */
-+	spin_lock_irq(&ndlp->lock);
-+	ndlp->nlp_flag |= NLP_LOGO_ACC;
-+	spin_unlock_irq(&ndlp->lock);
-+	lpfc_els_rsp_acc(vport, ELS_CMD_PRLO, cmdiocb, ndlp, NULL);
-+
-+	/* Save ELS_CMD_PRLO as the last elscmd and then set to NPR.
-+	 * lpfc_cmpl_els_logo_acc is expected to restart discovery.
-+	 */
-+	ndlp->nlp_last_elscmd = ELS_CMD_PRLO;
-+	ndlp->nlp_prev_state = ndlp->nlp_state;
-+
-+	lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE | LOG_ELS | LOG_DISCOVERY,
-+			 "3422 DID x%06x nflag x%x lastels x%x ref cnt %u\n",
-+			 ndlp->nlp_DID, ndlp->nlp_flag,
-+			 ndlp->nlp_last_elscmd,
-+			 kref_read(&ndlp->kref));
-+
-+	lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
-+
- 	return ndlp->nlp_state;
- }
- 
-diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
-index 443a3176c6c0c9..c2f6151cbd2d02 100644
---- a/drivers/scsi/pm8001/pm8001_init.c
-+++ b/drivers/scsi/pm8001/pm8001_init.c
-@@ -88,10 +88,12 @@ static void pm8001_map_queues(struct Scsi_Host *shost)
- 	struct pm8001_hba_info *pm8001_ha = sha->lldd_ha;
- 	struct blk_mq_queue_map *qmap = &shost->tag_set.map[HCTX_TYPE_DEFAULT];
- 
--	if (pm8001_ha->number_of_intr > 1)
-+	if (pm8001_ha->number_of_intr > 1) {
- 		blk_mq_pci_map_queues(qmap, pm8001_ha->pdev, 1);
-+		return;
-+	}
- 
--	return blk_mq_map_queues(qmap);
-+	blk_mq_map_queues(qmap);
- }
- 
- /*
-diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
-index 2ae64cda8bc9ea..0af2d366c85f94 100644
---- a/drivers/scsi/smartpqi/smartpqi_init.c
-+++ b/drivers/scsi/smartpqi/smartpqi_init.c
-@@ -5918,7 +5918,7 @@ static bool pqi_is_parity_write_stream(struct pqi_ctrl_info *ctrl_info,
- 	int rc;
- 	struct pqi_scsi_dev *device;
- 	struct pqi_stream_data *pqi_stream_data;
--	struct pqi_scsi_dev_raid_map_data rmd;
-+	struct pqi_scsi_dev_raid_map_data rmd = { 0 };
- 
- 	if (!ctrl_info->enable_stream_detection)
- 		return false;
-diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
-index 338aa8c429682c..212a402e753587 100644
---- a/drivers/scsi/st.c
-+++ b/drivers/scsi/st.c
-@@ -835,6 +835,9 @@ static int flush_buffer(struct scsi_tape *STp, int seek_next)
- 	int backspace, result;
- 	struct st_partstat *STps;
- 
-+	if (STp->ready != ST_READY)
-+		return 0;
-+
- 	/*
- 	 * If there was a bus reset, block further access
- 	 * to this device.
-@@ -842,8 +845,6 @@ static int flush_buffer(struct scsi_tape *STp, int seek_next)
- 	if (STp->pos_unknown)
- 		return (-EIO);
- 
--	if (STp->ready != ST_READY)
--		return 0;
- 	STps = &(STp->ps[STp->partition]);
- 	if (STps->rw == ST_WRITING)	/* Writing */
- 		return st_flush_write_buffer(STp);
-diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
-index 2fb8d4e55c7773..ef3a7226db125c 100644
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -466,6 +466,7 @@ static const struct platform_device_id bcm63xx_spi_dev_match[] = {
- 	{
- 	},
- };
-+MODULE_DEVICE_TABLE(platform, bcm63xx_spi_dev_match);
- 
- static const struct of_device_id bcm63xx_spi_of_match[] = {
- 	{ .compatible = "brcm,bcm6348-spi", .data = &bcm6348_spi_reg_offsets },
-@@ -583,13 +584,15 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
- 
- 	bcm_spi_writeb(bs, SPI_INTR_CLEAR_ALL, SPI_INT_STATUS);
- 
--	pm_runtime_enable(&pdev->dev);
-+	ret = devm_pm_runtime_enable(&pdev->dev);
-+	if (ret)
-+		goto out_clk_disable;
- 
- 	/* register and we are done */
- 	ret = devm_spi_register_controller(dev, host);
- 	if (ret) {
- 		dev_err(dev, "spi register failed\n");
--		goto out_pm_disable;
-+		goto out_clk_disable;
- 	}
- 
- 	dev_info(dev, "at %pr (irq %d, FIFOs size %d)\n",
-@@ -597,8 +600,6 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
- 
- 	return 0;
- 
--out_pm_disable:
--	pm_runtime_disable(&pdev->dev);
- out_clk_disable:
- 	clk_disable_unprepare(clk);
- out_err:
-diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c
-index 5cab7caf46586c..81edf0a3ddf843 100644
---- a/drivers/spi/spi-cadence.c
-+++ b/drivers/spi/spi-cadence.c
-@@ -581,31 +581,19 @@ static int cdns_spi_probe(struct platform_device *pdev)
- 		goto remove_ctlr;
- 	}
- 
--	xspi->pclk = devm_clk_get(&pdev->dev, "pclk");
-+	xspi->pclk = devm_clk_get_enabled(&pdev->dev, "pclk");
- 	if (IS_ERR(xspi->pclk)) {
- 		dev_err(&pdev->dev, "pclk clock not found.\n");
- 		ret = PTR_ERR(xspi->pclk);
- 		goto remove_ctlr;
- 	}
- 
--	ret = clk_prepare_enable(xspi->pclk);
--	if (ret) {
--		dev_err(&pdev->dev, "Unable to enable APB clock.\n");
--		goto remove_ctlr;
--	}
--
- 	if (!spi_controller_is_target(ctlr)) {
--		xspi->ref_clk = devm_clk_get(&pdev->dev, "ref_clk");
-+		xspi->ref_clk = devm_clk_get_enabled(&pdev->dev, "ref_clk");
- 		if (IS_ERR(xspi->ref_clk)) {
- 			dev_err(&pdev->dev, "ref_clk clock not found.\n");
- 			ret = PTR_ERR(xspi->ref_clk);
--			goto clk_dis_apb;
--		}
--
--		ret = clk_prepare_enable(xspi->ref_clk);
--		if (ret) {
--			dev_err(&pdev->dev, "Unable to enable device clock.\n");
--			goto clk_dis_apb;
-+			goto remove_ctlr;
- 		}
- 
- 		pm_runtime_use_autosuspend(&pdev->dev);
-@@ -677,12 +665,9 @@ static int cdns_spi_probe(struct platform_device *pdev)
- 
- clk_dis_all:
- 	if (!spi_controller_is_target(ctlr)) {
--		pm_runtime_set_suspended(&pdev->dev);
- 		pm_runtime_disable(&pdev->dev);
--		clk_disable_unprepare(xspi->ref_clk);
-+		pm_runtime_set_suspended(&pdev->dev);
- 	}
--clk_dis_apb:
--	clk_disable_unprepare(xspi->pclk);
- remove_ctlr:
- 	spi_controller_put(ctlr);
- 	return ret;
-@@ -703,10 +688,10 @@ static void cdns_spi_remove(struct platform_device *pdev)
- 
- 	cdns_spi_write(xspi, CDNS_SPI_ER, CDNS_SPI_ER_DISABLE);
- 
--	clk_disable_unprepare(xspi->ref_clk);
--	clk_disable_unprepare(xspi->pclk);
--	pm_runtime_set_suspended(&pdev->dev);
--	pm_runtime_disable(&pdev->dev);
-+	if (!spi_controller_is_target(ctlr)) {
-+		pm_runtime_disable(&pdev->dev);
-+		pm_runtime_set_suspended(&pdev->dev);
-+	}
- 
- 	spi_unregister_controller(ctlr);
- }
-diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
-index 006860ee03ca0d..daa32bde615561 100644
---- a/drivers/spi/spi-imx.c
-+++ b/drivers/spi/spi-imx.c
-@@ -1870,8 +1870,8 @@ static int spi_imx_probe(struct platform_device *pdev)
- 		spi_imx_sdma_exit(spi_imx);
- out_runtime_pm_put:
- 	pm_runtime_dont_use_autosuspend(spi_imx->dev);
--	pm_runtime_set_suspended(&pdev->dev);
- 	pm_runtime_disable(spi_imx->dev);
-+	pm_runtime_set_suspended(&pdev->dev);
- 
- 	clk_disable_unprepare(spi_imx->clk_ipg);
- out_put_per:
-diff --git a/drivers/spi/spi-rpc-if.c b/drivers/spi/spi-rpc-if.c
-index e11146932828a2..7cce2d2ab9ca61 100644
---- a/drivers/spi/spi-rpc-if.c
-+++ b/drivers/spi/spi-rpc-if.c
-@@ -198,9 +198,16 @@ static int __maybe_unused rpcif_spi_resume(struct device *dev)
- 
- static SIMPLE_DEV_PM_OPS(rpcif_spi_pm_ops, rpcif_spi_suspend, rpcif_spi_resume);
- 
-+static const struct platform_device_id rpc_if_spi_id_table[] = {
-+	{ .name = "rpc-if-spi" },
-+	{ /* sentinel */ }
-+};
-+MODULE_DEVICE_TABLE(platform, rpc_if_spi_id_table);
-+
- static struct platform_driver rpcif_spi_driver = {
- 	.probe	= rpcif_spi_probe,
- 	.remove_new = rpcif_spi_remove,
-+	.id_table = rpc_if_spi_id_table,
- 	.driver = {
- 		.name	= "rpc-if-spi",
- #ifdef CONFIG_PM_SLEEP
-diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
-index 652eadbefe24ca..f699ce1b402530 100644
---- a/drivers/spi/spi-s3c64xx.c
-+++ b/drivers/spi/spi-s3c64xx.c
-@@ -239,7 +239,7 @@ static void s3c64xx_flush_fifo(struct s3c64xx_spi_driver_data *sdd)
- 	loops = msecs_to_loops(1);
- 	do {
- 		val = readl(regs + S3C64XX_SPI_STATUS);
--	} while (TX_FIFO_LVL(val, sdd) && loops--);
-+	} while (TX_FIFO_LVL(val, sdd) && --loops);
- 
- 	if (loops == 0)
- 		dev_warn(&sdd->pdev->dev, "Timed out flushing TX FIFO\n");
-@@ -252,7 +252,7 @@ static void s3c64xx_flush_fifo(struct s3c64xx_spi_driver_data *sdd)
- 			readl(regs + S3C64XX_SPI_RX_DATA);
- 		else
- 			break;
--	} while (loops--);
-+	} while (--loops);
- 
- 	if (loops == 0)
- 		dev_warn(&sdd->pdev->dev, "Timed out flushing RX FIFO\n");
-diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
-index 8f17d29ab7e9cc..99813232c25e98 100644
---- a/drivers/vhost/scsi.c
-+++ b/drivers/vhost/scsi.c
-@@ -1018,20 +1018,23 @@ vhost_scsi_get_req(struct vhost_virtqueue *vq, struct vhost_scsi_ctx *vc,
- 		/* virtio-scsi spec requires byte 0 of the lun to be 1 */
- 		vq_err(vq, "Illegal virtio-scsi lun: %u\n", *vc->lunp);
- 	} else {
--		struct vhost_scsi_tpg **vs_tpg, *tpg;
--
--		vs_tpg = vhost_vq_get_backend(vq);	/* validated at handler entry */
--
--		tpg = READ_ONCE(vs_tpg[*vc->target]);
--		if (unlikely(!tpg)) {
--			vq_err(vq, "Target 0x%x does not exist\n", *vc->target);
--		} else {
--			if (tpgp)
--				*tpgp = tpg;
--			ret = 0;
-+		struct vhost_scsi_tpg **vs_tpg, *tpg = NULL;
-+
-+		if (vc->target) {
-+			/* validated at handler entry */
-+			vs_tpg = vhost_vq_get_backend(vq);
-+			tpg = READ_ONCE(vs_tpg[*vc->target]);
-+			if (unlikely(!tpg)) {
-+				vq_err(vq, "Target 0x%x does not exist\n", *vc->target);
-+				goto out;
-+			}
- 		}
--	}
- 
-+		if (tpgp)
-+			*tpgp = tpg;
-+		ret = 0;
-+	}
-+out:
- 	return ret;
- }
- 
-diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
-index f9b4ddd592ce4d..88ac24202a1ff4 100644
---- a/drivers/video/fbdev/efifb.c
-+++ b/drivers/video/fbdev/efifb.c
-@@ -571,15 +571,10 @@ static int efifb_probe(struct platform_device *dev)
- 		break;
- 	}
- 
--	err = sysfs_create_groups(&dev->dev.kobj, efifb_groups);
--	if (err) {
--		pr_err("efifb: cannot add sysfs attrs\n");
--		goto err_unmap;
--	}
- 	err = fb_alloc_cmap(&info->cmap, 256, 0);
- 	if (err < 0) {
- 		pr_err("efifb: cannot allocate colormap\n");
--		goto err_groups;
-+		goto err_unmap;
- 	}
- 
- 	if (efifb_pci_dev)
-@@ -603,8 +598,6 @@ static int efifb_probe(struct platform_device *dev)
- 		pm_runtime_put(&efifb_pci_dev->dev);
- 
- 	fb_dealloc_cmap(&info->cmap);
--err_groups:
--	sysfs_remove_groups(&dev->dev.kobj, efifb_groups);
- err_unmap:
- 	if (mem_flags & (EFI_MEMORY_UC | EFI_MEMORY_WC))
- 		iounmap(info->screen_base);
-@@ -624,12 +617,12 @@ static void efifb_remove(struct platform_device *pdev)
- 
- 	/* efifb_destroy takes care of info cleanup */
- 	unregister_framebuffer(info);
--	sysfs_remove_groups(&pdev->dev.kobj, efifb_groups);
- }
- 
- static struct platform_driver efifb_driver = {
- 	.driver = {
- 		.name = "efi-framebuffer",
-+		.dev_groups = efifb_groups,
- 	},
- 	.probe = efifb_probe,
- 	.remove_new = efifb_remove,
-diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
-index fa943612c4e2b3..3a2427eb29f236 100644
---- a/drivers/video/fbdev/pxafb.c
-+++ b/drivers/video/fbdev/pxafb.c
-@@ -2403,6 +2403,7 @@ static void pxafb_remove(struct platform_device *dev)
- 	info = &fbi->fb;
- 
- 	pxafb_overlay_exit(fbi);
-+	cancel_work_sync(&fbi->task);
- 	unregister_framebuffer(info);
- 
- 	pxafb_disable_controller(fbi);
-diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
-index df223ebf2551cf..a2ba1c7fc16af4 100644
---- a/fs/btrfs/backref.c
-+++ b/fs/btrfs/backref.c
-@@ -3098,10 +3098,14 @@ void btrfs_backref_release_cache(struct btrfs_backref_cache *cache)
- 		btrfs_backref_cleanup_node(cache, node);
- 	}
- 
--	cache->last_trans = 0;
--
--	for (i = 0; i < BTRFS_MAX_LEVEL; i++)
--		ASSERT(list_empty(&cache->pending[i]));
-+	for (i = 0; i < BTRFS_MAX_LEVEL; i++) {
-+		while (!list_empty(&cache->pending[i])) {
-+			node = list_first_entry(&cache->pending[i],
-+						struct btrfs_backref_node,
-+						list);
-+			btrfs_backref_cleanup_node(cache, node);
-+		}
-+	}
- 	ASSERT(list_empty(&cache->pending_edge));
- 	ASSERT(list_empty(&cache->useless_node));
- 	ASSERT(list_empty(&cache->changed));
-diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
-index caedd4460d9941..8ec411eb9c9b0c 100644
---- a/fs/btrfs/disk-io.c
-+++ b/fs/btrfs/disk-io.c
-@@ -4313,6 +4313,17 @@ void __cold close_ctree(struct btrfs_fs_info *fs_info)
- 	/* clear out the rbtree of defraggable inodes */
- 	btrfs_cleanup_defrag_inodes(fs_info);
- 
-+	/*
-+	 * Wait for any fixup workers to complete.
-+	 * If we don't wait for them here and they are still running by the time
-+	 * we call kthread_stop() against the cleaner kthread further below, we
-+	 * get an use-after-free on the cleaner because the fixup worker adds an
-+	 * inode to the list of delayed iputs and then attempts to wakeup the
-+	 * cleaner kthread, which was already stopped and destroyed. We parked
-+	 * already the cleaner, but below we run all pending delayed iputs.
-+	 */
-+	btrfs_flush_workqueue(fs_info->fixup_workers);
-+
- 	/*
- 	 * After we parked the cleaner kthread, ordered extents may have
- 	 * completed and created new delayed iputs. If one of the async reclaim
-diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
-index 4eaac3ae5c3658..299eac696eb426 100644
---- a/fs/btrfs/relocation.c
-+++ b/fs/btrfs/relocation.c
-@@ -235,71 +235,7 @@ static struct btrfs_backref_node *walk_down_backref(
- 	return NULL;
- }
- 
--static void update_backref_node(struct btrfs_backref_cache *cache,
--				struct btrfs_backref_node *node, u64 bytenr)
--{
--	struct rb_node *rb_node;
--	rb_erase(&node->rb_node, &cache->rb_root);
--	node->bytenr = bytenr;
--	rb_node = rb_simple_insert(&cache->rb_root, node->bytenr, &node->rb_node);
--	if (rb_node)
--		btrfs_backref_panic(cache->fs_info, bytenr, -EEXIST);
--}
--
--/*
-- * update backref cache after a transaction commit
-- */
--static int update_backref_cache(struct btrfs_trans_handle *trans,
--				struct btrfs_backref_cache *cache)
--{
--	struct btrfs_backref_node *node;
--	int level = 0;
--
--	if (cache->last_trans == 0) {
--		cache->last_trans = trans->transid;
--		return 0;
--	}
--
--	if (cache->last_trans == trans->transid)
--		return 0;
--
--	/*
--	 * detached nodes are used to avoid unnecessary backref
--	 * lookup. transaction commit changes the extent tree.
--	 * so the detached nodes are no longer useful.
--	 */
--	while (!list_empty(&cache->detached)) {
--		node = list_entry(cache->detached.next,
--				  struct btrfs_backref_node, list);
--		btrfs_backref_cleanup_node(cache, node);
--	}
--
--	while (!list_empty(&cache->changed)) {
--		node = list_entry(cache->changed.next,
--				  struct btrfs_backref_node, list);
--		list_del_init(&node->list);
--		BUG_ON(node->pending);
--		update_backref_node(cache, node, node->new_bytenr);
--	}
--
--	/*
--	 * some nodes can be left in the pending list if there were
--	 * errors during processing the pending nodes.
--	 */
--	for (level = 0; level < BTRFS_MAX_LEVEL; level++) {
--		list_for_each_entry(node, &cache->pending[level], list) {
--			BUG_ON(!node->pending);
--			if (node->bytenr == node->new_bytenr)
--				continue;
--			update_backref_node(cache, node, node->new_bytenr);
--		}
--	}
--
--	cache->last_trans = 0;
--	return 1;
--}
--
--static bool reloc_root_is_dead(struct btrfs_root *root)
-+static bool reloc_root_is_dead(const struct btrfs_root *root)
- {
- 	/*
- 	 * Pair with set_bit/clear_bit in clean_dirty_subvols and
-@@ -320,7 +256,7 @@ static bool reloc_root_is_dead(struct btrfs_root *root)
-  * from no reloc root.  But btrfs_should_ignore_reloc_root() below is a
-  * special case.
-  */
--static bool have_reloc_root(struct btrfs_root *root)
-+static bool have_reloc_root(const struct btrfs_root *root)
- {
- 	if (reloc_root_is_dead(root))
- 		return false;
-@@ -329,31 +265,30 @@ static bool have_reloc_root(struct btrfs_root *root)
- 	return true;
- }
- 
--int btrfs_should_ignore_reloc_root(struct btrfs_root *root)
-+bool btrfs_should_ignore_reloc_root(const struct btrfs_root *root)
- {
- 	struct btrfs_root *reloc_root;
- 
- 	if (!test_bit(BTRFS_ROOT_SHAREABLE, &root->state))
--		return 0;
-+		return false;
- 
- 	/* This root has been merged with its reloc tree, we can ignore it */
- 	if (reloc_root_is_dead(root))
--		return 1;
-+		return true;
- 
- 	reloc_root = root->reloc_root;
- 	if (!reloc_root)
--		return 0;
-+		return false;
- 
- 	if (btrfs_header_generation(reloc_root->commit_root) ==
- 	    root->fs_info->running_transaction->transid)
--		return 0;
-+		return false;
- 	/*
--	 * if there is reloc tree and it was created in previous
--	 * transaction backref lookup can find the reloc tree,
--	 * so backref node for the fs tree root is useless for
--	 * relocation.
-+	 * If there is reloc tree and it was created in previous transaction
-+	 * backref lookup can find the reloc tree, so backref node for the fs
-+	 * tree root is useless for relocation.
- 	 */
--	return 1;
-+	return true;
- }
- 
- /*
-@@ -547,7 +482,7 @@ static noinline_for_stack struct btrfs_backref_node *build_backref_tree(
-  */
- static int clone_backref_node(struct btrfs_trans_handle *trans,
- 			      struct reloc_control *rc,
--			      struct btrfs_root *src,
-+			      const struct btrfs_root *src,
- 			      struct btrfs_root *dest)
- {
- 	struct btrfs_root *reloc_root = src->reloc_root;
-@@ -558,9 +493,6 @@ static int clone_backref_node(struct btrfs_trans_handle *trans,
- 	struct btrfs_backref_edge *new_edge;
- 	struct rb_node *rb_node;
- 
--	if (cache->last_trans > 0)
--		update_backref_cache(trans, cache);
--
- 	rb_node = rb_simple_search(&cache->rb_root, src->commit_root->start);
- 	if (rb_node) {
- 		node = rb_entry(rb_node, struct btrfs_backref_node, rb_node);
-@@ -931,7 +863,7 @@ int btrfs_update_reloc_root(struct btrfs_trans_handle *trans,
- 	btrfs_grab_root(reloc_root);
- 
- 	/* root->reloc_root will stay until current relocation finished */
--	if (fs_info->reloc_ctl->merge_reloc_tree &&
-+	if (fs_info->reloc_ctl && fs_info->reloc_ctl->merge_reloc_tree &&
- 	    btrfs_root_refs(root_item) == 0) {
- 		set_bit(BTRFS_ROOT_DEAD_RELOC_TREE, &root->state);
- 		/*
-@@ -1187,9 +1119,9 @@ int replace_file_extents(struct btrfs_trans_handle *trans,
- 	return ret;
- }
- 
--static noinline_for_stack
--int memcmp_node_keys(struct extent_buffer *eb, int slot,
--		     struct btrfs_path *path, int level)
-+static noinline_for_stack int memcmp_node_keys(const struct extent_buffer *eb,
-+					       int slot, const struct btrfs_path *path,
-+					       int level)
- {
- 	struct btrfs_disk_key key1;
- 	struct btrfs_disk_key key2;
-@@ -1518,8 +1450,8 @@ int walk_down_reloc_tree(struct btrfs_root *root, struct btrfs_path *path,
-  * [min_key, max_key)
-  */
- static int invalidate_extent_cache(struct btrfs_root *root,
--				   struct btrfs_key *min_key,
--				   struct btrfs_key *max_key)
-+				   const struct btrfs_key *min_key,
-+				   const struct btrfs_key *max_key)
- {
- 	struct btrfs_fs_info *fs_info = root->fs_info;
- 	struct inode *inode = NULL;
-@@ -2830,7 +2762,7 @@ int relocate_tree_blocks(struct btrfs_trans_handle *trans,
- 
- static noinline_for_stack int prealloc_file_extent_cluster(
- 				struct btrfs_inode *inode,
--				struct file_extent_cluster *cluster)
-+				const struct file_extent_cluster *cluster)
- {
- 	u64 alloc_hint = 0;
- 	u64 start;
-@@ -2965,7 +2897,7 @@ static noinline_for_stack int setup_relocation_extent_mapping(struct inode *inod
- /*
-  * Allow error injection to test balance/relocation cancellation
-  */
--noinline int btrfs_should_cancel_balance(struct btrfs_fs_info *fs_info)
-+noinline int btrfs_should_cancel_balance(const struct btrfs_fs_info *fs_info)
- {
- 	return atomic_read(&fs_info->balance_cancel_req) ||
- 		atomic_read(&fs_info->reloc_cancel_req) ||
-@@ -2973,7 +2905,7 @@ noinline int btrfs_should_cancel_balance(struct btrfs_fs_info *fs_info)
- }
- ALLOW_ERROR_INJECTION(btrfs_should_cancel_balance, TRUE);
- 
--static u64 get_cluster_boundary_end(struct file_extent_cluster *cluster,
-+static u64 get_cluster_boundary_end(const struct file_extent_cluster *cluster,
- 				    int cluster_nr)
- {
- 	/* Last extent, use cluster end directly */
-@@ -2985,7 +2917,7 @@ static u64 get_cluster_boundary_end(struct file_extent_cluster *cluster,
- }
- 
- static int relocate_one_page(struct inode *inode, struct file_ra_state *ra,
--			     struct file_extent_cluster *cluster,
-+			     const struct file_extent_cluster *cluster,
- 			     int *cluster_nr, unsigned long page_index)
- {
- 	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
-@@ -3120,7 +3052,7 @@ static int relocate_one_page(struct inode *inode, struct file_ra_state *ra,
- }
- 
- static int relocate_file_extent_cluster(struct inode *inode,
--					struct file_extent_cluster *cluster)
-+					const struct file_extent_cluster *cluster)
- {
- 	u64 offset = BTRFS_I(inode)->index_cnt;
- 	unsigned long index;
-@@ -3158,9 +3090,9 @@ static int relocate_file_extent_cluster(struct inode *inode,
- 	return ret;
- }
- 
--static noinline_for_stack
--int relocate_data_extent(struct inode *inode, struct btrfs_key *extent_key,
--			 struct file_extent_cluster *cluster)
-+static noinline_for_stack int relocate_data_extent(struct inode *inode,
-+				const struct btrfs_key *extent_key,
-+				struct file_extent_cluster *cluster)
- {
- 	int ret;
- 
-@@ -3193,7 +3125,7 @@ int relocate_data_extent(struct inode *inode, struct btrfs_key *extent_key,
-  * the major work is getting the generation and level of the block
-  */
- static int add_tree_block(struct reloc_control *rc,
--			  struct btrfs_key *extent_key,
-+			  const struct btrfs_key *extent_key,
- 			  struct btrfs_path *path,
- 			  struct rb_root *blocks)
- {
-@@ -3444,11 +3376,10 @@ static int delete_v1_space_cache(struct extent_buffer *leaf,
- /*
-  * helper to find all tree blocks that reference a given data extent
-  */
--static noinline_for_stack
--int add_data_references(struct reloc_control *rc,
--			struct btrfs_key *extent_key,
--			struct btrfs_path *path,
--			struct rb_root *blocks)
-+static noinline_for_stack int add_data_references(struct reloc_control *rc,
-+						  const struct btrfs_key *extent_key,
-+						  struct btrfs_path *path,
-+						  struct rb_root *blocks)
- {
- 	struct btrfs_backref_walk_ctx ctx = { 0 };
- 	struct ulist_iterator leaf_uiter;
-@@ -3684,11 +3615,9 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
- 			break;
- 		}
- restart:
--		if (update_backref_cache(trans, &rc->backref_cache)) {
--			btrfs_end_transaction(trans);
--			trans = NULL;
--			continue;
--		}
-+		if (rc->backref_cache.last_trans != trans->transid)
-+			btrfs_backref_release_cache(&rc->backref_cache);
-+		rc->backref_cache.last_trans = trans->transid;
- 
- 		ret = find_next_extent(rc, path, &key);
- 		if (ret < 0)
-@@ -3874,9 +3803,9 @@ static void delete_orphan_inode(struct btrfs_trans_handle *trans,
-  * helper to create inode for data relocation.
-  * the inode is in data relocation tree and its link count is 0
-  */
--static noinline_for_stack
--struct inode *create_reloc_inode(struct btrfs_fs_info *fs_info,
--				 struct btrfs_block_group *group)
-+static noinline_for_stack struct inode *create_reloc_inode(
-+					struct btrfs_fs_info *fs_info,
-+					const struct btrfs_block_group *group)
- {
- 	struct inode *inode = NULL;
- 	struct btrfs_trans_handle *trans;
-@@ -4422,7 +4351,8 @@ int btrfs_reloc_clone_csums(struct btrfs_ordered_extent *ordered)
- }
- 
- int btrfs_reloc_cow_block(struct btrfs_trans_handle *trans,
--			  struct btrfs_root *root, struct extent_buffer *buf,
-+			  struct btrfs_root *root,
-+			  const struct extent_buffer *buf,
- 			  struct extent_buffer *cow)
- {
- 	struct btrfs_fs_info *fs_info = root->fs_info;
-@@ -4561,7 +4491,7 @@ int btrfs_reloc_post_snapshot(struct btrfs_trans_handle *trans,
-  *
-  * Return U64_MAX if no running relocation.
-  */
--u64 btrfs_get_reloc_bg_bytenr(struct btrfs_fs_info *fs_info)
-+u64 btrfs_get_reloc_bg_bytenr(const struct btrfs_fs_info *fs_info)
- {
- 	u64 logical = U64_MAX;
- 
-diff --git a/fs/btrfs/relocation.h b/fs/btrfs/relocation.h
-index 77d69f6ae967c2..5fb60f2deb5305 100644
---- a/fs/btrfs/relocation.h
-+++ b/fs/btrfs/relocation.h
-@@ -10,15 +10,16 @@ int btrfs_update_reloc_root(struct btrfs_trans_handle *trans,
- int btrfs_recover_relocation(struct btrfs_fs_info *fs_info);
- int btrfs_reloc_clone_csums(struct btrfs_ordered_extent *ordered);
- int btrfs_reloc_cow_block(struct btrfs_trans_handle *trans,
--			  struct btrfs_root *root, struct extent_buffer *buf,
-+			  struct btrfs_root *root,
-+			  const struct extent_buffer *buf,
- 			  struct extent_buffer *cow);
- void btrfs_reloc_pre_snapshot(struct btrfs_pending_snapshot *pending,
- 			      u64 *bytes_to_reserve);
- int btrfs_reloc_post_snapshot(struct btrfs_trans_handle *trans,
- 			      struct btrfs_pending_snapshot *pending);
--int btrfs_should_cancel_balance(struct btrfs_fs_info *fs_info);
-+int btrfs_should_cancel_balance(const struct btrfs_fs_info *fs_info);
- struct btrfs_root *find_reloc_root(struct btrfs_fs_info *fs_info, u64 bytenr);
--int btrfs_should_ignore_reloc_root(struct btrfs_root *root);
--u64 btrfs_get_reloc_bg_bytenr(struct btrfs_fs_info *fs_info);
-+bool btrfs_should_ignore_reloc_root(const struct btrfs_root *root);
-+u64 btrfs_get_reloc_bg_bytenr(const struct btrfs_fs_info *fs_info);
- 
- #endif
-diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
-index e912d8e411cc4c..aa1e6d88a72c7c 100644
---- a/fs/btrfs/send.c
-+++ b/fs/btrfs/send.c
-@@ -6190,8 +6190,29 @@ static int send_write_or_clone(struct send_ctx *sctx,
- 	if (ret < 0)
- 		return ret;
- 
--	if (clone_root->offset + num_bytes == info.size)
-+	if (clone_root->offset + num_bytes == info.size) {
-+		/*
-+		 * The final size of our file matches the end offset, but it may
-+		 * be that its current size is larger, so we have to truncate it
-+		 * to any value between the start offset of the range and the
-+		 * final i_size, otherwise the clone operation is invalid
-+		 * because it's unaligned and it ends before the current EOF.
-+		 * We do this truncate to the final i_size when we finish
-+		 * processing the inode, but it's too late by then. And here we
-+		 * truncate to the start offset of the range because it's always
-+		 * sector size aligned while if it were the final i_size it
-+		 * would result in dirtying part of a page, filling part of a
-+		 * page with zeroes and then having the clone operation at the
-+		 * receiver trigger IO and wait for it due to the dirty page.
-+		 */
-+		if (sctx->parent_root != NULL) {
-+			ret = send_truncate(sctx, sctx->cur_ino,
-+					    sctx->cur_inode_gen, offset);
-+			if (ret < 0)
-+				return ret;
-+		}
- 		goto clone_data;
-+	}
- 
- write_data:
- 	ret = send_extent_data(sctx, path, offset, num_bytes);
-diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
-index 7bf7a5fcc045f8..594e41582ae9ca 100644
---- a/fs/cachefiles/namei.c
-+++ b/fs/cachefiles/namei.c
-@@ -594,14 +594,12 @@ static bool cachefiles_open_file(struct cachefiles_object *object,
- 	 * write and readdir but not lookup or open).
- 	 */
- 	touch_atime(&file->f_path);
--	dput(dentry);
- 	return true;
- 
- check_failed:
- 	fscache_cookie_lookup_negative(object->cookie);
- 	cachefiles_unmark_inode_in_use(object, file);
- 	fput(file);
--	dput(dentry);
- 	if (ret == -ESTALE)
- 		return cachefiles_create_file(object);
- 	return false;
-@@ -610,7 +608,6 @@ static bool cachefiles_open_file(struct cachefiles_object *object,
- 	fput(file);
- error:
- 	cachefiles_do_unmark_inode_in_use(object, d_inode(dentry));
--	dput(dentry);
- 	return false;
- }
- 
-@@ -653,7 +650,9 @@ bool cachefiles_look_up_object(struct cachefiles_object *object)
- 		goto new_file;
- 	}
- 
--	if (!cachefiles_open_file(object, dentry))
-+	ret = cachefiles_open_file(object, dentry);
-+	dput(dentry);
-+	if (!ret)
- 		return false;
- 
- 	_leave(" = t [%lu]", file_inode(object->file)->i_ino);
-diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
-index da64bb7325dbc0..1a2776025e9861 100644
---- a/fs/ceph/addr.c
-+++ b/fs/ceph/addr.c
-@@ -95,7 +95,6 @@ static bool ceph_dirty_folio(struct address_space *mapping, struct folio *folio)
- 
- 	/* dirty the head */
- 	spin_lock(&ci->i_ceph_lock);
--	BUG_ON(ci->i_wr_ref == 0); // caller should hold Fw reference
- 	if (__ceph_have_pending_cap_snap(ci)) {
- 		struct ceph_cap_snap *capsnap =
- 				list_last_entry(&ci->i_cap_snaps,
-@@ -484,8 +483,11 @@ static int ceph_init_request(struct netfs_io_request *rreq, struct file *file)
- 	rreq->netfs_priv = priv;
- 
- out:
--	if (ret < 0)
-+	if (ret < 0) {
-+		if (got)
-+			ceph_put_cap_refs(ceph_inode(inode), got);
- 		kfree(priv);
-+	}
- 
- 	return ret;
- }
-diff --git a/fs/dax.c b/fs/dax.c
-index 3380b43cb6bbbd..d48b4fc7a4838e 100644
---- a/fs/dax.c
-+++ b/fs/dax.c
-@@ -1305,11 +1305,15 @@ int dax_file_unshare(struct inode *inode, loff_t pos, loff_t len,
- 	struct iomap_iter iter = {
- 		.inode		= inode,
- 		.pos		= pos,
--		.len		= len,
- 		.flags		= IOMAP_WRITE | IOMAP_UNSHARE | IOMAP_DAX,
- 	};
-+	loff_t size = i_size_read(inode);
- 	int ret;
- 
-+	if (pos < 0 || pos >= size)
-+		return 0;
-+
-+	iter.len = min(len, size - pos);
- 	while ((ret = iomap_iter(&iter, ops)) > 0)
- 		iter.processed = dax_unshare_iter(&iter);
- 	return ret;
-diff --git a/fs/exec.c b/fs/exec.c
-index 1cbbef281f8cfe..f49b352a60323a 100644
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -770,7 +770,8 @@ int setup_arg_pages(struct linux_binprm *bprm,
- 	stack_base = calc_max_stack_size(stack_base);
- 
- 	/* Add space for stack randomization. */
--	stack_base += (STACK_RND_MASK << PAGE_SHIFT);
-+	if (current->flags & PF_RANDOMIZE)
-+		stack_base += (STACK_RND_MASK << PAGE_SHIFT);
- 
- 	/* Make sure we didn't let the argument array grow too large. */
- 	if (vma->vm_end - vma->vm_start > stack_base)
-diff --git a/fs/exfat/balloc.c b/fs/exfat/balloc.c
-index e918decb373586..5b547a5963808e 100644
---- a/fs/exfat/balloc.c
-+++ b/fs/exfat/balloc.c
-@@ -110,11 +110,8 @@ int exfat_load_bitmap(struct super_block *sb)
- 				return -EIO;
- 
- 			type = exfat_get_entry_type(ep);
--			if (type == TYPE_UNUSED)
--				break;
--			if (type != TYPE_BITMAP)
--				continue;
--			if (ep->dentry.bitmap.flags == 0x0) {
-+			if (type == TYPE_BITMAP &&
-+			    ep->dentry.bitmap.flags == 0x0) {
- 				int err;
- 
- 				err = exfat_allocate_bitmap(sb, ep);
-@@ -122,6 +119,9 @@ int exfat_load_bitmap(struct super_block *sb)
- 				return err;
- 			}
- 			brelse(bh);
-+
-+			if (type == TYPE_UNUSED)
-+				return -EINVAL;
- 		}
- 
- 		if (exfat_get_next_cluster(sb, &clu.dir))
-diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
-index 3985f8c33f9553..7ea33c3fe94e1c 100644
---- a/fs/ext4/dir.c
-+++ b/fs/ext4/dir.c
-@@ -279,12 +279,20 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)
- 					struct fscrypt_str de_name =
- 							FSTR_INIT(de->name,
- 								de->name_len);
-+					u32 hash;
-+					u32 minor_hash;
-+
-+					if (IS_CASEFOLDED(inode)) {
-+						hash = EXT4_DIRENT_HASH(de);
-+						minor_hash = EXT4_DIRENT_MINOR_HASH(de);
-+					} else {
-+						hash = 0;
-+						minor_hash = 0;
-+					}
- 
- 					/* Directory is encrypted */
- 					err = fscrypt_fname_disk_to_usr(inode,
--						EXT4_DIRENT_HASH(de),
--						EXT4_DIRENT_MINOR_HASH(de),
--						&de_name, &fstr);
-+						hash, minor_hash, &de_name, &fstr);
- 					de_name = fstr;
- 					fstr.len = save_len;
- 					if (err)
-diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
-index 448e0ea49b31d1..1c059ac1c1ef27 100644
---- a/fs/ext4/extents.c
-+++ b/fs/ext4/extents.c
-@@ -957,6 +957,8 @@ ext4_find_extent(struct inode *inode, ext4_lblk_t block,
- 
- 	ext4_ext_show_path(inode, path);
- 
-+	if (orig_path)
-+		*orig_path = path;
- 	return path;
- 
- err:
-@@ -1877,6 +1879,7 @@ static void ext4_ext_try_to_merge_up(handle_t *handle,
- 	path[0].p_hdr->eh_max = cpu_to_le16(max_root);
- 
- 	brelse(path[1].p_bh);
-+	path[1].p_bh = NULL;
- 	ext4_free_blocks(handle, inode, NULL, blk, 1,
- 			 EXT4_FREE_BLOCKS_METADATA | EXT4_FREE_BLOCKS_FORGET);
- }
-@@ -2103,6 +2106,7 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode,
- 				       ppath, newext);
- 	if (err)
- 		goto cleanup;
-+	path = *ppath;
- 	depth = ext_depth(inode);
- 	eh = path[depth].p_hdr;
- 
-@@ -3230,6 +3234,24 @@ static int ext4_split_extent_at(handle_t *handle,
- 	if (err != -ENOSPC && err != -EDQUOT && err != -ENOMEM)
- 		goto out;
- 
-+	/*
-+	 * Update path is required because previous ext4_ext_insert_extent()
-+	 * may have freed or reallocated the path. Using EXT4_EX_NOFAIL
-+	 * guarantees that ext4_find_extent() will not return -ENOMEM,
-+	 * otherwise -ENOMEM will cause a retry in do_writepages(), and a
-+	 * WARN_ON may be triggered in ext4_da_update_reserve_space() due to
-+	 * an incorrect ee_len causing the i_reserved_data_blocks exception.
-+	 */
-+	path = ext4_find_extent(inode, ee_block, ppath,
-+				flags | EXT4_EX_NOFAIL);
-+	if (IS_ERR(path)) {
-+		EXT4_ERROR_INODE(inode, "Failed split extent on %u, err %ld",
-+				 split, PTR_ERR(path));
-+		return PTR_ERR(path);
-+	}
-+	depth = ext_depth(inode);
-+	ex = path[depth].p_ext;
-+
- 	if (EXT4_EXT_MAY_ZEROOUT & split_flag) {
- 		if (split_flag & (EXT4_EXT_DATA_VALID1|EXT4_EXT_DATA_VALID2)) {
- 			if (split_flag & EXT4_EXT_DATA_VALID1) {
-@@ -3282,12 +3304,12 @@ static int ext4_split_extent_at(handle_t *handle,
- 	ext4_ext_dirty(handle, inode, path + path->p_depth);
- 	return err;
- out:
--	ext4_ext_show_leaf(inode, path);
-+	ext4_ext_show_leaf(inode, *ppath);
- 	return err;
- }
- 
- /*
-- * ext4_split_extents() splits an extent and mark extent which is covered
-+ * ext4_split_extent() splits an extent and mark extent which is covered
-  * by @map as split_flags indicates
-  *
-  * It may result in splitting the extent into multiple extents (up to three)
-@@ -3363,7 +3385,7 @@ static int ext4_split_extent(handle_t *handle,
- 			goto out;
- 	}
- 
--	ext4_ext_show_leaf(inode, path);
-+	ext4_ext_show_leaf(inode, *ppath);
- out:
- 	return err ? err : allocated;
- }
-@@ -3828,14 +3850,13 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode,
- 			struct ext4_ext_path **ppath, int flags,
- 			unsigned int allocated, ext4_fsblk_t newblock)
- {
--	struct ext4_ext_path __maybe_unused *path = *ppath;
- 	int ret = 0;
- 	int err = 0;
- 
- 	ext_debug(inode, "logical block %llu, max_blocks %u, flags 0x%x, allocated %u\n",
- 		  (unsigned long long)map->m_lblk, map->m_len, flags,
- 		  allocated);
--	ext4_ext_show_leaf(inode, path);
-+	ext4_ext_show_leaf(inode, *ppath);
- 
- 	/*
- 	 * When writing into unwritten space, we should not fail to
-@@ -3932,7 +3953,7 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode,
- 	if (allocated > map->m_len)
- 		allocated = map->m_len;
- 	map->m_len = allocated;
--	ext4_ext_show_leaf(inode, path);
-+	ext4_ext_show_leaf(inode, *ppath);
- out2:
- 	return err ? err : allocated;
- }
-@@ -5531,6 +5552,7 @@ static int ext4_insert_range(struct file *file, loff_t offset, loff_t len)
- 	path = ext4_find_extent(inode, offset_lblk, NULL, 0);
- 	if (IS_ERR(path)) {
- 		up_write(&EXT4_I(inode)->i_data_sem);
-+		ret = PTR_ERR(path);
- 		goto out_stop;
- 	}
- 
-@@ -5876,7 +5898,7 @@ int ext4_clu_mapped(struct inode *inode, ext4_lblk_t lclu)
- int ext4_ext_replay_update_ex(struct inode *inode, ext4_lblk_t start,
- 			      int len, int unwritten, ext4_fsblk_t pblk)
- {
--	struct ext4_ext_path *path = NULL, *ppath;
-+	struct ext4_ext_path *path;
- 	struct ext4_extent *ex;
- 	int ret;
- 
-@@ -5892,30 +5914,29 @@ int ext4_ext_replay_update_ex(struct inode *inode, ext4_lblk_t start,
- 	if (le32_to_cpu(ex->ee_block) != start ||
- 		ext4_ext_get_actual_len(ex) != len) {
- 		/* We need to split this extent to match our extent first */
--		ppath = path;
- 		down_write(&EXT4_I(inode)->i_data_sem);
--		ret = ext4_force_split_extent_at(NULL, inode, &ppath, start, 1);
-+		ret = ext4_force_split_extent_at(NULL, inode, &path, start, 1);
- 		up_write(&EXT4_I(inode)->i_data_sem);
- 		if (ret)
- 			goto out;
--		kfree(path);
--		path = ext4_find_extent(inode, start, NULL, 0);
-+
-+		path = ext4_find_extent(inode, start, &path, 0);
- 		if (IS_ERR(path))
--			return -1;
--		ppath = path;
-+			return PTR_ERR(path);
- 		ex = path[path->p_depth].p_ext;
- 		WARN_ON(le32_to_cpu(ex->ee_block) != start);
-+
- 		if (ext4_ext_get_actual_len(ex) != len) {
- 			down_write(&EXT4_I(inode)->i_data_sem);
--			ret = ext4_force_split_extent_at(NULL, inode, &ppath,
-+			ret = ext4_force_split_extent_at(NULL, inode, &path,
- 							 start + len, 1);
- 			up_write(&EXT4_I(inode)->i_data_sem);
- 			if (ret)
- 				goto out;
--			kfree(path);
--			path = ext4_find_extent(inode, start, NULL, 0);
-+
-+			path = ext4_find_extent(inode, start, &path, 0);
- 			if (IS_ERR(path))
--				return -EINVAL;
-+				return PTR_ERR(path);
- 			ex = path[path->p_depth].p_ext;
- 		}
- 	}
-diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c
-index f32a91d7c05d90..b527f4ab47e021 100644
---- a/fs/ext4/fast_commit.c
-+++ b/fs/ext4/fast_commit.c
-@@ -339,22 +339,29 @@ void ext4_fc_mark_ineligible(struct super_block *sb, int reason, handle_t *handl
- {
- 	struct ext4_sb_info *sbi = EXT4_SB(sb);
- 	tid_t tid;
-+	bool has_transaction = true;
-+	bool is_ineligible;
- 
- 	if (ext4_fc_disabled(sb))
- 		return;
- 
--	ext4_set_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);
- 	if (handle && !IS_ERR(handle))
- 		tid = handle->h_transaction->t_tid;
- 	else {
- 		read_lock(&sbi->s_journal->j_state_lock);
--		tid = sbi->s_journal->j_running_transaction ?
--				sbi->s_journal->j_running_transaction->t_tid : 0;
-+		if (sbi->s_journal->j_running_transaction)
-+			tid = sbi->s_journal->j_running_transaction->t_tid;
-+		else
-+			has_transaction = false;
- 		read_unlock(&sbi->s_journal->j_state_lock);
- 	}
- 	spin_lock(&sbi->s_fc_lock);
--	if (tid_gt(tid, sbi->s_fc_ineligible_tid))
-+	is_ineligible = ext4_test_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);
-+	if (has_transaction &&
-+	    (!is_ineligible ||
-+	     (is_ineligible && tid_gt(tid, sbi->s_fc_ineligible_tid))))
- 		sbi->s_fc_ineligible_tid = tid;
-+	ext4_set_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);
- 	spin_unlock(&sbi->s_fc_lock);
- 	WARN_ON(reason >= EXT4_FC_REASON_MAX);
- 	sbi->s_fc_stats.fc_ineligible_reason_count[reason]++;
-@@ -372,7 +379,7 @@ void ext4_fc_mark_ineligible(struct super_block *sb, int reason, handle_t *handl
-  */
- static int ext4_fc_track_template(
- 	handle_t *handle, struct inode *inode,
--	int (*__fc_track_fn)(struct inode *, void *, bool),
-+	int (*__fc_track_fn)(handle_t *handle, struct inode *, void *, bool),
- 	void *args, int enqueue)
- {
- 	bool update = false;
-@@ -389,7 +396,7 @@ static int ext4_fc_track_template(
- 		ext4_fc_reset_inode(inode);
- 		ei->i_sync_tid = tid;
- 	}
--	ret = __fc_track_fn(inode, args, update);
-+	ret = __fc_track_fn(handle, inode, args, update);
- 	mutex_unlock(&ei->i_fc_lock);
- 
- 	if (!enqueue)
-@@ -413,7 +420,8 @@ struct __track_dentry_update_args {
- };
- 
- /* __track_fn for directory entry updates. Called with ei->i_fc_lock. */
--static int __track_dentry_update(struct inode *inode, void *arg, bool update)
-+static int __track_dentry_update(handle_t *handle, struct inode *inode,
-+				 void *arg, bool update)
- {
- 	struct ext4_fc_dentry_update *node;
- 	struct ext4_inode_info *ei = EXT4_I(inode);
-@@ -428,14 +436,14 @@ static int __track_dentry_update(struct inode *inode, void *arg, bool update)
- 
- 	if (IS_ENCRYPTED(dir)) {
- 		ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_ENCRYPTED_FILENAME,
--					NULL);
-+					handle);
- 		mutex_lock(&ei->i_fc_lock);
- 		return -EOPNOTSUPP;
- 	}
- 
- 	node = kmem_cache_alloc(ext4_fc_dentry_cachep, GFP_NOFS);
- 	if (!node) {
--		ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_NOMEM, NULL);
-+		ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_NOMEM, handle);
- 		mutex_lock(&ei->i_fc_lock);
- 		return -ENOMEM;
- 	}
-@@ -447,7 +455,7 @@ static int __track_dentry_update(struct inode *inode, void *arg, bool update)
- 		node->fcd_name.name = kmalloc(dentry->d_name.len, GFP_NOFS);
- 		if (!node->fcd_name.name) {
- 			kmem_cache_free(ext4_fc_dentry_cachep, node);
--			ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_NOMEM, NULL);
-+			ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_NOMEM, handle);
- 			mutex_lock(&ei->i_fc_lock);
- 			return -ENOMEM;
- 		}
-@@ -569,7 +577,8 @@ void ext4_fc_track_create(handle_t *handle, struct dentry *dentry)
- }
- 
- /* __track_fn for inode tracking */
--static int __track_inode(struct inode *inode, void *arg, bool update)
-+static int __track_inode(handle_t *handle, struct inode *inode, void *arg,
-+			 bool update)
- {
- 	if (update)
- 		return -EEXIST;
-@@ -607,7 +616,8 @@ struct __track_range_args {
- };
- 
- /* __track_fn for tracking data updates */
--static int __track_range(struct inode *inode, void *arg, bool update)
-+static int __track_range(handle_t *handle, struct inode *inode, void *arg,
-+			 bool update)
- {
- 	struct ext4_inode_info *ei = EXT4_I(inode);
- 	ext4_lblk_t oldstart;
-@@ -1288,8 +1298,21 @@ static void ext4_fc_cleanup(journal_t *journal, int full, tid_t tid)
- 		list_del_init(&iter->i_fc_list);
- 		ext4_clear_inode_state(&iter->vfs_inode,
- 				       EXT4_STATE_FC_COMMITTING);
--		if (tid_geq(tid, iter->i_sync_tid))
-+		if (tid_geq(tid, iter->i_sync_tid)) {
- 			ext4_fc_reset_inode(&iter->vfs_inode);
-+		} else if (full) {
-+			/*
-+			 * We are called after a full commit, inode has been
-+			 * modified while the commit was running. Re-enqueue
-+			 * the inode into STAGING, which will then be splice
-+			 * back into MAIN. This cannot happen during
-+			 * fastcommit because the journal is locked all the
-+			 * time in that case (and tid doesn't increase so
-+			 * tid check above isn't reliable).
-+			 */
-+			list_add_tail(&EXT4_I(&iter->vfs_inode)->i_fc_list,
-+				      &sbi->s_fc_q[FC_Q_STAGING]);
-+		}
- 		/* Make sure EXT4_STATE_FC_COMMITTING bit is clear */
- 		smp_mb();
- #if (BITS_PER_LONG < 64)
-diff --git a/fs/ext4/file.c b/fs/ext4/file.c
-index 6aa15dafc67786..c71af675e310af 100644
---- a/fs/ext4/file.c
-+++ b/fs/ext4/file.c
-@@ -334,10 +334,10 @@ static ssize_t ext4_handle_inode_extension(struct inode *inode, loff_t offset,
-  * Clean up the inode after DIO or DAX extending write has completed and the
-  * inode size has been updated using ext4_handle_inode_extension().
-  */
--static void ext4_inode_extension_cleanup(struct inode *inode, ssize_t count)
-+static void ext4_inode_extension_cleanup(struct inode *inode, bool need_trunc)
- {
- 	lockdep_assert_held_write(&inode->i_rwsem);
--	if (count < 0) {
-+	if (need_trunc) {
- 		ext4_truncate_failed_write(inode);
- 		/*
- 		 * If the truncate operation failed early, then the inode may
-@@ -586,7 +586,7 @@ static ssize_t ext4_dio_write_iter(struct kiocb *iocb, struct iov_iter *from)
- 		 * writeback of delalloc blocks.
- 		 */
- 		WARN_ON_ONCE(ret == -EIOCBQUEUED);
--		ext4_inode_extension_cleanup(inode, ret);
-+		ext4_inode_extension_cleanup(inode, ret < 0);
- 	}
- 
- out:
-@@ -670,7 +670,7 @@ ext4_dax_write_iter(struct kiocb *iocb, struct iov_iter *from)
- 
- 	if (extend) {
- 		ret = ext4_handle_inode_extension(inode, offset, ret);
--		ext4_inode_extension_cleanup(inode, ret);
-+		ext4_inode_extension_cleanup(inode, ret < (ssize_t)count);
- 	}
- out:
- 	inode_unlock(inode);
-diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
-index a4ffd1acac6514..14f7098bcefe1c 100644
---- a/fs/ext4/inode.c
-+++ b/fs/ext4/inode.c
-@@ -5257,8 +5257,9 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode)
- {
- 	unsigned offset;
- 	journal_t *journal = EXT4_SB(inode->i_sb)->s_journal;
--	tid_t commit_tid = 0;
-+	tid_t commit_tid;
- 	int ret;
-+	bool has_transaction;
- 
- 	offset = inode->i_size & (PAGE_SIZE - 1);
- 	/*
-@@ -5283,12 +5284,14 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode)
- 		folio_put(folio);
- 		if (ret != -EBUSY)
- 			return;
--		commit_tid = 0;
-+		has_transaction = false;
- 		read_lock(&journal->j_state_lock);
--		if (journal->j_committing_transaction)
-+		if (journal->j_committing_transaction) {
- 			commit_tid = journal->j_committing_transaction->t_tid;
-+			has_transaction = true;
-+		}
- 		read_unlock(&journal->j_state_lock);
--		if (commit_tid)
-+		if (has_transaction)
- 			jbd2_log_wait_commit(journal, commit_tid);
- 	}
- }
-diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c
-index d98ac2af8199f1..a5e1492bbaaa56 100644
---- a/fs/ext4/migrate.c
-+++ b/fs/ext4/migrate.c
-@@ -663,8 +663,8 @@ int ext4_ind_migrate(struct inode *inode)
- 	if (unlikely(ret2 && !ret))
- 		ret = ret2;
- errout:
--	ext4_journal_stop(handle);
- 	up_write(&EXT4_I(inode)->i_data_sem);
-+	ext4_journal_stop(handle);
- out_unlock:
- 	ext4_writepages_up_write(inode->i_sb, alloc_ctx);
- 	return ret;
-diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
-index e6976716e85d4d..0bfd5ff103aa44 100644
---- a/fs/ext4/move_extent.c
-+++ b/fs/ext4/move_extent.c
-@@ -36,7 +36,6 @@ get_ext_path(struct inode *inode, ext4_lblk_t lblock,
- 		*ppath = NULL;
- 		return -ENODATA;
- 	}
--	*ppath = path;
- 	return 0;
- }
- 
-diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
-index 3bd2301cb48e7e..4de1f61bba76b3 100644
---- a/fs/ext4/namei.c
-+++ b/fs/ext4/namei.c
-@@ -1526,7 +1526,7 @@ static bool ext4_match(struct inode *parent,
- }
- 
- /*
-- * Returns 0 if not found, -1 on failure, and 1 on success
-+ * Returns 0 if not found, -EFSCORRUPTED on failure, and 1 on success
-  */
- int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size,
- 		    struct inode *dir, struct ext4_filename *fname,
-@@ -1547,7 +1547,7 @@ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size,
- 			 * a full check */
- 			if (ext4_check_dir_entry(dir, NULL, de, bh, search_buf,
- 						 buf_size, offset))
--				return -1;
-+				return -EFSCORRUPTED;
- 			*res_dir = de;
- 			return 1;
- 		}
-@@ -1555,7 +1555,7 @@ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size,
- 		de_len = ext4_rec_len_from_disk(de->rec_len,
- 						dir->i_sb->s_blocksize);
- 		if (de_len <= 0)
--			return -1;
-+			return -EFSCORRUPTED;
- 		offset += de_len;
- 		de = (struct ext4_dir_entry_2 *) ((char *) de + de_len);
- 	}
-@@ -1707,8 +1707,10 @@ static struct buffer_head *__ext4_find_entry(struct inode *dir,
- 			goto cleanup_and_exit;
- 		} else {
- 			brelse(bh);
--			if (i < 0)
-+			if (i < 0) {
-+				ret = ERR_PTR(i);
- 				goto cleanup_and_exit;
-+			}
- 		}
- 	next:
- 		if (++block >= nblocks)
-@@ -1803,7 +1805,7 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir,
- 		if (retval == 1)
- 			goto success;
- 		brelse(bh);
--		if (retval == -1) {
-+		if (retval < 0) {
- 			bh = ERR_PTR(ERR_BAD_DX_DIR);
- 			goto errout;
- 		}
-@@ -2045,7 +2047,7 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
- 		split = count/2;
- 
- 	hash2 = map[split].hash;
--	continued = hash2 == map[split - 1].hash;
-+	continued = split > 0 ? hash2 == map[split - 1].hash : 0;
- 	dxtrace(printk(KERN_INFO "Split block %lu at %x, %i/%i\n",
- 			(unsigned long)dx_get_block(frame->at),
- 					hash2, split, count-split));
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 46c4f750497918..ed0dc4cc1d28e9 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -5658,8 +5658,8 @@ failed_mount8: __maybe_unused
- failed_mount3:
- 	/* flush s_sb_upd_work before sbi destroy */
- 	flush_work(&sbi->s_sb_upd_work);
--	del_timer_sync(&sbi->s_err_report);
- 	ext4_stop_mmpd(sbi);
-+	del_timer_sync(&sbi->s_err_report);
- 	ext4_group_desc_free(sbi);
- failed_mount:
- 	if (sbi->s_chksum_driver)
-diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
-index c368ff671d7739..04ca085b282794 100644
---- a/fs/ext4/xattr.c
-+++ b/fs/ext4/xattr.c
-@@ -2554,6 +2554,8 @@ ext4_xattr_set(struct inode *inode, int name_index, const char *name,
- 
- 		error = ext4_xattr_set_handle(handle, inode, name_index, name,
- 					      value, value_len, flags);
-+		ext4_fc_mark_ineligible(inode->i_sb, EXT4_FC_REASON_XATTR,
-+					handle);
- 		error2 = ext4_journal_stop(handle);
- 		if (error == -ENOSPC &&
- 		    ext4_should_retry_alloc(sb, &retries))
-@@ -2561,7 +2563,6 @@ ext4_xattr_set(struct inode *inode, int name_index, const char *name,
- 		if (error == 0)
- 			error = error2;
- 	}
--	ext4_fc_mark_ineligible(inode->i_sb, EXT4_FC_REASON_XATTR, NULL);
- 
- 	return error;
- }
-diff --git a/fs/file.c b/fs/file.c
-index ca984655a187fd..bd817e31d79866 100644
---- a/fs/file.c
-+++ b/fs/file.c
-@@ -267,59 +267,45 @@ static inline void __clear_open_fd(unsigned int fd, struct fdtable *fdt)
- 	__clear_bit(fd / BITS_PER_LONG, fdt->full_fds_bits);
- }
- 
--static unsigned int count_open_files(struct fdtable *fdt)
--{
--	unsigned int size = fdt->max_fds;
--	unsigned int i;
--
--	/* Find the last open fd */
--	for (i = size / BITS_PER_LONG; i > 0; ) {
--		if (fdt->open_fds[--i])
--			break;
--	}
--	i = (i + 1) * BITS_PER_LONG;
--	return i;
--}
--
- /*
-  * Note that a sane fdtable size always has to be a multiple of
-  * BITS_PER_LONG, since we have bitmaps that are sized by this.
-  *
-- * 'max_fds' will normally already be properly aligned, but it
-- * turns out that in the close_range() -> __close_range() ->
-- * unshare_fd() -> dup_fd() -> sane_fdtable_size() we can end
-- * up having a 'max_fds' value that isn't already aligned.
-- *
-- * Rather than make close_range() have to worry about this,
-- * just make that BITS_PER_LONG alignment be part of a sane
-- * fdtable size. Becuase that's really what it is.
-+ * punch_hole is optional - when close_range() is asked to unshare
-+ * and close, we don't need to copy descriptors in that range, so
-+ * a smaller cloned descriptor table might suffice if the last
-+ * currently opened descriptor falls into that range.
-  */
--static unsigned int sane_fdtable_size(struct fdtable *fdt, unsigned int max_fds)
-+static unsigned int sane_fdtable_size(struct fdtable *fdt, struct fd_range *punch_hole)
- {
--	unsigned int count;
--
--	count = count_open_files(fdt);
--	if (max_fds < NR_OPEN_DEFAULT)
--		max_fds = NR_OPEN_DEFAULT;
--	return ALIGN(min(count, max_fds), BITS_PER_LONG);
-+	unsigned int last = find_last_bit(fdt->open_fds, fdt->max_fds);
-+
-+	if (last == fdt->max_fds)
-+		return NR_OPEN_DEFAULT;
-+	if (punch_hole && punch_hole->to >= last && punch_hole->from <= last) {
-+		last = find_last_bit(fdt->open_fds, punch_hole->from);
-+		if (last == punch_hole->from)
-+			return NR_OPEN_DEFAULT;
-+	}
-+	return ALIGN(last + 1, BITS_PER_LONG);
- }
- 
- /*
-- * Allocate a new files structure and copy contents from the
-- * passed in files structure.
-- * errorp will be valid only when the returned files_struct is NULL.
-+ * Allocate a new descriptor table and copy contents from the passed in
-+ * instance.  Returns a pointer to cloned table on success, ERR_PTR()
-+ * on failure.  For 'punch_hole' see sane_fdtable_size().
-  */
--struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int *errorp)
-+struct files_struct *dup_fd(struct files_struct *oldf, struct fd_range *punch_hole)
- {
- 	struct files_struct *newf;
- 	struct file **old_fds, **new_fds;
- 	unsigned int open_files, i;
- 	struct fdtable *old_fdt, *new_fdt;
-+	int error;
- 
--	*errorp = -ENOMEM;
- 	newf = kmem_cache_alloc(files_cachep, GFP_KERNEL);
- 	if (!newf)
--		goto out;
-+		return ERR_PTR(-ENOMEM);
- 
- 	atomic_set(&newf->count, 1);
- 
-@@ -336,7 +322,7 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int
- 
- 	spin_lock(&oldf->file_lock);
- 	old_fdt = files_fdtable(oldf);
--	open_files = sane_fdtable_size(old_fdt, max_fds);
-+	open_files = sane_fdtable_size(old_fdt, punch_hole);
- 
- 	/*
- 	 * Check whether we need to allocate a larger fd array and fd set.
-@@ -349,14 +335,14 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int
- 
- 		new_fdt = alloc_fdtable(open_files - 1);
- 		if (!new_fdt) {
--			*errorp = -ENOMEM;
-+			error = -ENOMEM;
- 			goto out_release;
- 		}
- 
- 		/* beyond sysctl_nr_open; nothing to do */
- 		if (unlikely(new_fdt->max_fds < open_files)) {
- 			__free_fdtable(new_fdt);
--			*errorp = -EMFILE;
-+			error = -EMFILE;
- 			goto out_release;
- 		}
- 
-@@ -367,7 +353,7 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int
- 		 */
- 		spin_lock(&oldf->file_lock);
- 		old_fdt = files_fdtable(oldf);
--		open_files = sane_fdtable_size(old_fdt, max_fds);
-+		open_files = sane_fdtable_size(old_fdt, punch_hole);
- 	}
- 
- 	copy_fd_bitmaps(new_fdt, old_fdt, open_files / BITS_PER_LONG);
-@@ -401,8 +387,7 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int
- 
- out_release:
- 	kmem_cache_free(files_cachep, newf);
--out:
--	return NULL;
-+	return ERR_PTR(error);
- }
- 
- static struct fdtable *close_files(struct files_struct * files)
-@@ -736,37 +721,25 @@ int __close_range(unsigned fd, unsigned max_fd, unsigned int flags)
- 	if (fd > max_fd)
- 		return -EINVAL;
- 
--	if (flags & CLOSE_RANGE_UNSHARE) {
--		int ret;
--		unsigned int max_unshare_fds = NR_OPEN_MAX;
-+	if ((flags & CLOSE_RANGE_UNSHARE) && atomic_read(&cur_fds->count) > 1) {
-+		struct fd_range range = {fd, max_fd}, *punch_hole = &range;
- 
- 		/*
- 		 * If the caller requested all fds to be made cloexec we always
- 		 * copy all of the file descriptors since they still want to
- 		 * use them.
- 		 */
--		if (!(flags & CLOSE_RANGE_CLOEXEC)) {
--			/*
--			 * If the requested range is greater than the current
--			 * maximum, we're closing everything so only copy all
--			 * file descriptors beneath the lowest file descriptor.
--			 */
--			rcu_read_lock();
--			if (max_fd >= last_fd(files_fdtable(cur_fds)))
--				max_unshare_fds = fd;
--			rcu_read_unlock();
--		}
--
--		ret = unshare_fd(CLONE_FILES, max_unshare_fds, &fds);
--		if (ret)
--			return ret;
-+		if (flags & CLOSE_RANGE_CLOEXEC)
-+			punch_hole = NULL;
- 
-+		fds = dup_fd(cur_fds, punch_hole);
-+		if (IS_ERR(fds))
-+			return PTR_ERR(fds);
- 		/*
- 		 * We used to share our file descriptor table, and have now
- 		 * created a private one, make sure we're using it below.
- 		 */
--		if (fds)
--			swap(cur_fds, fds);
-+		swap(cur_fds, fds);
- 	}
- 
- 	if (flags & CLOSE_RANGE_CLOEXEC)
-diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
-index 975fd88c1f0f4a..aedaad4c37d757 100644
---- a/fs/iomap/buffered-io.c
-+++ b/fs/iomap/buffered-io.c
-@@ -1177,7 +1177,15 @@ static int iomap_write_delalloc_release(struct inode *inode,
- 			error = data_end;
- 			goto out_unlock;
- 		}
--		WARN_ON_ONCE(data_end <= start_byte);
-+
-+		/*
-+		 * If we race with post-direct I/O invalidation of the page cache,
-+		 * there might be no data left at start_byte.
-+		 */
-+		if (data_end == start_byte)
-+			continue;
-+
-+		WARN_ON_ONCE(data_end < start_byte);
- 		WARN_ON_ONCE(data_end > scan_end_byte);
- 
- 		error = iomap_write_delalloc_scan(inode, &punch_start_byte,
-@@ -1316,11 +1324,15 @@ iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len,
- 	struct iomap_iter iter = {
- 		.inode		= inode,
- 		.pos		= pos,
--		.len		= len,
- 		.flags		= IOMAP_WRITE | IOMAP_UNSHARE,
- 	};
-+	loff_t size = i_size_read(inode);
- 	int ret;
- 
-+	if (pos < 0 || pos >= size)
-+		return 0;
-+
-+	iter.len = min(len, size - pos);
- 	while ((ret = iomap_iter(&iter, ops)) > 0)
- 		iter.processed = iomap_unshare_iter(&iter);
- 	return ret;
-diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
-index 118699fff2f900..8fda66c98a610f 100644
---- a/fs/jbd2/checkpoint.c
-+++ b/fs/jbd2/checkpoint.c
-@@ -79,17 +79,23 @@ __releases(&journal->j_state_lock)
- 		if (space_left < nblocks) {
- 			int chkpt = journal->j_checkpoint_transactions != NULL;
- 			tid_t tid = 0;
-+			bool has_transaction = false;
- 
--			if (journal->j_committing_transaction)
-+			if (journal->j_committing_transaction) {
- 				tid = journal->j_committing_transaction->t_tid;
-+				has_transaction = true;
-+			}
- 			spin_unlock(&journal->j_list_lock);
- 			write_unlock(&journal->j_state_lock);
- 			if (chkpt) {
- 				jbd2_log_do_checkpoint(journal);
--			} else if (jbd2_cleanup_journal_tail(journal) == 0) {
--				/* We were able to recover space; yay! */
-+			} else if (jbd2_cleanup_journal_tail(journal) <= 0) {
-+				/*
-+				 * We were able to recover space or the
-+				 * journal was aborted due to an error.
-+				 */
- 				;
--			} else if (tid) {
-+			} else if (has_transaction) {
- 				/*
- 				 * jbd2_journal_commit_transaction() may want
- 				 * to take the checkpoint_mutex if JBD2_FLUSHED
-@@ -409,6 +415,7 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
- 	tid_t tid = 0;
- 	unsigned long nr_freed = 0;
- 	unsigned long freed;
-+	bool first_set = false;
- 
- again:
- 	spin_lock(&journal->j_list_lock);
-@@ -428,8 +435,10 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
- 	else
- 		transaction = journal->j_checkpoint_transactions;
- 
--	if (!first_tid)
-+	if (!first_set) {
- 		first_tid = transaction->t_tid;
-+		first_set = true;
-+	}
- 	last_transaction = journal->j_checkpoint_transactions->t_cpprev;
- 	next_transaction = transaction;
- 	last_tid = last_transaction->t_tid;
-@@ -459,7 +468,7 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
- 	spin_unlock(&journal->j_list_lock);
- 	cond_resched();
- 
--	if (*nr_to_scan && next_tid)
-+	if (*nr_to_scan && journal->j_shrink_transaction)
- 		goto again;
- out:
- 	trace_jbd2_shrink_checkpoint_list(journal, first_tid, tid, last_tid,
-diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
-index 57264eb4d9da37..dfbb8f73861f64 100644
---- a/fs/jbd2/journal.c
-+++ b/fs/jbd2/journal.c
-@@ -725,7 +725,7 @@ int jbd2_fc_begin_commit(journal_t *journal, tid_t tid)
- 		return -EINVAL;
- 
- 	write_lock(&journal->j_state_lock);
--	if (tid <= journal->j_commit_sequence) {
-+	if (tid_geq(journal->j_commit_sequence, tid)) {
- 		write_unlock(&journal->j_state_lock);
- 		return -EALREADY;
- 	}
-@@ -755,9 +755,9 @@ EXPORT_SYMBOL(jbd2_fc_begin_commit);
-  */
- static int __jbd2_fc_end_commit(journal_t *journal, tid_t tid, bool fallback)
- {
--	jbd2_journal_unlock_updates(journal);
- 	if (journal->j_fc_cleanup_callback)
- 		journal->j_fc_cleanup_callback(journal, 0, tid);
-+	jbd2_journal_unlock_updates(journal);
- 	write_lock(&journal->j_state_lock);
- 	journal->j_flags &= ~JBD2_FAST_COMMIT_ONGOING;
- 	if (fallback)
-diff --git a/fs/jfs/jfs_discard.c b/fs/jfs/jfs_discard.c
-index 575cb2ba74fc86..5f4b305030ad5e 100644
---- a/fs/jfs/jfs_discard.c
-+++ b/fs/jfs/jfs_discard.c
-@@ -65,7 +65,7 @@ void jfs_issue_discard(struct inode *ip, u64 blkno, u64 nblocks)
- int jfs_ioc_trim(struct inode *ip, struct fstrim_range *range)
- {
- 	struct inode *ipbmap = JFS_SBI(ip->i_sb)->ipbmap;
--	struct bmap *bmp = JFS_SBI(ip->i_sb)->bmap;
-+	struct bmap *bmp;
- 	struct super_block *sb = ipbmap->i_sb;
- 	int agno, agno_end;
- 	u64 start, end, minlen;
-@@ -83,10 +83,15 @@ int jfs_ioc_trim(struct inode *ip, struct fstrim_range *range)
- 	if (minlen == 0)
- 		minlen = 1;
- 
-+	down_read(&sb->s_umount);
-+	bmp = JFS_SBI(ip->i_sb)->bmap;
-+
- 	if (minlen > bmp->db_agsize ||
- 	    start >= bmp->db_mapsize ||
--	    range->len < sb->s_blocksize)
-+	    range->len < sb->s_blocksize) {
-+		up_read(&sb->s_umount);
- 		return -EINVAL;
-+	}
- 
- 	if (end >= bmp->db_mapsize)
- 		end = bmp->db_mapsize - 1;
-@@ -100,6 +105,8 @@ int jfs_ioc_trim(struct inode *ip, struct fstrim_range *range)
- 		trimmed += dbDiscardAG(ip, agno, minlen);
- 		agno++;
- 	}
-+
-+	up_read(&sb->s_umount);
- 	range->len = trimmed << sb->s_blocksize_bits;
- 
- 	return 0;
-diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
-index 0625d1c0d0649a..974ecf5e0d9522 100644
---- a/fs/jfs/jfs_dmap.c
-+++ b/fs/jfs/jfs_dmap.c
-@@ -2944,9 +2944,10 @@ static void dbAdjTree(dmtree_t *tp, int leafno, int newval, bool is_ctl)
- static int dbFindLeaf(dmtree_t *tp, int l2nb, int *leafidx, bool is_ctl)
- {
- 	int ti, n = 0, k, x = 0;
--	int max_size;
-+	int max_size, max_idx;
- 
- 	max_size = is_ctl ? CTLTREESIZE : TREESIZE;
-+	max_idx = is_ctl ? LPERCTL : LPERDMAP;
- 
- 	/* first check the root of the tree to see if there is
- 	 * sufficient free space.
-@@ -2978,6 +2979,8 @@ static int dbFindLeaf(dmtree_t *tp, int l2nb, int *leafidx, bool is_ctl)
- 		 */
- 		assert(n < 4);
- 	}
-+	if (le32_to_cpu(tp->dmt_leafidx) >= max_idx)
-+		return -ENOSPC;
- 
- 	/* set the return to the leftmost leaf describing sufficient
- 	 * free space.
-@@ -3022,7 +3025,7 @@ static int dbFindBits(u32 word, int l2nb)
- 
- 	/* scan the word for nb free bits at nb alignments.
- 	 */
--	for (bitno = 0; mask != 0; bitno += nb, mask >>= nb) {
-+	for (bitno = 0; mask != 0; bitno += nb, mask = (mask >> nb)) {
- 		if ((mask & word) == mask)
- 			break;
- 	}
-diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c
-index 17faf8d3552904..49e064c1f55179 100644
---- a/fs/jfs/xattr.c
-+++ b/fs/jfs/xattr.c
-@@ -434,6 +434,8 @@ static int ea_get(struct inode *inode, struct ea_buffer *ea_buf, int min_size)
- 	int rc;
- 	int quota_allocation = 0;
- 
-+	memset(&ea_buf->new_ea, 0, sizeof(ea_buf->new_ea));
-+
- 	/* When fsck.jfs clears a bad ea, it doesn't clear the size */
- 	if (ji->ea.flag == 0)
- 		ea_size = 0;
-diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
-index cdad1eaa4a3180..f16bbbfcf672c8 100644
---- a/fs/nfsd/nfs4state.c
-+++ b/fs/nfsd/nfs4state.c
-@@ -1087,7 +1087,8 @@ static void nfs4_free_deleg(struct nfs4_stid *stid)
-  * When a delegation is recalled, the filehandle is stored in the "new"
-  * filter.
-  * Every 30 seconds we swap the filters and clear the "new" one,
-- * unless both are empty of course.
-+ * unless both are empty of course.  This results in delegations for a
-+ * given filehandle being blocked for between 30 and 60 seconds.
-  *
-  * Each filter is 256 bits.  We hash the filehandle to 32bit and use the
-  * low 3 bytes as hash-table indices.
-@@ -1116,9 +1117,9 @@ static int delegation_blocked(struct knfsd_fh *fh)
- 		if (ktime_get_seconds() - bd->swap_time > 30) {
- 			bd->entries -= bd->old_entries;
- 			bd->old_entries = bd->entries;
-+			bd->new = 1-bd->new;
- 			memset(bd->set[bd->new], 0,
- 			       sizeof(bd->set[0]));
--			bd->new = 1-bd->new;
- 			bd->swap_time = ktime_get_seconds();
- 		}
- 		spin_unlock(&blocked_delegations_lock);
-diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
-index 92c7dde148a4d8..76dfbb99277f05 100644
---- a/fs/nfsd/nfs4xdr.c
-+++ b/fs/nfsd/nfs4xdr.c
-@@ -1245,14 +1245,6 @@ nfsd4_decode_putfh(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
- 	return nfs_ok;
- }
- 
--static __be32
--nfsd4_decode_putpubfh(struct nfsd4_compoundargs *argp, union nfsd4_op_u *p)
--{
--	if (argp->minorversion == 0)
--		return nfs_ok;
--	return nfserr_notsupp;
--}
--
- static __be32
- nfsd4_decode_read(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
- {
-@@ -2345,7 +2337,7 @@ static const nfsd4_dec nfsd4_dec_ops[] = {
- 	[OP_OPEN_CONFIRM]	= nfsd4_decode_open_confirm,
- 	[OP_OPEN_DOWNGRADE]	= nfsd4_decode_open_downgrade,
- 	[OP_PUTFH]		= nfsd4_decode_putfh,
--	[OP_PUTPUBFH]		= nfsd4_decode_putpubfh,
-+	[OP_PUTPUBFH]		= nfsd4_decode_noop,
- 	[OP_PUTROOTFH]		= nfsd4_decode_noop,
- 	[OP_READ]		= nfsd4_decode_read,
- 	[OP_READDIR]		= nfsd4_decode_readdir,
-diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
-index 1f2a5b22b6498e..b3e51d88faff46 100644
---- a/fs/nfsd/vfs.c
-+++ b/fs/nfsd/vfs.c
-@@ -101,6 +101,7 @@ nfserrno (int errno)
- 		{ nfserr_io, -EUCLEAN },
- 		{ nfserr_perm, -ENOKEY },
- 		{ nfserr_no_grace, -ENOGRACE},
-+		{ nfserr_io, -EBADMSG },
- 	};
- 	int	i;
- 
-diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
-index 29361634ce57ea..315f7c2f6a02c1 100644
---- a/fs/ocfs2/aops.c
-+++ b/fs/ocfs2/aops.c
-@@ -156,9 +156,8 @@ int ocfs2_get_block(struct inode *inode, sector_t iblock,
- 	err = ocfs2_extent_map_get_blocks(inode, iblock, &p_blkno, &count,
- 					  &ext_flags);
- 	if (err) {
--		mlog(ML_ERROR, "Error %d from get_blocks(0x%p, %llu, 1, "
--		     "%llu, NULL)\n", err, inode, (unsigned long long)iblock,
--		     (unsigned long long)p_blkno);
-+		mlog(ML_ERROR, "get_blocks() failed, inode: 0x%p, "
-+		     "block: %llu\n", inode, (unsigned long long)iblock);
- 		goto bail;
- 	}
- 
-diff --git a/fs/ocfs2/buffer_head_io.c b/fs/ocfs2/buffer_head_io.c
-index 196638a22b48a6..45ca3cb7c0974c 100644
---- a/fs/ocfs2/buffer_head_io.c
-+++ b/fs/ocfs2/buffer_head_io.c
-@@ -235,7 +235,6 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
- 		if (bhs[i] == NULL) {
- 			bhs[i] = sb_getblk(sb, block++);
- 			if (bhs[i] == NULL) {
--				ocfs2_metadata_cache_io_unlock(ci);
- 				status = -ENOMEM;
- 				mlog_errno(status);
- 				/* Don't forget to put previous bh! */
-@@ -389,7 +388,8 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
- 		/* Always set the buffer in the cache, even if it was
- 		 * a forced read, or read-ahead which hasn't yet
- 		 * completed. */
--		ocfs2_set_buffer_uptodate(ci, bh);
-+		if (bh)
-+			ocfs2_set_buffer_uptodate(ci, bh);
- 	}
- 	ocfs2_metadata_cache_io_unlock(ci);
- 
-diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
-index 400aec9126c652..cbe3c12ff5f75c 100644
---- a/fs/ocfs2/journal.c
-+++ b/fs/ocfs2/journal.c
-@@ -1055,7 +1055,7 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)
- 	if (!igrab(inode))
- 		BUG();
- 
--	num_running_trans = atomic_read(&(osb->journal->j_num_trans));
-+	num_running_trans = atomic_read(&(journal->j_num_trans));
- 	trace_ocfs2_journal_shutdown(num_running_trans);
- 
- 	/* Do a commit_cache here. It will flush our journal, *and*
-@@ -1074,9 +1074,10 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)
- 		osb->commit_task = NULL;
- 	}
- 
--	BUG_ON(atomic_read(&(osb->journal->j_num_trans)) != 0);
-+	BUG_ON(atomic_read(&(journal->j_num_trans)) != 0);
- 
--	if (ocfs2_mount_local(osb)) {
-+	if (ocfs2_mount_local(osb) &&
-+	    (journal->j_journal->j_flags & JBD2_LOADED)) {
- 		jbd2_journal_lock_updates(journal->j_journal);
- 		status = jbd2_journal_flush(journal->j_journal, 0);
- 		jbd2_journal_unlock_updates(journal->j_journal);
-diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
-index c803c10dd97ef1..d96011ede18a75 100644
---- a/fs/ocfs2/localalloc.c
-+++ b/fs/ocfs2/localalloc.c
-@@ -1008,6 +1008,25 @@ static int ocfs2_sync_local_to_main(struct ocfs2_super *osb,
- 		start = bit_off + 1;
- 	}
- 
-+	/* clear the contiguous bits until the end boundary */
-+	if (count) {
-+		blkno = la_start_blk +
-+			ocfs2_clusters_to_blocks(osb->sb,
-+					start - count);
-+
-+		trace_ocfs2_sync_local_to_main_free(
-+				count, start - count,
-+				(unsigned long long)la_start_blk,
-+				(unsigned long long)blkno);
-+
-+		status = ocfs2_release_clusters(handle,
-+				main_bm_inode,
-+				main_bm_bh, blkno,
-+				count);
-+		if (status < 0)
-+			mlog_errno(status);
-+	}
-+
- bail:
- 	if (status)
- 		mlog_errno(status);
-diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c
-index dfaae1e524124d..257f13cdd14c1f 100644
---- a/fs/ocfs2/quota_local.c
-+++ b/fs/ocfs2/quota_local.c
-@@ -689,7 +689,7 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)
- 	int status;
- 	struct buffer_head *bh = NULL;
- 	struct ocfs2_quota_recovery *rec;
--	int locked = 0;
-+	int locked = 0, global_read = 0;
- 
- 	info->dqi_max_spc_limit = 0x7fffffffffffffffLL;
- 	info->dqi_max_ino_limit = 0x7fffffffffffffffLL;
-@@ -697,6 +697,7 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)
- 	if (!oinfo) {
- 		mlog(ML_ERROR, "failed to allocate memory for ocfs2 quota"
- 			       " info.");
-+		status = -ENOMEM;
- 		goto out_err;
- 	}
- 	info->dqi_priv = oinfo;
-@@ -709,6 +710,7 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)
- 	status = ocfs2_global_read_info(sb, type);
- 	if (status < 0)
- 		goto out_err;
-+	global_read = 1;
- 
- 	status = ocfs2_inode_lock(lqinode, &oinfo->dqi_lqi_bh, 1);
- 	if (status < 0) {
-@@ -779,10 +781,12 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)
- 		if (locked)
- 			ocfs2_inode_unlock(lqinode, 1);
- 		ocfs2_release_local_quota_bitmaps(&oinfo->dqi_chunk);
-+		if (global_read)
-+			cancel_delayed_work_sync(&oinfo->dqi_sync_work);
- 		kfree(oinfo);
- 	}
- 	brelse(bh);
--	return -1;
-+	return status;
- }
- 
- /* Write local info to quota file */
-diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
-index 3f80a56d0d603c..c71b79b5fb9be0 100644
---- a/fs/ocfs2/refcounttree.c
-+++ b/fs/ocfs2/refcounttree.c
-@@ -25,6 +25,7 @@
- #include "namei.h"
- #include "ocfs2_trace.h"
- #include "file.h"
-+#include "symlink.h"
- 
- #include <linux/bio.h>
- #include <linux/blkdev.h>
-@@ -4155,8 +4156,9 @@ static int __ocfs2_reflink(struct dentry *old_dentry,
- 	int ret;
- 	struct inode *inode = d_inode(old_dentry);
- 	struct buffer_head *new_bh = NULL;
-+	struct ocfs2_inode_info *oi = OCFS2_I(inode);
- 
--	if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_SYSTEM_FILE) {
-+	if (oi->ip_flags & OCFS2_INODE_SYSTEM_FILE) {
- 		ret = -EINVAL;
- 		mlog_errno(ret);
- 		goto out;
-@@ -4182,6 +4184,26 @@ static int __ocfs2_reflink(struct dentry *old_dentry,
- 		goto out_unlock;
- 	}
- 
-+	if ((oi->ip_dyn_features & OCFS2_HAS_XATTR_FL) &&
-+	    (oi->ip_dyn_features & OCFS2_INLINE_XATTR_FL)) {
-+		/*
-+		 * Adjust extent record count to reserve space for extended attribute.
-+		 * Inline data count had been adjusted in ocfs2_duplicate_inline_data().
-+		 */
-+		struct ocfs2_inode_info *new_oi = OCFS2_I(new_inode);
-+
-+		if (!(new_oi->ip_dyn_features & OCFS2_INLINE_DATA_FL) &&
-+		    !(ocfs2_inode_is_fast_symlink(new_inode))) {
-+			struct ocfs2_dinode *new_di = (struct ocfs2_dinode *)new_bh->b_data;
-+			struct ocfs2_dinode *old_di = (struct ocfs2_dinode *)old_bh->b_data;
-+			struct ocfs2_extent_list *el = &new_di->id2.i_list;
-+			int inline_size = le16_to_cpu(old_di->i_xattr_inline_size);
-+
-+			le16_add_cpu(&el->l_count, -(inline_size /
-+					sizeof(struct ocfs2_extent_rec)));
-+		}
-+	}
-+
- 	ret = ocfs2_create_reflink_node(inode, old_bh,
- 					new_inode, new_bh, preserve);
- 	if (ret) {
-@@ -4189,7 +4211,7 @@ static int __ocfs2_reflink(struct dentry *old_dentry,
- 		goto inode_unlock;
- 	}
- 
--	if (OCFS2_I(inode)->ip_dyn_features & OCFS2_HAS_XATTR_FL) {
-+	if (oi->ip_dyn_features & OCFS2_HAS_XATTR_FL) {
- 		ret = ocfs2_reflink_xattrs(inode, old_bh,
- 					   new_inode, new_bh,
- 					   preserve);
-diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
-index 29d53d1d1476bd..1cc28891807154 100644
---- a/fs/ocfs2/xattr.c
-+++ b/fs/ocfs2/xattr.c
-@@ -6520,16 +6520,7 @@ static int ocfs2_reflink_xattr_inline(struct ocfs2_xattr_reflink *args)
- 	}
- 
- 	new_oi = OCFS2_I(args->new_inode);
--	/*
--	 * Adjust extent record count to reserve space for extended attribute.
--	 * Inline data count had been adjusted in ocfs2_duplicate_inline_data().
--	 */
--	if (!(new_oi->ip_dyn_features & OCFS2_INLINE_DATA_FL) &&
--	    !(ocfs2_inode_is_fast_symlink(args->new_inode))) {
--		struct ocfs2_extent_list *el = &new_di->id2.i_list;
--		le16_add_cpu(&el->l_count, -(inline_size /
--					sizeof(struct ocfs2_extent_rec)));
--	}
-+
- 	spin_lock(&new_oi->ip_lock);
- 	new_oi->ip_dyn_features |= OCFS2_HAS_XATTR_FL | OCFS2_INLINE_XATTR_FL;
- 	new_di->i_dyn_features = cpu_to_le16(new_oi->ip_dyn_features);
-diff --git a/fs/overlayfs/params.c b/fs/overlayfs/params.c
-index 0f3768cf9e8716..21d31aaef95d6c 100644
---- a/fs/overlayfs/params.c
-+++ b/fs/overlayfs/params.c
-@@ -761,11 +761,6 @@ int ovl_fs_params_verify(const struct ovl_fs_context *ctx,
- {
- 	struct ovl_opt_set set = ctx->set;
- 
--	if (ctx->nr_data > 0 && !config->metacopy) {
--		pr_err("lower data-only dirs require metacopy support.\n");
--		return -EINVAL;
--	}
--
- 	/* Workdir/index are useless in non-upper mount */
- 	if (!config->upperdir) {
- 		if (config->workdir) {
-@@ -917,6 +912,39 @@ int ovl_fs_params_verify(const struct ovl_fs_context *ctx,
- 		config->metacopy = false;
- 	}
- 
-+	/*
-+	 * Fail if we don't have trusted xattr capability and a feature was
-+	 * explicitly requested that requires them.
-+	 */
-+	if (!config->userxattr && !capable(CAP_SYS_ADMIN)) {
-+		if (set.redirect &&
-+		    config->redirect_mode != OVL_REDIRECT_NOFOLLOW) {
-+			pr_err("redirect_dir requires permission to access trusted xattrs\n");
-+			return -EPERM;
-+		}
-+		if (config->metacopy && set.metacopy) {
-+			pr_err("metacopy requires permission to access trusted xattrs\n");
-+			return -EPERM;
-+		}
-+		if (config->verity_mode) {
-+			pr_err("verity requires permission to access trusted xattrs\n");
-+			return -EPERM;
-+		}
-+		if (ctx->nr_data > 0) {
-+			pr_err("lower data-only dirs require permission to access trusted xattrs\n");
-+			return -EPERM;
-+		}
-+		/*
-+		 * Other xattr-dependent features should be disabled without
-+		 * great disturbance to the user in ovl_make_workdir().
-+		 */
-+	}
-+
-+	if (ctx->nr_data > 0 && !config->metacopy) {
-+		pr_err("lower data-only dirs require metacopy support.\n");
-+		return -EINVAL;
-+	}
-+
- 	return 0;
- }
- 
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 6e61d93ffa5523..699f085d4de7d7 100644
---- a/fs/proc/base.c
-+++ b/fs/proc/base.c
-@@ -85,6 +85,7 @@
- #include <linux/elf.h>
- #include <linux/pid_namespace.h>
- #include <linux/user_namespace.h>
-+#include <linux/fs_parser.h>
- #include <linux/fs_struct.h>
- #include <linux/slab.h>
- #include <linux/sched/autogroup.h>
-@@ -116,6 +117,40 @@
- static u8 nlink_tid __ro_after_init;
- static u8 nlink_tgid __ro_after_init;
- 
-+enum proc_mem_force {
-+	PROC_MEM_FORCE_ALWAYS,
-+	PROC_MEM_FORCE_PTRACE,
-+	PROC_MEM_FORCE_NEVER
-+};
-+
-+static enum proc_mem_force proc_mem_force_override __ro_after_init =
-+	IS_ENABLED(CONFIG_PROC_MEM_NO_FORCE) ? PROC_MEM_FORCE_NEVER :
-+	IS_ENABLED(CONFIG_PROC_MEM_FORCE_PTRACE) ? PROC_MEM_FORCE_PTRACE :
-+	PROC_MEM_FORCE_ALWAYS;
-+
-+static const struct constant_table proc_mem_force_table[] __initconst = {
-+	{ "always", PROC_MEM_FORCE_ALWAYS },
-+	{ "ptrace", PROC_MEM_FORCE_PTRACE },
-+	{ "never", PROC_MEM_FORCE_NEVER },
-+	{ }
-+};
-+
-+static int __init early_proc_mem_force_override(char *buf)
-+{
-+	if (!buf)
-+		return -EINVAL;
-+
-+	/*
-+	 * lookup_constant() defaults to proc_mem_force_override to preseve
-+	 * the initial Kconfig choice in case an invalid param gets passed.
-+	 */
-+	proc_mem_force_override = lookup_constant(proc_mem_force_table,
-+						  buf, proc_mem_force_override);
-+
-+	return 0;
-+}
-+early_param("proc_mem.force_override", early_proc_mem_force_override);
-+
- struct pid_entry {
- 	const char *name;
- 	unsigned int len;
-@@ -834,6 +869,28 @@ static int mem_open(struct inode *inode, struct file *file)
- 	return ret;
- }
- 
-+static bool proc_mem_foll_force(struct file *file, struct mm_struct *mm)
-+{
-+	struct task_struct *task;
-+	bool ptrace_active = false;
-+
-+	switch (proc_mem_force_override) {
-+	case PROC_MEM_FORCE_NEVER:
-+		return false;
-+	case PROC_MEM_FORCE_PTRACE:
-+		task = get_proc_task(file_inode(file));
-+		if (task) {
-+			ptrace_active =	READ_ONCE(task->ptrace) &&
-+					READ_ONCE(task->mm) == mm &&
-+					READ_ONCE(task->parent) == current;
-+			put_task_struct(task);
-+		}
-+		return ptrace_active;
-+	default:
-+		return true;
-+	}
-+}
-+
- static ssize_t mem_rw(struct file *file, char __user *buf,
- 			size_t count, loff_t *ppos, int write)
- {
-@@ -854,7 +911,9 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
- 	if (!mmget_not_zero(mm))
- 		goto free;
- 
--	flags = FOLL_FORCE | (write ? FOLL_WRITE : 0);
-+	flags = write ? FOLL_WRITE : 0;
-+	if (proc_mem_foll_force(file, mm))
-+		flags |= FOLL_FORCE;
- 
- 	while (count > 0) {
- 		size_t this_len = min_t(size_t, count, PAGE_SIZE);
-diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c
-index 87caeff427a16c..2d9f8bdb6d4efe 100644
---- a/fs/smb/client/cifsfs.c
-+++ b/fs/smb/client/cifsfs.c
-@@ -312,8 +312,17 @@ cifs_statfs(struct dentry *dentry, struct kstatfs *buf)
- 	struct TCP_Server_Info *server = tcon->ses->server;
- 	unsigned int xid;
- 	int rc = 0;
-+	const char *full_path;
-+	void *page;
- 
- 	xid = get_xid();
-+	page = alloc_dentry_path();
-+
-+	full_path = build_path_from_dentry(dentry, page);
-+	if (IS_ERR(full_path)) {
-+		rc = PTR_ERR(full_path);
-+		goto statfs_out;
-+	}
- 
- 	if (le32_to_cpu(tcon->fsAttrInfo.MaxPathNameComponentLength) > 0)
- 		buf->f_namelen =
-@@ -329,8 +338,10 @@ cifs_statfs(struct dentry *dentry, struct kstatfs *buf)
- 	buf->f_ffree = 0;	/* unlimited */
- 
- 	if (server->ops->queryfs)
--		rc = server->ops->queryfs(xid, tcon, cifs_sb, buf);
-+		rc = server->ops->queryfs(xid, tcon, full_path, cifs_sb, buf);
- 
-+statfs_out:
-+	free_dentry_path(page);
- 	free_xid(xid);
- 	return rc;
- }
-diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h
-index 54a84003950a45..111540eff66e7d 100644
---- a/fs/smb/client/cifsglob.h
-+++ b/fs/smb/client/cifsglob.h
-@@ -485,7 +485,7 @@ struct smb_version_operations {
- 			__u16 net_fid, struct cifsInodeInfo *cifs_inode);
- 	/* query remote filesystem */
- 	int (*queryfs)(const unsigned int, struct cifs_tcon *,
--		       struct cifs_sb_info *, struct kstatfs *);
-+		       const char *, struct cifs_sb_info *, struct kstatfs *);
- 	/* send mandatory brlock to the server */
- 	int (*mand_lock)(const unsigned int, struct cifsFileInfo *, __u64,
- 			 __u64, __u32, int, int, bool);
-diff --git a/fs/smb/client/inode.c b/fs/smb/client/inode.c
-index e74ba047902d8a..e7970cbeb86111 100644
---- a/fs/smb/client/inode.c
-+++ b/fs/smb/client/inode.c
-@@ -779,10 +779,6 @@ static void cifs_open_info_to_fattr(struct cifs_fattr *fattr,
- 		fattr->cf_mode = S_IFREG | cifs_sb->ctx->file_mode;
- 		fattr->cf_dtype = DT_REG;
- 
--		/* clear write bits if ATTR_READONLY is set */
--		if (fattr->cf_cifsattrs & ATTR_READONLY)
--			fattr->cf_mode &= ~(S_IWUGO);
--
- 		/*
- 		 * Don't accept zero nlink from non-unix servers unless
- 		 * delete is pending.  Instead mark it as unknown.
-@@ -795,6 +791,10 @@ static void cifs_open_info_to_fattr(struct cifs_fattr *fattr,
- 		}
- 	}
- 
-+	/* clear write bits if ATTR_READONLY is set */
-+	if (fattr->cf_cifsattrs & ATTR_READONLY)
-+		fattr->cf_mode &= ~(S_IWUGO);
-+
- out_reparse:
- 	if (S_ISLNK(fattr->cf_mode)) {
- 		if (likely(data->symlink_target))
-@@ -1212,11 +1212,14 @@ static int cifs_get_fattr(struct cifs_open_info_data *data,
- 				 __func__, rc);
- 			goto out;
- 		}
--	}
--
--	/* fill in remaining high mode bits e.g. SUID, VTX */
--	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL)
-+	} else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL)
-+		/* fill in remaining high mode bits e.g. SUID, VTX */
- 		cifs_sfu_mode(fattr, full_path, cifs_sb, xid);
-+	else if (!(tcon->posix_extensions))
-+		/* clear write bits if ATTR_READONLY is set */
-+		if (fattr->cf_cifsattrs & ATTR_READONLY)
-+			fattr->cf_mode &= ~(S_IWUGO);
-+
- 
- 	/* check for Minshall+French symlinks */
- 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS) {
-diff --git a/fs/smb/client/reparse.c b/fs/smb/client/reparse.c
-index 48c27581ec511c..ad0e0de9a165d4 100644
---- a/fs/smb/client/reparse.c
-+++ b/fs/smb/client/reparse.c
-@@ -320,15 +320,21 @@ static int parse_reparse_posix(struct reparse_posix_data *buf,
- 	unsigned int len;
- 	u64 type;
- 
-+	len = le16_to_cpu(buf->ReparseDataLength);
-+	if (len < sizeof(buf->InodeType)) {
-+		cifs_dbg(VFS, "srv returned malformed nfs buffer\n");
-+		return -EIO;
-+	}
-+
-+	len -= sizeof(buf->InodeType);
-+
- 	switch ((type = le64_to_cpu(buf->InodeType))) {
- 	case NFS_SPECFILE_LNK:
--		len = le16_to_cpu(buf->ReparseDataLength);
- 		data->symlink_target = cifs_strndup_from_utf16(buf->DataBuffer,
- 							       len, true,
- 							       cifs_sb->local_nls);
- 		if (!data->symlink_target)
- 			return -ENOMEM;
--		convert_delimiter(data->symlink_target, '/');
- 		cifs_dbg(FYI, "%s: target path: %s\n",
- 			 __func__, data->symlink_target);
- 		break;
-@@ -482,12 +488,18 @@ bool cifs_reparse_point_to_fattr(struct cifs_sb_info *cifs_sb,
- 	u32 tag = data->reparse.tag;
- 
- 	if (tag == IO_REPARSE_TAG_NFS && buf) {
-+		if (le16_to_cpu(buf->ReparseDataLength) < sizeof(buf->InodeType))
-+			return false;
- 		switch (le64_to_cpu(buf->InodeType)) {
- 		case NFS_SPECFILE_CHR:
-+			if (le16_to_cpu(buf->ReparseDataLength) != sizeof(buf->InodeType) + 8)
-+				return false;
- 			fattr->cf_mode |= S_IFCHR;
- 			fattr->cf_rdev = reparse_nfs_mkdev(buf);
- 			break;
- 		case NFS_SPECFILE_BLK:
-+			if (le16_to_cpu(buf->ReparseDataLength) != sizeof(buf->InodeType) + 8)
-+				return false;
- 			fattr->cf_mode |= S_IFBLK;
- 			fattr->cf_rdev = reparse_nfs_mkdev(buf);
- 			break;
-diff --git a/fs/smb/client/smb1ops.c b/fs/smb/client/smb1ops.c
-index 212ec6f66ec65b..e3a195824b4037 100644
---- a/fs/smb/client/smb1ops.c
-+++ b/fs/smb/client/smb1ops.c
-@@ -909,7 +909,7 @@ cifs_oplock_response(struct cifs_tcon *tcon, __u64 persistent_fid,
- 
- static int
- cifs_queryfs(const unsigned int xid, struct cifs_tcon *tcon,
--	     struct cifs_sb_info *cifs_sb, struct kstatfs *buf)
-+	     const char *path, struct cifs_sb_info *cifs_sb, struct kstatfs *buf)
- {
- 	int rc = -EOPNOTSUPP;
- 
-diff --git a/fs/smb/client/smb2inode.c b/fs/smb/client/smb2inode.c
-index dd8acd20775219..8010b3ed4b3fe4 100644
---- a/fs/smb/client/smb2inode.c
-+++ b/fs/smb/client/smb2inode.c
-@@ -1205,9 +1205,12 @@ struct inode *smb2_get_reparse_inode(struct cifs_open_info_data *data,
- 	struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
- 	struct cifsFileInfo *cfile;
- 	struct inode *new = NULL;
-+	int out_buftype[4] = {};
-+	struct kvec out_iov[4] = {};
- 	struct kvec in_iov[2];
- 	int cmds[2];
- 	int rc;
-+	int i;
- 
- 	oparms = CIFS_OPARMS(cifs_sb, tcon, full_path,
- 			     SYNCHRONIZE | DELETE |
-@@ -1228,7 +1231,7 @@ struct inode *smb2_get_reparse_inode(struct cifs_open_info_data *data,
- 		cmds[1] = SMB2_OP_POSIX_QUERY_INFO;
- 		cifs_get_writable_path(tcon, full_path, FIND_WR_ANY, &cfile);
- 		rc = smb2_compound_op(xid, tcon, cifs_sb, full_path, &oparms,
--				      in_iov, cmds, 2, cfile, NULL, NULL, NULL);
-+				      in_iov, cmds, 2, cfile, out_iov, out_buftype, NULL);
- 		if (!rc) {
- 			rc = smb311_posix_get_inode_info(&new, full_path,
- 							 data, sb, xid);
-@@ -1237,12 +1240,29 @@ struct inode *smb2_get_reparse_inode(struct cifs_open_info_data *data,
- 		cmds[1] = SMB2_OP_QUERY_INFO;
- 		cifs_get_writable_path(tcon, full_path, FIND_WR_ANY, &cfile);
- 		rc = smb2_compound_op(xid, tcon, cifs_sb, full_path, &oparms,
--				      in_iov, cmds, 2, cfile, NULL, NULL, NULL);
-+				      in_iov, cmds, 2, cfile, out_iov, out_buftype, NULL);
- 		if (!rc) {
- 			rc = cifs_get_inode_info(&new, full_path,
- 						 data, sb, xid, NULL);
- 		}
- 	}
-+
-+
-+	/*
-+	 * If CREATE was successful but SMB2_OP_SET_REPARSE failed then
-+	 * remove the intermediate object created by CREATE. Otherwise
-+	 * empty object stay on the server when reparse call failed.
-+	 */
-+	if (rc &&
-+	    out_iov[0].iov_base != NULL && out_buftype[0] != CIFS_NO_BUFFER &&
-+	    ((struct smb2_hdr *)out_iov[0].iov_base)->Status == STATUS_SUCCESS &&
-+	    (out_iov[1].iov_base == NULL || out_buftype[1] == CIFS_NO_BUFFER ||
-+	     ((struct smb2_hdr *)out_iov[1].iov_base)->Status != STATUS_SUCCESS))
-+		smb2_unlink(xid, tcon, full_path, cifs_sb, NULL);
-+
-+	for (i = 0; i < ARRAY_SIZE(out_buftype); i++)
-+		free_rsp_buf(out_buftype[i], out_iov[i].iov_base);
-+
- 	return rc ? ERR_PTR(rc) : new;
- }
- 
-diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
-index acd5d7d7935257..007d0a683910f6 100644
---- a/fs/smb/client/smb2ops.c
-+++ b/fs/smb/client/smb2ops.c
-@@ -2783,7 +2783,7 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon,
- 
- static int
- smb2_queryfs(const unsigned int xid, struct cifs_tcon *tcon,
--	     struct cifs_sb_info *cifs_sb, struct kstatfs *buf)
-+	     const char *path, struct cifs_sb_info *cifs_sb, struct kstatfs *buf)
- {
- 	struct smb2_query_info_rsp *rsp;
- 	struct smb2_fs_full_size_info *info = NULL;
-@@ -2792,7 +2792,7 @@ smb2_queryfs(const unsigned int xid, struct cifs_tcon *tcon,
- 	int rc;
- 
- 
--	rc = smb2_query_info_compound(xid, tcon, "",
-+	rc = smb2_query_info_compound(xid, tcon, path,
- 				      FILE_READ_ATTRIBUTES,
- 				      FS_FULL_SIZE_INFORMATION,
- 				      SMB2_O_INFO_FILESYSTEM,
-@@ -2820,28 +2820,33 @@ smb2_queryfs(const unsigned int xid, struct cifs_tcon *tcon,
- 
- static int
- smb311_queryfs(const unsigned int xid, struct cifs_tcon *tcon,
--	       struct cifs_sb_info *cifs_sb, struct kstatfs *buf)
-+	       const char *path, struct cifs_sb_info *cifs_sb, struct kstatfs *buf)
- {
- 	int rc;
--	__le16 srch_path = 0; /* Null - open root of share */
-+	__le16 *utf16_path = NULL;
- 	u8 oplock = SMB2_OPLOCK_LEVEL_NONE;
- 	struct cifs_open_parms oparms;
- 	struct cifs_fid fid;
- 
- 	if (!tcon->posix_extensions)
--		return smb2_queryfs(xid, tcon, cifs_sb, buf);
-+		return smb2_queryfs(xid, tcon, path, cifs_sb, buf);
- 
- 	oparms = (struct cifs_open_parms) {
- 		.tcon = tcon,
--		.path = "",
-+		.path = path,
- 		.desired_access = FILE_READ_ATTRIBUTES,
- 		.disposition = FILE_OPEN,
- 		.create_options = cifs_create_options(cifs_sb, 0),
- 		.fid = &fid,
- 	};
- 
--	rc = SMB2_open(xid, &oparms, &srch_path, &oplock, NULL, NULL,
-+	utf16_path = cifs_convert_path_to_utf16(path, cifs_sb);
-+	if (utf16_path == NULL)
-+		return -ENOMEM;
-+
-+	rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL, NULL,
- 		       NULL, NULL);
-+	kfree(utf16_path);
- 	if (rc)
- 		return rc;
- 
-diff --git a/fs/smb/server/connection.c b/fs/smb/server/connection.c
-index 7889df8112b4ee..cac80e7bfefc74 100644
---- a/fs/smb/server/connection.c
-+++ b/fs/smb/server/connection.c
-@@ -39,7 +39,8 @@ void ksmbd_conn_free(struct ksmbd_conn *conn)
- 	xa_destroy(&conn->sessions);
- 	kvfree(conn->request_buf);
- 	kfree(conn->preauth_info);
--	kfree(conn);
-+	if (atomic_dec_and_test(&conn->refcnt))
-+		kfree(conn);
- }
- 
- /**
-@@ -68,6 +69,7 @@ struct ksmbd_conn *ksmbd_conn_alloc(void)
- 		conn->um = NULL;
- 	atomic_set(&conn->req_running, 0);
- 	atomic_set(&conn->r_count, 0);
-+	atomic_set(&conn->refcnt, 1);
- 	conn->total_credits = 1;
- 	conn->outstanding_credits = 0;
- 
-diff --git a/fs/smb/server/connection.h b/fs/smb/server/connection.h
-index b93e5437793e00..82343afc8d0499 100644
---- a/fs/smb/server/connection.h
-+++ b/fs/smb/server/connection.h
-@@ -106,6 +106,7 @@ struct ksmbd_conn {
- 	bool				signing_negotiated;
- 	__le16				signing_algorithm;
- 	bool				binding;
-+	atomic_t			refcnt;
- };
- 
- struct ksmbd_conn_ops {
-diff --git a/fs/smb/server/oplock.c b/fs/smb/server/oplock.c
-index e546ffa57b55ab..8ee86478287f93 100644
---- a/fs/smb/server/oplock.c
-+++ b/fs/smb/server/oplock.c
-@@ -51,6 +51,7 @@ static struct oplock_info *alloc_opinfo(struct ksmbd_work *work,
- 	init_waitqueue_head(&opinfo->oplock_brk);
- 	atomic_set(&opinfo->refcount, 1);
- 	atomic_set(&opinfo->breaking_cnt, 0);
-+	atomic_inc(&opinfo->conn->refcnt);
- 
- 	return opinfo;
- }
-@@ -124,6 +125,8 @@ static void free_opinfo(struct oplock_info *opinfo)
- {
- 	if (opinfo->is_lease)
- 		free_lease(opinfo);
-+	if (opinfo->conn && atomic_dec_and_test(&opinfo->conn->refcnt))
-+		kfree(opinfo->conn);
- 	kfree(opinfo);
- }
- 
-@@ -163,9 +166,7 @@ static struct oplock_info *opinfo_get_list(struct ksmbd_inode *ci)
- 		    !atomic_inc_not_zero(&opinfo->refcount))
- 			opinfo = NULL;
- 		else {
--			atomic_inc(&opinfo->conn->r_count);
- 			if (ksmbd_conn_releasing(opinfo->conn)) {
--				atomic_dec(&opinfo->conn->r_count);
- 				atomic_dec(&opinfo->refcount);
- 				opinfo = NULL;
- 			}
-@@ -177,26 +178,11 @@ static struct oplock_info *opinfo_get_list(struct ksmbd_inode *ci)
- 	return opinfo;
- }
- 
--static void opinfo_conn_put(struct oplock_info *opinfo)
-+void opinfo_put(struct oplock_info *opinfo)
- {
--	struct ksmbd_conn *conn;
--
- 	if (!opinfo)
- 		return;
- 
--	conn = opinfo->conn;
--	/*
--	 * Checking waitqueue to dropping pending requests on
--	 * disconnection. waitqueue_active is safe because it
--	 * uses atomic operation for condition.
--	 */
--	if (!atomic_dec_return(&conn->r_count) && waitqueue_active(&conn->r_count_q))
--		wake_up(&conn->r_count_q);
--	opinfo_put(opinfo);
--}
--
--void opinfo_put(struct oplock_info *opinfo)
--{
- 	if (!atomic_dec_and_test(&opinfo->refcount))
- 		return;
- 
-@@ -1127,14 +1113,11 @@ void smb_send_parent_lease_break_noti(struct ksmbd_file *fp,
- 			if (!atomic_inc_not_zero(&opinfo->refcount))
- 				continue;
- 
--			atomic_inc(&opinfo->conn->r_count);
--			if (ksmbd_conn_releasing(opinfo->conn)) {
--				atomic_dec(&opinfo->conn->r_count);
-+			if (ksmbd_conn_releasing(opinfo->conn))
- 				continue;
--			}
- 
- 			oplock_break(opinfo, SMB2_OPLOCK_LEVEL_NONE);
--			opinfo_conn_put(opinfo);
-+			opinfo_put(opinfo);
- 		}
- 	}
- 	up_read(&p_ci->m_lock);
-@@ -1167,13 +1150,10 @@ void smb_lazy_parent_lease_break_close(struct ksmbd_file *fp)
- 			if (!atomic_inc_not_zero(&opinfo->refcount))
- 				continue;
- 
--			atomic_inc(&opinfo->conn->r_count);
--			if (ksmbd_conn_releasing(opinfo->conn)) {
--				atomic_dec(&opinfo->conn->r_count);
-+			if (ksmbd_conn_releasing(opinfo->conn))
- 				continue;
--			}
- 			oplock_break(opinfo, SMB2_OPLOCK_LEVEL_NONE);
--			opinfo_conn_put(opinfo);
-+			opinfo_put(opinfo);
- 		}
- 	}
- 	up_read(&p_ci->m_lock);
-@@ -1252,7 +1232,7 @@ int smb_grant_oplock(struct ksmbd_work *work, int req_op_level, u64 pid,
- 	prev_opinfo = opinfo_get_list(ci);
- 	if (!prev_opinfo ||
- 	    (prev_opinfo->level == SMB2_OPLOCK_LEVEL_NONE && lctx)) {
--		opinfo_conn_put(prev_opinfo);
-+		opinfo_put(prev_opinfo);
- 		goto set_lev;
- 	}
- 	prev_op_has_lease = prev_opinfo->is_lease;
-@@ -1262,19 +1242,19 @@ int smb_grant_oplock(struct ksmbd_work *work, int req_op_level, u64 pid,
- 	if (share_ret < 0 &&
- 	    prev_opinfo->level == SMB2_OPLOCK_LEVEL_EXCLUSIVE) {
- 		err = share_ret;
--		opinfo_conn_put(prev_opinfo);
-+		opinfo_put(prev_opinfo);
- 		goto err_out;
- 	}
- 
- 	if (prev_opinfo->level != SMB2_OPLOCK_LEVEL_BATCH &&
- 	    prev_opinfo->level != SMB2_OPLOCK_LEVEL_EXCLUSIVE) {
--		opinfo_conn_put(prev_opinfo);
-+		opinfo_put(prev_opinfo);
- 		goto op_break_not_needed;
- 	}
- 
- 	list_add(&work->interim_entry, &prev_opinfo->interim_list);
- 	err = oplock_break(prev_opinfo, SMB2_OPLOCK_LEVEL_II);
--	opinfo_conn_put(prev_opinfo);
-+	opinfo_put(prev_opinfo);
- 	if (err == -ENOENT)
- 		goto set_lev;
- 	/* Check all oplock was freed by close */
-@@ -1337,14 +1317,14 @@ static void smb_break_all_write_oplock(struct ksmbd_work *work,
- 		return;
- 	if (brk_opinfo->level != SMB2_OPLOCK_LEVEL_BATCH &&
- 	    brk_opinfo->level != SMB2_OPLOCK_LEVEL_EXCLUSIVE) {
--		opinfo_conn_put(brk_opinfo);
-+		opinfo_put(brk_opinfo);
- 		return;
- 	}
- 
- 	brk_opinfo->open_trunc = is_trunc;
- 	list_add(&work->interim_entry, &brk_opinfo->interim_list);
- 	oplock_break(brk_opinfo, SMB2_OPLOCK_LEVEL_II);
--	opinfo_conn_put(brk_opinfo);
-+	opinfo_put(brk_opinfo);
- }
- 
- /**
-@@ -1376,11 +1356,8 @@ void smb_break_all_levII_oplock(struct ksmbd_work *work, struct ksmbd_file *fp,
- 		if (!atomic_inc_not_zero(&brk_op->refcount))
- 			continue;
- 
--		atomic_inc(&brk_op->conn->r_count);
--		if (ksmbd_conn_releasing(brk_op->conn)) {
--			atomic_dec(&brk_op->conn->r_count);
-+		if (ksmbd_conn_releasing(brk_op->conn))
- 			continue;
--		}
- 
- 		rcu_read_unlock();
- 		if (brk_op->is_lease && (brk_op->o_lease->state &
-@@ -1411,7 +1388,7 @@ void smb_break_all_levII_oplock(struct ksmbd_work *work, struct ksmbd_file *fp,
- 		brk_op->open_trunc = is_trunc;
- 		oplock_break(brk_op, SMB2_OPLOCK_LEVEL_NONE);
- next:
--		opinfo_conn_put(brk_op);
-+		opinfo_put(brk_op);
- 		rcu_read_lock();
- 	}
- 	rcu_read_unlock();
-diff --git a/fs/smb/server/vfs_cache.c b/fs/smb/server/vfs_cache.c
-index 8b2e37c8716ed7..271a23abc82fdd 100644
---- a/fs/smb/server/vfs_cache.c
-+++ b/fs/smb/server/vfs_cache.c
-@@ -710,6 +710,8 @@ static bool session_fd_check(struct ksmbd_tree_connect *tcon,
- 	list_for_each_entry_rcu(op, &ci->m_op_list, op_entry) {
- 		if (op->conn != conn)
- 			continue;
-+		if (op->conn && atomic_dec_and_test(&op->conn->refcnt))
-+			kfree(op->conn);
- 		op->conn = NULL;
- 	}
- 	up_write(&ci->m_lock);
-@@ -807,6 +809,7 @@ int ksmbd_reopen_durable_fd(struct ksmbd_work *work, struct ksmbd_file *fp)
- 		if (op->conn)
- 			continue;
- 		op->conn = fp->conn;
-+		atomic_inc(&op->conn->refcnt);
- 	}
- 	up_write(&ci->m_lock);
- 
-diff --git a/include/crypto/internal/simd.h b/include/crypto/internal/simd.h
-index d2316242a98843..be97b97a75dd2d 100644
---- a/include/crypto/internal/simd.h
-+++ b/include/crypto/internal/simd.h
-@@ -14,11 +14,10 @@
- struct simd_skcipher_alg;
- struct skcipher_alg;
- 
--struct simd_skcipher_alg *simd_skcipher_create_compat(const char *algname,
-+struct simd_skcipher_alg *simd_skcipher_create_compat(struct skcipher_alg *ialg,
-+						      const char *algname,
- 						      const char *drvname,
- 						      const char *basename);
--struct simd_skcipher_alg *simd_skcipher_create(const char *algname,
--					       const char *basename);
- void simd_skcipher_free(struct simd_skcipher_alg *alg);
- 
- int simd_register_skciphers_compat(struct skcipher_alg *algs, int count,
-@@ -32,13 +31,6 @@ void simd_unregister_skciphers(struct skcipher_alg *algs, int count,
- struct simd_aead_alg;
- struct aead_alg;
- 
--struct simd_aead_alg *simd_aead_create_compat(const char *algname,
--					      const char *drvname,
--					      const char *basename);
--struct simd_aead_alg *simd_aead_create(const char *algname,
--				       const char *basename);
--void simd_aead_free(struct simd_aead_alg *alg);
--
- int simd_register_aeads_compat(struct aead_alg *algs, int count,
- 			       struct simd_aead_alg **simd_algs);
- 
-diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
-index a93a387f8a1a15..2ad9c9f9e90ffd 100644
---- a/include/drm/drm_print.h
-+++ b/include/drm/drm_print.h
-@@ -122,7 +122,8 @@ drm_vprintf(struct drm_printer *p, const char *fmt, va_list *va)
- 
- /**
-  * struct drm_print_iterator - local struct used with drm_printer_coredump
-- * @data: Pointer to the devcoredump output buffer
-+ * @data: Pointer to the devcoredump output buffer, can be NULL if using
-+ * drm_printer_coredump to determine size of devcoredump
-  * @start: The offset within the buffer to start writing
-  * @remain: The number of bytes to write for this iteration
-  */
-@@ -167,6 +168,57 @@ struct drm_print_iterator {
-  *			coredump_read, ...)
-  *	}
-  *
-+ * The above example has a time complexity of O(N^2), where N is the size of the
-+ * devcoredump. This is acceptable for small devcoredumps but scales poorly for
-+ * larger ones.
-+ *
-+ * Another use case for drm_coredump_printer is to capture the devcoredump into
-+ * a saved buffer before the dev_coredump() callback. This involves two passes:
-+ * one to determine the size of the devcoredump and another to print it to a
-+ * buffer. Then, in dev_coredump(), copy from the saved buffer into the
-+ * devcoredump read buffer.
-+ *
-+ * For example::
-+ *
-+ *	char *devcoredump_saved_buffer;
-+ *
-+ *	ssize_t __coredump_print(char *buffer, ssize_t count, ...)
-+ *	{
-+ *		struct drm_print_iterator iter;
-+ *		struct drm_printer p;
-+ *
-+ *		iter.data = buffer;
-+ *		iter.start = 0;
-+ *		iter.remain = count;
-+ *
-+ *		p = drm_coredump_printer(&iter);
-+ *
-+ *		drm_printf(p, "foo=%d\n", foo);
-+ *		...
-+ *		return count - iter.remain;
-+ *	}
-+ *
-+ *	void coredump_print(...)
-+ *	{
-+ *		ssize_t count;
-+ *
-+ *		count = __coredump_print(NULL, INT_MAX, ...);
-+ *		devcoredump_saved_buffer = kvmalloc(count, GFP_KERNEL);
-+ *		__coredump_print(devcoredump_saved_buffer, count, ...);
-+ *	}
-+ *
-+ *	void coredump_read(char *buffer, loff_t offset, size_t count,
-+ *			   void *data, size_t datalen)
-+ *	{
-+ *		...
-+ *		memcpy(buffer, devcoredump_saved_buffer + offset, count);
-+ *		...
-+ *	}
-+ *
-+ * The above example has a time complexity of O(N*2), where N is the size of the
-+ * devcoredump. This scales better than the previous example for larger
-+ * devcoredumps.
-+ *
-  * RETURNS:
-  * The &drm_printer object
-  */
-diff --git a/include/dt-bindings/clock/exynos7885.h b/include/dt-bindings/clock/exynos7885.h
-index 255e3aa9432373..54cfccff85086a 100644
---- a/include/dt-bindings/clock/exynos7885.h
-+++ b/include/dt-bindings/clock/exynos7885.h
-@@ -136,12 +136,12 @@
- #define CLK_MOUT_FSYS_MMC_CARD_USER	2
- #define CLK_MOUT_FSYS_MMC_EMBD_USER	3
- #define CLK_MOUT_FSYS_MMC_SDIO_USER	4
--#define CLK_MOUT_FSYS_USB30DRD_USER	4
- #define CLK_GOUT_MMC_CARD_ACLK		5
- #define CLK_GOUT_MMC_CARD_SDCLKIN	6
- #define CLK_GOUT_MMC_EMBD_ACLK		7
- #define CLK_GOUT_MMC_EMBD_SDCLKIN	8
- #define CLK_GOUT_MMC_SDIO_ACLK		9
- #define CLK_GOUT_MMC_SDIO_SDCLKIN	10
-+#define CLK_MOUT_FSYS_USB30DRD_USER	11
- 
- #endif /* _DT_BINDINGS_CLOCK_EXYNOS_7885_H */
-diff --git a/include/dt-bindings/clock/qcom,gcc-sc8180x.h b/include/dt-bindings/clock/qcom,gcc-sc8180x.h
-index e893415ae13d0f..2569f874fe13c6 100644
---- a/include/dt-bindings/clock/qcom,gcc-sc8180x.h
-+++ b/include/dt-bindings/clock/qcom,gcc-sc8180x.h
-@@ -246,6 +246,9 @@
- #define GCC_PCIE_3_CLKREF_CLK					236
- #define GCC_USB3_PRIM_CLKREF_CLK				237
- #define GCC_USB3_SEC_CLKREF_CLK					238
-+#define GCC_UFS_MEM_CLKREF_EN					239
-+#define GCC_UFS_CARD_CLKREF_EN					240
-+#define GPLL9							241
- 
- #define GCC_EMAC_BCR						0
- #define GCC_GPU_BCR						1
-diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
-index 3a4cefb25ba61c..9ca4211c063f39 100644
---- a/include/linux/cpufreq.h
-+++ b/include/linux/cpufreq.h
-@@ -1124,10 +1124,9 @@ static inline int parse_perf_domain(int cpu, const char *list_name,
- 				    const char *cell_name,
- 				    struct of_phandle_args *args)
- {
--	struct device_node *cpu_np;
- 	int ret;
- 
--	cpu_np = of_cpu_device_node_get(cpu);
-+	struct device_node *cpu_np __free(device_node) = of_cpu_device_node_get(cpu);
- 	if (!cpu_np)
- 		return -ENODEV;
- 
-@@ -1135,9 +1134,6 @@ static inline int parse_perf_domain(int cpu, const char *list_name,
- 					 args);
- 	if (ret < 0)
- 		return ret;
--
--	of_node_put(cpu_np);
--
- 	return 0;
- }
- 
-diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
-index e066816f3519fb..fcff696860b8fe 100644
---- a/include/linux/fdtable.h
-+++ b/include/linux/fdtable.h
-@@ -22,7 +22,6 @@
-  * as this is the granularity returned by copy_fdset().
-  */
- #define NR_OPEN_DEFAULT BITS_PER_LONG
--#define NR_OPEN_MAX ~0U
- 
- struct fdtable {
- 	unsigned int max_fds;
-@@ -117,7 +116,10 @@ struct task_struct;
- 
- void put_files_struct(struct files_struct *fs);
- int unshare_files(void);
--struct files_struct *dup_fd(struct files_struct *, unsigned, int *) __latent_entropy;
-+struct fd_range {
-+	unsigned int from, to;
-+};
-+struct files_struct *dup_fd(struct files_struct *, struct fd_range *) __latent_entropy;
- void do_close_on_exec(struct files_struct *);
- int iterate_fd(struct files_struct *, unsigned,
- 		int (*)(const void *, struct file *, unsigned),
-@@ -126,8 +128,6 @@ int iterate_fd(struct files_struct *, unsigned,
- extern int close_fd(unsigned int fd);
- extern int __close_range(unsigned int fd, unsigned int max_fd, unsigned int flags);
- extern struct file *close_fd_get_file(unsigned int fd);
--extern int unshare_fd(unsigned long unshare_flags, unsigned int max_fds,
--		      struct files_struct **new_fdp);
- 
- extern struct kmem_cache *files_cachep;
- 
-diff --git a/include/linux/i2c.h b/include/linux/i2c.h
-index 32cf5708d5a5b6..a3166100f0cce2 100644
---- a/include/linux/i2c.h
-+++ b/include/linux/i2c.h
-@@ -746,6 +746,11 @@ struct i2c_adapter {
- 
- 	struct irq_domain *host_notify_domain;
- 	struct regulator *bus_regulator;
-+
-+	struct dentry *debugfs;
-+
-+	/* 7bit address space */
-+	DECLARE_BITMAP(addrs_in_instantiation, 1 << 7);
- };
- #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev)
- 
-diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index b8e60a20416ba5..8f5ac20b4c03d9 100644
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -5029,6 +5029,24 @@ void netif_set_tso_max_segs(struct net_device *dev, unsigned int segs);
- void netif_inherit_tso_max(struct net_device *to,
- 			   const struct net_device *from);
- 
-+static inline unsigned int
-+netif_get_gro_max_size(const struct net_device *dev, const struct sk_buff *skb)
-+{
-+	/* pairs with WRITE_ONCE() in netif_set_gro(_ipv4)_max_size() */
-+	return skb->protocol == htons(ETH_P_IPV6) ?
-+	       READ_ONCE(dev->gro_max_size) :
-+	       READ_ONCE(dev->gro_ipv4_max_size);
-+}
-+
-+static inline unsigned int
-+netif_get_gso_max_size(const struct net_device *dev, const struct sk_buff *skb)
-+{
-+	/* pairs with WRITE_ONCE() in netif_set_gso(_ipv4)_max_size() */
-+	return skb->protocol == htons(ETH_P_IPV6) ?
-+	       READ_ONCE(dev->gso_max_size) :
-+	       READ_ONCE(dev->gso_ipv4_max_size);
-+}
-+
- static inline bool netif_is_macsec(const struct net_device *dev)
- {
- 	return dev->priv_flags & IFF_MACSEC;
-diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
-index 95d4118ee4a917..7a5563ffe61b53 100644
---- a/include/linux/perf_event.h
-+++ b/include/linux/perf_event.h
-@@ -1599,13 +1599,7 @@ static inline int perf_is_paranoid(void)
- 	return sysctl_perf_event_paranoid > -1;
- }
- 
--static inline int perf_allow_kernel(struct perf_event_attr *attr)
--{
--	if (sysctl_perf_event_paranoid > 1 && !perfmon_capable())
--		return -EACCES;
--
--	return security_perf_event_open(attr, PERF_SECURITY_KERNEL);
--}
-+int perf_allow_kernel(struct perf_event_attr *attr);
- 
- static inline int perf_allow_cpu(struct perf_event_attr *attr)
- {
-diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
-index 5acb77968902dc..42ff5a4de8ee76 100644
---- a/include/linux/stmmac.h
-+++ b/include/linux/stmmac.h
-@@ -117,7 +117,6 @@ struct stmmac_axi {
- 
- #define EST_GCL		1024
- struct stmmac_est {
--	struct mutex lock;
- 	int enable;
- 	u32 btr_reserve[2];
- 	u32 btr_offset[2];
-diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
-index f46e0ca0169c72..d91e32aff5a134 100644
---- a/include/linux/uprobes.h
-+++ b/include/linux/uprobes.h
-@@ -76,6 +76,8 @@ struct uprobe_task {
- 	struct uprobe			*active_uprobe;
- 	unsigned long			xol_vaddr;
- 
-+	struct arch_uprobe              *auprobe;
-+
- 	struct return_instance		*return_instances;
- 	unsigned int			depth;
- };
-diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
-index 276ca543ef44d8..02a9f4dc594d02 100644
---- a/include/linux/virtio_net.h
-+++ b/include/linux/virtio_net.h
-@@ -103,8 +103,10 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,
- 
- 		if (!skb_partial_csum_set(skb, start, off))
- 			return -EINVAL;
-+		if (skb_transport_offset(skb) < nh_min_len)
-+			return -EINVAL;
- 
--		nh_min_len = max_t(u32, nh_min_len, skb_transport_offset(skb));
-+		nh_min_len = skb_transport_offset(skb);
- 		p_off = nh_min_len + thlen;
- 		if (!pskb_may_pull(skb, p_off))
- 			return -EINVAL;
-diff --git a/include/net/mana/gdma.h b/include/net/mana/gdma.h
-index 88b6ef7ce1a6ef..3965343fdee0cd 100644
---- a/include/net/mana/gdma.h
-+++ b/include/net/mana/gdma.h
-@@ -222,7 +222,15 @@ struct gdma_dev {
- 	struct auxiliary_device *adev;
- };
- 
--#define MINIMUM_SUPPORTED_PAGE_SIZE PAGE_SIZE
-+/* MANA_PAGE_SIZE is the DMA unit */
-+#define MANA_PAGE_SHIFT 12
-+#define MANA_PAGE_SIZE BIT(MANA_PAGE_SHIFT)
-+#define MANA_PAGE_ALIGN(x) ALIGN((x), MANA_PAGE_SIZE)
-+#define MANA_PAGE_ALIGNED(addr) IS_ALIGNED((unsigned long)(addr), MANA_PAGE_SIZE)
-+#define MANA_PFN(a) ((a) >> MANA_PAGE_SHIFT)
-+
-+/* Required by HW */
-+#define MANA_MIN_QSIZE MANA_PAGE_SIZE
- 
- #define GDMA_CQE_SIZE 64
- #define GDMA_EQE_SIZE 16
-diff --git a/include/net/mana/mana.h b/include/net/mana/mana.h
-index 28e110f733ffd3..7892b79854f62e 100644
---- a/include/net/mana/mana.h
-+++ b/include/net/mana/mana.h
-@@ -42,7 +42,8 @@ enum TRI_STATE {
- 
- #define MAX_SEND_BUFFERS_PER_QUEUE 256
- 
--#define EQ_SIZE (8 * PAGE_SIZE)
-+#define EQ_SIZE (8 * MANA_PAGE_SIZE)
-+
- #define LOG2_EQ_THROTTLE 3
- 
- #define MAX_PORTS_IN_MANA_DEV 256
-diff --git a/include/uapi/linux/cec.h b/include/uapi/linux/cec.h
-index b8e071abaea5ac..3eba3934512e60 100644
---- a/include/uapi/linux/cec.h
-+++ b/include/uapi/linux/cec.h
-@@ -132,6 +132,8 @@ static inline void cec_msg_init(struct cec_msg *msg,
-  * Set the msg destination to the orig initiator and the msg initiator to the
-  * orig destination. Note that msg and orig may be the same pointer, in which
-  * case the change is done in place.
-+ *
-+ * It also zeroes the reply, timeout and flags fields.
-  */
- static inline void cec_msg_set_reply_to(struct cec_msg *msg,
- 					struct cec_msg *orig)
-@@ -139,7 +141,9 @@ static inline void cec_msg_set_reply_to(struct cec_msg *msg,
- 	/* The destination becomes the initiator and vice versa */
- 	msg->msg[0] = (cec_msg_destination(orig) << 4) |
- 		      cec_msg_initiator(orig);
--	msg->reply = msg->timeout = 0;
-+	msg->reply = 0;
-+	msg->timeout = 0;
-+	msg->flags = 0;
- }
- 
- /**
-diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h
-index 621e3035145eba..9c29015d09c10f 100644
---- a/include/uapi/linux/netfilter/nf_tables.h
-+++ b/include/uapi/linux/netfilter/nf_tables.h
-@@ -1690,7 +1690,7 @@ enum nft_flowtable_flags {
-  *
-  * @NFTA_FLOWTABLE_TABLE: name of the table containing the expression (NLA_STRING)
-  * @NFTA_FLOWTABLE_NAME: name of this flow table (NLA_STRING)
-- * @NFTA_FLOWTABLE_HOOK: netfilter hook configuration(NLA_U32)
-+ * @NFTA_FLOWTABLE_HOOK: netfilter hook configuration (NLA_NESTED)
-  * @NFTA_FLOWTABLE_USE: number of references to this flow table (NLA_U32)
-  * @NFTA_FLOWTABLE_HANDLE: object handle (NLA_U64)
-  * @NFTA_FLOWTABLE_FLAGS: flags (NLA_U32)
-diff --git a/io_uring/net.c b/io_uring/net.c
-index cf1060fb04f435..7412904387bfa0 100644
---- a/io_uring/net.c
-+++ b/io_uring/net.c
-@@ -930,6 +930,7 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags)
- 	int ret, min_ret = 0;
- 	bool force_nonblock = issue_flags & IO_URING_F_NONBLOCK;
- 	size_t len = sr->len;
-+	bool mshot_finished;
- 
- 	if (!(req->flags & REQ_F_POLLED) &&
- 	    (sr->flags & IORING_RECVSEND_POLL_FIRST))
-@@ -999,6 +1000,7 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags)
- 		req_set_fail(req);
- 	}
- 
-+	mshot_finished = ret <= 0;
- 	if (ret > 0)
- 		ret += sr->done_io;
- 	else if (sr->done_io)
-@@ -1006,7 +1008,7 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags)
- 	else
- 		io_kbuf_recycle(req, issue_flags);
- 
--	if (!io_recv_finish(req, &ret, &msg, ret <= 0, issue_flags))
-+	if (!io_recv_finish(req, &ret, &msg, mshot_finished, issue_flags))
- 		goto retry_multishot;
- 
- 	return ret;
-diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
-index 834394faf2af30..3032a464d31bbf 100644
---- a/kernel/bpf/verifier.c
-+++ b/kernel/bpf/verifier.c
-@@ -7846,6 +7846,15 @@ static int widen_imprecise_scalars(struct bpf_verifier_env *env,
- 	return 0;
- }
- 
-+static struct bpf_reg_state *get_iter_from_state(struct bpf_verifier_state *cur_st,
-+						 struct bpf_kfunc_call_arg_meta *meta)
-+{
-+	int iter_frameno = meta->iter.frameno;
-+	int iter_spi = meta->iter.spi;
-+
-+	return &cur_st->frame[iter_frameno]->stack[iter_spi].spilled_ptr;
-+}
-+
- /* process_iter_next_call() is called when verifier gets to iterator's next
-  * "method" (e.g., bpf_iter_num_next() for numbers iterator) call. We'll refer
-  * to it as just "iter_next()" in comments below.
-@@ -7930,12 +7939,10 @@ static int process_iter_next_call(struct bpf_verifier_env *env, int insn_idx,
- 	struct bpf_verifier_state *cur_st = env->cur_state, *queued_st, *prev_st;
- 	struct bpf_func_state *cur_fr = cur_st->frame[cur_st->curframe], *queued_fr;
- 	struct bpf_reg_state *cur_iter, *queued_iter;
--	int iter_frameno = meta->iter.frameno;
--	int iter_spi = meta->iter.spi;
- 
- 	BTF_TYPE_EMIT(struct bpf_iter);
- 
--	cur_iter = &env->cur_state->frame[iter_frameno]->stack[iter_spi].spilled_ptr;
-+	cur_iter = get_iter_from_state(cur_st, meta);
- 
- 	if (cur_iter->iter.state != BPF_ITER_STATE_ACTIVE &&
- 	    cur_iter->iter.state != BPF_ITER_STATE_DRAINED) {
-@@ -7963,7 +7970,7 @@ static int process_iter_next_call(struct bpf_verifier_env *env, int insn_idx,
- 		if (!queued_st)
- 			return -ENOMEM;
- 
--		queued_iter = &queued_st->frame[iter_frameno]->stack[iter_spi].spilled_ptr;
-+		queued_iter = get_iter_from_state(queued_st, meta);
- 		queued_iter->iter.state = BPF_ITER_STATE_ACTIVE;
- 		queued_iter->iter.depth++;
- 		if (prev_st)
-@@ -11995,6 +12002,17 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn,
- 			regs[BPF_REG_0].btf = desc_btf;
- 			regs[BPF_REG_0].type = PTR_TO_BTF_ID;
- 			regs[BPF_REG_0].btf_id = ptr_type_id;
-+
-+			if (is_iter_next_kfunc(&meta)) {
-+				struct bpf_reg_state *cur_iter;
-+
-+				cur_iter = get_iter_from_state(env->cur_state, &meta);
-+
-+				if (cur_iter->type & MEM_RCU) /* KF_RCU_PROTECTED */
-+					regs[BPF_REG_0].type |= MEM_RCU;
-+				else
-+					regs[BPF_REG_0].type |= PTR_TRUSTED;
-+			}
- 		}
- 
- 		if (is_kfunc_ret_null(&meta)) {
-diff --git a/kernel/events/core.c b/kernel/events/core.c
-index 4d0abdace4e7cc..ec0fae49a0dd9a 100644
---- a/kernel/events/core.c
-+++ b/kernel/events/core.c
-@@ -264,6 +264,7 @@ static void event_function_call(struct perf_event *event, event_f func, void *da
- {
- 	struct perf_event_context *ctx = event->ctx;
- 	struct task_struct *task = READ_ONCE(ctx->task); /* verified in event_function */
-+	struct perf_cpu_context *cpuctx;
- 	struct event_function_struct efs = {
- 		.event = event,
- 		.func = func,
-@@ -291,22 +292,25 @@ static void event_function_call(struct perf_event *event, event_f func, void *da
- 	if (!task_function_call(task, event_function, &efs))
- 		return;
- 
--	raw_spin_lock_irq(&ctx->lock);
-+	local_irq_disable();
-+	cpuctx = this_cpu_ptr(&perf_cpu_context);
-+	perf_ctx_lock(cpuctx, ctx);
- 	/*
- 	 * Reload the task pointer, it might have been changed by
- 	 * a concurrent perf_event_context_sched_out().
- 	 */
- 	task = ctx->task;
--	if (task == TASK_TOMBSTONE) {
--		raw_spin_unlock_irq(&ctx->lock);
--		return;
--	}
-+	if (task == TASK_TOMBSTONE)
-+		goto unlock;
- 	if (ctx->is_active) {
--		raw_spin_unlock_irq(&ctx->lock);
-+		perf_ctx_unlock(cpuctx, ctx);
-+		local_irq_enable();
- 		goto again;
- 	}
- 	func(event, NULL, ctx, data);
--	raw_spin_unlock_irq(&ctx->lock);
-+unlock:
-+	perf_ctx_unlock(cpuctx, ctx);
-+	local_irq_enable();
- }
- 
- /*
-@@ -4100,7 +4104,11 @@ static void perf_adjust_period(struct perf_event *event, u64 nsec, u64 count, bo
- 	period = perf_calculate_period(event, nsec, count);
- 
- 	delta = (s64)(period - hwc->sample_period);
--	delta = (delta + 7) / 8; /* low pass filter */
-+	if (delta >= 0)
-+		delta += 7;
-+	else
-+		delta -= 7;
-+	delta /= 8; /* low pass filter */
- 
- 	sample_period = hwc->sample_period + delta;
- 
-@@ -13330,6 +13338,15 @@ const struct perf_event_attr *perf_event_attrs(struct perf_event *event)
- 	return &event->attr;
- }
- 
-+int perf_allow_kernel(struct perf_event_attr *attr)
-+{
-+	if (sysctl_perf_event_paranoid > 1 && !perfmon_capable())
-+		return -EACCES;
-+
-+	return security_perf_event_open(attr, PERF_SECURITY_KERNEL);
-+}
-+EXPORT_SYMBOL_GPL(perf_allow_kernel);
-+
- /*
-  * Inherit an event from parent task to child task.
-  *
-diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
-index 4705571f803458..6dac0b5798213b 100644
---- a/kernel/events/uprobes.c
-+++ b/kernel/events/uprobes.c
-@@ -1491,7 +1491,7 @@ static struct xol_area *__create_xol_area(unsigned long vaddr)
- 
- 	area->xol_mapping.name = "[uprobes]";
- 	area->xol_mapping.pages = area->pages;
--	area->pages[0] = alloc_page(GFP_HIGHUSER);
-+	area->pages[0] = alloc_page(GFP_HIGHUSER | __GFP_ZERO);
- 	if (!area->pages[0])
- 		goto free_bitmap;
- 	area->pages[1] = NULL;
-@@ -2071,6 +2071,7 @@ static void handler_chain(struct uprobe *uprobe, struct pt_regs *regs)
- 	bool need_prep = false; /* prepare return uprobe, when needed */
- 
- 	down_read(&uprobe->register_rwsem);
-+	current->utask->auprobe = &uprobe->arch;
- 	for (uc = uprobe->consumers; uc; uc = uc->next) {
- 		int rc = 0;
- 
-@@ -2085,6 +2086,7 @@ static void handler_chain(struct uprobe *uprobe, struct pt_regs *regs)
- 
- 		remove &= rc;
- 	}
-+	current->utask->auprobe = NULL;
- 
- 	if (need_prep && !remove)
- 		prepare_uretprobe(uprobe, regs); /* put bp at return */
-diff --git a/kernel/fork.c b/kernel/fork.c
-index 177ce7438db6b1..32ffbc1c96bae3 100644
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -1767,33 +1767,30 @@ static int copy_files(unsigned long clone_flags, struct task_struct *tsk,
- 		      int no_files)
- {
- 	struct files_struct *oldf, *newf;
--	int error = 0;
- 
- 	/*
- 	 * A background process may not have any files ...
- 	 */
- 	oldf = current->files;
- 	if (!oldf)
--		goto out;
-+		return 0;
- 
- 	if (no_files) {
- 		tsk->files = NULL;
--		goto out;
-+		return 0;
- 	}
- 
- 	if (clone_flags & CLONE_FILES) {
- 		atomic_inc(&oldf->count);
--		goto out;
-+		return 0;
- 	}
- 
--	newf = dup_fd(oldf, NR_OPEN_MAX, &error);
--	if (!newf)
--		goto out;
-+	newf = dup_fd(oldf, NULL);
-+	if (IS_ERR(newf))
-+		return PTR_ERR(newf);
- 
- 	tsk->files = newf;
--	error = 0;
--out:
--	return error;
-+	return 0;
- }
- 
- static int copy_sighand(unsigned long clone_flags, struct task_struct *tsk)
-@@ -3358,17 +3355,16 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
- /*
-  * Unshare file descriptor table if it is being shared
-  */
--int unshare_fd(unsigned long unshare_flags, unsigned int max_fds,
--	       struct files_struct **new_fdp)
-+static int unshare_fd(unsigned long unshare_flags, struct files_struct **new_fdp)
- {
- 	struct files_struct *fd = current->files;
--	int error = 0;
- 
- 	if ((unshare_flags & CLONE_FILES) &&
- 	    (fd && atomic_read(&fd->count) > 1)) {
--		*new_fdp = dup_fd(fd, max_fds, &error);
--		if (!*new_fdp)
--			return error;
-+		fd = dup_fd(fd, NULL);
-+		if (IS_ERR(fd))
-+			return PTR_ERR(fd);
-+		*new_fdp = fd;
- 	}
- 
- 	return 0;
-@@ -3426,7 +3422,7 @@ int ksys_unshare(unsigned long unshare_flags)
- 	err = unshare_fs(unshare_flags, &new_fs);
- 	if (err)
- 		goto bad_unshare_out;
--	err = unshare_fd(unshare_flags, NR_OPEN_MAX, &new_fd);
-+	err = unshare_fd(unshare_flags, &new_fd);
- 	if (err)
- 		goto bad_unshare_cleanup_fs;
- 	err = unshare_userns(unshare_flags, &new_cred);
-@@ -3518,7 +3514,7 @@ int unshare_files(void)
- 	struct files_struct *old, *copy = NULL;
- 	int error;
- 
--	error = unshare_fd(CLONE_FILES, NR_OPEN_MAX, &copy);
-+	error = unshare_fd(CLONE_FILES, &copy);
- 	if (error || !copy)
- 		return error;
- 
-diff --git a/kernel/jump_label.c b/kernel/jump_label.c
-index 1ed269b2c4035e..554e04b25b13a8 100644
---- a/kernel/jump_label.c
-+++ b/kernel/jump_label.c
-@@ -159,22 +159,24 @@ bool static_key_slow_inc_cpuslocked(struct static_key *key)
- 	if (static_key_fast_inc_not_disabled(key))
- 		return true;
- 
--	jump_label_lock();
--	if (atomic_read(&key->enabled) == 0) {
--		atomic_set(&key->enabled, -1);
-+	guard(mutex)(&jump_label_mutex);
-+	/* Try to mark it as 'enabling in progress. */
-+	if (!atomic_cmpxchg(&key->enabled, 0, -1)) {
- 		jump_label_update(key);
- 		/*
--		 * Ensure that if the above cmpxchg loop observes our positive
--		 * value, it must also observe all the text changes.
-+		 * Ensure that when static_key_fast_inc_not_disabled() or
-+		 * static_key_dec_not_one() observe the positive value,
-+		 * they must also observe all the text changes.
- 		 */
- 		atomic_set_release(&key->enabled, 1);
- 	} else {
--		if (WARN_ON_ONCE(!static_key_fast_inc_not_disabled(key))) {
--			jump_label_unlock();
-+		/*
-+		 * While holding the mutex this should never observe
-+		 * anything else than a value >= 1 and succeed
-+		 */
-+		if (WARN_ON_ONCE(!static_key_fast_inc_not_disabled(key)))
- 			return false;
--		}
- 	}
--	jump_label_unlock();
- 	return true;
- }
- 
-@@ -245,7 +247,7 @@ void static_key_disable(struct static_key *key)
- }
- EXPORT_SYMBOL_GPL(static_key_disable);
- 
--static bool static_key_slow_try_dec(struct static_key *key)
-+static bool static_key_dec_not_one(struct static_key *key)
- {
- 	int v;
- 
-@@ -269,6 +271,14 @@ static bool static_key_slow_try_dec(struct static_key *key)
- 		 * enabled. This suggests an ordering problem on the user side.
- 		 */
- 		WARN_ON_ONCE(v < 0);
-+
-+		/*
-+		 * Warn about underflow, and lie about success in an attempt to
-+		 * not make things worse.
-+		 */
-+		if (WARN_ON_ONCE(v == 0))
-+			return true;
-+
- 		if (v <= 1)
- 			return false;
- 	} while (!likely(atomic_try_cmpxchg(&key->enabled, &v, v - 1)));
-@@ -279,15 +289,27 @@ static bool static_key_slow_try_dec(struct static_key *key)
- static void __static_key_slow_dec_cpuslocked(struct static_key *key)
- {
- 	lockdep_assert_cpus_held();
-+	int val;
- 
--	if (static_key_slow_try_dec(key))
-+	if (static_key_dec_not_one(key))
- 		return;
- 
- 	guard(mutex)(&jump_label_mutex);
--	if (atomic_cmpxchg(&key->enabled, 1, 0) == 1)
-+	val = atomic_read(&key->enabled);
-+	/*
-+	 * It should be impossible to observe -1 with jump_label_mutex held,
-+	 * see static_key_slow_inc_cpuslocked().
-+	 */
-+	if (WARN_ON_ONCE(val == -1))
-+		return;
-+	/*
-+	 * Cannot already be 0, something went sideways.
-+	 */
-+	if (WARN_ON_ONCE(val == 0))
-+		return;
-+
-+	if (atomic_dec_and_test(&key->enabled))
- 		jump_label_update(key);
--	else
--		WARN_ON_ONCE(!static_key_slow_try_dec(key));
- }
- 
- static void __static_key_slow_dec(struct static_key *key)
-@@ -324,7 +346,7 @@ void __static_key_slow_dec_deferred(struct static_key *key,
- {
- 	STATIC_KEY_CHECK_USE(key);
- 
--	if (static_key_slow_try_dec(key))
-+	if (static_key_dec_not_one(key))
- 		return;
- 
- 	schedule_delayed_work(work, timeout);
-diff --git a/kernel/rcu/rcuscale.c b/kernel/rcu/rcuscale.c
-index ffdb30495e3cc3..ed46d9e8c0e434 100644
---- a/kernel/rcu/rcuscale.c
-+++ b/kernel/rcu/rcuscale.c
-@@ -498,7 +498,7 @@ rcu_scale_writer(void *arg)
- 			schedule_timeout_idle(torture_random(&tr) % writer_holdoff_jiffies + 1);
- 		wdp = &wdpp[i];
- 		*wdp = ktime_get_mono_fast_ns();
--		if (gp_async) {
-+		if (gp_async && !WARN_ON_ONCE(!cur_ops->async)) {
- retry:
- 			if (!rhp)
- 				rhp = kmalloc(sizeof(*rhp), GFP_KERNEL);
-@@ -554,7 +554,7 @@ rcu_scale_writer(void *arg)
- 			i++;
- 		rcu_scale_wait_shutdown();
- 	} while (!torture_must_stop());
--	if (gp_async) {
-+	if (gp_async && cur_ops->async) {
- 		cur_ops->gp_barrier();
- 	}
- 	writer_n_durations[me] = i_max + 1;
-diff --git a/kernel/resource.c b/kernel/resource.c
-index ce127a829ead70..635e858db0fe81 100644
---- a/kernel/resource.c
-+++ b/kernel/resource.c
-@@ -493,20 +493,62 @@ static int __region_intersects(struct resource *parent, resource_size_t start,
- 			       size_t size, unsigned long flags,
- 			       unsigned long desc)
- {
--	struct resource res;
-+	resource_size_t ostart, oend;
- 	int type = 0; int other = 0;
--	struct resource *p;
-+	struct resource *p, *dp;
-+	bool is_type, covered;
-+	struct resource res;
- 
- 	res.start = start;
- 	res.end = start + size - 1;
- 
- 	for (p = parent->child; p ; p = p->sibling) {
--		bool is_type = (((p->flags & flags) == flags) &&
--				((desc == IORES_DESC_NONE) ||
--				 (desc == p->desc)));
--
--		if (resource_overlaps(p, &res))
--			is_type ? type++ : other++;
-+		if (!resource_overlaps(p, &res))
-+			continue;
-+		is_type = (p->flags & flags) == flags &&
-+			(desc == IORES_DESC_NONE || desc == p->desc);
-+		if (is_type) {
-+			type++;
-+			continue;
-+		}
-+		/*
-+		 * Continue to search in descendant resources as if the
-+		 * matched descendant resources cover some ranges of 'p'.
-+		 *
-+		 * |------------- "CXL Window 0" ------------|
-+		 * |-- "System RAM" --|
-+		 *
-+		 * will behave similar as the following fake resource
-+		 * tree when searching "System RAM".
-+		 *
-+		 * |-- "System RAM" --||-- "CXL Window 0a" --|
-+		 */
-+		covered = false;
-+		ostart = max(res.start, p->start);
-+		oend = min(res.end, p->end);
-+		for_each_resource(p, dp, false) {
-+			if (!resource_overlaps(dp, &res))
-+				continue;
-+			is_type = (dp->flags & flags) == flags &&
-+				(desc == IORES_DESC_NONE || desc == dp->desc);
-+			if (is_type) {
-+				type++;
-+				/*
-+				 * Range from 'ostart' to 'dp->start'
-+				 * isn't covered by matched resource.
-+				 */
-+				if (dp->start > ostart)
-+					break;
-+				if (dp->end >= oend) {
-+					covered = true;
-+					break;
-+				}
-+				/* Remove covered range */
-+				ostart = max(ostart, dp->end + 1);
-+			}
-+		}
-+		if (!covered)
-+			other++;
- 	}
- 
- 	if (type == 0)
-diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
-index 431971acc76322..f97e1473389ff1 100644
---- a/kernel/sched/psi.c
-+++ b/kernel/sched/psi.c
-@@ -776,13 +776,14 @@ static void record_times(struct psi_group_cpu *groupc, u64 now)
- }
- 
- static void psi_group_change(struct psi_group *group, int cpu,
--			     unsigned int clear, unsigned int set, u64 now,
-+			     unsigned int clear, unsigned int set,
- 			     bool wake_clock)
- {
- 	struct psi_group_cpu *groupc;
- 	unsigned int t, m;
- 	enum psi_states s;
- 	u32 state_mask;
-+	u64 now;
- 
- 	lockdep_assert_rq_held(cpu_rq(cpu));
- 	groupc = per_cpu_ptr(group->pcpu, cpu);
-@@ -797,6 +798,7 @@ static void psi_group_change(struct psi_group *group, int cpu,
- 	 * SOME and FULL time these may have resulted in.
- 	 */
- 	write_seqcount_begin(&groupc->seq);
-+	now = cpu_clock(cpu);
- 
- 	/*
- 	 * Start with TSK_ONCPU, which doesn't have a corresponding
-@@ -910,18 +912,15 @@ void psi_task_change(struct task_struct *task, int clear, int set)
- {
- 	int cpu = task_cpu(task);
- 	struct psi_group *group;
--	u64 now;
- 
- 	if (!task->pid)
- 		return;
- 
- 	psi_flags_change(task, clear, set);
- 
--	now = cpu_clock(cpu);
--
- 	group = task_psi_group(task);
- 	do {
--		psi_group_change(group, cpu, clear, set, now, true);
-+		psi_group_change(group, cpu, clear, set, true);
- 	} while ((group = group->parent));
- }
- 
-@@ -930,7 +929,6 @@ void psi_task_switch(struct task_struct *prev, struct task_struct *next,
- {
- 	struct psi_group *group, *common = NULL;
- 	int cpu = task_cpu(prev);
--	u64 now = cpu_clock(cpu);
- 
- 	if (next->pid) {
- 		psi_flags_change(next, 0, TSK_ONCPU);
-@@ -947,7 +945,7 @@ void psi_task_switch(struct task_struct *prev, struct task_struct *next,
- 				break;
- 			}
- 
--			psi_group_change(group, cpu, 0, TSK_ONCPU, now, true);
-+			psi_group_change(group, cpu, 0, TSK_ONCPU, true);
- 		} while ((group = group->parent));
- 	}
- 
-@@ -985,7 +983,7 @@ void psi_task_switch(struct task_struct *prev, struct task_struct *next,
- 		do {
- 			if (group == common)
- 				break;
--			psi_group_change(group, cpu, clear, set, now, wake_clock);
-+			psi_group_change(group, cpu, clear, set, wake_clock);
- 		} while ((group = group->parent));
- 
- 		/*
-@@ -997,7 +995,7 @@ void psi_task_switch(struct task_struct *prev, struct task_struct *next,
- 		if ((prev->psi_flags ^ next->psi_flags) & ~TSK_ONCPU) {
- 			clear &= ~TSK_ONCPU;
- 			for (; group; group = group->parent)
--				psi_group_change(group, cpu, clear, set, now, wake_clock);
-+				psi_group_change(group, cpu, clear, set, wake_clock);
- 		}
- 	}
- }
-@@ -1008,8 +1006,8 @@ void psi_account_irqtime(struct rq *rq, struct task_struct *curr, struct task_st
- 	int cpu = task_cpu(curr);
- 	struct psi_group *group;
- 	struct psi_group_cpu *groupc;
--	u64 now, irq;
- 	s64 delta;
-+	u64 irq;
- 
- 	if (!curr->pid)
- 		return;
-@@ -1019,7 +1017,6 @@ void psi_account_irqtime(struct rq *rq, struct task_struct *curr, struct task_st
- 	if (prev && task_psi_group(prev) == group)
- 		return;
- 
--	now = cpu_clock(cpu);
- 	irq = irq_time_read(cpu);
- 	delta = (s64)(irq - rq->psi_irq_time);
- 	if (delta < 0)
-@@ -1027,12 +1024,15 @@ void psi_account_irqtime(struct rq *rq, struct task_struct *curr, struct task_st
- 	rq->psi_irq_time = irq;
- 
- 	do {
-+		u64 now;
-+
- 		if (!group->enabled)
- 			continue;
- 
- 		groupc = per_cpu_ptr(group->pcpu, cpu);
- 
- 		write_seqcount_begin(&groupc->seq);
-+		now = cpu_clock(cpu);
- 
- 		record_times(groupc, now);
- 		groupc->times[PSI_IRQ_FULL] += delta;
-@@ -1231,11 +1231,9 @@ void psi_cgroup_restart(struct psi_group *group)
- 	for_each_possible_cpu(cpu) {
- 		struct rq *rq = cpu_rq(cpu);
- 		struct rq_flags rf;
--		u64 now;
- 
- 		rq_lock_irq(rq, &rf);
--		now = cpu_clock(cpu);
--		psi_group_change(group, cpu, 0, 0, now, true);
-+		psi_group_change(group, cpu, 0, 0, true);
- 		rq_unlock_irq(rq, &rf);
- 	}
- }
-diff --git a/kernel/static_call_inline.c b/kernel/static_call_inline.c
-index 639397b5491ca0..5259cda486d058 100644
---- a/kernel/static_call_inline.c
-+++ b/kernel/static_call_inline.c
-@@ -411,6 +411,17 @@ static void static_call_del_module(struct module *mod)
- 
- 	for (site = start; site < stop; site++) {
- 		key = static_call_key(site);
-+
-+		/*
-+		 * If the key was not updated due to a memory allocation
-+		 * failure in __static_call_init() then treating key::sites
-+		 * as key::mods in the code below would cause random memory
-+		 * access and #GP. In that case all subsequent sites have
-+		 * not been touched either, so stop iterating.
-+		 */
-+		if (!static_call_key_has_mods(key))
-+			break;
-+
- 		if (key == prev_key)
- 			continue;
- 
-@@ -442,7 +453,7 @@ static int static_call_module_notify(struct notifier_block *nb,
- 	case MODULE_STATE_COMING:
- 		ret = static_call_add_module(mod);
- 		if (ret) {
--			WARN(1, "Failed to allocate memory for static calls");
-+			pr_warn("Failed to allocate memory for static calls\n");
- 			static_call_del_module(mod);
- 		}
- 		break;
-diff --git a/kernel/trace/trace_hwlat.c b/kernel/trace/trace_hwlat.c
-index b791524a6536ac..3bd6071441ade9 100644
---- a/kernel/trace/trace_hwlat.c
-+++ b/kernel/trace/trace_hwlat.c
-@@ -520,6 +520,8 @@ static void hwlat_hotplug_workfn(struct work_struct *dummy)
- 	if (!hwlat_busy || hwlat_data.thread_mode != MODE_PER_CPU)
- 		goto out_unlock;
- 
-+	if (!cpu_online(cpu))
-+		goto out_unlock;
- 	if (!cpumask_test_cpu(cpu, tr->tracing_cpumask))
- 		goto out_unlock;
- 
-diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c
-index 461b4ab60b501a..3e2bc029fa8c83 100644
---- a/kernel/trace/trace_osnoise.c
-+++ b/kernel/trace/trace_osnoise.c
-@@ -1953,12 +1953,8 @@ static void stop_kthread(unsigned int cpu)
- {
- 	struct task_struct *kthread;
- 
--	mutex_lock(&interface_lock);
--	kthread = per_cpu(per_cpu_osnoise_var, cpu).kthread;
-+	kthread = xchg_relaxed(&(per_cpu(per_cpu_osnoise_var, cpu).kthread), NULL);
- 	if (kthread) {
--		per_cpu(per_cpu_osnoise_var, cpu).kthread = NULL;
--		mutex_unlock(&interface_lock);
--
- 		if (cpumask_test_and_clear_cpu(cpu, &kthread_cpumask) &&
- 		    !WARN_ON(!test_bit(OSN_WORKLOAD, &osnoise_options))) {
- 			kthread_stop(kthread);
-@@ -1972,7 +1968,6 @@ static void stop_kthread(unsigned int cpu)
- 			put_task_struct(kthread);
- 		}
- 	} else {
--		mutex_unlock(&interface_lock);
- 		/* if no workload, just return */
- 		if (!test_bit(OSN_WORKLOAD, &osnoise_options)) {
- 			/*
-@@ -1994,8 +1989,12 @@ static void stop_per_cpu_kthreads(void)
- {
- 	int cpu;
- 
--	for_each_possible_cpu(cpu)
-+	cpus_read_lock();
-+
-+	for_each_online_cpu(cpu)
- 		stop_kthread(cpu);
-+
-+	cpus_read_unlock();
- }
- 
- /*
-@@ -2007,6 +2006,10 @@ static int start_kthread(unsigned int cpu)
- 	void *main = osnoise_main;
- 	char comm[24];
- 
-+	/* Do not start a new thread if it is already running */
-+	if (per_cpu(per_cpu_osnoise_var, cpu).kthread)
-+		return 0;
-+
- 	if (timerlat_enabled()) {
- 		snprintf(comm, 24, "timerlat/%d", cpu);
- 		main = timerlat_main;
-@@ -2061,11 +2064,10 @@ static int start_per_cpu_kthreads(void)
- 		if (cpumask_test_and_clear_cpu(cpu, &kthread_cpumask)) {
- 			struct task_struct *kthread;
- 
--			kthread = per_cpu(per_cpu_osnoise_var, cpu).kthread;
-+			kthread = xchg_relaxed(&(per_cpu(per_cpu_osnoise_var, cpu).kthread), NULL);
- 			if (!WARN_ON(!kthread))
- 				kthread_stop(kthread);
- 		}
--		per_cpu(per_cpu_osnoise_var, cpu).kthread = NULL;
- 	}
- 
- 	for_each_cpu(cpu, current_mask) {
-@@ -2095,6 +2097,8 @@ static void osnoise_hotplug_workfn(struct work_struct *dummy)
- 	mutex_lock(&interface_lock);
- 	cpus_read_lock();
- 
-+	if (!cpu_online(cpu))
-+		goto out_unlock;
- 	if (!cpumask_test_cpu(cpu, &osnoise_cpumask))
- 		goto out_unlock;
- 
-diff --git a/lib/buildid.c b/lib/buildid.c
-index e3a7acdeef0ed4..d3bc3d0528d5c8 100644
---- a/lib/buildid.c
-+++ b/lib/buildid.c
-@@ -18,31 +18,37 @@ static int parse_build_id_buf(unsigned char *build_id,
- 			      const void *note_start,
- 			      Elf32_Word note_size)
- {
--	Elf32_Word note_offs = 0, new_offs;
--
--	while (note_offs + sizeof(Elf32_Nhdr) < note_size) {
--		Elf32_Nhdr *nhdr = (Elf32_Nhdr *)(note_start + note_offs);
-+	const char note_name[] = "GNU";
-+	const size_t note_name_sz = sizeof(note_name);
-+	u64 note_off = 0, new_off, name_sz, desc_sz;
-+	const char *data;
-+
-+	while (note_off + sizeof(Elf32_Nhdr) < note_size &&
-+	       note_off + sizeof(Elf32_Nhdr) > note_off /* overflow */) {
-+		Elf32_Nhdr *nhdr = (Elf32_Nhdr *)(note_start + note_off);
-+
-+		name_sz = READ_ONCE(nhdr->n_namesz);
-+		desc_sz = READ_ONCE(nhdr->n_descsz);
-+
-+		new_off = note_off + sizeof(Elf32_Nhdr);
-+		if (check_add_overflow(new_off, ALIGN(name_sz, 4), &new_off) ||
-+		    check_add_overflow(new_off, ALIGN(desc_sz, 4), &new_off) ||
-+		    new_off > note_size)
-+			break;
- 
- 		if (nhdr->n_type == BUILD_ID &&
--		    nhdr->n_namesz == sizeof("GNU") &&
--		    !strcmp((char *)(nhdr + 1), "GNU") &&
--		    nhdr->n_descsz > 0 &&
--		    nhdr->n_descsz <= BUILD_ID_SIZE_MAX) {
--			memcpy(build_id,
--			       note_start + note_offs +
--			       ALIGN(sizeof("GNU"), 4) + sizeof(Elf32_Nhdr),
--			       nhdr->n_descsz);
--			memset(build_id + nhdr->n_descsz, 0,
--			       BUILD_ID_SIZE_MAX - nhdr->n_descsz);
-+		    name_sz == note_name_sz &&
-+		    memcmp(nhdr + 1, note_name, note_name_sz) == 0 &&
-+		    desc_sz > 0 && desc_sz <= BUILD_ID_SIZE_MAX) {
-+			data = note_start + note_off + ALIGN(note_name_sz, 4);
-+			memcpy(build_id, data, desc_sz);
-+			memset(build_id + desc_sz, 0, BUILD_ID_SIZE_MAX - desc_sz);
- 			if (size)
--				*size = nhdr->n_descsz;
-+				*size = desc_sz;
- 			return 0;
- 		}
--		new_offs = note_offs + sizeof(Elf32_Nhdr) +
--			ALIGN(nhdr->n_namesz, 4) + ALIGN(nhdr->n_descsz, 4);
--		if (new_offs <= note_offs)  /* overflow */
--			break;
--		note_offs = new_offs;
-+
-+		note_off = new_off;
- 	}
- 
- 	return -EINVAL;
-@@ -71,20 +77,28 @@ static int get_build_id_32(const void *page_addr, unsigned char *build_id,
- {
- 	Elf32_Ehdr *ehdr = (Elf32_Ehdr *)page_addr;
- 	Elf32_Phdr *phdr;
--	int i;
-+	__u32 i, phnum;
-+
-+	/*
-+	 * FIXME
-+	 * Neither ELF spec nor ELF loader require that program headers
-+	 * start immediately after ELF header.
-+	 */
-+	if (ehdr->e_phoff != sizeof(Elf32_Ehdr))
-+		return -EINVAL;
- 
-+	phnum = READ_ONCE(ehdr->e_phnum);
- 	/* only supports phdr that fits in one page */
--	if (ehdr->e_phnum >
--	    (PAGE_SIZE - sizeof(Elf32_Ehdr)) / sizeof(Elf32_Phdr))
-+	if (phnum > (PAGE_SIZE - sizeof(Elf32_Ehdr)) / sizeof(Elf32_Phdr))
- 		return -EINVAL;
- 
- 	phdr = (Elf32_Phdr *)(page_addr + sizeof(Elf32_Ehdr));
- 
--	for (i = 0; i < ehdr->e_phnum; ++i) {
-+	for (i = 0; i < phnum; ++i) {
- 		if (phdr[i].p_type == PT_NOTE &&
- 		    !parse_build_id(page_addr, build_id, size,
--				    page_addr + phdr[i].p_offset,
--				    phdr[i].p_filesz))
-+				    page_addr + READ_ONCE(phdr[i].p_offset),
-+				    READ_ONCE(phdr[i].p_filesz)))
- 			return 0;
- 	}
- 	return -EINVAL;
-@@ -96,20 +110,28 @@ static int get_build_id_64(const void *page_addr, unsigned char *build_id,
- {
- 	Elf64_Ehdr *ehdr = (Elf64_Ehdr *)page_addr;
- 	Elf64_Phdr *phdr;
--	int i;
-+	__u32 i, phnum;
-+
-+	/*
-+	 * FIXME
-+	 * Neither ELF spec nor ELF loader require that program headers
-+	 * start immediately after ELF header.
-+	 */
-+	if (ehdr->e_phoff != sizeof(Elf64_Ehdr))
-+		return -EINVAL;
- 
-+	phnum = READ_ONCE(ehdr->e_phnum);
- 	/* only supports phdr that fits in one page */
--	if (ehdr->e_phnum >
--	    (PAGE_SIZE - sizeof(Elf64_Ehdr)) / sizeof(Elf64_Phdr))
-+	if (phnum > (PAGE_SIZE - sizeof(Elf64_Ehdr)) / sizeof(Elf64_Phdr))
- 		return -EINVAL;
- 
- 	phdr = (Elf64_Phdr *)(page_addr + sizeof(Elf64_Ehdr));
- 
--	for (i = 0; i < ehdr->e_phnum; ++i) {
-+	for (i = 0; i < phnum; ++i) {
- 		if (phdr[i].p_type == PT_NOTE &&
- 		    !parse_build_id(page_addr, build_id, size,
--				    page_addr + phdr[i].p_offset,
--				    phdr[i].p_filesz))
-+				    page_addr + READ_ONCE(phdr[i].p_offset),
-+				    READ_ONCE(phdr[i].p_filesz)))
- 			return 0;
- 	}
- 	return -EINVAL;
-@@ -138,6 +160,10 @@ int build_id_parse(struct vm_area_struct *vma, unsigned char *build_id,
- 	page = find_get_page(vma->vm_file->f_mapping, 0);
- 	if (!page)
- 		return -EFAULT;	/* page not mapped */
-+	if (!PageUptodate(page)) {
-+		put_page(page);
-+		return -EFAULT;
-+	}
- 
- 	ret = -EINVAL;
- 	page_addr = kmap_atomic(page);
-diff --git a/mm/Kconfig b/mm/Kconfig
-index ece4f2847e2b43..c11cd01169e8d1 100644
---- a/mm/Kconfig
-+++ b/mm/Kconfig
-@@ -147,12 +147,15 @@ config ZSWAP_ZPOOL_DEFAULT_ZBUD
- 	help
- 	  Use the zbud allocator as the default allocator.
- 
--config ZSWAP_ZPOOL_DEFAULT_Z3FOLD
--	bool "z3fold"
--	select Z3FOLD
-+config ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED
-+	bool "z3foldi (DEPRECATED)"
-+	select Z3FOLD_DEPRECATED
- 	help
- 	  Use the z3fold allocator as the default allocator.
- 
-+	  Deprecated and scheduled for removal in a few cycles,
-+	  see CONFIG_Z3FOLD_DEPRECATED.
-+
- config ZSWAP_ZPOOL_DEFAULT_ZSMALLOC
- 	bool "zsmalloc"
- 	select ZSMALLOC
-@@ -164,7 +167,7 @@ config ZSWAP_ZPOOL_DEFAULT
-        string
-        depends on ZSWAP
-        default "zbud" if ZSWAP_ZPOOL_DEFAULT_ZBUD
--       default "z3fold" if ZSWAP_ZPOOL_DEFAULT_Z3FOLD
-+       default "z3fold" if ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED
-        default "zsmalloc" if ZSWAP_ZPOOL_DEFAULT_ZSMALLOC
-        default ""
- 
-@@ -178,15 +181,25 @@ config ZBUD
- 	  deterministic reclaim properties that make it preferable to a higher
- 	  density approach when reclaim will be used.
- 
--config Z3FOLD
--	tristate "3:1 compression allocator (z3fold)"
-+config Z3FOLD_DEPRECATED
-+	tristate "3:1 compression allocator (z3fold) (DEPRECATED)"
- 	depends on ZSWAP
- 	help
-+	  Deprecated and scheduled for removal in a few cycles. If you have
-+	  a good reason for using Z3FOLD over ZSMALLOC, please contact
-+	  linux-mm@kvack.org and the zswap maintainers.
-+
- 	  A special purpose allocator for storing compressed pages.
- 	  It is designed to store up to three compressed pages per physical
- 	  page. It is a ZBUD derivative so the simplicity and determinism are
- 	  still there.
- 
-+config Z3FOLD
-+	tristate
-+	default y if Z3FOLD_DEPRECATED=y
-+	default m if Z3FOLD_DEPRECATED=m
-+	depends on Z3FOLD_DEPRECATED
-+
- config ZSMALLOC
- 	tristate
- 	prompt "N:1 compression allocator (zsmalloc)" if ZSWAP
-diff --git a/mm/slab_common.c b/mm/slab_common.c
-index 8d431193c27360..ef971fcdaa0708 100644
---- a/mm/slab_common.c
-+++ b/mm/slab_common.c
-@@ -1388,6 +1388,13 @@ __do_krealloc(const void *p, size_t new_size, gfp_t flags)
- 
- 	/* If the object still fits, repoison it precisely. */
- 	if (ks >= new_size) {
-+		/* Zero out spare memory. */
-+		if (want_init_on_alloc(flags)) {
-+			kasan_disable_current();
-+			memset((void *)p + new_size, 0, ks - new_size);
-+			kasan_enable_current();
-+		}
-+
- 		p = kasan_krealloc((void *)p, new_size, flags);
- 		return (void *)p;
- 	}
-diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
-index 1b56355c40eaf5..f787b0eb7d669b 100644
---- a/net/bluetooth/hci_core.c
-+++ b/net/bluetooth/hci_core.c
-@@ -3755,6 +3755,8 @@ static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
- 
- 	hci_dev_lock(hdev);
- 	conn = hci_conn_hash_lookup_handle(hdev, handle);
-+	if (conn && hci_dev_test_flag(hdev, HCI_MGMT))
-+		mgmt_device_connected(hdev, conn, NULL, 0);
- 	hci_dev_unlock(hdev);
- 
- 	if (conn) {
-diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
-index d81c7fccdd4045..da056cca3edbcf 100644
---- a/net/bluetooth/hci_event.c
-+++ b/net/bluetooth/hci_event.c
-@@ -3707,7 +3707,7 @@ static void hci_remote_features_evt(struct hci_dev *hdev, void *data,
- 		goto unlock;
- 	}
- 
--	if (!ev->status && !test_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) {
-+	if (!ev->status) {
- 		struct hci_cp_remote_name_req cp;
- 		memset(&cp, 0, sizeof(cp));
- 		bacpy(&cp.bdaddr, &conn->dst);
-@@ -5324,19 +5324,16 @@ static void hci_user_confirm_request_evt(struct hci_dev *hdev, void *data,
- 		goto unlock;
- 	}
- 
--	/* If no side requires MITM protection; auto-accept */
-+	/* If no side requires MITM protection; use JUST_CFM method */
- 	if ((!loc_mitm || conn->remote_cap == HCI_IO_NO_INPUT_OUTPUT) &&
- 	    (!rem_mitm || conn->io_capability == HCI_IO_NO_INPUT_OUTPUT)) {
- 
--		/* If we're not the initiators request authorization to
--		 * proceed from user space (mgmt_user_confirm with
--		 * confirm_hint set to 1). The exception is if neither
--		 * side had MITM or if the local IO capability is
--		 * NoInputNoOutput, in which case we do auto-accept
-+		/* If we're not the initiator of request authorization and the
-+		 * local IO capability is not NoInputNoOutput, use JUST_WORKS
-+		 * method (mgmt_user_confirm with confirm_hint set to 1).
- 		 */
- 		if (!test_bit(HCI_CONN_AUTH_PEND, &conn->flags) &&
--		    conn->io_capability != HCI_IO_NO_INPUT_OUTPUT &&
--		    (loc_mitm || rem_mitm)) {
-+		    conn->io_capability != HCI_IO_NO_INPUT_OUTPUT) {
- 			bt_dev_dbg(hdev, "Confirming auto-accept as acceptor");
- 			confirm_hint = 1;
- 			goto confirm;
-diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
-index 3d904ca92e9e8e..69c2ba1e843eb4 100644
---- a/net/bluetooth/hci_sock.c
-+++ b/net/bluetooth/hci_sock.c
-@@ -1943,10 +1943,9 @@ static int hci_sock_setsockopt_old(struct socket *sock, int level, int optname,
- 
- 	switch (optname) {
- 	case HCI_DATA_DIR:
--		if (copy_from_sockptr(&opt, optval, sizeof(opt))) {
--			err = -EFAULT;
-+		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, len);
-+		if (err)
- 			break;
--		}
- 
- 		if (opt)
- 			hci_pi(sk)->cmsg_mask |= HCI_CMSG_DIR;
-@@ -1955,10 +1954,9 @@ static int hci_sock_setsockopt_old(struct socket *sock, int level, int optname,
- 		break;
- 
- 	case HCI_TIME_STAMP:
--		if (copy_from_sockptr(&opt, optval, sizeof(opt))) {
--			err = -EFAULT;
-+		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, len);
-+		if (err)
- 			break;
--		}
- 
- 		if (opt)
- 			hci_pi(sk)->cmsg_mask |= HCI_CMSG_TSTAMP;
-@@ -1976,11 +1974,9 @@ static int hci_sock_setsockopt_old(struct socket *sock, int level, int optname,
- 			uf.event_mask[1] = *((u32 *) f->event_mask + 1);
- 		}
- 
--		len = min_t(unsigned int, len, sizeof(uf));
--		if (copy_from_sockptr(&uf, optval, len)) {
--			err = -EFAULT;
-+		err = bt_copy_from_sockptr(&uf, sizeof(uf), optval, len);
-+		if (err)
- 			break;
--		}
- 
- 		if (!capable(CAP_NET_RAW)) {
- 			uf.type_mask &= hci_sec_filter.type_mask;
-@@ -2039,10 +2035,9 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
- 			goto done;
- 		}
- 
--		if (copy_from_sockptr(&opt, optval, sizeof(opt))) {
--			err = -EFAULT;
-+		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, len);
-+		if (err)
- 			break;
--		}
- 
- 		hci_pi(sk)->mtu = opt;
- 		break;
-diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
-index 3ccba592f7349c..c46d123c30e14a 100644
---- a/net/bluetooth/iso.c
-+++ b/net/bluetooth/iso.c
-@@ -1349,7 +1349,7 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
- 			       sockptr_t optval, unsigned int optlen)
- {
- 	struct sock *sk = sock->sk;
--	int len, err = 0;
-+	int err = 0;
- 	struct bt_iso_qos qos = default_qos;
- 	u32 opt;
- 
-@@ -1364,10 +1364,9 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
- 			break;
- 		}
- 
--		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
--			err = -EFAULT;
-+		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen);
-+		if (err)
- 			break;
--		}
- 
- 		if (opt)
- 			set_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
-@@ -1376,10 +1375,9 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
- 		break;
- 
- 	case BT_PKT_STATUS:
--		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
--			err = -EFAULT;
-+		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen);
-+		if (err)
- 			break;
--		}
- 
- 		if (opt)
- 			set_bit(BT_SK_PKT_STATUS, &bt_sk(sk)->flags);
-@@ -1394,17 +1392,9 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
- 			break;
- 		}
- 
--		len = min_t(unsigned int, sizeof(qos), optlen);
--
--		if (copy_from_sockptr(&qos, optval, len)) {
--			err = -EFAULT;
--			break;
--		}
--
--		if (len == sizeof(qos.ucast) && !check_ucast_qos(&qos)) {
--			err = -EINVAL;
-+		err = bt_copy_from_sockptr(&qos, sizeof(qos), optval, optlen);
-+		if (err)
- 			break;
--		}
- 
- 		iso_pi(sk)->qos = qos;
- 		iso_pi(sk)->qos_user_set = true;
-@@ -1419,18 +1409,16 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
- 		}
- 
- 		if (optlen > sizeof(iso_pi(sk)->base)) {
--			err = -EOVERFLOW;
-+			err = -EINVAL;
- 			break;
- 		}
- 
--		len = min_t(unsigned int, sizeof(iso_pi(sk)->base), optlen);
--
--		if (copy_from_sockptr(iso_pi(sk)->base, optval, len)) {
--			err = -EFAULT;
-+		err = bt_copy_from_sockptr(iso_pi(sk)->base, optlen, optval,
-+					   optlen);
-+		if (err)
- 			break;
--		}
- 
--		iso_pi(sk)->base_len = len;
-+		iso_pi(sk)->base_len = optlen;
- 
- 		break;
- 
-diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
-index 2651cc2d5c283f..93651c421767a0 100644
---- a/net/bluetooth/l2cap_core.c
-+++ b/net/bluetooth/l2cap_core.c
-@@ -4064,17 +4064,9 @@ static void l2cap_connect(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd,
- static int l2cap_connect_req(struct l2cap_conn *conn,
- 			     struct l2cap_cmd_hdr *cmd, u16 cmd_len, u8 *data)
- {
--	struct hci_dev *hdev = conn->hcon->hdev;
--	struct hci_conn *hcon = conn->hcon;
--
- 	if (cmd_len < sizeof(struct l2cap_conn_req))
- 		return -EPROTO;
- 
--	hci_dev_lock(hdev);
--	if (hci_dev_test_flag(hdev, HCI_MGMT))
--		mgmt_device_connected(hdev, hcon, NULL, 0);
--	hci_dev_unlock(hdev);
--
- 	l2cap_connect(conn, cmd, data, L2CAP_CONN_RSP);
- 	return 0;
- }
-diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
-index 5d332e69c7e1ab..f04ce84267988f 100644
---- a/net/bluetooth/l2cap_sock.c
-+++ b/net/bluetooth/l2cap_sock.c
-@@ -727,7 +727,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
- 	struct sock *sk = sock->sk;
- 	struct l2cap_chan *chan = l2cap_pi(sk)->chan;
- 	struct l2cap_options opts;
--	int len, err = 0;
-+	int err = 0;
- 	u32 opt;
- 
- 	BT_DBG("sk %p", sk);
-@@ -754,11 +754,9 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
- 		opts.max_tx   = chan->max_tx;
- 		opts.txwin_size = chan->tx_win;
- 
--		len = min_t(unsigned int, sizeof(opts), optlen);
--		if (copy_from_sockptr(&opts, optval, len)) {
--			err = -EFAULT;
-+		err = bt_copy_from_sockptr(&opts, sizeof(opts), optval, optlen);
-+		if (err)
- 			break;
--		}
- 
- 		if (opts.txwin_size > L2CAP_DEFAULT_EXT_WINDOW) {
- 			err = -EINVAL;
-@@ -801,10 +799,9 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
- 		break;
- 
- 	case L2CAP_LM:
--		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
--			err = -EFAULT;
-+		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen);
-+		if (err)
- 			break;
--		}
- 
- 		if (opt & L2CAP_LM_FIPS) {
- 			err = -EINVAL;
-@@ -885,7 +882,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
- 	struct bt_security sec;
- 	struct bt_power pwr;
- 	struct l2cap_conn *conn;
--	int len, err = 0;
-+	int err = 0;
- 	u32 opt;
- 	u16 mtu;
- 	u8 mode;
-@@ -911,11 +908,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
- 
- 		sec.level = BT_SECURITY_LOW;
- 
--		len = min_t(unsigned int, sizeof(sec), optlen);
--		if (copy_from_sockptr(&sec, optval, len)) {
--			err = -EFAULT;
-+		err = bt_copy_from_sockptr(&sec, sizeof(sec), optval, optlen);
-+		if (err)
- 			break;
--		}
- 
- 		if (sec.level < BT_SECURITY_LOW ||
- 		    sec.level > BT_SECURITY_FIPS) {
-@@ -960,10 +955,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
- 			break;
- 		}
- 
--		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
--			err = -EFAULT;
-+		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen);
-+		if (err)
- 			break;
--		}
- 
- 		if (opt) {
- 			set_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
-@@ -975,10 +969,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
- 		break;
- 
- 	case BT_FLUSHABLE:
--		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
--			err = -EFAULT;
-+		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen);
-+		if (err)
- 			break;
--		}
- 
- 		if (opt > BT_FLUSHABLE_ON) {
- 			err = -EINVAL;
-@@ -1010,11 +1003,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
- 
- 		pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
- 
--		len = min_t(unsigned int, sizeof(pwr), optlen);
--		if (copy_from_sockptr(&pwr, optval, len)) {
--			err = -EFAULT;
-+		err = bt_copy_from_sockptr(&pwr, sizeof(pwr), optval, optlen);
-+		if (err)
- 			break;
--		}
- 
- 		if (pwr.force_active)
- 			set_bit(FLAG_FORCE_ACTIVE, &chan->flags);
-@@ -1023,10 +1014,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
- 		break;
- 
- 	case BT_CHANNEL_POLICY:
--		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
--			err = -EFAULT;
-+		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen);
-+		if (err)
- 			break;
--		}
- 
- 		err = -EOPNOTSUPP;
- 		break;
-@@ -1055,10 +1045,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
- 			break;
- 		}
- 
--		if (copy_from_sockptr(&mtu, optval, sizeof(u16))) {
--			err = -EFAULT;
-+		err = bt_copy_from_sockptr(&mtu, sizeof(mtu), optval, optlen);
-+		if (err)
- 			break;
--		}
- 
- 		if (chan->mode == L2CAP_MODE_EXT_FLOWCTL &&
- 		    sk->sk_state == BT_CONNECTED)
-@@ -1086,10 +1075,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
- 			break;
- 		}
- 
--		if (copy_from_sockptr(&mode, optval, sizeof(u8))) {
--			err = -EFAULT;
-+		err = bt_copy_from_sockptr(&mode, sizeof(mode), optval, optlen);
-+		if (err)
- 			break;
--		}
- 
- 		BT_DBG("mode %u", mode);
- 
-diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
-index 149aff29e56469..1f3a39c20a9114 100644
---- a/net/bluetooth/mgmt.c
-+++ b/net/bluetooth/mgmt.c
-@@ -1446,10 +1446,15 @@ static void cmd_status_rsp(struct mgmt_pending_cmd *cmd, void *data)
- 
- static void cmd_complete_rsp(struct mgmt_pending_cmd *cmd, void *data)
- {
--	if (cmd->cmd_complete) {
--		u8 *status = data;
-+	struct cmd_lookup *match = data;
-+
-+	/* dequeue cmd_sync entries using cmd as data as that is about to be
-+	 * removed/freed.
-+	 */
-+	hci_cmd_sync_dequeue(match->hdev, NULL, cmd, NULL);
- 
--		cmd->cmd_complete(cmd, *status);
-+	if (cmd->cmd_complete) {
-+		cmd->cmd_complete(cmd, match->mgmt_status);
- 		mgmt_pending_remove(cmd);
- 
- 		return;
-@@ -9342,12 +9347,12 @@ void mgmt_index_added(struct hci_dev *hdev)
- void mgmt_index_removed(struct hci_dev *hdev)
- {
- 	struct mgmt_ev_ext_index ev;
--	u8 status = MGMT_STATUS_INVALID_INDEX;
-+	struct cmd_lookup match = { NULL, hdev, MGMT_STATUS_INVALID_INDEX };
- 
- 	if (test_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks))
- 		return;
- 
--	mgmt_pending_foreach(0, hdev, cmd_complete_rsp, &status);
-+	mgmt_pending_foreach(0, hdev, cmd_complete_rsp, &match);
- 
- 	if (hci_dev_test_flag(hdev, HCI_UNCONFIGURED)) {
- 		mgmt_index_event(MGMT_EV_UNCONF_INDEX_REMOVED, hdev, NULL, 0,
-@@ -9398,7 +9403,7 @@ void mgmt_power_on(struct hci_dev *hdev, int err)
- void __mgmt_power_off(struct hci_dev *hdev)
- {
- 	struct cmd_lookup match = { NULL, hdev };
--	u8 status, zero_cod[] = { 0, 0, 0 };
-+	u8 zero_cod[] = { 0, 0, 0 };
- 
- 	mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match);
- 
-@@ -9410,11 +9415,11 @@ void __mgmt_power_off(struct hci_dev *hdev)
- 	 * status responses.
- 	 */
- 	if (hci_dev_test_flag(hdev, HCI_UNREGISTER))
--		status = MGMT_STATUS_INVALID_INDEX;
-+		match.mgmt_status = MGMT_STATUS_INVALID_INDEX;
- 	else
--		status = MGMT_STATUS_NOT_POWERED;
-+		match.mgmt_status = MGMT_STATUS_NOT_POWERED;
- 
--	mgmt_pending_foreach(0, hdev, cmd_complete_rsp, &status);
-+	mgmt_pending_foreach(0, hdev, cmd_complete_rsp, &match);
- 
- 	if (memcmp(hdev->dev_class, zero_cod, sizeof(zero_cod)) != 0) {
- 		mgmt_limited_event(MGMT_EV_CLASS_OF_DEV_CHANGED, hdev,
-diff --git a/net/core/dev.c b/net/core/dev.c
-index 5a5bd339f11eb9..70f757707f1a2f 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -3500,7 +3500,7 @@ static netdev_features_t gso_features_check(const struct sk_buff *skb,
- 	if (gso_segs > READ_ONCE(dev->gso_max_segs))
- 		return features & ~NETIF_F_GSO_MASK;
- 
--	if (unlikely(skb->len >= READ_ONCE(dev->gso_max_size)))
-+	if (unlikely(skb->len >= netif_get_gso_max_size(dev, skb)))
- 		return features & ~NETIF_F_GSO_MASK;
- 
- 	if (!skb_shinfo(skb)->gso_type) {
-@@ -3746,7 +3746,7 @@ static void qdisc_pkt_len_init(struct sk_buff *skb)
- 						sizeof(_tcphdr), &_tcphdr);
- 			if (likely(th))
- 				hdr_len += __tcp_hdrlen(th);
--		} else {
-+		} else if (shinfo->gso_type & SKB_GSO_UDP_L4) {
- 			struct udphdr _udphdr;
- 
- 			if (skb_header_pointer(skb, hdr_len,
-@@ -3754,10 +3754,14 @@ static void qdisc_pkt_len_init(struct sk_buff *skb)
- 				hdr_len += sizeof(struct udphdr);
- 		}
- 
--		if (shinfo->gso_type & SKB_GSO_DODGY)
--			gso_segs = DIV_ROUND_UP(skb->len - hdr_len,
--						shinfo->gso_size);
-+		if (unlikely(shinfo->gso_type & SKB_GSO_DODGY)) {
-+			int payload = skb->len - hdr_len;
- 
-+			/* Malicious packet. */
-+			if (payload <= 0)
-+				return;
-+			gso_segs = DIV_ROUND_UP(payload, shinfo->gso_size);
-+		}
- 		qdisc_skb_cb(skb)->pkt_len += (gso_segs - 1) * hdr_len;
- 	}
- }
-diff --git a/net/core/gro.c b/net/core/gro.c
-index 31e40f25fdf109..85d3f686ba539b 100644
---- a/net/core/gro.c
-+++ b/net/core/gro.c
-@@ -100,7 +100,6 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb)
- 	unsigned int headlen = skb_headlen(skb);
- 	unsigned int len = skb_gro_len(skb);
- 	unsigned int delta_truesize;
--	unsigned int gro_max_size;
- 	unsigned int new_truesize;
- 	struct sk_buff *lp;
- 	int segs;
-@@ -114,12 +113,8 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb)
- 	if (p->pp_recycle != skb->pp_recycle)
- 		return -ETOOMANYREFS;
- 
--	/* pairs with WRITE_ONCE() in netif_set_gro(_ipv4)_max_size() */
--	gro_max_size = p->protocol == htons(ETH_P_IPV6) ?
--			READ_ONCE(p->dev->gro_max_size) :
--			READ_ONCE(p->dev->gro_ipv4_max_size);
--
--	if (unlikely(p->len + len >= gro_max_size || NAPI_GRO_CB(skb)->flush))
-+	if (unlikely(p->len + len >= netif_get_gro_max_size(p->dev, p) ||
-+		     NAPI_GRO_CB(skb)->flush))
- 		return -E2BIG;
- 
- 	if (unlikely(p->len + len >= GRO_LEGACY_MAX_SIZE)) {
-diff --git a/net/core/netpoll.c b/net/core/netpoll.c
-index 55bcacf67df3b6..e0821390040937 100644
---- a/net/core/netpoll.c
-+++ b/net/core/netpoll.c
-@@ -626,12 +626,9 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev)
- 	const struct net_device_ops *ops;
- 	int err;
- 
--	np->dev = ndev;
--	strscpy(np->dev_name, ndev->name, IFNAMSIZ);
--
- 	if (ndev->priv_flags & IFF_DISABLE_NETPOLL) {
- 		np_err(np, "%s doesn't support polling, aborting\n",
--		       np->dev_name);
-+		       ndev->name);
- 		err = -ENOTSUPP;
- 		goto out;
- 	}
-@@ -649,7 +646,7 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev)
- 
- 		refcount_set(&npinfo->refcnt, 1);
- 
--		ops = np->dev->netdev_ops;
-+		ops = ndev->netdev_ops;
- 		if (ops->ndo_netpoll_setup) {
- 			err = ops->ndo_netpoll_setup(ndev, npinfo);
- 			if (err)
-@@ -660,6 +657,8 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev)
- 		refcount_inc(&npinfo->refcnt);
- 	}
- 
-+	np->dev = ndev;
-+	strscpy(np->dev_name, ndev->name, IFNAMSIZ);
- 	npinfo->netpoll = np;
- 
- 	/* last thing to do is link it to the net device structure */
-@@ -677,6 +676,7 @@ EXPORT_SYMBOL_GPL(__netpoll_setup);
- int netpoll_setup(struct netpoll *np)
- {
- 	struct net_device *ndev = NULL;
-+	bool ip_overwritten = false;
- 	struct in_device *in_dev;
- 	int err;
- 
-@@ -741,6 +741,7 @@ int netpoll_setup(struct netpoll *np)
- 			}
- 
- 			np->local_ip.ip = ifa->ifa_local;
-+			ip_overwritten = true;
- 			np_info(np, "local IP %pI4\n", &np->local_ip.ip);
- 		} else {
- #if IS_ENABLED(CONFIG_IPV6)
-@@ -757,6 +758,7 @@ int netpoll_setup(struct netpoll *np)
- 					    !!(ipv6_addr_type(&np->remote_ip.in6) & IPV6_ADDR_LINKLOCAL))
- 						continue;
- 					np->local_ip.in6 = ifp->addr;
-+					ip_overwritten = true;
- 					err = 0;
- 					break;
- 				}
-@@ -787,6 +789,9 @@ int netpoll_setup(struct netpoll *np)
- 	return 0;
- 
- put:
-+	DEBUG_NET_WARN_ON_ONCE(np->dev);
-+	if (ip_overwritten)
-+		memset(&np->local_ip, 0, sizeof(np->local_ip));
- 	netdev_put(ndev, &np->dev_tracker);
- unlock:
- 	rtnl_unlock();
-diff --git a/net/dsa/slave.c b/net/dsa/slave.c
-index 48db91b33390bb..9328ca004fd900 100644
---- a/net/dsa/slave.c
-+++ b/net/dsa/slave.c
-@@ -2822,13 +2822,14 @@ EXPORT_SYMBOL_GPL(dsa_slave_dev_check);
- static int dsa_slave_changeupper(struct net_device *dev,
- 				 struct netdev_notifier_changeupper_info *info)
- {
--	struct dsa_port *dp = dsa_slave_to_port(dev);
- 	struct netlink_ext_ack *extack;
- 	int err = NOTIFY_DONE;
-+	struct dsa_port *dp;
- 
- 	if (!dsa_slave_dev_check(dev))
- 		return err;
- 
-+	dp = dsa_slave_to_port(dev);
- 	extack = netdev_notifier_info_to_extack(&info->info);
- 
- 	if (netif_is_bridge_master(info->upper_dev)) {
-@@ -2881,11 +2882,13 @@ static int dsa_slave_changeupper(struct net_device *dev,
- static int dsa_slave_prechangeupper(struct net_device *dev,
- 				    struct netdev_notifier_changeupper_info *info)
- {
--	struct dsa_port *dp = dsa_slave_to_port(dev);
-+	struct dsa_port *dp;
- 
- 	if (!dsa_slave_dev_check(dev))
- 		return NOTIFY_DONE;
- 
-+	dp = dsa_slave_to_port(dev);
-+
- 	if (netif_is_bridge_master(info->upper_dev) && !info->linking)
- 		dsa_port_pre_bridge_leave(dp, info->upper_dev);
- 	else if (netif_is_lag_master(info->upper_dev) && !info->linking)
-diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
-index bc74f131fe4dfa..cb0c80328eebf3 100644
---- a/net/ipv4/devinet.c
-+++ b/net/ipv4/devinet.c
-@@ -569,10 +569,6 @@ static int inet_set_ifa(struct net_device *dev, struct in_ifaddr *ifa)
- 
- 	ASSERT_RTNL();
- 
--	if (!in_dev) {
--		inet_free_ifa(ifa);
--		return -ENOBUFS;
--	}
- 	ipv4_devconf_setall(in_dev);
- 	neigh_parms_data_state_setall(in_dev->arp_parms);
- 	if (ifa->ifa_dev != in_dev) {
-@@ -1174,6 +1170,8 @@ int devinet_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr)
- 
- 		if (!ifa) {
- 			ret = -ENOBUFS;
-+			if (!in_dev)
-+				break;
- 			ifa = inet_alloc_ifa();
- 			if (!ifa)
- 				break;
-diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
-index 390f4be7f7bec2..90ce87ffed4617 100644
---- a/net/ipv4/fib_frontend.c
-+++ b/net/ipv4/fib_frontend.c
-@@ -1343,7 +1343,7 @@ static void nl_fib_lookup(struct net *net, struct fib_result_nl *frn)
- 	struct flowi4           fl4 = {
- 		.flowi4_mark = frn->fl_mark,
- 		.daddr = frn->fl_addr,
--		.flowi4_tos = frn->fl_tos,
-+		.flowi4_tos = frn->fl_tos & IPTOS_RT_MASK,
- 		.flowi4_scope = frn->fl_scope,
- 	};
- 	struct fib_table *tb;
-diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
-index f21a1a54037239..890c15510b4210 100644
---- a/net/ipv4/ip_gre.c
-+++ b/net/ipv4/ip_gre.c
-@@ -645,11 +645,11 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb,
- 		if (skb_cow_head(skb, 0))
- 			goto free_skb;
- 
--		tnl_params = (const struct iphdr *)skb->data;
--
--		if (!pskb_network_may_pull(skb, pull_len))
-+		if (!pskb_may_pull(skb, pull_len))
- 			goto free_skb;
- 
-+		tnl_params = (const struct iphdr *)skb->data;
-+
- 		/* ip_tunnel_xmit() needs skb->data pointing to gre header. */
- 		skb_pull(skb, pull_len);
- 		skb_reset_mac_header(skb);
-diff --git a/net/ipv4/netfilter/nf_dup_ipv4.c b/net/ipv4/netfilter/nf_dup_ipv4.c
-index 6cc5743c553a02..9a21175693db58 100644
---- a/net/ipv4/netfilter/nf_dup_ipv4.c
-+++ b/net/ipv4/netfilter/nf_dup_ipv4.c
-@@ -52,8 +52,9 @@ void nf_dup_ipv4(struct net *net, struct sk_buff *skb, unsigned int hooknum,
- {
- 	struct iphdr *iph;
- 
-+	local_bh_disable();
- 	if (this_cpu_read(nf_skb_duplicated))
--		return;
-+		goto out;
- 	/*
- 	 * Copy the skb, and route the copy. Will later return %XT_CONTINUE for
- 	 * the original skb, which should continue on its way as if nothing has
-@@ -61,7 +62,7 @@ void nf_dup_ipv4(struct net *net, struct sk_buff *skb, unsigned int hooknum,
- 	 */
- 	skb = pskb_copy(skb, GFP_ATOMIC);
- 	if (skb == NULL)
--		return;
-+		goto out;
- 
- #if IS_ENABLED(CONFIG_NF_CONNTRACK)
- 	/* Avoid counting cloned packets towards the original connection. */
-@@ -90,6 +91,8 @@ void nf_dup_ipv4(struct net *net, struct sk_buff *skb, unsigned int hooknum,
- 	} else {
- 		kfree_skb(skb);
- 	}
-+out:
-+	local_bh_enable();
- }
- EXPORT_SYMBOL_GPL(nf_dup_ipv4);
- 
-diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
-index 96d235bcf5cb22..df3ddf31f8e673 100644
---- a/net/ipv4/tcp_ipv4.c
-+++ b/net/ipv4/tcp_ipv4.c
-@@ -116,6 +116,9 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp)
- 	const struct tcp_timewait_sock *tcptw = tcp_twsk(sktw);
- 	struct tcp_sock *tp = tcp_sk(sk);
- 
-+	if (tw->tw_substate == TCP_FIN_WAIT2)
-+		reuse = 0;
-+
- 	if (reuse == 2) {
- 		/* Still does not detect *everything* that goes through
- 		 * lo, since we require a loopback src or dst address
-diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
-index f544016e6eb3f0..a727eeafd0a96d 100644
---- a/net/ipv4/udp_offload.c
-+++ b/net/ipv4/udp_offload.c
-@@ -290,8 +290,26 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,
- 		return NULL;
- 	}
- 
--	if (skb_shinfo(gso_skb)->gso_type & SKB_GSO_FRAGLIST)
--		return __udp_gso_segment_list(gso_skb, features, is_ipv6);
-+	if (skb_shinfo(gso_skb)->gso_type & SKB_GSO_FRAGLIST) {
-+		 /* Detect modified geometry and pass those to skb_segment. */
-+		if (skb_pagelen(gso_skb) - sizeof(*uh) == skb_shinfo(gso_skb)->gso_size)
-+			return __udp_gso_segment_list(gso_skb, features, is_ipv6);
-+
-+		 /* Setup csum, as fraglist skips this in udp4_gro_receive. */
-+		gso_skb->csum_start = skb_transport_header(gso_skb) - gso_skb->head;
-+		gso_skb->csum_offset = offsetof(struct udphdr, check);
-+		gso_skb->ip_summed = CHECKSUM_PARTIAL;
-+
-+		uh = udp_hdr(gso_skb);
-+		if (is_ipv6)
-+			uh->check = ~udp_v6_check(gso_skb->len,
-+						  &ipv6_hdr(gso_skb)->saddr,
-+						  &ipv6_hdr(gso_skb)->daddr, 0);
-+		else
-+			uh->check = ~udp_v4_check(gso_skb->len,
-+						  ip_hdr(gso_skb)->saddr,
-+						  ip_hdr(gso_skb)->daddr, 0);
-+	}
- 
- 	skb_pull(gso_skb, sizeof(*uh));
- 
-diff --git a/net/ipv6/netfilter/nf_dup_ipv6.c b/net/ipv6/netfilter/nf_dup_ipv6.c
-index a0a2de30be3e7b..0c39c77fe8a8a4 100644
---- a/net/ipv6/netfilter/nf_dup_ipv6.c
-+++ b/net/ipv6/netfilter/nf_dup_ipv6.c
-@@ -47,11 +47,12 @@ static bool nf_dup_ipv6_route(struct net *net, struct sk_buff *skb,
- void nf_dup_ipv6(struct net *net, struct sk_buff *skb, unsigned int hooknum,
- 		 const struct in6_addr *gw, int oif)
- {
-+	local_bh_disable();
- 	if (this_cpu_read(nf_skb_duplicated))
--		return;
-+		goto out;
- 	skb = pskb_copy(skb, GFP_ATOMIC);
- 	if (skb == NULL)
--		return;
-+		goto out;
- 
- #if IS_ENABLED(CONFIG_NF_CONNTRACK)
- 	nf_reset_ct(skb);
-@@ -69,6 +70,8 @@ void nf_dup_ipv6(struct net *net, struct sk_buff *skb, unsigned int hooknum,
- 	} else {
- 		kfree_skb(skb);
- 	}
-+out:
-+	local_bh_enable();
- }
- EXPORT_SYMBOL_GPL(nf_dup_ipv6);
- 
-diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
-index 68952752b5990f..c09aed6a3cfcc8 100644
---- a/net/mac80211/chan.c
-+++ b/net/mac80211/chan.c
-@@ -245,7 +245,9 @@ ieee80211_get_max_required_bw(struct ieee80211_sub_if_data *sdata,
- 	enum nl80211_chan_width max_bw = NL80211_CHAN_WIDTH_20_NOHT;
- 	struct sta_info *sta;
- 
--	list_for_each_entry_rcu(sta, &sdata->local->sta_list, list) {
-+	lockdep_assert_wiphy(sdata->local->hw.wiphy);
-+
-+	list_for_each_entry(sta, &sdata->local->sta_list, list) {
- 		if (sdata != sta->sdata &&
- 		    !(sta->sdata->bss && sta->sdata->bss == sdata->bss))
- 			continue;
-diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
-index 42e2c84ed2484a..b14c809bcdea33 100644
---- a/net/mac80211/mlme.c
-+++ b/net/mac80211/mlme.c
-@@ -732,7 +732,7 @@ static bool ieee80211_add_vht_ie(struct ieee80211_sub_if_data *sdata,
- 		bool disable_mu_mimo = false;
- 		struct ieee80211_sub_if_data *other;
- 
--		list_for_each_entry_rcu(other, &local->interfaces, list) {
-+		list_for_each_entry(other, &local->interfaces, list) {
- 			if (other->vif.bss_conf.mu_mimo_owner) {
- 				disable_mu_mimo = true;
- 				break;
-diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
-index b58d061333c523..933a58895432f0 100644
---- a/net/mac80211/scan.c
-+++ b/net/mac80211/scan.c
-@@ -489,7 +489,7 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
- 	 * the scan was in progress; if there was none this will
- 	 * just be a no-op for the particular interface.
- 	 */
--	list_for_each_entry_rcu(sdata, &local->interfaces, list) {
-+	list_for_each_entry(sdata, &local->interfaces, list) {
- 		if (ieee80211_sdata_running(sdata))
- 			wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work);
- 	}
-diff --git a/net/mac80211/util.c b/net/mac80211/util.c
-index d682c32821a110..02b5aaad2a155c 100644
---- a/net/mac80211/util.c
-+++ b/net/mac80211/util.c
-@@ -745,7 +745,9 @@ static void __iterate_interfaces(struct ieee80211_local *local,
- 	struct ieee80211_sub_if_data *sdata;
- 	bool active_only = iter_flags & IEEE80211_IFACE_ITER_ACTIVE;
- 
--	list_for_each_entry_rcu(sdata, &local->interfaces, list) {
-+	list_for_each_entry_rcu(sdata, &local->interfaces, list,
-+				lockdep_is_held(&local->iflist_mtx) ||
-+				lockdep_is_held(&local->hw.wiphy->mtx)) {
- 		switch (sdata->vif.type) {
- 		case NL80211_IFTYPE_MONITOR:
- 			if (!(sdata->u.mntr.flags & MONITOR_FLAG_ACTIVE))
-diff --git a/net/mac802154/scan.c b/net/mac802154/scan.c
-index d9658f2c4ae6be..c9f72f271c4ea1 100644
---- a/net/mac802154/scan.c
-+++ b/net/mac802154/scan.c
-@@ -176,6 +176,7 @@ void mac802154_scan_worker(struct work_struct *work)
- 	struct ieee802154_local *local =
- 		container_of(work, struct ieee802154_local, scan_work.work);
- 	struct cfg802154_scan_request *scan_req;
-+	enum nl802154_scan_types scan_req_type;
- 	struct ieee802154_sub_if_data *sdata;
- 	unsigned int scan_duration = 0;
- 	struct wpan_phy *wpan_phy;
-@@ -209,6 +210,7 @@ void mac802154_scan_worker(struct work_struct *work)
- 	}
- 
- 	wpan_phy = scan_req->wpan_phy;
-+	scan_req_type = scan_req->type;
- 	scan_req_duration = scan_req->duration;
- 
- 	/* Look for the next valid chan */
-@@ -246,7 +248,7 @@ void mac802154_scan_worker(struct work_struct *work)
- 		goto end_scan;
- 	}
- 
--	if (scan_req->type == NL802154_SCAN_ACTIVE) {
-+	if (scan_req_type == NL802154_SCAN_ACTIVE) {
- 		ret = mac802154_transmit_beacon_req(local, sdata);
- 		if (ret)
- 			dev_err(&sdata->dev->dev,
-diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
-index da7fd3919ce483..aacb0d7f82e9f8 100644
---- a/net/netfilter/nf_tables_api.c
-+++ b/net/netfilter/nf_tables_api.c
-@@ -594,6 +594,12 @@ static int nft_mapelem_deactivate(const struct nft_ctx *ctx,
- 				  const struct nft_set_iter *iter,
- 				  struct nft_set_elem *elem)
- {
-+	struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
-+
-+	if (!nft_set_elem_active(ext, iter->genmask))
-+		return 0;
-+
-+	nft_set_elem_change_active(ctx->net, set, ext);
- 	nft_setelem_data_deactivate(ctx->net, set, elem);
- 
- 	return 0;
-@@ -619,6 +625,7 @@ static void nft_map_catchall_deactivate(const struct nft_ctx *ctx,
- 			continue;
- 
- 		elem.priv = catchall->elem;
-+		nft_set_elem_change_active(ctx->net, set, ext);
- 		nft_setelem_data_deactivate(ctx->net, set, &elem);
- 		break;
- 	}
-@@ -3820,6 +3827,9 @@ int nft_setelem_validate(const struct nft_ctx *ctx, struct nft_set *set,
- 	const struct nft_data *data;
- 	int err;
- 
-+	if (!nft_set_elem_active(ext, iter->genmask))
-+		return 0;
-+
- 	if (nft_set_ext_exists(ext, NFT_SET_EXT_FLAGS) &&
- 	    *nft_set_ext_flags(ext) & NFT_SET_ELEM_INTERVAL_END)
- 		return 0;
-@@ -3843,19 +3853,22 @@ int nft_setelem_validate(const struct nft_ctx *ctx, struct nft_set *set,
- 
- int nft_set_catchall_validate(const struct nft_ctx *ctx, struct nft_set *set)
- {
--	u8 genmask = nft_genmask_next(ctx->net);
-+	struct nft_set_iter dummy_iter = {
-+		.genmask	= nft_genmask_next(ctx->net),
-+	};
- 	struct nft_set_elem_catchall *catchall;
- 	struct nft_set_elem elem;
-+
- 	struct nft_set_ext *ext;
- 	int ret = 0;
- 
- 	list_for_each_entry_rcu(catchall, &set->catchall_list, list) {
- 		ext = nft_set_elem_ext(set, catchall->elem);
--		if (!nft_set_elem_active(ext, genmask))
-+		if (!nft_set_elem_active(ext, dummy_iter.genmask))
- 			continue;
- 
- 		elem.priv = catchall->elem;
--		ret = nft_setelem_validate(ctx, set, NULL, &elem);
-+		ret = nft_setelem_validate(ctx, set, &dummy_iter, &elem);
- 		if (ret < 0)
- 			return ret;
- 	}
-@@ -5347,6 +5360,11 @@ static int nf_tables_bind_check_setelem(const struct nft_ctx *ctx,
- 					const struct nft_set_iter *iter,
- 					struct nft_set_elem *elem)
- {
-+	const struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
-+
-+	if (!nft_set_elem_active(ext, iter->genmask))
-+		return 0;
-+
- 	return nft_setelem_data_validate(ctx, set, elem);
- }
- 
-@@ -5441,6 +5459,13 @@ static int nft_mapelem_activate(const struct nft_ctx *ctx,
- 				const struct nft_set_iter *iter,
- 				struct nft_set_elem *elem)
- {
-+	struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
-+
-+	/* called from abort path, reverse check to undo changes. */
-+	if (nft_set_elem_active(ext, iter->genmask))
-+		return 0;
-+
-+	nft_clear(ctx->net, ext);
- 	nft_setelem_data_activate(ctx->net, set, elem);
- 
- 	return 0;
-@@ -5459,6 +5484,7 @@ static void nft_map_catchall_activate(const struct nft_ctx *ctx,
- 		if (!nft_set_elem_active(ext, genmask))
- 			continue;
- 
-+		nft_clear(ctx->net, ext);
- 		elem.priv = catchall->elem;
- 		nft_setelem_data_activate(ctx->net, set, &elem);
- 		break;
-@@ -5733,6 +5759,9 @@ static int nf_tables_dump_setelem(const struct nft_ctx *ctx,
- 	const struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
- 	struct nft_set_dump_args *args;
- 
-+	if (!nft_set_elem_active(ext, iter->genmask))
-+		return 0;
-+
- 	if (nft_set_elem_expired(ext) || nft_set_elem_is_dead(ext))
- 		return 0;
- 
-@@ -6500,7 +6529,7 @@ static void nft_setelem_activate(struct net *net, struct nft_set *set,
- 	struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
- 
- 	if (nft_setelem_is_catchall(set, elem)) {
--		nft_set_elem_change_active(net, set, ext);
-+		nft_clear(net, ext);
- 	} else {
- 		set->ops->activate(net, set, elem);
- 	}
-@@ -7061,6 +7090,16 @@ void nft_data_hold(const struct nft_data *data, enum nft_data_types type)
- 	}
- }
- 
-+static int nft_setelem_active_next(const struct net *net,
-+				   const struct nft_set *set,
-+				   struct nft_set_elem *elem)
-+{
-+	const struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
-+	u8 genmask = nft_genmask_next(net);
-+
-+	return nft_set_elem_active(ext, genmask);
-+}
-+
- static void nft_setelem_data_activate(const struct net *net,
- 				      const struct nft_set *set,
- 				      struct nft_set_elem *elem)
-@@ -7184,9 +7223,13 @@ static int nft_setelem_flush(const struct nft_ctx *ctx,
- 			     const struct nft_set_iter *iter,
- 			     struct nft_set_elem *elem)
- {
-+	const struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
- 	struct nft_trans *trans;
- 	int err;
- 
-+	if (!nft_set_elem_active(ext, iter->genmask))
-+		return 0;
-+
- 	trans = nft_trans_alloc_gfp(ctx, NFT_MSG_DELSETELEM,
- 				    sizeof(struct nft_trans_elem), GFP_ATOMIC);
- 	if (!trans)
-@@ -10538,8 +10581,10 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)
- 		case NFT_MSG_DESTROYSETELEM:
- 			te = (struct nft_trans_elem *)trans->data;
- 
--			nft_setelem_data_activate(net, te->set, &te->elem);
--			nft_setelem_activate(net, te->set, &te->elem);
-+			if (!nft_setelem_active_next(net, te->set, &te->elem)) {
-+				nft_setelem_data_activate(net, te->set, &te->elem);
-+				nft_setelem_activate(net, te->set, &te->elem);
-+			}
- 			if (!nft_setelem_is_catchall(te->set, &te->elem))
- 				te->set->ndeact--;
- 
-diff --git a/net/netfilter/nft_set_bitmap.c b/net/netfilter/nft_set_bitmap.c
-index 1e5e7a181e0bc2..cbf7f7825f1b88 100644
---- a/net/netfilter/nft_set_bitmap.c
-+++ b/net/netfilter/nft_set_bitmap.c
-@@ -171,7 +171,7 @@ static void nft_bitmap_activate(const struct net *net,
- 	nft_bitmap_location(set, nft_set_ext_key(&be->ext), &idx, &off);
- 	/* Enter 11 state. */
- 	priv->bitmap[idx] |= (genmask << off);
--	nft_set_elem_change_active(net, set, &be->ext);
-+	nft_clear(net, &be->ext);
- }
- 
- static bool nft_bitmap_flush(const struct net *net,
-@@ -223,8 +223,6 @@ static void nft_bitmap_walk(const struct nft_ctx *ctx,
- 	list_for_each_entry_rcu(be, &priv->list, head) {
- 		if (iter->count < iter->skip)
- 			goto cont;
--		if (!nft_set_elem_active(&be->ext, iter->genmask))
--			goto cont;
- 
- 		elem.priv = be;
- 
-diff --git a/net/netfilter/nft_set_hash.c b/net/netfilter/nft_set_hash.c
-index 2013de934cef09..3a96d4a77a228a 100644
---- a/net/netfilter/nft_set_hash.c
-+++ b/net/netfilter/nft_set_hash.c
-@@ -189,7 +189,7 @@ static void nft_rhash_activate(const struct net *net, const struct nft_set *set,
- {
- 	struct nft_rhash_elem *he = elem->priv;
- 
--	nft_set_elem_change_active(net, set, &he->ext);
-+	nft_clear(net, &he->ext);
- }
- 
- static bool nft_rhash_flush(const struct net *net,
-@@ -277,8 +277,6 @@ static void nft_rhash_walk(const struct nft_ctx *ctx, struct nft_set *set,
- 
- 		if (iter->count < iter->skip)
- 			goto cont;
--		if (!nft_set_elem_active(&he->ext, iter->genmask))
--			goto cont;
- 
- 		elem.priv = he;
- 
-@@ -587,7 +585,7 @@ static void nft_hash_activate(const struct net *net, const struct nft_set *set,
- {
- 	struct nft_hash_elem *he = elem->priv;
- 
--	nft_set_elem_change_active(net, set, &he->ext);
-+	nft_clear(net, &he->ext);
- }
- 
- static bool nft_hash_flush(const struct net *net,
-@@ -641,8 +639,6 @@ static void nft_hash_walk(const struct nft_ctx *ctx, struct nft_set *set,
- 		hlist_for_each_entry_rcu(he, &priv->table[i], node) {
- 			if (iter->count < iter->skip)
- 				goto cont;
--			if (!nft_set_elem_active(&he->ext, iter->genmask))
--				goto cont;
- 
- 			elem.priv = he;
- 
-diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c
-index 22407e7e0b51e3..334958ef8d66c8 100644
---- a/net/netfilter/nft_set_pipapo.c
-+++ b/net/netfilter/nft_set_pipapo.c
-@@ -1766,7 +1766,7 @@ static void nft_pipapo_activate(const struct net *net,
- {
- 	struct nft_pipapo_elem *e = elem->priv;
- 
--	nft_set_elem_change_active(net, set, &e->ext);
-+	nft_clear(net, &e->ext);
- }
- 
- /**
-@@ -2068,9 +2068,6 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set,
- 
- 		e = f->mt[r].e;
- 
--		if (!nft_set_elem_active(&e->ext, iter->genmask))
--			goto cont;
--
- 		elem.priv = e;
- 
- 		iter->err = iter->fn(ctx, set, iter, &elem);
-diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c
-index 5bf5572e945cc3..afbda7e3fd0487 100644
---- a/net/netfilter/nft_set_rbtree.c
-+++ b/net/netfilter/nft_set_rbtree.c
-@@ -527,7 +527,7 @@ static void nft_rbtree_activate(const struct net *net,
- {
- 	struct nft_rbtree_elem *rbe = elem->priv;
- 
--	nft_set_elem_change_active(net, set, &rbe->ext);
-+	nft_clear(net, &rbe->ext);
- }
- 
- static bool nft_rbtree_flush(const struct net *net,
-@@ -596,8 +596,6 @@ static void nft_rbtree_walk(const struct nft_ctx *ctx,
- 
- 		if (iter->count < iter->skip)
- 			goto cont;
--		if (!nft_set_elem_active(&rbe->ext, iter->genmask))
--			goto cont;
- 
- 		elem.priv = rbe;
- 
-diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
-index d431376bb120ab..66ad7dc10864e0 100644
---- a/net/rxrpc/ar-internal.h
-+++ b/net/rxrpc/ar-internal.h
-@@ -1066,7 +1066,7 @@ bool rxrpc_direct_abort(struct sk_buff *skb, enum rxrpc_abort_reason why,
- int rxrpc_io_thread(void *data);
- static inline void rxrpc_wake_up_io_thread(struct rxrpc_local *local)
- {
--	wake_up_process(local->io_thread);
-+	wake_up_process(READ_ONCE(local->io_thread));
- }
- 
- static inline bool rxrpc_protocol_error(struct sk_buff *skb, enum rxrpc_abort_reason why)
-diff --git a/net/rxrpc/io_thread.c b/net/rxrpc/io_thread.c
-index 4a3a08a0e2cd04..d7e72bae4d2b2c 100644
---- a/net/rxrpc/io_thread.c
-+++ b/net/rxrpc/io_thread.c
-@@ -27,11 +27,17 @@ int rxrpc_encap_rcv(struct sock *udp_sk, struct sk_buff *skb)
- {
- 	struct sk_buff_head *rx_queue;
- 	struct rxrpc_local *local = rcu_dereference_sk_user_data(udp_sk);
-+	struct task_struct *io_thread;
- 
- 	if (unlikely(!local)) {
- 		kfree_skb(skb);
- 		return 0;
- 	}
-+	io_thread = READ_ONCE(local->io_thread);
-+	if (!io_thread) {
-+		kfree_skb(skb);
-+		return 0;
-+	}
- 	if (skb->tstamp == 0)
- 		skb->tstamp = ktime_get_real();
- 
-@@ -47,7 +53,7 @@ int rxrpc_encap_rcv(struct sock *udp_sk, struct sk_buff *skb)
- #endif
- 
- 	skb_queue_tail(rx_queue, skb);
--	rxrpc_wake_up_io_thread(local);
-+	wake_up_process(io_thread);
- 	return 0;
- }
- 
-@@ -554,7 +560,7 @@ int rxrpc_io_thread(void *data)
- 	__set_current_state(TASK_RUNNING);
- 	rxrpc_see_local(local, rxrpc_local_stop);
- 	rxrpc_destroy_local(local);
--	local->io_thread = NULL;
-+	WRITE_ONCE(local->io_thread, NULL);
- 	rxrpc_see_local(local, rxrpc_local_stopped);
- 	return 0;
- }
-diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c
-index 34d30736813531..8da6120f65330e 100644
---- a/net/rxrpc/local_object.c
-+++ b/net/rxrpc/local_object.c
-@@ -232,7 +232,7 @@ static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net)
- 	}
- 
- 	wait_for_completion(&local->io_thread_ready);
--	local->io_thread = io_thread;
-+	WRITE_ONCE(local->io_thread, io_thread);
- 	_leave(" = 0");
- 	return 0;
- 
-diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
-index 418d4a846d04a8..87090d67903621 100644
---- a/net/sched/sch_taprio.c
-+++ b/net/sched/sch_taprio.c
-@@ -1975,7 +1975,9 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt,
- 			goto unlock;
- 		}
- 
--		rcu_assign_pointer(q->admin_sched, new_admin);
-+		/* Not going to race against advance_sched(), but still */
-+		admin = rcu_replace_pointer(q->admin_sched, new_admin,
-+					    lockdep_rtnl_is_held());
- 		if (admin)
- 			call_rcu(&admin->rcu, taprio_free_sched_cb);
- 	} else {
-diff --git a/net/sctp/socket.c b/net/sctp/socket.c
-index 225dfacfd233fd..4a1ebe46d045d8 100644
---- a/net/sctp/socket.c
-+++ b/net/sctp/socket.c
-@@ -8551,8 +8551,10 @@ static int sctp_listen_start(struct sock *sk, int backlog)
- 	 */
- 	inet_sk_set_state(sk, SCTP_SS_LISTENING);
- 	if (!ep->base.bind_addr.port) {
--		if (sctp_autobind(sk))
-+		if (sctp_autobind(sk)) {
-+			inet_sk_set_state(sk, SCTP_SS_CLOSED);
- 			return -EAGAIN;
-+		}
- 	} else {
- 		if (sctp_get_port(sk, inet_sk(sk)->inet_num)) {
- 			inet_sk_set_state(sk, SCTP_SS_CLOSED);
-diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
-index 878415c4352761..fec638e494c9dd 100644
---- a/net/tipc/bearer.c
-+++ b/net/tipc/bearer.c
-@@ -163,8 +163,12 @@ static int bearer_name_validate(const char *name,
- 
- 	/* return bearer name components, if necessary */
- 	if (name_parts) {
--		strcpy(name_parts->media_name, media_name);
--		strcpy(name_parts->if_name, if_name);
-+		if (strscpy(name_parts->media_name, media_name,
-+			    TIPC_MAX_MEDIA_NAME) < 0)
-+			return 0;
-+		if (strscpy(name_parts->if_name, if_name,
-+			    TIPC_MAX_IF_NAME) < 0)
-+			return 0;
- 	}
- 	return 1;
- }
-diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
-index 4ce23762b1c954..9e74f249cb45f1 100644
---- a/net/wireless/nl80211.c
-+++ b/net/wireless/nl80211.c
-@@ -10048,7 +10048,20 @@ static int nl80211_start_radar_detection(struct sk_buff *skb,
- 
- 	err = rdev_start_radar_detection(rdev, dev, &chandef, cac_time_ms);
- 	if (!err) {
--		wdev->links[0].ap.chandef = chandef;
-+		switch (wdev->iftype) {
-+		case NL80211_IFTYPE_AP:
-+		case NL80211_IFTYPE_P2P_GO:
-+			wdev->links[0].ap.chandef = chandef;
-+			break;
-+		case NL80211_IFTYPE_ADHOC:
-+			wdev->u.ibss.chandef = chandef;
-+			break;
-+		case NL80211_IFTYPE_MESH_POINT:
-+			wdev->u.mesh.chandef = chandef;
-+			break;
-+		default:
-+			break;
-+		}
- 		wdev->cac_started = true;
- 		wdev->cac_start_time = jiffies;
- 		wdev->cac_time_ms = cac_time_ms;
-diff --git a/rust/kernel/sync/locked_by.rs b/rust/kernel/sync/locked_by.rs
-index b17ee5cd98f3eb..48546ad37335b6 100644
---- a/rust/kernel/sync/locked_by.rs
-+++ b/rust/kernel/sync/locked_by.rs
-@@ -80,8 +80,12 @@ pub struct LockedBy<T: ?Sized, U: ?Sized> {
- // SAFETY: `LockedBy` can be transferred across thread boundaries iff the data it protects can.
- unsafe impl<T: ?Sized + Send, U: ?Sized> Send for LockedBy<T, U> {}
- 
--// SAFETY: `LockedBy` serialises the interior mutability it provides, so it is `Sync` as long as the
--// data it protects is `Send`.
-+// SAFETY: If `T` is not `Sync`, then parallel shared access to this `LockedBy` allows you to use
-+// `access_mut` to hand out `&mut T` on one thread at the time. The requirement that `T: Send` is
-+// sufficient to allow that.
-+//
-+// If `T` is `Sync`, then the `access` method also becomes available, which allows you to obtain
-+// several `&T` from several threads at once. However, this is okay as `T` is `Sync`.
- unsafe impl<T: ?Sized + Send, U: ?Sized> Sync for LockedBy<T, U> {}
- 
- impl<T, U> LockedBy<T, U> {
-@@ -115,7 +119,10 @@ impl<T: ?Sized, U> LockedBy<T, U> {
-     ///
-     /// Panics if `owner` is different from the data protected by the lock used in
-     /// [`new`](LockedBy::new).
--    pub fn access<'a>(&'a self, owner: &'a U) -> &'a T {
-+    pub fn access<'a>(&'a self, owner: &'a U) -> &'a T
-+    where
-+        T: Sync,
-+    {
-         build_assert!(
-             size_of::<U>() > 0,
-             "`U` cannot be a ZST because `owner` wouldn't be unique"
-@@ -124,7 +131,10 @@ pub fn access<'a>(&'a self, owner: &'a U) -> &'a T {
-             panic!("mismatched owners");
-         }
- 
--        // SAFETY: `owner` is evidence that the owner is locked.
-+        // SAFETY: `owner` is evidence that there are only shared references to the owner for the
-+        // duration of 'a, so it's not possible to use `Self::access_mut` to obtain a mutable
-+        // reference to the inner value that aliases with this shared reference. The type is `Sync`
-+        // so there are no other requirements.
-         unsafe { &*self.data.get() }
-     }
- 
-diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
-index 620a3527c767af..4f3ba3debc08e1 100644
---- a/scripts/kconfig/qconf.cc
-+++ b/scripts/kconfig/qconf.cc
-@@ -1174,7 +1174,7 @@ void ConfigInfoView::clicked(const QUrl &url)
- {
- 	QByteArray str = url.toEncoded();
- 	const std::size_t count = str.size();
--	char *data = new char[count + 1];
-+	char *data = new char[count + 2];  // '$' + '\0'
- 	struct symbol **result;
- 	struct menu *m = NULL;
- 
-diff --git a/security/Kconfig b/security/Kconfig
-index 52c9af08ad35d3..39af8b8696efb0 100644
---- a/security/Kconfig
-+++ b/security/Kconfig
-@@ -19,6 +19,38 @@ config SECURITY_DMESG_RESTRICT
- 
- 	  If you are unsure how to answer this question, answer N.
- 
-+choice
-+	prompt "Allow /proc/pid/mem access override"
-+	default PROC_MEM_ALWAYS_FORCE
-+	help
-+	  Traditionally /proc/pid/mem allows users to override memory
-+	  permissions for users like ptrace, assuming they have ptrace
-+	  capability.
-+
-+	  This allows people to limit that - either never override, or
-+	  require actual active ptrace attachment.
-+
-+	  Defaults to the traditional behavior (for now)
-+
-+config PROC_MEM_ALWAYS_FORCE
-+	bool "Traditional /proc/pid/mem behavior"
-+	help
-+	  This allows /proc/pid/mem accesses to override memory mapping
-+	  permissions if you have ptrace access rights.
-+
-+config PROC_MEM_FORCE_PTRACE
-+	bool "Require active ptrace() use for access override"
-+	help
-+	  This allows /proc/pid/mem accesses to override memory mapping
-+	  permissions for active ptracers like gdb.
-+
-+config PROC_MEM_NO_FORCE
-+	bool "Never"
-+	help
-+	  Never override memory mapping permissions
-+
-+endchoice
-+
- config SECURITY
- 	bool "Enable different security models"
- 	depends on SYSFS
-diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c
-index 90b53500a236bd..aed9e3ef2c9ecb 100644
---- a/security/tomoyo/domain.c
-+++ b/security/tomoyo/domain.c
-@@ -723,10 +723,13 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm)
- 	ee->r.obj = &ee->obj;
- 	ee->obj.path1 = bprm->file->f_path;
- 	/* Get symlink's pathname of program. */
--	retval = -ENOENT;
- 	exename.name = tomoyo_realpath_nofollow(original_name);
--	if (!exename.name)
--		goto out;
-+	if (!exename.name) {
-+		/* Fallback to realpath if symlink's pathname does not exist. */
-+		exename.name = tomoyo_realpath_from_path(&bprm->file->f_path);
-+		if (!exename.name)
-+			goto out;
-+	}
- 	tomoyo_fill_path_info(&exename);
- retry:
- 	/* Check 'aggregator' directive. */
-diff --git a/sound/core/init.c b/sound/core/init.c
-index b2b7e50ff4cc3b..81186af3ac625c 100644
---- a/sound/core/init.c
-+++ b/sound/core/init.c
-@@ -666,13 +666,19 @@ void snd_card_free(struct snd_card *card)
- }
- EXPORT_SYMBOL(snd_card_free);
- 
-+/* check, if the character is in the valid ASCII range */
-+static inline bool safe_ascii_char(char c)
-+{
-+	return isascii(c) && isalnum(c);
-+}
-+
- /* retrieve the last word of shortname or longname */
- static const char *retrieve_id_from_card_name(const char *name)
- {
- 	const char *spos = name;
- 
- 	while (*name) {
--		if (isspace(*name) && isalnum(name[1]))
-+		if (isspace(*name) && safe_ascii_char(name[1]))
- 			spos = name + 1;
- 		name++;
- 	}
-@@ -699,12 +705,12 @@ static void copy_valid_id_string(struct snd_card *card, const char *src,
- {
- 	char *id = card->id;
- 
--	while (*nid && !isalnum(*nid))
-+	while (*nid && !safe_ascii_char(*nid))
- 		nid++;
- 	if (isdigit(*nid))
- 		*id++ = isalpha(*src) ? *src : 'D';
- 	while (*nid && (size_t)(id - card->id) < sizeof(card->id) - 1) {
--		if (isalnum(*nid))
-+		if (safe_ascii_char(*nid))
- 			*id++ = *nid;
- 		nid++;
- 	}
-@@ -800,7 +806,7 @@ static ssize_t id_store(struct device *dev, struct device_attribute *attr,
- 
- 	for (idx = 0; idx < copy; idx++) {
- 		c = buf[idx];
--		if (!isalnum(c) && c != '_' && c != '-')
-+		if (!safe_ascii_char(c) && c != '_' && c != '-')
- 			return -EINVAL;
- 	}
- 	memcpy(buf1, buf, copy);
-diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
-index dae2da3808351b..abc99ae3332824 100644
---- a/sound/core/oss/mixer_oss.c
-+++ b/sound/core/oss/mixer_oss.c
-@@ -967,8 +967,8 @@ static void snd_mixer_oss_slot_free(struct snd_mixer_oss_slot *chn)
- 	struct slot *p = chn->private_data;
- 	if (p) {
- 		if (p->allocated && p->assigned) {
--			kfree_const(p->assigned->name);
--			kfree_const(p->assigned);
-+			kfree(p->assigned->name);
-+			kfree(p->assigned);
- 		}
- 		kfree(p);
- 	}
-diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c
-index 850544725da796..d55c3dc229c0e8 100644
---- a/sound/isa/gus/gus_pcm.c
-+++ b/sound/isa/gus/gus_pcm.c
-@@ -378,7 +378,7 @@ static int snd_gf1_pcm_playback_copy(struct snd_pcm_substream *substream,
- 
- 	bpos = get_bpos(pcmp, voice, pos, len);
- 	if (bpos < 0)
--		return pos;
-+		return bpos;
- 	if (copy_from_iter(runtime->dma_area + bpos, len, src) != len)
- 		return -EFAULT;
- 	return playback_copy_ack(substream, bpos, len);
-@@ -395,7 +395,7 @@ static int snd_gf1_pcm_playback_silence(struct snd_pcm_substream *substream,
- 	
- 	bpos = get_bpos(pcmp, voice, pos, len);
- 	if (bpos < 0)
--		return pos;
-+		return bpos;
- 	snd_pcm_format_set_silence(runtime->format, runtime->dma_area + bpos,
- 				   bytes_to_samples(runtime, count));
- 	return playback_copy_ack(substream, bpos, len);
-diff --git a/sound/pci/asihpi/hpimsgx.c b/sound/pci/asihpi/hpimsgx.c
-index d0caef2994818e..b68e6bfbbfbab5 100644
---- a/sound/pci/asihpi/hpimsgx.c
-+++ b/sound/pci/asihpi/hpimsgx.c
-@@ -708,7 +708,7 @@ static u16 HPIMSGX__init(struct hpi_message *phm,
- 		phr->error = HPI_ERROR_PROCESSING_MESSAGE;
- 		return phr->error;
- 	}
--	if (hr.error == 0) {
-+	if (hr.error == 0 && hr.u.s.adapter_index < HPI_MAX_ADAPTERS) {
- 		/* the adapter was created successfully
- 		   save the mapping for future use */
- 		hpi_entry_points[hr.u.s.adapter_index] = entry_point_func;
-diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h
-index f31cb31d463621..8556031bcd68e4 100644
---- a/sound/pci/hda/hda_controller.h
-+++ b/sound/pci/hda/hda_controller.h
-@@ -28,7 +28,7 @@
- #else
- #define AZX_DCAPS_I915_COMPONENT 0		/* NOP */
- #endif
--#define AZX_DCAPS_AMD_ALLOC_FIX	(1 << 14)	/* AMD allocation workaround */
-+/* 14 unused */
- #define AZX_DCAPS_CTX_WORKAROUND (1 << 15)	/* X-Fi workaround */
- #define AZX_DCAPS_POSFIX_LPIB	(1 << 16)	/* Use LPIB as default */
- #define AZX_DCAPS_AMD_WORKAROUND (1 << 17)	/* AMD-specific workaround */
-diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
-index d3ed3e21b1979f..8e8d4c667923c5 100644
---- a/sound/pci/hda/hda_generic.c
-+++ b/sound/pci/hda/hda_generic.c
-@@ -1383,7 +1383,7 @@ static int try_assign_dacs(struct hda_codec *codec, int num_outs,
- 		struct nid_path *path;
- 		hda_nid_t pin = pins[i];
- 
--		if (!spec->obey_preferred_dacs) {
-+		if (!spec->preferred_dacs) {
- 			path = snd_hda_get_path_from_idx(codec, path_idx[i]);
- 			if (path) {
- 				badness += assign_out_path_ctls(codec, path);
-@@ -1395,7 +1395,7 @@ static int try_assign_dacs(struct hda_codec *codec, int num_outs,
- 		if (dacs[i]) {
- 			if (is_dac_already_used(codec, dacs[i]))
- 				badness += bad->shared_primary;
--		} else if (spec->obey_preferred_dacs) {
-+		} else if (spec->preferred_dacs) {
- 			badness += BAD_NO_PRIMARY_DAC;
- 		}
- 
-diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
-index d5c9f113e477a5..a6a9d353fe635a 100644
---- a/sound/pci/hda/hda_intel.c
-+++ b/sound/pci/hda/hda_intel.c
-@@ -40,7 +40,6 @@
- 
- #ifdef CONFIG_X86
- /* for snoop control */
--#include <linux/dma-map-ops.h>
- #include <asm/set_memory.h>
- #include <asm/cpufeature.h>
- #endif
-@@ -302,7 +301,7 @@ enum {
- 
- /* quirks for ATI HDMI with snoop off */
- #define AZX_DCAPS_PRESET_ATI_HDMI_NS \
--	(AZX_DCAPS_PRESET_ATI_HDMI | AZX_DCAPS_AMD_ALLOC_FIX)
-+	(AZX_DCAPS_PRESET_ATI_HDMI | AZX_DCAPS_SNOOP_OFF)
- 
- /* quirks for AMD SB */
- #define AZX_DCAPS_PRESET_AMD_SB \
-@@ -1716,13 +1715,6 @@ static void azx_check_snoop_available(struct azx *chip)
- 	if (chip->driver_caps & AZX_DCAPS_SNOOP_OFF)
- 		snoop = false;
- 
--#ifdef CONFIG_X86
--	/* check the presence of DMA ops (i.e. IOMMU), disable snoop conditionally */
--	if ((chip->driver_caps & AZX_DCAPS_AMD_ALLOC_FIX) &&
--	    !get_dma_ops(chip->card->dev))
--		snoop = false;
--#endif
--
- 	chip->snoop = snoop;
- 	if (!snoop) {
- 		dev_info(chip->card->dev, "Force to non-snoop mode\n");
-diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
-index 63bd0e384bae2c..8a3abd4babba6e 100644
---- a/sound/pci/hda/patch_conexant.c
-+++ b/sound/pci/hda/patch_conexant.c
-@@ -820,6 +820,23 @@ static const struct hda_pintbl cxt_pincfg_sws_js201d[] = {
- 	{}
- };
- 
-+/* pincfg quirk for Tuxedo Sirius;
-+ * unfortunately the (PCI) SSID conflicts with System76 Pangolin pang14,
-+ * which has incompatible pin setup, so we check the codec SSID (luckily
-+ * different one!) and conditionally apply the quirk here
-+ */
-+static void cxt_fixup_sirius_top_speaker(struct hda_codec *codec,
-+					 const struct hda_fixup *fix,
-+					 int action)
-+{
-+	/* ignore for incorrectly picked-up pang14 */
-+	if (codec->core.subsystem_id == 0x278212b3)
-+		return;
-+	/* set up the top speaker pin */
-+	if (action == HDA_FIXUP_ACT_PRE_PROBE)
-+		snd_hda_codec_set_pincfg(codec, 0x1d, 0x82170111);
-+}
-+
- static const struct hda_fixup cxt_fixups[] = {
- 	[CXT_PINCFG_LENOVO_X200] = {
- 		.type = HDA_FIXUP_PINS,
-@@ -980,11 +997,8 @@ static const struct hda_fixup cxt_fixups[] = {
- 		.v.pins = cxt_pincfg_sws_js201d,
- 	},
- 	[CXT_PINCFG_TOP_SPEAKER] = {
--		.type = HDA_FIXUP_PINS,
--		.v.pins = (const struct hda_pintbl[]) {
--			{ 0x1d, 0x82170111 },
--			{ }
--		},
-+		.type = HDA_FIXUP_FUNC,
-+		.v.func = cxt_fixup_sirius_top_speaker,
- 	},
- };
- 
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 130508f5ad9c8a..ebdd7c43233636 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -585,6 +585,7 @@ static void alc_shutup_pins(struct hda_codec *codec)
- 	switch (codec->core.vendor_id) {
- 	case 0x10ec0236:
- 	case 0x10ec0256:
-+	case 0x10ec0257:
- 	case 0x19e58326:
- 	case 0x10ec0283:
- 	case 0x10ec0285:
-@@ -9922,6 +9923,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
- 	SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED),
- 	SND_PCI_QUIRK(0x103c, 0x8898, "HP EliteBook 845 G8 Notebook PC", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),
- 	SND_PCI_QUIRK(0x103c, 0x88d0, "HP Pavilion 15-eh1xxx (mainboard 88D0)", ALC287_FIXUP_HP_GPIO_LED),
-+	SND_PCI_QUIRK(0x103c, 0x88dd, "HP Pavilion 15z-ec200", ALC285_FIXUP_HP_MUTE_LED),
- 	SND_PCI_QUIRK(0x103c, 0x8902, "HP OMEN 16", ALC285_FIXUP_HP_MUTE_LED),
- 	SND_PCI_QUIRK(0x103c, 0x890e, "HP 255 G8 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
- 	SND_PCI_QUIRK(0x103c, 0x8919, "HP Pavilion Aero Laptop 13-be0xxx", ALC287_FIXUP_HP_GPIO_LED),
-@@ -10329,6 +10331,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
- 	SND_PCI_QUIRK(0x17aa, 0x38cd, "Y790 VECO DUAL", ALC287_FIXUP_TAS2781_I2C),
- 	SND_PCI_QUIRK(0x17aa, 0x38d2, "Lenovo Yoga 9 14IMH9", ALC287_FIXUP_YOGA9_14IMH9_BASS_SPK_PIN),
- 	SND_PCI_QUIRK(0x17aa, 0x38d7, "Lenovo Yoga 9 14IMH9", ALC287_FIXUP_YOGA9_14IMH9_BASS_SPK_PIN),
-+	SND_PCI_QUIRK(0x17aa, 0x38df, "Y990 YG DUAL", ALC287_FIXUP_TAS2781_I2C),
- 	SND_PCI_QUIRK(0x17aa, 0x38f9, "Thinkbook 16P Gen5", ALC287_FIXUP_CS35L41_I2C_2),
- 	SND_PCI_QUIRK(0x17aa, 0x38fa, "Thinkbook 16P Gen5", ALC287_FIXUP_CS35L41_I2C_2),
- 	SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
-@@ -10361,6 +10364,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
- 	SND_PCI_QUIRK(0x1849, 0xa233, "Positivo Master C6300", ALC269_FIXUP_HEADSET_MIC),
- 	SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MACH-WX9", ALC256_FIXUP_HUAWEI_MACH_WX9_PINS),
- 	SND_PCI_QUIRK(0x19e5, 0x320f, "Huawei WRT-WX9 ", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),
-+	SND_PCI_QUIRK(0x19e5, 0x3212, "Huawei KLV-WX9 ", ALC256_FIXUP_ACER_HEADSET_MIC),
- 	SND_PCI_QUIRK(0x1b35, 0x1235, "CZC B20", ALC269_FIXUP_CZC_B20),
- 	SND_PCI_QUIRK(0x1b35, 0x1236, "CZC TMI", ALC269_FIXUP_CZC_TMI),
- 	SND_PCI_QUIRK(0x1b35, 0x1237, "CZC L101", ALC269_FIXUP_CZC_L101),
-diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
-index e7d1b43471a291..713ca262a0e979 100644
---- a/sound/pci/rme9652/hdsp.c
-+++ b/sound/pci/rme9652/hdsp.c
-@@ -1298,8 +1298,10 @@ static int snd_hdsp_midi_output_possible (struct hdsp *hdsp, int id)
- 
- static void snd_hdsp_flush_midi_input (struct hdsp *hdsp, int id)
- {
--	while (snd_hdsp_midi_input_available (hdsp, id))
--		snd_hdsp_midi_read_byte (hdsp, id);
-+	int count = 256;
-+
-+	while (snd_hdsp_midi_input_available(hdsp, id) && --count)
-+		snd_hdsp_midi_read_byte(hdsp, id);
- }
- 
- static int snd_hdsp_midi_output_write (struct hdsp_midi *hmidi)
-diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
-index 267c7848974aee..74215f57f4fc9d 100644
---- a/sound/pci/rme9652/hdspm.c
-+++ b/sound/pci/rme9652/hdspm.c
-@@ -1838,8 +1838,10 @@ static inline int snd_hdspm_midi_output_possible (struct hdspm *hdspm, int id)
- 
- static void snd_hdspm_flush_midi_input(struct hdspm *hdspm, int id)
- {
--	while (snd_hdspm_midi_input_available (hdspm, id))
--		snd_hdspm_midi_read_byte (hdspm, id);
-+	int count = 256;
-+
-+	while (snd_hdspm_midi_input_available(hdspm, id) && --count)
-+		snd_hdspm_midi_read_byte(hdspm, id);
- }
- 
- static int snd_hdspm_midi_output_write (struct hdspm_midi *hmidi)
-diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c
-index dcc4e14b3dde27..206bbb5aaab5d9 100644
---- a/sound/soc/atmel/mchp-pdmc.c
-+++ b/sound/soc/atmel/mchp-pdmc.c
-@@ -285,6 +285,9 @@ static int mchp_pdmc_chmap_ctl_put(struct snd_kcontrol *kcontrol,
- 	if (!substream)
- 		return -ENODEV;
- 
-+	if (!substream->runtime)
-+		return 0; /* just for avoiding error from alsactl restore */
-+
- 	map = mchp_pdmc_chmap_get(substream, info);
- 	if (!map)
- 		return -EINVAL;
-diff --git a/sound/soc/codecs/wsa883x.c b/sound/soc/codecs/wsa883x.c
-index 2169d939898419..1831d4487ba9d1 100644
---- a/sound/soc/codecs/wsa883x.c
-+++ b/sound/soc/codecs/wsa883x.c
-@@ -998,15 +998,19 @@ static const struct reg_sequence reg_init[] = {
- 	{WSA883X_GMAMP_SUP1, 0xE2},
- };
- 
--static void wsa883x_init(struct wsa883x_priv *wsa883x)
-+static int wsa883x_init(struct wsa883x_priv *wsa883x)
- {
- 	struct regmap *regmap = wsa883x->regmap;
--	int variant, version;
-+	int variant, version, ret;
- 
--	regmap_read(regmap, WSA883X_OTP_REG_0, &variant);
-+	ret = regmap_read(regmap, WSA883X_OTP_REG_0, &variant);
-+	if (ret)
-+		return ret;
- 	wsa883x->variant = variant & WSA883X_ID_MASK;
- 
--	regmap_read(regmap, WSA883X_CHIP_ID0, &version);
-+	ret = regmap_read(regmap, WSA883X_CHIP_ID0, &version);
-+	if (ret)
-+		return ret;
- 	wsa883x->version = version;
- 
- 	switch (wsa883x->variant) {
-@@ -1041,6 +1045,8 @@ static void wsa883x_init(struct wsa883x_priv *wsa883x)
- 				   WSA883X_DRE_OFFSET_MASK,
- 				   wsa883x->comp_offset);
- 	}
-+
-+	return 0;
- }
- 
- static int wsa883x_update_status(struct sdw_slave *slave,
-@@ -1049,7 +1055,7 @@ static int wsa883x_update_status(struct sdw_slave *slave,
- 	struct wsa883x_priv *wsa883x = dev_get_drvdata(&slave->dev);
- 
- 	if (status == SDW_SLAVE_ATTACHED && slave->dev_num > 0)
--		wsa883x_init(wsa883x);
-+		return wsa883x_init(wsa883x);
- 
- 	return 0;
- }
-diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c
-index 356a0bc3b126b3..f8144bf4c90d33 100644
---- a/sound/soc/fsl/imx-card.c
-+++ b/sound/soc/fsl/imx-card.c
-@@ -714,6 +714,7 @@ static int imx_card_probe(struct platform_device *pdev)
- 
- 	data->plat_data = plat_data;
- 	data->card.dev = &pdev->dev;
-+	data->card.owner = THIS_MODULE;
- 
- 	dev_set_drvdata(&pdev->dev, &data->card);
- 	snd_soc_card_set_drvdata(&data->card, data);
-diff --git a/sound/usb/card.c b/sound/usb/card.c
-index 1b2edc0fd2e992..7743ea983b1a81 100644
---- a/sound/usb/card.c
-+++ b/sound/usb/card.c
-@@ -382,6 +382,12 @@ static const struct usb_audio_device_name usb_audio_names[] = {
- 	/* Creative/Toshiba Multimedia Center SB-0500 */
- 	DEVICE_NAME(0x041e, 0x3048, "Toshiba", "SB-0500"),
- 
-+	/* Logitech Audio Devices */
-+	DEVICE_NAME(0x046d, 0x0867, "Logitech, Inc.", "Logi-MeetUp"),
-+	DEVICE_NAME(0x046d, 0x0874, "Logitech, Inc.", "Logi-Tap-Audio"),
-+	DEVICE_NAME(0x046d, 0x087c, "Logitech, Inc.", "Logi-Huddle"),
-+	DEVICE_NAME(0x046d, 0x0898, "Logitech, Inc.", "Logi-RB-Audio"),
-+	DEVICE_NAME(0x046d, 0x08d2, "Logitech, Inc.", "Logi-RBM-Audio"),
- 	DEVICE_NAME(0x046d, 0x0990, "Logitech, Inc.", "QuickCam Pro 9000"),
- 
- 	DEVICE_NAME(0x05e1, 0x0408, "Syntek", "STK1160"),
-diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c
-index ffd8c157a28139..70de08635f54cb 100644
---- a/sound/usb/line6/podhd.c
-+++ b/sound/usb/line6/podhd.c
-@@ -507,7 +507,7 @@ static const struct line6_properties podhd_properties_table[] = {
- 	[LINE6_PODHD500X] = {
- 		.id = "PODHD500X",
- 		.name = "POD HD500X",
--		.capabilities	= LINE6_CAP_CONTROL
-+		.capabilities	= LINE6_CAP_CONTROL | LINE6_CAP_HWMON_CTL
- 				| LINE6_CAP_PCM | LINE6_CAP_HWMON,
- 		.altsetting = 1,
- 		.ep_ctrl_r = 0x81,
-diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
-index 8cc2d4937f3403..197fd07e69edd4 100644
---- a/sound/usb/mixer.c
-+++ b/sound/usb/mixer.c
-@@ -1377,6 +1377,19 @@ static int get_min_max_with_quirks(struct usb_mixer_elem_info *cval,
- 
- #define get_min_max(cval, def)	get_min_max_with_quirks(cval, def, NULL)
- 
-+/* get the max value advertised via control API */
-+static int get_max_exposed(struct usb_mixer_elem_info *cval)
-+{
-+	if (!cval->max_exposed) {
-+		if (cval->res)
-+			cval->max_exposed =
-+				DIV_ROUND_UP(cval->max - cval->min, cval->res);
-+		else
-+			cval->max_exposed = cval->max - cval->min;
-+	}
-+	return cval->max_exposed;
-+}
-+
- /* get a feature/mixer unit info */
- static int mixer_ctl_feature_info(struct snd_kcontrol *kcontrol,
- 				  struct snd_ctl_elem_info *uinfo)
-@@ -1389,11 +1402,8 @@ static int mixer_ctl_feature_info(struct snd_kcontrol *kcontrol,
- 	else
- 		uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
- 	uinfo->count = cval->channels;
--	if (cval->val_type == USB_MIXER_BOOLEAN ||
--	    cval->val_type == USB_MIXER_INV_BOOLEAN) {
--		uinfo->value.integer.min = 0;
--		uinfo->value.integer.max = 1;
--	} else {
-+	if (cval->val_type != USB_MIXER_BOOLEAN &&
-+	    cval->val_type != USB_MIXER_INV_BOOLEAN) {
- 		if (!cval->initialized) {
- 			get_min_max_with_quirks(cval, 0, kcontrol);
- 			if (cval->initialized && cval->dBmin >= cval->dBmax) {
-@@ -1405,10 +1415,10 @@ static int mixer_ctl_feature_info(struct snd_kcontrol *kcontrol,
- 					       &kcontrol->id);
- 			}
- 		}
--		uinfo->value.integer.min = 0;
--		uinfo->value.integer.max =
--			DIV_ROUND_UP(cval->max - cval->min, cval->res);
- 	}
-+
-+	uinfo->value.integer.min = 0;
-+	uinfo->value.integer.max = get_max_exposed(cval);
- 	return 0;
- }
- 
-@@ -1449,6 +1459,7 @@ static int mixer_ctl_feature_put(struct snd_kcontrol *kcontrol,
- 				 struct snd_ctl_elem_value *ucontrol)
- {
- 	struct usb_mixer_elem_info *cval = kcontrol->private_data;
-+	int max_val = get_max_exposed(cval);
- 	int c, cnt, val, oval, err;
- 	int changed = 0;
- 
-@@ -1461,6 +1472,8 @@ static int mixer_ctl_feature_put(struct snd_kcontrol *kcontrol,
- 			if (err < 0)
- 				return filter_error(cval, err);
- 			val = ucontrol->value.integer.value[cnt];
-+			if (val < 0 || val > max_val)
-+				return -EINVAL;
- 			val = get_abs_value(cval, val);
- 			if (oval != val) {
- 				snd_usb_set_cur_mix_value(cval, c + 1, cnt, val);
-@@ -1474,6 +1487,8 @@ static int mixer_ctl_feature_put(struct snd_kcontrol *kcontrol,
- 		if (err < 0)
- 			return filter_error(cval, err);
- 		val = ucontrol->value.integer.value[0];
-+		if (val < 0 || val > max_val)
-+			return -EINVAL;
- 		val = get_abs_value(cval, val);
- 		if (val != oval) {
- 			snd_usb_set_cur_mix_value(cval, 0, 0, val);
-@@ -2337,6 +2352,8 @@ static int mixer_ctl_procunit_put(struct snd_kcontrol *kcontrol,
- 	if (err < 0)
- 		return filter_error(cval, err);
- 	val = ucontrol->value.integer.value[0];
-+	if (val < 0 || val > get_max_exposed(cval))
-+		return -EINVAL;
- 	val = get_abs_value(cval, val);
- 	if (val != oval) {
- 		set_cur_ctl_value(cval, cval->control << 8, val);
-@@ -2699,6 +2716,8 @@ static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol,
- 	if (err < 0)
- 		return filter_error(cval, err);
- 	val = ucontrol->value.enumerated.item[0];
-+	if (val < 0 || val >= cval->max) /* here cval->max = # elements */
-+		return -EINVAL;
- 	val = get_abs_value(cval, val);
- 	if (val != oval) {
- 		set_cur_ctl_value(cval, cval->control << 8, val);
-diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h
-index d43895c1ae5c6c..167fbfcf01ace9 100644
---- a/sound/usb/mixer.h
-+++ b/sound/usb/mixer.h
-@@ -88,6 +88,7 @@ struct usb_mixer_elem_info {
- 	int channels;
- 	int val_type;
- 	int min, max, res;
-+	int max_exposed; /* control API exposes the value in 0..max_exposed */
- 	int dBmin, dBmax;
- 	int cached;
- 	int cache_val[MAX_CHANNELS];
-diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
-index d2aa97a5c438cb..75cde5779f38d5 100644
---- a/sound/usb/quirks-table.h
-+++ b/sound/usb/quirks-table.h
-@@ -35,10 +35,87 @@
- 	.bInterfaceClass = USB_CLASS_AUDIO, \
- 	.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL
- 
-+/* Quirk .driver_info, followed by the definition of the quirk entry;
-+ * put like QUIRK_DRIVER_INFO { ... } in each entry of the quirk table
-+ */
-+#define QUIRK_DRIVER_INFO \
-+	.driver_info = (unsigned long)&(const struct snd_usb_audio_quirk)
-+
-+/*
-+ * Macros for quirk data entries
-+ */
-+
-+/* Quirk data entry for ignoring the interface */
-+#define QUIRK_DATA_IGNORE(_ifno) \
-+	.ifnum = (_ifno), .type = QUIRK_IGNORE_INTERFACE
-+/* Quirk data entry for a standard audio interface */
-+#define QUIRK_DATA_STANDARD_AUDIO(_ifno) \
-+	.ifnum = (_ifno), .type = QUIRK_AUDIO_STANDARD_INTERFACE
-+/* Quirk data entry for a standard MIDI interface */
-+#define QUIRK_DATA_STANDARD_MIDI(_ifno) \
-+	.ifnum = (_ifno), .type = QUIRK_MIDI_STANDARD_INTERFACE
-+/* Quirk data entry for a standard mixer interface */
-+#define QUIRK_DATA_STANDARD_MIXER(_ifno) \
-+	.ifnum = (_ifno), .type = QUIRK_AUDIO_STANDARD_MIXER
-+
-+/* Quirk data entry for Yamaha MIDI */
-+#define QUIRK_DATA_MIDI_YAMAHA(_ifno) \
-+	.ifnum = (_ifno), .type = QUIRK_MIDI_YAMAHA
-+/* Quirk data entry for Edirol UAxx */
-+#define QUIRK_DATA_EDIROL_UAXX(_ifno) \
-+	.ifnum = (_ifno), .type = QUIRK_AUDIO_EDIROL_UAXX
-+/* Quirk data entry for raw bytes interface */
-+#define QUIRK_DATA_RAW_BYTES(_ifno) \
-+	.ifnum = (_ifno), .type = QUIRK_MIDI_RAW_BYTES
-+
-+/* Quirk composite array terminator */
-+#define QUIRK_COMPOSITE_END	{ .ifnum = -1 }
-+
-+/* Quirk data entry for composite quirks;
-+ * followed by the quirk array that is terminated with QUIRK_COMPOSITE_END
-+ * e.g. QUIRK_DATA_COMPOSITE { { quirk1 }, { quirk2 },..., QUIRK_COMPOSITE_END }
-+ */
-+#define QUIRK_DATA_COMPOSITE \
-+	.ifnum = QUIRK_ANY_INTERFACE, \
-+	.type = QUIRK_COMPOSITE, \
-+	.data = &(const struct snd_usb_audio_quirk[])
-+
-+/* Quirk data entry for a fixed audio endpoint;
-+ * followed by audioformat definition
-+ * e.g. QUIRK_DATA_AUDIOFORMAT(n) { .formats = xxx, ... }
-+ */
-+#define QUIRK_DATA_AUDIOFORMAT(_ifno)	    \
-+	.ifnum = (_ifno),		    \
-+	.type = QUIRK_AUDIO_FIXED_ENDPOINT, \
-+	.data = &(const struct audioformat)
-+
-+/* Quirk data entry for a fixed MIDI endpoint;
-+ * followed by snd_usb_midi_endpoint_info definition
-+ * e.g. QUIRK_DATA_MIDI_FIXED_ENDPOINT(n) { .out_cables = x, .in_cables = y }
-+ */
-+#define QUIRK_DATA_MIDI_FIXED_ENDPOINT(_ifno) \
-+	.ifnum = (_ifno),		      \
-+	.type = QUIRK_MIDI_FIXED_ENDPOINT,    \
-+	.data = &(const struct snd_usb_midi_endpoint_info)
-+/* Quirk data entry for a MIDIMAN MIDI endpoint */
-+#define QUIRK_DATA_MIDI_MIDIMAN(_ifno) \
-+	.ifnum = (_ifno),	       \
-+	.type = QUIRK_MIDI_MIDIMAN,    \
-+	.data = &(const struct snd_usb_midi_endpoint_info)
-+/* Quirk data entry for a EMAGIC MIDI endpoint */
-+#define QUIRK_DATA_MIDI_EMAGIC(_ifno) \
-+	.ifnum = (_ifno),	      \
-+	.type = QUIRK_MIDI_EMAGIC,    \
-+	.data = &(const struct snd_usb_midi_endpoint_info)
-+
-+/*
-+ * Here we go... the quirk table definition begins:
-+ */
-+
- /* FTDI devices */
- {
- 	USB_DEVICE(0x0403, 0xb8d8),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "STARR LABS", */
- 		/* .product_name = "Starr Labs MIDI USB device", */
- 		.ifnum = 0,
-@@ -49,10 +126,8 @@
- {
- 	/* Creative BT-D1 */
- 	USB_DEVICE(0x041e, 0x0005),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = 1,
--		.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--		.data = &(const struct audioformat) {
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_AUDIOFORMAT(1) {
- 			.formats = SNDRV_PCM_FMTBIT_S16_LE,
- 			.channels = 2,
- 			.iface = 1,
-@@ -87,18 +162,11 @@
-  */
- {
- 	USB_AUDIO_DEVICE(0x041e, 0x4095),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = &(const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_MIXER,
--			},
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_MIXER(2) },
- 			{
--				.ifnum = 3,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(3) {
- 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
- 					.channels = 2,
- 					.fmt_bits = 16,
-@@ -114,9 +182,7 @@
- 					.rate_table = (unsigned int[]) { 48000 },
- 				},
- 			},
--			{
--				.ifnum = -1
--			},
-+			QUIRK_COMPOSITE_END
- 		},
- 	},
- },
-@@ -128,31 +194,18 @@
-  */
- {
- 	USB_DEVICE(0x0424, 0xb832),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Standard Microsystems Corp.",
- 		.product_name = "HP Wireless Audio",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+		QUIRK_DATA_COMPOSITE {
- 			/* Mixer */
--			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE,
--			},
-+			{ QUIRK_DATA_IGNORE(0) },
- 			/* Playback */
--			{
--				.ifnum = 1,
--				.type = QUIRK_IGNORE_INTERFACE,
--			},
-+			{ QUIRK_DATA_IGNORE(1) },
- 			/* Capture */
--			{
--				.ifnum = 2,
--				.type = QUIRK_IGNORE_INTERFACE,
--			},
-+			{ QUIRK_DATA_IGNORE(2) },
- 			/* HID Device, .ifnum = 3 */
--			{
--				.ifnum = -1,
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -175,20 +228,18 @@
- 
- #define YAMAHA_DEVICE(id, name) { \
- 	USB_DEVICE(0x0499, id), \
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { \
-+	QUIRK_DRIVER_INFO { \
- 		.vendor_name = "Yamaha", \
- 		.product_name = name, \
--		.ifnum = QUIRK_ANY_INTERFACE, \
--		.type = QUIRK_MIDI_YAMAHA \
-+		QUIRK_DATA_MIDI_YAMAHA(QUIRK_ANY_INTERFACE) \
- 	} \
- }
- #define YAMAHA_INTERFACE(id, intf, name) { \
- 	USB_DEVICE_VENDOR_SPEC(0x0499, id), \
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { \
-+	QUIRK_DRIVER_INFO { \
- 		.vendor_name = "Yamaha", \
- 		.product_name = name, \
--		.ifnum = intf, \
--		.type = QUIRK_MIDI_YAMAHA \
-+		QUIRK_DATA_MIDI_YAMAHA(intf) \
- 	} \
- }
- YAMAHA_DEVICE(0x1000, "UX256"),
-@@ -276,135 +327,67 @@ YAMAHA_DEVICE(0x105d, NULL),
- YAMAHA_DEVICE(0x1718, "P-125"),
- {
- 	USB_DEVICE(0x0499, 0x1503),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "Yamaha", */
- 		/* .product_name = "MOX6/MOX8", */
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 3,
--				.type = QUIRK_MIDI_YAMAHA
--			},
--			{
--				.ifnum = -1
--			}
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(2) },
-+			{ QUIRK_DATA_MIDI_YAMAHA(3) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE(0x0499, 0x1507),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "Yamaha", */
- 		/* .product_name = "THR10", */
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 3,
--				.type = QUIRK_MIDI_YAMAHA
--			},
--			{
--				.ifnum = -1
--			}
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(2) },
-+			{ QUIRK_DATA_MIDI_YAMAHA(3) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE(0x0499, 0x1509),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "Yamaha", */
- 		/* .product_name = "Steinberg UR22", */
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 3,
--				.type = QUIRK_MIDI_YAMAHA
--			},
--			{
--				.ifnum = 4,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = -1
--			}
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(2) },
-+			{ QUIRK_DATA_MIDI_YAMAHA(3) },
-+			{ QUIRK_DATA_IGNORE(4) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE(0x0499, 0x150a),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "Yamaha", */
- 		/* .product_name = "THR5A", */
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 3,
--				.type = QUIRK_MIDI_YAMAHA
--			},
--			{
--				.ifnum = -1
--			}
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(2) },
-+			{ QUIRK_DATA_MIDI_YAMAHA(3) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE(0x0499, 0x150c),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "Yamaha", */
- 		/* .product_name = "THR10C", */
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 3,
--				.type = QUIRK_MIDI_YAMAHA
--			},
--			{
--				.ifnum = -1
--			}
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(2) },
-+			{ QUIRK_DATA_MIDI_YAMAHA(3) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -438,7 +421,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	               USB_DEVICE_ID_MATCH_INT_CLASS,
- 	.idVendor = 0x0499,
- 	.bInterfaceClass = USB_CLASS_VENDOR_SPEC,
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.ifnum = QUIRK_ANY_INTERFACE,
- 		.type = QUIRK_AUTODETECT
- 	}
-@@ -449,16 +432,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
-  */
- {
- 	USB_DEVICE(0x0582, 0x0000),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "UA-100",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+		QUIRK_DATA_COMPOSITE {
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = & (const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
- 					.channels = 4,
- 					.iface = 0,
-@@ -473,9 +452,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = & (const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(1) {
- 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
- 					.channels = 2,
- 					.iface = 1,
-@@ -490,106 +467,66 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 2,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
- 					.out_cables = 0x0007,
- 					.in_cables  = 0x0007
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE(0x0582, 0x0002),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "UM-4",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_IGNORE(0) },
-+			{ QUIRK_DATA_IGNORE(1) },
- 			{
--				.ifnum = 2,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
- 					.out_cables = 0x000f,
- 					.in_cables  = 0x000f
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE(0x0582, 0x0003),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "SC-8850",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_IGNORE(0) },
-+			{ QUIRK_DATA_IGNORE(1) },
- 			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
- 					.out_cables = 0x003f,
- 					.in_cables  = 0x003f
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE(0x0582, 0x0004),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "U-8",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_IGNORE(0) },
-+			{ QUIRK_DATA_IGNORE(1) },
- 			{
--				.ifnum = 2,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
- 					.out_cables = 0x0005,
- 					.in_cables  = 0x0005
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -597,152 +534,92 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	/* Has ID 0x0099 when not in "Advanced Driver" mode.
- 	 * The UM-2EX has only one input, but we cannot detect this. */
- 	USB_DEVICE(0x0582, 0x0005),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "UM-2",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_IGNORE(0) },
-+			{ QUIRK_DATA_IGNORE(1) },
- 			{
--				.ifnum = 2,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
- 					.out_cables = 0x0003,
- 					.in_cables  = 0x0003
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE(0x0582, 0x0007),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "SC-8820",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_IGNORE(0) },
-+			{ QUIRK_DATA_IGNORE(1) },
- 			{
--				.ifnum = 2,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
- 					.out_cables = 0x0013,
- 					.in_cables  = 0x0013
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE(0x0582, 0x0008),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "PC-300",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_IGNORE(0) },
-+			{ QUIRK_DATA_IGNORE(1) },
- 			{
--				.ifnum = 2,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
- 					.out_cables = 0x0001,
- 					.in_cables  = 0x0001
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	/* has ID 0x009d when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x0009),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "UM-1",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_IGNORE(0) },
-+			{ QUIRK_DATA_IGNORE(1) },
- 			{
--				.ifnum = 2,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
- 					.out_cables = 0x0001,
- 					.in_cables  = 0x0001
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE(0x0582, 0x000b),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "SK-500",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_IGNORE(0) },
-+			{ QUIRK_DATA_IGNORE(1) },
- 			{
--				.ifnum = 2,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
- 					.out_cables = 0x0013,
- 					.in_cables  = 0x0013
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -750,31 +627,19 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	/* thanks to Emiliano Grilli <emillo@libero.it>
- 	 * for helping researching this data */
- 	USB_DEVICE(0x0582, 0x000c),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "SC-D70",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(0) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
- 			{
--				.ifnum = 2,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
- 					.out_cables = 0x0007,
- 					.in_cables  = 0x0007
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -788,35 +653,23 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * the 96kHz sample rate.
- 	 */
- 	USB_DEVICE(0x0582, 0x0010),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "UA-5",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = -1
--			}
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(2) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	/* has ID 0x0013 when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x0012),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "XV-5050",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0001,
- 			.in_cables  = 0x0001
- 		}
-@@ -825,12 +678,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* has ID 0x0015 when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x0014),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "UM-880",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x01ff,
- 			.in_cables  = 0x01ff
- 		}
-@@ -839,74 +690,48 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* has ID 0x0017 when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x0016),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "SD-90",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(0) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
- 			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
- 					.out_cables = 0x000f,
- 					.in_cables  = 0x000f
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	/* has ID 0x001c when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x001b),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "MMP-2",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_IGNORE(0) },
-+			{ QUIRK_DATA_IGNORE(1) },
- 			{
--				.ifnum = 2,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
- 					.out_cables = 0x0001,
- 					.in_cables  = 0x0001
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	/* has ID 0x001e when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x001d),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "V-SYNTH",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0001,
- 			.in_cables  = 0x0001
- 		}
-@@ -915,12 +740,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* has ID 0x0024 when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x0023),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "UM-550",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x003f,
- 			.in_cables  = 0x003f
- 		}
-@@ -933,20 +756,13 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * and no MIDI.
- 	 */
- 	USB_DEVICE(0x0582, 0x0025),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "UA-20",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_IGNORE(0) },
- 			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = & (const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(1) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 2,
- 					.iface = 1,
-@@ -961,9 +777,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = & (const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(2) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 2,
- 					.iface = 2,
-@@ -978,28 +792,22 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 3,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(3) {
- 					.out_cables = 0x0001,
- 					.in_cables  = 0x0001
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	/* has ID 0x0028 when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x0027),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "SD-20",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0003,
- 			.in_cables  = 0x0007
- 		}
-@@ -1008,12 +816,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* has ID 0x002a when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x0029),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "SD-80",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x000f,
- 			.in_cables  = 0x000f
- 		}
-@@ -1026,39 +832,24 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * but offers only 16-bit PCM and no MIDI.
- 	 */
- 	USB_DEVICE_VENDOR_SPEC(0x0582, 0x002b),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "UA-700",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_EDIROL_UAXX
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_EDIROL_UAXX
--			},
--			{
--				.ifnum = 3,
--				.type = QUIRK_AUDIO_EDIROL_UAXX
--			},
--			{
--				.ifnum = -1
--			}
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_EDIROL_UAXX(1) },
-+			{ QUIRK_DATA_EDIROL_UAXX(2) },
-+			{ QUIRK_DATA_EDIROL_UAXX(3) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	/* has ID 0x002e when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x002d),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "XV-2020",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0001,
- 			.in_cables  = 0x0001
- 		}
-@@ -1067,12 +858,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* has ID 0x0030 when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x002f),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "VariOS",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0007,
- 			.in_cables  = 0x0007
- 		}
-@@ -1081,12 +870,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* has ID 0x0034 when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x0033),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "PCR",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0003,
- 			.in_cables  = 0x0007
- 		}
-@@ -1098,12 +885,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * later revisions use IDs 0x0054 and 0x00a2.
- 	 */
- 	USB_DEVICE(0x0582, 0x0037),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "Digital Piano",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0001,
- 			.in_cables  = 0x0001
- 		}
-@@ -1116,39 +901,24 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * and no MIDI.
- 	 */
- 	USB_DEVICE_VENDOR_SPEC(0x0582, 0x003b),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "BOSS",
- 		.product_name = "GS-10",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = & (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 3,
--				.type = QUIRK_MIDI_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = -1
--			}
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(2) },
-+			{ QUIRK_DATA_STANDARD_MIDI(3) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	/* has ID 0x0041 when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x0040),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "GI-20",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0001,
- 			.in_cables  = 0x0001
- 		}
-@@ -1157,12 +927,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* has ID 0x0043 when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x0042),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "RS-70",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0001,
- 			.in_cables  = 0x0001
- 		}
-@@ -1171,36 +939,24 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* has ID 0x0049 when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x0047),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "EDIROL", */
- 		/* .product_name = "UR-80", */
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+		QUIRK_DATA_COMPOSITE {
- 			/* in the 96 kHz modes, only interface 1 is there */
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = -1
--			}
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(2) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	/* has ID 0x004a when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x0048),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "EDIROL", */
- 		/* .product_name = "UR-80", */
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0003,
- 			.in_cables  = 0x0007
- 		}
-@@ -1209,35 +965,23 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* has ID 0x004e when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x004c),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "PCR-A",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = -1
--			}
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(2) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	/* has ID 0x004f when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x004d),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "PCR-A",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0003,
- 			.in_cables  = 0x0007
- 		}
-@@ -1249,76 +993,52 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * is standard compliant, but has only 16-bit PCM.
- 	 */
- 	USB_DEVICE(0x0582, 0x0050),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "UA-3FX",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = -1
--			}
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(2) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE(0x0582, 0x0052),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "UM-1SX",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_STANDARD_INTERFACE
-+		QUIRK_DATA_STANDARD_MIDI(0)
- 	}
- },
- {
- 	USB_DEVICE(0x0582, 0x0060),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "EXR Series",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_STANDARD_INTERFACE
-+		QUIRK_DATA_STANDARD_MIDI(0)
- 	}
- },
- {
- 	/* has ID 0x0066 when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x0064),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "EDIROL", */
- 		/* .product_name = "PCR-1", */
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = -1
--			}
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(2) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	/* has ID 0x0067 when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x0065),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "EDIROL", */
- 		/* .product_name = "PCR-1", */
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0001,
- 			.in_cables  = 0x0003
- 		}
-@@ -1327,12 +1047,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* has ID 0x006e when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x006d),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "FANTOM-X",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0001,
- 			.in_cables  = 0x0001
- 		}
-@@ -1345,39 +1063,24 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * offers only 16-bit PCM at 44.1 kHz and no MIDI.
- 	 */
- 	USB_DEVICE_VENDOR_SPEC(0x0582, 0x0074),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "UA-25",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_EDIROL_UAXX
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_EDIROL_UAXX
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_EDIROL_UAXX
--			},
--			{
--				.ifnum = -1
--			}
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_EDIROL_UAXX(0) },
-+			{ QUIRK_DATA_EDIROL_UAXX(1) },
-+			{ QUIRK_DATA_EDIROL_UAXX(2) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	/* has ID 0x0076 when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x0075),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "BOSS",
- 		.product_name = "DR-880",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0001,
- 			.in_cables  = 0x0001
- 		}
-@@ -1386,12 +1089,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* has ID 0x007b when not in "Advanced Driver" mode */
- 	USB_DEVICE_VENDOR_SPEC(0x0582, 0x007a),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		/* "RD" or "RD-700SX"? */
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0003,
- 			.in_cables  = 0x0003
- 		}
-@@ -1400,12 +1101,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* has ID 0x0081 when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x0080),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Roland",
- 		.product_name = "G-70",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0001,
- 			.in_cables  = 0x0001
- 		}
-@@ -1414,12 +1113,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* has ID 0x008c when not in "Advanced Driver" mode */
- 	USB_DEVICE(0x0582, 0x008b),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "PC-50",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0001,
- 			.in_cables  = 0x0001
- 		}
-@@ -1431,56 +1128,31 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * is standard compliant, but has only 16-bit PCM and no MIDI.
- 	 */
- 	USB_DEVICE(0x0582, 0x00a3),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "UA-4FX",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_EDIROL_UAXX
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_EDIROL_UAXX
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_EDIROL_UAXX
--			},
--			{
--				.ifnum = -1
--			}
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_EDIROL_UAXX(0) },
-+			{ QUIRK_DATA_EDIROL_UAXX(1) },
-+			{ QUIRK_DATA_EDIROL_UAXX(2) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	/* Edirol M-16DX */
- 	USB_DEVICE(0x0582, 0x00c4),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(0) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
- 					.out_cables = 0x0001,
- 					.in_cables  = 0x0001
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -1490,37 +1162,22 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * offers only 16-bit PCM at 44.1 kHz and no MIDI.
- 	 */
- 	USB_DEVICE_VENDOR_SPEC(0x0582, 0x00e6),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "EDIROL",
- 		.product_name = "UA-25EX",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_EDIROL_UAXX
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_EDIROL_UAXX
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_EDIROL_UAXX
--			},
--			{
--				.ifnum = -1
--			}
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_EDIROL_UAXX(0) },
-+			{ QUIRK_DATA_EDIROL_UAXX(1) },
-+			{ QUIRK_DATA_EDIROL_UAXX(2) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	/* Edirol UM-3G */
- 	USB_DEVICE_VENDOR_SPEC(0x0582, 0x0108),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
--		.ifnum = 0,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(0) {
- 			.out_cables = 0x0007,
- 			.in_cables  = 0x0007
- 		}
-@@ -1529,45 +1186,29 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* BOSS ME-25 */
- 	USB_DEVICE(0x0582, 0x0113),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(0) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
- 			{
--				.ifnum = 2,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
- 					.out_cables = 0x0001,
- 					.in_cables  = 0x0001
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	/* only 44.1 kHz works at the moment */
- 	USB_DEVICE(0x0582, 0x0120),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "Roland", */
- 		/* .product_name = "OCTO-CAPTURE", */
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+		QUIRK_DATA_COMPOSITE {
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = & (const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
- 					.channels = 10,
- 					.iface = 0,
-@@ -1583,9 +1224,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = & (const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(1) {
- 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
- 					.channels = 12,
- 					.iface = 1,
-@@ -1601,40 +1240,26 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 2,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
- 					.out_cables = 0x0001,
- 					.in_cables  = 0x0001
- 				}
- 			},
--			{
--				.ifnum = 3,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 4,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = -1
--			}
-+			{ QUIRK_DATA_IGNORE(3) },
-+			{ QUIRK_DATA_IGNORE(4) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	/* only 44.1 kHz works at the moment */
- 	USB_DEVICE(0x0582, 0x012f),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "Roland", */
- 		/* .product_name = "QUAD-CAPTURE", */
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+		QUIRK_DATA_COMPOSITE {
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = & (const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
- 					.channels = 4,
- 					.iface = 0,
-@@ -1650,9 +1275,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = & (const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(1) {
- 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
- 					.channels = 6,
- 					.iface = 1,
-@@ -1668,54 +1291,32 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 2,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
- 					.out_cables = 0x0001,
- 					.in_cables  = 0x0001
- 				}
- 			},
--			{
--				.ifnum = 3,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 4,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = -1
--			}
-+			{ QUIRK_DATA_IGNORE(3) },
-+			{ QUIRK_DATA_IGNORE(4) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE(0x0582, 0x0159),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "Roland", */
- 		/* .product_name = "UA-22", */
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(0) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
- 			{
--				.ifnum = 2,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(2) {
- 					.out_cables = 0x0001,
- 					.in_cables = 0x0001
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -1723,19 +1324,19 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- /* UA101 and co are supported by another driver */
- {
- 	USB_DEVICE(0x0582, 0x0044), /* UA-1000 high speed */
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.ifnum = QUIRK_NODEV_INTERFACE
- 	},
- },
- {
- 	USB_DEVICE(0x0582, 0x007d), /* UA-101 high speed */
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.ifnum = QUIRK_NODEV_INTERFACE
- 	},
- },
- {
- 	USB_DEVICE(0x0582, 0x008d), /* UA-101 full speed */
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.ifnum = QUIRK_NODEV_INTERFACE
- 	},
- },
-@@ -1746,7 +1347,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	               USB_DEVICE_ID_MATCH_INT_CLASS,
- 	.idVendor = 0x0582,
- 	.bInterfaceClass = USB_CLASS_VENDOR_SPEC,
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.ifnum = QUIRK_ANY_INTERFACE,
- 		.type = QUIRK_AUTODETECT
- 	}
-@@ -1761,12 +1362,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * compliant USB MIDI ports for external MIDI and controls.
- 	 */
- 	USB_DEVICE_VENDOR_SPEC(0x06f8, 0xb000),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Hercules",
- 		.product_name = "DJ Console (WE)",
--		.ifnum = 4,
--		.type = QUIRK_MIDI_FIXED_ENDPOINT,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_FIXED_ENDPOINT(4) {
- 			.out_cables = 0x0001,
- 			.in_cables = 0x0001
- 		}
-@@ -1776,12 +1375,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- /* Midiman/M-Audio devices */
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x1002),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "M-Audio",
- 		.product_name = "MidiSport 2x2",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_MIDI_MIDIMAN,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_MIDIMAN(QUIRK_ANY_INTERFACE) {
- 			.out_cables = 0x0003,
- 			.in_cables  = 0x0003
- 		}
-@@ -1789,12 +1386,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- },
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x1011),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "M-Audio",
- 		.product_name = "MidiSport 1x1",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_MIDI_MIDIMAN,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_MIDIMAN(QUIRK_ANY_INTERFACE) {
- 			.out_cables = 0x0001,
- 			.in_cables  = 0x0001
- 		}
-@@ -1802,12 +1397,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- },
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x1015),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "M-Audio",
- 		.product_name = "Keystation",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_MIDI_MIDIMAN,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_MIDIMAN(QUIRK_ANY_INTERFACE) {
- 			.out_cables = 0x0001,
- 			.in_cables  = 0x0001
- 		}
-@@ -1815,12 +1408,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- },
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x1021),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "M-Audio",
- 		.product_name = "MidiSport 4x4",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_MIDI_MIDIMAN,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_MIDIMAN(QUIRK_ANY_INTERFACE) {
- 			.out_cables = 0x000f,
- 			.in_cables  = 0x000f
- 		}
-@@ -1833,12 +1424,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * Thanks to Olaf Giesbrecht <Olaf_Giesbrecht@yahoo.de>
- 	 */
- 	USB_DEVICE_VER(0x0763, 0x1031, 0x0100, 0x0109),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "M-Audio",
- 		.product_name = "MidiSport 8x8",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_MIDI_MIDIMAN,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_MIDIMAN(QUIRK_ANY_INTERFACE) {
- 			.out_cables = 0x01ff,
- 			.in_cables  = 0x01ff
- 		}
-@@ -1846,12 +1435,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- },
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x1033),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "M-Audio",
- 		.product_name = "MidiSport 8x8",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_MIDI_MIDIMAN,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_MIDIMAN(QUIRK_ANY_INTERFACE) {
- 			.out_cables = 0x01ff,
- 			.in_cables  = 0x01ff
- 		}
-@@ -1859,12 +1446,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- },
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x1041),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "M-Audio",
- 		.product_name = "MidiSport 2x4",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_MIDI_MIDIMAN,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_MIDIMAN(QUIRK_ANY_INTERFACE) {
- 			.out_cables = 0x000f,
- 			.in_cables  = 0x0003
- 		}
-@@ -1872,76 +1457,41 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- },
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x2001),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "M-Audio",
- 		.product_name = "Quattro",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = & (const struct snd_usb_audio_quirk[]) {
-+		QUIRK_DATA_COMPOSITE {
- 			/*
- 			 * Interfaces 0-2 are "Windows-compatible", 16-bit only,
- 			 * and share endpoints with the other interfaces.
- 			 * Ignore them.  The other interfaces can do 24 bits,
- 			 * but captured samples are big-endian (see usbaudio.c).
- 			 */
--			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 3,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 4,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 5,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 6,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 7,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 8,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 9,
--				.type = QUIRK_MIDI_MIDIMAN,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+			{ QUIRK_DATA_IGNORE(0) },
-+			{ QUIRK_DATA_IGNORE(1) },
-+			{ QUIRK_DATA_IGNORE(2) },
-+			{ QUIRK_DATA_IGNORE(3) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(4) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(5) },
-+			{ QUIRK_DATA_IGNORE(6) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(7) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(8) },
-+			{
-+				QUIRK_DATA_MIDI_MIDIMAN(9) {
- 					.out_cables = 0x0001,
- 					.in_cables  = 0x0001
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x2003),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "M-Audio",
- 		.product_name = "AudioPhile",
--		.ifnum = 6,
--		.type = QUIRK_MIDI_MIDIMAN,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_MIDIMAN(6) {
- 			.out_cables = 0x0001,
- 			.in_cables  = 0x0001
- 		}
-@@ -1949,12 +1499,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- },
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x2008),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "M-Audio",
- 		.product_name = "Ozone",
--		.ifnum = 3,
--		.type = QUIRK_MIDI_MIDIMAN,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_MIDIMAN(3) {
- 			.out_cables = 0x0001,
- 			.in_cables  = 0x0001
- 		}
-@@ -1962,93 +1510,45 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- },
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x200d),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "M-Audio",
- 		.product_name = "OmniStudio",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = & (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 3,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 4,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 5,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 6,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 7,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 8,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 9,
--				.type = QUIRK_MIDI_MIDIMAN,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_IGNORE(0) },
-+			{ QUIRK_DATA_IGNORE(1) },
-+			{ QUIRK_DATA_IGNORE(2) },
-+			{ QUIRK_DATA_IGNORE(3) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(4) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(5) },
-+			{ QUIRK_DATA_IGNORE(6) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(7) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(8) },
-+			{
-+				QUIRK_DATA_MIDI_MIDIMAN(9) {
- 					.out_cables = 0x0001,
- 					.in_cables  = 0x0001
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE(0x0763, 0x2019),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "M-Audio", */
- 		/* .product_name = "Ozone Academic", */
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = & (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(0) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(2) },
- 			{
--				.ifnum = 3,
--				.type = QUIRK_MIDI_MIDIMAN,
--				.data = & (const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_MIDIMAN(3) {
- 					.out_cables = 0x0001,
- 					.in_cables  = 0x0001
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -2058,21 +1558,14 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- },
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x2030),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "M-Audio", */
- 		/* .product_name = "Fast Track C400", */
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = &(const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_MIXER,
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_MIXER(1) },
- 			/* Playback */
- 			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(2) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 6,
- 					.iface = 2,
-@@ -2096,9 +1589,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 			},
- 			/* Capture */
- 			{
--				.ifnum = 3,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(3) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 4,
- 					.iface = 3,
-@@ -2120,30 +1611,21 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.clock = 0x80,
- 				}
- 			},
--			/* MIDI */
--			{
--				.ifnum = -1 /* Interface = 4 */
--			}
-+			/* MIDI: Interface = 4*/
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x2031),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "M-Audio", */
- 		/* .product_name = "Fast Track C600", */
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = &(const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_MIXER,
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_MIXER(1) },
- 			/* Playback */
- 			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(2) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 8,
- 					.iface = 2,
-@@ -2167,9 +1649,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 			},
- 			/* Capture */
- 			{
--				.ifnum = 3,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(3) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 6,
- 					.iface = 3,
-@@ -2191,29 +1671,20 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.clock = 0x80,
- 				}
- 			},
--			/* MIDI */
--			{
--				.ifnum = -1 /* Interface = 4 */
--			}
-+			/* MIDI: Interface = 4 */
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x2080),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "M-Audio", */
- 		/* .product_name = "Fast Track Ultra", */
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = & (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_MIXER,
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_MIXER(0) },
- 			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = & (const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(1) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 8,
- 					.iface = 1,
-@@ -2235,9 +1706,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = & (const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(2) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 8,
- 					.iface = 2,
-@@ -2259,28 +1728,19 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			/* interface 3 (MIDI) is standard compliant */
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0763, 0x2081),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "M-Audio", */
- 		/* .product_name = "Fast Track Ultra 8R", */
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = & (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_MIXER,
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_MIXER(0) },
- 			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = & (const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(1) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 8,
- 					.iface = 1,
-@@ -2302,9 +1762,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = & (const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(2) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 8,
- 					.iface = 2,
-@@ -2326,9 +1784,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			/* interface 3 (MIDI) is standard compliant */
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -2336,21 +1792,19 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- /* Casio devices */
- {
- 	USB_DEVICE(0x07cf, 0x6801),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Casio",
- 		.product_name = "PL-40R",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_YAMAHA
-+		QUIRK_DATA_MIDI_YAMAHA(0)
- 	}
- },
- {
- 	/* this ID is used by several devices without a product ID */
- 	USB_DEVICE(0x07cf, 0x6802),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Casio",
- 		.product_name = "Keyboard",
--		.ifnum = 0,
--		.type = QUIRK_MIDI_YAMAHA
-+		QUIRK_DATA_MIDI_YAMAHA(0)
- 	}
- },
- 
-@@ -2363,23 +1817,13 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	.idVendor = 0x07fd,
- 	.idProduct = 0x0001,
- 	.bDeviceSubClass = 2,
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "MOTU",
- 		.product_name = "Fastlane",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = & (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_MIDI_RAW_BYTES
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = -1
--			}
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_RAW_BYTES(0) },
-+			{ QUIRK_DATA_IGNORE(1) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -2387,12 +1831,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- /* Emagic devices */
- {
- 	USB_DEVICE(0x086a, 0x0001),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Emagic",
- 		.product_name = "Unitor8",
--		.ifnum = 2,
--		.type = QUIRK_MIDI_EMAGIC,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_EMAGIC(2) {
- 			.out_cables = 0x80ff,
- 			.in_cables  = 0x80ff
- 		}
-@@ -2400,12 +1842,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- },
- {
- 	USB_DEVICE(0x086a, 0x0002),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Emagic",
- 		/* .product_name = "AMT8", */
--		.ifnum = 2,
--		.type = QUIRK_MIDI_EMAGIC,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_EMAGIC(2) {
- 			.out_cables = 0x80ff,
- 			.in_cables  = 0x80ff
- 		}
-@@ -2413,12 +1853,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- },
- {
- 	USB_DEVICE(0x086a, 0x0003),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Emagic",
- 		/* .product_name = "MT4", */
--		.ifnum = 2,
--		.type = QUIRK_MIDI_EMAGIC,
--		.data = & (const struct snd_usb_midi_endpoint_info) {
-+		QUIRK_DATA_MIDI_EMAGIC(2) {
- 			.out_cables = 0x800f,
- 			.in_cables  = 0x8003
- 		}
-@@ -2428,38 +1866,35 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- /* KORG devices */
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0944, 0x0200),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "KORG, Inc.",
- 		/* .product_name = "PANDORA PX5D", */
--		.ifnum = 3,
--		.type = QUIRK_MIDI_STANDARD_INTERFACE,
-+		QUIRK_DATA_STANDARD_MIDI(3)
- 	}
- },
- 
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0944, 0x0201),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "KORG, Inc.",
- 		/* .product_name = "ToneLab ST", */
--		.ifnum = 3,
--		.type = QUIRK_MIDI_STANDARD_INTERFACE,
-+		QUIRK_DATA_STANDARD_MIDI(3)
- 	}
- },
- 
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0944, 0x0204),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "KORG, Inc.",
- 		/* .product_name = "ToneLab EX", */
--		.ifnum = 3,
--		.type = QUIRK_MIDI_STANDARD_INTERFACE,
-+		QUIRK_DATA_STANDARD_MIDI(3)
- 	}
- },
- 
- /* AKAI devices */
- {
- 	USB_DEVICE(0x09e8, 0x0062),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "AKAI",
- 		.product_name = "MPD16",
- 		.ifnum = 0,
-@@ -2470,21 +1905,11 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* Akai MPC Element */
- 	USB_DEVICE(0x09e8, 0x0021),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = & (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_MIDI_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = -1
--			}
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_IGNORE(0) },
-+			{ QUIRK_DATA_STANDARD_MIDI(1) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -2493,66 +1918,36 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* Steinberg MI2 */
- 	USB_DEVICE_VENDOR_SPEC(0x0a4e, 0x2040),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = & (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(0) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(2) },
- 			{
--				.ifnum = 3,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = &(const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(3) {
- 					.out_cables = 0x0001,
- 					.in_cables  = 0x0001
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	/* Steinberg MI4 */
- 	USB_DEVICE_VENDOR_SPEC(0x0a4e, 0x4040),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = & (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(0) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(2) },
- 			{
--				.ifnum = 3,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = &(const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(3) {
- 					.out_cables = 0x0001,
- 					.in_cables  = 0x0001
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -2560,34 +1955,31 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- /* TerraTec devices */
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0ccd, 0x0012),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "TerraTec",
- 		.product_name = "PHASE 26",
--		.ifnum = 3,
--		.type = QUIRK_MIDI_STANDARD_INTERFACE
-+		QUIRK_DATA_STANDARD_MIDI(3)
- 	}
- },
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0ccd, 0x0013),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "TerraTec",
- 		.product_name = "PHASE 26",
--		.ifnum = 3,
--		.type = QUIRK_MIDI_STANDARD_INTERFACE
-+		QUIRK_DATA_STANDARD_MIDI(3)
- 	}
- },
- {
- 	USB_DEVICE_VENDOR_SPEC(0x0ccd, 0x0014),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "TerraTec",
- 		.product_name = "PHASE 26",
--		.ifnum = 3,
--		.type = QUIRK_MIDI_STANDARD_INTERFACE
-+		QUIRK_DATA_STANDARD_MIDI(3)
- 	}
- },
- {
- 	USB_DEVICE(0x0ccd, 0x0035),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Miditech",
- 		.product_name = "Play'n Roll",
- 		.ifnum = 0,
-@@ -2602,7 +1994,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- /* Novation EMS devices */
- {
- 	USB_DEVICE_VENDOR_SPEC(0x1235, 0x0001),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Novation",
- 		.product_name = "ReMOTE Audio/XStation",
- 		.ifnum = 4,
-@@ -2611,7 +2003,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- },
- {
- 	USB_DEVICE_VENDOR_SPEC(0x1235, 0x0002),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Novation",
- 		.product_name = "Speedio",
- 		.ifnum = 3,
-@@ -2620,38 +2012,29 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- },
- {
- 	USB_DEVICE(0x1235, 0x000a),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "Novation", */
- 		/* .product_name = "Nocturn", */
--		.ifnum = 0,
--		.type = QUIRK_MIDI_RAW_BYTES
-+		QUIRK_DATA_RAW_BYTES(0)
- 	}
- },
- {
- 	USB_DEVICE(0x1235, 0x000e),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		/* .vendor_name = "Novation", */
- 		/* .product_name = "Launchpad", */
--		.ifnum = 0,
--		.type = QUIRK_MIDI_RAW_BYTES
-+		QUIRK_DATA_RAW_BYTES(0)
- 	}
- },
- {
- 	USB_DEVICE(0x1235, 0x0010),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Focusrite",
- 		.product_name = "Saffire 6 USB",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_MIXER(0) },
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_MIXER,
--			},
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 4,
- 					.iface = 0,
-@@ -2678,9 +2061,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 2,
- 					.iface = 0,
-@@ -2702,28 +2083,19 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					}
- 				}
- 			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_MIDI_RAW_BYTES
--			},
--			{
--				.ifnum = -1
--			}
-+			{ QUIRK_DATA_RAW_BYTES(1) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE(0x1235, 0x0018),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Novation",
- 		.product_name = "Twitch",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+		QUIRK_DATA_COMPOSITE {
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = & (const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 4,
- 					.iface = 0,
-@@ -2742,19 +2114,14 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					}
- 				}
- 			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_MIDI_RAW_BYTES
--			},
--			{
--				.ifnum = -1
--			}
-+			{ QUIRK_DATA_RAW_BYTES(1) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	USB_DEVICE_VENDOR_SPEC(0x1235, 0x4661),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Novation",
- 		.product_name = "ReMOTE25",
- 		.ifnum = 0,
-@@ -2766,25 +2133,16 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* VirusTI Desktop */
- 	USB_DEVICE_VENDOR_SPEC(0x133e, 0x0815),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = &(const struct snd_usb_audio_quirk[]) {
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
- 			{
--				.ifnum = 3,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = &(const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(3) {
- 					.out_cables = 0x0003,
- 					.in_cables  = 0x0003
- 				}
- 			},
--			{
--				.ifnum = 4,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = -1
--			}
-+			{ QUIRK_DATA_IGNORE(4) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -2812,7 +2170,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- /* QinHeng devices */
- {
- 	USB_DEVICE(0x1a86, 0x752d),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "QinHeng",
- 		.product_name = "CH345",
- 		.ifnum = 1,
-@@ -2826,7 +2184,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- /* Miditech devices */
- {
- 	USB_DEVICE(0x4752, 0x0011),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Miditech",
- 		.product_name = "Midistart-2",
- 		.ifnum = 0,
-@@ -2838,7 +2196,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* this ID used by both Miditech MidiStudio-2 and CME UF-x */
- 	USB_DEVICE(0x7104, 0x2202),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.ifnum = 0,
- 		.type = QUIRK_MIDI_CME
- 	}
-@@ -2848,20 +2206,13 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	/* Thanks to Clemens Ladisch <clemens@ladisch.de> */
- 	USB_DEVICE(0x0dba, 0x1000),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Digidesign",
- 		.product_name = "MBox",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]){
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_MIXER,
--			},
-+		QUIRK_DATA_COMPOSITE{
-+			{ QUIRK_DATA_STANDARD_MIXER(0) },
- 			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(1) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3BE,
- 					.channels = 2,
- 					.iface = 1,
-@@ -2882,9 +2233,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(1) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3BE,
- 					.channels = 2,
- 					.iface = 1,
-@@ -2905,9 +2254,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					}
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -2915,24 +2262,14 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- /* DIGIDESIGN MBOX 2 */
- {
- 	USB_DEVICE(0x0dba, 0x3000),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Digidesign",
- 		.product_name = "Mbox 2",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_IGNORE(0) },
-+			{ QUIRK_DATA_IGNORE(1) },
- 			{
--				.ifnum = 1,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(2) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3BE,
- 					.channels = 2,
- 					.iface = 2,
-@@ -2950,15 +2287,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					}
- 				}
- 			},
-+			{ QUIRK_DATA_IGNORE(3) },
- 			{
--				.ifnum = 3,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 4,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
--				.formats = SNDRV_PCM_FMTBIT_S24_3BE,
-+				QUIRK_DATA_AUDIOFORMAT(4) {
-+					.formats = SNDRV_PCM_FMTBIT_S24_3BE,
- 					.channels = 2,
- 					.iface = 4,
- 					.altsetting = 2,
-@@ -2975,14 +2307,9 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					}
- 				}
- 			},
-+			{ QUIRK_DATA_IGNORE(5) },
- 			{
--				.ifnum = 5,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 6,
--				.type = QUIRK_MIDI_MIDIMAN,
--				.data = &(const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_MIDIMAN(6) {
- 					.out_ep =  0x02,
- 					.out_cables = 0x0001,
- 					.in_ep = 0x81,
-@@ -2990,33 +2317,21 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.in_cables = 0x0001
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- /* DIGIDESIGN MBOX 3 */
- {
- 	USB_DEVICE(0x0dba, 0x5000),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Digidesign",
- 		.product_name = "Mbox 3",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_IGNORE(0) },
-+			{ QUIRK_DATA_IGNORE(1) },
- 			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(2) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 4,
- 					.iface = 2,
-@@ -3036,9 +2351,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 3,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(3) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 4,
- 					.iface = 3,
-@@ -3059,36 +2372,25 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 4,
--				.type = QUIRK_MIDI_FIXED_ENDPOINT,
--				.data = &(const struct snd_usb_midi_endpoint_info) {
-+				QUIRK_DATA_MIDI_FIXED_ENDPOINT(4) {
- 					.out_cables = 0x0001,
- 					.in_cables  = 0x0001
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- {
- 	/* Tascam US122 MKII - playback-only support */
- 	USB_DEVICE_VENDOR_SPEC(0x0644, 0x8021),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "TASCAM",
- 		.product_name = "US122 MKII",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_IGNORE(0) },
- 			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(1) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 2,
- 					.iface = 1,
-@@ -3109,9 +2411,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					}
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -3119,20 +2419,13 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- /* Denon DN-X1600 */
- {
- 	USB_AUDIO_DEVICE(0x154e, 0x500e),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Denon",
- 		.product_name = "DN-X1600",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]){
--			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE,
--			},
-+		QUIRK_DATA_COMPOSITE{
-+			{ QUIRK_DATA_IGNORE(0) },
- 			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(1) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 8,
- 					.iface = 1,
-@@ -3153,9 +2446,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(2) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 8,
- 					.iface = 2,
-@@ -3175,13 +2466,8 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					}
- 				}
- 			},
--			{
--				.ifnum = 4,
--				.type = QUIRK_MIDI_STANDARD_INTERFACE,
--			},
--			{
--				.ifnum = -1
--			}
-+			{ QUIRK_DATA_STANDARD_MIDI(4) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -3190,17 +2476,13 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	USB_DEVICE(0x045e, 0x0283),
- 	.bInterfaceClass = USB_CLASS_PER_INTERFACE,
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Microsoft",
- 		.product_name = "XboxLive Headset/Xbox Communicator",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = &(const struct snd_usb_audio_quirk[]) {
-+		QUIRK_DATA_COMPOSITE {
- 			{
- 				/* playback */
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
- 					.channels = 1,
- 					.iface = 0,
-@@ -3216,9 +2498,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 			},
- 			{
- 				/* capture */
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(1) {
- 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
- 					.channels = 1,
- 					.iface = 1,
-@@ -3232,9 +2512,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.rate_max = 16000
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -3243,18 +2521,11 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- {
- 	USB_DEVICE(0x200c, 0x100b),
- 	.bInterfaceClass = USB_CLASS_PER_INTERFACE,
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = &(const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_MIXER,
--			},
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_MIXER(0) },
- 			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(1) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 4,
- 					.iface = 1,
-@@ -3273,9 +2544,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					}
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -3288,28 +2557,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * enabled in create_standard_audio_quirk().
- 	 */
- 	USB_DEVICE(0x1686, 0x00dd),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				/* Playback  */
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE,
--			},
--			{
--				/* Capture */
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE,
--			},
--			{
--				/* Midi */
--				.ifnum = 3,
--				.type = QUIRK_MIDI_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = -1
--			},
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) }, /* Playback  */
-+			{ QUIRK_DATA_STANDARD_AUDIO(2) }, /* Capture */
-+			{ QUIRK_DATA_STANDARD_MIDI(3) }, /* Midi */
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -3323,18 +2576,16 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 		       USB_DEVICE_ID_MATCH_INT_SUBCLASS,
- 	.bInterfaceClass = USB_CLASS_AUDIO,
- 	.bInterfaceSubClass = USB_SUBCLASS_MIDISTREAMING,
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_MIDI_STANDARD_INTERFACE
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_STANDARD_MIDI(QUIRK_ANY_INTERFACE)
- 	}
- },
- 
- /* Rane SL-1 */
- {
- 	USB_DEVICE(0x13e5, 0x0001),
--	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_AUDIO_STANDARD_INTERFACE
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_STANDARD_AUDIO(QUIRK_ANY_INTERFACE)
-         }
- },
- 
-@@ -3350,24 +2601,13 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * and only the 48 kHz sample rate works for the playback interface.
- 	 */
- 	USB_DEVICE(0x0a12, 0x1243),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_MIXER,
--			},
--			/* Capture */
--			{
--				.ifnum = 1,
--				.type = QUIRK_IGNORE_INTERFACE,
--			},
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_MIXER(0) },
-+			{ QUIRK_DATA_IGNORE(1) }, /* Capture */
- 			/* Playback */
- 			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(2) {
- 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
- 					.channels = 2,
- 					.iface = 2,
-@@ -3386,9 +2626,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					}
- 				}
- 			},
--			{
--				.ifnum = -1
--			},
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -3401,19 +2639,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * even on windows.
- 	 */
- 	USB_DEVICE(0x19b5, 0x0021),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_MIXER,
--			},
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_MIXER(0) },
- 			/* Playback */
- 			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(1) {
- 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
- 					.channels = 2,
- 					.iface = 1,
-@@ -3432,29 +2663,20 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					}
- 				}
- 			},
--			{
--				.ifnum = -1
--			},
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
- /* MOTU Microbook II */
- {
- 	USB_DEVICE_VENDOR_SPEC(0x07fd, 0x0004),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "MOTU",
- 		.product_name = "MicroBookII",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_MIXER,
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_MIXER(0) },
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3BE,
- 					.channels = 6,
- 					.iface = 0,
-@@ -3475,9 +2697,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3BE,
- 					.channels = 8,
- 					.iface = 0,
-@@ -3498,9 +2718,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					}
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -3512,14 +2730,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * The feedback for the output is the input.
- 	 */
- 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x0023),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
- 					.channels = 12,
- 					.iface = 0,
-@@ -3536,9 +2750,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
- 					.channels = 10,
- 					.iface = 0,
-@@ -3556,9 +2768,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.rate_table = (unsigned int[]) { 44100 }
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -3601,14 +2811,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * but not for DVS (Digital Vinyl Systems) like in Mixxx.
- 	 */
- 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x0017),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 8, // outputs
- 					.iface = 0,
-@@ -3625,9 +2831,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					}
- 			},
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 8, // inputs
- 					.iface = 0,
-@@ -3645,9 +2849,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.rate_table = (unsigned int[]) { 48000 }
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -3658,14 +2860,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * The feedback for the output is the dummy input.
- 	 */
- 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x000e),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 4,
- 					.iface = 0,
-@@ -3682,9 +2880,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 2,
- 					.iface = 0,
-@@ -3702,9 +2898,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.rate_table = (unsigned int[]) { 44100 }
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -3715,14 +2909,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * PCM is 6 channels out & 4 channels in @ 44.1 fixed
- 	 */
- 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x000d),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 6, //Master, Headphones & Booth
- 					.iface = 0,
-@@ -3739,9 +2929,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 4, //2x RCA inputs (CH1 & CH2)
- 					.iface = 0,
-@@ -3759,9 +2947,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.rate_table = (unsigned int[]) { 44100 }
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -3773,14 +2959,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * The Feedback for the output is the input
- 	 */
- 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x001e),
--		.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 4,
- 					.iface = 0,
-@@ -3797,9 +2979,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 6,
- 					.iface = 0,
-@@ -3817,9 +2997,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.rate_table = (unsigned int[]) { 44100 }
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -3830,14 +3008,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * 10 channels playback & 12 channels capture @ 44.1/48/96kHz S24LE
- 	 */
- 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x000a),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 10,
- 					.iface = 0,
-@@ -3858,9 +3032,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 12,
- 					.iface = 0,
-@@ -3882,9 +3054,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					}
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -3896,14 +3066,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * The Feedback for the output is the input
- 	 */
- 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x0029),
--		.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 6,
- 					.iface = 0,
-@@ -3920,9 +3086,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 6,
- 					.iface = 0,
-@@ -3940,9 +3104,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.rate_table = (unsigned int[]) { 44100 }
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -3960,20 +3122,13 @@ YAMAHA_DEVICE(0x7010, "UB99"),
-  */
- {
- 	USB_AUDIO_DEVICE(0x534d, 0x0021),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "MacroSilicon",
- 		.product_name = "MS210x",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = &(const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_MIXER,
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_MIXER(2) },
- 			{
--				.ifnum = 3,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(3) {
- 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
- 					.channels = 2,
- 					.iface = 3,
-@@ -3988,9 +3143,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.rate_max = 48000,
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -4008,20 +3161,13 @@ YAMAHA_DEVICE(0x7010, "UB99"),
-  */
- {
- 	USB_AUDIO_DEVICE(0x534d, 0x2109),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "MacroSilicon",
- 		.product_name = "MS2109",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = &(const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_MIXER,
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_MIXER(2) },
- 			{
--				.ifnum = 3,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(3) {
- 					.formats = SNDRV_PCM_FMTBIT_S16_LE,
- 					.channels = 2,
- 					.iface = 3,
-@@ -4036,9 +3182,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.rate_max = 48000,
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -4048,14 +3192,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * 8 channels playback & 8 channels capture @ 44.1/48/96kHz S24LE
- 	 */
- 	USB_DEVICE_VENDOR_SPEC(0x08e4, 0x017f),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 8,
- 					.iface = 0,
-@@ -4074,9 +3214,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 8,
- 					.iface = 0,
-@@ -4096,9 +3234,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.rate_table = (unsigned int[]) { 44100, 48000, 96000 }
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -4108,14 +3244,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * 10 channels playback & 12 channels capture @ 48kHz S24LE
- 	 */
- 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x001b),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 10,
- 					.iface = 0,
-@@ -4134,9 +3266,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 12,
- 					.iface = 0,
-@@ -4154,9 +3284,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.rate_table = (unsigned int[]) { 48000 }
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -4168,14 +3296,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * Capture on EP 0x86
- 	 */
- 	USB_DEVICE_VENDOR_SPEC(0x08e4, 0x0163),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 8,
- 					.iface = 0,
-@@ -4195,9 +3319,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 				}
- 			},
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 8,
- 					.iface = 0,
-@@ -4217,9 +3339,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.rate_table = (unsigned int[]) { 44100, 48000, 96000 }
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -4230,14 +3350,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * and 8 channels in @ 48 fixed (endpoint 0x82).
- 	 */
- 	USB_DEVICE_VENDOR_SPEC(0x2b73, 0x0013),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 8, // outputs
- 					.iface = 0,
-@@ -4254,9 +3370,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					}
- 			},
- 			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(0) {
- 					.formats = SNDRV_PCM_FMTBIT_S24_3LE,
- 					.channels = 8, // inputs
- 					.iface = 0,
-@@ -4274,9 +3388,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.rate_table = (unsigned int[]) { 48000 }
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -4287,28 +3399,15 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 */
- 	USB_DEVICE(0x1395, 0x0300),
- 	.bInterfaceClass = USB_CLASS_PER_INTERFACE,
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = &(const struct snd_usb_audio_quirk[]) {
-+	QUIRK_DRIVER_INFO {
-+		QUIRK_DATA_COMPOSITE {
- 			// Communication
--			{
--				.ifnum = 3,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
-+			{ QUIRK_DATA_STANDARD_AUDIO(3) },
- 			// Recording
--			{
--				.ifnum = 4,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
-+			{ QUIRK_DATA_STANDARD_AUDIO(4) },
- 			// Main
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
--			{
--				.ifnum = -1
--			}
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -4317,21 +3416,14 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * Fiero SC-01 (firmware v1.0.0 @ 48 kHz)
- 	 */
- 	USB_DEVICE(0x2b53, 0x0023),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Fiero",
- 		.product_name = "SC-01",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = &(const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(0) },
- 			/* Playback */
- 			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(1) {
- 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
- 					.channels = 2,
- 					.fmt_bits = 24,
-@@ -4351,9 +3443,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 			},
- 			/* Capture */
- 			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(2) {
- 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
- 					.channels = 2,
- 					.fmt_bits = 24,
-@@ -4372,9 +3462,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.clock = 0x29
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -4383,21 +3471,14 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * Fiero SC-01 (firmware v1.0.0 @ 96 kHz)
- 	 */
- 	USB_DEVICE(0x2b53, 0x0024),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Fiero",
- 		.product_name = "SC-01",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = &(const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(0) },
- 			/* Playback */
- 			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(1) {
- 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
- 					.channels = 2,
- 					.fmt_bits = 24,
-@@ -4417,9 +3498,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 			},
- 			/* Capture */
- 			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(2) {
- 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
- 					.channels = 2,
- 					.fmt_bits = 24,
-@@ -4438,9 +3517,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.clock = 0x29
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -4449,21 +3526,14 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * Fiero SC-01 (firmware v1.1.0)
- 	 */
- 	USB_DEVICE(0x2b53, 0x0031),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Fiero",
- 		.product_name = "SC-01",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = &(const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE
--			},
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_STANDARD_AUDIO(0) },
- 			/* Playback */
- 			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(1) {
- 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
- 					.channels = 2,
- 					.fmt_bits = 24,
-@@ -4484,9 +3554,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 			},
- 			/* Capture */
- 			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
--				.data = &(const struct audioformat) {
-+				QUIRK_DATA_AUDIOFORMAT(2) {
- 					.formats = SNDRV_PCM_FMTBIT_S32_LE,
- 					.channels = 2,
- 					.fmt_bits = 24,
-@@ -4506,9 +3574,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 					.clock = 0x29
- 				}
- 			},
--			{
--				.ifnum = -1
--			}
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-@@ -4517,27 +3583,14 @@ YAMAHA_DEVICE(0x7010, "UB99"),
- 	 * For the standard mode, Mythware XA001AU has ID ffad:a001
- 	 */
- 	USB_DEVICE_VENDOR_SPEC(0xffad, 0xa001),
--	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-+	QUIRK_DRIVER_INFO {
- 		.vendor_name = "Mythware",
- 		.product_name = "XA001AU",
--		.ifnum = QUIRK_ANY_INTERFACE,
--		.type = QUIRK_COMPOSITE,
--		.data = (const struct snd_usb_audio_quirk[]) {
--			{
--				.ifnum = 0,
--				.type = QUIRK_IGNORE_INTERFACE,
--			},
--			{
--				.ifnum = 1,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE,
--			},
--			{
--				.ifnum = 2,
--				.type = QUIRK_AUDIO_STANDARD_INTERFACE,
--			},
--			{
--				.ifnum = -1
--			}
-+		QUIRK_DATA_COMPOSITE {
-+			{ QUIRK_DATA_IGNORE(0) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(1) },
-+			{ QUIRK_DATA_STANDARD_AUDIO(2) },
-+			QUIRK_COMPOSITE_END
- 		}
- 	}
- },
-diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
-index 9ba985c6a40836..1753746430da5f 100644
---- a/sound/usb/quirks.c
-+++ b/sound/usb/quirks.c
-@@ -2123,6 +2123,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
- 		   QUIRK_FLAG_DISABLE_AUTOSUSPEND),
- 	DEVICE_FLG(0x17aa, 0x104d, /* Lenovo ThinkStation P620 Internal Speaker + Front Headset */
- 		   QUIRK_FLAG_DISABLE_AUTOSUSPEND),
-+	DEVICE_FLG(0x1852, 0x5062, /* Luxman D-08u */
-+		   QUIRK_FLAG_ITF_USB_DSD_DAC | QUIRK_FLAG_CTL_MSG_DELAY),
- 	DEVICE_FLG(0x1852, 0x5065, /* Luxman DA-06 */
- 		   QUIRK_FLAG_ITF_USB_DSD_DAC | QUIRK_FLAG_CTL_MSG_DELAY),
- 	DEVICE_FLG(0x1901, 0x0191, /* GE B850V3 CP2114 audio interface */
-@@ -2181,6 +2183,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
- 		   QUIRK_FLAG_GENERIC_IMPLICIT_FB),
- 	DEVICE_FLG(0x2b53, 0x0031, /* Fiero SC-01 (firmware v1.1.0) */
- 		   QUIRK_FLAG_GENERIC_IMPLICIT_FB),
-+	DEVICE_FLG(0x2d95, 0x8011, /* VIVO USB-C HEADSET */
-+		   QUIRK_FLAG_CTL_MSG_DELAY_1M),
- 	DEVICE_FLG(0x2d95, 0x8021, /* VIVO USB-C-XE710 HEADSET */
- 		   QUIRK_FLAG_CTL_MSG_DELAY_1M),
- 	DEVICE_FLG(0x30be, 0x0101, /* Schiit Hel */
-diff --git a/tools/arch/x86/kcpuid/kcpuid.c b/tools/arch/x86/kcpuid/kcpuid.c
-index 24b7d017ec2c11..b7965dfff33a9a 100644
---- a/tools/arch/x86/kcpuid/kcpuid.c
-+++ b/tools/arch/x86/kcpuid/kcpuid.c
-@@ -7,7 +7,8 @@
- #include <string.h>
- #include <getopt.h>
- 
--#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-+#define ARRAY_SIZE(x)	(sizeof(x) / sizeof((x)[0]))
-+#define min(a, b)	(((a) < (b)) ? (a) : (b))
- 
- typedef unsigned int u32;
- typedef unsigned long long u64;
-@@ -207,12 +208,9 @@ static void raw_dump_range(struct cpuid_range *range)
- #define MAX_SUBLEAF_NUM		32
- struct cpuid_range *setup_cpuid_range(u32 input_eax)
- {
--	u32 max_func, idx_func;
--	int subleaf;
-+	u32 max_func, idx_func, subleaf, max_subleaf;
-+	u32 eax, ebx, ecx, edx, f = input_eax;
- 	struct cpuid_range *range;
--	u32 eax, ebx, ecx, edx;
--	u32 f = input_eax;
--	int max_subleaf;
- 	bool allzero;
- 
- 	eax = input_eax;
-@@ -258,7 +256,7 @@ struct cpuid_range *setup_cpuid_range(u32 input_eax)
- 		 * others have to be tried (0xf)
- 		 */
- 		if (f == 0x7 || f == 0x14 || f == 0x17 || f == 0x18)
--			max_subleaf = (eax & 0xff) + 1;
-+			max_subleaf = min((eax & 0xff) + 1, max_subleaf);
- 
- 		if (f == 0xb)
- 			max_subleaf = 2;
-diff --git a/tools/bpf/bpftool/net.c b/tools/bpf/bpftool/net.c
-index 66a8ce8ae0127a..28e9417a5c2e35 100644
---- a/tools/bpf/bpftool/net.c
-+++ b/tools/bpf/bpftool/net.c
-@@ -480,9 +480,9 @@ static void __show_dev_tc_bpf(const struct ip_devname_ifindex *dev,
- 		if (prog_flags[i] || json_output) {
- 			NET_START_ARRAY("prog_flags", "%s ");
- 			for (j = 0; prog_flags[i] && j < 32; j++) {
--				if (!(prog_flags[i] & (1 << j)))
-+				if (!(prog_flags[i] & (1U << j)))
- 					continue;
--				NET_DUMP_UINT_ONLY(1 << j);
-+				NET_DUMP_UINT_ONLY(1U << j);
- 			}
- 			NET_END_ARRAY("");
- 		}
-@@ -491,9 +491,9 @@ static void __show_dev_tc_bpf(const struct ip_devname_ifindex *dev,
- 			if (link_flags[i] || json_output) {
- 				NET_START_ARRAY("link_flags", "%s ");
- 				for (j = 0; link_flags[i] && j < 32; j++) {
--					if (!(link_flags[i] & (1 << j)))
-+					if (!(link_flags[i] & (1U << j)))
- 						continue;
--					NET_DUMP_UINT_ONLY(1 << j);
-+					NET_DUMP_UINT_ONLY(1U << j);
- 				}
- 				NET_END_ARRAY("");
- 			}
-@@ -819,6 +819,9 @@ static void show_link_netfilter(void)
- 		nf_link_count++;
- 	}
- 
-+	if (!nf_link_info)
-+		return;
-+
- 	qsort(nf_link_info, nf_link_count, sizeof(*nf_link_info), netfilter_link_compar);
- 
- 	for (id = 0; id < nf_link_count; id++) {
-diff --git a/tools/include/nolibc/arch-powerpc.h b/tools/include/nolibc/arch-powerpc.h
-index ac212e6185b26d..41ebd394b90c7a 100644
---- a/tools/include/nolibc/arch-powerpc.h
-+++ b/tools/include/nolibc/arch-powerpc.h
-@@ -172,7 +172,7 @@
- 	_ret;                                                                \
- })
- 
--#ifndef __powerpc64__
-+#if !defined(__powerpc64__) && !defined(__clang__)
- /* FIXME: For 32-bit PowerPC, with newer gcc compilers (e.g. gcc 13.1.0),
-  * "omit-frame-pointer" fails with __attribute__((no_stack_protector)) but
-  * works with __attribute__((__optimize__("-fno-stack-protector")))
-diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
-index ac8c0ef48a7f34..aa450cc2648aa5 100644
---- a/tools/perf/util/hist.c
-+++ b/tools/perf/util/hist.c
-@@ -637,7 +637,12 @@ static struct hist_entry *hists__findnew_entry(struct hists *hists,
- 			 * mis-adjust symbol addresses when computing
- 			 * the history counter to increment.
- 			 */
--			if (he->ms.map != entry->ms.map) {
-+			if (hists__has(hists, sym) && he->ms.map != entry->ms.map) {
-+				if (he->ms.sym) {
-+					u64 addr = he->ms.sym->start;
-+					he->ms.sym = map__find_symbol(entry->ms.map, addr);
-+				}
-+
- 				map__put(he->ms.map);
- 				he->ms.map = map__get(entry->ms.map);
- 			}
-diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
-index 7c6874804660eb..24dead4e30656c 100644
---- a/tools/perf/util/machine.c
-+++ b/tools/perf/util/machine.c
-@@ -2536,8 +2536,12 @@ static void save_lbr_cursor_node(struct thread *thread,
- 		cursor->curr = cursor->first;
- 	else
- 		cursor->curr = cursor->curr->next;
-+
-+	map_symbol__exit(&lbr_stitch->prev_lbr_cursor[idx].ms);
- 	memcpy(&lbr_stitch->prev_lbr_cursor[idx], cursor->curr,
- 	       sizeof(struct callchain_cursor_node));
-+	lbr_stitch->prev_lbr_cursor[idx].ms.maps = maps__get(cursor->curr->ms.maps);
-+	lbr_stitch->prev_lbr_cursor[idx].ms.map = map__get(cursor->curr->ms.map);
- 
- 	lbr_stitch->prev_lbr_cursor[idx].valid = true;
- 	cursor->pos++;
-@@ -2748,6 +2752,9 @@ static bool has_stitched_lbr(struct thread *thread,
- 		memcpy(&stitch_node->cursor, &lbr_stitch->prev_lbr_cursor[i],
- 		       sizeof(struct callchain_cursor_node));
- 
-+		stitch_node->cursor.ms.maps = maps__get(lbr_stitch->prev_lbr_cursor[i].ms.maps);
-+		stitch_node->cursor.ms.map = map__get(lbr_stitch->prev_lbr_cursor[i].ms.map);
-+
- 		if (callee)
- 			list_add(&stitch_node->node, &lbr_stitch->lists);
- 		else
-@@ -2771,6 +2778,8 @@ static bool alloc_lbr_stitch(struct thread *thread, unsigned int max_lbr)
- 	if (!thread__lbr_stitch(thread)->prev_lbr_cursor)
- 		goto free_lbr_stitch;
- 
-+	thread__lbr_stitch(thread)->prev_lbr_cursor_size = max_lbr + 1;
-+
- 	INIT_LIST_HEAD(&thread__lbr_stitch(thread)->lists);
- 	INIT_LIST_HEAD(&thread__lbr_stitch(thread)->free_lists);
- 
-@@ -2826,8 +2835,12 @@ static int resolve_lbr_callchain_sample(struct thread *thread,
- 						max_lbr, callee);
- 
- 		if (!stitched_lbr && !list_empty(&lbr_stitch->lists)) {
--			list_replace_init(&lbr_stitch->lists,
--					  &lbr_stitch->free_lists);
-+			struct stitch_list *stitch_node;
-+
-+			list_for_each_entry(stitch_node, &lbr_stitch->lists, node)
-+				map_symbol__exit(&stitch_node->cursor.ms);
-+
-+			list_splice_init(&lbr_stitch->lists, &lbr_stitch->free_lists);
- 		}
- 		memcpy(&lbr_stitch->prev_sample, sample, sizeof(*sample));
- 	}
-diff --git a/tools/perf/util/setup.py b/tools/perf/util/setup.py
-index 79d5e2955f85d8..e837132d5031bd 100644
---- a/tools/perf/util/setup.py
-+++ b/tools/perf/util/setup.py
-@@ -17,7 +17,7 @@ src_feature_tests  = getenv('srctree') + '/tools/build/feature'
- 
- def clang_has_option(option):
-     cc_output = Popen([cc, cc_options + option, path.join(src_feature_tests, "test-hello.c") ], stderr=PIPE).stderr.readlines()
--    return [o for o in cc_output if ((b"unknown argument" in o) or (b"is not supported" in o))] == [ ]
-+    return [o for o in cc_output if ((b"unknown argument" in o) or (b"is not supported" in o) or (b"unknown warning option" in o))] == [ ]
- 
- if cc_is_clang:
-     from sysconfig import get_config_vars
-@@ -63,6 +63,8 @@ cflags = getenv('CFLAGS', '').split()
- cflags += ['-fno-strict-aliasing', '-Wno-write-strings', '-Wno-unused-parameter', '-Wno-redundant-decls', '-DPYTHON_PERF' ]
- if cc_is_clang:
-     cflags += ["-Wno-unused-command-line-argument" ]
-+    if clang_has_option("-Wno-cast-function-type-mismatch"):
-+        cflags += ["-Wno-cast-function-type-mismatch" ]
- else:
-     cflags += ['-Wno-cast-function-type' ]
- 
-diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
-index 61e9f449c72581..6817b99e550ba7 100644
---- a/tools/perf/util/thread.c
-+++ b/tools/perf/util/thread.c
-@@ -478,6 +478,7 @@ void thread__free_stitch_list(struct thread *thread)
- 		return;
- 
- 	list_for_each_entry_safe(pos, tmp, &lbr_stitch->lists, node) {
-+		map_symbol__exit(&pos->cursor.ms);
- 		list_del_init(&pos->node);
- 		free(pos);
- 	}
-@@ -487,6 +488,9 @@ void thread__free_stitch_list(struct thread *thread)
- 		free(pos);
- 	}
- 
-+	for (unsigned int i = 0 ; i < lbr_stitch->prev_lbr_cursor_size; i++)
-+		map_symbol__exit(&lbr_stitch->prev_lbr_cursor[i].ms);
-+
- 	zfree(&lbr_stitch->prev_lbr_cursor);
- 	free(thread__lbr_stitch(thread));
- 	thread__set_lbr_stitch(thread, NULL);
-diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
-index 0df775b5c1105d..a5423f834dc9d9 100644
---- a/tools/perf/util/thread.h
-+++ b/tools/perf/util/thread.h
-@@ -28,6 +28,7 @@ struct lbr_stitch {
- 	struct list_head		free_lists;
- 	struct perf_sample		prev_sample;
- 	struct callchain_cursor_node	*prev_lbr_cursor;
-+	unsigned int prev_lbr_cursor_size;
- };
- 
- struct thread_rb_node {
-diff --git a/tools/testing/selftests/breakpoints/step_after_suspend_test.c b/tools/testing/selftests/breakpoints/step_after_suspend_test.c
-index 2cf6f10ab7c4ac..fc02918962c757 100644
---- a/tools/testing/selftests/breakpoints/step_after_suspend_test.c
-+++ b/tools/testing/selftests/breakpoints/step_after_suspend_test.c
-@@ -153,7 +153,10 @@ void suspend(void)
- 	if (err < 0)
- 		ksft_exit_fail_msg("timerfd_settime() failed\n");
- 
--	if (write(power_state_fd, "mem", strlen("mem")) != strlen("mem"))
-+	system("(echo mem > /sys/power/state) 2> /dev/null");
-+
-+	timerfd_gettime(timerfd, &spec);
-+	if (spec.it_value.tv_sec != 0 || spec.it_value.tv_nsec != 0)
- 		ksft_exit_fail_msg("Failed to enter Suspend state\n");
- 
- 	close(timerfd);
-diff --git a/tools/testing/selftests/hid/Makefile b/tools/testing/selftests/hid/Makefile
-index 2e986cbf1a4630..87b6f5f83d7e0b 100644
---- a/tools/testing/selftests/hid/Makefile
-+++ b/tools/testing/selftests/hid/Makefile
-@@ -17,6 +17,8 @@ TEST_PROGS += hid-tablet.sh
- TEST_PROGS += hid-usb_crash.sh
- TEST_PROGS += hid-wacom.sh
- 
-+TEST_FILES := run-hid-tools-tests.sh
-+
- CXX ?= $(CROSS_COMPILE)g++
- 
- HOSTPKG_CONFIG := pkg-config
-diff --git a/tools/testing/selftests/mm/charge_reserved_hugetlb.sh b/tools/testing/selftests/mm/charge_reserved_hugetlb.sh
-index e14bdd4455f2d2..8e00276b4e69be 100755
---- a/tools/testing/selftests/mm/charge_reserved_hugetlb.sh
-+++ b/tools/testing/selftests/mm/charge_reserved_hugetlb.sh
-@@ -252,7 +252,7 @@ function cleanup_hugetlb_memory() {
-   local cgroup="$1"
-   if [[ "$(pgrep -f write_to_hugetlbfs)" != "" ]]; then
-     echo killing write_to_hugetlbfs
--    killall -2 write_to_hugetlbfs
-+    killall -2 --wait write_to_hugetlbfs
-     wait_for_hugetlb_memory_to_get_depleted $cgroup
-   fi
-   set -e
-diff --git a/tools/testing/selftests/mm/write_to_hugetlbfs.c b/tools/testing/selftests/mm/write_to_hugetlbfs.c
-index 6a2caba19ee1d9..1289d311efd705 100644
---- a/tools/testing/selftests/mm/write_to_hugetlbfs.c
-+++ b/tools/testing/selftests/mm/write_to_hugetlbfs.c
-@@ -28,7 +28,7 @@ enum method {
- 
- /* Global variables. */
- static const char *self;
--static char *shmaddr;
-+static int *shmaddr;
- static int shmid;
- 
- /*
-@@ -47,15 +47,17 @@ void sig_handler(int signo)
- {
- 	printf("Received %d.\n", signo);
- 	if (signo == SIGINT) {
--		printf("Deleting the memory\n");
--		if (shmdt((const void *)shmaddr) != 0) {
--			perror("Detach failure");
-+		if (shmaddr) {
-+			printf("Deleting the memory\n");
-+			if (shmdt((const void *)shmaddr) != 0) {
-+				perror("Detach failure");
-+				shmctl(shmid, IPC_RMID, NULL);
-+				exit(4);
-+			}
-+
- 			shmctl(shmid, IPC_RMID, NULL);
--			exit(4);
-+			printf("Done deleting the memory\n");
- 		}
--
--		shmctl(shmid, IPC_RMID, NULL);
--		printf("Done deleting the memory\n");
- 	}
- 	exit(2);
- }
-@@ -211,7 +213,8 @@ int main(int argc, char **argv)
- 			shmctl(shmid, IPC_RMID, NULL);
- 			exit(2);
- 		}
--		printf("shmaddr: %p\n", ptr);
-+		shmaddr = ptr;
-+		printf("shmaddr: %p\n", shmaddr);
- 
- 		break;
- 	default:
-diff --git a/tools/testing/selftests/netfilter/nft_audit.sh b/tools/testing/selftests/netfilter/nft_audit.sh
-index 99ed5bd6e8402f..e4717444d38e77 100755
---- a/tools/testing/selftests/netfilter/nft_audit.sh
-+++ b/tools/testing/selftests/netfilter/nft_audit.sh
-@@ -25,12 +25,31 @@ logread_pid=$!
- trap 'kill $logread_pid; rm -f $logfile $rulefile' EXIT
- exec 3<"$logfile"
- 
-+lsplit='s/^\(.*\) entries=\([^ ]*\) \(.*\)$/pfx="\1"\nval="\2"\nsfx="\3"/'
-+summarize_logs() {
-+	sum=0
-+	while read line; do
-+		eval $(sed "$lsplit" <<< "$line")
-+		[[ $sum -gt 0 ]] && {
-+			[[ "$pfx $sfx" == "$tpfx $tsfx" ]] && {
-+				let "sum += val"
-+				continue
-+			}
-+			echo "$tpfx entries=$sum $tsfx"
-+		}
-+		tpfx="$pfx"
-+		tsfx="$sfx"
-+		sum=$val
-+	done
-+	echo "$tpfx entries=$sum $tsfx"
-+}
-+
- do_test() { # (cmd, log)
- 	echo -n "testing for cmd: $1 ... "
- 	cat <&3 >/dev/null
- 	$1 >/dev/null || exit 1
- 	sleep 0.1
--	res=$(diff -a -u <(echo "$2") - <&3)
-+	res=$(diff -a -u <(echo "$2") <(summarize_logs <&3))
- 	[ $? -eq 0 ] && { echo "OK"; return; }
- 	echo "FAIL"
- 	grep -v '^\(---\|+++\|@@\)' <<< "$res"
-@@ -129,31 +148,17 @@ do_test 'nft reset rules t1 c2' \
- 'table=t1 family=2 entries=3 op=nft_reset_rule'
- 
- do_test 'nft reset rules table t1' \
--'table=t1 family=2 entries=3 op=nft_reset_rule
--table=t1 family=2 entries=3 op=nft_reset_rule
--table=t1 family=2 entries=3 op=nft_reset_rule'
-+'table=t1 family=2 entries=9 op=nft_reset_rule'
- 
- do_test 'nft reset rules t2 c3' \
--'table=t2 family=2 entries=189 op=nft_reset_rule
--table=t2 family=2 entries=188 op=nft_reset_rule
--table=t2 family=2 entries=126 op=nft_reset_rule'
-+'table=t2 family=2 entries=503 op=nft_reset_rule'
- 
- do_test 'nft reset rules t2' \
--'table=t2 family=2 entries=3 op=nft_reset_rule
--table=t2 family=2 entries=3 op=nft_reset_rule
--table=t2 family=2 entries=186 op=nft_reset_rule
--table=t2 family=2 entries=188 op=nft_reset_rule
--table=t2 family=2 entries=129 op=nft_reset_rule'
-+'table=t2 family=2 entries=509 op=nft_reset_rule'
- 
- do_test 'nft reset rules' \
--'table=t1 family=2 entries=3 op=nft_reset_rule
--table=t1 family=2 entries=3 op=nft_reset_rule
--table=t1 family=2 entries=3 op=nft_reset_rule
--table=t2 family=2 entries=3 op=nft_reset_rule
--table=t2 family=2 entries=3 op=nft_reset_rule
--table=t2 family=2 entries=180 op=nft_reset_rule
--table=t2 family=2 entries=188 op=nft_reset_rule
--table=t2 family=2 entries=135 op=nft_reset_rule'
-+'table=t1 family=2 entries=9 op=nft_reset_rule
-+table=t2 family=2 entries=509 op=nft_reset_rule'
- 
- # resetting sets and elements
- 
-@@ -177,13 +182,11 @@ do_test 'nft reset counters t1' \
- 'table=t1 family=2 entries=1 op=nft_reset_obj'
- 
- do_test 'nft reset counters t2' \
--'table=t2 family=2 entries=342 op=nft_reset_obj
--table=t2 family=2 entries=158 op=nft_reset_obj'
-+'table=t2 family=2 entries=500 op=nft_reset_obj'
- 
- do_test 'nft reset counters' \
- 'table=t1 family=2 entries=1 op=nft_reset_obj
--table=t2 family=2 entries=341 op=nft_reset_obj
--table=t2 family=2 entries=159 op=nft_reset_obj'
-+table=t2 family=2 entries=500 op=nft_reset_obj'
- 
- # resetting quotas
- 
-@@ -194,13 +197,11 @@ do_test 'nft reset quotas t1' \
- 'table=t1 family=2 entries=1 op=nft_reset_obj'
- 
- do_test 'nft reset quotas t2' \
--'table=t2 family=2 entries=315 op=nft_reset_obj
--table=t2 family=2 entries=185 op=nft_reset_obj'
-+'table=t2 family=2 entries=500 op=nft_reset_obj'
- 
- do_test 'nft reset quotas' \
- 'table=t1 family=2 entries=1 op=nft_reset_obj
--table=t2 family=2 entries=314 op=nft_reset_obj
--table=t2 family=2 entries=186 op=nft_reset_obj'
-+table=t2 family=2 entries=500 op=nft_reset_obj'
- 
- # deleting rules
- 
-diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c
-index 1fc4998f06bf6f..4aaafbfc2f9735 100644
---- a/tools/testing/selftests/nolibc/nolibc-test.c
-+++ b/tools/testing/selftests/nolibc/nolibc-test.c
-@@ -522,7 +522,7 @@ int expect_strzr(const char *expr, int llen)
- {
- 	int ret = 0;
- 
--	llen += printf(" = <%s> ", expr);
-+	llen += printf(" = <%s> ", expr ? expr : "(null)");
- 	if (expr) {
- 		ret = 1;
- 		result(llen, FAIL);
-@@ -541,7 +541,7 @@ int expect_strnz(const char *expr, int llen)
- {
- 	int ret = 0;
- 
--	llen += printf(" = <%s> ", expr);
-+	llen += printf(" = <%s> ", expr ? expr : "(null)");
- 	if (!expr) {
- 		ret = 1;
- 		result(llen, FAIL);
-diff --git a/tools/testing/selftests/vDSO/parse_vdso.c b/tools/testing/selftests/vDSO/parse_vdso.c
-index 4ae417372e9ebc..7dd5668ea8a6e3 100644
---- a/tools/testing/selftests/vDSO/parse_vdso.c
-+++ b/tools/testing/selftests/vDSO/parse_vdso.c
-@@ -36,6 +36,12 @@
- #define ELF_BITS_XFORM(bits, x) ELF_BITS_XFORM2(bits, x)
- #define ELF(x) ELF_BITS_XFORM(ELF_BITS, x)
- 
-+#ifdef __s390x__
-+#define ELF_HASH_ENTRY ELF(Xword)
-+#else
-+#define ELF_HASH_ENTRY ELF(Word)
-+#endif
-+
- static struct vdso_info
- {
- 	bool valid;
-@@ -47,8 +53,8 @@ static struct vdso_info
- 	/* Symbol table */
- 	ELF(Sym) *symtab;
- 	const char *symstrings;
--	ELF(Word) *bucket, *chain;
--	ELF(Word) nbucket, nchain;
-+	ELF_HASH_ENTRY *bucket, *chain;
-+	ELF_HASH_ENTRY nbucket, nchain;
- 
- 	/* Version table */
- 	ELF(Versym) *versym;
-@@ -115,7 +121,7 @@ void vdso_init_from_sysinfo_ehdr(uintptr_t base)
- 	/*
- 	 * Fish out the useful bits of the dynamic table.
- 	 */
--	ELF(Word) *hash = 0;
-+	ELF_HASH_ENTRY *hash = 0;
- 	vdso_info.symstrings = 0;
- 	vdso_info.symtab = 0;
- 	vdso_info.versym = 0;
-@@ -133,7 +139,7 @@ void vdso_init_from_sysinfo_ehdr(uintptr_t base)
- 				 + vdso_info.load_offset);
- 			break;
- 		case DT_HASH:
--			hash = (ELF(Word) *)
-+			hash = (ELF_HASH_ENTRY *)
- 				((uintptr_t)dyn[i].d_un.d_ptr
- 				 + vdso_info.load_offset);
- 			break;
-@@ -216,7 +222,8 @@ void *vdso_sym(const char *version, const char *name)
- 		ELF(Sym) *sym = &vdso_info.symtab[chain];
- 
- 		/* Check for a defined global or weak function w/ right name. */
--		if (ELF64_ST_TYPE(sym->st_info) != STT_FUNC)
-+		if (ELF64_ST_TYPE(sym->st_info) != STT_FUNC &&
-+		    ELF64_ST_TYPE(sym->st_info) != STT_NOTYPE)
- 			continue;
- 		if (ELF64_ST_BIND(sym->st_info) != STB_GLOBAL &&
- 		    ELF64_ST_BIND(sym->st_info) != STB_WEAK)
-diff --git a/tools/testing/selftests/vDSO/vdso_config.h b/tools/testing/selftests/vDSO/vdso_config.h
-index cdfed403ba13f8..72de45f587b2c9 100644
---- a/tools/testing/selftests/vDSO/vdso_config.h
-+++ b/tools/testing/selftests/vDSO/vdso_config.h
-@@ -18,18 +18,18 @@
- #elif defined(__aarch64__)
- #define VDSO_VERSION		3
- #define VDSO_NAMES		0
--#elif defined(__powerpc__)
-+#elif defined(__powerpc64__)
- #define VDSO_VERSION		1
- #define VDSO_NAMES		0
--#define VDSO_32BIT		1
--#elif defined(__powerpc64__)
-+#elif defined(__powerpc__)
- #define VDSO_VERSION		1
- #define VDSO_NAMES		0
--#elif defined (__s390__)
-+#define VDSO_32BIT		1
-+#elif defined (__s390__) && !defined(__s390x__)
- #define VDSO_VERSION		2
- #define VDSO_NAMES		0
- #define VDSO_32BIT		1
--#elif defined (__s390X__)
-+#elif defined (__s390x__)
- #define VDSO_VERSION		2
- #define VDSO_NAMES		0
- #elif defined(__mips__)
-diff --git a/tools/testing/selftests/vDSO/vdso_test_correctness.c b/tools/testing/selftests/vDSO/vdso_test_correctness.c
-index e691a3cf149112..cdb697ae8343cc 100644
---- a/tools/testing/selftests/vDSO/vdso_test_correctness.c
-+++ b/tools/testing/selftests/vDSO/vdso_test_correctness.c
-@@ -114,6 +114,12 @@ static void fill_function_pointers()
- 	if (!vdso)
- 		vdso = dlopen("linux-gate.so.1",
- 			      RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD);
-+	if (!vdso)
-+		vdso = dlopen("linux-vdso32.so.1",
-+			      RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD);
-+	if (!vdso)
-+		vdso = dlopen("linux-vdso64.so.1",
-+			      RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD);
- 	if (!vdso) {
- 		printf("[WARN]\tfailed to find vDSO\n");
- 		return;
-diff --git a/tools/tracing/rtla/src/osnoise_top.c b/tools/tracing/rtla/src/osnoise_top.c
-index d7295c0115a282..de8767ff043a43 100644
---- a/tools/tracing/rtla/src/osnoise_top.c
-+++ b/tools/tracing/rtla/src/osnoise_top.c
-@@ -428,7 +428,7 @@ struct osnoise_top_params *osnoise_top_parse_args(int argc, char **argv)
- 		case 'd':
- 			params->duration = parse_seconds_duration(optarg);
- 			if (!params->duration)
--				osnoise_top_usage(params, "Invalid -D duration\n");
-+				osnoise_top_usage(params, "Invalid -d duration\n");
- 			break;
- 		case 'e':
- 			tevent = trace_event_alloc(optarg);
-diff --git a/tools/tracing/rtla/src/timerlat_top.c b/tools/tracing/rtla/src/timerlat_top.c
-index 38d6965183d9fb..a84f43857de14d 100644
---- a/tools/tracing/rtla/src/timerlat_top.c
-+++ b/tools/tracing/rtla/src/timerlat_top.c
-@@ -339,7 +339,7 @@ static void timerlat_top_usage(char *usage)
- 		"	  -c/--cpus cpus: run the tracer only on the given cpus",
- 		"	  -H/--house-keeping cpus: run rtla control threads only on the given cpus",
- 		"	  -C/--cgroup[=cgroup_name]: set cgroup, if no cgroup_name is passed, the rtla's cgroup will be inherited",
--		"	  -d/--duration time[m|h|d]: duration of the session in seconds",
-+		"	  -d/--duration time[s|m|h|d]: duration of the session",
- 		"	  -D/--debug: print debug info",
- 		"	     --dump-tasks: prints the task running on all CPUs if stop conditions are met (depends on !--no-aa)",
- 		"	  -t/--trace[=file]: save the stopped trace to [file|timerlat_trace.txt]",
-@@ -485,7 +485,7 @@ static struct timerlat_top_params
- 		case 'd':
- 			params->duration = parse_seconds_duration(optarg);
- 			if (!params->duration)
--				timerlat_top_usage("Invalid -D duration\n");
-+				timerlat_top_usage("Invalid -d duration\n");
- 			break;
- 		case 'e':
- 			tevent = trace_event_alloc(optarg);
diff --git a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.55-56.patch b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.55-56.patch
deleted file mode 100644
index ec2276153023..000000000000
--- a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.55-56.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 6e297758842d9c..301c5694995c5a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1,9 @@
- # SPDX-License-Identifier: GPL-2.0
- VERSION = 6
- PATCHLEVEL = 6
--SUBLEVEL = 55
-+SUBLEVEL = 56
- EXTRAVERSION =
--NAME = Hurr durr I'ma ninja sloth
-+NAME = Pinguïn Aangedreven
- 
- # *DOCUMENTATION*
- # To see a list of typical targets execute "make help"
-diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
-index 24dead4e30656c..7c6874804660eb 100644
---- a/tools/perf/util/machine.c
-+++ b/tools/perf/util/machine.c
-@@ -2536,12 +2536,8 @@ static void save_lbr_cursor_node(struct thread *thread,
- 		cursor->curr = cursor->first;
- 	else
- 		cursor->curr = cursor->curr->next;
--
--	map_symbol__exit(&lbr_stitch->prev_lbr_cursor[idx].ms);
- 	memcpy(&lbr_stitch->prev_lbr_cursor[idx], cursor->curr,
- 	       sizeof(struct callchain_cursor_node));
--	lbr_stitch->prev_lbr_cursor[idx].ms.maps = maps__get(cursor->curr->ms.maps);
--	lbr_stitch->prev_lbr_cursor[idx].ms.map = map__get(cursor->curr->ms.map);
- 
- 	lbr_stitch->prev_lbr_cursor[idx].valid = true;
- 	cursor->pos++;
-@@ -2752,9 +2748,6 @@ static bool has_stitched_lbr(struct thread *thread,
- 		memcpy(&stitch_node->cursor, &lbr_stitch->prev_lbr_cursor[i],
- 		       sizeof(struct callchain_cursor_node));
- 
--		stitch_node->cursor.ms.maps = maps__get(lbr_stitch->prev_lbr_cursor[i].ms.maps);
--		stitch_node->cursor.ms.map = map__get(lbr_stitch->prev_lbr_cursor[i].ms.map);
--
- 		if (callee)
- 			list_add(&stitch_node->node, &lbr_stitch->lists);
- 		else
-@@ -2778,8 +2771,6 @@ static bool alloc_lbr_stitch(struct thread *thread, unsigned int max_lbr)
- 	if (!thread__lbr_stitch(thread)->prev_lbr_cursor)
- 		goto free_lbr_stitch;
- 
--	thread__lbr_stitch(thread)->prev_lbr_cursor_size = max_lbr + 1;
--
- 	INIT_LIST_HEAD(&thread__lbr_stitch(thread)->lists);
- 	INIT_LIST_HEAD(&thread__lbr_stitch(thread)->free_lists);
- 
-@@ -2835,12 +2826,8 @@ static int resolve_lbr_callchain_sample(struct thread *thread,
- 						max_lbr, callee);
- 
- 		if (!stitched_lbr && !list_empty(&lbr_stitch->lists)) {
--			struct stitch_list *stitch_node;
--
--			list_for_each_entry(stitch_node, &lbr_stitch->lists, node)
--				map_symbol__exit(&stitch_node->cursor.ms);
--
--			list_splice_init(&lbr_stitch->lists, &lbr_stitch->free_lists);
-+			list_replace_init(&lbr_stitch->lists,
-+					  &lbr_stitch->free_lists);
- 		}
- 		memcpy(&lbr_stitch->prev_sample, sample, sizeof(*sample));
- 	}
-diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
-index 6817b99e550ba7..61e9f449c72581 100644
---- a/tools/perf/util/thread.c
-+++ b/tools/perf/util/thread.c
-@@ -478,7 +478,6 @@ void thread__free_stitch_list(struct thread *thread)
- 		return;
- 
- 	list_for_each_entry_safe(pos, tmp, &lbr_stitch->lists, node) {
--		map_symbol__exit(&pos->cursor.ms);
- 		list_del_init(&pos->node);
- 		free(pos);
- 	}
-@@ -488,9 +487,6 @@ void thread__free_stitch_list(struct thread *thread)
- 		free(pos);
- 	}
- 
--	for (unsigned int i = 0 ; i < lbr_stitch->prev_lbr_cursor_size; i++)
--		map_symbol__exit(&lbr_stitch->prev_lbr_cursor[i].ms);
--
- 	zfree(&lbr_stitch->prev_lbr_cursor);
- 	free(thread__lbr_stitch(thread));
- 	thread__set_lbr_stitch(thread, NULL);
-diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
-index a5423f834dc9d9..0df775b5c1105d 100644
---- a/tools/perf/util/thread.h
-+++ b/tools/perf/util/thread.h
-@@ -28,7 +28,6 @@ struct lbr_stitch {
- 	struct list_head		free_lists;
- 	struct perf_sample		prev_sample;
- 	struct callchain_cursor_node	*prev_lbr_cursor;
--	unsigned int prev_lbr_cursor_size;
- };
- 
- struct thread_rb_node {
diff --git a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.56-57.patch b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.56-57.patch
deleted file mode 100644
index 37f9889f6b7e..000000000000
--- a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.56-57.patch
+++ /dev/null
@@ -1,16701 +0,0 @@
-diff --git a/Documentation/dev-tools/kselftest.rst b/Documentation/dev-tools/kselftest.rst
-index deede972f25479..3ae1b3677d7f3a 100644
---- a/Documentation/dev-tools/kselftest.rst
-+++ b/Documentation/dev-tools/kselftest.rst
-@@ -255,9 +255,21 @@ Contributing new tests (details)
- 
-    TEST_PROGS_EXTENDED, TEST_GEN_PROGS_EXTENDED mean it is the
-    executable which is not tested by default.
-+
-    TEST_FILES, TEST_GEN_FILES mean it is the file which is used by
-    test.
- 
-+   TEST_INCLUDES is similar to TEST_FILES, it lists files which should be
-+   included when exporting or installing the tests, with the following
-+   differences:
-+
-+    * symlinks to files in other directories are preserved
-+    * the part of paths below tools/testing/selftests/ is preserved when
-+      copying the files to the output directory
-+
-+   TEST_INCLUDES is meant to list dependencies located in other directories of
-+   the selftests hierarchy.
-+
-  * First use the headers inside the kernel source and/or git repo, and then the
-    system headers.  Headers for the kernel release as opposed to headers
-    installed by the distro on the system should be the primary focus to be able
-diff --git a/Makefile b/Makefile
-index 301c5694995c5a..5b5e40c4088c1c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- VERSION = 6
- PATCHLEVEL = 6
--SUBLEVEL = 56
-+SUBLEVEL = 57
- EXTRAVERSION =
- NAME = Pinguïn Aangedreven
- 
-diff --git a/arch/loongarch/pci/acpi.c b/arch/loongarch/pci/acpi.c
-index 365f7de771cbb9..1da4dc46df43e5 100644
---- a/arch/loongarch/pci/acpi.c
-+++ b/arch/loongarch/pci/acpi.c
-@@ -225,6 +225,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
- 	if (bus) {
- 		memcpy(bus->sysdata, info->cfg, sizeof(struct pci_config_window));
- 		kfree(info);
-+		kfree(root_ops);
- 	} else {
- 		struct pci_bus *child;
- 
-diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
-index aa8bb0208bcc8f..2b175ddf82f0bc 100644
---- a/arch/powerpc/configs/ps3_defconfig
-+++ b/arch/powerpc/configs/ps3_defconfig
-@@ -24,7 +24,6 @@ CONFIG_PS3_VRAM=m
- CONFIG_PS3_LPM=m
- # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
- CONFIG_KEXEC=y
--# CONFIG_PPC64_BIG_ENDIAN_ELF_ABI_V2 is not set
- CONFIG_PPC_4K_PAGES=y
- CONFIG_SCHED_SMT=y
- CONFIG_PM=y
-diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h
-index b79d0228144f44..3ed853b8a8c858 100644
---- a/arch/riscv/include/asm/sbi.h
-+++ b/arch/riscv/include/asm/sbi.h
-@@ -327,6 +327,8 @@ static inline int sbi_remote_fence_i(const struct cpumask *cpu_mask) { return -1
- static inline void sbi_init(void) {}
- #endif /* CONFIG_RISCV_SBI */
- 
-+unsigned long riscv_get_mvendorid(void);
-+unsigned long riscv_get_marchid(void);
- unsigned long riscv_cached_mvendorid(unsigned int cpu_id);
- unsigned long riscv_cached_marchid(unsigned int cpu_id);
- unsigned long riscv_cached_mimpid(unsigned int cpu_id);
-diff --git a/arch/riscv/include/asm/sparsemem.h b/arch/riscv/include/asm/sparsemem.h
-index 63acaecc337478..2f901a410586d0 100644
---- a/arch/riscv/include/asm/sparsemem.h
-+++ b/arch/riscv/include/asm/sparsemem.h
-@@ -7,7 +7,7 @@
- #ifdef CONFIG_64BIT
- #define MAX_PHYSMEM_BITS	56
- #else
--#define MAX_PHYSMEM_BITS	34
-+#define MAX_PHYSMEM_BITS	32
- #endif /* CONFIG_64BIT */
- #define SECTION_SIZE_BITS	27
- #endif /* CONFIG_SPARSEMEM */
-diff --git a/arch/riscv/include/asm/thread_info.h b/arch/riscv/include/asm/thread_info.h
-index 4fb84c2e94c650..8c72d1bcdf141e 100644
---- a/arch/riscv/include/asm/thread_info.h
-+++ b/arch/riscv/include/asm/thread_info.h
-@@ -33,7 +33,6 @@
- 
- #define THREAD_SHIFT            (PAGE_SHIFT + THREAD_SIZE_ORDER)
- #define OVERFLOW_STACK_SIZE     SZ_4K
--#define SHADOW_OVERFLOW_STACK_SIZE (1024)
- 
- #define IRQ_STACK_SIZE		THREAD_SIZE
- 
-diff --git a/arch/riscv/kernel/cpu.c b/arch/riscv/kernel/cpu.c
-index 157ace8b262c20..88732abecd0230 100644
---- a/arch/riscv/kernel/cpu.c
-+++ b/arch/riscv/kernel/cpu.c
-@@ -139,6 +139,34 @@ int riscv_of_parent_hartid(struct device_node *node, unsigned long *hartid)
- 	return -1;
- }
- 
-+unsigned long __init riscv_get_marchid(void)
-+{
-+	struct riscv_cpuinfo *ci = this_cpu_ptr(&riscv_cpuinfo);
-+
-+#if IS_ENABLED(CONFIG_RISCV_SBI)
-+	ci->marchid = sbi_spec_is_0_1() ? 0 : sbi_get_marchid();
-+#elif IS_ENABLED(CONFIG_RISCV_M_MODE)
-+	ci->marchid = csr_read(CSR_MARCHID);
-+#else
-+	ci->marchid = 0;
-+#endif
-+	return ci->marchid;
-+}
-+
-+unsigned long __init riscv_get_mvendorid(void)
-+{
-+	struct riscv_cpuinfo *ci = this_cpu_ptr(&riscv_cpuinfo);
-+
-+#if IS_ENABLED(CONFIG_RISCV_SBI)
-+	ci->mvendorid = sbi_spec_is_0_1() ? 0 : sbi_get_mvendorid();
-+#elif IS_ENABLED(CONFIG_RISCV_M_MODE)
-+	ci->mvendorid = csr_read(CSR_MVENDORID);
-+#else
-+	ci->mvendorid = 0;
-+#endif
-+	return ci->mvendorid;
-+}
-+
- DEFINE_PER_CPU(struct riscv_cpuinfo, riscv_cpuinfo);
- 
- unsigned long riscv_cached_mvendorid(unsigned int cpu_id)
-@@ -170,12 +198,16 @@ static int riscv_cpuinfo_starting(unsigned int cpu)
- 	struct riscv_cpuinfo *ci = this_cpu_ptr(&riscv_cpuinfo);
- 
- #if IS_ENABLED(CONFIG_RISCV_SBI)
--	ci->mvendorid = sbi_spec_is_0_1() ? 0 : sbi_get_mvendorid();
--	ci->marchid = sbi_spec_is_0_1() ? 0 : sbi_get_marchid();
-+	if (!ci->mvendorid)
-+		ci->mvendorid = sbi_spec_is_0_1() ? 0 : sbi_get_mvendorid();
-+	if (!ci->marchid)
-+		ci->marchid = sbi_spec_is_0_1() ? 0 : sbi_get_marchid();
- 	ci->mimpid = sbi_spec_is_0_1() ? 0 : sbi_get_mimpid();
- #elif IS_ENABLED(CONFIG_RISCV_M_MODE)
--	ci->mvendorid = csr_read(CSR_MVENDORID);
--	ci->marchid = csr_read(CSR_MARCHID);
-+	if (!ci->mvendorid)
-+		ci->mvendorid = csr_read(CSR_MVENDORID);
-+	if (!ci->marchid)
-+		ci->marchid = csr_read(CSR_MARCHID);
- 	ci->mimpid = csr_read(CSR_MIMPID);
- #else
- 	ci->mvendorid = 0;
-diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c
-index e39a905aca2483..bb5fb2b820a21e 100644
---- a/arch/riscv/kernel/cpufeature.c
-+++ b/arch/riscv/kernel/cpufeature.c
-@@ -351,6 +351,8 @@ static void __init riscv_fill_hwcap_from_isa_string(unsigned long *isa2hwcap)
- 	struct acpi_table_header *rhct;
- 	acpi_status status;
- 	unsigned int cpu;
-+	u64 boot_vendorid;
-+	u64 boot_archid;
- 
- 	if (!acpi_disabled) {
- 		status = acpi_get_table(ACPI_SIG_RHCT, 0, &rhct);
-@@ -358,6 +360,9 @@ static void __init riscv_fill_hwcap_from_isa_string(unsigned long *isa2hwcap)
- 			return;
- 	}
- 
-+	boot_vendorid = riscv_get_mvendorid();
-+	boot_archid = riscv_get_marchid();
-+
- 	for_each_possible_cpu(cpu) {
- 		struct riscv_isainfo *isainfo = &hart_isa[cpu];
- 		unsigned long this_hwcap = 0;
-@@ -405,8 +410,7 @@ static void __init riscv_fill_hwcap_from_isa_string(unsigned long *isa2hwcap)
- 		 * CPU cores with the ratified spec will contain non-zero
- 		 * marchid.
- 		 */
--		if (acpi_disabled && riscv_cached_mvendorid(cpu) == THEAD_VENDOR_ID &&
--		    riscv_cached_marchid(cpu) == 0x0) {
-+		if (acpi_disabled && boot_vendorid == THEAD_VENDOR_ID && boot_archid == 0x0) {
- 			this_hwcap &= ~isa2hwcap[RISCV_ISA_EXT_v];
- 			clear_bit(RISCV_ISA_EXT_v, isainfo->isa);
- 		}
-diff --git a/arch/riscv/kernel/elf_kexec.c b/arch/riscv/kernel/elf_kexec.c
-index e60fbd8660c4a5..8c32bf1eedda08 100644
---- a/arch/riscv/kernel/elf_kexec.c
-+++ b/arch/riscv/kernel/elf_kexec.c
-@@ -444,6 +444,12 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi,
- 			*(u32 *)loc = CLEAN_IMM(CJTYPE, *(u32 *)loc) |
- 				 ENCODE_CJTYPE_IMM(val - addr);
- 			break;
-+		case R_RISCV_ADD16:
-+			*(u16 *)loc += val;
-+			break;
-+		case R_RISCV_SUB16:
-+			*(u16 *)loc -= val;
-+			break;
- 		case R_RISCV_ADD32:
- 			*(u32 *)loc += val;
- 			break;
-diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S
-index ed7baf2cf7e87b..1f90fee24a8ba8 100644
---- a/arch/riscv/kernel/entry.S
-+++ b/arch/riscv/kernel/entry.S
-@@ -219,8 +219,8 @@ SYM_CODE_START(ret_from_fork)
- 	jalr s0
- 1:
- 	move a0, sp /* pt_regs */
--	la ra, ret_from_exception
--	tail syscall_exit_to_user_mode
-+	call syscall_exit_to_user_mode
-+	j ret_from_exception
- SYM_CODE_END(ret_from_fork)
- 
- /*
-diff --git a/arch/s390/include/asm/facility.h b/arch/s390/include/asm/facility.h
-index 94b6919026dfb8..953d42205ea83e 100644
---- a/arch/s390/include/asm/facility.h
-+++ b/arch/s390/include/asm/facility.h
-@@ -60,8 +60,10 @@ static inline int test_facility(unsigned long nr)
- 	unsigned long facilities_als[] = { FACILITIES_ALS };
- 
- 	if (__builtin_constant_p(nr) && nr < sizeof(facilities_als) * 8) {
--		if (__test_facility(nr, &facilities_als))
--			return 1;
-+		if (__test_facility(nr, &facilities_als)) {
-+			if (!__is_defined(__DECOMPRESSOR))
-+				return 1;
-+		}
- 	}
- 	return __test_facility(nr, &stfle_fac_list);
- }
-diff --git a/arch/s390/include/asm/io.h b/arch/s390/include/asm/io.h
-index 4453ad7c11aced..36a9c7740c437a 100644
---- a/arch/s390/include/asm/io.h
-+++ b/arch/s390/include/asm/io.h
-@@ -16,8 +16,10 @@
- #include <asm/pci_io.h>
- 
- #define xlate_dev_mem_ptr xlate_dev_mem_ptr
-+#define kc_xlate_dev_mem_ptr xlate_dev_mem_ptr
- void *xlate_dev_mem_ptr(phys_addr_t phys);
- #define unxlate_dev_mem_ptr unxlate_dev_mem_ptr
-+#define kc_unxlate_dev_mem_ptr unxlate_dev_mem_ptr
- void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr);
- 
- #define IO_SPACE_LIMIT 0
-diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c
-index 06efad5b4f931b..a3169193775f71 100644
---- a/arch/s390/kernel/perf_cpum_sf.c
-+++ b/arch/s390/kernel/perf_cpum_sf.c
-@@ -1463,7 +1463,7 @@ static int aux_output_begin(struct perf_output_handle *handle,
- 	unsigned long range, i, range_scan, idx, head, base, offset;
- 	struct hws_trailer_entry *te;
- 
--	if (WARN_ON_ONCE(handle->head & ~PAGE_MASK))
-+	if (handle->head & ~PAGE_MASK)
- 		return -EINVAL;
- 
- 	aux->head = handle->head >> PAGE_SHIFT;
-@@ -1642,7 +1642,7 @@ static void hw_collect_aux(struct cpu_hw_sf *cpuhw)
- 	unsigned long num_sdb;
- 
- 	aux = perf_get_aux(handle);
--	if (WARN_ON_ONCE(!aux))
-+	if (!aux)
- 		return;
- 
- 	/* Inform user space new data arrived */
-@@ -1661,7 +1661,7 @@ static void hw_collect_aux(struct cpu_hw_sf *cpuhw)
- 				num_sdb);
- 			break;
- 		}
--		if (WARN_ON_ONCE(!aux))
-+		if (!aux)
- 			return;
- 
- 		/* Update head and alert_mark to new position */
-@@ -1896,12 +1896,8 @@ static void cpumsf_pmu_start(struct perf_event *event, int flags)
- {
- 	struct cpu_hw_sf *cpuhw = this_cpu_ptr(&cpu_hw_sf);
- 
--	if (WARN_ON_ONCE(!(event->hw.state & PERF_HES_STOPPED)))
-+	if (!(event->hw.state & PERF_HES_STOPPED))
- 		return;
--
--	if (flags & PERF_EF_RELOAD)
--		WARN_ON_ONCE(!(event->hw.state & PERF_HES_UPTODATE));
--
- 	perf_pmu_disable(event->pmu);
- 	event->hw.state = 0;
- 	cpuhw->lsctl.cs = 1;
-diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
-index f47515313226c4..9af4d829649444 100644
---- a/arch/s390/mm/cmm.c
-+++ b/arch/s390/mm/cmm.c
-@@ -95,11 +95,12 @@ static long cmm_alloc_pages(long nr, long *counter,
- 		(*counter)++;
- 		spin_unlock(&cmm_lock);
- 		nr--;
-+		cond_resched();
- 	}
- 	return nr;
- }
- 
--static long cmm_free_pages(long nr, long *counter, struct cmm_page_array **list)
-+static long __cmm_free_pages(long nr, long *counter, struct cmm_page_array **list)
- {
- 	struct cmm_page_array *pa;
- 	unsigned long addr;
-@@ -123,6 +124,21 @@ static long cmm_free_pages(long nr, long *counter, struct cmm_page_array **list)
- 	return nr;
- }
- 
-+static long cmm_free_pages(long nr, long *counter, struct cmm_page_array **list)
-+{
-+	long inc = 0;
-+
-+	while (nr) {
-+		inc = min(256L, nr);
-+		nr -= inc;
-+		inc = __cmm_free_pages(inc, counter, list);
-+		if (inc)
-+			break;
-+		cond_resched();
-+	}
-+	return nr + inc;
-+}
-+
- static int cmm_oom_notify(struct notifier_block *self,
- 			  unsigned long dummy, void *parm)
- {
-diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
-index 6f1cc7f1b202a6..6dabb53f58a445 100644
---- a/arch/x86/kernel/amd_nb.c
-+++ b/arch/x86/kernel/amd_nb.c
-@@ -26,6 +26,7 @@
- #define PCI_DEVICE_ID_AMD_19H_M70H_ROOT		0x14e8
- #define PCI_DEVICE_ID_AMD_1AH_M00H_ROOT		0x153a
- #define PCI_DEVICE_ID_AMD_1AH_M20H_ROOT		0x1507
-+#define PCI_DEVICE_ID_AMD_1AH_M60H_ROOT		0x1122
- #define PCI_DEVICE_ID_AMD_MI200_ROOT		0x14bb
- 
- #define PCI_DEVICE_ID_AMD_17H_DF_F4		0x1464
-@@ -61,6 +62,7 @@ static const struct pci_device_id amd_root_ids[] = {
- 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_ROOT) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_ROOT) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_ROOT) },
-+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M60H_ROOT) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_ROOT) },
- 	{}
- };
-@@ -92,6 +94,8 @@ static const struct pci_device_id amd_nb_misc_ids[] = {
- 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) },
-+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M60H_DF_F3) },
-+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M70H_DF_F3) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F3) },
- 	{}
- };
-diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
-index 878a4c6dd75651..a50c99e9b5c01f 100644
---- a/arch/x86/net/bpf_jit_comp.c
-+++ b/arch/x86/net/bpf_jit_comp.c
-@@ -58,6 +58,56 @@ static bool is_imm8(int value)
- 	return value <= 127 && value >= -128;
- }
- 
-+/*
-+ * Let us limit the positive offset to be <= 123.
-+ * This is to ensure eventual jit convergence For the following patterns:
-+ * ...
-+ * pass4, final_proglen=4391:
-+ *   ...
-+ *   20e:    48 85 ff                test   rdi,rdi
-+ *   211:    74 7d                   je     0x290
-+ *   213:    48 8b 77 00             mov    rsi,QWORD PTR [rdi+0x0]
-+ *   ...
-+ *   289:    48 85 ff                test   rdi,rdi
-+ *   28c:    74 17                   je     0x2a5
-+ *   28e:    e9 7f ff ff ff          jmp    0x212
-+ *   293:    bf 03 00 00 00          mov    edi,0x3
-+ * Note that insn at 0x211 is 2-byte cond jump insn for offset 0x7d (-125)
-+ * and insn at 0x28e is 5-byte jmp insn with offset -129.
-+ *
-+ * pass5, final_proglen=4392:
-+ *   ...
-+ *   20e:    48 85 ff                test   rdi,rdi
-+ *   211:    0f 84 80 00 00 00       je     0x297
-+ *   217:    48 8b 77 00             mov    rsi,QWORD PTR [rdi+0x0]
-+ *   ...
-+ *   28d:    48 85 ff                test   rdi,rdi
-+ *   290:    74 1a                   je     0x2ac
-+ *   292:    eb 84                   jmp    0x218
-+ *   294:    bf 03 00 00 00          mov    edi,0x3
-+ * Note that insn at 0x211 is 6-byte cond jump insn now since its offset
-+ * becomes 0x80 based on previous round (0x293 - 0x213 = 0x80).
-+ * At the same time, insn at 0x292 is a 2-byte insn since its offset is
-+ * -124.
-+ *
-+ * pass6 will repeat the same code as in pass4 and this will prevent
-+ * eventual convergence.
-+ *
-+ * To fix this issue, we need to break je (2->6 bytes) <-> jmp (5->2 bytes)
-+ * cycle in the above. In the above example je offset <= 0x7c should work.
-+ *
-+ * For other cases, je <-> je needs offset <= 0x7b to avoid no convergence
-+ * issue. For jmp <-> je and jmp <-> jmp cases, jmp offset <= 0x7c should
-+ * avoid no convergence issue.
-+ *
-+ * Overall, let us limit the positive offset for 8bit cond/uncond jmp insn
-+ * to maximum 123 (0x7b). This way, the jit pass can eventually converge.
-+ */
-+static bool is_imm8_jmp_offset(int value)
-+{
-+	return value <= 123 && value >= -128;
-+}
-+
- static bool is_simm32(s64 value)
- {
- 	return value == (s64)(s32)value;
-@@ -1774,7 +1824,7 @@ st:			if (is_imm8(insn->off))
- 				return -EFAULT;
- 			}
- 			jmp_offset = addrs[i + insn->off] - addrs[i];
--			if (is_imm8(jmp_offset)) {
-+			if (is_imm8_jmp_offset(jmp_offset)) {
- 				if (jmp_padding) {
- 					/* To keep the jmp_offset valid, the extra bytes are
- 					 * padded before the jump insn, so we subtract the
-@@ -1856,7 +1906,7 @@ st:			if (is_imm8(insn->off))
- 				break;
- 			}
- emit_jmp:
--			if (is_imm8(jmp_offset)) {
-+			if (is_imm8_jmp_offset(jmp_offset)) {
- 				if (jmp_padding) {
- 					/* To avoid breaking jmp_offset, the extra bytes
- 					 * are padded before the actual jmp insn, so
-diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
-index 0a6aea36cd9751..6e76780fb43083 100644
---- a/drivers/ata/ahci.c
-+++ b/drivers/ata/ahci.c
-@@ -667,6 +667,87 @@ static int mobile_lpm_policy = -1;
- module_param(mobile_lpm_policy, int, 0644);
- MODULE_PARM_DESC(mobile_lpm_policy, "Default LPM policy for mobile chipsets");
- 
-+static char *ahci_mask_port_map;
-+module_param_named(mask_port_map, ahci_mask_port_map, charp, 0444);
-+MODULE_PARM_DESC(mask_port_map,
-+		 "32-bits port map masks to ignore controllers ports. "
-+		 "Valid values are: "
-+		 "\"<mask>\" to apply the same mask to all AHCI controller "
-+		 "devices, and \"<pci_dev>=<mask>,<pci_dev>=<mask>,...\" to "
-+		 "specify different masks for the controllers specified, "
-+		 "where <pci_dev> is the PCI ID of an AHCI controller in the "
-+		 "form \"domain:bus:dev.func\"");
-+
-+static void ahci_apply_port_map_mask(struct device *dev,
-+				     struct ahci_host_priv *hpriv, char *mask_s)
-+{
-+	unsigned int mask;
-+
-+	if (kstrtouint(mask_s, 0, &mask)) {
-+		dev_err(dev, "Invalid port map mask\n");
-+		return;
-+	}
-+
-+	hpriv->mask_port_map = mask;
-+}
-+
-+static void ahci_get_port_map_mask(struct device *dev,
-+				   struct ahci_host_priv *hpriv)
-+{
-+	char *param, *end, *str, *mask_s;
-+	char *name;
-+
-+	if (!strlen(ahci_mask_port_map))
-+		return;
-+
-+	str = kstrdup(ahci_mask_port_map, GFP_KERNEL);
-+	if (!str)
-+		return;
-+
-+	/* Handle single mask case */
-+	if (!strchr(str, '=')) {
-+		ahci_apply_port_map_mask(dev, hpriv, str);
-+		goto free;
-+	}
-+
-+	/*
-+	 * Mask list case: parse the parameter to apply the mask only if
-+	 * the device name matches.
-+	 */
-+	param = str;
-+	end = param + strlen(param);
-+	while (param && param < end && *param) {
-+		name = param;
-+		param = strchr(name, '=');
-+		if (!param)
-+			break;
-+
-+		*param = '\0';
-+		param++;
-+		if (param >= end)
-+			break;
-+
-+		if (strcmp(dev_name(dev), name) != 0) {
-+			param = strchr(param, ',');
-+			if (param)
-+				param++;
-+			continue;
-+		}
-+
-+		mask_s = param;
-+		param = strchr(mask_s, ',');
-+		if (param) {
-+			*param = '\0';
-+			param++;
-+		}
-+
-+		ahci_apply_port_map_mask(dev, hpriv, mask_s);
-+	}
-+
-+free:
-+	kfree(str);
-+}
-+
- static void ahci_pci_save_initial_config(struct pci_dev *pdev,
- 					 struct ahci_host_priv *hpriv)
- {
-@@ -689,6 +770,10 @@ static void ahci_pci_save_initial_config(struct pci_dev *pdev,
- 			  "Disabling your PATA port. Use the boot option 'ahci.marvell_enable=0' to avoid this.\n");
- 	}
- 
-+	/* Handle port map masks passed as module parameter. */
-+	if (ahci_mask_port_map)
-+		ahci_get_port_map_mask(&pdev->dev, hpriv);
-+
- 	ahci_save_initial_config(&pdev->dev, hpriv);
- }
- 
-diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
-index cd87457375454a..a96566e1b2b84c 100644
---- a/drivers/ata/libata-eh.c
-+++ b/drivers/ata/libata-eh.c
-@@ -4049,10 +4049,20 @@ static void ata_eh_handle_port_suspend(struct ata_port *ap)
- 
- 	WARN_ON(ap->pflags & ATA_PFLAG_SUSPENDED);
- 
--	/* Set all devices attached to the port in standby mode */
--	ata_for_each_link(link, ap, HOST_FIRST) {
--		ata_for_each_dev(dev, link, ENABLED)
--			ata_dev_power_set_standby(dev);
-+	/*
-+	 * We will reach this point for all of the PM events:
-+	 * PM_EVENT_SUSPEND (if runtime pm, PM_EVENT_AUTO will also be set)
-+	 * PM_EVENT_FREEZE, and PM_EVENT_HIBERNATE.
-+	 *
-+	 * We do not want to perform disk spin down for PM_EVENT_FREEZE.
-+	 * (Spin down will be performed by the subsequent PM_EVENT_HIBERNATE.)
-+	 */
-+	if (!(ap->pm_mesg.event & PM_EVENT_FREEZE)) {
-+		/* Set all devices attached to the port in standby mode */
-+		ata_for_each_link(link, ap, HOST_FIRST) {
-+			ata_for_each_dev(dev, link, ENABLED)
-+				ata_dev_power_set_standby(dev);
-+		}
- 	}
- 
- 	/*
-diff --git a/drivers/base/bus.c b/drivers/base/bus.c
-index d7c4330786cae2..d4361ad3b433f5 100644
---- a/drivers/base/bus.c
-+++ b/drivers/base/bus.c
-@@ -152,7 +152,8 @@ static ssize_t bus_attr_show(struct kobject *kobj, struct attribute *attr,
- {
- 	struct bus_attribute *bus_attr = to_bus_attr(attr);
- 	struct subsys_private *subsys_priv = to_subsys_private(kobj);
--	ssize_t ret = 0;
-+	/* return -EIO for reading a bus attribute without show() */
-+	ssize_t ret = -EIO;
- 
- 	if (bus_attr->show)
- 		ret = bus_attr->show(subsys_priv->bus, buf);
-@@ -164,7 +165,8 @@ static ssize_t bus_attr_store(struct kobject *kobj, struct attribute *attr,
- {
- 	struct bus_attribute *bus_attr = to_bus_attr(attr);
- 	struct subsys_private *subsys_priv = to_subsys_private(kobj);
--	ssize_t ret = 0;
-+	/* return -EIO for writing a bus attribute without store() */
-+	ssize_t ret = -EIO;
- 
- 	if (bus_attr->store)
- 		ret = bus_attr->store(subsys_priv->bus, buf, count);
-@@ -920,6 +922,8 @@ int bus_register(const struct bus_type *bus)
- 	bus_remove_file(bus, &bus_attr_uevent);
- bus_uevent_fail:
- 	kset_unregister(&priv->subsys);
-+	/* Above kset_unregister() will kfree @priv */
-+	priv = NULL;
- out:
- 	kfree(priv);
- 	return retval;
-diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
-index 06673c6ca25555..606f388c7a5716 100644
---- a/drivers/block/zram/zram_drv.c
-+++ b/drivers/block/zram/zram_drv.c
-@@ -1983,6 +1983,13 @@ static void zram_destroy_comps(struct zram *zram)
- 		zcomp_destroy(comp);
- 		zram->num_active_comps--;
- 	}
-+
-+	for (prio = ZRAM_PRIMARY_COMP; prio < ZRAM_MAX_COMPS; prio++) {
-+		/* Do not free statically defined compression algorithms */
-+		if (zram->comp_algs[prio] != default_compressor)
-+			kfree(zram->comp_algs[prio]);
-+		zram->comp_algs[prio] = NULL;
-+	}
- }
- 
- static void zram_reset_device(struct zram *zram)
-diff --git a/drivers/bus/mhi/ep/internal.h b/drivers/bus/mhi/ep/internal.h
-index a2125fa5fe2f97..accbf3a51d0cf5 100644
---- a/drivers/bus/mhi/ep/internal.h
-+++ b/drivers/bus/mhi/ep/internal.h
-@@ -159,6 +159,7 @@ struct mhi_ep_chan {
- 	void (*xfer_cb)(struct mhi_ep_device *mhi_dev, struct mhi_result *result);
- 	enum mhi_ch_state state;
- 	enum dma_data_direction dir;
-+	size_t rd_offset;
- 	u64 tre_loc;
- 	u32 tre_size;
- 	u32 tre_bytes_left;
-diff --git a/drivers/bus/mhi/ep/main.c b/drivers/bus/mhi/ep/main.c
-index 934cdbca08e448..c48f4d9f2c690b 100644
---- a/drivers/bus/mhi/ep/main.c
-+++ b/drivers/bus/mhi/ep/main.c
-@@ -74,7 +74,7 @@ static int mhi_ep_send_completion_event(struct mhi_ep_cntrl *mhi_cntrl, struct m
- 	struct mhi_ring_element *event;
- 	int ret;
- 
--	event = kmem_cache_zalloc(mhi_cntrl->ev_ring_el_cache, GFP_KERNEL | GFP_DMA);
-+	event = kmem_cache_zalloc(mhi_cntrl->ev_ring_el_cache, GFP_KERNEL);
- 	if (!event)
- 		return -ENOMEM;
- 
-@@ -93,7 +93,7 @@ int mhi_ep_send_state_change_event(struct mhi_ep_cntrl *mhi_cntrl, enum mhi_stat
- 	struct mhi_ring_element *event;
- 	int ret;
- 
--	event = kmem_cache_zalloc(mhi_cntrl->ev_ring_el_cache, GFP_KERNEL | GFP_DMA);
-+	event = kmem_cache_zalloc(mhi_cntrl->ev_ring_el_cache, GFP_KERNEL);
- 	if (!event)
- 		return -ENOMEM;
- 
-@@ -111,7 +111,7 @@ int mhi_ep_send_ee_event(struct mhi_ep_cntrl *mhi_cntrl, enum mhi_ee_type exec_e
- 	struct mhi_ring_element *event;
- 	int ret;
- 
--	event = kmem_cache_zalloc(mhi_cntrl->ev_ring_el_cache, GFP_KERNEL | GFP_DMA);
-+	event = kmem_cache_zalloc(mhi_cntrl->ev_ring_el_cache, GFP_KERNEL);
- 	if (!event)
- 		return -ENOMEM;
- 
-@@ -130,7 +130,7 @@ static int mhi_ep_send_cmd_comp_event(struct mhi_ep_cntrl *mhi_cntrl, enum mhi_e
- 	struct mhi_ring_element *event;
- 	int ret;
- 
--	event = kmem_cache_zalloc(mhi_cntrl->ev_ring_el_cache, GFP_KERNEL | GFP_DMA);
-+	event = kmem_cache_zalloc(mhi_cntrl->ev_ring_el_cache, GFP_KERNEL);
- 	if (!event)
- 		return -ENOMEM;
- 
-@@ -183,6 +183,8 @@ static int mhi_ep_process_cmd_ring(struct mhi_ep_ring *ring, struct mhi_ring_ele
- 
- 				goto err_unlock;
- 			}
-+
-+			mhi_chan->rd_offset = ch_ring->rd_offset;
- 		}
- 
- 		/* Set channel state to RUNNING */
-@@ -312,21 +314,85 @@ bool mhi_ep_queue_is_empty(struct mhi_ep_device *mhi_dev, enum dma_data_directio
- 	struct mhi_ep_cntrl *mhi_cntrl = mhi_dev->mhi_cntrl;
- 	struct mhi_ep_ring *ring = &mhi_cntrl->mhi_chan[mhi_chan->chan].ring;
- 
--	return !!(ring->rd_offset == ring->wr_offset);
-+	return !!(mhi_chan->rd_offset == ring->wr_offset);
- }
- EXPORT_SYMBOL_GPL(mhi_ep_queue_is_empty);
- 
-+static void mhi_ep_read_completion(struct mhi_ep_buf_info *buf_info)
-+{
-+	struct mhi_ep_device *mhi_dev = buf_info->mhi_dev;
-+	struct mhi_ep_cntrl *mhi_cntrl = mhi_dev->mhi_cntrl;
-+	struct mhi_ep_chan *mhi_chan = mhi_dev->ul_chan;
-+	struct mhi_ep_ring *ring = &mhi_cntrl->mhi_chan[mhi_chan->chan].ring;
-+	struct mhi_ring_element *el = &ring->ring_cache[ring->rd_offset];
-+	struct mhi_result result = {};
-+	int ret;
-+
-+	if (mhi_chan->xfer_cb) {
-+		result.buf_addr = buf_info->cb_buf;
-+		result.dir = mhi_chan->dir;
-+		result.bytes_xferd = buf_info->size;
-+
-+		mhi_chan->xfer_cb(mhi_dev, &result);
-+	}
-+
-+	/*
-+	 * The host will split the data packet into multiple TREs if it can't fit
-+	 * the packet in a single TRE. In that case, CHAIN flag will be set by the
-+	 * host for all TREs except the last one.
-+	 */
-+	if (buf_info->code != MHI_EV_CC_OVERFLOW) {
-+		if (MHI_TRE_DATA_GET_CHAIN(el)) {
-+			/*
-+			 * IEOB (Interrupt on End of Block) flag will be set by the host if
-+			 * it expects the completion event for all TREs of a TD.
-+			 */
-+			if (MHI_TRE_DATA_GET_IEOB(el)) {
-+				ret = mhi_ep_send_completion_event(mhi_cntrl, ring, el,
-+							     MHI_TRE_DATA_GET_LEN(el),
-+							     MHI_EV_CC_EOB);
-+				if (ret < 0) {
-+					dev_err(&mhi_chan->mhi_dev->dev,
-+						"Error sending transfer compl. event\n");
-+					goto err_free_tre_buf;
-+				}
-+			}
-+		} else {
-+			/*
-+			 * IEOT (Interrupt on End of Transfer) flag will be set by the host
-+			 * for the last TRE of the TD and expects the completion event for
-+			 * the same.
-+			 */
-+			if (MHI_TRE_DATA_GET_IEOT(el)) {
-+				ret = mhi_ep_send_completion_event(mhi_cntrl, ring, el,
-+							     MHI_TRE_DATA_GET_LEN(el),
-+							     MHI_EV_CC_EOT);
-+				if (ret < 0) {
-+					dev_err(&mhi_chan->mhi_dev->dev,
-+						"Error sending transfer compl. event\n");
-+					goto err_free_tre_buf;
-+				}
-+			}
-+		}
-+	}
-+
-+	mhi_ep_ring_inc_index(ring);
-+
-+err_free_tre_buf:
-+	kmem_cache_free(mhi_cntrl->tre_buf_cache, buf_info->cb_buf);
-+}
-+
- static int mhi_ep_read_channel(struct mhi_ep_cntrl *mhi_cntrl,
--				struct mhi_ep_ring *ring,
--				struct mhi_result *result,
--				u32 len)
-+			       struct mhi_ep_ring *ring)
- {
- 	struct mhi_ep_chan *mhi_chan = &mhi_cntrl->mhi_chan[ring->ch_id];
- 	struct device *dev = &mhi_cntrl->mhi_dev->dev;
- 	size_t tr_len, read_offset, write_offset;
- 	struct mhi_ep_buf_info buf_info = {};
-+	u32 len = MHI_EP_DEFAULT_MTU;
- 	struct mhi_ring_element *el;
- 	bool tr_done = false;
-+	void *buf_addr;
- 	u32 buf_left;
- 	int ret;
- 
-@@ -339,7 +405,7 @@ static int mhi_ep_read_channel(struct mhi_ep_cntrl *mhi_cntrl,
- 			return -ENODEV;
- 		}
- 
--		el = &ring->ring_cache[ring->rd_offset];
-+		el = &ring->ring_cache[mhi_chan->rd_offset];
- 
- 		/* Check if there is data pending to be read from previous read operation */
- 		if (mhi_chan->tre_bytes_left) {
-@@ -356,82 +422,50 @@ static int mhi_ep_read_channel(struct mhi_ep_cntrl *mhi_cntrl,
- 		read_offset = mhi_chan->tre_size - mhi_chan->tre_bytes_left;
- 		write_offset = len - buf_left;
- 
-+		buf_addr = kmem_cache_zalloc(mhi_cntrl->tre_buf_cache, GFP_KERNEL);
-+		if (!buf_addr)
-+			return -ENOMEM;
-+
- 		buf_info.host_addr = mhi_chan->tre_loc + read_offset;
--		buf_info.dev_addr = result->buf_addr + write_offset;
-+		buf_info.dev_addr = buf_addr + write_offset;
- 		buf_info.size = tr_len;
-+		buf_info.cb = mhi_ep_read_completion;
-+		buf_info.cb_buf = buf_addr;
-+		buf_info.mhi_dev = mhi_chan->mhi_dev;
-+
-+		if (mhi_chan->tre_bytes_left - tr_len)
-+			buf_info.code = MHI_EV_CC_OVERFLOW;
- 
- 		dev_dbg(dev, "Reading %zd bytes from channel (%u)\n", tr_len, ring->ch_id);
--		ret = mhi_cntrl->read_from_host(mhi_cntrl, &buf_info);
-+		ret = mhi_cntrl->read_async(mhi_cntrl, &buf_info);
- 		if (ret < 0) {
- 			dev_err(&mhi_chan->mhi_dev->dev, "Error reading from channel\n");
--			return ret;
-+			goto err_free_buf_addr;
- 		}
- 
- 		buf_left -= tr_len;
- 		mhi_chan->tre_bytes_left -= tr_len;
- 
--		/*
--		 * Once the TRE (Transfer Ring Element) of a TD (Transfer Descriptor) has been
--		 * read completely:
--		 *
--		 * 1. Send completion event to the host based on the flags set in TRE.
--		 * 2. Increment the local read offset of the transfer ring.
--		 */
- 		if (!mhi_chan->tre_bytes_left) {
--			/*
--			 * The host will split the data packet into multiple TREs if it can't fit
--			 * the packet in a single TRE. In that case, CHAIN flag will be set by the
--			 * host for all TREs except the last one.
--			 */
--			if (MHI_TRE_DATA_GET_CHAIN(el)) {
--				/*
--				 * IEOB (Interrupt on End of Block) flag will be set by the host if
--				 * it expects the completion event for all TREs of a TD.
--				 */
--				if (MHI_TRE_DATA_GET_IEOB(el)) {
--					ret = mhi_ep_send_completion_event(mhi_cntrl, ring, el,
--								     MHI_TRE_DATA_GET_LEN(el),
--								     MHI_EV_CC_EOB);
--					if (ret < 0) {
--						dev_err(&mhi_chan->mhi_dev->dev,
--							"Error sending transfer compl. event\n");
--						return ret;
--					}
--				}
--			} else {
--				/*
--				 * IEOT (Interrupt on End of Transfer) flag will be set by the host
--				 * for the last TRE of the TD and expects the completion event for
--				 * the same.
--				 */
--				if (MHI_TRE_DATA_GET_IEOT(el)) {
--					ret = mhi_ep_send_completion_event(mhi_cntrl, ring, el,
--								     MHI_TRE_DATA_GET_LEN(el),
--								     MHI_EV_CC_EOT);
--					if (ret < 0) {
--						dev_err(&mhi_chan->mhi_dev->dev,
--							"Error sending transfer compl. event\n");
--						return ret;
--					}
--				}
--
-+			if (MHI_TRE_DATA_GET_IEOT(el))
- 				tr_done = true;
--			}
- 
--			mhi_ep_ring_inc_index(ring);
-+			mhi_chan->rd_offset = (mhi_chan->rd_offset + 1) % ring->ring_size;
- 		}
--
--		result->bytes_xferd += tr_len;
- 	} while (buf_left && !tr_done);
- 
- 	return 0;
-+
-+err_free_buf_addr:
-+	kmem_cache_free(mhi_cntrl->tre_buf_cache, buf_addr);
-+
-+	return ret;
- }
- 
--static int mhi_ep_process_ch_ring(struct mhi_ep_ring *ring, struct mhi_ring_element *el)
-+static int mhi_ep_process_ch_ring(struct mhi_ep_ring *ring)
- {
- 	struct mhi_ep_cntrl *mhi_cntrl = ring->mhi_cntrl;
- 	struct mhi_result result = {};
--	u32 len = MHI_EP_DEFAULT_MTU;
- 	struct mhi_ep_chan *mhi_chan;
- 	int ret;
- 
-@@ -452,32 +486,49 @@ static int mhi_ep_process_ch_ring(struct mhi_ep_ring *ring, struct mhi_ring_elem
- 		mhi_chan->xfer_cb(mhi_chan->mhi_dev, &result);
- 	} else {
- 		/* UL channel */
--		result.buf_addr = kmem_cache_zalloc(mhi_cntrl->tre_buf_cache, GFP_KERNEL | GFP_DMA);
--		if (!result.buf_addr)
--			return -ENOMEM;
--
- 		do {
--			ret = mhi_ep_read_channel(mhi_cntrl, ring, &result, len);
-+			ret = mhi_ep_read_channel(mhi_cntrl, ring);
- 			if (ret < 0) {
- 				dev_err(&mhi_chan->mhi_dev->dev, "Failed to read channel\n");
--				kmem_cache_free(mhi_cntrl->tre_buf_cache, result.buf_addr);
- 				return ret;
- 			}
- 
--			result.dir = mhi_chan->dir;
--			mhi_chan->xfer_cb(mhi_chan->mhi_dev, &result);
--			result.bytes_xferd = 0;
--			memset(result.buf_addr, 0, len);
--
- 			/* Read until the ring becomes empty */
- 		} while (!mhi_ep_queue_is_empty(mhi_chan->mhi_dev, DMA_TO_DEVICE));
--
--		kmem_cache_free(mhi_cntrl->tre_buf_cache, result.buf_addr);
- 	}
- 
- 	return 0;
- }
- 
-+static void mhi_ep_skb_completion(struct mhi_ep_buf_info *buf_info)
-+{
-+	struct mhi_ep_device *mhi_dev = buf_info->mhi_dev;
-+	struct mhi_ep_cntrl *mhi_cntrl = mhi_dev->mhi_cntrl;
-+	struct mhi_ep_chan *mhi_chan = mhi_dev->dl_chan;
-+	struct mhi_ep_ring *ring = &mhi_cntrl->mhi_chan[mhi_chan->chan].ring;
-+	struct mhi_ring_element *el = &ring->ring_cache[ring->rd_offset];
-+	struct device *dev = &mhi_dev->dev;
-+	struct mhi_result result = {};
-+	int ret;
-+
-+	if (mhi_chan->xfer_cb) {
-+		result.buf_addr = buf_info->cb_buf;
-+		result.dir = mhi_chan->dir;
-+		result.bytes_xferd = buf_info->size;
-+
-+		mhi_chan->xfer_cb(mhi_dev, &result);
-+	}
-+
-+	ret = mhi_ep_send_completion_event(mhi_cntrl, ring, el, buf_info->size,
-+					   buf_info->code);
-+	if (ret) {
-+		dev_err(dev, "Error sending transfer completion event\n");
-+		return;
-+	}
-+
-+	mhi_ep_ring_inc_index(ring);
-+}
-+
- /* TODO: Handle partially formed TDs */
- int mhi_ep_queue_skb(struct mhi_ep_device *mhi_dev, struct sk_buff *skb)
- {
-@@ -488,7 +539,6 @@ int mhi_ep_queue_skb(struct mhi_ep_device *mhi_dev, struct sk_buff *skb)
- 	struct mhi_ring_element *el;
- 	u32 buf_left, read_offset;
- 	struct mhi_ep_ring *ring;
--	enum mhi_ev_ccs code;
- 	size_t tr_len;
- 	u32 tre_len;
- 	int ret;
-@@ -512,7 +562,7 @@ int mhi_ep_queue_skb(struct mhi_ep_device *mhi_dev, struct sk_buff *skb)
- 			goto err_exit;
- 		}
- 
--		el = &ring->ring_cache[ring->rd_offset];
-+		el = &ring->ring_cache[mhi_chan->rd_offset];
- 		tre_len = MHI_TRE_DATA_GET_LEN(el);
- 
- 		tr_len = min(buf_left, tre_len);
-@@ -521,33 +571,35 @@ int mhi_ep_queue_skb(struct mhi_ep_device *mhi_dev, struct sk_buff *skb)
- 		buf_info.dev_addr = skb->data + read_offset;
- 		buf_info.host_addr = MHI_TRE_DATA_GET_PTR(el);
- 		buf_info.size = tr_len;
-+		buf_info.cb = mhi_ep_skb_completion;
-+		buf_info.cb_buf = skb;
-+		buf_info.mhi_dev = mhi_dev;
- 
--		dev_dbg(dev, "Writing %zd bytes to channel (%u)\n", tr_len, ring->ch_id);
--		ret = mhi_cntrl->write_to_host(mhi_cntrl, &buf_info);
--		if (ret < 0) {
--			dev_err(dev, "Error writing to the channel\n");
--			goto err_exit;
--		}
--
--		buf_left -= tr_len;
- 		/*
- 		 * For all TREs queued by the host for DL channel, only the EOT flag will be set.
- 		 * If the packet doesn't fit into a single TRE, send the OVERFLOW event to
- 		 * the host so that the host can adjust the packet boundary to next TREs. Else send
- 		 * the EOT event to the host indicating the packet boundary.
- 		 */
--		if (buf_left)
--			code = MHI_EV_CC_OVERFLOW;
-+		if (buf_left - tr_len)
-+			buf_info.code = MHI_EV_CC_OVERFLOW;
- 		else
--			code = MHI_EV_CC_EOT;
-+			buf_info.code = MHI_EV_CC_EOT;
- 
--		ret = mhi_ep_send_completion_event(mhi_cntrl, ring, el, tr_len, code);
--		if (ret) {
--			dev_err(dev, "Error sending transfer completion event\n");
-+		dev_dbg(dev, "Writing %zd bytes to channel (%u)\n", tr_len, ring->ch_id);
-+		ret = mhi_cntrl->write_async(mhi_cntrl, &buf_info);
-+		if (ret < 0) {
-+			dev_err(dev, "Error writing to the channel\n");
- 			goto err_exit;
- 		}
- 
--		mhi_ep_ring_inc_index(ring);
-+		buf_left -= tr_len;
-+
-+		/*
-+		 * Update the read offset cached in mhi_chan. Actual read offset
-+		 * will be updated by the completion handler.
-+		 */
-+		mhi_chan->rd_offset = (mhi_chan->rd_offset + 1) % ring->ring_size;
- 	} while (buf_left);
- 
- 	mutex_unlock(&mhi_chan->lock);
-@@ -748,7 +800,6 @@ static void mhi_ep_ch_ring_worker(struct work_struct *work)
- 	struct mhi_ep_cntrl *mhi_cntrl = container_of(work, struct mhi_ep_cntrl, ch_ring_work);
- 	struct device *dev = &mhi_cntrl->mhi_dev->dev;
- 	struct mhi_ep_ring_item *itr, *tmp;
--	struct mhi_ring_element *el;
- 	struct mhi_ep_ring *ring;
- 	struct mhi_ep_chan *chan;
- 	unsigned long flags;
-@@ -787,16 +838,14 @@ static void mhi_ep_ch_ring_worker(struct work_struct *work)
- 		}
- 
- 		/* Sanity check to make sure there are elements in the ring */
--		if (ring->rd_offset == ring->wr_offset) {
-+		if (chan->rd_offset == ring->wr_offset) {
- 			mutex_unlock(&chan->lock);
- 			kmem_cache_free(mhi_cntrl->ring_item_cache, itr);
- 			continue;
- 		}
- 
--		el = &ring->ring_cache[ring->rd_offset];
--
- 		dev_dbg(dev, "Processing the ring for channel (%u)\n", ring->ch_id);
--		ret = mhi_ep_process_ch_ring(ring, el);
-+		ret = mhi_ep_process_ch_ring(ring);
- 		if (ret) {
- 			dev_err(dev, "Error processing ring for channel (%u): %d\n",
- 				ring->ch_id, ret);
-@@ -1411,14 +1460,14 @@ int mhi_ep_register_controller(struct mhi_ep_cntrl *mhi_cntrl,
- 
- 	mhi_cntrl->ev_ring_el_cache = kmem_cache_create("mhi_ep_event_ring_el",
- 							sizeof(struct mhi_ring_element), 0,
--							SLAB_CACHE_DMA, NULL);
-+							0, NULL);
- 	if (!mhi_cntrl->ev_ring_el_cache) {
- 		ret = -ENOMEM;
- 		goto err_free_cmd;
- 	}
- 
- 	mhi_cntrl->tre_buf_cache = kmem_cache_create("mhi_ep_tre_buf", MHI_EP_DEFAULT_MTU, 0,
--						      SLAB_CACHE_DMA, NULL);
-+						      0, NULL);
- 	if (!mhi_cntrl->tre_buf_cache) {
- 		ret = -ENOMEM;
- 		goto err_destroy_ev_ring_el_cache;
-@@ -1431,6 +1480,7 @@ int mhi_ep_register_controller(struct mhi_ep_cntrl *mhi_cntrl,
- 		ret = -ENOMEM;
- 		goto err_destroy_tre_buf_cache;
- 	}
-+
- 	INIT_WORK(&mhi_cntrl->state_work, mhi_ep_state_worker);
- 	INIT_WORK(&mhi_cntrl->reset_work, mhi_ep_reset_worker);
- 	INIT_WORK(&mhi_cntrl->cmd_ring_work, mhi_ep_cmd_ring_worker);
-diff --git a/drivers/bus/mhi/ep/ring.c b/drivers/bus/mhi/ep/ring.c
-index c673d7200b3e17..ba9f696d1aa80e 100644
---- a/drivers/bus/mhi/ep/ring.c
-+++ b/drivers/bus/mhi/ep/ring.c
-@@ -48,7 +48,7 @@ static int __mhi_ep_cache_ring(struct mhi_ep_ring *ring, size_t end)
- 		buf_info.host_addr = ring->rbase + (start * sizeof(struct mhi_ring_element));
- 		buf_info.dev_addr = &ring->ring_cache[start];
- 
--		ret = mhi_cntrl->read_from_host(mhi_cntrl, &buf_info);
-+		ret = mhi_cntrl->read_sync(mhi_cntrl, &buf_info);
- 		if (ret < 0)
- 			return ret;
- 	} else {
-@@ -56,7 +56,7 @@ static int __mhi_ep_cache_ring(struct mhi_ep_ring *ring, size_t end)
- 		buf_info.host_addr = ring->rbase + (start * sizeof(struct mhi_ring_element));
- 		buf_info.dev_addr = &ring->ring_cache[start];
- 
--		ret = mhi_cntrl->read_from_host(mhi_cntrl, &buf_info);
-+		ret = mhi_cntrl->read_sync(mhi_cntrl, &buf_info);
- 		if (ret < 0)
- 			return ret;
- 
-@@ -65,7 +65,7 @@ static int __mhi_ep_cache_ring(struct mhi_ep_ring *ring, size_t end)
- 			buf_info.dev_addr = &ring->ring_cache[0];
- 			buf_info.size = end * sizeof(struct mhi_ring_element);
- 
--			ret = mhi_cntrl->read_from_host(mhi_cntrl, &buf_info);
-+			ret = mhi_cntrl->read_sync(mhi_cntrl, &buf_info);
- 			if (ret < 0)
- 				return ret;
- 		}
-@@ -143,7 +143,7 @@ int mhi_ep_ring_add_element(struct mhi_ep_ring *ring, struct mhi_ring_element *e
- 	buf_info.dev_addr = el;
- 	buf_info.size = sizeof(*el);
- 
--	return mhi_cntrl->write_to_host(mhi_cntrl, &buf_info);
-+	return mhi_cntrl->write_sync(mhi_cntrl, &buf_info);
- }
- 
- void mhi_ep_ring_init(struct mhi_ep_ring *ring, enum mhi_ep_ring_type type, u32 id)
-diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
-index 680d1ef2a21794..796ab9a4e48fa1 100644
---- a/drivers/char/virtio_console.c
-+++ b/drivers/char/virtio_console.c
-@@ -2052,25 +2052,27 @@ static int virtcons_probe(struct virtio_device *vdev)
- 		multiport = true;
- 	}
- 
--	err = init_vqs(portdev);
--	if (err < 0) {
--		dev_err(&vdev->dev, "Error %d initializing vqs\n", err);
--		goto free_chrdev;
--	}
--
- 	spin_lock_init(&portdev->ports_lock);
- 	INIT_LIST_HEAD(&portdev->ports);
- 	INIT_LIST_HEAD(&portdev->list);
- 
--	virtio_device_ready(portdev->vdev);
--
- 	INIT_WORK(&portdev->config_work, &config_work_handler);
- 	INIT_WORK(&portdev->control_work, &control_work_handler);
- 
- 	if (multiport) {
- 		spin_lock_init(&portdev->c_ivq_lock);
- 		spin_lock_init(&portdev->c_ovq_lock);
-+	}
- 
-+	err = init_vqs(portdev);
-+	if (err < 0) {
-+		dev_err(&vdev->dev, "Error %d initializing vqs\n", err);
-+		goto free_chrdev;
-+	}
-+
-+	virtio_device_ready(portdev->vdev);
-+
-+	if (multiport) {
- 		err = fill_queue(portdev->c_ivq, &portdev->c_ivq_lock);
- 		if (err < 0) {
- 			dev_err(&vdev->dev,
-diff --git a/drivers/clk/bcm/clk-bcm53573-ilp.c b/drivers/clk/bcm/clk-bcm53573-ilp.c
-index 84f2af736ee8a6..83ef41d618be37 100644
---- a/drivers/clk/bcm/clk-bcm53573-ilp.c
-+++ b/drivers/clk/bcm/clk-bcm53573-ilp.c
-@@ -112,7 +112,7 @@ static void bcm53573_ilp_init(struct device_node *np)
- 		goto err_free_ilp;
- 	}
- 
--	ilp->regmap = syscon_node_to_regmap(of_get_parent(np));
-+	ilp->regmap = syscon_node_to_regmap(np->parent);
- 	if (IS_ERR(ilp->regmap)) {
- 		err = PTR_ERR(ilp->regmap);
- 		goto err_free_ilp;
-diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c
-index 2b77d1fc7bb946..1e1296e748357b 100644
---- a/drivers/clk/imx/clk-imx7d.c
-+++ b/drivers/clk/imx/clk-imx7d.c
-@@ -498,9 +498,9 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node)
- 	hws[IMX7D_ENET_AXI_ROOT_SRC] = imx_clk_hw_mux2_flags("enet_axi_src", base + 0x8900, 24, 3, enet_axi_sel, ARRAY_SIZE(enet_axi_sel), CLK_SET_PARENT_GATE);
- 	hws[IMX7D_NAND_USDHC_BUS_ROOT_SRC] = imx_clk_hw_mux2_flags("nand_usdhc_src", base + 0x8980, 24, 3, nand_usdhc_bus_sel, ARRAY_SIZE(nand_usdhc_bus_sel), CLK_SET_PARENT_GATE);
- 	hws[IMX7D_DRAM_PHYM_ROOT_SRC] = imx_clk_hw_mux2_flags("dram_phym_src", base + 0x9800, 24, 1, dram_phym_sel, ARRAY_SIZE(dram_phym_sel), CLK_SET_PARENT_GATE);
--	hws[IMX7D_DRAM_ROOT_SRC] = imx_clk_hw_mux2_flags("dram_src", base + 0x9880, 24, 1, dram_sel, ARRAY_SIZE(dram_sel), CLK_SET_PARENT_GATE);
-+	hws[IMX7D_DRAM_ROOT_SRC] = imx_clk_hw_mux2("dram_src", base + 0x9880, 24, 1, dram_sel, ARRAY_SIZE(dram_sel));
- 	hws[IMX7D_DRAM_PHYM_ALT_ROOT_SRC] = imx_clk_hw_mux2_flags("dram_phym_alt_src", base + 0xa000, 24, 3, dram_phym_alt_sel, ARRAY_SIZE(dram_phym_alt_sel), CLK_SET_PARENT_GATE);
--	hws[IMX7D_DRAM_ALT_ROOT_SRC]  = imx_clk_hw_mux2_flags("dram_alt_src", base + 0xa080, 24, 3, dram_alt_sel, ARRAY_SIZE(dram_alt_sel), CLK_SET_PARENT_GATE);
-+	hws[IMX7D_DRAM_ALT_ROOT_SRC]  = imx_clk_hw_mux2("dram_alt_src", base + 0xa080, 24, 3, dram_alt_sel, ARRAY_SIZE(dram_alt_sel));
- 	hws[IMX7D_USB_HSIC_ROOT_SRC] = imx_clk_hw_mux2_flags("usb_hsic_src", base + 0xa100, 24, 3, usb_hsic_sel, ARRAY_SIZE(usb_hsic_sel), CLK_SET_PARENT_GATE);
- 	hws[IMX7D_PCIE_CTRL_ROOT_SRC] = imx_clk_hw_mux2_flags("pcie_ctrl_src", base + 0xa180, 24, 3, pcie_ctrl_sel, ARRAY_SIZE(pcie_ctrl_sel), CLK_SET_PARENT_GATE);
- 	hws[IMX7D_PCIE_PHY_ROOT_SRC] = imx_clk_hw_mux2_flags("pcie_phy_src", base + 0xa200, 24, 3, pcie_phy_sel, ARRAY_SIZE(pcie_phy_sel), CLK_SET_PARENT_GATE);
-diff --git a/drivers/comedi/drivers/ni_routing/tools/convert_c_to_py.c b/drivers/comedi/drivers/ni_routing/tools/convert_c_to_py.c
-index d55521b5bdcb2d..892a66b2cea665 100644
---- a/drivers/comedi/drivers/ni_routing/tools/convert_c_to_py.c
-+++ b/drivers/comedi/drivers/ni_routing/tools/convert_c_to_py.c
-@@ -140,6 +140,11 @@ int main(void)
- {
- 	FILE *fp = fopen("ni_values.py", "w");
- 
-+	if (fp == NULL) {
-+		fprintf(stderr, "Could not open file!");
-+		return -1;
-+	}
-+
- 	/* write route register values */
- 	fprintf(fp, "ni_route_values = {\n");
- 	for (int i = 0; ni_all_route_values[i]; ++i)
-diff --git a/drivers/dax/device.c b/drivers/dax/device.c
-index 93ebedc5ec8ca3..01e89b7ac637f2 100644
---- a/drivers/dax/device.c
-+++ b/drivers/dax/device.c
-@@ -86,7 +86,7 @@ static void dax_set_mapping(struct vm_fault *vmf, pfn_t pfn,
- 		nr_pages = 1;
- 
- 	pgoff = linear_page_index(vmf->vma,
--			ALIGN(vmf->address, fault_size));
-+			ALIGN_DOWN(vmf->address, fault_size));
- 
- 	for (i = 0; i < nr_pages; i++) {
- 		struct page *page = pfn_to_page(pfn_t_to_pfn(pfn) + i);
-diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c
-index 58f107194fdafd..76468e6a2899a8 100644
---- a/drivers/gpio/gpio-aspeed.c
-+++ b/drivers/gpio/gpio-aspeed.c
-@@ -406,6 +406,8 @@ static void __aspeed_gpio_set(struct gpio_chip *gc, unsigned int offset,
- 	gpio->dcache[GPIO_BANK(offset)] = reg;
- 
- 	iowrite32(reg, addr);
-+	/* Flush write */
-+	ioread32(addr);
- }
- 
- static void aspeed_gpio_set(struct gpio_chip *gc, unsigned int offset,
-@@ -1191,7 +1193,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)
- 	if (!gpio_id)
- 		return -EINVAL;
- 
--	gpio->clk = of_clk_get(pdev->dev.of_node, 0);
-+	gpio->clk = devm_clk_get_enabled(&pdev->dev, NULL);
- 	if (IS_ERR(gpio->clk)) {
- 		dev_warn(&pdev->dev,
- 				"Failed to get clock from devicetree, debouncing disabled\n");
-diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
-index a7a6f6c5c76556..c2efe18ceacd07 100644
---- a/drivers/gpu/drm/amd/display/dc/core/dc.c
-+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
-@@ -1691,7 +1691,7 @@ bool dc_validate_boot_timing(const struct dc *dc,
- 		if (crtc_timing->pix_clk_100hz != pix_clk_100hz)
- 			return false;
- 
--		if (!se->funcs->dp_get_pixel_format)
-+		if (!se || !se->funcs->dp_get_pixel_format)
- 			return false;
- 
- 		if (!se->funcs->dp_get_pixel_format(
-diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c
-index 93c0455766ddb0..cee5e9e64ae711 100644
---- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c
-+++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c
-@@ -432,21 +432,18 @@ static enum mod_hdcp_status authenticated_dp(struct mod_hdcp *hdcp,
- 		goto out;
- 	}
- 
--	if (status == MOD_HDCP_STATUS_SUCCESS)
--		if (!mod_hdcp_execute_and_set(mod_hdcp_read_bstatus,
--				&input->bstatus_read, &status,
--				hdcp, "bstatus_read"))
--			goto out;
--	if (status == MOD_HDCP_STATUS_SUCCESS)
--		if (!mod_hdcp_execute_and_set(check_link_integrity_dp,
--				&input->link_integrity_check, &status,
--				hdcp, "link_integrity_check"))
--			goto out;
--	if (status == MOD_HDCP_STATUS_SUCCESS)
--		if (!mod_hdcp_execute_and_set(check_no_reauthentication_request_dp,
--				&input->reauth_request_check, &status,
--				hdcp, "reauth_request_check"))
--			goto out;
-+	mod_hdcp_execute_and_set(mod_hdcp_read_bstatus,
-+			&input->bstatus_read, &status,
-+			hdcp, "bstatus_read");
-+
-+	mod_hdcp_execute_and_set(check_link_integrity_dp,
-+			&input->link_integrity_check, &status,
-+			hdcp, "link_integrity_check");
-+
-+	mod_hdcp_execute_and_set(check_no_reauthentication_request_dp,
-+			&input->reauth_request_check, &status,
-+			hdcp, "reauth_request_check");
-+
- out:
- 	return status;
- }
-diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
-index cb90e70d85e862..65f9f66933bba2 100644
---- a/drivers/gpu/drm/drm_crtc.c
-+++ b/drivers/gpu/drm/drm_crtc.c
-@@ -904,6 +904,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
- 	connector_set = NULL;
- 	fb = NULL;
- 	mode = NULL;
-+	num_connectors = 0;
- 
- 	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
- 
-diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
-index a42549fa96918e..cb99839afcd03a 100644
---- a/drivers/gpu/drm/i915/display/intel_hdcp.c
-+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
-@@ -1005,7 +1005,8 @@ static void intel_hdcp_update_value(struct intel_connector *connector,
- 	hdcp->value = value;
- 	if (update_property) {
- 		drm_connector_get(&connector->base);
--		queue_work(i915->unordered_wq, &hdcp->prop_work);
-+		if (!queue_work(i915->unordered_wq, &hdcp->prop_work))
-+			drm_connector_put(&connector->base);
- 	}
- }
- 
-@@ -2480,7 +2481,8 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,
- 		mutex_lock(&hdcp->mutex);
- 		hdcp->value = DRM_MODE_CONTENT_PROTECTION_DESIRED;
- 		drm_connector_get(&connector->base);
--		queue_work(i915->unordered_wq, &hdcp->prop_work);
-+		if (!queue_work(i915->unordered_wq, &hdcp->prop_work))
-+			drm_connector_put(&connector->base);
- 		mutex_unlock(&hdcp->mutex);
- 	}
- 
-@@ -2497,7 +2499,9 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,
- 		 */
- 		if (!desired_and_not_enabled && !content_protection_type_changed) {
- 			drm_connector_get(&connector->base);
--			queue_work(i915->unordered_wq, &hdcp->prop_work);
-+			if (!queue_work(i915->unordered_wq, &hdcp->prop_work))
-+				drm_connector_put(&connector->base);
-+
- 		}
- 	}
- 
-diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
-index a34917b048f96f..8c7fff19c97bb0 100644
---- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
-+++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
-@@ -1157,7 +1157,7 @@ nv04_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
- 	chan = drm->channel;
- 	if (!chan)
- 		return -ENODEV;
--	cli = (void *)chan->user.client;
-+	cli = chan->cli;
- 	push = chan->chan.push;
- 
- 	s = kzalloc(sizeof(*s), GFP_KERNEL);
-diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
-index 74b16e39138561..2e177ebab30398 100644
---- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
-@@ -351,7 +351,7 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)
- 	list_add(&chan->head, &abi16->channels);
- 
- 	/* create channel object and initialise dma and fence management */
--	ret = nouveau_channel_new(drm, device, false, runm, init->fb_ctxdma_handle,
-+	ret = nouveau_channel_new(cli, false, runm, init->fb_ctxdma_handle,
- 				  init->tt_ctxdma_handle, &chan->chan);
- 	if (ret)
- 		goto done;
-diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
-index 3a7f4ce34aa31c..5d398a422459e1 100644
---- a/drivers/gpu/drm/nouveau/nouveau_bo.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
-@@ -843,7 +843,7 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict,
- {
- 	struct nouveau_drm *drm = nouveau_bdev(bo->bdev);
- 	struct nouveau_channel *chan = drm->ttm.chan;
--	struct nouveau_cli *cli = (void *)chan->user.client;
-+	struct nouveau_cli *cli = chan->cli;
- 	struct nouveau_fence *fence;
- 	int ret;
- 
-diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
-index 7c97b288680760..cee36b1efd3917 100644
---- a/drivers/gpu/drm/nouveau/nouveau_chan.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
-@@ -52,7 +52,7 @@ static int
- nouveau_channel_killed(struct nvif_event *event, void *repv, u32 repc)
- {
- 	struct nouveau_channel *chan = container_of(event, typeof(*chan), kill);
--	struct nouveau_cli *cli = (void *)chan->user.client;
-+	struct nouveau_cli *cli = chan->cli;
- 
- 	NV_PRINTK(warn, cli, "channel %d killed!\n", chan->chid);
- 
-@@ -66,7 +66,7 @@ int
- nouveau_channel_idle(struct nouveau_channel *chan)
- {
- 	if (likely(chan && chan->fence && !atomic_read(&chan->killed))) {
--		struct nouveau_cli *cli = (void *)chan->user.client;
-+		struct nouveau_cli *cli = chan->cli;
- 		struct nouveau_fence *fence = NULL;
- 		int ret;
- 
-@@ -142,10 +142,11 @@ nouveau_channel_wait(struct nvif_push *push, u32 size)
- }
- 
- static int
--nouveau_channel_prep(struct nouveau_drm *drm, struct nvif_device *device,
-+nouveau_channel_prep(struct nouveau_cli *cli,
- 		     u32 size, struct nouveau_channel **pchan)
- {
--	struct nouveau_cli *cli = (void *)device->object.client;
-+	struct nouveau_drm *drm = cli->drm;
-+	struct nvif_device *device = &cli->device;
- 	struct nv_dma_v0 args = {};
- 	struct nouveau_channel *chan;
- 	u32 target;
-@@ -155,6 +156,7 @@ nouveau_channel_prep(struct nouveau_drm *drm, struct nvif_device *device,
- 	if (!chan)
- 		return -ENOMEM;
- 
-+	chan->cli = cli;
- 	chan->device = device;
- 	chan->drm = drm;
- 	chan->vmm = nouveau_cli_vmm(cli);
-@@ -254,7 +256,7 @@ nouveau_channel_prep(struct nouveau_drm *drm, struct nvif_device *device,
- }
- 
- static int
--nouveau_channel_ctor(struct nouveau_drm *drm, struct nvif_device *device, bool priv, u64 runm,
-+nouveau_channel_ctor(struct nouveau_cli *cli, bool priv, u64 runm,
- 		     struct nouveau_channel **pchan)
- {
- 	const struct nvif_mclass hosts[] = {
-@@ -279,7 +281,7 @@ nouveau_channel_ctor(struct nouveau_drm *drm, struct nvif_device *device, bool p
- 		struct nvif_chan_v0 chan;
- 		char name[TASK_COMM_LEN+16];
- 	} args;
--	struct nouveau_cli *cli = (void *)device->object.client;
-+	struct nvif_device *device = &cli->device;
- 	struct nouveau_channel *chan;
- 	const u64 plength = 0x10000;
- 	const u64 ioffset = plength;
-@@ -298,7 +300,7 @@ nouveau_channel_ctor(struct nouveau_drm *drm, struct nvif_device *device, bool p
- 		size = ioffset + ilength;
- 
- 	/* allocate dma push buffer */
--	ret = nouveau_channel_prep(drm, device, size, &chan);
-+	ret = nouveau_channel_prep(cli, size, &chan);
- 	*pchan = chan;
- 	if (ret)
- 		return ret;
-@@ -493,13 +495,12 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
- }
- 
- int
--nouveau_channel_new(struct nouveau_drm *drm, struct nvif_device *device,
-+nouveau_channel_new(struct nouveau_cli *cli,
- 		    bool priv, u64 runm, u32 vram, u32 gart, struct nouveau_channel **pchan)
- {
--	struct nouveau_cli *cli = (void *)device->object.client;
- 	int ret;
- 
--	ret = nouveau_channel_ctor(drm, device, priv, runm, pchan);
-+	ret = nouveau_channel_ctor(cli, priv, runm, pchan);
- 	if (ret) {
- 		NV_PRINTK(dbg, cli, "channel create, %d\n", ret);
- 		return ret;
-diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.h b/drivers/gpu/drm/nouveau/nouveau_chan.h
-index 5de2ef4e98c2bb..260febd634ee21 100644
---- a/drivers/gpu/drm/nouveau/nouveau_chan.h
-+++ b/drivers/gpu/drm/nouveau/nouveau_chan.h
-@@ -12,6 +12,7 @@ struct nouveau_channel {
- 		struct nvif_push *push;
- 	} chan;
- 
-+	struct nouveau_cli *cli;
- 	struct nvif_device *device;
- 	struct nouveau_drm *drm;
- 	struct nouveau_vmm *vmm;
-@@ -62,7 +63,7 @@ struct nouveau_channel {
- int nouveau_channels_init(struct nouveau_drm *);
- void nouveau_channels_fini(struct nouveau_drm *);
- 
--int  nouveau_channel_new(struct nouveau_drm *, struct nvif_device *, bool priv, u64 runm,
-+int  nouveau_channel_new(struct nouveau_cli *, bool priv, u64 runm,
- 			 u32 vram, u32 gart, struct nouveau_channel **);
- void nouveau_channel_del(struct nouveau_channel **);
- int  nouveau_channel_idle(struct nouveau_channel *);
-diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c
-index 6fb65b01d77804..097bd3af0719e0 100644
---- a/drivers/gpu/drm/nouveau/nouveau_dmem.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c
-@@ -193,7 +193,7 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struct vm_fault *vmf)
- 	if (!spage || !(src & MIGRATE_PFN_MIGRATE))
- 		goto done;
- 
--	dpage = alloc_page_vma(GFP_HIGHUSER, vmf->vma, vmf->address);
-+	dpage = alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO, vmf->vma, vmf->address);
- 	if (!dpage)
- 		goto done;
- 
-diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
-index 75545da9d1e91d..ac15a662e06042 100644
---- a/drivers/gpu/drm/nouveau/nouveau_drm.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
-@@ -343,7 +343,7 @@ nouveau_accel_ce_init(struct nouveau_drm *drm)
- 		return;
- 	}
- 
--	ret = nouveau_channel_new(drm, device, false, runm, NvDmaFB, NvDmaTT, &drm->cechan);
-+	ret = nouveau_channel_new(&drm->client, true, runm, NvDmaFB, NvDmaTT, &drm->cechan);
- 	if (ret)
- 		NV_ERROR(drm, "failed to create ce channel, %d\n", ret);
- }
-@@ -371,7 +371,7 @@ nouveau_accel_gr_init(struct nouveau_drm *drm)
- 		return;
- 	}
- 
--	ret = nouveau_channel_new(drm, device, false, runm, NvDmaFB, NvDmaTT, &drm->channel);
-+	ret = nouveau_channel_new(&drm->client, false, runm, NvDmaFB, NvDmaTT, &drm->channel);
- 	if (ret) {
- 		NV_ERROR(drm, "failed to create kernel channel, %d\n", ret);
- 		nouveau_accel_gr_fini(drm);
-diff --git a/drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c b/drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c
-index cfa5b54ed6fe78..e6328991c87e93 100644
---- a/drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c
-+++ b/drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c
-@@ -2112,11 +2112,11 @@ static const struct panel_desc starry_qfh032011_53g_desc = {
- };
- 
- static const struct drm_display_mode starry_himax83102_j02_default_mode = {
--	.clock = 162850,
-+	.clock = 162680,
- 	.hdisplay = 1200,
--	.hsync_start = 1200 + 50,
--	.hsync_end = 1200 + 50 + 20,
--	.htotal = 1200 + 50 + 20 + 50,
-+	.hsync_start = 1200 + 60,
-+	.hsync_end = 1200 + 60 + 20,
-+	.htotal = 1200 + 60 + 20 + 40,
- 	.vdisplay = 1920,
- 	.vsync_start = 1920 + 116,
- 	.vsync_end = 1920 + 116 + 8,
-diff --git a/drivers/gpu/drm/v3d/v3d_perfmon.c b/drivers/gpu/drm/v3d/v3d_perfmon.c
-index e1be7368b87dfc..73b9c92dc0fc5b 100644
---- a/drivers/gpu/drm/v3d/v3d_perfmon.c
-+++ b/drivers/gpu/drm/v3d/v3d_perfmon.c
-@@ -103,6 +103,11 @@ void v3d_perfmon_open_file(struct v3d_file_priv *v3d_priv)
- static int v3d_perfmon_idr_del(int id, void *elem, void *data)
- {
- 	struct v3d_perfmon *perfmon = elem;
-+	struct v3d_dev *v3d = (struct v3d_dev *)data;
-+
-+	/* If the active perfmon is being destroyed, stop it first */
-+	if (perfmon == v3d->active_perfmon)
-+		v3d_perfmon_stop(v3d, perfmon, false);
- 
- 	v3d_perfmon_put(perfmon);
- 
-@@ -111,8 +116,10 @@ static int v3d_perfmon_idr_del(int id, void *elem, void *data)
- 
- void v3d_perfmon_close_file(struct v3d_file_priv *v3d_priv)
- {
-+	struct v3d_dev *v3d = v3d_priv->v3d;
-+
- 	mutex_lock(&v3d_priv->perfmon.lock);
--	idr_for_each(&v3d_priv->perfmon.idr, v3d_perfmon_idr_del, NULL);
-+	idr_for_each(&v3d_priv->perfmon.idr, v3d_perfmon_idr_del, v3d);
- 	idr_destroy(&v3d_priv->perfmon.idr);
- 	mutex_unlock(&v3d_priv->perfmon.lock);
- 	mutex_destroy(&v3d_priv->perfmon.lock);
-diff --git a/drivers/gpu/drm/vc4/vc4_perfmon.c b/drivers/gpu/drm/vc4/vc4_perfmon.c
-index c4ac2c94623815..c00a5cc2316d20 100644
---- a/drivers/gpu/drm/vc4/vc4_perfmon.c
-+++ b/drivers/gpu/drm/vc4/vc4_perfmon.c
-@@ -116,6 +116,11 @@ void vc4_perfmon_open_file(struct vc4_file *vc4file)
- static int vc4_perfmon_idr_del(int id, void *elem, void *data)
- {
- 	struct vc4_perfmon *perfmon = elem;
-+	struct vc4_dev *vc4 = (struct vc4_dev *)data;
-+
-+	/* If the active perfmon is being destroyed, stop it first */
-+	if (perfmon == vc4->active_perfmon)
-+		vc4_perfmon_stop(vc4, perfmon, false);
- 
- 	vc4_perfmon_put(perfmon);
- 
-@@ -130,7 +135,7 @@ void vc4_perfmon_close_file(struct vc4_file *vc4file)
- 		return;
- 
- 	mutex_lock(&vc4file->perfmon.lock);
--	idr_for_each(&vc4file->perfmon.idr, vc4_perfmon_idr_del, NULL);
-+	idr_for_each(&vc4file->perfmon.idr, vc4_perfmon_idr_del, vc4);
- 	idr_destroy(&vc4file->perfmon.idr);
- 	mutex_unlock(&vc4file->perfmon.lock);
- 	mutex_destroy(&vc4file->perfmon.lock);
-diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
-index 790aa908e2a788..9e2cde55b465ce 100644
---- a/drivers/hid/Kconfig
-+++ b/drivers/hid/Kconfig
-@@ -1300,6 +1300,15 @@ config HID_ALPS
- 	Say Y here if you have a Alps touchpads over i2c-hid or usbhid
- 	and want support for its special functionalities.
- 
-+config HID_MCP2200
-+	tristate "Microchip MCP2200 HID USB-to-GPIO bridge"
-+	depends on USB_HID && GPIOLIB
-+	help
-+	  Provides GPIO functionality over USB-HID through MCP2200 device.
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called hid-mcp2200.ko.
-+
- config HID_MCP2221
- 	tristate "Microchip MCP2221 HID USB-to-I2C/SMbus host support"
- 	depends on USB_HID && I2C
-diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
-index 8a06d0f840bcbe..082a728eac6004 100644
---- a/drivers/hid/Makefile
-+++ b/drivers/hid/Makefile
-@@ -79,6 +79,7 @@ obj-$(CONFIG_HID_LOGITECH_HIDPP)	+= hid-logitech-hidpp.o
- obj-$(CONFIG_HID_MACALLY)	+= hid-macally.o
- obj-$(CONFIG_HID_MAGICMOUSE)	+= hid-magicmouse.o
- obj-$(CONFIG_HID_MALTRON)	+= hid-maltron.o
-+obj-$(CONFIG_HID_MCP2200)	+= hid-mcp2200.o
- obj-$(CONFIG_HID_MCP2221)	+= hid-mcp2221.o
- obj-$(CONFIG_HID_MAYFLASH)	+= hid-mf.o
- obj-$(CONFIG_HID_MEGAWORLD_FF)	+= hid-megaworld.o
-diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_client.c b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
-index 4b59687ff5d821..3438d392920fad 100644
---- a/drivers/hid/amd-sfh-hid/amd_sfh_client.c
-+++ b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
-@@ -236,9 +236,9 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata)
- 	cl_data->in_data = in_data;
- 
- 	for (i = 0; i < cl_data->num_hid_devices; i++) {
--		in_data->sensor_virt_addr[i] = dma_alloc_coherent(dev, sizeof(int) * 8,
--								  &cl_data->sensor_dma_addr[i],
--								  GFP_KERNEL);
-+		in_data->sensor_virt_addr[i] = dmam_alloc_coherent(dev, sizeof(int) * 8,
-+								   &cl_data->sensor_dma_addr[i],
-+								   GFP_KERNEL);
- 		if (!in_data->sensor_virt_addr[i]) {
- 			rc = -ENOMEM;
- 			goto cleanup;
-@@ -331,7 +331,6 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata)
- int amd_sfh_hid_client_deinit(struct amd_mp2_dev *privdata)
- {
- 	struct amdtp_cl_data *cl_data = privdata->cl_data;
--	struct amd_input_data *in_data = cl_data->in_data;
- 	int i, status;
- 
- 	for (i = 0; i < cl_data->num_hid_devices; i++) {
-@@ -351,12 +350,5 @@ int amd_sfh_hid_client_deinit(struct amd_mp2_dev *privdata)
- 	cancel_delayed_work_sync(&cl_data->work_buffer);
- 	amdtp_hid_remove(cl_data);
- 
--	for (i = 0; i < cl_data->num_hid_devices; i++) {
--		if (in_data->sensor_virt_addr[i]) {
--			dma_free_coherent(&privdata->pdev->dev, 8 * sizeof(int),
--					  in_data->sensor_virt_addr[i],
--					  cl_data->sensor_dma_addr[i]);
--		}
--	}
- 	return 0;
- }
-diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
-index 88cbb2fe6ac8cc..84625e817ce950 100644
---- a/drivers/hid/hid-asus.c
-+++ b/drivers/hid/hid-asus.c
-@@ -881,7 +881,10 @@ static int asus_input_mapping(struct hid_device *hdev,
- 		case 0xb3: asus_map_key_clear(KEY_PROG3);	break; /* Fn+Left next aura */
- 		case 0x6a: asus_map_key_clear(KEY_F13);		break; /* Screenpad toggle */
- 		case 0x4b: asus_map_key_clear(KEY_F14);		break; /* Arrows/Pg-Up/Dn toggle */
--
-+		case 0xa5: asus_map_key_clear(KEY_F15);		break; /* ROG Ally left back */
-+		case 0xa6: asus_map_key_clear(KEY_F16);		break; /* ROG Ally QAM button */
-+		case 0xa7: asus_map_key_clear(KEY_F17);		break; /* ROG Ally ROG long-press */
-+		case 0xa8: asus_map_key_clear(KEY_F18);		break; /* ROG Ally ROG long-press-release */
- 
- 		default:
- 			/* ASUS lazily declares 256 usages, ignore the rest,
-@@ -1273,6 +1276,15 @@ static const struct hid_device_id asus_devices[] = {
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
- 	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3),
- 	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
-+	    USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR),
-+	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
-+	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY),
-+	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
-+	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X),
-+	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
- 	    USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD),
- 	  QUIRK_ROG_CLAYMORE_II_KEYBOARD },
-diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index f2e8fb357590ff..d4f6066dbbc596 100644
---- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -208,6 +208,9 @@
- #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD	0x1866
- #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2	0x19b6
- #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3	0x1a30
-+#define USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR		0x18c6
-+#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY		0x1abe
-+#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X		0x1b4c
- #define USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD	0x196b
- #define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD	0x1869
- 
-@@ -298,6 +301,9 @@
- 
- #define USB_VENDOR_ID_CIDC		0x1677
- 
-+#define I2C_VENDOR_ID_CIRQUE           0x0488
-+#define I2C_PRODUCT_ID_CIRQUE_1063     0x1063
-+
- #define USB_VENDOR_ID_CJTOUCH		0x24b8
- #define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020	0x0020
- #define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040	0x0040
-@@ -499,6 +505,7 @@
- #define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100 0xe100
- 
- #define I2C_VENDOR_ID_GOODIX		0x27c6
-+#define I2C_DEVICE_ID_GOODIX_01E0	0x01e0
- #define I2C_DEVICE_ID_GOODIX_01E8	0x01e8
- #define I2C_DEVICE_ID_GOODIX_01E9	0x01e9
- #define I2C_DEVICE_ID_GOODIX_01F0	0x01f0
-@@ -907,6 +914,7 @@
- #define USB_DEVICE_ID_PICK16F1454	0x0042
- #define USB_DEVICE_ID_PICK16F1454_V2	0xf2f7
- #define USB_DEVICE_ID_LUXAFOR		0xf372
-+#define USB_DEVICE_ID_MCP2200		0x00df
- #define USB_DEVICE_ID_MCP2221		0x00dd
- 
- #define USB_VENDOR_ID_MICROSOFT		0x045e
-@@ -1025,6 +1033,8 @@
- #define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3220_SERIES	0xc056
- #define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3215_SERIES	0xc057
- #define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3225_SERIES	0xc058
-+#define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3325_SERIES	0x430c
-+#define USB_DEVICE_ID_PLANTRONICS_ENCOREPRO_500_SERIES		0x431e
- 
- #define USB_VENDOR_ID_PANASONIC		0x04da
- #define USB_DEVICE_ID_PANABOARD_UBT780	0x1044
-diff --git a/drivers/hid/hid-mcp2200.c b/drivers/hid/hid-mcp2200.c
-new file mode 100644
-index 00000000000000..bf57f7f6caa084
---- /dev/null
-+++ b/drivers/hid/hid-mcp2200.c
-@@ -0,0 +1,392 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * MCP2200 - Microchip USB to GPIO bridge
-+ *
-+ * Copyright (c) 2023, Johannes Roith <johannes@gnu-linux.rocks>
-+ *
-+ * Datasheet: https://ww1.microchip.com/downloads/en/DeviceDoc/22228A.pdf
-+ * App Note for HID: https://ww1.microchip.com/downloads/en/DeviceDoc/93066A.pdf
-+ */
-+#include <linux/completion.h>
-+#include <linux/delay.h>
-+#include <linux/err.h>
-+#include <linux/gpio/driver.h>
-+#include <linux/hid.h>
-+#include <linux/hidraw.h>
-+#include <linux/module.h>
-+#include <linux/mutex.h>
-+#include "hid-ids.h"
-+
-+/* Commands codes in a raw output report */
-+#define SET_CLEAR_OUTPUTS	0x08
-+#define CONFIGURE		0x10
-+#define READ_EE			0x20
-+#define WRITE_EE		0x40
-+#define READ_ALL		0x80
-+
-+/* MCP GPIO direction encoding */
-+enum MCP_IO_DIR {
-+	MCP2200_DIR_OUT = 0x00,
-+	MCP2200_DIR_IN  = 0x01,
-+};
-+
-+/* Altternative pin assignments */
-+#define TXLED		2
-+#define RXLED		3
-+#define USBCFG		6
-+#define SSPND		7
-+#define MCP_NGPIO	8
-+
-+/* CMD to set or clear a GPIO output */
-+struct mcp_set_clear_outputs {
-+	u8 cmd;
-+	u8 dummys1[10];
-+	u8 set_bmap;
-+	u8 clear_bmap;
-+	u8 dummys2[3];
-+} __packed;
-+
-+/* CMD to configure the IOs */
-+struct mcp_configure {
-+	u8 cmd;
-+	u8 dummys1[3];
-+	u8 io_bmap;
-+	u8 config_alt_pins;
-+	u8 io_default_val_bmap;
-+	u8 config_alt_options;
-+	u8 baud_h;
-+	u8 baud_l;
-+	u8 dummys2[6];
-+} __packed;
-+
-+/* CMD to read all parameters */
-+struct mcp_read_all {
-+	u8 cmd;
-+	u8 dummys[15];
-+} __packed;
-+
-+/* Response to the read all cmd */
-+struct mcp_read_all_resp {
-+	u8 cmd;
-+	u8 eep_addr;
-+	u8 dummy;
-+	u8 eep_val;
-+	u8 io_bmap;
-+	u8 config_alt_pins;
-+	u8 io_default_val_bmap;
-+	u8 config_alt_options;
-+	u8 baud_h;
-+	u8 baud_l;
-+	u8 io_port_val_bmap;
-+	u8 dummys[5];
-+} __packed;
-+
-+struct mcp2200 {
-+	struct hid_device *hdev;
-+	struct mutex lock;
-+	struct completion wait_in_report;
-+	u8 gpio_dir;
-+	u8 gpio_val;
-+	u8 gpio_inval;
-+	u8 baud_h;
-+	u8 baud_l;
-+	u8 config_alt_pins;
-+	u8 gpio_reset_val;
-+	u8 config_alt_options;
-+	int status;
-+	struct gpio_chip gc;
-+	u8 hid_report[16];
-+};
-+
-+/* this executes the READ_ALL cmd */
-+static int mcp_cmd_read_all(struct mcp2200 *mcp)
-+{
-+	struct mcp_read_all *read_all;
-+	int len, t;
-+
-+	reinit_completion(&mcp->wait_in_report);
-+
-+	mutex_lock(&mcp->lock);
-+
-+	read_all = (struct mcp_read_all *) mcp->hid_report;
-+	read_all->cmd = READ_ALL;
-+	len = hid_hw_output_report(mcp->hdev, (u8 *) read_all,
-+				   sizeof(struct mcp_read_all));
-+
-+	mutex_unlock(&mcp->lock);
-+
-+	if (len != sizeof(struct mcp_read_all))
-+		return -EINVAL;
-+
-+	t = wait_for_completion_timeout(&mcp->wait_in_report,
-+					msecs_to_jiffies(4000));
-+	if (!t)
-+		return -ETIMEDOUT;
-+
-+	/* return status, negative value if wrong response was received */
-+	return mcp->status;
-+}
-+
-+static void mcp_set_multiple(struct gpio_chip *gc, unsigned long *mask,
-+			     unsigned long *bits)
-+{
-+	struct mcp2200 *mcp = gpiochip_get_data(gc);
-+	u8 value;
-+	int status;
-+	struct mcp_set_clear_outputs *cmd;
-+
-+	mutex_lock(&mcp->lock);
-+	cmd = (struct mcp_set_clear_outputs *) mcp->hid_report;
-+
-+	value = mcp->gpio_val & ~*mask;
-+	value |= (*mask & *bits);
-+
-+	cmd->cmd = SET_CLEAR_OUTPUTS;
-+	cmd->set_bmap = value;
-+	cmd->clear_bmap = ~(value);
-+
-+	status = hid_hw_output_report(mcp->hdev, (u8 *) cmd,
-+		       sizeof(struct mcp_set_clear_outputs));
-+
-+	if (status == sizeof(struct mcp_set_clear_outputs))
-+		mcp->gpio_val = value;
-+
-+	mutex_unlock(&mcp->lock);
-+}
-+
-+static void mcp_set(struct gpio_chip *gc, unsigned int gpio_nr, int value)
-+{
-+	unsigned long mask = 1 << gpio_nr;
-+	unsigned long bmap_value = value << gpio_nr;
-+
-+	mcp_set_multiple(gc, &mask, &bmap_value);
-+}
-+
-+static int mcp_get_multiple(struct gpio_chip *gc, unsigned long *mask,
-+		unsigned long *bits)
-+{
-+	u32 val;
-+	struct mcp2200 *mcp = gpiochip_get_data(gc);
-+	int status;
-+
-+	status = mcp_cmd_read_all(mcp);
-+	if (status)
-+		return status;
-+
-+	val = mcp->gpio_inval;
-+	*bits = (val & *mask);
-+	return 0;
-+}
-+
-+static int mcp_get(struct gpio_chip *gc, unsigned int gpio_nr)
-+{
-+	unsigned long mask = 0, bits = 0;
-+
-+	mask = (1 << gpio_nr);
-+	mcp_get_multiple(gc, &mask, &bits);
-+	return bits > 0;
-+}
-+
-+static int mcp_get_direction(struct gpio_chip *gc, unsigned int gpio_nr)
-+{
-+	struct mcp2200 *mcp = gpiochip_get_data(gc);
-+
-+	return (mcp->gpio_dir & (MCP2200_DIR_IN << gpio_nr))
-+		? GPIO_LINE_DIRECTION_IN : GPIO_LINE_DIRECTION_OUT;
-+}
-+
-+static int mcp_set_direction(struct gpio_chip *gc, unsigned int gpio_nr,
-+			     enum MCP_IO_DIR io_direction)
-+{
-+	struct mcp2200 *mcp = gpiochip_get_data(gc);
-+	struct mcp_configure *conf;
-+	int status;
-+	/* after the configure cmd we will need to set the outputs again */
-+	unsigned long mask = ~(mcp->gpio_dir); /* only set outputs */
-+	unsigned long bits = mcp->gpio_val;
-+	/* Offsets of alternative pins in config_alt_pins, 0 is not used */
-+	u8 alt_pin_conf[8] = {SSPND, USBCFG, 0, 0, 0, 0, RXLED, TXLED};
-+	u8 config_alt_pins = mcp->config_alt_pins;
-+
-+	/* Read in the reset baudrate first, we need it later */
-+	status = mcp_cmd_read_all(mcp);
-+	if (status != 0)
-+		return status;
-+
-+	mutex_lock(&mcp->lock);
-+	conf = (struct mcp_configure  *) mcp->hid_report;
-+
-+	/* configure will reset the chip! */
-+	conf->cmd = CONFIGURE;
-+	conf->io_bmap = (mcp->gpio_dir & ~(1 << gpio_nr))
-+		| (io_direction << gpio_nr);
-+	/* Don't overwrite the reset parameters */
-+	conf->baud_h = mcp->baud_h;
-+	conf->baud_l = mcp->baud_l;
-+	conf->config_alt_options = mcp->config_alt_options;
-+	conf->io_default_val_bmap = mcp->gpio_reset_val;
-+	/* Adjust alt. func if necessary */
-+	if (alt_pin_conf[gpio_nr])
-+		config_alt_pins &= ~(1 << alt_pin_conf[gpio_nr]);
-+	conf->config_alt_pins = config_alt_pins;
-+
-+	status = hid_hw_output_report(mcp->hdev, (u8 *) conf,
-+				      sizeof(struct mcp_set_clear_outputs));
-+
-+	if (status == sizeof(struct mcp_set_clear_outputs)) {
-+		mcp->gpio_dir = conf->io_bmap;
-+		mcp->config_alt_pins = config_alt_pins;
-+	} else {
-+		mutex_unlock(&mcp->lock);
-+		return -EIO;
-+	}
-+
-+	mutex_unlock(&mcp->lock);
-+
-+	/* Configure CMD will clear all IOs -> rewrite them */
-+	mcp_set_multiple(gc, &mask, &bits);
-+	return 0;
-+}
-+
-+static int mcp_direction_input(struct gpio_chip *gc, unsigned int gpio_nr)
-+{
-+	return mcp_set_direction(gc, gpio_nr, MCP2200_DIR_IN);
-+}
-+
-+static int mcp_direction_output(struct gpio_chip *gc, unsigned int gpio_nr,
-+				int value)
-+{
-+	int ret;
-+	unsigned long mask, bmap_value;
-+
-+	mask = 1 << gpio_nr;
-+	bmap_value = value << gpio_nr;
-+
-+	ret = mcp_set_direction(gc, gpio_nr, MCP2200_DIR_OUT);
-+	if (!ret)
-+		mcp_set_multiple(gc, &mask, &bmap_value);
-+	return ret;
-+}
-+
-+static const struct gpio_chip template_chip = {
-+	.label			= "mcp2200",
-+	.owner			= THIS_MODULE,
-+	.get_direction		= mcp_get_direction,
-+	.direction_input	= mcp_direction_input,
-+	.direction_output	= mcp_direction_output,
-+	.set			= mcp_set,
-+	.set_multiple		= mcp_set_multiple,
-+	.get			= mcp_get,
-+	.get_multiple		= mcp_get_multiple,
-+	.base			= -1,
-+	.ngpio			= MCP_NGPIO,
-+	.can_sleep		= true,
-+};
-+
-+/*
-+ * MCP2200 uses interrupt endpoint for input reports. This function
-+ * is called by HID layer when it receives i/p report from mcp2200,
-+ * which is actually a response to the previously sent command.
-+ */
-+static int mcp2200_raw_event(struct hid_device *hdev, struct hid_report *report,
-+		u8 *data, int size)
-+{
-+	struct mcp2200 *mcp = hid_get_drvdata(hdev);
-+	struct mcp_read_all_resp *all_resp;
-+
-+	switch (data[0]) {
-+	case READ_ALL:
-+		all_resp = (struct mcp_read_all_resp *) data;
-+		mcp->status = 0;
-+		mcp->gpio_inval = all_resp->io_port_val_bmap;
-+		mcp->baud_h = all_resp->baud_h;
-+		mcp->baud_l = all_resp->baud_l;
-+		mcp->gpio_reset_val = all_resp->io_default_val_bmap;
-+		mcp->config_alt_pins = all_resp->config_alt_pins;
-+		mcp->config_alt_options = all_resp->config_alt_options;
-+		break;
-+	default:
-+		mcp->status = -EIO;
-+		break;
-+	}
-+
-+	complete(&mcp->wait_in_report);
-+	return 0;
-+}
-+
-+static int mcp2200_probe(struct hid_device *hdev, const struct hid_device_id *id)
-+{
-+	int ret;
-+	struct mcp2200 *mcp;
-+
-+	mcp = devm_kzalloc(&hdev->dev, sizeof(*mcp), GFP_KERNEL);
-+	if (!mcp)
-+		return -ENOMEM;
-+
-+	ret = hid_parse(hdev);
-+	if (ret) {
-+		hid_err(hdev, "can't parse reports\n");
-+		return ret;
-+	}
-+
-+	ret = hid_hw_start(hdev, 0);
-+	if (ret) {
-+		hid_err(hdev, "can't start hardware\n");
-+		return ret;
-+	}
-+
-+	hid_info(hdev, "USB HID v%x.%02x Device [%s] on %s\n", hdev->version >> 8,
-+			hdev->version & 0xff, hdev->name, hdev->phys);
-+
-+	ret = hid_hw_open(hdev);
-+	if (ret) {
-+		hid_err(hdev, "can't open device\n");
-+		hid_hw_stop(hdev);
-+		return ret;
-+	}
-+
-+	mutex_init(&mcp->lock);
-+	init_completion(&mcp->wait_in_report);
-+	hid_set_drvdata(hdev, mcp);
-+	mcp->hdev = hdev;
-+
-+	mcp->gc = template_chip;
-+	mcp->gc.parent = &hdev->dev;
-+
-+	ret = devm_gpiochip_add_data(&hdev->dev, &mcp->gc, mcp);
-+	if (ret < 0) {
-+		hid_err(hdev, "Unable to register gpiochip\n");
-+		hid_hw_close(hdev);
-+		hid_hw_stop(hdev);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static void mcp2200_remove(struct hid_device *hdev)
-+{
-+	hid_hw_close(hdev);
-+	hid_hw_stop(hdev);
-+}
-+
-+static const struct hid_device_id mcp2200_devices[] = {
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_MCP2200) },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(hid, mcp2200_devices);
-+
-+static struct hid_driver mcp2200_driver = {
-+	.name		= "mcp2200",
-+	.id_table	= mcp2200_devices,
-+	.probe		= mcp2200_probe,
-+	.remove		= mcp2200_remove,
-+	.raw_event	= mcp2200_raw_event,
-+};
-+
-+/* Register with HID core */
-+module_hid_driver(mcp2200_driver);
-+
-+MODULE_AUTHOR("Johannes Roith <johannes@gnu-linux.rocks>");
-+MODULE_DESCRIPTION("MCP2200 Microchip HID USB to GPIO bridge");
-+MODULE_LICENSE("GPL");
-diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index 6d76463f5896f3..e7199ae2e3d918 100644
---- a/drivers/hid/hid-multitouch.c
-+++ b/drivers/hid/hid-multitouch.c
-@@ -1447,7 +1447,8 @@ static __u8 *mt_report_fixup(struct hid_device *hdev, __u8 *rdesc,
- {
- 	if (hdev->vendor == I2C_VENDOR_ID_GOODIX &&
- 	    (hdev->product == I2C_DEVICE_ID_GOODIX_01E8 ||
--	     hdev->product == I2C_DEVICE_ID_GOODIX_01E9)) {
-+	     hdev->product == I2C_DEVICE_ID_GOODIX_01E9 ||
-+		 hdev->product == I2C_DEVICE_ID_GOODIX_01E0)) {
- 		if (rdesc[607] == 0x15) {
- 			rdesc[607] = 0x25;
- 			dev_info(
-@@ -2068,7 +2069,10 @@ static const struct hid_device_id mt_devices[] = {
- 		     I2C_DEVICE_ID_GOODIX_01E8) },
- 	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT_NSMU,
- 	  HID_DEVICE(BUS_I2C, HID_GROUP_ANY, I2C_VENDOR_ID_GOODIX,
--		     I2C_DEVICE_ID_GOODIX_01E8) },
-+		     I2C_DEVICE_ID_GOODIX_01E9) },
-+	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT_NSMU,
-+	  HID_DEVICE(BUS_I2C, HID_GROUP_ANY, I2C_VENDOR_ID_GOODIX,
-+		     I2C_DEVICE_ID_GOODIX_01E0) },
- 
- 	/* GoodTouch panels */
- 	{ .driver_data = MT_CLS_NSMU,
-diff --git a/drivers/hid/hid-plantronics.c b/drivers/hid/hid-plantronics.c
-index 3d414ae194acbd..25cfd964dc25d9 100644
---- a/drivers/hid/hid-plantronics.c
-+++ b/drivers/hid/hid-plantronics.c
-@@ -38,8 +38,10 @@
- 			    (usage->hid & HID_USAGE_PAGE) == HID_UP_CONSUMER)
- 
- #define PLT_QUIRK_DOUBLE_VOLUME_KEYS BIT(0)
-+#define PLT_QUIRK_FOLLOWED_OPPOSITE_VOLUME_KEYS BIT(1)
- 
- #define PLT_DOUBLE_KEY_TIMEOUT 5 /* ms */
-+#define PLT_FOLLOWED_OPPOSITE_KEY_TIMEOUT 220 /* ms */
- 
- struct plt_drv_data {
- 	unsigned long device_type;
-@@ -137,6 +139,21 @@ static int plantronics_event(struct hid_device *hdev, struct hid_field *field,
- 
- 		drv_data->last_volume_key_ts = cur_ts;
- 	}
-+	if (drv_data->quirks & PLT_QUIRK_FOLLOWED_OPPOSITE_VOLUME_KEYS) {
-+		unsigned long prev_ts, cur_ts;
-+
-+		/* Usages are filtered in plantronics_usages. */
-+
-+		if (!value) /* Handle key presses only. */
-+			return 0;
-+
-+		prev_ts = drv_data->last_volume_key_ts;
-+		cur_ts = jiffies;
-+		if (jiffies_to_msecs(cur_ts - prev_ts) <= PLT_FOLLOWED_OPPOSITE_KEY_TIMEOUT)
-+			return 1; /* Ignore the followed opposite volume key. */
-+
-+		drv_data->last_volume_key_ts = cur_ts;
-+	}
- 
- 	return 0;
- }
-@@ -210,6 +227,12 @@ static const struct hid_device_id plantronics_devices[] = {
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS,
- 					 USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3225_SERIES),
- 		.driver_data = PLT_QUIRK_DOUBLE_VOLUME_KEYS },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS,
-+					 USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3325_SERIES),
-+		.driver_data = PLT_QUIRK_FOLLOWED_OPPOSITE_VOLUME_KEYS },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS,
-+					 USB_DEVICE_ID_PLANTRONICS_ENCOREPRO_500_SERIES),
-+		.driver_data = PLT_QUIRK_FOLLOWED_OPPOSITE_VOLUME_KEYS },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, HID_ANY_ID) },
- 	{ }
- };
-diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c
-index 799ad0ef9c4af0..045db6f0fb4c4f 100644
---- a/drivers/hid/i2c-hid/i2c-hid-core.c
-+++ b/drivers/hid/i2c-hid/i2c-hid-core.c
-@@ -44,12 +44,12 @@
- #include "i2c-hid.h"
- 
- /* quirks to control the device */
--#define I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV	BIT(0)
--#define I2C_HID_QUIRK_NO_IRQ_AFTER_RESET	BIT(1)
--#define I2C_HID_QUIRK_BOGUS_IRQ			BIT(4)
--#define I2C_HID_QUIRK_RESET_ON_RESUME		BIT(5)
--#define I2C_HID_QUIRK_BAD_INPUT_SIZE		BIT(6)
--#define I2C_HID_QUIRK_NO_WAKEUP_AFTER_RESET	BIT(7)
-+#define I2C_HID_QUIRK_NO_IRQ_AFTER_RESET	BIT(0)
-+#define I2C_HID_QUIRK_BOGUS_IRQ			BIT(1)
-+#define I2C_HID_QUIRK_RESET_ON_RESUME		BIT(2)
-+#define I2C_HID_QUIRK_BAD_INPUT_SIZE		BIT(3)
-+#define I2C_HID_QUIRK_NO_WAKEUP_AFTER_RESET	BIT(4)
-+#define I2C_HID_QUIRK_NO_SLEEP_ON_SUSPEND	BIT(5)
- 
- /* Command opcodes */
- #define I2C_HID_OPCODE_RESET			0x01
-@@ -119,8 +119,6 @@ static const struct i2c_hid_quirks {
- 	__u16 idProduct;
- 	__u32 quirks;
- } i2c_hid_quirks[] = {
--	{ USB_VENDOR_ID_WEIDA, HID_ANY_ID,
--		I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV },
- 	{ I2C_VENDOR_ID_HANTICK, I2C_PRODUCT_ID_HANTICK_5288,
- 		I2C_HID_QUIRK_NO_IRQ_AFTER_RESET },
- 	{ I2C_VENDOR_ID_ITE, I2C_DEVICE_ID_ITE_VOYO_WINPAD_A15,
-@@ -133,6 +131,8 @@ static const struct i2c_hid_quirks {
- 		 I2C_HID_QUIRK_RESET_ON_RESUME },
- 	{ USB_VENDOR_ID_ITE, I2C_DEVICE_ID_ITE_LENOVO_LEGION_Y720,
- 		I2C_HID_QUIRK_BAD_INPUT_SIZE },
-+	{ I2C_VENDOR_ID_CIRQUE, I2C_PRODUCT_ID_CIRQUE_1063,
-+		I2C_HID_QUIRK_NO_SLEEP_ON_SUSPEND },
- 	/*
- 	 * Sending the wakeup after reset actually break ELAN touchscreen controller
- 	 */
-@@ -389,8 +389,7 @@ static int i2c_hid_set_power(struct i2c_hid *ihid, int power_state)
- 	 * The call will get a return value (EREMOTEIO) but device will be
- 	 * triggered and activated. After that, it goes like a normal device.
- 	 */
--	if (power_state == I2C_HID_PWR_ON &&
--	    ihid->quirks & I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV) {
-+	if (power_state == I2C_HID_PWR_ON) {
- 		ret = i2c_hid_set_power_command(ihid, I2C_HID_PWR_ON);
- 
- 		/* Device was already activated */
-@@ -949,7 +948,8 @@ static int i2c_hid_core_suspend(struct i2c_hid *ihid, bool force_poweroff)
- 		return ret;
- 
- 	/* Save some power */
--	i2c_hid_set_power(ihid, I2C_HID_PWR_SLEEP);
-+	if (!(ihid->quirks & I2C_HID_QUIRK_NO_SLEEP_ON_SUSPEND))
-+		i2c_hid_set_power(ihid, I2C_HID_PWR_SLEEP);
- 
- 	disable_irq(client->irq);
- 
-diff --git a/drivers/hid/intel-ish-hid/ishtp-fw-loader.c b/drivers/hid/intel-ish-hid/ishtp-fw-loader.c
-index 16aa030af8453c..983be15fedcc92 100644
---- a/drivers/hid/intel-ish-hid/ishtp-fw-loader.c
-+++ b/drivers/hid/intel-ish-hid/ishtp-fw-loader.c
-@@ -635,7 +635,7 @@ static int ish_fw_xfer_direct_dma(struct ishtp_cl_data *client_data,
- 				  const struct firmware *fw,
- 				  const struct shim_fw_info fw_info)
- {
--	int rv;
-+	int rv = 0;
- 	void *dma_buf;
- 	dma_addr_t dma_buf_phy;
- 	u32 fragment_offset, fragment_size, payload_max_size;
-diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
-index ec38c88921589e..a4c361b6619c16 100644
---- a/drivers/hwmon/Kconfig
-+++ b/drivers/hwmon/Kconfig
-@@ -174,6 +174,7 @@ config SENSORS_ADM9240
- 	tristate "Analog Devices ADM9240 and compatibles"
- 	depends on I2C
- 	select HWMON_VID
-+	select REGMAP_I2C
- 	help
- 	  If you say yes here you get support for Analog Devices ADM9240,
- 	  Dallas DS1780, National Semiconductor LM81 sensor chips.
-@@ -235,6 +236,7 @@ config SENSORS_ADT7462
- config SENSORS_ADT7470
- 	tristate "Analog Devices ADT7470"
- 	depends on I2C
-+	select REGMAP_I2C
- 	help
- 	  If you say yes here you get support for the Analog Devices
- 	  ADT7470 temperature monitoring chips.
-@@ -1200,6 +1202,7 @@ config SENSORS_MAX31790
- config SENSORS_MC34VR500
- 	tristate "NXP MC34VR500 hardware monitoring driver"
- 	depends on I2C
-+	select REGMAP_I2C
- 	help
- 	  If you say yes here you get support for the temperature and input
- 	  voltage sensors of the NXP MC34VR500.
-@@ -2137,6 +2140,7 @@ config SENSORS_TMP464
- config SENSORS_TMP513
- 	tristate "Texas Instruments TMP513 and compatibles"
- 	depends on I2C
-+	select REGMAP_I2C
- 	help
- 	  If you say yes here you get support for Texas Instruments TMP512,
- 	  and TMP513 temperature and power supply sensor chips.
-diff --git a/drivers/hwmon/intel-m10-bmc-hwmon.c b/drivers/hwmon/intel-m10-bmc-hwmon.c
-index ca2dff15892515..96397ae6ff18fc 100644
---- a/drivers/hwmon/intel-m10-bmc-hwmon.c
-+++ b/drivers/hwmon/intel-m10-bmc-hwmon.c
-@@ -358,7 +358,7 @@ static const struct m10bmc_sdata n6000bmc_temp_tbl[] = {
- 	{ 0x4f0, 0x4f4, 0x4f8, 0x52c, 0x0, 500, "Board Top Near FPGA Temperature" },
- 	{ 0x4fc, 0x500, 0x504, 0x52c, 0x0, 500, "Board Bottom Near CVL Temperature" },
- 	{ 0x508, 0x50c, 0x510, 0x52c, 0x0, 500, "Board Top East Near VRs Temperature" },
--	{ 0x514, 0x518, 0x51c, 0x52c, 0x0, 500, "Columbiaville Die Temperature" },
-+	{ 0x514, 0x518, 0x51c, 0x52c, 0x0, 500, "CVL Die Temperature" },
- 	{ 0x520, 0x524, 0x528, 0x52c, 0x0, 500, "Board Rear Side Temperature" },
- 	{ 0x530, 0x534, 0x538, 0x52c, 0x0, 500, "Board Front Side Temperature" },
- 	{ 0x53c, 0x540, 0x544, 0x0, 0x0, 500, "QSFP1 Case Temperature" },
-diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
-index ae0f454c305d63..c906731c6c2d3e 100644
---- a/drivers/hwmon/k10temp.c
-+++ b/drivers/hwmon/k10temp.c
-@@ -545,6 +545,7 @@ static const struct pci_device_id k10temp_id_table[] = {
- 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) },
- 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) },
- 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) },
-+	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M60H_DF_F3) },
- 	{ PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },
- 	{}
- };
-diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
-index 3410add34aad28..2b8bcd121ffa5d 100644
---- a/drivers/i2c/busses/i2c-i801.c
-+++ b/drivers/i2c/busses/i2c-i801.c
-@@ -1754,8 +1754,15 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
- 
- 	i801_add_tco(priv);
- 
-+	/*
-+	 * adapter.name is used by platform code to find the main I801 adapter
-+	 * to instantiante i2c_clients, do not change.
-+	 */
- 	snprintf(priv->adapter.name, sizeof(priv->adapter.name),
--		"SMBus I801 adapter at %04lx", priv->smba);
-+		 "SMBus %s adapter at %04lx",
-+		 (priv->features & FEATURE_IDF) ? "I801 IDF" : "I801",
-+		 priv->smba);
-+
- 	err = i2c_add_adapter(&priv->adapter);
- 	if (err) {
- 		platform_device_unregister(priv->tco_pdev);
-diff --git a/drivers/i3c/master/i3c-master-cdns.c b/drivers/i3c/master/i3c-master-cdns.c
-index fa5aaaf4461814..d8426847c2837b 100644
---- a/drivers/i3c/master/i3c-master-cdns.c
-+++ b/drivers/i3c/master/i3c-master-cdns.c
-@@ -1666,6 +1666,7 @@ static void cdns_i3c_master_remove(struct platform_device *pdev)
- {
- 	struct cdns_i3c_master *master = platform_get_drvdata(pdev);
- 
-+	cancel_work_sync(&master->hj_work);
- 	i3c_master_unregister(&master->base);
- 
- 	clk_disable_unprepare(master->sysclk);
-diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
-index 674344eb8e2f48..58befbaaf0ad54 100644
---- a/drivers/infiniband/core/mad.c
-+++ b/drivers/infiniband/core/mad.c
-@@ -2616,14 +2616,16 @@ static int retry_send(struct ib_mad_send_wr_private *mad_send_wr)
- 
- static void timeout_sends(struct work_struct *work)
- {
-+	struct ib_mad_send_wr_private *mad_send_wr, *n;
- 	struct ib_mad_agent_private *mad_agent_priv;
--	struct ib_mad_send_wr_private *mad_send_wr;
- 	struct ib_mad_send_wc mad_send_wc;
-+	struct list_head local_list;
- 	unsigned long flags, delay;
- 
- 	mad_agent_priv = container_of(work, struct ib_mad_agent_private,
- 				      timed_work.work);
- 	mad_send_wc.vendor_err = 0;
-+	INIT_LIST_HEAD(&local_list);
- 
- 	spin_lock_irqsave(&mad_agent_priv->lock, flags);
- 	while (!list_empty(&mad_agent_priv->wait_list)) {
-@@ -2641,13 +2643,16 @@ static void timeout_sends(struct work_struct *work)
- 			break;
- 		}
- 
--		list_del(&mad_send_wr->agent_list);
-+		list_del_init(&mad_send_wr->agent_list);
- 		if (mad_send_wr->status == IB_WC_SUCCESS &&
- 		    !retry_send(mad_send_wr))
- 			continue;
- 
--		spin_unlock_irqrestore(&mad_agent_priv->lock, flags);
-+		list_add_tail(&mad_send_wr->agent_list, &local_list);
-+	}
-+	spin_unlock_irqrestore(&mad_agent_priv->lock, flags);
- 
-+	list_for_each_entry_safe(mad_send_wr, n, &local_list, agent_list) {
- 		if (mad_send_wr->status == IB_WC_SUCCESS)
- 			mad_send_wc.status = IB_WC_RESP_TIMEOUT_ERR;
- 		else
-@@ -2655,11 +2660,8 @@ static void timeout_sends(struct work_struct *work)
- 		mad_send_wc.send_buf = &mad_send_wr->send_buf;
- 		mad_agent_priv->agent.send_handler(&mad_agent_priv->agent,
- 						   &mad_send_wc);
--
- 		deref_mad_agent(mad_agent_priv);
--		spin_lock_irqsave(&mad_agent_priv->lock, flags);
- 	}
--	spin_unlock_irqrestore(&mad_agent_priv->lock, flags);
- }
- 
- /*
-diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c
-index a524181f34df95..3a4605fda6d57e 100644
---- a/drivers/infiniband/hw/mlx5/odp.c
-+++ b/drivers/infiniband/hw/mlx5/odp.c
-@@ -733,24 +733,31 @@ static int pagefault_dmabuf_mr(struct mlx5_ib_mr *mr, size_t bcnt,
-  *  >0: Number of pages mapped
-  */
- static int pagefault_mr(struct mlx5_ib_mr *mr, u64 io_virt, size_t bcnt,
--			u32 *bytes_mapped, u32 flags)
-+			u32 *bytes_mapped, u32 flags, bool permissive_fault)
- {
- 	struct ib_umem_odp *odp = to_ib_umem_odp(mr->umem);
- 
--	if (unlikely(io_virt < mr->ibmr.iova))
-+	if (unlikely(io_virt < mr->ibmr.iova) && !permissive_fault)
- 		return -EFAULT;
- 
- 	if (mr->umem->is_dmabuf)
- 		return pagefault_dmabuf_mr(mr, bcnt, bytes_mapped, flags);
- 
- 	if (!odp->is_implicit_odp) {
-+		u64 offset = io_virt < mr->ibmr.iova ? 0 : io_virt - mr->ibmr.iova;
- 		u64 user_va;
- 
--		if (check_add_overflow(io_virt - mr->ibmr.iova,
--				       (u64)odp->umem.address, &user_va))
-+		if (check_add_overflow(offset, (u64)odp->umem.address,
-+				       &user_va))
- 			return -EFAULT;
--		if (unlikely(user_va >= ib_umem_end(odp) ||
--			     ib_umem_end(odp) - user_va < bcnt))
-+
-+		if (permissive_fault) {
-+			if (user_va < ib_umem_start(odp))
-+				user_va = ib_umem_start(odp);
-+			if ((user_va + bcnt) > ib_umem_end(odp))
-+				bcnt = ib_umem_end(odp) - user_va;
-+		} else if (unlikely(user_va >= ib_umem_end(odp) ||
-+				    ib_umem_end(odp) - user_va < bcnt))
- 			return -EFAULT;
- 		return pagefault_real_mr(mr, odp, user_va, bcnt, bytes_mapped,
- 					 flags);
-@@ -857,7 +864,7 @@ static int pagefault_single_data_segment(struct mlx5_ib_dev *dev,
- 	case MLX5_MKEY_MR:
- 		mr = container_of(mmkey, struct mlx5_ib_mr, mmkey);
- 
--		ret = pagefault_mr(mr, io_virt, bcnt, bytes_mapped, 0);
-+		ret = pagefault_mr(mr, io_virt, bcnt, bytes_mapped, 0, false);
- 		if (ret < 0)
- 			goto end;
- 
-@@ -1710,7 +1717,7 @@ static void mlx5_ib_prefetch_mr_work(struct work_struct *w)
- 	for (i = 0; i < work->num_sge; ++i) {
- 		ret = pagefault_mr(work->frags[i].mr, work->frags[i].io_virt,
- 				   work->frags[i].length, &bytes_mapped,
--				   work->pf_flags);
-+				   work->pf_flags, false);
- 		if (ret <= 0)
- 			continue;
- 		mlx5_update_odp_stats(work->frags[i].mr, prefetch, ret);
-@@ -1761,7 +1768,7 @@ static int mlx5_ib_prefetch_sg_list(struct ib_pd *pd,
- 		if (IS_ERR(mr))
- 			return PTR_ERR(mr);
- 		ret = pagefault_mr(mr, sg_list[i].addr, sg_list[i].length,
--				   &bytes_mapped, pf_flags);
-+				   &bytes_mapped, pf_flags, false);
- 		if (ret < 0) {
- 			mlx5r_deref_odp_mkey(&mr->mmkey);
- 			return ret;
-diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
-index 94ac99a4f696e7..758a3d9c2844d1 100644
---- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c
-+++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
-@@ -931,12 +931,11 @@ static void rtrs_srv_info_req_done(struct ib_cq *cq, struct ib_wc *wc)
- 	if (err)
- 		goto close;
- 
--out:
- 	rtrs_iu_free(iu, srv_path->s.dev->ib_dev, 1);
- 	return;
- close:
-+	rtrs_iu_free(iu, srv_path->s.dev->ib_dev, 1);
- 	close_path(srv_path);
--	goto out;
- }
- 
- static int post_recv_info_req(struct rtrs_srv_con *con)
-@@ -987,6 +986,16 @@ static int post_recv_path(struct rtrs_srv_path *srv_path)
- 			q_size = SERVICE_CON_QUEUE_DEPTH;
- 		else
- 			q_size = srv->queue_depth;
-+		if (srv_path->state != RTRS_SRV_CONNECTING) {
-+			rtrs_err(s, "Path state invalid. state %s\n",
-+				 rtrs_srv_state_str(srv_path->state));
-+			return -EIO;
-+		}
-+
-+		if (!srv_path->s.con[cid]) {
-+			rtrs_err(s, "Conn not set for %d\n", cid);
-+			return -EIO;
-+		}
- 
- 		err = post_recv_io(to_srv_con(srv_path->s.con[cid]), q_size);
- 		if (err) {
-diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
-index aa32371f04af6c..ef9ea295f9e035 100644
---- a/drivers/input/rmi4/rmi_driver.c
-+++ b/drivers/input/rmi4/rmi_driver.c
-@@ -978,12 +978,12 @@ static int rmi_driver_remove(struct device *dev)
- 
- 	rmi_disable_irq(rmi_dev, false);
- 
--	irq_domain_remove(data->irqdomain);
--	data->irqdomain = NULL;
--
- 	rmi_f34_remove_sysfs(rmi_dev);
- 	rmi_free_function_list(rmi_dev);
- 
-+	irq_domain_remove(data->irqdomain);
-+	data->irqdomain = NULL;
-+
- 	return 0;
- }
- 
-diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c
-index 468191438849ea..29bfc2bf796b65 100644
---- a/drivers/media/common/videobuf2/videobuf2-core.c
-+++ b/drivers/media/common/videobuf2/videobuf2-core.c
-@@ -302,6 +302,10 @@ static void __vb2_plane_dmabuf_put(struct vb2_buffer *vb, struct vb2_plane *p)
- 	p->mem_priv = NULL;
- 	p->dbuf = NULL;
- 	p->dbuf_mapped = 0;
-+	p->bytesused = 0;
-+	p->length = 0;
-+	p->m.fd = 0;
-+	p->data_offset = 0;
- }
- 
- /*
-@@ -1296,10 +1300,6 @@ static int __prepare_dmabuf(struct vb2_buffer *vb)
- 
- 		/* Release previously acquired memory if present */
- 		__vb2_plane_dmabuf_put(vb, &vb->planes[plane]);
--		vb->planes[plane].bytesused = 0;
--		vb->planes[plane].length = 0;
--		vb->planes[plane].m.fd = 0;
--		vb->planes[plane].data_offset = 0;
- 
- 		/* Acquire each plane's memory */
- 		mem_priv = call_ptr_memop(attach_dmabuf,
-diff --git a/drivers/mfd/intel_soc_pmic_chtwc.c b/drivers/mfd/intel_soc_pmic_chtwc.c
-index 7fce3ef7ab453d..2a83f540d4c9d8 100644
---- a/drivers/mfd/intel_soc_pmic_chtwc.c
-+++ b/drivers/mfd/intel_soc_pmic_chtwc.c
-@@ -178,7 +178,6 @@ static const struct dmi_system_id cht_wc_model_dmi_ids[] = {
- 		.driver_data = (void *)(long)INTEL_CHT_WC_LENOVO_YT3_X90,
- 		.matches = {
- 			DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),
--			DMI_MATCH(DMI_PRODUCT_NAME, "CHERRYVIEW D1 PLATFORM"),
- 			DMI_MATCH(DMI_PRODUCT_VERSION, "Blade3-10A-001"),
- 		},
- 	},
-diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
-index ae1c4dc35fe336..4a2c9a9134d8c8 100644
---- a/drivers/net/dsa/b53/b53_common.c
-+++ b/drivers/net/dsa/b53/b53_common.c
-@@ -27,6 +27,7 @@
- #include <linux/phylink.h>
- #include <linux/etherdevice.h>
- #include <linux/if_bridge.h>
-+#include <linux/if_vlan.h>
- #include <net/dsa.h>
- 
- #include "b53_regs.h"
-@@ -224,6 +225,9 @@ static const struct b53_mib_desc b53_mibs_58xx[] = {
- 
- #define B53_MIBS_58XX_SIZE	ARRAY_SIZE(b53_mibs_58xx)
- 
-+#define B53_MAX_MTU_25		(1536 - ETH_HLEN - VLAN_HLEN - ETH_FCS_LEN)
-+#define B53_MAX_MTU		(9720 - ETH_HLEN - VLAN_HLEN - ETH_FCS_LEN)
-+
- static int b53_do_vlan_op(struct b53_device *dev, u8 op)
- {
- 	unsigned int i;
-@@ -2263,20 +2267,25 @@ static int b53_change_mtu(struct dsa_switch *ds, int port, int mtu)
- 	bool allow_10_100;
- 
- 	if (is5325(dev) || is5365(dev))
--		return -EOPNOTSUPP;
-+		return 0;
- 
- 	if (!dsa_is_cpu_port(ds, port))
- 		return 0;
- 
--	enable_jumbo = (mtu >= JMS_MIN_SIZE);
--	allow_10_100 = (dev->chip_id == BCM583XX_DEVICE_ID);
-+	enable_jumbo = (mtu > ETH_DATA_LEN);
-+	allow_10_100 = !is63xx(dev);
- 
- 	return b53_set_jumbo(dev, enable_jumbo, allow_10_100);
- }
- 
- static int b53_get_max_mtu(struct dsa_switch *ds, int port)
- {
--	return JMS_MAX_SIZE;
-+	struct b53_device *dev = ds->priv;
-+
-+	if (is5325(dev) || is5365(dev))
-+		return B53_MAX_MTU_25;
-+
-+	return B53_MAX_MTU;
- }
- 
- static const struct dsa_switch_ops b53_switch_ops = {
-diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c
-index 24ef219e6f5657..8b05a70c0ff3f9 100644
---- a/drivers/net/dsa/lan9303-core.c
-+++ b/drivers/net/dsa/lan9303-core.c
-@@ -6,6 +6,7 @@
- #include <linux/module.h>
- #include <linux/gpio/consumer.h>
- #include <linux/regmap.h>
-+#include <linux/iopoll.h>
- #include <linux/mutex.h>
- #include <linux/mii.h>
- #include <linux/of.h>
-@@ -839,6 +840,8 @@ static void lan9303_handle_reset(struct lan9303 *chip)
- 	if (!chip->reset_gpio)
- 		return;
- 
-+	gpiod_set_value_cansleep(chip->reset_gpio, 1);
-+
- 	if (chip->reset_duration != 0)
- 		msleep(chip->reset_duration);
- 
-@@ -864,8 +867,34 @@ static int lan9303_disable_processing(struct lan9303 *chip)
- static int lan9303_check_device(struct lan9303 *chip)
- {
- 	int ret;
-+	int err;
- 	u32 reg;
- 
-+	/* In I2C-managed configurations this polling loop will clash with
-+	 * switch's reading of EEPROM right after reset and this behaviour is
-+	 * not configurable. While lan9303_read() already has quite long retry
-+	 * timeout, seems not all cases are being detected as arbitration error.
-+	 *
-+	 * According to datasheet, EEPROM loader has 30ms timeout (in case of
-+	 * missing EEPROM).
-+	 *
-+	 * Loading of the largest supported EEPROM is expected to take at least
-+	 * 5.9s.
-+	 */
-+	err = read_poll_timeout(lan9303_read, ret,
-+				!ret && reg & LAN9303_HW_CFG_READY,
-+				20000, 6000000, false,
-+				chip->regmap, LAN9303_HW_CFG, &reg);
-+	if (ret) {
-+		dev_err(chip->dev, "failed to read HW_CFG reg: %pe\n",
-+			ERR_PTR(ret));
-+		return ret;
-+	}
-+	if (err) {
-+		dev_err(chip->dev, "HW_CFG not ready: 0x%08x\n", reg);
-+		return err;
-+	}
-+
- 	ret = lan9303_read(chip->regmap, LAN9303_CHIP_REV, &reg);
- 	if (ret) {
- 		dev_err(chip->dev, "failed to read chip revision register: %d\n",
-diff --git a/drivers/net/ethernet/adi/adin1110.c b/drivers/net/ethernet/adi/adin1110.c
-index d7c274af6d4dae..3c26176316a38b 100644
---- a/drivers/net/ethernet/adi/adin1110.c
-+++ b/drivers/net/ethernet/adi/adin1110.c
-@@ -318,11 +318,11 @@ static int adin1110_read_fifo(struct adin1110_port_priv *port_priv)
- 	 * from the  ADIN1110 frame header.
- 	 */
- 	if (frame_size < ADIN1110_FRAME_HEADER_LEN + ADIN1110_FEC_LEN)
--		return ret;
-+		return -EINVAL;
- 
- 	round_len = adin1110_round_len(frame_size);
- 	if (round_len < 0)
--		return ret;
-+		return -EINVAL;
- 
- 	frame_size_no_fcs = frame_size - ADIN1110_FRAME_HEADER_LEN - ADIN1110_FEC_LEN;
- 	memset(priv->data, 0, ADIN1110_RD_HEADER_LEN);
-diff --git a/drivers/net/ethernet/amd/pds_core/main.c b/drivers/net/ethernet/amd/pds_core/main.c
-index 6d589ac532a3d8..eddbf0acdde77f 100644
---- a/drivers/net/ethernet/amd/pds_core/main.c
-+++ b/drivers/net/ethernet/amd/pds_core/main.c
-@@ -451,6 +451,9 @@ static void pdsc_remove(struct pci_dev *pdev)
- 
- static void pdsc_stop_health_thread(struct pdsc *pdsc)
- {
-+	if (pdsc->pdev->is_virtfn)
-+		return;
-+
- 	timer_shutdown_sync(&pdsc->wdtimer);
- 	if (pdsc->health_work.func)
- 		cancel_work_sync(&pdsc->health_work);
-@@ -458,6 +461,9 @@ static void pdsc_stop_health_thread(struct pdsc *pdsc)
- 
- static void pdsc_restart_health_thread(struct pdsc *pdsc)
- {
-+	if (pdsc->pdev->is_virtfn)
-+		return;
-+
- 	timer_setup(&pdsc->wdtimer, pdsc_wdtimer_cb, 0);
- 	mod_timer(&pdsc->wdtimer, jiffies + 1);
- }
-diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c
-index f69d974a23a1f5..5af98fba74803e 100644
---- a/drivers/net/ethernet/cortina/gemini.c
-+++ b/drivers/net/ethernet/cortina/gemini.c
-@@ -79,8 +79,8 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
- #define GMAC0_IRQ4_8 (GMAC0_MIB_INT_BIT | GMAC0_RX_OVERRUN_INT_BIT)
- 
- #define GMAC_OFFLOAD_FEATURES (NETIF_F_SG | NETIF_F_IP_CSUM | \
--		NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | \
--		NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6)
-+			       NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | \
-+			       NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6)
- 
- /**
-  * struct gmac_queue_page - page buffer per-page info
-@@ -1148,24 +1148,26 @@ static int gmac_map_tx_bufs(struct net_device *netdev, struct sk_buff *skb,
- 	struct gmac_txdesc *txd;
- 	skb_frag_t *skb_frag;
- 	dma_addr_t mapping;
--	unsigned short mtu;
- 	void *buffer;
-+	u16 mss;
- 	int ret;
- 
--	mtu  = ETH_HLEN;
--	mtu += netdev->mtu;
--	if (skb->protocol == htons(ETH_P_8021Q))
--		mtu += VLAN_HLEN;
--
- 	word1 = skb->len;
- 	word3 = SOF_BIT;
- 
--	if (word1 > mtu) {
-+	mss = skb_shinfo(skb)->gso_size;
-+	if (mss) {
-+		/* This means we are dealing with TCP and skb->len is the
-+		 * sum total of all the segments. The TSO will deal with
-+		 * chopping this up for us.
-+		 */
-+		/* The accelerator needs the full frame size here */
-+		mss += skb_tcp_all_headers(skb);
-+		netdev_dbg(netdev, "segment offloading mss = %04x len=%04x\n",
-+			   mss, skb->len);
- 		word1 |= TSS_MTU_ENABLE_BIT;
--		word3 |= mtu;
--	}
--
--	if (skb->len >= ETH_FRAME_LEN) {
-+		word3 |= mss;
-+	} else if (skb->len >= ETH_FRAME_LEN) {
- 		/* Hardware offloaded checksumming isn't working on frames
- 		 * bigger than 1514 bytes. A hypothesis about this is that the
- 		 * checksum buffer is only 1518 bytes, so when the frames get
-@@ -1180,7 +1182,9 @@ static int gmac_map_tx_bufs(struct net_device *netdev, struct sk_buff *skb,
- 				return ret;
- 		}
- 		word1 |= TSS_BYPASS_BIT;
--	} else if (skb->ip_summed == CHECKSUM_PARTIAL) {
-+	}
-+
-+	if (skb->ip_summed == CHECKSUM_PARTIAL) {
- 		int tcp = 0;
- 
- 		/* We do not switch off the checksumming on non TCP/UDP
-diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
-index 81e3173521589d..e8d9a0eba4d6b5 100644
---- a/drivers/net/ethernet/freescale/fec_main.c
-+++ b/drivers/net/ethernet/freescale/fec_main.c
-@@ -1058,7 +1058,8 @@ fec_restart(struct net_device *ndev)
- 	u32 rcntl = OPT_FRAME_SIZE | 0x04;
- 	u32 ecntl = FEC_ECR_ETHEREN;
- 
--	fec_ptp_save_state(fep);
-+	if (fep->bufdesc_ex)
-+		fec_ptp_save_state(fep);
- 
- 	/* Whack a reset.  We should wait for this.
- 	 * For i.MX6SX SOC, enet use AXI bus, we use disable MAC
-@@ -1321,7 +1322,8 @@ fec_stop(struct net_device *ndev)
- 			netdev_err(ndev, "Graceful transmit stop did not complete!\n");
- 	}
- 
--	fec_ptp_save_state(fep);
-+	if (fep->bufdesc_ex)
-+		fec_ptp_save_state(fep);
- 
- 	/* Whack a reset.  We should wait for this.
- 	 * For i.MX6SX SOC, enet use AXI bus, we use disable MAC
-diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c
-index c3236b59e7e934..3578b7d720c068 100644
---- a/drivers/net/ethernet/ibm/emac/mal.c
-+++ b/drivers/net/ethernet/ibm/emac/mal.c
-@@ -578,7 +578,7 @@ static int mal_probe(struct platform_device *ofdev)
- 		printk(KERN_ERR "%pOF: Support for 405EZ not enabled!\n",
- 				ofdev->dev.of_node);
- 		err = -ENODEV;
--		goto fail;
-+		goto fail_unmap;
- #endif
- 	}
- 
-diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
-index 4b6e7536170abc..fc8ed38aa09554 100644
---- a/drivers/net/ethernet/intel/e1000e/hw.h
-+++ b/drivers/net/ethernet/intel/e1000e/hw.h
-@@ -108,8 +108,8 @@ struct e1000_hw;
- #define E1000_DEV_ID_PCH_RPL_I219_V22		0x0DC8
- #define E1000_DEV_ID_PCH_MTP_I219_LM18		0x550A
- #define E1000_DEV_ID_PCH_MTP_I219_V18		0x550B
--#define E1000_DEV_ID_PCH_MTP_I219_LM19		0x550C
--#define E1000_DEV_ID_PCH_MTP_I219_V19		0x550D
-+#define E1000_DEV_ID_PCH_ADP_I219_LM19		0x550C
-+#define E1000_DEV_ID_PCH_ADP_I219_V19		0x550D
- #define E1000_DEV_ID_PCH_LNP_I219_LM20		0x550E
- #define E1000_DEV_ID_PCH_LNP_I219_V20		0x550F
- #define E1000_DEV_ID_PCH_LNP_I219_LM21		0x5510
-diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
-index f9e94be36e97f2..ce227b56cf7243 100644
---- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
-+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
-@@ -1108,6 +1108,46 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link)
- 	return 0;
- }
- 
-+/**
-+ *  e1000e_force_smbus - Force interfaces to transition to SMBUS mode.
-+ *  @hw: pointer to the HW structure
-+ *
-+ *  Force the MAC and the PHY to SMBUS mode. Assumes semaphore already
-+ *  acquired.
-+ *
-+ * Return: 0 on success, negative errno on failure.
-+ **/
-+static s32 e1000e_force_smbus(struct e1000_hw *hw)
-+{
-+	u16 smb_ctrl = 0;
-+	u32 ctrl_ext;
-+	s32 ret_val;
-+
-+	/* Switching PHY interface always returns MDI error
-+	 * so disable retry mechanism to avoid wasting time
-+	 */
-+	e1000e_disable_phy_retry(hw);
-+
-+	/* Force SMBus mode in the PHY */
-+	ret_val = e1000_read_phy_reg_hv_locked(hw, CV_SMB_CTRL, &smb_ctrl);
-+	if (ret_val) {
-+		e1000e_enable_phy_retry(hw);
-+		return ret_val;
-+	}
-+
-+	smb_ctrl |= CV_SMB_CTRL_FORCE_SMBUS;
-+	e1000_write_phy_reg_hv_locked(hw, CV_SMB_CTRL, smb_ctrl);
-+
-+	e1000e_enable_phy_retry(hw);
-+
-+	/* Force SMBus mode in the MAC */
-+	ctrl_ext = er32(CTRL_EXT);
-+	ctrl_ext |= E1000_CTRL_EXT_FORCE_SMBUS;
-+	ew32(CTRL_EXT, ctrl_ext);
-+
-+	return 0;
-+}
-+
- /**
-  *  e1000_enable_ulp_lpt_lp - configure Ultra Low Power mode for LynxPoint-LP
-  *  @hw: pointer to the HW structure
-@@ -1165,6 +1205,14 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx)
- 	if (ret_val)
- 		goto out;
- 
-+	if (hw->mac.type != e1000_pch_mtp) {
-+		ret_val = e1000e_force_smbus(hw);
-+		if (ret_val) {
-+			e_dbg("Failed to force SMBUS: %d\n", ret_val);
-+			goto release;
-+		}
-+	}
-+
- 	/* Si workaround for ULP entry flow on i127/rev6 h/w.  Enable
- 	 * LPLU and disable Gig speed when entering ULP
- 	 */
-@@ -1225,6 +1273,13 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx)
- 	}
- 
- release:
-+	if (hw->mac.type == e1000_pch_mtp) {
-+		ret_val = e1000e_force_smbus(hw);
-+		if (ret_val)
-+			e_dbg("Failed to force SMBUS over MTL system: %d\n",
-+			      ret_val);
-+	}
-+
- 	hw->phy.ops.release(hw);
- out:
- 	if (ret_val)
-diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
-index d377a286c0e1bf..721c098f2bb1b2 100644
---- a/drivers/net/ethernet/intel/e1000e/netdev.c
-+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
-@@ -6623,7 +6623,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
- 	struct e1000_hw *hw = &adapter->hw;
- 	u32 ctrl, ctrl_ext, rctl, status, wufc;
- 	int retval = 0;
--	u16 smb_ctrl;
- 
- 	/* Runtime suspend should only enable wakeup for link changes */
- 	if (runtime)
-@@ -6701,23 +6700,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
- 				goto skip_phy_configurations;
- 			}
- 		}
--
--		/* Force SMBUS to allow WOL */
--		/* Switching PHY interface always returns MDI error
--		 * so disable retry mechanism to avoid wasting time
--		 */
--		e1000e_disable_phy_retry(hw);
--
--		e1e_rphy(hw, CV_SMB_CTRL, &smb_ctrl);
--		smb_ctrl |= CV_SMB_CTRL_FORCE_SMBUS;
--		e1e_wphy(hw, CV_SMB_CTRL, smb_ctrl);
--
--		e1000e_enable_phy_retry(hw);
--
--		/* Force SMBus mode in MAC */
--		ctrl_ext = er32(CTRL_EXT);
--		ctrl_ext |= E1000_CTRL_EXT_FORCE_SMBUS;
--		ew32(CTRL_EXT, ctrl_ext);
- 	}
- 
- 	/* Ensure that the appropriate bits are set in LPI_CTRL
-@@ -7917,10 +7899,10 @@ static const struct pci_device_id e1000_pci_tbl[] = {
- 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V17), board_pch_adp },
- 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM22), board_pch_adp },
- 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V22), board_pch_adp },
-+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM19), board_pch_adp },
-+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V19), board_pch_adp },
- 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM18), board_pch_mtp },
- 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V18), board_pch_mtp },
--	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM19), board_pch_mtp },
--	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V19), board_pch_mtp },
- 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM20), board_pch_mtp },
- 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V20), board_pch_mtp },
- 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM21), board_pch_mtp },
-diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
-index 18a1c3b6d72c5e..c8f35d4de271ad 100644
---- a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
-+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
-@@ -5,6 +5,7 @@
- #define _I40E_ADMINQ_CMD_H_
- 
- #include <linux/bits.h>
-+#include <linux/types.h>
- 
- /* This header file defines the i40e Admin Queue commands and is shared between
-  * i40e Firmware and Software.
-diff --git a/drivers/net/ethernet/intel/i40e/i40e_diag.h b/drivers/net/ethernet/intel/i40e/i40e_diag.h
-index ece3a6b9a5c61e..ab20202a3da3ca 100644
---- a/drivers/net/ethernet/intel/i40e/i40e_diag.h
-+++ b/drivers/net/ethernet/intel/i40e/i40e_diag.h
-@@ -4,6 +4,7 @@
- #ifndef _I40E_DIAG_H_
- #define _I40E_DIAG_H_
- 
-+#include <linux/types.h>
- #include "i40e_adminq_cmd.h"
- 
- /* forward-declare the HW struct for the compiler */
-diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
-index 1d241ebd04ec7c..80472aa1deba4e 100644
---- a/drivers/net/ethernet/intel/i40e/i40e_main.c
-+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
-@@ -1744,6 +1744,7 @@ struct i40e_mac_filter *i40e_add_mac_filter(struct i40e_vsi *vsi,
- 	struct hlist_node *h;
- 	int bkt;
- 
-+	lockdep_assert_held(&vsi->mac_filter_hash_lock);
- 	if (vsi->info.pvid)
- 		return i40e_add_filter(vsi, macaddr,
- 				       le16_to_cpu(vsi->info.pvid));
-diff --git a/drivers/net/ethernet/intel/i40e/i40e_register.h b/drivers/net/ethernet/intel/i40e/i40e_register.h
-index 989c1868247338..d3c82ba3835a78 100644
---- a/drivers/net/ethernet/intel/i40e/i40e_register.h
-+++ b/drivers/net/ethernet/intel/i40e/i40e_register.h
-@@ -204,7 +204,7 @@
- #define I40E_GLGEN_MSCA_OPCODE_SHIFT 26
- #define I40E_GLGEN_MSCA_OPCODE_MASK(_i) I40E_MASK(_i, I40E_GLGEN_MSCA_OPCODE_SHIFT)
- #define I40E_GLGEN_MSCA_STCODE_SHIFT 28
--#define I40E_GLGEN_MSCA_STCODE_MASK I40E_MASK(0x1, I40E_GLGEN_MSCA_STCODE_SHIFT)
-+#define I40E_GLGEN_MSCA_STCODE_MASK(_i) I40E_MASK(_i, I40E_GLGEN_MSCA_STCODE_SHIFT)
- #define I40E_GLGEN_MSCA_MDICMD_SHIFT 30
- #define I40E_GLGEN_MSCA_MDICMD_MASK I40E_MASK(0x1, I40E_GLGEN_MSCA_MDICMD_SHIFT)
- #define I40E_GLGEN_MSCA_MDIINPROGEN_SHIFT 31
-diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
-index 4092f82bcfb12c..6e7cb2081ab37e 100644
---- a/drivers/net/ethernet/intel/i40e/i40e_type.h
-+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
-@@ -40,11 +40,11 @@ typedef void (*I40E_ADMINQ_CALLBACK)(struct i40e_hw *, struct i40e_aq_desc *);
- #define I40E_QTX_CTL_VM_QUEUE	0x1
- #define I40E_QTX_CTL_PF_QUEUE	0x2
- 
--#define I40E_MDIO_CLAUSE22_STCODE_MASK		I40E_GLGEN_MSCA_STCODE_MASK
-+#define I40E_MDIO_CLAUSE22_STCODE_MASK		I40E_GLGEN_MSCA_STCODE_MASK(1)
- #define I40E_MDIO_CLAUSE22_OPCODE_WRITE_MASK	I40E_GLGEN_MSCA_OPCODE_MASK(1)
- #define I40E_MDIO_CLAUSE22_OPCODE_READ_MASK	I40E_GLGEN_MSCA_OPCODE_MASK(2)
- 
--#define I40E_MDIO_CLAUSE45_STCODE_MASK		I40E_GLGEN_MSCA_STCODE_MASK
-+#define I40E_MDIO_CLAUSE45_STCODE_MASK		I40E_GLGEN_MSCA_STCODE_MASK(0)
- #define I40E_MDIO_CLAUSE45_OPCODE_ADDRESS_MASK	I40E_GLGEN_MSCA_OPCODE_MASK(0)
- #define I40E_MDIO_CLAUSE45_OPCODE_WRITE_MASK	I40E_GLGEN_MSCA_OPCODE_MASK(1)
- #define I40E_MDIO_CLAUSE45_OPCODE_READ_MASK	I40E_GLGEN_MSCA_OPCODE_MASK(3)
-diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
-index 7d47a05274548d..d5509bc16d0d57 100644
---- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
-+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
-@@ -2219,8 +2219,10 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg)
- 		vfres->vsi_res[0].qset_handle
- 					  = le16_to_cpu(vsi->info.qs_handle[0]);
- 		if (!(vf->driver_caps & VIRTCHNL_VF_OFFLOAD_USO) && !vf->pf_set_mac) {
-+			spin_lock_bh(&vsi->mac_filter_hash_lock);
- 			i40e_del_mac_filter(vsi, vf->default_lan_addr.addr);
- 			eth_zero_addr(vf->default_lan_addr.addr);
-+			spin_unlock_bh(&vsi->mac_filter_hash_lock);
- 		}
- 		ether_addr_copy(vfres->vsi_res[0].default_mac_addr,
- 				vf->default_lan_addr.addr);
-diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
-index 7b3ce30ba38fa0..f943964ec05ae7 100644
---- a/drivers/net/ethernet/intel/ice/ice.h
-+++ b/drivers/net/ethernet/intel/ice/ice.h
-@@ -518,7 +518,7 @@ enum ice_misc_thread_tasks {
- 	ICE_MISC_THREAD_NBITS		/* must be last */
- };
- 
--struct ice_switchdev_info {
-+struct ice_eswitch {
- 	struct ice_vsi *control_vsi;
- 	struct ice_vsi *uplink_vsi;
- 	struct ice_esw_br_offloads *br_offloads;
-@@ -631,7 +631,7 @@ struct ice_pf {
- 	struct ice_link_default_override_tlv link_dflt_override;
- 	struct ice_lag *lag; /* Link Aggregation information */
- 
--	struct ice_switchdev_info switchdev;
-+	struct ice_eswitch eswitch;
- 	struct ice_esw_br_port *br_port;
- 
- #define ICE_INVALID_AGG_NODE_ID		0
-@@ -838,7 +838,7 @@ static inline struct ice_vsi *ice_find_vsi(struct ice_pf *pf, u16 vsi_num)
-  */
- static inline bool ice_is_switchdev_running(struct ice_pf *pf)
- {
--	return pf->switchdev.is_running;
-+	return pf->eswitch.is_running;
- }
- 
- #define ICE_FD_STAT_CTR_BLOCK_COUNT	256
-diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch.c b/drivers/net/ethernet/intel/ice/ice_eswitch.c
-index a655d499abfa85..e7f1e53314d768 100644
---- a/drivers/net/ethernet/intel/ice/ice_eswitch.c
-+++ b/drivers/net/ethernet/intel/ice/ice_eswitch.c
-@@ -16,12 +16,12 @@
-  * @vf: pointer to VF struct
-  *
-  * This function adds advanced rule that forwards packets with
-- * VF's VSI index to the corresponding switchdev ctrl VSI queue.
-+ * VF's VSI index to the corresponding eswitch ctrl VSI queue.
-  */
- static int
- ice_eswitch_add_vf_sp_rule(struct ice_pf *pf, struct ice_vf *vf)
- {
--	struct ice_vsi *ctrl_vsi = pf->switchdev.control_vsi;
-+	struct ice_vsi *ctrl_vsi = pf->eswitch.control_vsi;
- 	struct ice_adv_rule_info rule_info = { 0 };
- 	struct ice_adv_lkup_elem *list;
- 	struct ice_hw *hw = &pf->hw;
-@@ -59,7 +59,7 @@ ice_eswitch_add_vf_sp_rule(struct ice_pf *pf, struct ice_vf *vf)
-  * @vf: pointer to the VF struct
-  *
-  * Delete the advanced rule that was used to forward packets with the VF's VSI
-- * index to the corresponding switchdev ctrl VSI queue.
-+ * index to the corresponding eswitch ctrl VSI queue.
-  */
- static void ice_eswitch_del_vf_sp_rule(struct ice_vf *vf)
- {
-@@ -70,7 +70,7 @@ static void ice_eswitch_del_vf_sp_rule(struct ice_vf *vf)
- }
- 
- /**
-- * ice_eswitch_setup_env - configure switchdev HW filters
-+ * ice_eswitch_setup_env - configure eswitch HW filters
-  * @pf: pointer to PF struct
-  *
-  * This function adds HW filters configuration specific for switchdev
-@@ -78,18 +78,18 @@ static void ice_eswitch_del_vf_sp_rule(struct ice_vf *vf)
-  */
- static int ice_eswitch_setup_env(struct ice_pf *pf)
- {
--	struct ice_vsi *uplink_vsi = pf->switchdev.uplink_vsi;
--	struct net_device *uplink_netdev = uplink_vsi->netdev;
--	struct ice_vsi *ctrl_vsi = pf->switchdev.control_vsi;
-+	struct ice_vsi *uplink_vsi = pf->eswitch.uplink_vsi;
-+	struct ice_vsi *ctrl_vsi = pf->eswitch.control_vsi;
-+	struct net_device *netdev = uplink_vsi->netdev;
- 	struct ice_vsi_vlan_ops *vlan_ops;
- 	bool rule_added = false;
- 
- 	ice_remove_vsi_fltr(&pf->hw, uplink_vsi->idx);
- 
--	netif_addr_lock_bh(uplink_netdev);
--	__dev_uc_unsync(uplink_netdev, NULL);
--	__dev_mc_unsync(uplink_netdev, NULL);
--	netif_addr_unlock_bh(uplink_netdev);
-+	netif_addr_lock_bh(netdev);
-+	__dev_uc_unsync(netdev, NULL);
-+	__dev_mc_unsync(netdev, NULL);
-+	netif_addr_unlock_bh(netdev);
- 
- 	if (ice_vsi_add_vlan_zero(uplink_vsi))
- 		goto err_def_rx;
-@@ -132,10 +132,10 @@ static int ice_eswitch_setup_env(struct ice_pf *pf)
- }
- 
- /**
-- * ice_eswitch_remap_rings_to_vectors - reconfigure rings of switchdev ctrl VSI
-+ * ice_eswitch_remap_rings_to_vectors - reconfigure rings of eswitch ctrl VSI
-  * @pf: pointer to PF struct
-  *
-- * In switchdev number of allocated Tx/Rx rings is equal.
-+ * In eswitch number of allocated Tx/Rx rings is equal.
-  *
-  * This function fills q_vectors structures associated with representor and
-  * move each ring pairs to port representor netdevs. Each port representor
-@@ -144,7 +144,7 @@ static int ice_eswitch_setup_env(struct ice_pf *pf)
-  */
- static void ice_eswitch_remap_rings_to_vectors(struct ice_pf *pf)
- {
--	struct ice_vsi *vsi = pf->switchdev.control_vsi;
-+	struct ice_vsi *vsi = pf->eswitch.control_vsi;
- 	int q_id;
- 
- 	ice_for_each_txq(vsi, q_id) {
-@@ -189,7 +189,7 @@ static void ice_eswitch_remap_rings_to_vectors(struct ice_pf *pf)
- /**
-  * ice_eswitch_release_reprs - clear PR VSIs configuration
-  * @pf: poiner to PF struct
-- * @ctrl_vsi: pointer to switchdev control VSI
-+ * @ctrl_vsi: pointer to eswitch control VSI
-  */
- static void
- ice_eswitch_release_reprs(struct ice_pf *pf, struct ice_vsi *ctrl_vsi)
-@@ -223,7 +223,7 @@ ice_eswitch_release_reprs(struct ice_pf *pf, struct ice_vsi *ctrl_vsi)
-  */
- static int ice_eswitch_setup_reprs(struct ice_pf *pf)
- {
--	struct ice_vsi *ctrl_vsi = pf->switchdev.control_vsi;
-+	struct ice_vsi *ctrl_vsi = pf->eswitch.control_vsi;
- 	int max_vsi_num = 0;
- 	struct ice_vf *vf;
- 	unsigned int bkt;
-@@ -359,7 +359,7 @@ ice_eswitch_port_start_xmit(struct sk_buff *skb, struct net_device *netdev)
- }
- 
- /**
-- * ice_eswitch_set_target_vsi - set switchdev context in Tx context descriptor
-+ * ice_eswitch_set_target_vsi - set eswitch context in Tx context descriptor
-  * @skb: pointer to send buffer
-  * @off: pointer to offload struct
-  */
-@@ -382,7 +382,7 @@ ice_eswitch_set_target_vsi(struct sk_buff *skb,
- }
- 
- /**
-- * ice_eswitch_release_env - clear switchdev HW filters
-+ * ice_eswitch_release_env - clear eswitch HW filters
-  * @pf: pointer to PF struct
-  *
-  * This function removes HW filters configuration specific for switchdev
-@@ -390,8 +390,8 @@ ice_eswitch_set_target_vsi(struct sk_buff *skb,
-  */
- static void ice_eswitch_release_env(struct ice_pf *pf)
- {
--	struct ice_vsi *uplink_vsi = pf->switchdev.uplink_vsi;
--	struct ice_vsi *ctrl_vsi = pf->switchdev.control_vsi;
-+	struct ice_vsi *uplink_vsi = pf->eswitch.uplink_vsi;
-+	struct ice_vsi *ctrl_vsi = pf->eswitch.control_vsi;
- 	struct ice_vsi_vlan_ops *vlan_ops;
- 
- 	vlan_ops = ice_get_compat_vsi_vlan_ops(uplink_vsi);
-@@ -407,7 +407,7 @@ static void ice_eswitch_release_env(struct ice_pf *pf)
- }
- 
- /**
-- * ice_eswitch_vsi_setup - configure switchdev control VSI
-+ * ice_eswitch_vsi_setup - configure eswitch control VSI
-  * @pf: pointer to PF structure
-  * @pi: pointer to port_info structure
-  */
-@@ -486,12 +486,12 @@ static int ice_eswitch_enable_switchdev(struct ice_pf *pf)
- 		return -EINVAL;
- 	}
- 
--	pf->switchdev.control_vsi = ice_eswitch_vsi_setup(pf, pf->hw.port_info);
--	if (!pf->switchdev.control_vsi)
-+	pf->eswitch.control_vsi = ice_eswitch_vsi_setup(pf, pf->hw.port_info);
-+	if (!pf->eswitch.control_vsi)
- 		return -ENODEV;
- 
--	ctrl_vsi = pf->switchdev.control_vsi;
--	pf->switchdev.uplink_vsi = uplink_vsi;
-+	ctrl_vsi = pf->eswitch.control_vsi;
-+	pf->eswitch.uplink_vsi = uplink_vsi;
- 
- 	if (ice_eswitch_setup_env(pf))
- 		goto err_vsi;
-@@ -526,12 +526,12 @@ static int ice_eswitch_enable_switchdev(struct ice_pf *pf)
- }
- 
- /**
-- * ice_eswitch_disable_switchdev - disable switchdev resources
-+ * ice_eswitch_disable_switchdev - disable eswitch resources
-  * @pf: pointer to PF structure
-  */
- static void ice_eswitch_disable_switchdev(struct ice_pf *pf)
- {
--	struct ice_vsi *ctrl_vsi = pf->switchdev.control_vsi;
-+	struct ice_vsi *ctrl_vsi = pf->eswitch.control_vsi;
- 
- 	ice_eswitch_napi_disable(pf);
- 	ice_eswitch_br_offloads_deinit(pf);
-@@ -625,7 +625,7 @@ void ice_eswitch_release(struct ice_pf *pf)
- 		return;
- 
- 	ice_eswitch_disable_switchdev(pf);
--	pf->switchdev.is_running = false;
-+	pf->eswitch.is_running = false;
- }
- 
- /**
-@@ -636,14 +636,15 @@ int ice_eswitch_configure(struct ice_pf *pf)
- {
- 	int status;
- 
--	if (pf->eswitch_mode == DEVLINK_ESWITCH_MODE_LEGACY || pf->switchdev.is_running)
-+	if (pf->eswitch_mode == DEVLINK_ESWITCH_MODE_LEGACY ||
-+	    pf->eswitch.is_running)
- 		return 0;
- 
- 	status = ice_eswitch_enable_switchdev(pf);
- 	if (status)
- 		return status;
- 
--	pf->switchdev.is_running = true;
-+	pf->eswitch.is_running = true;
- 	return 0;
- }
- 
-@@ -693,7 +694,7 @@ void ice_eswitch_stop_all_tx_queues(struct ice_pf *pf)
-  */
- int ice_eswitch_rebuild(struct ice_pf *pf)
- {
--	struct ice_vsi *ctrl_vsi = pf->switchdev.control_vsi;
-+	struct ice_vsi *ctrl_vsi = pf->eswitch.control_vsi;
- 	int status;
- 
- 	ice_eswitch_napi_disable(pf);
-diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch_br.c b/drivers/net/ethernet/intel/ice/ice_eswitch_br.c
-index 67bfd1f61cdd49..4750198d0c0cad 100644
---- a/drivers/net/ethernet/intel/ice/ice_eswitch_br.c
-+++ b/drivers/net/ethernet/intel/ice/ice_eswitch_br.c
-@@ -582,10 +582,13 @@ ice_eswitch_br_switchdev_event(struct notifier_block *nb,
- 	return NOTIFY_DONE;
- }
- 
--static void ice_eswitch_br_fdb_flush(struct ice_esw_br *bridge)
-+void ice_eswitch_br_fdb_flush(struct ice_esw_br *bridge)
- {
- 	struct ice_esw_br_fdb_entry *entry, *tmp;
- 
-+	if (!bridge)
-+		return;
-+
- 	list_for_each_entry_safe(entry, tmp, &bridge->fdb_list, list)
- 		ice_eswitch_br_fdb_entry_notify_and_cleanup(bridge, entry);
- }
-@@ -947,7 +950,7 @@ ice_eswitch_br_vf_repr_port_init(struct ice_esw_br *bridge,
- static int
- ice_eswitch_br_uplink_port_init(struct ice_esw_br *bridge, struct ice_pf *pf)
- {
--	struct ice_vsi *vsi = pf->switchdev.uplink_vsi;
-+	struct ice_vsi *vsi = pf->eswitch.uplink_vsi;
- 	struct ice_esw_br_port *br_port;
- 	int err;
- 
-@@ -1185,7 +1188,7 @@ ice_eswitch_br_port_event(struct notifier_block *nb,
- static void
- ice_eswitch_br_offloads_dealloc(struct ice_pf *pf)
- {
--	struct ice_esw_br_offloads *br_offloads = pf->switchdev.br_offloads;
-+	struct ice_esw_br_offloads *br_offloads = pf->eswitch.br_offloads;
- 
- 	ASSERT_RTNL();
- 
-@@ -1194,7 +1197,7 @@ ice_eswitch_br_offloads_dealloc(struct ice_pf *pf)
- 
- 	ice_eswitch_br_deinit(br_offloads, br_offloads->bridge);
- 
--	pf->switchdev.br_offloads = NULL;
-+	pf->eswitch.br_offloads = NULL;
- 	kfree(br_offloads);
- }
- 
-@@ -1205,14 +1208,14 @@ ice_eswitch_br_offloads_alloc(struct ice_pf *pf)
- 
- 	ASSERT_RTNL();
- 
--	if (pf->switchdev.br_offloads)
-+	if (pf->eswitch.br_offloads)
- 		return ERR_PTR(-EEXIST);
- 
- 	br_offloads = kzalloc(sizeof(*br_offloads), GFP_KERNEL);
- 	if (!br_offloads)
- 		return ERR_PTR(-ENOMEM);
- 
--	pf->switchdev.br_offloads = br_offloads;
-+	pf->eswitch.br_offloads = br_offloads;
- 	br_offloads->pf = pf;
- 
- 	return br_offloads;
-@@ -1223,7 +1226,7 @@ ice_eswitch_br_offloads_deinit(struct ice_pf *pf)
- {
- 	struct ice_esw_br_offloads *br_offloads;
- 
--	br_offloads = pf->switchdev.br_offloads;
-+	br_offloads = pf->eswitch.br_offloads;
- 	if (!br_offloads)
- 		return;
- 
-diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch_br.h b/drivers/net/ethernet/intel/ice/ice_eswitch_br.h
-index 85a8fadb2928e6..3920e506119148 100644
---- a/drivers/net/ethernet/intel/ice/ice_eswitch_br.h
-+++ b/drivers/net/ethernet/intel/ice/ice_eswitch_br.h
-@@ -116,5 +116,6 @@ void
- ice_eswitch_br_offloads_deinit(struct ice_pf *pf);
- int
- ice_eswitch_br_offloads_init(struct ice_pf *pf);
-+void ice_eswitch_br_fdb_flush(struct ice_esw_br *bridge);
- 
- #endif /* _ICE_ESWITCH_BR_H_ */
-diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
-index 4d3a9fc79a6c1d..9f12c9a0fe2968 100644
---- a/drivers/net/ethernet/intel/ice/ice_main.c
-+++ b/drivers/net/ethernet/intel/ice/ice_main.c
-@@ -84,7 +84,8 @@ ice_indr_setup_tc_cb(struct net_device *netdev, struct Qdisc *sch,
- 
- bool netif_is_ice(const struct net_device *dev)
- {
--	return dev && (dev->netdev_ops == &ice_netdev_ops);
-+	return dev && (dev->netdev_ops == &ice_netdev_ops ||
-+		       dev->netdev_ops == &ice_netdev_safe_mode_ops);
- }
- 
- /**
-@@ -517,25 +518,6 @@ static void ice_pf_dis_all_vsi(struct ice_pf *pf, bool locked)
- 		pf->vf_agg_node[node].num_vsis = 0;
- }
- 
--/**
-- * ice_clear_sw_switch_recipes - clear switch recipes
-- * @pf: board private structure
-- *
-- * Mark switch recipes as not created in sw structures. There are cases where
-- * rules (especially advanced rules) need to be restored, either re-read from
-- * hardware or added again. For example after the reset. 'recp_created' flag
-- * prevents from doing that and need to be cleared upfront.
-- */
--static void ice_clear_sw_switch_recipes(struct ice_pf *pf)
--{
--	struct ice_sw_recipe *recp;
--	u8 i;
--
--	recp = pf->hw.switch_info->recp_list;
--	for (i = 0; i < ICE_MAX_NUM_RECIPES; i++)
--		recp[i].recp_created = false;
--}
--
- /**
-  * ice_prepare_for_reset - prep for reset
-  * @pf: board private structure
-@@ -572,8 +554,9 @@ ice_prepare_for_reset(struct ice_pf *pf, enum ice_reset_req reset_type)
- 	mutex_unlock(&pf->vfs.table_lock);
- 
- 	if (ice_is_eswitch_mode_switchdev(pf)) {
--		if (reset_type != ICE_RESET_PFR)
--			ice_clear_sw_switch_recipes(pf);
-+		rtnl_lock();
-+		ice_eswitch_br_fdb_flush(pf->eswitch.br_offloads->bridge);
-+		rtnl_unlock();
- 	}
- 
- 	/* release ADQ specific HW and SW resources */
-diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c
-index 355716e6bcc82d..19f730a68fa21c 100644
---- a/drivers/net/ethernet/intel/ice/ice_switch.c
-+++ b/drivers/net/ethernet/intel/ice/ice_switch.c
-@@ -6326,8 +6326,6 @@ ice_replay_vsi_fltr(struct ice_hw *hw, u16 vsi_handle, u8 recp_id,
- 		if (!itr->vsi_list_info ||
- 		    !test_bit(vsi_handle, itr->vsi_list_info->vsi_map))
- 			continue;
--		/* Clearing it so that the logic can add it back */
--		clear_bit(vsi_handle, itr->vsi_list_info->vsi_map);
- 		f_entry.fltr_info.vsi_handle = vsi_handle;
- 		f_entry.fltr_info.fltr_act = ICE_FWD_TO_VSI;
- 		/* update the src in case it is VSI num */
-diff --git a/drivers/net/ethernet/intel/ice/ice_tc_lib.c b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
-index 76ad5930c01029..c213121aa5010a 100644
---- a/drivers/net/ethernet/intel/ice/ice_tc_lib.c
-+++ b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
-@@ -660,7 +660,7 @@ static int ice_tc_setup_redirect_action(struct net_device *filter_dev,
- 		   ice_tc_is_dev_uplink(target_dev)) {
- 		repr = ice_netdev_to_repr(filter_dev);
- 
--		fltr->dest_vsi = repr->src_vsi->back->switchdev.uplink_vsi;
-+		fltr->dest_vsi = repr->src_vsi->back->eswitch.uplink_vsi;
- 		fltr->direction = ICE_ESWITCH_FLTR_EGRESS;
- 	} else if (ice_tc_is_dev_uplink(filter_dev) &&
- 		   ice_is_port_repr_netdev(target_dev)) {
-@@ -772,11 +772,22 @@ ice_eswitch_add_tc_fltr(struct ice_vsi *vsi, struct ice_tc_flower_fltr *fltr)
- 		rule_info.sw_act.src = hw->pf_id;
- 		rule_info.flags_info.act = ICE_SINGLE_ACT_LB_ENABLE;
- 	} else if (fltr->direction == ICE_ESWITCH_FLTR_EGRESS &&
--		   fltr->dest_vsi == vsi->back->switchdev.uplink_vsi) {
-+		   fltr->dest_vsi == vsi->back->eswitch.uplink_vsi) {
- 		/* VF to Uplink */
- 		rule_info.sw_act.flag |= ICE_FLTR_TX;
- 		rule_info.sw_act.src = vsi->idx;
- 		rule_info.flags_info.act = ICE_SINGLE_ACT_LAN_ENABLE;
-+		/* This is a specific case. The destination VSI index is
-+		 * overwritten by the source VSI index. This type of filter
-+		 * should allow the packet to go to the LAN, not to the
-+		 * VSI passed here. It should set LAN_EN bit only. However,
-+		 * the VSI must be a valid one. Setting source VSI index
-+		 * here is safe. Even if the result from switch is set LAN_EN
-+		 * and LB_EN (which normally will pass the packet to this VSI)
-+		 * packet won't be seen on the VSI, because local loopback is
-+		 * turned off.
-+		 */
-+		rule_info.sw_act.vsi_handle = vsi->idx;
- 	} else {
- 		/* VF to VF */
- 		rule_info.sw_act.flag |= ICE_FLTR_TX;
-diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
-index 986bcbf0a6abaf..49b349fa22542a 100644
---- a/drivers/net/ethernet/intel/igb/igb_main.c
-+++ b/drivers/net/ethernet/intel/igb/igb_main.c
-@@ -9672,6 +9672,10 @@ static void igb_io_resume(struct pci_dev *pdev)
- 	struct igb_adapter *adapter = netdev_priv(netdev);
- 
- 	if (netif_running(netdev)) {
-+		if (!test_bit(__IGB_DOWN, &adapter->state)) {
-+			dev_dbg(&pdev->dev, "Resuming from non-fatal error, do nothing.\n");
-+			return;
-+		}
- 		if (igb_up(adapter)) {
- 			dev_err(&pdev->dev, "igb_up failed after reset\n");
- 			return;
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-index 89a80e3e8bb88f..d6167a7b19f21b 100644
---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -2018,7 +2018,7 @@ static int __alloc_dma_rx_desc_resources(struct stmmac_priv *priv,
- 	rx_q->queue_index = queue;
- 	rx_q->priv_data = priv;
- 
--	pp_params.flags = PP_FLAG_DMA_MAP | (xdp_prog ? PP_FLAG_DMA_SYNC_DEV : 0);
-+	pp_params.flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV;
- 	pp_params.pool_size = dma_conf->dma_rx_size;
- 	num_pages = DIV_ROUND_UP(dma_conf->dma_buf_sz, PAGE_SIZE);
- 	pp_params.order = ilog2(num_pages);
-diff --git a/drivers/net/phy/bcm84881.c b/drivers/net/phy/bcm84881.c
-index 9717a1626f3fa1..37a64a37b2ae38 100644
---- a/drivers/net/phy/bcm84881.c
-+++ b/drivers/net/phy/bcm84881.c
-@@ -120,7 +120,7 @@ static int bcm84881_aneg_done(struct phy_device *phydev)
- 
- 	bmsr = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_C22 + MII_BMSR);
- 	if (bmsr < 0)
--		return val;
-+		return bmsr;
- 
- 	return !!(val & MDIO_AN_STAT1_COMPLETE) &&
- 	       !!(bmsr & BMSR_ANEGCOMPLETE);
-@@ -146,7 +146,7 @@ static int bcm84881_read_status(struct phy_device *phydev)
- 
- 	bmsr = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_C22 + MII_BMSR);
- 	if (bmsr < 0)
--		return val;
-+		return bmsr;
- 
- 	phydev->autoneg_complete = !!(val & MDIO_AN_STAT1_COMPLETE) &&
- 				   !!(bmsr & BMSR_ANEGCOMPLETE);
-diff --git a/drivers/net/phy/dp83869.c b/drivers/net/phy/dp83869.c
-index d7aaefb5226b62..5f056d7db83eed 100644
---- a/drivers/net/phy/dp83869.c
-+++ b/drivers/net/phy/dp83869.c
-@@ -645,7 +645,6 @@ static int dp83869_configure_fiber(struct phy_device *phydev,
- 		     phydev->supported);
- 
- 	linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, phydev->supported);
--	linkmode_set_bit(ADVERTISED_FIBRE, phydev->advertising);
- 
- 	if (dp83869->mode == DP83869_RGMII_1000_BASE) {
- 		linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,
-diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
-index 2e4bff6055e223..ec2a3d16b1a2da 100644
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -3082,10 +3082,11 @@ static __maybe_unused int phy_led_hw_is_supported(struct led_classdev *led_cdev,
- 
- static void phy_leds_unregister(struct phy_device *phydev)
- {
--	struct phy_led *phyled;
-+	struct phy_led *phyled, *tmp;
- 
--	list_for_each_entry(phyled, &phydev->leds, list) {
-+	list_for_each_entry_safe(phyled, tmp, &phydev->leds, list) {
- 		led_classdev_unregister(&phyled->led_cdev);
-+		list_del(&phyled->list);
- 	}
- }
- 
-diff --git a/drivers/net/ppp/ppp_async.c b/drivers/net/ppp/ppp_async.c
-index e94a4b08fd63b7..7d9201ef925ff1 100644
---- a/drivers/net/ppp/ppp_async.c
-+++ b/drivers/net/ppp/ppp_async.c
-@@ -541,7 +541,7 @@ ppp_async_encode(struct asyncppp *ap)
- 	 * and 7 (code-reject) must be sent as though no options
- 	 * had been negotiated.
- 	 */
--	islcp = proto == PPP_LCP && 1 <= data[2] && data[2] <= 7;
-+	islcp = proto == PPP_LCP && count >= 3 && 1 <= data[2] && data[2] <= 7;
- 
- 	if (i == 0) {
- 		if (islcp)
-diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
-index ba93bab948e09f..bf9e801cc61cce 100644
---- a/drivers/net/slip/slhc.c
-+++ b/drivers/net/slip/slhc.c
-@@ -643,46 +643,57 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
- int
- slhc_remember(struct slcompress *comp, unsigned char *icp, int isize)
- {
--	struct cstate *cs;
--	unsigned ihl;
--
-+	const struct tcphdr *th;
- 	unsigned char index;
-+	struct iphdr *iph;
-+	struct cstate *cs;
-+	unsigned int ihl;
- 
--	if(isize < 20) {
--		/* The packet is shorter than a legal IP header */
-+	/* The packet is shorter than a legal IP header.
-+	 * Also make sure isize is positive.
-+	 */
-+	if (isize < (int)sizeof(struct iphdr)) {
-+runt:
- 		comp->sls_i_runt++;
--		return slhc_toss( comp );
-+		return slhc_toss(comp);
- 	}
-+	iph = (struct iphdr *)icp;
- 	/* Peek at the IP header's IHL field to find its length */
--	ihl = icp[0] & 0xf;
--	if(ihl < 20 / 4){
--		/* The IP header length field is too small */
--		comp->sls_i_runt++;
--		return slhc_toss( comp );
--	}
--	index = icp[9];
--	icp[9] = IPPROTO_TCP;
-+	ihl = iph->ihl;
-+	/* The IP header length field is too small,
-+	 * or packet is shorter than the IP header followed
-+	 * by minimal tcp header.
-+	 */
-+	if (ihl < 5 || isize < ihl * 4 + sizeof(struct tcphdr))
-+		goto runt;
-+
-+	index = iph->protocol;
-+	iph->protocol = IPPROTO_TCP;
- 
- 	if (ip_fast_csum(icp, ihl)) {
- 		/* Bad IP header checksum; discard */
- 		comp->sls_i_badcheck++;
--		return slhc_toss( comp );
-+		return slhc_toss(comp);
- 	}
--	if(index > comp->rslot_limit) {
-+	if (index > comp->rslot_limit) {
- 		comp->sls_i_error++;
- 		return slhc_toss(comp);
- 	}
--
-+	th = (struct tcphdr *)(icp + ihl * 4);
-+	if (th->doff < sizeof(struct tcphdr) / 4)
-+		goto runt;
-+	if (isize < ihl * 4 + th->doff * 4)
-+		goto runt;
- 	/* Update local state */
- 	cs = &comp->rstate[comp->recv_current = index];
- 	comp->flags &=~ SLF_TOSS;
--	memcpy(&cs->cs_ip,icp,20);
--	memcpy(&cs->cs_tcp,icp + ihl*4,20);
-+	memcpy(&cs->cs_ip, iph, sizeof(*iph));
-+	memcpy(&cs->cs_tcp, th, sizeof(*th));
- 	if (ihl > 5)
--	  memcpy(cs->cs_ipopt, icp + sizeof(struct iphdr), (ihl - 5) * 4);
--	if (cs->cs_tcp.doff > 5)
--	  memcpy(cs->cs_tcpopt, icp + ihl*4 + sizeof(struct tcphdr), (cs->cs_tcp.doff - 5) * 4);
--	cs->cs_hsize = ihl*2 + cs->cs_tcp.doff*2;
-+	  memcpy(cs->cs_ipopt, &iph[1], (ihl - 5) * 4);
-+	if (th->doff > 5)
-+	  memcpy(cs->cs_tcpopt, &th[1], (th->doff - 5) * 4);
-+	cs->cs_hsize = ihl*2 + th->doff*2;
- 	cs->initialized = true;
- 	/* Put headers back on packet
- 	 * Neither header checksum is recalculated
-diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
-index 8268fa331826e7..c114c91b558bdc 100644
---- a/drivers/net/vxlan/vxlan_core.c
-+++ b/drivers/net/vxlan/vxlan_core.c
-@@ -4819,9 +4819,13 @@ static int __init vxlan_init_module(void)
- 	if (rc)
- 		goto out4;
- 
--	vxlan_vnifilter_init();
-+	rc = vxlan_vnifilter_init();
-+	if (rc)
-+		goto out5;
- 
- 	return 0;
-+out5:
-+	rtnl_link_unregister(&vxlan_link_ops);
- out4:
- 	unregister_switchdev_notifier(&vxlan_switchdev_notifier_block);
- out3:
-diff --git a/drivers/net/vxlan/vxlan_private.h b/drivers/net/vxlan/vxlan_private.h
-index 817fa3075842ee..85b6d0c347e3b4 100644
---- a/drivers/net/vxlan/vxlan_private.h
-+++ b/drivers/net/vxlan/vxlan_private.h
-@@ -202,7 +202,7 @@ int vxlan_vni_in_use(struct net *src_net, struct vxlan_dev *vxlan,
- int vxlan_vnigroup_init(struct vxlan_dev *vxlan);
- void vxlan_vnigroup_uninit(struct vxlan_dev *vxlan);
- 
--void vxlan_vnifilter_init(void);
-+int vxlan_vnifilter_init(void);
- void vxlan_vnifilter_uninit(void);
- void vxlan_vnifilter_count(struct vxlan_dev *vxlan, __be32 vni,
- 			   struct vxlan_vni_node *vninode,
-diff --git a/drivers/net/vxlan/vxlan_vnifilter.c b/drivers/net/vxlan/vxlan_vnifilter.c
-index 9c59d0bf8c3de0..d2023e7131bd4f 100644
---- a/drivers/net/vxlan/vxlan_vnifilter.c
-+++ b/drivers/net/vxlan/vxlan_vnifilter.c
-@@ -992,19 +992,18 @@ static int vxlan_vnifilter_process(struct sk_buff *skb, struct nlmsghdr *nlh,
- 	return err;
- }
- 
--void vxlan_vnifilter_init(void)
-+static const struct rtnl_msg_handler vxlan_vnifilter_rtnl_msg_handlers[] = {
-+	{THIS_MODULE, PF_BRIDGE, RTM_GETTUNNEL, NULL, vxlan_vnifilter_dump, 0},
-+	{THIS_MODULE, PF_BRIDGE, RTM_NEWTUNNEL, vxlan_vnifilter_process, NULL, 0},
-+	{THIS_MODULE, PF_BRIDGE, RTM_DELTUNNEL, vxlan_vnifilter_process, NULL, 0},
-+};
-+
-+int vxlan_vnifilter_init(void)
- {
--	rtnl_register_module(THIS_MODULE, PF_BRIDGE, RTM_GETTUNNEL, NULL,
--			     vxlan_vnifilter_dump, 0);
--	rtnl_register_module(THIS_MODULE, PF_BRIDGE, RTM_NEWTUNNEL,
--			     vxlan_vnifilter_process, NULL, 0);
--	rtnl_register_module(THIS_MODULE, PF_BRIDGE, RTM_DELTUNNEL,
--			     vxlan_vnifilter_process, NULL, 0);
-+	return rtnl_register_many(vxlan_vnifilter_rtnl_msg_handlers);
- }
- 
- void vxlan_vnifilter_uninit(void)
- {
--	rtnl_unregister(PF_BRIDGE, RTM_GETTUNNEL);
--	rtnl_unregister(PF_BRIDGE, RTM_NEWTUNNEL);
--	rtnl_unregister(PF_BRIDGE, RTM_DELTUNNEL);
-+	rtnl_unregister_many(vxlan_vnifilter_rtnl_msg_handlers);
- }
-diff --git a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
-index d6bbcc7b5b90d6..0a94c634ddc27e 100644
---- a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
-+++ b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
-@@ -1554,6 +1554,7 @@ static void switchtec_ntb_remove(struct device *dev)
- 	switchtec_ntb_deinit_db_msg_irq(sndev);
- 	switchtec_ntb_deinit_shared_mw(sndev);
- 	switchtec_ntb_deinit_crosslink(sndev);
-+	cancel_work_sync(&sndev->check_link_status_work);
- 	kfree(sndev);
- 	dev_info(dev, "ntb device unregistered\n");
- }
-diff --git a/drivers/nvdimm/nd_virtio.c b/drivers/nvdimm/nd_virtio.c
-index 1f8c667c6f1ee0..839f10ca56eac9 100644
---- a/drivers/nvdimm/nd_virtio.c
-+++ b/drivers/nvdimm/nd_virtio.c
-@@ -44,6 +44,15 @@ static int virtio_pmem_flush(struct nd_region *nd_region)
- 	unsigned long flags;
- 	int err, err1;
- 
-+	/*
-+	 * Don't bother to submit the request to the device if the device is
-+	 * not activated.
-+	 */
-+	if (vdev->config->get_status(vdev) & VIRTIO_CONFIG_S_NEEDS_RESET) {
-+		dev_info(&vdev->dev, "virtio pmem device needs a reset\n");
-+		return -EIO;
-+	}
-+
- 	might_sleep();
- 	req_data = kmalloc(sizeof(*req_data), GFP_KERNEL);
- 	if (!req_data)
-diff --git a/drivers/pci/endpoint/functions/pci-epf-mhi.c b/drivers/pci/endpoint/functions/pci-epf-mhi.c
-index 6dc918a8a0235d..34e7191f950867 100644
---- a/drivers/pci/endpoint/functions/pci-epf-mhi.c
-+++ b/drivers/pci/endpoint/functions/pci-epf-mhi.c
-@@ -536,11 +536,11 @@ static int pci_epf_mhi_link_up(struct pci_epf *epf)
- 	mhi_cntrl->alloc_map = pci_epf_mhi_alloc_map;
- 	mhi_cntrl->unmap_free = pci_epf_mhi_unmap_free;
- 	if (info->flags & MHI_EPF_USE_DMA) {
--		mhi_cntrl->read_from_host = pci_epf_mhi_edma_read;
--		mhi_cntrl->write_to_host = pci_epf_mhi_edma_write;
-+		mhi_cntrl->read_sync = pci_epf_mhi_edma_read;
-+		mhi_cntrl->write_sync = pci_epf_mhi_edma_write;
- 	} else {
--		mhi_cntrl->read_from_host = pci_epf_mhi_iatu_read;
--		mhi_cntrl->write_to_host = pci_epf_mhi_iatu_write;
-+		mhi_cntrl->read_sync = pci_epf_mhi_iatu_read;
-+		mhi_cntrl->write_sync = pci_epf_mhi_iatu_write;
- 	}
- 
- 	/* Register the MHI EP controller */
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 0b08ac45effbbc..54061b65a2b721 100644
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -3614,6 +3614,8 @@ DECLARE_PCI_FIXUP_FINAL(0x1814, 0x0601, /* Ralink RT2800 802.11n PCI */
- 			quirk_broken_intx_masking);
- DECLARE_PCI_FIXUP_FINAL(0x1b7c, 0x0004, /* Ceton InfiniTV4 */
- 			quirk_broken_intx_masking);
-+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_20K2,
-+			quirk_broken_intx_masking);
- 
- /*
-  * Realtek RTL8169 PCI Gigabit Ethernet Controller (rev 10)
-@@ -4252,6 +4254,10 @@ static void quirk_dma_func0_alias(struct pci_dev *dev)
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_RICOH, 0xe832, quirk_dma_func0_alias);
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_RICOH, 0xe476, quirk_dma_func0_alias);
- 
-+/* Some Glenfly chips use function 0 as the PCIe Requester ID for DMA */
-+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_GLENFLY, 0x3d40, quirk_dma_func0_alias);
-+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_GLENFLY, 0x3d41, quirk_dma_func0_alias);
-+
- static void quirk_dma_func1_alias(struct pci_dev *dev)
- {
- 	if (PCI_FUNC(dev->devfn) != 1)
-@@ -5076,6 +5082,8 @@ static const struct pci_dev_acs_enabled {
- 	/* QCOM QDF2xxx root ports */
- 	{ PCI_VENDOR_ID_QCOM, 0x0400, pci_quirk_qcom_rp_acs },
- 	{ PCI_VENDOR_ID_QCOM, 0x0401, pci_quirk_qcom_rp_acs },
-+	/* QCOM SA8775P root port */
-+	{ PCI_VENDOR_ID_QCOM, 0x0115, pci_quirk_qcom_rp_acs },
- 	/* HXT SD4800 root ports. The ACS design is same as QCOM QDF2xxx */
- 	{ PCI_VENDOR_ID_HXT, 0x0401, pci_quirk_qcom_rp_acs },
- 	/* Intel PCH root ports */
-diff --git a/drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c b/drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c
-index d4fb85c20eb0f1..a43e20abb10d54 100644
---- a/drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c
-+++ b/drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c
-@@ -37,56 +37,28 @@
- #define EUSB2_TUNE_EUSB_EQU		0x5A
- #define EUSB2_TUNE_EUSB_HS_COMP_CUR	0x5B
- 
--#define QCOM_EUSB2_REPEATER_INIT_CFG(r, v)	\
--	{					\
--		.reg = r,			\
--		.val = v,			\
--	}
--
--enum reg_fields {
--	F_TUNE_EUSB_HS_COMP_CUR,
--	F_TUNE_EUSB_EQU,
--	F_TUNE_EUSB_SLEW,
--	F_TUNE_USB2_HS_COMP_CUR,
--	F_TUNE_USB2_PREEM,
--	F_TUNE_USB2_EQU,
--	F_TUNE_USB2_SLEW,
--	F_TUNE_SQUELCH_U,
--	F_TUNE_HSDISC,
--	F_TUNE_RES_FSDIF,
--	F_TUNE_IUSB2,
--	F_TUNE_USB2_CROSSOVER,
--	F_NUM_TUNE_FIELDS,
--
--	F_FORCE_VAL_5 = F_NUM_TUNE_FIELDS,
--	F_FORCE_EN_5,
--
--	F_EN_CTL1,
--
--	F_RPTR_STATUS,
--	F_NUM_FIELDS,
--};
--
--static struct reg_field eusb2_repeater_tune_reg_fields[F_NUM_FIELDS] = {
--	[F_TUNE_EUSB_HS_COMP_CUR] = REG_FIELD(EUSB2_TUNE_EUSB_HS_COMP_CUR, 0, 1),
--	[F_TUNE_EUSB_EQU] = REG_FIELD(EUSB2_TUNE_EUSB_EQU, 0, 1),
--	[F_TUNE_EUSB_SLEW] = REG_FIELD(EUSB2_TUNE_EUSB_SLEW, 0, 1),
--	[F_TUNE_USB2_HS_COMP_CUR] = REG_FIELD(EUSB2_TUNE_USB2_HS_COMP_CUR, 0, 1),
--	[F_TUNE_USB2_PREEM] = REG_FIELD(EUSB2_TUNE_USB2_PREEM, 0, 2),
--	[F_TUNE_USB2_EQU] = REG_FIELD(EUSB2_TUNE_USB2_EQU, 0, 1),
--	[F_TUNE_USB2_SLEW] = REG_FIELD(EUSB2_TUNE_USB2_SLEW, 0, 1),
--	[F_TUNE_SQUELCH_U] = REG_FIELD(EUSB2_TUNE_SQUELCH_U, 0, 2),
--	[F_TUNE_HSDISC] = REG_FIELD(EUSB2_TUNE_HSDISC, 0, 2),
--	[F_TUNE_RES_FSDIF] = REG_FIELD(EUSB2_TUNE_RES_FSDIF, 0, 2),
--	[F_TUNE_IUSB2] = REG_FIELD(EUSB2_TUNE_IUSB2, 0, 3),
--	[F_TUNE_USB2_CROSSOVER] = REG_FIELD(EUSB2_TUNE_USB2_CROSSOVER, 0, 2),
--
--	[F_FORCE_VAL_5] = REG_FIELD(EUSB2_FORCE_VAL_5, 0, 7),
--	[F_FORCE_EN_5] = REG_FIELD(EUSB2_FORCE_EN_5, 0, 7),
--
--	[F_EN_CTL1] = REG_FIELD(EUSB2_EN_CTL1, 0, 7),
--
--	[F_RPTR_STATUS] = REG_FIELD(EUSB2_RPTR_STATUS, 0, 7),
-+enum eusb2_reg_layout {
-+	TUNE_EUSB_HS_COMP_CUR,
-+	TUNE_EUSB_EQU,
-+	TUNE_EUSB_SLEW,
-+	TUNE_USB2_HS_COMP_CUR,
-+	TUNE_USB2_PREEM,
-+	TUNE_USB2_EQU,
-+	TUNE_USB2_SLEW,
-+	TUNE_SQUELCH_U,
-+	TUNE_HSDISC,
-+	TUNE_RES_FSDIF,
-+	TUNE_IUSB2,
-+	TUNE_USB2_CROSSOVER,
-+	NUM_TUNE_FIELDS,
-+
-+	FORCE_VAL_5 = NUM_TUNE_FIELDS,
-+	FORCE_EN_5,
-+
-+	EN_CTL1,
-+
-+	RPTR_STATUS,
-+	LAYOUT_SIZE,
- };
- 
- struct eusb2_repeater_cfg {
-@@ -98,10 +70,11 @@ struct eusb2_repeater_cfg {
- 
- struct eusb2_repeater {
- 	struct device *dev;
--	struct regmap_field *regs[F_NUM_FIELDS];
-+	struct regmap *regmap;
- 	struct phy *phy;
- 	struct regulator_bulk_data *vregs;
- 	const struct eusb2_repeater_cfg *cfg;
-+	u32 base;
- 	enum phy_mode mode;
- };
- 
-@@ -109,10 +82,10 @@ static const char * const pm8550b_vreg_l[] = {
- 	"vdd18", "vdd3",
- };
- 
--static const u32 pm8550b_init_tbl[F_NUM_TUNE_FIELDS] = {
--	[F_TUNE_IUSB2] = 0x8,
--	[F_TUNE_SQUELCH_U] = 0x3,
--	[F_TUNE_USB2_PREEM] = 0x5,
-+static const u32 pm8550b_init_tbl[NUM_TUNE_FIELDS] = {
-+	[TUNE_IUSB2] = 0x8,
-+	[TUNE_SQUELCH_U] = 0x3,
-+	[TUNE_USB2_PREEM] = 0x5,
- };
- 
- static const struct eusb2_repeater_cfg pm8550b_eusb2_cfg = {
-@@ -140,32 +113,42 @@ static int eusb2_repeater_init_vregs(struct eusb2_repeater *rptr)
- 
- static int eusb2_repeater_init(struct phy *phy)
- {
--	struct reg_field *regfields = eusb2_repeater_tune_reg_fields;
- 	struct eusb2_repeater *rptr = phy_get_drvdata(phy);
-+	struct device_node *np = rptr->dev->of_node;
-+	struct regmap *regmap = rptr->regmap;
- 	const u32 *init_tbl = rptr->cfg->init_tbl;
-+	u8 tune_usb2_preem = init_tbl[TUNE_USB2_PREEM];
-+	u8 tune_hsdisc = init_tbl[TUNE_HSDISC];
-+	u8 tune_iusb2 = init_tbl[TUNE_IUSB2];
-+	u32 base = rptr->base;
- 	u32 val;
- 	int ret;
--	int i;
-+
-+	of_property_read_u8(np, "qcom,tune-usb2-amplitude", &tune_iusb2);
-+	of_property_read_u8(np, "qcom,tune-usb2-disc-thres", &tune_hsdisc);
-+	of_property_read_u8(np, "qcom,tune-usb2-preem", &tune_usb2_preem);
- 
- 	ret = regulator_bulk_enable(rptr->cfg->num_vregs, rptr->vregs);
- 	if (ret)
- 		return ret;
- 
--	regmap_field_update_bits(rptr->regs[F_EN_CTL1], EUSB2_RPTR_EN, EUSB2_RPTR_EN);
-+	regmap_write(regmap, base + EUSB2_EN_CTL1, EUSB2_RPTR_EN);
- 
--	for (i = 0; i < F_NUM_TUNE_FIELDS; i++) {
--		if (init_tbl[i]) {
--			regmap_field_update_bits(rptr->regs[i], init_tbl[i], init_tbl[i]);
--		} else {
--			/* Write 0 if there's no value set */
--			u32 mask = GENMASK(regfields[i].msb, regfields[i].lsb);
-+	regmap_write(regmap, base + EUSB2_TUNE_EUSB_HS_COMP_CUR, init_tbl[TUNE_EUSB_HS_COMP_CUR]);
-+	regmap_write(regmap, base + EUSB2_TUNE_EUSB_EQU, init_tbl[TUNE_EUSB_EQU]);
-+	regmap_write(regmap, base + EUSB2_TUNE_EUSB_SLEW, init_tbl[TUNE_EUSB_SLEW]);
-+	regmap_write(regmap, base + EUSB2_TUNE_USB2_HS_COMP_CUR, init_tbl[TUNE_USB2_HS_COMP_CUR]);
-+	regmap_write(regmap, base + EUSB2_TUNE_USB2_EQU, init_tbl[TUNE_USB2_EQU]);
-+	regmap_write(regmap, base + EUSB2_TUNE_USB2_SLEW, init_tbl[TUNE_USB2_SLEW]);
-+	regmap_write(regmap, base + EUSB2_TUNE_SQUELCH_U, init_tbl[TUNE_SQUELCH_U]);
-+	regmap_write(regmap, base + EUSB2_TUNE_RES_FSDIF, init_tbl[TUNE_RES_FSDIF]);
-+	regmap_write(regmap, base + EUSB2_TUNE_USB2_CROSSOVER, init_tbl[TUNE_USB2_CROSSOVER]);
- 
--			regmap_field_update_bits(rptr->regs[i], mask, 0);
--		}
--	}
-+	regmap_write(regmap, base + EUSB2_TUNE_USB2_PREEM, tune_usb2_preem);
-+	regmap_write(regmap, base + EUSB2_TUNE_HSDISC, tune_hsdisc);
-+	regmap_write(regmap, base + EUSB2_TUNE_IUSB2, tune_iusb2);
- 
--	ret = regmap_field_read_poll_timeout(rptr->regs[F_RPTR_STATUS],
--					     val, val & RPTR_OK, 10, 5);
-+	ret = regmap_read_poll_timeout(regmap, base + EUSB2_RPTR_STATUS, val, val & RPTR_OK, 10, 5);
- 	if (ret)
- 		dev_err(rptr->dev, "initialization timed-out\n");
- 
-@@ -176,6 +159,8 @@ static int eusb2_repeater_set_mode(struct phy *phy,
- 				   enum phy_mode mode, int submode)
- {
- 	struct eusb2_repeater *rptr = phy_get_drvdata(phy);
-+	struct regmap *regmap = rptr->regmap;
-+	u32 base = rptr->base;
- 
- 	switch (mode) {
- 	case PHY_MODE_USB_HOST:
-@@ -184,10 +169,8 @@ static int eusb2_repeater_set_mode(struct phy *phy,
- 		 * per eUSB 1.2 Spec. Below implement software workaround until
- 		 * PHY and controller is fixing seen observation.
- 		 */
--		regmap_field_update_bits(rptr->regs[F_FORCE_EN_5],
--					 F_CLK_19P2M_EN, F_CLK_19P2M_EN);
--		regmap_field_update_bits(rptr->regs[F_FORCE_VAL_5],
--					 V_CLK_19P2M_EN, V_CLK_19P2M_EN);
-+		regmap_write(regmap, base + EUSB2_FORCE_EN_5, F_CLK_19P2M_EN);
-+		regmap_write(regmap, base + EUSB2_FORCE_VAL_5, V_CLK_19P2M_EN);
- 		break;
- 	case PHY_MODE_USB_DEVICE:
- 		/*
-@@ -196,10 +179,8 @@ static int eusb2_repeater_set_mode(struct phy *phy,
- 		 * repeater doesn't clear previous value due to shared
- 		 * regulators (say host <-> device mode switch).
- 		 */
--		regmap_field_update_bits(rptr->regs[F_FORCE_EN_5],
--					 F_CLK_19P2M_EN, 0);
--		regmap_field_update_bits(rptr->regs[F_FORCE_VAL_5],
--					 V_CLK_19P2M_EN, 0);
-+		regmap_write(regmap, base + EUSB2_FORCE_EN_5, 0);
-+		regmap_write(regmap, base + EUSB2_FORCE_VAL_5, 0);
- 		break;
- 	default:
- 		return -EINVAL;
-@@ -228,9 +209,8 @@ static int eusb2_repeater_probe(struct platform_device *pdev)
- 	struct device *dev = &pdev->dev;
- 	struct phy_provider *phy_provider;
- 	struct device_node *np = dev->of_node;
--	struct regmap *regmap;
--	int i, ret;
- 	u32 res;
-+	int ret;
- 
- 	rptr = devm_kzalloc(dev, sizeof(*rptr), GFP_KERNEL);
- 	if (!rptr)
-@@ -243,22 +223,15 @@ static int eusb2_repeater_probe(struct platform_device *pdev)
- 	if (!rptr->cfg)
- 		return -EINVAL;
- 
--	regmap = dev_get_regmap(dev->parent, NULL);
--	if (!regmap)
-+	rptr->regmap = dev_get_regmap(dev->parent, NULL);
-+	if (!rptr->regmap)
- 		return -ENODEV;
- 
- 	ret = of_property_read_u32(np, "reg", &res);
- 	if (ret < 0)
- 		return ret;
- 
--	for (i = 0; i < F_NUM_FIELDS; i++)
--		eusb2_repeater_tune_reg_fields[i].reg += res;
--
--	ret = devm_regmap_field_bulk_alloc(dev, regmap, rptr->regs,
--					   eusb2_repeater_tune_reg_fields,
--					   F_NUM_FIELDS);
--	if (ret)
--		return ret;
-+	rptr->base = res;
- 
- 	ret = eusb2_repeater_init_vregs(rptr);
- 	if (ret < 0) {
-diff --git a/drivers/powercap/intel_rapl_tpmi.c b/drivers/powercap/intel_rapl_tpmi.c
-index f6b7f085977ce1..1c48dba0ba96af 100644
---- a/drivers/powercap/intel_rapl_tpmi.c
-+++ b/drivers/powercap/intel_rapl_tpmi.c
-@@ -15,7 +15,8 @@
- #include <linux/module.h>
- #include <linux/slab.h>
- 
--#define TPMI_RAPL_VERSION 1
-+#define TPMI_RAPL_MAJOR_VERSION 0
-+#define TPMI_RAPL_MINOR_VERSION 1
- 
- /* 1 header + 10 registers + 5 reserved. 8 bytes for each. */
- #define TPMI_RAPL_DOMAIN_SIZE 128
-@@ -154,11 +155,21 @@ static int parse_one_domain(struct tpmi_rapl_package *trp, u32 offset)
- 	tpmi_domain_size = tpmi_domain_header >> 16 & 0xff;
- 	tpmi_domain_flags = tpmi_domain_header >> 32 & 0xffff;
- 
--	if (tpmi_domain_version != TPMI_RAPL_VERSION) {
--		pr_warn(FW_BUG "Unsupported version:%d\n", tpmi_domain_version);
-+	if (tpmi_domain_version == TPMI_VERSION_INVALID) {
-+		pr_warn(FW_BUG "Invalid version\n");
- 		return -ENODEV;
- 	}
- 
-+	if (TPMI_MAJOR_VERSION(tpmi_domain_version) != TPMI_RAPL_MAJOR_VERSION) {
-+		pr_warn(FW_BUG "Unsupported major version:%ld\n",
-+			TPMI_MAJOR_VERSION(tpmi_domain_version));
-+		return -ENODEV;
-+	}
-+
-+	if (TPMI_MINOR_VERSION(tpmi_domain_version) > TPMI_RAPL_MINOR_VERSION)
-+		pr_info("Ignore: Unsupported minor version:%ld\n",
-+			TPMI_MINOR_VERSION(tpmi_domain_version));
-+
- 	/* Domain size: in unit of 128 Bytes */
- 	if (tpmi_domain_size != 1) {
- 		pr_warn(FW_BUG "Invalid Domain size %d\n", tpmi_domain_size);
-@@ -181,7 +192,7 @@ static int parse_one_domain(struct tpmi_rapl_package *trp, u32 offset)
- 			pr_warn(FW_BUG "System domain must support Domain Info register\n");
- 			return -ENODEV;
- 		}
--		tpmi_domain_info = readq(trp->base + offset + TPMI_RAPL_REG_DOMAIN_INFO);
-+		tpmi_domain_info = readq(trp->base + offset + TPMI_RAPL_REG_DOMAIN_INFO * 8);
- 		if (!(tpmi_domain_info & TPMI_RAPL_DOMAIN_ROOT))
- 			return 0;
- 		domain_type = RAPL_DOMAIN_PLATFORM;
-diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
-index d68d4b22f528e2..610a69928dff2a 100644
---- a/drivers/remoteproc/imx_rproc.c
-+++ b/drivers/remoteproc/imx_rproc.c
-@@ -669,6 +669,17 @@ static struct resource_table *imx_rproc_get_loaded_rsc_table(struct rproc *rproc
- 	return (struct resource_table *)priv->rsc_table;
- }
- 
-+static struct resource_table *
-+imx_rproc_elf_find_loaded_rsc_table(struct rproc *rproc, const struct firmware *fw)
-+{
-+	struct imx_rproc *priv = rproc->priv;
-+
-+	if (priv->rsc_table)
-+		return (struct resource_table *)priv->rsc_table;
-+
-+	return rproc_elf_find_loaded_rsc_table(rproc, fw);
-+}
-+
- static const struct rproc_ops imx_rproc_ops = {
- 	.prepare	= imx_rproc_prepare,
- 	.attach		= imx_rproc_attach,
-@@ -679,7 +690,7 @@ static const struct rproc_ops imx_rproc_ops = {
- 	.da_to_va       = imx_rproc_da_to_va,
- 	.load		= rproc_elf_load_segments,
- 	.parse_fw	= imx_rproc_parse_fw,
--	.find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table,
-+	.find_loaded_rsc_table = imx_rproc_elf_find_loaded_rsc_table,
- 	.get_loaded_rsc_table = imx_rproc_get_loaded_rsc_table,
- 	.sanity_check	= rproc_elf_sanity_check,
- 	.get_boot_addr	= rproc_elf_get_boot_addr,
-diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
-index baae1f8279e0cb..1775115239860b 100644
---- a/drivers/scsi/lpfc/lpfc_ct.c
-+++ b/drivers/scsi/lpfc/lpfc_ct.c
-@@ -1671,6 +1671,18 @@ lpfc_cmpl_ct(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
- 	}
- 
- out:
-+	/* If the caller wanted a synchronous DA_ID completion, signal the
-+	 * wait obj and clear flag to reset the vport.
-+	 */
-+	if (ndlp->save_flags & NLP_WAIT_FOR_DA_ID) {
-+		if (ndlp->da_id_waitq)
-+			wake_up(ndlp->da_id_waitq);
-+	}
-+
-+	spin_lock_irq(&ndlp->lock);
-+	ndlp->save_flags &= ~NLP_WAIT_FOR_DA_ID;
-+	spin_unlock_irq(&ndlp->lock);
-+
- 	lpfc_ct_free_iocb(phba, cmdiocb);
- 	lpfc_nlp_put(ndlp);
- 	return;
-diff --git a/drivers/scsi/lpfc/lpfc_disc.h b/drivers/scsi/lpfc/lpfc_disc.h
-index f82615d87c4bbb..f5ae8cc158205c 100644
---- a/drivers/scsi/lpfc/lpfc_disc.h
-+++ b/drivers/scsi/lpfc/lpfc_disc.h
-@@ -90,6 +90,8 @@ enum lpfc_nlp_save_flags {
- 	NLP_IN_RECOV_POST_DEV_LOSS	= 0x1,
- 	/* wait for outstanding LOGO to cmpl */
- 	NLP_WAIT_FOR_LOGO		= 0x2,
-+	/* wait for outstanding DA_ID to finish */
-+	NLP_WAIT_FOR_DA_ID              = 0x4
- };
- 
- struct lpfc_nodelist {
-@@ -159,7 +161,12 @@ struct lpfc_nodelist {
- 	uint32_t nvme_fb_size; /* NVME target's supported byte cnt */
- #define NVME_FB_BIT_SHIFT 9    /* PRLI Rsp first burst in 512B units. */
- 	uint32_t nlp_defer_did;
-+
-+	/* These wait objects are NPIV specific.  These IOs must complete
-+	 * synchronously.
-+	 */
- 	wait_queue_head_t *logo_waitq;
-+	wait_queue_head_t *da_id_waitq;
- };
- 
- struct lpfc_node_rrq {
-diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
-index f67d72160d36ed..ebe84bb7bb3ddf 100644
---- a/drivers/scsi/lpfc/lpfc_els.c
-+++ b/drivers/scsi/lpfc/lpfc_els.c
-@@ -9649,11 +9649,12 @@ lpfc_els_flush_cmd(struct lpfc_vport *vport)
- 		if (piocb->cmd_flag & LPFC_DRIVER_ABORTED && !mbx_tmo_err)
- 			continue;
- 
--		/* On the ELS ring we can have ELS_REQUESTs or
--		 * GEN_REQUESTs waiting for a response.
-+		/* On the ELS ring we can have ELS_REQUESTs, ELS_RSPs,
-+		 * or GEN_REQUESTs waiting for a CQE response.
- 		 */
- 		ulp_command = get_job_cmnd(phba, piocb);
--		if (ulp_command == CMD_ELS_REQUEST64_CR) {
-+		if (ulp_command == CMD_ELS_REQUEST64_WQE ||
-+		    ulp_command == CMD_XMIT_ELS_RSP64_WQE) {
- 			list_add_tail(&piocb->dlist, &abort_list);
- 
- 			/* If the link is down when flushing ELS commands
-diff --git a/drivers/scsi/lpfc/lpfc_vport.c b/drivers/scsi/lpfc/lpfc_vport.c
-index 9e0e9e02d2c473..256ee797adb306 100644
---- a/drivers/scsi/lpfc/lpfc_vport.c
-+++ b/drivers/scsi/lpfc/lpfc_vport.c
-@@ -633,6 +633,7 @@ lpfc_vport_delete(struct fc_vport *fc_vport)
- 	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
- 	struct lpfc_hba  *phba = vport->phba;
- 	int rc;
-+	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(waitq);
- 
- 	if (vport->port_type == LPFC_PHYSICAL_PORT) {
- 		lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,
-@@ -688,21 +689,49 @@ lpfc_vport_delete(struct fc_vport *fc_vport)
- 	if (!ndlp)
- 		goto skip_logo;
- 
-+	/* Send the DA_ID and Fabric LOGO to cleanup the NPIV fabric entries. */
- 	if (ndlp && ndlp->nlp_state == NLP_STE_UNMAPPED_NODE &&
- 	    phba->link_state >= LPFC_LINK_UP &&
- 	    phba->fc_topology != LPFC_TOPOLOGY_LOOP) {
- 		if (vport->cfg_enable_da_id) {
--			/* Send DA_ID and wait for a completion. */
-+			/* Send DA_ID and wait for a completion.  This is best
-+			 * effort.  If the DA_ID fails, likely the fabric will
-+			 * "leak" NportIDs but at least the driver issued the
-+			 * command.
-+			 */
-+			ndlp = lpfc_findnode_did(vport, NameServer_DID);
-+			if (!ndlp)
-+				goto issue_logo;
-+
-+			spin_lock_irq(&ndlp->lock);
-+			ndlp->da_id_waitq = &waitq;
-+			ndlp->save_flags |= NLP_WAIT_FOR_DA_ID;
-+			spin_unlock_irq(&ndlp->lock);
-+
- 			rc = lpfc_ns_cmd(vport, SLI_CTNS_DA_ID, 0, 0);
--			if (rc) {
--				lpfc_printf_log(vport->phba, KERN_WARNING,
--						LOG_VPORT,
--						"1829 CT command failed to "
--						"delete objects on fabric, "
--						"rc %d\n", rc);
-+			if (!rc) {
-+				wait_event_timeout(waitq,
-+				   !(ndlp->save_flags & NLP_WAIT_FOR_DA_ID),
-+				   msecs_to_jiffies(phba->fc_ratov * 2000));
- 			}
-+
-+			lpfc_printf_vlog(vport, KERN_INFO, LOG_VPORT | LOG_ELS,
-+					 "1829 DA_ID issue status %d. "
-+					 "SFlag x%x NState x%x, NFlag x%x "
-+					 "Rpi x%x\n",
-+					 rc, ndlp->save_flags, ndlp->nlp_state,
-+					 ndlp->nlp_flag, ndlp->nlp_rpi);
-+
-+			/* Remove the waitq and save_flags.  It no
-+			 * longer matters if the wake happened.
-+			 */
-+			spin_lock_irq(&ndlp->lock);
-+			ndlp->da_id_waitq = NULL;
-+			ndlp->save_flags &= ~NLP_WAIT_FOR_DA_ID;
-+			spin_unlock_irq(&ndlp->lock);
- 		}
- 
-+issue_logo:
- 		/*
- 		 * If the vpi is not registered, then a valid FDISC doesn't
- 		 * exist and there is no need for a ELS LOGO.  Just cleanup
-diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index b0a574c534c4c0..2c627deedc1fa2 100644
---- a/drivers/scsi/sd.c
-+++ b/drivers/scsi/sd.c
-@@ -3968,7 +3968,7 @@ static int sd_resume(struct device *dev)
- static int sd_resume_common(struct device *dev, bool runtime)
- {
- 	struct scsi_disk *sdkp = dev_get_drvdata(dev);
--	int ret = 0;
-+	int ret;
- 
- 	if (!sdkp)	/* E.g.: runtime resume at the start of sd_probe() */
- 		return 0;
-@@ -3978,11 +3978,8 @@ static int sd_resume_common(struct device *dev, bool runtime)
- 		return 0;
- 	}
- 
--	if (!sdkp->device->no_start_on_resume) {
--		sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
--		ret = sd_start_stop_device(sdkp, 1);
--	}
--
-+	sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
-+	ret = sd_start_stop_device(sdkp, 1);
- 	if (!ret) {
- 		sd_resume(dev);
- 		sdkp->suspended = false;
-diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
-index e4fafc77bd2010..bbf6327b9e5a68 100644
---- a/drivers/scsi/wd33c93.c
-+++ b/drivers/scsi/wd33c93.c
-@@ -831,7 +831,7 @@ wd33c93_intr(struct Scsi_Host *instance)
- 		/* construct an IDENTIFY message with correct disconnect bit */
- 
- 		hostdata->outgoing_msg[0] = IDENTIFY(0, cmd->device->lun);
--		if (scsi_pointer->phase)
-+		if (WD33C93_scsi_pointer(cmd)->phase)
- 			hostdata->outgoing_msg[0] |= 0x40;
- 
- 		if (hostdata->sync_stat[cmd->device->id] == SS_FIRST) {
-diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
-index 3e7cf04aaf2a64..e69982dbd449bc 100644
---- a/drivers/soundwire/cadence_master.c
-+++ b/drivers/soundwire/cadence_master.c
-@@ -891,8 +891,14 @@ static int cdns_update_slave_status(struct sdw_cdns *cdns,
- 		}
- 	}
- 
--	if (is_slave)
--		return sdw_handle_slave_status(&cdns->bus, status);
-+	if (is_slave) {
-+		int ret;
-+
-+		mutex_lock(&cdns->status_update_lock);
-+		ret = sdw_handle_slave_status(&cdns->bus, status);
-+		mutex_unlock(&cdns->status_update_lock);
-+		return ret;
-+	}
- 
- 	return 0;
- }
-@@ -989,6 +995,31 @@ irqreturn_t sdw_cdns_irq(int irq, void *dev_id)
- }
- EXPORT_SYMBOL(sdw_cdns_irq);
- 
-+static void cdns_check_attached_status_dwork(struct work_struct *work)
-+{
-+	struct sdw_cdns *cdns =
-+		container_of(work, struct sdw_cdns, attach_dwork.work);
-+	enum sdw_slave_status status[SDW_MAX_DEVICES + 1];
-+	u32 val;
-+	int ret;
-+	int i;
-+
-+	val = cdns_readl(cdns, CDNS_MCP_SLAVE_STAT);
-+
-+	for (i = 0; i <= SDW_MAX_DEVICES; i++) {
-+		status[i] = val & 0x3;
-+		if (status[i])
-+			dev_dbg(cdns->dev, "Peripheral %d status: %d\n", i, status[i]);
-+		val >>= 2;
-+	}
-+
-+	mutex_lock(&cdns->status_update_lock);
-+	ret = sdw_handle_slave_status(&cdns->bus, status);
-+	mutex_unlock(&cdns->status_update_lock);
-+	if (ret < 0)
-+		dev_err(cdns->dev, "%s: sdw_handle_slave_status failed: %d\n", __func__, ret);
-+}
-+
- /**
-  * cdns_update_slave_status_work - update slave status in a work since we will need to handle
-  * other interrupts eg. CDNS_MCP_INT_RX_WL during the update slave
-@@ -1745,7 +1776,11 @@ int sdw_cdns_probe(struct sdw_cdns *cdns)
- 	init_completion(&cdns->tx_complete);
- 	cdns->bus.port_ops = &cdns_port_ops;
- 
-+	mutex_init(&cdns->status_update_lock);
-+
- 	INIT_WORK(&cdns->work, cdns_update_slave_status_work);
-+	INIT_DELAYED_WORK(&cdns->attach_dwork, cdns_check_attached_status_dwork);
-+
- 	return 0;
- }
- EXPORT_SYMBOL(sdw_cdns_probe);
-diff --git a/drivers/soundwire/cadence_master.h b/drivers/soundwire/cadence_master.h
-index bc84435e420f5b..e1d7969ba48ae8 100644
---- a/drivers/soundwire/cadence_master.h
-+++ b/drivers/soundwire/cadence_master.h
-@@ -117,6 +117,8 @@ struct sdw_cdns_dai_runtime {
-  * @link_up: Link status
-  * @msg_count: Messages sent on bus
-  * @dai_runtime_array: runtime context for each allocated DAI.
-+ * @status_update_lock: protect concurrency between interrupt-based and delayed work
-+ * status update
-  */
- struct sdw_cdns {
- 	struct device *dev;
-@@ -148,10 +150,13 @@ struct sdw_cdns {
- 	bool interrupt_enabled;
- 
- 	struct work_struct work;
-+	struct delayed_work attach_dwork;
- 
- 	struct list_head list;
- 
- 	struct sdw_cdns_dai_runtime **dai_runtime_array;
-+
-+	struct mutex status_update_lock; /* add mutual exclusion to sdw_handle_slave_status() */
- };
- 
- #define bus_to_cdns(_bus) container_of(_bus, struct sdw_cdns, bus)
-diff --git a/drivers/soundwire/intel.h b/drivers/soundwire/intel.h
-index 511932c55216c7..bb6b1df2d2c201 100644
---- a/drivers/soundwire/intel.h
-+++ b/drivers/soundwire/intel.h
-@@ -91,6 +91,8 @@ static inline void intel_writew(void __iomem *base, int offset, u16 value)
- 
- #define INTEL_MASTER_RESET_ITERATIONS	10
- 
-+#define SDW_INTEL_DELAYED_ENUMERATION_MS	100
-+
- #define SDW_INTEL_CHECK_OPS(sdw, cb)	((sdw) && (sdw)->link_res && (sdw)->link_res->hw_ops && \
- 					 (sdw)->link_res->hw_ops->cb)
- #define SDW_INTEL_OPS(sdw, cb)		((sdw)->link_res->hw_ops->cb)
-diff --git a/drivers/soundwire/intel_auxdevice.c b/drivers/soundwire/intel_auxdevice.c
-index 93698532deac40..bdfff78ac2f810 100644
---- a/drivers/soundwire/intel_auxdevice.c
-+++ b/drivers/soundwire/intel_auxdevice.c
-@@ -398,6 +398,7 @@ static void intel_link_remove(struct auxiliary_device *auxdev)
- 	 */
- 	if (!bus->prop.hw_disabled) {
- 		sdw_intel_debugfs_exit(sdw);
-+		cancel_delayed_work_sync(&cdns->attach_dwork);
- 		sdw_cdns_enable_interrupt(cdns, false);
- 	}
- 	sdw_bus_master_delete(bus);
-diff --git a/drivers/soundwire/intel_bus_common.c b/drivers/soundwire/intel_bus_common.c
-index e5ac3cc7cb79b1..db9cf211671a3e 100644
---- a/drivers/soundwire/intel_bus_common.c
-+++ b/drivers/soundwire/intel_bus_common.c
-@@ -45,21 +45,24 @@ int intel_start_bus(struct sdw_intel *sdw)
- 		return ret;
- 	}
- 
--	ret = sdw_cdns_exit_reset(cdns);
-+	ret = sdw_cdns_enable_interrupt(cdns, true);
- 	if (ret < 0) {
--		dev_err(dev, "%s: unable to exit bus reset sequence: %d\n", __func__, ret);
-+		dev_err(dev, "%s: cannot enable interrupts: %d\n", __func__, ret);
- 		return ret;
- 	}
- 
--	ret = sdw_cdns_enable_interrupt(cdns, true);
-+	ret = sdw_cdns_exit_reset(cdns);
- 	if (ret < 0) {
--		dev_err(dev, "%s: cannot enable interrupts: %d\n", __func__, ret);
-+		dev_err(dev, "%s: unable to exit bus reset sequence: %d\n", __func__, ret);
- 		return ret;
- 	}
- 
- 	sdw_cdns_check_self_clearing_bits(cdns, __func__,
- 					  true, INTEL_MASTER_RESET_ITERATIONS);
- 
-+	schedule_delayed_work(&cdns->attach_dwork,
-+			      msecs_to_jiffies(SDW_INTEL_DELAYED_ENUMERATION_MS));
-+
- 	return 0;
- }
- 
-@@ -136,21 +139,24 @@ int intel_start_bus_after_reset(struct sdw_intel *sdw)
- 			return ret;
- 		}
- 
--		ret = sdw_cdns_exit_reset(cdns);
-+		ret = sdw_cdns_enable_interrupt(cdns, true);
- 		if (ret < 0) {
--			dev_err(dev, "unable to exit bus reset sequence during resume\n");
-+			dev_err(dev, "cannot enable interrupts during resume\n");
- 			return ret;
- 		}
- 
--		ret = sdw_cdns_enable_interrupt(cdns, true);
-+		ret = sdw_cdns_exit_reset(cdns);
- 		if (ret < 0) {
--			dev_err(dev, "cannot enable interrupts during resume\n");
-+			dev_err(dev, "unable to exit bus reset sequence during resume\n");
- 			return ret;
- 		}
- 
- 	}
- 	sdw_cdns_check_self_clearing_bits(cdns, __func__, true, INTEL_MASTER_RESET_ITERATIONS);
- 
-+	schedule_delayed_work(&cdns->attach_dwork,
-+			      msecs_to_jiffies(SDW_INTEL_DELAYED_ENUMERATION_MS));
-+
- 	return 0;
- }
- 
-@@ -184,6 +190,9 @@ int intel_start_bus_after_clock_stop(struct sdw_intel *sdw)
- 
- 	sdw_cdns_check_self_clearing_bits(cdns, __func__, true, INTEL_MASTER_RESET_ITERATIONS);
- 
-+	schedule_delayed_work(&cdns->attach_dwork,
-+			      msecs_to_jiffies(SDW_INTEL_DELAYED_ENUMERATION_MS));
-+
- 	return 0;
- }
- 
-@@ -194,6 +203,8 @@ int intel_stop_bus(struct sdw_intel *sdw, bool clock_stop)
- 	bool wake_enable = false;
- 	int ret;
- 
-+	cancel_delayed_work_sync(&cdns->attach_dwork);
-+
- 	if (clock_stop) {
- 		ret = sdw_cdns_clock_stop(cdns, true);
- 		if (ret < 0)
-diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c
-index 180cea7d381729..13313f07839b6f 100644
---- a/drivers/spi/spi-fsl-lpspi.c
-+++ b/drivers/spi/spi-fsl-lpspi.c
-@@ -881,39 +881,39 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
- 	fsl_lpspi->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
- 	if (IS_ERR(fsl_lpspi->base)) {
- 		ret = PTR_ERR(fsl_lpspi->base);
--		goto out_controller_put;
-+		return ret;
- 	}
- 	fsl_lpspi->base_phys = res->start;
- 
- 	irq = platform_get_irq(pdev, 0);
- 	if (irq < 0) {
- 		ret = irq;
--		goto out_controller_put;
-+		return ret;
- 	}
- 
- 	ret = devm_request_irq(&pdev->dev, irq, fsl_lpspi_isr, 0,
- 			       dev_name(&pdev->dev), fsl_lpspi);
- 	if (ret) {
- 		dev_err(&pdev->dev, "can't get irq%d: %d\n", irq, ret);
--		goto out_controller_put;
-+		return ret;
- 	}
- 
- 	fsl_lpspi->clk_per = devm_clk_get(&pdev->dev, "per");
- 	if (IS_ERR(fsl_lpspi->clk_per)) {
- 		ret = PTR_ERR(fsl_lpspi->clk_per);
--		goto out_controller_put;
-+		return ret;
- 	}
- 
- 	fsl_lpspi->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
- 	if (IS_ERR(fsl_lpspi->clk_ipg)) {
- 		ret = PTR_ERR(fsl_lpspi->clk_ipg);
--		goto out_controller_put;
-+		return ret;
- 	}
- 
- 	/* enable the clock */
- 	ret = fsl_lpspi_init_rpm(fsl_lpspi);
- 	if (ret)
--		goto out_controller_put;
-+		return ret;
- 
- 	ret = pm_runtime_get_sync(fsl_lpspi->dev);
- 	if (ret < 0) {
-@@ -974,8 +974,6 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
- 	pm_runtime_dont_use_autosuspend(fsl_lpspi->dev);
- 	pm_runtime_put_sync(fsl_lpspi->dev);
- 	pm_runtime_disable(fsl_lpspi->dev);
--out_controller_put:
--	spi_controller_put(controller);
- 
- 	return ret;
- }
-diff --git a/drivers/staging/vme_user/vme_fake.c b/drivers/staging/vme_user/vme_fake.c
-index 7c53a8a7b79b81..95730d1270af8f 100644
---- a/drivers/staging/vme_user/vme_fake.c
-+++ b/drivers/staging/vme_user/vme_fake.c
-@@ -1064,6 +1064,12 @@ static int __init fake_init(void)
- 	struct vme_slave_resource *slave_image;
- 	struct vme_lm_resource *lm;
- 
-+	if (geoid < 0 || geoid >= VME_MAX_SLOTS) {
-+		pr_err("VME geographical address must be between 0 and %d (exclusive), but got %d\n",
-+			VME_MAX_SLOTS, geoid);
-+		return -EINVAL;
-+	}
-+
- 	/* We need a fake parent device */
- 	vme_root = root_device_register("vme");
- 	if (IS_ERR(vme_root))
-diff --git a/drivers/staging/vme_user/vme_tsi148.c b/drivers/staging/vme_user/vme_tsi148.c
-index 2f5eafd5093402..4566e391d913fc 100644
---- a/drivers/staging/vme_user/vme_tsi148.c
-+++ b/drivers/staging/vme_user/vme_tsi148.c
-@@ -2252,6 +2252,12 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
- 	struct vme_dma_resource *dma_ctrlr;
- 	struct vme_lm_resource *lm;
- 
-+	if (geoid < 0 || geoid >= VME_MAX_SLOTS) {
-+		dev_err(&pdev->dev, "VME geographical address must be between 0 and %d (exclusive), but got %d\n",
-+			VME_MAX_SLOTS, geoid);
-+		return -EINVAL;
-+	}
-+
- 	/* If we want to support more than one of each bridge, we need to
- 	 * dynamically generate this so we get one per device
- 	 */
-diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
-index 0d1e980072704e..24eaec5d095c1d 100644
---- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
-+++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
-@@ -223,19 +223,19 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev, const struct pci_device_
- 
- 	INIT_DELAYED_WORK(&pci_info->work, proc_thermal_threshold_work_fn);
- 
--	ret = proc_thermal_add(&pdev->dev, proc_priv);
--	if (ret) {
--		dev_err(&pdev->dev, "error: proc_thermal_add, will continue\n");
--		pci_info->no_legacy = 1;
--	}
--
- 	proc_priv->priv_data = pci_info;
- 	pci_info->proc_priv = proc_priv;
- 	pci_set_drvdata(pdev, proc_priv);
- 
- 	ret = proc_thermal_mmio_add(pdev, proc_priv, id->driver_data);
- 	if (ret)
--		goto err_ret_thermal;
-+		return ret;
-+
-+	ret = proc_thermal_add(&pdev->dev, proc_priv);
-+	if (ret) {
-+		dev_err(&pdev->dev, "error: proc_thermal_add, will continue\n");
-+		pci_info->no_legacy = 1;
-+	}
- 
- 	psv_trip.temperature = get_trip_temp(pci_info);
- 
-@@ -245,7 +245,7 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev, const struct pci_device_
- 							&tzone_params, 0, 0);
- 	if (IS_ERR(pci_info->tzone)) {
- 		ret = PTR_ERR(pci_info->tzone);
--		goto err_ret_mmio;
-+		goto err_del_legacy;
- 	}
- 
- 	/* request and enable interrupt */
-@@ -276,12 +276,10 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev, const struct pci_device_
- 	pci_free_irq_vectors(pdev);
- err_ret_tzone:
- 	thermal_zone_device_unregister(pci_info->tzone);
--err_ret_mmio:
--	proc_thermal_mmio_remove(pdev, proc_priv);
--err_ret_thermal:
-+err_del_legacy:
- 	if (!pci_info->no_legacy)
- 		proc_thermal_remove(proc_priv);
--	pci_disable_device(pdev);
-+	proc_thermal_mmio_remove(pdev, proc_priv);
- 
- 	return ret;
- }
-@@ -303,7 +301,6 @@ static void proc_thermal_pci_remove(struct pci_dev *pdev)
- 	proc_thermal_mmio_remove(pdev, pci_info->proc_priv);
- 	if (!pci_info->no_legacy)
- 		proc_thermal_remove(proc_priv);
--	pci_disable_device(pdev);
- }
- 
- #ifdef CONFIG_PM_SLEEP
-diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
-index 5d5570bebfeb61..8ff0efac6aa0d3 100644
---- a/drivers/tty/serial/serial_core.c
-+++ b/drivers/tty/serial/serial_core.c
-@@ -374,14 +374,16 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)
- 		/*
- 		 * Turn off DTR and RTS early.
- 		 */
--		if (uport && uart_console(uport) && tty) {
--			uport->cons->cflag = tty->termios.c_cflag;
--			uport->cons->ispeed = tty->termios.c_ispeed;
--			uport->cons->ospeed = tty->termios.c_ospeed;
--		}
-+		if (uport) {
-+			if (uart_console(uport) && tty) {
-+				uport->cons->cflag = tty->termios.c_cflag;
-+				uport->cons->ispeed = tty->termios.c_ispeed;
-+				uport->cons->ospeed = tty->termios.c_ospeed;
-+			}
- 
--		if (!tty || C_HUPCL(tty))
--			uart_port_dtr_rts(uport, false);
-+			if (!tty || C_HUPCL(tty))
-+				uart_port_dtr_rts(uport, false);
-+		}
- 
- 		uart_port_shutdown(port);
- 	}
-diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
-index ed59d2367a4e72..59d53ea100c003 100644
---- a/drivers/ufs/core/ufshcd.c
-+++ b/drivers/ufs/core/ufshcd.c
-@@ -2804,9 +2804,8 @@ static void ufshcd_init_lrb(struct ufs_hba *hba, struct ufshcd_lrb *lrb, int i)
- 	struct utp_transfer_req_desc *utrdlp = hba->utrdl_base_addr;
- 	dma_addr_t cmd_desc_element_addr = hba->ucdl_dma_addr +
- 		i * ufshcd_get_ucd_size(hba);
--	u16 response_offset = offsetof(struct utp_transfer_cmd_desc,
--				       response_upiu);
--	u16 prdt_offset = offsetof(struct utp_transfer_cmd_desc, prd_table);
-+	u16 response_offset = le16_to_cpu(utrdlp[i].response_upiu_offset);
-+	u16 prdt_offset = le16_to_cpu(utrdlp[i].prd_table_offset);
- 
- 	lrb->utr_descriptor_ptr = utrdlp + i;
- 	lrb->utrd_dma_addr = hba->utrdl_dma_addr +
-diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
-index 0b7bd3c643c3aa..f70ceedfb468f7 100644
---- a/drivers/usb/chipidea/udc.c
-+++ b/drivers/usb/chipidea/udc.c
-@@ -86,7 +86,7 @@ static int hw_device_state(struct ci_hdrc *ci, u32 dma)
- 		hw_write(ci, OP_ENDPTLISTADDR, ~0, dma);
- 		/* interrupt, error, port change, reset, sleep/suspend */
- 		hw_write(ci, OP_USBINTR, ~0,
--			     USBi_UI|USBi_UEI|USBi_PCI|USBi_URI|USBi_SLI);
-+			     USBi_UI|USBi_UEI|USBi_PCI|USBi_URI);
- 	} else {
- 		hw_write(ci, OP_USBINTR, ~0, 0);
- 	}
-@@ -876,6 +876,7 @@ __releases(ci->lock)
- __acquires(ci->lock)
- {
- 	int retval;
-+	u32 intr;
- 
- 	spin_unlock(&ci->lock);
- 	if (ci->gadget.speed != USB_SPEED_UNKNOWN)
-@@ -889,6 +890,11 @@ __acquires(ci->lock)
- 	if (retval)
- 		goto done;
- 
-+	/* clear SLI */
-+	hw_write(ci, OP_USBSTS, USBi_SLI, USBi_SLI);
-+	intr = hw_read(ci, OP_USBINTR, ~0);
-+	hw_write(ci, OP_USBINTR, ~0, intr | USBi_SLI);
-+
- 	ci->status = usb_ep_alloc_request(&ci->ep0in->ep, GFP_ATOMIC);
- 	if (ci->status == NULL)
- 		retval = -ENOMEM;
-diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
-index 7b84416dfc2b11..c1b7209b94836c 100644
---- a/drivers/usb/dwc2/platform.c
-+++ b/drivers/usb/dwc2/platform.c
-@@ -469,18 +469,6 @@ static int dwc2_driver_probe(struct platform_device *dev)
- 
- 	spin_lock_init(&hsotg->lock);
- 
--	hsotg->irq = platform_get_irq(dev, 0);
--	if (hsotg->irq < 0)
--		return hsotg->irq;
--
--	dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
--		hsotg->irq);
--	retval = devm_request_irq(hsotg->dev, hsotg->irq,
--				  dwc2_handle_common_intr, IRQF_SHARED,
--				  dev_name(hsotg->dev), hsotg);
--	if (retval)
--		return retval;
--
- 	hsotg->vbus_supply = devm_regulator_get_optional(hsotg->dev, "vbus");
- 	if (IS_ERR(hsotg->vbus_supply)) {
- 		retval = PTR_ERR(hsotg->vbus_supply);
-@@ -524,6 +512,20 @@ static int dwc2_driver_probe(struct platform_device *dev)
- 	if (retval)
- 		goto error;
- 
-+	hsotg->irq = platform_get_irq(dev, 0);
-+	if (hsotg->irq < 0) {
-+		retval = hsotg->irq;
-+		goto error;
-+	}
-+
-+	dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
-+		hsotg->irq);
-+	retval = devm_request_irq(hsotg->dev, hsotg->irq,
-+				  dwc2_handle_common_intr, IRQF_SHARED,
-+				  dev_name(hsotg->dev), hsotg);
-+	if (retval)
-+		goto error;
-+
- 	/*
- 	 * For OTG cores, set the force mode bits to reflect the value
- 	 * of dr_mode. Force mode bits should not be touched at any
-diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
-index 9955091c533608..af851e4e8c8a76 100644
---- a/drivers/usb/dwc3/core.c
-+++ b/drivers/usb/dwc3/core.c
-@@ -533,6 +533,7 @@ static int dwc3_alloc_event_buffers(struct dwc3 *dwc, unsigned int length)
- int dwc3_event_buffers_setup(struct dwc3 *dwc)
- {
- 	struct dwc3_event_buffer	*evt;
-+	u32				reg;
- 
- 	if (!dwc->ev_buf)
- 		return 0;
-@@ -545,8 +546,10 @@ int dwc3_event_buffers_setup(struct dwc3 *dwc)
- 			upper_32_bits(evt->dma));
- 	dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(0),
- 			DWC3_GEVNTSIZ_SIZE(evt->length));
--	dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), 0);
- 
-+	/* Clear any stale event */
-+	reg = dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(0));
-+	dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), reg);
- 	return 0;
- }
- 
-@@ -573,7 +576,10 @@ void dwc3_event_buffers_cleanup(struct dwc3 *dwc)
- 	dwc3_writel(dwc->regs, DWC3_GEVNTADRHI(0), 0);
- 	dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(0), DWC3_GEVNTSIZ_INTMASK
- 			| DWC3_GEVNTSIZ_SIZE(0));
--	dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), 0);
-+
-+	/* Clear any stale event */
-+	reg = dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(0));
-+	dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), reg);
- }
- 
- static void dwc3_core_num_eps(struct dwc3 *dwc)
-@@ -2254,7 +2260,11 @@ static int dwc3_runtime_resume(struct device *dev)
- 
- 	switch (dwc->current_dr_role) {
- 	case DWC3_GCTL_PRTCAP_DEVICE:
--		dwc3_gadget_process_pending_events(dwc);
-+		if (dwc->pending_events) {
-+			pm_runtime_put(dwc->dev);
-+			dwc->pending_events = false;
-+			enable_irq(dwc->irq_gadget);
-+		}
- 		break;
- 	case DWC3_GCTL_PRTCAP_HOST:
- 	default:
-@@ -2341,6 +2351,12 @@ static void dwc3_complete(struct device *dev)
- static const struct dev_pm_ops dwc3_dev_pm_ops = {
- 	SET_SYSTEM_SLEEP_PM_OPS(dwc3_suspend, dwc3_resume)
- 	.complete = dwc3_complete,
-+
-+	/*
-+	 * Runtime suspend halts the controller on disconnection. It relies on
-+	 * platforms with custom connection notification to start the controller
-+	 * again.
-+	 */
- 	SET_RUNTIME_PM_OPS(dwc3_runtime_suspend, dwc3_runtime_resume,
- 			dwc3_runtime_idle)
- };
-diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
-index db1a793a9b13ff..420753205fafa1 100644
---- a/drivers/usb/dwc3/core.h
-+++ b/drivers/usb/dwc3/core.h
-@@ -1643,7 +1643,6 @@ static inline void dwc3_otg_host_init(struct dwc3 *dwc)
- #if !IS_ENABLED(CONFIG_USB_DWC3_HOST)
- int dwc3_gadget_suspend(struct dwc3 *dwc);
- int dwc3_gadget_resume(struct dwc3 *dwc);
--void dwc3_gadget_process_pending_events(struct dwc3 *dwc);
- #else
- static inline int dwc3_gadget_suspend(struct dwc3 *dwc)
- {
-@@ -1655,9 +1654,6 @@ static inline int dwc3_gadget_resume(struct dwc3 *dwc)
- 	return 0;
- }
- 
--static inline void dwc3_gadget_process_pending_events(struct dwc3 *dwc)
--{
--}
- #endif /* !IS_ENABLED(CONFIG_USB_DWC3_HOST) */
- 
- #if IS_ENABLED(CONFIG_USB_DWC3_ULPI)
-diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
-index 1a1da4a0570196..6d439aba646008 100644
---- a/drivers/usb/dwc3/gadget.c
-+++ b/drivers/usb/dwc3/gadget.c
-@@ -4741,14 +4741,3 @@ int dwc3_gadget_resume(struct dwc3 *dwc)
- 
- 	return dwc3_gadget_soft_connect(dwc);
- }
--
--void dwc3_gadget_process_pending_events(struct dwc3 *dwc)
--{
--	if (dwc->pending_events) {
--		dwc3_interrupt(dwc->irq_gadget, dwc->ev_buf);
--		dwc3_thread_interrupt(dwc->irq_gadget, dwc->ev_buf);
--		pm_runtime_put(dwc->dev);
--		dwc->pending_events = false;
--		enable_irq(dwc->irq_gadget);
--	}
--}
-diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
-index 9886e1cb13985b..33979f61dc4dd7 100644
---- a/drivers/usb/gadget/udc/core.c
-+++ b/drivers/usb/gadget/udc/core.c
-@@ -1671,6 +1671,7 @@ int usb_gadget_register_driver_owner(struct usb_gadget_driver *driver,
- 	driver->driver.bus = &gadget_bus_type;
- 	driver->driver.owner = owner;
- 	driver->driver.mod_name = mod_name;
-+	driver->driver.probe_type = PROBE_FORCE_SYNCHRONOUS;
- 	ret = driver_register(&driver->driver);
- 	if (ret) {
- 		pr_warn("%s: driver registration failed: %d\n",
-diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
-index dd02b064ecd4bc..044303187d9fd0 100644
---- a/drivers/usb/host/xhci-pci.c
-+++ b/drivers/usb/host/xhci-pci.c
-@@ -73,6 +73,7 @@
- #define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI		0x1142
- #define PCI_DEVICE_ID_ASMEDIA_1142_XHCI			0x1242
- #define PCI_DEVICE_ID_ASMEDIA_2142_XHCI			0x2142
-+#define PCI_DEVICE_ID_ASMEDIA_3042_XHCI			0x3042
- #define PCI_DEVICE_ID_ASMEDIA_3242_XHCI			0x3242
- 
- #define PCI_DEVICE_ID_CADENCE				0x17CD
-@@ -516,6 +517,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
- 		pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI)
- 		xhci->quirks |= XHCI_ASMEDIA_MODIFY_FLOWCONTROL;
- 
-+	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
-+	    pdev->device == PCI_DEVICE_ID_ASMEDIA_3042_XHCI)
-+		xhci->quirks |= XHCI_RESET_ON_RESUME;
-+
- 	if (pdev->vendor == PCI_VENDOR_ID_TI && pdev->device == 0x8241)
- 		xhci->quirks |= XHCI_LIMIT_ENDPOINT_INTERVAL_7;
- 
-diff --git a/drivers/usb/misc/yurex.c b/drivers/usb/misc/yurex.c
-index 6adaaf66c14d7b..c313cd41f7a5a5 100644
---- a/drivers/usb/misc/yurex.c
-+++ b/drivers/usb/misc/yurex.c
-@@ -34,8 +34,6 @@
- #define YUREX_BUF_SIZE		8
- #define YUREX_WRITE_TIMEOUT	(HZ*2)
- 
--#define MAX_S64_STRLEN 20 /* {-}922337203685477580{7,8} */
--
- /* table of devices that work with this driver */
- static struct usb_device_id yurex_table[] = {
- 	{ USB_DEVICE(YUREX_VENDOR_ID, YUREX_PRODUCT_ID) },
-@@ -403,7 +401,8 @@ static ssize_t yurex_read(struct file *file, char __user *buffer, size_t count,
- {
- 	struct usb_yurex *dev;
- 	int len = 0;
--	char in_buffer[MAX_S64_STRLEN];
-+	char in_buffer[20];
-+	unsigned long flags;
- 
- 	dev = file->private_data;
- 
-@@ -413,16 +412,14 @@ static ssize_t yurex_read(struct file *file, char __user *buffer, size_t count,
- 		return -ENODEV;
- 	}
- 
--	if (WARN_ON_ONCE(dev->bbu > S64_MAX || dev->bbu < S64_MIN)) {
--		mutex_unlock(&dev->io_mutex);
--		return -EIO;
--	}
--
--	spin_lock_irq(&dev->lock);
--	scnprintf(in_buffer, MAX_S64_STRLEN, "%lld\n", dev->bbu);
--	spin_unlock_irq(&dev->lock);
-+	spin_lock_irqsave(&dev->lock, flags);
-+	len = snprintf(in_buffer, 20, "%lld\n", dev->bbu);
-+	spin_unlock_irqrestore(&dev->lock, flags);
- 	mutex_unlock(&dev->io_mutex);
- 
-+	if (WARN_ON_ONCE(len >= sizeof(in_buffer)))
-+		return -EIO;
-+
- 	return simple_read_from_buffer(buffer, count, ppos, in_buffer, len);
- }
- 
-diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
-index fd68204374f2ce..e5ad23d86833d5 100644
---- a/drivers/usb/storage/unusual_devs.h
-+++ b/drivers/usb/storage/unusual_devs.h
-@@ -2423,6 +2423,17 @@ UNUSUAL_DEV(  0xc251, 0x4003, 0x0100, 0x0100,
- 		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
- 		US_FL_NOT_LOCKABLE),
- 
-+/*
-+ * Reported by Icenowy Zheng <uwu@icenowy.me>
-+ * This is an interface for vendor-specific cryptic commands instead
-+ * of real USB storage device.
-+ */
-+UNUSUAL_DEV(  0xe5b7, 0x0811, 0x0100, 0x0100,
-+		"ZhuHai JieLi Technology",
-+		"JieLi BR21",
-+		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
-+		US_FL_IGNORE_DEVICE),
-+
- /* Reported by Andrew Simmons <andrew.simmons@gmail.com> */
- UNUSUAL_DEV(  0xed06, 0x4500, 0x0001, 0x0001,
- 		"DataStor",
-diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
-index 125269f39f83a3..01db27cbf1d10d 100644
---- a/drivers/usb/typec/tipd/core.c
-+++ b/drivers/usb/typec/tipd/core.c
-@@ -907,6 +907,8 @@ static void tps6598x_remove(struct i2c_client *client)
- 
- 	if (!client->irq)
- 		cancel_delayed_work_sync(&tps->wq_poll);
-+	else
-+		devm_free_irq(tps->dev, client->irq, tps);
- 
- 	tps6598x_disconnect(tps, 0);
- 	typec_unregister_port(tps->port);
-diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
-index 24035b4f2cd707..405d587450ef84 100644
---- a/drivers/video/fbdev/core/fbcon.c
-+++ b/drivers/video/fbdev/core/fbcon.c
-@@ -847,6 +847,8 @@ static int set_con2fb_map(int unit, int newidx, int user)
- 			return err;
- 
- 		fbcon_add_cursor_work(info);
-+	} else if (vc) {
-+		set_blitting_type(vc, info);
- 	}
- 
- 	con2fb_map[unit] = newidx;
-diff --git a/drivers/video/fbdev/sis/sis_main.c b/drivers/video/fbdev/sis/sis_main.c
-index 6d524a65af181a..ad39571f913491 100644
---- a/drivers/video/fbdev/sis/sis_main.c
-+++ b/drivers/video/fbdev/sis/sis_main.c
-@@ -184,7 +184,7 @@ static void sisfb_search_mode(char *name, bool quiet)
- {
- 	unsigned int j = 0, xres = 0, yres = 0, depth = 0, rate = 0;
- 	int i = 0;
--	char strbuf[16], strbuf1[20];
-+	char strbuf[24], strbuf1[20];
- 	char *nameptr = name;
- 
- 	/* We don't know the hardware specs yet and there is no ivideo */
-diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
-index 50d795a2542c3b..b3680e1c7054c4 100644
---- a/fs/btrfs/extent-tree.c
-+++ b/fs/btrfs/extent-tree.c
-@@ -1303,13 +1303,24 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len,
- 		bytes_left = end - start;
- 	}
- 
--	if (bytes_left) {
-+	while (bytes_left) {
-+		u64 bytes_to_discard = min(BTRFS_MAX_DISCARD_CHUNK_SIZE, bytes_left);
-+
- 		ret = blkdev_issue_discard(bdev, start >> SECTOR_SHIFT,
--					   bytes_left >> SECTOR_SHIFT,
-+					   bytes_to_discard >> SECTOR_SHIFT,
- 					   GFP_NOFS);
--		if (!ret)
--			*discarded_bytes += bytes_left;
-+
-+		if (ret) {
-+			if (ret != -EOPNOTSUPP)
-+				break;
-+			continue;
-+		}
-+
-+		start += bytes_to_discard;
-+		bytes_left -= bytes_to_discard;
-+		*discarded_bytes += bytes_to_discard;
- 	}
-+
- 	return ret;
- }
- 
-diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
-index 2128a032c3b74d..5203095318b027 100644
---- a/fs/btrfs/volumes.h
-+++ b/fs/btrfs/volumes.h
-@@ -15,6 +15,12 @@
- 
- #define BTRFS_MAX_DATA_CHUNK_SIZE	(10ULL * SZ_1G)
- 
-+/*
-+ * Arbitratry maximum size of one discard request to limit potentially long time
-+ * spent in blkdev_issue_discard().
-+ */
-+#define BTRFS_MAX_DISCARD_CHUNK_SIZE	(SZ_1G)
-+
- extern struct mutex uuid_mutex;
- 
- #define BTRFS_STRIPE_LEN		SZ_64K
-diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
-index 2784f6cb448222..c4463c3f2068dd 100644
---- a/fs/btrfs/zoned.c
-+++ b/fs/btrfs/zoned.c
-@@ -1357,7 +1357,7 @@ static int btrfs_load_zone_info(struct btrfs_fs_info *fs_info, int zone_idx,
- 	switch (zone.cond) {
- 	case BLK_ZONE_COND_OFFLINE:
- 	case BLK_ZONE_COND_READONLY:
--		btrfs_err(fs_info,
-+		btrfs_err_in_rcu(fs_info,
- 		"zoned: offline/readonly zone %llu on device %s (devid %llu)",
- 			  (info->physical >> device->zone_info->zone_size_shift),
- 			  rcu_str_deref(device->name), device->devid);
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index ed0dc4cc1d28e9..1d14a38017a7f0 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -744,11 +744,12 @@ static void ext4_handle_error(struct super_block *sb, bool force_ro, int error,
- 
- 	ext4_msg(sb, KERN_CRIT, "Remounting filesystem read-only");
- 	/*
--	 * Make sure updated value of ->s_mount_flags will be visible before
--	 * ->s_flags update
-+	 * EXT4_FLAGS_SHUTDOWN was set which stops all filesystem
-+	 * modifications. We don't set SB_RDONLY because that requires
-+	 * sb->s_umount semaphore and setting it without proper remount
-+	 * procedure is confusing code such as freeze_super() leading to
-+	 * deadlocks and other problems.
- 	 */
--	smp_wmb();
--	sb->s_flags |= SB_RDONLY;
- }
- 
- static void update_super_work(struct work_struct *work)
-diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
-index 04ca085b282794..f40785bc4e5549 100644
---- a/fs/ext4/xattr.c
-+++ b/fs/ext4/xattr.c
-@@ -458,7 +458,7 @@ static int ext4_xattr_inode_iget(struct inode *parent, unsigned long ea_ino,
- 		ext4_set_inode_state(inode, EXT4_STATE_LUSTRE_EA_INODE);
- 		ext4_xattr_inode_set_ref(inode, 1);
- 	} else {
--		inode_lock(inode);
-+		inode_lock_nested(inode, I_MUTEX_XATTR);
- 		inode->i_flags |= S_NOQUOTA;
- 		inode_unlock(inode);
- 	}
-@@ -1039,7 +1039,7 @@ static int ext4_xattr_inode_update_ref(handle_t *handle, struct inode *ea_inode,
- 	s64 ref_count;
- 	int ret;
- 
--	inode_lock(ea_inode);
-+	inode_lock_nested(ea_inode, I_MUTEX_XATTR);
- 
- 	ret = ext4_reserve_inode_write(handle, ea_inode, &iloc);
- 	if (ret)
-diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
-index 299b6d6aaa7953..c537e1d02cf3a1 100644
---- a/fs/gfs2/quota.c
-+++ b/fs/gfs2/quota.c
-@@ -446,47 +446,29 @@ static void bh_put(struct gfs2_quota_data *qd)
- 	mutex_unlock(&sdp->sd_quota_mutex);
- }
- 
--static int qd_check_sync(struct gfs2_sbd *sdp, struct gfs2_quota_data *qd,
--			 u64 *sync_gen)
-+static bool qd_grab_sync(struct gfs2_sbd *sdp, struct gfs2_quota_data *qd,
-+			 u64 sync_gen)
- {
- 	if (test_bit(QDF_LOCKED, &qd->qd_flags) ||
- 	    !test_bit(QDF_CHANGE, &qd->qd_flags) ||
--	    (sync_gen && (qd->qd_sync_gen >= *sync_gen)))
--		return 0;
--
--	/*
--	 * If qd_change is 0 it means a pending quota change was negated.
--	 * We should not sync it, but we still have a qd reference and slot
--	 * reference taken by gfs2_quota_change -> do_qc that need to be put.
--	 */
--	if (!qd->qd_change && test_and_clear_bit(QDF_CHANGE, &qd->qd_flags)) {
--		slot_put(qd);
--		qd_put(qd);
--		return 0;
--	}
-+	    qd->qd_sync_gen >= sync_gen)
-+		return false;
- 
- 	if (!lockref_get_not_dead(&qd->qd_lockref))
--		return 0;
-+		return false;
- 
- 	list_move_tail(&qd->qd_list, &sdp->sd_quota_list);
- 	set_bit(QDF_LOCKED, &qd->qd_flags);
- 	qd->qd_change_sync = qd->qd_change;
- 	slot_hold(qd);
--	return 1;
-+	return true;
- }
- 
--static int qd_bh_get_or_undo(struct gfs2_sbd *sdp, struct gfs2_quota_data *qd)
-+static void qd_ungrab_sync(struct gfs2_quota_data *qd)
- {
--	int error;
--
--	error = bh_get(qd);
--	if (!error)
--		return 0;
--
- 	clear_bit(QDF_LOCKED, &qd->qd_flags);
- 	slot_put(qd);
- 	qd_put(qd);
--	return error;
- }
- 
- static int qd_fish(struct gfs2_sbd *sdp, struct gfs2_quota_data **qdp)
-@@ -502,7 +484,7 @@ static int qd_fish(struct gfs2_sbd *sdp, struct gfs2_quota_data **qdp)
- 	spin_lock(&qd_lock);
- 
- 	list_for_each_entry(iter, &sdp->sd_quota_list, qd_list) {
--		if (qd_check_sync(sdp, iter, &sdp->sd_quota_sync_gen)) {
-+		if (qd_grab_sync(sdp, iter, sdp->sd_quota_sync_gen)) {
- 			qd = iter;
- 			break;
- 		}
-@@ -511,12 +493,15 @@ static int qd_fish(struct gfs2_sbd *sdp, struct gfs2_quota_data **qdp)
- 	spin_unlock(&qd_lock);
- 
- 	if (qd) {
--		error = qd_bh_get_or_undo(sdp, qd);
--		if (error)
-+		error = bh_get(qd);
-+		if (error) {
-+			qd_ungrab_sync(qd);
- 			return error;
--		*qdp = qd;
-+		}
- 	}
- 
-+	*qdp = qd;
-+
- 	return 0;
- }
- 
-@@ -1148,7 +1133,6 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)
- 	struct gfs2_quota_data *qda[2 * GFS2_MAXQUOTAS];
- 	unsigned int count = 0;
- 	u32 x;
--	int found;
- 
- 	if (!test_and_clear_bit(GIF_QD_LOCKED, &ip->i_flags))
- 		return;
-@@ -1156,6 +1140,7 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)
- 	for (x = 0; x < ip->i_qadata->qa_qd_num; x++) {
- 		struct gfs2_quota_data *qd;
- 		bool sync;
-+		int error;
- 
- 		qd = ip->i_qadata->qa_qd[x];
- 		sync = need_sync(qd);
-@@ -1165,14 +1150,20 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)
- 			continue;
- 
- 		spin_lock(&qd_lock);
--		found = qd_check_sync(sdp, qd, NULL);
-+		sync = qd_grab_sync(sdp, qd, U64_MAX);
- 		spin_unlock(&qd_lock);
- 
--		if (!found)
-+		if (!sync)
-+			continue;
-+
-+		gfs2_assert_warn(sdp, qd->qd_change_sync);
-+		error = bh_get(qd);
-+		if (error) {
-+			qd_ungrab_sync(qd);
- 			continue;
-+		}
- 
--		if (!qd_bh_get_or_undo(sdp, qd))
--			qda[count++] = qd;
-+		qda[count++] = qd;
- 	}
- 
- 	if (count) {
-diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
-index 321af81c456e2a..d5f6437da352da 100644
---- a/fs/nfs/callback_xdr.c
-+++ b/fs/nfs/callback_xdr.c
-@@ -372,6 +372,8 @@ static __be32 decode_rc_list(struct xdr_stream *xdr,
- 
- 	rc_list->rcl_nrefcalls = ntohl(*p++);
- 	if (rc_list->rcl_nrefcalls) {
-+		if (unlikely(rc_list->rcl_nrefcalls > xdr->buf->len))
-+			goto out;
- 		p = xdr_inline_decode(xdr,
- 			     rc_list->rcl_nrefcalls * 2 * sizeof(uint32_t));
- 		if (unlikely(p == NULL))
-diff --git a/fs/nfs/client.c b/fs/nfs/client.c
-index 4d9249c99989f7..62607d52bfa5e7 100644
---- a/fs/nfs/client.c
-+++ b/fs/nfs/client.c
-@@ -987,6 +987,7 @@ struct nfs_server *nfs_alloc_server(void)
- 	INIT_LIST_HEAD(&server->layouts);
- 	INIT_LIST_HEAD(&server->state_owners_lru);
- 	INIT_LIST_HEAD(&server->ss_copies);
-+	INIT_LIST_HEAD(&server->ss_src_copies);
- 
- 	atomic_set(&server->active, 0);
- 
-diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
-index 28704f924612c4..531c9c20ef1d1b 100644
---- a/fs/nfs/nfs42proc.c
-+++ b/fs/nfs/nfs42proc.c
-@@ -218,7 +218,7 @@ static int handle_async_copy(struct nfs42_copy_res *res,
- 
- 	if (dst_server != src_server) {
- 		spin_lock(&src_server->nfs_client->cl_lock);
--		list_add_tail(&copy->src_copies, &src_server->ss_copies);
-+		list_add_tail(&copy->src_copies, &src_server->ss_src_copies);
- 		spin_unlock(&src_server->nfs_client->cl_lock);
- 	}
- 
-diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
-index 6c4539ed2654ac..794bb4aa588d39 100644
---- a/fs/nfs/nfs4state.c
-+++ b/fs/nfs/nfs4state.c
-@@ -1597,7 +1597,7 @@ static void nfs42_complete_copies(struct nfs4_state_owner *sp, struct nfs4_state
- 			complete(&copy->completion);
- 		}
- 	}
--	list_for_each_entry(copy, &sp->so_server->ss_copies, src_copies) {
-+	list_for_each_entry(copy, &sp->so_server->ss_src_copies, src_copies) {
- 		if ((test_bit(NFS_CLNT_SRC_SSC_COPY_STATE, &state->flags) &&
- 				!nfs4_stateid_match_other(&state->stateid,
- 				&copy->parent_src_state->stateid)))
-diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
-index 5c9f8f8404d5b0..6f2bcbfde45e69 100644
---- a/fs/nfsd/filecache.c
-+++ b/fs/nfsd/filecache.c
-@@ -718,7 +718,7 @@ nfsd_file_cache_init(void)
- 
- 	ret = rhltable_init(&nfsd_file_rhltable, &nfsd_file_rhash_params);
- 	if (ret)
--		return ret;
-+		goto out;
- 
- 	ret = -ENOMEM;
- 	nfsd_filecache_wq = alloc_workqueue("nfsd_filecache", 0, 0);
-@@ -770,6 +770,8 @@ nfsd_file_cache_init(void)
- 
- 	INIT_DELAYED_WORK(&nfsd_filecache_laundrette, nfsd_file_gc_worker);
- out:
-+	if (ret)
-+		clear_bit(NFSD_FILE_CACHE_UP, &nfsd_file_flags);
- 	return ret;
- out_notifier:
- 	lease_unregister_notifier(&nfsd_file_lease_notifier);
-diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
-index cd69cbd0aaae7f..f14d21b6c6d395 100644
---- a/fs/ntfs3/file.c
-+++ b/fs/ntfs3/file.c
-@@ -418,7 +418,7 @@ static int ntfs_truncate(struct inode *inode, loff_t new_size)
- }
- 
- /*
-- * ntfs_fallocate
-+ * ntfs_fallocate - file_operations::ntfs_fallocate
-  *
-  * Preallocate space for a file. This implements ntfs's fallocate file
-  * operation, which gets called from sys_fallocate system call. User
-@@ -553,6 +553,8 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len)
- 		ni_lock(ni);
- 		err = attr_collapse_range(ni, vbo, len);
- 		ni_unlock(ni);
-+		if (err)
-+			goto out;
- 	} else if (mode & FALLOC_FL_INSERT_RANGE) {
- 		/* Check new size. */
- 		err = inode_newsize_ok(inode, new_size);
-diff --git a/fs/ntfs3/frecord.c b/fs/ntfs3/frecord.c
-index f7c381730b396f..61055bcfe8277f 100644
---- a/fs/ntfs3/frecord.c
-+++ b/fs/ntfs3/frecord.c
-@@ -1900,13 +1900,13 @@ enum REPARSE_SIGN ni_parse_reparse(struct ntfs_inode *ni, struct ATTRIB *attr,
- 
- /*
-  * fiemap_fill_next_extent_k - a copy of fiemap_fill_next_extent
-- * but it accepts kernel address for fi_extents_start
-+ * but it uses 'fe_k' instead of fieinfo->fi_extents_start
-  */
- static int fiemap_fill_next_extent_k(struct fiemap_extent_info *fieinfo,
--				     u64 logical, u64 phys, u64 len, u32 flags)
-+				     struct fiemap_extent *fe_k, u64 logical,
-+				     u64 phys, u64 len, u32 flags)
- {
- 	struct fiemap_extent extent;
--	struct fiemap_extent __user *dest = fieinfo->fi_extents_start;
- 
- 	/* only count the extents */
- 	if (fieinfo->fi_extents_max == 0) {
-@@ -1930,8 +1930,7 @@ static int fiemap_fill_next_extent_k(struct fiemap_extent_info *fieinfo,
- 	extent.fe_length = len;
- 	extent.fe_flags = flags;
- 
--	dest += fieinfo->fi_extents_mapped;
--	memcpy(dest, &extent, sizeof(extent));
-+	memcpy(fe_k + fieinfo->fi_extents_mapped, &extent, sizeof(extent));
- 
- 	fieinfo->fi_extents_mapped++;
- 	if (fieinfo->fi_extents_mapped == fieinfo->fi_extents_max)
-@@ -1949,7 +1948,6 @@ int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,
- 	      __u64 vbo, __u64 len)
- {
- 	int err = 0;
--	struct fiemap_extent __user *fe_u = fieinfo->fi_extents_start;
- 	struct fiemap_extent *fe_k = NULL;
- 	struct ntfs_sb_info *sbi = ni->mi.sbi;
- 	u8 cluster_bits = sbi->cluster_bits;
-@@ -2008,7 +2006,6 @@ int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,
- 		err = -ENOMEM;
- 		goto out;
- 	}
--	fieinfo->fi_extents_start = fe_k;
- 
- 	end = vbo + len;
- 	alloc_size = le64_to_cpu(attr->nres.alloc_size);
-@@ -2098,8 +2095,8 @@ int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,
- 			if (vbo + dlen >= end)
- 				flags |= FIEMAP_EXTENT_LAST;
- 
--			err = fiemap_fill_next_extent_k(fieinfo, vbo, lbo, dlen,
--							flags);
-+			err = fiemap_fill_next_extent_k(fieinfo, fe_k, vbo, lbo,
-+							dlen, flags);
- 
- 			if (err < 0)
- 				break;
-@@ -2120,7 +2117,7 @@ int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,
- 		if (vbo + bytes >= end)
- 			flags |= FIEMAP_EXTENT_LAST;
- 
--		err = fiemap_fill_next_extent_k(fieinfo, vbo, lbo, bytes,
-+		err = fiemap_fill_next_extent_k(fieinfo, fe_k, vbo, lbo, bytes,
- 						flags);
- 		if (err < 0)
- 			break;
-@@ -2137,15 +2134,13 @@ int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,
- 	/*
- 	 * Copy to user memory out of lock
- 	 */
--	if (copy_to_user(fe_u, fe_k,
-+	if (copy_to_user(fieinfo->fi_extents_start, fe_k,
- 			 fieinfo->fi_extents_max *
- 				 sizeof(struct fiemap_extent))) {
- 		err = -EFAULT;
- 	}
- 
- out:
--	/* Restore original pointer. */
--	fieinfo->fi_extents_start = fe_u;
- 	kfree(fe_k);
- 	return err;
- }
-diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c
-index 231b012fb19d3d..2a1aeab53ea4b5 100644
---- a/fs/ntfs3/fslog.c
-+++ b/fs/ntfs3/fslog.c
-@@ -609,14 +609,29 @@ static inline void add_client(struct CLIENT_REC *ca, u16 index, __le16 *head)
- 	*head = cpu_to_le16(index);
- }
- 
-+/*
-+ * Enumerate restart table.
-+ *
-+ * @t - table to enumerate.
-+ * @c - current enumerated element.
-+ *
-+ * enumeration starts with @c == NULL
-+ * returns next element or NULL
-+ */
- static inline void *enum_rstbl(struct RESTART_TABLE *t, void *c)
- {
- 	__le32 *e;
- 	u32 bprt;
--	u16 rsize = t ? le16_to_cpu(t->size) : 0;
-+	u16 rsize;
-+
-+	if (!t)
-+		return NULL;
-+
-+	rsize = le16_to_cpu(t->size);
- 
- 	if (!c) {
--		if (!t || !t->total)
-+		/* start enumeration. */
-+		if (!t->total)
- 			return NULL;
- 		e = Add2Ptr(t, sizeof(struct RESTART_TABLE));
- 	} else {
-diff --git a/fs/ntfs3/namei.c b/fs/ntfs3/namei.c
-index b5687d74b44952..bcdc1ec90a96a8 100644
---- a/fs/ntfs3/namei.c
-+++ b/fs/ntfs3/namei.c
-@@ -501,7 +501,7 @@ static int ntfs_d_hash(const struct dentry *dentry, struct qstr *name)
- 	/*
- 	 * Try slow way with current upcase table
- 	 */
--	uni = __getname();
-+	uni = kmem_cache_alloc(names_cachep, GFP_NOWAIT);
- 	if (!uni)
- 		return -ENOMEM;
- 
-@@ -523,7 +523,7 @@ static int ntfs_d_hash(const struct dentry *dentry, struct qstr *name)
- 	err = 0;
- 
- out:
--	__putname(uni);
-+	kmem_cache_free(names_cachep, uni);
- 	return err;
- }
- 
-diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
-index 23fc24d16b31e4..7e4fa9c68c1dd0 100644
---- a/fs/proc/kcore.c
-+++ b/fs/proc/kcore.c
-@@ -50,6 +50,20 @@ static struct proc_dir_entry *proc_root_kcore;
- #define	kc_offset_to_vaddr(o) ((o) + PAGE_OFFSET)
- #endif
- 
-+#ifndef kc_xlate_dev_mem_ptr
-+#define kc_xlate_dev_mem_ptr kc_xlate_dev_mem_ptr
-+static inline void *kc_xlate_dev_mem_ptr(phys_addr_t phys)
-+{
-+	return __va(phys);
-+}
-+#endif
-+#ifndef kc_unxlate_dev_mem_ptr
-+#define kc_unxlate_dev_mem_ptr kc_unxlate_dev_mem_ptr
-+static inline void kc_unxlate_dev_mem_ptr(phys_addr_t phys, void *virt)
-+{
-+}
-+#endif
-+
- static LIST_HEAD(kclist_head);
- static DECLARE_RWSEM(kclist_lock);
- static int kcore_need_update = 1;
-@@ -471,6 +485,8 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)
- 	while (buflen) {
- 		struct page *page;
- 		unsigned long pfn;
-+		phys_addr_t phys;
-+		void *__start;
- 
- 		/*
- 		 * If this is the first iteration or the address is not within
-@@ -537,7 +553,8 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)
- 			}
- 			break;
- 		case KCORE_RAM:
--			pfn = __pa(start) >> PAGE_SHIFT;
-+			phys = __pa(start);
-+			pfn =  phys >> PAGE_SHIFT;
- 			page = pfn_to_online_page(pfn);
- 
- 			/*
-@@ -556,13 +573,28 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter)
- 			fallthrough;
- 		case KCORE_VMEMMAP:
- 		case KCORE_TEXT:
-+			if (m->type == KCORE_RAM) {
-+				__start = kc_xlate_dev_mem_ptr(phys);
-+				if (!__start) {
-+					ret = -ENOMEM;
-+					if (iov_iter_zero(tsz, iter) != tsz)
-+						ret = -EFAULT;
-+					goto out;
-+				}
-+			} else {
-+				__start = (void *)start;
-+			}
-+
- 			/*
- 			 * Sadly we must use a bounce buffer here to be able to
- 			 * make use of copy_from_kernel_nofault(), as these
- 			 * memory regions might not always be mapped on all
- 			 * architectures.
- 			 */
--			if (copy_from_kernel_nofault(buf, (void *)start, tsz)) {
-+			ret = copy_from_kernel_nofault(buf, __start, tsz);
-+			if (m->type == KCORE_RAM)
-+				kc_unxlate_dev_mem_ptr(phys, __start);
-+			if (ret) {
- 				if (iov_iter_zero(tsz, iter) != tsz) {
- 					ret = -EFAULT;
- 					goto out;
-diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
-index 007d0a683910f6..450e3050324c6c 100644
---- a/fs/smb/client/smb2ops.c
-+++ b/fs/smb/client/smb2ops.c
-@@ -4250,7 +4250,7 @@ smb2_get_enc_key(struct TCP_Server_Info *server, __u64 ses_id, int enc, u8 *key)
-  */
- static int
- crypt_message(struct TCP_Server_Info *server, int num_rqst,
--	      struct smb_rqst *rqst, int enc)
-+	      struct smb_rqst *rqst, int enc, struct crypto_aead *tfm)
- {
- 	struct smb2_transform_hdr *tr_hdr =
- 		(struct smb2_transform_hdr *)rqst[0].rq_iov[0].iov_base;
-@@ -4261,8 +4261,6 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
- 	u8 key[SMB3_ENC_DEC_KEY_SIZE];
- 	struct aead_request *req;
- 	u8 *iv;
--	DECLARE_CRYPTO_WAIT(wait);
--	struct crypto_aead *tfm;
- 	unsigned int crypt_len = le32_to_cpu(tr_hdr->OriginalMessageSize);
- 	void *creq;
- 	size_t sensitive_size;
-@@ -4274,14 +4272,6 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
- 		return rc;
- 	}
- 
--	rc = smb3_crypto_aead_allocate(server);
--	if (rc) {
--		cifs_server_dbg(VFS, "%s: crypto alloc failed\n", __func__);
--		return rc;
--	}
--
--	tfm = enc ? server->secmech.enc : server->secmech.dec;
--
- 	if ((server->cipher_type == SMB2_ENCRYPTION_AES256_CCM) ||
- 		(server->cipher_type == SMB2_ENCRYPTION_AES256_GCM))
- 		rc = crypto_aead_setkey(tfm, key, SMB3_GCM256_CRYPTKEY_SIZE);
-@@ -4321,11 +4311,7 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
- 	aead_request_set_crypt(req, sg, sg, crypt_len, iv);
- 	aead_request_set_ad(req, assoc_data_len);
- 
--	aead_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
--				  crypto_req_done, &wait);
--
--	rc = crypto_wait_req(enc ? crypto_aead_encrypt(req)
--				: crypto_aead_decrypt(req), &wait);
-+	rc = enc ? crypto_aead_encrypt(req) : crypto_aead_decrypt(req);
- 
- 	if (!rc && enc)
- 		memcpy(&tr_hdr->Signature, sign, SMB2_SIGNATURE_SIZE);
-@@ -4432,7 +4418,7 @@ smb3_init_transform_rq(struct TCP_Server_Info *server, int num_rqst,
- 	/* fill the 1st iov with a transform header */
- 	fill_transform_hdr(tr_hdr, orig_len, old_rq, server->cipher_type);
- 
--	rc = crypt_message(server, num_rqst, new_rq, 1);
-+	rc = crypt_message(server, num_rqst, new_rq, 1, server->secmech.enc);
- 	cifs_dbg(FYI, "Encrypt message returned %d\n", rc);
- 	if (rc)
- 		goto err_free;
-@@ -4457,8 +4443,9 @@ decrypt_raw_data(struct TCP_Server_Info *server, char *buf,
- 		 unsigned int buf_data_size, struct iov_iter *iter,
- 		 bool is_offloaded)
- {
--	struct kvec iov[2];
-+	struct crypto_aead *tfm;
- 	struct smb_rqst rqst = {NULL};
-+	struct kvec iov[2];
- 	size_t iter_size = 0;
- 	int rc;
- 
-@@ -4475,9 +4462,31 @@ decrypt_raw_data(struct TCP_Server_Info *server, char *buf,
- 		iter_size = iov_iter_count(iter);
- 	}
- 
--	rc = crypt_message(server, 1, &rqst, 0);
-+	if (is_offloaded) {
-+		if ((server->cipher_type == SMB2_ENCRYPTION_AES128_GCM) ||
-+		    (server->cipher_type == SMB2_ENCRYPTION_AES256_GCM))
-+			tfm = crypto_alloc_aead("gcm(aes)", 0, 0);
-+		else
-+			tfm = crypto_alloc_aead("ccm(aes)", 0, 0);
-+		if (IS_ERR(tfm)) {
-+			rc = PTR_ERR(tfm);
-+			cifs_server_dbg(VFS, "%s: Failed alloc decrypt TFM, rc=%d\n", __func__, rc);
-+
-+			return rc;
-+		}
-+	} else {
-+		if (unlikely(!server->secmech.dec))
-+			return -EIO;
-+
-+		tfm = server->secmech.dec;
-+	}
-+
-+	rc = crypt_message(server, 1, &rqst, 0, tfm);
- 	cifs_dbg(FYI, "Decrypt message returned %d\n", rc);
- 
-+	if (is_offloaded)
-+		crypto_free_aead(tfm);
-+
- 	if (rc)
- 		return rc;
- 
-diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c
-index bf45b8652e5805..83a03201bb8628 100644
---- a/fs/smb/client/smb2pdu.c
-+++ b/fs/smb/client/smb2pdu.c
-@@ -1263,6 +1263,12 @@ SMB2_negotiate(const unsigned int xid,
- 		else
- 			cifs_server_dbg(VFS, "Missing expected negotiate contexts\n");
- 	}
-+
-+	if (server->cipher_type && !rc) {
-+		rc = smb3_crypto_aead_allocate(server);
-+		if (rc)
-+			cifs_server_dbg(VFS, "%s: crypto alloc failed, rc=%d\n", __func__, rc);
-+	}
- neg_exit:
- 	free_rsp_buf(resp_buftype, rsp);
- 	return rc;
-diff --git a/fs/unicode/mkutf8data.c b/fs/unicode/mkutf8data.c
-index bc1a7c8b5c8dfc..e779252be1648b 100644
---- a/fs/unicode/mkutf8data.c
-+++ b/fs/unicode/mkutf8data.c
-@@ -2230,75 +2230,6 @@ static void nfdicf_init(void)
- 		file_fail(fold_name);
- }
- 
--static void ignore_init(void)
--{
--	FILE *file;
--	unsigned int unichar;
--	unsigned int first;
--	unsigned int last;
--	unsigned int *um;
--	int count;
--	int ret;
--
--	if (verbose > 0)
--		printf("Parsing %s\n", prop_name);
--	file = fopen(prop_name, "r");
--	if (!file)
--		open_fail(prop_name, errno);
--	assert(file);
--	count = 0;
--	while (fgets(line, LINESIZE, file)) {
--		ret = sscanf(line, "%X..%X ; %s # ", &first, &last, buf0);
--		if (ret == 3) {
--			if (strcmp(buf0, "Default_Ignorable_Code_Point"))
--				continue;
--			if (!utf32valid(first) || !utf32valid(last))
--				line_fail(prop_name, line);
--			for (unichar = first; unichar <= last; unichar++) {
--				free(unicode_data[unichar].utf32nfdi);
--				um = malloc(sizeof(unsigned int));
--				*um = 0;
--				unicode_data[unichar].utf32nfdi = um;
--				free(unicode_data[unichar].utf32nfdicf);
--				um = malloc(sizeof(unsigned int));
--				*um = 0;
--				unicode_data[unichar].utf32nfdicf = um;
--				count++;
--			}
--			if (verbose > 1)
--				printf(" %X..%X Default_Ignorable_Code_Point\n",
--					first, last);
--			continue;
--		}
--		ret = sscanf(line, "%X ; %s # ", &unichar, buf0);
--		if (ret == 2) {
--			if (strcmp(buf0, "Default_Ignorable_Code_Point"))
--				continue;
--			if (!utf32valid(unichar))
--				line_fail(prop_name, line);
--			free(unicode_data[unichar].utf32nfdi);
--			um = malloc(sizeof(unsigned int));
--			*um = 0;
--			unicode_data[unichar].utf32nfdi = um;
--			free(unicode_data[unichar].utf32nfdicf);
--			um = malloc(sizeof(unsigned int));
--			*um = 0;
--			unicode_data[unichar].utf32nfdicf = um;
--			if (verbose > 1)
--				printf(" %X Default_Ignorable_Code_Point\n",
--					unichar);
--			count++;
--			continue;
--		}
--	}
--	fclose(file);
--
--	if (verbose > 0)
--		printf("Found %d entries\n", count);
--	if (count == 0)
--		file_fail(prop_name);
--}
--
- static void corrections_init(void)
- {
- 	FILE *file;
-@@ -3410,7 +3341,6 @@ int main(int argc, char *argv[])
- 	ccc_init();
- 	nfdi_init();
- 	nfdicf_init();
--	ignore_init();
- 	corrections_init();
- 	hangul_decompose();
- 	nfdi_decompose();
-diff --git a/fs/unicode/utf8data.c_shipped b/fs/unicode/utf8data.c_shipped
-index d9b62901aa96b7..1aab5257a331f0 100644
---- a/fs/unicode/utf8data.c_shipped
-+++ b/fs/unicode/utf8data.c_shipped
-@@ -82,58 +82,58 @@ static const struct utf8data utf8nfdidata[] = {
- 	{ 0xc0100, 20736 }
- };
- 
--static const unsigned char utf8data[64256] = {
-+static const unsigned char utf8data[64080] = {
- 	/* nfdicf_30100 */
--	0xd7,0x07,0x66,0x84,0x0c,0x01,0x00,0xc6,0xd5,0x16,0xe4,0x99,0x1a,0xe3,0x63,0x15,
--	0xe2,0x4c,0x0e,0xc1,0xe0,0x4e,0x0d,0xcf,0x86,0x65,0x2d,0x0d,0x01,0x00,0xd4,0xb8,
--	0xd3,0x27,0xe2,0x89,0xa3,0xe1,0xce,0x35,0xe0,0x2c,0x22,0xcf,0x86,0xc5,0xe4,0x15,
--	0x6d,0xe3,0x60,0x68,0xe2,0xf6,0x65,0xe1,0x29,0x65,0xe0,0xee,0x64,0xcf,0x86,0xe5,
--	0xb3,0x64,0x64,0x96,0x64,0x0b,0x00,0xd2,0x0e,0xe1,0xb5,0x3c,0xe0,0xba,0xa3,0xcf,
--	0x86,0xcf,0x06,0x01,0x00,0xd1,0x0c,0xe0,0x1e,0xa9,0xcf,0x86,0xcf,0x06,0x02,0xff,
-+	0xd7,0x07,0x66,0x84,0x0c,0x01,0x00,0xc6,0xd5,0x16,0xe4,0x96,0x1a,0xe3,0x60,0x15,
-+	0xe2,0x49,0x0e,0xc1,0xe0,0x4b,0x0d,0xcf,0x86,0x65,0x2d,0x0d,0x01,0x00,0xd4,0xb8,
-+	0xd3,0x27,0xe2,0x03,0xa3,0xe1,0xcb,0x35,0xe0,0x29,0x22,0xcf,0x86,0xc5,0xe4,0xfa,
-+	0x6c,0xe3,0x45,0x68,0xe2,0xdb,0x65,0xe1,0x0e,0x65,0xe0,0xd3,0x64,0xcf,0x86,0xe5,
-+	0x98,0x64,0x64,0x7b,0x64,0x0b,0x00,0xd2,0x0e,0xe1,0xb3,0x3c,0xe0,0x34,0xa3,0xcf,
-+	0x86,0xcf,0x06,0x01,0x00,0xd1,0x0c,0xe0,0x98,0xa8,0xcf,0x86,0xcf,0x06,0x02,0xff,
- 	0xff,0xd0,0x08,0xcf,0x86,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x01,
--	0x00,0xe4,0xe1,0x45,0xe3,0x3b,0x45,0xd2,0x06,0xcf,0x06,0x01,0x00,0xe1,0x87,0xad,
--	0xd0,0x21,0xcf,0x86,0xe5,0x81,0xaa,0xe4,0x00,0xaa,0xe3,0xbf,0xa9,0xe2,0x9e,0xa9,
--	0xe1,0x8d,0xa9,0x10,0x08,0x01,0xff,0xe8,0xb1,0x88,0x00,0x01,0xff,0xe6,0x9b,0xb4,
--	0x00,0xcf,0x86,0xe5,0x63,0xac,0xd4,0x19,0xe3,0xa2,0xab,0xe2,0x81,0xab,0xe1,0x70,
--	0xab,0x10,0x08,0x01,0xff,0xe9,0xb9,0xbf,0x00,0x01,0xff,0xe8,0xab,0x96,0x00,0xe3,
--	0x09,0xac,0xe2,0xe8,0xab,0xe1,0xd7,0xab,0x10,0x08,0x01,0xff,0xe7,0xb8,0xb7,0x00,
--	0x01,0xff,0xe9,0x9b,0xbb,0x00,0x83,0xe2,0x19,0xfa,0xe1,0xf2,0xf6,0xe0,0x6f,0xf5,
--	0xcf,0x86,0xd5,0x31,0xc4,0xe3,0x54,0x4e,0xe2,0xf5,0x4c,0xe1,0xa4,0xcc,0xe0,0x9c,
--	0x4b,0xcf,0x86,0xe5,0x8e,0x49,0xe4,0xaf,0x46,0xe3,0x11,0xbd,0xe2,0x68,0xbc,0xe1,
--	0x43,0xbc,0xe0,0x1c,0xbc,0xcf,0x86,0xe5,0xe9,0xbb,0x94,0x07,0x63,0xd4,0xbb,0x07,
--	0x00,0x07,0x00,0xe4,0xdb,0xf4,0xd3,0x08,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd2,0x0b,
--	0xe1,0xea,0xe1,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd1,0x0e,0xe0,0xd9,0xe2,0xcf,0x86,
--	0xe5,0x9e,0xe2,0xcf,0x06,0x11,0x00,0xd0,0x0b,0xcf,0x86,0xe5,0xd9,0xe2,0xcf,0x06,
--	0x13,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x00,0x00,0xe4,0x74,0xf4,0xe3,0x5d,0xf3,
--	0xd2,0xa0,0xe1,0x13,0xe7,0xd0,0x21,0xcf,0x86,0xe5,0x14,0xe4,0xe4,0x90,0xe3,0xe3,
--	0x4e,0xe3,0xe2,0x2d,0xe3,0xe1,0x1b,0xe3,0x10,0x08,0x05,0xff,0xe4,0xb8,0xbd,0x00,
--	0x05,0xff,0xe4,0xb8,0xb8,0x00,0xcf,0x86,0xd5,0x1c,0xe4,0x70,0xe5,0xe3,0x2f,0xe5,
--	0xe2,0x0e,0xe5,0xe1,0xfd,0xe4,0x10,0x08,0x05,0xff,0xe5,0x92,0xa2,0x00,0x05,0xff,
--	0xe5,0x93,0xb6,0x00,0xd4,0x34,0xd3,0x18,0xe2,0xf7,0xe5,0xe1,0xe6,0xe5,0x10,0x09,
--	0x05,0xff,0xf0,0xa1,0x9a,0xa8,0x00,0x05,0xff,0xf0,0xa1,0x9b,0xaa,0x00,0xe2,0x17,
--	0xe6,0x91,0x11,0x10,0x09,0x05,0xff,0xf0,0xa1,0x8d,0xaa,0x00,0x05,0xff,0xe5,0xac,
--	0x88,0x00,0x05,0xff,0xe5,0xac,0xbe,0x00,0xe3,0x5d,0xe6,0xd2,0x14,0xe1,0x2c,0xe6,
-+	0x00,0xe4,0xdf,0x45,0xe3,0x39,0x45,0xd2,0x06,0xcf,0x06,0x01,0x00,0xe1,0x01,0xad,
-+	0xd0,0x21,0xcf,0x86,0xe5,0xfb,0xa9,0xe4,0x7a,0xa9,0xe3,0x39,0xa9,0xe2,0x18,0xa9,
-+	0xe1,0x07,0xa9,0x10,0x08,0x01,0xff,0xe8,0xb1,0x88,0x00,0x01,0xff,0xe6,0x9b,0xb4,
-+	0x00,0xcf,0x86,0xe5,0xdd,0xab,0xd4,0x19,0xe3,0x1c,0xab,0xe2,0xfb,0xaa,0xe1,0xea,
-+	0xaa,0x10,0x08,0x01,0xff,0xe9,0xb9,0xbf,0x00,0x01,0xff,0xe8,0xab,0x96,0x00,0xe3,
-+	0x83,0xab,0xe2,0x62,0xab,0xe1,0x51,0xab,0x10,0x08,0x01,0xff,0xe7,0xb8,0xb7,0x00,
-+	0x01,0xff,0xe9,0x9b,0xbb,0x00,0x83,0xe2,0x68,0xf9,0xe1,0x52,0xf6,0xe0,0xcf,0xf4,
-+	0xcf,0x86,0xd5,0x31,0xc4,0xe3,0x51,0x4e,0xe2,0xf2,0x4c,0xe1,0x09,0xcc,0xe0,0x99,
-+	0x4b,0xcf,0x86,0xe5,0x8b,0x49,0xe4,0xac,0x46,0xe3,0x76,0xbc,0xe2,0xcd,0xbb,0xe1,
-+	0xa8,0xbb,0xe0,0x81,0xbb,0xcf,0x86,0xe5,0x4e,0xbb,0x94,0x07,0x63,0x39,0xbb,0x07,
-+	0x00,0x07,0x00,0xe4,0x3b,0xf4,0xd3,0x08,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd2,0x0b,
-+	0xe1,0x4a,0xe1,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd1,0x0e,0xe0,0x39,0xe2,0xcf,0x86,
-+	0xe5,0xfe,0xe1,0xcf,0x06,0x11,0x00,0xd0,0x0b,0xcf,0x86,0xe5,0x39,0xe2,0xcf,0x06,
-+	0x13,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x00,0x00,0xe4,0xd4,0xf3,0xe3,0xbd,0xf2,
-+	0xd2,0xa0,0xe1,0x73,0xe6,0xd0,0x21,0xcf,0x86,0xe5,0x74,0xe3,0xe4,0xf0,0xe2,0xe3,
-+	0xae,0xe2,0xe2,0x8d,0xe2,0xe1,0x7b,0xe2,0x10,0x08,0x05,0xff,0xe4,0xb8,0xbd,0x00,
-+	0x05,0xff,0xe4,0xb8,0xb8,0x00,0xcf,0x86,0xd5,0x1c,0xe4,0xd0,0xe4,0xe3,0x8f,0xe4,
-+	0xe2,0x6e,0xe4,0xe1,0x5d,0xe4,0x10,0x08,0x05,0xff,0xe5,0x92,0xa2,0x00,0x05,0xff,
-+	0xe5,0x93,0xb6,0x00,0xd4,0x34,0xd3,0x18,0xe2,0x57,0xe5,0xe1,0x46,0xe5,0x10,0x09,
-+	0x05,0xff,0xf0,0xa1,0x9a,0xa8,0x00,0x05,0xff,0xf0,0xa1,0x9b,0xaa,0x00,0xe2,0x77,
-+	0xe5,0x91,0x11,0x10,0x09,0x05,0xff,0xf0,0xa1,0x8d,0xaa,0x00,0x05,0xff,0xe5,0xac,
-+	0x88,0x00,0x05,0xff,0xe5,0xac,0xbe,0x00,0xe3,0xbd,0xe5,0xd2,0x14,0xe1,0x8c,0xe5,
- 	0x10,0x08,0x05,0xff,0xe5,0xaf,0xb3,0x00,0x05,0xff,0xf0,0xa1,0xac,0x98,0x00,0xe1,
--	0x38,0xe6,0x10,0x08,0x05,0xff,0xe5,0xbc,0xb3,0x00,0x05,0xff,0xe5,0xb0,0xa2,0x00,
--	0xd1,0xd5,0xd0,0x6a,0xcf,0x86,0xe5,0x8d,0xeb,0xd4,0x19,0xe3,0xc6,0xea,0xe2,0xa4,
--	0xea,0xe1,0x93,0xea,0x10,0x08,0x05,0xff,0xe6,0xb4,0xbe,0x00,0x05,0xff,0xe6,0xb5,
--	0xb7,0x00,0xd3,0x18,0xe2,0x10,0xeb,0xe1,0xff,0xea,0x10,0x09,0x05,0xff,0xf0,0xa3,
--	0xbd,0x9e,0x00,0x05,0xff,0xf0,0xa3,0xbe,0x8e,0x00,0xd2,0x13,0xe1,0x28,0xeb,0x10,
-+	0x98,0xe5,0x10,0x08,0x05,0xff,0xe5,0xbc,0xb3,0x00,0x05,0xff,0xe5,0xb0,0xa2,0x00,
-+	0xd1,0xd5,0xd0,0x6a,0xcf,0x86,0xe5,0xed,0xea,0xd4,0x19,0xe3,0x26,0xea,0xe2,0x04,
-+	0xea,0xe1,0xf3,0xe9,0x10,0x08,0x05,0xff,0xe6,0xb4,0xbe,0x00,0x05,0xff,0xe6,0xb5,
-+	0xb7,0x00,0xd3,0x18,0xe2,0x70,0xea,0xe1,0x5f,0xea,0x10,0x09,0x05,0xff,0xf0,0xa3,
-+	0xbd,0x9e,0x00,0x05,0xff,0xf0,0xa3,0xbe,0x8e,0x00,0xd2,0x13,0xe1,0x88,0xea,0x10,
- 	0x08,0x05,0xff,0xe7,0x81,0xbd,0x00,0x05,0xff,0xe7,0x81,0xb7,0x00,0xd1,0x11,0x10,
- 	0x08,0x05,0xff,0xe7,0x85,0x85,0x00,0x05,0xff,0xf0,0xa4,0x89,0xa3,0x00,0x10,0x08,
--	0x05,0xff,0xe7,0x86,0x9c,0x00,0x05,0xff,0xe4,0x8e,0xab,0x00,0xcf,0x86,0xe5,0x2a,
--	0xed,0xd4,0x1a,0xe3,0x62,0xec,0xe2,0x48,0xec,0xe1,0x35,0xec,0x10,0x08,0x05,0xff,
--	0xe7,0x9b,0xb4,0x00,0x05,0xff,0xf0,0xa5,0x83,0xb3,0x00,0xd3,0x16,0xe2,0xaa,0xec,
--	0xe1,0x98,0xec,0x10,0x08,0x05,0xff,0xe7,0xa3,0x8c,0x00,0x05,0xff,0xe4,0x83,0xa3,
--	0x00,0xd2,0x13,0xe1,0xc6,0xec,0x10,0x08,0x05,0xff,0xe4,0x84,0xaf,0x00,0x05,0xff,
-+	0x05,0xff,0xe7,0x86,0x9c,0x00,0x05,0xff,0xe4,0x8e,0xab,0x00,0xcf,0x86,0xe5,0x8a,
-+	0xec,0xd4,0x1a,0xe3,0xc2,0xeb,0xe2,0xa8,0xeb,0xe1,0x95,0xeb,0x10,0x08,0x05,0xff,
-+	0xe7,0x9b,0xb4,0x00,0x05,0xff,0xf0,0xa5,0x83,0xb3,0x00,0xd3,0x16,0xe2,0x0a,0xec,
-+	0xe1,0xf8,0xeb,0x10,0x08,0x05,0xff,0xe7,0xa3,0x8c,0x00,0x05,0xff,0xe4,0x83,0xa3,
-+	0x00,0xd2,0x13,0xe1,0x26,0xec,0x10,0x08,0x05,0xff,0xe4,0x84,0xaf,0x00,0x05,0xff,
- 	0xe7,0xa9,0x80,0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0xa5,0xa5,0xbc,0x00,0x05,
- 	0xff,0xf0,0xa5,0xaa,0xa7,0x00,0x10,0x09,0x05,0xff,0xf0,0xa5,0xaa,0xa7,0x00,0x05,
--	0xff,0xe7,0xaa,0xae,0x00,0xe0,0xdc,0xef,0xcf,0x86,0xd5,0x1d,0xe4,0x51,0xee,0xe3,
--	0x0d,0xee,0xe2,0xeb,0xed,0xe1,0xda,0xed,0x10,0x09,0x05,0xff,0xf0,0xa3,0x8d,0x9f,
--	0x00,0x05,0xff,0xe4,0x8f,0x95,0x00,0xd4,0x19,0xe3,0xf8,0xee,0xe2,0xd4,0xee,0xe1,
--	0xc3,0xee,0x10,0x08,0x05,0xff,0xe8,0x8d,0x93,0x00,0x05,0xff,0xe8,0x8f,0x8a,0x00,
--	0xd3,0x18,0xe2,0x43,0xef,0xe1,0x32,0xef,0x10,0x09,0x05,0xff,0xf0,0xa6,0xbe,0xb1,
--	0x00,0x05,0xff,0xf0,0xa7,0x83,0x92,0x00,0xd2,0x13,0xe1,0x5b,0xef,0x10,0x08,0x05,
-+	0xff,0xe7,0xaa,0xae,0x00,0xe0,0x3c,0xef,0xcf,0x86,0xd5,0x1d,0xe4,0xb1,0xed,0xe3,
-+	0x6d,0xed,0xe2,0x4b,0xed,0xe1,0x3a,0xed,0x10,0x09,0x05,0xff,0xf0,0xa3,0x8d,0x9f,
-+	0x00,0x05,0xff,0xe4,0x8f,0x95,0x00,0xd4,0x19,0xe3,0x58,0xee,0xe2,0x34,0xee,0xe1,
-+	0x23,0xee,0x10,0x08,0x05,0xff,0xe8,0x8d,0x93,0x00,0x05,0xff,0xe8,0x8f,0x8a,0x00,
-+	0xd3,0x18,0xe2,0xa3,0xee,0xe1,0x92,0xee,0x10,0x09,0x05,0xff,0xf0,0xa6,0xbe,0xb1,
-+	0x00,0x05,0xff,0xf0,0xa7,0x83,0x92,0x00,0xd2,0x13,0xe1,0xbb,0xee,0x10,0x08,0x05,
- 	0xff,0xe8,0x9a,0x88,0x00,0x05,0xff,0xe8,0x9c,0x8e,0x00,0xd1,0x10,0x10,0x08,0x05,
- 	0xff,0xe8,0x9c,0xa8,0x00,0x05,0xff,0xe8,0x9d,0xab,0x00,0x10,0x08,0x05,0xff,0xe8,
- 	0x9e,0x86,0x00,0x05,0xff,0xe4,0xb5,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-@@ -141,152 +141,152 @@ static const unsigned char utf8data[64256] = {
- 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 	/* nfdi_30100 */
--	0x57,0x04,0x01,0x00,0xc6,0xd5,0x16,0xe4,0xc2,0x59,0xe3,0xfb,0x54,0xe2,0x74,0x4f,
--	0xc1,0xe0,0xa0,0x4d,0xcf,0x86,0x65,0x84,0x4d,0x01,0x00,0xd4,0xb8,0xd3,0x27,0xe2,
--	0x0c,0xa0,0xe1,0xdf,0x8d,0xe0,0x39,0x71,0xcf,0x86,0xc5,0xe4,0x98,0x69,0xe3,0xe3,
--	0x64,0xe2,0x79,0x62,0xe1,0xac,0x61,0xe0,0x71,0x61,0xcf,0x86,0xe5,0x36,0x61,0x64,
--	0x19,0x61,0x0b,0x00,0xd2,0x0e,0xe1,0xc2,0xa0,0xe0,0x3d,0xa0,0xcf,0x86,0xcf,0x06,
--	0x01,0x00,0xd1,0x0c,0xe0,0xa1,0xa5,0xcf,0x86,0xcf,0x06,0x02,0xff,0xff,0xd0,0x08,
--	0xcf,0x86,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x01,0x00,0xe4,0x9e,
--	0xb6,0xe3,0x18,0xae,0xd2,0x06,0xcf,0x06,0x01,0x00,0xe1,0x0a,0xaa,0xd0,0x21,0xcf,
--	0x86,0xe5,0x04,0xa7,0xe4,0x83,0xa6,0xe3,0x42,0xa6,0xe2,0x21,0xa6,0xe1,0x10,0xa6,
--	0x10,0x08,0x01,0xff,0xe8,0xb1,0x88,0x00,0x01,0xff,0xe6,0x9b,0xb4,0x00,0xcf,0x86,
--	0xe5,0xe6,0xa8,0xd4,0x19,0xe3,0x25,0xa8,0xe2,0x04,0xa8,0xe1,0xf3,0xa7,0x10,0x08,
--	0x01,0xff,0xe9,0xb9,0xbf,0x00,0x01,0xff,0xe8,0xab,0x96,0x00,0xe3,0x8c,0xa8,0xe2,
--	0x6b,0xa8,0xe1,0x5a,0xa8,0x10,0x08,0x01,0xff,0xe7,0xb8,0xb7,0x00,0x01,0xff,0xe9,
--	0x9b,0xbb,0x00,0x83,0xe2,0x9c,0xf6,0xe1,0x75,0xf3,0xe0,0xf2,0xf1,0xcf,0x86,0xd5,
--	0x31,0xc4,0xe3,0x6d,0xcc,0xe2,0x46,0xca,0xe1,0x27,0xc9,0xe0,0xb7,0xbf,0xcf,0x86,
--	0xe5,0xaa,0xbb,0xe4,0xa3,0xba,0xe3,0x94,0xb9,0xe2,0xeb,0xb8,0xe1,0xc6,0xb8,0xe0,
--	0x9f,0xb8,0xcf,0x86,0xe5,0x6c,0xb8,0x94,0x07,0x63,0x57,0xb8,0x07,0x00,0x07,0x00,
--	0xe4,0x5e,0xf1,0xd3,0x08,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd2,0x0b,0xe1,0x6d,0xde,
--	0xcf,0x86,0xcf,0x06,0x05,0x00,0xd1,0x0e,0xe0,0x5c,0xdf,0xcf,0x86,0xe5,0x21,0xdf,
--	0xcf,0x06,0x11,0x00,0xd0,0x0b,0xcf,0x86,0xe5,0x5c,0xdf,0xcf,0x06,0x13,0x00,0xcf,
--	0x86,0xd5,0x06,0xcf,0x06,0x00,0x00,0xe4,0xf7,0xf0,0xe3,0xe0,0xef,0xd2,0xa0,0xe1,
--	0x96,0xe3,0xd0,0x21,0xcf,0x86,0xe5,0x97,0xe0,0xe4,0x13,0xe0,0xe3,0xd1,0xdf,0xe2,
--	0xb0,0xdf,0xe1,0x9e,0xdf,0x10,0x08,0x05,0xff,0xe4,0xb8,0xbd,0x00,0x05,0xff,0xe4,
--	0xb8,0xb8,0x00,0xcf,0x86,0xd5,0x1c,0xe4,0xf3,0xe1,0xe3,0xb2,0xe1,0xe2,0x91,0xe1,
--	0xe1,0x80,0xe1,0x10,0x08,0x05,0xff,0xe5,0x92,0xa2,0x00,0x05,0xff,0xe5,0x93,0xb6,
--	0x00,0xd4,0x34,0xd3,0x18,0xe2,0x7a,0xe2,0xe1,0x69,0xe2,0x10,0x09,0x05,0xff,0xf0,
--	0xa1,0x9a,0xa8,0x00,0x05,0xff,0xf0,0xa1,0x9b,0xaa,0x00,0xe2,0x9a,0xe2,0x91,0x11,
--	0x10,0x09,0x05,0xff,0xf0,0xa1,0x8d,0xaa,0x00,0x05,0xff,0xe5,0xac,0x88,0x00,0x05,
--	0xff,0xe5,0xac,0xbe,0x00,0xe3,0xe0,0xe2,0xd2,0x14,0xe1,0xaf,0xe2,0x10,0x08,0x05,
--	0xff,0xe5,0xaf,0xb3,0x00,0x05,0xff,0xf0,0xa1,0xac,0x98,0x00,0xe1,0xbb,0xe2,0x10,
--	0x08,0x05,0xff,0xe5,0xbc,0xb3,0x00,0x05,0xff,0xe5,0xb0,0xa2,0x00,0xd1,0xd5,0xd0,
--	0x6a,0xcf,0x86,0xe5,0x10,0xe8,0xd4,0x19,0xe3,0x49,0xe7,0xe2,0x27,0xe7,0xe1,0x16,
--	0xe7,0x10,0x08,0x05,0xff,0xe6,0xb4,0xbe,0x00,0x05,0xff,0xe6,0xb5,0xb7,0x00,0xd3,
--	0x18,0xe2,0x93,0xe7,0xe1,0x82,0xe7,0x10,0x09,0x05,0xff,0xf0,0xa3,0xbd,0x9e,0x00,
--	0x05,0xff,0xf0,0xa3,0xbe,0x8e,0x00,0xd2,0x13,0xe1,0xab,0xe7,0x10,0x08,0x05,0xff,
--	0xe7,0x81,0xbd,0x00,0x05,0xff,0xe7,0x81,0xb7,0x00,0xd1,0x11,0x10,0x08,0x05,0xff,
--	0xe7,0x85,0x85,0x00,0x05,0xff,0xf0,0xa4,0x89,0xa3,0x00,0x10,0x08,0x05,0xff,0xe7,
--	0x86,0x9c,0x00,0x05,0xff,0xe4,0x8e,0xab,0x00,0xcf,0x86,0xe5,0xad,0xe9,0xd4,0x1a,
--	0xe3,0xe5,0xe8,0xe2,0xcb,0xe8,0xe1,0xb8,0xe8,0x10,0x08,0x05,0xff,0xe7,0x9b,0xb4,
--	0x00,0x05,0xff,0xf0,0xa5,0x83,0xb3,0x00,0xd3,0x16,0xe2,0x2d,0xe9,0xe1,0x1b,0xe9,
--	0x10,0x08,0x05,0xff,0xe7,0xa3,0x8c,0x00,0x05,0xff,0xe4,0x83,0xa3,0x00,0xd2,0x13,
--	0xe1,0x49,0xe9,0x10,0x08,0x05,0xff,0xe4,0x84,0xaf,0x00,0x05,0xff,0xe7,0xa9,0x80,
--	0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0xa5,0xa5,0xbc,0x00,0x05,0xff,0xf0,0xa5,
--	0xaa,0xa7,0x00,0x10,0x09,0x05,0xff,0xf0,0xa5,0xaa,0xa7,0x00,0x05,0xff,0xe7,0xaa,
--	0xae,0x00,0xe0,0x5f,0xec,0xcf,0x86,0xd5,0x1d,0xe4,0xd4,0xea,0xe3,0x90,0xea,0xe2,
--	0x6e,0xea,0xe1,0x5d,0xea,0x10,0x09,0x05,0xff,0xf0,0xa3,0x8d,0x9f,0x00,0x05,0xff,
--	0xe4,0x8f,0x95,0x00,0xd4,0x19,0xe3,0x7b,0xeb,0xe2,0x57,0xeb,0xe1,0x46,0xeb,0x10,
--	0x08,0x05,0xff,0xe8,0x8d,0x93,0x00,0x05,0xff,0xe8,0x8f,0x8a,0x00,0xd3,0x18,0xe2,
--	0xc6,0xeb,0xe1,0xb5,0xeb,0x10,0x09,0x05,0xff,0xf0,0xa6,0xbe,0xb1,0x00,0x05,0xff,
--	0xf0,0xa7,0x83,0x92,0x00,0xd2,0x13,0xe1,0xde,0xeb,0x10,0x08,0x05,0xff,0xe8,0x9a,
--	0x88,0x00,0x05,0xff,0xe8,0x9c,0x8e,0x00,0xd1,0x10,0x10,0x08,0x05,0xff,0xe8,0x9c,
--	0xa8,0x00,0x05,0xff,0xe8,0x9d,0xab,0x00,0x10,0x08,0x05,0xff,0xe8,0x9e,0x86,0x00,
--	0x05,0xff,0xe4,0xb5,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-+	0x57,0x04,0x01,0x00,0xc6,0xd5,0x13,0xe4,0xa8,0x59,0xe3,0xe2,0x54,0xe2,0x5b,0x4f,
-+	0xc1,0xe0,0x87,0x4d,0xcf,0x06,0x01,0x00,0xd4,0xb8,0xd3,0x27,0xe2,0x89,0x9f,0xe1,
-+	0x91,0x8d,0xe0,0x21,0x71,0xcf,0x86,0xc5,0xe4,0x80,0x69,0xe3,0xcb,0x64,0xe2,0x61,
-+	0x62,0xe1,0x94,0x61,0xe0,0x59,0x61,0xcf,0x86,0xe5,0x1e,0x61,0x64,0x01,0x61,0x0b,
-+	0x00,0xd2,0x0e,0xe1,0x3f,0xa0,0xe0,0xba,0x9f,0xcf,0x86,0xcf,0x06,0x01,0x00,0xd1,
-+	0x0c,0xe0,0x1e,0xa5,0xcf,0x86,0xcf,0x06,0x02,0xff,0xff,0xd0,0x08,0xcf,0x86,0xcf,
-+	0x06,0x01,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x01,0x00,0xe4,0x1b,0xb6,0xe3,0x95,
-+	0xad,0xd2,0x06,0xcf,0x06,0x01,0x00,0xe1,0x87,0xa9,0xd0,0x21,0xcf,0x86,0xe5,0x81,
-+	0xa6,0xe4,0x00,0xa6,0xe3,0xbf,0xa5,0xe2,0x9e,0xa5,0xe1,0x8d,0xa5,0x10,0x08,0x01,
-+	0xff,0xe8,0xb1,0x88,0x00,0x01,0xff,0xe6,0x9b,0xb4,0x00,0xcf,0x86,0xe5,0x63,0xa8,
-+	0xd4,0x19,0xe3,0xa2,0xa7,0xe2,0x81,0xa7,0xe1,0x70,0xa7,0x10,0x08,0x01,0xff,0xe9,
-+	0xb9,0xbf,0x00,0x01,0xff,0xe8,0xab,0x96,0x00,0xe3,0x09,0xa8,0xe2,0xe8,0xa7,0xe1,
-+	0xd7,0xa7,0x10,0x08,0x01,0xff,0xe7,0xb8,0xb7,0x00,0x01,0xff,0xe9,0x9b,0xbb,0x00,
-+	0x83,0xe2,0xee,0xf5,0xe1,0xd8,0xf2,0xe0,0x55,0xf1,0xcf,0x86,0xd5,0x31,0xc4,0xe3,
-+	0xd5,0xcb,0xe2,0xae,0xc9,0xe1,0x8f,0xc8,0xe0,0x1f,0xbf,0xcf,0x86,0xe5,0x12,0xbb,
-+	0xe4,0x0b,0xba,0xe3,0xfc,0xb8,0xe2,0x53,0xb8,0xe1,0x2e,0xb8,0xe0,0x07,0xb8,0xcf,
-+	0x86,0xe5,0xd4,0xb7,0x94,0x07,0x63,0xbf,0xb7,0x07,0x00,0x07,0x00,0xe4,0xc1,0xf0,
-+	0xd3,0x08,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd2,0x0b,0xe1,0xd0,0xdd,0xcf,0x86,0xcf,
-+	0x06,0x05,0x00,0xd1,0x0e,0xe0,0xbf,0xde,0xcf,0x86,0xe5,0x84,0xde,0xcf,0x06,0x11,
-+	0x00,0xd0,0x0b,0xcf,0x86,0xe5,0xbf,0xde,0xcf,0x06,0x13,0x00,0xcf,0x86,0xd5,0x06,
-+	0xcf,0x06,0x00,0x00,0xe4,0x5a,0xf0,0xe3,0x43,0xef,0xd2,0xa0,0xe1,0xf9,0xe2,0xd0,
-+	0x21,0xcf,0x86,0xe5,0xfa,0xdf,0xe4,0x76,0xdf,0xe3,0x34,0xdf,0xe2,0x13,0xdf,0xe1,
-+	0x01,0xdf,0x10,0x08,0x05,0xff,0xe4,0xb8,0xbd,0x00,0x05,0xff,0xe4,0xb8,0xb8,0x00,
-+	0xcf,0x86,0xd5,0x1c,0xe4,0x56,0xe1,0xe3,0x15,0xe1,0xe2,0xf4,0xe0,0xe1,0xe3,0xe0,
-+	0x10,0x08,0x05,0xff,0xe5,0x92,0xa2,0x00,0x05,0xff,0xe5,0x93,0xb6,0x00,0xd4,0x34,
-+	0xd3,0x18,0xe2,0xdd,0xe1,0xe1,0xcc,0xe1,0x10,0x09,0x05,0xff,0xf0,0xa1,0x9a,0xa8,
-+	0x00,0x05,0xff,0xf0,0xa1,0x9b,0xaa,0x00,0xe2,0xfd,0xe1,0x91,0x11,0x10,0x09,0x05,
-+	0xff,0xf0,0xa1,0x8d,0xaa,0x00,0x05,0xff,0xe5,0xac,0x88,0x00,0x05,0xff,0xe5,0xac,
-+	0xbe,0x00,0xe3,0x43,0xe2,0xd2,0x14,0xe1,0x12,0xe2,0x10,0x08,0x05,0xff,0xe5,0xaf,
-+	0xb3,0x00,0x05,0xff,0xf0,0xa1,0xac,0x98,0x00,0xe1,0x1e,0xe2,0x10,0x08,0x05,0xff,
-+	0xe5,0xbc,0xb3,0x00,0x05,0xff,0xe5,0xb0,0xa2,0x00,0xd1,0xd5,0xd0,0x6a,0xcf,0x86,
-+	0xe5,0x73,0xe7,0xd4,0x19,0xe3,0xac,0xe6,0xe2,0x8a,0xe6,0xe1,0x79,0xe6,0x10,0x08,
-+	0x05,0xff,0xe6,0xb4,0xbe,0x00,0x05,0xff,0xe6,0xb5,0xb7,0x00,0xd3,0x18,0xe2,0xf6,
-+	0xe6,0xe1,0xe5,0xe6,0x10,0x09,0x05,0xff,0xf0,0xa3,0xbd,0x9e,0x00,0x05,0xff,0xf0,
-+	0xa3,0xbe,0x8e,0x00,0xd2,0x13,0xe1,0x0e,0xe7,0x10,0x08,0x05,0xff,0xe7,0x81,0xbd,
-+	0x00,0x05,0xff,0xe7,0x81,0xb7,0x00,0xd1,0x11,0x10,0x08,0x05,0xff,0xe7,0x85,0x85,
-+	0x00,0x05,0xff,0xf0,0xa4,0x89,0xa3,0x00,0x10,0x08,0x05,0xff,0xe7,0x86,0x9c,0x00,
-+	0x05,0xff,0xe4,0x8e,0xab,0x00,0xcf,0x86,0xe5,0x10,0xe9,0xd4,0x1a,0xe3,0x48,0xe8,
-+	0xe2,0x2e,0xe8,0xe1,0x1b,0xe8,0x10,0x08,0x05,0xff,0xe7,0x9b,0xb4,0x00,0x05,0xff,
-+	0xf0,0xa5,0x83,0xb3,0x00,0xd3,0x16,0xe2,0x90,0xe8,0xe1,0x7e,0xe8,0x10,0x08,0x05,
-+	0xff,0xe7,0xa3,0x8c,0x00,0x05,0xff,0xe4,0x83,0xa3,0x00,0xd2,0x13,0xe1,0xac,0xe8,
-+	0x10,0x08,0x05,0xff,0xe4,0x84,0xaf,0x00,0x05,0xff,0xe7,0xa9,0x80,0x00,0xd1,0x12,
-+	0x10,0x09,0x05,0xff,0xf0,0xa5,0xa5,0xbc,0x00,0x05,0xff,0xf0,0xa5,0xaa,0xa7,0x00,
-+	0x10,0x09,0x05,0xff,0xf0,0xa5,0xaa,0xa7,0x00,0x05,0xff,0xe7,0xaa,0xae,0x00,0xe0,
-+	0xc2,0xeb,0xcf,0x86,0xd5,0x1d,0xe4,0x37,0xea,0xe3,0xf3,0xe9,0xe2,0xd1,0xe9,0xe1,
-+	0xc0,0xe9,0x10,0x09,0x05,0xff,0xf0,0xa3,0x8d,0x9f,0x00,0x05,0xff,0xe4,0x8f,0x95,
-+	0x00,0xd4,0x19,0xe3,0xde,0xea,0xe2,0xba,0xea,0xe1,0xa9,0xea,0x10,0x08,0x05,0xff,
-+	0xe8,0x8d,0x93,0x00,0x05,0xff,0xe8,0x8f,0x8a,0x00,0xd3,0x18,0xe2,0x29,0xeb,0xe1,
-+	0x18,0xeb,0x10,0x09,0x05,0xff,0xf0,0xa6,0xbe,0xb1,0x00,0x05,0xff,0xf0,0xa7,0x83,
-+	0x92,0x00,0xd2,0x13,0xe1,0x41,0xeb,0x10,0x08,0x05,0xff,0xe8,0x9a,0x88,0x00,0x05,
-+	0xff,0xe8,0x9c,0x8e,0x00,0xd1,0x10,0x10,0x08,0x05,0xff,0xe8,0x9c,0xa8,0x00,0x05,
-+	0xff,0xe8,0x9d,0xab,0x00,0x10,0x08,0x05,0xff,0xe8,0x9e,0x86,0x00,0x05,0xff,0xe4,
-+	0xb5,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 	/* nfdicf_30200 */
--	0xd7,0x07,0x66,0x84,0x05,0x01,0x00,0xc6,0xd5,0x16,0xe4,0x99,0x13,0xe3,0x63,0x0e,
--	0xe2,0x4c,0x07,0xc1,0xe0,0x4e,0x06,0xcf,0x86,0x65,0x2d,0x06,0x01,0x00,0xd4,0x2a,
--	0xe3,0xd0,0x35,0xe2,0x88,0x9c,0xe1,0xcd,0x2e,0xe0,0x2b,0x1b,0xcf,0x86,0xc5,0xe4,
--	0x14,0x66,0xe3,0x5f,0x61,0xe2,0xf5,0x5e,0xe1,0x28,0x5e,0xe0,0xed,0x5d,0xcf,0x86,
--	0xe5,0xb2,0x5d,0x64,0x95,0x5d,0x0b,0x00,0x83,0xe2,0xa7,0xf3,0xe1,0x80,0xf0,0xe0,
--	0xfd,0xee,0xcf,0x86,0xd5,0x31,0xc4,0xe3,0xe2,0x47,0xe2,0x83,0x46,0xe1,0x32,0xc6,
--	0xe0,0x2a,0x45,0xcf,0x86,0xe5,0x1c,0x43,0xe4,0x3d,0x40,0xe3,0x9f,0xb6,0xe2,0xf6,
--	0xb5,0xe1,0xd1,0xb5,0xe0,0xaa,0xb5,0xcf,0x86,0xe5,0x77,0xb5,0x94,0x07,0x63,0x62,
--	0xb5,0x07,0x00,0x07,0x00,0xe4,0x69,0xee,0xd3,0x08,0xcf,0x86,0xcf,0x06,0x05,0x00,
--	0xd2,0x0b,0xe1,0x78,0xdb,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd1,0x0e,0xe0,0x67,0xdc,
--	0xcf,0x86,0xe5,0x2c,0xdc,0xcf,0x06,0x11,0x00,0xd0,0x0b,0xcf,0x86,0xe5,0x67,0xdc,
--	0xcf,0x06,0x13,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x00,0x00,0xe4,0x02,0xee,0xe3,
--	0xeb,0xec,0xd2,0xa0,0xe1,0xa1,0xe0,0xd0,0x21,0xcf,0x86,0xe5,0xa2,0xdd,0xe4,0x1e,
--	0xdd,0xe3,0xdc,0xdc,0xe2,0xbb,0xdc,0xe1,0xa9,0xdc,0x10,0x08,0x05,0xff,0xe4,0xb8,
--	0xbd,0x00,0x05,0xff,0xe4,0xb8,0xb8,0x00,0xcf,0x86,0xd5,0x1c,0xe4,0xfe,0xde,0xe3,
--	0xbd,0xde,0xe2,0x9c,0xde,0xe1,0x8b,0xde,0x10,0x08,0x05,0xff,0xe5,0x92,0xa2,0x00,
--	0x05,0xff,0xe5,0x93,0xb6,0x00,0xd4,0x34,0xd3,0x18,0xe2,0x85,0xdf,0xe1,0x74,0xdf,
-+	0xd7,0x07,0x66,0x84,0x05,0x01,0x00,0xc6,0xd5,0x16,0xe4,0x96,0x13,0xe3,0x60,0x0e,
-+	0xe2,0x49,0x07,0xc1,0xe0,0x4b,0x06,0xcf,0x86,0x65,0x2d,0x06,0x01,0x00,0xd4,0x2a,
-+	0xe3,0xce,0x35,0xe2,0x02,0x9c,0xe1,0xca,0x2e,0xe0,0x28,0x1b,0xcf,0x86,0xc5,0xe4,
-+	0xf9,0x65,0xe3,0x44,0x61,0xe2,0xda,0x5e,0xe1,0x0d,0x5e,0xe0,0xd2,0x5d,0xcf,0x86,
-+	0xe5,0x97,0x5d,0x64,0x7a,0x5d,0x0b,0x00,0x83,0xe2,0xf6,0xf2,0xe1,0xe0,0xef,0xe0,
-+	0x5d,0xee,0xcf,0x86,0xd5,0x31,0xc4,0xe3,0xdf,0x47,0xe2,0x80,0x46,0xe1,0x97,0xc5,
-+	0xe0,0x27,0x45,0xcf,0x86,0xe5,0x19,0x43,0xe4,0x3a,0x40,0xe3,0x04,0xb6,0xe2,0x5b,
-+	0xb5,0xe1,0x36,0xb5,0xe0,0x0f,0xb5,0xcf,0x86,0xe5,0xdc,0xb4,0x94,0x07,0x63,0xc7,
-+	0xb4,0x07,0x00,0x07,0x00,0xe4,0xc9,0xed,0xd3,0x08,0xcf,0x86,0xcf,0x06,0x05,0x00,
-+	0xd2,0x0b,0xe1,0xd8,0xda,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd1,0x0e,0xe0,0xc7,0xdb,
-+	0xcf,0x86,0xe5,0x8c,0xdb,0xcf,0x06,0x11,0x00,0xd0,0x0b,0xcf,0x86,0xe5,0xc7,0xdb,
-+	0xcf,0x06,0x13,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x00,0x00,0xe4,0x62,0xed,0xe3,
-+	0x4b,0xec,0xd2,0xa0,0xe1,0x01,0xe0,0xd0,0x21,0xcf,0x86,0xe5,0x02,0xdd,0xe4,0x7e,
-+	0xdc,0xe3,0x3c,0xdc,0xe2,0x1b,0xdc,0xe1,0x09,0xdc,0x10,0x08,0x05,0xff,0xe4,0xb8,
-+	0xbd,0x00,0x05,0xff,0xe4,0xb8,0xb8,0x00,0xcf,0x86,0xd5,0x1c,0xe4,0x5e,0xde,0xe3,
-+	0x1d,0xde,0xe2,0xfc,0xdd,0xe1,0xeb,0xdd,0x10,0x08,0x05,0xff,0xe5,0x92,0xa2,0x00,
-+	0x05,0xff,0xe5,0x93,0xb6,0x00,0xd4,0x34,0xd3,0x18,0xe2,0xe5,0xde,0xe1,0xd4,0xde,
- 	0x10,0x09,0x05,0xff,0xf0,0xa1,0x9a,0xa8,0x00,0x05,0xff,0xf0,0xa1,0x9b,0xaa,0x00,
--	0xe2,0xa5,0xdf,0x91,0x11,0x10,0x09,0x05,0xff,0xf0,0xa1,0x8d,0xaa,0x00,0x05,0xff,
--	0xe5,0xac,0x88,0x00,0x05,0xff,0xe5,0xac,0xbe,0x00,0xe3,0xeb,0xdf,0xd2,0x14,0xe1,
--	0xba,0xdf,0x10,0x08,0x05,0xff,0xe5,0xaf,0xb3,0x00,0x05,0xff,0xf0,0xa1,0xac,0x98,
--	0x00,0xe1,0xc6,0xdf,0x10,0x08,0x05,0xff,0xe5,0xbc,0xb3,0x00,0x05,0xff,0xe5,0xb0,
--	0xa2,0x00,0xd1,0xd5,0xd0,0x6a,0xcf,0x86,0xe5,0x1b,0xe5,0xd4,0x19,0xe3,0x54,0xe4,
--	0xe2,0x32,0xe4,0xe1,0x21,0xe4,0x10,0x08,0x05,0xff,0xe6,0xb4,0xbe,0x00,0x05,0xff,
--	0xe6,0xb5,0xb7,0x00,0xd3,0x18,0xe2,0x9e,0xe4,0xe1,0x8d,0xe4,0x10,0x09,0x05,0xff,
--	0xf0,0xa3,0xbd,0x9e,0x00,0x05,0xff,0xf0,0xa3,0xbe,0x8e,0x00,0xd2,0x13,0xe1,0xb6,
-+	0xe2,0x05,0xdf,0x91,0x11,0x10,0x09,0x05,0xff,0xf0,0xa1,0x8d,0xaa,0x00,0x05,0xff,
-+	0xe5,0xac,0x88,0x00,0x05,0xff,0xe5,0xac,0xbe,0x00,0xe3,0x4b,0xdf,0xd2,0x14,0xe1,
-+	0x1a,0xdf,0x10,0x08,0x05,0xff,0xe5,0xaf,0xb3,0x00,0x05,0xff,0xf0,0xa1,0xac,0x98,
-+	0x00,0xe1,0x26,0xdf,0x10,0x08,0x05,0xff,0xe5,0xbc,0xb3,0x00,0x05,0xff,0xe5,0xb0,
-+	0xa2,0x00,0xd1,0xd5,0xd0,0x6a,0xcf,0x86,0xe5,0x7b,0xe4,0xd4,0x19,0xe3,0xb4,0xe3,
-+	0xe2,0x92,0xe3,0xe1,0x81,0xe3,0x10,0x08,0x05,0xff,0xe6,0xb4,0xbe,0x00,0x05,0xff,
-+	0xe6,0xb5,0xb7,0x00,0xd3,0x18,0xe2,0xfe,0xe3,0xe1,0xed,0xe3,0x10,0x09,0x05,0xff,
-+	0xf0,0xa3,0xbd,0x9e,0x00,0x05,0xff,0xf0,0xa3,0xbe,0x8e,0x00,0xd2,0x13,0xe1,0x16,
- 	0xe4,0x10,0x08,0x05,0xff,0xe7,0x81,0xbd,0x00,0x05,0xff,0xe7,0x81,0xb7,0x00,0xd1,
- 	0x11,0x10,0x08,0x05,0xff,0xe7,0x85,0x85,0x00,0x05,0xff,0xf0,0xa4,0x89,0xa3,0x00,
- 	0x10,0x08,0x05,0xff,0xe7,0x86,0x9c,0x00,0x05,0xff,0xe4,0x8e,0xab,0x00,0xcf,0x86,
--	0xe5,0xb8,0xe6,0xd4,0x1a,0xe3,0xf0,0xe5,0xe2,0xd6,0xe5,0xe1,0xc3,0xe5,0x10,0x08,
-+	0xe5,0x18,0xe6,0xd4,0x1a,0xe3,0x50,0xe5,0xe2,0x36,0xe5,0xe1,0x23,0xe5,0x10,0x08,
- 	0x05,0xff,0xe7,0x9b,0xb4,0x00,0x05,0xff,0xf0,0xa5,0x83,0xb3,0x00,0xd3,0x16,0xe2,
--	0x38,0xe6,0xe1,0x26,0xe6,0x10,0x08,0x05,0xff,0xe7,0xa3,0x8c,0x00,0x05,0xff,0xe4,
--	0x83,0xa3,0x00,0xd2,0x13,0xe1,0x54,0xe6,0x10,0x08,0x05,0xff,0xe4,0x84,0xaf,0x00,
-+	0x98,0xe5,0xe1,0x86,0xe5,0x10,0x08,0x05,0xff,0xe7,0xa3,0x8c,0x00,0x05,0xff,0xe4,
-+	0x83,0xa3,0x00,0xd2,0x13,0xe1,0xb4,0xe5,0x10,0x08,0x05,0xff,0xe4,0x84,0xaf,0x00,
- 	0x05,0xff,0xe7,0xa9,0x80,0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0xa5,0xa5,0xbc,
- 	0x00,0x05,0xff,0xf0,0xa5,0xaa,0xa7,0x00,0x10,0x09,0x05,0xff,0xf0,0xa5,0xaa,0xa7,
--	0x00,0x05,0xff,0xe7,0xaa,0xae,0x00,0xe0,0x6a,0xe9,0xcf,0x86,0xd5,0x1d,0xe4,0xdf,
--	0xe7,0xe3,0x9b,0xe7,0xe2,0x79,0xe7,0xe1,0x68,0xe7,0x10,0x09,0x05,0xff,0xf0,0xa3,
--	0x8d,0x9f,0x00,0x05,0xff,0xe4,0x8f,0x95,0x00,0xd4,0x19,0xe3,0x86,0xe8,0xe2,0x62,
--	0xe8,0xe1,0x51,0xe8,0x10,0x08,0x05,0xff,0xe8,0x8d,0x93,0x00,0x05,0xff,0xe8,0x8f,
--	0x8a,0x00,0xd3,0x18,0xe2,0xd1,0xe8,0xe1,0xc0,0xe8,0x10,0x09,0x05,0xff,0xf0,0xa6,
--	0xbe,0xb1,0x00,0x05,0xff,0xf0,0xa7,0x83,0x92,0x00,0xd2,0x13,0xe1,0xe9,0xe8,0x10,
-+	0x00,0x05,0xff,0xe7,0xaa,0xae,0x00,0xe0,0xca,0xe8,0xcf,0x86,0xd5,0x1d,0xe4,0x3f,
-+	0xe7,0xe3,0xfb,0xe6,0xe2,0xd9,0xe6,0xe1,0xc8,0xe6,0x10,0x09,0x05,0xff,0xf0,0xa3,
-+	0x8d,0x9f,0x00,0x05,0xff,0xe4,0x8f,0x95,0x00,0xd4,0x19,0xe3,0xe6,0xe7,0xe2,0xc2,
-+	0xe7,0xe1,0xb1,0xe7,0x10,0x08,0x05,0xff,0xe8,0x8d,0x93,0x00,0x05,0xff,0xe8,0x8f,
-+	0x8a,0x00,0xd3,0x18,0xe2,0x31,0xe8,0xe1,0x20,0xe8,0x10,0x09,0x05,0xff,0xf0,0xa6,
-+	0xbe,0xb1,0x00,0x05,0xff,0xf0,0xa7,0x83,0x92,0x00,0xd2,0x13,0xe1,0x49,0xe8,0x10,
- 	0x08,0x05,0xff,0xe8,0x9a,0x88,0x00,0x05,0xff,0xe8,0x9c,0x8e,0x00,0xd1,0x10,0x10,
- 	0x08,0x05,0xff,0xe8,0x9c,0xa8,0x00,0x05,0xff,0xe8,0x9d,0xab,0x00,0x10,0x08,0x05,
- 	0xff,0xe8,0x9e,0x86,0x00,0x05,0xff,0xe4,0xb5,0x97,0x00,0x00,0x00,0x00,0x00,0x00,
- 	/* nfdi_30200 */
--	0x57,0x04,0x01,0x00,0xc6,0xd5,0x16,0xe4,0x82,0x53,0xe3,0xbb,0x4e,0xe2,0x34,0x49,
--	0xc1,0xe0,0x60,0x47,0xcf,0x86,0x65,0x44,0x47,0x01,0x00,0xd4,0x2a,0xe3,0x1c,0x9a,
--	0xe2,0xcb,0x99,0xe1,0x9e,0x87,0xe0,0xf8,0x6a,0xcf,0x86,0xc5,0xe4,0x57,0x63,0xe3,
--	0xa2,0x5e,0xe2,0x38,0x5c,0xe1,0x6b,0x5b,0xe0,0x30,0x5b,0xcf,0x86,0xe5,0xf5,0x5a,
--	0x64,0xd8,0x5a,0x0b,0x00,0x83,0xe2,0xea,0xf0,0xe1,0xc3,0xed,0xe0,0x40,0xec,0xcf,
--	0x86,0xd5,0x31,0xc4,0xe3,0xbb,0xc6,0xe2,0x94,0xc4,0xe1,0x75,0xc3,0xe0,0x05,0xba,
--	0xcf,0x86,0xe5,0xf8,0xb5,0xe4,0xf1,0xb4,0xe3,0xe2,0xb3,0xe2,0x39,0xb3,0xe1,0x14,
--	0xb3,0xe0,0xed,0xb2,0xcf,0x86,0xe5,0xba,0xb2,0x94,0x07,0x63,0xa5,0xb2,0x07,0x00,
--	0x07,0x00,0xe4,0xac,0xeb,0xd3,0x08,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd2,0x0b,0xe1,
--	0xbb,0xd8,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd1,0x0e,0xe0,0xaa,0xd9,0xcf,0x86,0xe5,
--	0x6f,0xd9,0xcf,0x06,0x11,0x00,0xd0,0x0b,0xcf,0x86,0xe5,0xaa,0xd9,0xcf,0x06,0x13,
--	0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x00,0x00,0xe4,0x45,0xeb,0xe3,0x2e,0xea,0xd2,
--	0xa0,0xe1,0xe4,0xdd,0xd0,0x21,0xcf,0x86,0xe5,0xe5,0xda,0xe4,0x61,0xda,0xe3,0x1f,
--	0xda,0xe2,0xfe,0xd9,0xe1,0xec,0xd9,0x10,0x08,0x05,0xff,0xe4,0xb8,0xbd,0x00,0x05,
--	0xff,0xe4,0xb8,0xb8,0x00,0xcf,0x86,0xd5,0x1c,0xe4,0x41,0xdc,0xe3,0x00,0xdc,0xe2,
--	0xdf,0xdb,0xe1,0xce,0xdb,0x10,0x08,0x05,0xff,0xe5,0x92,0xa2,0x00,0x05,0xff,0xe5,
--	0x93,0xb6,0x00,0xd4,0x34,0xd3,0x18,0xe2,0xc8,0xdc,0xe1,0xb7,0xdc,0x10,0x09,0x05,
--	0xff,0xf0,0xa1,0x9a,0xa8,0x00,0x05,0xff,0xf0,0xa1,0x9b,0xaa,0x00,0xe2,0xe8,0xdc,
--	0x91,0x11,0x10,0x09,0x05,0xff,0xf0,0xa1,0x8d,0xaa,0x00,0x05,0xff,0xe5,0xac,0x88,
--	0x00,0x05,0xff,0xe5,0xac,0xbe,0x00,0xe3,0x2e,0xdd,0xd2,0x14,0xe1,0xfd,0xdc,0x10,
--	0x08,0x05,0xff,0xe5,0xaf,0xb3,0x00,0x05,0xff,0xf0,0xa1,0xac,0x98,0x00,0xe1,0x09,
--	0xdd,0x10,0x08,0x05,0xff,0xe5,0xbc,0xb3,0x00,0x05,0xff,0xe5,0xb0,0xa2,0x00,0xd1,
--	0xd5,0xd0,0x6a,0xcf,0x86,0xe5,0x5e,0xe2,0xd4,0x19,0xe3,0x97,0xe1,0xe2,0x75,0xe1,
--	0xe1,0x64,0xe1,0x10,0x08,0x05,0xff,0xe6,0xb4,0xbe,0x00,0x05,0xff,0xe6,0xb5,0xb7,
--	0x00,0xd3,0x18,0xe2,0xe1,0xe1,0xe1,0xd0,0xe1,0x10,0x09,0x05,0xff,0xf0,0xa3,0xbd,
--	0x9e,0x00,0x05,0xff,0xf0,0xa3,0xbe,0x8e,0x00,0xd2,0x13,0xe1,0xf9,0xe1,0x10,0x08,
--	0x05,0xff,0xe7,0x81,0xbd,0x00,0x05,0xff,0xe7,0x81,0xb7,0x00,0xd1,0x11,0x10,0x08,
--	0x05,0xff,0xe7,0x85,0x85,0x00,0x05,0xff,0xf0,0xa4,0x89,0xa3,0x00,0x10,0x08,0x05,
--	0xff,0xe7,0x86,0x9c,0x00,0x05,0xff,0xe4,0x8e,0xab,0x00,0xcf,0x86,0xe5,0xfb,0xe3,
--	0xd4,0x1a,0xe3,0x33,0xe3,0xe2,0x19,0xe3,0xe1,0x06,0xe3,0x10,0x08,0x05,0xff,0xe7,
--	0x9b,0xb4,0x00,0x05,0xff,0xf0,0xa5,0x83,0xb3,0x00,0xd3,0x16,0xe2,0x7b,0xe3,0xe1,
--	0x69,0xe3,0x10,0x08,0x05,0xff,0xe7,0xa3,0x8c,0x00,0x05,0xff,0xe4,0x83,0xa3,0x00,
--	0xd2,0x13,0xe1,0x97,0xe3,0x10,0x08,0x05,0xff,0xe4,0x84,0xaf,0x00,0x05,0xff,0xe7,
--	0xa9,0x80,0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0xa5,0xa5,0xbc,0x00,0x05,0xff,
--	0xf0,0xa5,0xaa,0xa7,0x00,0x10,0x09,0x05,0xff,0xf0,0xa5,0xaa,0xa7,0x00,0x05,0xff,
--	0xe7,0xaa,0xae,0x00,0xe0,0xad,0xe6,0xcf,0x86,0xd5,0x1d,0xe4,0x22,0xe5,0xe3,0xde,
--	0xe4,0xe2,0xbc,0xe4,0xe1,0xab,0xe4,0x10,0x09,0x05,0xff,0xf0,0xa3,0x8d,0x9f,0x00,
--	0x05,0xff,0xe4,0x8f,0x95,0x00,0xd4,0x19,0xe3,0xc9,0xe5,0xe2,0xa5,0xe5,0xe1,0x94,
--	0xe5,0x10,0x08,0x05,0xff,0xe8,0x8d,0x93,0x00,0x05,0xff,0xe8,0x8f,0x8a,0x00,0xd3,
--	0x18,0xe2,0x14,0xe6,0xe1,0x03,0xe6,0x10,0x09,0x05,0xff,0xf0,0xa6,0xbe,0xb1,0x00,
--	0x05,0xff,0xf0,0xa7,0x83,0x92,0x00,0xd2,0x13,0xe1,0x2c,0xe6,0x10,0x08,0x05,0xff,
--	0xe8,0x9a,0x88,0x00,0x05,0xff,0xe8,0x9c,0x8e,0x00,0xd1,0x10,0x10,0x08,0x05,0xff,
--	0xe8,0x9c,0xa8,0x00,0x05,0xff,0xe8,0x9d,0xab,0x00,0x10,0x08,0x05,0xff,0xe8,0x9e,
--	0x86,0x00,0x05,0xff,0xe4,0xb5,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-+	0x57,0x04,0x01,0x00,0xc6,0xd5,0x13,0xe4,0x68,0x53,0xe3,0xa2,0x4e,0xe2,0x1b,0x49,
-+	0xc1,0xe0,0x47,0x47,0xcf,0x06,0x01,0x00,0xd4,0x2a,0xe3,0x99,0x99,0xe2,0x48,0x99,
-+	0xe1,0x50,0x87,0xe0,0xe0,0x6a,0xcf,0x86,0xc5,0xe4,0x3f,0x63,0xe3,0x8a,0x5e,0xe2,
-+	0x20,0x5c,0xe1,0x53,0x5b,0xe0,0x18,0x5b,0xcf,0x86,0xe5,0xdd,0x5a,0x64,0xc0,0x5a,
-+	0x0b,0x00,0x83,0xe2,0x3c,0xf0,0xe1,0x26,0xed,0xe0,0xa3,0xeb,0xcf,0x86,0xd5,0x31,
-+	0xc4,0xe3,0x23,0xc6,0xe2,0xfc,0xc3,0xe1,0xdd,0xc2,0xe0,0x6d,0xb9,0xcf,0x86,0xe5,
-+	0x60,0xb5,0xe4,0x59,0xb4,0xe3,0x4a,0xb3,0xe2,0xa1,0xb2,0xe1,0x7c,0xb2,0xe0,0x55,
-+	0xb2,0xcf,0x86,0xe5,0x22,0xb2,0x94,0x07,0x63,0x0d,0xb2,0x07,0x00,0x07,0x00,0xe4,
-+	0x0f,0xeb,0xd3,0x08,0xcf,0x86,0xcf,0x06,0x05,0x00,0xd2,0x0b,0xe1,0x1e,0xd8,0xcf,
-+	0x86,0xcf,0x06,0x05,0x00,0xd1,0x0e,0xe0,0x0d,0xd9,0xcf,0x86,0xe5,0xd2,0xd8,0xcf,
-+	0x06,0x11,0x00,0xd0,0x0b,0xcf,0x86,0xe5,0x0d,0xd9,0xcf,0x06,0x13,0x00,0xcf,0x86,
-+	0xd5,0x06,0xcf,0x06,0x00,0x00,0xe4,0xa8,0xea,0xe3,0x91,0xe9,0xd2,0xa0,0xe1,0x47,
-+	0xdd,0xd0,0x21,0xcf,0x86,0xe5,0x48,0xda,0xe4,0xc4,0xd9,0xe3,0x82,0xd9,0xe2,0x61,
-+	0xd9,0xe1,0x4f,0xd9,0x10,0x08,0x05,0xff,0xe4,0xb8,0xbd,0x00,0x05,0xff,0xe4,0xb8,
-+	0xb8,0x00,0xcf,0x86,0xd5,0x1c,0xe4,0xa4,0xdb,0xe3,0x63,0xdb,0xe2,0x42,0xdb,0xe1,
-+	0x31,0xdb,0x10,0x08,0x05,0xff,0xe5,0x92,0xa2,0x00,0x05,0xff,0xe5,0x93,0xb6,0x00,
-+	0xd4,0x34,0xd3,0x18,0xe2,0x2b,0xdc,0xe1,0x1a,0xdc,0x10,0x09,0x05,0xff,0xf0,0xa1,
-+	0x9a,0xa8,0x00,0x05,0xff,0xf0,0xa1,0x9b,0xaa,0x00,0xe2,0x4b,0xdc,0x91,0x11,0x10,
-+	0x09,0x05,0xff,0xf0,0xa1,0x8d,0xaa,0x00,0x05,0xff,0xe5,0xac,0x88,0x00,0x05,0xff,
-+	0xe5,0xac,0xbe,0x00,0xe3,0x91,0xdc,0xd2,0x14,0xe1,0x60,0xdc,0x10,0x08,0x05,0xff,
-+	0xe5,0xaf,0xb3,0x00,0x05,0xff,0xf0,0xa1,0xac,0x98,0x00,0xe1,0x6c,0xdc,0x10,0x08,
-+	0x05,0xff,0xe5,0xbc,0xb3,0x00,0x05,0xff,0xe5,0xb0,0xa2,0x00,0xd1,0xd5,0xd0,0x6a,
-+	0xcf,0x86,0xe5,0xc1,0xe1,0xd4,0x19,0xe3,0xfa,0xe0,0xe2,0xd8,0xe0,0xe1,0xc7,0xe0,
-+	0x10,0x08,0x05,0xff,0xe6,0xb4,0xbe,0x00,0x05,0xff,0xe6,0xb5,0xb7,0x00,0xd3,0x18,
-+	0xe2,0x44,0xe1,0xe1,0x33,0xe1,0x10,0x09,0x05,0xff,0xf0,0xa3,0xbd,0x9e,0x00,0x05,
-+	0xff,0xf0,0xa3,0xbe,0x8e,0x00,0xd2,0x13,0xe1,0x5c,0xe1,0x10,0x08,0x05,0xff,0xe7,
-+	0x81,0xbd,0x00,0x05,0xff,0xe7,0x81,0xb7,0x00,0xd1,0x11,0x10,0x08,0x05,0xff,0xe7,
-+	0x85,0x85,0x00,0x05,0xff,0xf0,0xa4,0x89,0xa3,0x00,0x10,0x08,0x05,0xff,0xe7,0x86,
-+	0x9c,0x00,0x05,0xff,0xe4,0x8e,0xab,0x00,0xcf,0x86,0xe5,0x5e,0xe3,0xd4,0x1a,0xe3,
-+	0x96,0xe2,0xe2,0x7c,0xe2,0xe1,0x69,0xe2,0x10,0x08,0x05,0xff,0xe7,0x9b,0xb4,0x00,
-+	0x05,0xff,0xf0,0xa5,0x83,0xb3,0x00,0xd3,0x16,0xe2,0xde,0xe2,0xe1,0xcc,0xe2,0x10,
-+	0x08,0x05,0xff,0xe7,0xa3,0x8c,0x00,0x05,0xff,0xe4,0x83,0xa3,0x00,0xd2,0x13,0xe1,
-+	0xfa,0xe2,0x10,0x08,0x05,0xff,0xe4,0x84,0xaf,0x00,0x05,0xff,0xe7,0xa9,0x80,0x00,
-+	0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0xa5,0xa5,0xbc,0x00,0x05,0xff,0xf0,0xa5,0xaa,
-+	0xa7,0x00,0x10,0x09,0x05,0xff,0xf0,0xa5,0xaa,0xa7,0x00,0x05,0xff,0xe7,0xaa,0xae,
-+	0x00,0xe0,0x10,0xe6,0xcf,0x86,0xd5,0x1d,0xe4,0x85,0xe4,0xe3,0x41,0xe4,0xe2,0x1f,
-+	0xe4,0xe1,0x0e,0xe4,0x10,0x09,0x05,0xff,0xf0,0xa3,0x8d,0x9f,0x00,0x05,0xff,0xe4,
-+	0x8f,0x95,0x00,0xd4,0x19,0xe3,0x2c,0xe5,0xe2,0x08,0xe5,0xe1,0xf7,0xe4,0x10,0x08,
-+	0x05,0xff,0xe8,0x8d,0x93,0x00,0x05,0xff,0xe8,0x8f,0x8a,0x00,0xd3,0x18,0xe2,0x77,
-+	0xe5,0xe1,0x66,0xe5,0x10,0x09,0x05,0xff,0xf0,0xa6,0xbe,0xb1,0x00,0x05,0xff,0xf0,
-+	0xa7,0x83,0x92,0x00,0xd2,0x13,0xe1,0x8f,0xe5,0x10,0x08,0x05,0xff,0xe8,0x9a,0x88,
-+	0x00,0x05,0xff,0xe8,0x9c,0x8e,0x00,0xd1,0x10,0x10,0x08,0x05,0xff,0xe8,0x9c,0xa8,
-+	0x00,0x05,0xff,0xe8,0x9d,0xab,0x00,0x10,0x08,0x05,0xff,0xe8,0x9e,0x86,0x00,0x05,
-+	0xff,0xe4,0xb5,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 	/* nfdicf_c0100 */
- 	0xd7,0xb0,0x56,0x04,0x01,0x00,0x95,0xa8,0xd4,0x5e,0xd3,0x2e,0xd2,0x16,0xd1,0x0a,
- 	0x10,0x04,0x01,0x00,0x01,0xff,0x61,0x00,0x10,0x06,0x01,0xff,0x62,0x00,0x01,0xff,
-@@ -299,3184 +299,3174 @@ static const unsigned char utf8data[64256] = {
- 	0xd1,0x0c,0x10,0x06,0x01,0xff,0x74,0x00,0x01,0xff,0x75,0x00,0x10,0x06,0x01,0xff,
- 	0x76,0x00,0x01,0xff,0x77,0x00,0x92,0x16,0xd1,0x0c,0x10,0x06,0x01,0xff,0x78,0x00,
- 	0x01,0xff,0x79,0x00,0x10,0x06,0x01,0xff,0x7a,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
--	0xc6,0xe5,0xf9,0x14,0xe4,0x6f,0x0d,0xe3,0x39,0x08,0xe2,0x22,0x01,0xc1,0xd0,0x24,
--	0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x07,0x63,0xd8,0x43,0x01,0x00,0x93,0x13,0x52,
--	0x04,0x01,0x00,0x91,0x0b,0x10,0x04,0x01,0x00,0x01,0xff,0xce,0xbc,0x00,0x01,0x00,
--	0x01,0x00,0xcf,0x86,0xe5,0xb3,0x44,0xd4,0x7f,0xd3,0x3f,0xd2,0x20,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0x61,0xcc,0x80,0x00,0x01,0xff,0x61,0xcc,0x81,0x00,0x10,0x08,0x01,
--	0xff,0x61,0xcc,0x82,0x00,0x01,0xff,0x61,0xcc,0x83,0x00,0xd1,0x10,0x10,0x08,0x01,
--	0xff,0x61,0xcc,0x88,0x00,0x01,0xff,0x61,0xcc,0x8a,0x00,0x10,0x07,0x01,0xff,0xc3,
--	0xa6,0x00,0x01,0xff,0x63,0xcc,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
--	0x65,0xcc,0x80,0x00,0x01,0xff,0x65,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,
--	0x82,0x00,0x01,0xff,0x65,0xcc,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,0xcc,
--	0x80,0x00,0x01,0xff,0x69,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x69,0xcc,0x82,0x00,
--	0x01,0xff,0x69,0xcc,0x88,0x00,0xd3,0x3b,0xd2,0x1f,0xd1,0x0f,0x10,0x07,0x01,0xff,
--	0xc3,0xb0,0x00,0x01,0xff,0x6e,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x80,
--	0x00,0x01,0xff,0x6f,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x82,
--	0x00,0x01,0xff,0x6f,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x88,0x00,0x01,
--	0x00,0xd2,0x1f,0xd1,0x0f,0x10,0x07,0x01,0xff,0xc3,0xb8,0x00,0x01,0xff,0x75,0xcc,
--	0x80,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0x81,0x00,0x01,0xff,0x75,0xcc,0x82,0x00,
--	0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0x88,0x00,0x01,0xff,0x79,0xcc,0x81,0x00,
--	0x10,0x07,0x01,0xff,0xc3,0xbe,0x00,0x01,0xff,0x73,0x73,0x00,0xe1,0xd4,0x03,0xe0,
--	0xeb,0x01,0xcf,0x86,0xd5,0xfb,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x01,0xff,0x61,0xcc,0x84,0x00,0x01,0xff,0x61,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,
--	0x61,0xcc,0x86,0x00,0x01,0xff,0x61,0xcc,0x86,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
--	0x61,0xcc,0xa8,0x00,0x01,0xff,0x61,0xcc,0xa8,0x00,0x10,0x08,0x01,0xff,0x63,0xcc,
--	0x81,0x00,0x01,0xff,0x63,0xcc,0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
--	0x63,0xcc,0x82,0x00,0x01,0xff,0x63,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x63,0xcc,
--	0x87,0x00,0x01,0xff,0x63,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x63,0xcc,
--	0x8c,0x00,0x01,0xff,0x63,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x64,0xcc,0x8c,0x00,
--	0x01,0xff,0x64,0xcc,0x8c,0x00,0xd3,0x3b,0xd2,0x1b,0xd1,0x0b,0x10,0x07,0x01,0xff,
--	0xc4,0x91,0x00,0x01,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,0x84,0x00,0x01,0xff,0x65,
--	0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0x86,0x00,0x01,0xff,0x65,
--	0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,0x87,0x00,0x01,0xff,0x65,0xcc,0x87,
--	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0xa8,0x00,0x01,0xff,0x65,
--	0xcc,0xa8,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,0x8c,0x00,0x01,0xff,0x65,0xcc,0x8c,
--	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x67,0xcc,0x82,0x00,0x01,0xff,0x67,0xcc,0x82,
--	0x00,0x10,0x08,0x01,0xff,0x67,0xcc,0x86,0x00,0x01,0xff,0x67,0xcc,0x86,0x00,0xd4,
--	0x7b,0xd3,0x3b,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x67,0xcc,0x87,0x00,0x01,
--	0xff,0x67,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x67,0xcc,0xa7,0x00,0x01,0xff,0x67,
--	0xcc,0xa7,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x68,0xcc,0x82,0x00,0x01,0xff,0x68,
--	0xcc,0x82,0x00,0x10,0x07,0x01,0xff,0xc4,0xa7,0x00,0x01,0x00,0xd2,0x20,0xd1,0x10,
--	0x10,0x08,0x01,0xff,0x69,0xcc,0x83,0x00,0x01,0xff,0x69,0xcc,0x83,0x00,0x10,0x08,
--	0x01,0xff,0x69,0xcc,0x84,0x00,0x01,0xff,0x69,0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,
--	0x01,0xff,0x69,0xcc,0x86,0x00,0x01,0xff,0x69,0xcc,0x86,0x00,0x10,0x08,0x01,0xff,
--	0x69,0xcc,0xa8,0x00,0x01,0xff,0x69,0xcc,0xa8,0x00,0xd3,0x37,0xd2,0x17,0xd1,0x0c,
--	0x10,0x08,0x01,0xff,0x69,0xcc,0x87,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xc4,0xb3,
--	0x00,0x01,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6a,0xcc,0x82,0x00,0x01,0xff,0x6a,
--	0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x6b,0xcc,0xa7,0x00,0x01,0xff,0x6b,0xcc,0xa7,
--	0x00,0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x6c,0xcc,0x81,0x00,0x10,
--	0x08,0x01,0xff,0x6c,0xcc,0x81,0x00,0x01,0xff,0x6c,0xcc,0xa7,0x00,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0x6c,0xcc,0xa7,0x00,0x01,0xff,0x6c,0xcc,0x8c,0x00,0x10,0x08,0x01,
--	0xff,0x6c,0xcc,0x8c,0x00,0x01,0xff,0xc5,0x80,0x00,0xcf,0x86,0xd5,0xed,0xd4,0x72,
--	0xd3,0x37,0xd2,0x17,0xd1,0x0b,0x10,0x04,0x01,0x00,0x01,0xff,0xc5,0x82,0x00,0x10,
--	0x04,0x01,0x00,0x01,0xff,0x6e,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,
--	0xcc,0x81,0x00,0x01,0xff,0x6e,0xcc,0xa7,0x00,0x10,0x08,0x01,0xff,0x6e,0xcc,0xa7,
--	0x00,0x01,0xff,0x6e,0xcc,0x8c,0x00,0xd2,0x1b,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,
--	0xcc,0x8c,0x00,0x01,0xff,0xca,0xbc,0x6e,0x00,0x10,0x07,0x01,0xff,0xc5,0x8b,0x00,
--	0x01,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x84,0x00,0x01,0xff,0x6f,0xcc,
--	0x84,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x86,0x00,0x01,0xff,0x6f,0xcc,0x86,0x00,
--	0xd3,0x3b,0xd2,0x1b,0xd1,0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x8b,0x00,0x01,0xff,
--	0x6f,0xcc,0x8b,0x00,0x10,0x07,0x01,0xff,0xc5,0x93,0x00,0x01,0x00,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0x72,0xcc,0x81,0x00,0x01,0xff,0x72,0xcc,0x81,0x00,0x10,0x08,0x01,
--	0xff,0x72,0xcc,0xa7,0x00,0x01,0xff,0x72,0xcc,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0x72,0xcc,0x8c,0x00,0x01,0xff,0x72,0xcc,0x8c,0x00,0x10,0x08,0x01,
--	0xff,0x73,0xcc,0x81,0x00,0x01,0xff,0x73,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,
--	0xff,0x73,0xcc,0x82,0x00,0x01,0xff,0x73,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x73,
--	0xcc,0xa7,0x00,0x01,0xff,0x73,0xcc,0xa7,0x00,0xd4,0x7b,0xd3,0x3b,0xd2,0x20,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0x73,0xcc,0x8c,0x00,0x01,0xff,0x73,0xcc,0x8c,0x00,0x10,
--	0x08,0x01,0xff,0x74,0xcc,0xa7,0x00,0x01,0xff,0x74,0xcc,0xa7,0x00,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0x74,0xcc,0x8c,0x00,0x01,0xff,0x74,0xcc,0x8c,0x00,0x10,0x07,0x01,
--	0xff,0xc5,0xa7,0x00,0x01,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,
--	0x83,0x00,0x01,0xff,0x75,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0x84,0x00,
--	0x01,0xff,0x75,0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0x86,0x00,
--	0x01,0xff,0x75,0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0x8a,0x00,0x01,0xff,
--	0x75,0xcc,0x8a,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,
--	0x8b,0x00,0x01,0xff,0x75,0xcc,0x8b,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0xa8,0x00,
--	0x01,0xff,0x75,0xcc,0xa8,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x82,0x00,
--	0x01,0xff,0x77,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x79,0xcc,0x82,0x00,0x01,0xff,
--	0x79,0xcc,0x82,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x79,0xcc,0x88,0x00,
--	0x01,0xff,0x7a,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0x81,0x00,0x01,0xff,
--	0x7a,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x7a,0xcc,0x87,0x00,0x01,0xff,
--	0x7a,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0x8c,0x00,0x01,0xff,0x73,0x00,
--	0xe0,0x65,0x01,0xcf,0x86,0xd5,0xb4,0xd4,0x5a,0xd3,0x2f,0xd2,0x16,0xd1,0x0b,0x10,
--	0x04,0x01,0x00,0x01,0xff,0xc9,0x93,0x00,0x10,0x07,0x01,0xff,0xc6,0x83,0x00,0x01,
--	0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xc6,0x85,0x00,0x01,0x00,0x10,0x07,0x01,0xff,
--	0xc9,0x94,0x00,0x01,0xff,0xc6,0x88,0x00,0xd2,0x19,0xd1,0x0b,0x10,0x04,0x01,0x00,
--	0x01,0xff,0xc9,0x96,0x00,0x10,0x07,0x01,0xff,0xc9,0x97,0x00,0x01,0xff,0xc6,0x8c,
--	0x00,0x51,0x04,0x01,0x00,0x10,0x07,0x01,0xff,0xc7,0x9d,0x00,0x01,0xff,0xc9,0x99,
--	0x00,0xd3,0x32,0xd2,0x19,0xd1,0x0e,0x10,0x07,0x01,0xff,0xc9,0x9b,0x00,0x01,0xff,
--	0xc6,0x92,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xc9,0xa0,0x00,0xd1,0x0b,0x10,0x07,
--	0x01,0xff,0xc9,0xa3,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xc9,0xa9,0x00,0x01,0xff,
--	0xc9,0xa8,0x00,0xd2,0x0f,0x91,0x0b,0x10,0x07,0x01,0xff,0xc6,0x99,0x00,0x01,0x00,
--	0x01,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xc9,0xaf,0x00,0x01,0xff,0xc9,0xb2,0x00,
--	0x10,0x04,0x01,0x00,0x01,0xff,0xc9,0xb5,0x00,0xd4,0x5d,0xd3,0x34,0xd2,0x1b,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x9b,0x00,0x01,0xff,0x6f,0xcc,0x9b,0x00,0x10,
--	0x07,0x01,0xff,0xc6,0xa3,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xc6,0xa5,
--	0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xca,0x80,0x00,0x01,0xff,0xc6,0xa8,0x00,0xd2,
--	0x0f,0x91,0x0b,0x10,0x04,0x01,0x00,0x01,0xff,0xca,0x83,0x00,0x01,0x00,0xd1,0x0b,
--	0x10,0x07,0x01,0xff,0xc6,0xad,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xca,0x88,0x00,
--	0x01,0xff,0x75,0xcc,0x9b,0x00,0xd3,0x33,0xd2,0x1d,0xd1,0x0f,0x10,0x08,0x01,0xff,
--	0x75,0xcc,0x9b,0x00,0x01,0xff,0xca,0x8a,0x00,0x10,0x07,0x01,0xff,0xca,0x8b,0x00,
--	0x01,0xff,0xc6,0xb4,0x00,0xd1,0x0b,0x10,0x04,0x01,0x00,0x01,0xff,0xc6,0xb6,0x00,
--	0x10,0x04,0x01,0x00,0x01,0xff,0xca,0x92,0x00,0xd2,0x0f,0x91,0x0b,0x10,0x07,0x01,
--	0xff,0xc6,0xb9,0x00,0x01,0x00,0x01,0x00,0x91,0x0b,0x10,0x07,0x01,0xff,0xc6,0xbd,
--	0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0xd4,0xd4,0x44,0xd3,0x16,0x52,0x04,0x01,
--	0x00,0x51,0x07,0x01,0xff,0xc7,0x86,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xc7,0x89,
--	0x00,0xd2,0x12,0x91,0x0b,0x10,0x07,0x01,0xff,0xc7,0x89,0x00,0x01,0x00,0x01,0xff,
--	0xc7,0x8c,0x00,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x61,0xcc,0x8c,0x00,0x10,
--	0x08,0x01,0xff,0x61,0xcc,0x8c,0x00,0x01,0xff,0x69,0xcc,0x8c,0x00,0xd3,0x46,0xd2,
--	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,0xcc,0x8c,0x00,0x01,0xff,0x6f,0xcc,0x8c,
--	0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x8c,0x00,0x01,0xff,0x75,0xcc,0x8c,0x00,0xd1,
--	0x12,0x10,0x08,0x01,0xff,0x75,0xcc,0x8c,0x00,0x01,0xff,0x75,0xcc,0x88,0xcc,0x84,
--	0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,0x84,0x00,0x01,0xff,0x75,0xcc,0x88,
--	0xcc,0x81,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,0x81,
--	0x00,0x01,0xff,0x75,0xcc,0x88,0xcc,0x8c,0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,
--	0xcc,0x8c,0x00,0x01,0xff,0x75,0xcc,0x88,0xcc,0x80,0x00,0xd1,0x0e,0x10,0x0a,0x01,
--	0xff,0x75,0xcc,0x88,0xcc,0x80,0x00,0x01,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0x88,
--	0xcc,0x84,0x00,0x01,0xff,0x61,0xcc,0x88,0xcc,0x84,0x00,0xd4,0x87,0xd3,0x41,0xd2,
--	0x26,0xd1,0x14,0x10,0x0a,0x01,0xff,0x61,0xcc,0x87,0xcc,0x84,0x00,0x01,0xff,0x61,
--	0xcc,0x87,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,0xc3,0xa6,0xcc,0x84,0x00,0x01,0xff,
--	0xc3,0xa6,0xcc,0x84,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xc7,0xa5,0x00,0x01,0x00,
--	0x10,0x08,0x01,0xff,0x67,0xcc,0x8c,0x00,0x01,0xff,0x67,0xcc,0x8c,0x00,0xd2,0x20,
--	0xd1,0x10,0x10,0x08,0x01,0xff,0x6b,0xcc,0x8c,0x00,0x01,0xff,0x6b,0xcc,0x8c,0x00,
--	0x10,0x08,0x01,0xff,0x6f,0xcc,0xa8,0x00,0x01,0xff,0x6f,0xcc,0xa8,0x00,0xd1,0x14,
--	0x10,0x0a,0x01,0xff,0x6f,0xcc,0xa8,0xcc,0x84,0x00,0x01,0xff,0x6f,0xcc,0xa8,0xcc,
--	0x84,0x00,0x10,0x09,0x01,0xff,0xca,0x92,0xcc,0x8c,0x00,0x01,0xff,0xca,0x92,0xcc,
--	0x8c,0x00,0xd3,0x38,0xd2,0x1a,0xd1,0x0f,0x10,0x08,0x01,0xff,0x6a,0xcc,0x8c,0x00,
--	0x01,0xff,0xc7,0xb3,0x00,0x10,0x07,0x01,0xff,0xc7,0xb3,0x00,0x01,0x00,0xd1,0x10,
--	0x10,0x08,0x01,0xff,0x67,0xcc,0x81,0x00,0x01,0xff,0x67,0xcc,0x81,0x00,0x10,0x07,
--	0x04,0xff,0xc6,0x95,0x00,0x04,0xff,0xc6,0xbf,0x00,0xd2,0x24,0xd1,0x10,0x10,0x08,
--	0x04,0xff,0x6e,0xcc,0x80,0x00,0x04,0xff,0x6e,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,
--	0x61,0xcc,0x8a,0xcc,0x81,0x00,0x01,0xff,0x61,0xcc,0x8a,0xcc,0x81,0x00,0xd1,0x12,
--	0x10,0x09,0x01,0xff,0xc3,0xa6,0xcc,0x81,0x00,0x01,0xff,0xc3,0xa6,0xcc,0x81,0x00,
--	0x10,0x09,0x01,0xff,0xc3,0xb8,0xcc,0x81,0x00,0x01,0xff,0xc3,0xb8,0xcc,0x81,0x00,
--	0xe2,0x31,0x02,0xe1,0xc3,0x44,0xe0,0xc8,0x01,0xcf,0x86,0xd5,0xfb,0xd4,0x80,0xd3,
--	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0x8f,0x00,0x01,0xff,0x61,
--	0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x61,0xcc,0x91,0x00,0x01,0xff,0x61,0xcc,0x91,
--	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0x8f,0x00,0x01,0xff,0x65,0xcc,0x8f,
--	0x00,0x10,0x08,0x01,0xff,0x65,0xcc,0x91,0x00,0x01,0xff,0x65,0xcc,0x91,0x00,0xd2,
--	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,0xcc,0x8f,0x00,0x01,0xff,0x69,0xcc,0x8f,
--	0x00,0x10,0x08,0x01,0xff,0x69,0xcc,0x91,0x00,0x01,0xff,0x69,0xcc,0x91,0x00,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x8f,0x00,0x01,0xff,0x6f,0xcc,0x8f,0x00,0x10,
--	0x08,0x01,0xff,0x6f,0xcc,0x91,0x00,0x01,0xff,0x6f,0xcc,0x91,0x00,0xd3,0x40,0xd2,
--	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x72,0xcc,0x8f,0x00,0x01,0xff,0x72,0xcc,0x8f,
--	0x00,0x10,0x08,0x01,0xff,0x72,0xcc,0x91,0x00,0x01,0xff,0x72,0xcc,0x91,0x00,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0x8f,0x00,0x01,0xff,0x75,0xcc,0x8f,0x00,0x10,
--	0x08,0x01,0xff,0x75,0xcc,0x91,0x00,0x01,0xff,0x75,0xcc,0x91,0x00,0xd2,0x20,0xd1,
--	0x10,0x10,0x08,0x04,0xff,0x73,0xcc,0xa6,0x00,0x04,0xff,0x73,0xcc,0xa6,0x00,0x10,
--	0x08,0x04,0xff,0x74,0xcc,0xa6,0x00,0x04,0xff,0x74,0xcc,0xa6,0x00,0xd1,0x0b,0x10,
--	0x07,0x04,0xff,0xc8,0x9d,0x00,0x04,0x00,0x10,0x08,0x04,0xff,0x68,0xcc,0x8c,0x00,
--	0x04,0xff,0x68,0xcc,0x8c,0x00,0xd4,0x79,0xd3,0x31,0xd2,0x16,0xd1,0x0b,0x10,0x07,
--	0x06,0xff,0xc6,0x9e,0x00,0x07,0x00,0x10,0x07,0x04,0xff,0xc8,0xa3,0x00,0x04,0x00,
--	0xd1,0x0b,0x10,0x07,0x04,0xff,0xc8,0xa5,0x00,0x04,0x00,0x10,0x08,0x04,0xff,0x61,
--	0xcc,0x87,0x00,0x04,0xff,0x61,0xcc,0x87,0x00,0xd2,0x24,0xd1,0x10,0x10,0x08,0x04,
--	0xff,0x65,0xcc,0xa7,0x00,0x04,0xff,0x65,0xcc,0xa7,0x00,0x10,0x0a,0x04,0xff,0x6f,
--	0xcc,0x88,0xcc,0x84,0x00,0x04,0xff,0x6f,0xcc,0x88,0xcc,0x84,0x00,0xd1,0x14,0x10,
--	0x0a,0x04,0xff,0x6f,0xcc,0x83,0xcc,0x84,0x00,0x04,0xff,0x6f,0xcc,0x83,0xcc,0x84,
--	0x00,0x10,0x08,0x04,0xff,0x6f,0xcc,0x87,0x00,0x04,0xff,0x6f,0xcc,0x87,0x00,0xd3,
--	0x27,0xe2,0x21,0x43,0xd1,0x14,0x10,0x0a,0x04,0xff,0x6f,0xcc,0x87,0xcc,0x84,0x00,
--	0x04,0xff,0x6f,0xcc,0x87,0xcc,0x84,0x00,0x10,0x08,0x04,0xff,0x79,0xcc,0x84,0x00,
--	0x04,0xff,0x79,0xcc,0x84,0x00,0xd2,0x13,0x51,0x04,0x08,0x00,0x10,0x08,0x08,0xff,
--	0xe2,0xb1,0xa5,0x00,0x08,0xff,0xc8,0xbc,0x00,0xd1,0x0b,0x10,0x04,0x08,0x00,0x08,
--	0xff,0xc6,0x9a,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0xa6,0x00,0x08,0x00,0xcf,0x86,
--	0x95,0x5f,0x94,0x5b,0xd3,0x2f,0xd2,0x16,0xd1,0x0b,0x10,0x04,0x08,0x00,0x08,0xff,
--	0xc9,0x82,0x00,0x10,0x04,0x09,0x00,0x09,0xff,0xc6,0x80,0x00,0xd1,0x0e,0x10,0x07,
--	0x09,0xff,0xca,0x89,0x00,0x09,0xff,0xca,0x8c,0x00,0x10,0x07,0x09,0xff,0xc9,0x87,
--	0x00,0x09,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x09,0xff,0xc9,0x89,0x00,0x09,0x00,
--	0x10,0x07,0x09,0xff,0xc9,0x8b,0x00,0x09,0x00,0xd1,0x0b,0x10,0x07,0x09,0xff,0xc9,
--	0x8d,0x00,0x09,0x00,0x10,0x07,0x09,0xff,0xc9,0x8f,0x00,0x09,0x00,0x01,0x00,0x01,
--	0x00,0xd1,0x8b,0xd0,0x0c,0xcf,0x86,0xe5,0x10,0x43,0x64,0xef,0x42,0x01,0xe6,0xcf,
--	0x86,0xd5,0x2a,0xe4,0x99,0x43,0xe3,0x7f,0x43,0xd2,0x11,0xe1,0x5e,0x43,0x10,0x07,
--	0x01,0xff,0xcc,0x80,0x00,0x01,0xff,0xcc,0x81,0x00,0xe1,0x65,0x43,0x10,0x09,0x01,
--	0xff,0xcc,0x88,0xcc,0x81,0x00,0x01,0xff,0xce,0xb9,0x00,0xd4,0x0f,0x93,0x0b,0x92,
--	0x07,0x61,0xab,0x43,0x01,0xea,0x06,0xe6,0x06,0xe6,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,
--	0x10,0x07,0x0a,0xff,0xcd,0xb1,0x00,0x0a,0x00,0x10,0x07,0x0a,0xff,0xcd,0xb3,0x00,
--	0x0a,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xca,0xb9,0x00,0x01,0x00,0x10,0x07,0x0a,
--	0xff,0xcd,0xb7,0x00,0x0a,0x00,0xd2,0x07,0x61,0x97,0x43,0x00,0x00,0x51,0x04,0x09,
--	0x00,0x10,0x06,0x01,0xff,0x3b,0x00,0x10,0xff,0xcf,0xb3,0x00,0xe0,0x31,0x01,0xcf,
--	0x86,0xd5,0xd3,0xd4,0x5f,0xd3,0x21,0x52,0x04,0x00,0x00,0xd1,0x0d,0x10,0x04,0x01,
--	0x00,0x01,0xff,0xc2,0xa8,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x81,
--	0x00,0x01,0xff,0xc2,0xb7,0x00,0xd2,0x1f,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb5,
--	0xcc,0x81,0x00,0x01,0xff,0xce,0xb7,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,
--	0xcc,0x81,0x00,0x00,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xce,0xbf,0xcc,0x81,0x00,
--	0x00,0x00,0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,0x01,0xff,0xcf,0x89,0xcc,
--	0x81,0x00,0xd3,0x3c,0xd2,0x20,0xd1,0x12,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x88,
--	0xcc,0x81,0x00,0x01,0xff,0xce,0xb1,0x00,0x10,0x07,0x01,0xff,0xce,0xb2,0x00,0x01,
--	0xff,0xce,0xb3,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xce,0xb4,0x00,0x01,0xff,0xce,
--	0xb5,0x00,0x10,0x07,0x01,0xff,0xce,0xb6,0x00,0x01,0xff,0xce,0xb7,0x00,0xd2,0x1c,
--	0xd1,0x0e,0x10,0x07,0x01,0xff,0xce,0xb8,0x00,0x01,0xff,0xce,0xb9,0x00,0x10,0x07,
--	0x01,0xff,0xce,0xba,0x00,0x01,0xff,0xce,0xbb,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,
--	0xce,0xbc,0x00,0x01,0xff,0xce,0xbd,0x00,0x10,0x07,0x01,0xff,0xce,0xbe,0x00,0x01,
--	0xff,0xce,0xbf,0x00,0xe4,0x85,0x43,0xd3,0x35,0xd2,0x19,0xd1,0x0e,0x10,0x07,0x01,
--	0xff,0xcf,0x80,0x00,0x01,0xff,0xcf,0x81,0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xcf,
--	0x83,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xcf,0x84,0x00,0x01,0xff,0xcf,0x85,0x00,
--	0x10,0x07,0x01,0xff,0xcf,0x86,0x00,0x01,0xff,0xcf,0x87,0x00,0xe2,0x2b,0x43,0xd1,
--	0x0e,0x10,0x07,0x01,0xff,0xcf,0x88,0x00,0x01,0xff,0xcf,0x89,0x00,0x10,0x09,0x01,
--	0xff,0xce,0xb9,0xcc,0x88,0x00,0x01,0xff,0xcf,0x85,0xcc,0x88,0x00,0xcf,0x86,0xd5,
--	0x94,0xd4,0x3c,0xd3,0x13,0x92,0x0f,0x51,0x04,0x01,0x00,0x10,0x07,0x01,0xff,0xcf,
--	0x83,0x00,0x01,0x00,0x01,0x00,0xd2,0x07,0x61,0x3a,0x43,0x01,0x00,0xd1,0x12,0x10,
--	0x09,0x01,0xff,0xce,0xbf,0xcc,0x81,0x00,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,0x10,
--	0x09,0x01,0xff,0xcf,0x89,0xcc,0x81,0x00,0x0a,0xff,0xcf,0x97,0x00,0xd3,0x2c,0xd2,
--	0x11,0xe1,0x46,0x43,0x10,0x07,0x01,0xff,0xce,0xb2,0x00,0x01,0xff,0xce,0xb8,0x00,
--	0xd1,0x10,0x10,0x09,0x01,0xff,0xcf,0x92,0xcc,0x88,0x00,0x01,0xff,0xcf,0x86,0x00,
--	0x10,0x07,0x01,0xff,0xcf,0x80,0x00,0x04,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x06,
--	0xff,0xcf,0x99,0x00,0x06,0x00,0x10,0x07,0x01,0xff,0xcf,0x9b,0x00,0x04,0x00,0xd1,
--	0x0b,0x10,0x07,0x01,0xff,0xcf,0x9d,0x00,0x04,0x00,0x10,0x07,0x01,0xff,0xcf,0x9f,
--	0x00,0x04,0x00,0xd4,0x58,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xcf,
--	0xa1,0x00,0x04,0x00,0x10,0x07,0x01,0xff,0xcf,0xa3,0x00,0x01,0x00,0xd1,0x0b,0x10,
--	0x07,0x01,0xff,0xcf,0xa5,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xcf,0xa7,0x00,0x01,
--	0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xcf,0xa9,0x00,0x01,0x00,0x10,0x07,
--	0x01,0xff,0xcf,0xab,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xcf,0xad,0x00,
--	0x01,0x00,0x10,0x07,0x01,0xff,0xcf,0xaf,0x00,0x01,0x00,0xd3,0x2b,0xd2,0x12,0x91,
--	0x0e,0x10,0x07,0x01,0xff,0xce,0xba,0x00,0x01,0xff,0xcf,0x81,0x00,0x01,0x00,0xd1,
--	0x0e,0x10,0x07,0x05,0xff,0xce,0xb8,0x00,0x05,0xff,0xce,0xb5,0x00,0x10,0x04,0x06,
--	0x00,0x07,0xff,0xcf,0xb8,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x04,0x07,0x00,0x07,0xff,
--	0xcf,0xb2,0x00,0x10,0x07,0x07,0xff,0xcf,0xbb,0x00,0x07,0x00,0xd1,0x0b,0x10,0x04,
--	0x08,0x00,0x08,0xff,0xcd,0xbb,0x00,0x10,0x07,0x08,0xff,0xcd,0xbc,0x00,0x08,0xff,
--	0xcd,0xbd,0x00,0xe3,0xed,0x46,0xe2,0x3d,0x05,0xe1,0x27,0x02,0xe0,0x66,0x01,0xcf,
--	0x86,0xd5,0xf0,0xd4,0x7e,0xd3,0x40,0xd2,0x22,0xd1,0x12,0x10,0x09,0x04,0xff,0xd0,
--	0xb5,0xcc,0x80,0x00,0x01,0xff,0xd0,0xb5,0xcc,0x88,0x00,0x10,0x07,0x01,0xff,0xd1,
--	0x92,0x00,0x01,0xff,0xd0,0xb3,0xcc,0x81,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,
--	0x94,0x00,0x01,0xff,0xd1,0x95,0x00,0x10,0x07,0x01,0xff,0xd1,0x96,0x00,0x01,0xff,
--	0xd1,0x96,0xcc,0x88,0x00,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,0x98,0x00,
--	0x01,0xff,0xd1,0x99,0x00,0x10,0x07,0x01,0xff,0xd1,0x9a,0x00,0x01,0xff,0xd1,0x9b,
--	0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0xba,0xcc,0x81,0x00,0x04,0xff,0xd0,0xb8,
--	0xcc,0x80,0x00,0x10,0x09,0x01,0xff,0xd1,0x83,0xcc,0x86,0x00,0x01,0xff,0xd1,0x9f,
--	0x00,0xd3,0x38,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd0,0xb0,0x00,0x01,0xff,
--	0xd0,0xb1,0x00,0x10,0x07,0x01,0xff,0xd0,0xb2,0x00,0x01,0xff,0xd0,0xb3,0x00,0xd1,
--	0x0e,0x10,0x07,0x01,0xff,0xd0,0xb4,0x00,0x01,0xff,0xd0,0xb5,0x00,0x10,0x07,0x01,
--	0xff,0xd0,0xb6,0x00,0x01,0xff,0xd0,0xb7,0x00,0xd2,0x1e,0xd1,0x10,0x10,0x07,0x01,
--	0xff,0xd0,0xb8,0x00,0x01,0xff,0xd0,0xb8,0xcc,0x86,0x00,0x10,0x07,0x01,0xff,0xd0,
--	0xba,0x00,0x01,0xff,0xd0,0xbb,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd0,0xbc,0x00,
--	0x01,0xff,0xd0,0xbd,0x00,0x10,0x07,0x01,0xff,0xd0,0xbe,0x00,0x01,0xff,0xd0,0xbf,
--	0x00,0xe4,0x25,0x42,0xd3,0x38,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,0x80,
--	0x00,0x01,0xff,0xd1,0x81,0x00,0x10,0x07,0x01,0xff,0xd1,0x82,0x00,0x01,0xff,0xd1,
--	0x83,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,0x84,0x00,0x01,0xff,0xd1,0x85,0x00,
--	0x10,0x07,0x01,0xff,0xd1,0x86,0x00,0x01,0xff,0xd1,0x87,0x00,0xd2,0x1c,0xd1,0x0e,
--	0x10,0x07,0x01,0xff,0xd1,0x88,0x00,0x01,0xff,0xd1,0x89,0x00,0x10,0x07,0x01,0xff,
--	0xd1,0x8a,0x00,0x01,0xff,0xd1,0x8b,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,0x8c,
--	0x00,0x01,0xff,0xd1,0x8d,0x00,0x10,0x07,0x01,0xff,0xd1,0x8e,0x00,0x01,0xff,0xd1,
--	0x8f,0x00,0xcf,0x86,0xd5,0x07,0x64,0xcf,0x41,0x01,0x00,0xd4,0x58,0xd3,0x2c,0xd2,
--	0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xa1,0x00,0x01,0x00,0x10,0x07,0x01,0xff,
--	0xd1,0xa3,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xa5,0x00,0x01,0x00,
--	0x10,0x07,0x01,0xff,0xd1,0xa7,0x00,0x01,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,
--	0xff,0xd1,0xa9,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xab,0x00,0x01,0x00,0xd1,
--	0x0b,0x10,0x07,0x01,0xff,0xd1,0xad,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xaf,
--	0x00,0x01,0x00,0xd3,0x33,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xb1,0x00,
--	0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xb3,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,
--	0xff,0xd1,0xb5,0x00,0x01,0x00,0x10,0x09,0x01,0xff,0xd1,0xb5,0xcc,0x8f,0x00,0x01,
--	0xff,0xd1,0xb5,0xcc,0x8f,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xb9,
--	0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xbb,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,
--	0x01,0xff,0xd1,0xbd,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xbf,0x00,0x01,0x00,
--	0xe0,0x41,0x01,0xcf,0x86,0xd5,0x8e,0xd4,0x36,0xd3,0x11,0xe2,0x91,0x41,0xe1,0x88,
--	0x41,0x10,0x07,0x01,0xff,0xd2,0x81,0x00,0x01,0x00,0xd2,0x0f,0x51,0x04,0x04,0x00,
--	0x10,0x07,0x06,0xff,0xd2,0x8b,0x00,0x06,0x00,0xd1,0x0b,0x10,0x07,0x04,0xff,0xd2,
--	0x8d,0x00,0x04,0x00,0x10,0x07,0x04,0xff,0xd2,0x8f,0x00,0x04,0x00,0xd3,0x2c,0xd2,
--	0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0x91,0x00,0x01,0x00,0x10,0x07,0x01,0xff,
--	0xd2,0x93,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0x95,0x00,0x01,0x00,
--	0x10,0x07,0x01,0xff,0xd2,0x97,0x00,0x01,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,
--	0xff,0xd2,0x99,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0x9b,0x00,0x01,0x00,0xd1,
--	0x0b,0x10,0x07,0x01,0xff,0xd2,0x9d,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0x9f,
--	0x00,0x01,0x00,0xd4,0x58,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,
--	0xa1,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xa3,0x00,0x01,0x00,0xd1,0x0b,0x10,
--	0x07,0x01,0xff,0xd2,0xa5,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xa7,0x00,0x01,
--	0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0xa9,0x00,0x01,0x00,0x10,0x07,
--	0x01,0xff,0xd2,0xab,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0xad,0x00,
--	0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xaf,0x00,0x01,0x00,0xd3,0x2c,0xd2,0x16,0xd1,
--	0x0b,0x10,0x07,0x01,0xff,0xd2,0xb1,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xb3,
--	0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0xb5,0x00,0x01,0x00,0x10,0x07,
--	0x01,0xff,0xd2,0xb7,0x00,0x01,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,
--	0xb9,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xbb,0x00,0x01,0x00,0xd1,0x0b,0x10,
--	0x07,0x01,0xff,0xd2,0xbd,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xbf,0x00,0x01,
--	0x00,0xcf,0x86,0xd5,0xdc,0xd4,0x5a,0xd3,0x36,0xd2,0x20,0xd1,0x10,0x10,0x07,0x01,
--	0xff,0xd3,0x8f,0x00,0x01,0xff,0xd0,0xb6,0xcc,0x86,0x00,0x10,0x09,0x01,0xff,0xd0,
--	0xb6,0xcc,0x86,0x00,0x01,0xff,0xd3,0x84,0x00,0xd1,0x0b,0x10,0x04,0x01,0x00,0x06,
--	0xff,0xd3,0x86,0x00,0x10,0x04,0x06,0x00,0x01,0xff,0xd3,0x88,0x00,0xd2,0x16,0xd1,
--	0x0b,0x10,0x04,0x01,0x00,0x06,0xff,0xd3,0x8a,0x00,0x10,0x04,0x06,0x00,0x01,0xff,
--	0xd3,0x8c,0x00,0xe1,0x69,0x40,0x10,0x04,0x01,0x00,0x06,0xff,0xd3,0x8e,0x00,0xd3,
--	0x41,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0xb0,0xcc,0x86,0x00,0x01,0xff,
--	0xd0,0xb0,0xcc,0x86,0x00,0x10,0x09,0x01,0xff,0xd0,0xb0,0xcc,0x88,0x00,0x01,0xff,
--	0xd0,0xb0,0xcc,0x88,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd3,0x95,0x00,0x01,0x00,
--	0x10,0x09,0x01,0xff,0xd0,0xb5,0xcc,0x86,0x00,0x01,0xff,0xd0,0xb5,0xcc,0x86,0x00,
--	0xd2,0x1d,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd3,0x99,0x00,0x01,0x00,0x10,0x09,0x01,
--	0xff,0xd3,0x99,0xcc,0x88,0x00,0x01,0xff,0xd3,0x99,0xcc,0x88,0x00,0xd1,0x12,0x10,
--	0x09,0x01,0xff,0xd0,0xb6,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb6,0xcc,0x88,0x00,0x10,
--	0x09,0x01,0xff,0xd0,0xb7,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb7,0xcc,0x88,0x00,0xd4,
--	0x82,0xd3,0x41,0xd2,0x1d,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd3,0xa1,0x00,0x01,0x00,
--	0x10,0x09,0x01,0xff,0xd0,0xb8,0xcc,0x84,0x00,0x01,0xff,0xd0,0xb8,0xcc,0x84,0x00,
--	0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0xb8,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb8,0xcc,
--	0x88,0x00,0x10,0x09,0x01,0xff,0xd0,0xbe,0xcc,0x88,0x00,0x01,0xff,0xd0,0xbe,0xcc,
--	0x88,0x00,0xd2,0x1d,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd3,0xa9,0x00,0x01,0x00,0x10,
--	0x09,0x01,0xff,0xd3,0xa9,0xcc,0x88,0x00,0x01,0xff,0xd3,0xa9,0xcc,0x88,0x00,0xd1,
--	0x12,0x10,0x09,0x04,0xff,0xd1,0x8d,0xcc,0x88,0x00,0x04,0xff,0xd1,0x8d,0xcc,0x88,
--	0x00,0x10,0x09,0x01,0xff,0xd1,0x83,0xcc,0x84,0x00,0x01,0xff,0xd1,0x83,0xcc,0x84,
--	0x00,0xd3,0x41,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd1,0x83,0xcc,0x88,0x00,
--	0x01,0xff,0xd1,0x83,0xcc,0x88,0x00,0x10,0x09,0x01,0xff,0xd1,0x83,0xcc,0x8b,0x00,
--	0x01,0xff,0xd1,0x83,0xcc,0x8b,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd1,0x87,0xcc,
--	0x88,0x00,0x01,0xff,0xd1,0x87,0xcc,0x88,0x00,0x10,0x07,0x08,0xff,0xd3,0xb7,0x00,
--	0x08,0x00,0xd2,0x1d,0xd1,0x12,0x10,0x09,0x01,0xff,0xd1,0x8b,0xcc,0x88,0x00,0x01,
--	0xff,0xd1,0x8b,0xcc,0x88,0x00,0x10,0x07,0x09,0xff,0xd3,0xbb,0x00,0x09,0x00,0xd1,
--	0x0b,0x10,0x07,0x09,0xff,0xd3,0xbd,0x00,0x09,0x00,0x10,0x07,0x09,0xff,0xd3,0xbf,
--	0x00,0x09,0x00,0xe1,0x26,0x02,0xe0,0x78,0x01,0xcf,0x86,0xd5,0xb0,0xd4,0x58,0xd3,
--	0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x06,0xff,0xd4,0x81,0x00,0x06,0x00,0x10,0x07,
--	0x06,0xff,0xd4,0x83,0x00,0x06,0x00,0xd1,0x0b,0x10,0x07,0x06,0xff,0xd4,0x85,0x00,
--	0x06,0x00,0x10,0x07,0x06,0xff,0xd4,0x87,0x00,0x06,0x00,0xd2,0x16,0xd1,0x0b,0x10,
--	0x07,0x06,0xff,0xd4,0x89,0x00,0x06,0x00,0x10,0x07,0x06,0xff,0xd4,0x8b,0x00,0x06,
--	0x00,0xd1,0x0b,0x10,0x07,0x06,0xff,0xd4,0x8d,0x00,0x06,0x00,0x10,0x07,0x06,0xff,
--	0xd4,0x8f,0x00,0x06,0x00,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x09,0xff,0xd4,
--	0x91,0x00,0x09,0x00,0x10,0x07,0x09,0xff,0xd4,0x93,0x00,0x09,0x00,0xd1,0x0b,0x10,
--	0x07,0x0a,0xff,0xd4,0x95,0x00,0x0a,0x00,0x10,0x07,0x0a,0xff,0xd4,0x97,0x00,0x0a,
--	0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x0a,0xff,0xd4,0x99,0x00,0x0a,0x00,0x10,0x07,
--	0x0a,0xff,0xd4,0x9b,0x00,0x0a,0x00,0xd1,0x0b,0x10,0x07,0x0a,0xff,0xd4,0x9d,0x00,
--	0x0a,0x00,0x10,0x07,0x0a,0xff,0xd4,0x9f,0x00,0x0a,0x00,0xd4,0x58,0xd3,0x2c,0xd2,
--	0x16,0xd1,0x0b,0x10,0x07,0x0a,0xff,0xd4,0xa1,0x00,0x0a,0x00,0x10,0x07,0x0a,0xff,
--	0xd4,0xa3,0x00,0x0a,0x00,0xd1,0x0b,0x10,0x07,0x0b,0xff,0xd4,0xa5,0x00,0x0b,0x00,
--	0x10,0x07,0x0c,0xff,0xd4,0xa7,0x00,0x0c,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x10,
--	0xff,0xd4,0xa9,0x00,0x10,0x00,0x10,0x07,0x10,0xff,0xd4,0xab,0x00,0x10,0x00,0xd1,
--	0x0b,0x10,0x07,0x10,0xff,0xd4,0xad,0x00,0x10,0x00,0x10,0x07,0x10,0xff,0xd4,0xaf,
--	0x00,0x10,0x00,0xd3,0x35,0xd2,0x19,0xd1,0x0b,0x10,0x04,0x00,0x00,0x01,0xff,0xd5,
--	0xa1,0x00,0x10,0x07,0x01,0xff,0xd5,0xa2,0x00,0x01,0xff,0xd5,0xa3,0x00,0xd1,0x0e,
--	0x10,0x07,0x01,0xff,0xd5,0xa4,0x00,0x01,0xff,0xd5,0xa5,0x00,0x10,0x07,0x01,0xff,
--	0xd5,0xa6,0x00,0x01,0xff,0xd5,0xa7,0x00,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,
--	0xd5,0xa8,0x00,0x01,0xff,0xd5,0xa9,0x00,0x10,0x07,0x01,0xff,0xd5,0xaa,0x00,0x01,
--	0xff,0xd5,0xab,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,0xac,0x00,0x01,0xff,0xd5,
--	0xad,0x00,0x10,0x07,0x01,0xff,0xd5,0xae,0x00,0x01,0xff,0xd5,0xaf,0x00,0xcf,0x86,
--	0xe5,0x08,0x3f,0xd4,0x70,0xd3,0x38,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,
--	0xb0,0x00,0x01,0xff,0xd5,0xb1,0x00,0x10,0x07,0x01,0xff,0xd5,0xb2,0x00,0x01,0xff,
--	0xd5,0xb3,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,0xb4,0x00,0x01,0xff,0xd5,0xb5,
--	0x00,0x10,0x07,0x01,0xff,0xd5,0xb6,0x00,0x01,0xff,0xd5,0xb7,0x00,0xd2,0x1c,0xd1,
--	0x0e,0x10,0x07,0x01,0xff,0xd5,0xb8,0x00,0x01,0xff,0xd5,0xb9,0x00,0x10,0x07,0x01,
--	0xff,0xd5,0xba,0x00,0x01,0xff,0xd5,0xbb,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,
--	0xbc,0x00,0x01,0xff,0xd5,0xbd,0x00,0x10,0x07,0x01,0xff,0xd5,0xbe,0x00,0x01,0xff,
--	0xd5,0xbf,0x00,0xe3,0x87,0x3e,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd6,0x80,
--	0x00,0x01,0xff,0xd6,0x81,0x00,0x10,0x07,0x01,0xff,0xd6,0x82,0x00,0x01,0xff,0xd6,
--	0x83,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd6,0x84,0x00,0x01,0xff,0xd6,0x85,0x00,
--	0x10,0x07,0x01,0xff,0xd6,0x86,0x00,0x00,0x00,0xe0,0x2f,0x3f,0xcf,0x86,0xe5,0xc0,
--	0x3e,0xe4,0x97,0x3e,0xe3,0x76,0x3e,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,
--	0x04,0x01,0x00,0x01,0xff,0xd5,0xa5,0xd6,0x82,0x00,0xe4,0x3e,0x25,0xe3,0xc3,0x1a,
--	0xe2,0x7b,0x81,0xe1,0xc0,0x13,0xd0,0x1e,0xcf,0x86,0xc5,0xe4,0x08,0x4b,0xe3,0x53,
--	0x46,0xe2,0xe9,0x43,0xe1,0x1c,0x43,0xe0,0xe1,0x42,0xcf,0x86,0xe5,0xa6,0x42,0x64,
--	0x89,0x42,0x0b,0x00,0xcf,0x86,0xe5,0xfa,0x01,0xe4,0x03,0x56,0xe3,0x76,0x01,0xe2,
--	0x8e,0x53,0xd1,0x0c,0xe0,0xef,0x52,0xcf,0x86,0x65,0x8d,0x52,0x04,0x00,0xe0,0x0d,
--	0x01,0xcf,0x86,0xd5,0x0a,0xe4,0x10,0x53,0x63,0xff,0x52,0x0a,0x00,0xd4,0x80,0xd3,
--	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0x80,0x00,0x01,0xff,0xe2,
--	0xb4,0x81,0x00,0x10,0x08,0x01,0xff,0xe2,0xb4,0x82,0x00,0x01,0xff,0xe2,0xb4,0x83,
--	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0x84,0x00,0x01,0xff,0xe2,0xb4,0x85,
--	0x00,0x10,0x08,0x01,0xff,0xe2,0xb4,0x86,0x00,0x01,0xff,0xe2,0xb4,0x87,0x00,0xd2,
--	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0x88,0x00,0x01,0xff,0xe2,0xb4,0x89,
--	0x00,0x10,0x08,0x01,0xff,0xe2,0xb4,0x8a,0x00,0x01,0xff,0xe2,0xb4,0x8b,0x00,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0x8c,0x00,0x01,0xff,0xe2,0xb4,0x8d,0x00,0x10,
--	0x08,0x01,0xff,0xe2,0xb4,0x8e,0x00,0x01,0xff,0xe2,0xb4,0x8f,0x00,0xd3,0x40,0xd2,
--	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0x90,0x00,0x01,0xff,0xe2,0xb4,0x91,
--	0x00,0x10,0x08,0x01,0xff,0xe2,0xb4,0x92,0x00,0x01,0xff,0xe2,0xb4,0x93,0x00,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0x94,0x00,0x01,0xff,0xe2,0xb4,0x95,0x00,0x10,
--	0x08,0x01,0xff,0xe2,0xb4,0x96,0x00,0x01,0xff,0xe2,0xb4,0x97,0x00,0xd2,0x20,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0x98,0x00,0x01,0xff,0xe2,0xb4,0x99,0x00,0x10,
--	0x08,0x01,0xff,0xe2,0xb4,0x9a,0x00,0x01,0xff,0xe2,0xb4,0x9b,0x00,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0xe2,0xb4,0x9c,0x00,0x01,0xff,0xe2,0xb4,0x9d,0x00,0x10,0x08,0x01,
--	0xff,0xe2,0xb4,0x9e,0x00,0x01,0xff,0xe2,0xb4,0x9f,0x00,0xcf,0x86,0xe5,0x42,0x52,
--	0x94,0x50,0xd3,0x3c,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0xa0,0x00,
--	0x01,0xff,0xe2,0xb4,0xa1,0x00,0x10,0x08,0x01,0xff,0xe2,0xb4,0xa2,0x00,0x01,0xff,
--	0xe2,0xb4,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0xa4,0x00,0x01,0xff,
--	0xe2,0xb4,0xa5,0x00,0x10,0x04,0x00,0x00,0x0d,0xff,0xe2,0xb4,0xa7,0x00,0x52,0x04,
--	0x00,0x00,0x91,0x0c,0x10,0x04,0x00,0x00,0x0d,0xff,0xe2,0xb4,0xad,0x00,0x00,0x00,
--	0x01,0x00,0xd2,0x1b,0xe1,0xfc,0x52,0xe0,0xad,0x52,0xcf,0x86,0x95,0x0f,0x94,0x0b,
--	0x93,0x07,0x62,0x92,0x52,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0xd1,0x13,0xe0,
--	0xd3,0x53,0xcf,0x86,0x95,0x0a,0xe4,0xa8,0x53,0x63,0x97,0x53,0x04,0x00,0x04,0x00,
--	0xd0,0x0d,0xcf,0x86,0x95,0x07,0x64,0x22,0x54,0x08,0x00,0x04,0x00,0xcf,0x86,0x55,
--	0x04,0x04,0x00,0x54,0x04,0x04,0x00,0xd3,0x07,0x62,0x2f,0x54,0x04,0x00,0xd2,0x20,
--	0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8f,0xb0,0x00,0x11,0xff,0xe1,0x8f,0xb1,0x00,
--	0x10,0x08,0x11,0xff,0xe1,0x8f,0xb2,0x00,0x11,0xff,0xe1,0x8f,0xb3,0x00,0x91,0x10,
--	0x10,0x08,0x11,0xff,0xe1,0x8f,0xb4,0x00,0x11,0xff,0xe1,0x8f,0xb5,0x00,0x00,0x00,
--	0xd4,0x1c,0xe3,0xe0,0x56,0xe2,0x17,0x56,0xe1,0xda,0x55,0xe0,0xbb,0x55,0xcf,0x86,
--	0x95,0x0a,0xe4,0xa4,0x55,0x63,0x88,0x55,0x04,0x00,0x04,0x00,0xe3,0xd2,0x01,0xe2,
--	0x2b,0x5a,0xd1,0x0c,0xe0,0x4c,0x59,0xcf,0x86,0x65,0x25,0x59,0x0a,0x00,0xe0,0x9c,
--	0x59,0xcf,0x86,0xd5,0xc5,0xd4,0x45,0xd3,0x31,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x12,
--	0xff,0xd0,0xb2,0x00,0x12,0xff,0xd0,0xb4,0x00,0x10,0x07,0x12,0xff,0xd0,0xbe,0x00,
--	0x12,0xff,0xd1,0x81,0x00,0x51,0x07,0x12,0xff,0xd1,0x82,0x00,0x10,0x07,0x12,0xff,
--	0xd1,0x8a,0x00,0x12,0xff,0xd1,0xa3,0x00,0x92,0x10,0x91,0x0c,0x10,0x08,0x12,0xff,
--	0xea,0x99,0x8b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,
--	0x10,0x08,0x14,0xff,0xe1,0x83,0x90,0x00,0x14,0xff,0xe1,0x83,0x91,0x00,0x10,0x08,
--	0x14,0xff,0xe1,0x83,0x92,0x00,0x14,0xff,0xe1,0x83,0x93,0x00,0xd1,0x10,0x10,0x08,
--	0x14,0xff,0xe1,0x83,0x94,0x00,0x14,0xff,0xe1,0x83,0x95,0x00,0x10,0x08,0x14,0xff,
--	0xe1,0x83,0x96,0x00,0x14,0xff,0xe1,0x83,0x97,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x14,0xff,0xe1,0x83,0x98,0x00,0x14,0xff,0xe1,0x83,0x99,0x00,0x10,0x08,0x14,0xff,
--	0xe1,0x83,0x9a,0x00,0x14,0xff,0xe1,0x83,0x9b,0x00,0xd1,0x10,0x10,0x08,0x14,0xff,
--	0xe1,0x83,0x9c,0x00,0x14,0xff,0xe1,0x83,0x9d,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,
--	0x9e,0x00,0x14,0xff,0xe1,0x83,0x9f,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,
--	0x10,0x08,0x14,0xff,0xe1,0x83,0xa0,0x00,0x14,0xff,0xe1,0x83,0xa1,0x00,0x10,0x08,
--	0x14,0xff,0xe1,0x83,0xa2,0x00,0x14,0xff,0xe1,0x83,0xa3,0x00,0xd1,0x10,0x10,0x08,
--	0x14,0xff,0xe1,0x83,0xa4,0x00,0x14,0xff,0xe1,0x83,0xa5,0x00,0x10,0x08,0x14,0xff,
--	0xe1,0x83,0xa6,0x00,0x14,0xff,0xe1,0x83,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x14,0xff,0xe1,0x83,0xa8,0x00,0x14,0xff,0xe1,0x83,0xa9,0x00,0x10,0x08,0x14,0xff,
--	0xe1,0x83,0xaa,0x00,0x14,0xff,0xe1,0x83,0xab,0x00,0xd1,0x10,0x10,0x08,0x14,0xff,
--	0xe1,0x83,0xac,0x00,0x14,0xff,0xe1,0x83,0xad,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,
--	0xae,0x00,0x14,0xff,0xe1,0x83,0xaf,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x14,0xff,0xe1,0x83,0xb0,0x00,0x14,0xff,0xe1,0x83,0xb1,0x00,0x10,0x08,0x14,0xff,
--	0xe1,0x83,0xb2,0x00,0x14,0xff,0xe1,0x83,0xb3,0x00,0xd1,0x10,0x10,0x08,0x14,0xff,
--	0xe1,0x83,0xb4,0x00,0x14,0xff,0xe1,0x83,0xb5,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,
--	0xb6,0x00,0x14,0xff,0xe1,0x83,0xb7,0x00,0xd2,0x1c,0xd1,0x10,0x10,0x08,0x14,0xff,
--	0xe1,0x83,0xb8,0x00,0x14,0xff,0xe1,0x83,0xb9,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,
--	0xba,0x00,0x00,0x00,0xd1,0x0c,0x10,0x04,0x00,0x00,0x14,0xff,0xe1,0x83,0xbd,0x00,
--	0x10,0x08,0x14,0xff,0xe1,0x83,0xbe,0x00,0x14,0xff,0xe1,0x83,0xbf,0x00,0xe2,0x9d,
--	0x08,0xe1,0x48,0x04,0xe0,0x1c,0x02,0xcf,0x86,0xe5,0x11,0x01,0xd4,0x84,0xd3,0x40,
--	0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0xa5,0x00,0x01,0xff,0x61,0xcc,
--	0xa5,0x00,0x10,0x08,0x01,0xff,0x62,0xcc,0x87,0x00,0x01,0xff,0x62,0xcc,0x87,0x00,
--	0xd1,0x10,0x10,0x08,0x01,0xff,0x62,0xcc,0xa3,0x00,0x01,0xff,0x62,0xcc,0xa3,0x00,
--	0x10,0x08,0x01,0xff,0x62,0xcc,0xb1,0x00,0x01,0xff,0x62,0xcc,0xb1,0x00,0xd2,0x24,
--	0xd1,0x14,0x10,0x0a,0x01,0xff,0x63,0xcc,0xa7,0xcc,0x81,0x00,0x01,0xff,0x63,0xcc,
--	0xa7,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x64,0xcc,0x87,0x00,0x01,0xff,0x64,0xcc,
--	0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x64,0xcc,0xa3,0x00,0x01,0xff,0x64,0xcc,
--	0xa3,0x00,0x10,0x08,0x01,0xff,0x64,0xcc,0xb1,0x00,0x01,0xff,0x64,0xcc,0xb1,0x00,
--	0xd3,0x48,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x64,0xcc,0xa7,0x00,0x01,0xff,
--	0x64,0xcc,0xa7,0x00,0x10,0x08,0x01,0xff,0x64,0xcc,0xad,0x00,0x01,0xff,0x64,0xcc,
--	0xad,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x65,0xcc,0x84,0xcc,0x80,0x00,0x01,0xff,
--	0x65,0xcc,0x84,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x65,0xcc,0x84,0xcc,0x81,0x00,
--	0x01,0xff,0x65,0xcc,0x84,0xcc,0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
--	0x65,0xcc,0xad,0x00,0x01,0xff,0x65,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,
--	0xb0,0x00,0x01,0xff,0x65,0xcc,0xb0,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x65,0xcc,
--	0xa7,0xcc,0x86,0x00,0x01,0xff,0x65,0xcc,0xa7,0xcc,0x86,0x00,0x10,0x08,0x01,0xff,
--	0x66,0xcc,0x87,0x00,0x01,0xff,0x66,0xcc,0x87,0x00,0xd4,0x84,0xd3,0x40,0xd2,0x20,
--	0xd1,0x10,0x10,0x08,0x01,0xff,0x67,0xcc,0x84,0x00,0x01,0xff,0x67,0xcc,0x84,0x00,
--	0x10,0x08,0x01,0xff,0x68,0xcc,0x87,0x00,0x01,0xff,0x68,0xcc,0x87,0x00,0xd1,0x10,
--	0x10,0x08,0x01,0xff,0x68,0xcc,0xa3,0x00,0x01,0xff,0x68,0xcc,0xa3,0x00,0x10,0x08,
--	0x01,0xff,0x68,0xcc,0x88,0x00,0x01,0xff,0x68,0xcc,0x88,0x00,0xd2,0x20,0xd1,0x10,
--	0x10,0x08,0x01,0xff,0x68,0xcc,0xa7,0x00,0x01,0xff,0x68,0xcc,0xa7,0x00,0x10,0x08,
--	0x01,0xff,0x68,0xcc,0xae,0x00,0x01,0xff,0x68,0xcc,0xae,0x00,0xd1,0x10,0x10,0x08,
--	0x01,0xff,0x69,0xcc,0xb0,0x00,0x01,0xff,0x69,0xcc,0xb0,0x00,0x10,0x0a,0x01,0xff,
--	0x69,0xcc,0x88,0xcc,0x81,0x00,0x01,0xff,0x69,0xcc,0x88,0xcc,0x81,0x00,0xd3,0x40,
--	0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x6b,0xcc,0x81,0x00,0x01,0xff,0x6b,0xcc,
--	0x81,0x00,0x10,0x08,0x01,0xff,0x6b,0xcc,0xa3,0x00,0x01,0xff,0x6b,0xcc,0xa3,0x00,
--	0xd1,0x10,0x10,0x08,0x01,0xff,0x6b,0xcc,0xb1,0x00,0x01,0xff,0x6b,0xcc,0xb1,0x00,
--	0x10,0x08,0x01,0xff,0x6c,0xcc,0xa3,0x00,0x01,0xff,0x6c,0xcc,0xa3,0x00,0xd2,0x24,
--	0xd1,0x14,0x10,0x0a,0x01,0xff,0x6c,0xcc,0xa3,0xcc,0x84,0x00,0x01,0xff,0x6c,0xcc,
--	0xa3,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x6c,0xcc,0xb1,0x00,0x01,0xff,0x6c,0xcc,
--	0xb1,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6c,0xcc,0xad,0x00,0x01,0xff,0x6c,0xcc,
--	0xad,0x00,0x10,0x08,0x01,0xff,0x6d,0xcc,0x81,0x00,0x01,0xff,0x6d,0xcc,0x81,0x00,
--	0xcf,0x86,0xe5,0x15,0x01,0xd4,0x88,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
--	0xff,0x6d,0xcc,0x87,0x00,0x01,0xff,0x6d,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x6d,
--	0xcc,0xa3,0x00,0x01,0xff,0x6d,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,
--	0xcc,0x87,0x00,0x01,0xff,0x6e,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x6e,0xcc,0xa3,
--	0x00,0x01,0xff,0x6e,0xcc,0xa3,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,
--	0xcc,0xb1,0x00,0x01,0xff,0x6e,0xcc,0xb1,0x00,0x10,0x08,0x01,0xff,0x6e,0xcc,0xad,
--	0x00,0x01,0xff,0x6e,0xcc,0xad,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x83,
--	0xcc,0x81,0x00,0x01,0xff,0x6f,0xcc,0x83,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x6f,
--	0xcc,0x83,0xcc,0x88,0x00,0x01,0xff,0x6f,0xcc,0x83,0xcc,0x88,0x00,0xd3,0x48,0xd2,
--	0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x84,0xcc,0x80,0x00,0x01,0xff,0x6f,
--	0xcc,0x84,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x84,0xcc,0x81,0x00,0x01,
--	0xff,0x6f,0xcc,0x84,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x70,0xcc,0x81,
--	0x00,0x01,0xff,0x70,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x70,0xcc,0x87,0x00,0x01,
--	0xff,0x70,0xcc,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x72,0xcc,0x87,
--	0x00,0x01,0xff,0x72,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x72,0xcc,0xa3,0x00,0x01,
--	0xff,0x72,0xcc,0xa3,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x72,0xcc,0xa3,0xcc,0x84,
--	0x00,0x01,0xff,0x72,0xcc,0xa3,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x72,0xcc,0xb1,
--	0x00,0x01,0xff,0x72,0xcc,0xb1,0x00,0xd4,0x8c,0xd3,0x48,0xd2,0x20,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0x73,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x87,0x00,0x10,0x08,0x01,
--	0xff,0x73,0xcc,0xa3,0x00,0x01,0xff,0x73,0xcc,0xa3,0x00,0xd1,0x14,0x10,0x0a,0x01,
--	0xff,0x73,0xcc,0x81,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x81,0xcc,0x87,0x00,0x10,
--	0x0a,0x01,0xff,0x73,0xcc,0x8c,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x8c,0xcc,0x87,
--	0x00,0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x73,0xcc,0xa3,0xcc,0x87,0x00,0x01,
--	0xff,0x73,0xcc,0xa3,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x74,0xcc,0x87,0x00,0x01,
--	0xff,0x74,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x74,0xcc,0xa3,0x00,0x01,
--	0xff,0x74,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x74,0xcc,0xb1,0x00,0x01,0xff,0x74,
--	0xcc,0xb1,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x74,0xcc,0xad,
--	0x00,0x01,0xff,0x74,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0xa4,0x00,0x01,
--	0xff,0x75,0xcc,0xa4,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0xb0,0x00,0x01,
--	0xff,0x75,0xcc,0xb0,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0xad,0x00,0x01,0xff,0x75,
--	0xcc,0xad,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,0xcc,0x83,0xcc,0x81,
--	0x00,0x01,0xff,0x75,0xcc,0x83,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x84,
--	0xcc,0x88,0x00,0x01,0xff,0x75,0xcc,0x84,0xcc,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,
--	0xff,0x76,0xcc,0x83,0x00,0x01,0xff,0x76,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x76,
--	0xcc,0xa3,0x00,0x01,0xff,0x76,0xcc,0xa3,0x00,0xe0,0x11,0x02,0xcf,0x86,0xd5,0xe2,
--	0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x80,0x00,
--	0x01,0xff,0x77,0xcc,0x80,0x00,0x10,0x08,0x01,0xff,0x77,0xcc,0x81,0x00,0x01,0xff,
--	0x77,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x88,0x00,0x01,0xff,
--	0x77,0xcc,0x88,0x00,0x10,0x08,0x01,0xff,0x77,0xcc,0x87,0x00,0x01,0xff,0x77,0xcc,
--	0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0xa3,0x00,0x01,0xff,
--	0x77,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x78,0xcc,0x87,0x00,0x01,0xff,0x78,0xcc,
--	0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x78,0xcc,0x88,0x00,0x01,0xff,0x78,0xcc,
--	0x88,0x00,0x10,0x08,0x01,0xff,0x79,0xcc,0x87,0x00,0x01,0xff,0x79,0xcc,0x87,0x00,
--	0xd3,0x33,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x7a,0xcc,0x82,0x00,0x01,0xff,
--	0x7a,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0xa3,0x00,0x01,0xff,0x7a,0xcc,
--	0xa3,0x00,0xe1,0x12,0x59,0x10,0x08,0x01,0xff,0x7a,0xcc,0xb1,0x00,0x01,0xff,0x7a,
--	0xcc,0xb1,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x8a,0x00,0x01,
--	0xff,0x79,0xcc,0x8a,0x00,0x10,0x08,0x01,0xff,0x61,0xca,0xbe,0x00,0x02,0xff,0x73,
--	0xcc,0x87,0x00,0x51,0x04,0x0a,0x00,0x10,0x07,0x0a,0xff,0x73,0x73,0x00,0x0a,0x00,
--	0xd4,0x98,0xd3,0x48,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0xa3,0x00,
--	0x01,0xff,0x61,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x61,0xcc,0x89,0x00,0x01,0xff,
--	0x61,0xcc,0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x61,0xcc,0x82,0xcc,0x81,0x00,
--	0x01,0xff,0x61,0xcc,0x82,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0x82,0xcc,
--	0x80,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x80,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,
--	0x01,0xff,0x61,0xcc,0x82,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x89,0x00,
--	0x10,0x0a,0x01,0xff,0x61,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,
--	0x83,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x61,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,
--	0x61,0xcc,0xa3,0xcc,0x82,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0x86,0xcc,0x81,0x00,
--	0x01,0xff,0x61,0xcc,0x86,0xcc,0x81,0x00,0xd3,0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,
--	0x01,0xff,0x61,0xcc,0x86,0xcc,0x80,0x00,0x01,0xff,0x61,0xcc,0x86,0xcc,0x80,0x00,
--	0x10,0x0a,0x01,0xff,0x61,0xcc,0x86,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x86,0xcc,
--	0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x61,0xcc,0x86,0xcc,0x83,0x00,0x01,0xff,
--	0x61,0xcc,0x86,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0xa3,0xcc,0x86,0x00,
--	0x01,0xff,0x61,0xcc,0xa3,0xcc,0x86,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
--	0x65,0xcc,0xa3,0x00,0x01,0xff,0x65,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,
--	0x89,0x00,0x01,0xff,0x65,0xcc,0x89,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,
--	0x83,0x00,0x01,0xff,0x65,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x65,0xcc,0x82,0xcc,
--	0x81,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x81,0x00,0xcf,0x86,0xe5,0x31,0x01,0xd4,
--	0x90,0xd3,0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x65,0xcc,0x82,0xcc,0x80,
--	0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x65,0xcc,0x82,
--	0xcc,0x89,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,
--	0xff,0x65,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x83,0x00,0x10,
--	0x0a,0x01,0xff,0x65,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,0x65,0xcc,0xa3,0xcc,0x82,
--	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,0xcc,0x89,0x00,0x01,0xff,0x69,
--	0xcc,0x89,0x00,0x10,0x08,0x01,0xff,0x69,0xcc,0xa3,0x00,0x01,0xff,0x69,0xcc,0xa3,
--	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0xa3,0x00,0x01,0xff,0x6f,0xcc,0xa3,
--	0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x89,0x00,0xd3,
--	0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x81,0x00,0x01,
--	0xff,0x6f,0xcc,0x82,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x80,
--	0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x80,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,
--	0xcc,0x82,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x89,0x00,0x10,0x0a,0x01,
--	0xff,0x6f,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x83,0x00,0xd2,
--	0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,0x6f,
--	0xcc,0xa3,0xcc,0x82,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x81,0x00,0x01,
--	0xff,0x6f,0xcc,0x9b,0xcc,0x81,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,
--	0xcc,0x80,0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x6f,
--	0xcc,0x9b,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x89,0x00,0xd4,0x98,0xd3,
--	0x48,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x83,0x00,0x01,
--	0xff,0x6f,0xcc,0x9b,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0xa3,
--	0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,
--	0xcc,0xa3,0x00,0x01,0xff,0x75,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0x89,
--	0x00,0x01,0xff,0x75,0xcc,0x89,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,
--	0xcc,0x9b,0xcc,0x81,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x81,0x00,0x10,0x0a,0x01,
--	0xff,0x75,0xcc,0x9b,0xcc,0x80,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x80,0x00,0xd1,
--	0x14,0x10,0x0a,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x89,0x00,0x01,0xff,0x75,0xcc,0x9b,
--	0xcc,0x89,0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x83,0x00,0x01,0xff,0x75,
--	0xcc,0x9b,0xcc,0x83,0x00,0xd3,0x44,0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,
--	0xcc,0x9b,0xcc,0xa3,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0xa3,0x00,0x10,0x08,0x01,
--	0xff,0x79,0xcc,0x80,0x00,0x01,0xff,0x79,0xcc,0x80,0x00,0xd1,0x10,0x10,0x08,0x01,
--	0xff,0x79,0xcc,0xa3,0x00,0x01,0xff,0x79,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x79,
--	0xcc,0x89,0x00,0x01,0xff,0x79,0xcc,0x89,0x00,0xd2,0x1c,0xd1,0x10,0x10,0x08,0x01,
--	0xff,0x79,0xcc,0x83,0x00,0x01,0xff,0x79,0xcc,0x83,0x00,0x10,0x08,0x0a,0xff,0xe1,
--	0xbb,0xbb,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xe1,0xbb,0xbd,0x00,0x0a,
--	0x00,0x10,0x08,0x0a,0xff,0xe1,0xbb,0xbf,0x00,0x0a,0x00,0xe1,0xbf,0x02,0xe0,0xa1,
--	0x01,0xcf,0x86,0xd5,0xc6,0xd4,0x6c,0xd3,0x18,0xe2,0x0e,0x59,0xe1,0xf7,0x58,0x10,
--	0x09,0x01,0xff,0xce,0xb1,0xcc,0x93,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0x00,0xd2,
--	0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x93,0x00,0x01,0xff,0xce,0xb1,
--	0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,
--	0xce,0xb1,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,
--	0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,
--	0xff,0xce,0xb1,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcd,0x82,
--	0x00,0xd3,0x18,0xe2,0x4a,0x59,0xe1,0x33,0x59,0x10,0x09,0x01,0xff,0xce,0xb5,0xcc,
--	0x93,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,
--	0xff,0xce,0xb5,0xcc,0x93,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0x00,0x10,0x0b,0x01,
--	0xff,0xce,0xb5,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0xcc,0x80,
--	0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xce,0xb5,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,
--	0xce,0xb5,0xcc,0x94,0xcc,0x81,0x00,0x00,0x00,0xd4,0x6c,0xd3,0x18,0xe2,0x74,0x59,
--	0xe1,0x5d,0x59,0x10,0x09,0x01,0xff,0xce,0xb7,0xcc,0x93,0x00,0x01,0xff,0xce,0xb7,
--	0xcc,0x94,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb7,0xcc,0x93,0x00,
--	0x01,0xff,0xce,0xb7,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,
--	0x80,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,
--	0xff,0xce,0xb7,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x81,
--	0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb7,
--	0xcc,0x94,0xcd,0x82,0x00,0xd3,0x18,0xe2,0xb0,0x59,0xe1,0x99,0x59,0x10,0x09,0x01,
--	0xff,0xce,0xb9,0xcc,0x93,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0x00,0xd2,0x28,0xd1,
--	0x12,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x93,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,
--	0x00,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xb9,
--	0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x93,0xcc,
--	0x81,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xce,
--	0xb9,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0xcd,0x82,0x00,0xcf,
--	0x86,0xd5,0xac,0xd4,0x5a,0xd3,0x18,0xe2,0xed,0x59,0xe1,0xd6,0x59,0x10,0x09,0x01,
--	0xff,0xce,0xbf,0xcc,0x93,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,0x00,0xd2,0x28,0xd1,
--	0x12,0x10,0x09,0x01,0xff,0xce,0xbf,0xcc,0x93,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,
--	0x00,0x10,0x0b,0x01,0xff,0xce,0xbf,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xbf,
--	0xcc,0x94,0xcc,0x80,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xce,0xbf,0xcc,0x93,0xcc,
--	0x81,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,0xcc,0x81,0x00,0x00,0x00,0xd3,0x18,0xe2,
--	0x17,0x5a,0xe1,0x00,0x5a,0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x93,0x00,0x01,0xff,
--	0xcf,0x85,0xcc,0x94,0x00,0xd2,0x1c,0xd1,0x0d,0x10,0x04,0x00,0x00,0x01,0xff,0xcf,
--	0x85,0xcc,0x94,0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcc,0x80,
--	0x00,0xd1,0x0f,0x10,0x04,0x00,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcc,0x81,0x00,
--	0x10,0x04,0x00,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcd,0x82,0x00,0xe4,0xd3,0x5a,
--	0xd3,0x18,0xe2,0x52,0x5a,0xe1,0x3b,0x5a,0x10,0x09,0x01,0xff,0xcf,0x89,0xcc,0x93,
--	0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,
--	0xcf,0x89,0xcc,0x93,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,
--	0xcf,0x89,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x80,0x00,
--	0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xcf,
--	0x89,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcd,0x82,
--	0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcd,0x82,0x00,0xe0,0xd9,0x02,0xcf,0x86,0xe5,
--	0x91,0x01,0xd4,0xc8,0xd3,0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb1,
--	0xcc,0x93,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xce,0xb9,0x00,0x10,0x0d,
--	0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,
--	0x94,0xcc,0x80,0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,
--	0xcc,0x81,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x81,0xce,0xb9,0x00,
--	0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,0x01,0xff,0xce,
--	0xb1,0xcc,0x94,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,
--	0xce,0xb1,0xcc,0x93,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xce,0xb9,0x00,
--	0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xce,
--	0xb1,0xcc,0x94,0xcc,0x80,0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,0xb1,
--	0xcc,0x93,0xcc,0x81,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x81,0xce,
--	0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,0x01,
--	0xff,0xce,0xb1,0xcc,0x94,0xcd,0x82,0xce,0xb9,0x00,0xd3,0x64,0xd2,0x30,0xd1,0x16,
--	0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,
--	0x94,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x80,0xce,0xb9,
--	0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,
--	0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x81,0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,
--	0x94,0xcc,0x81,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,0x82,
--	0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x30,
--	0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xce,0xb9,0x00,0x01,0xff,0xce,
--	0xb7,0xcc,0x94,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x80,
--	0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,0xce,0xb9,0x00,0xd1,0x1a,
--	0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x81,0xce,0xb9,0x00,0x01,0xff,0xce,
--	0xb7,0xcc,0x94,0xcc,0x81,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,
--	0xcd,0x82,0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x82,0xce,0xb9,0x00,
--	0xd4,0xc8,0xd3,0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,
--	0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,
--	0xcf,0x89,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,
--	0x80,0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x81,
--	0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x81,0xce,0xb9,0x00,0x10,0x0d,
--	0x01,0xff,0xcf,0x89,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,
--	0x94,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x89,
--	0xcc,0x93,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xce,0xb9,0x00,0x10,0x0d,
--	0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,
--	0x94,0xcc,0x80,0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,
--	0xcc,0x81,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x81,0xce,0xb9,0x00,
--	0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,0x01,0xff,0xcf,
--	0x89,0xcc,0x94,0xcd,0x82,0xce,0xb9,0x00,0xd3,0x49,0xd2,0x26,0xd1,0x12,0x10,0x09,
--	0x01,0xff,0xce,0xb1,0xcc,0x86,0x00,0x01,0xff,0xce,0xb1,0xcc,0x84,0x00,0x10,0x0b,
--	0x01,0xff,0xce,0xb1,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xce,0xb9,0x00,
--	0xd1,0x0f,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x81,0xce,0xb9,0x00,0x00,0x00,0x10,
--	0x09,0x01,0xff,0xce,0xb1,0xcd,0x82,0x00,0x01,0xff,0xce,0xb1,0xcd,0x82,0xce,0xb9,
--	0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x86,0x00,0x01,0xff,
--	0xce,0xb1,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x80,0x00,0x01,0xff,
--	0xce,0xb1,0xcc,0x81,0x00,0xe1,0xf3,0x5a,0x10,0x09,0x01,0xff,0xce,0xb1,0xce,0xb9,
--	0x00,0x01,0x00,0xcf,0x86,0xd5,0xbd,0xd4,0x7e,0xd3,0x44,0xd2,0x21,0xd1,0x0d,0x10,
--	0x04,0x01,0x00,0x01,0xff,0xc2,0xa8,0xcd,0x82,0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,
--	0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xce,0xb9,0x00,0xd1,0x0f,0x10,0x0b,
--	0x01,0xff,0xce,0xb7,0xcc,0x81,0xce,0xb9,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xce,
--	0xb7,0xcd,0x82,0x00,0x01,0xff,0xce,0xb7,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x24,0xd1,
--	0x12,0x10,0x09,0x01,0xff,0xce,0xb5,0xcc,0x80,0x00,0x01,0xff,0xce,0xb5,0xcc,0x81,
--	0x00,0x10,0x09,0x01,0xff,0xce,0xb7,0xcc,0x80,0x00,0x01,0xff,0xce,0xb7,0xcc,0x81,
--	0x00,0xe1,0x02,0x5b,0x10,0x09,0x01,0xff,0xce,0xb7,0xce,0xb9,0x00,0x01,0xff,0xe1,
--	0xbe,0xbf,0xcc,0x80,0x00,0xd3,0x18,0xe2,0x28,0x5b,0xe1,0x11,0x5b,0x10,0x09,0x01,
--	0xff,0xce,0xb9,0xcc,0x86,0x00,0x01,0xff,0xce,0xb9,0xcc,0x84,0x00,0xe2,0x4c,0x5b,
--	0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x86,0x00,0x01,0xff,0xce,0xb9,0xcc,
--	0x84,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x80,0x00,0x01,0xff,0xce,0xb9,0xcc,
--	0x81,0x00,0xd4,0x51,0xd3,0x18,0xe2,0x6f,0x5b,0xe1,0x58,0x5b,0x10,0x09,0x01,0xff,
--	0xcf,0x85,0xcc,0x86,0x00,0x01,0xff,0xcf,0x85,0xcc,0x84,0x00,0xd2,0x24,0xd1,0x12,
--	0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x86,0x00,0x01,0xff,0xcf,0x85,0xcc,0x84,0x00,
--	0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x80,0x00,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,
--	0xe1,0x8f,0x5b,0x10,0x09,0x01,0xff,0xcf,0x81,0xcc,0x94,0x00,0x01,0xff,0xc2,0xa8,
--	0xcc,0x80,0x00,0xd3,0x3b,0xd2,0x18,0x51,0x04,0x00,0x00,0x10,0x0b,0x01,0xff,0xcf,
--	0x89,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xce,0xb9,0x00,0xd1,0x0f,0x10,
--	0x0b,0x01,0xff,0xcf,0x89,0xcc,0x81,0xce,0xb9,0x00,0x00,0x00,0x10,0x09,0x01,0xff,
--	0xcf,0x89,0xcd,0x82,0x00,0x01,0xff,0xcf,0x89,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x24,
--	0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xbf,0xcc,0x80,0x00,0x01,0xff,0xce,0xbf,0xcc,
--	0x81,0x00,0x10,0x09,0x01,0xff,0xcf,0x89,0xcc,0x80,0x00,0x01,0xff,0xcf,0x89,0xcc,
--	0x81,0x00,0xe1,0x99,0x5b,0x10,0x09,0x01,0xff,0xcf,0x89,0xce,0xb9,0x00,0x01,0xff,
--	0xc2,0xb4,0x00,0xe0,0x0c,0x68,0xcf,0x86,0xe5,0x23,0x02,0xe4,0x25,0x01,0xe3,0x85,
--	0x5e,0xd2,0x2a,0xe1,0x5f,0x5c,0xe0,0xdd,0x5b,0xcf,0x86,0xe5,0xbb,0x5b,0x94,0x1b,
--	0xe3,0xa4,0x5b,0x92,0x14,0x91,0x10,0x10,0x08,0x01,0xff,0xe2,0x80,0x82,0x00,0x01,
--	0xff,0xe2,0x80,0x83,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd1,0xd6,0xd0,0x46,0xcf,
--	0x86,0x55,0x04,0x01,0x00,0xd4,0x29,0xd3,0x13,0x52,0x04,0x01,0x00,0x51,0x04,0x01,
--	0x00,0x10,0x07,0x01,0xff,0xcf,0x89,0x00,0x01,0x00,0x92,0x12,0x51,0x04,0x01,0x00,
--	0x10,0x06,0x01,0xff,0x6b,0x00,0x01,0xff,0x61,0xcc,0x8a,0x00,0x01,0x00,0xe3,0x25,
--	0x5d,0x92,0x10,0x51,0x04,0x01,0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0x8e,0x00,0x01,
--	0x00,0x01,0x00,0xcf,0x86,0xd5,0x0a,0xe4,0x42,0x5d,0x63,0x2d,0x5d,0x06,0x00,0x94,
--	0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x85,0xb0,0x00,0x01,
--	0xff,0xe2,0x85,0xb1,0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0xb2,0x00,0x01,0xff,0xe2,
--	0x85,0xb3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x85,0xb4,0x00,0x01,0xff,0xe2,
--	0x85,0xb5,0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0xb6,0x00,0x01,0xff,0xe2,0x85,0xb7,
--	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x85,0xb8,0x00,0x01,0xff,0xe2,
--	0x85,0xb9,0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0xba,0x00,0x01,0xff,0xe2,0x85,0xbb,
--	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x85,0xbc,0x00,0x01,0xff,0xe2,0x85,0xbd,
--	0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0xbe,0x00,0x01,0xff,0xe2,0x85,0xbf,0x00,0x01,
--	0x00,0xe0,0x34,0x5d,0xcf,0x86,0xe5,0x13,0x5d,0xe4,0xf2,0x5c,0xe3,0xe1,0x5c,0xe2,
--	0xd4,0x5c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x04,0xff,0xe2,0x86,0x84,0x00,
--	0xe3,0x23,0x61,0xe2,0xf0,0x60,0xd1,0x0c,0xe0,0x9d,0x60,0xcf,0x86,0x65,0x7e,0x60,
--	0x01,0x00,0xd0,0x62,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x18,
--	0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x08,0x01,0xff,0xe2,0x93,0x90,0x00,
--	0x01,0xff,0xe2,0x93,0x91,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x93,
--	0x92,0x00,0x01,0xff,0xe2,0x93,0x93,0x00,0x10,0x08,0x01,0xff,0xe2,0x93,0x94,0x00,
--	0x01,0xff,0xe2,0x93,0x95,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x93,0x96,0x00,
--	0x01,0xff,0xe2,0x93,0x97,0x00,0x10,0x08,0x01,0xff,0xe2,0x93,0x98,0x00,0x01,0xff,
--	0xe2,0x93,0x99,0x00,0xcf,0x86,0xe5,0x57,0x60,0x94,0x80,0xd3,0x40,0xd2,0x20,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0xe2,0x93,0x9a,0x00,0x01,0xff,0xe2,0x93,0x9b,0x00,0x10,
--	0x08,0x01,0xff,0xe2,0x93,0x9c,0x00,0x01,0xff,0xe2,0x93,0x9d,0x00,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0xe2,0x93,0x9e,0x00,0x01,0xff,0xe2,0x93,0x9f,0x00,0x10,0x08,0x01,
--	0xff,0xe2,0x93,0xa0,0x00,0x01,0xff,0xe2,0x93,0xa1,0x00,0xd2,0x20,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0xe2,0x93,0xa2,0x00,0x01,0xff,0xe2,0x93,0xa3,0x00,0x10,0x08,0x01,
--	0xff,0xe2,0x93,0xa4,0x00,0x01,0xff,0xe2,0x93,0xa5,0x00,0xd1,0x10,0x10,0x08,0x01,
--	0xff,0xe2,0x93,0xa6,0x00,0x01,0xff,0xe2,0x93,0xa7,0x00,0x10,0x08,0x01,0xff,0xe2,
--	0x93,0xa8,0x00,0x01,0xff,0xe2,0x93,0xa9,0x00,0x01,0x00,0xd4,0x0c,0xe3,0x33,0x62,
--	0xe2,0x2c,0x62,0xcf,0x06,0x04,0x00,0xe3,0x0c,0x65,0xe2,0xff,0x63,0xe1,0x2e,0x02,
--	0xe0,0x84,0x01,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,
--	0x10,0x08,0x08,0xff,0xe2,0xb0,0xb0,0x00,0x08,0xff,0xe2,0xb0,0xb1,0x00,0x10,0x08,
--	0x08,0xff,0xe2,0xb0,0xb2,0x00,0x08,0xff,0xe2,0xb0,0xb3,0x00,0xd1,0x10,0x10,0x08,
--	0x08,0xff,0xe2,0xb0,0xb4,0x00,0x08,0xff,0xe2,0xb0,0xb5,0x00,0x10,0x08,0x08,0xff,
--	0xe2,0xb0,0xb6,0x00,0x08,0xff,0xe2,0xb0,0xb7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x08,0xff,0xe2,0xb0,0xb8,0x00,0x08,0xff,0xe2,0xb0,0xb9,0x00,0x10,0x08,0x08,0xff,
--	0xe2,0xb0,0xba,0x00,0x08,0xff,0xe2,0xb0,0xbb,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,
--	0xe2,0xb0,0xbc,0x00,0x08,0xff,0xe2,0xb0,0xbd,0x00,0x10,0x08,0x08,0xff,0xe2,0xb0,
--	0xbe,0x00,0x08,0xff,0xe2,0xb0,0xbf,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x08,0xff,0xe2,0xb1,0x80,0x00,0x08,0xff,0xe2,0xb1,0x81,0x00,0x10,0x08,0x08,0xff,
--	0xe2,0xb1,0x82,0x00,0x08,0xff,0xe2,0xb1,0x83,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,
--	0xe2,0xb1,0x84,0x00,0x08,0xff,0xe2,0xb1,0x85,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,
--	0x86,0x00,0x08,0xff,0xe2,0xb1,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,
--	0xe2,0xb1,0x88,0x00,0x08,0xff,0xe2,0xb1,0x89,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,
--	0x8a,0x00,0x08,0xff,0xe2,0xb1,0x8b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb1,
--	0x8c,0x00,0x08,0xff,0xe2,0xb1,0x8d,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0x8e,0x00,
--	0x08,0xff,0xe2,0xb1,0x8f,0x00,0x94,0x7c,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x08,0xff,0xe2,0xb1,0x90,0x00,0x08,0xff,0xe2,0xb1,0x91,0x00,0x10,0x08,0x08,0xff,
--	0xe2,0xb1,0x92,0x00,0x08,0xff,0xe2,0xb1,0x93,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,
--	0xe2,0xb1,0x94,0x00,0x08,0xff,0xe2,0xb1,0x95,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,
--	0x96,0x00,0x08,0xff,0xe2,0xb1,0x97,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,
--	0xe2,0xb1,0x98,0x00,0x08,0xff,0xe2,0xb1,0x99,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,
--	0x9a,0x00,0x08,0xff,0xe2,0xb1,0x9b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb1,
--	0x9c,0x00,0x08,0xff,0xe2,0xb1,0x9d,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0x9e,0x00,
--	0x00,0x00,0x08,0x00,0xcf,0x86,0xd5,0x07,0x64,0xef,0x61,0x08,0x00,0xd4,0x63,0xd3,
--	0x32,0xd2,0x1b,0xd1,0x0c,0x10,0x08,0x09,0xff,0xe2,0xb1,0xa1,0x00,0x09,0x00,0x10,
--	0x07,0x09,0xff,0xc9,0xab,0x00,0x09,0xff,0xe1,0xb5,0xbd,0x00,0xd1,0x0b,0x10,0x07,
--	0x09,0xff,0xc9,0xbd,0x00,0x09,0x00,0x10,0x04,0x09,0x00,0x09,0xff,0xe2,0xb1,0xa8,
--	0x00,0xd2,0x18,0xd1,0x0c,0x10,0x04,0x09,0x00,0x09,0xff,0xe2,0xb1,0xaa,0x00,0x10,
--	0x04,0x09,0x00,0x09,0xff,0xe2,0xb1,0xac,0x00,0xd1,0x0b,0x10,0x04,0x09,0x00,0x0a,
--	0xff,0xc9,0x91,0x00,0x10,0x07,0x0a,0xff,0xc9,0xb1,0x00,0x0a,0xff,0xc9,0x90,0x00,
--	0xd3,0x27,0xd2,0x17,0xd1,0x0b,0x10,0x07,0x0b,0xff,0xc9,0x92,0x00,0x0a,0x00,0x10,
--	0x08,0x0a,0xff,0xe2,0xb1,0xb3,0x00,0x0a,0x00,0x91,0x0c,0x10,0x04,0x09,0x00,0x09,
--	0xff,0xe2,0xb1,0xb6,0x00,0x09,0x00,0x52,0x04,0x0a,0x00,0x51,0x04,0x0a,0x00,0x10,
--	0x07,0x0b,0xff,0xc8,0xbf,0x00,0x0b,0xff,0xc9,0x80,0x00,0xe0,0x83,0x01,0xcf,0x86,
--	0xd5,0xc0,0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,
--	0x81,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x83,0x00,0x08,0x00,0xd1,0x0c,
--	0x10,0x08,0x08,0xff,0xe2,0xb2,0x85,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,
--	0x87,0x00,0x08,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0x89,0x00,
--	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x8b,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,
--	0x08,0xff,0xe2,0xb2,0x8d,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x8f,0x00,
--	0x08,0x00,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0x91,0x00,
--	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x93,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,
--	0x08,0xff,0xe2,0xb2,0x95,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x97,0x00,
--	0x08,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0x99,0x00,0x08,0x00,
--	0x10,0x08,0x08,0xff,0xe2,0xb2,0x9b,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
--	0xe2,0xb2,0x9d,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x9f,0x00,0x08,0x00,
--	0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xa1,0x00,
--	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xa3,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,
--	0x08,0xff,0xe2,0xb2,0xa5,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xa7,0x00,
--	0x08,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xa9,0x00,0x08,0x00,
--	0x10,0x08,0x08,0xff,0xe2,0xb2,0xab,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
--	0xe2,0xb2,0xad,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xaf,0x00,0x08,0x00,
--	0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xb1,0x00,0x08,0x00,
--	0x10,0x08,0x08,0xff,0xe2,0xb2,0xb3,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
--	0xe2,0xb2,0xb5,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xb7,0x00,0x08,0x00,
--	0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xb9,0x00,0x08,0x00,0x10,0x08,
--	0x08,0xff,0xe2,0xb2,0xbb,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,
--	0xbd,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xbf,0x00,0x08,0x00,0xcf,0x86,
--	0xd5,0xc0,0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,
--	0x81,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x83,0x00,0x08,0x00,0xd1,0x0c,
--	0x10,0x08,0x08,0xff,0xe2,0xb3,0x85,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,
--	0x87,0x00,0x08,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0x89,0x00,
--	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x8b,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,
--	0x08,0xff,0xe2,0xb3,0x8d,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x8f,0x00,
--	0x08,0x00,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0x91,0x00,
--	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x93,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,
--	0x08,0xff,0xe2,0xb3,0x95,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x97,0x00,
--	0x08,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0x99,0x00,0x08,0x00,
--	0x10,0x08,0x08,0xff,0xe2,0xb3,0x9b,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
--	0xe2,0xb3,0x9d,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x9f,0x00,0x08,0x00,
--	0xd4,0x3b,0xd3,0x1c,0x92,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0xa1,0x00,
--	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0xa3,0x00,0x08,0x00,0x08,0x00,0xd2,0x10,
--	0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x0b,0xff,0xe2,0xb3,0xac,0x00,0xe1,0x3b,
--	0x5f,0x10,0x04,0x0b,0x00,0x0b,0xff,0xe2,0xb3,0xae,0x00,0xe3,0x40,0x5f,0x92,0x10,
--	0x51,0x04,0x0b,0xe6,0x10,0x08,0x0d,0xff,0xe2,0xb3,0xb3,0x00,0x0d,0x00,0x00,0x00,
--	0xe2,0x98,0x08,0xd1,0x0b,0xe0,0x11,0x67,0xcf,0x86,0xcf,0x06,0x01,0x00,0xe0,0x65,
--	0x6c,0xcf,0x86,0xe5,0xa7,0x05,0xd4,0x06,0xcf,0x06,0x04,0x00,0xd3,0x0c,0xe2,0xf8,
--	0x67,0xe1,0x8f,0x67,0xcf,0x06,0x04,0x00,0xe2,0xdb,0x01,0xe1,0x26,0x01,0xd0,0x09,
--	0xcf,0x86,0x65,0xf4,0x67,0x0a,0x00,0xcf,0x86,0xd5,0xc0,0xd4,0x60,0xd3,0x30,0xd2,
--	0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x81,0x00,0x0a,0x00,0x10,0x08,0x0a,
--	0xff,0xea,0x99,0x83,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x85,
--	0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0x87,0x00,0x0a,0x00,0xd2,0x18,0xd1,
--	0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x89,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,
--	0x99,0x8b,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x8d,0x00,0x0a,
--	0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0x8f,0x00,0x0a,0x00,0xd3,0x30,0xd2,0x18,0xd1,
--	0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x91,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,
--	0x99,0x93,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x95,0x00,0x0a,
--	0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0x97,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,
--	0x08,0x0a,0xff,0xea,0x99,0x99,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0x9b,
--	0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x9d,0x00,0x0a,0x00,0x10,
--	0x08,0x0a,0xff,0xea,0x99,0x9f,0x00,0x0a,0x00,0xe4,0x5d,0x67,0xd3,0x30,0xd2,0x18,
--	0xd1,0x0c,0x10,0x08,0x0c,0xff,0xea,0x99,0xa1,0x00,0x0c,0x00,0x10,0x08,0x0a,0xff,
--	0xea,0x99,0xa3,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0xa5,0x00,
--	0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0xa7,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,
--	0x10,0x08,0x0a,0xff,0xea,0x99,0xa9,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,
--	0xab,0x00,0x0a,0x00,0xe1,0x0c,0x67,0x10,0x08,0x0a,0xff,0xea,0x99,0xad,0x00,0x0a,
--	0x00,0xe0,0x35,0x67,0xcf,0x86,0x95,0xab,0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,
--	0x10,0x08,0x0a,0xff,0xea,0x9a,0x81,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9a,
--	0x83,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9a,0x85,0x00,0x0a,0x00,
--	0x10,0x08,0x0a,0xff,0xea,0x9a,0x87,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,
--	0x0a,0xff,0xea,0x9a,0x89,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9a,0x8b,0x00,
--	0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9a,0x8d,0x00,0x0a,0x00,0x10,0x08,
--	0x0a,0xff,0xea,0x9a,0x8f,0x00,0x0a,0x00,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,
--	0x0a,0xff,0xea,0x9a,0x91,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9a,0x93,0x00,
--	0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9a,0x95,0x00,0x0a,0x00,0x10,0x08,
--	0x0a,0xff,0xea,0x9a,0x97,0x00,0x0a,0x00,0xe2,0x92,0x66,0xd1,0x0c,0x10,0x08,0x10,
--	0xff,0xea,0x9a,0x99,0x00,0x10,0x00,0x10,0x08,0x10,0xff,0xea,0x9a,0x9b,0x00,0x10,
--	0x00,0x0b,0x00,0xe1,0x10,0x02,0xd0,0xb9,0xcf,0x86,0xd5,0x07,0x64,0x9e,0x66,0x08,
--	0x00,0xd4,0x58,0xd3,0x28,0xd2,0x10,0x51,0x04,0x09,0x00,0x10,0x08,0x0a,0xff,0xea,
--	0x9c,0xa3,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9c,0xa5,0x00,0x0a,
--	0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xa7,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,
--	0x08,0x0a,0xff,0xea,0x9c,0xa9,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xab,
--	0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9c,0xad,0x00,0x0a,0x00,0x10,
--	0x08,0x0a,0xff,0xea,0x9c,0xaf,0x00,0x0a,0x00,0xd3,0x28,0xd2,0x10,0x51,0x04,0x0a,
--	0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xb3,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,
--	0xff,0xea,0x9c,0xb5,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xb7,0x00,0x0a,
--	0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9c,0xb9,0x00,0x0a,0x00,0x10,
--	0x08,0x0a,0xff,0xea,0x9c,0xbb,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,
--	0x9c,0xbd,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xbf,0x00,0x0a,0x00,0xcf,
--	0x86,0xd5,0xc0,0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,
--	0x9d,0x81,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x83,0x00,0x0a,0x00,0xd1,
--	0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0x85,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,
--	0x9d,0x87,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0x89,
--	0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x8b,0x00,0x0a,0x00,0xd1,0x0c,0x10,
--	0x08,0x0a,0xff,0xea,0x9d,0x8d,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x8f,
--	0x00,0x0a,0x00,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0x91,
--	0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x93,0x00,0x0a,0x00,0xd1,0x0c,0x10,
--	0x08,0x0a,0xff,0xea,0x9d,0x95,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x97,
--	0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0x99,0x00,0x0a,
--	0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x9b,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,
--	0xff,0xea,0x9d,0x9d,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x9f,0x00,0x0a,
--	0x00,0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0xa1,
--	0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xa3,0x00,0x0a,0x00,0xd1,0x0c,0x10,
--	0x08,0x0a,0xff,0xea,0x9d,0xa5,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xa7,
--	0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0xa9,0x00,0x0a,
--	0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xab,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,
--	0xff,0xea,0x9d,0xad,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xaf,0x00,0x0a,
--	0x00,0x53,0x04,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x04,0x0a,0x00,0x0a,0xff,0xea,
--	0x9d,0xba,0x00,0x10,0x04,0x0a,0x00,0x0a,0xff,0xea,0x9d,0xbc,0x00,0xd1,0x0c,0x10,
--	0x04,0x0a,0x00,0x0a,0xff,0xe1,0xb5,0xb9,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xbf,
--	0x00,0x0a,0x00,0xe0,0x71,0x01,0xcf,0x86,0xd5,0xa6,0xd4,0x4e,0xd3,0x30,0xd2,0x18,
--	0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9e,0x81,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,
--	0xea,0x9e,0x83,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9e,0x85,0x00,
--	0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9e,0x87,0x00,0x0a,0x00,0xd2,0x10,0x51,0x04,
--	0x0a,0x00,0x10,0x04,0x0a,0x00,0x0a,0xff,0xea,0x9e,0x8c,0x00,0xe1,0x9a,0x64,0x10,
--	0x04,0x0a,0x00,0x0c,0xff,0xc9,0xa5,0x00,0xd3,0x28,0xd2,0x18,0xd1,0x0c,0x10,0x08,
--	0x0c,0xff,0xea,0x9e,0x91,0x00,0x0c,0x00,0x10,0x08,0x0d,0xff,0xea,0x9e,0x93,0x00,
--	0x0d,0x00,0x51,0x04,0x10,0x00,0x10,0x08,0x10,0xff,0xea,0x9e,0x97,0x00,0x10,0x00,
--	0xd2,0x18,0xd1,0x0c,0x10,0x08,0x10,0xff,0xea,0x9e,0x99,0x00,0x10,0x00,0x10,0x08,
--	0x10,0xff,0xea,0x9e,0x9b,0x00,0x10,0x00,0xd1,0x0c,0x10,0x08,0x10,0xff,0xea,0x9e,
--	0x9d,0x00,0x10,0x00,0x10,0x08,0x10,0xff,0xea,0x9e,0x9f,0x00,0x10,0x00,0xd4,0x63,
--	0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0c,0xff,0xea,0x9e,0xa1,0x00,0x0c,0x00,
--	0x10,0x08,0x0c,0xff,0xea,0x9e,0xa3,0x00,0x0c,0x00,0xd1,0x0c,0x10,0x08,0x0c,0xff,
--	0xea,0x9e,0xa5,0x00,0x0c,0x00,0x10,0x08,0x0c,0xff,0xea,0x9e,0xa7,0x00,0x0c,0x00,
--	0xd2,0x1a,0xd1,0x0c,0x10,0x08,0x0c,0xff,0xea,0x9e,0xa9,0x00,0x0c,0x00,0x10,0x07,
--	0x0d,0xff,0xc9,0xa6,0x00,0x10,0xff,0xc9,0x9c,0x00,0xd1,0x0e,0x10,0x07,0x10,0xff,
--	0xc9,0xa1,0x00,0x10,0xff,0xc9,0xac,0x00,0x10,0x07,0x12,0xff,0xc9,0xaa,0x00,0x14,
--	0x00,0xd3,0x35,0xd2,0x1d,0xd1,0x0e,0x10,0x07,0x10,0xff,0xca,0x9e,0x00,0x10,0xff,
--	0xca,0x87,0x00,0x10,0x07,0x11,0xff,0xca,0x9d,0x00,0x11,0xff,0xea,0xad,0x93,0x00,
--	0xd1,0x0c,0x10,0x08,0x11,0xff,0xea,0x9e,0xb5,0x00,0x11,0x00,0x10,0x08,0x11,0xff,
--	0xea,0x9e,0xb7,0x00,0x11,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x14,0xff,0xea,0x9e,
--	0xb9,0x00,0x14,0x00,0x10,0x08,0x15,0xff,0xea,0x9e,0xbb,0x00,0x15,0x00,0xd1,0x0c,
--	0x10,0x08,0x15,0xff,0xea,0x9e,0xbd,0x00,0x15,0x00,0x10,0x08,0x15,0xff,0xea,0x9e,
--	0xbf,0x00,0x15,0x00,0xcf,0x86,0xe5,0xd4,0x63,0x94,0x2f,0x93,0x2b,0xd2,0x10,0x51,
--	0x04,0x00,0x00,0x10,0x08,0x15,0xff,0xea,0x9f,0x83,0x00,0x15,0x00,0xd1,0x0f,0x10,
--	0x08,0x15,0xff,0xea,0x9e,0x94,0x00,0x15,0xff,0xca,0x82,0x00,0x10,0x08,0x15,0xff,
--	0xe1,0xb6,0x8e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe4,0xb4,0x66,0xd3,0x1d,0xe2,
--	0x5b,0x64,0xe1,0x0a,0x64,0xe0,0xf7,0x63,0xcf,0x86,0xe5,0xd8,0x63,0x94,0x0b,0x93,
--	0x07,0x62,0xc3,0x63,0x08,0x00,0x08,0x00,0x08,0x00,0xd2,0x0f,0xe1,0x5a,0x65,0xe0,
--	0x27,0x65,0xcf,0x86,0x65,0x0c,0x65,0x0a,0x00,0xd1,0xab,0xd0,0x1a,0xcf,0x86,0xe5,
--	0x17,0x66,0xe4,0xfa,0x65,0xe3,0xe1,0x65,0xe2,0xd4,0x65,0x91,0x08,0x10,0x04,0x00,
--	0x00,0x0c,0x00,0x0c,0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0xd4,0x0b,0x93,0x07,0x62,
--	0x27,0x66,0x11,0x00,0x00,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x11,0xff,
--	0xe1,0x8e,0xa0,0x00,0x11,0xff,0xe1,0x8e,0xa1,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,
--	0xa2,0x00,0x11,0xff,0xe1,0x8e,0xa3,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,
--	0xa4,0x00,0x11,0xff,0xe1,0x8e,0xa5,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,0xa6,0x00,
--	0x11,0xff,0xe1,0x8e,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,
--	0xa8,0x00,0x11,0xff,0xe1,0x8e,0xa9,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,0xaa,0x00,
--	0x11,0xff,0xe1,0x8e,0xab,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,0xac,0x00,
--	0x11,0xff,0xe1,0x8e,0xad,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,0xae,0x00,0x11,0xff,
--	0xe1,0x8e,0xaf,0x00,0xe0,0xb2,0x65,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,
--	0xd2,0x20,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,0xb0,0x00,0x11,0xff,0xe1,0x8e,
--	0xb1,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,0xb2,0x00,0x11,0xff,0xe1,0x8e,0xb3,0x00,
--	0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,0xb4,0x00,0x11,0xff,0xe1,0x8e,0xb5,0x00,
--	0x10,0x08,0x11,0xff,0xe1,0x8e,0xb6,0x00,0x11,0xff,0xe1,0x8e,0xb7,0x00,0xd2,0x20,
--	0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,0xb8,0x00,0x11,0xff,0xe1,0x8e,0xb9,0x00,
--	0x10,0x08,0x11,0xff,0xe1,0x8e,0xba,0x00,0x11,0xff,0xe1,0x8e,0xbb,0x00,0xd1,0x10,
--	0x10,0x08,0x11,0xff,0xe1,0x8e,0xbc,0x00,0x11,0xff,0xe1,0x8e,0xbd,0x00,0x10,0x08,
--	0x11,0xff,0xe1,0x8e,0xbe,0x00,0x11,0xff,0xe1,0x8e,0xbf,0x00,0xd3,0x40,0xd2,0x20,
--	0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8f,0x80,0x00,0x11,0xff,0xe1,0x8f,0x81,0x00,
--	0x10,0x08,0x11,0xff,0xe1,0x8f,0x82,0x00,0x11,0xff,0xe1,0x8f,0x83,0x00,0xd1,0x10,
--	0x10,0x08,0x11,0xff,0xe1,0x8f,0x84,0x00,0x11,0xff,0xe1,0x8f,0x85,0x00,0x10,0x08,
--	0x11,0xff,0xe1,0x8f,0x86,0x00,0x11,0xff,0xe1,0x8f,0x87,0x00,0xd2,0x20,0xd1,0x10,
--	0x10,0x08,0x11,0xff,0xe1,0x8f,0x88,0x00,0x11,0xff,0xe1,0x8f,0x89,0x00,0x10,0x08,
--	0x11,0xff,0xe1,0x8f,0x8a,0x00,0x11,0xff,0xe1,0x8f,0x8b,0x00,0xd1,0x10,0x10,0x08,
--	0x11,0xff,0xe1,0x8f,0x8c,0x00,0x11,0xff,0xe1,0x8f,0x8d,0x00,0x10,0x08,0x11,0xff,
--	0xe1,0x8f,0x8e,0x00,0x11,0xff,0xe1,0x8f,0x8f,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,
--	0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8f,0x90,0x00,0x11,0xff,0xe1,0x8f,0x91,0x00,
--	0x10,0x08,0x11,0xff,0xe1,0x8f,0x92,0x00,0x11,0xff,0xe1,0x8f,0x93,0x00,0xd1,0x10,
--	0x10,0x08,0x11,0xff,0xe1,0x8f,0x94,0x00,0x11,0xff,0xe1,0x8f,0x95,0x00,0x10,0x08,
--	0x11,0xff,0xe1,0x8f,0x96,0x00,0x11,0xff,0xe1,0x8f,0x97,0x00,0xd2,0x20,0xd1,0x10,
--	0x10,0x08,0x11,0xff,0xe1,0x8f,0x98,0x00,0x11,0xff,0xe1,0x8f,0x99,0x00,0x10,0x08,
--	0x11,0xff,0xe1,0x8f,0x9a,0x00,0x11,0xff,0xe1,0x8f,0x9b,0x00,0xd1,0x10,0x10,0x08,
--	0x11,0xff,0xe1,0x8f,0x9c,0x00,0x11,0xff,0xe1,0x8f,0x9d,0x00,0x10,0x08,0x11,0xff,
--	0xe1,0x8f,0x9e,0x00,0x11,0xff,0xe1,0x8f,0x9f,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,
--	0x10,0x08,0x11,0xff,0xe1,0x8f,0xa0,0x00,0x11,0xff,0xe1,0x8f,0xa1,0x00,0x10,0x08,
--	0x11,0xff,0xe1,0x8f,0xa2,0x00,0x11,0xff,0xe1,0x8f,0xa3,0x00,0xd1,0x10,0x10,0x08,
--	0x11,0xff,0xe1,0x8f,0xa4,0x00,0x11,0xff,0xe1,0x8f,0xa5,0x00,0x10,0x08,0x11,0xff,
--	0xe1,0x8f,0xa6,0x00,0x11,0xff,0xe1,0x8f,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x11,0xff,0xe1,0x8f,0xa8,0x00,0x11,0xff,0xe1,0x8f,0xa9,0x00,0x10,0x08,0x11,0xff,
--	0xe1,0x8f,0xaa,0x00,0x11,0xff,0xe1,0x8f,0xab,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,
--	0xe1,0x8f,0xac,0x00,0x11,0xff,0xe1,0x8f,0xad,0x00,0x10,0x08,0x11,0xff,0xe1,0x8f,
--	0xae,0x00,0x11,0xff,0xe1,0x8f,0xaf,0x00,0xd1,0x0c,0xe0,0xeb,0x63,0xcf,0x86,0xcf,
--	0x06,0x02,0xff,0xff,0xd0,0x08,0xcf,0x86,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0x06,
--	0xcf,0x06,0x01,0x00,0xd4,0xae,0xd3,0x09,0xe2,0x54,0x64,0xcf,0x06,0x01,0x00,0xd2,
--	0x27,0xe1,0x1f,0x70,0xe0,0x26,0x6e,0xcf,0x86,0xe5,0x3f,0x6d,0xe4,0xce,0x6c,0xe3,
--	0x99,0x6c,0xe2,0x78,0x6c,0xe1,0x67,0x6c,0x10,0x08,0x01,0xff,0xe5,0x88,0x87,0x00,
--	0x01,0xff,0xe5,0xba,0xa6,0x00,0xe1,0x74,0x74,0xe0,0xe8,0x73,0xcf,0x86,0xe5,0x22,
--	0x73,0xd4,0x3b,0x93,0x37,0xd2,0x1d,0xd1,0x0e,0x10,0x07,0x01,0xff,0x66,0x66,0x00,
--	0x01,0xff,0x66,0x69,0x00,0x10,0x07,0x01,0xff,0x66,0x6c,0x00,0x01,0xff,0x66,0x66,
--	0x69,0x00,0xd1,0x0f,0x10,0x08,0x01,0xff,0x66,0x66,0x6c,0x00,0x01,0xff,0x73,0x74,
--	0x00,0x10,0x07,0x01,0xff,0x73,0x74,0x00,0x00,0x00,0x00,0x00,0xe3,0xc8,0x72,0xd2,
--	0x11,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xd5,0xb4,0xd5,0xb6,0x00,
--	0xd1,0x12,0x10,0x09,0x01,0xff,0xd5,0xb4,0xd5,0xa5,0x00,0x01,0xff,0xd5,0xb4,0xd5,
--	0xab,0x00,0x10,0x09,0x01,0xff,0xd5,0xbe,0xd5,0xb6,0x00,0x01,0xff,0xd5,0xb4,0xd5,
--	0xad,0x00,0xd3,0x09,0xe2,0x40,0x74,0xcf,0x06,0x01,0x00,0xd2,0x13,0xe1,0x30,0x75,
--	0xe0,0xc1,0x74,0xcf,0x86,0xe5,0x9e,0x74,0x64,0x8d,0x74,0x06,0xff,0x00,0xe1,0x96,
--	0x75,0xe0,0x63,0x75,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,
--	0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x7c,
--	0xd3,0x3c,0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0xef,0xbd,0x81,0x00,
--	0x10,0x08,0x01,0xff,0xef,0xbd,0x82,0x00,0x01,0xff,0xef,0xbd,0x83,0x00,0xd1,0x10,
--	0x10,0x08,0x01,0xff,0xef,0xbd,0x84,0x00,0x01,0xff,0xef,0xbd,0x85,0x00,0x10,0x08,
--	0x01,0xff,0xef,0xbd,0x86,0x00,0x01,0xff,0xef,0xbd,0x87,0x00,0xd2,0x20,0xd1,0x10,
--	0x10,0x08,0x01,0xff,0xef,0xbd,0x88,0x00,0x01,0xff,0xef,0xbd,0x89,0x00,0x10,0x08,
--	0x01,0xff,0xef,0xbd,0x8a,0x00,0x01,0xff,0xef,0xbd,0x8b,0x00,0xd1,0x10,0x10,0x08,
--	0x01,0xff,0xef,0xbd,0x8c,0x00,0x01,0xff,0xef,0xbd,0x8d,0x00,0x10,0x08,0x01,0xff,
--	0xef,0xbd,0x8e,0x00,0x01,0xff,0xef,0xbd,0x8f,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,
--	0x10,0x08,0x01,0xff,0xef,0xbd,0x90,0x00,0x01,0xff,0xef,0xbd,0x91,0x00,0x10,0x08,
--	0x01,0xff,0xef,0xbd,0x92,0x00,0x01,0xff,0xef,0xbd,0x93,0x00,0xd1,0x10,0x10,0x08,
--	0x01,0xff,0xef,0xbd,0x94,0x00,0x01,0xff,0xef,0xbd,0x95,0x00,0x10,0x08,0x01,0xff,
--	0xef,0xbd,0x96,0x00,0x01,0xff,0xef,0xbd,0x97,0x00,0x92,0x1c,0xd1,0x10,0x10,0x08,
--	0x01,0xff,0xef,0xbd,0x98,0x00,0x01,0xff,0xef,0xbd,0x99,0x00,0x10,0x08,0x01,0xff,
--	0xef,0xbd,0x9a,0x00,0x01,0x00,0x01,0x00,0x83,0xe2,0x87,0xb3,0xe1,0x60,0xb0,0xe0,
--	0xdd,0xae,0xcf,0x86,0xe5,0x81,0x9b,0xc4,0xe3,0xc1,0x07,0xe2,0x62,0x06,0xe1,0x11,
--	0x86,0xe0,0x09,0x05,0xcf,0x86,0xe5,0xfb,0x02,0xd4,0x1c,0xe3,0x7f,0x76,0xe2,0xd6,
--	0x75,0xe1,0xb1,0x75,0xe0,0x8a,0x75,0xcf,0x86,0xe5,0x57,0x75,0x94,0x07,0x63,0x42,
--	0x75,0x07,0x00,0x07,0x00,0xe3,0x2b,0x78,0xe2,0xf0,0x77,0xe1,0x77,0x01,0xe0,0x88,
--	0x77,0xcf,0x86,0xe5,0x21,0x01,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,
--	0x05,0xff,0xf0,0x90,0x90,0xa8,0x00,0x05,0xff,0xf0,0x90,0x90,0xa9,0x00,0x10,0x09,
--	0x05,0xff,0xf0,0x90,0x90,0xaa,0x00,0x05,0xff,0xf0,0x90,0x90,0xab,0x00,0xd1,0x12,
--	0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xac,0x00,0x05,0xff,0xf0,0x90,0x90,0xad,0x00,
--	0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xae,0x00,0x05,0xff,0xf0,0x90,0x90,0xaf,0x00,
--	0xd2,0x24,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xb0,0x00,0x05,0xff,0xf0,
--	0x90,0x90,0xb1,0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xb2,0x00,0x05,0xff,0xf0,
--	0x90,0x90,0xb3,0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xb4,0x00,0x05,
--	0xff,0xf0,0x90,0x90,0xb5,0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xb6,0x00,0x05,
--	0xff,0xf0,0x90,0x90,0xb7,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x05,0xff,
--	0xf0,0x90,0x90,0xb8,0x00,0x05,0xff,0xf0,0x90,0x90,0xb9,0x00,0x10,0x09,0x05,0xff,
--	0xf0,0x90,0x90,0xba,0x00,0x05,0xff,0xf0,0x90,0x90,0xbb,0x00,0xd1,0x12,0x10,0x09,
--	0x05,0xff,0xf0,0x90,0x90,0xbc,0x00,0x05,0xff,0xf0,0x90,0x90,0xbd,0x00,0x10,0x09,
--	0x05,0xff,0xf0,0x90,0x90,0xbe,0x00,0x05,0xff,0xf0,0x90,0x90,0xbf,0x00,0xd2,0x24,
--	0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x91,0x80,0x00,0x05,0xff,0xf0,0x90,0x91,
--	0x81,0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x91,0x82,0x00,0x05,0xff,0xf0,0x90,0x91,
--	0x83,0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x91,0x84,0x00,0x05,0xff,0xf0,
--	0x90,0x91,0x85,0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x91,0x86,0x00,0x05,0xff,0xf0,
--	0x90,0x91,0x87,0x00,0x94,0x4c,0x93,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x05,0xff,
--	0xf0,0x90,0x91,0x88,0x00,0x05,0xff,0xf0,0x90,0x91,0x89,0x00,0x10,0x09,0x05,0xff,
--	0xf0,0x90,0x91,0x8a,0x00,0x05,0xff,0xf0,0x90,0x91,0x8b,0x00,0xd1,0x12,0x10,0x09,
--	0x05,0xff,0xf0,0x90,0x91,0x8c,0x00,0x05,0xff,0xf0,0x90,0x91,0x8d,0x00,0x10,0x09,
--	0x07,0xff,0xf0,0x90,0x91,0x8e,0x00,0x07,0xff,0xf0,0x90,0x91,0x8f,0x00,0x05,0x00,
--	0x05,0x00,0xd0,0xa0,0xcf,0x86,0xd5,0x07,0x64,0x30,0x76,0x07,0x00,0xd4,0x07,0x63,
--	0x3d,0x76,0x07,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,
--	0x93,0x98,0x00,0x12,0xff,0xf0,0x90,0x93,0x99,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,
--	0x93,0x9a,0x00,0x12,0xff,0xf0,0x90,0x93,0x9b,0x00,0xd1,0x12,0x10,0x09,0x12,0xff,
--	0xf0,0x90,0x93,0x9c,0x00,0x12,0xff,0xf0,0x90,0x93,0x9d,0x00,0x10,0x09,0x12,0xff,
--	0xf0,0x90,0x93,0x9e,0x00,0x12,0xff,0xf0,0x90,0x93,0x9f,0x00,0xd2,0x24,0xd1,0x12,
--	0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xa0,0x00,0x12,0xff,0xf0,0x90,0x93,0xa1,0x00,
--	0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xa2,0x00,0x12,0xff,0xf0,0x90,0x93,0xa3,0x00,
--	0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xa4,0x00,0x12,0xff,0xf0,0x90,0x93,
--	0xa5,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xa6,0x00,0x12,0xff,0xf0,0x90,0x93,
--	0xa7,0x00,0xcf,0x86,0xe5,0xc6,0x75,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,
--	0x09,0x12,0xff,0xf0,0x90,0x93,0xa8,0x00,0x12,0xff,0xf0,0x90,0x93,0xa9,0x00,0x10,
--	0x09,0x12,0xff,0xf0,0x90,0x93,0xaa,0x00,0x12,0xff,0xf0,0x90,0x93,0xab,0x00,0xd1,
--	0x12,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xac,0x00,0x12,0xff,0xf0,0x90,0x93,0xad,
--	0x00,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xae,0x00,0x12,0xff,0xf0,0x90,0x93,0xaf,
--	0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xb0,0x00,0x12,0xff,
--	0xf0,0x90,0x93,0xb1,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xb2,0x00,0x12,0xff,
--	0xf0,0x90,0x93,0xb3,0x00,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xb4,0x00,
--	0x12,0xff,0xf0,0x90,0x93,0xb5,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xb6,0x00,
--	0x12,0xff,0xf0,0x90,0x93,0xb7,0x00,0x93,0x28,0x92,0x24,0xd1,0x12,0x10,0x09,0x12,
--	0xff,0xf0,0x90,0x93,0xb8,0x00,0x12,0xff,0xf0,0x90,0x93,0xb9,0x00,0x10,0x09,0x12,
--	0xff,0xf0,0x90,0x93,0xba,0x00,0x12,0xff,0xf0,0x90,0x93,0xbb,0x00,0x00,0x00,0x12,
--	0x00,0xd4,0x1f,0xe3,0xdf,0x76,0xe2,0x6a,0x76,0xe1,0x09,0x76,0xe0,0xea,0x75,0xcf,
--	0x86,0xe5,0xb7,0x75,0x94,0x0a,0xe3,0xa2,0x75,0x62,0x99,0x75,0x07,0x00,0x07,0x00,
--	0xe3,0xde,0x78,0xe2,0xaf,0x78,0xd1,0x09,0xe0,0x4c,0x78,0xcf,0x06,0x0b,0x00,0xe0,
--	0x7f,0x78,0xcf,0x86,0xe5,0x21,0x01,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,
--	0x09,0x11,0xff,0xf0,0x90,0xb3,0x80,0x00,0x11,0xff,0xf0,0x90,0xb3,0x81,0x00,0x10,
--	0x09,0x11,0xff,0xf0,0x90,0xb3,0x82,0x00,0x11,0xff,0xf0,0x90,0xb3,0x83,0x00,0xd1,
--	0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x84,0x00,0x11,0xff,0xf0,0x90,0xb3,0x85,
--	0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x86,0x00,0x11,0xff,0xf0,0x90,0xb3,0x87,
--	0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x88,0x00,0x11,0xff,
--	0xf0,0x90,0xb3,0x89,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x8a,0x00,0x11,0xff,
--	0xf0,0x90,0xb3,0x8b,0x00,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x8c,0x00,
--	0x11,0xff,0xf0,0x90,0xb3,0x8d,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x8e,0x00,
--	0x11,0xff,0xf0,0x90,0xb3,0x8f,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x11,
--	0xff,0xf0,0x90,0xb3,0x90,0x00,0x11,0xff,0xf0,0x90,0xb3,0x91,0x00,0x10,0x09,0x11,
--	0xff,0xf0,0x90,0xb3,0x92,0x00,0x11,0xff,0xf0,0x90,0xb3,0x93,0x00,0xd1,0x12,0x10,
--	0x09,0x11,0xff,0xf0,0x90,0xb3,0x94,0x00,0x11,0xff,0xf0,0x90,0xb3,0x95,0x00,0x10,
--	0x09,0x11,0xff,0xf0,0x90,0xb3,0x96,0x00,0x11,0xff,0xf0,0x90,0xb3,0x97,0x00,0xd2,
--	0x24,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x98,0x00,0x11,0xff,0xf0,0x90,
--	0xb3,0x99,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x9a,0x00,0x11,0xff,0xf0,0x90,
--	0xb3,0x9b,0x00,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x9c,0x00,0x11,0xff,
--	0xf0,0x90,0xb3,0x9d,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x9e,0x00,0x11,0xff,
--	0xf0,0x90,0xb3,0x9f,0x00,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x11,
--	0xff,0xf0,0x90,0xb3,0xa0,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa1,0x00,0x10,0x09,0x11,
--	0xff,0xf0,0x90,0xb3,0xa2,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa3,0x00,0xd1,0x12,0x10,
--	0x09,0x11,0xff,0xf0,0x90,0xb3,0xa4,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa5,0x00,0x10,
--	0x09,0x11,0xff,0xf0,0x90,0xb3,0xa6,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa7,0x00,0xd2,
--	0x24,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xa8,0x00,0x11,0xff,0xf0,0x90,
--	0xb3,0xa9,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xaa,0x00,0x11,0xff,0xf0,0x90,
--	0xb3,0xab,0x00,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xac,0x00,0x11,0xff,
--	0xf0,0x90,0xb3,0xad,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xae,0x00,0x11,0xff,
--	0xf0,0x90,0xb3,0xaf,0x00,0x93,0x23,0x92,0x1f,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,
--	0x90,0xb3,0xb0,0x00,0x11,0xff,0xf0,0x90,0xb3,0xb1,0x00,0x10,0x09,0x11,0xff,0xf0,
--	0x90,0xb3,0xb2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x15,0xe4,0x91,
--	0x7b,0xe3,0x9b,0x79,0xe2,0x94,0x78,0xe1,0xe4,0x77,0xe0,0x9d,0x77,0xcf,0x06,0x0c,
--	0x00,0xe4,0xeb,0x7e,0xe3,0x44,0x7e,0xe2,0xed,0x7d,0xd1,0x0c,0xe0,0xb2,0x7d,0xcf,
--	0x86,0x65,0x93,0x7d,0x14,0x00,0xe0,0xb6,0x7d,0xcf,0x86,0x55,0x04,0x00,0x00,0xd4,
--	0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x80,0x00,
--	0x10,0xff,0xf0,0x91,0xa3,0x81,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x82,0x00,
--	0x10,0xff,0xf0,0x91,0xa3,0x83,0x00,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,
--	0x84,0x00,0x10,0xff,0xf0,0x91,0xa3,0x85,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,
--	0x86,0x00,0x10,0xff,0xf0,0x91,0xa3,0x87,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x10,
--	0xff,0xf0,0x91,0xa3,0x88,0x00,0x10,0xff,0xf0,0x91,0xa3,0x89,0x00,0x10,0x09,0x10,
--	0xff,0xf0,0x91,0xa3,0x8a,0x00,0x10,0xff,0xf0,0x91,0xa3,0x8b,0x00,0xd1,0x12,0x10,
--	0x09,0x10,0xff,0xf0,0x91,0xa3,0x8c,0x00,0x10,0xff,0xf0,0x91,0xa3,0x8d,0x00,0x10,
--	0x09,0x10,0xff,0xf0,0x91,0xa3,0x8e,0x00,0x10,0xff,0xf0,0x91,0xa3,0x8f,0x00,0xd3,
--	0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x90,0x00,0x10,0xff,
--	0xf0,0x91,0xa3,0x91,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x92,0x00,0x10,0xff,
--	0xf0,0x91,0xa3,0x93,0x00,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x94,0x00,
--	0x10,0xff,0xf0,0x91,0xa3,0x95,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x96,0x00,
--	0x10,0xff,0xf0,0x91,0xa3,0x97,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,
--	0x91,0xa3,0x98,0x00,0x10,0xff,0xf0,0x91,0xa3,0x99,0x00,0x10,0x09,0x10,0xff,0xf0,
--	0x91,0xa3,0x9a,0x00,0x10,0xff,0xf0,0x91,0xa3,0x9b,0x00,0xd1,0x12,0x10,0x09,0x10,
--	0xff,0xf0,0x91,0xa3,0x9c,0x00,0x10,0xff,0xf0,0x91,0xa3,0x9d,0x00,0x10,0x09,0x10,
--	0xff,0xf0,0x91,0xa3,0x9e,0x00,0x10,0xff,0xf0,0x91,0xa3,0x9f,0x00,0xd1,0x11,0xe0,
--	0x12,0x81,0xcf,0x86,0xe5,0x09,0x81,0xe4,0xd2,0x80,0xcf,0x06,0x00,0x00,0xe0,0xdb,
--	0x82,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x00,0x00,0xd4,0x09,0xe3,0x10,0x81,0xcf,0x06,
--	0x0c,0x00,0xd3,0x06,0xcf,0x06,0x00,0x00,0xe2,0x3b,0x82,0xe1,0x16,0x82,0xd0,0x06,
--	0xcf,0x06,0x00,0x00,0xcf,0x86,0xa5,0x21,0x01,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,
--	0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xa0,0x00,0x14,0xff,0xf0,0x96,0xb9,0xa1,
--	0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xa2,0x00,0x14,0xff,0xf0,0x96,0xb9,0xa3,
--	0x00,0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xa4,0x00,0x14,0xff,0xf0,0x96,
--	0xb9,0xa5,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xa6,0x00,0x14,0xff,0xf0,0x96,
--	0xb9,0xa7,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xa8,0x00,
--	0x14,0xff,0xf0,0x96,0xb9,0xa9,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xaa,0x00,
--	0x14,0xff,0xf0,0x96,0xb9,0xab,0x00,0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,
--	0xac,0x00,0x14,0xff,0xf0,0x96,0xb9,0xad,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,
--	0xae,0x00,0x14,0xff,0xf0,0x96,0xb9,0xaf,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,
--	0x09,0x14,0xff,0xf0,0x96,0xb9,0xb0,0x00,0x14,0xff,0xf0,0x96,0xb9,0xb1,0x00,0x10,
--	0x09,0x14,0xff,0xf0,0x96,0xb9,0xb2,0x00,0x14,0xff,0xf0,0x96,0xb9,0xb3,0x00,0xd1,
--	0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xb4,0x00,0x14,0xff,0xf0,0x96,0xb9,0xb5,
--	0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xb6,0x00,0x14,0xff,0xf0,0x96,0xb9,0xb7,
--	0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xb8,0x00,0x14,0xff,
--	0xf0,0x96,0xb9,0xb9,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xba,0x00,0x14,0xff,
--	0xf0,0x96,0xb9,0xbb,0x00,0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xbc,0x00,
--	0x14,0xff,0xf0,0x96,0xb9,0xbd,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xbe,0x00,
--	0x14,0xff,0xf0,0x96,0xb9,0xbf,0x00,0x14,0x00,0xd2,0x14,0xe1,0x25,0x82,0xe0,0x1c,
--	0x82,0xcf,0x86,0xe5,0xdd,0x81,0xe4,0x9a,0x81,0xcf,0x06,0x12,0x00,0xd1,0x0b,0xe0,
--	0x51,0x83,0xcf,0x86,0xcf,0x06,0x00,0x00,0xe0,0x95,0x8b,0xcf,0x86,0xd5,0x22,0xe4,
--	0xd0,0x88,0xe3,0x93,0x88,0xe2,0x38,0x88,0xe1,0x31,0x88,0xe0,0x2a,0x88,0xcf,0x86,
--	0xe5,0xfb,0x87,0xe4,0xe2,0x87,0x93,0x07,0x62,0xd1,0x87,0x12,0xe6,0x12,0xe6,0xe4,
--	0x36,0x89,0xe3,0x2f,0x89,0xd2,0x09,0xe1,0xb8,0x88,0xcf,0x06,0x10,0x00,0xe1,0x1f,
--	0x89,0xe0,0xec,0x88,0xcf,0x86,0xe5,0x21,0x01,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,
--	0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xa2,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xa3,
--	0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xa4,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xa5,
--	0x00,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xa6,0x00,0x12,0xff,0xf0,0x9e,
--	0xa4,0xa7,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xa8,0x00,0x12,0xff,0xf0,0x9e,
--	0xa4,0xa9,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xaa,0x00,
--	0x12,0xff,0xf0,0x9e,0xa4,0xab,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xac,0x00,
--	0x12,0xff,0xf0,0x9e,0xa4,0xad,0x00,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,
--	0xae,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xaf,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,
--	0xb0,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb1,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,
--	0x09,0x12,0xff,0xf0,0x9e,0xa4,0xb2,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb3,0x00,0x10,
--	0x09,0x12,0xff,0xf0,0x9e,0xa4,0xb4,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb5,0x00,0xd1,
--	0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xb6,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb7,
--	0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xb8,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb9,
--	0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xba,0x00,0x12,0xff,
--	0xf0,0x9e,0xa4,0xbb,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xbc,0x00,0x12,0xff,
--	0xf0,0x9e,0xa4,0xbd,0x00,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xbe,0x00,
--	0x12,0xff,0xf0,0x9e,0xa4,0xbf,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa5,0x80,0x00,
--	0x12,0xff,0xf0,0x9e,0xa5,0x81,0x00,0x94,0x1e,0x93,0x1a,0x92,0x16,0x91,0x12,0x10,
--	0x09,0x12,0xff,0xf0,0x9e,0xa5,0x82,0x00,0x12,0xff,0xf0,0x9e,0xa5,0x83,0x00,0x12,
--	0x00,0x12,0x00,0x12,0x00,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--	/* nfdi_c0100 */
--	0x57,0x04,0x01,0x00,0xc6,0xe5,0xac,0x13,0xe4,0x41,0x0c,0xe3,0x7a,0x07,0xe2,0xf3,
--	0x01,0xc1,0xd0,0x1f,0xcf,0x86,0x55,0x04,0x01,0x00,0x94,0x15,0x53,0x04,0x01,0x00,
--	0x52,0x04,0x01,0x00,0x91,0x09,0x10,0x04,0x01,0x00,0x01,0xff,0x00,0x01,0x00,0x01,
--	0x00,0xcf,0x86,0xd5,0xe4,0xd4,0x7c,0xd3,0x3c,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
--	0xff,0x41,0xcc,0x80,0x00,0x01,0xff,0x41,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x41,
--	0xcc,0x82,0x00,0x01,0xff,0x41,0xcc,0x83,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,
--	0xcc,0x88,0x00,0x01,0xff,0x41,0xcc,0x8a,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0x43,
--	0xcc,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x45,0xcc,0x80,0x00,0x01,
--	0xff,0x45,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x45,0xcc,0x82,0x00,0x01,0xff,0x45,
--	0xcc,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x49,0xcc,0x80,0x00,0x01,0xff,0x49,
--	0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x49,0xcc,0x82,0x00,0x01,0xff,0x49,0xcc,0x88,
--	0x00,0xd3,0x38,0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x4e,0xcc,0x83,
--	0x00,0x10,0x08,0x01,0xff,0x4f,0xcc,0x80,0x00,0x01,0xff,0x4f,0xcc,0x81,0x00,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0x82,0x00,0x01,0xff,0x4f,0xcc,0x83,0x00,0x10,
--	0x08,0x01,0xff,0x4f,0xcc,0x88,0x00,0x01,0x00,0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,
--	0x00,0x01,0xff,0x55,0xcc,0x80,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0x81,0x00,0x01,
--	0xff,0x55,0xcc,0x82,0x00,0x91,0x10,0x10,0x08,0x01,0xff,0x55,0xcc,0x88,0x00,0x01,
--	0xff,0x59,0xcc,0x81,0x00,0x01,0x00,0xd4,0x7c,0xd3,0x3c,0xd2,0x20,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0x61,0xcc,0x80,0x00,0x01,0xff,0x61,0xcc,0x81,0x00,0x10,0x08,0x01,
--	0xff,0x61,0xcc,0x82,0x00,0x01,0xff,0x61,0xcc,0x83,0x00,0xd1,0x10,0x10,0x08,0x01,
--	0xff,0x61,0xcc,0x88,0x00,0x01,0xff,0x61,0xcc,0x8a,0x00,0x10,0x04,0x01,0x00,0x01,
-+	0xc6,0xe5,0xf6,0x14,0xe4,0x6c,0x0d,0xe3,0x36,0x08,0xe2,0x1f,0x01,0xc1,0xd0,0x21,
-+	0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0x93,0x13,0x52,0x04,0x01,0x00,
-+	0x91,0x0b,0x10,0x04,0x01,0x00,0x01,0xff,0xce,0xbc,0x00,0x01,0x00,0x01,0x00,0xcf,
-+	0x86,0xe5,0x9d,0x44,0xd4,0x7f,0xd3,0x3f,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0x61,0xcc,0x80,0x00,0x01,0xff,0x61,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x61,0xcc,
-+	0x82,0x00,0x01,0xff,0x61,0xcc,0x83,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,
-+	0x88,0x00,0x01,0xff,0x61,0xcc,0x8a,0x00,0x10,0x07,0x01,0xff,0xc3,0xa6,0x00,0x01,
- 	0xff,0x63,0xcc,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0x80,
- 	0x00,0x01,0xff,0x65,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,0x82,0x00,0x01,
- 	0xff,0x65,0xcc,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,0xcc,0x80,0x00,0x01,
- 	0xff,0x69,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x69,0xcc,0x82,0x00,0x01,0xff,0x69,
--	0xcc,0x88,0x00,0xd3,0x38,0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x6e,
--	0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x80,0x00,0x01,0xff,0x6f,0xcc,0x81,
--	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x82,0x00,0x01,0xff,0x6f,0xcc,0x83,
--	0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x88,0x00,0x01,0x00,0xd2,0x1c,0xd1,0x0c,0x10,
--	0x04,0x01,0x00,0x01,0xff,0x75,0xcc,0x80,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0x81,
--	0x00,0x01,0xff,0x75,0xcc,0x82,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0x88,
--	0x00,0x01,0xff,0x79,0xcc,0x81,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0x79,0xcc,0x88,
--	0x00,0xe1,0x9a,0x03,0xe0,0xd3,0x01,0xcf,0x86,0xd5,0xf4,0xd4,0x80,0xd3,0x40,0xd2,
--	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0x84,0x00,0x01,0xff,0x61,0xcc,0x84,
--	0x00,0x10,0x08,0x01,0xff,0x41,0xcc,0x86,0x00,0x01,0xff,0x61,0xcc,0x86,0x00,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0xa8,0x00,0x01,0xff,0x61,0xcc,0xa8,0x00,0x10,
--	0x08,0x01,0xff,0x43,0xcc,0x81,0x00,0x01,0xff,0x63,0xcc,0x81,0x00,0xd2,0x20,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0x43,0xcc,0x82,0x00,0x01,0xff,0x63,0xcc,0x82,0x00,0x10,
--	0x08,0x01,0xff,0x43,0xcc,0x87,0x00,0x01,0xff,0x63,0xcc,0x87,0x00,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0x43,0xcc,0x8c,0x00,0x01,0xff,0x63,0xcc,0x8c,0x00,0x10,0x08,0x01,
--	0xff,0x44,0xcc,0x8c,0x00,0x01,0xff,0x64,0xcc,0x8c,0x00,0xd3,0x34,0xd2,0x14,0x51,
--	0x04,0x01,0x00,0x10,0x08,0x01,0xff,0x45,0xcc,0x84,0x00,0x01,0xff,0x65,0xcc,0x84,
--	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x45,0xcc,0x86,0x00,0x01,0xff,0x65,0xcc,0x86,
--	0x00,0x10,0x08,0x01,0xff,0x45,0xcc,0x87,0x00,0x01,0xff,0x65,0xcc,0x87,0x00,0xd2,
--	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x45,0xcc,0xa8,0x00,0x01,0xff,0x65,0xcc,0xa8,
--	0x00,0x10,0x08,0x01,0xff,0x45,0xcc,0x8c,0x00,0x01,0xff,0x65,0xcc,0x8c,0x00,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0x47,0xcc,0x82,0x00,0x01,0xff,0x67,0xcc,0x82,0x00,0x10,
--	0x08,0x01,0xff,0x47,0xcc,0x86,0x00,0x01,0xff,0x67,0xcc,0x86,0x00,0xd4,0x74,0xd3,
--	0x34,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x47,0xcc,0x87,0x00,0x01,0xff,0x67,
--	0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x47,0xcc,0xa7,0x00,0x01,0xff,0x67,0xcc,0xa7,
--	0x00,0x91,0x10,0x10,0x08,0x01,0xff,0x48,0xcc,0x82,0x00,0x01,0xff,0x68,0xcc,0x82,
--	0x00,0x01,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x49,0xcc,0x83,0x00,0x01,
--	0xff,0x69,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x49,0xcc,0x84,0x00,0x01,0xff,0x69,
--	0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x49,0xcc,0x86,0x00,0x01,0xff,0x69,
--	0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x49,0xcc,0xa8,0x00,0x01,0xff,0x69,0xcc,0xa8,
--	0x00,0xd3,0x30,0xd2,0x10,0x91,0x0c,0x10,0x08,0x01,0xff,0x49,0xcc,0x87,0x00,0x01,
--	0x00,0x01,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4a,0xcc,0x82,0x00,0x01,0xff,0x6a,
--	0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x4b,0xcc,0xa7,0x00,0x01,0xff,0x6b,0xcc,0xa7,
--	0x00,0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x4c,0xcc,0x81,0x00,0x10,
--	0x08,0x01,0xff,0x6c,0xcc,0x81,0x00,0x01,0xff,0x4c,0xcc,0xa7,0x00,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0x6c,0xcc,0xa7,0x00,0x01,0xff,0x4c,0xcc,0x8c,0x00,0x10,0x08,0x01,
--	0xff,0x6c,0xcc,0x8c,0x00,0x01,0x00,0xcf,0x86,0xd5,0xd4,0xd4,0x60,0xd3,0x30,0xd2,
--	0x10,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0x4e,0xcc,0x81,0x00,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0x6e,0xcc,0x81,0x00,0x01,0xff,0x4e,0xcc,0xa7,0x00,0x10,
--	0x08,0x01,0xff,0x6e,0xcc,0xa7,0x00,0x01,0xff,0x4e,0xcc,0x8c,0x00,0xd2,0x10,0x91,
--	0x0c,0x10,0x08,0x01,0xff,0x6e,0xcc,0x8c,0x00,0x01,0x00,0x01,0x00,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0x4f,0xcc,0x84,0x00,0x01,0xff,0x6f,0xcc,0x84,0x00,0x10,0x08,0x01,
--	0xff,0x4f,0xcc,0x86,0x00,0x01,0xff,0x6f,0xcc,0x86,0x00,0xd3,0x34,0xd2,0x14,0x91,
--	0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0x8b,0x00,0x01,0xff,0x6f,0xcc,0x8b,0x00,0x01,
--	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x52,0xcc,0x81,0x00,0x01,0xff,0x72,0xcc,0x81,
--	0x00,0x10,0x08,0x01,0xff,0x52,0xcc,0xa7,0x00,0x01,0xff,0x72,0xcc,0xa7,0x00,0xd2,
--	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x52,0xcc,0x8c,0x00,0x01,0xff,0x72,0xcc,0x8c,
--	0x00,0x10,0x08,0x01,0xff,0x53,0xcc,0x81,0x00,0x01,0xff,0x73,0xcc,0x81,0x00,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0x53,0xcc,0x82,0x00,0x01,0xff,0x73,0xcc,0x82,0x00,0x10,
--	0x08,0x01,0xff,0x53,0xcc,0xa7,0x00,0x01,0xff,0x73,0xcc,0xa7,0x00,0xd4,0x74,0xd3,
--	0x34,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x53,0xcc,0x8c,0x00,0x01,0xff,0x73,
--	0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x54,0xcc,0xa7,0x00,0x01,0xff,0x74,0xcc,0xa7,
--	0x00,0x91,0x10,0x10,0x08,0x01,0xff,0x54,0xcc,0x8c,0x00,0x01,0xff,0x74,0xcc,0x8c,
--	0x00,0x01,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x55,0xcc,0x83,0x00,0x01,
--	0xff,0x75,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0x84,0x00,0x01,0xff,0x75,
--	0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x55,0xcc,0x86,0x00,0x01,0xff,0x75,
--	0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0x8a,0x00,0x01,0xff,0x75,0xcc,0x8a,
--	0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x55,0xcc,0x8b,0x00,0x01,
--	0xff,0x75,0xcc,0x8b,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0xa8,0x00,0x01,0xff,0x75,
--	0xcc,0xa8,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x57,0xcc,0x82,0x00,0x01,0xff,0x77,
--	0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x59,0xcc,0x82,0x00,0x01,0xff,0x79,0xcc,0x82,
--	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x59,0xcc,0x88,0x00,0x01,0xff,0x5a,
--	0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0x81,0x00,0x01,0xff,0x5a,0xcc,0x87,
--	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x7a,0xcc,0x87,0x00,0x01,0xff,0x5a,0xcc,0x8c,
--	0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0x8c,0x00,0x01,0x00,0xd0,0x4a,0xcf,0x86,0x55,
--	0x04,0x01,0x00,0xd4,0x2c,0xd3,0x18,0x92,0x14,0x91,0x10,0x10,0x08,0x01,0xff,0x4f,
--	0xcc,0x9b,0x00,0x01,0xff,0x6f,0xcc,0x9b,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,
--	0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0x55,0xcc,0x9b,0x00,0x93,
--	0x14,0x92,0x10,0x91,0x0c,0x10,0x08,0x01,0xff,0x75,0xcc,0x9b,0x00,0x01,0x00,0x01,
--	0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0xb4,0xd4,0x24,0x53,0x04,0x01,0x00,0x52,
--	0x04,0x01,0x00,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x41,0xcc,0x8c,0x00,0x10,
--	0x08,0x01,0xff,0x61,0xcc,0x8c,0x00,0x01,0xff,0x49,0xcc,0x8c,0x00,0xd3,0x46,0xd2,
--	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,0xcc,0x8c,0x00,0x01,0xff,0x4f,0xcc,0x8c,
--	0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x8c,0x00,0x01,0xff,0x55,0xcc,0x8c,0x00,0xd1,
--	0x12,0x10,0x08,0x01,0xff,0x75,0xcc,0x8c,0x00,0x01,0xff,0x55,0xcc,0x88,0xcc,0x84,
--	0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,0x84,0x00,0x01,0xff,0x55,0xcc,0x88,
--	0xcc,0x81,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,0x81,
--	0x00,0x01,0xff,0x55,0xcc,0x88,0xcc,0x8c,0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,
--	0xcc,0x8c,0x00,0x01,0xff,0x55,0xcc,0x88,0xcc,0x80,0x00,0xd1,0x0e,0x10,0x0a,0x01,
--	0xff,0x75,0xcc,0x88,0xcc,0x80,0x00,0x01,0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x88,
--	0xcc,0x84,0x00,0x01,0xff,0x61,0xcc,0x88,0xcc,0x84,0x00,0xd4,0x80,0xd3,0x3a,0xd2,
--	0x26,0xd1,0x14,0x10,0x0a,0x01,0xff,0x41,0xcc,0x87,0xcc,0x84,0x00,0x01,0xff,0x61,
--	0xcc,0x87,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,0xc3,0x86,0xcc,0x84,0x00,0x01,0xff,
--	0xc3,0xa6,0xcc,0x84,0x00,0x51,0x04,0x01,0x00,0x10,0x08,0x01,0xff,0x47,0xcc,0x8c,
--	0x00,0x01,0xff,0x67,0xcc,0x8c,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x4b,
--	0xcc,0x8c,0x00,0x01,0xff,0x6b,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x4f,0xcc,0xa8,
--	0x00,0x01,0xff,0x6f,0xcc,0xa8,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0xa8,
--	0xcc,0x84,0x00,0x01,0xff,0x6f,0xcc,0xa8,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,0xc6,
--	0xb7,0xcc,0x8c,0x00,0x01,0xff,0xca,0x92,0xcc,0x8c,0x00,0xd3,0x24,0xd2,0x10,0x91,
--	0x0c,0x10,0x08,0x01,0xff,0x6a,0xcc,0x8c,0x00,0x01,0x00,0x01,0x00,0x91,0x10,0x10,
--	0x08,0x01,0xff,0x47,0xcc,0x81,0x00,0x01,0xff,0x67,0xcc,0x81,0x00,0x04,0x00,0xd2,
--	0x24,0xd1,0x10,0x10,0x08,0x04,0xff,0x4e,0xcc,0x80,0x00,0x04,0xff,0x6e,0xcc,0x80,
--	0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x8a,0xcc,0x81,0x00,0x01,0xff,0x61,0xcc,0x8a,
--	0xcc,0x81,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xc3,0x86,0xcc,0x81,0x00,0x01,0xff,
--	0xc3,0xa6,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xc3,0x98,0xcc,0x81,0x00,0x01,0xff,
--	0xc3,0xb8,0xcc,0x81,0x00,0xe2,0x07,0x02,0xe1,0xae,0x01,0xe0,0x93,0x01,0xcf,0x86,
--	0xd5,0xf4,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,
--	0x8f,0x00,0x01,0xff,0x61,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x41,0xcc,0x91,0x00,
--	0x01,0xff,0x61,0xcc,0x91,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x45,0xcc,0x8f,0x00,
--	0x01,0xff,0x65,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x45,0xcc,0x91,0x00,0x01,0xff,
--	0x65,0xcc,0x91,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x49,0xcc,0x8f,0x00,
--	0x01,0xff,0x69,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x49,0xcc,0x91,0x00,0x01,0xff,
--	0x69,0xcc,0x91,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0x8f,0x00,0x01,0xff,
--	0x6f,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x4f,0xcc,0x91,0x00,0x01,0xff,0x6f,0xcc,
--	0x91,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x52,0xcc,0x8f,0x00,
--	0x01,0xff,0x72,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x52,0xcc,0x91,0x00,0x01,0xff,
--	0x72,0xcc,0x91,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x55,0xcc,0x8f,0x00,0x01,0xff,
--	0x75,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0x91,0x00,0x01,0xff,0x75,0xcc,
--	0x91,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x04,0xff,0x53,0xcc,0xa6,0x00,0x04,0xff,
--	0x73,0xcc,0xa6,0x00,0x10,0x08,0x04,0xff,0x54,0xcc,0xa6,0x00,0x04,0xff,0x74,0xcc,
--	0xa6,0x00,0x51,0x04,0x04,0x00,0x10,0x08,0x04,0xff,0x48,0xcc,0x8c,0x00,0x04,0xff,
--	0x68,0xcc,0x8c,0x00,0xd4,0x68,0xd3,0x20,0xd2,0x0c,0x91,0x08,0x10,0x04,0x06,0x00,
--	0x07,0x00,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x08,0x04,0xff,0x41,0xcc,0x87,0x00,
--	0x04,0xff,0x61,0xcc,0x87,0x00,0xd2,0x24,0xd1,0x10,0x10,0x08,0x04,0xff,0x45,0xcc,
--	0xa7,0x00,0x04,0xff,0x65,0xcc,0xa7,0x00,0x10,0x0a,0x04,0xff,0x4f,0xcc,0x88,0xcc,
-+	0xcc,0x88,0x00,0xd3,0x3b,0xd2,0x1f,0xd1,0x0f,0x10,0x07,0x01,0xff,0xc3,0xb0,0x00,
-+	0x01,0xff,0x6e,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x80,0x00,0x01,0xff,
-+	0x6f,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x82,0x00,0x01,0xff,
-+	0x6f,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x88,0x00,0x01,0x00,0xd2,0x1f,
-+	0xd1,0x0f,0x10,0x07,0x01,0xff,0xc3,0xb8,0x00,0x01,0xff,0x75,0xcc,0x80,0x00,0x10,
-+	0x08,0x01,0xff,0x75,0xcc,0x81,0x00,0x01,0xff,0x75,0xcc,0x82,0x00,0xd1,0x10,0x10,
-+	0x08,0x01,0xff,0x75,0xcc,0x88,0x00,0x01,0xff,0x79,0xcc,0x81,0x00,0x10,0x07,0x01,
-+	0xff,0xc3,0xbe,0x00,0x01,0xff,0x73,0x73,0x00,0xe1,0xd4,0x03,0xe0,0xeb,0x01,0xcf,
-+	0x86,0xd5,0xfb,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,
-+	0xcc,0x84,0x00,0x01,0xff,0x61,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x61,0xcc,0x86,
-+	0x00,0x01,0xff,0x61,0xcc,0x86,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0xa8,
-+	0x00,0x01,0xff,0x61,0xcc,0xa8,0x00,0x10,0x08,0x01,0xff,0x63,0xcc,0x81,0x00,0x01,
-+	0xff,0x63,0xcc,0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x63,0xcc,0x82,
-+	0x00,0x01,0xff,0x63,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x63,0xcc,0x87,0x00,0x01,
-+	0xff,0x63,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x63,0xcc,0x8c,0x00,0x01,
-+	0xff,0x63,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x64,0xcc,0x8c,0x00,0x01,0xff,0x64,
-+	0xcc,0x8c,0x00,0xd3,0x3b,0xd2,0x1b,0xd1,0x0b,0x10,0x07,0x01,0xff,0xc4,0x91,0x00,
-+	0x01,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,0x84,0x00,0x01,0xff,0x65,0xcc,0x84,0x00,
-+	0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0x86,0x00,0x01,0xff,0x65,0xcc,0x86,0x00,
-+	0x10,0x08,0x01,0xff,0x65,0xcc,0x87,0x00,0x01,0xff,0x65,0xcc,0x87,0x00,0xd2,0x20,
-+	0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0xa8,0x00,0x01,0xff,0x65,0xcc,0xa8,0x00,
-+	0x10,0x08,0x01,0xff,0x65,0xcc,0x8c,0x00,0x01,0xff,0x65,0xcc,0x8c,0x00,0xd1,0x10,
-+	0x10,0x08,0x01,0xff,0x67,0xcc,0x82,0x00,0x01,0xff,0x67,0xcc,0x82,0x00,0x10,0x08,
-+	0x01,0xff,0x67,0xcc,0x86,0x00,0x01,0xff,0x67,0xcc,0x86,0x00,0xd4,0x7b,0xd3,0x3b,
-+	0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x67,0xcc,0x87,0x00,0x01,0xff,0x67,0xcc,
-+	0x87,0x00,0x10,0x08,0x01,0xff,0x67,0xcc,0xa7,0x00,0x01,0xff,0x67,0xcc,0xa7,0x00,
-+	0xd1,0x10,0x10,0x08,0x01,0xff,0x68,0xcc,0x82,0x00,0x01,0xff,0x68,0xcc,0x82,0x00,
-+	0x10,0x07,0x01,0xff,0xc4,0xa7,0x00,0x01,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
-+	0xff,0x69,0xcc,0x83,0x00,0x01,0xff,0x69,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x69,
-+	0xcc,0x84,0x00,0x01,0xff,0x69,0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,
-+	0xcc,0x86,0x00,0x01,0xff,0x69,0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x69,0xcc,0xa8,
-+	0x00,0x01,0xff,0x69,0xcc,0xa8,0x00,0xd3,0x37,0xd2,0x17,0xd1,0x0c,0x10,0x08,0x01,
-+	0xff,0x69,0xcc,0x87,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xc4,0xb3,0x00,0x01,0x00,
-+	0xd1,0x10,0x10,0x08,0x01,0xff,0x6a,0xcc,0x82,0x00,0x01,0xff,0x6a,0xcc,0x82,0x00,
-+	0x10,0x08,0x01,0xff,0x6b,0xcc,0xa7,0x00,0x01,0xff,0x6b,0xcc,0xa7,0x00,0xd2,0x1c,
-+	0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x6c,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,
-+	0x6c,0xcc,0x81,0x00,0x01,0xff,0x6c,0xcc,0xa7,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0x6c,0xcc,0xa7,0x00,0x01,0xff,0x6c,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x6c,0xcc,
-+	0x8c,0x00,0x01,0xff,0xc5,0x80,0x00,0xcf,0x86,0xd5,0xed,0xd4,0x72,0xd3,0x37,0xd2,
-+	0x17,0xd1,0x0b,0x10,0x04,0x01,0x00,0x01,0xff,0xc5,0x82,0x00,0x10,0x04,0x01,0x00,
-+	0x01,0xff,0x6e,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,0xcc,0x81,0x00,
-+	0x01,0xff,0x6e,0xcc,0xa7,0x00,0x10,0x08,0x01,0xff,0x6e,0xcc,0xa7,0x00,0x01,0xff,
-+	0x6e,0xcc,0x8c,0x00,0xd2,0x1b,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,0xcc,0x8c,0x00,
-+	0x01,0xff,0xca,0xbc,0x6e,0x00,0x10,0x07,0x01,0xff,0xc5,0x8b,0x00,0x01,0x00,0xd1,
-+	0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x84,0x00,0x01,0xff,0x6f,0xcc,0x84,0x00,0x10,
-+	0x08,0x01,0xff,0x6f,0xcc,0x86,0x00,0x01,0xff,0x6f,0xcc,0x86,0x00,0xd3,0x3b,0xd2,
-+	0x1b,0xd1,0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,0x8b,0x00,0x01,0xff,0x6f,0xcc,0x8b,
-+	0x00,0x10,0x07,0x01,0xff,0xc5,0x93,0x00,0x01,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0x72,0xcc,0x81,0x00,0x01,0xff,0x72,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x72,0xcc,
-+	0xa7,0x00,0x01,0xff,0x72,0xcc,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0x72,0xcc,0x8c,0x00,0x01,0xff,0x72,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x73,0xcc,
-+	0x81,0x00,0x01,0xff,0x73,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x73,0xcc,
-+	0x82,0x00,0x01,0xff,0x73,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x73,0xcc,0xa7,0x00,
-+	0x01,0xff,0x73,0xcc,0xa7,0x00,0xd4,0x7b,0xd3,0x3b,0xd2,0x20,0xd1,0x10,0x10,0x08,
-+	0x01,0xff,0x73,0xcc,0x8c,0x00,0x01,0xff,0x73,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,
-+	0x74,0xcc,0xa7,0x00,0x01,0xff,0x74,0xcc,0xa7,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0x74,0xcc,0x8c,0x00,0x01,0xff,0x74,0xcc,0x8c,0x00,0x10,0x07,0x01,0xff,0xc5,0xa7,
-+	0x00,0x01,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0x83,0x00,0x01,
-+	0xff,0x75,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0x84,0x00,0x01,0xff,0x75,
-+	0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0x86,0x00,0x01,0xff,0x75,
-+	0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0x8a,0x00,0x01,0xff,0x75,0xcc,0x8a,
-+	0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0x8b,0x00,0x01,
-+	0xff,0x75,0xcc,0x8b,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0xa8,0x00,0x01,0xff,0x75,
-+	0xcc,0xa8,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x82,0x00,0x01,0xff,0x77,
-+	0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x79,0xcc,0x82,0x00,0x01,0xff,0x79,0xcc,0x82,
-+	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x79,0xcc,0x88,0x00,0x01,0xff,0x7a,
-+	0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0x81,0x00,0x01,0xff,0x7a,0xcc,0x87,
-+	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x7a,0xcc,0x87,0x00,0x01,0xff,0x7a,0xcc,0x8c,
-+	0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0x8c,0x00,0x01,0xff,0x73,0x00,0xe0,0x65,0x01,
-+	0xcf,0x86,0xd5,0xb4,0xd4,0x5a,0xd3,0x2f,0xd2,0x16,0xd1,0x0b,0x10,0x04,0x01,0x00,
-+	0x01,0xff,0xc9,0x93,0x00,0x10,0x07,0x01,0xff,0xc6,0x83,0x00,0x01,0x00,0xd1,0x0b,
-+	0x10,0x07,0x01,0xff,0xc6,0x85,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xc9,0x94,0x00,
-+	0x01,0xff,0xc6,0x88,0x00,0xd2,0x19,0xd1,0x0b,0x10,0x04,0x01,0x00,0x01,0xff,0xc9,
-+	0x96,0x00,0x10,0x07,0x01,0xff,0xc9,0x97,0x00,0x01,0xff,0xc6,0x8c,0x00,0x51,0x04,
-+	0x01,0x00,0x10,0x07,0x01,0xff,0xc7,0x9d,0x00,0x01,0xff,0xc9,0x99,0x00,0xd3,0x32,
-+	0xd2,0x19,0xd1,0x0e,0x10,0x07,0x01,0xff,0xc9,0x9b,0x00,0x01,0xff,0xc6,0x92,0x00,
-+	0x10,0x04,0x01,0x00,0x01,0xff,0xc9,0xa0,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xc9,
-+	0xa3,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xc9,0xa9,0x00,0x01,0xff,0xc9,0xa8,0x00,
-+	0xd2,0x0f,0x91,0x0b,0x10,0x07,0x01,0xff,0xc6,0x99,0x00,0x01,0x00,0x01,0x00,0xd1,
-+	0x0e,0x10,0x07,0x01,0xff,0xc9,0xaf,0x00,0x01,0xff,0xc9,0xb2,0x00,0x10,0x04,0x01,
-+	0x00,0x01,0xff,0xc9,0xb5,0x00,0xd4,0x5d,0xd3,0x34,0xd2,0x1b,0xd1,0x10,0x10,0x08,
-+	0x01,0xff,0x6f,0xcc,0x9b,0x00,0x01,0xff,0x6f,0xcc,0x9b,0x00,0x10,0x07,0x01,0xff,
-+	0xc6,0xa3,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xc6,0xa5,0x00,0x01,0x00,
-+	0x10,0x07,0x01,0xff,0xca,0x80,0x00,0x01,0xff,0xc6,0xa8,0x00,0xd2,0x0f,0x91,0x0b,
-+	0x10,0x04,0x01,0x00,0x01,0xff,0xca,0x83,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,
-+	0xff,0xc6,0xad,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xca,0x88,0x00,0x01,0xff,0x75,
-+	0xcc,0x9b,0x00,0xd3,0x33,0xd2,0x1d,0xd1,0x0f,0x10,0x08,0x01,0xff,0x75,0xcc,0x9b,
-+	0x00,0x01,0xff,0xca,0x8a,0x00,0x10,0x07,0x01,0xff,0xca,0x8b,0x00,0x01,0xff,0xc6,
-+	0xb4,0x00,0xd1,0x0b,0x10,0x04,0x01,0x00,0x01,0xff,0xc6,0xb6,0x00,0x10,0x04,0x01,
-+	0x00,0x01,0xff,0xca,0x92,0x00,0xd2,0x0f,0x91,0x0b,0x10,0x07,0x01,0xff,0xc6,0xb9,
-+	0x00,0x01,0x00,0x01,0x00,0x91,0x0b,0x10,0x07,0x01,0xff,0xc6,0xbd,0x00,0x01,0x00,
-+	0x01,0x00,0xcf,0x86,0xd5,0xd4,0xd4,0x44,0xd3,0x16,0x52,0x04,0x01,0x00,0x51,0x07,
-+	0x01,0xff,0xc7,0x86,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xc7,0x89,0x00,0xd2,0x12,
-+	0x91,0x0b,0x10,0x07,0x01,0xff,0xc7,0x89,0x00,0x01,0x00,0x01,0xff,0xc7,0x8c,0x00,
-+	0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x61,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,
-+	0x61,0xcc,0x8c,0x00,0x01,0xff,0x69,0xcc,0x8c,0x00,0xd3,0x46,0xd2,0x20,0xd1,0x10,
-+	0x10,0x08,0x01,0xff,0x69,0xcc,0x8c,0x00,0x01,0xff,0x6f,0xcc,0x8c,0x00,0x10,0x08,
-+	0x01,0xff,0x6f,0xcc,0x8c,0x00,0x01,0xff,0x75,0xcc,0x8c,0x00,0xd1,0x12,0x10,0x08,
-+	0x01,0xff,0x75,0xcc,0x8c,0x00,0x01,0xff,0x75,0xcc,0x88,0xcc,0x84,0x00,0x10,0x0a,
-+	0x01,0xff,0x75,0xcc,0x88,0xcc,0x84,0x00,0x01,0xff,0x75,0xcc,0x88,0xcc,0x81,0x00,
-+	0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,0x81,0x00,0x01,0xff,
-+	0x75,0xcc,0x88,0xcc,0x8c,0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,0x8c,0x00,
-+	0x01,0xff,0x75,0xcc,0x88,0xcc,0x80,0x00,0xd1,0x0e,0x10,0x0a,0x01,0xff,0x75,0xcc,
-+	0x88,0xcc,0x80,0x00,0x01,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0x88,0xcc,0x84,0x00,
-+	0x01,0xff,0x61,0xcc,0x88,0xcc,0x84,0x00,0xd4,0x87,0xd3,0x41,0xd2,0x26,0xd1,0x14,
-+	0x10,0x0a,0x01,0xff,0x61,0xcc,0x87,0xcc,0x84,0x00,0x01,0xff,0x61,0xcc,0x87,0xcc,
-+	0x84,0x00,0x10,0x09,0x01,0xff,0xc3,0xa6,0xcc,0x84,0x00,0x01,0xff,0xc3,0xa6,0xcc,
-+	0x84,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xc7,0xa5,0x00,0x01,0x00,0x10,0x08,0x01,
-+	0xff,0x67,0xcc,0x8c,0x00,0x01,0xff,0x67,0xcc,0x8c,0x00,0xd2,0x20,0xd1,0x10,0x10,
-+	0x08,0x01,0xff,0x6b,0xcc,0x8c,0x00,0x01,0xff,0x6b,0xcc,0x8c,0x00,0x10,0x08,0x01,
-+	0xff,0x6f,0xcc,0xa8,0x00,0x01,0xff,0x6f,0xcc,0xa8,0x00,0xd1,0x14,0x10,0x0a,0x01,
-+	0xff,0x6f,0xcc,0xa8,0xcc,0x84,0x00,0x01,0xff,0x6f,0xcc,0xa8,0xcc,0x84,0x00,0x10,
-+	0x09,0x01,0xff,0xca,0x92,0xcc,0x8c,0x00,0x01,0xff,0xca,0x92,0xcc,0x8c,0x00,0xd3,
-+	0x38,0xd2,0x1a,0xd1,0x0f,0x10,0x08,0x01,0xff,0x6a,0xcc,0x8c,0x00,0x01,0xff,0xc7,
-+	0xb3,0x00,0x10,0x07,0x01,0xff,0xc7,0xb3,0x00,0x01,0x00,0xd1,0x10,0x10,0x08,0x01,
-+	0xff,0x67,0xcc,0x81,0x00,0x01,0xff,0x67,0xcc,0x81,0x00,0x10,0x07,0x04,0xff,0xc6,
-+	0x95,0x00,0x04,0xff,0xc6,0xbf,0x00,0xd2,0x24,0xd1,0x10,0x10,0x08,0x04,0xff,0x6e,
-+	0xcc,0x80,0x00,0x04,0xff,0x6e,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0x8a,
-+	0xcc,0x81,0x00,0x01,0xff,0x61,0xcc,0x8a,0xcc,0x81,0x00,0xd1,0x12,0x10,0x09,0x01,
-+	0xff,0xc3,0xa6,0xcc,0x81,0x00,0x01,0xff,0xc3,0xa6,0xcc,0x81,0x00,0x10,0x09,0x01,
-+	0xff,0xc3,0xb8,0xcc,0x81,0x00,0x01,0xff,0xc3,0xb8,0xcc,0x81,0x00,0xe2,0x31,0x02,
-+	0xe1,0xad,0x44,0xe0,0xc8,0x01,0xcf,0x86,0xd5,0xfb,0xd4,0x80,0xd3,0x40,0xd2,0x20,
-+	0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0x8f,0x00,0x01,0xff,0x61,0xcc,0x8f,0x00,
-+	0x10,0x08,0x01,0xff,0x61,0xcc,0x91,0x00,0x01,0xff,0x61,0xcc,0x91,0x00,0xd1,0x10,
-+	0x10,0x08,0x01,0xff,0x65,0xcc,0x8f,0x00,0x01,0xff,0x65,0xcc,0x8f,0x00,0x10,0x08,
-+	0x01,0xff,0x65,0xcc,0x91,0x00,0x01,0xff,0x65,0xcc,0x91,0x00,0xd2,0x20,0xd1,0x10,
-+	0x10,0x08,0x01,0xff,0x69,0xcc,0x8f,0x00,0x01,0xff,0x69,0xcc,0x8f,0x00,0x10,0x08,
-+	0x01,0xff,0x69,0xcc,0x91,0x00,0x01,0xff,0x69,0xcc,0x91,0x00,0xd1,0x10,0x10,0x08,
-+	0x01,0xff,0x6f,0xcc,0x8f,0x00,0x01,0xff,0x6f,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,
-+	0x6f,0xcc,0x91,0x00,0x01,0xff,0x6f,0xcc,0x91,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,
-+	0x10,0x08,0x01,0xff,0x72,0xcc,0x8f,0x00,0x01,0xff,0x72,0xcc,0x8f,0x00,0x10,0x08,
-+	0x01,0xff,0x72,0xcc,0x91,0x00,0x01,0xff,0x72,0xcc,0x91,0x00,0xd1,0x10,0x10,0x08,
-+	0x01,0xff,0x75,0xcc,0x8f,0x00,0x01,0xff,0x75,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,
-+	0x75,0xcc,0x91,0x00,0x01,0xff,0x75,0xcc,0x91,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
-+	0x04,0xff,0x73,0xcc,0xa6,0x00,0x04,0xff,0x73,0xcc,0xa6,0x00,0x10,0x08,0x04,0xff,
-+	0x74,0xcc,0xa6,0x00,0x04,0xff,0x74,0xcc,0xa6,0x00,0xd1,0x0b,0x10,0x07,0x04,0xff,
-+	0xc8,0x9d,0x00,0x04,0x00,0x10,0x08,0x04,0xff,0x68,0xcc,0x8c,0x00,0x04,0xff,0x68,
-+	0xcc,0x8c,0x00,0xd4,0x79,0xd3,0x31,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x06,0xff,0xc6,
-+	0x9e,0x00,0x07,0x00,0x10,0x07,0x04,0xff,0xc8,0xa3,0x00,0x04,0x00,0xd1,0x0b,0x10,
-+	0x07,0x04,0xff,0xc8,0xa5,0x00,0x04,0x00,0x10,0x08,0x04,0xff,0x61,0xcc,0x87,0x00,
-+	0x04,0xff,0x61,0xcc,0x87,0x00,0xd2,0x24,0xd1,0x10,0x10,0x08,0x04,0xff,0x65,0xcc,
-+	0xa7,0x00,0x04,0xff,0x65,0xcc,0xa7,0x00,0x10,0x0a,0x04,0xff,0x6f,0xcc,0x88,0xcc,
- 	0x84,0x00,0x04,0xff,0x6f,0xcc,0x88,0xcc,0x84,0x00,0xd1,0x14,0x10,0x0a,0x04,0xff,
--	0x4f,0xcc,0x83,0xcc,0x84,0x00,0x04,0xff,0x6f,0xcc,0x83,0xcc,0x84,0x00,0x10,0x08,
--	0x04,0xff,0x4f,0xcc,0x87,0x00,0x04,0xff,0x6f,0xcc,0x87,0x00,0x93,0x30,0xd2,0x24,
--	0xd1,0x14,0x10,0x0a,0x04,0xff,0x4f,0xcc,0x87,0xcc,0x84,0x00,0x04,0xff,0x6f,0xcc,
--	0x87,0xcc,0x84,0x00,0x10,0x08,0x04,0xff,0x59,0xcc,0x84,0x00,0x04,0xff,0x79,0xcc,
--	0x84,0x00,0x51,0x04,0x07,0x00,0x10,0x04,0x07,0x00,0x08,0x00,0x08,0x00,0xcf,0x86,
--	0x95,0x14,0x94,0x10,0x93,0x0c,0x92,0x08,0x11,0x04,0x08,0x00,0x09,0x00,0x09,0x00,
--	0x09,0x00,0x01,0x00,0x01,0x00,0xd0,0x22,0xcf,0x86,0x55,0x04,0x01,0x00,0x94,0x18,
--	0x53,0x04,0x01,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x04,0x00,0x04,0x00,
--	0x11,0x04,0x04,0x00,0x07,0x00,0x01,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,0x01,0x00,
--	0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
--	0x04,0x00,0x94,0x18,0x53,0x04,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x04,0x00,
--	0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x07,0x00,0x07,0x00,0xe1,0x35,0x01,0xd0,
--	0x72,0xcf,0x86,0xd5,0x24,0x54,0x04,0x01,0xe6,0xd3,0x10,0x52,0x04,0x01,0xe6,0x91,
--	0x08,0x10,0x04,0x01,0xe6,0x01,0xe8,0x01,0xdc,0x92,0x0c,0x51,0x04,0x01,0xdc,0x10,
--	0x04,0x01,0xe8,0x01,0xd8,0x01,0xdc,0xd4,0x2c,0xd3,0x1c,0xd2,0x10,0xd1,0x08,0x10,
--	0x04,0x01,0xdc,0x01,0xca,0x10,0x04,0x01,0xca,0x01,0xdc,0x51,0x04,0x01,0xdc,0x10,
--	0x04,0x01,0xdc,0x01,0xca,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0xca,0x01,0xdc,0x01,
--	0xdc,0x01,0xdc,0xd3,0x08,0x12,0x04,0x01,0xdc,0x01,0x01,0xd2,0x0c,0x91,0x08,0x10,
--	0x04,0x01,0x01,0x01,0xdc,0x01,0xdc,0x91,0x08,0x10,0x04,0x01,0xdc,0x01,0xe6,0x01,
--	0xe6,0xcf,0x86,0xd5,0x7f,0xd4,0x47,0xd3,0x2e,0xd2,0x19,0xd1,0x0e,0x10,0x07,0x01,
--	0xff,0xcc,0x80,0x00,0x01,0xff,0xcc,0x81,0x00,0x10,0x04,0x01,0xe6,0x01,0xff,0xcc,
--	0x93,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xcc,0x88,0xcc,0x81,0x00,0x01,0xf0,0x10,
--	0x04,0x04,0xe6,0x04,0xdc,0xd2,0x08,0x11,0x04,0x04,0xdc,0x04,0xe6,0xd1,0x08,0x10,
--	0x04,0x04,0xe6,0x04,0xdc,0x10,0x04,0x04,0xdc,0x06,0xff,0x00,0xd3,0x18,0xd2,0x0c,
--	0x51,0x04,0x07,0xe6,0x10,0x04,0x07,0xe6,0x07,0xdc,0x51,0x04,0x07,0xdc,0x10,0x04,
--	0x07,0xdc,0x07,0xe6,0xd2,0x10,0xd1,0x08,0x10,0x04,0x08,0xe8,0x08,0xdc,0x10,0x04,
--	0x08,0xdc,0x08,0xe6,0xd1,0x08,0x10,0x04,0x08,0xe9,0x07,0xea,0x10,0x04,0x07,0xea,
--	0x07,0xe9,0xd4,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,0x01,0xea,0x10,0x04,0x04,0xe9,
--	0x06,0xe6,0x06,0xe6,0x06,0xe6,0xd3,0x13,0x52,0x04,0x0a,0x00,0x91,0x0b,0x10,0x07,
--	0x01,0xff,0xca,0xb9,0x00,0x01,0x00,0x0a,0x00,0xd2,0x0c,0x51,0x04,0x00,0x00,0x10,
--	0x04,0x01,0x00,0x09,0x00,0x51,0x04,0x09,0x00,0x10,0x06,0x01,0xff,0x3b,0x00,0x10,
--	0x00,0xd0,0xe1,0xcf,0x86,0xd5,0x7a,0xd4,0x5f,0xd3,0x21,0x52,0x04,0x00,0x00,0xd1,
--	0x0d,0x10,0x04,0x01,0x00,0x01,0xff,0xc2,0xa8,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,
--	0xce,0x91,0xcc,0x81,0x00,0x01,0xff,0xc2,0xb7,0x00,0xd2,0x1f,0xd1,0x12,0x10,0x09,
--	0x01,0xff,0xce,0x95,0xcc,0x81,0x00,0x01,0xff,0xce,0x97,0xcc,0x81,0x00,0x10,0x09,
--	0x01,0xff,0xce,0x99,0xcc,0x81,0x00,0x00,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xce,
--	0x9f,0xcc,0x81,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xce,0xa5,0xcc,0x81,0x00,0x01,
--	0xff,0xce,0xa9,0xcc,0x81,0x00,0x93,0x17,0x92,0x13,0x91,0x0f,0x10,0x0b,0x01,0xff,
--	0xce,0xb9,0xcc,0x88,0xcc,0x81,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,
--	0x4a,0xd3,0x10,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x01,
--	0x00,0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,0xce,0x99,0xcc,0x88,0x00,
--	0x01,0xff,0xce,0xa5,0xcc,0x88,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,
--	0x81,0x00,0x01,0xff,0xce,0xb5,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb7,0xcc,
--	0x81,0x00,0x01,0xff,0xce,0xb9,0xcc,0x81,0x00,0x93,0x17,0x92,0x13,0x91,0x0f,0x10,
--	0x0b,0x01,0xff,0xcf,0x85,0xcc,0x88,0xcc,0x81,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
--	0x01,0x00,0xcf,0x86,0xd5,0x7b,0xd4,0x39,0x53,0x04,0x01,0x00,0xd2,0x16,0x51,0x04,
--	0x01,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x88,0x00,0x01,0xff,0xcf,0x85,0xcc,
--	0x88,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xbf,0xcc,0x81,0x00,0x01,0xff,0xcf,
--	0x85,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xcf,0x89,0xcc,0x81,0x00,0x0a,0x00,0xd3,
--	0x26,0xd2,0x11,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xcf,0x92,0xcc,
--	0x81,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xcf,0x92,0xcc,0x88,0x00,0x01,0x00,0x10,
--	0x04,0x01,0x00,0x04,0x00,0xd2,0x0c,0x51,0x04,0x06,0x00,0x10,0x04,0x01,0x00,0x04,
--	0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x04,0x00,0x10,0x04,0x01,0x00,0x04,0x00,0xd4,
--	0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x04,0x00,0x01,0x00,0x01,
--	0x00,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x05,0x00,0x10,0x04,0x06,
--	0x00,0x07,0x00,0x12,0x04,0x07,0x00,0x08,0x00,0xe3,0x47,0x04,0xe2,0xbe,0x02,0xe1,
--	0x07,0x01,0xd0,0x8b,0xcf,0x86,0xd5,0x6c,0xd4,0x53,0xd3,0x30,0xd2,0x1f,0xd1,0x12,
--	0x10,0x09,0x04,0xff,0xd0,0x95,0xcc,0x80,0x00,0x01,0xff,0xd0,0x95,0xcc,0x88,0x00,
--	0x10,0x04,0x01,0x00,0x01,0xff,0xd0,0x93,0xcc,0x81,0x00,0x51,0x04,0x01,0x00,0x10,
--	0x04,0x01,0x00,0x01,0xff,0xd0,0x86,0xcc,0x88,0x00,0x52,0x04,0x01,0x00,0xd1,0x12,
--	0x10,0x09,0x01,0xff,0xd0,0x9a,0xcc,0x81,0x00,0x04,0xff,0xd0,0x98,0xcc,0x80,0x00,
--	0x10,0x09,0x01,0xff,0xd0,0xa3,0xcc,0x86,0x00,0x01,0x00,0x53,0x04,0x01,0x00,0x92,
--	0x11,0x91,0x0d,0x10,0x04,0x01,0x00,0x01,0xff,0xd0,0x98,0xcc,0x86,0x00,0x01,0x00,
--	0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x92,0x11,0x91,0x0d,0x10,0x04,
--	0x01,0x00,0x01,0xff,0xd0,0xb8,0xcc,0x86,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,
--	0x57,0x54,0x04,0x01,0x00,0xd3,0x30,0xd2,0x1f,0xd1,0x12,0x10,0x09,0x04,0xff,0xd0,
--	0xb5,0xcc,0x80,0x00,0x01,0xff,0xd0,0xb5,0xcc,0x88,0x00,0x10,0x04,0x01,0x00,0x01,
--	0xff,0xd0,0xb3,0xcc,0x81,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xff,
--	0xd1,0x96,0xcc,0x88,0x00,0x52,0x04,0x01,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,
--	0xba,0xcc,0x81,0x00,0x04,0xff,0xd0,0xb8,0xcc,0x80,0x00,0x10,0x09,0x01,0xff,0xd1,
--	0x83,0xcc,0x86,0x00,0x01,0x00,0x54,0x04,0x01,0x00,0x93,0x1a,0x52,0x04,0x01,0x00,
--	0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,0xd1,0xb4,0xcc,0x8f,0x00,0x01,0xff,0xd1,
--	0xb5,0xcc,0x8f,0x00,0x01,0x00,0xd0,0x2e,0xcf,0x86,0x95,0x28,0x94,0x24,0xd3,0x18,
--	0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xe6,0x51,0x04,0x01,0xe6,
--	0x10,0x04,0x01,0xe6,0x0a,0xe6,0x92,0x08,0x11,0x04,0x04,0x00,0x06,0x00,0x04,0x00,
--	0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0xbe,0xd4,0x4a,0xd3,0x2a,0xd2,0x1a,0xd1,0x0d,
--	0x10,0x04,0x01,0x00,0x01,0xff,0xd0,0x96,0xcc,0x86,0x00,0x10,0x09,0x01,0xff,0xd0,
--	0xb6,0xcc,0x86,0x00,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x06,0x00,0x10,0x04,
--	0x06,0x00,0x01,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x06,0x00,0x10,0x04,
--	0x06,0x00,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x06,0x00,0x10,0x04,0x06,0x00,
--	0x09,0x00,0xd3,0x3a,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0x90,0xcc,0x86,
--	0x00,0x01,0xff,0xd0,0xb0,0xcc,0x86,0x00,0x10,0x09,0x01,0xff,0xd0,0x90,0xcc,0x88,
--	0x00,0x01,0xff,0xd0,0xb0,0xcc,0x88,0x00,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,
--	0xd0,0x95,0xcc,0x86,0x00,0x01,0xff,0xd0,0xb5,0xcc,0x86,0x00,0xd2,0x16,0x51,0x04,
--	0x01,0x00,0x10,0x09,0x01,0xff,0xd3,0x98,0xcc,0x88,0x00,0x01,0xff,0xd3,0x99,0xcc,
--	0x88,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0x96,0xcc,0x88,0x00,0x01,0xff,0xd0,
--	0xb6,0xcc,0x88,0x00,0x10,0x09,0x01,0xff,0xd0,0x97,0xcc,0x88,0x00,0x01,0xff,0xd0,
--	0xb7,0xcc,0x88,0x00,0xd4,0x74,0xd3,0x3a,0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,
--	0x01,0xff,0xd0,0x98,0xcc,0x84,0x00,0x01,0xff,0xd0,0xb8,0xcc,0x84,0x00,0xd1,0x12,
--	0x10,0x09,0x01,0xff,0xd0,0x98,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb8,0xcc,0x88,0x00,
--	0x10,0x09,0x01,0xff,0xd0,0x9e,0xcc,0x88,0x00,0x01,0xff,0xd0,0xbe,0xcc,0x88,0x00,
--	0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,0xd3,0xa8,0xcc,0x88,0x00,0x01,
--	0xff,0xd3,0xa9,0xcc,0x88,0x00,0xd1,0x12,0x10,0x09,0x04,0xff,0xd0,0xad,0xcc,0x88,
--	0x00,0x04,0xff,0xd1,0x8d,0xcc,0x88,0x00,0x10,0x09,0x01,0xff,0xd0,0xa3,0xcc,0x84,
--	0x00,0x01,0xff,0xd1,0x83,0xcc,0x84,0x00,0xd3,0x3a,0xd2,0x24,0xd1,0x12,0x10,0x09,
--	0x01,0xff,0xd0,0xa3,0xcc,0x88,0x00,0x01,0xff,0xd1,0x83,0xcc,0x88,0x00,0x10,0x09,
--	0x01,0xff,0xd0,0xa3,0xcc,0x8b,0x00,0x01,0xff,0xd1,0x83,0xcc,0x8b,0x00,0x91,0x12,
--	0x10,0x09,0x01,0xff,0xd0,0xa7,0xcc,0x88,0x00,0x01,0xff,0xd1,0x87,0xcc,0x88,0x00,
--	0x08,0x00,0x92,0x16,0x91,0x12,0x10,0x09,0x01,0xff,0xd0,0xab,0xcc,0x88,0x00,0x01,
--	0xff,0xd1,0x8b,0xcc,0x88,0x00,0x09,0x00,0x09,0x00,0xd1,0x74,0xd0,0x36,0xcf,0x86,
--	0xd5,0x10,0x54,0x04,0x06,0x00,0x93,0x08,0x12,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,
--	0xd4,0x10,0x93,0x0c,0x52,0x04,0x0a,0x00,0x11,0x04,0x0b,0x00,0x0c,0x00,0x10,0x00,
--	0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
--	0x01,0x00,0xcf,0x86,0xd5,0x24,0x54,0x04,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,
--	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,
--	0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,
--	0x10,0x04,0x14,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd0,0xba,
--	0xcf,0x86,0xd5,0x4c,0xd4,0x24,0x53,0x04,0x01,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,
--	0x14,0x00,0x01,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,
--	0x10,0x00,0x10,0x04,0x10,0x00,0x0d,0x00,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,
--	0x00,0x00,0x02,0xdc,0x02,0xe6,0x51,0x04,0x02,0xe6,0x10,0x04,0x02,0xdc,0x02,0xe6,
--	0x92,0x0c,0x51,0x04,0x02,0xe6,0x10,0x04,0x02,0xde,0x02,0xdc,0x02,0xe6,0xd4,0x2c,
--	0xd3,0x10,0x92,0x0c,0x51,0x04,0x02,0xe6,0x10,0x04,0x08,0xdc,0x02,0xdc,0x02,0xdc,
--	0xd2,0x0c,0x51,0x04,0x02,0xe6,0x10,0x04,0x02,0xdc,0x02,0xe6,0xd1,0x08,0x10,0x04,
--	0x02,0xe6,0x02,0xde,0x10,0x04,0x02,0xe4,0x02,0xe6,0xd3,0x20,0xd2,0x10,0xd1,0x08,
--	0x10,0x04,0x01,0x0a,0x01,0x0b,0x10,0x04,0x01,0x0c,0x01,0x0d,0xd1,0x08,0x10,0x04,
--	0x01,0x0e,0x01,0x0f,0x10,0x04,0x01,0x10,0x01,0x11,0xd2,0x10,0xd1,0x08,0x10,0x04,
--	0x01,0x12,0x01,0x13,0x10,0x04,0x09,0x13,0x01,0x14,0xd1,0x08,0x10,0x04,0x01,0x15,
--	0x01,0x16,0x10,0x04,0x01,0x00,0x01,0x17,0xcf,0x86,0xd5,0x28,0x94,0x24,0x93,0x20,
--	0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x01,0x18,0x10,0x04,0x01,0x19,0x01,0x00,
--	0xd1,0x08,0x10,0x04,0x02,0xe6,0x08,0xdc,0x10,0x04,0x08,0x00,0x08,0x12,0x00,0x00,
--	0x01,0x00,0xd4,0x1c,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,
--	0x01,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x14,0x00,0x93,0x10,
--	0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--	0xe2,0xfb,0x01,0xe1,0x2b,0x01,0xd0,0xa8,0xcf,0x86,0xd5,0x55,0xd4,0x28,0xd3,0x10,
--	0x52,0x04,0x07,0x00,0x91,0x08,0x10,0x04,0x0d,0x00,0x10,0x00,0x0a,0x00,0xd2,0x0c,
--	0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x00,0x08,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
--	0x07,0x00,0x07,0x00,0xd3,0x0c,0x52,0x04,0x07,0xe6,0x11,0x04,0x07,0xe6,0x0a,0xe6,
--	0xd2,0x10,0xd1,0x08,0x10,0x04,0x0a,0x1e,0x0a,0x1f,0x10,0x04,0x0a,0x20,0x01,0x00,
--	0xd1,0x09,0x10,0x05,0x0f,0xff,0x00,0x00,0x00,0x10,0x04,0x08,0x00,0x01,0x00,0xd4,
--	0x3d,0x93,0x39,0xd2,0x1a,0xd1,0x08,0x10,0x04,0x0c,0x00,0x01,0x00,0x10,0x09,0x01,
--	0xff,0xd8,0xa7,0xd9,0x93,0x00,0x01,0xff,0xd8,0xa7,0xd9,0x94,0x00,0xd1,0x12,0x10,
--	0x09,0x01,0xff,0xd9,0x88,0xd9,0x94,0x00,0x01,0xff,0xd8,0xa7,0xd9,0x95,0x00,0x10,
--	0x09,0x01,0xff,0xd9,0x8a,0xd9,0x94,0x00,0x01,0x00,0x01,0x00,0x53,0x04,0x01,0x00,
--	0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x0a,0x00,0x0a,0x00,0xcf,0x86,
--	0xd5,0x5c,0xd4,0x20,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,
--	0x01,0x00,0x01,0x1b,0xd1,0x08,0x10,0x04,0x01,0x1c,0x01,0x1d,0x10,0x04,0x01,0x1e,
--	0x01,0x1f,0xd3,0x20,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x20,0x01,0x21,0x10,0x04,
--	0x01,0x22,0x04,0xe6,0xd1,0x08,0x10,0x04,0x04,0xe6,0x04,0xdc,0x10,0x04,0x07,0xdc,
--	0x07,0xe6,0xd2,0x0c,0x91,0x08,0x10,0x04,0x07,0xe6,0x08,0xe6,0x08,0xe6,0xd1,0x08,
--	0x10,0x04,0x08,0xdc,0x08,0xe6,0x10,0x04,0x08,0xe6,0x0c,0xdc,0xd4,0x10,0x53,0x04,
--	0x01,0x00,0x52,0x04,0x01,0x00,0x11,0x04,0x01,0x00,0x06,0x00,0x93,0x10,0x92,0x0c,
--	0x91,0x08,0x10,0x04,0x01,0x23,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd0,0x22,
--	0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x08,
--	0x11,0x04,0x04,0x00,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x04,0x00,
--	0xcf,0x86,0xd5,0x5b,0xd4,0x2e,0xd3,0x1e,0x92,0x1a,0xd1,0x0d,0x10,0x09,0x01,0xff,
--	0xdb,0x95,0xd9,0x94,0x00,0x01,0x00,0x10,0x09,0x01,0xff,0xdb,0x81,0xd9,0x94,0x00,
-+	0x6f,0xcc,0x83,0xcc,0x84,0x00,0x04,0xff,0x6f,0xcc,0x83,0xcc,0x84,0x00,0x10,0x08,
-+	0x04,0xff,0x6f,0xcc,0x87,0x00,0x04,0xff,0x6f,0xcc,0x87,0x00,0xd3,0x27,0xe2,0x0b,
-+	0x43,0xd1,0x14,0x10,0x0a,0x04,0xff,0x6f,0xcc,0x87,0xcc,0x84,0x00,0x04,0xff,0x6f,
-+	0xcc,0x87,0xcc,0x84,0x00,0x10,0x08,0x04,0xff,0x79,0xcc,0x84,0x00,0x04,0xff,0x79,
-+	0xcc,0x84,0x00,0xd2,0x13,0x51,0x04,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0xa5,
-+	0x00,0x08,0xff,0xc8,0xbc,0x00,0xd1,0x0b,0x10,0x04,0x08,0x00,0x08,0xff,0xc6,0x9a,
-+	0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0xa6,0x00,0x08,0x00,0xcf,0x86,0x95,0x5f,0x94,
-+	0x5b,0xd3,0x2f,0xd2,0x16,0xd1,0x0b,0x10,0x04,0x08,0x00,0x08,0xff,0xc9,0x82,0x00,
-+	0x10,0x04,0x09,0x00,0x09,0xff,0xc6,0x80,0x00,0xd1,0x0e,0x10,0x07,0x09,0xff,0xca,
-+	0x89,0x00,0x09,0xff,0xca,0x8c,0x00,0x10,0x07,0x09,0xff,0xc9,0x87,0x00,0x09,0x00,
-+	0xd2,0x16,0xd1,0x0b,0x10,0x07,0x09,0xff,0xc9,0x89,0x00,0x09,0x00,0x10,0x07,0x09,
-+	0xff,0xc9,0x8b,0x00,0x09,0x00,0xd1,0x0b,0x10,0x07,0x09,0xff,0xc9,0x8d,0x00,0x09,
-+	0x00,0x10,0x07,0x09,0xff,0xc9,0x8f,0x00,0x09,0x00,0x01,0x00,0x01,0x00,0xd1,0x8b,
-+	0xd0,0x0c,0xcf,0x86,0xe5,0xfa,0x42,0x64,0xd9,0x42,0x01,0xe6,0xcf,0x86,0xd5,0x2a,
-+	0xe4,0x82,0x43,0xe3,0x69,0x43,0xd2,0x11,0xe1,0x48,0x43,0x10,0x07,0x01,0xff,0xcc,
-+	0x80,0x00,0x01,0xff,0xcc,0x81,0x00,0xe1,0x4f,0x43,0x10,0x09,0x01,0xff,0xcc,0x88,
-+	0xcc,0x81,0x00,0x01,0xff,0xce,0xb9,0x00,0xd4,0x0f,0x93,0x0b,0x92,0x07,0x61,0x94,
-+	0x43,0x01,0xea,0x06,0xe6,0x06,0xe6,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x0a,
-+	0xff,0xcd,0xb1,0x00,0x0a,0x00,0x10,0x07,0x0a,0xff,0xcd,0xb3,0x00,0x0a,0x00,0xd1,
-+	0x0b,0x10,0x07,0x01,0xff,0xca,0xb9,0x00,0x01,0x00,0x10,0x07,0x0a,0xff,0xcd,0xb7,
-+	0x00,0x0a,0x00,0xd2,0x07,0x61,0x80,0x43,0x00,0x00,0x51,0x04,0x09,0x00,0x10,0x06,
-+	0x01,0xff,0x3b,0x00,0x10,0xff,0xcf,0xb3,0x00,0xe0,0x31,0x01,0xcf,0x86,0xd5,0xd3,
-+	0xd4,0x5f,0xd3,0x21,0x52,0x04,0x00,0x00,0xd1,0x0d,0x10,0x04,0x01,0x00,0x01,0xff,
-+	0xc2,0xa8,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x81,0x00,0x01,0xff,
-+	0xc2,0xb7,0x00,0xd2,0x1f,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb5,0xcc,0x81,0x00,
-+	0x01,0xff,0xce,0xb7,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x81,0x00,
-+	0x00,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xce,0xbf,0xcc,0x81,0x00,0x00,0x00,0x10,
-+	0x09,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,0x01,0xff,0xcf,0x89,0xcc,0x81,0x00,0xd3,
-+	0x3c,0xd2,0x20,0xd1,0x12,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x88,0xcc,0x81,0x00,
-+	0x01,0xff,0xce,0xb1,0x00,0x10,0x07,0x01,0xff,0xce,0xb2,0x00,0x01,0xff,0xce,0xb3,
-+	0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xce,0xb4,0x00,0x01,0xff,0xce,0xb5,0x00,0x10,
-+	0x07,0x01,0xff,0xce,0xb6,0x00,0x01,0xff,0xce,0xb7,0x00,0xd2,0x1c,0xd1,0x0e,0x10,
-+	0x07,0x01,0xff,0xce,0xb8,0x00,0x01,0xff,0xce,0xb9,0x00,0x10,0x07,0x01,0xff,0xce,
-+	0xba,0x00,0x01,0xff,0xce,0xbb,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xce,0xbc,0x00,
-+	0x01,0xff,0xce,0xbd,0x00,0x10,0x07,0x01,0xff,0xce,0xbe,0x00,0x01,0xff,0xce,0xbf,
-+	0x00,0xe4,0x6e,0x43,0xd3,0x35,0xd2,0x19,0xd1,0x0e,0x10,0x07,0x01,0xff,0xcf,0x80,
-+	0x00,0x01,0xff,0xcf,0x81,0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xcf,0x83,0x00,0xd1,
-+	0x0e,0x10,0x07,0x01,0xff,0xcf,0x84,0x00,0x01,0xff,0xcf,0x85,0x00,0x10,0x07,0x01,
-+	0xff,0xcf,0x86,0x00,0x01,0xff,0xcf,0x87,0x00,0xe2,0x14,0x43,0xd1,0x0e,0x10,0x07,
-+	0x01,0xff,0xcf,0x88,0x00,0x01,0xff,0xcf,0x89,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,
-+	0xcc,0x88,0x00,0x01,0xff,0xcf,0x85,0xcc,0x88,0x00,0xcf,0x86,0xd5,0x94,0xd4,0x3c,
-+	0xd3,0x13,0x92,0x0f,0x51,0x04,0x01,0x00,0x10,0x07,0x01,0xff,0xcf,0x83,0x00,0x01,
-+	0x00,0x01,0x00,0xd2,0x07,0x61,0x23,0x43,0x01,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,
-+	0xce,0xbf,0xcc,0x81,0x00,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,
-+	0xcf,0x89,0xcc,0x81,0x00,0x0a,0xff,0xcf,0x97,0x00,0xd3,0x2c,0xd2,0x11,0xe1,0x2f,
-+	0x43,0x10,0x07,0x01,0xff,0xce,0xb2,0x00,0x01,0xff,0xce,0xb8,0x00,0xd1,0x10,0x10,
-+	0x09,0x01,0xff,0xcf,0x92,0xcc,0x88,0x00,0x01,0xff,0xcf,0x86,0x00,0x10,0x07,0x01,
-+	0xff,0xcf,0x80,0x00,0x04,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x06,0xff,0xcf,0x99,
-+	0x00,0x06,0x00,0x10,0x07,0x01,0xff,0xcf,0x9b,0x00,0x04,0x00,0xd1,0x0b,0x10,0x07,
-+	0x01,0xff,0xcf,0x9d,0x00,0x04,0x00,0x10,0x07,0x01,0xff,0xcf,0x9f,0x00,0x04,0x00,
-+	0xd4,0x58,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xcf,0xa1,0x00,0x04,
-+	0x00,0x10,0x07,0x01,0xff,0xcf,0xa3,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,
-+	0xcf,0xa5,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xcf,0xa7,0x00,0x01,0x00,0xd2,0x16,
-+	0xd1,0x0b,0x10,0x07,0x01,0xff,0xcf,0xa9,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xcf,
-+	0xab,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xcf,0xad,0x00,0x01,0x00,0x10,
-+	0x07,0x01,0xff,0xcf,0xaf,0x00,0x01,0x00,0xd3,0x2b,0xd2,0x12,0x91,0x0e,0x10,0x07,
-+	0x01,0xff,0xce,0xba,0x00,0x01,0xff,0xcf,0x81,0x00,0x01,0x00,0xd1,0x0e,0x10,0x07,
-+	0x05,0xff,0xce,0xb8,0x00,0x05,0xff,0xce,0xb5,0x00,0x10,0x04,0x06,0x00,0x07,0xff,
-+	0xcf,0xb8,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x04,0x07,0x00,0x07,0xff,0xcf,0xb2,0x00,
-+	0x10,0x07,0x07,0xff,0xcf,0xbb,0x00,0x07,0x00,0xd1,0x0b,0x10,0x04,0x08,0x00,0x08,
-+	0xff,0xcd,0xbb,0x00,0x10,0x07,0x08,0xff,0xcd,0xbc,0x00,0x08,0xff,0xcd,0xbd,0x00,
-+	0xe3,0xd6,0x46,0xe2,0x3d,0x05,0xe1,0x27,0x02,0xe0,0x66,0x01,0xcf,0x86,0xd5,0xf0,
-+	0xd4,0x7e,0xd3,0x40,0xd2,0x22,0xd1,0x12,0x10,0x09,0x04,0xff,0xd0,0xb5,0xcc,0x80,
-+	0x00,0x01,0xff,0xd0,0xb5,0xcc,0x88,0x00,0x10,0x07,0x01,0xff,0xd1,0x92,0x00,0x01,
-+	0xff,0xd0,0xb3,0xcc,0x81,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,0x94,0x00,0x01,
-+	0xff,0xd1,0x95,0x00,0x10,0x07,0x01,0xff,0xd1,0x96,0x00,0x01,0xff,0xd1,0x96,0xcc,
-+	0x88,0x00,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,0x98,0x00,0x01,0xff,0xd1,
-+	0x99,0x00,0x10,0x07,0x01,0xff,0xd1,0x9a,0x00,0x01,0xff,0xd1,0x9b,0x00,0xd1,0x12,
-+	0x10,0x09,0x01,0xff,0xd0,0xba,0xcc,0x81,0x00,0x04,0xff,0xd0,0xb8,0xcc,0x80,0x00,
-+	0x10,0x09,0x01,0xff,0xd1,0x83,0xcc,0x86,0x00,0x01,0xff,0xd1,0x9f,0x00,0xd3,0x38,
-+	0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd0,0xb0,0x00,0x01,0xff,0xd0,0xb1,0x00,
-+	0x10,0x07,0x01,0xff,0xd0,0xb2,0x00,0x01,0xff,0xd0,0xb3,0x00,0xd1,0x0e,0x10,0x07,
-+	0x01,0xff,0xd0,0xb4,0x00,0x01,0xff,0xd0,0xb5,0x00,0x10,0x07,0x01,0xff,0xd0,0xb6,
-+	0x00,0x01,0xff,0xd0,0xb7,0x00,0xd2,0x1e,0xd1,0x10,0x10,0x07,0x01,0xff,0xd0,0xb8,
-+	0x00,0x01,0xff,0xd0,0xb8,0xcc,0x86,0x00,0x10,0x07,0x01,0xff,0xd0,0xba,0x00,0x01,
-+	0xff,0xd0,0xbb,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd0,0xbc,0x00,0x01,0xff,0xd0,
-+	0xbd,0x00,0x10,0x07,0x01,0xff,0xd0,0xbe,0x00,0x01,0xff,0xd0,0xbf,0x00,0xe4,0x0e,
-+	0x42,0xd3,0x38,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,0x80,0x00,0x01,0xff,
-+	0xd1,0x81,0x00,0x10,0x07,0x01,0xff,0xd1,0x82,0x00,0x01,0xff,0xd1,0x83,0x00,0xd1,
-+	0x0e,0x10,0x07,0x01,0xff,0xd1,0x84,0x00,0x01,0xff,0xd1,0x85,0x00,0x10,0x07,0x01,
-+	0xff,0xd1,0x86,0x00,0x01,0xff,0xd1,0x87,0x00,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,
-+	0xff,0xd1,0x88,0x00,0x01,0xff,0xd1,0x89,0x00,0x10,0x07,0x01,0xff,0xd1,0x8a,0x00,
-+	0x01,0xff,0xd1,0x8b,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd1,0x8c,0x00,0x01,0xff,
-+	0xd1,0x8d,0x00,0x10,0x07,0x01,0xff,0xd1,0x8e,0x00,0x01,0xff,0xd1,0x8f,0x00,0xcf,
-+	0x86,0xd5,0x07,0x64,0xb8,0x41,0x01,0x00,0xd4,0x58,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,
-+	0x10,0x07,0x01,0xff,0xd1,0xa1,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xa3,0x00,
-+	0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xa5,0x00,0x01,0x00,0x10,0x07,0x01,
-+	0xff,0xd1,0xa7,0x00,0x01,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xa9,
-+	0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xab,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,
-+	0x01,0xff,0xd1,0xad,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xaf,0x00,0x01,0x00,
-+	0xd3,0x33,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xb1,0x00,0x01,0x00,0x10,
-+	0x07,0x01,0xff,0xd1,0xb3,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xb5,
-+	0x00,0x01,0x00,0x10,0x09,0x01,0xff,0xd1,0xb5,0xcc,0x8f,0x00,0x01,0xff,0xd1,0xb5,
-+	0xcc,0x8f,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,0xb9,0x00,0x01,0x00,
-+	0x10,0x07,0x01,0xff,0xd1,0xbb,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd1,
-+	0xbd,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd1,0xbf,0x00,0x01,0x00,0xe0,0x41,0x01,
-+	0xcf,0x86,0xd5,0x8e,0xd4,0x36,0xd3,0x11,0xe2,0x7a,0x41,0xe1,0x71,0x41,0x10,0x07,
-+	0x01,0xff,0xd2,0x81,0x00,0x01,0x00,0xd2,0x0f,0x51,0x04,0x04,0x00,0x10,0x07,0x06,
-+	0xff,0xd2,0x8b,0x00,0x06,0x00,0xd1,0x0b,0x10,0x07,0x04,0xff,0xd2,0x8d,0x00,0x04,
-+	0x00,0x10,0x07,0x04,0xff,0xd2,0x8f,0x00,0x04,0x00,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,
-+	0x10,0x07,0x01,0xff,0xd2,0x91,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0x93,0x00,
-+	0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0x95,0x00,0x01,0x00,0x10,0x07,0x01,
-+	0xff,0xd2,0x97,0x00,0x01,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0x99,
-+	0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0x9b,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,
-+	0x01,0xff,0xd2,0x9d,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0x9f,0x00,0x01,0x00,
-+	0xd4,0x58,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0xa1,0x00,0x01,
-+	0x00,0x10,0x07,0x01,0xff,0xd2,0xa3,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,
-+	0xd2,0xa5,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xa7,0x00,0x01,0x00,0xd2,0x16,
-+	0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0xa9,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,
-+	0xab,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0xad,0x00,0x01,0x00,0x10,
-+	0x07,0x01,0xff,0xd2,0xaf,0x00,0x01,0x00,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,
-+	0x01,0xff,0xd2,0xb1,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xb3,0x00,0x01,0x00,
-+	0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0xb5,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,
-+	0xb7,0x00,0x01,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd2,0xb9,0x00,0x01,
-+	0x00,0x10,0x07,0x01,0xff,0xd2,0xbb,0x00,0x01,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,
-+	0xd2,0xbd,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xd2,0xbf,0x00,0x01,0x00,0xcf,0x86,
-+	0xd5,0xdc,0xd4,0x5a,0xd3,0x36,0xd2,0x20,0xd1,0x10,0x10,0x07,0x01,0xff,0xd3,0x8f,
-+	0x00,0x01,0xff,0xd0,0xb6,0xcc,0x86,0x00,0x10,0x09,0x01,0xff,0xd0,0xb6,0xcc,0x86,
-+	0x00,0x01,0xff,0xd3,0x84,0x00,0xd1,0x0b,0x10,0x04,0x01,0x00,0x06,0xff,0xd3,0x86,
-+	0x00,0x10,0x04,0x06,0x00,0x01,0xff,0xd3,0x88,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x04,
-+	0x01,0x00,0x06,0xff,0xd3,0x8a,0x00,0x10,0x04,0x06,0x00,0x01,0xff,0xd3,0x8c,0x00,
-+	0xe1,0x52,0x40,0x10,0x04,0x01,0x00,0x06,0xff,0xd3,0x8e,0x00,0xd3,0x41,0xd2,0x24,
-+	0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0xb0,0xcc,0x86,0x00,0x01,0xff,0xd0,0xb0,0xcc,
-+	0x86,0x00,0x10,0x09,0x01,0xff,0xd0,0xb0,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb0,0xcc,
-+	0x88,0x00,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd3,0x95,0x00,0x01,0x00,0x10,0x09,0x01,
-+	0xff,0xd0,0xb5,0xcc,0x86,0x00,0x01,0xff,0xd0,0xb5,0xcc,0x86,0x00,0xd2,0x1d,0xd1,
-+	0x0b,0x10,0x07,0x01,0xff,0xd3,0x99,0x00,0x01,0x00,0x10,0x09,0x01,0xff,0xd3,0x99,
-+	0xcc,0x88,0x00,0x01,0xff,0xd3,0x99,0xcc,0x88,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,
-+	0xd0,0xb6,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb6,0xcc,0x88,0x00,0x10,0x09,0x01,0xff,
-+	0xd0,0xb7,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb7,0xcc,0x88,0x00,0xd4,0x82,0xd3,0x41,
-+	0xd2,0x1d,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd3,0xa1,0x00,0x01,0x00,0x10,0x09,0x01,
-+	0xff,0xd0,0xb8,0xcc,0x84,0x00,0x01,0xff,0xd0,0xb8,0xcc,0x84,0x00,0xd1,0x12,0x10,
-+	0x09,0x01,0xff,0xd0,0xb8,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb8,0xcc,0x88,0x00,0x10,
-+	0x09,0x01,0xff,0xd0,0xbe,0xcc,0x88,0x00,0x01,0xff,0xd0,0xbe,0xcc,0x88,0x00,0xd2,
-+	0x1d,0xd1,0x0b,0x10,0x07,0x01,0xff,0xd3,0xa9,0x00,0x01,0x00,0x10,0x09,0x01,0xff,
-+	0xd3,0xa9,0xcc,0x88,0x00,0x01,0xff,0xd3,0xa9,0xcc,0x88,0x00,0xd1,0x12,0x10,0x09,
-+	0x04,0xff,0xd1,0x8d,0xcc,0x88,0x00,0x04,0xff,0xd1,0x8d,0xcc,0x88,0x00,0x10,0x09,
-+	0x01,0xff,0xd1,0x83,0xcc,0x84,0x00,0x01,0xff,0xd1,0x83,0xcc,0x84,0x00,0xd3,0x41,
-+	0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd1,0x83,0xcc,0x88,0x00,0x01,0xff,0xd1,
-+	0x83,0xcc,0x88,0x00,0x10,0x09,0x01,0xff,0xd1,0x83,0xcc,0x8b,0x00,0x01,0xff,0xd1,
-+	0x83,0xcc,0x8b,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd1,0x87,0xcc,0x88,0x00,0x01,
-+	0xff,0xd1,0x87,0xcc,0x88,0x00,0x10,0x07,0x08,0xff,0xd3,0xb7,0x00,0x08,0x00,0xd2,
-+	0x1d,0xd1,0x12,0x10,0x09,0x01,0xff,0xd1,0x8b,0xcc,0x88,0x00,0x01,0xff,0xd1,0x8b,
-+	0xcc,0x88,0x00,0x10,0x07,0x09,0xff,0xd3,0xbb,0x00,0x09,0x00,0xd1,0x0b,0x10,0x07,
-+	0x09,0xff,0xd3,0xbd,0x00,0x09,0x00,0x10,0x07,0x09,0xff,0xd3,0xbf,0x00,0x09,0x00,
-+	0xe1,0x26,0x02,0xe0,0x78,0x01,0xcf,0x86,0xd5,0xb0,0xd4,0x58,0xd3,0x2c,0xd2,0x16,
-+	0xd1,0x0b,0x10,0x07,0x06,0xff,0xd4,0x81,0x00,0x06,0x00,0x10,0x07,0x06,0xff,0xd4,
-+	0x83,0x00,0x06,0x00,0xd1,0x0b,0x10,0x07,0x06,0xff,0xd4,0x85,0x00,0x06,0x00,0x10,
-+	0x07,0x06,0xff,0xd4,0x87,0x00,0x06,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x06,0xff,
-+	0xd4,0x89,0x00,0x06,0x00,0x10,0x07,0x06,0xff,0xd4,0x8b,0x00,0x06,0x00,0xd1,0x0b,
-+	0x10,0x07,0x06,0xff,0xd4,0x8d,0x00,0x06,0x00,0x10,0x07,0x06,0xff,0xd4,0x8f,0x00,
-+	0x06,0x00,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x09,0xff,0xd4,0x91,0x00,0x09,
-+	0x00,0x10,0x07,0x09,0xff,0xd4,0x93,0x00,0x09,0x00,0xd1,0x0b,0x10,0x07,0x0a,0xff,
-+	0xd4,0x95,0x00,0x0a,0x00,0x10,0x07,0x0a,0xff,0xd4,0x97,0x00,0x0a,0x00,0xd2,0x16,
-+	0xd1,0x0b,0x10,0x07,0x0a,0xff,0xd4,0x99,0x00,0x0a,0x00,0x10,0x07,0x0a,0xff,0xd4,
-+	0x9b,0x00,0x0a,0x00,0xd1,0x0b,0x10,0x07,0x0a,0xff,0xd4,0x9d,0x00,0x0a,0x00,0x10,
-+	0x07,0x0a,0xff,0xd4,0x9f,0x00,0x0a,0x00,0xd4,0x58,0xd3,0x2c,0xd2,0x16,0xd1,0x0b,
-+	0x10,0x07,0x0a,0xff,0xd4,0xa1,0x00,0x0a,0x00,0x10,0x07,0x0a,0xff,0xd4,0xa3,0x00,
-+	0x0a,0x00,0xd1,0x0b,0x10,0x07,0x0b,0xff,0xd4,0xa5,0x00,0x0b,0x00,0x10,0x07,0x0c,
-+	0xff,0xd4,0xa7,0x00,0x0c,0x00,0xd2,0x16,0xd1,0x0b,0x10,0x07,0x10,0xff,0xd4,0xa9,
-+	0x00,0x10,0x00,0x10,0x07,0x10,0xff,0xd4,0xab,0x00,0x10,0x00,0xd1,0x0b,0x10,0x07,
-+	0x10,0xff,0xd4,0xad,0x00,0x10,0x00,0x10,0x07,0x10,0xff,0xd4,0xaf,0x00,0x10,0x00,
-+	0xd3,0x35,0xd2,0x19,0xd1,0x0b,0x10,0x04,0x00,0x00,0x01,0xff,0xd5,0xa1,0x00,0x10,
-+	0x07,0x01,0xff,0xd5,0xa2,0x00,0x01,0xff,0xd5,0xa3,0x00,0xd1,0x0e,0x10,0x07,0x01,
-+	0xff,0xd5,0xa4,0x00,0x01,0xff,0xd5,0xa5,0x00,0x10,0x07,0x01,0xff,0xd5,0xa6,0x00,
-+	0x01,0xff,0xd5,0xa7,0x00,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,0xa8,0x00,
-+	0x01,0xff,0xd5,0xa9,0x00,0x10,0x07,0x01,0xff,0xd5,0xaa,0x00,0x01,0xff,0xd5,0xab,
-+	0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,0xac,0x00,0x01,0xff,0xd5,0xad,0x00,0x10,
-+	0x07,0x01,0xff,0xd5,0xae,0x00,0x01,0xff,0xd5,0xaf,0x00,0xcf,0x86,0xe5,0xf1,0x3e,
-+	0xd4,0x70,0xd3,0x38,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,0xb0,0x00,0x01,
-+	0xff,0xd5,0xb1,0x00,0x10,0x07,0x01,0xff,0xd5,0xb2,0x00,0x01,0xff,0xd5,0xb3,0x00,
-+	0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,0xb4,0x00,0x01,0xff,0xd5,0xb5,0x00,0x10,0x07,
-+	0x01,0xff,0xd5,0xb6,0x00,0x01,0xff,0xd5,0xb7,0x00,0xd2,0x1c,0xd1,0x0e,0x10,0x07,
-+	0x01,0xff,0xd5,0xb8,0x00,0x01,0xff,0xd5,0xb9,0x00,0x10,0x07,0x01,0xff,0xd5,0xba,
-+	0x00,0x01,0xff,0xd5,0xbb,0x00,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd5,0xbc,0x00,0x01,
-+	0xff,0xd5,0xbd,0x00,0x10,0x07,0x01,0xff,0xd5,0xbe,0x00,0x01,0xff,0xd5,0xbf,0x00,
-+	0xe3,0x70,0x3e,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x01,0xff,0xd6,0x80,0x00,0x01,0xff,
-+	0xd6,0x81,0x00,0x10,0x07,0x01,0xff,0xd6,0x82,0x00,0x01,0xff,0xd6,0x83,0x00,0xd1,
-+	0x0e,0x10,0x07,0x01,0xff,0xd6,0x84,0x00,0x01,0xff,0xd6,0x85,0x00,0x10,0x07,0x01,
-+	0xff,0xd6,0x86,0x00,0x00,0x00,0xe0,0x18,0x3f,0xcf,0x86,0xe5,0xa9,0x3e,0xe4,0x80,
-+	0x3e,0xe3,0x5f,0x3e,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
-+	0x01,0xff,0xd5,0xa5,0xd6,0x82,0x00,0xe4,0x3e,0x25,0xe3,0xc4,0x1a,0xe2,0xf8,0x80,
-+	0xe1,0xc0,0x13,0xd0,0x1e,0xcf,0x86,0xc5,0xe4,0xf0,0x4a,0xe3,0x3b,0x46,0xe2,0xd1,
-+	0x43,0xe1,0x04,0x43,0xe0,0xc9,0x42,0xcf,0x86,0xe5,0x8e,0x42,0x64,0x71,0x42,0x0b,
-+	0x00,0xcf,0x86,0xe5,0xfa,0x01,0xe4,0xd5,0x55,0xe3,0x76,0x01,0xe2,0x76,0x53,0xd1,
-+	0x0c,0xe0,0xd7,0x52,0xcf,0x86,0x65,0x75,0x52,0x04,0x00,0xe0,0x0d,0x01,0xcf,0x86,
-+	0xd5,0x0a,0xe4,0xf8,0x52,0x63,0xe7,0x52,0x0a,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,
-+	0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0x80,0x00,0x01,0xff,0xe2,0xb4,0x81,0x00,
-+	0x10,0x08,0x01,0xff,0xe2,0xb4,0x82,0x00,0x01,0xff,0xe2,0xb4,0x83,0x00,0xd1,0x10,
-+	0x10,0x08,0x01,0xff,0xe2,0xb4,0x84,0x00,0x01,0xff,0xe2,0xb4,0x85,0x00,0x10,0x08,
-+	0x01,0xff,0xe2,0xb4,0x86,0x00,0x01,0xff,0xe2,0xb4,0x87,0x00,0xd2,0x20,0xd1,0x10,
-+	0x10,0x08,0x01,0xff,0xe2,0xb4,0x88,0x00,0x01,0xff,0xe2,0xb4,0x89,0x00,0x10,0x08,
-+	0x01,0xff,0xe2,0xb4,0x8a,0x00,0x01,0xff,0xe2,0xb4,0x8b,0x00,0xd1,0x10,0x10,0x08,
-+	0x01,0xff,0xe2,0xb4,0x8c,0x00,0x01,0xff,0xe2,0xb4,0x8d,0x00,0x10,0x08,0x01,0xff,
-+	0xe2,0xb4,0x8e,0x00,0x01,0xff,0xe2,0xb4,0x8f,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,
-+	0x10,0x08,0x01,0xff,0xe2,0xb4,0x90,0x00,0x01,0xff,0xe2,0xb4,0x91,0x00,0x10,0x08,
-+	0x01,0xff,0xe2,0xb4,0x92,0x00,0x01,0xff,0xe2,0xb4,0x93,0x00,0xd1,0x10,0x10,0x08,
-+	0x01,0xff,0xe2,0xb4,0x94,0x00,0x01,0xff,0xe2,0xb4,0x95,0x00,0x10,0x08,0x01,0xff,
-+	0xe2,0xb4,0x96,0x00,0x01,0xff,0xe2,0xb4,0x97,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
-+	0x01,0xff,0xe2,0xb4,0x98,0x00,0x01,0xff,0xe2,0xb4,0x99,0x00,0x10,0x08,0x01,0xff,
-+	0xe2,0xb4,0x9a,0x00,0x01,0xff,0xe2,0xb4,0x9b,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0xe2,0xb4,0x9c,0x00,0x01,0xff,0xe2,0xb4,0x9d,0x00,0x10,0x08,0x01,0xff,0xe2,0xb4,
-+	0x9e,0x00,0x01,0xff,0xe2,0xb4,0x9f,0x00,0xcf,0x86,0xe5,0x2a,0x52,0x94,0x50,0xd3,
-+	0x3c,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0xa0,0x00,0x01,0xff,0xe2,
-+	0xb4,0xa1,0x00,0x10,0x08,0x01,0xff,0xe2,0xb4,0xa2,0x00,0x01,0xff,0xe2,0xb4,0xa3,
-+	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0xb4,0xa4,0x00,0x01,0xff,0xe2,0xb4,0xa5,
-+	0x00,0x10,0x04,0x00,0x00,0x0d,0xff,0xe2,0xb4,0xa7,0x00,0x52,0x04,0x00,0x00,0x91,
-+	0x0c,0x10,0x04,0x00,0x00,0x0d,0xff,0xe2,0xb4,0xad,0x00,0x00,0x00,0x01,0x00,0xd2,
-+	0x1b,0xe1,0xce,0x52,0xe0,0x7f,0x52,0xcf,0x86,0x95,0x0f,0x94,0x0b,0x93,0x07,0x62,
-+	0x64,0x52,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0xd1,0x13,0xe0,0xa5,0x53,0xcf,
-+	0x86,0x95,0x0a,0xe4,0x7a,0x53,0x63,0x69,0x53,0x04,0x00,0x04,0x00,0xd0,0x0d,0xcf,
-+	0x86,0x95,0x07,0x64,0xf4,0x53,0x08,0x00,0x04,0x00,0xcf,0x86,0x55,0x04,0x04,0x00,
-+	0x54,0x04,0x04,0x00,0xd3,0x07,0x62,0x01,0x54,0x04,0x00,0xd2,0x20,0xd1,0x10,0x10,
-+	0x08,0x11,0xff,0xe1,0x8f,0xb0,0x00,0x11,0xff,0xe1,0x8f,0xb1,0x00,0x10,0x08,0x11,
-+	0xff,0xe1,0x8f,0xb2,0x00,0x11,0xff,0xe1,0x8f,0xb3,0x00,0x91,0x10,0x10,0x08,0x11,
-+	0xff,0xe1,0x8f,0xb4,0x00,0x11,0xff,0xe1,0x8f,0xb5,0x00,0x00,0x00,0xd4,0x1c,0xe3,
-+	0x92,0x56,0xe2,0xc9,0x55,0xe1,0x8c,0x55,0xe0,0x6d,0x55,0xcf,0x86,0x95,0x0a,0xe4,
-+	0x56,0x55,0x63,0x45,0x55,0x04,0x00,0x04,0x00,0xe3,0xd2,0x01,0xe2,0xdd,0x59,0xd1,
-+	0x0c,0xe0,0xfe,0x58,0xcf,0x86,0x65,0xd7,0x58,0x0a,0x00,0xe0,0x4e,0x59,0xcf,0x86,
-+	0xd5,0xc5,0xd4,0x45,0xd3,0x31,0xd2,0x1c,0xd1,0x0e,0x10,0x07,0x12,0xff,0xd0,0xb2,
-+	0x00,0x12,0xff,0xd0,0xb4,0x00,0x10,0x07,0x12,0xff,0xd0,0xbe,0x00,0x12,0xff,0xd1,
-+	0x81,0x00,0x51,0x07,0x12,0xff,0xd1,0x82,0x00,0x10,0x07,0x12,0xff,0xd1,0x8a,0x00,
-+	0x12,0xff,0xd1,0xa3,0x00,0x92,0x10,0x91,0x0c,0x10,0x08,0x12,0xff,0xea,0x99,0x8b,
-+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x14,
-+	0xff,0xe1,0x83,0x90,0x00,0x14,0xff,0xe1,0x83,0x91,0x00,0x10,0x08,0x14,0xff,0xe1,
-+	0x83,0x92,0x00,0x14,0xff,0xe1,0x83,0x93,0x00,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,
-+	0x83,0x94,0x00,0x14,0xff,0xe1,0x83,0x95,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0x96,
-+	0x00,0x14,0xff,0xe1,0x83,0x97,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,
-+	0x83,0x98,0x00,0x14,0xff,0xe1,0x83,0x99,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0x9a,
-+	0x00,0x14,0xff,0xe1,0x83,0x9b,0x00,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,0x83,0x9c,
-+	0x00,0x14,0xff,0xe1,0x83,0x9d,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0x9e,0x00,0x14,
-+	0xff,0xe1,0x83,0x9f,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x14,
-+	0xff,0xe1,0x83,0xa0,0x00,0x14,0xff,0xe1,0x83,0xa1,0x00,0x10,0x08,0x14,0xff,0xe1,
-+	0x83,0xa2,0x00,0x14,0xff,0xe1,0x83,0xa3,0x00,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,
-+	0x83,0xa4,0x00,0x14,0xff,0xe1,0x83,0xa5,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0xa6,
-+	0x00,0x14,0xff,0xe1,0x83,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,
-+	0x83,0xa8,0x00,0x14,0xff,0xe1,0x83,0xa9,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0xaa,
-+	0x00,0x14,0xff,0xe1,0x83,0xab,0x00,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,0x83,0xac,
-+	0x00,0x14,0xff,0xe1,0x83,0xad,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0xae,0x00,0x14,
-+	0xff,0xe1,0x83,0xaf,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,
-+	0x83,0xb0,0x00,0x14,0xff,0xe1,0x83,0xb1,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0xb2,
-+	0x00,0x14,0xff,0xe1,0x83,0xb3,0x00,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,0x83,0xb4,
-+	0x00,0x14,0xff,0xe1,0x83,0xb5,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0xb6,0x00,0x14,
-+	0xff,0xe1,0x83,0xb7,0x00,0xd2,0x1c,0xd1,0x10,0x10,0x08,0x14,0xff,0xe1,0x83,0xb8,
-+	0x00,0x14,0xff,0xe1,0x83,0xb9,0x00,0x10,0x08,0x14,0xff,0xe1,0x83,0xba,0x00,0x00,
-+	0x00,0xd1,0x0c,0x10,0x04,0x00,0x00,0x14,0xff,0xe1,0x83,0xbd,0x00,0x10,0x08,0x14,
-+	0xff,0xe1,0x83,0xbe,0x00,0x14,0xff,0xe1,0x83,0xbf,0x00,0xe2,0x9d,0x08,0xe1,0x48,
-+	0x04,0xe0,0x1c,0x02,0xcf,0x86,0xe5,0x11,0x01,0xd4,0x84,0xd3,0x40,0xd2,0x20,0xd1,
-+	0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0xa5,0x00,0x01,0xff,0x61,0xcc,0xa5,0x00,0x10,
-+	0x08,0x01,0xff,0x62,0xcc,0x87,0x00,0x01,0xff,0x62,0xcc,0x87,0x00,0xd1,0x10,0x10,
-+	0x08,0x01,0xff,0x62,0xcc,0xa3,0x00,0x01,0xff,0x62,0xcc,0xa3,0x00,0x10,0x08,0x01,
-+	0xff,0x62,0xcc,0xb1,0x00,0x01,0xff,0x62,0xcc,0xb1,0x00,0xd2,0x24,0xd1,0x14,0x10,
-+	0x0a,0x01,0xff,0x63,0xcc,0xa7,0xcc,0x81,0x00,0x01,0xff,0x63,0xcc,0xa7,0xcc,0x81,
-+	0x00,0x10,0x08,0x01,0xff,0x64,0xcc,0x87,0x00,0x01,0xff,0x64,0xcc,0x87,0x00,0xd1,
-+	0x10,0x10,0x08,0x01,0xff,0x64,0xcc,0xa3,0x00,0x01,0xff,0x64,0xcc,0xa3,0x00,0x10,
-+	0x08,0x01,0xff,0x64,0xcc,0xb1,0x00,0x01,0xff,0x64,0xcc,0xb1,0x00,0xd3,0x48,0xd2,
-+	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x64,0xcc,0xa7,0x00,0x01,0xff,0x64,0xcc,0xa7,
-+	0x00,0x10,0x08,0x01,0xff,0x64,0xcc,0xad,0x00,0x01,0xff,0x64,0xcc,0xad,0x00,0xd1,
-+	0x14,0x10,0x0a,0x01,0xff,0x65,0xcc,0x84,0xcc,0x80,0x00,0x01,0xff,0x65,0xcc,0x84,
-+	0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x65,0xcc,0x84,0xcc,0x81,0x00,0x01,0xff,0x65,
-+	0xcc,0x84,0xcc,0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0xad,
-+	0x00,0x01,0xff,0x65,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,0xb0,0x00,0x01,
-+	0xff,0x65,0xcc,0xb0,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x65,0xcc,0xa7,0xcc,0x86,
-+	0x00,0x01,0xff,0x65,0xcc,0xa7,0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x66,0xcc,0x87,
-+	0x00,0x01,0xff,0x66,0xcc,0x87,0x00,0xd4,0x84,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,
-+	0x08,0x01,0xff,0x67,0xcc,0x84,0x00,0x01,0xff,0x67,0xcc,0x84,0x00,0x10,0x08,0x01,
-+	0xff,0x68,0xcc,0x87,0x00,0x01,0xff,0x68,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,
-+	0xff,0x68,0xcc,0xa3,0x00,0x01,0xff,0x68,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x68,
-+	0xcc,0x88,0x00,0x01,0xff,0x68,0xcc,0x88,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
-+	0xff,0x68,0xcc,0xa7,0x00,0x01,0xff,0x68,0xcc,0xa7,0x00,0x10,0x08,0x01,0xff,0x68,
-+	0xcc,0xae,0x00,0x01,0xff,0x68,0xcc,0xae,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,
-+	0xcc,0xb0,0x00,0x01,0xff,0x69,0xcc,0xb0,0x00,0x10,0x0a,0x01,0xff,0x69,0xcc,0x88,
-+	0xcc,0x81,0x00,0x01,0xff,0x69,0xcc,0x88,0xcc,0x81,0x00,0xd3,0x40,0xd2,0x20,0xd1,
-+	0x10,0x10,0x08,0x01,0xff,0x6b,0xcc,0x81,0x00,0x01,0xff,0x6b,0xcc,0x81,0x00,0x10,
-+	0x08,0x01,0xff,0x6b,0xcc,0xa3,0x00,0x01,0xff,0x6b,0xcc,0xa3,0x00,0xd1,0x10,0x10,
-+	0x08,0x01,0xff,0x6b,0xcc,0xb1,0x00,0x01,0xff,0x6b,0xcc,0xb1,0x00,0x10,0x08,0x01,
-+	0xff,0x6c,0xcc,0xa3,0x00,0x01,0xff,0x6c,0xcc,0xa3,0x00,0xd2,0x24,0xd1,0x14,0x10,
-+	0x0a,0x01,0xff,0x6c,0xcc,0xa3,0xcc,0x84,0x00,0x01,0xff,0x6c,0xcc,0xa3,0xcc,0x84,
-+	0x00,0x10,0x08,0x01,0xff,0x6c,0xcc,0xb1,0x00,0x01,0xff,0x6c,0xcc,0xb1,0x00,0xd1,
-+	0x10,0x10,0x08,0x01,0xff,0x6c,0xcc,0xad,0x00,0x01,0xff,0x6c,0xcc,0xad,0x00,0x10,
-+	0x08,0x01,0xff,0x6d,0xcc,0x81,0x00,0x01,0xff,0x6d,0xcc,0x81,0x00,0xcf,0x86,0xe5,
-+	0x15,0x01,0xd4,0x88,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x6d,0xcc,
-+	0x87,0x00,0x01,0xff,0x6d,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x6d,0xcc,0xa3,0x00,
-+	0x01,0xff,0x6d,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,0xcc,0x87,0x00,
-+	0x01,0xff,0x6e,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x6e,0xcc,0xa3,0x00,0x01,0xff,
-+	0x6e,0xcc,0xa3,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,0xcc,0xb1,0x00,
-+	0x01,0xff,0x6e,0xcc,0xb1,0x00,0x10,0x08,0x01,0xff,0x6e,0xcc,0xad,0x00,0x01,0xff,
-+	0x6e,0xcc,0xad,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x83,0xcc,0x81,0x00,
-+	0x01,0xff,0x6f,0xcc,0x83,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x83,0xcc,
-+	0x88,0x00,0x01,0xff,0x6f,0xcc,0x83,0xcc,0x88,0x00,0xd3,0x48,0xd2,0x28,0xd1,0x14,
-+	0x10,0x0a,0x01,0xff,0x6f,0xcc,0x84,0xcc,0x80,0x00,0x01,0xff,0x6f,0xcc,0x84,0xcc,
-+	0x80,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x84,0xcc,0x81,0x00,0x01,0xff,0x6f,0xcc,
-+	0x84,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x70,0xcc,0x81,0x00,0x01,0xff,
-+	0x70,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x70,0xcc,0x87,0x00,0x01,0xff,0x70,0xcc,
-+	0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x72,0xcc,0x87,0x00,0x01,0xff,
-+	0x72,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x72,0xcc,0xa3,0x00,0x01,0xff,0x72,0xcc,
-+	0xa3,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x72,0xcc,0xa3,0xcc,0x84,0x00,0x01,0xff,
-+	0x72,0xcc,0xa3,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x72,0xcc,0xb1,0x00,0x01,0xff,
-+	0x72,0xcc,0xb1,0x00,0xd4,0x8c,0xd3,0x48,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0x73,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x73,0xcc,
-+	0xa3,0x00,0x01,0xff,0x73,0xcc,0xa3,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x73,0xcc,
-+	0x81,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x81,0xcc,0x87,0x00,0x10,0x0a,0x01,0xff,
-+	0x73,0xcc,0x8c,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x8c,0xcc,0x87,0x00,0xd2,0x24,
-+	0xd1,0x14,0x10,0x0a,0x01,0xff,0x73,0xcc,0xa3,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,
-+	0xa3,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x74,0xcc,0x87,0x00,0x01,0xff,0x74,0xcc,
-+	0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x74,0xcc,0xa3,0x00,0x01,0xff,0x74,0xcc,
-+	0xa3,0x00,0x10,0x08,0x01,0xff,0x74,0xcc,0xb1,0x00,0x01,0xff,0x74,0xcc,0xb1,0x00,
-+	0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x74,0xcc,0xad,0x00,0x01,0xff,
-+	0x74,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0xa4,0x00,0x01,0xff,0x75,0xcc,
-+	0xa4,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0xb0,0x00,0x01,0xff,0x75,0xcc,
-+	0xb0,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0xad,0x00,0x01,0xff,0x75,0xcc,0xad,0x00,
-+	0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,0xcc,0x83,0xcc,0x81,0x00,0x01,0xff,
-+	0x75,0xcc,0x83,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x84,0xcc,0x88,0x00,
-+	0x01,0xff,0x75,0xcc,0x84,0xcc,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x76,0xcc,
-+	0x83,0x00,0x01,0xff,0x76,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x76,0xcc,0xa3,0x00,
-+	0x01,0xff,0x76,0xcc,0xa3,0x00,0xe0,0x11,0x02,0xcf,0x86,0xd5,0xe2,0xd4,0x80,0xd3,
-+	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x80,0x00,0x01,0xff,0x77,
-+	0xcc,0x80,0x00,0x10,0x08,0x01,0xff,0x77,0xcc,0x81,0x00,0x01,0xff,0x77,0xcc,0x81,
-+	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x88,0x00,0x01,0xff,0x77,0xcc,0x88,
-+	0x00,0x10,0x08,0x01,0xff,0x77,0xcc,0x87,0x00,0x01,0xff,0x77,0xcc,0x87,0x00,0xd2,
-+	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0xa3,0x00,0x01,0xff,0x77,0xcc,0xa3,
-+	0x00,0x10,0x08,0x01,0xff,0x78,0xcc,0x87,0x00,0x01,0xff,0x78,0xcc,0x87,0x00,0xd1,
-+	0x10,0x10,0x08,0x01,0xff,0x78,0xcc,0x88,0x00,0x01,0xff,0x78,0xcc,0x88,0x00,0x10,
-+	0x08,0x01,0xff,0x79,0xcc,0x87,0x00,0x01,0xff,0x79,0xcc,0x87,0x00,0xd3,0x33,0xd2,
-+	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x7a,0xcc,0x82,0x00,0x01,0xff,0x7a,0xcc,0x82,
-+	0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0xa3,0x00,0x01,0xff,0x7a,0xcc,0xa3,0x00,0xe1,
-+	0xc4,0x58,0x10,0x08,0x01,0xff,0x7a,0xcc,0xb1,0x00,0x01,0xff,0x7a,0xcc,0xb1,0x00,
-+	0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x8a,0x00,0x01,0xff,0x79,0xcc,
-+	0x8a,0x00,0x10,0x08,0x01,0xff,0x61,0xca,0xbe,0x00,0x02,0xff,0x73,0xcc,0x87,0x00,
-+	0x51,0x04,0x0a,0x00,0x10,0x07,0x0a,0xff,0x73,0x73,0x00,0x0a,0x00,0xd4,0x98,0xd3,
-+	0x48,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0xa3,0x00,0x01,0xff,0x61,
-+	0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x61,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x89,
-+	0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x61,0xcc,0x82,0xcc,0x81,0x00,0x01,0xff,0x61,
-+	0xcc,0x82,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0x82,0xcc,0x80,0x00,0x01,
-+	0xff,0x61,0xcc,0x82,0xcc,0x80,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x61,
-+	0xcc,0x82,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x89,0x00,0x10,0x0a,0x01,
-+	0xff,0x61,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x83,0x00,0xd1,
-+	0x14,0x10,0x0a,0x01,0xff,0x61,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,0x61,0xcc,0xa3,
-+	0xcc,0x82,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0x86,0xcc,0x81,0x00,0x01,0xff,0x61,
-+	0xcc,0x86,0xcc,0x81,0x00,0xd3,0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x61,
-+	0xcc,0x86,0xcc,0x80,0x00,0x01,0xff,0x61,0xcc,0x86,0xcc,0x80,0x00,0x10,0x0a,0x01,
-+	0xff,0x61,0xcc,0x86,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x86,0xcc,0x89,0x00,0xd1,
-+	0x14,0x10,0x0a,0x01,0xff,0x61,0xcc,0x86,0xcc,0x83,0x00,0x01,0xff,0x61,0xcc,0x86,
-+	0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x61,0xcc,0xa3,0xcc,0x86,0x00,0x01,0xff,0x61,
-+	0xcc,0xa3,0xcc,0x86,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0xa3,
-+	0x00,0x01,0xff,0x65,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x65,0xcc,0x89,0x00,0x01,
-+	0xff,0x65,0xcc,0x89,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x65,0xcc,0x83,0x00,0x01,
-+	0xff,0x65,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x65,0xcc,0x82,0xcc,0x81,0x00,0x01,
-+	0xff,0x65,0xcc,0x82,0xcc,0x81,0x00,0xcf,0x86,0xe5,0x31,0x01,0xd4,0x90,0xd3,0x50,
-+	0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x65,0xcc,0x82,0xcc,0x80,0x00,0x01,0xff,
-+	0x65,0xcc,0x82,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x65,0xcc,0x82,0xcc,0x89,0x00,
-+	0x01,0xff,0x65,0xcc,0x82,0xcc,0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x65,0xcc,
-+	0x82,0xcc,0x83,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,
-+	0x65,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,0x65,0xcc,0xa3,0xcc,0x82,0x00,0xd2,0x20,
-+	0xd1,0x10,0x10,0x08,0x01,0xff,0x69,0xcc,0x89,0x00,0x01,0xff,0x69,0xcc,0x89,0x00,
-+	0x10,0x08,0x01,0xff,0x69,0xcc,0xa3,0x00,0x01,0xff,0x69,0xcc,0xa3,0x00,0xd1,0x10,
-+	0x10,0x08,0x01,0xff,0x6f,0xcc,0xa3,0x00,0x01,0xff,0x6f,0xcc,0xa3,0x00,0x10,0x08,
-+	0x01,0xff,0x6f,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x89,0x00,0xd3,0x50,0xd2,0x28,
-+	0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x81,0x00,0x01,0xff,0x6f,0xcc,
-+	0x82,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x80,0x00,0x01,0xff,
-+	0x6f,0xcc,0x82,0xcc,0x80,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x82,0xcc,
-+	0x89,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x89,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,
-+	0x82,0xcc,0x83,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x83,0x00,0xd2,0x28,0xd1,0x14,
-+	0x10,0x0a,0x01,0xff,0x6f,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,0x6f,0xcc,0xa3,0xcc,
-+	0x82,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x81,0x00,0x01,0xff,0x6f,0xcc,
-+	0x9b,0xcc,0x81,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x80,0x00,
-+	0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,0xcc,
-+	0x89,0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x89,0x00,0xd4,0x98,0xd3,0x48,0xd2,0x28,
-+	0xd1,0x14,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x83,0x00,0x01,0xff,0x6f,0xcc,
-+	0x9b,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0xa3,0x00,0x01,0xff,
-+	0x6f,0xcc,0x9b,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x75,0xcc,0xa3,0x00,
-+	0x01,0xff,0x75,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x75,0xcc,0x89,0x00,0x01,0xff,
-+	0x75,0xcc,0x89,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,0xcc,0x9b,0xcc,
-+	0x81,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,
-+	0x9b,0xcc,0x80,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x80,0x00,0xd1,0x14,0x10,0x0a,
-+	0x01,0xff,0x75,0xcc,0x9b,0xcc,0x89,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x89,0x00,
-+	0x10,0x0a,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x83,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,
-+	0x83,0x00,0xd3,0x44,0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x75,0xcc,0x9b,0xcc,
-+	0xa3,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x79,0xcc,
-+	0x80,0x00,0x01,0xff,0x79,0xcc,0x80,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x79,0xcc,
-+	0xa3,0x00,0x01,0xff,0x79,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x79,0xcc,0x89,0x00,
-+	0x01,0xff,0x79,0xcc,0x89,0x00,0xd2,0x1c,0xd1,0x10,0x10,0x08,0x01,0xff,0x79,0xcc,
-+	0x83,0x00,0x01,0xff,0x79,0xcc,0x83,0x00,0x10,0x08,0x0a,0xff,0xe1,0xbb,0xbb,0x00,
-+	0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xe1,0xbb,0xbd,0x00,0x0a,0x00,0x10,0x08,
-+	0x0a,0xff,0xe1,0xbb,0xbf,0x00,0x0a,0x00,0xe1,0xbf,0x02,0xe0,0xa1,0x01,0xcf,0x86,
-+	0xd5,0xc6,0xd4,0x6c,0xd3,0x18,0xe2,0xc0,0x58,0xe1,0xa9,0x58,0x10,0x09,0x01,0xff,
-+	0xce,0xb1,0xcc,0x93,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0x00,0xd2,0x28,0xd1,0x12,
-+	0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x93,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0x00,
-+	0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xb1,0xcc,
-+	0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x81,
-+	0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xce,0xb1,
-+	0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcd,0x82,0x00,0xd3,0x18,
-+	0xe2,0xfc,0x58,0xe1,0xe5,0x58,0x10,0x09,0x01,0xff,0xce,0xb5,0xcc,0x93,0x00,0x01,
-+	0xff,0xce,0xb5,0xcc,0x94,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb5,
-+	0xcc,0x93,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb5,
-+	0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0xcc,0x80,0x00,0x91,0x16,
-+	0x10,0x0b,0x01,0xff,0xce,0xb5,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0xb5,0xcc,
-+	0x94,0xcc,0x81,0x00,0x00,0x00,0xd4,0x6c,0xd3,0x18,0xe2,0x26,0x59,0xe1,0x0f,0x59,
-+	0x10,0x09,0x01,0xff,0xce,0xb7,0xcc,0x93,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0x00,
-+	0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb7,0xcc,0x93,0x00,0x01,0xff,0xce,
-+	0xb7,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x80,0x00,0x01,
-+	0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb7,
-+	0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,
-+	0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,
-+	0x82,0x00,0xd3,0x18,0xe2,0x62,0x59,0xe1,0x4b,0x59,0x10,0x09,0x01,0xff,0xce,0xb9,
-+	0xcc,0x93,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,
-+	0x01,0xff,0xce,0xb9,0xcc,0x93,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0x00,0x10,0x0b,
-+	0x01,0xff,0xce,0xb9,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0xcc,
-+	0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x93,0xcc,0x81,0x00,0x01,
-+	0xff,0xce,0xb9,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x93,
-+	0xcd,0x82,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0xcd,0x82,0x00,0xcf,0x86,0xd5,0xac,
-+	0xd4,0x5a,0xd3,0x18,0xe2,0x9f,0x59,0xe1,0x88,0x59,0x10,0x09,0x01,0xff,0xce,0xbf,
-+	0xcc,0x93,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,
-+	0x01,0xff,0xce,0xbf,0xcc,0x93,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,0x00,0x10,0x0b,
-+	0x01,0xff,0xce,0xbf,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,0xcc,
-+	0x80,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xce,0xbf,0xcc,0x93,0xcc,0x81,0x00,0x01,
-+	0xff,0xce,0xbf,0xcc,0x94,0xcc,0x81,0x00,0x00,0x00,0xd3,0x18,0xe2,0xc9,0x59,0xe1,
-+	0xb2,0x59,0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x93,0x00,0x01,0xff,0xcf,0x85,0xcc,
-+	0x94,0x00,0xd2,0x1c,0xd1,0x0d,0x10,0x04,0x00,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,
-+	0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x0f,
-+	0x10,0x04,0x00,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcc,0x81,0x00,0x10,0x04,0x00,
-+	0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcd,0x82,0x00,0xe4,0x85,0x5a,0xd3,0x18,0xe2,
-+	0x04,0x5a,0xe1,0xed,0x59,0x10,0x09,0x01,0xff,0xcf,0x89,0xcc,0x93,0x00,0x01,0xff,
-+	0xcf,0x89,0xcc,0x94,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xcf,0x89,0xcc,
-+	0x93,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,
-+	0x93,0xcc,0x80,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,
-+	0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,
-+	0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,
-+	0xcf,0x89,0xcc,0x94,0xcd,0x82,0x00,0xe0,0xd9,0x02,0xcf,0x86,0xe5,0x91,0x01,0xd4,
-+	0xc8,0xd3,0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,0xce,
-+	0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,
-+	0xb1,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x80,
-+	0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x81,0xce,
-+	0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x81,0xce,0xb9,0x00,0x10,0x0d,0x01,
-+	0xff,0xce,0xb1,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,
-+	0xcd,0x82,0xce,0xb9,0x00,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,
-+	0x93,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xce,0xb9,0x00,0x10,0x0d,0x01,
-+	0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,
-+	0xcc,0x80,0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,
-+	0x81,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x81,0xce,0xb9,0x00,0x10,
-+	0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,
-+	0xcc,0x94,0xcd,0x82,0xce,0xb9,0x00,0xd3,0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,
-+	0xff,0xce,0xb7,0xcc,0x93,0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xce,0xb9,
-+	0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,
-+	0xce,0xb7,0xcc,0x94,0xcc,0x80,0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,
-+	0xb7,0xcc,0x93,0xcc,0x81,0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x81,
-+	0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,
-+	0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x30,0xd1,0x16,0x10,
-+	0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,
-+	0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,
-+	0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,
-+	0xff,0xce,0xb7,0xcc,0x93,0xcc,0x81,0xce,0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,
-+	0xcc,0x81,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,0x82,0xce,
-+	0xb9,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x82,0xce,0xb9,0x00,0xd4,0xc8,0xd3,
-+	0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xce,0xb9,0x00,
-+	0x01,0xff,0xcf,0x89,0xcc,0x94,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,
-+	0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x80,0xce,0xb9,
-+	0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x81,0xce,0xb9,0x00,
-+	0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x81,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xcf,
-+	0x89,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcd,0x82,
-+	0xce,0xb9,0x00,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xce,
-+	0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xce,0xb9,0x00,0x10,0x0d,0x01,0xff,0xcf,
-+	0x89,0xcc,0x93,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x80,
-+	0xce,0xb9,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x81,0xce,
-+	0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x81,0xce,0xb9,0x00,0x10,0x0d,0x01,
-+	0xff,0xcf,0x89,0xcc,0x93,0xcd,0x82,0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,
-+	0xcd,0x82,0xce,0xb9,0x00,0xd3,0x49,0xd2,0x26,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,
-+	0xb1,0xcc,0x86,0x00,0x01,0xff,0xce,0xb1,0xcc,0x84,0x00,0x10,0x0b,0x01,0xff,0xce,
-+	0xb1,0xcc,0x80,0xce,0xb9,0x00,0x01,0xff,0xce,0xb1,0xce,0xb9,0x00,0xd1,0x0f,0x10,
-+	0x0b,0x01,0xff,0xce,0xb1,0xcc,0x81,0xce,0xb9,0x00,0x00,0x00,0x10,0x09,0x01,0xff,
-+	0xce,0xb1,0xcd,0x82,0x00,0x01,0xff,0xce,0xb1,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x24,
-+	0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x86,0x00,0x01,0xff,0xce,0xb1,0xcc,
-+	0x84,0x00,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x80,0x00,0x01,0xff,0xce,0xb1,0xcc,
-+	0x81,0x00,0xe1,0xa5,0x5a,0x10,0x09,0x01,0xff,0xce,0xb1,0xce,0xb9,0x00,0x01,0x00,
-+	0xcf,0x86,0xd5,0xbd,0xd4,0x7e,0xd3,0x44,0xd2,0x21,0xd1,0x0d,0x10,0x04,0x01,0x00,
-+	0x01,0xff,0xc2,0xa8,0xcd,0x82,0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x80,0xce,
-+	0xb9,0x00,0x01,0xff,0xce,0xb7,0xce,0xb9,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xce,
-+	0xb7,0xcc,0x81,0xce,0xb9,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xce,0xb7,0xcd,0x82,
-+	0x00,0x01,0xff,0xce,0xb7,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,
-+	0x01,0xff,0xce,0xb5,0xcc,0x80,0x00,0x01,0xff,0xce,0xb5,0xcc,0x81,0x00,0x10,0x09,
-+	0x01,0xff,0xce,0xb7,0xcc,0x80,0x00,0x01,0xff,0xce,0xb7,0xcc,0x81,0x00,0xe1,0xb4,
-+	0x5a,0x10,0x09,0x01,0xff,0xce,0xb7,0xce,0xb9,0x00,0x01,0xff,0xe1,0xbe,0xbf,0xcc,
-+	0x80,0x00,0xd3,0x18,0xe2,0xda,0x5a,0xe1,0xc3,0x5a,0x10,0x09,0x01,0xff,0xce,0xb9,
-+	0xcc,0x86,0x00,0x01,0xff,0xce,0xb9,0xcc,0x84,0x00,0xe2,0xfe,0x5a,0xd1,0x12,0x10,
-+	0x09,0x01,0xff,0xce,0xb9,0xcc,0x86,0x00,0x01,0xff,0xce,0xb9,0xcc,0x84,0x00,0x10,
-+	0x09,0x01,0xff,0xce,0xb9,0xcc,0x80,0x00,0x01,0xff,0xce,0xb9,0xcc,0x81,0x00,0xd4,
-+	0x51,0xd3,0x18,0xe2,0x21,0x5b,0xe1,0x0a,0x5b,0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,
-+	0x86,0x00,0x01,0xff,0xcf,0x85,0xcc,0x84,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,
-+	0xff,0xcf,0x85,0xcc,0x86,0x00,0x01,0xff,0xcf,0x85,0xcc,0x84,0x00,0x10,0x09,0x01,
-+	0xff,0xcf,0x85,0xcc,0x80,0x00,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,0xe1,0x41,0x5b,
-+	0x10,0x09,0x01,0xff,0xcf,0x81,0xcc,0x94,0x00,0x01,0xff,0xc2,0xa8,0xcc,0x80,0x00,
-+	0xd3,0x3b,0xd2,0x18,0x51,0x04,0x00,0x00,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x80,
-+	0xce,0xb9,0x00,0x01,0xff,0xcf,0x89,0xce,0xb9,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,
-+	0xcf,0x89,0xcc,0x81,0xce,0xb9,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xcf,0x89,0xcd,
-+	0x82,0x00,0x01,0xff,0xcf,0x89,0xcd,0x82,0xce,0xb9,0x00,0xd2,0x24,0xd1,0x12,0x10,
-+	0x09,0x01,0xff,0xce,0xbf,0xcc,0x80,0x00,0x01,0xff,0xce,0xbf,0xcc,0x81,0x00,0x10,
-+	0x09,0x01,0xff,0xcf,0x89,0xcc,0x80,0x00,0x01,0xff,0xcf,0x89,0xcc,0x81,0x00,0xe1,
-+	0x4b,0x5b,0x10,0x09,0x01,0xff,0xcf,0x89,0xce,0xb9,0x00,0x01,0xff,0xc2,0xb4,0x00,
-+	0xe0,0xa2,0x67,0xcf,0x86,0xe5,0x24,0x02,0xe4,0x26,0x01,0xe3,0x1b,0x5e,0xd2,0x2b,
-+	0xe1,0xf5,0x5b,0xe0,0x7a,0x5b,0xcf,0x86,0xe5,0x5f,0x5b,0x94,0x1c,0x93,0x18,0x92,
-+	0x14,0x91,0x10,0x10,0x08,0x01,0xff,0xe2,0x80,0x82,0x00,0x01,0xff,0xe2,0x80,0x83,
-+	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd1,0xd6,0xd0,0x46,0xcf,0x86,0x55,
-+	0x04,0x01,0x00,0xd4,0x29,0xd3,0x13,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,
-+	0x07,0x01,0xff,0xcf,0x89,0x00,0x01,0x00,0x92,0x12,0x51,0x04,0x01,0x00,0x10,0x06,
-+	0x01,0xff,0x6b,0x00,0x01,0xff,0x61,0xcc,0x8a,0x00,0x01,0x00,0xe3,0xba,0x5c,0x92,
-+	0x10,0x51,0x04,0x01,0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0x8e,0x00,0x01,0x00,0x01,
-+	0x00,0xcf,0x86,0xd5,0x0a,0xe4,0xd7,0x5c,0x63,0xc2,0x5c,0x06,0x00,0x94,0x80,0xd3,
-+	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x85,0xb0,0x00,0x01,0xff,0xe2,
-+	0x85,0xb1,0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0xb2,0x00,0x01,0xff,0xe2,0x85,0xb3,
-+	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x85,0xb4,0x00,0x01,0xff,0xe2,0x85,0xb5,
-+	0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0xb6,0x00,0x01,0xff,0xe2,0x85,0xb7,0x00,0xd2,
-+	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x85,0xb8,0x00,0x01,0xff,0xe2,0x85,0xb9,
-+	0x00,0x10,0x08,0x01,0xff,0xe2,0x85,0xba,0x00,0x01,0xff,0xe2,0x85,0xbb,0x00,0xd1,
-+	0x10,0x10,0x08,0x01,0xff,0xe2,0x85,0xbc,0x00,0x01,0xff,0xe2,0x85,0xbd,0x00,0x10,
-+	0x08,0x01,0xff,0xe2,0x85,0xbe,0x00,0x01,0xff,0xe2,0x85,0xbf,0x00,0x01,0x00,0xe0,
-+	0xc9,0x5c,0xcf,0x86,0xe5,0xa8,0x5c,0xe4,0x87,0x5c,0xe3,0x76,0x5c,0xe2,0x69,0x5c,
-+	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x04,0xff,0xe2,0x86,0x84,0x00,0xe3,0xb8,
-+	0x60,0xe2,0x85,0x60,0xd1,0x0c,0xe0,0x32,0x60,0xcf,0x86,0x65,0x13,0x60,0x01,0x00,
-+	0xd0,0x62,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x18,0x52,0x04,
-+	0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x08,0x01,0xff,0xe2,0x93,0x90,0x00,0x01,0xff,
-+	0xe2,0x93,0x91,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x93,0x92,0x00,
-+	0x01,0xff,0xe2,0x93,0x93,0x00,0x10,0x08,0x01,0xff,0xe2,0x93,0x94,0x00,0x01,0xff,
-+	0xe2,0x93,0x95,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,0x93,0x96,0x00,0x01,0xff,
-+	0xe2,0x93,0x97,0x00,0x10,0x08,0x01,0xff,0xe2,0x93,0x98,0x00,0x01,0xff,0xe2,0x93,
-+	0x99,0x00,0xcf,0x86,0xe5,0xec,0x5f,0x94,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,
-+	0x08,0x01,0xff,0xe2,0x93,0x9a,0x00,0x01,0xff,0xe2,0x93,0x9b,0x00,0x10,0x08,0x01,
-+	0xff,0xe2,0x93,0x9c,0x00,0x01,0xff,0xe2,0x93,0x9d,0x00,0xd1,0x10,0x10,0x08,0x01,
-+	0xff,0xe2,0x93,0x9e,0x00,0x01,0xff,0xe2,0x93,0x9f,0x00,0x10,0x08,0x01,0xff,0xe2,
-+	0x93,0xa0,0x00,0x01,0xff,0xe2,0x93,0xa1,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
-+	0xff,0xe2,0x93,0xa2,0x00,0x01,0xff,0xe2,0x93,0xa3,0x00,0x10,0x08,0x01,0xff,0xe2,
-+	0x93,0xa4,0x00,0x01,0xff,0xe2,0x93,0xa5,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe2,
-+	0x93,0xa6,0x00,0x01,0xff,0xe2,0x93,0xa7,0x00,0x10,0x08,0x01,0xff,0xe2,0x93,0xa8,
-+	0x00,0x01,0xff,0xe2,0x93,0xa9,0x00,0x01,0x00,0xd4,0x0c,0xe3,0xc8,0x61,0xe2,0xc1,
-+	0x61,0xcf,0x06,0x04,0x00,0xe3,0xa1,0x64,0xe2,0x94,0x63,0xe1,0x2e,0x02,0xe0,0x84,
-+	0x01,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
-+	0x08,0xff,0xe2,0xb0,0xb0,0x00,0x08,0xff,0xe2,0xb0,0xb1,0x00,0x10,0x08,0x08,0xff,
-+	0xe2,0xb0,0xb2,0x00,0x08,0xff,0xe2,0xb0,0xb3,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,
-+	0xe2,0xb0,0xb4,0x00,0x08,0xff,0xe2,0xb0,0xb5,0x00,0x10,0x08,0x08,0xff,0xe2,0xb0,
-+	0xb6,0x00,0x08,0xff,0xe2,0xb0,0xb7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,
-+	0xe2,0xb0,0xb8,0x00,0x08,0xff,0xe2,0xb0,0xb9,0x00,0x10,0x08,0x08,0xff,0xe2,0xb0,
-+	0xba,0x00,0x08,0xff,0xe2,0xb0,0xbb,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb0,
-+	0xbc,0x00,0x08,0xff,0xe2,0xb0,0xbd,0x00,0x10,0x08,0x08,0xff,0xe2,0xb0,0xbe,0x00,
-+	0x08,0xff,0xe2,0xb0,0xbf,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,
-+	0xe2,0xb1,0x80,0x00,0x08,0xff,0xe2,0xb1,0x81,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,
-+	0x82,0x00,0x08,0xff,0xe2,0xb1,0x83,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb1,
-+	0x84,0x00,0x08,0xff,0xe2,0xb1,0x85,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0x86,0x00,
-+	0x08,0xff,0xe2,0xb1,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb1,
-+	0x88,0x00,0x08,0xff,0xe2,0xb1,0x89,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0x8a,0x00,
-+	0x08,0xff,0xe2,0xb1,0x8b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb1,0x8c,0x00,
-+	0x08,0xff,0xe2,0xb1,0x8d,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0x8e,0x00,0x08,0xff,
-+	0xe2,0xb1,0x8f,0x00,0x94,0x7c,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,
-+	0xe2,0xb1,0x90,0x00,0x08,0xff,0xe2,0xb1,0x91,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,
-+	0x92,0x00,0x08,0xff,0xe2,0xb1,0x93,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb1,
-+	0x94,0x00,0x08,0xff,0xe2,0xb1,0x95,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0x96,0x00,
-+	0x08,0xff,0xe2,0xb1,0x97,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb1,
-+	0x98,0x00,0x08,0xff,0xe2,0xb1,0x99,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0x9a,0x00,
-+	0x08,0xff,0xe2,0xb1,0x9b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe2,0xb1,0x9c,0x00,
-+	0x08,0xff,0xe2,0xb1,0x9d,0x00,0x10,0x08,0x08,0xff,0xe2,0xb1,0x9e,0x00,0x00,0x00,
-+	0x08,0x00,0xcf,0x86,0xd5,0x07,0x64,0x84,0x61,0x08,0x00,0xd4,0x63,0xd3,0x32,0xd2,
-+	0x1b,0xd1,0x0c,0x10,0x08,0x09,0xff,0xe2,0xb1,0xa1,0x00,0x09,0x00,0x10,0x07,0x09,
-+	0xff,0xc9,0xab,0x00,0x09,0xff,0xe1,0xb5,0xbd,0x00,0xd1,0x0b,0x10,0x07,0x09,0xff,
-+	0xc9,0xbd,0x00,0x09,0x00,0x10,0x04,0x09,0x00,0x09,0xff,0xe2,0xb1,0xa8,0x00,0xd2,
-+	0x18,0xd1,0x0c,0x10,0x04,0x09,0x00,0x09,0xff,0xe2,0xb1,0xaa,0x00,0x10,0x04,0x09,
-+	0x00,0x09,0xff,0xe2,0xb1,0xac,0x00,0xd1,0x0b,0x10,0x04,0x09,0x00,0x0a,0xff,0xc9,
-+	0x91,0x00,0x10,0x07,0x0a,0xff,0xc9,0xb1,0x00,0x0a,0xff,0xc9,0x90,0x00,0xd3,0x27,
-+	0xd2,0x17,0xd1,0x0b,0x10,0x07,0x0b,0xff,0xc9,0x92,0x00,0x0a,0x00,0x10,0x08,0x0a,
-+	0xff,0xe2,0xb1,0xb3,0x00,0x0a,0x00,0x91,0x0c,0x10,0x04,0x09,0x00,0x09,0xff,0xe2,
-+	0xb1,0xb6,0x00,0x09,0x00,0x52,0x04,0x0a,0x00,0x51,0x04,0x0a,0x00,0x10,0x07,0x0b,
-+	0xff,0xc8,0xbf,0x00,0x0b,0xff,0xc9,0x80,0x00,0xe0,0x83,0x01,0xcf,0x86,0xd5,0xc0,
-+	0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0x81,0x00,
-+	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x83,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,
-+	0x08,0xff,0xe2,0xb2,0x85,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x87,0x00,
-+	0x08,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0x89,0x00,0x08,0x00,
-+	0x10,0x08,0x08,0xff,0xe2,0xb2,0x8b,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
-+	0xe2,0xb2,0x8d,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x8f,0x00,0x08,0x00,
-+	0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0x91,0x00,0x08,0x00,
-+	0x10,0x08,0x08,0xff,0xe2,0xb2,0x93,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
-+	0xe2,0xb2,0x95,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x97,0x00,0x08,0x00,
-+	0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0x99,0x00,0x08,0x00,0x10,0x08,
-+	0x08,0xff,0xe2,0xb2,0x9b,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,
-+	0x9d,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0x9f,0x00,0x08,0x00,0xd4,0x60,
-+	0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xa1,0x00,0x08,0x00,
-+	0x10,0x08,0x08,0xff,0xe2,0xb2,0xa3,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
-+	0xe2,0xb2,0xa5,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xa7,0x00,0x08,0x00,
-+	0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xa9,0x00,0x08,0x00,0x10,0x08,
-+	0x08,0xff,0xe2,0xb2,0xab,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,
-+	0xad,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xaf,0x00,0x08,0x00,0xd3,0x30,
-+	0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xb1,0x00,0x08,0x00,0x10,0x08,
-+	0x08,0xff,0xe2,0xb2,0xb3,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,
-+	0xb5,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xb7,0x00,0x08,0x00,0xd2,0x18,
-+	0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xb9,0x00,0x08,0x00,0x10,0x08,0x08,0xff,
-+	0xe2,0xb2,0xbb,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb2,0xbd,0x00,
-+	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb2,0xbf,0x00,0x08,0x00,0xcf,0x86,0xd5,0xc0,
-+	0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0x81,0x00,
-+	0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x83,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,
-+	0x08,0xff,0xe2,0xb3,0x85,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x87,0x00,
-+	0x08,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0x89,0x00,0x08,0x00,
-+	0x10,0x08,0x08,0xff,0xe2,0xb3,0x8b,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
-+	0xe2,0xb3,0x8d,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x8f,0x00,0x08,0x00,
-+	0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0x91,0x00,0x08,0x00,
-+	0x10,0x08,0x08,0xff,0xe2,0xb3,0x93,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,
-+	0xe2,0xb3,0x95,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x97,0x00,0x08,0x00,
-+	0xd2,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0x99,0x00,0x08,0x00,0x10,0x08,
-+	0x08,0xff,0xe2,0xb3,0x9b,0x00,0x08,0x00,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,
-+	0x9d,0x00,0x08,0x00,0x10,0x08,0x08,0xff,0xe2,0xb3,0x9f,0x00,0x08,0x00,0xd4,0x3b,
-+	0xd3,0x1c,0x92,0x18,0xd1,0x0c,0x10,0x08,0x08,0xff,0xe2,0xb3,0xa1,0x00,0x08,0x00,
-+	0x10,0x08,0x08,0xff,0xe2,0xb3,0xa3,0x00,0x08,0x00,0x08,0x00,0xd2,0x10,0x51,0x04,
-+	0x08,0x00,0x10,0x04,0x08,0x00,0x0b,0xff,0xe2,0xb3,0xac,0x00,0xe1,0xd0,0x5e,0x10,
-+	0x04,0x0b,0x00,0x0b,0xff,0xe2,0xb3,0xae,0x00,0xe3,0xd5,0x5e,0x92,0x10,0x51,0x04,
-+	0x0b,0xe6,0x10,0x08,0x0d,0xff,0xe2,0xb3,0xb3,0x00,0x0d,0x00,0x00,0x00,0xe2,0x98,
-+	0x08,0xd1,0x0b,0xe0,0x8d,0x66,0xcf,0x86,0xcf,0x06,0x01,0x00,0xe0,0xe1,0x6b,0xcf,
-+	0x86,0xe5,0xa7,0x05,0xd4,0x06,0xcf,0x06,0x04,0x00,0xd3,0x0c,0xe2,0x74,0x67,0xe1,
-+	0x0b,0x67,0xcf,0x06,0x04,0x00,0xe2,0xdb,0x01,0xe1,0x26,0x01,0xd0,0x09,0xcf,0x86,
-+	0x65,0x70,0x67,0x0a,0x00,0xcf,0x86,0xd5,0xc0,0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,
-+	0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x81,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,
-+	0x99,0x83,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x85,0x00,0x0a,
-+	0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0x87,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,
-+	0x08,0x0a,0xff,0xea,0x99,0x89,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0x8b,
-+	0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x8d,0x00,0x0a,0x00,0x10,
-+	0x08,0x0a,0xff,0xea,0x99,0x8f,0x00,0x0a,0x00,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,
-+	0x08,0x0a,0xff,0xea,0x99,0x91,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0x93,
-+	0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x95,0x00,0x0a,0x00,0x10,
-+	0x08,0x0a,0xff,0xea,0x99,0x97,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,
-+	0xff,0xea,0x99,0x99,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0x9b,0x00,0x0a,
-+	0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0x9d,0x00,0x0a,0x00,0x10,0x08,0x0a,
-+	0xff,0xea,0x99,0x9f,0x00,0x0a,0x00,0xe4,0xd9,0x66,0xd3,0x30,0xd2,0x18,0xd1,0x0c,
-+	0x10,0x08,0x0c,0xff,0xea,0x99,0xa1,0x00,0x0c,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,
-+	0xa3,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x99,0xa5,0x00,0x0a,0x00,
-+	0x10,0x08,0x0a,0xff,0xea,0x99,0xa7,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,
-+	0x0a,0xff,0xea,0x99,0xa9,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x99,0xab,0x00,
-+	0x0a,0x00,0xe1,0x88,0x66,0x10,0x08,0x0a,0xff,0xea,0x99,0xad,0x00,0x0a,0x00,0xe0,
-+	0xb1,0x66,0xcf,0x86,0x95,0xab,0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,
-+	0x0a,0xff,0xea,0x9a,0x81,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9a,0x83,0x00,
-+	0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9a,0x85,0x00,0x0a,0x00,0x10,0x08,
-+	0x0a,0xff,0xea,0x9a,0x87,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,
-+	0xea,0x9a,0x89,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9a,0x8b,0x00,0x0a,0x00,
-+	0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9a,0x8d,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,
-+	0xea,0x9a,0x8f,0x00,0x0a,0x00,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,
-+	0xea,0x9a,0x91,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9a,0x93,0x00,0x0a,0x00,
-+	0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9a,0x95,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,
-+	0xea,0x9a,0x97,0x00,0x0a,0x00,0xe2,0x0e,0x66,0xd1,0x0c,0x10,0x08,0x10,0xff,0xea,
-+	0x9a,0x99,0x00,0x10,0x00,0x10,0x08,0x10,0xff,0xea,0x9a,0x9b,0x00,0x10,0x00,0x0b,
-+	0x00,0xe1,0x10,0x02,0xd0,0xb9,0xcf,0x86,0xd5,0x07,0x64,0x1a,0x66,0x08,0x00,0xd4,
-+	0x58,0xd3,0x28,0xd2,0x10,0x51,0x04,0x09,0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xa3,
-+	0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9c,0xa5,0x00,0x0a,0x00,0x10,
-+	0x08,0x0a,0xff,0xea,0x9c,0xa7,0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,
-+	0xff,0xea,0x9c,0xa9,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xab,0x00,0x0a,
-+	0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9c,0xad,0x00,0x0a,0x00,0x10,0x08,0x0a,
-+	0xff,0xea,0x9c,0xaf,0x00,0x0a,0x00,0xd3,0x28,0xd2,0x10,0x51,0x04,0x0a,0x00,0x10,
-+	0x08,0x0a,0xff,0xea,0x9c,0xb3,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,
-+	0x9c,0xb5,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xb7,0x00,0x0a,0x00,0xd2,
-+	0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9c,0xb9,0x00,0x0a,0x00,0x10,0x08,0x0a,
-+	0xff,0xea,0x9c,0xbb,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9c,0xbd,
-+	0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9c,0xbf,0x00,0x0a,0x00,0xcf,0x86,0xd5,
-+	0xc0,0xd4,0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0x81,
-+	0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x83,0x00,0x0a,0x00,0xd1,0x0c,0x10,
-+	0x08,0x0a,0xff,0xea,0x9d,0x85,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x87,
-+	0x00,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0x89,0x00,0x0a,
-+	0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x8b,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,
-+	0xff,0xea,0x9d,0x8d,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x8f,0x00,0x0a,
-+	0x00,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0x91,0x00,0x0a,
-+	0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x93,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,
-+	0xff,0xea,0x9d,0x95,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x97,0x00,0x0a,
-+	0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0x99,0x00,0x0a,0x00,0x10,
-+	0x08,0x0a,0xff,0xea,0x9d,0x9b,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,
-+	0x9d,0x9d,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0x9f,0x00,0x0a,0x00,0xd4,
-+	0x60,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0xa1,0x00,0x0a,
-+	0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xa3,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,
-+	0xff,0xea,0x9d,0xa5,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xa7,0x00,0x0a,
-+	0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9d,0xa9,0x00,0x0a,0x00,0x10,
-+	0x08,0x0a,0xff,0xea,0x9d,0xab,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,
-+	0x9d,0xad,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xaf,0x00,0x0a,0x00,0x53,
-+	0x04,0x0a,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x04,0x0a,0x00,0x0a,0xff,0xea,0x9d,0xba,
-+	0x00,0x10,0x04,0x0a,0x00,0x0a,0xff,0xea,0x9d,0xbc,0x00,0xd1,0x0c,0x10,0x04,0x0a,
-+	0x00,0x0a,0xff,0xe1,0xb5,0xb9,0x00,0x10,0x08,0x0a,0xff,0xea,0x9d,0xbf,0x00,0x0a,
-+	0x00,0xe0,0x71,0x01,0xcf,0x86,0xd5,0xa6,0xd4,0x4e,0xd3,0x30,0xd2,0x18,0xd1,0x0c,
-+	0x10,0x08,0x0a,0xff,0xea,0x9e,0x81,0x00,0x0a,0x00,0x10,0x08,0x0a,0xff,0xea,0x9e,
-+	0x83,0x00,0x0a,0x00,0xd1,0x0c,0x10,0x08,0x0a,0xff,0xea,0x9e,0x85,0x00,0x0a,0x00,
-+	0x10,0x08,0x0a,0xff,0xea,0x9e,0x87,0x00,0x0a,0x00,0xd2,0x10,0x51,0x04,0x0a,0x00,
-+	0x10,0x04,0x0a,0x00,0x0a,0xff,0xea,0x9e,0x8c,0x00,0xe1,0x16,0x64,0x10,0x04,0x0a,
-+	0x00,0x0c,0xff,0xc9,0xa5,0x00,0xd3,0x28,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0c,0xff,
-+	0xea,0x9e,0x91,0x00,0x0c,0x00,0x10,0x08,0x0d,0xff,0xea,0x9e,0x93,0x00,0x0d,0x00,
-+	0x51,0x04,0x10,0x00,0x10,0x08,0x10,0xff,0xea,0x9e,0x97,0x00,0x10,0x00,0xd2,0x18,
-+	0xd1,0x0c,0x10,0x08,0x10,0xff,0xea,0x9e,0x99,0x00,0x10,0x00,0x10,0x08,0x10,0xff,
-+	0xea,0x9e,0x9b,0x00,0x10,0x00,0xd1,0x0c,0x10,0x08,0x10,0xff,0xea,0x9e,0x9d,0x00,
-+	0x10,0x00,0x10,0x08,0x10,0xff,0xea,0x9e,0x9f,0x00,0x10,0x00,0xd4,0x63,0xd3,0x30,
-+	0xd2,0x18,0xd1,0x0c,0x10,0x08,0x0c,0xff,0xea,0x9e,0xa1,0x00,0x0c,0x00,0x10,0x08,
-+	0x0c,0xff,0xea,0x9e,0xa3,0x00,0x0c,0x00,0xd1,0x0c,0x10,0x08,0x0c,0xff,0xea,0x9e,
-+	0xa5,0x00,0x0c,0x00,0x10,0x08,0x0c,0xff,0xea,0x9e,0xa7,0x00,0x0c,0x00,0xd2,0x1a,
-+	0xd1,0x0c,0x10,0x08,0x0c,0xff,0xea,0x9e,0xa9,0x00,0x0c,0x00,0x10,0x07,0x0d,0xff,
-+	0xc9,0xa6,0x00,0x10,0xff,0xc9,0x9c,0x00,0xd1,0x0e,0x10,0x07,0x10,0xff,0xc9,0xa1,
-+	0x00,0x10,0xff,0xc9,0xac,0x00,0x10,0x07,0x12,0xff,0xc9,0xaa,0x00,0x14,0x00,0xd3,
-+	0x35,0xd2,0x1d,0xd1,0x0e,0x10,0x07,0x10,0xff,0xca,0x9e,0x00,0x10,0xff,0xca,0x87,
-+	0x00,0x10,0x07,0x11,0xff,0xca,0x9d,0x00,0x11,0xff,0xea,0xad,0x93,0x00,0xd1,0x0c,
-+	0x10,0x08,0x11,0xff,0xea,0x9e,0xb5,0x00,0x11,0x00,0x10,0x08,0x11,0xff,0xea,0x9e,
-+	0xb7,0x00,0x11,0x00,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x14,0xff,0xea,0x9e,0xb9,0x00,
-+	0x14,0x00,0x10,0x08,0x15,0xff,0xea,0x9e,0xbb,0x00,0x15,0x00,0xd1,0x0c,0x10,0x08,
-+	0x15,0xff,0xea,0x9e,0xbd,0x00,0x15,0x00,0x10,0x08,0x15,0xff,0xea,0x9e,0xbf,0x00,
-+	0x15,0x00,0xcf,0x86,0xe5,0x50,0x63,0x94,0x2f,0x93,0x2b,0xd2,0x10,0x51,0x04,0x00,
-+	0x00,0x10,0x08,0x15,0xff,0xea,0x9f,0x83,0x00,0x15,0x00,0xd1,0x0f,0x10,0x08,0x15,
-+	0xff,0xea,0x9e,0x94,0x00,0x15,0xff,0xca,0x82,0x00,0x10,0x08,0x15,0xff,0xe1,0xb6,
-+	0x8e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe4,0x30,0x66,0xd3,0x1d,0xe2,0xd7,0x63,
-+	0xe1,0x86,0x63,0xe0,0x73,0x63,0xcf,0x86,0xe5,0x54,0x63,0x94,0x0b,0x93,0x07,0x62,
-+	0x3f,0x63,0x08,0x00,0x08,0x00,0x08,0x00,0xd2,0x0f,0xe1,0xd6,0x64,0xe0,0xa3,0x64,
-+	0xcf,0x86,0x65,0x88,0x64,0x0a,0x00,0xd1,0xab,0xd0,0x1a,0xcf,0x86,0xe5,0x93,0x65,
-+	0xe4,0x76,0x65,0xe3,0x5d,0x65,0xe2,0x50,0x65,0x91,0x08,0x10,0x04,0x00,0x00,0x0c,
-+	0x00,0x0c,0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0xd4,0x0b,0x93,0x07,0x62,0xa3,0x65,
-+	0x11,0x00,0x00,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,
-+	0xa0,0x00,0x11,0xff,0xe1,0x8e,0xa1,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,0xa2,0x00,
-+	0x11,0xff,0xe1,0x8e,0xa3,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,0xa4,0x00,
-+	0x11,0xff,0xe1,0x8e,0xa5,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,0xa6,0x00,0x11,0xff,
-+	0xe1,0x8e,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,0xa8,0x00,
-+	0x11,0xff,0xe1,0x8e,0xa9,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,0xaa,0x00,0x11,0xff,
-+	0xe1,0x8e,0xab,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,0xac,0x00,0x11,0xff,
-+	0xe1,0x8e,0xad,0x00,0x10,0x08,0x11,0xff,0xe1,0x8e,0xae,0x00,0x11,0xff,0xe1,0x8e,
-+	0xaf,0x00,0xe0,0x2e,0x65,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,
-+	0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8e,0xb0,0x00,0x11,0xff,0xe1,0x8e,0xb1,0x00,
-+	0x10,0x08,0x11,0xff,0xe1,0x8e,0xb2,0x00,0x11,0xff,0xe1,0x8e,0xb3,0x00,0xd1,0x10,
-+	0x10,0x08,0x11,0xff,0xe1,0x8e,0xb4,0x00,0x11,0xff,0xe1,0x8e,0xb5,0x00,0x10,0x08,
-+	0x11,0xff,0xe1,0x8e,0xb6,0x00,0x11,0xff,0xe1,0x8e,0xb7,0x00,0xd2,0x20,0xd1,0x10,
-+	0x10,0x08,0x11,0xff,0xe1,0x8e,0xb8,0x00,0x11,0xff,0xe1,0x8e,0xb9,0x00,0x10,0x08,
-+	0x11,0xff,0xe1,0x8e,0xba,0x00,0x11,0xff,0xe1,0x8e,0xbb,0x00,0xd1,0x10,0x10,0x08,
-+	0x11,0xff,0xe1,0x8e,0xbc,0x00,0x11,0xff,0xe1,0x8e,0xbd,0x00,0x10,0x08,0x11,0xff,
-+	0xe1,0x8e,0xbe,0x00,0x11,0xff,0xe1,0x8e,0xbf,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,
-+	0x10,0x08,0x11,0xff,0xe1,0x8f,0x80,0x00,0x11,0xff,0xe1,0x8f,0x81,0x00,0x10,0x08,
-+	0x11,0xff,0xe1,0x8f,0x82,0x00,0x11,0xff,0xe1,0x8f,0x83,0x00,0xd1,0x10,0x10,0x08,
-+	0x11,0xff,0xe1,0x8f,0x84,0x00,0x11,0xff,0xe1,0x8f,0x85,0x00,0x10,0x08,0x11,0xff,
-+	0xe1,0x8f,0x86,0x00,0x11,0xff,0xe1,0x8f,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
-+	0x11,0xff,0xe1,0x8f,0x88,0x00,0x11,0xff,0xe1,0x8f,0x89,0x00,0x10,0x08,0x11,0xff,
-+	0xe1,0x8f,0x8a,0x00,0x11,0xff,0xe1,0x8f,0x8b,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,
-+	0xe1,0x8f,0x8c,0x00,0x11,0xff,0xe1,0x8f,0x8d,0x00,0x10,0x08,0x11,0xff,0xe1,0x8f,
-+	0x8e,0x00,0x11,0xff,0xe1,0x8f,0x8f,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,
-+	0x10,0x08,0x11,0xff,0xe1,0x8f,0x90,0x00,0x11,0xff,0xe1,0x8f,0x91,0x00,0x10,0x08,
-+	0x11,0xff,0xe1,0x8f,0x92,0x00,0x11,0xff,0xe1,0x8f,0x93,0x00,0xd1,0x10,0x10,0x08,
-+	0x11,0xff,0xe1,0x8f,0x94,0x00,0x11,0xff,0xe1,0x8f,0x95,0x00,0x10,0x08,0x11,0xff,
-+	0xe1,0x8f,0x96,0x00,0x11,0xff,0xe1,0x8f,0x97,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
-+	0x11,0xff,0xe1,0x8f,0x98,0x00,0x11,0xff,0xe1,0x8f,0x99,0x00,0x10,0x08,0x11,0xff,
-+	0xe1,0x8f,0x9a,0x00,0x11,0xff,0xe1,0x8f,0x9b,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,
-+	0xe1,0x8f,0x9c,0x00,0x11,0xff,0xe1,0x8f,0x9d,0x00,0x10,0x08,0x11,0xff,0xe1,0x8f,
-+	0x9e,0x00,0x11,0xff,0xe1,0x8f,0x9f,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
-+	0x11,0xff,0xe1,0x8f,0xa0,0x00,0x11,0xff,0xe1,0x8f,0xa1,0x00,0x10,0x08,0x11,0xff,
-+	0xe1,0x8f,0xa2,0x00,0x11,0xff,0xe1,0x8f,0xa3,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,
-+	0xe1,0x8f,0xa4,0x00,0x11,0xff,0xe1,0x8f,0xa5,0x00,0x10,0x08,0x11,0xff,0xe1,0x8f,
-+	0xa6,0x00,0x11,0xff,0xe1,0x8f,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x11,0xff,
-+	0xe1,0x8f,0xa8,0x00,0x11,0xff,0xe1,0x8f,0xa9,0x00,0x10,0x08,0x11,0xff,0xe1,0x8f,
-+	0xaa,0x00,0x11,0xff,0xe1,0x8f,0xab,0x00,0xd1,0x10,0x10,0x08,0x11,0xff,0xe1,0x8f,
-+	0xac,0x00,0x11,0xff,0xe1,0x8f,0xad,0x00,0x10,0x08,0x11,0xff,0xe1,0x8f,0xae,0x00,
-+	0x11,0xff,0xe1,0x8f,0xaf,0x00,0xd1,0x0c,0xe0,0x67,0x63,0xcf,0x86,0xcf,0x06,0x02,
-+	0xff,0xff,0xd0,0x08,0xcf,0x86,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,
-+	0x01,0x00,0xd4,0xae,0xd3,0x09,0xe2,0xd0,0x63,0xcf,0x06,0x01,0x00,0xd2,0x27,0xe1,
-+	0x9b,0x6f,0xe0,0xa2,0x6d,0xcf,0x86,0xe5,0xbb,0x6c,0xe4,0x4a,0x6c,0xe3,0x15,0x6c,
-+	0xe2,0xf4,0x6b,0xe1,0xe3,0x6b,0x10,0x08,0x01,0xff,0xe5,0x88,0x87,0x00,0x01,0xff,
-+	0xe5,0xba,0xa6,0x00,0xe1,0xf0,0x73,0xe0,0x64,0x73,0xcf,0x86,0xe5,0x9e,0x72,0xd4,
-+	0x3b,0x93,0x37,0xd2,0x1d,0xd1,0x0e,0x10,0x07,0x01,0xff,0x66,0x66,0x00,0x01,0xff,
-+	0x66,0x69,0x00,0x10,0x07,0x01,0xff,0x66,0x6c,0x00,0x01,0xff,0x66,0x66,0x69,0x00,
-+	0xd1,0x0f,0x10,0x08,0x01,0xff,0x66,0x66,0x6c,0x00,0x01,0xff,0x73,0x74,0x00,0x10,
-+	0x07,0x01,0xff,0x73,0x74,0x00,0x00,0x00,0x00,0x00,0xe3,0x44,0x72,0xd2,0x11,0x51,
-+	0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xd5,0xb4,0xd5,0xb6,0x00,0xd1,0x12,
-+	0x10,0x09,0x01,0xff,0xd5,0xb4,0xd5,0xa5,0x00,0x01,0xff,0xd5,0xb4,0xd5,0xab,0x00,
-+	0x10,0x09,0x01,0xff,0xd5,0xbe,0xd5,0xb6,0x00,0x01,0xff,0xd5,0xb4,0xd5,0xad,0x00,
-+	0xd3,0x09,0xe2,0xbc,0x73,0xcf,0x06,0x01,0x00,0xd2,0x12,0xe1,0xab,0x74,0xe0,0x3c,
-+	0x74,0xcf,0x86,0xe5,0x19,0x74,0x64,0x08,0x74,0x06,0x00,0xe1,0x11,0x75,0xe0,0xde,
-+	0x74,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,
-+	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x7c,0xd3,0x3c,0xd2,
-+	0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0xef,0xbd,0x81,0x00,0x10,0x08,0x01,
-+	0xff,0xef,0xbd,0x82,0x00,0x01,0xff,0xef,0xbd,0x83,0x00,0xd1,0x10,0x10,0x08,0x01,
-+	0xff,0xef,0xbd,0x84,0x00,0x01,0xff,0xef,0xbd,0x85,0x00,0x10,0x08,0x01,0xff,0xef,
-+	0xbd,0x86,0x00,0x01,0xff,0xef,0xbd,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
-+	0xff,0xef,0xbd,0x88,0x00,0x01,0xff,0xef,0xbd,0x89,0x00,0x10,0x08,0x01,0xff,0xef,
-+	0xbd,0x8a,0x00,0x01,0xff,0xef,0xbd,0x8b,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xef,
-+	0xbd,0x8c,0x00,0x01,0xff,0xef,0xbd,0x8d,0x00,0x10,0x08,0x01,0xff,0xef,0xbd,0x8e,
-+	0x00,0x01,0xff,0xef,0xbd,0x8f,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
-+	0xff,0xef,0xbd,0x90,0x00,0x01,0xff,0xef,0xbd,0x91,0x00,0x10,0x08,0x01,0xff,0xef,
-+	0xbd,0x92,0x00,0x01,0xff,0xef,0xbd,0x93,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xef,
-+	0xbd,0x94,0x00,0x01,0xff,0xef,0xbd,0x95,0x00,0x10,0x08,0x01,0xff,0xef,0xbd,0x96,
-+	0x00,0x01,0xff,0xef,0xbd,0x97,0x00,0x92,0x1c,0xd1,0x10,0x10,0x08,0x01,0xff,0xef,
-+	0xbd,0x98,0x00,0x01,0xff,0xef,0xbd,0x99,0x00,0x10,0x08,0x01,0xff,0xef,0xbd,0x9a,
-+	0x00,0x01,0x00,0x01,0x00,0x83,0xe2,0xd9,0xb2,0xe1,0xc3,0xaf,0xe0,0x40,0xae,0xcf,
-+	0x86,0xe5,0xe4,0x9a,0xc4,0xe3,0xc1,0x07,0xe2,0x62,0x06,0xe1,0x79,0x85,0xe0,0x09,
-+	0x05,0xcf,0x86,0xe5,0xfb,0x02,0xd4,0x1c,0xe3,0xe7,0x75,0xe2,0x3e,0x75,0xe1,0x19,
-+	0x75,0xe0,0xf2,0x74,0xcf,0x86,0xe5,0xbf,0x74,0x94,0x07,0x63,0xaa,0x74,0x07,0x00,
-+	0x07,0x00,0xe3,0x93,0x77,0xe2,0x58,0x77,0xe1,0x77,0x01,0xe0,0xf0,0x76,0xcf,0x86,
-+	0xe5,0x21,0x01,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,
-+	0x90,0x90,0xa8,0x00,0x05,0xff,0xf0,0x90,0x90,0xa9,0x00,0x10,0x09,0x05,0xff,0xf0,
-+	0x90,0x90,0xaa,0x00,0x05,0xff,0xf0,0x90,0x90,0xab,0x00,0xd1,0x12,0x10,0x09,0x05,
-+	0xff,0xf0,0x90,0x90,0xac,0x00,0x05,0xff,0xf0,0x90,0x90,0xad,0x00,0x10,0x09,0x05,
-+	0xff,0xf0,0x90,0x90,0xae,0x00,0x05,0xff,0xf0,0x90,0x90,0xaf,0x00,0xd2,0x24,0xd1,
-+	0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xb0,0x00,0x05,0xff,0xf0,0x90,0x90,0xb1,
-+	0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xb2,0x00,0x05,0xff,0xf0,0x90,0x90,0xb3,
-+	0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xb4,0x00,0x05,0xff,0xf0,0x90,
-+	0x90,0xb5,0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,0xb6,0x00,0x05,0xff,0xf0,0x90,
-+	0x90,0xb7,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,
-+	0xb8,0x00,0x05,0xff,0xf0,0x90,0x90,0xb9,0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x90,
-+	0xba,0x00,0x05,0xff,0xf0,0x90,0x90,0xbb,0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,
-+	0x90,0x90,0xbc,0x00,0x05,0xff,0xf0,0x90,0x90,0xbd,0x00,0x10,0x09,0x05,0xff,0xf0,
-+	0x90,0x90,0xbe,0x00,0x05,0xff,0xf0,0x90,0x90,0xbf,0x00,0xd2,0x24,0xd1,0x12,0x10,
-+	0x09,0x05,0xff,0xf0,0x90,0x91,0x80,0x00,0x05,0xff,0xf0,0x90,0x91,0x81,0x00,0x10,
-+	0x09,0x05,0xff,0xf0,0x90,0x91,0x82,0x00,0x05,0xff,0xf0,0x90,0x91,0x83,0x00,0xd1,
-+	0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x91,0x84,0x00,0x05,0xff,0xf0,0x90,0x91,0x85,
-+	0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x91,0x86,0x00,0x05,0xff,0xf0,0x90,0x91,0x87,
-+	0x00,0x94,0x4c,0x93,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,0x90,0x91,
-+	0x88,0x00,0x05,0xff,0xf0,0x90,0x91,0x89,0x00,0x10,0x09,0x05,0xff,0xf0,0x90,0x91,
-+	0x8a,0x00,0x05,0xff,0xf0,0x90,0x91,0x8b,0x00,0xd1,0x12,0x10,0x09,0x05,0xff,0xf0,
-+	0x90,0x91,0x8c,0x00,0x05,0xff,0xf0,0x90,0x91,0x8d,0x00,0x10,0x09,0x07,0xff,0xf0,
-+	0x90,0x91,0x8e,0x00,0x07,0xff,0xf0,0x90,0x91,0x8f,0x00,0x05,0x00,0x05,0x00,0xd0,
-+	0xa0,0xcf,0x86,0xd5,0x07,0x64,0x98,0x75,0x07,0x00,0xd4,0x07,0x63,0xa5,0x75,0x07,
-+	0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0x98,0x00,
-+	0x12,0xff,0xf0,0x90,0x93,0x99,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0x9a,0x00,
-+	0x12,0xff,0xf0,0x90,0x93,0x9b,0x00,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,
-+	0x9c,0x00,0x12,0xff,0xf0,0x90,0x93,0x9d,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,
-+	0x9e,0x00,0x12,0xff,0xf0,0x90,0x93,0x9f,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,
-+	0xff,0xf0,0x90,0x93,0xa0,0x00,0x12,0xff,0xf0,0x90,0x93,0xa1,0x00,0x10,0x09,0x12,
-+	0xff,0xf0,0x90,0x93,0xa2,0x00,0x12,0xff,0xf0,0x90,0x93,0xa3,0x00,0xd1,0x12,0x10,
-+	0x09,0x12,0xff,0xf0,0x90,0x93,0xa4,0x00,0x12,0xff,0xf0,0x90,0x93,0xa5,0x00,0x10,
-+	0x09,0x12,0xff,0xf0,0x90,0x93,0xa6,0x00,0x12,0xff,0xf0,0x90,0x93,0xa7,0x00,0xcf,
-+	0x86,0xe5,0x2e,0x75,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,
-+	0xf0,0x90,0x93,0xa8,0x00,0x12,0xff,0xf0,0x90,0x93,0xa9,0x00,0x10,0x09,0x12,0xff,
-+	0xf0,0x90,0x93,0xaa,0x00,0x12,0xff,0xf0,0x90,0x93,0xab,0x00,0xd1,0x12,0x10,0x09,
-+	0x12,0xff,0xf0,0x90,0x93,0xac,0x00,0x12,0xff,0xf0,0x90,0x93,0xad,0x00,0x10,0x09,
-+	0x12,0xff,0xf0,0x90,0x93,0xae,0x00,0x12,0xff,0xf0,0x90,0x93,0xaf,0x00,0xd2,0x24,
-+	0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xb0,0x00,0x12,0xff,0xf0,0x90,0x93,
-+	0xb1,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xb2,0x00,0x12,0xff,0xf0,0x90,0x93,
-+	0xb3,0x00,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xb4,0x00,0x12,0xff,0xf0,
-+	0x90,0x93,0xb5,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,0x93,0xb6,0x00,0x12,0xff,0xf0,
-+	0x90,0x93,0xb7,0x00,0x93,0x28,0x92,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x90,
-+	0x93,0xb8,0x00,0x12,0xff,0xf0,0x90,0x93,0xb9,0x00,0x10,0x09,0x12,0xff,0xf0,0x90,
-+	0x93,0xba,0x00,0x12,0xff,0xf0,0x90,0x93,0xbb,0x00,0x00,0x00,0x12,0x00,0xd4,0x1f,
-+	0xe3,0x47,0x76,0xe2,0xd2,0x75,0xe1,0x71,0x75,0xe0,0x52,0x75,0xcf,0x86,0xe5,0x1f,
-+	0x75,0x94,0x0a,0xe3,0x0a,0x75,0x62,0x01,0x75,0x07,0x00,0x07,0x00,0xe3,0x46,0x78,
-+	0xe2,0x17,0x78,0xd1,0x09,0xe0,0xb4,0x77,0xcf,0x06,0x0b,0x00,0xe0,0xe7,0x77,0xcf,
-+	0x86,0xe5,0x21,0x01,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x11,0xff,
-+	0xf0,0x90,0xb3,0x80,0x00,0x11,0xff,0xf0,0x90,0xb3,0x81,0x00,0x10,0x09,0x11,0xff,
-+	0xf0,0x90,0xb3,0x82,0x00,0x11,0xff,0xf0,0x90,0xb3,0x83,0x00,0xd1,0x12,0x10,0x09,
-+	0x11,0xff,0xf0,0x90,0xb3,0x84,0x00,0x11,0xff,0xf0,0x90,0xb3,0x85,0x00,0x10,0x09,
-+	0x11,0xff,0xf0,0x90,0xb3,0x86,0x00,0x11,0xff,0xf0,0x90,0xb3,0x87,0x00,0xd2,0x24,
-+	0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x88,0x00,0x11,0xff,0xf0,0x90,0xb3,
-+	0x89,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x8a,0x00,0x11,0xff,0xf0,0x90,0xb3,
-+	0x8b,0x00,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x8c,0x00,0x11,0xff,0xf0,
-+	0x90,0xb3,0x8d,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x8e,0x00,0x11,0xff,0xf0,
-+	0x90,0xb3,0x8f,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,
-+	0xb3,0x90,0x00,0x11,0xff,0xf0,0x90,0xb3,0x91,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,
-+	0xb3,0x92,0x00,0x11,0xff,0xf0,0x90,0xb3,0x93,0x00,0xd1,0x12,0x10,0x09,0x11,0xff,
-+	0xf0,0x90,0xb3,0x94,0x00,0x11,0xff,0xf0,0x90,0xb3,0x95,0x00,0x10,0x09,0x11,0xff,
-+	0xf0,0x90,0xb3,0x96,0x00,0x11,0xff,0xf0,0x90,0xb3,0x97,0x00,0xd2,0x24,0xd1,0x12,
-+	0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x98,0x00,0x11,0xff,0xf0,0x90,0xb3,0x99,0x00,
-+	0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x9a,0x00,0x11,0xff,0xf0,0x90,0xb3,0x9b,0x00,
-+	0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x9c,0x00,0x11,0xff,0xf0,0x90,0xb3,
-+	0x9d,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0x9e,0x00,0x11,0xff,0xf0,0x90,0xb3,
-+	0x9f,0x00,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,
-+	0xb3,0xa0,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa1,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,
-+	0xb3,0xa2,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa3,0x00,0xd1,0x12,0x10,0x09,0x11,0xff,
-+	0xf0,0x90,0xb3,0xa4,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa5,0x00,0x10,0x09,0x11,0xff,
-+	0xf0,0x90,0xb3,0xa6,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa7,0x00,0xd2,0x24,0xd1,0x12,
-+	0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xa8,0x00,0x11,0xff,0xf0,0x90,0xb3,0xa9,0x00,
-+	0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xaa,0x00,0x11,0xff,0xf0,0x90,0xb3,0xab,0x00,
-+	0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xac,0x00,0x11,0xff,0xf0,0x90,0xb3,
-+	0xad,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xae,0x00,0x11,0xff,0xf0,0x90,0xb3,
-+	0xaf,0x00,0x93,0x23,0x92,0x1f,0xd1,0x12,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xb0,
-+	0x00,0x11,0xff,0xf0,0x90,0xb3,0xb1,0x00,0x10,0x09,0x11,0xff,0xf0,0x90,0xb3,0xb2,
-+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x15,0xe4,0xf9,0x7a,0xe3,0x03,
-+	0x79,0xe2,0xfc,0x77,0xe1,0x4c,0x77,0xe0,0x05,0x77,0xcf,0x06,0x0c,0x00,0xe4,0x53,
-+	0x7e,0xe3,0xac,0x7d,0xe2,0x55,0x7d,0xd1,0x0c,0xe0,0x1a,0x7d,0xcf,0x86,0x65,0xfb,
-+	0x7c,0x14,0x00,0xe0,0x1e,0x7d,0xcf,0x86,0x55,0x04,0x00,0x00,0xd4,0x90,0xd3,0x48,
-+	0xd2,0x24,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x80,0x00,0x10,0xff,0xf0,
-+	0x91,0xa3,0x81,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x82,0x00,0x10,0xff,0xf0,
-+	0x91,0xa3,0x83,0x00,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x84,0x00,0x10,
-+	0xff,0xf0,0x91,0xa3,0x85,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x86,0x00,0x10,
-+	0xff,0xf0,0x91,0xa3,0x87,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,
-+	0xa3,0x88,0x00,0x10,0xff,0xf0,0x91,0xa3,0x89,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,
-+	0xa3,0x8a,0x00,0x10,0xff,0xf0,0x91,0xa3,0x8b,0x00,0xd1,0x12,0x10,0x09,0x10,0xff,
-+	0xf0,0x91,0xa3,0x8c,0x00,0x10,0xff,0xf0,0x91,0xa3,0x8d,0x00,0x10,0x09,0x10,0xff,
-+	0xf0,0x91,0xa3,0x8e,0x00,0x10,0xff,0xf0,0x91,0xa3,0x8f,0x00,0xd3,0x48,0xd2,0x24,
-+	0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x90,0x00,0x10,0xff,0xf0,0x91,0xa3,
-+	0x91,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x92,0x00,0x10,0xff,0xf0,0x91,0xa3,
-+	0x93,0x00,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x94,0x00,0x10,0xff,0xf0,
-+	0x91,0xa3,0x95,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x96,0x00,0x10,0xff,0xf0,
-+	0x91,0xa3,0x97,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x98,
-+	0x00,0x10,0xff,0xf0,0x91,0xa3,0x99,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,0xa3,0x9a,
-+	0x00,0x10,0xff,0xf0,0x91,0xa3,0x9b,0x00,0xd1,0x12,0x10,0x09,0x10,0xff,0xf0,0x91,
-+	0xa3,0x9c,0x00,0x10,0xff,0xf0,0x91,0xa3,0x9d,0x00,0x10,0x09,0x10,0xff,0xf0,0x91,
-+	0xa3,0x9e,0x00,0x10,0xff,0xf0,0x91,0xa3,0x9f,0x00,0xd1,0x11,0xe0,0x7a,0x80,0xcf,
-+	0x86,0xe5,0x71,0x80,0xe4,0x3a,0x80,0xcf,0x06,0x00,0x00,0xe0,0x43,0x82,0xcf,0x86,
-+	0xd5,0x06,0xcf,0x06,0x00,0x00,0xd4,0x09,0xe3,0x78,0x80,0xcf,0x06,0x0c,0x00,0xd3,
-+	0x06,0xcf,0x06,0x00,0x00,0xe2,0xa3,0x81,0xe1,0x7e,0x81,0xd0,0x06,0xcf,0x06,0x00,
-+	0x00,0xcf,0x86,0xa5,0x21,0x01,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,
-+	0x14,0xff,0xf0,0x96,0xb9,0xa0,0x00,0x14,0xff,0xf0,0x96,0xb9,0xa1,0x00,0x10,0x09,
-+	0x14,0xff,0xf0,0x96,0xb9,0xa2,0x00,0x14,0xff,0xf0,0x96,0xb9,0xa3,0x00,0xd1,0x12,
-+	0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xa4,0x00,0x14,0xff,0xf0,0x96,0xb9,0xa5,0x00,
-+	0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xa6,0x00,0x14,0xff,0xf0,0x96,0xb9,0xa7,0x00,
-+	0xd2,0x24,0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xa8,0x00,0x14,0xff,0xf0,
-+	0x96,0xb9,0xa9,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xaa,0x00,0x14,0xff,0xf0,
-+	0x96,0xb9,0xab,0x00,0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xac,0x00,0x14,
-+	0xff,0xf0,0x96,0xb9,0xad,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xae,0x00,0x14,
-+	0xff,0xf0,0x96,0xb9,0xaf,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x14,0xff,
-+	0xf0,0x96,0xb9,0xb0,0x00,0x14,0xff,0xf0,0x96,0xb9,0xb1,0x00,0x10,0x09,0x14,0xff,
-+	0xf0,0x96,0xb9,0xb2,0x00,0x14,0xff,0xf0,0x96,0xb9,0xb3,0x00,0xd1,0x12,0x10,0x09,
-+	0x14,0xff,0xf0,0x96,0xb9,0xb4,0x00,0x14,0xff,0xf0,0x96,0xb9,0xb5,0x00,0x10,0x09,
-+	0x14,0xff,0xf0,0x96,0xb9,0xb6,0x00,0x14,0xff,0xf0,0x96,0xb9,0xb7,0x00,0xd2,0x24,
-+	0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xb8,0x00,0x14,0xff,0xf0,0x96,0xb9,
-+	0xb9,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xba,0x00,0x14,0xff,0xf0,0x96,0xb9,
-+	0xbb,0x00,0xd1,0x12,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xbc,0x00,0x14,0xff,0xf0,
-+	0x96,0xb9,0xbd,0x00,0x10,0x09,0x14,0xff,0xf0,0x96,0xb9,0xbe,0x00,0x14,0xff,0xf0,
-+	0x96,0xb9,0xbf,0x00,0x14,0x00,0xd2,0x14,0xe1,0x8d,0x81,0xe0,0x84,0x81,0xcf,0x86,
-+	0xe5,0x45,0x81,0xe4,0x02,0x81,0xcf,0x06,0x12,0x00,0xd1,0x0b,0xe0,0xb8,0x82,0xcf,
-+	0x86,0xcf,0x06,0x00,0x00,0xe0,0xf8,0x8a,0xcf,0x86,0xd5,0x22,0xe4,0x33,0x88,0xe3,
-+	0xf6,0x87,0xe2,0x9b,0x87,0xe1,0x94,0x87,0xe0,0x8d,0x87,0xcf,0x86,0xe5,0x5e,0x87,
-+	0xe4,0x45,0x87,0x93,0x07,0x62,0x34,0x87,0x12,0xe6,0x12,0xe6,0xe4,0x99,0x88,0xe3,
-+	0x92,0x88,0xd2,0x09,0xe1,0x1b,0x88,0xcf,0x06,0x10,0x00,0xe1,0x82,0x88,0xe0,0x4f,
-+	0x88,0xcf,0x86,0xe5,0x21,0x01,0xd4,0x90,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,
-+	0x12,0xff,0xf0,0x9e,0xa4,0xa2,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xa3,0x00,0x10,0x09,
-+	0x12,0xff,0xf0,0x9e,0xa4,0xa4,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xa5,0x00,0xd1,0x12,
-+	0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xa6,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xa7,0x00,
-+	0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xa8,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xa9,0x00,
-+	0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xaa,0x00,0x12,0xff,0xf0,
-+	0x9e,0xa4,0xab,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xac,0x00,0x12,0xff,0xf0,
-+	0x9e,0xa4,0xad,0x00,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xae,0x00,0x12,
-+	0xff,0xf0,0x9e,0xa4,0xaf,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xb0,0x00,0x12,
-+	0xff,0xf0,0x9e,0xa4,0xb1,0x00,0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x12,0xff,
-+	0xf0,0x9e,0xa4,0xb2,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb3,0x00,0x10,0x09,0x12,0xff,
-+	0xf0,0x9e,0xa4,0xb4,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb5,0x00,0xd1,0x12,0x10,0x09,
-+	0x12,0xff,0xf0,0x9e,0xa4,0xb6,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb7,0x00,0x10,0x09,
-+	0x12,0xff,0xf0,0x9e,0xa4,0xb8,0x00,0x12,0xff,0xf0,0x9e,0xa4,0xb9,0x00,0xd2,0x24,
-+	0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xba,0x00,0x12,0xff,0xf0,0x9e,0xa4,
-+	0xbb,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xbc,0x00,0x12,0xff,0xf0,0x9e,0xa4,
-+	0xbd,0x00,0xd1,0x12,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa4,0xbe,0x00,0x12,0xff,0xf0,
-+	0x9e,0xa4,0xbf,0x00,0x10,0x09,0x12,0xff,0xf0,0x9e,0xa5,0x80,0x00,0x12,0xff,0xf0,
-+	0x9e,0xa5,0x81,0x00,0x94,0x1e,0x93,0x1a,0x92,0x16,0x91,0x12,0x10,0x09,0x12,0xff,
-+	0xf0,0x9e,0xa5,0x82,0x00,0x12,0xff,0xf0,0x9e,0xa5,0x83,0x00,0x12,0x00,0x12,0x00,
-+	0x12,0x00,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-+	/* nfdi_c0100 */
-+	0x57,0x04,0x01,0x00,0xc6,0xe5,0x91,0x13,0xe4,0x27,0x0c,0xe3,0x61,0x07,0xe2,0xda,
-+	0x01,0xc1,0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0xe4,0xd4,0x7c,0xd3,0x3c,
-+	0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0x80,0x00,0x01,0xff,0x41,0xcc,
-+	0x81,0x00,0x10,0x08,0x01,0xff,0x41,0xcc,0x82,0x00,0x01,0xff,0x41,0xcc,0x83,0x00,
-+	0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0x88,0x00,0x01,0xff,0x41,0xcc,0x8a,0x00,
-+	0x10,0x04,0x01,0x00,0x01,0xff,0x43,0xcc,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
-+	0x01,0xff,0x45,0xcc,0x80,0x00,0x01,0xff,0x45,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,
-+	0x45,0xcc,0x82,0x00,0x01,0xff,0x45,0xcc,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0x49,0xcc,0x80,0x00,0x01,0xff,0x49,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x49,0xcc,
-+	0x82,0x00,0x01,0xff,0x49,0xcc,0x88,0x00,0xd3,0x38,0xd2,0x1c,0xd1,0x0c,0x10,0x04,
-+	0x01,0x00,0x01,0xff,0x4e,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x4f,0xcc,0x80,0x00,
-+	0x01,0xff,0x4f,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0x82,0x00,
-+	0x01,0xff,0x4f,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x4f,0xcc,0x88,0x00,0x01,0x00,
-+	0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x55,0xcc,0x80,0x00,0x10,0x08,
-+	0x01,0xff,0x55,0xcc,0x81,0x00,0x01,0xff,0x55,0xcc,0x82,0x00,0x91,0x10,0x10,0x08,
-+	0x01,0xff,0x55,0xcc,0x88,0x00,0x01,0xff,0x59,0xcc,0x81,0x00,0x01,0x00,0xd4,0x7c,
-+	0xd3,0x3c,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0x80,0x00,0x01,0xff,
-+	0x61,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x61,0xcc,0x82,0x00,0x01,0xff,0x61,0xcc,
-+	0x83,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x61,0xcc,0x88,0x00,0x01,0xff,0x61,0xcc,
-+	0x8a,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0x63,0xcc,0xa7,0x00,0xd2,0x20,0xd1,0x10,
-+	0x10,0x08,0x01,0xff,0x65,0xcc,0x80,0x00,0x01,0xff,0x65,0xcc,0x81,0x00,0x10,0x08,
-+	0x01,0xff,0x65,0xcc,0x82,0x00,0x01,0xff,0x65,0xcc,0x88,0x00,0xd1,0x10,0x10,0x08,
-+	0x01,0xff,0x69,0xcc,0x80,0x00,0x01,0xff,0x69,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,
-+	0x69,0xcc,0x82,0x00,0x01,0xff,0x69,0xcc,0x88,0x00,0xd3,0x38,0xd2,0x1c,0xd1,0x0c,
-+	0x10,0x04,0x01,0x00,0x01,0xff,0x6e,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,
-+	0x80,0x00,0x01,0xff,0x6f,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6f,0xcc,
-+	0x82,0x00,0x01,0xff,0x6f,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x88,0x00,
-+	0x01,0x00,0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0x75,0xcc,0x80,0x00,
-+	0x10,0x08,0x01,0xff,0x75,0xcc,0x81,0x00,0x01,0xff,0x75,0xcc,0x82,0x00,0xd1,0x10,
-+	0x10,0x08,0x01,0xff,0x75,0xcc,0x88,0x00,0x01,0xff,0x79,0xcc,0x81,0x00,0x10,0x04,
-+	0x01,0x00,0x01,0xff,0x79,0xcc,0x88,0x00,0xe1,0x9a,0x03,0xe0,0xd3,0x01,0xcf,0x86,
-+	0xd5,0xf4,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,
-+	0x84,0x00,0x01,0xff,0x61,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x41,0xcc,0x86,0x00,
-+	0x01,0xff,0x61,0xcc,0x86,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0xa8,0x00,
-+	0x01,0xff,0x61,0xcc,0xa8,0x00,0x10,0x08,0x01,0xff,0x43,0xcc,0x81,0x00,0x01,0xff,
-+	0x63,0xcc,0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x43,0xcc,0x82,0x00,
-+	0x01,0xff,0x63,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x43,0xcc,0x87,0x00,0x01,0xff,
-+	0x63,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x43,0xcc,0x8c,0x00,0x01,0xff,
-+	0x63,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x44,0xcc,0x8c,0x00,0x01,0xff,0x64,0xcc,
-+	0x8c,0x00,0xd3,0x34,0xd2,0x14,0x51,0x04,0x01,0x00,0x10,0x08,0x01,0xff,0x45,0xcc,
-+	0x84,0x00,0x01,0xff,0x65,0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x45,0xcc,
-+	0x86,0x00,0x01,0xff,0x65,0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x45,0xcc,0x87,0x00,
-+	0x01,0xff,0x65,0xcc,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x45,0xcc,
-+	0xa8,0x00,0x01,0xff,0x65,0xcc,0xa8,0x00,0x10,0x08,0x01,0xff,0x45,0xcc,0x8c,0x00,
-+	0x01,0xff,0x65,0xcc,0x8c,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x47,0xcc,0x82,0x00,
-+	0x01,0xff,0x67,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x47,0xcc,0x86,0x00,0x01,0xff,
-+	0x67,0xcc,0x86,0x00,0xd4,0x74,0xd3,0x34,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0x47,0xcc,0x87,0x00,0x01,0xff,0x67,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x47,0xcc,
-+	0xa7,0x00,0x01,0xff,0x67,0xcc,0xa7,0x00,0x91,0x10,0x10,0x08,0x01,0xff,0x48,0xcc,
-+	0x82,0x00,0x01,0xff,0x68,0xcc,0x82,0x00,0x01,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
-+	0x01,0xff,0x49,0xcc,0x83,0x00,0x01,0xff,0x69,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,
-+	0x49,0xcc,0x84,0x00,0x01,0xff,0x69,0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0x49,0xcc,0x86,0x00,0x01,0xff,0x69,0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x49,0xcc,
-+	0xa8,0x00,0x01,0xff,0x69,0xcc,0xa8,0x00,0xd3,0x30,0xd2,0x10,0x91,0x0c,0x10,0x08,
-+	0x01,0xff,0x49,0xcc,0x87,0x00,0x01,0x00,0x01,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0x4a,0xcc,0x82,0x00,0x01,0xff,0x6a,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x4b,0xcc,
-+	0xa7,0x00,0x01,0xff,0x6b,0xcc,0xa7,0x00,0xd2,0x1c,0xd1,0x0c,0x10,0x04,0x01,0x00,
-+	0x01,0xff,0x4c,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x6c,0xcc,0x81,0x00,0x01,0xff,
-+	0x4c,0xcc,0xa7,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6c,0xcc,0xa7,0x00,0x01,0xff,
-+	0x4c,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x6c,0xcc,0x8c,0x00,0x01,0x00,0xcf,0x86,
-+	0xd5,0xd4,0xd4,0x60,0xd3,0x30,0xd2,0x10,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
-+	0x01,0xff,0x4e,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x6e,0xcc,0x81,0x00,
-+	0x01,0xff,0x4e,0xcc,0xa7,0x00,0x10,0x08,0x01,0xff,0x6e,0xcc,0xa7,0x00,0x01,0xff,
-+	0x4e,0xcc,0x8c,0x00,0xd2,0x10,0x91,0x0c,0x10,0x08,0x01,0xff,0x6e,0xcc,0x8c,0x00,
-+	0x01,0x00,0x01,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0x84,0x00,0x01,0xff,
-+	0x6f,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x4f,0xcc,0x86,0x00,0x01,0xff,0x6f,0xcc,
-+	0x86,0x00,0xd3,0x34,0xd2,0x14,0x91,0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0x8b,0x00,
-+	0x01,0xff,0x6f,0xcc,0x8b,0x00,0x01,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x52,0xcc,
-+	0x81,0x00,0x01,0xff,0x72,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x52,0xcc,0xa7,0x00,
-+	0x01,0xff,0x72,0xcc,0xa7,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x52,0xcc,
-+	0x8c,0x00,0x01,0xff,0x72,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x53,0xcc,0x81,0x00,
-+	0x01,0xff,0x73,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x53,0xcc,0x82,0x00,
-+	0x01,0xff,0x73,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x53,0xcc,0xa7,0x00,0x01,0xff,
-+	0x73,0xcc,0xa7,0x00,0xd4,0x74,0xd3,0x34,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0x53,0xcc,0x8c,0x00,0x01,0xff,0x73,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x54,0xcc,
-+	0xa7,0x00,0x01,0xff,0x74,0xcc,0xa7,0x00,0x91,0x10,0x10,0x08,0x01,0xff,0x54,0xcc,
-+	0x8c,0x00,0x01,0xff,0x74,0xcc,0x8c,0x00,0x01,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
-+	0x01,0xff,0x55,0xcc,0x83,0x00,0x01,0xff,0x75,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,
-+	0x55,0xcc,0x84,0x00,0x01,0xff,0x75,0xcc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0x55,0xcc,0x86,0x00,0x01,0xff,0x75,0xcc,0x86,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,
-+	0x8a,0x00,0x01,0xff,0x75,0xcc,0x8a,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
-+	0x01,0xff,0x55,0xcc,0x8b,0x00,0x01,0xff,0x75,0xcc,0x8b,0x00,0x10,0x08,0x01,0xff,
-+	0x55,0xcc,0xa8,0x00,0x01,0xff,0x75,0xcc,0xa8,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0x57,0xcc,0x82,0x00,0x01,0xff,0x77,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x59,0xcc,
-+	0x82,0x00,0x01,0xff,0x79,0xcc,0x82,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0x59,0xcc,0x88,0x00,0x01,0xff,0x5a,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,
-+	0x81,0x00,0x01,0xff,0x5a,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x7a,0xcc,
-+	0x87,0x00,0x01,0xff,0x5a,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x7a,0xcc,0x8c,0x00,
-+	0x01,0x00,0xd0,0x4a,0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x2c,0xd3,0x18,0x92,0x14,
-+	0x91,0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0x9b,0x00,0x01,0xff,0x6f,0xcc,0x9b,0x00,
- 	0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
--	0x04,0x00,0xd3,0x19,0xd2,0x11,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xff,
--	0xdb,0x92,0xd9,0x94,0x00,0x11,0x04,0x01,0x00,0x01,0xe6,0x52,0x04,0x01,0xe6,0xd1,
--	0x08,0x10,0x04,0x01,0xe6,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xe6,0xd4,0x38,0xd3,
--	0x1c,0xd2,0x0c,0x51,0x04,0x01,0xe6,0x10,0x04,0x01,0xe6,0x01,0xdc,0xd1,0x08,0x10,
--	0x04,0x01,0xe6,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xe6,0xd2,0x10,0xd1,0x08,0x10,
--	0x04,0x01,0xe6,0x01,0x00,0x10,0x04,0x01,0xdc,0x01,0xe6,0x91,0x08,0x10,0x04,0x01,
--	0xe6,0x01,0xdc,0x07,0x00,0x53,0x04,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x04,
--	0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x07,0x00,0xd1,0xc8,0xd0,0x76,0xcf,
--	0x86,0xd5,0x28,0xd4,0x14,0x53,0x04,0x04,0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,
--	0x00,0x10,0x04,0x00,0x00,0x04,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x04,
--	0x00,0x04,0x24,0x04,0x00,0x04,0x00,0x04,0x00,0xd4,0x14,0x53,0x04,0x04,0x00,0x52,
--	0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x07,0x00,0x07,0x00,0xd3,0x1c,0xd2,
--	0x0c,0x91,0x08,0x10,0x04,0x04,0xe6,0x04,0xdc,0x04,0xe6,0xd1,0x08,0x10,0x04,0x04,
--	0xdc,0x04,0xe6,0x10,0x04,0x04,0xe6,0x04,0xdc,0xd2,0x0c,0x51,0x04,0x04,0xdc,0x10,
--	0x04,0x04,0xe6,0x04,0xdc,0xd1,0x08,0x10,0x04,0x04,0xdc,0x04,0xe6,0x10,0x04,0x04,
--	0xdc,0x04,0xe6,0xcf,0x86,0xd5,0x3c,0x94,0x38,0xd3,0x1c,0xd2,0x0c,0x51,0x04,0x04,
--	0xe6,0x10,0x04,0x04,0xdc,0x04,0xe6,0xd1,0x08,0x10,0x04,0x04,0xdc,0x04,0xe6,0x10,
--	0x04,0x04,0xdc,0x04,0xe6,0xd2,0x10,0xd1,0x08,0x10,0x04,0x04,0xdc,0x04,0xe6,0x10,
--	0x04,0x04,0xe6,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x07,0x00,0x07,0x00,0x08,
--	0x00,0x94,0x10,0x53,0x04,0x08,0x00,0x52,0x04,0x08,0x00,0x11,0x04,0x08,0x00,0x0a,
--	0x00,0x0a,0x00,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,0x00,0x93,
--	0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,
--	0x00,0xcf,0x86,0x55,0x04,0x09,0x00,0xd4,0x14,0x53,0x04,0x09,0x00,0x92,0x0c,0x51,
--	0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x09,0xe6,0x09,0xe6,0xd3,0x10,0x92,0x0c,0x51,
--	0x04,0x09,0xe6,0x10,0x04,0x09,0xdc,0x09,0xe6,0x09,0x00,0xd2,0x0c,0x51,0x04,0x09,
--	0x00,0x10,0x04,0x09,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x14,0xdc,0x14,
--	0x00,0xe4,0xf8,0x57,0xe3,0x45,0x3f,0xe2,0xf4,0x3e,0xe1,0xc7,0x2c,0xe0,0x21,0x10,
--	0xcf,0x86,0xc5,0xe4,0x80,0x08,0xe3,0xcb,0x03,0xe2,0x61,0x01,0xd1,0x94,0xd0,0x5a,
--	0xcf,0x86,0xd5,0x20,0x54,0x04,0x0b,0x00,0xd3,0x0c,0x52,0x04,0x0b,0x00,0x11,0x04,
--	0x0b,0x00,0x0b,0xe6,0x92,0x0c,0x51,0x04,0x0b,0xe6,0x10,0x04,0x0b,0x00,0x0b,0xe6,
--	0x0b,0xe6,0xd4,0x24,0xd3,0x10,0x52,0x04,0x0b,0xe6,0x91,0x08,0x10,0x04,0x0b,0x00,
--	0x0b,0xe6,0x0b,0xe6,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0b,0x00,0x0b,0xe6,0x0b,0xe6,
--	0x11,0x04,0x0b,0xe6,0x00,0x00,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,0x00,0x51,0x04,
--	0x0b,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0xcf,0x86,0xd5,0x20,0x54,0x04,0x0c,0x00,
--	0x53,0x04,0x0c,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0c,0x00,0x0c,0xdc,0x0c,0xdc,
--	0x51,0x04,0x00,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,0x94,0x14,0x53,0x04,0x13,0x00,
--	0x92,0x0c,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--	0xd0,0x4a,0xcf,0x86,0x55,0x04,0x00,0x00,0xd4,0x20,0xd3,0x10,0x92,0x0c,0x91,0x08,
--	0x10,0x04,0x0d,0x00,0x10,0x00,0x0d,0x00,0x0d,0x00,0x52,0x04,0x0d,0x00,0x91,0x08,
--	0x10,0x04,0x0d,0x00,0x10,0x00,0x10,0x00,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x10,0x00,
--	0x10,0x04,0x10,0x00,0x11,0x00,0x91,0x08,0x10,0x04,0x11,0x00,0x00,0x00,0x12,0x00,
--	0x52,0x04,0x12,0x00,0x11,0x04,0x12,0x00,0x00,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,
--	0x00,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x14,0xdc,
--	0x12,0xe6,0x12,0xe6,0xd4,0x30,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x12,0xe6,0x10,0x04,
--	0x12,0x00,0x11,0xdc,0x51,0x04,0x0d,0xe6,0x10,0x04,0x0d,0xdc,0x0d,0xe6,0xd2,0x0c,
--	0x91,0x08,0x10,0x04,0x0d,0xe6,0x0d,0xdc,0x0d,0xe6,0x91,0x08,0x10,0x04,0x0d,0xe6,
--	0x0d,0xdc,0x0d,0xdc,0xd3,0x1c,0xd2,0x10,0xd1,0x08,0x10,0x04,0x0d,0x1b,0x0d,0x1c,
--	0x10,0x04,0x0d,0x1d,0x0d,0xe6,0x51,0x04,0x0d,0xe6,0x10,0x04,0x0d,0xdc,0x0d,0xe6,
--	0xd2,0x10,0xd1,0x08,0x10,0x04,0x0d,0xe6,0x0d,0xdc,0x10,0x04,0x0d,0xdc,0x0d,0xe6,
--	0x51,0x04,0x0d,0xe6,0x10,0x04,0x0d,0xe6,0x10,0xe6,0xe1,0x3a,0x01,0xd0,0x77,0xcf,
--	0x86,0xd5,0x20,0x94,0x1c,0x93,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0b,0x00,0x01,
--	0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x07,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,
--	0x00,0xd4,0x1b,0x53,0x04,0x01,0x00,0x92,0x13,0x91,0x0f,0x10,0x04,0x01,0x00,0x01,
--	0xff,0xe0,0xa4,0xa8,0xe0,0xa4,0xbc,0x00,0x01,0x00,0x01,0x00,0xd3,0x26,0xd2,0x13,
--	0x91,0x0f,0x10,0x04,0x01,0x00,0x01,0xff,0xe0,0xa4,0xb0,0xe0,0xa4,0xbc,0x00,0x01,
--	0x00,0x91,0x0f,0x10,0x0b,0x01,0xff,0xe0,0xa4,0xb3,0xe0,0xa4,0xbc,0x00,0x01,0x00,
--	0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x0c,0x00,0x91,0x08,0x10,0x04,0x01,0x07,
--	0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x8c,0xd4,0x18,0x53,0x04,0x01,0x00,0x52,0x04,
--	0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x01,0x09,0x10,0x04,0x0b,0x00,0x0c,0x00,
--	0xd3,0x1c,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x01,0xe6,0x10,0x04,0x01,0xdc,
--	0x01,0xe6,0x91,0x08,0x10,0x04,0x01,0xe6,0x0b,0x00,0x0c,0x00,0xd2,0x2c,0xd1,0x16,
--	0x10,0x0b,0x01,0xff,0xe0,0xa4,0x95,0xe0,0xa4,0xbc,0x00,0x01,0xff,0xe0,0xa4,0x96,
--	0xe0,0xa4,0xbc,0x00,0x10,0x0b,0x01,0xff,0xe0,0xa4,0x97,0xe0,0xa4,0xbc,0x00,0x01,
--	0xff,0xe0,0xa4,0x9c,0xe0,0xa4,0xbc,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xe0,0xa4,
--	0xa1,0xe0,0xa4,0xbc,0x00,0x01,0xff,0xe0,0xa4,0xa2,0xe0,0xa4,0xbc,0x00,0x10,0x0b,
--	0x01,0xff,0xe0,0xa4,0xab,0xe0,0xa4,0xbc,0x00,0x01,0xff,0xe0,0xa4,0xaf,0xe0,0xa4,
--	0xbc,0x00,0x54,0x04,0x01,0x00,0xd3,0x14,0x92,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,
--	0x0a,0x00,0x10,0x04,0x0a,0x00,0x0c,0x00,0x0c,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,
--	0x10,0x00,0x0b,0x00,0x10,0x04,0x0b,0x00,0x09,0x00,0x91,0x08,0x10,0x04,0x09,0x00,
--	0x08,0x00,0x09,0x00,0xd0,0x86,0xcf,0x86,0xd5,0x44,0xd4,0x2c,0xd3,0x18,0xd2,0x0c,
--	0x91,0x08,0x10,0x04,0x10,0x00,0x01,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,
--	0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,
-+	0x01,0xff,0x55,0xcc,0x9b,0x00,0x93,0x14,0x92,0x10,0x91,0x0c,0x10,0x08,0x01,0xff,
-+	0x75,0xcc,0x9b,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0xb4,
-+	0xd4,0x24,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x0c,0x10,0x04,0x01,0x00,
-+	0x01,0xff,0x41,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x61,0xcc,0x8c,0x00,0x01,0xff,
-+	0x49,0xcc,0x8c,0x00,0xd3,0x46,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x69,0xcc,
-+	0x8c,0x00,0x01,0xff,0x4f,0xcc,0x8c,0x00,0x10,0x08,0x01,0xff,0x6f,0xcc,0x8c,0x00,
-+	0x01,0xff,0x55,0xcc,0x8c,0x00,0xd1,0x12,0x10,0x08,0x01,0xff,0x75,0xcc,0x8c,0x00,
-+	0x01,0xff,0x55,0xcc,0x88,0xcc,0x84,0x00,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,
-+	0x84,0x00,0x01,0xff,0x55,0xcc,0x88,0xcc,0x81,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,
-+	0x01,0xff,0x75,0xcc,0x88,0xcc,0x81,0x00,0x01,0xff,0x55,0xcc,0x88,0xcc,0x8c,0x00,
-+	0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,0x8c,0x00,0x01,0xff,0x55,0xcc,0x88,0xcc,
-+	0x80,0x00,0xd1,0x0e,0x10,0x0a,0x01,0xff,0x75,0xcc,0x88,0xcc,0x80,0x00,0x01,0x00,
-+	0x10,0x0a,0x01,0xff,0x41,0xcc,0x88,0xcc,0x84,0x00,0x01,0xff,0x61,0xcc,0x88,0xcc,
-+	0x84,0x00,0xd4,0x80,0xd3,0x3a,0xd2,0x26,0xd1,0x14,0x10,0x0a,0x01,0xff,0x41,0xcc,
-+	0x87,0xcc,0x84,0x00,0x01,0xff,0x61,0xcc,0x87,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,
-+	0xc3,0x86,0xcc,0x84,0x00,0x01,0xff,0xc3,0xa6,0xcc,0x84,0x00,0x51,0x04,0x01,0x00,
-+	0x10,0x08,0x01,0xff,0x47,0xcc,0x8c,0x00,0x01,0xff,0x67,0xcc,0x8c,0x00,0xd2,0x20,
-+	0xd1,0x10,0x10,0x08,0x01,0xff,0x4b,0xcc,0x8c,0x00,0x01,0xff,0x6b,0xcc,0x8c,0x00,
-+	0x10,0x08,0x01,0xff,0x4f,0xcc,0xa8,0x00,0x01,0xff,0x6f,0xcc,0xa8,0x00,0xd1,0x14,
-+	0x10,0x0a,0x01,0xff,0x4f,0xcc,0xa8,0xcc,0x84,0x00,0x01,0xff,0x6f,0xcc,0xa8,0xcc,
-+	0x84,0x00,0x10,0x09,0x01,0xff,0xc6,0xb7,0xcc,0x8c,0x00,0x01,0xff,0xca,0x92,0xcc,
-+	0x8c,0x00,0xd3,0x24,0xd2,0x10,0x91,0x0c,0x10,0x08,0x01,0xff,0x6a,0xcc,0x8c,0x00,
-+	0x01,0x00,0x01,0x00,0x91,0x10,0x10,0x08,0x01,0xff,0x47,0xcc,0x81,0x00,0x01,0xff,
-+	0x67,0xcc,0x81,0x00,0x04,0x00,0xd2,0x24,0xd1,0x10,0x10,0x08,0x04,0xff,0x4e,0xcc,
-+	0x80,0x00,0x04,0xff,0x6e,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x8a,0xcc,
-+	0x81,0x00,0x01,0xff,0x61,0xcc,0x8a,0xcc,0x81,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,
-+	0xc3,0x86,0xcc,0x81,0x00,0x01,0xff,0xc3,0xa6,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,
-+	0xc3,0x98,0xcc,0x81,0x00,0x01,0xff,0xc3,0xb8,0xcc,0x81,0x00,0xe2,0x07,0x02,0xe1,
-+	0xae,0x01,0xe0,0x93,0x01,0xcf,0x86,0xd5,0xf4,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,
-+	0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0x8f,0x00,0x01,0xff,0x61,0xcc,0x8f,0x00,0x10,
-+	0x08,0x01,0xff,0x41,0xcc,0x91,0x00,0x01,0xff,0x61,0xcc,0x91,0x00,0xd1,0x10,0x10,
-+	0x08,0x01,0xff,0x45,0xcc,0x8f,0x00,0x01,0xff,0x65,0xcc,0x8f,0x00,0x10,0x08,0x01,
-+	0xff,0x45,0xcc,0x91,0x00,0x01,0xff,0x65,0xcc,0x91,0x00,0xd2,0x20,0xd1,0x10,0x10,
-+	0x08,0x01,0xff,0x49,0xcc,0x8f,0x00,0x01,0xff,0x69,0xcc,0x8f,0x00,0x10,0x08,0x01,
-+	0xff,0x49,0xcc,0x91,0x00,0x01,0xff,0x69,0xcc,0x91,0x00,0xd1,0x10,0x10,0x08,0x01,
-+	0xff,0x4f,0xcc,0x8f,0x00,0x01,0xff,0x6f,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x4f,
-+	0xcc,0x91,0x00,0x01,0xff,0x6f,0xcc,0x91,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,
-+	0x08,0x01,0xff,0x52,0xcc,0x8f,0x00,0x01,0xff,0x72,0xcc,0x8f,0x00,0x10,0x08,0x01,
-+	0xff,0x52,0xcc,0x91,0x00,0x01,0xff,0x72,0xcc,0x91,0x00,0xd1,0x10,0x10,0x08,0x01,
-+	0xff,0x55,0xcc,0x8f,0x00,0x01,0xff,0x75,0xcc,0x8f,0x00,0x10,0x08,0x01,0xff,0x55,
-+	0xcc,0x91,0x00,0x01,0xff,0x75,0xcc,0x91,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x04,
-+	0xff,0x53,0xcc,0xa6,0x00,0x04,0xff,0x73,0xcc,0xa6,0x00,0x10,0x08,0x04,0xff,0x54,
-+	0xcc,0xa6,0x00,0x04,0xff,0x74,0xcc,0xa6,0x00,0x51,0x04,0x04,0x00,0x10,0x08,0x04,
-+	0xff,0x48,0xcc,0x8c,0x00,0x04,0xff,0x68,0xcc,0x8c,0x00,0xd4,0x68,0xd3,0x20,0xd2,
-+	0x0c,0x91,0x08,0x10,0x04,0x06,0x00,0x07,0x00,0x04,0x00,0x51,0x04,0x04,0x00,0x10,
-+	0x08,0x04,0xff,0x41,0xcc,0x87,0x00,0x04,0xff,0x61,0xcc,0x87,0x00,0xd2,0x24,0xd1,
-+	0x10,0x10,0x08,0x04,0xff,0x45,0xcc,0xa7,0x00,0x04,0xff,0x65,0xcc,0xa7,0x00,0x10,
-+	0x0a,0x04,0xff,0x4f,0xcc,0x88,0xcc,0x84,0x00,0x04,0xff,0x6f,0xcc,0x88,0xcc,0x84,
-+	0x00,0xd1,0x14,0x10,0x0a,0x04,0xff,0x4f,0xcc,0x83,0xcc,0x84,0x00,0x04,0xff,0x6f,
-+	0xcc,0x83,0xcc,0x84,0x00,0x10,0x08,0x04,0xff,0x4f,0xcc,0x87,0x00,0x04,0xff,0x6f,
-+	0xcc,0x87,0x00,0x93,0x30,0xd2,0x24,0xd1,0x14,0x10,0x0a,0x04,0xff,0x4f,0xcc,0x87,
-+	0xcc,0x84,0x00,0x04,0xff,0x6f,0xcc,0x87,0xcc,0x84,0x00,0x10,0x08,0x04,0xff,0x59,
-+	0xcc,0x84,0x00,0x04,0xff,0x79,0xcc,0x84,0x00,0x51,0x04,0x07,0x00,0x10,0x04,0x07,
-+	0x00,0x08,0x00,0x08,0x00,0xcf,0x86,0x95,0x14,0x94,0x10,0x93,0x0c,0x92,0x08,0x11,
-+	0x04,0x08,0x00,0x09,0x00,0x09,0x00,0x09,0x00,0x01,0x00,0x01,0x00,0xd0,0x22,0xcf,
-+	0x86,0x55,0x04,0x01,0x00,0x94,0x18,0x53,0x04,0x01,0x00,0xd2,0x0c,0x91,0x08,0x10,
-+	0x04,0x01,0x00,0x04,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x07,0x00,0x01,0x00,0xcf,
-+	0x86,0xd5,0x18,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x51,
-+	0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x04,0x00,0x94,0x18,0x53,0x04,0x01,0x00,0xd2,
-+	0x08,0x11,0x04,0x01,0x00,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x07,
-+	0x00,0x07,0x00,0xe1,0x34,0x01,0xd0,0x72,0xcf,0x86,0xd5,0x24,0x54,0x04,0x01,0xe6,
-+	0xd3,0x10,0x52,0x04,0x01,0xe6,0x91,0x08,0x10,0x04,0x01,0xe6,0x01,0xe8,0x01,0xdc,
-+	0x92,0x0c,0x51,0x04,0x01,0xdc,0x10,0x04,0x01,0xe8,0x01,0xd8,0x01,0xdc,0xd4,0x2c,
-+	0xd3,0x1c,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0xdc,0x01,0xca,0x10,0x04,0x01,0xca,
-+	0x01,0xdc,0x51,0x04,0x01,0xdc,0x10,0x04,0x01,0xdc,0x01,0xca,0x92,0x0c,0x91,0x08,
-+	0x10,0x04,0x01,0xca,0x01,0xdc,0x01,0xdc,0x01,0xdc,0xd3,0x08,0x12,0x04,0x01,0xdc,
-+	0x01,0x01,0xd2,0x0c,0x91,0x08,0x10,0x04,0x01,0x01,0x01,0xdc,0x01,0xdc,0x91,0x08,
-+	0x10,0x04,0x01,0xdc,0x01,0xe6,0x01,0xe6,0xcf,0x86,0xd5,0x7e,0xd4,0x46,0xd3,0x2e,
-+	0xd2,0x19,0xd1,0x0e,0x10,0x07,0x01,0xff,0xcc,0x80,0x00,0x01,0xff,0xcc,0x81,0x00,
-+	0x10,0x04,0x01,0xe6,0x01,0xff,0xcc,0x93,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xcc,
-+	0x88,0xcc,0x81,0x00,0x01,0xf0,0x10,0x04,0x04,0xe6,0x04,0xdc,0xd2,0x08,0x11,0x04,
-+	0x04,0xdc,0x04,0xe6,0xd1,0x08,0x10,0x04,0x04,0xe6,0x04,0xdc,0x10,0x04,0x04,0xdc,
-+	0x06,0x00,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x07,0xe6,0x10,0x04,0x07,0xe6,0x07,0xdc,
-+	0x51,0x04,0x07,0xdc,0x10,0x04,0x07,0xdc,0x07,0xe6,0xd2,0x10,0xd1,0x08,0x10,0x04,
-+	0x08,0xe8,0x08,0xdc,0x10,0x04,0x08,0xdc,0x08,0xe6,0xd1,0x08,0x10,0x04,0x08,0xe9,
-+	0x07,0xea,0x10,0x04,0x07,0xea,0x07,0xe9,0xd4,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,
-+	0x01,0xea,0x10,0x04,0x04,0xe9,0x06,0xe6,0x06,0xe6,0x06,0xe6,0xd3,0x13,0x52,0x04,
-+	0x0a,0x00,0x91,0x0b,0x10,0x07,0x01,0xff,0xca,0xb9,0x00,0x01,0x00,0x0a,0x00,0xd2,
-+	0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x01,0x00,0x09,0x00,0x51,0x04,0x09,0x00,0x10,
-+	0x06,0x01,0xff,0x3b,0x00,0x10,0x00,0xd0,0xe1,0xcf,0x86,0xd5,0x7a,0xd4,0x5f,0xd3,
-+	0x21,0x52,0x04,0x00,0x00,0xd1,0x0d,0x10,0x04,0x01,0x00,0x01,0xff,0xc2,0xa8,0xcc,
-+	0x81,0x00,0x10,0x09,0x01,0xff,0xce,0x91,0xcc,0x81,0x00,0x01,0xff,0xc2,0xb7,0x00,
-+	0xd2,0x1f,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x95,0xcc,0x81,0x00,0x01,0xff,0xce,
-+	0x97,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0x99,0xcc,0x81,0x00,0x00,0x00,0xd1,
-+	0x0d,0x10,0x09,0x01,0xff,0xce,0x9f,0xcc,0x81,0x00,0x00,0x00,0x10,0x09,0x01,0xff,
-+	0xce,0xa5,0xcc,0x81,0x00,0x01,0xff,0xce,0xa9,0xcc,0x81,0x00,0x93,0x17,0x92,0x13,
-+	0x91,0x0f,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x88,0xcc,0x81,0x00,0x01,0x00,0x01,
-+	0x00,0x01,0x00,0x01,0x00,0xd4,0x4a,0xd3,0x10,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,
-+	0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,0x01,
-+	0xff,0xce,0x99,0xcc,0x88,0x00,0x01,0xff,0xce,0xa5,0xcc,0x88,0x00,0xd1,0x12,0x10,
-+	0x09,0x01,0xff,0xce,0xb1,0xcc,0x81,0x00,0x01,0xff,0xce,0xb5,0xcc,0x81,0x00,0x10,
-+	0x09,0x01,0xff,0xce,0xb7,0xcc,0x81,0x00,0x01,0xff,0xce,0xb9,0xcc,0x81,0x00,0x93,
-+	0x17,0x92,0x13,0x91,0x0f,0x10,0x0b,0x01,0xff,0xcf,0x85,0xcc,0x88,0xcc,0x81,0x00,
-+	0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x7b,0xd4,0x39,0x53,0x04,
-+	0x01,0x00,0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x88,
-+	0x00,0x01,0xff,0xcf,0x85,0xcc,0x88,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xbf,
-+	0xcc,0x81,0x00,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xcf,0x89,
-+	0xcc,0x81,0x00,0x0a,0x00,0xd3,0x26,0xd2,0x11,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
-+	0x00,0x01,0xff,0xcf,0x92,0xcc,0x81,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xcf,0x92,
-+	0xcc,0x88,0x00,0x01,0x00,0x10,0x04,0x01,0x00,0x04,0x00,0xd2,0x0c,0x51,0x04,0x06,
-+	0x00,0x10,0x04,0x01,0x00,0x04,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x04,0x00,0x10,
-+	0x04,0x01,0x00,0x04,0x00,0xd4,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,
-+	0x00,0x04,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,
-+	0x04,0x05,0x00,0x10,0x04,0x06,0x00,0x07,0x00,0x12,0x04,0x07,0x00,0x08,0x00,0xe3,
-+	0x47,0x04,0xe2,0xbe,0x02,0xe1,0x07,0x01,0xd0,0x8b,0xcf,0x86,0xd5,0x6c,0xd4,0x53,
-+	0xd3,0x30,0xd2,0x1f,0xd1,0x12,0x10,0x09,0x04,0xff,0xd0,0x95,0xcc,0x80,0x00,0x01,
-+	0xff,0xd0,0x95,0xcc,0x88,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xd0,0x93,0xcc,0x81,
-+	0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xd0,0x86,0xcc,0x88,0x00,
-+	0x52,0x04,0x01,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0x9a,0xcc,0x81,0x00,0x04,
-+	0xff,0xd0,0x98,0xcc,0x80,0x00,0x10,0x09,0x01,0xff,0xd0,0xa3,0xcc,0x86,0x00,0x01,
-+	0x00,0x53,0x04,0x01,0x00,0x92,0x11,0x91,0x0d,0x10,0x04,0x01,0x00,0x01,0xff,0xd0,
-+	0x98,0xcc,0x86,0x00,0x01,0x00,0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,
-+	0x92,0x11,0x91,0x0d,0x10,0x04,0x01,0x00,0x01,0xff,0xd0,0xb8,0xcc,0x86,0x00,0x01,
-+	0x00,0x01,0x00,0xcf,0x86,0xd5,0x57,0x54,0x04,0x01,0x00,0xd3,0x30,0xd2,0x1f,0xd1,
-+	0x12,0x10,0x09,0x04,0xff,0xd0,0xb5,0xcc,0x80,0x00,0x01,0xff,0xd0,0xb5,0xcc,0x88,
-+	0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xd0,0xb3,0xcc,0x81,0x00,0x51,0x04,0x01,0x00,
-+	0x10,0x04,0x01,0x00,0x01,0xff,0xd1,0x96,0xcc,0x88,0x00,0x52,0x04,0x01,0x00,0xd1,
-+	0x12,0x10,0x09,0x01,0xff,0xd0,0xba,0xcc,0x81,0x00,0x04,0xff,0xd0,0xb8,0xcc,0x80,
-+	0x00,0x10,0x09,0x01,0xff,0xd1,0x83,0xcc,0x86,0x00,0x01,0x00,0x54,0x04,0x01,0x00,
-+	0x93,0x1a,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,0xd1,0xb4,
-+	0xcc,0x8f,0x00,0x01,0xff,0xd1,0xb5,0xcc,0x8f,0x00,0x01,0x00,0xd0,0x2e,0xcf,0x86,
-+	0x95,0x28,0x94,0x24,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
-+	0x01,0xe6,0x51,0x04,0x01,0xe6,0x10,0x04,0x01,0xe6,0x0a,0xe6,0x92,0x08,0x11,0x04,
-+	0x04,0x00,0x06,0x00,0x04,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0xbe,0xd4,0x4a,
-+	0xd3,0x2a,0xd2,0x1a,0xd1,0x0d,0x10,0x04,0x01,0x00,0x01,0xff,0xd0,0x96,0xcc,0x86,
-+	0x00,0x10,0x09,0x01,0xff,0xd0,0xb6,0xcc,0x86,0x00,0x01,0x00,0xd1,0x08,0x10,0x04,
-+	0x01,0x00,0x06,0x00,0x10,0x04,0x06,0x00,0x01,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,
-+	0x01,0x00,0x06,0x00,0x10,0x04,0x06,0x00,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,
-+	0x06,0x00,0x10,0x04,0x06,0x00,0x09,0x00,0xd3,0x3a,0xd2,0x24,0xd1,0x12,0x10,0x09,
-+	0x01,0xff,0xd0,0x90,0xcc,0x86,0x00,0x01,0xff,0xd0,0xb0,0xcc,0x86,0x00,0x10,0x09,
-+	0x01,0xff,0xd0,0x90,0xcc,0x88,0x00,0x01,0xff,0xd0,0xb0,0xcc,0x88,0x00,0x51,0x04,
-+	0x01,0x00,0x10,0x09,0x01,0xff,0xd0,0x95,0xcc,0x86,0x00,0x01,0xff,0xd0,0xb5,0xcc,
-+	0x86,0x00,0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,0xd3,0x98,0xcc,0x88,
-+	0x00,0x01,0xff,0xd3,0x99,0xcc,0x88,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0x96,
-+	0xcc,0x88,0x00,0x01,0xff,0xd0,0xb6,0xcc,0x88,0x00,0x10,0x09,0x01,0xff,0xd0,0x97,
-+	0xcc,0x88,0x00,0x01,0xff,0xd0,0xb7,0xcc,0x88,0x00,0xd4,0x74,0xd3,0x3a,0xd2,0x16,
-+	0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,0xd0,0x98,0xcc,0x84,0x00,0x01,0xff,0xd0,
-+	0xb8,0xcc,0x84,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0x98,0xcc,0x88,0x00,0x01,
-+	0xff,0xd0,0xb8,0xcc,0x88,0x00,0x10,0x09,0x01,0xff,0xd0,0x9e,0xcc,0x88,0x00,0x01,
-+	0xff,0xd0,0xbe,0xcc,0x88,0x00,0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,
-+	0xd3,0xa8,0xcc,0x88,0x00,0x01,0xff,0xd3,0xa9,0xcc,0x88,0x00,0xd1,0x12,0x10,0x09,
-+	0x04,0xff,0xd0,0xad,0xcc,0x88,0x00,0x04,0xff,0xd1,0x8d,0xcc,0x88,0x00,0x10,0x09,
-+	0x01,0xff,0xd0,0xa3,0xcc,0x84,0x00,0x01,0xff,0xd1,0x83,0xcc,0x84,0x00,0xd3,0x3a,
-+	0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd0,0xa3,0xcc,0x88,0x00,0x01,0xff,0xd1,
-+	0x83,0xcc,0x88,0x00,0x10,0x09,0x01,0xff,0xd0,0xa3,0xcc,0x8b,0x00,0x01,0xff,0xd1,
-+	0x83,0xcc,0x8b,0x00,0x91,0x12,0x10,0x09,0x01,0xff,0xd0,0xa7,0xcc,0x88,0x00,0x01,
-+	0xff,0xd1,0x87,0xcc,0x88,0x00,0x08,0x00,0x92,0x16,0x91,0x12,0x10,0x09,0x01,0xff,
-+	0xd0,0xab,0xcc,0x88,0x00,0x01,0xff,0xd1,0x8b,0xcc,0x88,0x00,0x09,0x00,0x09,0x00,
-+	0xd1,0x74,0xd0,0x36,0xcf,0x86,0xd5,0x10,0x54,0x04,0x06,0x00,0x93,0x08,0x12,0x04,
-+	0x09,0x00,0x0a,0x00,0x0a,0x00,0xd4,0x10,0x93,0x0c,0x52,0x04,0x0a,0x00,0x11,0x04,
-+	0x0b,0x00,0x0c,0x00,0x10,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,
-+	0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x24,0x54,0x04,0x01,0x00,
-+	0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,
-+	0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x14,
-+	0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
-+	0x01,0x00,0x01,0x00,0xd0,0xba,0xcf,0x86,0xd5,0x4c,0xd4,0x24,0x53,0x04,0x01,0x00,
-+	0xd2,0x10,0xd1,0x08,0x10,0x04,0x14,0x00,0x01,0x00,0x10,0x04,0x04,0x00,0x00,0x00,
-+	0xd1,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x04,0x10,0x00,0x0d,0x00,0xd3,0x18,
-+	0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x02,0xdc,0x02,0xe6,0x51,0x04,0x02,0xe6,
-+	0x10,0x04,0x02,0xdc,0x02,0xe6,0x92,0x0c,0x51,0x04,0x02,0xe6,0x10,0x04,0x02,0xde,
-+	0x02,0xdc,0x02,0xe6,0xd4,0x2c,0xd3,0x10,0x92,0x0c,0x51,0x04,0x02,0xe6,0x10,0x04,
-+	0x08,0xdc,0x02,0xdc,0x02,0xdc,0xd2,0x0c,0x51,0x04,0x02,0xe6,0x10,0x04,0x02,0xdc,
-+	0x02,0xe6,0xd1,0x08,0x10,0x04,0x02,0xe6,0x02,0xde,0x10,0x04,0x02,0xe4,0x02,0xe6,
-+	0xd3,0x20,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x0a,0x01,0x0b,0x10,0x04,0x01,0x0c,
-+	0x01,0x0d,0xd1,0x08,0x10,0x04,0x01,0x0e,0x01,0x0f,0x10,0x04,0x01,0x10,0x01,0x11,
-+	0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x12,0x01,0x13,0x10,0x04,0x09,0x13,0x01,0x14,
-+	0xd1,0x08,0x10,0x04,0x01,0x15,0x01,0x16,0x10,0x04,0x01,0x00,0x01,0x17,0xcf,0x86,
-+	0xd5,0x28,0x94,0x24,0x93,0x20,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x01,0x18,
-+	0x10,0x04,0x01,0x19,0x01,0x00,0xd1,0x08,0x10,0x04,0x02,0xe6,0x08,0xdc,0x10,0x04,
-+	0x08,0x00,0x08,0x12,0x00,0x00,0x01,0x00,0xd4,0x1c,0x53,0x04,0x01,0x00,0xd2,0x0c,
-+	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,
-+	0x00,0x00,0x14,0x00,0x93,0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
-+	0x00,0x00,0x00,0x00,0x00,0x00,0xe2,0xfa,0x01,0xe1,0x2a,0x01,0xd0,0xa7,0xcf,0x86,
-+	0xd5,0x54,0xd4,0x28,0xd3,0x10,0x52,0x04,0x07,0x00,0x91,0x08,0x10,0x04,0x0d,0x00,
-+	0x10,0x00,0x0a,0x00,0xd2,0x0c,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x00,0x08,0x00,
-+	0x91,0x08,0x10,0x04,0x01,0x00,0x07,0x00,0x07,0x00,0xd3,0x0c,0x52,0x04,0x07,0xe6,
-+	0x11,0x04,0x07,0xe6,0x0a,0xe6,0xd2,0x10,0xd1,0x08,0x10,0x04,0x0a,0x1e,0x0a,0x1f,
-+	0x10,0x04,0x0a,0x20,0x01,0x00,0xd1,0x08,0x10,0x04,0x0f,0x00,0x00,0x00,0x10,0x04,
-+	0x08,0x00,0x01,0x00,0xd4,0x3d,0x93,0x39,0xd2,0x1a,0xd1,0x08,0x10,0x04,0x0c,0x00,
-+	0x01,0x00,0x10,0x09,0x01,0xff,0xd8,0xa7,0xd9,0x93,0x00,0x01,0xff,0xd8,0xa7,0xd9,
-+	0x94,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd9,0x88,0xd9,0x94,0x00,0x01,0xff,0xd8,
-+	0xa7,0xd9,0x95,0x00,0x10,0x09,0x01,0xff,0xd9,0x8a,0xd9,0x94,0x00,0x01,0x00,0x01,
-+	0x00,0x53,0x04,0x01,0x00,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x0a,
-+	0x00,0x0a,0x00,0xcf,0x86,0xd5,0x5c,0xd4,0x20,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,
-+	0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0x1b,0xd1,0x08,0x10,0x04,0x01,0x1c,0x01,
-+	0x1d,0x10,0x04,0x01,0x1e,0x01,0x1f,0xd3,0x20,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,
-+	0x20,0x01,0x21,0x10,0x04,0x01,0x22,0x04,0xe6,0xd1,0x08,0x10,0x04,0x04,0xe6,0x04,
-+	0xdc,0x10,0x04,0x07,0xdc,0x07,0xe6,0xd2,0x0c,0x91,0x08,0x10,0x04,0x07,0xe6,0x08,
-+	0xe6,0x08,0xe6,0xd1,0x08,0x10,0x04,0x08,0xdc,0x08,0xe6,0x10,0x04,0x08,0xe6,0x0c,
-+	0xdc,0xd4,0x10,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x11,0x04,0x01,0x00,0x06,
-+	0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x23,0x01,0x00,0x01,0x00,0x01,
-+	0x00,0x01,0x00,0xd0,0x22,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0x53,
-+	0x04,0x01,0x00,0xd2,0x08,0x11,0x04,0x04,0x00,0x01,0x00,0x51,0x04,0x01,0x00,0x10,
-+	0x04,0x01,0x00,0x04,0x00,0xcf,0x86,0xd5,0x5b,0xd4,0x2e,0xd3,0x1e,0x92,0x1a,0xd1,
-+	0x0d,0x10,0x09,0x01,0xff,0xdb,0x95,0xd9,0x94,0x00,0x01,0x00,0x10,0x09,0x01,0xff,
-+	0xdb,0x81,0xd9,0x94,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,
-+	0x00,0x10,0x04,0x01,0x00,0x04,0x00,0xd3,0x19,0xd2,0x11,0x51,0x04,0x01,0x00,0x10,
-+	0x04,0x01,0x00,0x01,0xff,0xdb,0x92,0xd9,0x94,0x00,0x11,0x04,0x01,0x00,0x01,0xe6,
-+	0x52,0x04,0x01,0xe6,0xd1,0x08,0x10,0x04,0x01,0xe6,0x01,0x00,0x10,0x04,0x01,0x00,
-+	0x01,0xe6,0xd4,0x38,0xd3,0x1c,0xd2,0x0c,0x51,0x04,0x01,0xe6,0x10,0x04,0x01,0xe6,
-+	0x01,0xdc,0xd1,0x08,0x10,0x04,0x01,0xe6,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xe6,
-+	0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0xe6,0x01,0x00,0x10,0x04,0x01,0xdc,0x01,0xe6,
-+	0x91,0x08,0x10,0x04,0x01,0xe6,0x01,0xdc,0x07,0x00,0x53,0x04,0x01,0x00,0xd2,0x08,
-+	0x11,0x04,0x01,0x00,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x07,0x00,
-+	0xd1,0xc8,0xd0,0x76,0xcf,0x86,0xd5,0x28,0xd4,0x14,0x53,0x04,0x04,0x00,0x52,0x04,
-+	0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x00,0x00,0x04,0x00,0x93,0x10,0x92,0x0c,
-+	0x91,0x08,0x10,0x04,0x04,0x00,0x04,0x24,0x04,0x00,0x04,0x00,0x04,0x00,0xd4,0x14,
-+	0x53,0x04,0x04,0x00,0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x07,0x00,
-+	0x07,0x00,0xd3,0x1c,0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,0xe6,0x04,0xdc,0x04,0xe6,
-+	0xd1,0x08,0x10,0x04,0x04,0xdc,0x04,0xe6,0x10,0x04,0x04,0xe6,0x04,0xdc,0xd2,0x0c,
-+	0x51,0x04,0x04,0xdc,0x10,0x04,0x04,0xe6,0x04,0xdc,0xd1,0x08,0x10,0x04,0x04,0xdc,
-+	0x04,0xe6,0x10,0x04,0x04,0xdc,0x04,0xe6,0xcf,0x86,0xd5,0x3c,0x94,0x38,0xd3,0x1c,
-+	0xd2,0x0c,0x51,0x04,0x04,0xe6,0x10,0x04,0x04,0xdc,0x04,0xe6,0xd1,0x08,0x10,0x04,
-+	0x04,0xdc,0x04,0xe6,0x10,0x04,0x04,0xdc,0x04,0xe6,0xd2,0x10,0xd1,0x08,0x10,0x04,
-+	0x04,0xdc,0x04,0xe6,0x10,0x04,0x04,0xe6,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,
-+	0x07,0x00,0x07,0x00,0x08,0x00,0x94,0x10,0x53,0x04,0x08,0x00,0x52,0x04,0x08,0x00,
-+	0x11,0x04,0x08,0x00,0x0a,0x00,0x0a,0x00,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x04,0x00,
-+	0x54,0x04,0x04,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x06,0x00,
-+	0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0x55,0x04,0x09,0x00,0xd4,0x14,0x53,0x04,
-+	0x09,0x00,0x92,0x0c,0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x09,0xe6,0x09,0xe6,
-+	0xd3,0x10,0x92,0x0c,0x51,0x04,0x09,0xe6,0x10,0x04,0x09,0xdc,0x09,0xe6,0x09,0x00,
-+	0xd2,0x0c,0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x00,0x00,0x91,0x08,0x10,0x04,
-+	0x00,0x00,0x14,0xdc,0x14,0x00,0xe4,0x78,0x57,0xe3,0xda,0x3e,0xe2,0x89,0x3e,0xe1,
-+	0x91,0x2c,0xe0,0x21,0x10,0xcf,0x86,0xc5,0xe4,0x80,0x08,0xe3,0xcb,0x03,0xe2,0x61,
-+	0x01,0xd1,0x94,0xd0,0x5a,0xcf,0x86,0xd5,0x20,0x54,0x04,0x0b,0x00,0xd3,0x0c,0x52,
-+	0x04,0x0b,0x00,0x11,0x04,0x0b,0x00,0x0b,0xe6,0x92,0x0c,0x51,0x04,0x0b,0xe6,0x10,
-+	0x04,0x0b,0x00,0x0b,0xe6,0x0b,0xe6,0xd4,0x24,0xd3,0x10,0x52,0x04,0x0b,0xe6,0x91,
-+	0x08,0x10,0x04,0x0b,0x00,0x0b,0xe6,0x0b,0xe6,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0b,
-+	0x00,0x0b,0xe6,0x0b,0xe6,0x11,0x04,0x0b,0xe6,0x00,0x00,0x53,0x04,0x0b,0x00,0x52,
-+	0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0xcf,0x86,0xd5,
-+	0x20,0x54,0x04,0x0c,0x00,0x53,0x04,0x0c,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0c,
-+	0x00,0x0c,0xdc,0x0c,0xdc,0x51,0x04,0x00,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,0x94,
-+	0x14,0x53,0x04,0x13,0x00,0x92,0x0c,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x00,
-+	0x00,0x00,0x00,0x00,0x00,0xd0,0x4a,0xcf,0x86,0x55,0x04,0x00,0x00,0xd4,0x20,0xd3,
-+	0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0d,0x00,0x10,0x00,0x0d,0x00,0x0d,0x00,0x52,
-+	0x04,0x0d,0x00,0x91,0x08,0x10,0x04,0x0d,0x00,0x10,0x00,0x10,0x00,0xd3,0x18,0xd2,
-+	0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x11,0x00,0x91,0x08,0x10,0x04,0x11,
-+	0x00,0x00,0x00,0x12,0x00,0x52,0x04,0x12,0x00,0x11,0x04,0x12,0x00,0x00,0x00,0xcf,
-+	0x86,0xd5,0x18,0x54,0x04,0x00,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,
-+	0x04,0x00,0x00,0x14,0xdc,0x12,0xe6,0x12,0xe6,0xd4,0x30,0xd3,0x18,0xd2,0x0c,0x51,
-+	0x04,0x12,0xe6,0x10,0x04,0x12,0x00,0x11,0xdc,0x51,0x04,0x0d,0xe6,0x10,0x04,0x0d,
-+	0xdc,0x0d,0xe6,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0d,0xe6,0x0d,0xdc,0x0d,0xe6,0x91,
-+	0x08,0x10,0x04,0x0d,0xe6,0x0d,0xdc,0x0d,0xdc,0xd3,0x1c,0xd2,0x10,0xd1,0x08,0x10,
-+	0x04,0x0d,0x1b,0x0d,0x1c,0x10,0x04,0x0d,0x1d,0x0d,0xe6,0x51,0x04,0x0d,0xe6,0x10,
-+	0x04,0x0d,0xdc,0x0d,0xe6,0xd2,0x10,0xd1,0x08,0x10,0x04,0x0d,0xe6,0x0d,0xdc,0x10,
-+	0x04,0x0d,0xdc,0x0d,0xe6,0x51,0x04,0x0d,0xe6,0x10,0x04,0x0d,0xe6,0x10,0xe6,0xe1,
-+	0x3a,0x01,0xd0,0x77,0xcf,0x86,0xd5,0x20,0x94,0x1c,0x93,0x18,0xd2,0x0c,0x91,0x08,
-+	0x10,0x04,0x0b,0x00,0x01,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x07,0x00,0x01,0x00,
-+	0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x1b,0x53,0x04,0x01,0x00,0x92,0x13,0x91,0x0f,
-+	0x10,0x04,0x01,0x00,0x01,0xff,0xe0,0xa4,0xa8,0xe0,0xa4,0xbc,0x00,0x01,0x00,0x01,
-+	0x00,0xd3,0x26,0xd2,0x13,0x91,0x0f,0x10,0x04,0x01,0x00,0x01,0xff,0xe0,0xa4,0xb0,
-+	0xe0,0xa4,0xbc,0x00,0x01,0x00,0x91,0x0f,0x10,0x0b,0x01,0xff,0xe0,0xa4,0xb3,0xe0,
-+	0xa4,0xbc,0x00,0x01,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x0c,0x00,0x91,
-+	0x08,0x10,0x04,0x01,0x07,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x8c,0xd4,0x18,0x53,
-+	0x04,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x01,0x09,0x10,
-+	0x04,0x0b,0x00,0x0c,0x00,0xd3,0x1c,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x01,
-+	0xe6,0x10,0x04,0x01,0xdc,0x01,0xe6,0x91,0x08,0x10,0x04,0x01,0xe6,0x0b,0x00,0x0c,
-+	0x00,0xd2,0x2c,0xd1,0x16,0x10,0x0b,0x01,0xff,0xe0,0xa4,0x95,0xe0,0xa4,0xbc,0x00,
-+	0x01,0xff,0xe0,0xa4,0x96,0xe0,0xa4,0xbc,0x00,0x10,0x0b,0x01,0xff,0xe0,0xa4,0x97,
-+	0xe0,0xa4,0xbc,0x00,0x01,0xff,0xe0,0xa4,0x9c,0xe0,0xa4,0xbc,0x00,0xd1,0x16,0x10,
-+	0x0b,0x01,0xff,0xe0,0xa4,0xa1,0xe0,0xa4,0xbc,0x00,0x01,0xff,0xe0,0xa4,0xa2,0xe0,
-+	0xa4,0xbc,0x00,0x10,0x0b,0x01,0xff,0xe0,0xa4,0xab,0xe0,0xa4,0xbc,0x00,0x01,0xff,
-+	0xe0,0xa4,0xaf,0xe0,0xa4,0xbc,0x00,0x54,0x04,0x01,0x00,0xd3,0x14,0x92,0x10,0xd1,
-+	0x08,0x10,0x04,0x01,0x00,0x0a,0x00,0x10,0x04,0x0a,0x00,0x0c,0x00,0x0c,0x00,0xd2,
-+	0x10,0xd1,0x08,0x10,0x04,0x10,0x00,0x0b,0x00,0x10,0x04,0x0b,0x00,0x09,0x00,0x91,
-+	0x08,0x10,0x04,0x09,0x00,0x08,0x00,0x09,0x00,0xd0,0x86,0xcf,0x86,0xd5,0x44,0xd4,
-+	0x2c,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x10,0x00,0x01,0x00,0x01,0x00,0x91,
-+	0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,
-+	0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x93,0x14,0x92,0x10,0xd1,
-+	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,
-+	0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,
-+	0x00,0x01,0x00,0x01,0x00,0xd3,0x18,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,
-+	0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0xd2,0x08,0x11,
-+	0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x01,0x07,0x07,0x00,0x01,0x00,0xcf,
-+	0x86,0xd5,0x7b,0xd4,0x42,0xd3,0x14,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,
-+	0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xd2,0x17,0xd1,0x08,0x10,0x04,0x01,
-+	0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xe0,0xa7,0x87,0xe0,0xa6,0xbe,0x00,
-+	0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe0,0xa7,0x87,0xe0,0xa7,0x97,0x00,0x01,0x09,0x10,
-+	0x04,0x08,0x00,0x00,0x00,0xd3,0x10,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,
-+	0x04,0x00,0x00,0x01,0x00,0x52,0x04,0x00,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xe0,
-+	0xa6,0xa1,0xe0,0xa6,0xbc,0x00,0x01,0xff,0xe0,0xa6,0xa2,0xe0,0xa6,0xbc,0x00,0x10,
-+	0x04,0x00,0x00,0x01,0xff,0xe0,0xa6,0xaf,0xe0,0xa6,0xbc,0x00,0xd4,0x10,0x93,0x0c,
-+	0x52,0x04,0x01,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x53,0x04,0x01,0x00,
-+	0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x0b,0x00,0x51,0x04,0x13,0x00,
-+	0x10,0x04,0x14,0xe6,0x00,0x00,0xe2,0x48,0x02,0xe1,0x4f,0x01,0xd0,0xa4,0xcf,0x86,
-+	0xd5,0x4c,0xd4,0x34,0xd3,0x1c,0xd2,0x10,0xd1,0x08,0x10,0x04,0x00,0x00,0x07,0x00,
-+	0x10,0x04,0x01,0x00,0x07,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,
-+	0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x51,0x04,0x00,0x00,
- 	0x10,0x04,0x00,0x00,0x01,0x00,0x93,0x14,0x92,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,
- 	0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,
- 	0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,
--	0xd3,0x18,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x01,0x00,
--	0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,
--	0x91,0x08,0x10,0x04,0x01,0x07,0x07,0x00,0x01,0x00,0xcf,0x86,0xd5,0x7b,0xd4,0x42,
--	0xd3,0x14,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,
--	0x00,0x00,0x01,0x00,0xd2,0x17,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,
--	0x00,0x00,0x01,0xff,0xe0,0xa7,0x87,0xe0,0xa6,0xbe,0x00,0xd1,0x0f,0x10,0x0b,0x01,
--	0xff,0xe0,0xa7,0x87,0xe0,0xa7,0x97,0x00,0x01,0x09,0x10,0x04,0x08,0x00,0x00,0x00,
--	0xd3,0x10,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,
--	0x52,0x04,0x00,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xe0,0xa6,0xa1,0xe0,0xa6,0xbc,
--	0x00,0x01,0xff,0xe0,0xa6,0xa2,0xe0,0xa6,0xbc,0x00,0x10,0x04,0x00,0x00,0x01,0xff,
--	0xe0,0xa6,0xaf,0xe0,0xa6,0xbc,0x00,0xd4,0x10,0x93,0x0c,0x52,0x04,0x01,0x00,0x11,
--	0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,
--	0x00,0x10,0x04,0x01,0x00,0x0b,0x00,0x51,0x04,0x13,0x00,0x10,0x04,0x14,0xe6,0x00,
--	0x00,0xe2,0x48,0x02,0xe1,0x4f,0x01,0xd0,0xa4,0xcf,0x86,0xd5,0x4c,0xd4,0x34,0xd3,
--	0x1c,0xd2,0x10,0xd1,0x08,0x10,0x04,0x00,0x00,0x07,0x00,0x10,0x04,0x01,0x00,0x07,
--	0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,
--	0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,
--	0x00,0x93,0x14,0x92,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x00,
--	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x91,
--	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0xd3,0x2e,0xd2,0x17,0xd1,
--	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xe0,0xa8,0xb2,
--	0xe0,0xa8,0xbc,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,
--	0xe0,0xa8,0xb8,0xe0,0xa8,0xbc,0x00,0x00,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,
--	0x00,0x91,0x08,0x10,0x04,0x01,0x07,0x00,0x00,0x01,0x00,0xcf,0x86,0xd5,0x80,0xd4,
--	0x34,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x51,
--	0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,
--	0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x01,
--	0x09,0x00,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x0a,0x00,0x00,
--	0x00,0x00,0x00,0xd2,0x25,0xd1,0x0f,0x10,0x04,0x00,0x00,0x01,0xff,0xe0,0xa8,0x96,
--	0xe0,0xa8,0xbc,0x00,0x10,0x0b,0x01,0xff,0xe0,0xa8,0x97,0xe0,0xa8,0xbc,0x00,0x01,
--	0xff,0xe0,0xa8,0x9c,0xe0,0xa8,0xbc,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,
--	0x10,0x0b,0x01,0xff,0xe0,0xa8,0xab,0xe0,0xa8,0xbc,0x00,0x00,0x00,0xd4,0x10,0x93,
--	0x0c,0x52,0x04,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x93,0x14,0x52,
--	0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x0a,0x00,0x10,0x04,0x14,0x00,0x00,
--	0x00,0x00,0x00,0xd0,0x82,0xcf,0x86,0xd5,0x40,0xd4,0x2c,0xd3,0x18,0xd2,0x0c,0x91,
--	0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,
--	0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x07,0x00,0x01,0x00,0x10,
--	0x04,0x00,0x00,0x01,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x00,
--	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x91,
--	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0xd3,0x18,0xd2,0x0c,0x91,
--	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,
--	0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x01,
--	0x07,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x3c,0xd4,0x28,0xd3,0x10,0x52,0x04,0x01,
--	0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,
--	0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x01,0x09,0x00,
--	0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
--	0x00,0x00,0x00,0xd4,0x18,0x93,0x14,0xd2,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x07,
--	0x00,0x07,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd3,0x10,0x92,0x0c,0x91,
--	0x08,0x10,0x04,0x0d,0x00,0x07,0x00,0x00,0x00,0x00,0x00,0x92,0x0c,0x91,0x08,0x10,
--	0x04,0x00,0x00,0x11,0x00,0x13,0x00,0x13,0x00,0xe1,0x24,0x01,0xd0,0x86,0xcf,0x86,
--	0xd5,0x44,0xd4,0x2c,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,
--	0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,
--	0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x93,0x14,
--	0x92,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,
--	0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,
--	0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,
--	0x01,0x00,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x07,0x00,0x01,0x00,
--	0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x01,0x07,0x01,0x00,
--	0x01,0x00,0xcf,0x86,0xd5,0x73,0xd4,0x45,0xd3,0x14,0x52,0x04,0x01,0x00,0xd1,0x08,
--	0x10,0x04,0x0a,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xd2,0x1e,0xd1,0x0f,
--	0x10,0x0b,0x01,0xff,0xe0,0xad,0x87,0xe0,0xad,0x96,0x00,0x00,0x00,0x10,0x04,0x00,
--	0x00,0x01,0xff,0xe0,0xad,0x87,0xe0,0xac,0xbe,0x00,0x91,0x0f,0x10,0x0b,0x01,0xff,
--	0xe0,0xad,0x87,0xe0,0xad,0x97,0x00,0x01,0x09,0x00,0x00,0xd3,0x0c,0x52,0x04,0x00,
--	0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x52,0x04,0x00,0x00,0xd1,0x16,0x10,0x0b,0x01,
--	0xff,0xe0,0xac,0xa1,0xe0,0xac,0xbc,0x00,0x01,0xff,0xe0,0xac,0xa2,0xe0,0xac,0xbc,
--	0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xd4,0x14,0x93,0x10,0xd2,0x08,0x11,0x04,0x01,
--	0x00,0x0a,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x93,0x10,0x92,0x0c,0x91,
--	0x08,0x10,0x04,0x01,0x00,0x07,0x00,0x0c,0x00,0x0c,0x00,0x00,0x00,0xd0,0xb1,0xcf,
--	0x86,0xd5,0x63,0xd4,0x28,0xd3,0x14,0xd2,0x08,0x11,0x04,0x00,0x00,0x01,0x00,0x91,
--	0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,
--	0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0xd3,0x1f,0xd2,0x0c,0x91,
--	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x91,0x0f,0x10,0x0b,0x01,0xff,0xe0,
--	0xae,0x92,0xe0,0xaf,0x97,0x00,0x01,0x00,0x00,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,
--	0x00,0x00,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
--	0x00,0x00,0x01,0x00,0xd4,0x2c,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,
--	0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0xd2,0x0c,
--	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,
--	0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x08,0x00,0x01,0x00,
--	0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0xcf,0x86,
--	0xd5,0x61,0xd4,0x45,0xd3,0x14,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
--	0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0xd2,0x1e,0xd1,0x08,0x10,0x04,0x01,0x00,
--	0x00,0x00,0x10,0x0b,0x01,0xff,0xe0,0xaf,0x86,0xe0,0xae,0xbe,0x00,0x01,0xff,0xe0,
--	0xaf,0x87,0xe0,0xae,0xbe,0x00,0x91,0x0f,0x10,0x0b,0x01,0xff,0xe0,0xaf,0x86,0xe0,
--	0xaf,0x97,0x00,0x01,0x09,0x00,0x00,0x93,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0a,
--	0x00,0x00,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x00,
--	0x00,0xd4,0x14,0x93,0x10,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x08,
--	0x00,0x01,0x00,0x01,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
--	0x00,0x07,0x00,0x07,0x00,0x92,0x0c,0x51,0x04,0x07,0x00,0x10,0x04,0x07,0x00,0x00,
--	0x00,0x00,0x00,0xe3,0x1c,0x04,0xe2,0x1a,0x02,0xd1,0xf3,0xd0,0x76,0xcf,0x86,0xd5,
--	0x3c,0xd4,0x28,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x10,0x00,0x01,0x00,0x01,
--	0x00,0x91,0x08,0x10,0x04,0x14,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0x91,
--	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,
--	0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,
--	0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0xd3,
--	0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x10,0x00,0x01,0x00,0x01,0x00,0xd2,
--	0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x0a,0x00,0x01,
--	0x00,0xcf,0x86,0xd5,0x53,0xd4,0x2f,0xd3,0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,
--	0x04,0x01,0x00,0x00,0x00,0x01,0x00,0xd2,0x13,0x91,0x0f,0x10,0x0b,0x01,0xff,0xe0,
--	0xb1,0x86,0xe0,0xb1,0x96,0x00,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
--	0x01,0x09,0x00,0x00,0xd3,0x14,0x52,0x04,0x00,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,
--	0x01,0x54,0x10,0x04,0x01,0x5b,0x00,0x00,0x92,0x0c,0x51,0x04,0x0a,0x00,0x10,0x04,
--	0x11,0x00,0x00,0x00,0x00,0x00,0xd4,0x14,0x93,0x10,0xd2,0x08,0x11,0x04,0x01,0x00,
--	0x0a,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x93,0x10,0x52,0x04,0x00,0x00,
--	0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x15,0x00,0x0a,0x00,0xd0,0x76,0xcf,0x86,
--	0xd5,0x3c,0xd4,0x28,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x12,0x00,0x10,0x00,
--	0x01,0x00,0x91,0x08,0x10,0x04,0x14,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,
--	0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,
--	0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,
-+	0xd3,0x2e,0xd2,0x17,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x01,0x00,
-+	0x01,0xff,0xe0,0xa8,0xb2,0xe0,0xa8,0xbc,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,0x01,
-+	0x00,0x10,0x0b,0x01,0xff,0xe0,0xa8,0xb8,0xe0,0xa8,0xbc,0x00,0x00,0x00,0xd2,0x08,
-+	0x11,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x01,0x07,0x00,0x00,0x01,0x00,
-+	0xcf,0x86,0xd5,0x80,0xd4,0x34,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,
-+	0x01,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xd2,0x10,
-+	0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x91,0x08,
-+	0x10,0x04,0x01,0x00,0x01,0x09,0x00,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,
-+	0x00,0x00,0x0a,0x00,0x00,0x00,0x00,0x00,0xd2,0x25,0xd1,0x0f,0x10,0x04,0x00,0x00,
-+	0x01,0xff,0xe0,0xa8,0x96,0xe0,0xa8,0xbc,0x00,0x10,0x0b,0x01,0xff,0xe0,0xa8,0x97,
-+	0xe0,0xa8,0xbc,0x00,0x01,0xff,0xe0,0xa8,0x9c,0xe0,0xa8,0xbc,0x00,0xd1,0x08,0x10,
-+	0x04,0x01,0x00,0x00,0x00,0x10,0x0b,0x01,0xff,0xe0,0xa8,0xab,0xe0,0xa8,0xbc,0x00,
-+	0x00,0x00,0xd4,0x10,0x93,0x0c,0x52,0x04,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,
-+	0x01,0x00,0x93,0x14,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x0a,0x00,
-+	0x10,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0xd0,0x82,0xcf,0x86,0xd5,0x40,0xd4,0x2c,
-+	0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x91,0x08,
-+	0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,
-+	0x07,0x00,0x01,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,
-+	0x01,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,
- 	0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,
--	0xd3,0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,
--	0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x07,0x07,0x07,0x00,
--	0x01,0x00,0xcf,0x86,0xd5,0x82,0xd4,0x5e,0xd3,0x2a,0xd2,0x13,0x91,0x0f,0x10,0x0b,
--	0x01,0xff,0xe0,0xb2,0xbf,0xe0,0xb3,0x95,0x00,0x01,0x00,0x01,0x00,0xd1,0x08,0x10,
--	0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xe0,0xb3,0x86,0xe0,0xb3,
--	0x95,0x00,0xd2,0x28,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe0,0xb3,0x86,0xe0,0xb3,0x96,
--	0x00,0x00,0x00,0x10,0x0b,0x01,0xff,0xe0,0xb3,0x86,0xe0,0xb3,0x82,0x00,0x01,0xff,
--	0xe0,0xb3,0x86,0xe0,0xb3,0x82,0xe0,0xb3,0x95,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
--	0x01,0x09,0x00,0x00,0xd3,0x14,0x52,0x04,0x00,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,
--	0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,
--	0x10,0x04,0x01,0x00,0x00,0x00,0xd4,0x14,0x93,0x10,0xd2,0x08,0x11,0x04,0x01,0x00,
--	0x09,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x93,0x14,0x92,0x10,0xd1,0x08,
--	0x10,0x04,0x00,0x00,0x09,0x00,0x10,0x04,0x09,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--	0xe1,0x06,0x01,0xd0,0x6e,0xcf,0x86,0xd5,0x3c,0xd4,0x28,0xd3,0x18,0xd2,0x0c,0x91,
--	0x08,0x10,0x04,0x13,0x00,0x10,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,
--	0x00,0x01,0x00,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,
--	0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,
--	0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,
--	0x00,0x0c,0x00,0x01,0x00,0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,
--	0x00,0x10,0x04,0x0c,0x00,0x13,0x09,0x91,0x08,0x10,0x04,0x13,0x09,0x0a,0x00,0x01,
--	0x00,0xcf,0x86,0xd5,0x65,0xd4,0x45,0xd3,0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,
--	0x04,0x0a,0x00,0x00,0x00,0x01,0x00,0xd2,0x1e,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,
--	0x00,0x10,0x0b,0x01,0xff,0xe0,0xb5,0x86,0xe0,0xb4,0xbe,0x00,0x01,0xff,0xe0,0xb5,
--	0x87,0xe0,0xb4,0xbe,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe0,0xb5,0x86,0xe0,0xb5,
--	0x97,0x00,0x01,0x09,0x10,0x04,0x0c,0x00,0x12,0x00,0xd3,0x10,0x52,0x04,0x00,0x00,
--	0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x01,0x00,0x52,0x04,0x12,0x00,0x51,0x04,
--	0x12,0x00,0x10,0x04,0x12,0x00,0x11,0x00,0xd4,0x14,0x93,0x10,0xd2,0x08,0x11,0x04,
--	0x01,0x00,0x0a,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd3,0x0c,0x52,0x04,
--	0x0a,0x00,0x11,0x04,0x0a,0x00,0x12,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x12,0x00,
--	0x0a,0x00,0x0a,0x00,0x0a,0x00,0xd0,0x5a,0xcf,0x86,0xd5,0x34,0xd4,0x18,0x93,0x14,
--	0xd2,0x08,0x11,0x04,0x00,0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x04,0x00,
--	0x04,0x00,0x04,0x00,0xd3,0x10,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,
--	0x04,0x00,0x00,0x00,0x92,0x08,0x11,0x04,0x00,0x00,0x04,0x00,0x04,0x00,0x54,0x04,
--	0x04,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,0x04,0x00,0x10,0x04,0x00,0x00,0x04,0x00,
--	0x04,0x00,0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x04,0x00,0x00,0x00,
--	0xcf,0x86,0xd5,0x77,0xd4,0x28,0xd3,0x10,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,
--	0x10,0x04,0x04,0x00,0x00,0x00,0xd2,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x04,0x09,
--	0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x04,0x00,0xd3,0x14,0x52,0x04,
--	0x04,0x00,0xd1,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x10,0x04,0x04,0x00,0x00,0x00,
--	0xd2,0x13,0x51,0x04,0x04,0x00,0x10,0x0b,0x04,0xff,0xe0,0xb7,0x99,0xe0,0xb7,0x8a,
--	0x00,0x04,0x00,0xd1,0x19,0x10,0x0b,0x04,0xff,0xe0,0xb7,0x99,0xe0,0xb7,0x8f,0x00,
--	0x04,0xff,0xe0,0xb7,0x99,0xe0,0xb7,0x8f,0xe0,0xb7,0x8a,0x00,0x10,0x0b,0x04,0xff,
--	0xe0,0xb7,0x99,0xe0,0xb7,0x9f,0x00,0x04,0x00,0xd4,0x10,0x93,0x0c,0x52,0x04,0x00,
--	0x00,0x11,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x93,0x14,0xd2,0x08,0x11,0x04,0x00,
--	0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe2,
--	0x31,0x01,0xd1,0x58,0xd0,0x3a,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,
--	0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
--	0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,0x67,0x10,0x04,
--	0x01,0x09,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xcf,0x86,
--	0x95,0x18,0xd4,0x0c,0x53,0x04,0x01,0x00,0x12,0x04,0x01,0x6b,0x01,0x00,0x53,0x04,
--	0x01,0x00,0x12,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0xd0,0x9e,0xcf,0x86,0xd5,0x54,
--	0xd4,0x3c,0xd3,0x20,0xd2,0x10,0xd1,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x10,0x04,
--	0x01,0x00,0x00,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x15,0x00,
--	0x01,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x15,0x00,0x10,0x04,0x01,0x00,
--	0x00,0x00,0x91,0x08,0x10,0x04,0x15,0x00,0x01,0x00,0x15,0x00,0xd3,0x08,0x12,0x04,
--	0x15,0x00,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x15,0x00,0x01,0x00,0x01,0x00,
--	0x01,0x00,0xd4,0x30,0xd3,0x1c,0xd2,0x0c,0x91,0x08,0x10,0x04,0x15,0x00,0x01,0x00,
--	0x01,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x10,0x04,0x00,0x00,0x01,0x00,
--	0xd2,0x08,0x11,0x04,0x15,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x15,0x00,0x01,0x00,
--	0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,0x76,0x10,0x04,0x15,0x09,
--	0x01,0x00,0x11,0x04,0x01,0x00,0x00,0x00,0xcf,0x86,0x95,0x34,0xd4,0x20,0xd3,0x14,
--	0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x01,0x00,
--	0x00,0x00,0x52,0x04,0x01,0x7a,0x11,0x04,0x01,0x00,0x00,0x00,0x53,0x04,0x01,0x00,
--	0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x01,0x00,0x0d,0x00,0x00,0x00,
--	0xe1,0x2b,0x01,0xd0,0x3e,0xcf,0x86,0xd5,0x14,0x54,0x04,0x02,0x00,0x53,0x04,0x02,
--	0x00,0x92,0x08,0x11,0x04,0x02,0xdc,0x02,0x00,0x02,0x00,0x54,0x04,0x02,0x00,0xd3,
--	0x14,0x52,0x04,0x02,0x00,0xd1,0x08,0x10,0x04,0x02,0x00,0x02,0xdc,0x10,0x04,0x02,
--	0x00,0x02,0xdc,0x92,0x0c,0x91,0x08,0x10,0x04,0x02,0x00,0x02,0xd8,0x02,0x00,0x02,
--	0x00,0xcf,0x86,0xd5,0x73,0xd4,0x36,0xd3,0x17,0x92,0x13,0x51,0x04,0x02,0x00,0x10,
--	0x04,0x02,0x00,0x02,0xff,0xe0,0xbd,0x82,0xe0,0xbe,0xb7,0x00,0x02,0x00,0xd2,0x0c,
--	0x91,0x08,0x10,0x04,0x00,0x00,0x02,0x00,0x02,0x00,0x91,0x0f,0x10,0x04,0x02,0x00,
--	0x02,0xff,0xe0,0xbd,0x8c,0xe0,0xbe,0xb7,0x00,0x02,0x00,0xd3,0x26,0xd2,0x13,0x51,
--	0x04,0x02,0x00,0x10,0x0b,0x02,0xff,0xe0,0xbd,0x91,0xe0,0xbe,0xb7,0x00,0x02,0x00,
--	0x51,0x04,0x02,0x00,0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbd,0x96,0xe0,0xbe,0xb7,
--	0x00,0x52,0x04,0x02,0x00,0x91,0x0f,0x10,0x0b,0x02,0xff,0xe0,0xbd,0x9b,0xe0,0xbe,
--	0xb7,0x00,0x02,0x00,0x02,0x00,0xd4,0x27,0x53,0x04,0x02,0x00,0xd2,0x17,0xd1,0x0f,
--	0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbd,0x80,0xe0,0xbe,0xb5,0x00,0x10,0x04,0x04,
--	0x00,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,0xd3,0x35,0xd2,
--	0x17,0xd1,0x08,0x10,0x04,0x00,0x00,0x02,0x81,0x10,0x04,0x02,0x82,0x02,0xff,0xe0,
--	0xbd,0xb1,0xe0,0xbd,0xb2,0x00,0xd1,0x0f,0x10,0x04,0x02,0x84,0x02,0xff,0xe0,0xbd,
--	0xb1,0xe0,0xbd,0xb4,0x00,0x10,0x0b,0x02,0xff,0xe0,0xbe,0xb2,0xe0,0xbe,0x80,0x00,
--	0x02,0x00,0xd2,0x13,0x91,0x0f,0x10,0x0b,0x02,0xff,0xe0,0xbe,0xb3,0xe0,0xbe,0x80,
--	0x00,0x02,0x00,0x02,0x82,0x11,0x04,0x02,0x82,0x02,0x00,0xd0,0xd3,0xcf,0x86,0xd5,
--	0x65,0xd4,0x27,0xd3,0x1f,0xd2,0x13,0x91,0x0f,0x10,0x04,0x02,0x82,0x02,0xff,0xe0,
--	0xbd,0xb1,0xe0,0xbe,0x80,0x00,0x02,0xe6,0x91,0x08,0x10,0x04,0x02,0x09,0x02,0x00,
--	0x02,0xe6,0x12,0x04,0x02,0x00,0x0c,0x00,0xd3,0x1f,0xd2,0x13,0x51,0x04,0x02,0x00,
--	0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbe,0x92,0xe0,0xbe,0xb7,0x00,0x51,0x04,0x02,
--	0x00,0x10,0x04,0x04,0x00,0x02,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x02,
--	0x00,0x02,0x00,0x91,0x0f,0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbe,0x9c,0xe0,0xbe,
--	0xb7,0x00,0x02,0x00,0xd4,0x3d,0xd3,0x26,0xd2,0x13,0x51,0x04,0x02,0x00,0x10,0x0b,
--	0x02,0xff,0xe0,0xbe,0xa1,0xe0,0xbe,0xb7,0x00,0x02,0x00,0x51,0x04,0x02,0x00,0x10,
--	0x04,0x02,0x00,0x02,0xff,0xe0,0xbe,0xa6,0xe0,0xbe,0xb7,0x00,0x52,0x04,0x02,0x00,
--	0x91,0x0f,0x10,0x0b,0x02,0xff,0xe0,0xbe,0xab,0xe0,0xbe,0xb7,0x00,0x02,0x00,0x04,
--	0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x02,0x00,0x02,0x00,0x02,
--	0x00,0xd2,0x13,0x91,0x0f,0x10,0x04,0x04,0x00,0x02,0xff,0xe0,0xbe,0x90,0xe0,0xbe,
--	0xb5,0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0xcf,0x86,
--	0x95,0x4c,0xd4,0x24,0xd3,0x10,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,
--	0x04,0xdc,0x04,0x00,0x52,0x04,0x04,0x00,0xd1,0x08,0x10,0x04,0x04,0x00,0x00,0x00,
--	0x10,0x04,0x0a,0x00,0x04,0x00,0xd3,0x14,0xd2,0x08,0x11,0x04,0x08,0x00,0x0a,0x00,
--	0x91,0x08,0x10,0x04,0x0a,0x00,0x0b,0x00,0x0b,0x00,0x92,0x10,0xd1,0x08,0x10,0x04,
--	0x0b,0x00,0x0c,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,
--	0xe5,0xf7,0x04,0xe4,0x79,0x03,0xe3,0x7b,0x01,0xe2,0x04,0x01,0xd1,0x7f,0xd0,0x65,
--	0xcf,0x86,0x55,0x04,0x04,0x00,0xd4,0x33,0xd3,0x1f,0xd2,0x0c,0x51,0x04,0x04,0x00,
--	0x10,0x04,0x0a,0x00,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x0b,0x04,0xff,0xe1,0x80,
--	0xa5,0xe1,0x80,0xae,0x00,0x04,0x00,0x92,0x10,0xd1,0x08,0x10,0x04,0x0a,0x00,0x04,
--	0x00,0x10,0x04,0x04,0x00,0x0a,0x00,0x04,0x00,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x04,
--	0x00,0x10,0x04,0x04,0x00,0x0a,0x00,0x51,0x04,0x0a,0x00,0x10,0x04,0x04,0x00,0x04,
--	0x07,0x92,0x10,0xd1,0x08,0x10,0x04,0x04,0x00,0x04,0x09,0x10,0x04,0x0a,0x09,0x0a,
--	0x00,0x0a,0x00,0xcf,0x86,0x95,0x14,0x54,0x04,0x04,0x00,0x53,0x04,0x04,0x00,0x92,
--	0x08,0x11,0x04,0x04,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0xd0,0x2e,0xcf,0x86,0x95,
--	0x28,0xd4,0x14,0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,
--	0x00,0x0a,0xdc,0x0a,0x00,0x53,0x04,0x0a,0x00,0xd2,0x08,0x11,0x04,0x0a,0x00,0x0b,
--	0x00,0x11,0x04,0x0b,0x00,0x0a,0x00,0x01,0x00,0xcf,0x86,0xd5,0x24,0x94,0x20,0xd3,
--	0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x00,0x00,0x0d,0x00,0x52,
--	0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x0d,0x00,0x00,0x00,0x01,0x00,0x54,
--	0x04,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
--	0x00,0x06,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x06,0x00,0x08,0x00,0x10,0x04,0x08,
--	0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x08,0x00,0x0d,0x00,0x0d,0x00,0xd1,0x3e,0xd0,
--	0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0x1d,0x54,0x04,0x01,0x00,0x53,0x04,0x01,
--	0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,
--	0x00,0x01,0xff,0x00,0x94,0x15,0x93,0x11,0x92,0x0d,0x91,0x09,0x10,0x05,0x01,0xff,
--	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd0,0x1e,0xcf,0x86,0x55,
--	0x04,0x01,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
--	0x00,0x0b,0x00,0x0b,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,
--	0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x92,0x08,0x11,0x04,0x01,0x00,0x0b,0x00,0x0b,
--	0x00,0xe2,0x21,0x01,0xd1,0x6c,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x94,0x14,0x93,0x10,
--	0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0x04,0x00,
--	0x04,0x00,0x04,0x00,0xcf,0x86,0x95,0x48,0xd4,0x24,0xd3,0x10,0x52,0x04,0x04,0x00,
--	0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,
--	0x04,0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0xd3,0x10,0x52,0x04,
--	0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0xd2,0x0c,0x91,0x08,
--	0x10,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0x04,0x00,
--	0xd0,0x62,0xcf,0x86,0xd5,0x28,0x94,0x24,0xd3,0x10,0x52,0x04,0x04,0x00,0x51,0x04,
--	0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,
--	0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0xd4,0x14,0x53,0x04,
--	0x04,0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,
--	0xd3,0x14,0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0x11,0x04,
--	0x04,0x00,0x00,0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,
--	0x00,0x00,0xcf,0x86,0xd5,0x38,0xd4,0x24,0xd3,0x14,0xd2,0x0c,0x91,0x08,0x10,0x04,
--	0x04,0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0x52,0x04,0x04,0x00,
--	0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0x93,0x10,0x52,0x04,0x04,0x00,
--	0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0x94,0x14,0x53,0x04,
--	0x04,0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,
--	0x04,0x00,0xd1,0x9c,0xd0,0x3e,0xcf,0x86,0x95,0x38,0xd4,0x14,0x53,0x04,0x04,0x00,
--	0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0xd3,0x14,
--	0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,
--	0x00,0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,
--	0x04,0x00,0xcf,0x86,0xd5,0x34,0xd4,0x14,0x93,0x10,0x52,0x04,0x04,0x00,0x51,0x04,
--	0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0x04,0x00,0x53,0x04,0x04,0x00,0xd2,0x0c,
--	0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,
--	0x0c,0xe6,0x10,0x04,0x0c,0xe6,0x08,0xe6,0xd4,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,
--	0x10,0x04,0x08,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x53,0x04,0x04,0x00,
--	0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0xd0,0x1a,
--	0xcf,0x86,0x95,0x14,0x54,0x04,0x08,0x00,0x53,0x04,0x08,0x00,0x92,0x08,0x11,0x04,
--	0x08,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,
--	0x04,0x00,0xd3,0x10,0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x11,0x00,
--	0x00,0x00,0x52,0x04,0x11,0x00,0x11,0x04,0x11,0x00,0x00,0x00,0xd3,0x30,0xd2,0x2a,
--	0xd1,0x24,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,
--	0x10,0x04,0x0b,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,
--	0xcf,0x06,0x04,0x00,0xcf,0x06,0x04,0x00,0xcf,0x06,0x04,0x00,0xd2,0x6c,0xd1,0x24,
--	0xd0,0x06,0xcf,0x06,0x04,0x00,0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,0x00,
--	0x93,0x10,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x0b,0x00,
--	0x0b,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x04,0x00,0x53,0x04,0x04,0x00,
--	0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x04,0x00,
--	0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,
--	0x10,0x04,0x04,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,
--	0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,0x80,0xd0,0x46,0xcf,0x86,0xd5,0x28,
--	0xd4,0x14,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x91,0x08,0x10,0x04,0x06,0x00,
--	0x00,0x00,0x06,0x00,0x93,0x10,0x52,0x04,0x06,0x00,0x91,0x08,0x10,0x04,0x06,0x09,
--	0x00,0x00,0x00,0x00,0x00,0x00,0x54,0x04,0x06,0x00,0x93,0x14,0x52,0x04,0x06,0x00,
--	0xd1,0x08,0x10,0x04,0x06,0x09,0x06,0x00,0x10,0x04,0x06,0x00,0x00,0x00,0x00,0x00,
--	0xcf,0x86,0xd5,0x10,0x54,0x04,0x06,0x00,0x93,0x08,0x12,0x04,0x06,0x00,0x00,0x00,
--	0x00,0x00,0xd4,0x14,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x91,0x08,0x10,0x04,
--	0x06,0x00,0x00,0x00,0x06,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x06,0x00,
--	0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0xd0,0x1b,0xcf,0x86,0x55,0x04,0x04,0x00,
--	0x54,0x04,0x04,0x00,0x93,0x0d,0x52,0x04,0x04,0x00,0x11,0x05,0x04,0xff,0x00,0x04,
--	0x00,0x04,0x00,0xcf,0x86,0xd5,0x24,0x54,0x04,0x04,0x00,0xd3,0x10,0x92,0x0c,0x51,
--	0x04,0x04,0x00,0x10,0x04,0x04,0x09,0x04,0x00,0x04,0x00,0x52,0x04,0x04,0x00,0x91,
--	0x08,0x10,0x04,0x04,0x00,0x07,0xe6,0x00,0x00,0xd4,0x10,0x53,0x04,0x04,0x00,0x92,
--	0x08,0x11,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x07,0x00,0x92,0x08,0x11,
--	0x04,0x07,0x00,0x00,0x00,0x00,0x00,0xe4,0xb7,0x03,0xe3,0x58,0x01,0xd2,0x8f,0xd1,
--	0x53,0xd0,0x35,0xcf,0x86,0x95,0x2f,0xd4,0x1f,0x53,0x04,0x04,0x00,0xd2,0x0d,0x51,
--	0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x04,0xff,0x00,0x51,0x05,0x04,0xff,0x00,0x10,
--	0x05,0x04,0xff,0x00,0x00,0x00,0x53,0x04,0x04,0x00,0x92,0x08,0x11,0x04,0x04,0x00,
--	0x00,0x00,0x00,0x00,0x04,0x00,0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,0x00,
--	0x53,0x04,0x04,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,0x00,0x00,
--	0x00,0x00,0xd0,0x22,0xcf,0x86,0x55,0x04,0x04,0x00,0x94,0x18,0x53,0x04,0x04,0x00,
--	0x92,0x10,0xd1,0x08,0x10,0x04,0x04,0x00,0x04,0xe4,0x10,0x04,0x0a,0x00,0x00,0x00,
--	0x00,0x00,0x0b,0x00,0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,0x0b,0x00,0x93,0x0c,
--	0x52,0x04,0x0b,0x00,0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0xd1,0x80,0xd0,0x42,
--	0xcf,0x86,0xd5,0x1c,0x54,0x04,0x07,0x00,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,
--	0xd1,0x08,0x10,0x04,0x07,0x00,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0xd4,0x0c,
--	0x53,0x04,0x07,0x00,0x12,0x04,0x07,0x00,0x00,0x00,0x53,0x04,0x07,0x00,0x92,0x10,
--	0xd1,0x08,0x10,0x04,0x07,0x00,0x07,0xde,0x10,0x04,0x07,0xe6,0x07,0xdc,0x00,0x00,
--	0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x07,0x00,
--	0x00,0x00,0x00,0x00,0x07,0x00,0x07,0x00,0x07,0x00,0xd4,0x10,0x53,0x04,0x07,0x00,
--	0x52,0x04,0x07,0x00,0x11,0x04,0x07,0x00,0x00,0x00,0x93,0x10,0x52,0x04,0x07,0x00,
--	0x91,0x08,0x10,0x04,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd0,0x1a,0xcf,0x86,
--	0x55,0x04,0x08,0x00,0x94,0x10,0x53,0x04,0x08,0x00,0x92,0x08,0x11,0x04,0x08,0x00,
--	0x0b,0x00,0x00,0x00,0x08,0x00,0xcf,0x86,0x95,0x28,0xd4,0x10,0x53,0x04,0x08,0x00,
--	0x92,0x08,0x11,0x04,0x08,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x08,0x00,0xd2,0x0c,
--	0x51,0x04,0x08,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x08,0x00,
--	0x07,0x00,0xd2,0xe4,0xd1,0x80,0xd0,0x2e,0xcf,0x86,0x95,0x28,0x54,0x04,0x08,0x00,
--	0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x08,0xe6,
--	0xd2,0x0c,0x91,0x08,0x10,0x04,0x08,0xdc,0x08,0x00,0x08,0x00,0x11,0x04,0x00,0x00,
--	0x08,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,
--	0x52,0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0xd4,0x14,
--	0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0b,0x09,0x0b,0x00,0x0b,0x00,0x0b,0x00,
--	0x0b,0x00,0xd3,0x10,0x52,0x04,0x0b,0x00,0x91,0x08,0x10,0x04,0x0b,0x00,0x0b,0xe6,
--	0x0b,0xe6,0x52,0x04,0x0b,0xe6,0xd1,0x08,0x10,0x04,0x0b,0xe6,0x00,0x00,0x10,0x04,
--	0x00,0x00,0x0b,0xdc,0xd0,0x5e,0xcf,0x86,0xd5,0x20,0xd4,0x10,0x53,0x04,0x0b,0x00,
--	0x92,0x08,0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x0b,0x00,0x92,0x08,
--	0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0xd4,0x10,0x53,0x04,0x0b,0x00,0x52,0x04,
--	0x0b,0x00,0x11,0x04,0x0b,0x00,0x00,0x00,0xd3,0x10,0x52,0x04,0x10,0xe6,0x91,0x08,
--	0x10,0x04,0x10,0xe6,0x10,0xdc,0x10,0xdc,0xd2,0x0c,0x51,0x04,0x10,0xdc,0x10,0x04,
--	0x10,0xdc,0x10,0xe6,0xd1,0x08,0x10,0x04,0x10,0xe6,0x10,0xdc,0x10,0x04,0x10,0x00,
--	0x00,0x00,0xcf,0x06,0x00,0x00,0xe1,0x1e,0x01,0xd0,0xaa,0xcf,0x86,0xd5,0x6e,0xd4,
--	0x53,0xd3,0x17,0x52,0x04,0x09,0x00,0x51,0x04,0x09,0x00,0x10,0x0b,0x09,0xff,0xe1,
--	0xac,0x85,0xe1,0xac,0xb5,0x00,0x09,0x00,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x09,0xff,
--	0xe1,0xac,0x87,0xe1,0xac,0xb5,0x00,0x09,0x00,0x10,0x0b,0x09,0xff,0xe1,0xac,0x89,
--	0xe1,0xac,0xb5,0x00,0x09,0x00,0xd1,0x0f,0x10,0x0b,0x09,0xff,0xe1,0xac,0x8b,0xe1,
--	0xac,0xb5,0x00,0x09,0x00,0x10,0x0b,0x09,0xff,0xe1,0xac,0x8d,0xe1,0xac,0xb5,0x00,
--	0x09,0x00,0x93,0x17,0x92,0x13,0x51,0x04,0x09,0x00,0x10,0x0b,0x09,0xff,0xe1,0xac,
--	0x91,0xe1,0xac,0xb5,0x00,0x09,0x00,0x09,0x00,0x09,0x00,0x54,0x04,0x09,0x00,0xd3,
--	0x10,0x52,0x04,0x09,0x00,0x91,0x08,0x10,0x04,0x09,0x07,0x09,0x00,0x09,0x00,0xd2,
--	0x13,0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x09,0xff,0xe1,0xac,0xba,0xe1,0xac,
--	0xb5,0x00,0x91,0x0f,0x10,0x04,0x09,0x00,0x09,0xff,0xe1,0xac,0xbc,0xe1,0xac,0xb5,
--	0x00,0x09,0x00,0xcf,0x86,0xd5,0x3d,0x94,0x39,0xd3,0x31,0xd2,0x25,0xd1,0x16,0x10,
--	0x0b,0x09,0xff,0xe1,0xac,0xbe,0xe1,0xac,0xb5,0x00,0x09,0xff,0xe1,0xac,0xbf,0xe1,
--	0xac,0xb5,0x00,0x10,0x04,0x09,0x00,0x09,0xff,0xe1,0xad,0x82,0xe1,0xac,0xb5,0x00,
--	0x91,0x08,0x10,0x04,0x09,0x09,0x09,0x00,0x09,0x00,0x12,0x04,0x09,0x00,0x00,0x00,
--	0x09,0x00,0xd4,0x1c,0x53,0x04,0x09,0x00,0xd2,0x0c,0x51,0x04,0x09,0x00,0x10,0x04,
--	0x09,0x00,0x09,0xe6,0x91,0x08,0x10,0x04,0x09,0xdc,0x09,0xe6,0x09,0xe6,0xd3,0x08,
--	0x12,0x04,0x09,0xe6,0x09,0x00,0x52,0x04,0x09,0x00,0x91,0x08,0x10,0x04,0x09,0x00,
--	0x00,0x00,0x00,0x00,0xd0,0x2e,0xcf,0x86,0x55,0x04,0x0a,0x00,0xd4,0x18,0x53,0x04,
--	0x0a,0x00,0xd2,0x0c,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x09,0x0d,0x09,0x11,0x04,
--	0x0d,0x00,0x0a,0x00,0x53,0x04,0x0a,0x00,0x92,0x08,0x11,0x04,0x0a,0x00,0x0d,0x00,
--	0x0d,0x00,0xcf,0x86,0x55,0x04,0x0c,0x00,0xd4,0x14,0x93,0x10,0x52,0x04,0x0c,0x00,
--	0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x07,0x0c,0x00,0x0c,0x00,0xd3,0x0c,0x92,0x08,
--	0x11,0x04,0x0c,0x00,0x0c,0x09,0x00,0x00,0x12,0x04,0x00,0x00,0x0c,0x00,0xe3,0xb2,
--	0x01,0xe2,0x09,0x01,0xd1,0x4c,0xd0,0x2a,0xcf,0x86,0x55,0x04,0x0a,0x00,0x54,0x04,
--	0x0a,0x00,0xd3,0x10,0x52,0x04,0x0a,0x00,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x00,
--	0x0a,0x07,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0a,0x00,0x0a,0x00,
--	0xcf,0x86,0x95,0x1c,0x94,0x18,0x53,0x04,0x0a,0x00,0xd2,0x08,0x11,0x04,0x0a,0x00,
--	0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,
--	0xd0,0x3a,0xcf,0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x12,0x00,0x92,0x0c,0x91,0x08,
--	0x10,0x04,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x14,0x00,0x54,0x04,0x14,0x00,
--	0x53,0x04,0x14,0x00,0xd2,0x0c,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x00,0x00,
--	0x91,0x08,0x10,0x04,0x00,0x00,0x14,0x00,0x14,0x00,0xcf,0x86,0xd5,0x2c,0xd4,0x08,
--	0x13,0x04,0x0d,0x00,0x00,0x00,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x0b,0xe6,0x10,0x04,
--	0x0b,0xe6,0x0b,0x00,0x91,0x08,0x10,0x04,0x0b,0x01,0x0b,0xdc,0x0b,0xdc,0x92,0x08,
--	0x11,0x04,0x0b,0xdc,0x0b,0xe6,0x0b,0xdc,0xd4,0x28,0xd3,0x10,0x92,0x0c,0x91,0x08,
--	0x10,0x04,0x0b,0xe6,0x0b,0x00,0x0b,0x01,0x0b,0x01,0xd2,0x0c,0x91,0x08,0x10,0x04,
--	0x0b,0x01,0x0b,0x00,0x0b,0x00,0x91,0x08,0x10,0x04,0x0b,0x00,0x0b,0xdc,0x0b,0x00,
--	0xd3,0x1c,0xd2,0x0c,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x0d,0x00,0xd1,0x08,
--	0x10,0x04,0x0d,0xe6,0x0d,0x00,0x10,0x04,0x0d,0x00,0x13,0x00,0x92,0x0c,0x51,0x04,
--	0x10,0xe6,0x10,0x04,0x15,0x00,0x00,0x00,0x00,0x00,0xd1,0x1c,0xd0,0x06,0xcf,0x06,
--	0x07,0x00,0xcf,0x86,0x55,0x04,0x07,0x00,0x94,0x0c,0x53,0x04,0x07,0x00,0x12,0x04,
--	0x07,0x00,0x08,0x00,0x08,0x00,0xd0,0x06,0xcf,0x06,0x08,0x00,0xcf,0x86,0xd5,0x40,
--	0xd4,0x2c,0xd3,0x10,0x92,0x0c,0x51,0x04,0x08,0xe6,0x10,0x04,0x08,0xdc,0x08,0xe6,
--	0x09,0xe6,0xd2,0x0c,0x51,0x04,0x09,0xe6,0x10,0x04,0x09,0xdc,0x0a,0xe6,0xd1,0x08,
--	0x10,0x04,0x0a,0xe6,0x0a,0xea,0x10,0x04,0x0a,0xd6,0x0a,0xdc,0x93,0x10,0x92,0x0c,
--	0x91,0x08,0x10,0x04,0x0a,0xca,0x0a,0xe6,0x0a,0xe6,0x0a,0xe6,0x0a,0xe6,0xd4,0x14,
--	0x93,0x10,0x52,0x04,0x0a,0xe6,0x51,0x04,0x0a,0xe6,0x10,0x04,0x0a,0xe6,0x10,0xe6,
--	0x10,0xe6,0xd3,0x10,0x52,0x04,0x10,0xe6,0x51,0x04,0x10,0xe6,0x10,0x04,0x13,0xe8,
--	0x13,0xe4,0xd2,0x10,0xd1,0x08,0x10,0x04,0x13,0xe4,0x13,0xdc,0x10,0x04,0x00,0x00,
--	0x12,0xe6,0xd1,0x08,0x10,0x04,0x0c,0xe9,0x0b,0xdc,0x10,0x04,0x09,0xe6,0x09,0xdc,
--	0xe2,0x80,0x08,0xe1,0x48,0x04,0xe0,0x1c,0x02,0xcf,0x86,0xe5,0x11,0x01,0xd4,0x84,
--	0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0xa5,0x00,0x01,0xff,
--	0x61,0xcc,0xa5,0x00,0x10,0x08,0x01,0xff,0x42,0xcc,0x87,0x00,0x01,0xff,0x62,0xcc,
--	0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x42,0xcc,0xa3,0x00,0x01,0xff,0x62,0xcc,
--	0xa3,0x00,0x10,0x08,0x01,0xff,0x42,0xcc,0xb1,0x00,0x01,0xff,0x62,0xcc,0xb1,0x00,
--	0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x43,0xcc,0xa7,0xcc,0x81,0x00,0x01,0xff,
--	0x63,0xcc,0xa7,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x44,0xcc,0x87,0x00,0x01,0xff,
--	0x64,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x44,0xcc,0xa3,0x00,0x01,0xff,
--	0x64,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x44,0xcc,0xb1,0x00,0x01,0xff,0x64,0xcc,
--	0xb1,0x00,0xd3,0x48,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x44,0xcc,0xa7,0x00,
--	0x01,0xff,0x64,0xcc,0xa7,0x00,0x10,0x08,0x01,0xff,0x44,0xcc,0xad,0x00,0x01,0xff,
--	0x64,0xcc,0xad,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x45,0xcc,0x84,0xcc,0x80,0x00,
--	0x01,0xff,0x65,0xcc,0x84,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x45,0xcc,0x84,0xcc,
--	0x81,0x00,0x01,0xff,0x65,0xcc,0x84,0xcc,0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x01,0xff,0x45,0xcc,0xad,0x00,0x01,0xff,0x65,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,
--	0x45,0xcc,0xb0,0x00,0x01,0xff,0x65,0xcc,0xb0,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,
--	0x45,0xcc,0xa7,0xcc,0x86,0x00,0x01,0xff,0x65,0xcc,0xa7,0xcc,0x86,0x00,0x10,0x08,
--	0x01,0xff,0x46,0xcc,0x87,0x00,0x01,0xff,0x66,0xcc,0x87,0x00,0xd4,0x84,0xd3,0x40,
--	0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x47,0xcc,0x84,0x00,0x01,0xff,0x67,0xcc,
--	0x84,0x00,0x10,0x08,0x01,0xff,0x48,0xcc,0x87,0x00,0x01,0xff,0x68,0xcc,0x87,0x00,
--	0xd1,0x10,0x10,0x08,0x01,0xff,0x48,0xcc,0xa3,0x00,0x01,0xff,0x68,0xcc,0xa3,0x00,
--	0x10,0x08,0x01,0xff,0x48,0xcc,0x88,0x00,0x01,0xff,0x68,0xcc,0x88,0x00,0xd2,0x20,
--	0xd1,0x10,0x10,0x08,0x01,0xff,0x48,0xcc,0xa7,0x00,0x01,0xff,0x68,0xcc,0xa7,0x00,
--	0x10,0x08,0x01,0xff,0x48,0xcc,0xae,0x00,0x01,0xff,0x68,0xcc,0xae,0x00,0xd1,0x10,
--	0x10,0x08,0x01,0xff,0x49,0xcc,0xb0,0x00,0x01,0xff,0x69,0xcc,0xb0,0x00,0x10,0x0a,
--	0x01,0xff,0x49,0xcc,0x88,0xcc,0x81,0x00,0x01,0xff,0x69,0xcc,0x88,0xcc,0x81,0x00,
--	0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x4b,0xcc,0x81,0x00,0x01,0xff,
--	0x6b,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x4b,0xcc,0xa3,0x00,0x01,0xff,0x6b,0xcc,
--	0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4b,0xcc,0xb1,0x00,0x01,0xff,0x6b,0xcc,
--	0xb1,0x00,0x10,0x08,0x01,0xff,0x4c,0xcc,0xa3,0x00,0x01,0xff,0x6c,0xcc,0xa3,0x00,
--	0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4c,0xcc,0xa3,0xcc,0x84,0x00,0x01,0xff,
--	0x6c,0xcc,0xa3,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x4c,0xcc,0xb1,0x00,0x01,0xff,
--	0x6c,0xcc,0xb1,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4c,0xcc,0xad,0x00,0x01,0xff,
--	0x6c,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x4d,0xcc,0x81,0x00,0x01,0xff,0x6d,0xcc,
--	0x81,0x00,0xcf,0x86,0xe5,0x15,0x01,0xd4,0x88,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0x4d,0xcc,0x87,0x00,0x01,0xff,0x6d,0xcc,0x87,0x00,0x10,0x08,0x01,
--	0xff,0x4d,0xcc,0xa3,0x00,0x01,0xff,0x6d,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,
--	0xff,0x4e,0xcc,0x87,0x00,0x01,0xff,0x6e,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x4e,
--	0xcc,0xa3,0x00,0x01,0xff,0x6e,0xcc,0xa3,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
--	0xff,0x4e,0xcc,0xb1,0x00,0x01,0xff,0x6e,0xcc,0xb1,0x00,0x10,0x08,0x01,0xff,0x4e,
--	0xcc,0xad,0x00,0x01,0xff,0x6e,0xcc,0xad,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,
--	0xcc,0x83,0xcc,0x81,0x00,0x01,0xff,0x6f,0xcc,0x83,0xcc,0x81,0x00,0x10,0x0a,0x01,
--	0xff,0x4f,0xcc,0x83,0xcc,0x88,0x00,0x01,0xff,0x6f,0xcc,0x83,0xcc,0x88,0x00,0xd3,
--	0x48,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x84,0xcc,0x80,0x00,0x01,
--	0xff,0x6f,0xcc,0x84,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x84,0xcc,0x81,
--	0x00,0x01,0xff,0x6f,0xcc,0x84,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x50,
--	0xcc,0x81,0x00,0x01,0xff,0x70,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x50,0xcc,0x87,
--	0x00,0x01,0xff,0x70,0xcc,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x52,
--	0xcc,0x87,0x00,0x01,0xff,0x72,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x52,0xcc,0xa3,
--	0x00,0x01,0xff,0x72,0xcc,0xa3,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x52,0xcc,0xa3,
--	0xcc,0x84,0x00,0x01,0xff,0x72,0xcc,0xa3,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x52,
--	0xcc,0xb1,0x00,0x01,0xff,0x72,0xcc,0xb1,0x00,0xd4,0x8c,0xd3,0x48,0xd2,0x20,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0x53,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x87,0x00,0x10,
--	0x08,0x01,0xff,0x53,0xcc,0xa3,0x00,0x01,0xff,0x73,0xcc,0xa3,0x00,0xd1,0x14,0x10,
--	0x0a,0x01,0xff,0x53,0xcc,0x81,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x81,0xcc,0x87,
--	0x00,0x10,0x0a,0x01,0xff,0x53,0xcc,0x8c,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x8c,
--	0xcc,0x87,0x00,0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x53,0xcc,0xa3,0xcc,0x87,
--	0x00,0x01,0xff,0x73,0xcc,0xa3,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x54,0xcc,0x87,
--	0x00,0x01,0xff,0x74,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x54,0xcc,0xa3,
--	0x00,0x01,0xff,0x74,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x54,0xcc,0xb1,0x00,0x01,
--	0xff,0x74,0xcc,0xb1,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x54,
--	0xcc,0xad,0x00,0x01,0xff,0x74,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0xa4,
--	0x00,0x01,0xff,0x75,0xcc,0xa4,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x55,0xcc,0xb0,
--	0x00,0x01,0xff,0x75,0xcc,0xb0,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0xad,0x00,0x01,
--	0xff,0x75,0xcc,0xad,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x55,0xcc,0x83,
--	0xcc,0x81,0x00,0x01,0xff,0x75,0xcc,0x83,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x55,
--	0xcc,0x84,0xcc,0x88,0x00,0x01,0xff,0x75,0xcc,0x84,0xcc,0x88,0x00,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0x56,0xcc,0x83,0x00,0x01,0xff,0x76,0xcc,0x83,0x00,0x10,0x08,0x01,
--	0xff,0x56,0xcc,0xa3,0x00,0x01,0xff,0x76,0xcc,0xa3,0x00,0xe0,0x10,0x02,0xcf,0x86,
--	0xd5,0xe1,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x57,0xcc,
--	0x80,0x00,0x01,0xff,0x77,0xcc,0x80,0x00,0x10,0x08,0x01,0xff,0x57,0xcc,0x81,0x00,
--	0x01,0xff,0x77,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x57,0xcc,0x88,0x00,
--	0x01,0xff,0x77,0xcc,0x88,0x00,0x10,0x08,0x01,0xff,0x57,0xcc,0x87,0x00,0x01,0xff,
--	0x77,0xcc,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x57,0xcc,0xa3,0x00,
--	0x01,0xff,0x77,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x58,0xcc,0x87,0x00,0x01,0xff,
--	0x78,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x58,0xcc,0x88,0x00,0x01,0xff,
--	0x78,0xcc,0x88,0x00,0x10,0x08,0x01,0xff,0x59,0xcc,0x87,0x00,0x01,0xff,0x79,0xcc,
--	0x87,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x5a,0xcc,0x82,0x00,
--	0x01,0xff,0x7a,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x5a,0xcc,0xa3,0x00,0x01,0xff,
--	0x7a,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x5a,0xcc,0xb1,0x00,0x01,0xff,
--	0x7a,0xcc,0xb1,0x00,0x10,0x08,0x01,0xff,0x68,0xcc,0xb1,0x00,0x01,0xff,0x74,0xcc,
--	0x88,0x00,0x92,0x1d,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x8a,0x00,0x01,0xff,
--	0x79,0xcc,0x8a,0x00,0x10,0x04,0x01,0x00,0x02,0xff,0xc5,0xbf,0xcc,0x87,0x00,0x0a,
--	0x00,0xd4,0x98,0xd3,0x48,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0xa3,
--	0x00,0x01,0xff,0x61,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x41,0xcc,0x89,0x00,0x01,
--	0xff,0x61,0xcc,0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x41,0xcc,0x82,0xcc,0x81,
--	0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x82,
--	0xcc,0x80,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x80,0x00,0xd2,0x28,0xd1,0x14,0x10,
--	0x0a,0x01,0xff,0x41,0xcc,0x82,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x89,
--	0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x61,0xcc,0x82,
--	0xcc,0x83,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x41,0xcc,0xa3,0xcc,0x82,0x00,0x01,
--	0xff,0x61,0xcc,0xa3,0xcc,0x82,0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x86,0xcc,0x81,
--	0x00,0x01,0xff,0x61,0xcc,0x86,0xcc,0x81,0x00,0xd3,0x50,0xd2,0x28,0xd1,0x14,0x10,
--	0x0a,0x01,0xff,0x41,0xcc,0x86,0xcc,0x80,0x00,0x01,0xff,0x61,0xcc,0x86,0xcc,0x80,
--	0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x86,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x86,
--	0xcc,0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x41,0xcc,0x86,0xcc,0x83,0x00,0x01,
--	0xff,0x61,0xcc,0x86,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0xa3,0xcc,0x86,
--	0x00,0x01,0xff,0x61,0xcc,0xa3,0xcc,0x86,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
--	0xff,0x45,0xcc,0xa3,0x00,0x01,0xff,0x65,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x45,
--	0xcc,0x89,0x00,0x01,0xff,0x65,0xcc,0x89,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x45,
--	0xcc,0x83,0x00,0x01,0xff,0x65,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x45,0xcc,0x82,
--	0xcc,0x81,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x81,0x00,0xcf,0x86,0xe5,0x31,0x01,
--	0xd4,0x90,0xd3,0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x45,0xcc,0x82,0xcc,
--	0x80,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x45,0xcc,
--	0x82,0xcc,0x89,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x89,0x00,0xd1,0x14,0x10,0x0a,
--	0x01,0xff,0x45,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x83,0x00,
--	0x10,0x0a,0x01,0xff,0x45,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,0x65,0xcc,0xa3,0xcc,
--	0x82,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x49,0xcc,0x89,0x00,0x01,0xff,
--	0x69,0xcc,0x89,0x00,0x10,0x08,0x01,0xff,0x49,0xcc,0xa3,0x00,0x01,0xff,0x69,0xcc,
--	0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0xa3,0x00,0x01,0xff,0x6f,0xcc,
--	0xa3,0x00,0x10,0x08,0x01,0xff,0x4f,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x89,0x00,
--	0xd3,0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x82,0xcc,0x81,0x00,
--	0x01,0xff,0x6f,0xcc,0x82,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x82,0xcc,
--	0x80,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x80,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,
--	0x4f,0xcc,0x82,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x89,0x00,0x10,0x0a,
--	0x01,0xff,0x4f,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x83,0x00,
--	0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,
--	0x6f,0xcc,0xa3,0xcc,0x82,0x00,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x9b,0xcc,0x81,0x00,
--	0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x81,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,
--	0x9b,0xcc,0x80,0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,
--	0x4f,0xcc,0x9b,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x89,0x00,0xd4,0x98,
--	0xd3,0x48,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x9b,0xcc,0x83,0x00,
--	0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x9b,0xcc,
--	0xa3,0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
--	0x55,0xcc,0xa3,0x00,0x01,0xff,0x75,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,
--	0x89,0x00,0x01,0xff,0x75,0xcc,0x89,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,
--	0x55,0xcc,0x9b,0xcc,0x81,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x81,0x00,0x10,0x0a,
--	0x01,0xff,0x55,0xcc,0x9b,0xcc,0x80,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x80,0x00,
--	0xd1,0x14,0x10,0x0a,0x01,0xff,0x55,0xcc,0x9b,0xcc,0x89,0x00,0x01,0xff,0x75,0xcc,
--	0x9b,0xcc,0x89,0x00,0x10,0x0a,0x01,0xff,0x55,0xcc,0x9b,0xcc,0x83,0x00,0x01,0xff,
--	0x75,0xcc,0x9b,0xcc,0x83,0x00,0xd3,0x44,0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,
--	0x55,0xcc,0x9b,0xcc,0xa3,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0xa3,0x00,0x10,0x08,
--	0x01,0xff,0x59,0xcc,0x80,0x00,0x01,0xff,0x79,0xcc,0x80,0x00,0xd1,0x10,0x10,0x08,
--	0x01,0xff,0x59,0xcc,0xa3,0x00,0x01,0xff,0x79,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,
--	0x59,0xcc,0x89,0x00,0x01,0xff,0x79,0xcc,0x89,0x00,0x92,0x14,0x91,0x10,0x10,0x08,
--	0x01,0xff,0x59,0xcc,0x83,0x00,0x01,0xff,0x79,0xcc,0x83,0x00,0x0a,0x00,0x0a,0x00,
--	0xe1,0xc0,0x04,0xe0,0x80,0x02,0xcf,0x86,0xe5,0x2d,0x01,0xd4,0xa8,0xd3,0x54,0xd2,
--	0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x93,0x00,0x01,0xff,0xce,0xb1,
--	0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,
--	0xce,0xb1,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,
--	0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,
--	0xff,0xce,0xb1,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcd,0x82,
--	0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x91,0xcc,0x93,0x00,0x01,0xff,
--	0xce,0x91,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0x91,0xcc,0x93,0xcc,0x80,0x00,
--	0x01,0xff,0xce,0x91,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,
--	0x91,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0x91,0xcc,0x94,0xcc,0x81,0x00,0x10,
--	0x0b,0x01,0xff,0xce,0x91,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0x91,0xcc,0x94,
--	0xcd,0x82,0x00,0xd3,0x42,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb5,0xcc,
--	0x93,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb5,0xcc,
--	0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0xcc,0x80,0x00,0x91,0x16,0x10,
--	0x0b,0x01,0xff,0xce,0xb5,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,
--	0xcc,0x81,0x00,0x00,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x95,0xcc,
--	0x93,0x00,0x01,0xff,0xce,0x95,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0x95,0xcc,
--	0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0x95,0xcc,0x94,0xcc,0x80,0x00,0x91,0x16,0x10,
--	0x0b,0x01,0xff,0xce,0x95,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0x95,0xcc,0x94,
--	0xcc,0x81,0x00,0x00,0x00,0xd4,0xa8,0xd3,0x54,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,
--	0xff,0xce,0xb7,0xcc,0x93,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0x00,0x10,0x0b,0x01,
--	0xff,0xce,0xb7,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,
--	0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,
--	0xce,0xb7,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,
--	0x82,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x82,0x00,0xd2,0x28,0xd1,0x12,0x10,
--	0x09,0x01,0xff,0xce,0x97,0xcc,0x93,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0x00,0x10,
--	0x0b,0x01,0xff,0xce,0x97,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,
--	0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0x97,0xcc,0x93,0xcc,0x81,0x00,
--	0x01,0xff,0xce,0x97,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xce,0x97,0xcc,
--	0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcd,0x82,0x00,0xd3,0x54,0xd2,
--	0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x93,0x00,0x01,0xff,0xce,0xb9,
--	0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,
--	0xce,0xb9,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,
--	0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,
--	0xff,0xce,0xb9,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0xcd,0x82,
--	0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x99,0xcc,0x93,0x00,0x01,0xff,
--	0xce,0x99,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0x99,0xcc,0x93,0xcc,0x80,0x00,
--	0x01,0xff,0xce,0x99,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,
--	0x99,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0x99,0xcc,0x94,0xcc,0x81,0x00,0x10,
--	0x0b,0x01,0xff,0xce,0x99,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0x99,0xcc,0x94,
--	0xcd,0x82,0x00,0xcf,0x86,0xe5,0x13,0x01,0xd4,0x84,0xd3,0x42,0xd2,0x28,0xd1,0x12,
--	0x10,0x09,0x01,0xff,0xce,0xbf,0xcc,0x93,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,0x00,
--	0x10,0x0b,0x01,0xff,0xce,0xbf,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xbf,0xcc,
--	0x94,0xcc,0x80,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xce,0xbf,0xcc,0x93,0xcc,0x81,
--	0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,0xcc,0x81,0x00,0x00,0x00,0xd2,0x28,0xd1,0x12,
--	0x10,0x09,0x01,0xff,0xce,0x9f,0xcc,0x93,0x00,0x01,0xff,0xce,0x9f,0xcc,0x94,0x00,
--	0x10,0x0b,0x01,0xff,0xce,0x9f,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0x9f,0xcc,
--	0x94,0xcc,0x80,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xce,0x9f,0xcc,0x93,0xcc,0x81,
--	0x00,0x01,0xff,0xce,0x9f,0xcc,0x94,0xcc,0x81,0x00,0x00,0x00,0xd3,0x54,0xd2,0x28,
--	0xd1,0x12,0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x93,0x00,0x01,0xff,0xcf,0x85,0xcc,
--	0x94,0x00,0x10,0x0b,0x01,0xff,0xcf,0x85,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xcf,
--	0x85,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x85,0xcc,0x93,
--	0xcc,0x81,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,
--	0xcf,0x85,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcd,0x82,0x00,
--	0xd2,0x1c,0xd1,0x0d,0x10,0x04,0x00,0x00,0x01,0xff,0xce,0xa5,0xcc,0x94,0x00,0x10,
--	0x04,0x00,0x00,0x01,0xff,0xce,0xa5,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x0f,0x10,0x04,
--	0x00,0x00,0x01,0xff,0xce,0xa5,0xcc,0x94,0xcc,0x81,0x00,0x10,0x04,0x00,0x00,0x01,
--	0xff,0xce,0xa5,0xcc,0x94,0xcd,0x82,0x00,0xd4,0xa8,0xd3,0x54,0xd2,0x28,0xd1,0x12,
--	0x10,0x09,0x01,0xff,0xcf,0x89,0xcc,0x93,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0x00,
--	0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xcf,0x89,0xcc,
--	0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x81,
--	0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xcf,0x89,
--	0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcd,0x82,0x00,0xd2,0x28,
--	0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xa9,0xcc,0x93,0x00,0x01,0xff,0xce,0xa9,0xcc,
--	0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,
--	0xa9,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xa9,0xcc,0x93,
--	0xcc,0x81,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,
--	0xce,0xa9,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,0xcd,0x82,0x00,
--	0xd3,0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x80,0x00,0x01,
--	0xff,0xce,0xb1,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb5,0xcc,0x80,0x00,0x01,
--	0xff,0xce,0xb5,0xcc,0x81,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb7,0xcc,0x80,
--	0x00,0x01,0xff,0xce,0xb7,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x80,
--	0x00,0x01,0xff,0xce,0xb9,0xcc,0x81,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,
--	0xce,0xbf,0xcc,0x80,0x00,0x01,0xff,0xce,0xbf,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,
--	0xcf,0x85,0xcc,0x80,0x00,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,0x91,0x12,0x10,0x09,
--	0x01,0xff,0xcf,0x89,0xcc,0x80,0x00,0x01,0xff,0xcf,0x89,0xcc,0x81,0x00,0x00,0x00,
--	0xe0,0xe1,0x02,0xcf,0x86,0xe5,0x91,0x01,0xd4,0xc8,0xd3,0x64,0xd2,0x30,0xd1,0x16,
--	0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcd,0x85,0x00,0x01,0xff,0xce,0xb1,0xcc,
--	0x94,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0xcd,0x85,
--	0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x80,0xcd,0x85,0x00,0xd1,0x1a,0x10,0x0d,
--	0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,0x01,0xff,0xce,0xb1,0xcc,
--	0x94,0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcd,0x82,
--	0xcd,0x85,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x30,
--	0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0x91,0xcc,0x93,0xcd,0x85,0x00,0x01,0xff,0xce,
--	0x91,0xcc,0x94,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0x91,0xcc,0x93,0xcc,0x80,
--	0xcd,0x85,0x00,0x01,0xff,0xce,0x91,0xcc,0x94,0xcc,0x80,0xcd,0x85,0x00,0xd1,0x1a,
--	0x10,0x0d,0x01,0xff,0xce,0x91,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,0x01,0xff,0xce,
--	0x91,0xcc,0x94,0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0x91,0xcc,0x93,
--	0xcd,0x82,0xcd,0x85,0x00,0x01,0xff,0xce,0x91,0xcc,0x94,0xcd,0x82,0xcd,0x85,0x00,
--	0xd3,0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,0x85,
--	0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,
--	0xcc,0x93,0xcc,0x80,0xcd,0x85,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,0xcd,
--	0x85,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x81,0xcd,0x85,
--	0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,
--	0xce,0xb7,0xcc,0x93,0xcd,0x82,0xcd,0x85,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,
--	0x82,0xcd,0x85,0x00,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0x97,0xcc,0x93,
--	0xcd,0x85,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,
--	0xce,0x97,0xcc,0x93,0xcc,0x80,0xcd,0x85,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcc,
--	0x80,0xcd,0x85,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,0x97,0xcc,0x93,0xcc,0x81,
--	0xcd,0x85,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,
--	0x01,0xff,0xce,0x97,0xcc,0x93,0xcd,0x82,0xcd,0x85,0x00,0x01,0xff,0xce,0x97,0xcc,
--	0x94,0xcd,0x82,0xcd,0x85,0x00,0xd4,0xc8,0xd3,0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,
--	0x01,0xff,0xcf,0x89,0xcc,0x93,0xcd,0x85,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcd,
--	0x85,0x00,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x80,0xcd,0x85,0x00,0x01,
--	0xff,0xcf,0x89,0xcc,0x94,0xcc,0x80,0xcd,0x85,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,
--	0xcf,0x89,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,
--	0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcd,0x82,0xcd,0x85,
--	0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x30,0xd1,0x16,
--	0x10,0x0b,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcd,0x85,0x00,0x01,0xff,0xce,0xa9,0xcc,
--	0x94,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcc,0x80,0xcd,0x85,
--	0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,0xcc,0x80,0xcd,0x85,0x00,0xd1,0x1a,0x10,0x0d,
--	0x01,0xff,0xce,0xa9,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,0x01,0xff,0xce,0xa9,0xcc,
--	0x94,0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcd,0x82,
--	0xcd,0x85,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,0xcd,0x82,0xcd,0x85,0x00,0xd3,0x49,
--	0xd2,0x26,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x86,0x00,0x01,0xff,0xce,
--	0xb1,0xcc,0x84,0x00,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x80,0xcd,0x85,0x00,0x01,
--	0xff,0xce,0xb1,0xcd,0x85,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x81,
--	0xcd,0x85,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xce,0xb1,0xcd,0x82,0x00,0x01,0xff,
--	0xce,0xb1,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,
--	0x91,0xcc,0x86,0x00,0x01,0xff,0xce,0x91,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,0xce,
--	0x91,0xcc,0x80,0x00,0x01,0xff,0xce,0x91,0xcc,0x81,0x00,0xd1,0x0d,0x10,0x09,0x01,
--	0xff,0xce,0x91,0xcd,0x85,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xce,0xb9,0x00,0x01,
--	0x00,0xcf,0x86,0xe5,0x16,0x01,0xd4,0x8f,0xd3,0x44,0xd2,0x21,0xd1,0x0d,0x10,0x04,
--	0x01,0x00,0x01,0xff,0xc2,0xa8,0xcd,0x82,0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,
--	0x80,0xcd,0x85,0x00,0x01,0xff,0xce,0xb7,0xcd,0x85,0x00,0xd1,0x0f,0x10,0x0b,0x01,
--	0xff,0xce,0xb7,0xcc,0x81,0xcd,0x85,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xce,0xb7,
--	0xcd,0x82,0x00,0x01,0xff,0xce,0xb7,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x24,0xd1,0x12,
--	0x10,0x09,0x01,0xff,0xce,0x95,0xcc,0x80,0x00,0x01,0xff,0xce,0x95,0xcc,0x81,0x00,
--	0x10,0x09,0x01,0xff,0xce,0x97,0xcc,0x80,0x00,0x01,0xff,0xce,0x97,0xcc,0x81,0x00,
--	0xd1,0x13,0x10,0x09,0x01,0xff,0xce,0x97,0xcd,0x85,0x00,0x01,0xff,0xe1,0xbe,0xbf,
--	0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0xe1,0xbe,0xbf,0xcc,0x81,0x00,0x01,0xff,0xe1,
--	0xbe,0xbf,0xcd,0x82,0x00,0xd3,0x40,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,
--	0xb9,0xcc,0x86,0x00,0x01,0xff,0xce,0xb9,0xcc,0x84,0x00,0x10,0x0b,0x01,0xff,0xce,
--	0xb9,0xcc,0x88,0xcc,0x80,0x00,0x01,0xff,0xce,0xb9,0xcc,0x88,0xcc,0x81,0x00,0x51,
--	0x04,0x00,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,0xcd,0x82,0x00,0x01,0xff,0xce,0xb9,
--	0xcc,0x88,0xcd,0x82,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x99,0xcc,
--	0x86,0x00,0x01,0xff,0xce,0x99,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,0xce,0x99,0xcc,
--	0x80,0x00,0x01,0xff,0xce,0x99,0xcc,0x81,0x00,0xd1,0x0e,0x10,0x04,0x00,0x00,0x01,
--	0xff,0xe1,0xbf,0xbe,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0xe1,0xbf,0xbe,0xcc,0x81,
--	0x00,0x01,0xff,0xe1,0xbf,0xbe,0xcd,0x82,0x00,0xd4,0x93,0xd3,0x4e,0xd2,0x28,0xd1,
--	0x12,0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x86,0x00,0x01,0xff,0xcf,0x85,0xcc,0x84,
--	0x00,0x10,0x0b,0x01,0xff,0xcf,0x85,0xcc,0x88,0xcc,0x80,0x00,0x01,0xff,0xcf,0x85,
--	0xcc,0x88,0xcc,0x81,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xcf,0x81,0xcc,0x93,0x00,
--	0x01,0xff,0xcf,0x81,0xcc,0x94,0x00,0x10,0x09,0x01,0xff,0xcf,0x85,0xcd,0x82,0x00,
--	0x01,0xff,0xcf,0x85,0xcc,0x88,0xcd,0x82,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,
--	0xff,0xce,0xa5,0xcc,0x86,0x00,0x01,0xff,0xce,0xa5,0xcc,0x84,0x00,0x10,0x09,0x01,
--	0xff,0xce,0xa5,0xcc,0x80,0x00,0x01,0xff,0xce,0xa5,0xcc,0x81,0x00,0xd1,0x12,0x10,
--	0x09,0x01,0xff,0xce,0xa1,0xcc,0x94,0x00,0x01,0xff,0xc2,0xa8,0xcc,0x80,0x00,0x10,
--	0x09,0x01,0xff,0xc2,0xa8,0xcc,0x81,0x00,0x01,0xff,0x60,0x00,0xd3,0x3b,0xd2,0x18,
--	0x51,0x04,0x00,0x00,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x80,0xcd,0x85,0x00,0x01,
--	0xff,0xcf,0x89,0xcd,0x85,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x81,
--	0xcd,0x85,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xcf,0x89,0xcd,0x82,0x00,0x01,0xff,
--	0xcf,0x89,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,
--	0x9f,0xcc,0x80,0x00,0x01,0xff,0xce,0x9f,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,
--	0xa9,0xcc,0x80,0x00,0x01,0xff,0xce,0xa9,0xcc,0x81,0x00,0xd1,0x10,0x10,0x09,0x01,
--	0xff,0xce,0xa9,0xcd,0x85,0x00,0x01,0xff,0xc2,0xb4,0x00,0x10,0x04,0x01,0x00,0x00,
--	0x00,0xe0,0x7e,0x0c,0xcf,0x86,0xe5,0xbb,0x08,0xe4,0x14,0x06,0xe3,0xf7,0x02,0xe2,
--	0xbd,0x01,0xd1,0xd0,0xd0,0x4f,0xcf,0x86,0xd5,0x2e,0x94,0x2a,0xd3,0x18,0x92,0x14,
--	0x91,0x10,0x10,0x08,0x01,0xff,0xe2,0x80,0x82,0x00,0x01,0xff,0xe2,0x80,0x83,0x00,
--	0x01,0x00,0x01,0x00,0x92,0x0d,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xff,
--	0x00,0x01,0xff,0x00,0x01,0x00,0x94,0x1b,0x53,0x04,0x01,0x00,0xd2,0x09,0x11,0x04,
--	0x01,0x00,0x01,0xff,0x00,0x51,0x05,0x01,0xff,0x00,0x10,0x05,0x01,0xff,0x00,0x04,
--	0x00,0x01,0x00,0xcf,0x86,0xd5,0x48,0xd4,0x1c,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,
--	0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x06,0x00,0x52,0x04,0x04,0x00,0x11,0x04,0x04,
--	0x00,0x06,0x00,0xd3,0x1c,0xd2,0x0c,0x51,0x04,0x06,0x00,0x10,0x04,0x06,0x00,0x07,
--	0x00,0xd1,0x08,0x10,0x04,0x07,0x00,0x08,0x00,0x10,0x04,0x08,0x00,0x06,0x00,0x52,
--	0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x06,0x00,0xd4,0x23,0xd3,
--	0x14,0x52,0x05,0x06,0xff,0x00,0x91,0x0a,0x10,0x05,0x0a,0xff,0x00,0x00,0xff,0x00,
--	0x0f,0xff,0x00,0x92,0x0a,0x11,0x05,0x0f,0xff,0x00,0x01,0xff,0x00,0x01,0xff,0x00,
--	0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x06,0x00,0x00,0x00,0x01,0x00,
--	0x01,0x00,0xd0,0x7e,0xcf,0x86,0xd5,0x34,0xd4,0x14,0x53,0x04,0x01,0x00,0x52,0x04,
--	0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0xd3,0x10,0x52,0x04,
--	0x08,0x00,0x91,0x08,0x10,0x04,0x08,0x00,0x0c,0x00,0x0c,0x00,0x52,0x04,0x0c,0x00,
--	0x91,0x08,0x10,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,0xd4,0x1c,0x53,0x04,0x01,0x00,
--	0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x02,0x00,0x91,0x08,0x10,0x04,
--	0x03,0x00,0x04,0x00,0x04,0x00,0xd3,0x10,0xd2,0x08,0x11,0x04,0x06,0x00,0x08,0x00,
--	0x11,0x04,0x08,0x00,0x0b,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x0b,0x00,0x0c,0x00,
--	0x10,0x04,0x0e,0x00,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x11,0x00,0x13,0x00,
--	0xcf,0x86,0xd5,0x28,0x54,0x04,0x00,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,0x01,0xe6,
--	0x01,0x01,0x01,0xe6,0xd2,0x0c,0x51,0x04,0x01,0x01,0x10,0x04,0x01,0x01,0x01,0xe6,
--	0x91,0x08,0x10,0x04,0x01,0xe6,0x01,0x00,0x01,0x00,0xd4,0x30,0xd3,0x1c,0xd2,0x0c,
--	0x91,0x08,0x10,0x04,0x01,0x00,0x01,0xe6,0x04,0x00,0xd1,0x08,0x10,0x04,0x06,0x00,
--	0x06,0x01,0x10,0x04,0x06,0x01,0x06,0xe6,0x92,0x10,0xd1,0x08,0x10,0x04,0x06,0xdc,
--	0x06,0xe6,0x10,0x04,0x06,0x01,0x08,0x01,0x09,0xdc,0x93,0x10,0x92,0x0c,0x91,0x08,
--	0x10,0x04,0x0a,0xe6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,0x81,0xd0,0x4f,
--	0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x29,0xd3,0x13,0x52,0x04,0x01,0x00,0x51,0x04,
--	0x01,0x00,0x10,0x07,0x01,0xff,0xce,0xa9,0x00,0x01,0x00,0x92,0x12,0x51,0x04,0x01,
--	0x00,0x10,0x06,0x01,0xff,0x4b,0x00,0x01,0xff,0x41,0xcc,0x8a,0x00,0x01,0x00,0x53,
--	0x04,0x01,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x04,0x00,0x10,0x04,0x04,
--	0x00,0x07,0x00,0x91,0x08,0x10,0x04,0x08,0x00,0x06,0x00,0x06,0x00,0xcf,0x86,0x95,
--	0x2c,0xd4,0x18,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0xd1,0x08,0x10,0x04,0x08,
--	0x00,0x09,0x00,0x10,0x04,0x09,0x00,0x0a,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x0b,
--	0x00,0x10,0x04,0x0b,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd0,0x68,0xcf,
--	0x86,0xd5,0x48,0xd4,0x28,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
--	0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,0x92,0x0c,0x91,
--	0x08,0x10,0x04,0x0a,0x00,0x0b,0x00,0x11,0x00,0x00,0x00,0x53,0x04,0x01,0x00,0x92,
--	0x18,0x51,0x04,0x01,0x00,0x10,0x0a,0x01,0xff,0xe2,0x86,0x90,0xcc,0xb8,0x00,0x01,
--	0xff,0xe2,0x86,0x92,0xcc,0xb8,0x00,0x01,0x00,0x94,0x1a,0x53,0x04,0x01,0x00,0x52,
--	0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x0a,0x01,0xff,0xe2,0x86,0x94,0xcc,0xb8,
--	0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x2e,0x94,0x2a,0x53,0x04,0x01,0x00,0x52,
--	0x04,0x01,0x00,0xd1,0x0e,0x10,0x04,0x01,0x00,0x01,0xff,0xe2,0x87,0x90,0xcc,0xb8,
--	0x00,0x10,0x0a,0x01,0xff,0xe2,0x87,0x94,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x87,0x92,
--	0xcc,0xb8,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x51,0x04,0x01,
--	0x00,0x10,0x04,0x01,0x00,0x04,0x00,0x04,0x00,0x93,0x08,0x12,0x04,0x04,0x00,0x06,
--	0x00,0x06,0x00,0xe2,0x38,0x02,0xe1,0x3f,0x01,0xd0,0x68,0xcf,0x86,0xd5,0x3e,0x94,
--	0x3a,0xd3,0x16,0x52,0x04,0x01,0x00,0x91,0x0e,0x10,0x0a,0x01,0xff,0xe2,0x88,0x83,
--	0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0xd2,0x12,0x91,0x0e,0x10,0x04,0x01,0x00,0x01,
--	0xff,0xe2,0x88,0x88,0xcc,0xb8,0x00,0x01,0x00,0x91,0x0e,0x10,0x0a,0x01,0xff,0xe2,
--	0x88,0x8b,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x24,0x93,0x20,0x52,
--	0x04,0x01,0x00,0xd1,0x0e,0x10,0x0a,0x01,0xff,0xe2,0x88,0xa3,0xcc,0xb8,0x00,0x01,
--	0x00,0x10,0x0a,0x01,0xff,0xe2,0x88,0xa5,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x01,
--	0x00,0xcf,0x86,0xd5,0x48,0x94,0x44,0xd3,0x2e,0xd2,0x12,0x91,0x0e,0x10,0x04,0x01,
--	0x00,0x01,0xff,0xe2,0x88,0xbc,0xcc,0xb8,0x00,0x01,0x00,0xd1,0x0e,0x10,0x0a,0x01,
--	0xff,0xe2,0x89,0x83,0xcc,0xb8,0x00,0x01,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xe2,
--	0x89,0x85,0xcc,0xb8,0x00,0x92,0x12,0x91,0x0e,0x10,0x04,0x01,0x00,0x01,0xff,0xe2,
--	0x89,0x88,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x40,0xd3,0x1e,0x92,
--	0x1a,0xd1,0x0c,0x10,0x08,0x01,0xff,0x3d,0xcc,0xb8,0x00,0x01,0x00,0x10,0x0a,0x01,
--	0xff,0xe2,0x89,0xa1,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,
--	0x0e,0x10,0x04,0x01,0x00,0x01,0xff,0xe2,0x89,0x8d,0xcc,0xb8,0x00,0x10,0x08,0x01,
--	0xff,0x3c,0xcc,0xb8,0x00,0x01,0xff,0x3e,0xcc,0xb8,0x00,0xd3,0x30,0xd2,0x18,0x91,
--	0x14,0x10,0x0a,0x01,0xff,0xe2,0x89,0xa4,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x89,0xa5,
--	0xcc,0xb8,0x00,0x01,0x00,0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x89,0xb2,0xcc,0xb8,
--	0x00,0x01,0xff,0xe2,0x89,0xb3,0xcc,0xb8,0x00,0x01,0x00,0x92,0x18,0x91,0x14,0x10,
--	0x0a,0x01,0xff,0xe2,0x89,0xb6,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x89,0xb7,0xcc,0xb8,
--	0x00,0x01,0x00,0x01,0x00,0xd0,0x86,0xcf,0x86,0xd5,0x50,0x94,0x4c,0xd3,0x30,0xd2,
--	0x18,0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x89,0xba,0xcc,0xb8,0x00,0x01,0xff,0xe2,
--	0x89,0xbb,0xcc,0xb8,0x00,0x01,0x00,0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x8a,0x82,
--	0xcc,0xb8,0x00,0x01,0xff,0xe2,0x8a,0x83,0xcc,0xb8,0x00,0x01,0x00,0x92,0x18,0x91,
--	0x14,0x10,0x0a,0x01,0xff,0xe2,0x8a,0x86,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x8a,0x87,
--	0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x30,0x53,0x04,0x01,0x00,0x52,
--	0x04,0x01,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0xe2,0x8a,0xa2,0xcc,0xb8,0x00,0x01,
--	0xff,0xe2,0x8a,0xa8,0xcc,0xb8,0x00,0x10,0x0a,0x01,0xff,0xe2,0x8a,0xa9,0xcc,0xb8,
--	0x00,0x01,0xff,0xe2,0x8a,0xab,0xcc,0xb8,0x00,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,
--	0x00,0xd4,0x5c,0xd3,0x2c,0x92,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0xe2,0x89,0xbc,
--	0xcc,0xb8,0x00,0x01,0xff,0xe2,0x89,0xbd,0xcc,0xb8,0x00,0x10,0x0a,0x01,0xff,0xe2,
--	0x8a,0x91,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x8a,0x92,0xcc,0xb8,0x00,0x01,0x00,0xd2,
--	0x18,0x51,0x04,0x01,0x00,0x10,0x0a,0x01,0xff,0xe2,0x8a,0xb2,0xcc,0xb8,0x00,0x01,
--	0xff,0xe2,0x8a,0xb3,0xcc,0xb8,0x00,0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x8a,0xb4,
--	0xcc,0xb8,0x00,0x01,0xff,0xe2,0x8a,0xb5,0xcc,0xb8,0x00,0x01,0x00,0x93,0x0c,0x92,
--	0x08,0x11,0x04,0x01,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0xd1,0x64,0xd0,0x3e,0xcf,
--	0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x04,
--	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x20,0x53,0x04,0x01,0x00,0x92,
--	0x18,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x80,0x88,0x00,0x10,0x08,0x01,
--	0xff,0xe3,0x80,0x89,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,
--	0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,
--	0x04,0x01,0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x06,0x00,0x04,0x00,0x04,0x00,0xd0,
--	0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x04,0x00,0x53,0x04,0x04,0x00,0x92,0x0c,0x51,
--	0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0xcf,0x86,0xd5,
--	0x2c,0xd4,0x14,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x51,0x04,0x06,0x00,0x10,
--	0x04,0x06,0x00,0x07,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x07,0x00,0x08,
--	0x00,0x08,0x00,0x08,0x00,0x12,0x04,0x08,0x00,0x09,0x00,0xd4,0x14,0x53,0x04,0x09,
--	0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x0b,0x00,0x0c,0x00,0x0c,0x00,0x0c,0x00,0xd3,
--	0x08,0x12,0x04,0x0c,0x00,0x10,0x00,0xd2,0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x10,
--	0x00,0x12,0x00,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x13,0x00,0xd3,0xa6,0xd2,
--	0x74,0xd1,0x40,0xd0,0x22,0xcf,0x86,0x55,0x04,0x01,0x00,0x94,0x18,0x93,0x14,0x52,
--	0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x04,0x00,0x10,0x04,0x04,0x00,0x00,
--	0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0x95,0x18,0x94,0x14,0x53,0x04,0x01,0x00,0x92,
--	0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
--	0x00,0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x14,0x53,
--	0x04,0x01,0x00,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x06,0x00,0x06,
--	0x00,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x51,0x04,0x06,0x00,0x10,0x04,0x06,
--	0x00,0x07,0x00,0xd1,0x06,0xcf,0x06,0x01,0x00,0xd0,0x1a,0xcf,0x86,0x95,0x14,0x54,
--	0x04,0x01,0x00,0x93,0x0c,0x52,0x04,0x01,0x00,0x11,0x04,0x01,0x00,0x06,0x00,0x06,
--	0x00,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0x13,0x04,0x04,
--	0x00,0x06,0x00,0xd2,0xdc,0xd1,0x48,0xd0,0x26,0xcf,0x86,0x95,0x20,0x54,0x04,0x01,
--	0x00,0xd3,0x0c,0x52,0x04,0x01,0x00,0x11,0x04,0x07,0x00,0x06,0x00,0x92,0x0c,0x91,
--	0x08,0x10,0x04,0x08,0x00,0x04,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0x55,
--	0x04,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,0x04,0x00,0x06,
--	0x00,0x06,0x00,0x52,0x04,0x06,0x00,0x11,0x04,0x06,0x00,0x08,0x00,0xd0,0x5e,0xcf,
--	0x86,0xd5,0x2c,0xd4,0x10,0x53,0x04,0x06,0x00,0x92,0x08,0x11,0x04,0x06,0x00,0x07,
--	0x00,0x07,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,0x07,0x00,0x08,0x00,0x08,0x00,0x52,
--	0x04,0x08,0x00,0x91,0x08,0x10,0x04,0x08,0x00,0x0a,0x00,0x0b,0x00,0xd4,0x10,0x93,
--	0x0c,0x92,0x08,0x11,0x04,0x07,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0xd3,0x10,0x92,
--	0x0c,0x51,0x04,0x08,0x00,0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,0x52,0x04,0x0a,
--	0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x0b,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x1c,0x94,
--	0x18,0xd3,0x08,0x12,0x04,0x0a,0x00,0x0b,0x00,0x52,0x04,0x0b,0x00,0x51,0x04,0x0b,
--	0x00,0x10,0x04,0x0c,0x00,0x0b,0x00,0x0b,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x51,
--	0x04,0x0b,0x00,0x10,0x04,0x0c,0x00,0x0b,0x00,0x0c,0x00,0x0b,0x00,0x0b,0x00,0xd1,
--	0xa8,0xd0,0x42,0xcf,0x86,0xd5,0x28,0x94,0x24,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,
--	0x04,0x10,0x00,0x01,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x0c,0x00,0x01,
--	0x00,0x92,0x08,0x11,0x04,0x01,0x00,0x0c,0x00,0x01,0x00,0x01,0x00,0x94,0x14,0x53,
--	0x04,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x0c,0x00,0x01,0x00,0x01,0x00,0x01,
--	0x00,0x01,0x00,0xcf,0x86,0xd5,0x40,0xd4,0x18,0x53,0x04,0x01,0x00,0x52,0x04,0x01,
--	0x00,0xd1,0x08,0x10,0x04,0x0c,0x00,0x01,0x00,0x10,0x04,0x0c,0x00,0x01,0x00,0xd3,
--	0x18,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x0c,0x00,0x51,0x04,0x0c,
--	0x00,0x10,0x04,0x01,0x00,0x0b,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,
--	0x04,0x01,0x00,0x0c,0x00,0xd4,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0c,
--	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x06,0x00,0x93,0x0c,0x52,0x04,0x06,0x00,0x11,
--	0x04,0x06,0x00,0x01,0x00,0x01,0x00,0xd0,0x3e,0xcf,0x86,0xd5,0x18,0x54,0x04,0x01,
--	0x00,0x93,0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x0c,0x00,0x0c,
--	0x00,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0c,
--	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,
--	0x04,0x01,0x00,0x0c,0x00,0xcf,0x86,0xd5,0x2c,0x94,0x28,0xd3,0x10,0x52,0x04,0x08,
--	0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x09,0x00,0xd2,0x0c,0x51,0x04,0x09,
--	0x00,0x10,0x04,0x09,0x00,0x0d,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x0d,0x00,0x0c,
--	0x00,0x06,0x00,0x94,0x0c,0x53,0x04,0x06,0x00,0x12,0x04,0x06,0x00,0x0a,0x00,0x06,
--	0x00,0xe4,0x39,0x01,0xd3,0x0c,0xd2,0x06,0xcf,0x06,0x04,0x00,0xcf,0x06,0x06,0x00,
--	0xd2,0x30,0xd1,0x06,0xcf,0x06,0x06,0x00,0xd0,0x06,0xcf,0x06,0x06,0x00,0xcf,0x86,
--	0x95,0x1e,0x54,0x04,0x06,0x00,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x91,0x0e,
--	0x10,0x0a,0x06,0xff,0xe2,0xab,0x9d,0xcc,0xb8,0x00,0x06,0x00,0x06,0x00,0x06,0x00,
--	0xd1,0x80,0xd0,0x3a,0xcf,0x86,0xd5,0x28,0xd4,0x10,0x53,0x04,0x07,0x00,0x52,0x04,
--	0x07,0x00,0x11,0x04,0x07,0x00,0x08,0x00,0xd3,0x08,0x12,0x04,0x08,0x00,0x09,0x00,
--	0x92,0x0c,0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,0x94,0x0c,
--	0x93,0x08,0x12,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0xcf,0x86,0xd5,0x30,
--	0xd4,0x14,0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,
--	0x10,0x00,0x10,0x00,0xd3,0x10,0x52,0x04,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,
--	0x0b,0x00,0x0b,0x00,0x92,0x08,0x11,0x04,0x0b,0x00,0x10,0x00,0x10,0x00,0x54,0x04,
--	0x10,0x00,0x93,0x0c,0x52,0x04,0x10,0x00,0x11,0x04,0x00,0x00,0x10,0x00,0x10,0x00,
--	0xd0,0x32,0xcf,0x86,0xd5,0x14,0x54,0x04,0x10,0x00,0x93,0x0c,0x52,0x04,0x10,0x00,
--	0x11,0x04,0x10,0x00,0x00,0x00,0x10,0x00,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,
--	0xd2,0x08,0x11,0x04,0x10,0x00,0x14,0x00,0x91,0x08,0x10,0x04,0x14,0x00,0x10,0x00,
--	0x10,0x00,0xcf,0x86,0xd5,0x28,0xd4,0x14,0x53,0x04,0x10,0x00,0x92,0x0c,0x91,0x08,
--	0x10,0x04,0x10,0x00,0x15,0x00,0x10,0x00,0x10,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,
--	0x10,0x00,0x10,0x04,0x13,0x00,0x14,0x00,0x14,0x00,0x14,0x00,0xd4,0x0c,0x53,0x04,
--	0x14,0x00,0x12,0x04,0x14,0x00,0x11,0x00,0x53,0x04,0x14,0x00,0x52,0x04,0x14,0x00,
--	0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x15,0x00,0xe3,0xb9,0x01,0xd2,0xac,0xd1,
--	0x68,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x08,0x00,0x94,0x14,0x53,0x04,0x08,0x00,0x52,
--	0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,0x00,0x08,0x00,0xcf,
--	0x86,0xd5,0x18,0x54,0x04,0x08,0x00,0x53,0x04,0x08,0x00,0x52,0x04,0x08,0x00,0x51,
--	0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,0x00,0xd4,0x14,0x53,0x04,0x09,0x00,0x52,
--	0x04,0x09,0x00,0x91,0x08,0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,0xd3,0x10,0x92,
--	0x0c,0x91,0x08,0x10,0x04,0x0b,0x00,0x0a,0x00,0x0a,0x00,0x09,0x00,0x52,0x04,0x0a,
--	0x00,0x11,0x04,0x0a,0x00,0x0b,0x00,0xd0,0x06,0xcf,0x06,0x08,0x00,0xcf,0x86,0x55,
--	0x04,0x08,0x00,0xd4,0x1c,0x53,0x04,0x08,0x00,0xd2,0x0c,0x51,0x04,0x08,0x00,0x10,
--	0x04,0x08,0x00,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x0b,0xe6,0xd3,
--	0x0c,0x92,0x08,0x11,0x04,0x0b,0xe6,0x0d,0x00,0x00,0x00,0x92,0x0c,0x91,0x08,0x10,
--	0x04,0x00,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0xd1,0x6c,0xd0,0x2a,0xcf,0x86,0x55,
--	0x04,0x08,0x00,0x94,0x20,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,
--	0x04,0x00,0x00,0x0d,0x00,0x52,0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x0d,
--	0x00,0x00,0x00,0x08,0x00,0xcf,0x86,0x55,0x04,0x08,0x00,0xd4,0x1c,0xd3,0x0c,0x52,
--	0x04,0x08,0x00,0x11,0x04,0x08,0x00,0x0d,0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,
--	0x00,0x10,0x04,0x00,0x00,0x08,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0c,
--	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,
--	0x04,0x00,0x00,0x0c,0x09,0xd0,0x5a,0xcf,0x86,0xd5,0x18,0x54,0x04,0x08,0x00,0x93,
--	0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,0x00,0x00,
--	0x00,0xd4,0x20,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,
--	0x00,0x00,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,
--	0x00,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,
--	0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,0x00,0xcf,
--	0x86,0x95,0x40,0xd4,0x20,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,
--	0x04,0x08,0x00,0x00,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,
--	0x00,0x00,0x00,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,
--	0x00,0x00,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,
--	0x00,0x0a,0xe6,0xd2,0x9c,0xd1,0x68,0xd0,0x32,0xcf,0x86,0xd5,0x14,0x54,0x04,0x08,
--	0x00,0x53,0x04,0x08,0x00,0x52,0x04,0x0a,0x00,0x11,0x04,0x08,0x00,0x0a,0x00,0x54,
--	0x04,0x0a,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0a,0x00,0x0b,0x00,0x0d,
--	0x00,0x0d,0x00,0x12,0x04,0x0d,0x00,0x10,0x00,0xcf,0x86,0x95,0x30,0x94,0x2c,0xd3,
--	0x18,0xd2,0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x12,0x00,0x91,0x08,0x10,
--	0x04,0x12,0x00,0x13,0x00,0x13,0x00,0xd2,0x08,0x11,0x04,0x13,0x00,0x14,0x00,0x51,
--	0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x15,0x00,0x00,0x00,0x00,0x00,0xd0,0x1e,0xcf,
--	0x86,0x95,0x18,0x54,0x04,0x04,0x00,0x53,0x04,0x04,0x00,0x92,0x0c,0x51,0x04,0x04,
--	0x00,0x10,0x04,0x00,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0xcf,0x86,0x55,0x04,0x04,
--	0x00,0x54,0x04,0x04,0x00,0x93,0x08,0x12,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0xd1,
--	0x06,0xcf,0x06,0x04,0x00,0xd0,0x06,0xcf,0x06,0x04,0x00,0xcf,0x86,0xd5,0x14,0x54,
--	0x04,0x04,0x00,0x93,0x0c,0x52,0x04,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0x00,
--	0x00,0x54,0x04,0x00,0x00,0x53,0x04,0x04,0x00,0x12,0x04,0x04,0x00,0x00,0x00,0xcf,
--	0x86,0xe5,0xa6,0x05,0xe4,0x9f,0x05,0xe3,0x96,0x04,0xe2,0xe4,0x03,0xe1,0xc0,0x01,
--	0xd0,0x3e,0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x1c,0x53,0x04,0x01,0x00,0xd2,0x0c,
--	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0xda,0x01,0xe4,0x91,0x08,0x10,0x04,0x01,0xe8,
--	0x01,0xde,0x01,0xe0,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x04,0x00,0x10,0x04,
--	0x04,0x00,0x06,0x00,0x51,0x04,0x06,0x00,0x10,0x04,0x04,0x00,0x01,0x00,0xcf,0x86,
--	0xd5,0xaa,0xd4,0x32,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,
--	0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,
--	0x8b,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0x8d,0xe3,0x82,
--	0x99,0x00,0x01,0x00,0xd3,0x3c,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,
--	0x8f,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0x91,0xe3,0x82,
--	0x99,0x00,0x01,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0x93,0xe3,0x82,0x99,
--	0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0x95,0xe3,0x82,0x99,0x00,0x01,0x00,
--	0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0x97,0xe3,0x82,0x99,0x00,0x01,
--	0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0x99,0xe3,0x82,0x99,0x00,0x01,0x00,0xd1,0x0f,
--	0x10,0x0b,0x01,0xff,0xe3,0x81,0x9b,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,
--	0xff,0xe3,0x81,0x9d,0xe3,0x82,0x99,0x00,0x01,0x00,0xd4,0x53,0xd3,0x3c,0xd2,0x1e,
--	0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0x9f,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,
--	0x0b,0x01,0xff,0xe3,0x81,0xa1,0xe3,0x82,0x99,0x00,0x01,0x00,0xd1,0x0f,0x10,0x04,
--	0x01,0x00,0x01,0xff,0xe3,0x81,0xa4,0xe3,0x82,0x99,0x00,0x10,0x04,0x01,0x00,0x01,
--	0xff,0xe3,0x81,0xa6,0xe3,0x82,0x99,0x00,0x92,0x13,0x91,0x0f,0x10,0x04,0x01,0x00,
--	0x01,0xff,0xe3,0x81,0xa8,0xe3,0x82,0x99,0x00,0x01,0x00,0x01,0x00,0xd3,0x4a,0xd2,
--	0x25,0xd1,0x16,0x10,0x0b,0x01,0xff,0xe3,0x81,0xaf,0xe3,0x82,0x99,0x00,0x01,0xff,
--	0xe3,0x81,0xaf,0xe3,0x82,0x9a,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x81,0xb2,
--	0xe3,0x82,0x99,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0xb2,0xe3,0x82,0x9a,
--	0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0xb5,0xe3,0x82,0x99,0x00,0x01,0xff,
--	0xe3,0x81,0xb5,0xe3,0x82,0x9a,0x00,0xd2,0x1e,0xd1,0x0f,0x10,0x04,0x01,0x00,0x01,
--	0xff,0xe3,0x81,0xb8,0xe3,0x82,0x99,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0xb8,0xe3,
--	0x82,0x9a,0x00,0x01,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xe3,0x81,0xbb,0xe3,0x82,
--	0x99,0x00,0x01,0xff,0xe3,0x81,0xbb,0xe3,0x82,0x9a,0x00,0x01,0x00,0xd0,0xee,0xcf,
--	0x86,0xd5,0x42,0x54,0x04,0x01,0x00,0xd3,0x1b,0x52,0x04,0x01,0x00,0xd1,0x0f,0x10,
--	0x0b,0x01,0xff,0xe3,0x81,0x86,0xe3,0x82,0x99,0x00,0x06,0x00,0x10,0x04,0x06,0x00,
--	0x00,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x00,0x00,0x01,0x08,0x10,0x04,0x01,0x08,
--	0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0x9d,0xe3,0x82,0x99,
--	0x00,0x06,0x00,0xd4,0x32,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x06,0x00,0x01,
--	0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,
--	0x82,0xab,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0xad,0xe3,
--	0x82,0x99,0x00,0x01,0x00,0xd3,0x3c,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,
--	0x82,0xaf,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0xb1,0xe3,
--	0x82,0x99,0x00,0x01,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,0xb3,0xe3,0x82,
--	0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0xb5,0xe3,0x82,0x99,0x00,0x01,
--	0x00,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,0xb7,0xe3,0x82,0x99,0x00,
--	0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0xb9,0xe3,0x82,0x99,0x00,0x01,0x00,0xd1,
--	0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,0xbb,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,
--	0x01,0xff,0xe3,0x82,0xbd,0xe3,0x82,0x99,0x00,0x01,0x00,0xcf,0x86,0xd5,0xd5,0xd4,
--	0x53,0xd3,0x3c,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,0xbf,0xe3,0x82,
--	0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x83,0x81,0xe3,0x82,0x99,0x00,0x01,
--	0x00,0xd1,0x0f,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x84,0xe3,0x82,0x99,0x00,
--	0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x86,0xe3,0x82,0x99,0x00,0x92,0x13,0x91,
--	0x0f,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x88,0xe3,0x82,0x99,0x00,0x01,0x00,
--	0x01,0x00,0xd3,0x4a,0xd2,0x25,0xd1,0x16,0x10,0x0b,0x01,0xff,0xe3,0x83,0x8f,0xe3,
--	0x82,0x99,0x00,0x01,0xff,0xe3,0x83,0x8f,0xe3,0x82,0x9a,0x00,0x10,0x04,0x01,0x00,
--	0x01,0xff,0xe3,0x83,0x92,0xe3,0x82,0x99,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,
--	0x83,0x92,0xe3,0x82,0x9a,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x83,0x95,0xe3,
--	0x82,0x99,0x00,0x01,0xff,0xe3,0x83,0x95,0xe3,0x82,0x9a,0x00,0xd2,0x1e,0xd1,0x0f,
--	0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x98,0xe3,0x82,0x99,0x00,0x10,0x0b,0x01,
--	0xff,0xe3,0x83,0x98,0xe3,0x82,0x9a,0x00,0x01,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,
--	0xe3,0x83,0x9b,0xe3,0x82,0x99,0x00,0x01,0xff,0xe3,0x83,0x9b,0xe3,0x82,0x9a,0x00,
--	0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x22,0x52,0x04,0x01,0x00,0xd1,0x0f,0x10,0x0b,
--	0x01,0xff,0xe3,0x82,0xa6,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x04,0x01,0x00,0x01,
--	0xff,0xe3,0x83,0xaf,0xe3,0x82,0x99,0x00,0xd2,0x25,0xd1,0x16,0x10,0x0b,0x01,0xff,
--	0xe3,0x83,0xb0,0xe3,0x82,0x99,0x00,0x01,0xff,0xe3,0x83,0xb1,0xe3,0x82,0x99,0x00,
--	0x10,0x0b,0x01,0xff,0xe3,0x83,0xb2,0xe3,0x82,0x99,0x00,0x01,0x00,0x51,0x04,0x01,
--	0x00,0x10,0x0b,0x01,0xff,0xe3,0x83,0xbd,0xe3,0x82,0x99,0x00,0x06,0x00,0xd1,0x65,
--	0xd0,0x46,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x52,0x04,0x00,0x00,0x91,0x08,
--	0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x18,0x53,0x04,
--	0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x0a,0x00,0x10,0x04,
--	0x13,0x00,0x14,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,
--	0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0x94,0x15,0x93,0x11,
--	0x52,0x04,0x01,0x00,0x91,0x09,0x10,0x05,0x01,0xff,0x00,0x01,0x00,0x01,0x00,0x01,
--	0x00,0x01,0x00,0xd0,0x32,0xcf,0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x01,0x00,0x52,
--	0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x54,
--	0x04,0x04,0x00,0x53,0x04,0x04,0x00,0x92,0x0c,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,
--	0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x08,0x14,0x04,0x08,0x00,0x0a,0x00,0x94,
--	0x0c,0x93,0x08,0x12,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0xd2,0xa4,0xd1,
--	0x5c,0xd0,0x22,0xcf,0x86,0x95,0x1c,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,
--	0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x07,0x00,0x10,0x04,0x07,0x00,0x00,
--	0x00,0x01,0x00,0xcf,0x86,0xd5,0x20,0xd4,0x0c,0x93,0x08,0x12,0x04,0x01,0x00,0x0b,
--	0x00,0x0b,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x07,0x00,0x06,0x00,0x06,
--	0x00,0x06,0x00,0x06,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,
--	0x00,0x51,0x04,0x07,0x00,0x10,0x04,0x08,0x00,0x01,0x00,0xd0,0x1e,0xcf,0x86,0x55,
--	0x04,0x01,0x00,0x54,0x04,0x01,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,
--	0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0xcf,0x86,0xd5,0x10,0x94,0x0c,0x53,
--	0x04,0x01,0x00,0x12,0x04,0x01,0x00,0x07,0x00,0x01,0x00,0x54,0x04,0x01,0x00,0x53,
--	0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x16,
--	0x00,0xd1,0x30,0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,
--	0x04,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
--	0x00,0x07,0x00,0x92,0x0c,0x51,0x04,0x07,0x00,0x10,0x04,0x07,0x00,0x01,0x00,0x01,
--	0x00,0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0x14,0x54,0x04,0x01,0x00,0x53,
--	0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x11,0x04,0x01,0x00,0x07,0x00,0x54,0x04,0x01,
--	0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
--	0x00,0x07,0x00,0xcf,0x06,0x04,0x00,0xcf,0x06,0x04,0x00,0xd1,0x48,0xd0,0x40,0xcf,
--	0x86,0xd5,0x06,0xcf,0x06,0x04,0x00,0xd4,0x06,0xcf,0x06,0x04,0x00,0xd3,0x2c,0xd2,
--	0x06,0xcf,0x06,0x04,0x00,0xd1,0x06,0xcf,0x06,0x04,0x00,0xd0,0x1a,0xcf,0x86,0x55,
--	0x04,0x04,0x00,0x54,0x04,0x04,0x00,0x93,0x0c,0x52,0x04,0x04,0x00,0x11,0x04,0x04,
--	0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x07,0x00,0xcf,0x06,0x01,0x00,0xcf,0x86,0xcf,
--	0x06,0x01,0x00,0xcf,0x86,0xcf,0x06,0x01,0x00,0xe2,0x71,0x05,0xd1,0x8c,0xd0,0x08,
--	0xcf,0x86,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x01,0x00,0xd4,0x06,
--	0xcf,0x06,0x01,0x00,0xd3,0x06,0xcf,0x06,0x01,0x00,0xd2,0x06,0xcf,0x06,0x01,0x00,
--	0xd1,0x06,0xcf,0x06,0x01,0x00,0xd0,0x22,0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x10,
--	0x93,0x0c,0x52,0x04,0x01,0x00,0x11,0x04,0x01,0x00,0x08,0x00,0x08,0x00,0x53,0x04,
--	0x08,0x00,0x12,0x04,0x08,0x00,0x0a,0x00,0xcf,0x86,0xd5,0x28,0xd4,0x18,0xd3,0x08,
--	0x12,0x04,0x0a,0x00,0x0b,0x00,0x52,0x04,0x0b,0x00,0x91,0x08,0x10,0x04,0x0d,0x00,
--	0x11,0x00,0x11,0x00,0x93,0x0c,0x52,0x04,0x11,0x00,0x11,0x04,0x11,0x00,0x13,0x00,
--	0x13,0x00,0x94,0x14,0x53,0x04,0x13,0x00,0x92,0x0c,0x51,0x04,0x13,0x00,0x10,0x04,
--	0x13,0x00,0x14,0x00,0x14,0x00,0x00,0x00,0xe0,0xdb,0x04,0xcf,0x86,0xe5,0xdf,0x01,
--	0xd4,0x06,0xcf,0x06,0x04,0x00,0xd3,0x74,0xd2,0x6e,0xd1,0x06,0xcf,0x06,0x04,0x00,
--	0xd0,0x3e,0xcf,0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x04,0x00,0x52,0x04,0x04,0x00,
--	0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0xd4,0x10,0x93,0x0c,
--	0x92,0x08,0x11,0x04,0x04,0x00,0x06,0x00,0x04,0x00,0x04,0x00,0x93,0x10,0x52,0x04,
--	0x04,0x00,0x91,0x08,0x10,0x04,0x06,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0xcf,0x86,
--	0x95,0x24,0x94,0x20,0x93,0x1c,0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x06,0x00,
--	0x04,0x00,0xd1,0x08,0x10,0x04,0x04,0x00,0x06,0x00,0x10,0x04,0x04,0x00,0x00,0x00,
--	0x00,0x00,0x0b,0x00,0x0b,0x00,0xcf,0x06,0x0a,0x00,0xd2,0x84,0xd1,0x4c,0xd0,0x16,
--	0xcf,0x86,0x55,0x04,0x0a,0x00,0x94,0x0c,0x53,0x04,0x0a,0x00,0x12,0x04,0x0a,0x00,
--	0x00,0x00,0x00,0x00,0xcf,0x86,0x55,0x04,0x0a,0x00,0xd4,0x1c,0xd3,0x0c,0x92,0x08,
--	0x11,0x04,0x0c,0x00,0x0a,0x00,0x0a,0x00,0x52,0x04,0x0a,0x00,0x51,0x04,0x0a,0x00,
--	0x10,0x04,0x0a,0x00,0x0a,0xe6,0xd3,0x08,0x12,0x04,0x0a,0x00,0x0d,0xe6,0x52,0x04,
--	0x0d,0xe6,0x11,0x04,0x0a,0xe6,0x0a,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,
--	0x0a,0x00,0x53,0x04,0x0a,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,
--	0x11,0xe6,0x0d,0xe6,0x0b,0x00,0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,0x0b,0x00,
--	0x93,0x0c,0x92,0x08,0x11,0x04,0x0b,0xe6,0x0b,0x00,0x0b,0x00,0x00,0x00,0xd1,0x40,
--	0xd0,0x3a,0xcf,0x86,0xd5,0x24,0x54,0x04,0x08,0x00,0xd3,0x10,0x52,0x04,0x08,0x00,
--	0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x09,0x00,0x92,0x0c,0x51,0x04,0x09,0x00,
--	0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,0x94,0x10,0x93,0x0c,0x92,0x08,0x11,0x04,
--	0x09,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0xcf,0x06,0x0a,0x00,0xd0,0x5e,
--	0xcf,0x86,0xd5,0x28,0xd4,0x18,0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,0xd1,0x08,
--	0x10,0x04,0x0a,0x00,0x0c,0x00,0x10,0x04,0x0c,0x00,0x11,0x00,0x93,0x0c,0x92,0x08,
--	0x11,0x04,0x0c,0x00,0x0d,0x00,0x10,0x00,0x10,0x00,0xd4,0x1c,0x53,0x04,0x0c,0x00,
--	0xd2,0x0c,0x51,0x04,0x0c,0x00,0x10,0x04,0x0d,0x00,0x10,0x00,0x51,0x04,0x10,0x00,
--	0x10,0x04,0x12,0x00,0x14,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,0x10,0x00,0x11,0x00,
--	0x11,0x00,0x92,0x08,0x11,0x04,0x14,0x00,0x15,0x00,0x15,0x00,0xcf,0x86,0xd5,0x1c,
--	0x94,0x18,0x93,0x14,0xd2,0x08,0x11,0x04,0x00,0x00,0x15,0x00,0x51,0x04,0x15,0x00,
--	0x10,0x04,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x54,0x04,0x00,0x00,0xd3,0x10,
--	0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x92,0x0c,
--	0x51,0x04,0x0d,0x00,0x10,0x04,0x0c,0x00,0x0a,0x00,0x0a,0x00,0xe4,0xf2,0x02,0xe3,
--	0x65,0x01,0xd2,0x98,0xd1,0x48,0xd0,0x36,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,
--	0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x09,0x08,0x00,0x08,0x00,
--	0x08,0x00,0xd4,0x0c,0x53,0x04,0x08,0x00,0x12,0x04,0x08,0x00,0x00,0x00,0x53,0x04,
--	0x0b,0x00,0x92,0x08,0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0x55,0x04,
--	0x09,0x00,0x54,0x04,0x09,0x00,0x13,0x04,0x09,0x00,0x00,0x00,0xd0,0x06,0xcf,0x06,
--	0x0a,0x00,0xcf,0x86,0xd5,0x2c,0xd4,0x1c,0xd3,0x10,0x52,0x04,0x0a,0x00,0x91,0x08,
--	0x10,0x04,0x0a,0x09,0x12,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x11,0x04,0x00,0x00,
--	0x0a,0x00,0x53,0x04,0x0a,0x00,0x92,0x08,0x11,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,
--	0x54,0x04,0x0b,0xe6,0xd3,0x0c,0x92,0x08,0x11,0x04,0x0b,0xe6,0x0b,0x00,0x0b,0x00,
--	0x52,0x04,0x0b,0x00,0x11,0x04,0x11,0x00,0x14,0x00,0xd1,0x60,0xd0,0x22,0xcf,0x86,
--	0x55,0x04,0x0a,0x00,0x94,0x18,0x53,0x04,0x0a,0x00,0xd2,0x0c,0x51,0x04,0x0a,0x00,
--	0x10,0x04,0x0a,0x00,0x0a,0xdc,0x11,0x04,0x0a,0xdc,0x0a,0x00,0x0a,0x00,0xcf,0x86,
--	0xd5,0x24,0x54,0x04,0x0a,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,0x0a,0x00,0x10,0x04,
--	0x0a,0x00,0x0a,0x09,0x00,0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,
--	0x00,0x00,0x0a,0x00,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,0x00,
--	0x91,0x08,0x10,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0xd0,0x1e,0xcf,0x86,0x55,0x04,
--	0x0b,0x00,0x54,0x04,0x0b,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x0b,0x00,0x10,0x04,
--	0x0b,0x00,0x0b,0x07,0x0b,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x34,0xd4,0x20,0xd3,0x10,
--	0x92,0x0c,0x91,0x08,0x10,0x04,0x0b,0x09,0x0b,0x00,0x0b,0x00,0x0b,0x00,0x52,0x04,
--	0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x00,0x00,0x0b,0x00,0x53,0x04,0x0b,0x00,
--	0xd2,0x08,0x11,0x04,0x0b,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x0b,0x00,0x54,0x04,
--	0x10,0x00,0x53,0x04,0x10,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,
--	0x10,0x00,0x00,0x00,0xd2,0xd0,0xd1,0x50,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x0a,0x00,
--	0x54,0x04,0x0a,0x00,0x93,0x10,0x52,0x04,0x0a,0x00,0x51,0x04,0x0a,0x00,0x10,0x04,
--	0x0a,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x20,0xd4,0x10,0x53,0x04,0x0a,0x00,
--	0x52,0x04,0x0a,0x00,0x11,0x04,0x0a,0x00,0x00,0x00,0x53,0x04,0x0a,0x00,0x92,0x08,
--	0x11,0x04,0x0a,0x00,0x00,0x00,0x0a,0x00,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,
--	0x12,0x04,0x0b,0x00,0x10,0x00,0xd0,0x3a,0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,
--	0x0b,0x00,0xd3,0x1c,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0b,0xe6,0x0b,0x00,0x0b,0xe6,
--	0xd1,0x08,0x10,0x04,0x0b,0xdc,0x0b,0x00,0x10,0x04,0x0b,0x00,0x0b,0xe6,0xd2,0x0c,
--	0x91,0x08,0x10,0x04,0x0b,0xe6,0x0b,0x00,0x0b,0x00,0x11,0x04,0x0b,0x00,0x0b,0xe6,
--	0xcf,0x86,0xd5,0x2c,0xd4,0x18,0x93,0x14,0x92,0x10,0xd1,0x08,0x10,0x04,0x0b,0x00,
--	0x0b,0xe6,0x10,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x00,0x00,
--	0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0b,0x00,0x0b,0x00,0x54,0x04,
--	0x0d,0x00,0x93,0x10,0x52,0x04,0x0d,0x00,0x51,0x04,0x0d,0x00,0x10,0x04,0x0d,0x09,
--	0x00,0x00,0x00,0x00,0xd1,0x8c,0xd0,0x72,0xcf,0x86,0xd5,0x4c,0xd4,0x30,0xd3,0x18,
--	0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x0c,0x00,0x0c,0x00,0x51,0x04,0x0c,0x00,
--	0x10,0x04,0x0c,0x00,0x00,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x0c,0x00,
--	0x0c,0x00,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,0x93,0x18,0xd2,0x0c,
--	0x91,0x08,0x10,0x04,0x00,0x00,0x0c,0x00,0x0c,0x00,0x51,0x04,0x0c,0x00,0x10,0x04,
--	0x0c,0x00,0x00,0x00,0x00,0x00,0x94,0x20,0xd3,0x10,0x52,0x04,0x0c,0x00,0x51,0x04,
--	0x0c,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,0x52,0x04,0x0c,0x00,0x51,0x04,0x0c,0x00,
--	0x10,0x04,0x0c,0x00,0x00,0x00,0x10,0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0x94,0x10,
--	0x93,0x0c,0x52,0x04,0x11,0x00,0x11,0x04,0x10,0x00,0x15,0x00,0x00,0x00,0x11,0x00,
--	0xd0,0x06,0xcf,0x06,0x11,0x00,0xcf,0x86,0x55,0x04,0x0b,0x00,0xd4,0x14,0x53,0x04,
--	0x0b,0x00,0x52,0x04,0x0b,0x00,0x91,0x08,0x10,0x04,0x0b,0x00,0x0b,0x09,0x00,0x00,
--	0x53,0x04,0x0b,0x00,0x92,0x08,0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,
--	0x02,0xff,0xff,0xcf,0x86,0xcf,0x06,0x02,0xff,0xff,0xd1,0x76,0xd0,0x09,0xcf,0x86,
--	0xcf,0x06,0x02,0xff,0xff,0xcf,0x86,0x85,0xd4,0x07,0xcf,0x06,0x02,0xff,0xff,0xd3,
--	0x07,0xcf,0x06,0x02,0xff,0xff,0xd2,0x07,0xcf,0x06,0x02,0xff,0xff,0xd1,0x07,0xcf,
--	0x06,0x02,0xff,0xff,0xd0,0x18,0xcf,0x86,0x55,0x05,0x02,0xff,0xff,0x94,0x0d,0x93,
--	0x09,0x12,0x05,0x02,0xff,0xff,0x00,0x00,0x00,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x24,
--	0x94,0x20,0xd3,0x10,0x52,0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,
--	0x00,0x00,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0b,0x00,0x0b,0x00,
--	0x0b,0x00,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,0x12,0x04,0x0b,0x00,0x00,0x00,
--	0xd0,0x08,0xcf,0x86,0xcf,0x06,0x01,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x01,0x00,
--	0xe4,0x9c,0x10,0xe3,0x16,0x08,0xd2,0x06,0xcf,0x06,0x01,0x00,0xe1,0x08,0x04,0xe0,
--	0x04,0x02,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0xe8,0xb1,0x88,0x00,0x01,0xff,0xe6,0x9b,0xb4,0x00,0x10,0x08,0x01,
--	0xff,0xe8,0xbb,0x8a,0x00,0x01,0xff,0xe8,0xb3,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,
--	0xff,0xe6,0xbb,0x91,0x00,0x01,0xff,0xe4,0xb8,0xb2,0x00,0x10,0x08,0x01,0xff,0xe5,
--	0x8f,0xa5,0x00,0x01,0xff,0xe9,0xbe,0x9c,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
--	0xff,0xe9,0xbe,0x9c,0x00,0x01,0xff,0xe5,0xa5,0x91,0x00,0x10,0x08,0x01,0xff,0xe9,
--	0x87,0x91,0x00,0x01,0xff,0xe5,0x96,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,
--	0xa5,0x88,0x00,0x01,0xff,0xe6,0x87,0xb6,0x00,0x10,0x08,0x01,0xff,0xe7,0x99,0xa9,
--	0x00,0x01,0xff,0xe7,0xbe,0x85,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
--	0xff,0xe8,0x98,0xbf,0x00,0x01,0xff,0xe8,0x9e,0xba,0x00,0x10,0x08,0x01,0xff,0xe8,
--	0xa3,0xb8,0x00,0x01,0xff,0xe9,0x82,0x8f,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,
--	0xa8,0x82,0x00,0x01,0xff,0xe6,0xb4,0x9b,0x00,0x10,0x08,0x01,0xff,0xe7,0x83,0x99,
--	0x00,0x01,0xff,0xe7,0x8f,0x9e,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,
--	0x90,0xbd,0x00,0x01,0xff,0xe9,0x85,0xaa,0x00,0x10,0x08,0x01,0xff,0xe9,0xa7,0xb1,
--	0x00,0x01,0xff,0xe4,0xba,0x82,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0x8d,0xb5,
--	0x00,0x01,0xff,0xe6,0xac,0x84,0x00,0x10,0x08,0x01,0xff,0xe7,0x88,0x9b,0x00,0x01,
--	0xff,0xe8,0x98,0xad,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
--	0xff,0xe9,0xb8,0x9e,0x00,0x01,0xff,0xe5,0xb5,0x90,0x00,0x10,0x08,0x01,0xff,0xe6,
--	0xbf,0xab,0x00,0x01,0xff,0xe8,0x97,0x8d,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,
--	0xa5,0xa4,0x00,0x01,0xff,0xe6,0x8b,0x89,0x00,0x10,0x08,0x01,0xff,0xe8,0x87,0x98,
--	0x00,0x01,0xff,0xe8,0xa0,0x9f,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,
--	0xbb,0x8a,0x00,0x01,0xff,0xe6,0x9c,0x97,0x00,0x10,0x08,0x01,0xff,0xe6,0xb5,0xaa,
--	0x00,0x01,0xff,0xe7,0x8b,0xbc,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0x83,0x8e,
--	0x00,0x01,0xff,0xe4,0xbe,0x86,0x00,0x10,0x08,0x01,0xff,0xe5,0x86,0xb7,0x00,0x01,
--	0xff,0xe5,0x8b,0x9e,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,
--	0x93,0x84,0x00,0x01,0xff,0xe6,0xab,0x93,0x00,0x10,0x08,0x01,0xff,0xe7,0x88,0x90,
--	0x00,0x01,0xff,0xe7,0x9b,0xa7,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x80,0x81,
--	0x00,0x01,0xff,0xe8,0x98,0x86,0x00,0x10,0x08,0x01,0xff,0xe8,0x99,0x9c,0x00,0x01,
--	0xff,0xe8,0xb7,0xaf,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0x9c,0xb2,
--	0x00,0x01,0xff,0xe9,0xad,0xaf,0x00,0x10,0x08,0x01,0xff,0xe9,0xb7,0xba,0x00,0x01,
--	0xff,0xe7,0xa2,0x8c,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,0xa5,0xbf,0x00,0x01,
--	0xff,0xe7,0xb6,0xa0,0x00,0x10,0x08,0x01,0xff,0xe8,0x8f,0x89,0x00,0x01,0xff,0xe9,
--	0x8c,0x84,0x00,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,
--	0x10,0x08,0x01,0xff,0xe9,0xb9,0xbf,0x00,0x01,0xff,0xe8,0xab,0x96,0x00,0x10,0x08,
--	0x01,0xff,0xe5,0xa3,0x9f,0x00,0x01,0xff,0xe5,0xbc,0x84,0x00,0xd1,0x10,0x10,0x08,
--	0x01,0xff,0xe7,0xb1,0xa0,0x00,0x01,0xff,0xe8,0x81,0xbe,0x00,0x10,0x08,0x01,0xff,
--	0xe7,0x89,0xa2,0x00,0x01,0xff,0xe7,0xa3,0x8a,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x01,0xff,0xe8,0xb3,0x82,0x00,0x01,0xff,0xe9,0x9b,0xb7,0x00,0x10,0x08,0x01,0xff,
--	0xe5,0xa3,0x98,0x00,0x01,0xff,0xe5,0xb1,0xa2,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
--	0xe6,0xa8,0x93,0x00,0x01,0xff,0xe6,0xb7,0x9a,0x00,0x10,0x08,0x01,0xff,0xe6,0xbc,
--	0x8f,0x00,0x01,0xff,0xe7,0xb4,0xaf,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x01,0xff,0xe7,0xb8,0xb7,0x00,0x01,0xff,0xe9,0x99,0x8b,0x00,0x10,0x08,0x01,0xff,
--	0xe5,0x8b,0x92,0x00,0x01,0xff,0xe8,0x82,0x8b,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
--	0xe5,0x87,0x9c,0x00,0x01,0xff,0xe5,0x87,0x8c,0x00,0x10,0x08,0x01,0xff,0xe7,0xa8,
--	0x9c,0x00,0x01,0xff,0xe7,0xb6,0xbe,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
--	0xe8,0x8f,0xb1,0x00,0x01,0xff,0xe9,0x99,0xb5,0x00,0x10,0x08,0x01,0xff,0xe8,0xae,
--	0x80,0x00,0x01,0xff,0xe6,0x8b,0x8f,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xa8,
--	0x82,0x00,0x01,0xff,0xe8,0xab,0xbe,0x00,0x10,0x08,0x01,0xff,0xe4,0xb8,0xb9,0x00,
--	0x01,0xff,0xe5,0xaf,0xa7,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x01,0xff,0xe6,0x80,0x92,0x00,0x01,0xff,0xe7,0x8e,0x87,0x00,0x10,0x08,0x01,0xff,
--	0xe7,0x95,0xb0,0x00,0x01,0xff,0xe5,0x8c,0x97,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
--	0xe7,0xa3,0xbb,0x00,0x01,0xff,0xe4,0xbe,0xbf,0x00,0x10,0x08,0x01,0xff,0xe5,0xbe,
--	0xa9,0x00,0x01,0xff,0xe4,0xb8,0x8d,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
--	0xe6,0xb3,0x8c,0x00,0x01,0xff,0xe6,0x95,0xb8,0x00,0x10,0x08,0x01,0xff,0xe7,0xb4,
--	0xa2,0x00,0x01,0xff,0xe5,0x8f,0x83,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0xa1,
--	0x9e,0x00,0x01,0xff,0xe7,0x9c,0x81,0x00,0x10,0x08,0x01,0xff,0xe8,0x91,0x89,0x00,
--	0x01,0xff,0xe8,0xaa,0xaa,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
--	0xe6,0xae,0xba,0x00,0x01,0xff,0xe8,0xbe,0xb0,0x00,0x10,0x08,0x01,0xff,0xe6,0xb2,
--	0x88,0x00,0x01,0xff,0xe6,0x8b,0xbe,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x8b,
--	0xa5,0x00,0x01,0xff,0xe6,0x8e,0xa0,0x00,0x10,0x08,0x01,0xff,0xe7,0x95,0xa5,0x00,
--	0x01,0xff,0xe4,0xba,0xae,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0x85,
--	0xa9,0x00,0x01,0xff,0xe5,0x87,0x89,0x00,0x10,0x08,0x01,0xff,0xe6,0xa2,0x81,0x00,
--	0x01,0xff,0xe7,0xb3,0xa7,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x89,0xaf,0x00,
--	0x01,0xff,0xe8,0xab,0x92,0x00,0x10,0x08,0x01,0xff,0xe9,0x87,0x8f,0x00,0x01,0xff,
--	0xe5,0x8b,0xb5,0x00,0xe0,0x04,0x02,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,
--	0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0x91,0x82,0x00,0x01,0xff,0xe5,0xa5,
--	0xb3,0x00,0x10,0x08,0x01,0xff,0xe5,0xbb,0xac,0x00,0x01,0xff,0xe6,0x97,0x85,0x00,
--	0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xbf,0xbe,0x00,0x01,0xff,0xe7,0xa4,0xaa,0x00,
--	0x10,0x08,0x01,0xff,0xe9,0x96,0xad,0x00,0x01,0xff,0xe9,0xa9,0xaa,0x00,0xd2,0x20,
--	0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0xba,0x97,0x00,0x01,0xff,0xe9,0xbb,0x8e,0x00,
--	0x10,0x08,0x01,0xff,0xe5,0x8a,0x9b,0x00,0x01,0xff,0xe6,0x9b,0x86,0x00,0xd1,0x10,
--	0x10,0x08,0x01,0xff,0xe6,0xad,0xb7,0x00,0x01,0xff,0xe8,0xbd,0xa2,0x00,0x10,0x08,
--	0x01,0xff,0xe5,0xb9,0xb4,0x00,0x01,0xff,0xe6,0x86,0x90,0x00,0xd3,0x40,0xd2,0x20,
--	0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0x88,0x80,0x00,0x01,0xff,0xe6,0x92,0x9a,0x00,
--	0x10,0x08,0x01,0xff,0xe6,0xbc,0xa3,0x00,0x01,0xff,0xe7,0x85,0x89,0x00,0xd1,0x10,
--	0x10,0x08,0x01,0xff,0xe7,0x92,0x89,0x00,0x01,0xff,0xe7,0xa7,0x8a,0x00,0x10,0x08,
--	0x01,0xff,0xe7,0xb7,0xb4,0x00,0x01,0xff,0xe8,0x81,0xaf,0x00,0xd2,0x20,0xd1,0x10,
--	0x10,0x08,0x01,0xff,0xe8,0xbc,0xa6,0x00,0x01,0xff,0xe8,0x93,0xae,0x00,0x10,0x08,
--	0x01,0xff,0xe9,0x80,0xa3,0x00,0x01,0xff,0xe9,0x8d,0x8a,0x00,0xd1,0x10,0x10,0x08,
--	0x01,0xff,0xe5,0x88,0x97,0x00,0x01,0xff,0xe5,0x8a,0xa3,0x00,0x10,0x08,0x01,0xff,
--	0xe5,0x92,0xbd,0x00,0x01,0xff,0xe7,0x83,0x88,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,
--	0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0xa3,0x82,0x00,0x01,0xff,0xe8,0xaa,0xaa,0x00,
--	0x10,0x08,0x01,0xff,0xe5,0xbb,0x89,0x00,0x01,0xff,0xe5,0xbf,0xb5,0x00,0xd1,0x10,
--	0x10,0x08,0x01,0xff,0xe6,0x8d,0xbb,0x00,0x01,0xff,0xe6,0xae,0xae,0x00,0x10,0x08,
--	0x01,0xff,0xe7,0xb0,0xbe,0x00,0x01,0xff,0xe7,0x8d,0xb5,0x00,0xd2,0x20,0xd1,0x10,
--	0x10,0x08,0x01,0xff,0xe4,0xbb,0xa4,0x00,0x01,0xff,0xe5,0x9b,0xb9,0x00,0x10,0x08,
--	0x01,0xff,0xe5,0xaf,0xa7,0x00,0x01,0xff,0xe5,0xb6,0xba,0x00,0xd1,0x10,0x10,0x08,
--	0x01,0xff,0xe6,0x80,0x9c,0x00,0x01,0xff,0xe7,0x8e,0xb2,0x00,0x10,0x08,0x01,0xff,
--	0xe7,0x91,0xa9,0x00,0x01,0xff,0xe7,0xbe,0x9a,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,
--	0x10,0x08,0x01,0xff,0xe8,0x81,0x86,0x00,0x01,0xff,0xe9,0x88,0xb4,0x00,0x10,0x08,
--	0x01,0xff,0xe9,0x9b,0xb6,0x00,0x01,0xff,0xe9,0x9d,0x88,0x00,0xd1,0x10,0x10,0x08,
--	0x01,0xff,0xe9,0xa0,0x98,0x00,0x01,0xff,0xe4,0xbe,0x8b,0x00,0x10,0x08,0x01,0xff,
--	0xe7,0xa6,0xae,0x00,0x01,0xff,0xe9,0x86,0xb4,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x01,0xff,0xe9,0x9a,0xb8,0x00,0x01,0xff,0xe6,0x83,0xa1,0x00,0x10,0x08,0x01,0xff,
--	0xe4,0xba,0x86,0x00,0x01,0xff,0xe5,0x83,0x9a,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
--	0xe5,0xaf,0xae,0x00,0x01,0xff,0xe5,0xb0,0xbf,0x00,0x10,0x08,0x01,0xff,0xe6,0x96,
--	0x99,0x00,0x01,0xff,0xe6,0xa8,0x82,0x00,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,
--	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,0x87,0x8e,0x00,0x01,0xff,0xe7,
--	0x99,0x82,0x00,0x10,0x08,0x01,0xff,0xe8,0x93,0xbc,0x00,0x01,0xff,0xe9,0x81,0xbc,
--	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0xbe,0x8d,0x00,0x01,0xff,0xe6,0x9a,0x88,
--	0x00,0x10,0x08,0x01,0xff,0xe9,0x98,0xae,0x00,0x01,0xff,0xe5,0x8a,0x89,0x00,0xd2,
--	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0x9d,0xbb,0x00,0x01,0xff,0xe6,0x9f,0xb3,
--	0x00,0x10,0x08,0x01,0xff,0xe6,0xb5,0x81,0x00,0x01,0xff,0xe6,0xba,0x9c,0x00,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0xe7,0x90,0x89,0x00,0x01,0xff,0xe7,0x95,0x99,0x00,0x10,
--	0x08,0x01,0xff,0xe7,0xa1,0xab,0x00,0x01,0xff,0xe7,0xb4,0x90,0x00,0xd3,0x40,0xd2,
--	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0xa1,0x9e,0x00,0x01,0xff,0xe5,0x85,0xad,
--	0x00,0x10,0x08,0x01,0xff,0xe6,0x88,0xae,0x00,0x01,0xff,0xe9,0x99,0xb8,0x00,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0xe5,0x80,0xab,0x00,0x01,0xff,0xe5,0xb4,0x99,0x00,0x10,
--	0x08,0x01,0xff,0xe6,0xb7,0xaa,0x00,0x01,0xff,0xe8,0xbc,0xaa,0x00,0xd2,0x20,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0xe5,0xbe,0x8b,0x00,0x01,0xff,0xe6,0x85,0x84,0x00,0x10,
--	0x08,0x01,0xff,0xe6,0xa0,0x97,0x00,0x01,0xff,0xe7,0x8e,0x87,0x00,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0xe9,0x9a,0x86,0x00,0x01,0xff,0xe5,0x88,0xa9,0x00,0x10,0x08,0x01,
--	0xff,0xe5,0x90,0x8f,0x00,0x01,0xff,0xe5,0xb1,0xa5,0x00,0xd4,0x80,0xd3,0x40,0xd2,
--	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0x98,0x93,0x00,0x01,0xff,0xe6,0x9d,0x8e,
--	0x00,0x10,0x08,0x01,0xff,0xe6,0xa2,0xa8,0x00,0x01,0xff,0xe6,0xb3,0xa5,0x00,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0xe7,0x90,0x86,0x00,0x01,0xff,0xe7,0x97,0xa2,0x00,0x10,
--	0x08,0x01,0xff,0xe7,0xbd,0xb9,0x00,0x01,0xff,0xe8,0xa3,0x8f,0x00,0xd2,0x20,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0xe8,0xa3,0xa1,0x00,0x01,0xff,0xe9,0x87,0x8c,0x00,0x10,
--	0x08,0x01,0xff,0xe9,0x9b,0xa2,0x00,0x01,0xff,0xe5,0x8c,0xbf,0x00,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0xe6,0xba,0xba,0x00,0x01,0xff,0xe5,0x90,0x9d,0x00,0x10,0x08,0x01,
--	0xff,0xe7,0x87,0x90,0x00,0x01,0xff,0xe7,0x92,0x98,0x00,0xd3,0x40,0xd2,0x20,0xd1,
--	0x10,0x10,0x08,0x01,0xff,0xe8,0x97,0xba,0x00,0x01,0xff,0xe9,0x9a,0xa3,0x00,0x10,
--	0x08,0x01,0xff,0xe9,0xb1,0x97,0x00,0x01,0xff,0xe9,0xba,0x9f,0x00,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0xe6,0x9e,0x97,0x00,0x01,0xff,0xe6,0xb7,0x8b,0x00,0x10,0x08,0x01,
--	0xff,0xe8,0x87,0xa8,0x00,0x01,0xff,0xe7,0xab,0x8b,0x00,0xd2,0x20,0xd1,0x10,0x10,
--	0x08,0x01,0xff,0xe7,0xac,0xa0,0x00,0x01,0xff,0xe7,0xb2,0x92,0x00,0x10,0x08,0x01,
--	0xff,0xe7,0x8b,0x80,0x00,0x01,0xff,0xe7,0x82,0x99,0x00,0xd1,0x10,0x10,0x08,0x01,
--	0xff,0xe8,0xad,0x98,0x00,0x01,0xff,0xe4,0xbb,0x80,0x00,0x10,0x08,0x01,0xff,0xe8,
--	0x8c,0xb6,0x00,0x01,0xff,0xe5,0x88,0xba,0x00,0xe2,0xad,0x06,0xe1,0xc4,0x03,0xe0,
--	0xcb,0x01,0xcf,0x86,0xd5,0xe4,0xd4,0x74,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x01,0xff,0xe5,0x88,0x87,0x00,0x01,0xff,0xe5,0xba,0xa6,0x00,0x10,0x08,0x01,0xff,
--	0xe6,0x8b,0x93,0x00,0x01,0xff,0xe7,0xb3,0x96,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
--	0xe5,0xae,0x85,0x00,0x01,0xff,0xe6,0xb4,0x9e,0x00,0x10,0x08,0x01,0xff,0xe6,0x9a,
--	0xb4,0x00,0x01,0xff,0xe8,0xbc,0xbb,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
--	0xe8,0xa1,0x8c,0x00,0x01,0xff,0xe9,0x99,0x8d,0x00,0x10,0x08,0x01,0xff,0xe8,0xa6,
--	0x8b,0x00,0x01,0xff,0xe5,0xbb,0x93,0x00,0x91,0x10,0x10,0x08,0x01,0xff,0xe5,0x85,
--	0x80,0x00,0x01,0xff,0xe5,0x97,0x80,0x00,0x01,0x00,0xd3,0x34,0xd2,0x18,0xd1,0x0c,
--	0x10,0x08,0x01,0xff,0xe5,0xa1,0x9a,0x00,0x01,0x00,0x10,0x08,0x01,0xff,0xe6,0x99,
--	0xb4,0x00,0x01,0x00,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0xe5,0x87,0x9e,0x00,
--	0x10,0x08,0x01,0xff,0xe7,0x8c,0xaa,0x00,0x01,0xff,0xe7,0x9b,0x8a,0x00,0xd2,0x20,
--	0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,0xa4,0xbc,0x00,0x01,0xff,0xe7,0xa5,0x9e,0x00,
--	0x10,0x08,0x01,0xff,0xe7,0xa5,0xa5,0x00,0x01,0xff,0xe7,0xa6,0x8f,0x00,0xd1,0x10,
--	0x10,0x08,0x01,0xff,0xe9,0x9d,0x96,0x00,0x01,0xff,0xe7,0xb2,0xbe,0x00,0x10,0x08,
--	0x01,0xff,0xe7,0xbe,0xbd,0x00,0x01,0x00,0xd4,0x64,0xd3,0x30,0xd2,0x18,0xd1,0x0c,
--	0x10,0x08,0x01,0xff,0xe8,0x98,0x92,0x00,0x01,0x00,0x10,0x08,0x01,0xff,0xe8,0xab,
--	0xb8,0x00,0x01,0x00,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0xe9,0x80,0xb8,0x00,
--	0x10,0x08,0x01,0xff,0xe9,0x83,0xbd,0x00,0x01,0x00,0xd2,0x14,0x51,0x04,0x01,0x00,
--	0x10,0x08,0x01,0xff,0xe9,0xa3,0xaf,0x00,0x01,0xff,0xe9,0xa3,0xbc,0x00,0xd1,0x10,
--	0x10,0x08,0x01,0xff,0xe9,0xa4,0xa8,0x00,0x01,0xff,0xe9,0xb6,0xb4,0x00,0x10,0x08,
--	0x0d,0xff,0xe9,0x83,0x9e,0x00,0x0d,0xff,0xe9,0x9a,0xb7,0x00,0xd3,0x40,0xd2,0x20,
--	0xd1,0x10,0x10,0x08,0x06,0xff,0xe4,0xbe,0xae,0x00,0x06,0xff,0xe5,0x83,0xa7,0x00,
--	0x10,0x08,0x06,0xff,0xe5,0x85,0x8d,0x00,0x06,0xff,0xe5,0x8b,0x89,0x00,0xd1,0x10,
--	0x10,0x08,0x06,0xff,0xe5,0x8b,0xa4,0x00,0x06,0xff,0xe5,0x8d,0x91,0x00,0x10,0x08,
--	0x06,0xff,0xe5,0x96,0x9d,0x00,0x06,0xff,0xe5,0x98,0x86,0x00,0xd2,0x20,0xd1,0x10,
--	0x10,0x08,0x06,0xff,0xe5,0x99,0xa8,0x00,0x06,0xff,0xe5,0xa1,0x80,0x00,0x10,0x08,
--	0x06,0xff,0xe5,0xa2,0xa8,0x00,0x06,0xff,0xe5,0xb1,0xa4,0x00,0xd1,0x10,0x10,0x08,
--	0x06,0xff,0xe5,0xb1,0xae,0x00,0x06,0xff,0xe6,0x82,0x94,0x00,0x10,0x08,0x06,0xff,
--	0xe6,0x85,0xa8,0x00,0x06,0xff,0xe6,0x86,0x8e,0x00,0xcf,0x86,0xe5,0x01,0x01,0xd4,
--	0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x06,0xff,0xe6,0x87,0xb2,0x00,0x06,
--	0xff,0xe6,0x95,0x8f,0x00,0x10,0x08,0x06,0xff,0xe6,0x97,0xa2,0x00,0x06,0xff,0xe6,
--	0x9a,0x91,0x00,0xd1,0x10,0x10,0x08,0x06,0xff,0xe6,0xa2,0x85,0x00,0x06,0xff,0xe6,
--	0xb5,0xb7,0x00,0x10,0x08,0x06,0xff,0xe6,0xb8,0x9a,0x00,0x06,0xff,0xe6,0xbc,0xa2,
--	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x06,0xff,0xe7,0x85,0xae,0x00,0x06,0xff,0xe7,
--	0x88,0xab,0x00,0x10,0x08,0x06,0xff,0xe7,0x90,0xa2,0x00,0x06,0xff,0xe7,0xa2,0x91,
--	0x00,0xd1,0x10,0x10,0x08,0x06,0xff,0xe7,0xa4,0xbe,0x00,0x06,0xff,0xe7,0xa5,0x89,
--	0x00,0x10,0x08,0x06,0xff,0xe7,0xa5,0x88,0x00,0x06,0xff,0xe7,0xa5,0x90,0x00,0xd3,
--	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x06,0xff,0xe7,0xa5,0x96,0x00,0x06,0xff,0xe7,
--	0xa5,0x9d,0x00,0x10,0x08,0x06,0xff,0xe7,0xa6,0x8d,0x00,0x06,0xff,0xe7,0xa6,0x8e,
--	0x00,0xd1,0x10,0x10,0x08,0x06,0xff,0xe7,0xa9,0x80,0x00,0x06,0xff,0xe7,0xaa,0x81,
--	0x00,0x10,0x08,0x06,0xff,0xe7,0xaf,0x80,0x00,0x06,0xff,0xe7,0xb7,0xb4,0x00,0xd2,
--	0x20,0xd1,0x10,0x10,0x08,0x06,0xff,0xe7,0xb8,0x89,0x00,0x06,0xff,0xe7,0xb9,0x81,
--	0x00,0x10,0x08,0x06,0xff,0xe7,0xbd,0xb2,0x00,0x06,0xff,0xe8,0x80,0x85,0x00,0xd1,
--	0x10,0x10,0x08,0x06,0xff,0xe8,0x87,0xad,0x00,0x06,0xff,0xe8,0x89,0xb9,0x00,0x10,
--	0x08,0x06,0xff,0xe8,0x89,0xb9,0x00,0x06,0xff,0xe8,0x91,0x97,0x00,0xd4,0x75,0xd3,
--	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x06,0xff,0xe8,0xa4,0x90,0x00,0x06,0xff,0xe8,
--	0xa6,0x96,0x00,0x10,0x08,0x06,0xff,0xe8,0xac,0x81,0x00,0x06,0xff,0xe8,0xac,0xb9,
--	0x00,0xd1,0x10,0x10,0x08,0x06,0xff,0xe8,0xb3,0x93,0x00,0x06,0xff,0xe8,0xb4,0x88,
--	0x00,0x10,0x08,0x06,0xff,0xe8,0xbe,0xb6,0x00,0x06,0xff,0xe9,0x80,0xb8,0x00,0xd2,
--	0x20,0xd1,0x10,0x10,0x08,0x06,0xff,0xe9,0x9b,0xa3,0x00,0x06,0xff,0xe9,0x9f,0xbf,
--	0x00,0x10,0x08,0x06,0xff,0xe9,0xa0,0xbb,0x00,0x0b,0xff,0xe6,0x81,0xb5,0x00,0x91,
--	0x11,0x10,0x09,0x0b,0xff,0xf0,0xa4,0x8b,0xae,0x00,0x0b,0xff,0xe8,0x88,0x98,0x00,
--	0x00,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe4,0xb8,0xa6,0x00,
--	0x08,0xff,0xe5,0x86,0xb5,0x00,0x10,0x08,0x08,0xff,0xe5,0x85,0xa8,0x00,0x08,0xff,
--	0xe4,0xbe,0x80,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe5,0x85,0x85,0x00,0x08,0xff,
--	0xe5,0x86,0x80,0x00,0x10,0x08,0x08,0xff,0xe5,0x8b,0x87,0x00,0x08,0xff,0xe5,0x8b,
--	0xba,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe5,0x96,0x9d,0x00,0x08,0xff,
--	0xe5,0x95,0x95,0x00,0x10,0x08,0x08,0xff,0xe5,0x96,0x99,0x00,0x08,0xff,0xe5,0x97,
--	0xa2,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe5,0xa1,0x9a,0x00,0x08,0xff,0xe5,0xa2,
--	0xb3,0x00,0x10,0x08,0x08,0xff,0xe5,0xa5,0x84,0x00,0x08,0xff,0xe5,0xa5,0x94,0x00,
--	0xe0,0x04,0x02,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,
--	0x10,0x08,0x08,0xff,0xe5,0xa9,0xa2,0x00,0x08,0xff,0xe5,0xac,0xa8,0x00,0x10,0x08,
--	0x08,0xff,0xe5,0xbb,0x92,0x00,0x08,0xff,0xe5,0xbb,0x99,0x00,0xd1,0x10,0x10,0x08,
--	0x08,0xff,0xe5,0xbd,0xa9,0x00,0x08,0xff,0xe5,0xbe,0xad,0x00,0x10,0x08,0x08,0xff,
--	0xe6,0x83,0x98,0x00,0x08,0xff,0xe6,0x85,0x8e,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x08,0xff,0xe6,0x84,0x88,0x00,0x08,0xff,0xe6,0x86,0x8e,0x00,0x10,0x08,0x08,0xff,
--	0xe6,0x85,0xa0,0x00,0x08,0xff,0xe6,0x87,0xb2,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,
--	0xe6,0x88,0xb4,0x00,0x08,0xff,0xe6,0x8f,0x84,0x00,0x10,0x08,0x08,0xff,0xe6,0x90,
--	0x9c,0x00,0x08,0xff,0xe6,0x91,0x92,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x08,0xff,0xe6,0x95,0x96,0x00,0x08,0xff,0xe6,0x99,0xb4,0x00,0x10,0x08,0x08,0xff,
--	0xe6,0x9c,0x97,0x00,0x08,0xff,0xe6,0x9c,0x9b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,
--	0xe6,0x9d,0x96,0x00,0x08,0xff,0xe6,0xad,0xb9,0x00,0x10,0x08,0x08,0xff,0xe6,0xae,
--	0xba,0x00,0x08,0xff,0xe6,0xb5,0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,
--	0xe6,0xbb,0x9b,0x00,0x08,0xff,0xe6,0xbb,0x8b,0x00,0x10,0x08,0x08,0xff,0xe6,0xbc,
--	0xa2,0x00,0x08,0xff,0xe7,0x80,0x9e,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe7,0x85,
--	0xae,0x00,0x08,0xff,0xe7,0x9e,0xa7,0x00,0x10,0x08,0x08,0xff,0xe7,0x88,0xb5,0x00,
--	0x08,0xff,0xe7,0x8a,0xaf,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x08,0xff,0xe7,0x8c,0xaa,0x00,0x08,0xff,0xe7,0x91,0xb1,0x00,0x10,0x08,0x08,0xff,
--	0xe7,0x94,0x86,0x00,0x08,0xff,0xe7,0x94,0xbb,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,
--	0xe7,0x98,0x9d,0x00,0x08,0xff,0xe7,0x98,0x9f,0x00,0x10,0x08,0x08,0xff,0xe7,0x9b,
--	0x8a,0x00,0x08,0xff,0xe7,0x9b,0x9b,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,
--	0xe7,0x9b,0xb4,0x00,0x08,0xff,0xe7,0x9d,0x8a,0x00,0x10,0x08,0x08,0xff,0xe7,0x9d,
--	0x80,0x00,0x08,0xff,0xe7,0xa3,0x8c,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe7,0xaa,
--	0xb1,0x00,0x08,0xff,0xe7,0xaf,0x80,0x00,0x10,0x08,0x08,0xff,0xe7,0xb1,0xbb,0x00,
--	0x08,0xff,0xe7,0xb5,0x9b,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,
--	0xe7,0xb7,0xb4,0x00,0x08,0xff,0xe7,0xbc,0xbe,0x00,0x10,0x08,0x08,0xff,0xe8,0x80,
--	0x85,0x00,0x08,0xff,0xe8,0x8d,0x92,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe8,0x8f,
--	0xaf,0x00,0x08,0xff,0xe8,0x9d,0xb9,0x00,0x10,0x08,0x08,0xff,0xe8,0xa5,0x81,0x00,
--	0x08,0xff,0xe8,0xa6,0x86,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe8,0xa6,
--	0x96,0x00,0x08,0xff,0xe8,0xaa,0xbf,0x00,0x10,0x08,0x08,0xff,0xe8,0xab,0xb8,0x00,
--	0x08,0xff,0xe8,0xab,0x8b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe8,0xac,0x81,0x00,
--	0x08,0xff,0xe8,0xab,0xbe,0x00,0x10,0x08,0x08,0xff,0xe8,0xab,0xad,0x00,0x08,0xff,
--	0xe8,0xac,0xb9,0x00,0xcf,0x86,0x95,0xde,0xd4,0x81,0xd3,0x40,0xd2,0x20,0xd1,0x10,
--	0x10,0x08,0x08,0xff,0xe8,0xae,0x8a,0x00,0x08,0xff,0xe8,0xb4,0x88,0x00,0x10,0x08,
--	0x08,0xff,0xe8,0xbc,0xb8,0x00,0x08,0xff,0xe9,0x81,0xb2,0x00,0xd1,0x10,0x10,0x08,
--	0x08,0xff,0xe9,0x86,0x99,0x00,0x08,0xff,0xe9,0x89,0xb6,0x00,0x10,0x08,0x08,0xff,
--	0xe9,0x99,0xbc,0x00,0x08,0xff,0xe9,0x9b,0xa3,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,
--	0x08,0xff,0xe9,0x9d,0x96,0x00,0x08,0xff,0xe9,0x9f,0x9b,0x00,0x10,0x08,0x08,0xff,
--	0xe9,0x9f,0xbf,0x00,0x08,0xff,0xe9,0xa0,0x8b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,
--	0xe9,0xa0,0xbb,0x00,0x08,0xff,0xe9,0xac,0x92,0x00,0x10,0x08,0x08,0xff,0xe9,0xbe,
--	0x9c,0x00,0x08,0xff,0xf0,0xa2,0xa1,0x8a,0x00,0xd3,0x45,0xd2,0x22,0xd1,0x12,0x10,
--	0x09,0x08,0xff,0xf0,0xa2,0xa1,0x84,0x00,0x08,0xff,0xf0,0xa3,0x8f,0x95,0x00,0x10,
--	0x08,0x08,0xff,0xe3,0xae,0x9d,0x00,0x08,0xff,0xe4,0x80,0x98,0x00,0xd1,0x11,0x10,
--	0x08,0x08,0xff,0xe4,0x80,0xb9,0x00,0x08,0xff,0xf0,0xa5,0x89,0x89,0x00,0x10,0x09,
--	0x08,0xff,0xf0,0xa5,0xb3,0x90,0x00,0x08,0xff,0xf0,0xa7,0xbb,0x93,0x00,0x92,0x14,
--	0x91,0x10,0x10,0x08,0x08,0xff,0xe9,0xbd,0x83,0x00,0x08,0xff,0xe9,0xbe,0x8e,0x00,
--	0x00,0x00,0x00,0x00,0x00,0x00,0xe1,0x94,0x01,0xe0,0x08,0x01,0xcf,0x86,0xd5,0x42,
--	0xd4,0x14,0x93,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
--	0x00,0x00,0x00,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,
--	0x01,0x00,0x01,0x00,0x52,0x04,0x00,0x00,0xd1,0x0d,0x10,0x04,0x00,0x00,0x04,0xff,
--	0xd7,0x99,0xd6,0xb4,0x00,0x10,0x04,0x01,0x1a,0x01,0xff,0xd7,0xb2,0xd6,0xb7,0x00,
--	0xd4,0x42,0x53,0x04,0x01,0x00,0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,
--	0xd7,0xa9,0xd7,0x81,0x00,0x01,0xff,0xd7,0xa9,0xd7,0x82,0x00,0xd1,0x16,0x10,0x0b,
--	0x01,0xff,0xd7,0xa9,0xd6,0xbc,0xd7,0x81,0x00,0x01,0xff,0xd7,0xa9,0xd6,0xbc,0xd7,
--	0x82,0x00,0x10,0x09,0x01,0xff,0xd7,0x90,0xd6,0xb7,0x00,0x01,0xff,0xd7,0x90,0xd6,
--	0xb8,0x00,0xd3,0x43,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0x90,0xd6,0xbc,
--	0x00,0x01,0xff,0xd7,0x91,0xd6,0xbc,0x00,0x10,0x09,0x01,0xff,0xd7,0x92,0xd6,0xbc,
--	0x00,0x01,0xff,0xd7,0x93,0xd6,0xbc,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0x94,
--	0xd6,0xbc,0x00,0x01,0xff,0xd7,0x95,0xd6,0xbc,0x00,0x10,0x09,0x01,0xff,0xd7,0x96,
--	0xd6,0xbc,0x00,0x00,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0x98,0xd6,
--	0xbc,0x00,0x01,0xff,0xd7,0x99,0xd6,0xbc,0x00,0x10,0x09,0x01,0xff,0xd7,0x9a,0xd6,
--	0xbc,0x00,0x01,0xff,0xd7,0x9b,0xd6,0xbc,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xd7,
--	0x9c,0xd6,0xbc,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xd7,0x9e,0xd6,0xbc,0x00,0x00,
--	0x00,0xcf,0x86,0x95,0x85,0x94,0x81,0xd3,0x3e,0xd2,0x1f,0xd1,0x12,0x10,0x09,0x01,
--	0xff,0xd7,0xa0,0xd6,0xbc,0x00,0x01,0xff,0xd7,0xa1,0xd6,0xbc,0x00,0x10,0x04,0x00,
--	0x00,0x01,0xff,0xd7,0xa3,0xd6,0xbc,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xd7,0xa4,
--	0xd6,0xbc,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xd7,0xa6,0xd6,0xbc,0x00,0x01,0xff,
--	0xd7,0xa7,0xd6,0xbc,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0xa8,0xd6,
--	0xbc,0x00,0x01,0xff,0xd7,0xa9,0xd6,0xbc,0x00,0x10,0x09,0x01,0xff,0xd7,0xaa,0xd6,
--	0xbc,0x00,0x01,0xff,0xd7,0x95,0xd6,0xb9,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,
--	0x91,0xd6,0xbf,0x00,0x01,0xff,0xd7,0x9b,0xd6,0xbf,0x00,0x10,0x09,0x01,0xff,0xd7,
--	0xa4,0xd6,0xbf,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd0,0x1a,0xcf,0x86,0x55,0x04,
--	0x01,0x00,0x54,0x04,0x01,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x01,0x00,0x0c,0x00,
--	0x0c,0x00,0x0c,0x00,0xcf,0x86,0x95,0x24,0xd4,0x10,0x93,0x0c,0x92,0x08,0x11,0x04,
--	0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x00,0x00,
--	0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd3,0x5a,0xd2,0x06,
--	0xcf,0x06,0x01,0x00,0xd1,0x14,0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0x95,0x08,
--	0x14,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd0,0x1a,0xcf,0x86,0x95,0x14,0x54,0x04,
--	0x01,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
--	0x01,0x00,0xcf,0x86,0xd5,0x0c,0x94,0x08,0x13,0x04,0x01,0x00,0x00,0x00,0x05,0x00,
--	0x54,0x04,0x05,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,
--	0x06,0x00,0x07,0x00,0x00,0x00,0xd2,0xce,0xd1,0xa5,0xd0,0x37,0xcf,0x86,0xd5,0x15,
--	0x54,0x05,0x06,0xff,0x00,0x53,0x04,0x08,0x00,0x92,0x08,0x11,0x04,0x08,0x00,0x00,
--	0x00,0x00,0x00,0x94,0x1c,0xd3,0x10,0x52,0x04,0x01,0xe6,0x51,0x04,0x0a,0xe6,0x10,
--	0x04,0x0a,0xe6,0x10,0xdc,0x52,0x04,0x10,0xdc,0x11,0x04,0x10,0xdc,0x11,0xe6,0x01,
--	0x00,0xcf,0x86,0xd5,0x38,0xd4,0x24,0xd3,0x14,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,
--	0x04,0x01,0x00,0x06,0x00,0x10,0x04,0x06,0x00,0x07,0x00,0x92,0x0c,0x91,0x08,0x10,
--	0x04,0x07,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x01,
--	0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0xd4,0x18,0xd3,0x10,0x52,
--	0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x12,0x04,0x01,
--	0x00,0x00,0x00,0x93,0x18,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x06,
--	0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0xd0,0x06,0xcf,
--	0x06,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,
-+	0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x91,0x08,
-+	0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,
-+	0x91,0x08,0x10,0x04,0x01,0x07,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x3c,0xd4,0x28,
-+	0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x00,0x00,0x01,0x00,
-+	0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,
-+	0x01,0x00,0x01,0x09,0x00,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,
-+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd4,0x18,0x93,0x14,0xd2,0x0c,0x91,0x08,
-+	0x10,0x04,0x01,0x00,0x07,0x00,0x07,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,
-+	0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0d,0x00,0x07,0x00,0x00,0x00,0x00,0x00,
-+	0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x11,0x00,0x13,0x00,0x13,0x00,0xe1,0x24,
-+	0x01,0xd0,0x86,0xcf,0x86,0xd5,0x44,0xd4,0x2c,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,
-+	0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,
- 	0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x00,
--	0x00,0x01,0xff,0x00,0xd1,0x50,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x94,0x14,0x93,0x10,
--	0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
--	0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,
--	0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x06,0x00,0x94,0x14,
--	0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x06,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
--	0x01,0x00,0x01,0x00,0xd0,0x2f,0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x15,0x93,0x11,
--	0x92,0x0d,0x91,0x09,0x10,0x05,0x01,0xff,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,
--	0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
--	0x00,0x00,0x00,0xcf,0x86,0xd5,0x38,0xd4,0x18,0xd3,0x0c,0x92,0x08,0x11,0x04,0x00,
--	0x00,0x01,0x00,0x01,0x00,0x92,0x08,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd3,
--	0x0c,0x92,0x08,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x00,
--	0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0xd4,0x20,0xd3,
--	0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x52,
--	0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x53,0x05,0x00,
--	0xff,0x00,0xd2,0x0d,0x91,0x09,0x10,0x05,0x00,0xff,0x00,0x04,0x00,0x04,0x00,0x91,
--	0x08,0x10,0x04,0x03,0x00,0x01,0x00,0x01,0x00,0x83,0xe2,0x46,0x3e,0xe1,0x1f,0x3b,
--	0xe0,0x9c,0x39,0xcf,0x86,0xe5,0x40,0x26,0xc4,0xe3,0x16,0x14,0xe2,0xef,0x11,0xe1,
--	0xd0,0x10,0xe0,0x60,0x07,0xcf,0x86,0xe5,0x53,0x03,0xe4,0x4c,0x02,0xe3,0x3d,0x01,
--	0xd2,0x94,0xd1,0x70,0xd0,0x4a,0xcf,0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x07,0x00,
--	0x52,0x04,0x07,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x07,0x00,0x07,0x00,0x07,0x00,
--	0xd4,0x14,0x93,0x10,0x52,0x04,0x07,0x00,0x51,0x04,0x07,0x00,0x10,0x04,0x07,0x00,
--	0x00,0x00,0x07,0x00,0x53,0x04,0x07,0x00,0xd2,0x0c,0x51,0x04,0x07,0x00,0x10,0x04,
--	0x07,0x00,0x00,0x00,0x51,0x04,0x07,0x00,0x10,0x04,0x00,0x00,0x07,0x00,0xcf,0x86,
--	0x95,0x20,0xd4,0x10,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,0x11,0x04,0x07,0x00,
--	0x00,0x00,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,0x11,0x04,0x07,0x00,0x00,0x00,
--	0x00,0x00,0xd0,0x06,0xcf,0x06,0x07,0x00,0xcf,0x86,0x55,0x04,0x07,0x00,0x54,0x04,
--	0x07,0x00,0x53,0x04,0x07,0x00,0x92,0x0c,0x51,0x04,0x07,0x00,0x10,0x04,0x07,0x00,
--	0x00,0x00,0x00,0x00,0xd1,0x40,0xd0,0x3a,0xcf,0x86,0xd5,0x20,0x94,0x1c,0x93,0x18,
--	0xd2,0x0c,0x51,0x04,0x07,0x00,0x10,0x04,0x07,0x00,0x00,0x00,0x51,0x04,0x00,0x00,
--	0x10,0x04,0x00,0x00,0x07,0x00,0x07,0x00,0x07,0x00,0x54,0x04,0x07,0x00,0x93,0x10,
--	0x52,0x04,0x07,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x07,0x00,0x07,0x00,
--	0xcf,0x06,0x08,0x00,0xd0,0x46,0xcf,0x86,0xd5,0x2c,0xd4,0x20,0x53,0x04,0x08,0x00,
--	0xd2,0x0c,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x10,0x00,0xd1,0x08,0x10,0x04,
--	0x10,0x00,0x12,0x00,0x10,0x04,0x12,0x00,0x00,0x00,0x53,0x04,0x0a,0x00,0x12,0x04,
--	0x0a,0x00,0x00,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x10,0x00,
--	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x08,0x14,0x04,
--	0x00,0x00,0x0a,0x00,0x54,0x04,0x0a,0x00,0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,
--	0x91,0x08,0x10,0x04,0x0a,0x00,0x0a,0xdc,0x00,0x00,0xd2,0x5e,0xd1,0x06,0xcf,0x06,
--	0x00,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x0a,0x00,0x53,0x04,0x0a,0x00,
--	0x52,0x04,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,
--	0xcf,0x86,0xd5,0x18,0x54,0x04,0x0a,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,
--	0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd4,0x14,0x93,0x10,0x92,0x0c,
--	0x91,0x08,0x10,0x04,0x10,0xdc,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x53,0x04,
--	0x10,0x00,0x12,0x04,0x10,0x00,0x00,0x00,0xd1,0x70,0xd0,0x36,0xcf,0x86,0xd5,0x18,
--	0x54,0x04,0x05,0x00,0x53,0x04,0x05,0x00,0x52,0x04,0x05,0x00,0x51,0x04,0x05,0x00,
--	0x10,0x04,0x05,0x00,0x10,0x00,0x94,0x18,0xd3,0x08,0x12,0x04,0x05,0x00,0x00,0x00,
--	0x52,0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x13,0x00,0x13,0x00,0x05,0x00,
--	0xcf,0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x05,0x00,0x92,0x0c,0x51,0x04,0x05,0x00,
--	0x10,0x04,0x05,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x54,0x04,0x10,0x00,0xd3,0x0c,
--	0x52,0x04,0x10,0x00,0x11,0x04,0x10,0x00,0x10,0xe6,0x92,0x0c,0x51,0x04,0x10,0xe6,
--	0x10,0x04,0x10,0xe6,0x00,0x00,0x00,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,
--	0x07,0x00,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,0x51,0x04,0x07,0x00,0x10,0x04,
--	0x00,0x00,0x07,0x00,0x08,0x00,0xcf,0x86,0x95,0x1c,0xd4,0x0c,0x93,0x08,0x12,0x04,
--	0x08,0x00,0x00,0x00,0x08,0x00,0x93,0x0c,0x52,0x04,0x08,0x00,0x11,0x04,0x08,0x00,
--	0x00,0x00,0x00,0x00,0x00,0x00,0xd3,0xba,0xd2,0x80,0xd1,0x34,0xd0,0x1a,0xcf,0x86,
--	0x55,0x04,0x05,0x00,0x94,0x10,0x93,0x0c,0x52,0x04,0x05,0x00,0x11,0x04,0x05,0x00,
--	0x07,0x00,0x05,0x00,0x05,0x00,0xcf,0x86,0x95,0x14,0x94,0x10,0x53,0x04,0x05,0x00,
--	0x52,0x04,0x05,0x00,0x11,0x04,0x05,0x00,0x07,0x00,0x07,0x00,0x07,0x00,0xd0,0x2a,
--	0xcf,0x86,0xd5,0x14,0x54,0x04,0x07,0x00,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,
--	0x11,0x04,0x07,0x00,0x00,0x00,0x94,0x10,0x53,0x04,0x07,0x00,0x92,0x08,0x11,0x04,
--	0x07,0x00,0x00,0x00,0x00,0x00,0x12,0x00,0xcf,0x86,0xd5,0x10,0x54,0x04,0x12,0x00,
--	0x93,0x08,0x12,0x04,0x12,0x00,0x00,0x00,0x12,0x00,0x54,0x04,0x12,0x00,0x53,0x04,
--	0x12,0x00,0x12,0x04,0x12,0x00,0x00,0x00,0xd1,0x34,0xd0,0x12,0xcf,0x86,0x55,0x04,
--	0x10,0x00,0x94,0x08,0x13,0x04,0x10,0x00,0x00,0x00,0x10,0x00,0xcf,0x86,0x55,0x04,
--	0x10,0x00,0x94,0x18,0xd3,0x08,0x12,0x04,0x10,0x00,0x00,0x00,0x52,0x04,0x00,0x00,
--	0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,
--	0xd2,0x06,0xcf,0x06,0x10,0x00,0xd1,0x40,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x10,0x00,
--	0x54,0x04,0x10,0x00,0x93,0x10,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,
--	0x10,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x14,0x54,0x04,0x10,0x00,0x93,0x0c,
--	0x52,0x04,0x10,0x00,0x11,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x94,0x08,0x13,0x04,
--	0x10,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xe4,0xce,0x02,0xe3,0x45,0x01,
--	0xd2,0xd0,0xd1,0x70,0xd0,0x52,0xcf,0x86,0xd5,0x20,0x94,0x1c,0xd3,0x0c,0x52,0x04,
--	0x07,0x00,0x11,0x04,0x07,0x00,0x00,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x07,0x00,
--	0x00,0x00,0x07,0x00,0x07,0x00,0x07,0x00,0x54,0x04,0x07,0x00,0xd3,0x10,0x52,0x04,
--	0x07,0x00,0x51,0x04,0x07,0x00,0x10,0x04,0x00,0x00,0x07,0x00,0xd2,0x0c,0x91,0x08,
--	0x10,0x04,0x07,0x00,0x00,0x00,0x00,0x00,0xd1,0x08,0x10,0x04,0x07,0x00,0x00,0x00,
--	0x10,0x04,0x00,0x00,0x07,0x00,0xcf,0x86,0x95,0x18,0x54,0x04,0x0b,0x00,0x93,0x10,
--	0x52,0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x00,0x00,0x0b,0x00,0x0b,0x00,
--	0x10,0x00,0xd0,0x32,0xcf,0x86,0xd5,0x18,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,
--	0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x94,0x14,
--	0x93,0x10,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,
--	0x10,0x00,0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,0x04,0x11,0x00,0xd3,0x14,
--	0xd2,0x0c,0x51,0x04,0x11,0x00,0x10,0x04,0x11,0x00,0x00,0x00,0x11,0x04,0x11,0x00,
--	0x00,0x00,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x11,0x00,0x11,0x00,
--	0xd1,0x40,0xd0,0x3a,0xcf,0x86,0xd5,0x1c,0x54,0x04,0x09,0x00,0x53,0x04,0x09,0x00,
--	0xd2,0x08,0x11,0x04,0x09,0x00,0x0b,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,
--	0x09,0x00,0x54,0x04,0x0a,0x00,0x53,0x04,0x0a,0x00,0xd2,0x08,0x11,0x04,0x0a,0x00,
--	0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0a,0x00,0xcf,0x06,0x00,0x00,
--	0xd0,0x1a,0xcf,0x86,0x55,0x04,0x0d,0x00,0x54,0x04,0x0d,0x00,0x53,0x04,0x0d,0x00,
--	0x52,0x04,0x00,0x00,0x11,0x04,0x11,0x00,0x0d,0x00,0xcf,0x86,0x95,0x14,0x54,0x04,
--	0x11,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x00,0x00,0x11,0x00,0x11,0x00,0x11,0x00,
--	0x11,0x00,0xd2,0xec,0xd1,0xa4,0xd0,0x76,0xcf,0x86,0xd5,0x48,0xd4,0x28,0xd3,0x14,
--	0x52,0x04,0x08,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,0x08,0x00,0x10,0x04,0x08,0x00,
--	0x00,0x00,0x52,0x04,0x00,0x00,0xd1,0x08,0x10,0x04,0x08,0x00,0x08,0xdc,0x10,0x04,
--	0x08,0x00,0x08,0xe6,0xd3,0x10,0x52,0x04,0x08,0x00,0x91,0x08,0x10,0x04,0x00,0x00,
--	0x08,0x00,0x08,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x08,0x00,0x08,0x00,
--	0x08,0x00,0x54,0x04,0x08,0x00,0xd3,0x0c,0x52,0x04,0x08,0x00,0x11,0x04,0x14,0x00,
--	0x00,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x08,0xe6,0x08,0x01,0x10,0x04,0x08,0xdc,
--	0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x08,0x09,0xcf,0x86,0x95,0x28,
--	0xd4,0x14,0x53,0x04,0x08,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,
--	0x00,0x00,0x00,0x00,0x53,0x04,0x08,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x08,0x00,
--	0x00,0x00,0x00,0x00,0x00,0x00,0x0b,0x00,0xd0,0x0a,0xcf,0x86,0x15,0x04,0x10,0x00,
--	0x00,0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0xd4,0x24,0xd3,0x14,0x52,0x04,0x10,0x00,
--	0xd1,0x08,0x10,0x04,0x10,0x00,0x10,0xe6,0x10,0x04,0x10,0xdc,0x00,0x00,0x92,0x0c,
--	0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x93,0x10,0x52,0x04,
--	0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xd1,0x54,
--	0xd0,0x26,0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,0x0b,0x00,0xd3,0x0c,0x52,0x04,
--	0x0b,0x00,0x11,0x04,0x0b,0x00,0x00,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,
--	0x0b,0x00,0x0b,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x14,0x54,0x04,0x0b,0x00,0x93,0x0c,
--	0x52,0x04,0x0b,0x00,0x11,0x04,0x0b,0x00,0x00,0x00,0x0b,0x00,0x54,0x04,0x0b,0x00,
--	0x93,0x10,0x92,0x0c,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,
--	0x0b,0x00,0xd0,0x42,0xcf,0x86,0xd5,0x28,0x54,0x04,0x10,0x00,0xd3,0x0c,0x92,0x08,
--	0x11,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,
--	0x10,0x00,0x10,0x00,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x94,0x14,
--	0x53,0x04,0x00,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,
--	0x10,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd3,0x96,0xd2,0x68,0xd1,0x24,0xd0,0x06,
--	0xcf,0x06,0x0b,0x00,0xcf,0x86,0x95,0x18,0x94,0x14,0x53,0x04,0x0b,0x00,0x92,0x0c,
--	0x91,0x08,0x10,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--	0xd0,0x1e,0xcf,0x86,0x55,0x04,0x11,0x00,0x54,0x04,0x11,0x00,0x93,0x10,0x92,0x0c,
--	0x51,0x04,0x11,0x00,0x10,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,
--	0x55,0x04,0x11,0x00,0x54,0x04,0x11,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,0x11,0x00,
--	0x10,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0x92,0x08,0x11,0x04,0x00,0x00,0x11,0x00,
--	0x11,0x00,0xd1,0x28,0xd0,0x22,0xcf,0x86,0x55,0x04,0x14,0x00,0xd4,0x0c,0x93,0x08,
--	0x12,0x04,0x14,0x00,0x14,0xe6,0x00,0x00,0x53,0x04,0x14,0x00,0x92,0x08,0x11,0x04,
--	0x14,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xd2,0x2a,
--	0xd1,0x24,0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,0x04,
--	0x0b,0x00,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,
--	0x0b,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd1,0x58,0xd0,0x12,0xcf,0x86,0x55,0x04,
--	0x14,0x00,0x94,0x08,0x13,0x04,0x14,0x00,0x00,0x00,0x14,0x00,0xcf,0x86,0x95,0x40,
--	0xd4,0x24,0xd3,0x0c,0x52,0x04,0x14,0x00,0x11,0x04,0x14,0x00,0x14,0xdc,0xd2,0x0c,
--	0x51,0x04,0x14,0xe6,0x10,0x04,0x14,0xe6,0x14,0xdc,0x91,0x08,0x10,0x04,0x14,0xe6,
--	0x14,0xdc,0x14,0xdc,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0xdc,0x14,0x00,
--	0x14,0x00,0x14,0x00,0x92,0x08,0x11,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--	0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,0x04,0x15,0x00,
--	0x93,0x10,0x52,0x04,0x15,0x00,0x51,0x04,0x15,0x00,0x10,0x04,0x15,0x00,0x00,0x00,
--	0x00,0x00,0xcf,0x86,0xe5,0x0f,0x06,0xe4,0xf8,0x03,0xe3,0x02,0x02,0xd2,0xfb,0xd1,
--	0x4c,0xd0,0x06,0xcf,0x06,0x0c,0x00,0xcf,0x86,0xd5,0x2c,0xd4,0x1c,0xd3,0x10,0x52,
--	0x04,0x0c,0x00,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x09,0x0c,0x00,0x52,0x04,0x0c,
--	0x00,0x11,0x04,0x0c,0x00,0x00,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x00,0x00,0x0c,
--	0x00,0x0c,0x00,0x0c,0x00,0x54,0x04,0x0c,0x00,0x53,0x04,0x00,0x00,0x52,0x04,0x00,
--	0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x09,0xd0,0x69,0xcf,0x86,0xd5,
--	0x32,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,0xd2,0x15,0x51,0x04,0x0b,0x00,0x10,
--	0x0d,0x0b,0xff,0xf0,0x91,0x82,0x99,0xf0,0x91,0x82,0xba,0x00,0x0b,0x00,0x91,0x11,
--	0x10,0x0d,0x0b,0xff,0xf0,0x91,0x82,0x9b,0xf0,0x91,0x82,0xba,0x00,0x0b,0x00,0x0b,
--	0x00,0xd4,0x1d,0x53,0x04,0x0b,0x00,0x92,0x15,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,
--	0x00,0x0b,0xff,0xf0,0x91,0x82,0xa5,0xf0,0x91,0x82,0xba,0x00,0x0b,0x00,0x53,0x04,
--	0x0b,0x00,0x92,0x10,0xd1,0x08,0x10,0x04,0x0b,0x00,0x0b,0x09,0x10,0x04,0x0b,0x07,
--	0x0b,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x20,0x94,0x1c,0xd3,0x0c,0x92,0x08,0x11,0x04,
--	0x0b,0x00,0x00,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,
--	0x14,0x00,0x00,0x00,0x0d,0x00,0xd4,0x14,0x53,0x04,0x0d,0x00,0x92,0x0c,0x91,0x08,
--	0x10,0x04,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x0d,0x00,0x92,0x08,
--	0x11,0x04,0x0d,0x00,0x00,0x00,0x00,0x00,0xd1,0x96,0xd0,0x5c,0xcf,0x86,0xd5,0x18,
--	0x94,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,0x0d,0xe6,0x10,0x04,0x0d,0xe6,0x0d,0x00,
--	0x0d,0x00,0x0d,0x00,0x0d,0x00,0xd4,0x26,0x53,0x04,0x0d,0x00,0x52,0x04,0x0d,0x00,
--	0x51,0x04,0x0d,0x00,0x10,0x0d,0x0d,0xff,0xf0,0x91,0x84,0xb1,0xf0,0x91,0x84,0xa7,
--	0x00,0x0d,0xff,0xf0,0x91,0x84,0xb2,0xf0,0x91,0x84,0xa7,0x00,0x93,0x18,0xd2,0x0c,
--	0x51,0x04,0x0d,0x00,0x10,0x04,0x0d,0x00,0x0d,0x09,0x91,0x08,0x10,0x04,0x0d,0x09,
--	0x00,0x00,0x0d,0x00,0x0d,0x00,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x52,0x04,
--	0x0d,0x00,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0x10,0x00,
--	0x54,0x04,0x10,0x00,0x93,0x18,0xd2,0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,
--	0x10,0x07,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xd0,0x06,
--	0xcf,0x06,0x0d,0x00,0xcf,0x86,0xd5,0x40,0xd4,0x2c,0xd3,0x10,0x92,0x0c,0x91,0x08,
--	0x10,0x04,0x0d,0x09,0x0d,0x00,0x0d,0x00,0x0d,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,
--	0x0d,0x00,0x11,0x00,0x10,0x04,0x11,0x07,0x11,0x00,0x91,0x08,0x10,0x04,0x11,0x00,
--	0x10,0x00,0x00,0x00,0x53,0x04,0x0d,0x00,0x92,0x0c,0x51,0x04,0x0d,0x00,0x10,0x04,
--	0x10,0x00,0x11,0x00,0x11,0x00,0xd4,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,
--	0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x93,0x10,0x52,0x04,0x10,0x00,
--	0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd2,0xc8,0xd1,0x48,
--	0xd0,0x42,0xcf,0x86,0xd5,0x18,0x54,0x04,0x10,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,
--	0x10,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x54,0x04,0x10,0x00,
--	0xd3,0x14,0x52,0x04,0x10,0x00,0xd1,0x08,0x10,0x04,0x10,0x00,0x10,0x09,0x10,0x04,
--	0x10,0x07,0x10,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x12,0x00,
--	0x00,0x00,0xcf,0x06,0x00,0x00,0xd0,0x52,0xcf,0x86,0xd5,0x3c,0xd4,0x28,0xd3,0x10,
--	0x52,0x04,0x11,0x00,0x51,0x04,0x11,0x00,0x10,0x04,0x11,0x00,0x00,0x00,0xd2,0x0c,
--	0x91,0x08,0x10,0x04,0x11,0x00,0x00,0x00,0x11,0x00,0x51,0x04,0x11,0x00,0x10,0x04,
--	0x00,0x00,0x11,0x00,0x53,0x04,0x11,0x00,0x52,0x04,0x11,0x00,0x51,0x04,0x11,0x00,
--	0x10,0x04,0x00,0x00,0x11,0x00,0x94,0x10,0x53,0x04,0x11,0x00,0x92,0x08,0x11,0x04,
--	0x11,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0xd4,0x18,
--	0x53,0x04,0x10,0x00,0x92,0x10,0xd1,0x08,0x10,0x04,0x10,0x00,0x10,0x07,0x10,0x04,
--	0x10,0x09,0x00,0x00,0x00,0x00,0x53,0x04,0x10,0x00,0x92,0x08,0x11,0x04,0x10,0x00,
--	0x00,0x00,0x00,0x00,0xe1,0x27,0x01,0xd0,0x8a,0xcf,0x86,0xd5,0x44,0xd4,0x2c,0xd3,
--	0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x11,0x00,0x10,0x00,0x10,0x00,0x91,0x08,0x10,
--	0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x52,0x04,0x10,0x00,0xd1,0x08,0x10,0x04,0x10,
--	0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x93,0x14,0x92,0x10,0xd1,0x08,0x10,
--	0x04,0x10,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0xd4,
--	0x14,0x53,0x04,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x10,
--	0x00,0x10,0x00,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x10,
--	0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0xd2,0x0c,0x51,0x04,0x10,
--	0x00,0x10,0x04,0x00,0x00,0x14,0x07,0x91,0x08,0x10,0x04,0x10,0x07,0x10,0x00,0x10,
--	0x00,0xcf,0x86,0xd5,0x6a,0xd4,0x42,0xd3,0x14,0x52,0x04,0x10,0x00,0xd1,0x08,0x10,
--	0x04,0x10,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0xd2,0x19,0xd1,0x08,0x10,
--	0x04,0x10,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0xff,0xf0,0x91,0x8d,0x87,0xf0,
--	0x91,0x8c,0xbe,0x00,0x91,0x11,0x10,0x0d,0x10,0xff,0xf0,0x91,0x8d,0x87,0xf0,0x91,
--	0x8d,0x97,0x00,0x10,0x09,0x00,0x00,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x11,
--	0x00,0x00,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x52,
--	0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0xd4,0x1c,0xd3,
--	0x0c,0x52,0x04,0x10,0x00,0x11,0x04,0x00,0x00,0x10,0xe6,0x52,0x04,0x10,0xe6,0x91,
--	0x08,0x10,0x04,0x10,0xe6,0x00,0x00,0x00,0x00,0x93,0x10,0x52,0x04,0x10,0xe6,0x91,
--	0x08,0x10,0x04,0x10,0xe6,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xe3,
--	0x30,0x01,0xd2,0xb7,0xd1,0x48,0xd0,0x06,0xcf,0x06,0x12,0x00,0xcf,0x86,0x95,0x3c,
--	0xd4,0x1c,0x93,0x18,0xd2,0x0c,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x09,0x12,0x00,
--	0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x07,0x12,0x00,0x12,0x00,0x53,0x04,0x12,0x00,
--	0xd2,0x0c,0x51,0x04,0x12,0x00,0x10,0x04,0x00,0x00,0x12,0x00,0xd1,0x08,0x10,0x04,
--	0x00,0x00,0x12,0x00,0x10,0x04,0x14,0xe6,0x15,0x00,0x00,0x00,0xd0,0x45,0xcf,0x86,
--	0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,0xd2,0x15,0x51,0x04,
--	0x10,0x00,0x10,0x04,0x10,0x00,0x10,0xff,0xf0,0x91,0x92,0xb9,0xf0,0x91,0x92,0xba,
--	0x00,0xd1,0x11,0x10,0x0d,0x10,0xff,0xf0,0x91,0x92,0xb9,0xf0,0x91,0x92,0xb0,0x00,
--	0x10,0x00,0x10,0x0d,0x10,0xff,0xf0,0x91,0x92,0xb9,0xf0,0x91,0x92,0xbd,0x00,0x10,
--	0x00,0xcf,0x86,0x95,0x24,0xd4,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,0x10,0x00,0x10,
--	0x04,0x10,0x09,0x10,0x07,0x10,0x00,0x00,0x00,0x53,0x04,0x10,0x00,0x92,0x08,0x11,
--	0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,0x06,0xcf,0x06,0x00,0x00,0xd0,
--	0x40,0xcf,0x86,0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,0xd3,0x0c,0x52,0x04,0x10,
--	0x00,0x11,0x04,0x10,0x00,0x00,0x00,0xd2,0x1e,0x51,0x04,0x10,0x00,0x10,0x0d,0x10,
--	0xff,0xf0,0x91,0x96,0xb8,0xf0,0x91,0x96,0xaf,0x00,0x10,0xff,0xf0,0x91,0x96,0xb9,
--	0xf0,0x91,0x96,0xaf,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x10,0x09,0xcf,
--	0x86,0x95,0x2c,0xd4,0x1c,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x10,0x07,0x10,
--	0x00,0x10,0x00,0x10,0x00,0x92,0x08,0x11,0x04,0x10,0x00,0x11,0x00,0x11,0x00,0x53,
--	0x04,0x11,0x00,0x52,0x04,0x11,0x00,0x11,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0xd2,
--	0xa0,0xd1,0x5c,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,0x53,
--	0x04,0x10,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x10,
--	0x09,0xcf,0x86,0xd5,0x24,0xd4,0x14,0x93,0x10,0x52,0x04,0x10,0x00,0x91,0x08,0x10,
--	0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x10,0x00,0x92,0x08,0x11,
--	0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x94,0x14,0x53,0x04,0x12,0x00,0x52,0x04,0x12,
--	0x00,0x91,0x08,0x10,0x04,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd0,0x2a,0xcf,
--	0x86,0x55,0x04,0x0d,0x00,0x54,0x04,0x0d,0x00,0xd3,0x10,0x52,0x04,0x0d,0x00,0x51,
--	0x04,0x0d,0x00,0x10,0x04,0x0d,0x09,0x0d,0x07,0x92,0x0c,0x91,0x08,0x10,0x04,0x15,
--	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0x95,0x14,0x94,0x10,0x53,0x04,0x0d,
--	0x00,0x92,0x08,0x11,0x04,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,
--	0x40,0xd0,0x3a,0xcf,0x86,0xd5,0x20,0x54,0x04,0x11,0x00,0x53,0x04,0x11,0x00,0xd2,
--	0x0c,0x51,0x04,0x11,0x00,0x10,0x04,0x14,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x00,
--	0x00,0x11,0x00,0x11,0x00,0x94,0x14,0x53,0x04,0x11,0x00,0x92,0x0c,0x51,0x04,0x11,
--	0x00,0x10,0x04,0x11,0x00,0x11,0x09,0x00,0x00,0x11,0x00,0xcf,0x06,0x00,0x00,0xcf,
--	0x06,0x00,0x00,0xe4,0x59,0x01,0xd3,0xb2,0xd2,0x5c,0xd1,0x28,0xd0,0x22,0xcf,0x86,
--	0x55,0x04,0x14,0x00,0x54,0x04,0x14,0x00,0x53,0x04,0x14,0x00,0x92,0x10,0xd1,0x08,
--	0x10,0x04,0x14,0x00,0x14,0x09,0x10,0x04,0x14,0x07,0x14,0x00,0x00,0x00,0xcf,0x06,
--	0x00,0x00,0xd0,0x0a,0xcf,0x86,0x15,0x04,0x00,0x00,0x10,0x00,0xcf,0x86,0x55,0x04,
--	0x10,0x00,0x54,0x04,0x10,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,0x10,0x00,0x10,0x04,
--	0x10,0x00,0x00,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,
--	0x00,0x00,0x10,0x00,0xd1,0x06,0xcf,0x06,0x00,0x00,0xd0,0x1a,0xcf,0x86,0x55,0x04,
--	0x00,0x00,0x94,0x10,0x53,0x04,0x15,0x00,0x92,0x08,0x11,0x04,0x00,0x00,0x15,0x00,
--	0x15,0x00,0x15,0x00,0xcf,0x86,0xd5,0x14,0x54,0x04,0x15,0x00,0x53,0x04,0x15,0x00,
--	0x92,0x08,0x11,0x04,0x00,0x00,0x15,0x00,0x15,0x00,0x94,0x1c,0x93,0x18,0xd2,0x0c,
--	0x91,0x08,0x10,0x04,0x15,0x09,0x15,0x00,0x15,0x00,0x91,0x08,0x10,0x04,0x15,0x00,
--	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd2,0xa0,0xd1,0x3c,0xd0,0x1e,0xcf,0x86,
--	0x55,0x04,0x13,0x00,0x54,0x04,0x13,0x00,0x93,0x10,0x52,0x04,0x13,0x00,0x91,0x08,
--	0x10,0x04,0x13,0x09,0x13,0x00,0x13,0x00,0x13,0x00,0xcf,0x86,0x95,0x18,0x94,0x14,
--	0x93,0x10,0x52,0x04,0x13,0x00,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x13,0x09,
--	0x00,0x00,0x13,0x00,0x13,0x00,0xd0,0x46,0xcf,0x86,0xd5,0x2c,0xd4,0x10,0x93,0x0c,
--	0x52,0x04,0x13,0x00,0x11,0x04,0x15,0x00,0x13,0x00,0x13,0x00,0x53,0x04,0x13,0x00,
--	0xd2,0x0c,0x91,0x08,0x10,0x04,0x13,0x00,0x13,0x09,0x13,0x00,0x91,0x08,0x10,0x04,
--	0x13,0x00,0x14,0x00,0x13,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,0x13,0x00,
--	0x10,0x04,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0x55,0x04,
--	0x10,0x00,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,
--	0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xe3,0xa9,0x01,0xd2,
--	0xb0,0xd1,0x6c,0xd0,0x3e,0xcf,0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x12,0x00,0x92,
--	0x0c,0x91,0x08,0x10,0x04,0x12,0x00,0x00,0x00,0x12,0x00,0x12,0x00,0x12,0x00,0x54,
--	0x04,0x12,0x00,0xd3,0x10,0x52,0x04,0x12,0x00,0x51,0x04,0x12,0x00,0x10,0x04,0x12,
--	0x00,0x00,0x00,0x52,0x04,0x12,0x00,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x12,
--	0x09,0xcf,0x86,0xd5,0x14,0x94,0x10,0x93,0x0c,0x52,0x04,0x12,0x00,0x11,0x04,0x12,
--	0x00,0x00,0x00,0x00,0x00,0x12,0x00,0x94,0x14,0x53,0x04,0x12,0x00,0x52,0x04,0x12,
--	0x00,0x91,0x08,0x10,0x04,0x12,0x00,0x00,0x00,0x00,0x00,0x12,0x00,0xd0,0x3e,0xcf,
--	0x86,0xd5,0x14,0x54,0x04,0x12,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x00,0x00,0x12,
--	0x00,0x12,0x00,0x12,0x00,0xd4,0x14,0x53,0x04,0x12,0x00,0x92,0x0c,0x91,0x08,0x10,
--	0x04,0x00,0x00,0x12,0x00,0x12,0x00,0x12,0x00,0x93,0x10,0x52,0x04,0x12,0x00,0x51,
--	0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd1,
--	0xa0,0xd0,0x52,0xcf,0x86,0xd5,0x24,0x94,0x20,0xd3,0x10,0x52,0x04,0x13,0x00,0x51,
--	0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x00,0x00,0x92,0x0c,0x51,0x04,0x13,0x00,0x10,
--	0x04,0x00,0x00,0x13,0x00,0x13,0x00,0x13,0x00,0x54,0x04,0x13,0x00,0xd3,0x10,0x52,
--	0x04,0x13,0x00,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x00,0x00,0xd2,0x0c,0x51,
--	0x04,0x00,0x00,0x10,0x04,0x13,0x00,0x00,0x00,0x51,0x04,0x13,0x00,0x10,0x04,0x00,
--	0x00,0x13,0x00,0xcf,0x86,0xd5,0x28,0xd4,0x18,0x93,0x14,0xd2,0x0c,0x51,0x04,0x13,
--	0x00,0x10,0x04,0x13,0x07,0x13,0x00,0x11,0x04,0x13,0x09,0x13,0x00,0x00,0x00,0x53,
--	0x04,0x13,0x00,0x92,0x08,0x11,0x04,0x13,0x00,0x00,0x00,0x00,0x00,0x94,0x20,0xd3,
--	0x10,0x52,0x04,0x14,0x00,0x51,0x04,0x14,0x00,0x10,0x04,0x00,0x00,0x14,0x00,0x92,
--	0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,0x14,0x00,0x14,0x00,0x14,0x00,0xd0,
--	0x52,0xcf,0x86,0xd5,0x3c,0xd4,0x14,0x53,0x04,0x14,0x00,0x52,0x04,0x14,0x00,0x51,
--	0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x00,0x00,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x14,
--	0x00,0x10,0x04,0x00,0x00,0x14,0x00,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x14,
--	0x09,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x94,
--	0x10,0x53,0x04,0x14,0x00,0x92,0x08,0x11,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0x00,
--	0x00,0xcf,0x06,0x00,0x00,0xd2,0x2a,0xd1,0x06,0xcf,0x06,0x00,0x00,0xd0,0x06,0xcf,
--	0x06,0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,0x04,0x14,0x00,0x53,0x04,0x14,
--	0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,
--	0x06,0xcf,0x06,0x00,0x00,0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x86,0x55,0x04,0x15,
--	0x00,0x54,0x04,0x15,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,0x15,0x00,0x00,0x00,0x00,
--	0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x15,0x00,0xd0,
--	0xca,0xcf,0x86,0xd5,0xc2,0xd4,0x54,0xd3,0x06,0xcf,0x06,0x09,0x00,0xd2,0x06,0xcf,
--	0x06,0x09,0x00,0xd1,0x24,0xd0,0x06,0xcf,0x06,0x09,0x00,0xcf,0x86,0x55,0x04,0x09,
--	0x00,0x94,0x14,0x53,0x04,0x09,0x00,0x52,0x04,0x09,0x00,0x51,0x04,0x09,0x00,0x10,
--	0x04,0x09,0x00,0x10,0x00,0x10,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x10,
--	0x00,0x53,0x04,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x10,0x00,0x11,0x00,0x00,
--	0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd3,0x68,0xd2,0x46,0xd1,0x40,0xd0,
--	0x06,0xcf,0x06,0x09,0x00,0xcf,0x86,0x55,0x04,0x09,0x00,0xd4,0x20,0xd3,0x10,0x92,
--	0x0c,0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x10,0x00,0x10,0x00,0x52,0x04,0x10,
--	0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x93,0x10,0x52,0x04,0x09,
--	0x00,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x11,
--	0x00,0xd1,0x1c,0xd0,0x06,0xcf,0x06,0x11,0x00,0xcf,0x86,0x95,0x10,0x94,0x0c,0x93,
--	0x08,0x12,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,
--	0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x86,0xd5,0x4c,0xd4,0x06,0xcf,
--	0x06,0x0b,0x00,0xd3,0x40,0xd2,0x3a,0xd1,0x34,0xd0,0x2e,0xcf,0x86,0x55,0x04,0x0b,
--	0x00,0xd4,0x14,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,
--	0x04,0x0b,0x00,0x00,0x00,0x53,0x04,0x15,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x15,
-+	0x00,0x01,0x00,0x93,0x14,0x92,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,
-+	0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,
-+	0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0xd3,0x18,0xd2,
-+	0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x00,
-+	0x00,0x07,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,
-+	0x04,0x01,0x07,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x73,0xd4,0x45,0xd3,0x14,0x52,
-+	0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x0a,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,
-+	0x00,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe0,0xad,0x87,0xe0,0xad,0x96,0x00,
-+	0x00,0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xe0,0xad,0x87,0xe0,0xac,0xbe,0x00,0x91,
-+	0x0f,0x10,0x0b,0x01,0xff,0xe0,0xad,0x87,0xe0,0xad,0x97,0x00,0x01,0x09,0x00,0x00,
-+	0xd3,0x0c,0x52,0x04,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x52,0x04,0x00,0x00,
-+	0xd1,0x16,0x10,0x0b,0x01,0xff,0xe0,0xac,0xa1,0xe0,0xac,0xbc,0x00,0x01,0xff,0xe0,
-+	0xac,0xa2,0xe0,0xac,0xbc,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xd4,0x14,0x93,0x10,
-+	0xd2,0x08,0x11,0x04,0x01,0x00,0x0a,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,
-+	0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x07,0x00,0x0c,0x00,0x0c,0x00,
-+	0x00,0x00,0xd0,0xb1,0xcf,0x86,0xd5,0x63,0xd4,0x28,0xd3,0x14,0xd2,0x08,0x11,0x04,
-+	0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0xd2,0x0c,
-+	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,
-+	0xd3,0x1f,0xd2,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x91,0x0f,
-+	0x10,0x0b,0x01,0xff,0xe0,0xae,0x92,0xe0,0xaf,0x97,0x00,0x01,0x00,0x00,0x00,0xd2,
-+	0x10,0xd1,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x91,
-+	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0xd4,0x2c,0xd3,0x18,0xd2,0x0c,0x51,
-+	0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,
-+	0x00,0x00,0x00,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x11,
-+	0x04,0x00,0x00,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,
-+	0x04,0x08,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x00,
-+	0x00,0x01,0x00,0xcf,0x86,0xd5,0x61,0xd4,0x45,0xd3,0x14,0xd2,0x0c,0x51,0x04,0x01,
-+	0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0xd2,0x1e,0xd1,
-+	0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x0b,0x01,0xff,0xe0,0xaf,0x86,0xe0,0xae,
-+	0xbe,0x00,0x01,0xff,0xe0,0xaf,0x87,0xe0,0xae,0xbe,0x00,0x91,0x0f,0x10,0x0b,0x01,
-+	0xff,0xe0,0xaf,0x86,0xe0,0xaf,0x97,0x00,0x01,0x09,0x00,0x00,0x93,0x18,0xd2,0x0c,
-+	0x91,0x08,0x10,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,
-+	0x00,0x00,0x01,0x00,0x00,0x00,0xd4,0x14,0x93,0x10,0x52,0x04,0x00,0x00,0x51,0x04,
-+	0x00,0x00,0x10,0x04,0x08,0x00,0x01,0x00,0x01,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,
-+	0x01,0x00,0x10,0x04,0x01,0x00,0x07,0x00,0x07,0x00,0x92,0x0c,0x51,0x04,0x07,0x00,
-+	0x10,0x04,0x07,0x00,0x00,0x00,0x00,0x00,0xe3,0x1c,0x04,0xe2,0x1a,0x02,0xd1,0xf3,
-+	0xd0,0x76,0xcf,0x86,0xd5,0x3c,0xd4,0x28,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,
-+	0x10,0x00,0x01,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x14,0x00,0x01,0x00,0x01,0x00,
-+	0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x93,0x10,
-+	0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
-+	0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,
-+	0x01,0x00,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x10,0x00,
-+	0x01,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,
-+	0x00,0x00,0x0a,0x00,0x01,0x00,0xcf,0x86,0xd5,0x53,0xd4,0x2f,0xd3,0x10,0x52,0x04,
-+	0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0xd2,0x13,0x91,0x0f,
-+	0x10,0x0b,0x01,0xff,0xe0,0xb1,0x86,0xe0,0xb1,0x96,0x00,0x00,0x00,0x01,0x00,0x91,
-+	0x08,0x10,0x04,0x01,0x00,0x01,0x09,0x00,0x00,0xd3,0x14,0x52,0x04,0x00,0x00,0xd1,
-+	0x08,0x10,0x04,0x00,0x00,0x01,0x54,0x10,0x04,0x01,0x5b,0x00,0x00,0x92,0x0c,0x51,
-+	0x04,0x0a,0x00,0x10,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0xd4,0x14,0x93,0x10,0xd2,
-+	0x08,0x11,0x04,0x01,0x00,0x0a,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x93,
-+	0x10,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x15,0x00,0x0a,
-+	0x00,0xd0,0x76,0xcf,0x86,0xd5,0x3c,0xd4,0x28,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,
-+	0x04,0x12,0x00,0x10,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x14,0x00,0x01,0x00,0x01,
-+	0x00,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x93,
-+	0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x01,
-+	0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x00,
-+	0x00,0x01,0x00,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x00,
-+	0x00,0x01,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,
-+	0x04,0x07,0x07,0x07,0x00,0x01,0x00,0xcf,0x86,0xd5,0x82,0xd4,0x5e,0xd3,0x2a,0xd2,
-+	0x13,0x91,0x0f,0x10,0x0b,0x01,0xff,0xe0,0xb2,0xbf,0xe0,0xb3,0x95,0x00,0x01,0x00,
-+	0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x01,0x00,0x01,0xff,
-+	0xe0,0xb3,0x86,0xe0,0xb3,0x95,0x00,0xd2,0x28,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe0,
-+	0xb3,0x86,0xe0,0xb3,0x96,0x00,0x00,0x00,0x10,0x0b,0x01,0xff,0xe0,0xb3,0x86,0xe0,
-+	0xb3,0x82,0x00,0x01,0xff,0xe0,0xb3,0x86,0xe0,0xb3,0x82,0xe0,0xb3,0x95,0x00,0x91,
-+	0x08,0x10,0x04,0x01,0x00,0x01,0x09,0x00,0x00,0xd3,0x14,0x52,0x04,0x00,0x00,0xd1,
-+	0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x52,0x04,0x00,
-+	0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0xd4,0x14,0x93,0x10,0xd2,
-+	0x08,0x11,0x04,0x01,0x00,0x09,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x93,
-+	0x14,0x92,0x10,0xd1,0x08,0x10,0x04,0x00,0x00,0x09,0x00,0x10,0x04,0x09,0x00,0x00,
-+	0x00,0x00,0x00,0x00,0x00,0xe1,0x06,0x01,0xd0,0x6e,0xcf,0x86,0xd5,0x3c,0xd4,0x28,
-+	0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x13,0x00,0x10,0x00,0x01,0x00,0x91,0x08,
-+	0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,
-+	0x01,0x00,0x00,0x00,0x01,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,
-+	0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,
-+	0x91,0x08,0x10,0x04,0x01,0x00,0x0c,0x00,0x01,0x00,0x01,0x00,0x53,0x04,0x01,0x00,
-+	0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x0c,0x00,0x13,0x09,0x91,0x08,0x10,0x04,
-+	0x13,0x09,0x0a,0x00,0x01,0x00,0xcf,0x86,0xd5,0x65,0xd4,0x45,0xd3,0x10,0x52,0x04,
-+	0x01,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x00,0x00,0x01,0x00,0xd2,0x1e,0xd1,0x08,
-+	0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x0b,0x01,0xff,0xe0,0xb5,0x86,0xe0,0xb4,0xbe,
-+	0x00,0x01,0xff,0xe0,0xb5,0x87,0xe0,0xb4,0xbe,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,
-+	0xe0,0xb5,0x86,0xe0,0xb5,0x97,0x00,0x01,0x09,0x10,0x04,0x0c,0x00,0x12,0x00,0xd3,
-+	0x10,0x52,0x04,0x00,0x00,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x01,0x00,0x52,
-+	0x04,0x12,0x00,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x11,0x00,0xd4,0x14,0x93,
-+	0x10,0xd2,0x08,0x11,0x04,0x01,0x00,0x0a,0x00,0x11,0x04,0x00,0x00,0x01,0x00,0x01,
-+	0x00,0xd3,0x0c,0x52,0x04,0x0a,0x00,0x11,0x04,0x0a,0x00,0x12,0x00,0x92,0x0c,0x91,
-+	0x08,0x10,0x04,0x12,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0xd0,0x5a,0xcf,0x86,0xd5,
-+	0x34,0xd4,0x18,0x93,0x14,0xd2,0x08,0x11,0x04,0x00,0x00,0x04,0x00,0x91,0x08,0x10,
-+	0x04,0x00,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0xd3,0x10,0x52,0x04,0x04,0x00,0x51,
-+	0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0x92,0x08,0x11,0x04,0x00,0x00,0x04,
-+	0x00,0x04,0x00,0x54,0x04,0x04,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,0x04,0x00,0x10,
-+	0x04,0x00,0x00,0x04,0x00,0x04,0x00,0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x00,
-+	0x00,0x04,0x00,0x00,0x00,0xcf,0x86,0xd5,0x77,0xd4,0x28,0xd3,0x10,0x52,0x04,0x04,
-+	0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0xd2,0x0c,0x51,0x04,0x00,
-+	0x00,0x10,0x04,0x04,0x09,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x04,
-+	0x00,0xd3,0x14,0x52,0x04,0x04,0x00,0xd1,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x10,
-+	0x04,0x04,0x00,0x00,0x00,0xd2,0x13,0x51,0x04,0x04,0x00,0x10,0x0b,0x04,0xff,0xe0,
-+	0xb7,0x99,0xe0,0xb7,0x8a,0x00,0x04,0x00,0xd1,0x19,0x10,0x0b,0x04,0xff,0xe0,0xb7,
-+	0x99,0xe0,0xb7,0x8f,0x00,0x04,0xff,0xe0,0xb7,0x99,0xe0,0xb7,0x8f,0xe0,0xb7,0x8a,
-+	0x00,0x10,0x0b,0x04,0xff,0xe0,0xb7,0x99,0xe0,0xb7,0x9f,0x00,0x04,0x00,0xd4,0x10,
-+	0x93,0x0c,0x52,0x04,0x00,0x00,0x11,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x93,0x14,
-+	0xd2,0x08,0x11,0x04,0x00,0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,
-+	0x00,0x00,0x00,0x00,0xe2,0x31,0x01,0xd1,0x58,0xd0,0x3a,0xcf,0x86,0xd5,0x18,0x94,
-+	0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,
-+	0x00,0x01,0x00,0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,
-+	0x04,0x01,0x67,0x10,0x04,0x01,0x09,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,
-+	0x00,0x01,0x00,0xcf,0x86,0x95,0x18,0xd4,0x0c,0x53,0x04,0x01,0x00,0x12,0x04,0x01,
-+	0x6b,0x01,0x00,0x53,0x04,0x01,0x00,0x12,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0xd0,
-+	0x9e,0xcf,0x86,0xd5,0x54,0xd4,0x3c,0xd3,0x20,0xd2,0x10,0xd1,0x08,0x10,0x04,0x00,
-+	0x00,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,
-+	0x00,0x10,0x04,0x15,0x00,0x01,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x15,
-+	0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x91,0x08,0x10,0x04,0x15,0x00,0x01,0x00,0x15,
-+	0x00,0xd3,0x08,0x12,0x04,0x15,0x00,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x15,
-+	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x30,0xd3,0x1c,0xd2,0x0c,0x91,0x08,0x10,
-+	0x04,0x15,0x00,0x01,0x00,0x01,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x10,
-+	0x04,0x00,0x00,0x01,0x00,0xd2,0x08,0x11,0x04,0x15,0x00,0x01,0x00,0x91,0x08,0x10,
-+	0x04,0x15,0x00,0x01,0x00,0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,
-+	0x76,0x10,0x04,0x15,0x09,0x01,0x00,0x11,0x04,0x01,0x00,0x00,0x00,0xcf,0x86,0x95,
-+	0x34,0xd4,0x20,0xd3,0x14,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x00,
-+	0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x52,0x04,0x01,0x7a,0x11,0x04,0x01,0x00,0x00,
-+	0x00,0x53,0x04,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x00,0x00,0x11,0x04,0x01,
-+	0x00,0x0d,0x00,0x00,0x00,0xe1,0x2b,0x01,0xd0,0x3e,0xcf,0x86,0xd5,0x14,0x54,0x04,
-+	0x02,0x00,0x53,0x04,0x02,0x00,0x92,0x08,0x11,0x04,0x02,0xdc,0x02,0x00,0x02,0x00,
-+	0x54,0x04,0x02,0x00,0xd3,0x14,0x52,0x04,0x02,0x00,0xd1,0x08,0x10,0x04,0x02,0x00,
-+	0x02,0xdc,0x10,0x04,0x02,0x00,0x02,0xdc,0x92,0x0c,0x91,0x08,0x10,0x04,0x02,0x00,
-+	0x02,0xd8,0x02,0x00,0x02,0x00,0xcf,0x86,0xd5,0x73,0xd4,0x36,0xd3,0x17,0x92,0x13,
-+	0x51,0x04,0x02,0x00,0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbd,0x82,0xe0,0xbe,0xb7,
-+	0x00,0x02,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x02,0x00,0x02,0x00,0x91,
-+	0x0f,0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbd,0x8c,0xe0,0xbe,0xb7,0x00,0x02,0x00,
-+	0xd3,0x26,0xd2,0x13,0x51,0x04,0x02,0x00,0x10,0x0b,0x02,0xff,0xe0,0xbd,0x91,0xe0,
-+	0xbe,0xb7,0x00,0x02,0x00,0x51,0x04,0x02,0x00,0x10,0x04,0x02,0x00,0x02,0xff,0xe0,
-+	0xbd,0x96,0xe0,0xbe,0xb7,0x00,0x52,0x04,0x02,0x00,0x91,0x0f,0x10,0x0b,0x02,0xff,
-+	0xe0,0xbd,0x9b,0xe0,0xbe,0xb7,0x00,0x02,0x00,0x02,0x00,0xd4,0x27,0x53,0x04,0x02,
-+	0x00,0xd2,0x17,0xd1,0x0f,0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbd,0x80,0xe0,0xbe,
-+	0xb5,0x00,0x10,0x04,0x04,0x00,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x00,0x00,
-+	0x00,0x00,0xd3,0x35,0xd2,0x17,0xd1,0x08,0x10,0x04,0x00,0x00,0x02,0x81,0x10,0x04,
-+	0x02,0x82,0x02,0xff,0xe0,0xbd,0xb1,0xe0,0xbd,0xb2,0x00,0xd1,0x0f,0x10,0x04,0x02,
-+	0x84,0x02,0xff,0xe0,0xbd,0xb1,0xe0,0xbd,0xb4,0x00,0x10,0x0b,0x02,0xff,0xe0,0xbe,
-+	0xb2,0xe0,0xbe,0x80,0x00,0x02,0x00,0xd2,0x13,0x91,0x0f,0x10,0x0b,0x02,0xff,0xe0,
-+	0xbe,0xb3,0xe0,0xbe,0x80,0x00,0x02,0x00,0x02,0x82,0x11,0x04,0x02,0x82,0x02,0x00,
-+	0xd0,0xd3,0xcf,0x86,0xd5,0x65,0xd4,0x27,0xd3,0x1f,0xd2,0x13,0x91,0x0f,0x10,0x04,
-+	0x02,0x82,0x02,0xff,0xe0,0xbd,0xb1,0xe0,0xbe,0x80,0x00,0x02,0xe6,0x91,0x08,0x10,
-+	0x04,0x02,0x09,0x02,0x00,0x02,0xe6,0x12,0x04,0x02,0x00,0x0c,0x00,0xd3,0x1f,0xd2,
-+	0x13,0x51,0x04,0x02,0x00,0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbe,0x92,0xe0,0xbe,
-+	0xb7,0x00,0x51,0x04,0x02,0x00,0x10,0x04,0x04,0x00,0x02,0x00,0xd2,0x0c,0x91,0x08,
-+	0x10,0x04,0x00,0x00,0x02,0x00,0x02,0x00,0x91,0x0f,0x10,0x04,0x02,0x00,0x02,0xff,
-+	0xe0,0xbe,0x9c,0xe0,0xbe,0xb7,0x00,0x02,0x00,0xd4,0x3d,0xd3,0x26,0xd2,0x13,0x51,
-+	0x04,0x02,0x00,0x10,0x0b,0x02,0xff,0xe0,0xbe,0xa1,0xe0,0xbe,0xb7,0x00,0x02,0x00,
-+	0x51,0x04,0x02,0x00,0x10,0x04,0x02,0x00,0x02,0xff,0xe0,0xbe,0xa6,0xe0,0xbe,0xb7,
-+	0x00,0x52,0x04,0x02,0x00,0x91,0x0f,0x10,0x0b,0x02,0xff,0xe0,0xbe,0xab,0xe0,0xbe,
-+	0xb7,0x00,0x02,0x00,0x04,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,
-+	0x02,0x00,0x02,0x00,0x02,0x00,0xd2,0x13,0x91,0x0f,0x10,0x04,0x04,0x00,0x02,0xff,
-+	0xe0,0xbe,0x90,0xe0,0xbe,0xb5,0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x00,
-+	0x00,0x04,0x00,0xcf,0x86,0x95,0x4c,0xd4,0x24,0xd3,0x10,0x52,0x04,0x04,0x00,0x51,
-+	0x04,0x04,0x00,0x10,0x04,0x04,0xdc,0x04,0x00,0x52,0x04,0x04,0x00,0xd1,0x08,0x10,
-+	0x04,0x04,0x00,0x00,0x00,0x10,0x04,0x0a,0x00,0x04,0x00,0xd3,0x14,0xd2,0x08,0x11,
-+	0x04,0x08,0x00,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x0b,0x00,0x0b,0x00,0x92,
-+	0x10,0xd1,0x08,0x10,0x04,0x0b,0x00,0x0c,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,0x00,
-+	0x00,0x00,0x00,0xcf,0x86,0xe5,0xcc,0x04,0xe4,0x63,0x03,0xe3,0x65,0x01,0xe2,0x04,
-+	0x01,0xd1,0x7f,0xd0,0x65,0xcf,0x86,0x55,0x04,0x04,0x00,0xd4,0x33,0xd3,0x1f,0xd2,
-+	0x0c,0x51,0x04,0x04,0x00,0x10,0x04,0x0a,0x00,0x04,0x00,0x51,0x04,0x04,0x00,0x10,
-+	0x0b,0x04,0xff,0xe1,0x80,0xa5,0xe1,0x80,0xae,0x00,0x04,0x00,0x92,0x10,0xd1,0x08,
-+	0x10,0x04,0x0a,0x00,0x04,0x00,0x10,0x04,0x04,0x00,0x0a,0x00,0x04,0x00,0xd3,0x18,
-+	0xd2,0x0c,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x0a,0x00,0x51,0x04,0x0a,0x00,
-+	0x10,0x04,0x04,0x00,0x04,0x07,0x92,0x10,0xd1,0x08,0x10,0x04,0x04,0x00,0x04,0x09,
-+	0x10,0x04,0x0a,0x09,0x0a,0x00,0x0a,0x00,0xcf,0x86,0x95,0x14,0x54,0x04,0x04,0x00,
-+	0x53,0x04,0x04,0x00,0x92,0x08,0x11,0x04,0x04,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,
-+	0xd0,0x2e,0xcf,0x86,0x95,0x28,0xd4,0x14,0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,
-+	0x91,0x08,0x10,0x04,0x0a,0x00,0x0a,0xdc,0x0a,0x00,0x53,0x04,0x0a,0x00,0xd2,0x08,
-+	0x11,0x04,0x0a,0x00,0x0b,0x00,0x11,0x04,0x0b,0x00,0x0a,0x00,0x01,0x00,0xcf,0x86,
-+	0xd5,0x24,0x94,0x20,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,
-+	0x00,0x00,0x0d,0x00,0x52,0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x0d,0x00,
-+	0x00,0x00,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,
-+	0x01,0x00,0x10,0x04,0x01,0x00,0x06,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x06,0x00,
-+	0x08,0x00,0x10,0x04,0x08,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x08,0x00,0x0d,0x00,
-+	0x0d,0x00,0xd1,0x28,0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0x95,0x1c,0x54,0x04,
-+	0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x08,0x11,0x04,0x01,0x00,0x0b,0x00,0x51,0x04,
-+	0x0b,0x00,0x10,0x04,0x0b,0x00,0x01,0x00,0x01,0x00,0xd0,0x1e,0xcf,0x86,0x55,0x04,
-+	0x01,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
-+	0x0b,0x00,0x0b,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,
-+	0x01,0x00,0x53,0x04,0x01,0x00,0x92,0x08,0x11,0x04,0x01,0x00,0x0b,0x00,0x0b,0x00,
-+	0xe2,0x21,0x01,0xd1,0x6c,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x94,0x14,0x93,0x10,0x52,
-+	0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0x04,0x00,0x04,
-+	0x00,0x04,0x00,0xcf,0x86,0x95,0x48,0xd4,0x24,0xd3,0x10,0x52,0x04,0x04,0x00,0x51,
-+	0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,
-+	0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0xd3,0x10,0x52,0x04,0x04,
-+	0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0xd2,0x0c,0x91,0x08,0x10,
-+	0x04,0x04,0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0xd0,
-+	0x62,0xcf,0x86,0xd5,0x28,0x94,0x24,0xd3,0x10,0x52,0x04,0x04,0x00,0x51,0x04,0x04,
-+	0x00,0x10,0x04,0x04,0x00,0x08,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x00,
-+	0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0xd4,0x14,0x53,0x04,0x04,
-+	0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0xd3,
-+	0x14,0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,
-+	0x00,0x00,0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,
-+	0x00,0xcf,0x86,0xd5,0x38,0xd4,0x24,0xd3,0x14,0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,
-+	0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0x52,0x04,0x04,0x00,0x51,
-+	0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0x93,0x10,0x52,0x04,0x04,0x00,0x51,
-+	0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0x94,0x14,0x53,0x04,0x04,
-+	0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0x04,
-+	0x00,0xd1,0x9c,0xd0,0x3e,0xcf,0x86,0x95,0x38,0xd4,0x14,0x53,0x04,0x04,0x00,0x52,
-+	0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0xd3,0x14,0xd2,
-+	0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x04,0x00,0x11,0x04,0x04,0x00,0x00,
-+	0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x08,0x00,0x04,
-+	0x00,0xcf,0x86,0xd5,0x34,0xd4,0x14,0x93,0x10,0x52,0x04,0x04,0x00,0x51,0x04,0x04,
-+	0x00,0x10,0x04,0x04,0x00,0x08,0x00,0x04,0x00,0x53,0x04,0x04,0x00,0xd2,0x0c,0x51,
-+	0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,0x0c,
-+	0xe6,0x10,0x04,0x0c,0xe6,0x08,0xe6,0xd4,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,
-+	0x04,0x08,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x53,0x04,0x04,0x00,0x52,
-+	0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0xd0,0x1a,0xcf,
-+	0x86,0x95,0x14,0x54,0x04,0x08,0x00,0x53,0x04,0x08,0x00,0x92,0x08,0x11,0x04,0x08,
-+	0x00,0x00,0x00,0x00,0x00,0x04,0x00,0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,
-+	0x00,0xd3,0x10,0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x11,0x00,0x00,
-+	0x00,0x52,0x04,0x11,0x00,0x11,0x04,0x11,0x00,0x00,0x00,0xd3,0x30,0xd2,0x2a,0xd1,
-+	0x24,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,
-+	0x04,0x0b,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0xcf,
-+	0x06,0x04,0x00,0xcf,0x06,0x04,0x00,0xcf,0x06,0x04,0x00,0xd2,0x6c,0xd1,0x24,0xd0,
-+	0x06,0xcf,0x06,0x04,0x00,0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,0x00,0x93,
-+	0x10,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x0b,0x00,0x0b,
-+	0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x04,0x00,0x53,0x04,0x04,0x00,0x52,
-+	0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0xcf,
-+	0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,
-+	0x04,0x04,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x10,
-+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,0x80,0xd0,0x46,0xcf,0x86,0xd5,0x28,0xd4,
-+	0x14,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x91,0x08,0x10,0x04,0x06,0x00,0x00,
-+	0x00,0x06,0x00,0x93,0x10,0x52,0x04,0x06,0x00,0x91,0x08,0x10,0x04,0x06,0x09,0x00,
-+	0x00,0x00,0x00,0x00,0x00,0x54,0x04,0x06,0x00,0x93,0x14,0x52,0x04,0x06,0x00,0xd1,
-+	0x08,0x10,0x04,0x06,0x09,0x06,0x00,0x10,0x04,0x06,0x00,0x00,0x00,0x00,0x00,0xcf,
-+	0x86,0xd5,0x10,0x54,0x04,0x06,0x00,0x93,0x08,0x12,0x04,0x06,0x00,0x00,0x00,0x00,
-+	0x00,0xd4,0x14,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x91,0x08,0x10,0x04,0x06,
-+	0x00,0x00,0x00,0x06,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x06,0x00,0x00,
-+	0x00,0x06,0x00,0x00,0x00,0x00,0x00,0xd0,0x06,0xcf,0x06,0x04,0x00,0xcf,0x86,0xd5,
-+	0x24,0x54,0x04,0x04,0x00,0xd3,0x10,0x92,0x0c,0x51,0x04,0x04,0x00,0x10,0x04,0x04,
-+	0x09,0x04,0x00,0x04,0x00,0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,0x07,
-+	0xe6,0x00,0x00,0xd4,0x10,0x53,0x04,0x04,0x00,0x92,0x08,0x11,0x04,0x04,0x00,0x00,
-+	0x00,0x00,0x00,0x53,0x04,0x07,0x00,0x92,0x08,0x11,0x04,0x07,0x00,0x00,0x00,0x00,
-+	0x00,0xe4,0xac,0x03,0xe3,0x4d,0x01,0xd2,0x84,0xd1,0x48,0xd0,0x2a,0xcf,0x86,0x95,
-+	0x24,0xd4,0x14,0x53,0x04,0x04,0x00,0x52,0x04,0x04,0x00,0x51,0x04,0x04,0x00,0x10,
-+	0x04,0x04,0x00,0x00,0x00,0x53,0x04,0x04,0x00,0x92,0x08,0x11,0x04,0x04,0x00,0x00,
-+	0x00,0x00,0x00,0x04,0x00,0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,0x00,0x53,
-+	0x04,0x04,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0x00,
-+	0x00,0xd0,0x22,0xcf,0x86,0x55,0x04,0x04,0x00,0x94,0x18,0x53,0x04,0x04,0x00,0x92,
-+	0x10,0xd1,0x08,0x10,0x04,0x04,0x00,0x04,0xe4,0x10,0x04,0x0a,0x00,0x00,0x00,0x00,
-+	0x00,0x0b,0x00,0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,0x0b,0x00,0x93,0x0c,0x52,
-+	0x04,0x0b,0x00,0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0xd1,0x80,0xd0,0x42,0xcf,
-+	0x86,0xd5,0x1c,0x54,0x04,0x07,0x00,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,0xd1,
-+	0x08,0x10,0x04,0x07,0x00,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0xd4,0x0c,0x53,
-+	0x04,0x07,0x00,0x12,0x04,0x07,0x00,0x00,0x00,0x53,0x04,0x07,0x00,0x92,0x10,0xd1,
-+	0x08,0x10,0x04,0x07,0x00,0x07,0xde,0x10,0x04,0x07,0xe6,0x07,0xdc,0x00,0x00,0xcf,
-+	0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x07,0x00,0x00,
-+	0x00,0x00,0x00,0x07,0x00,0x07,0x00,0x07,0x00,0xd4,0x10,0x53,0x04,0x07,0x00,0x52,
-+	0x04,0x07,0x00,0x11,0x04,0x07,0x00,0x00,0x00,0x93,0x10,0x52,0x04,0x07,0x00,0x91,
-+	0x08,0x10,0x04,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd0,0x1a,0xcf,0x86,0x55,
-+	0x04,0x08,0x00,0x94,0x10,0x53,0x04,0x08,0x00,0x92,0x08,0x11,0x04,0x08,0x00,0x0b,
-+	0x00,0x00,0x00,0x08,0x00,0xcf,0x86,0x95,0x28,0xd4,0x10,0x53,0x04,0x08,0x00,0x92,
-+	0x08,0x11,0x04,0x08,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x08,0x00,0xd2,0x0c,0x51,
-+	0x04,0x08,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x08,0x00,0x07,
-+	0x00,0xd2,0xe4,0xd1,0x80,0xd0,0x2e,0xcf,0x86,0x95,0x28,0x54,0x04,0x08,0x00,0xd3,
-+	0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x08,0xe6,0xd2,
-+	0x0c,0x91,0x08,0x10,0x04,0x08,0xdc,0x08,0x00,0x08,0x00,0x11,0x04,0x00,0x00,0x08,
-+	0x00,0x0b,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,0x52,
-+	0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0xd4,0x14,0x93,
-+	0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0b,0x09,0x0b,0x00,0x0b,0x00,0x0b,0x00,0x0b,
-+	0x00,0xd3,0x10,0x52,0x04,0x0b,0x00,0x91,0x08,0x10,0x04,0x0b,0x00,0x0b,0xe6,0x0b,
-+	0xe6,0x52,0x04,0x0b,0xe6,0xd1,0x08,0x10,0x04,0x0b,0xe6,0x00,0x00,0x10,0x04,0x00,
-+	0x00,0x0b,0xdc,0xd0,0x5e,0xcf,0x86,0xd5,0x20,0xd4,0x10,0x53,0x04,0x0b,0x00,0x92,
-+	0x08,0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x0b,0x00,0x92,0x08,0x11,
-+	0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0xd4,0x10,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,
-+	0x00,0x11,0x04,0x0b,0x00,0x00,0x00,0xd3,0x10,0x52,0x04,0x10,0xe6,0x91,0x08,0x10,
-+	0x04,0x10,0xe6,0x10,0xdc,0x10,0xdc,0xd2,0x0c,0x51,0x04,0x10,0xdc,0x10,0x04,0x10,
-+	0xdc,0x10,0xe6,0xd1,0x08,0x10,0x04,0x10,0xe6,0x10,0xdc,0x10,0x04,0x10,0x00,0x00,
-+	0x00,0xcf,0x06,0x00,0x00,0xe1,0x1e,0x01,0xd0,0xaa,0xcf,0x86,0xd5,0x6e,0xd4,0x53,
-+	0xd3,0x17,0x52,0x04,0x09,0x00,0x51,0x04,0x09,0x00,0x10,0x0b,0x09,0xff,0xe1,0xac,
-+	0x85,0xe1,0xac,0xb5,0x00,0x09,0x00,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x09,0xff,0xe1,
-+	0xac,0x87,0xe1,0xac,0xb5,0x00,0x09,0x00,0x10,0x0b,0x09,0xff,0xe1,0xac,0x89,0xe1,
-+	0xac,0xb5,0x00,0x09,0x00,0xd1,0x0f,0x10,0x0b,0x09,0xff,0xe1,0xac,0x8b,0xe1,0xac,
-+	0xb5,0x00,0x09,0x00,0x10,0x0b,0x09,0xff,0xe1,0xac,0x8d,0xe1,0xac,0xb5,0x00,0x09,
-+	0x00,0x93,0x17,0x92,0x13,0x51,0x04,0x09,0x00,0x10,0x0b,0x09,0xff,0xe1,0xac,0x91,
-+	0xe1,0xac,0xb5,0x00,0x09,0x00,0x09,0x00,0x09,0x00,0x54,0x04,0x09,0x00,0xd3,0x10,
-+	0x52,0x04,0x09,0x00,0x91,0x08,0x10,0x04,0x09,0x07,0x09,0x00,0x09,0x00,0xd2,0x13,
-+	0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x09,0xff,0xe1,0xac,0xba,0xe1,0xac,0xb5,
-+	0x00,0x91,0x0f,0x10,0x04,0x09,0x00,0x09,0xff,0xe1,0xac,0xbc,0xe1,0xac,0xb5,0x00,
-+	0x09,0x00,0xcf,0x86,0xd5,0x3d,0x94,0x39,0xd3,0x31,0xd2,0x25,0xd1,0x16,0x10,0x0b,
-+	0x09,0xff,0xe1,0xac,0xbe,0xe1,0xac,0xb5,0x00,0x09,0xff,0xe1,0xac,0xbf,0xe1,0xac,
-+	0xb5,0x00,0x10,0x04,0x09,0x00,0x09,0xff,0xe1,0xad,0x82,0xe1,0xac,0xb5,0x00,0x91,
-+	0x08,0x10,0x04,0x09,0x09,0x09,0x00,0x09,0x00,0x12,0x04,0x09,0x00,0x00,0x00,0x09,
-+	0x00,0xd4,0x1c,0x53,0x04,0x09,0x00,0xd2,0x0c,0x51,0x04,0x09,0x00,0x10,0x04,0x09,
-+	0x00,0x09,0xe6,0x91,0x08,0x10,0x04,0x09,0xdc,0x09,0xe6,0x09,0xe6,0xd3,0x08,0x12,
-+	0x04,0x09,0xe6,0x09,0x00,0x52,0x04,0x09,0x00,0x91,0x08,0x10,0x04,0x09,0x00,0x00,
-+	0x00,0x00,0x00,0xd0,0x2e,0xcf,0x86,0x55,0x04,0x0a,0x00,0xd4,0x18,0x53,0x04,0x0a,
-+	0x00,0xd2,0x0c,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x09,0x0d,0x09,0x11,0x04,0x0d,
-+	0x00,0x0a,0x00,0x53,0x04,0x0a,0x00,0x92,0x08,0x11,0x04,0x0a,0x00,0x0d,0x00,0x0d,
-+	0x00,0xcf,0x86,0x55,0x04,0x0c,0x00,0xd4,0x14,0x93,0x10,0x52,0x04,0x0c,0x00,0x51,
-+	0x04,0x0c,0x00,0x10,0x04,0x0c,0x07,0x0c,0x00,0x0c,0x00,0xd3,0x0c,0x92,0x08,0x11,
-+	0x04,0x0c,0x00,0x0c,0x09,0x00,0x00,0x12,0x04,0x00,0x00,0x0c,0x00,0xe3,0xb2,0x01,
-+	0xe2,0x09,0x01,0xd1,0x4c,0xd0,0x2a,0xcf,0x86,0x55,0x04,0x0a,0x00,0x54,0x04,0x0a,
-+	0x00,0xd3,0x10,0x52,0x04,0x0a,0x00,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x00,0x0a,
-+	0x07,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0a,0x00,0x0a,0x00,0xcf,
-+	0x86,0x95,0x1c,0x94,0x18,0x53,0x04,0x0a,0x00,0xd2,0x08,0x11,0x04,0x0a,0x00,0x00,
-+	0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0xd0,
-+	0x3a,0xcf,0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x12,0x00,0x92,0x0c,0x91,0x08,0x10,
-+	0x04,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x14,0x00,0x54,0x04,0x14,0x00,0x53,
-+	0x04,0x14,0x00,0xd2,0x0c,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x00,0x00,0x91,
-+	0x08,0x10,0x04,0x00,0x00,0x14,0x00,0x14,0x00,0xcf,0x86,0xd5,0x2c,0xd4,0x08,0x13,
-+	0x04,0x0d,0x00,0x00,0x00,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x0b,0xe6,0x10,0x04,0x0b,
-+	0xe6,0x0b,0x00,0x91,0x08,0x10,0x04,0x0b,0x01,0x0b,0xdc,0x0b,0xdc,0x92,0x08,0x11,
-+	0x04,0x0b,0xdc,0x0b,0xe6,0x0b,0xdc,0xd4,0x28,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,
-+	0x04,0x0b,0xe6,0x0b,0x00,0x0b,0x01,0x0b,0x01,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0b,
-+	0x01,0x0b,0x00,0x0b,0x00,0x91,0x08,0x10,0x04,0x0b,0x00,0x0b,0xdc,0x0b,0x00,0xd3,
-+	0x1c,0xd2,0x0c,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x0d,0x00,0xd1,0x08,0x10,
-+	0x04,0x0d,0xe6,0x0d,0x00,0x10,0x04,0x0d,0x00,0x13,0x00,0x92,0x0c,0x51,0x04,0x10,
-+	0xe6,0x10,0x04,0x15,0x00,0x00,0x00,0x00,0x00,0xd1,0x1c,0xd0,0x06,0xcf,0x06,0x07,
-+	0x00,0xcf,0x86,0x55,0x04,0x07,0x00,0x94,0x0c,0x53,0x04,0x07,0x00,0x12,0x04,0x07,
-+	0x00,0x08,0x00,0x08,0x00,0xd0,0x06,0xcf,0x06,0x08,0x00,0xcf,0x86,0xd5,0x40,0xd4,
-+	0x2c,0xd3,0x10,0x92,0x0c,0x51,0x04,0x08,0xe6,0x10,0x04,0x08,0xdc,0x08,0xe6,0x09,
-+	0xe6,0xd2,0x0c,0x51,0x04,0x09,0xe6,0x10,0x04,0x09,0xdc,0x0a,0xe6,0xd1,0x08,0x10,
-+	0x04,0x0a,0xe6,0x0a,0xea,0x10,0x04,0x0a,0xd6,0x0a,0xdc,0x93,0x10,0x92,0x0c,0x91,
-+	0x08,0x10,0x04,0x0a,0xca,0x0a,0xe6,0x0a,0xe6,0x0a,0xe6,0x0a,0xe6,0xd4,0x14,0x93,
-+	0x10,0x52,0x04,0x0a,0xe6,0x51,0x04,0x0a,0xe6,0x10,0x04,0x0a,0xe6,0x10,0xe6,0x10,
-+	0xe6,0xd3,0x10,0x52,0x04,0x10,0xe6,0x51,0x04,0x10,0xe6,0x10,0x04,0x13,0xe8,0x13,
-+	0xe4,0xd2,0x10,0xd1,0x08,0x10,0x04,0x13,0xe4,0x13,0xdc,0x10,0x04,0x00,0x00,0x12,
-+	0xe6,0xd1,0x08,0x10,0x04,0x0c,0xe9,0x0b,0xdc,0x10,0x04,0x09,0xe6,0x09,0xdc,0xe2,
-+	0x80,0x08,0xe1,0x48,0x04,0xe0,0x1c,0x02,0xcf,0x86,0xe5,0x11,0x01,0xd4,0x84,0xd3,
-+	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0xa5,0x00,0x01,0xff,0x61,
-+	0xcc,0xa5,0x00,0x10,0x08,0x01,0xff,0x42,0xcc,0x87,0x00,0x01,0xff,0x62,0xcc,0x87,
-+	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x42,0xcc,0xa3,0x00,0x01,0xff,0x62,0xcc,0xa3,
-+	0x00,0x10,0x08,0x01,0xff,0x42,0xcc,0xb1,0x00,0x01,0xff,0x62,0xcc,0xb1,0x00,0xd2,
-+	0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x43,0xcc,0xa7,0xcc,0x81,0x00,0x01,0xff,0x63,
-+	0xcc,0xa7,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x44,0xcc,0x87,0x00,0x01,0xff,0x64,
-+	0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x44,0xcc,0xa3,0x00,0x01,0xff,0x64,
-+	0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x44,0xcc,0xb1,0x00,0x01,0xff,0x64,0xcc,0xb1,
-+	0x00,0xd3,0x48,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x44,0xcc,0xa7,0x00,0x01,
-+	0xff,0x64,0xcc,0xa7,0x00,0x10,0x08,0x01,0xff,0x44,0xcc,0xad,0x00,0x01,0xff,0x64,
-+	0xcc,0xad,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x45,0xcc,0x84,0xcc,0x80,0x00,0x01,
-+	0xff,0x65,0xcc,0x84,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x45,0xcc,0x84,0xcc,0x81,
-+	0x00,0x01,0xff,0x65,0xcc,0x84,0xcc,0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
-+	0xff,0x45,0xcc,0xad,0x00,0x01,0xff,0x65,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x45,
-+	0xcc,0xb0,0x00,0x01,0xff,0x65,0xcc,0xb0,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x45,
-+	0xcc,0xa7,0xcc,0x86,0x00,0x01,0xff,0x65,0xcc,0xa7,0xcc,0x86,0x00,0x10,0x08,0x01,
-+	0xff,0x46,0xcc,0x87,0x00,0x01,0xff,0x66,0xcc,0x87,0x00,0xd4,0x84,0xd3,0x40,0xd2,
-+	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x47,0xcc,0x84,0x00,0x01,0xff,0x67,0xcc,0x84,
-+	0x00,0x10,0x08,0x01,0xff,0x48,0xcc,0x87,0x00,0x01,0xff,0x68,0xcc,0x87,0x00,0xd1,
-+	0x10,0x10,0x08,0x01,0xff,0x48,0xcc,0xa3,0x00,0x01,0xff,0x68,0xcc,0xa3,0x00,0x10,
-+	0x08,0x01,0xff,0x48,0xcc,0x88,0x00,0x01,0xff,0x68,0xcc,0x88,0x00,0xd2,0x20,0xd1,
-+	0x10,0x10,0x08,0x01,0xff,0x48,0xcc,0xa7,0x00,0x01,0xff,0x68,0xcc,0xa7,0x00,0x10,
-+	0x08,0x01,0xff,0x48,0xcc,0xae,0x00,0x01,0xff,0x68,0xcc,0xae,0x00,0xd1,0x10,0x10,
-+	0x08,0x01,0xff,0x49,0xcc,0xb0,0x00,0x01,0xff,0x69,0xcc,0xb0,0x00,0x10,0x0a,0x01,
-+	0xff,0x49,0xcc,0x88,0xcc,0x81,0x00,0x01,0xff,0x69,0xcc,0x88,0xcc,0x81,0x00,0xd3,
-+	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x4b,0xcc,0x81,0x00,0x01,0xff,0x6b,
-+	0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x4b,0xcc,0xa3,0x00,0x01,0xff,0x6b,0xcc,0xa3,
-+	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4b,0xcc,0xb1,0x00,0x01,0xff,0x6b,0xcc,0xb1,
-+	0x00,0x10,0x08,0x01,0xff,0x4c,0xcc,0xa3,0x00,0x01,0xff,0x6c,0xcc,0xa3,0x00,0xd2,
-+	0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4c,0xcc,0xa3,0xcc,0x84,0x00,0x01,0xff,0x6c,
-+	0xcc,0xa3,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x4c,0xcc,0xb1,0x00,0x01,0xff,0x6c,
-+	0xcc,0xb1,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4c,0xcc,0xad,0x00,0x01,0xff,0x6c,
-+	0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x4d,0xcc,0x81,0x00,0x01,0xff,0x6d,0xcc,0x81,
-+	0x00,0xcf,0x86,0xe5,0x15,0x01,0xd4,0x88,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
-+	0x01,0xff,0x4d,0xcc,0x87,0x00,0x01,0xff,0x6d,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,
-+	0x4d,0xcc,0xa3,0x00,0x01,0xff,0x6d,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0x4e,0xcc,0x87,0x00,0x01,0xff,0x6e,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x4e,0xcc,
-+	0xa3,0x00,0x01,0xff,0x6e,0xcc,0xa3,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0x4e,0xcc,0xb1,0x00,0x01,0xff,0x6e,0xcc,0xb1,0x00,0x10,0x08,0x01,0xff,0x4e,0xcc,
-+	0xad,0x00,0x01,0xff,0x6e,0xcc,0xad,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,
-+	0x83,0xcc,0x81,0x00,0x01,0xff,0x6f,0xcc,0x83,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,
-+	0x4f,0xcc,0x83,0xcc,0x88,0x00,0x01,0xff,0x6f,0xcc,0x83,0xcc,0x88,0x00,0xd3,0x48,
-+	0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x84,0xcc,0x80,0x00,0x01,0xff,
-+	0x6f,0xcc,0x84,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x84,0xcc,0x81,0x00,
-+	0x01,0xff,0x6f,0xcc,0x84,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x50,0xcc,
-+	0x81,0x00,0x01,0xff,0x70,0xcc,0x81,0x00,0x10,0x08,0x01,0xff,0x50,0xcc,0x87,0x00,
-+	0x01,0xff,0x70,0xcc,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x52,0xcc,
-+	0x87,0x00,0x01,0xff,0x72,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x52,0xcc,0xa3,0x00,
-+	0x01,0xff,0x72,0xcc,0xa3,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x52,0xcc,0xa3,0xcc,
-+	0x84,0x00,0x01,0xff,0x72,0xcc,0xa3,0xcc,0x84,0x00,0x10,0x08,0x01,0xff,0x52,0xcc,
-+	0xb1,0x00,0x01,0xff,0x72,0xcc,0xb1,0x00,0xd4,0x8c,0xd3,0x48,0xd2,0x20,0xd1,0x10,
-+	0x10,0x08,0x01,0xff,0x53,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x87,0x00,0x10,0x08,
-+	0x01,0xff,0x53,0xcc,0xa3,0x00,0x01,0xff,0x73,0xcc,0xa3,0x00,0xd1,0x14,0x10,0x0a,
-+	0x01,0xff,0x53,0xcc,0x81,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x81,0xcc,0x87,0x00,
-+	0x10,0x0a,0x01,0xff,0x53,0xcc,0x8c,0xcc,0x87,0x00,0x01,0xff,0x73,0xcc,0x8c,0xcc,
-+	0x87,0x00,0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x53,0xcc,0xa3,0xcc,0x87,0x00,
-+	0x01,0xff,0x73,0xcc,0xa3,0xcc,0x87,0x00,0x10,0x08,0x01,0xff,0x54,0xcc,0x87,0x00,
-+	0x01,0xff,0x74,0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x54,0xcc,0xa3,0x00,
-+	0x01,0xff,0x74,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x54,0xcc,0xb1,0x00,0x01,0xff,
-+	0x74,0xcc,0xb1,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x54,0xcc,
-+	0xad,0x00,0x01,0xff,0x74,0xcc,0xad,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0xa4,0x00,
-+	0x01,0xff,0x75,0xcc,0xa4,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x55,0xcc,0xb0,0x00,
-+	0x01,0xff,0x75,0xcc,0xb0,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0xad,0x00,0x01,0xff,
-+	0x75,0xcc,0xad,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x55,0xcc,0x83,0xcc,
-+	0x81,0x00,0x01,0xff,0x75,0xcc,0x83,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x55,0xcc,
-+	0x84,0xcc,0x88,0x00,0x01,0xff,0x75,0xcc,0x84,0xcc,0x88,0x00,0xd1,0x10,0x10,0x08,
-+	0x01,0xff,0x56,0xcc,0x83,0x00,0x01,0xff,0x76,0xcc,0x83,0x00,0x10,0x08,0x01,0xff,
-+	0x56,0xcc,0xa3,0x00,0x01,0xff,0x76,0xcc,0xa3,0x00,0xe0,0x10,0x02,0xcf,0x86,0xd5,
-+	0xe1,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x57,0xcc,0x80,
-+	0x00,0x01,0xff,0x77,0xcc,0x80,0x00,0x10,0x08,0x01,0xff,0x57,0xcc,0x81,0x00,0x01,
-+	0xff,0x77,0xcc,0x81,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x57,0xcc,0x88,0x00,0x01,
-+	0xff,0x77,0xcc,0x88,0x00,0x10,0x08,0x01,0xff,0x57,0xcc,0x87,0x00,0x01,0xff,0x77,
-+	0xcc,0x87,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x57,0xcc,0xa3,0x00,0x01,
-+	0xff,0x77,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x58,0xcc,0x87,0x00,0x01,0xff,0x78,
-+	0xcc,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x58,0xcc,0x88,0x00,0x01,0xff,0x78,
-+	0xcc,0x88,0x00,0x10,0x08,0x01,0xff,0x59,0xcc,0x87,0x00,0x01,0xff,0x79,0xcc,0x87,
-+	0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x5a,0xcc,0x82,0x00,0x01,
-+	0xff,0x7a,0xcc,0x82,0x00,0x10,0x08,0x01,0xff,0x5a,0xcc,0xa3,0x00,0x01,0xff,0x7a,
-+	0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x5a,0xcc,0xb1,0x00,0x01,0xff,0x7a,
-+	0xcc,0xb1,0x00,0x10,0x08,0x01,0xff,0x68,0xcc,0xb1,0x00,0x01,0xff,0x74,0xcc,0x88,
-+	0x00,0x92,0x1d,0xd1,0x10,0x10,0x08,0x01,0xff,0x77,0xcc,0x8a,0x00,0x01,0xff,0x79,
-+	0xcc,0x8a,0x00,0x10,0x04,0x01,0x00,0x02,0xff,0xc5,0xbf,0xcc,0x87,0x00,0x0a,0x00,
-+	0xd4,0x98,0xd3,0x48,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x41,0xcc,0xa3,0x00,
-+	0x01,0xff,0x61,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x41,0xcc,0x89,0x00,0x01,0xff,
-+	0x61,0xcc,0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x41,0xcc,0x82,0xcc,0x81,0x00,
-+	0x01,0xff,0x61,0xcc,0x82,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x82,0xcc,
-+	0x80,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x80,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,
-+	0x01,0xff,0x41,0xcc,0x82,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,0x89,0x00,
-+	0x10,0x0a,0x01,0xff,0x41,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x61,0xcc,0x82,0xcc,
-+	0x83,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x41,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,
-+	0x61,0xcc,0xa3,0xcc,0x82,0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0x86,0xcc,0x81,0x00,
-+	0x01,0xff,0x61,0xcc,0x86,0xcc,0x81,0x00,0xd3,0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,
-+	0x01,0xff,0x41,0xcc,0x86,0xcc,0x80,0x00,0x01,0xff,0x61,0xcc,0x86,0xcc,0x80,0x00,
-+	0x10,0x0a,0x01,0xff,0x41,0xcc,0x86,0xcc,0x89,0x00,0x01,0xff,0x61,0xcc,0x86,0xcc,
-+	0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x41,0xcc,0x86,0xcc,0x83,0x00,0x01,0xff,
-+	0x61,0xcc,0x86,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x41,0xcc,0xa3,0xcc,0x86,0x00,
-+	0x01,0xff,0x61,0xcc,0xa3,0xcc,0x86,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0x45,0xcc,0xa3,0x00,0x01,0xff,0x65,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x45,0xcc,
-+	0x89,0x00,0x01,0xff,0x65,0xcc,0x89,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x45,0xcc,
-+	0x83,0x00,0x01,0xff,0x65,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x45,0xcc,0x82,0xcc,
-+	0x81,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x81,0x00,0xcf,0x86,0xe5,0x31,0x01,0xd4,
-+	0x90,0xd3,0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x45,0xcc,0x82,0xcc,0x80,
-+	0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x45,0xcc,0x82,
-+	0xcc,0x89,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x89,0x00,0xd1,0x14,0x10,0x0a,0x01,
-+	0xff,0x45,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x65,0xcc,0x82,0xcc,0x83,0x00,0x10,
-+	0x0a,0x01,0xff,0x45,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,0x65,0xcc,0xa3,0xcc,0x82,
-+	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0x49,0xcc,0x89,0x00,0x01,0xff,0x69,
-+	0xcc,0x89,0x00,0x10,0x08,0x01,0xff,0x49,0xcc,0xa3,0x00,0x01,0xff,0x69,0xcc,0xa3,
-+	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x4f,0xcc,0xa3,0x00,0x01,0xff,0x6f,0xcc,0xa3,
-+	0x00,0x10,0x08,0x01,0xff,0x4f,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x89,0x00,0xd3,
-+	0x50,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x82,0xcc,0x81,0x00,0x01,
-+	0xff,0x6f,0xcc,0x82,0xcc,0x81,0x00,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x82,0xcc,0x80,
-+	0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x80,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,
-+	0xcc,0x82,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x89,0x00,0x10,0x0a,0x01,
-+	0xff,0x4f,0xcc,0x82,0xcc,0x83,0x00,0x01,0xff,0x6f,0xcc,0x82,0xcc,0x83,0x00,0xd2,
-+	0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0xa3,0xcc,0x82,0x00,0x01,0xff,0x6f,
-+	0xcc,0xa3,0xcc,0x82,0x00,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x9b,0xcc,0x81,0x00,0x01,
-+	0xff,0x6f,0xcc,0x9b,0xcc,0x81,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x9b,
-+	0xcc,0x80,0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0x4f,
-+	0xcc,0x9b,0xcc,0x89,0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0x89,0x00,0xd4,0x98,0xd3,
-+	0x48,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x9b,0xcc,0x83,0x00,0x01,
-+	0xff,0x6f,0xcc,0x9b,0xcc,0x83,0x00,0x10,0x0a,0x01,0xff,0x4f,0xcc,0x9b,0xcc,0xa3,
-+	0x00,0x01,0xff,0x6f,0xcc,0x9b,0xcc,0xa3,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0x55,
-+	0xcc,0xa3,0x00,0x01,0xff,0x75,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x55,0xcc,0x89,
-+	0x00,0x01,0xff,0x75,0xcc,0x89,0x00,0xd2,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,0x55,
-+	0xcc,0x9b,0xcc,0x81,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x81,0x00,0x10,0x0a,0x01,
-+	0xff,0x55,0xcc,0x9b,0xcc,0x80,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0x80,0x00,0xd1,
-+	0x14,0x10,0x0a,0x01,0xff,0x55,0xcc,0x9b,0xcc,0x89,0x00,0x01,0xff,0x75,0xcc,0x9b,
-+	0xcc,0x89,0x00,0x10,0x0a,0x01,0xff,0x55,0xcc,0x9b,0xcc,0x83,0x00,0x01,0xff,0x75,
-+	0xcc,0x9b,0xcc,0x83,0x00,0xd3,0x44,0xd2,0x24,0xd1,0x14,0x10,0x0a,0x01,0xff,0x55,
-+	0xcc,0x9b,0xcc,0xa3,0x00,0x01,0xff,0x75,0xcc,0x9b,0xcc,0xa3,0x00,0x10,0x08,0x01,
-+	0xff,0x59,0xcc,0x80,0x00,0x01,0xff,0x79,0xcc,0x80,0x00,0xd1,0x10,0x10,0x08,0x01,
-+	0xff,0x59,0xcc,0xa3,0x00,0x01,0xff,0x79,0xcc,0xa3,0x00,0x10,0x08,0x01,0xff,0x59,
-+	0xcc,0x89,0x00,0x01,0xff,0x79,0xcc,0x89,0x00,0x92,0x14,0x91,0x10,0x10,0x08,0x01,
-+	0xff,0x59,0xcc,0x83,0x00,0x01,0xff,0x79,0xcc,0x83,0x00,0x0a,0x00,0x0a,0x00,0xe1,
-+	0xc0,0x04,0xe0,0x80,0x02,0xcf,0x86,0xe5,0x2d,0x01,0xd4,0xa8,0xd3,0x54,0xd2,0x28,
-+	0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x93,0x00,0x01,0xff,0xce,0xb1,0xcc,
-+	0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,
-+	0xb1,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,
-+	0xcc,0x81,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,
-+	0xce,0xb1,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcd,0x82,0x00,
-+	0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x91,0xcc,0x93,0x00,0x01,0xff,0xce,
-+	0x91,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0x91,0xcc,0x93,0xcc,0x80,0x00,0x01,
-+	0xff,0xce,0x91,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0x91,
-+	0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0x91,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,
-+	0x01,0xff,0xce,0x91,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0x91,0xcc,0x94,0xcd,
-+	0x82,0x00,0xd3,0x42,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb5,0xcc,0x93,
-+	0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb5,0xcc,0x93,
-+	0xcc,0x80,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0xcc,0x80,0x00,0x91,0x16,0x10,0x0b,
-+	0x01,0xff,0xce,0xb5,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0xb5,0xcc,0x94,0xcc,
-+	0x81,0x00,0x00,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x95,0xcc,0x93,
-+	0x00,0x01,0xff,0xce,0x95,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0x95,0xcc,0x93,
-+	0xcc,0x80,0x00,0x01,0xff,0xce,0x95,0xcc,0x94,0xcc,0x80,0x00,0x91,0x16,0x10,0x0b,
-+	0x01,0xff,0xce,0x95,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0x95,0xcc,0x94,0xcc,
-+	0x81,0x00,0x00,0x00,0xd4,0xa8,0xd3,0x54,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,
-+	0xce,0xb7,0xcc,0x93,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,
-+	0xce,0xb7,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,0x00,
-+	0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,
-+	0xb7,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,0x82,
-+	0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x82,0x00,0xd2,0x28,0xd1,0x12,0x10,0x09,
-+	0x01,0xff,0xce,0x97,0xcc,0x93,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0x00,0x10,0x0b,
-+	0x01,0xff,0xce,0x97,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcc,
-+	0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0x97,0xcc,0x93,0xcc,0x81,0x00,0x01,
-+	0xff,0xce,0x97,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xce,0x97,0xcc,0x93,
-+	0xcd,0x82,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcd,0x82,0x00,0xd3,0x54,0xd2,0x28,
-+	0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x93,0x00,0x01,0xff,0xce,0xb9,0xcc,
-+	0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,
-+	0xb9,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb9,0xcc,0x93,
-+	0xcc,0x81,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,
-+	0xce,0xb9,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xb9,0xcc,0x94,0xcd,0x82,0x00,
-+	0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x99,0xcc,0x93,0x00,0x01,0xff,0xce,
-+	0x99,0xcc,0x94,0x00,0x10,0x0b,0x01,0xff,0xce,0x99,0xcc,0x93,0xcc,0x80,0x00,0x01,
-+	0xff,0xce,0x99,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0x99,
-+	0xcc,0x93,0xcc,0x81,0x00,0x01,0xff,0xce,0x99,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,
-+	0x01,0xff,0xce,0x99,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0x99,0xcc,0x94,0xcd,
-+	0x82,0x00,0xcf,0x86,0xe5,0x13,0x01,0xd4,0x84,0xd3,0x42,0xd2,0x28,0xd1,0x12,0x10,
-+	0x09,0x01,0xff,0xce,0xbf,0xcc,0x93,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,0x00,0x10,
-+	0x0b,0x01,0xff,0xce,0xbf,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xbf,0xcc,0x94,
-+	0xcc,0x80,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xce,0xbf,0xcc,0x93,0xcc,0x81,0x00,
-+	0x01,0xff,0xce,0xbf,0xcc,0x94,0xcc,0x81,0x00,0x00,0x00,0xd2,0x28,0xd1,0x12,0x10,
-+	0x09,0x01,0xff,0xce,0x9f,0xcc,0x93,0x00,0x01,0xff,0xce,0x9f,0xcc,0x94,0x00,0x10,
-+	0x0b,0x01,0xff,0xce,0x9f,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0x9f,0xcc,0x94,
-+	0xcc,0x80,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xce,0x9f,0xcc,0x93,0xcc,0x81,0x00,
-+	0x01,0xff,0xce,0x9f,0xcc,0x94,0xcc,0x81,0x00,0x00,0x00,0xd3,0x54,0xd2,0x28,0xd1,
-+	0x12,0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x93,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,
-+	0x00,0x10,0x0b,0x01,0xff,0xcf,0x85,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xcf,0x85,
-+	0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x85,0xcc,0x93,0xcc,
-+	0x81,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xcf,
-+	0x85,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xcf,0x85,0xcc,0x94,0xcd,0x82,0x00,0xd2,
-+	0x1c,0xd1,0x0d,0x10,0x04,0x00,0x00,0x01,0xff,0xce,0xa5,0xcc,0x94,0x00,0x10,0x04,
-+	0x00,0x00,0x01,0xff,0xce,0xa5,0xcc,0x94,0xcc,0x80,0x00,0xd1,0x0f,0x10,0x04,0x00,
-+	0x00,0x01,0xff,0xce,0xa5,0xcc,0x94,0xcc,0x81,0x00,0x10,0x04,0x00,0x00,0x01,0xff,
-+	0xce,0xa5,0xcc,0x94,0xcd,0x82,0x00,0xd4,0xa8,0xd3,0x54,0xd2,0x28,0xd1,0x12,0x10,
-+	0x09,0x01,0xff,0xcf,0x89,0xcc,0x93,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0x00,0x10,
-+	0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,
-+	0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x81,0x00,
-+	0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,
-+	0x93,0xcd,0x82,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcd,0x82,0x00,0xd2,0x28,0xd1,
-+	0x12,0x10,0x09,0x01,0xff,0xce,0xa9,0xcc,0x93,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,
-+	0x00,0x10,0x0b,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcc,0x80,0x00,0x01,0xff,0xce,0xa9,
-+	0xcc,0x94,0xcc,0x80,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcc,
-+	0x81,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,0xcc,0x81,0x00,0x10,0x0b,0x01,0xff,0xce,
-+	0xa9,0xcc,0x93,0xcd,0x82,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,0xcd,0x82,0x00,0xd3,
-+	0x48,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x80,0x00,0x01,0xff,
-+	0xce,0xb1,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb5,0xcc,0x80,0x00,0x01,0xff,
-+	0xce,0xb5,0xcc,0x81,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb7,0xcc,0x80,0x00,
-+	0x01,0xff,0xce,0xb7,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,0xcc,0x80,0x00,
-+	0x01,0xff,0xce,0xb9,0xcc,0x81,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,
-+	0xbf,0xcc,0x80,0x00,0x01,0xff,0xce,0xbf,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xcf,
-+	0x85,0xcc,0x80,0x00,0x01,0xff,0xcf,0x85,0xcc,0x81,0x00,0x91,0x12,0x10,0x09,0x01,
-+	0xff,0xcf,0x89,0xcc,0x80,0x00,0x01,0xff,0xcf,0x89,0xcc,0x81,0x00,0x00,0x00,0xe0,
-+	0xe1,0x02,0xcf,0x86,0xe5,0x91,0x01,0xd4,0xc8,0xd3,0x64,0xd2,0x30,0xd1,0x16,0x10,
-+	0x0b,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcd,0x85,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,
-+	0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcc,0x80,0xcd,0x85,0x00,
-+	0x01,0xff,0xce,0xb1,0xcc,0x94,0xcc,0x80,0xcd,0x85,0x00,0xd1,0x1a,0x10,0x0d,0x01,
-+	0xff,0xce,0xb1,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,
-+	0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xb1,0xcc,0x93,0xcd,0x82,0xcd,
-+	0x85,0x00,0x01,0xff,0xce,0xb1,0xcc,0x94,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x30,0xd1,
-+	0x16,0x10,0x0b,0x01,0xff,0xce,0x91,0xcc,0x93,0xcd,0x85,0x00,0x01,0xff,0xce,0x91,
-+	0xcc,0x94,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0x91,0xcc,0x93,0xcc,0x80,0xcd,
-+	0x85,0x00,0x01,0xff,0xce,0x91,0xcc,0x94,0xcc,0x80,0xcd,0x85,0x00,0xd1,0x1a,0x10,
-+	0x0d,0x01,0xff,0xce,0x91,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,0x01,0xff,0xce,0x91,
-+	0xcc,0x94,0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0x91,0xcc,0x93,0xcd,
-+	0x82,0xcd,0x85,0x00,0x01,0xff,0xce,0x91,0xcc,0x94,0xcd,0x82,0xcd,0x85,0x00,0xd3,
-+	0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcd,0x85,0x00,
-+	0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,
-+	0x93,0xcc,0x80,0xcd,0x85,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x80,0xcd,0x85,
-+	0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,0xb7,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,
-+	0x01,0xff,0xce,0xb7,0xcc,0x94,0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,
-+	0xb7,0xcc,0x93,0xcd,0x82,0xcd,0x85,0x00,0x01,0xff,0xce,0xb7,0xcc,0x94,0xcd,0x82,
-+	0xcd,0x85,0x00,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,0xff,0xce,0x97,0xcc,0x93,0xcd,
-+	0x85,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,
-+	0x97,0xcc,0x93,0xcc,0x80,0xcd,0x85,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcc,0x80,
-+	0xcd,0x85,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xce,0x97,0xcc,0x93,0xcc,0x81,0xcd,
-+	0x85,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,
-+	0xff,0xce,0x97,0xcc,0x93,0xcd,0x82,0xcd,0x85,0x00,0x01,0xff,0xce,0x97,0xcc,0x94,
-+	0xcd,0x82,0xcd,0x85,0x00,0xd4,0xc8,0xd3,0x64,0xd2,0x30,0xd1,0x16,0x10,0x0b,0x01,
-+	0xff,0xcf,0x89,0xcc,0x93,0xcd,0x85,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcd,0x85,
-+	0x00,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcc,0x80,0xcd,0x85,0x00,0x01,0xff,
-+	0xcf,0x89,0xcc,0x94,0xcc,0x80,0xcd,0x85,0x00,0xd1,0x1a,0x10,0x0d,0x01,0xff,0xcf,
-+	0x89,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,0x01,0xff,0xcf,0x89,0xcc,0x94,0xcc,0x81,
-+	0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xcf,0x89,0xcc,0x93,0xcd,0x82,0xcd,0x85,0x00,
-+	0x01,0xff,0xcf,0x89,0xcc,0x94,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x30,0xd1,0x16,0x10,
-+	0x0b,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcd,0x85,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,
-+	0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcc,0x80,0xcd,0x85,0x00,
-+	0x01,0xff,0xce,0xa9,0xcc,0x94,0xcc,0x80,0xcd,0x85,0x00,0xd1,0x1a,0x10,0x0d,0x01,
-+	0xff,0xce,0xa9,0xcc,0x93,0xcc,0x81,0xcd,0x85,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,
-+	0xcc,0x81,0xcd,0x85,0x00,0x10,0x0d,0x01,0xff,0xce,0xa9,0xcc,0x93,0xcd,0x82,0xcd,
-+	0x85,0x00,0x01,0xff,0xce,0xa9,0xcc,0x94,0xcd,0x82,0xcd,0x85,0x00,0xd3,0x49,0xd2,
-+	0x26,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb1,0xcc,0x86,0x00,0x01,0xff,0xce,0xb1,
-+	0xcc,0x84,0x00,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x80,0xcd,0x85,0x00,0x01,0xff,
-+	0xce,0xb1,0xcd,0x85,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xce,0xb1,0xcc,0x81,0xcd,
-+	0x85,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xce,0xb1,0xcd,0x82,0x00,0x01,0xff,0xce,
-+	0xb1,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x91,
-+	0xcc,0x86,0x00,0x01,0xff,0xce,0x91,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,0xce,0x91,
-+	0xcc,0x80,0x00,0x01,0xff,0xce,0x91,0xcc,0x81,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,
-+	0xce,0x91,0xcd,0x85,0x00,0x01,0x00,0x10,0x07,0x01,0xff,0xce,0xb9,0x00,0x01,0x00,
-+	0xcf,0x86,0xe5,0x16,0x01,0xd4,0x8f,0xd3,0x44,0xd2,0x21,0xd1,0x0d,0x10,0x04,0x01,
-+	0x00,0x01,0xff,0xc2,0xa8,0xcd,0x82,0x00,0x10,0x0b,0x01,0xff,0xce,0xb7,0xcc,0x80,
-+	0xcd,0x85,0x00,0x01,0xff,0xce,0xb7,0xcd,0x85,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,
-+	0xce,0xb7,0xcc,0x81,0xcd,0x85,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xce,0xb7,0xcd,
-+	0x82,0x00,0x01,0xff,0xce,0xb7,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x24,0xd1,0x12,0x10,
-+	0x09,0x01,0xff,0xce,0x95,0xcc,0x80,0x00,0x01,0xff,0xce,0x95,0xcc,0x81,0x00,0x10,
-+	0x09,0x01,0xff,0xce,0x97,0xcc,0x80,0x00,0x01,0xff,0xce,0x97,0xcc,0x81,0x00,0xd1,
-+	0x13,0x10,0x09,0x01,0xff,0xce,0x97,0xcd,0x85,0x00,0x01,0xff,0xe1,0xbe,0xbf,0xcc,
-+	0x80,0x00,0x10,0x0a,0x01,0xff,0xe1,0xbe,0xbf,0xcc,0x81,0x00,0x01,0xff,0xe1,0xbe,
-+	0xbf,0xcd,0x82,0x00,0xd3,0x40,0xd2,0x28,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0xb9,
-+	0xcc,0x86,0x00,0x01,0xff,0xce,0xb9,0xcc,0x84,0x00,0x10,0x0b,0x01,0xff,0xce,0xb9,
-+	0xcc,0x88,0xcc,0x80,0x00,0x01,0xff,0xce,0xb9,0xcc,0x88,0xcc,0x81,0x00,0x51,0x04,
-+	0x00,0x00,0x10,0x09,0x01,0xff,0xce,0xb9,0xcd,0x82,0x00,0x01,0xff,0xce,0xb9,0xcc,
-+	0x88,0xcd,0x82,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x99,0xcc,0x86,
-+	0x00,0x01,0xff,0xce,0x99,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,0xce,0x99,0xcc,0x80,
-+	0x00,0x01,0xff,0xce,0x99,0xcc,0x81,0x00,0xd1,0x0e,0x10,0x04,0x00,0x00,0x01,0xff,
-+	0xe1,0xbf,0xbe,0xcc,0x80,0x00,0x10,0x0a,0x01,0xff,0xe1,0xbf,0xbe,0xcc,0x81,0x00,
-+	0x01,0xff,0xe1,0xbf,0xbe,0xcd,0x82,0x00,0xd4,0x93,0xd3,0x4e,0xd2,0x28,0xd1,0x12,
-+	0x10,0x09,0x01,0xff,0xcf,0x85,0xcc,0x86,0x00,0x01,0xff,0xcf,0x85,0xcc,0x84,0x00,
-+	0x10,0x0b,0x01,0xff,0xcf,0x85,0xcc,0x88,0xcc,0x80,0x00,0x01,0xff,0xcf,0x85,0xcc,
-+	0x88,0xcc,0x81,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xcf,0x81,0xcc,0x93,0x00,0x01,
-+	0xff,0xcf,0x81,0xcc,0x94,0x00,0x10,0x09,0x01,0xff,0xcf,0x85,0xcd,0x82,0x00,0x01,
-+	0xff,0xcf,0x85,0xcc,0x88,0xcd,0x82,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,
-+	0xce,0xa5,0xcc,0x86,0x00,0x01,0xff,0xce,0xa5,0xcc,0x84,0x00,0x10,0x09,0x01,0xff,
-+	0xce,0xa5,0xcc,0x80,0x00,0x01,0xff,0xce,0xa5,0xcc,0x81,0x00,0xd1,0x12,0x10,0x09,
-+	0x01,0xff,0xce,0xa1,0xcc,0x94,0x00,0x01,0xff,0xc2,0xa8,0xcc,0x80,0x00,0x10,0x09,
-+	0x01,0xff,0xc2,0xa8,0xcc,0x81,0x00,0x01,0xff,0x60,0x00,0xd3,0x3b,0xd2,0x18,0x51,
-+	0x04,0x00,0x00,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x80,0xcd,0x85,0x00,0x01,0xff,
-+	0xcf,0x89,0xcd,0x85,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xcf,0x89,0xcc,0x81,0xcd,
-+	0x85,0x00,0x00,0x00,0x10,0x09,0x01,0xff,0xcf,0x89,0xcd,0x82,0x00,0x01,0xff,0xcf,
-+	0x89,0xcd,0x82,0xcd,0x85,0x00,0xd2,0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xce,0x9f,
-+	0xcc,0x80,0x00,0x01,0xff,0xce,0x9f,0xcc,0x81,0x00,0x10,0x09,0x01,0xff,0xce,0xa9,
-+	0xcc,0x80,0x00,0x01,0xff,0xce,0xa9,0xcc,0x81,0x00,0xd1,0x10,0x10,0x09,0x01,0xff,
-+	0xce,0xa9,0xcd,0x85,0x00,0x01,0xff,0xc2,0xb4,0x00,0x10,0x04,0x01,0x00,0x00,0x00,
-+	0xe0,0x62,0x0c,0xcf,0x86,0xe5,0x9f,0x08,0xe4,0xf8,0x05,0xe3,0xdb,0x02,0xe2,0xa1,
-+	0x01,0xd1,0xb4,0xd0,0x3a,0xcf,0x86,0xd5,0x20,0x94,0x1c,0x93,0x18,0x92,0x14,0x91,
-+	0x10,0x10,0x08,0x01,0xff,0xe2,0x80,0x82,0x00,0x01,0xff,0xe2,0x80,0x83,0x00,0x01,
-+	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x14,0x53,0x04,0x01,0x00,0x52,0x04,0x01,
-+	0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x04,0x00,0x01,0x00,0xcf,0x86,0xd5,
-+	0x48,0xd4,0x1c,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,
-+	0x00,0x06,0x00,0x52,0x04,0x04,0x00,0x11,0x04,0x04,0x00,0x06,0x00,0xd3,0x1c,0xd2,
-+	0x0c,0x51,0x04,0x06,0x00,0x10,0x04,0x06,0x00,0x07,0x00,0xd1,0x08,0x10,0x04,0x07,
-+	0x00,0x08,0x00,0x10,0x04,0x08,0x00,0x06,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,
-+	0x00,0x10,0x04,0x08,0x00,0x06,0x00,0xd4,0x1c,0xd3,0x10,0x52,0x04,0x06,0x00,0x91,
-+	0x08,0x10,0x04,0x0a,0x00,0x00,0x00,0x0f,0x00,0x92,0x08,0x11,0x04,0x0f,0x00,0x01,
-+	0x00,0x01,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x06,0x00,0x00,
-+	0x00,0x01,0x00,0x01,0x00,0xd0,0x7e,0xcf,0x86,0xd5,0x34,0xd4,0x14,0x53,0x04,0x01,
-+	0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0xd3,
-+	0x10,0x52,0x04,0x08,0x00,0x91,0x08,0x10,0x04,0x08,0x00,0x0c,0x00,0x0c,0x00,0x52,
-+	0x04,0x0c,0x00,0x91,0x08,0x10,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,0xd4,0x1c,0x53,
-+	0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x02,0x00,0x91,
-+	0x08,0x10,0x04,0x03,0x00,0x04,0x00,0x04,0x00,0xd3,0x10,0xd2,0x08,0x11,0x04,0x06,
-+	0x00,0x08,0x00,0x11,0x04,0x08,0x00,0x0b,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x0b,
-+	0x00,0x0c,0x00,0x10,0x04,0x0e,0x00,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x11,
-+	0x00,0x13,0x00,0xcf,0x86,0xd5,0x28,0x54,0x04,0x00,0x00,0xd3,0x0c,0x92,0x08,0x11,
-+	0x04,0x01,0xe6,0x01,0x01,0x01,0xe6,0xd2,0x0c,0x51,0x04,0x01,0x01,0x10,0x04,0x01,
-+	0x01,0x01,0xe6,0x91,0x08,0x10,0x04,0x01,0xe6,0x01,0x00,0x01,0x00,0xd4,0x30,0xd3,
-+	0x1c,0xd2,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x01,0xe6,0x04,0x00,0xd1,0x08,0x10,
-+	0x04,0x06,0x00,0x06,0x01,0x10,0x04,0x06,0x01,0x06,0xe6,0x92,0x10,0xd1,0x08,0x10,
-+	0x04,0x06,0xdc,0x06,0xe6,0x10,0x04,0x06,0x01,0x08,0x01,0x09,0xdc,0x93,0x10,0x92,
-+	0x0c,0x91,0x08,0x10,0x04,0x0a,0xe6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,
-+	0x81,0xd0,0x4f,0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x29,0xd3,0x13,0x52,0x04,0x01,
-+	0x00,0x51,0x04,0x01,0x00,0x10,0x07,0x01,0xff,0xce,0xa9,0x00,0x01,0x00,0x92,0x12,
-+	0x51,0x04,0x01,0x00,0x10,0x06,0x01,0xff,0x4b,0x00,0x01,0xff,0x41,0xcc,0x8a,0x00,
-+	0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x01,0x00,0x04,0x00,
-+	0x10,0x04,0x04,0x00,0x07,0x00,0x91,0x08,0x10,0x04,0x08,0x00,0x06,0x00,0x06,0x00,
-+	0xcf,0x86,0x95,0x2c,0xd4,0x18,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0xd1,0x08,
-+	0x10,0x04,0x08,0x00,0x09,0x00,0x10,0x04,0x09,0x00,0x0a,0x00,0x93,0x10,0x92,0x0c,
-+	0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
-+	0xd0,0x68,0xcf,0x86,0xd5,0x48,0xd4,0x28,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x01,0x00,
-+	0x10,0x04,0x01,0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,
-+	0x92,0x0c,0x91,0x08,0x10,0x04,0x0a,0x00,0x0b,0x00,0x11,0x00,0x00,0x00,0x53,0x04,
-+	0x01,0x00,0x92,0x18,0x51,0x04,0x01,0x00,0x10,0x0a,0x01,0xff,0xe2,0x86,0x90,0xcc,
-+	0xb8,0x00,0x01,0xff,0xe2,0x86,0x92,0xcc,0xb8,0x00,0x01,0x00,0x94,0x1a,0x53,0x04,
-+	0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x0a,0x01,0xff,0xe2,0x86,
-+	0x94,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x2e,0x94,0x2a,0x53,0x04,
-+	0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x0e,0x10,0x04,0x01,0x00,0x01,0xff,0xe2,0x87,
-+	0x90,0xcc,0xb8,0x00,0x10,0x0a,0x01,0xff,0xe2,0x87,0x94,0xcc,0xb8,0x00,0x01,0xff,
-+	0xe2,0x87,0x92,0xcc,0xb8,0x00,0x01,0x00,0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,
-+	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x04,0x00,0x04,0x00,0x93,0x08,0x12,0x04,
-+	0x04,0x00,0x06,0x00,0x06,0x00,0xe2,0x38,0x02,0xe1,0x3f,0x01,0xd0,0x68,0xcf,0x86,
-+	0xd5,0x3e,0x94,0x3a,0xd3,0x16,0x52,0x04,0x01,0x00,0x91,0x0e,0x10,0x0a,0x01,0xff,
-+	0xe2,0x88,0x83,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0xd2,0x12,0x91,0x0e,0x10,0x04,
-+	0x01,0x00,0x01,0xff,0xe2,0x88,0x88,0xcc,0xb8,0x00,0x01,0x00,0x91,0x0e,0x10,0x0a,
-+	0x01,0xff,0xe2,0x88,0x8b,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x24,
-+	0x93,0x20,0x52,0x04,0x01,0x00,0xd1,0x0e,0x10,0x0a,0x01,0xff,0xe2,0x88,0xa3,0xcc,
-+	0xb8,0x00,0x01,0x00,0x10,0x0a,0x01,0xff,0xe2,0x88,0xa5,0xcc,0xb8,0x00,0x01,0x00,
-+	0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x48,0x94,0x44,0xd3,0x2e,0xd2,0x12,0x91,0x0e,
-+	0x10,0x04,0x01,0x00,0x01,0xff,0xe2,0x88,0xbc,0xcc,0xb8,0x00,0x01,0x00,0xd1,0x0e,
-+	0x10,0x0a,0x01,0xff,0xe2,0x89,0x83,0xcc,0xb8,0x00,0x01,0x00,0x10,0x04,0x01,0x00,
-+	0x01,0xff,0xe2,0x89,0x85,0xcc,0xb8,0x00,0x92,0x12,0x91,0x0e,0x10,0x04,0x01,0x00,
-+	0x01,0xff,0xe2,0x89,0x88,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,0x40,
-+	0xd3,0x1e,0x92,0x1a,0xd1,0x0c,0x10,0x08,0x01,0xff,0x3d,0xcc,0xb8,0x00,0x01,0x00,
-+	0x10,0x0a,0x01,0xff,0xe2,0x89,0xa1,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x52,0x04,
-+	0x01,0x00,0xd1,0x0e,0x10,0x04,0x01,0x00,0x01,0xff,0xe2,0x89,0x8d,0xcc,0xb8,0x00,
-+	0x10,0x08,0x01,0xff,0x3c,0xcc,0xb8,0x00,0x01,0xff,0x3e,0xcc,0xb8,0x00,0xd3,0x30,
-+	0xd2,0x18,0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x89,0xa4,0xcc,0xb8,0x00,0x01,0xff,
-+	0xe2,0x89,0xa5,0xcc,0xb8,0x00,0x01,0x00,0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x89,
-+	0xb2,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x89,0xb3,0xcc,0xb8,0x00,0x01,0x00,0x92,0x18,
-+	0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x89,0xb6,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x89,
-+	0xb7,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0xd0,0x86,0xcf,0x86,0xd5,0x50,0x94,0x4c,
-+	0xd3,0x30,0xd2,0x18,0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x89,0xba,0xcc,0xb8,0x00,
-+	0x01,0xff,0xe2,0x89,0xbb,0xcc,0xb8,0x00,0x01,0x00,0x91,0x14,0x10,0x0a,0x01,0xff,
-+	0xe2,0x8a,0x82,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x8a,0x83,0xcc,0xb8,0x00,0x01,0x00,
-+	0x92,0x18,0x91,0x14,0x10,0x0a,0x01,0xff,0xe2,0x8a,0x86,0xcc,0xb8,0x00,0x01,0xff,
-+	0xe2,0x8a,0x87,0xcc,0xb8,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x30,0x53,0x04,
-+	0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x14,0x10,0x0a,0x01,0xff,0xe2,0x8a,0xa2,0xcc,
-+	0xb8,0x00,0x01,0xff,0xe2,0x8a,0xa8,0xcc,0xb8,0x00,0x10,0x0a,0x01,0xff,0xe2,0x8a,
-+	0xa9,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x8a,0xab,0xcc,0xb8,0x00,0x01,0x00,0xcf,0x86,
-+	0x55,0x04,0x01,0x00,0xd4,0x5c,0xd3,0x2c,0x92,0x28,0xd1,0x14,0x10,0x0a,0x01,0xff,
-+	0xe2,0x89,0xbc,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x89,0xbd,0xcc,0xb8,0x00,0x10,0x0a,
-+	0x01,0xff,0xe2,0x8a,0x91,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x8a,0x92,0xcc,0xb8,0x00,
-+	0x01,0x00,0xd2,0x18,0x51,0x04,0x01,0x00,0x10,0x0a,0x01,0xff,0xe2,0x8a,0xb2,0xcc,
-+	0xb8,0x00,0x01,0xff,0xe2,0x8a,0xb3,0xcc,0xb8,0x00,0x91,0x14,0x10,0x0a,0x01,0xff,
-+	0xe2,0x8a,0xb4,0xcc,0xb8,0x00,0x01,0xff,0xe2,0x8a,0xb5,0xcc,0xb8,0x00,0x01,0x00,
-+	0x93,0x0c,0x92,0x08,0x11,0x04,0x01,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0xd1,0x64,
-+	0xd0,0x3e,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,
-+	0x01,0x00,0x04,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x94,0x20,0x53,0x04,
-+	0x01,0x00,0x92,0x18,0xd1,0x0c,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x80,0x88,0x00,
-+	0x10,0x08,0x01,0xff,0xe3,0x80,0x89,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,
-+	0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,
-+	0x01,0x00,0x10,0x04,0x01,0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x06,0x00,0x04,0x00,
-+	0x04,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x04,0x00,0x53,0x04,0x04,0x00,
-+	0x92,0x0c,0x51,0x04,0x04,0x00,0x10,0x04,0x04,0x00,0x06,0x00,0x06,0x00,0x06,0x00,
-+	0xcf,0x86,0xd5,0x2c,0xd4,0x14,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x51,0x04,
-+	0x06,0x00,0x10,0x04,0x06,0x00,0x07,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,
-+	0x07,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x12,0x04,0x08,0x00,0x09,0x00,0xd4,0x14,
-+	0x53,0x04,0x09,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x0b,0x00,0x0c,0x00,0x0c,0x00,
-+	0x0c,0x00,0xd3,0x08,0x12,0x04,0x0c,0x00,0x10,0x00,0xd2,0x0c,0x51,0x04,0x10,0x00,
-+	0x10,0x04,0x10,0x00,0x12,0x00,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x13,0x00,
-+	0xd3,0xa6,0xd2,0x74,0xd1,0x40,0xd0,0x22,0xcf,0x86,0x55,0x04,0x01,0x00,0x94,0x18,
-+	0x93,0x14,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x04,0x00,0x10,0x04,
-+	0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0x95,0x18,0x94,0x14,0x53,0x04,
-+	0x01,0x00,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x00,0x00,
-+	0x00,0x00,0x01,0x00,0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,
-+	0xd4,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,
-+	0x06,0x00,0x06,0x00,0x53,0x04,0x06,0x00,0x52,0x04,0x06,0x00,0x51,0x04,0x06,0x00,
-+	0x10,0x04,0x06,0x00,0x07,0x00,0xd1,0x06,0xcf,0x06,0x01,0x00,0xd0,0x1a,0xcf,0x86,
-+	0x95,0x14,0x54,0x04,0x01,0x00,0x93,0x0c,0x52,0x04,0x01,0x00,0x11,0x04,0x01,0x00,
-+	0x06,0x00,0x06,0x00,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,
-+	0x13,0x04,0x04,0x00,0x06,0x00,0xd2,0xdc,0xd1,0x48,0xd0,0x26,0xcf,0x86,0x95,0x20,
-+	0x54,0x04,0x01,0x00,0xd3,0x0c,0x52,0x04,0x01,0x00,0x11,0x04,0x07,0x00,0x06,0x00,
-+	0x92,0x0c,0x91,0x08,0x10,0x04,0x08,0x00,0x04,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
-+	0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,
-+	0x04,0x00,0x06,0x00,0x06,0x00,0x52,0x04,0x06,0x00,0x11,0x04,0x06,0x00,0x08,0x00,
-+	0xd0,0x5e,0xcf,0x86,0xd5,0x2c,0xd4,0x10,0x53,0x04,0x06,0x00,0x92,0x08,0x11,0x04,
-+	0x06,0x00,0x07,0x00,0x07,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,0x07,0x00,0x08,0x00,
-+	0x08,0x00,0x52,0x04,0x08,0x00,0x91,0x08,0x10,0x04,0x08,0x00,0x0a,0x00,0x0b,0x00,
-+	0xd4,0x10,0x93,0x0c,0x92,0x08,0x11,0x04,0x07,0x00,0x08,0x00,0x08,0x00,0x08,0x00,
-+	0xd3,0x10,0x92,0x0c,0x51,0x04,0x08,0x00,0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,
-+	0x52,0x04,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x0b,0x00,0x0b,0x00,0xcf,0x86,
-+	0xd5,0x1c,0x94,0x18,0xd3,0x08,0x12,0x04,0x0a,0x00,0x0b,0x00,0x52,0x04,0x0b,0x00,
-+	0x51,0x04,0x0b,0x00,0x10,0x04,0x0c,0x00,0x0b,0x00,0x0b,0x00,0x94,0x14,0x93,0x10,
-+	0x92,0x0c,0x51,0x04,0x0b,0x00,0x10,0x04,0x0c,0x00,0x0b,0x00,0x0c,0x00,0x0b,0x00,
-+	0x0b,0x00,0xd1,0xa8,0xd0,0x42,0xcf,0x86,0xd5,0x28,0x94,0x24,0xd3,0x18,0xd2,0x0c,
-+	0x91,0x08,0x10,0x04,0x10,0x00,0x01,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
-+	0x0c,0x00,0x01,0x00,0x92,0x08,0x11,0x04,0x01,0x00,0x0c,0x00,0x01,0x00,0x01,0x00,
-+	0x94,0x14,0x53,0x04,0x01,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x0c,0x00,0x01,0x00,
-+	0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x40,0xd4,0x18,0x53,0x04,0x01,0x00,
-+	0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x0c,0x00,0x01,0x00,0x10,0x04,0x0c,0x00,
-+	0x01,0x00,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x0c,0x00,
-+	0x51,0x04,0x0c,0x00,0x10,0x04,0x01,0x00,0x0b,0x00,0x52,0x04,0x01,0x00,0x51,0x04,
-+	0x01,0x00,0x10,0x04,0x01,0x00,0x0c,0x00,0xd4,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,
-+	0x10,0x04,0x0c,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x06,0x00,0x93,0x0c,0x52,0x04,
-+	0x06,0x00,0x11,0x04,0x06,0x00,0x01,0x00,0x01,0x00,0xd0,0x3e,0xcf,0x86,0xd5,0x18,
-+	0x54,0x04,0x01,0x00,0x93,0x10,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
-+	0x0c,0x00,0x0c,0x00,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,
-+	0x10,0x04,0x0c,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,
-+	0x01,0x00,0x10,0x04,0x01,0x00,0x0c,0x00,0xcf,0x86,0xd5,0x2c,0x94,0x28,0xd3,0x10,
-+	0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x09,0x00,0xd2,0x0c,
-+	0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x0d,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,
-+	0x0d,0x00,0x0c,0x00,0x06,0x00,0x94,0x0c,0x53,0x04,0x06,0x00,0x12,0x04,0x06,0x00,
-+	0x0a,0x00,0x06,0x00,0xe4,0x39,0x01,0xd3,0x0c,0xd2,0x06,0xcf,0x06,0x04,0x00,0xcf,
-+	0x06,0x06,0x00,0xd2,0x30,0xd1,0x06,0xcf,0x06,0x06,0x00,0xd0,0x06,0xcf,0x06,0x06,
-+	0x00,0xcf,0x86,0x95,0x1e,0x54,0x04,0x06,0x00,0x53,0x04,0x06,0x00,0x52,0x04,0x06,
-+	0x00,0x91,0x0e,0x10,0x0a,0x06,0xff,0xe2,0xab,0x9d,0xcc,0xb8,0x00,0x06,0x00,0x06,
-+	0x00,0x06,0x00,0xd1,0x80,0xd0,0x3a,0xcf,0x86,0xd5,0x28,0xd4,0x10,0x53,0x04,0x07,
-+	0x00,0x52,0x04,0x07,0x00,0x11,0x04,0x07,0x00,0x08,0x00,0xd3,0x08,0x12,0x04,0x08,
-+	0x00,0x09,0x00,0x92,0x0c,0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,
-+	0x00,0x94,0x0c,0x93,0x08,0x12,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,0x0a,0x00,0xcf,
-+	0x86,0xd5,0x30,0xd4,0x14,0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,0x91,0x08,0x10,
-+	0x04,0x0a,0x00,0x10,0x00,0x10,0x00,0xd3,0x10,0x52,0x04,0x0a,0x00,0x91,0x08,0x10,
-+	0x04,0x0a,0x00,0x0b,0x00,0x0b,0x00,0x92,0x08,0x11,0x04,0x0b,0x00,0x10,0x00,0x10,
-+	0x00,0x54,0x04,0x10,0x00,0x93,0x0c,0x52,0x04,0x10,0x00,0x11,0x04,0x00,0x00,0x10,
-+	0x00,0x10,0x00,0xd0,0x32,0xcf,0x86,0xd5,0x14,0x54,0x04,0x10,0x00,0x93,0x0c,0x52,
-+	0x04,0x10,0x00,0x11,0x04,0x10,0x00,0x00,0x00,0x10,0x00,0x54,0x04,0x10,0x00,0x53,
-+	0x04,0x10,0x00,0xd2,0x08,0x11,0x04,0x10,0x00,0x14,0x00,0x91,0x08,0x10,0x04,0x14,
-+	0x00,0x10,0x00,0x10,0x00,0xcf,0x86,0xd5,0x28,0xd4,0x14,0x53,0x04,0x10,0x00,0x92,
-+	0x0c,0x91,0x08,0x10,0x04,0x10,0x00,0x15,0x00,0x10,0x00,0x10,0x00,0x93,0x10,0x92,
-+	0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x13,0x00,0x14,0x00,0x14,0x00,0x14,0x00,0xd4,
-+	0x0c,0x53,0x04,0x14,0x00,0x12,0x04,0x14,0x00,0x11,0x00,0x53,0x04,0x14,0x00,0x52,
-+	0x04,0x14,0x00,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x15,0x00,0xe3,0xb9,0x01,
-+	0xd2,0xac,0xd1,0x68,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x08,0x00,0x94,0x14,0x53,0x04,
-+	0x08,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,0x00,
-+	0x08,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,0x08,0x00,0x53,0x04,0x08,0x00,0x52,0x04,
-+	0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x00,0x00,0xd4,0x14,0x53,0x04,
-+	0x09,0x00,0x52,0x04,0x09,0x00,0x91,0x08,0x10,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,
-+	0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0b,0x00,0x0a,0x00,0x0a,0x00,0x09,0x00,
-+	0x52,0x04,0x0a,0x00,0x11,0x04,0x0a,0x00,0x0b,0x00,0xd0,0x06,0xcf,0x06,0x08,0x00,
-+	0xcf,0x86,0x55,0x04,0x08,0x00,0xd4,0x1c,0x53,0x04,0x08,0x00,0xd2,0x0c,0x51,0x04,
-+	0x08,0x00,0x10,0x04,0x08,0x00,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,
-+	0x0b,0xe6,0xd3,0x0c,0x92,0x08,0x11,0x04,0x0b,0xe6,0x0d,0x00,0x00,0x00,0x92,0x0c,
-+	0x91,0x08,0x10,0x04,0x00,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0xd1,0x6c,0xd0,0x2a,
-+	0xcf,0x86,0x55,0x04,0x08,0x00,0x94,0x20,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,
-+	0x08,0x00,0x10,0x04,0x00,0x00,0x0d,0x00,0x52,0x04,0x00,0x00,0x91,0x08,0x10,0x04,
-+	0x00,0x00,0x0d,0x00,0x00,0x00,0x08,0x00,0xcf,0x86,0x55,0x04,0x08,0x00,0xd4,0x1c,
-+	0xd3,0x0c,0x52,0x04,0x08,0x00,0x11,0x04,0x08,0x00,0x0d,0x00,0x52,0x04,0x00,0x00,
-+	0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x08,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,
-+	0x10,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x51,0x04,
-+	0x00,0x00,0x10,0x04,0x00,0x00,0x0c,0x09,0xd0,0x5a,0xcf,0x86,0xd5,0x18,0x54,0x04,
-+	0x08,0x00,0x93,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,
-+	0x00,0x00,0x00,0x00,0xd4,0x20,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,
-+	0x10,0x04,0x08,0x00,0x00,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,
-+	0x08,0x00,0x00,0x00,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,
-+	0x08,0x00,0x00,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,
-+	0x00,0x00,0xcf,0x86,0x95,0x40,0xd4,0x20,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,
-+	0x08,0x00,0x10,0x04,0x08,0x00,0x00,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,
-+	0x10,0x04,0x08,0x00,0x00,0x00,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,
-+	0x10,0x04,0x08,0x00,0x00,0x00,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,
-+	0x08,0x00,0x00,0x00,0x0a,0xe6,0xd2,0x9c,0xd1,0x68,0xd0,0x32,0xcf,0x86,0xd5,0x14,
-+	0x54,0x04,0x08,0x00,0x53,0x04,0x08,0x00,0x52,0x04,0x0a,0x00,0x11,0x04,0x08,0x00,
-+	0x0a,0x00,0x54,0x04,0x0a,0x00,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0a,0x00,
-+	0x0b,0x00,0x0d,0x00,0x0d,0x00,0x12,0x04,0x0d,0x00,0x10,0x00,0xcf,0x86,0x95,0x30,
-+	0x94,0x2c,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x12,0x00,
-+	0x91,0x08,0x10,0x04,0x12,0x00,0x13,0x00,0x13,0x00,0xd2,0x08,0x11,0x04,0x13,0x00,
-+	0x14,0x00,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x15,0x00,0x00,0x00,0x00,0x00,
-+	0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x04,0x00,0x53,0x04,0x04,0x00,0x92,0x0c,
-+	0x51,0x04,0x04,0x00,0x10,0x04,0x00,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0xcf,0x86,
-+	0x55,0x04,0x04,0x00,0x54,0x04,0x04,0x00,0x93,0x08,0x12,0x04,0x04,0x00,0x00,0x00,
-+	0x00,0x00,0xd1,0x06,0xcf,0x06,0x04,0x00,0xd0,0x06,0xcf,0x06,0x04,0x00,0xcf,0x86,
-+	0xd5,0x14,0x54,0x04,0x04,0x00,0x93,0x0c,0x52,0x04,0x04,0x00,0x11,0x04,0x04,0x00,
-+	0x00,0x00,0x00,0x00,0x54,0x04,0x00,0x00,0x53,0x04,0x04,0x00,0x12,0x04,0x04,0x00,
-+	0x00,0x00,0xcf,0x86,0xe5,0x8d,0x05,0xe4,0x86,0x05,0xe3,0x7d,0x04,0xe2,0xe4,0x03,
-+	0xe1,0xc0,0x01,0xd0,0x3e,0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x1c,0x53,0x04,0x01,
-+	0x00,0xd2,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0xda,0x01,0xe4,0x91,0x08,0x10,
-+	0x04,0x01,0xe8,0x01,0xde,0x01,0xe0,0x53,0x04,0x01,0x00,0xd2,0x0c,0x51,0x04,0x04,
-+	0x00,0x10,0x04,0x04,0x00,0x06,0x00,0x51,0x04,0x06,0x00,0x10,0x04,0x04,0x00,0x01,
-+	0x00,0xcf,0x86,0xd5,0xaa,0xd4,0x32,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,
-+	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x0f,0x10,0x0b,0x01,
-+	0xff,0xe3,0x81,0x8b,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,
-+	0x8d,0xe3,0x82,0x99,0x00,0x01,0x00,0xd3,0x3c,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,
-+	0xff,0xe3,0x81,0x8f,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,
-+	0x91,0xe3,0x82,0x99,0x00,0x01,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0x93,
-+	0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0x95,0xe3,0x82,0x99,
-+	0x00,0x01,0x00,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0x97,0xe3,0x82,
-+	0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0x99,0xe3,0x82,0x99,0x00,0x01,
-+	0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0x9b,0xe3,0x82,0x99,0x00,0x01,0x00,
-+	0x10,0x0b,0x01,0xff,0xe3,0x81,0x9d,0xe3,0x82,0x99,0x00,0x01,0x00,0xd4,0x53,0xd3,
-+	0x3c,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0x9f,0xe3,0x82,0x99,0x00,
-+	0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0xa1,0xe3,0x82,0x99,0x00,0x01,0x00,0xd1,
-+	0x0f,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x81,0xa4,0xe3,0x82,0x99,0x00,0x10,0x04,
-+	0x01,0x00,0x01,0xff,0xe3,0x81,0xa6,0xe3,0x82,0x99,0x00,0x92,0x13,0x91,0x0f,0x10,
-+	0x04,0x01,0x00,0x01,0xff,0xe3,0x81,0xa8,0xe3,0x82,0x99,0x00,0x01,0x00,0x01,0x00,
-+	0xd3,0x4a,0xd2,0x25,0xd1,0x16,0x10,0x0b,0x01,0xff,0xe3,0x81,0xaf,0xe3,0x82,0x99,
-+	0x00,0x01,0xff,0xe3,0x81,0xaf,0xe3,0x82,0x9a,0x00,0x10,0x04,0x01,0x00,0x01,0xff,
-+	0xe3,0x81,0xb2,0xe3,0x82,0x99,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0xb2,
-+	0xe3,0x82,0x9a,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x81,0xb5,0xe3,0x82,0x99,
-+	0x00,0x01,0xff,0xe3,0x81,0xb5,0xe3,0x82,0x9a,0x00,0xd2,0x1e,0xd1,0x0f,0x10,0x04,
-+	0x01,0x00,0x01,0xff,0xe3,0x81,0xb8,0xe3,0x82,0x99,0x00,0x10,0x0b,0x01,0xff,0xe3,
-+	0x81,0xb8,0xe3,0x82,0x9a,0x00,0x01,0x00,0x91,0x16,0x10,0x0b,0x01,0xff,0xe3,0x81,
-+	0xbb,0xe3,0x82,0x99,0x00,0x01,0xff,0xe3,0x81,0xbb,0xe3,0x82,0x9a,0x00,0x01,0x00,
-+	0xd0,0xee,0xcf,0x86,0xd5,0x42,0x54,0x04,0x01,0x00,0xd3,0x1b,0x52,0x04,0x01,0x00,
-+	0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x81,0x86,0xe3,0x82,0x99,0x00,0x06,0x00,0x10,
-+	0x04,0x06,0x00,0x00,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x00,0x00,0x01,0x08,0x10,
-+	0x04,0x01,0x08,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0x9d,
-+	0xe3,0x82,0x99,0x00,0x06,0x00,0xd4,0x32,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,
-+	0x06,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x0f,0x10,0x0b,
-+	0x01,0xff,0xe3,0x82,0xab,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,
-+	0x82,0xad,0xe3,0x82,0x99,0x00,0x01,0x00,0xd3,0x3c,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,
-+	0x01,0xff,0xe3,0x82,0xaf,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,
-+	0x82,0xb1,0xe3,0x82,0x99,0x00,0x01,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,
-+	0xb3,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0xb5,0xe3,0x82,
-+	0x99,0x00,0x01,0x00,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,0xb7,0xe3,
-+	0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0xb9,0xe3,0x82,0x99,0x00,
-+	0x01,0x00,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,0xbb,0xe3,0x82,0x99,0x00,0x01,
-+	0x00,0x10,0x0b,0x01,0xff,0xe3,0x82,0xbd,0xe3,0x82,0x99,0x00,0x01,0x00,0xcf,0x86,
-+	0xd5,0xd5,0xd4,0x53,0xd3,0x3c,0xd2,0x1e,0xd1,0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,
-+	0xbf,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x83,0x81,0xe3,0x82,
-+	0x99,0x00,0x01,0x00,0xd1,0x0f,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x84,0xe3,
-+	0x82,0x99,0x00,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x86,0xe3,0x82,0x99,0x00,
-+	0x92,0x13,0x91,0x0f,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x88,0xe3,0x82,0x99,
-+	0x00,0x01,0x00,0x01,0x00,0xd3,0x4a,0xd2,0x25,0xd1,0x16,0x10,0x0b,0x01,0xff,0xe3,
-+	0x83,0x8f,0xe3,0x82,0x99,0x00,0x01,0xff,0xe3,0x83,0x8f,0xe3,0x82,0x9a,0x00,0x10,
-+	0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x92,0xe3,0x82,0x99,0x00,0xd1,0x0f,0x10,0x0b,
-+	0x01,0xff,0xe3,0x83,0x92,0xe3,0x82,0x9a,0x00,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,
-+	0x83,0x95,0xe3,0x82,0x99,0x00,0x01,0xff,0xe3,0x83,0x95,0xe3,0x82,0x9a,0x00,0xd2,
-+	0x1e,0xd1,0x0f,0x10,0x04,0x01,0x00,0x01,0xff,0xe3,0x83,0x98,0xe3,0x82,0x99,0x00,
-+	0x10,0x0b,0x01,0xff,0xe3,0x83,0x98,0xe3,0x82,0x9a,0x00,0x01,0x00,0x91,0x16,0x10,
-+	0x0b,0x01,0xff,0xe3,0x83,0x9b,0xe3,0x82,0x99,0x00,0x01,0xff,0xe3,0x83,0x9b,0xe3,
-+	0x82,0x9a,0x00,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x22,0x52,0x04,0x01,0x00,0xd1,
-+	0x0f,0x10,0x0b,0x01,0xff,0xe3,0x82,0xa6,0xe3,0x82,0x99,0x00,0x01,0x00,0x10,0x04,
-+	0x01,0x00,0x01,0xff,0xe3,0x83,0xaf,0xe3,0x82,0x99,0x00,0xd2,0x25,0xd1,0x16,0x10,
-+	0x0b,0x01,0xff,0xe3,0x83,0xb0,0xe3,0x82,0x99,0x00,0x01,0xff,0xe3,0x83,0xb1,0xe3,
-+	0x82,0x99,0x00,0x10,0x0b,0x01,0xff,0xe3,0x83,0xb2,0xe3,0x82,0x99,0x00,0x01,0x00,
-+	0x51,0x04,0x01,0x00,0x10,0x0b,0x01,0xff,0xe3,0x83,0xbd,0xe3,0x82,0x99,0x00,0x06,
-+	0x00,0xd1,0x4c,0xd0,0x46,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x52,0x04,0x00,
-+	0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd4,
-+	0x18,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x0a,
-+	0x00,0x10,0x04,0x13,0x00,0x14,0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,
-+	0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x06,0x01,0x00,0xd0,0x32,0xcf,
-+	0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,
-+	0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x01,0x00,0x54,0x04,0x04,0x00,0x53,0x04,0x04,
-+	0x00,0x92,0x0c,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,0xcf,
-+	0x86,0xd5,0x08,0x14,0x04,0x08,0x00,0x0a,0x00,0x94,0x0c,0x93,0x08,0x12,0x04,0x0a,
-+	0x00,0x00,0x00,0x00,0x00,0x06,0x00,0xd2,0xa4,0xd1,0x5c,0xd0,0x22,0xcf,0x86,0x95,
-+	0x1c,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,
-+	0x04,0x01,0x00,0x07,0x00,0x10,0x04,0x07,0x00,0x00,0x00,0x01,0x00,0xcf,0x86,0xd5,
-+	0x20,0xd4,0x0c,0x93,0x08,0x12,0x04,0x01,0x00,0x0b,0x00,0x0b,0x00,0x93,0x10,0x92,
-+	0x0c,0x91,0x08,0x10,0x04,0x07,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x54,
-+	0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x07,0x00,0x10,
-+	0x04,0x08,0x00,0x01,0x00,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,
-+	0x00,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x01,0x00,0x06,0x00,0x06,0x00,0x06,
-+	0x00,0x06,0x00,0xcf,0x86,0xd5,0x10,0x94,0x0c,0x53,0x04,0x01,0x00,0x12,0x04,0x01,
-+	0x00,0x07,0x00,0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,
-+	0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x16,0x00,0xd1,0x30,0xd0,0x06,0xcf,
-+	0x06,0x01,0x00,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0xd3,0x10,0x52,
-+	0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x07,0x00,0x92,0x0c,0x51,
-+	0x04,0x07,0x00,0x10,0x04,0x07,0x00,0x01,0x00,0x01,0x00,0xd0,0x06,0xcf,0x06,0x01,
-+	0x00,0xcf,0x86,0xd5,0x14,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,
-+	0x00,0x11,0x04,0x01,0x00,0x07,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,
-+	0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x07,0x00,0xcf,0x06,0x04,
-+	0x00,0xcf,0x06,0x04,0x00,0xd1,0x48,0xd0,0x40,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x04,
-+	0x00,0xd4,0x06,0xcf,0x06,0x04,0x00,0xd3,0x2c,0xd2,0x06,0xcf,0x06,0x04,0x00,0xd1,
-+	0x06,0xcf,0x06,0x04,0x00,0xd0,0x1a,0xcf,0x86,0x55,0x04,0x04,0x00,0x54,0x04,0x04,
-+	0x00,0x93,0x0c,0x52,0x04,0x04,0x00,0x11,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0xcf,
-+	0x06,0x07,0x00,0xcf,0x06,0x01,0x00,0xcf,0x86,0xcf,0x06,0x01,0x00,0xcf,0x86,0xcf,
-+	0x06,0x01,0x00,0xe2,0x71,0x05,0xd1,0x8c,0xd0,0x08,0xcf,0x86,0xcf,0x06,0x01,0x00,
-+	0xcf,0x86,0xd5,0x06,0xcf,0x06,0x01,0x00,0xd4,0x06,0xcf,0x06,0x01,0x00,0xd3,0x06,
-+	0xcf,0x06,0x01,0x00,0xd2,0x06,0xcf,0x06,0x01,0x00,0xd1,0x06,0xcf,0x06,0x01,0x00,
-+	0xd0,0x22,0xcf,0x86,0x55,0x04,0x01,0x00,0xd4,0x10,0x93,0x0c,0x52,0x04,0x01,0x00,
-+	0x11,0x04,0x01,0x00,0x08,0x00,0x08,0x00,0x53,0x04,0x08,0x00,0x12,0x04,0x08,0x00,
-+	0x0a,0x00,0xcf,0x86,0xd5,0x28,0xd4,0x18,0xd3,0x08,0x12,0x04,0x0a,0x00,0x0b,0x00,
-+	0x52,0x04,0x0b,0x00,0x91,0x08,0x10,0x04,0x0d,0x00,0x11,0x00,0x11,0x00,0x93,0x0c,
-+	0x52,0x04,0x11,0x00,0x11,0x04,0x11,0x00,0x13,0x00,0x13,0x00,0x94,0x14,0x53,0x04,
-+	0x13,0x00,0x92,0x0c,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x14,0x00,0x14,0x00,
-+	0x00,0x00,0xe0,0xdb,0x04,0xcf,0x86,0xe5,0xdf,0x01,0xd4,0x06,0xcf,0x06,0x04,0x00,
-+	0xd3,0x74,0xd2,0x6e,0xd1,0x06,0xcf,0x06,0x04,0x00,0xd0,0x3e,0xcf,0x86,0xd5,0x18,
-+	0x94,0x14,0x53,0x04,0x04,0x00,0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,0x04,0x00,
-+	0x00,0x00,0x00,0x00,0x04,0x00,0xd4,0x10,0x93,0x0c,0x92,0x08,0x11,0x04,0x04,0x00,
-+	0x06,0x00,0x04,0x00,0x04,0x00,0x93,0x10,0x52,0x04,0x04,0x00,0x91,0x08,0x10,0x04,
-+	0x06,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0xcf,0x86,0x95,0x24,0x94,0x20,0x93,0x1c,
-+	0xd2,0x0c,0x91,0x08,0x10,0x04,0x04,0x00,0x06,0x00,0x04,0x00,0xd1,0x08,0x10,0x04,
-+	0x04,0x00,0x06,0x00,0x10,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x0b,0x00,0x0b,0x00,
-+	0xcf,0x06,0x0a,0x00,0xd2,0x84,0xd1,0x4c,0xd0,0x16,0xcf,0x86,0x55,0x04,0x0a,0x00,
-+	0x94,0x0c,0x53,0x04,0x0a,0x00,0x12,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,
-+	0x55,0x04,0x0a,0x00,0xd4,0x1c,0xd3,0x0c,0x92,0x08,0x11,0x04,0x0c,0x00,0x0a,0x00,
-+	0x0a,0x00,0x52,0x04,0x0a,0x00,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x00,0x0a,0xe6,
-+	0xd3,0x08,0x12,0x04,0x0a,0x00,0x0d,0xe6,0x52,0x04,0x0d,0xe6,0x11,0x04,0x0a,0xe6,
-+	0x0a,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x0a,0x00,0x53,0x04,0x0a,0x00,
-+	0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x11,0xe6,0x0d,0xe6,0x0b,0x00,
-+	0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,0x0b,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,
-+	0x0b,0xe6,0x0b,0x00,0x0b,0x00,0x00,0x00,0xd1,0x40,0xd0,0x3a,0xcf,0x86,0xd5,0x24,
-+	0x54,0x04,0x08,0x00,0xd3,0x10,0x52,0x04,0x08,0x00,0x51,0x04,0x08,0x00,0x10,0x04,
-+	0x08,0x00,0x09,0x00,0x92,0x0c,0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x0a,0x00,
-+	0x0a,0x00,0x94,0x10,0x93,0x0c,0x92,0x08,0x11,0x04,0x09,0x00,0x0a,0x00,0x0a,0x00,
-+	0x0a,0x00,0x0a,0x00,0xcf,0x06,0x0a,0x00,0xd0,0x5e,0xcf,0x86,0xd5,0x28,0xd4,0x18,
-+	0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,0xd1,0x08,0x10,0x04,0x0a,0x00,0x0c,0x00,
-+	0x10,0x04,0x0c,0x00,0x11,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x0c,0x00,0x0d,0x00,
-+	0x10,0x00,0x10,0x00,0xd4,0x1c,0x53,0x04,0x0c,0x00,0xd2,0x0c,0x51,0x04,0x0c,0x00,
-+	0x10,0x04,0x0d,0x00,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x12,0x00,0x14,0x00,
-+	0xd3,0x0c,0x92,0x08,0x11,0x04,0x10,0x00,0x11,0x00,0x11,0x00,0x92,0x08,0x11,0x04,
-+	0x14,0x00,0x15,0x00,0x15,0x00,0xcf,0x86,0xd5,0x1c,0x94,0x18,0x93,0x14,0xd2,0x08,
-+	0x11,0x04,0x00,0x00,0x15,0x00,0x51,0x04,0x15,0x00,0x10,0x04,0x15,0x00,0x00,0x00,
-+	0x00,0x00,0x00,0x00,0x54,0x04,0x00,0x00,0xd3,0x10,0x52,0x04,0x00,0x00,0x51,0x04,
-+	0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x92,0x0c,0x51,0x04,0x0d,0x00,0x10,0x04,
-+	0x0c,0x00,0x0a,0x00,0x0a,0x00,0xe4,0xf2,0x02,0xe3,0x65,0x01,0xd2,0x98,0xd1,0x48,
-+	0xd0,0x36,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x52,0x04,0x08,0x00,0x51,0x04,
-+	0x08,0x00,0x10,0x04,0x08,0x09,0x08,0x00,0x08,0x00,0x08,0x00,0xd4,0x0c,0x53,0x04,
-+	0x08,0x00,0x12,0x04,0x08,0x00,0x00,0x00,0x53,0x04,0x0b,0x00,0x92,0x08,0x11,0x04,
-+	0x0b,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0x55,0x04,0x09,0x00,0x54,0x04,0x09,0x00,
-+	0x13,0x04,0x09,0x00,0x00,0x00,0xd0,0x06,0xcf,0x06,0x0a,0x00,0xcf,0x86,0xd5,0x2c,
-+	0xd4,0x1c,0xd3,0x10,0x52,0x04,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x09,0x12,0x00,
-+	0x00,0x00,0x52,0x04,0x00,0x00,0x11,0x04,0x00,0x00,0x0a,0x00,0x53,0x04,0x0a,0x00,
-+	0x92,0x08,0x11,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,0x54,0x04,0x0b,0xe6,0xd3,0x0c,
-+	0x92,0x08,0x11,0x04,0x0b,0xe6,0x0b,0x00,0x0b,0x00,0x52,0x04,0x0b,0x00,0x11,0x04,
-+	0x11,0x00,0x14,0x00,0xd1,0x60,0xd0,0x22,0xcf,0x86,0x55,0x04,0x0a,0x00,0x94,0x18,
-+	0x53,0x04,0x0a,0x00,0xd2,0x0c,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x00,0x0a,0xdc,
-+	0x11,0x04,0x0a,0xdc,0x0a,0x00,0x0a,0x00,0xcf,0x86,0xd5,0x24,0x54,0x04,0x0a,0x00,
-+	0xd3,0x10,0x92,0x0c,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x00,0x0a,0x09,0x00,0x00,
-+	0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0a,0x00,0x54,0x04,
-+	0x0b,0x00,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,0x00,0x91,0x08,0x10,0x04,0x0b,0x00,
-+	0x00,0x00,0x00,0x00,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,0x0b,0x00,
-+	0x93,0x10,0x92,0x0c,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x0b,0x07,0x0b,0x00,
-+	0x0b,0x00,0xcf,0x86,0xd5,0x34,0xd4,0x20,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,
-+	0x0b,0x09,0x0b,0x00,0x0b,0x00,0x0b,0x00,0x52,0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,
-+	0x10,0x04,0x00,0x00,0x0b,0x00,0x53,0x04,0x0b,0x00,0xd2,0x08,0x11,0x04,0x0b,0x00,
-+	0x00,0x00,0x11,0x04,0x00,0x00,0x0b,0x00,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,
-+	0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0xd2,0xd0,
-+	0xd1,0x50,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x0a,0x00,0x54,0x04,0x0a,0x00,0x93,0x10,
-+	0x52,0x04,0x0a,0x00,0x51,0x04,0x0a,0x00,0x10,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,
-+	0xcf,0x86,0xd5,0x20,0xd4,0x10,0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,0x11,0x04,
-+	0x0a,0x00,0x00,0x00,0x53,0x04,0x0a,0x00,0x92,0x08,0x11,0x04,0x0a,0x00,0x00,0x00,
-+	0x0a,0x00,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,0x12,0x04,0x0b,0x00,0x10,0x00,
-+	0xd0,0x3a,0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,0x0b,0x00,0xd3,0x1c,0xd2,0x0c,
-+	0x91,0x08,0x10,0x04,0x0b,0xe6,0x0b,0x00,0x0b,0xe6,0xd1,0x08,0x10,0x04,0x0b,0xdc,
-+	0x0b,0x00,0x10,0x04,0x0b,0x00,0x0b,0xe6,0xd2,0x0c,0x91,0x08,0x10,0x04,0x0b,0xe6,
-+	0x0b,0x00,0x0b,0x00,0x11,0x04,0x0b,0x00,0x0b,0xe6,0xcf,0x86,0xd5,0x2c,0xd4,0x18,
-+	0x93,0x14,0x92,0x10,0xd1,0x08,0x10,0x04,0x0b,0x00,0x0b,0xe6,0x10,0x04,0x0b,0x00,
-+	0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x00,0x00,0x92,0x0c,0x51,0x04,0x00,0x00,
-+	0x10,0x04,0x00,0x00,0x0b,0x00,0x0b,0x00,0x54,0x04,0x0d,0x00,0x93,0x10,0x52,0x04,
-+	0x0d,0x00,0x51,0x04,0x0d,0x00,0x10,0x04,0x0d,0x09,0x00,0x00,0x00,0x00,0xd1,0x8c,
-+	0xd0,0x72,0xcf,0x86,0xd5,0x4c,0xd4,0x30,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,
-+	0x00,0x00,0x0c,0x00,0x0c,0x00,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,
-+	0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x0c,0x00,0x0c,0x00,0x51,0x04,0x0c,0x00,
-+	0x10,0x04,0x0c,0x00,0x00,0x00,0x93,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,
-+	0x0c,0x00,0x0c,0x00,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,
-+	0x94,0x20,0xd3,0x10,0x52,0x04,0x0c,0x00,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x00,
-+	0x00,0x00,0x52,0x04,0x0c,0x00,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x00,0x00,0x00,
-+	0x10,0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0x94,0x10,0x93,0x0c,0x52,0x04,0x11,0x00,
-+	0x11,0x04,0x10,0x00,0x15,0x00,0x00,0x00,0x11,0x00,0xd0,0x06,0xcf,0x06,0x11,0x00,
-+	0xcf,0x86,0x55,0x04,0x0b,0x00,0xd4,0x14,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,0x00,
-+	0x91,0x08,0x10,0x04,0x0b,0x00,0x0b,0x09,0x00,0x00,0x53,0x04,0x0b,0x00,0x92,0x08,
-+	0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x02,0xff,0xff,0xcf,0x86,0xcf,
-+	0x06,0x02,0xff,0xff,0xd1,0x76,0xd0,0x09,0xcf,0x86,0xcf,0x06,0x02,0xff,0xff,0xcf,
-+	0x86,0x85,0xd4,0x07,0xcf,0x06,0x02,0xff,0xff,0xd3,0x07,0xcf,0x06,0x02,0xff,0xff,
-+	0xd2,0x07,0xcf,0x06,0x02,0xff,0xff,0xd1,0x07,0xcf,0x06,0x02,0xff,0xff,0xd0,0x18,
-+	0xcf,0x86,0x55,0x05,0x02,0xff,0xff,0x94,0x0d,0x93,0x09,0x12,0x05,0x02,0xff,0xff,
-+	0x00,0x00,0x00,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x24,0x94,0x20,0xd3,0x10,0x52,0x04,
-+	0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0x92,0x0c,0x51,0x04,
-+	0x00,0x00,0x10,0x04,0x00,0x00,0x0b,0x00,0x0b,0x00,0x0b,0x00,0x54,0x04,0x0b,0x00,
-+	0x53,0x04,0x0b,0x00,0x12,0x04,0x0b,0x00,0x00,0x00,0xd0,0x08,0xcf,0x86,0xcf,0x06,
-+	0x01,0x00,0xcf,0x86,0xd5,0x06,0xcf,0x06,0x01,0x00,0xe4,0x9c,0x10,0xe3,0x16,0x08,
-+	0xd2,0x06,0xcf,0x06,0x01,0x00,0xe1,0x08,0x04,0xe0,0x04,0x02,0xcf,0x86,0xe5,0x01,
-+	0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0xb1,0x88,
-+	0x00,0x01,0xff,0xe6,0x9b,0xb4,0x00,0x10,0x08,0x01,0xff,0xe8,0xbb,0x8a,0x00,0x01,
-+	0xff,0xe8,0xb3,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xbb,0x91,0x00,0x01,
-+	0xff,0xe4,0xb8,0xb2,0x00,0x10,0x08,0x01,0xff,0xe5,0x8f,0xa5,0x00,0x01,0xff,0xe9,
-+	0xbe,0x9c,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0xbe,0x9c,0x00,0x01,
-+	0xff,0xe5,0xa5,0x91,0x00,0x10,0x08,0x01,0xff,0xe9,0x87,0x91,0x00,0x01,0xff,0xe5,
-+	0x96,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0xa5,0x88,0x00,0x01,0xff,0xe6,
-+	0x87,0xb6,0x00,0x10,0x08,0x01,0xff,0xe7,0x99,0xa9,0x00,0x01,0xff,0xe7,0xbe,0x85,
-+	0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x98,0xbf,0x00,0x01,
-+	0xff,0xe8,0x9e,0xba,0x00,0x10,0x08,0x01,0xff,0xe8,0xa3,0xb8,0x00,0x01,0xff,0xe9,
-+	0x82,0x8f,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xa8,0x82,0x00,0x01,0xff,0xe6,
-+	0xb4,0x9b,0x00,0x10,0x08,0x01,0xff,0xe7,0x83,0x99,0x00,0x01,0xff,0xe7,0x8f,0x9e,
-+	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x90,0xbd,0x00,0x01,0xff,0xe9,
-+	0x85,0xaa,0x00,0x10,0x08,0x01,0xff,0xe9,0xa7,0xb1,0x00,0x01,0xff,0xe4,0xba,0x82,
-+	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0x8d,0xb5,0x00,0x01,0xff,0xe6,0xac,0x84,
-+	0x00,0x10,0x08,0x01,0xff,0xe7,0x88,0x9b,0x00,0x01,0xff,0xe8,0x98,0xad,0x00,0xd4,
-+	0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0xb8,0x9e,0x00,0x01,
-+	0xff,0xe5,0xb5,0x90,0x00,0x10,0x08,0x01,0xff,0xe6,0xbf,0xab,0x00,0x01,0xff,0xe8,
-+	0x97,0x8d,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0xa5,0xa4,0x00,0x01,0xff,0xe6,
-+	0x8b,0x89,0x00,0x10,0x08,0x01,0xff,0xe8,0x87,0x98,0x00,0x01,0xff,0xe8,0xa0,0x9f,
-+	0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0xbb,0x8a,0x00,0x01,0xff,0xe6,
-+	0x9c,0x97,0x00,0x10,0x08,0x01,0xff,0xe6,0xb5,0xaa,0x00,0x01,0xff,0xe7,0x8b,0xbc,
-+	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0x83,0x8e,0x00,0x01,0xff,0xe4,0xbe,0x86,
-+	0x00,0x10,0x08,0x01,0xff,0xe5,0x86,0xb7,0x00,0x01,0xff,0xe5,0x8b,0x9e,0x00,0xd3,
-+	0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0x93,0x84,0x00,0x01,0xff,0xe6,
-+	0xab,0x93,0x00,0x10,0x08,0x01,0xff,0xe7,0x88,0x90,0x00,0x01,0xff,0xe7,0x9b,0xa7,
-+	0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x80,0x81,0x00,0x01,0xff,0xe8,0x98,0x86,
-+	0x00,0x10,0x08,0x01,0xff,0xe8,0x99,0x9c,0x00,0x01,0xff,0xe8,0xb7,0xaf,0x00,0xd2,
-+	0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0x9c,0xb2,0x00,0x01,0xff,0xe9,0xad,0xaf,
-+	0x00,0x10,0x08,0x01,0xff,0xe9,0xb7,0xba,0x00,0x01,0xff,0xe7,0xa2,0x8c,0x00,0xd1,
-+	0x10,0x10,0x08,0x01,0xff,0xe7,0xa5,0xbf,0x00,0x01,0xff,0xe7,0xb6,0xa0,0x00,0x10,
-+	0x08,0x01,0xff,0xe8,0x8f,0x89,0x00,0x01,0xff,0xe9,0x8c,0x84,0x00,0xcf,0x86,0xe5,
-+	0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0xb9,
-+	0xbf,0x00,0x01,0xff,0xe8,0xab,0x96,0x00,0x10,0x08,0x01,0xff,0xe5,0xa3,0x9f,0x00,
-+	0x01,0xff,0xe5,0xbc,0x84,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,0xb1,0xa0,0x00,
-+	0x01,0xff,0xe8,0x81,0xbe,0x00,0x10,0x08,0x01,0xff,0xe7,0x89,0xa2,0x00,0x01,0xff,
-+	0xe7,0xa3,0x8a,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0xb3,0x82,0x00,
-+	0x01,0xff,0xe9,0x9b,0xb7,0x00,0x10,0x08,0x01,0xff,0xe5,0xa3,0x98,0x00,0x01,0xff,
-+	0xe5,0xb1,0xa2,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xa8,0x93,0x00,0x01,0xff,
-+	0xe6,0xb7,0x9a,0x00,0x10,0x08,0x01,0xff,0xe6,0xbc,0x8f,0x00,0x01,0xff,0xe7,0xb4,
-+	0xaf,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,0xb8,0xb7,0x00,
-+	0x01,0xff,0xe9,0x99,0x8b,0x00,0x10,0x08,0x01,0xff,0xe5,0x8b,0x92,0x00,0x01,0xff,
-+	0xe8,0x82,0x8b,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0x87,0x9c,0x00,0x01,0xff,
-+	0xe5,0x87,0x8c,0x00,0x10,0x08,0x01,0xff,0xe7,0xa8,0x9c,0x00,0x01,0xff,0xe7,0xb6,
-+	0xbe,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x8f,0xb1,0x00,0x01,0xff,
-+	0xe9,0x99,0xb5,0x00,0x10,0x08,0x01,0xff,0xe8,0xae,0x80,0x00,0x01,0xff,0xe6,0x8b,
-+	0x8f,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xa8,0x82,0x00,0x01,0xff,0xe8,0xab,
-+	0xbe,0x00,0x10,0x08,0x01,0xff,0xe4,0xb8,0xb9,0x00,0x01,0xff,0xe5,0xaf,0xa7,0x00,
-+	0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0x80,0x92,0x00,
-+	0x01,0xff,0xe7,0x8e,0x87,0x00,0x10,0x08,0x01,0xff,0xe7,0x95,0xb0,0x00,0x01,0xff,
-+	0xe5,0x8c,0x97,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,0xa3,0xbb,0x00,0x01,0xff,
-+	0xe4,0xbe,0xbf,0x00,0x10,0x08,0x01,0xff,0xe5,0xbe,0xa9,0x00,0x01,0xff,0xe4,0xb8,
-+	0x8d,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xb3,0x8c,0x00,0x01,0xff,
-+	0xe6,0x95,0xb8,0x00,0x10,0x08,0x01,0xff,0xe7,0xb4,0xa2,0x00,0x01,0xff,0xe5,0x8f,
-+	0x83,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0xa1,0x9e,0x00,0x01,0xff,0xe7,0x9c,
-+	0x81,0x00,0x10,0x08,0x01,0xff,0xe8,0x91,0x89,0x00,0x01,0xff,0xe8,0xaa,0xaa,0x00,
-+	0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xae,0xba,0x00,0x01,0xff,
-+	0xe8,0xbe,0xb0,0x00,0x10,0x08,0x01,0xff,0xe6,0xb2,0x88,0x00,0x01,0xff,0xe6,0x8b,
-+	0xbe,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x8b,0xa5,0x00,0x01,0xff,0xe6,0x8e,
-+	0xa0,0x00,0x10,0x08,0x01,0xff,0xe7,0x95,0xa5,0x00,0x01,0xff,0xe4,0xba,0xae,0x00,
-+	0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0x85,0xa9,0x00,0x01,0xff,0xe5,0x87,
-+	0x89,0x00,0x10,0x08,0x01,0xff,0xe6,0xa2,0x81,0x00,0x01,0xff,0xe7,0xb3,0xa7,0x00,
-+	0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x89,0xaf,0x00,0x01,0xff,0xe8,0xab,0x92,0x00,
-+	0x10,0x08,0x01,0xff,0xe9,0x87,0x8f,0x00,0x01,0xff,0xe5,0x8b,0xb5,0x00,0xe0,0x04,
-+	0x02,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,
-+	0x01,0xff,0xe5,0x91,0x82,0x00,0x01,0xff,0xe5,0xa5,0xb3,0x00,0x10,0x08,0x01,0xff,
-+	0xe5,0xbb,0xac,0x00,0x01,0xff,0xe6,0x97,0x85,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0xe6,0xbf,0xbe,0x00,0x01,0xff,0xe7,0xa4,0xaa,0x00,0x10,0x08,0x01,0xff,0xe9,0x96,
-+	0xad,0x00,0x01,0xff,0xe9,0xa9,0xaa,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0xe9,0xba,0x97,0x00,0x01,0xff,0xe9,0xbb,0x8e,0x00,0x10,0x08,0x01,0xff,0xe5,0x8a,
-+	0x9b,0x00,0x01,0xff,0xe6,0x9b,0x86,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xad,
-+	0xb7,0x00,0x01,0xff,0xe8,0xbd,0xa2,0x00,0x10,0x08,0x01,0xff,0xe5,0xb9,0xb4,0x00,
-+	0x01,0xff,0xe6,0x86,0x90,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0xe6,0x88,0x80,0x00,0x01,0xff,0xe6,0x92,0x9a,0x00,0x10,0x08,0x01,0xff,0xe6,0xbc,
-+	0xa3,0x00,0x01,0xff,0xe7,0x85,0x89,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,0x92,
-+	0x89,0x00,0x01,0xff,0xe7,0xa7,0x8a,0x00,0x10,0x08,0x01,0xff,0xe7,0xb7,0xb4,0x00,
-+	0x01,0xff,0xe8,0x81,0xaf,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0xbc,
-+	0xa6,0x00,0x01,0xff,0xe8,0x93,0xae,0x00,0x10,0x08,0x01,0xff,0xe9,0x80,0xa3,0x00,
-+	0x01,0xff,0xe9,0x8d,0x8a,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0x88,0x97,0x00,
-+	0x01,0xff,0xe5,0x8a,0xa3,0x00,0x10,0x08,0x01,0xff,0xe5,0x92,0xbd,0x00,0x01,0xff,
-+	0xe7,0x83,0x88,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0xe8,0xa3,0x82,0x00,0x01,0xff,0xe8,0xaa,0xaa,0x00,0x10,0x08,0x01,0xff,0xe5,0xbb,
-+	0x89,0x00,0x01,0xff,0xe5,0xbf,0xb5,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0x8d,
-+	0xbb,0x00,0x01,0xff,0xe6,0xae,0xae,0x00,0x10,0x08,0x01,0xff,0xe7,0xb0,0xbe,0x00,
-+	0x01,0xff,0xe7,0x8d,0xb5,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe4,0xbb,
-+	0xa4,0x00,0x01,0xff,0xe5,0x9b,0xb9,0x00,0x10,0x08,0x01,0xff,0xe5,0xaf,0xa7,0x00,
-+	0x01,0xff,0xe5,0xb6,0xba,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0x80,0x9c,0x00,
-+	0x01,0xff,0xe7,0x8e,0xb2,0x00,0x10,0x08,0x01,0xff,0xe7,0x91,0xa9,0x00,0x01,0xff,
-+	0xe7,0xbe,0x9a,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0x81,
-+	0x86,0x00,0x01,0xff,0xe9,0x88,0xb4,0x00,0x10,0x08,0x01,0xff,0xe9,0x9b,0xb6,0x00,
-+	0x01,0xff,0xe9,0x9d,0x88,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0xa0,0x98,0x00,
-+	0x01,0xff,0xe4,0xbe,0x8b,0x00,0x10,0x08,0x01,0xff,0xe7,0xa6,0xae,0x00,0x01,0xff,
-+	0xe9,0x86,0xb4,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0x9a,0xb8,0x00,
-+	0x01,0xff,0xe6,0x83,0xa1,0x00,0x10,0x08,0x01,0xff,0xe4,0xba,0x86,0x00,0x01,0xff,
-+	0xe5,0x83,0x9a,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0xaf,0xae,0x00,0x01,0xff,
-+	0xe5,0xb0,0xbf,0x00,0x10,0x08,0x01,0xff,0xe6,0x96,0x99,0x00,0x01,0xff,0xe6,0xa8,
-+	0x82,0x00,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,
-+	0x08,0x01,0xff,0xe7,0x87,0x8e,0x00,0x01,0xff,0xe7,0x99,0x82,0x00,0x10,0x08,0x01,
-+	0xff,0xe8,0x93,0xbc,0x00,0x01,0xff,0xe9,0x81,0xbc,0x00,0xd1,0x10,0x10,0x08,0x01,
-+	0xff,0xe9,0xbe,0x8d,0x00,0x01,0xff,0xe6,0x9a,0x88,0x00,0x10,0x08,0x01,0xff,0xe9,
-+	0x98,0xae,0x00,0x01,0xff,0xe5,0x8a,0x89,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
-+	0xff,0xe6,0x9d,0xbb,0x00,0x01,0xff,0xe6,0x9f,0xb3,0x00,0x10,0x08,0x01,0xff,0xe6,
-+	0xb5,0x81,0x00,0x01,0xff,0xe6,0xba,0x9c,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,
-+	0x90,0x89,0x00,0x01,0xff,0xe7,0x95,0x99,0x00,0x10,0x08,0x01,0xff,0xe7,0xa1,0xab,
-+	0x00,0x01,0xff,0xe7,0xb4,0x90,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
-+	0xff,0xe9,0xa1,0x9e,0x00,0x01,0xff,0xe5,0x85,0xad,0x00,0x10,0x08,0x01,0xff,0xe6,
-+	0x88,0xae,0x00,0x01,0xff,0xe9,0x99,0xb8,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,
-+	0x80,0xab,0x00,0x01,0xff,0xe5,0xb4,0x99,0x00,0x10,0x08,0x01,0xff,0xe6,0xb7,0xaa,
-+	0x00,0x01,0xff,0xe8,0xbc,0xaa,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,
-+	0xbe,0x8b,0x00,0x01,0xff,0xe6,0x85,0x84,0x00,0x10,0x08,0x01,0xff,0xe6,0xa0,0x97,
-+	0x00,0x01,0xff,0xe7,0x8e,0x87,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0x9a,0x86,
-+	0x00,0x01,0xff,0xe5,0x88,0xa9,0x00,0x10,0x08,0x01,0xff,0xe5,0x90,0x8f,0x00,0x01,
-+	0xff,0xe5,0xb1,0xa5,0x00,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,
-+	0xff,0xe6,0x98,0x93,0x00,0x01,0xff,0xe6,0x9d,0x8e,0x00,0x10,0x08,0x01,0xff,0xe6,
-+	0xa2,0xa8,0x00,0x01,0xff,0xe6,0xb3,0xa5,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,
-+	0x90,0x86,0x00,0x01,0xff,0xe7,0x97,0xa2,0x00,0x10,0x08,0x01,0xff,0xe7,0xbd,0xb9,
-+	0x00,0x01,0xff,0xe8,0xa3,0x8f,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,
-+	0xa3,0xa1,0x00,0x01,0xff,0xe9,0x87,0x8c,0x00,0x10,0x08,0x01,0xff,0xe9,0x9b,0xa2,
-+	0x00,0x01,0xff,0xe5,0x8c,0xbf,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0xba,0xba,
-+	0x00,0x01,0xff,0xe5,0x90,0x9d,0x00,0x10,0x08,0x01,0xff,0xe7,0x87,0x90,0x00,0x01,
-+	0xff,0xe7,0x92,0x98,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,
-+	0x97,0xba,0x00,0x01,0xff,0xe9,0x9a,0xa3,0x00,0x10,0x08,0x01,0xff,0xe9,0xb1,0x97,
-+	0x00,0x01,0xff,0xe9,0xba,0x9f,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe6,0x9e,0x97,
-+	0x00,0x01,0xff,0xe6,0xb7,0x8b,0x00,0x10,0x08,0x01,0xff,0xe8,0x87,0xa8,0x00,0x01,
-+	0xff,0xe7,0xab,0x8b,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe7,0xac,0xa0,
-+	0x00,0x01,0xff,0xe7,0xb2,0x92,0x00,0x10,0x08,0x01,0xff,0xe7,0x8b,0x80,0x00,0x01,
-+	0xff,0xe7,0x82,0x99,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0xad,0x98,0x00,0x01,
-+	0xff,0xe4,0xbb,0x80,0x00,0x10,0x08,0x01,0xff,0xe8,0x8c,0xb6,0x00,0x01,0xff,0xe5,
-+	0x88,0xba,0x00,0xe2,0xad,0x06,0xe1,0xc4,0x03,0xe0,0xcb,0x01,0xcf,0x86,0xd5,0xe4,
-+	0xd4,0x74,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0x88,0x87,0x00,
-+	0x01,0xff,0xe5,0xba,0xa6,0x00,0x10,0x08,0x01,0xff,0xe6,0x8b,0x93,0x00,0x01,0xff,
-+	0xe7,0xb3,0x96,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe5,0xae,0x85,0x00,0x01,0xff,
-+	0xe6,0xb4,0x9e,0x00,0x10,0x08,0x01,0xff,0xe6,0x9a,0xb4,0x00,0x01,0xff,0xe8,0xbc,
-+	0xbb,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,0xe8,0xa1,0x8c,0x00,0x01,0xff,
-+	0xe9,0x99,0x8d,0x00,0x10,0x08,0x01,0xff,0xe8,0xa6,0x8b,0x00,0x01,0xff,0xe5,0xbb,
-+	0x93,0x00,0x91,0x10,0x10,0x08,0x01,0xff,0xe5,0x85,0x80,0x00,0x01,0xff,0xe5,0x97,
-+	0x80,0x00,0x01,0x00,0xd3,0x34,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x01,0xff,0xe5,0xa1,
-+	0x9a,0x00,0x01,0x00,0x10,0x08,0x01,0xff,0xe6,0x99,0xb4,0x00,0x01,0x00,0xd1,0x0c,
-+	0x10,0x04,0x01,0x00,0x01,0xff,0xe5,0x87,0x9e,0x00,0x10,0x08,0x01,0xff,0xe7,0x8c,
-+	0xaa,0x00,0x01,0xff,0xe7,0x9b,0x8a,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x01,0xff,
-+	0xe7,0xa4,0xbc,0x00,0x01,0xff,0xe7,0xa5,0x9e,0x00,0x10,0x08,0x01,0xff,0xe7,0xa5,
-+	0xa5,0x00,0x01,0xff,0xe7,0xa6,0x8f,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0x9d,
-+	0x96,0x00,0x01,0xff,0xe7,0xb2,0xbe,0x00,0x10,0x08,0x01,0xff,0xe7,0xbe,0xbd,0x00,
-+	0x01,0x00,0xd4,0x64,0xd3,0x30,0xd2,0x18,0xd1,0x0c,0x10,0x08,0x01,0xff,0xe8,0x98,
-+	0x92,0x00,0x01,0x00,0x10,0x08,0x01,0xff,0xe8,0xab,0xb8,0x00,0x01,0x00,0xd1,0x0c,
-+	0x10,0x04,0x01,0x00,0x01,0xff,0xe9,0x80,0xb8,0x00,0x10,0x08,0x01,0xff,0xe9,0x83,
-+	0xbd,0x00,0x01,0x00,0xd2,0x14,0x51,0x04,0x01,0x00,0x10,0x08,0x01,0xff,0xe9,0xa3,
-+	0xaf,0x00,0x01,0xff,0xe9,0xa3,0xbc,0x00,0xd1,0x10,0x10,0x08,0x01,0xff,0xe9,0xa4,
-+	0xa8,0x00,0x01,0xff,0xe9,0xb6,0xb4,0x00,0x10,0x08,0x0d,0xff,0xe9,0x83,0x9e,0x00,
-+	0x0d,0xff,0xe9,0x9a,0xb7,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x06,0xff,
-+	0xe4,0xbe,0xae,0x00,0x06,0xff,0xe5,0x83,0xa7,0x00,0x10,0x08,0x06,0xff,0xe5,0x85,
-+	0x8d,0x00,0x06,0xff,0xe5,0x8b,0x89,0x00,0xd1,0x10,0x10,0x08,0x06,0xff,0xe5,0x8b,
-+	0xa4,0x00,0x06,0xff,0xe5,0x8d,0x91,0x00,0x10,0x08,0x06,0xff,0xe5,0x96,0x9d,0x00,
-+	0x06,0xff,0xe5,0x98,0x86,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x06,0xff,0xe5,0x99,
-+	0xa8,0x00,0x06,0xff,0xe5,0xa1,0x80,0x00,0x10,0x08,0x06,0xff,0xe5,0xa2,0xa8,0x00,
-+	0x06,0xff,0xe5,0xb1,0xa4,0x00,0xd1,0x10,0x10,0x08,0x06,0xff,0xe5,0xb1,0xae,0x00,
-+	0x06,0xff,0xe6,0x82,0x94,0x00,0x10,0x08,0x06,0xff,0xe6,0x85,0xa8,0x00,0x06,0xff,
-+	0xe6,0x86,0x8e,0x00,0xcf,0x86,0xe5,0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,
-+	0x10,0x10,0x08,0x06,0xff,0xe6,0x87,0xb2,0x00,0x06,0xff,0xe6,0x95,0x8f,0x00,0x10,
-+	0x08,0x06,0xff,0xe6,0x97,0xa2,0x00,0x06,0xff,0xe6,0x9a,0x91,0x00,0xd1,0x10,0x10,
-+	0x08,0x06,0xff,0xe6,0xa2,0x85,0x00,0x06,0xff,0xe6,0xb5,0xb7,0x00,0x10,0x08,0x06,
-+	0xff,0xe6,0xb8,0x9a,0x00,0x06,0xff,0xe6,0xbc,0xa2,0x00,0xd2,0x20,0xd1,0x10,0x10,
-+	0x08,0x06,0xff,0xe7,0x85,0xae,0x00,0x06,0xff,0xe7,0x88,0xab,0x00,0x10,0x08,0x06,
-+	0xff,0xe7,0x90,0xa2,0x00,0x06,0xff,0xe7,0xa2,0x91,0x00,0xd1,0x10,0x10,0x08,0x06,
-+	0xff,0xe7,0xa4,0xbe,0x00,0x06,0xff,0xe7,0xa5,0x89,0x00,0x10,0x08,0x06,0xff,0xe7,
-+	0xa5,0x88,0x00,0x06,0xff,0xe7,0xa5,0x90,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,
-+	0x08,0x06,0xff,0xe7,0xa5,0x96,0x00,0x06,0xff,0xe7,0xa5,0x9d,0x00,0x10,0x08,0x06,
-+	0xff,0xe7,0xa6,0x8d,0x00,0x06,0xff,0xe7,0xa6,0x8e,0x00,0xd1,0x10,0x10,0x08,0x06,
-+	0xff,0xe7,0xa9,0x80,0x00,0x06,0xff,0xe7,0xaa,0x81,0x00,0x10,0x08,0x06,0xff,0xe7,
-+	0xaf,0x80,0x00,0x06,0xff,0xe7,0xb7,0xb4,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x06,
-+	0xff,0xe7,0xb8,0x89,0x00,0x06,0xff,0xe7,0xb9,0x81,0x00,0x10,0x08,0x06,0xff,0xe7,
-+	0xbd,0xb2,0x00,0x06,0xff,0xe8,0x80,0x85,0x00,0xd1,0x10,0x10,0x08,0x06,0xff,0xe8,
-+	0x87,0xad,0x00,0x06,0xff,0xe8,0x89,0xb9,0x00,0x10,0x08,0x06,0xff,0xe8,0x89,0xb9,
-+	0x00,0x06,0xff,0xe8,0x91,0x97,0x00,0xd4,0x75,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,
-+	0x08,0x06,0xff,0xe8,0xa4,0x90,0x00,0x06,0xff,0xe8,0xa6,0x96,0x00,0x10,0x08,0x06,
-+	0xff,0xe8,0xac,0x81,0x00,0x06,0xff,0xe8,0xac,0xb9,0x00,0xd1,0x10,0x10,0x08,0x06,
-+	0xff,0xe8,0xb3,0x93,0x00,0x06,0xff,0xe8,0xb4,0x88,0x00,0x10,0x08,0x06,0xff,0xe8,
-+	0xbe,0xb6,0x00,0x06,0xff,0xe9,0x80,0xb8,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x06,
-+	0xff,0xe9,0x9b,0xa3,0x00,0x06,0xff,0xe9,0x9f,0xbf,0x00,0x10,0x08,0x06,0xff,0xe9,
-+	0xa0,0xbb,0x00,0x0b,0xff,0xe6,0x81,0xb5,0x00,0x91,0x11,0x10,0x09,0x0b,0xff,0xf0,
-+	0xa4,0x8b,0xae,0x00,0x0b,0xff,0xe8,0x88,0x98,0x00,0x00,0x00,0xd3,0x40,0xd2,0x20,
-+	0xd1,0x10,0x10,0x08,0x08,0xff,0xe4,0xb8,0xa6,0x00,0x08,0xff,0xe5,0x86,0xb5,0x00,
-+	0x10,0x08,0x08,0xff,0xe5,0x85,0xa8,0x00,0x08,0xff,0xe4,0xbe,0x80,0x00,0xd1,0x10,
-+	0x10,0x08,0x08,0xff,0xe5,0x85,0x85,0x00,0x08,0xff,0xe5,0x86,0x80,0x00,0x10,0x08,
-+	0x08,0xff,0xe5,0x8b,0x87,0x00,0x08,0xff,0xe5,0x8b,0xba,0x00,0xd2,0x20,0xd1,0x10,
-+	0x10,0x08,0x08,0xff,0xe5,0x96,0x9d,0x00,0x08,0xff,0xe5,0x95,0x95,0x00,0x10,0x08,
-+	0x08,0xff,0xe5,0x96,0x99,0x00,0x08,0xff,0xe5,0x97,0xa2,0x00,0xd1,0x10,0x10,0x08,
-+	0x08,0xff,0xe5,0xa1,0x9a,0x00,0x08,0xff,0xe5,0xa2,0xb3,0x00,0x10,0x08,0x08,0xff,
-+	0xe5,0xa5,0x84,0x00,0x08,0xff,0xe5,0xa5,0x94,0x00,0xe0,0x04,0x02,0xcf,0x86,0xe5,
-+	0x01,0x01,0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe5,0xa9,
-+	0xa2,0x00,0x08,0xff,0xe5,0xac,0xa8,0x00,0x10,0x08,0x08,0xff,0xe5,0xbb,0x92,0x00,
-+	0x08,0xff,0xe5,0xbb,0x99,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe5,0xbd,0xa9,0x00,
-+	0x08,0xff,0xe5,0xbe,0xad,0x00,0x10,0x08,0x08,0xff,0xe6,0x83,0x98,0x00,0x08,0xff,
-+	0xe6,0x85,0x8e,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe6,0x84,0x88,0x00,
-+	0x08,0xff,0xe6,0x86,0x8e,0x00,0x10,0x08,0x08,0xff,0xe6,0x85,0xa0,0x00,0x08,0xff,
-+	0xe6,0x87,0xb2,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe6,0x88,0xb4,0x00,0x08,0xff,
-+	0xe6,0x8f,0x84,0x00,0x10,0x08,0x08,0xff,0xe6,0x90,0x9c,0x00,0x08,0xff,0xe6,0x91,
-+	0x92,0x00,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe6,0x95,0x96,0x00,
-+	0x08,0xff,0xe6,0x99,0xb4,0x00,0x10,0x08,0x08,0xff,0xe6,0x9c,0x97,0x00,0x08,0xff,
-+	0xe6,0x9c,0x9b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe6,0x9d,0x96,0x00,0x08,0xff,
-+	0xe6,0xad,0xb9,0x00,0x10,0x08,0x08,0xff,0xe6,0xae,0xba,0x00,0x08,0xff,0xe6,0xb5,
-+	0x81,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe6,0xbb,0x9b,0x00,0x08,0xff,
-+	0xe6,0xbb,0x8b,0x00,0x10,0x08,0x08,0xff,0xe6,0xbc,0xa2,0x00,0x08,0xff,0xe7,0x80,
-+	0x9e,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe7,0x85,0xae,0x00,0x08,0xff,0xe7,0x9e,
-+	0xa7,0x00,0x10,0x08,0x08,0xff,0xe7,0x88,0xb5,0x00,0x08,0xff,0xe7,0x8a,0xaf,0x00,
-+	0xd4,0x80,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe7,0x8c,0xaa,0x00,
-+	0x08,0xff,0xe7,0x91,0xb1,0x00,0x10,0x08,0x08,0xff,0xe7,0x94,0x86,0x00,0x08,0xff,
-+	0xe7,0x94,0xbb,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe7,0x98,0x9d,0x00,0x08,0xff,
-+	0xe7,0x98,0x9f,0x00,0x10,0x08,0x08,0xff,0xe7,0x9b,0x8a,0x00,0x08,0xff,0xe7,0x9b,
-+	0x9b,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe7,0x9b,0xb4,0x00,0x08,0xff,
-+	0xe7,0x9d,0x8a,0x00,0x10,0x08,0x08,0xff,0xe7,0x9d,0x80,0x00,0x08,0xff,0xe7,0xa3,
-+	0x8c,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe7,0xaa,0xb1,0x00,0x08,0xff,0xe7,0xaf,
-+	0x80,0x00,0x10,0x08,0x08,0xff,0xe7,0xb1,0xbb,0x00,0x08,0xff,0xe7,0xb5,0x9b,0x00,
-+	0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe7,0xb7,0xb4,0x00,0x08,0xff,
-+	0xe7,0xbc,0xbe,0x00,0x10,0x08,0x08,0xff,0xe8,0x80,0x85,0x00,0x08,0xff,0xe8,0x8d,
-+	0x92,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe8,0x8f,0xaf,0x00,0x08,0xff,0xe8,0x9d,
-+	0xb9,0x00,0x10,0x08,0x08,0xff,0xe8,0xa5,0x81,0x00,0x08,0xff,0xe8,0xa6,0x86,0x00,
-+	0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe8,0xa6,0x96,0x00,0x08,0xff,0xe8,0xaa,
-+	0xbf,0x00,0x10,0x08,0x08,0xff,0xe8,0xab,0xb8,0x00,0x08,0xff,0xe8,0xab,0x8b,0x00,
-+	0xd1,0x10,0x10,0x08,0x08,0xff,0xe8,0xac,0x81,0x00,0x08,0xff,0xe8,0xab,0xbe,0x00,
-+	0x10,0x08,0x08,0xff,0xe8,0xab,0xad,0x00,0x08,0xff,0xe8,0xac,0xb9,0x00,0xcf,0x86,
-+	0x95,0xde,0xd4,0x81,0xd3,0x40,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe8,0xae,
-+	0x8a,0x00,0x08,0xff,0xe8,0xb4,0x88,0x00,0x10,0x08,0x08,0xff,0xe8,0xbc,0xb8,0x00,
-+	0x08,0xff,0xe9,0x81,0xb2,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe9,0x86,0x99,0x00,
-+	0x08,0xff,0xe9,0x89,0xb6,0x00,0x10,0x08,0x08,0xff,0xe9,0x99,0xbc,0x00,0x08,0xff,
-+	0xe9,0x9b,0xa3,0x00,0xd2,0x20,0xd1,0x10,0x10,0x08,0x08,0xff,0xe9,0x9d,0x96,0x00,
-+	0x08,0xff,0xe9,0x9f,0x9b,0x00,0x10,0x08,0x08,0xff,0xe9,0x9f,0xbf,0x00,0x08,0xff,
-+	0xe9,0xa0,0x8b,0x00,0xd1,0x10,0x10,0x08,0x08,0xff,0xe9,0xa0,0xbb,0x00,0x08,0xff,
-+	0xe9,0xac,0x92,0x00,0x10,0x08,0x08,0xff,0xe9,0xbe,0x9c,0x00,0x08,0xff,0xf0,0xa2,
-+	0xa1,0x8a,0x00,0xd3,0x45,0xd2,0x22,0xd1,0x12,0x10,0x09,0x08,0xff,0xf0,0xa2,0xa1,
-+	0x84,0x00,0x08,0xff,0xf0,0xa3,0x8f,0x95,0x00,0x10,0x08,0x08,0xff,0xe3,0xae,0x9d,
-+	0x00,0x08,0xff,0xe4,0x80,0x98,0x00,0xd1,0x11,0x10,0x08,0x08,0xff,0xe4,0x80,0xb9,
-+	0x00,0x08,0xff,0xf0,0xa5,0x89,0x89,0x00,0x10,0x09,0x08,0xff,0xf0,0xa5,0xb3,0x90,
-+	0x00,0x08,0xff,0xf0,0xa7,0xbb,0x93,0x00,0x92,0x14,0x91,0x10,0x10,0x08,0x08,0xff,
-+	0xe9,0xbd,0x83,0x00,0x08,0xff,0xe9,0xbe,0x8e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-+	0xe1,0x94,0x01,0xe0,0x08,0x01,0xcf,0x86,0xd5,0x42,0xd4,0x14,0x93,0x10,0x52,0x04,
-+	0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0xd3,0x10,
-+	0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x52,0x04,
-+	0x00,0x00,0xd1,0x0d,0x10,0x04,0x00,0x00,0x04,0xff,0xd7,0x99,0xd6,0xb4,0x00,0x10,
-+	0x04,0x01,0x1a,0x01,0xff,0xd7,0xb2,0xd6,0xb7,0x00,0xd4,0x42,0x53,0x04,0x01,0x00,
-+	0xd2,0x16,0x51,0x04,0x01,0x00,0x10,0x09,0x01,0xff,0xd7,0xa9,0xd7,0x81,0x00,0x01,
-+	0xff,0xd7,0xa9,0xd7,0x82,0x00,0xd1,0x16,0x10,0x0b,0x01,0xff,0xd7,0xa9,0xd6,0xbc,
-+	0xd7,0x81,0x00,0x01,0xff,0xd7,0xa9,0xd6,0xbc,0xd7,0x82,0x00,0x10,0x09,0x01,0xff,
-+	0xd7,0x90,0xd6,0xb7,0x00,0x01,0xff,0xd7,0x90,0xd6,0xb8,0x00,0xd3,0x43,0xd2,0x24,
-+	0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0x90,0xd6,0xbc,0x00,0x01,0xff,0xd7,0x91,0xd6,
-+	0xbc,0x00,0x10,0x09,0x01,0xff,0xd7,0x92,0xd6,0xbc,0x00,0x01,0xff,0xd7,0x93,0xd6,
-+	0xbc,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0x94,0xd6,0xbc,0x00,0x01,0xff,0xd7,
-+	0x95,0xd6,0xbc,0x00,0x10,0x09,0x01,0xff,0xd7,0x96,0xd6,0xbc,0x00,0x00,0x00,0xd2,
-+	0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0x98,0xd6,0xbc,0x00,0x01,0xff,0xd7,0x99,
-+	0xd6,0xbc,0x00,0x10,0x09,0x01,0xff,0xd7,0x9a,0xd6,0xbc,0x00,0x01,0xff,0xd7,0x9b,
-+	0xd6,0xbc,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xd7,0x9c,0xd6,0xbc,0x00,0x00,0x00,
-+	0x10,0x09,0x01,0xff,0xd7,0x9e,0xd6,0xbc,0x00,0x00,0x00,0xcf,0x86,0x95,0x85,0x94,
-+	0x81,0xd3,0x3e,0xd2,0x1f,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0xa0,0xd6,0xbc,0x00,
-+	0x01,0xff,0xd7,0xa1,0xd6,0xbc,0x00,0x10,0x04,0x00,0x00,0x01,0xff,0xd7,0xa3,0xd6,
-+	0xbc,0x00,0xd1,0x0d,0x10,0x09,0x01,0xff,0xd7,0xa4,0xd6,0xbc,0x00,0x00,0x00,0x10,
-+	0x09,0x01,0xff,0xd7,0xa6,0xd6,0xbc,0x00,0x01,0xff,0xd7,0xa7,0xd6,0xbc,0x00,0xd2,
-+	0x24,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0xa8,0xd6,0xbc,0x00,0x01,0xff,0xd7,0xa9,
-+	0xd6,0xbc,0x00,0x10,0x09,0x01,0xff,0xd7,0xaa,0xd6,0xbc,0x00,0x01,0xff,0xd7,0x95,
-+	0xd6,0xb9,0x00,0xd1,0x12,0x10,0x09,0x01,0xff,0xd7,0x91,0xd6,0xbf,0x00,0x01,0xff,
-+	0xd7,0x9b,0xd6,0xbf,0x00,0x10,0x09,0x01,0xff,0xd7,0xa4,0xd6,0xbf,0x00,0x01,0x00,
-+	0x01,0x00,0x01,0x00,0xd0,0x1a,0xcf,0x86,0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,
-+	0x93,0x0c,0x92,0x08,0x11,0x04,0x01,0x00,0x0c,0x00,0x0c,0x00,0x0c,0x00,0xcf,0x86,
-+	0x95,0x24,0xd4,0x10,0x93,0x0c,0x92,0x08,0x11,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,
-+	0x00,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,
-+	0x01,0x00,0x01,0x00,0x01,0x00,0xd3,0x5a,0xd2,0x06,0xcf,0x06,0x01,0x00,0xd1,0x14,
-+	0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0x95,0x08,0x14,0x04,0x00,0x00,0x01,0x00,
-+	0x01,0x00,0xd0,0x1a,0xcf,0x86,0x95,0x14,0x54,0x04,0x01,0x00,0x93,0x0c,0x92,0x08,
-+	0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x0c,
-+	0x94,0x08,0x13,0x04,0x01,0x00,0x00,0x00,0x05,0x00,0x54,0x04,0x05,0x00,0x53,0x04,
-+	0x01,0x00,0x52,0x04,0x01,0x00,0x91,0x08,0x10,0x04,0x06,0x00,0x07,0x00,0x00,0x00,
-+	0xd2,0xcc,0xd1,0xa4,0xd0,0x36,0xcf,0x86,0xd5,0x14,0x54,0x04,0x06,0x00,0x53,0x04,
-+	0x08,0x00,0x92,0x08,0x11,0x04,0x08,0x00,0x00,0x00,0x00,0x00,0x94,0x1c,0xd3,0x10,
-+	0x52,0x04,0x01,0xe6,0x51,0x04,0x0a,0xe6,0x10,0x04,0x0a,0xe6,0x10,0xdc,0x52,0x04,
-+	0x10,0xdc,0x11,0x04,0x10,0xdc,0x11,0xe6,0x01,0x00,0xcf,0x86,0xd5,0x38,0xd4,0x24,
-+	0xd3,0x14,0x52,0x04,0x01,0x00,0xd1,0x08,0x10,0x04,0x01,0x00,0x06,0x00,0x10,0x04,
-+	0x06,0x00,0x07,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x07,0x00,0x01,0x00,0x01,0x00,
-+	0x01,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,
-+	0x01,0x00,0x01,0x00,0xd4,0x18,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,
-+	0x10,0x04,0x01,0x00,0x00,0x00,0x12,0x04,0x01,0x00,0x00,0x00,0x93,0x18,0xd2,0x0c,
-+	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x06,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
-+	0x00,0x00,0x01,0x00,0x01,0x00,0xd0,0x06,0xcf,0x06,0x01,0x00,0xcf,0x86,0x55,0x04,
-+	0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0xd1,0x08,
-+	0x10,0x04,0x01,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x01,0x00,0xd1,0x50,0xd0,0x1e,
-+	0xcf,0x86,0x95,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,
-+	0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xcf,0x86,0xd5,0x18,
-+	0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,
-+	0x10,0x04,0x01,0x00,0x06,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,
-+	0x06,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xd0,0x1e,0xcf,0x86,
-+	0x55,0x04,0x01,0x00,0x54,0x04,0x01,0x00,0x53,0x04,0x01,0x00,0x52,0x04,0x01,0x00,
-+	0x51,0x04,0x01,0x00,0x10,0x04,0x01,0x00,0x00,0x00,0xcf,0x86,0xd5,0x38,0xd4,0x18,
-+	0xd3,0x0c,0x92,0x08,0x11,0x04,0x00,0x00,0x01,0x00,0x01,0x00,0x92,0x08,0x11,0x04,
-+	0x00,0x00,0x01,0x00,0x01,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,0x00,0x00,0x01,0x00,
-+	0x01,0x00,0xd2,0x08,0x11,0x04,0x00,0x00,0x01,0x00,0x91,0x08,0x10,0x04,0x01,0x00,
-+	0x00,0x00,0x00,0x00,0xd4,0x20,0xd3,0x10,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,
-+	0x10,0x04,0x01,0x00,0x00,0x00,0x52,0x04,0x01,0x00,0x51,0x04,0x01,0x00,0x10,0x04,
-+	0x01,0x00,0x00,0x00,0x53,0x04,0x00,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,
-+	0x04,0x00,0x04,0x00,0x91,0x08,0x10,0x04,0x03,0x00,0x01,0x00,0x01,0x00,0x83,0xe2,
-+	0x30,0x3e,0xe1,0x1a,0x3b,0xe0,0x97,0x39,0xcf,0x86,0xe5,0x3b,0x26,0xc4,0xe3,0x16,
-+	0x14,0xe2,0xef,0x11,0xe1,0xd0,0x10,0xe0,0x60,0x07,0xcf,0x86,0xe5,0x53,0x03,0xe4,
-+	0x4c,0x02,0xe3,0x3d,0x01,0xd2,0x94,0xd1,0x70,0xd0,0x4a,0xcf,0x86,0xd5,0x18,0x94,
-+	0x14,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x07,
-+	0x00,0x07,0x00,0x07,0x00,0xd4,0x14,0x93,0x10,0x52,0x04,0x07,0x00,0x51,0x04,0x07,
-+	0x00,0x10,0x04,0x07,0x00,0x00,0x00,0x07,0x00,0x53,0x04,0x07,0x00,0xd2,0x0c,0x51,
-+	0x04,0x07,0x00,0x10,0x04,0x07,0x00,0x00,0x00,0x51,0x04,0x07,0x00,0x10,0x04,0x00,
-+	0x00,0x07,0x00,0xcf,0x86,0x95,0x20,0xd4,0x10,0x53,0x04,0x07,0x00,0x52,0x04,0x07,
-+	0x00,0x11,0x04,0x07,0x00,0x00,0x00,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,0x11,
-+	0x04,0x07,0x00,0x00,0x00,0x00,0x00,0xd0,0x06,0xcf,0x06,0x07,0x00,0xcf,0x86,0x55,
-+	0x04,0x07,0x00,0x54,0x04,0x07,0x00,0x53,0x04,0x07,0x00,0x92,0x0c,0x51,0x04,0x07,
-+	0x00,0x10,0x04,0x07,0x00,0x00,0x00,0x00,0x00,0xd1,0x40,0xd0,0x3a,0xcf,0x86,0xd5,
-+	0x20,0x94,0x1c,0x93,0x18,0xd2,0x0c,0x51,0x04,0x07,0x00,0x10,0x04,0x07,0x00,0x00,
-+	0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x07,0x00,0x07,0x00,0x07,0x00,0x54,
-+	0x04,0x07,0x00,0x93,0x10,0x52,0x04,0x07,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,
-+	0x00,0x07,0x00,0x07,0x00,0xcf,0x06,0x08,0x00,0xd0,0x46,0xcf,0x86,0xd5,0x2c,0xd4,
-+	0x20,0x53,0x04,0x08,0x00,0xd2,0x0c,0x51,0x04,0x08,0x00,0x10,0x04,0x08,0x00,0x10,
-+	0x00,0xd1,0x08,0x10,0x04,0x10,0x00,0x12,0x00,0x10,0x04,0x12,0x00,0x00,0x00,0x53,
-+	0x04,0x0a,0x00,0x12,0x04,0x0a,0x00,0x00,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,
-+	0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,
-+	0x86,0xd5,0x08,0x14,0x04,0x00,0x00,0x0a,0x00,0x54,0x04,0x0a,0x00,0x53,0x04,0x0a,
-+	0x00,0x52,0x04,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x0a,0xdc,0x00,0x00,0xd2,
-+	0x5e,0xd1,0x06,0xcf,0x06,0x00,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x0a,
-+	0x00,0x53,0x04,0x0a,0x00,0x52,0x04,0x0a,0x00,0x91,0x08,0x10,0x04,0x0a,0x00,0x00,
-+	0x00,0x00,0x00,0x0a,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,0x0a,0x00,0x93,0x10,0x92,
-+	0x0c,0x91,0x08,0x10,0x04,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd4,
-+	0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x10,0xdc,0x10,0x00,0x10,0x00,0x10,
-+	0x00,0x10,0x00,0x53,0x04,0x10,0x00,0x12,0x04,0x10,0x00,0x00,0x00,0xd1,0x70,0xd0,
-+	0x36,0xcf,0x86,0xd5,0x18,0x54,0x04,0x05,0x00,0x53,0x04,0x05,0x00,0x52,0x04,0x05,
-+	0x00,0x51,0x04,0x05,0x00,0x10,0x04,0x05,0x00,0x10,0x00,0x94,0x18,0xd3,0x08,0x12,
-+	0x04,0x05,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x13,
-+	0x00,0x13,0x00,0x05,0x00,0xcf,0x86,0xd5,0x18,0x94,0x14,0x53,0x04,0x05,0x00,0x92,
-+	0x0c,0x51,0x04,0x05,0x00,0x10,0x04,0x05,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x54,
-+	0x04,0x10,0x00,0xd3,0x0c,0x52,0x04,0x10,0x00,0x11,0x04,0x10,0x00,0x10,0xe6,0x92,
-+	0x0c,0x51,0x04,0x10,0xe6,0x10,0x04,0x10,0xe6,0x00,0x00,0x00,0x00,0xd0,0x1e,0xcf,
-+	0x86,0x95,0x18,0x54,0x04,0x07,0x00,0x53,0x04,0x07,0x00,0x52,0x04,0x07,0x00,0x51,
-+	0x04,0x07,0x00,0x10,0x04,0x00,0x00,0x07,0x00,0x08,0x00,0xcf,0x86,0x95,0x1c,0xd4,
-+	0x0c,0x93,0x08,0x12,0x04,0x08,0x00,0x00,0x00,0x08,0x00,0x93,0x0c,0x52,0x04,0x08,
-+	0x00,0x11,0x04,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd3,0xba,0xd2,0x80,0xd1,
-+	0x34,0xd0,0x1a,0xcf,0x86,0x55,0x04,0x05,0x00,0x94,0x10,0x93,0x0c,0x52,0x04,0x05,
-+	0x00,0x11,0x04,0x05,0x00,0x07,0x00,0x05,0x00,0x05,0x00,0xcf,0x86,0x95,0x14,0x94,
-+	0x10,0x53,0x04,0x05,0x00,0x52,0x04,0x05,0x00,0x11,0x04,0x05,0x00,0x07,0x00,0x07,
-+	0x00,0x07,0x00,0xd0,0x2a,0xcf,0x86,0xd5,0x14,0x54,0x04,0x07,0x00,0x53,0x04,0x07,
-+	0x00,0x52,0x04,0x07,0x00,0x11,0x04,0x07,0x00,0x00,0x00,0x94,0x10,0x53,0x04,0x07,
-+	0x00,0x92,0x08,0x11,0x04,0x07,0x00,0x00,0x00,0x00,0x00,0x12,0x00,0xcf,0x86,0xd5,
-+	0x10,0x54,0x04,0x12,0x00,0x93,0x08,0x12,0x04,0x12,0x00,0x00,0x00,0x12,0x00,0x54,
-+	0x04,0x12,0x00,0x53,0x04,0x12,0x00,0x12,0x04,0x12,0x00,0x00,0x00,0xd1,0x34,0xd0,
-+	0x12,0xcf,0x86,0x55,0x04,0x10,0x00,0x94,0x08,0x13,0x04,0x10,0x00,0x00,0x00,0x10,
-+	0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0x94,0x18,0xd3,0x08,0x12,0x04,0x10,0x00,0x00,
-+	0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x00,
-+	0x00,0xcf,0x06,0x00,0x00,0xd2,0x06,0xcf,0x06,0x10,0x00,0xd1,0x40,0xd0,0x1e,0xcf,
-+	0x86,0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,0x93,0x10,0x52,0x04,0x10,0x00,0x51,
-+	0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x14,0x54,
-+	0x04,0x10,0x00,0x93,0x0c,0x52,0x04,0x10,0x00,0x11,0x04,0x10,0x00,0x00,0x00,0x00,
-+	0x00,0x94,0x08,0x13,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xe4,
-+	0xce,0x02,0xe3,0x45,0x01,0xd2,0xd0,0xd1,0x70,0xd0,0x52,0xcf,0x86,0xd5,0x20,0x94,
-+	0x1c,0xd3,0x0c,0x52,0x04,0x07,0x00,0x11,0x04,0x07,0x00,0x00,0x00,0x92,0x0c,0x91,
-+	0x08,0x10,0x04,0x07,0x00,0x00,0x00,0x07,0x00,0x07,0x00,0x07,0x00,0x54,0x04,0x07,
-+	0x00,0xd3,0x10,0x52,0x04,0x07,0x00,0x51,0x04,0x07,0x00,0x10,0x04,0x00,0x00,0x07,
-+	0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x07,0x00,0x00,0x00,0x00,0x00,0xd1,0x08,0x10,
-+	0x04,0x07,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x07,0x00,0xcf,0x86,0x95,0x18,0x54,
-+	0x04,0x0b,0x00,0x93,0x10,0x52,0x04,0x0b,0x00,0x51,0x04,0x0b,0x00,0x10,0x04,0x00,
-+	0x00,0x0b,0x00,0x0b,0x00,0x10,0x00,0xd0,0x32,0xcf,0x86,0xd5,0x18,0x54,0x04,0x10,
-+	0x00,0x53,0x04,0x10,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,
-+	0x00,0x00,0x00,0x94,0x14,0x93,0x10,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,
-+	0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,
-+	0x04,0x11,0x00,0xd3,0x14,0xd2,0x0c,0x51,0x04,0x11,0x00,0x10,0x04,0x11,0x00,0x00,
-+	0x00,0x11,0x04,0x11,0x00,0x00,0x00,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,
-+	0x00,0x11,0x00,0x11,0x00,0xd1,0x40,0xd0,0x3a,0xcf,0x86,0xd5,0x1c,0x54,0x04,0x09,
-+	0x00,0x53,0x04,0x09,0x00,0xd2,0x08,0x11,0x04,0x09,0x00,0x0b,0x00,0x51,0x04,0x00,
-+	0x00,0x10,0x04,0x00,0x00,0x09,0x00,0x54,0x04,0x0a,0x00,0x53,0x04,0x0a,0x00,0xd2,
-+	0x08,0x11,0x04,0x0a,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0a,
-+	0x00,0xcf,0x06,0x00,0x00,0xd0,0x1a,0xcf,0x86,0x55,0x04,0x0d,0x00,0x54,0x04,0x0d,
-+	0x00,0x53,0x04,0x0d,0x00,0x52,0x04,0x00,0x00,0x11,0x04,0x11,0x00,0x0d,0x00,0xcf,
-+	0x86,0x95,0x14,0x54,0x04,0x11,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x00,0x00,0x11,
-+	0x00,0x11,0x00,0x11,0x00,0x11,0x00,0xd2,0xec,0xd1,0xa4,0xd0,0x76,0xcf,0x86,0xd5,
-+	0x48,0xd4,0x28,0xd3,0x14,0x52,0x04,0x08,0x00,0xd1,0x08,0x10,0x04,0x00,0x00,0x08,
-+	0x00,0x10,0x04,0x08,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0xd1,0x08,0x10,0x04,0x08,
-+	0x00,0x08,0xdc,0x10,0x04,0x08,0x00,0x08,0xe6,0xd3,0x10,0x52,0x04,0x08,0x00,0x91,
-+	0x08,0x10,0x04,0x00,0x00,0x08,0x00,0x08,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,
-+	0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x54,0x04,0x08,0x00,0xd3,0x0c,0x52,0x04,0x08,
-+	0x00,0x11,0x04,0x14,0x00,0x00,0x00,0xd2,0x10,0xd1,0x08,0x10,0x04,0x08,0xe6,0x08,
-+	0x01,0x10,0x04,0x08,0xdc,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x08,
-+	0x09,0xcf,0x86,0x95,0x28,0xd4,0x14,0x53,0x04,0x08,0x00,0x92,0x0c,0x91,0x08,0x10,
-+	0x04,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x08,0x00,0x92,0x0c,0x91,
-+	0x08,0x10,0x04,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0b,0x00,0xd0,0x0a,0xcf,
-+	0x86,0x15,0x04,0x10,0x00,0x00,0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0xd4,0x24,0xd3,
-+	0x14,0x52,0x04,0x10,0x00,0xd1,0x08,0x10,0x04,0x10,0x00,0x10,0xe6,0x10,0x04,0x10,
-+	0xdc,0x00,0x00,0x92,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x10,
-+	0x00,0x93,0x10,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,
-+	0x00,0x00,0x00,0xd1,0x54,0xd0,0x26,0xcf,0x86,0x55,0x04,0x0b,0x00,0x54,0x04,0x0b,
-+	0x00,0xd3,0x0c,0x52,0x04,0x0b,0x00,0x11,0x04,0x0b,0x00,0x00,0x00,0x92,0x0c,0x91,
-+	0x08,0x10,0x04,0x00,0x00,0x0b,0x00,0x0b,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x14,0x54,
-+	0x04,0x0b,0x00,0x93,0x0c,0x52,0x04,0x0b,0x00,0x11,0x04,0x0b,0x00,0x00,0x00,0x0b,
-+	0x00,0x54,0x04,0x0b,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,
-+	0x00,0x00,0x00,0x00,0x00,0x0b,0x00,0xd0,0x42,0xcf,0x86,0xd5,0x28,0x54,0x04,0x10,
-+	0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xd2,0x0c,0x91,
-+	0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x91,0x08,0x10,0x04,0x10,0x00,0x00,
-+	0x00,0x00,0x00,0x94,0x14,0x53,0x04,0x00,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,
-+	0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd3,0x96,0xd2,
-+	0x68,0xd1,0x24,0xd0,0x06,0xcf,0x06,0x0b,0x00,0xcf,0x86,0x95,0x18,0x94,0x14,0x53,
-+	0x04,0x0b,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,
-+	0x00,0x00,0x00,0x00,0x00,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x11,0x00,0x54,0x04,0x11,
-+	0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x11,0x00,0x10,0x04,0x11,0x00,0x00,0x00,0x00,
-+	0x00,0x00,0x00,0xcf,0x86,0x55,0x04,0x11,0x00,0x54,0x04,0x11,0x00,0xd3,0x10,0x92,
-+	0x0c,0x51,0x04,0x11,0x00,0x10,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0x92,0x08,0x11,
-+	0x04,0x00,0x00,0x11,0x00,0x11,0x00,0xd1,0x28,0xd0,0x22,0xcf,0x86,0x55,0x04,0x14,
-+	0x00,0xd4,0x0c,0x93,0x08,0x12,0x04,0x14,0x00,0x14,0xe6,0x00,0x00,0x53,0x04,0x14,
-+	0x00,0x92,0x08,0x11,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,
-+	0x06,0x00,0x00,0xd2,0x2a,0xd1,0x24,0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x86,0x55,
-+	0x04,0x00,0x00,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,0x00,0x51,
-+	0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd1,0x58,0xd0,
-+	0x12,0xcf,0x86,0x55,0x04,0x14,0x00,0x94,0x08,0x13,0x04,0x14,0x00,0x00,0x00,0x14,
-+	0x00,0xcf,0x86,0x95,0x40,0xd4,0x24,0xd3,0x0c,0x52,0x04,0x14,0x00,0x11,0x04,0x14,
-+	0x00,0x14,0xdc,0xd2,0x0c,0x51,0x04,0x14,0xe6,0x10,0x04,0x14,0xe6,0x14,0xdc,0x91,
-+	0x08,0x10,0x04,0x14,0xe6,0x14,0xdc,0x14,0xdc,0xd3,0x10,0x92,0x0c,0x91,0x08,0x10,
-+	0x04,0x14,0xdc,0x14,0x00,0x14,0x00,0x14,0x00,0x92,0x08,0x11,0x04,0x14,0x00,0x00,
-+	0x00,0x00,0x00,0x00,0x00,0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x86,0x55,0x04,0x00,
-+	0x00,0x54,0x04,0x15,0x00,0x93,0x10,0x52,0x04,0x15,0x00,0x51,0x04,0x15,0x00,0x10,
-+	0x04,0x15,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xe5,0x0f,0x06,0xe4,0xf8,0x03,0xe3,
-+	0x02,0x02,0xd2,0xfb,0xd1,0x4c,0xd0,0x06,0xcf,0x06,0x0c,0x00,0xcf,0x86,0xd5,0x2c,
-+	0xd4,0x1c,0xd3,0x10,0x52,0x04,0x0c,0x00,0x51,0x04,0x0c,0x00,0x10,0x04,0x0c,0x09,
-+	0x0c,0x00,0x52,0x04,0x0c,0x00,0x11,0x04,0x0c,0x00,0x00,0x00,0x93,0x0c,0x92,0x08,
-+	0x11,0x04,0x00,0x00,0x0c,0x00,0x0c,0x00,0x0c,0x00,0x54,0x04,0x0c,0x00,0x53,0x04,
-+	0x00,0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x09,
-+	0xd0,0x69,0xcf,0x86,0xd5,0x32,0x54,0x04,0x0b,0x00,0x53,0x04,0x0b,0x00,0xd2,0x15,
-+	0x51,0x04,0x0b,0x00,0x10,0x0d,0x0b,0xff,0xf0,0x91,0x82,0x99,0xf0,0x91,0x82,0xba,
-+	0x00,0x0b,0x00,0x91,0x11,0x10,0x0d,0x0b,0xff,0xf0,0x91,0x82,0x9b,0xf0,0x91,0x82,
-+	0xba,0x00,0x0b,0x00,0x0b,0x00,0xd4,0x1d,0x53,0x04,0x0b,0x00,0x92,0x15,0x51,0x04,
-+	0x0b,0x00,0x10,0x04,0x0b,0x00,0x0b,0xff,0xf0,0x91,0x82,0xa5,0xf0,0x91,0x82,0xba,
-+	0x00,0x0b,0x00,0x53,0x04,0x0b,0x00,0x92,0x10,0xd1,0x08,0x10,0x04,0x0b,0x00,0x0b,
-+	0x09,0x10,0x04,0x0b,0x07,0x0b,0x00,0x0b,0x00,0xcf,0x86,0xd5,0x20,0x94,0x1c,0xd3,
-+	0x0c,0x92,0x08,0x11,0x04,0x0b,0x00,0x00,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x91,
-+	0x08,0x10,0x04,0x00,0x00,0x14,0x00,0x00,0x00,0x0d,0x00,0xd4,0x14,0x53,0x04,0x0d,
-+	0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53,
-+	0x04,0x0d,0x00,0x92,0x08,0x11,0x04,0x0d,0x00,0x00,0x00,0x00,0x00,0xd1,0x96,0xd0,
-+	0x5c,0xcf,0x86,0xd5,0x18,0x94,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,0x0d,0xe6,0x10,
-+	0x04,0x0d,0xe6,0x0d,0x00,0x0d,0x00,0x0d,0x00,0x0d,0x00,0xd4,0x26,0x53,0x04,0x0d,
-+	0x00,0x52,0x04,0x0d,0x00,0x51,0x04,0x0d,0x00,0x10,0x0d,0x0d,0xff,0xf0,0x91,0x84,
-+	0xb1,0xf0,0x91,0x84,0xa7,0x00,0x0d,0xff,0xf0,0x91,0x84,0xb2,0xf0,0x91,0x84,0xa7,
-+	0x00,0x93,0x18,0xd2,0x0c,0x51,0x04,0x0d,0x00,0x10,0x04,0x0d,0x00,0x0d,0x09,0x91,
-+	0x08,0x10,0x04,0x0d,0x09,0x00,0x00,0x0d,0x00,0x0d,0x00,0xcf,0x86,0xd5,0x18,0x94,
-+	0x14,0x93,0x10,0x52,0x04,0x0d,0x00,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x00,
-+	0x00,0x00,0x00,0x10,0x00,0x54,0x04,0x10,0x00,0x93,0x18,0xd2,0x0c,0x51,0x04,0x10,
-+	0x00,0x10,0x04,0x10,0x00,0x10,0x07,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,
-+	0x00,0x00,0x00,0xd0,0x06,0xcf,0x06,0x0d,0x00,0xcf,0x86,0xd5,0x40,0xd4,0x2c,0xd3,
-+	0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x0d,0x09,0x0d,0x00,0x0d,0x00,0x0d,0x00,0xd2,
-+	0x10,0xd1,0x08,0x10,0x04,0x0d,0x00,0x11,0x00,0x10,0x04,0x11,0x07,0x11,0x00,0x91,
-+	0x08,0x10,0x04,0x11,0x00,0x10,0x00,0x00,0x00,0x53,0x04,0x0d,0x00,0x92,0x0c,0x51,
-+	0x04,0x0d,0x00,0x10,0x04,0x10,0x00,0x11,0x00,0x11,0x00,0xd4,0x14,0x93,0x10,0x92,
-+	0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x93,
-+	0x10,0x52,0x04,0x10,0x00,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,
-+	0x00,0xd2,0xc8,0xd1,0x48,0xd0,0x42,0xcf,0x86,0xd5,0x18,0x54,0x04,0x10,0x00,0x93,
-+	0x10,0x92,0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x10,
-+	0x00,0x54,0x04,0x10,0x00,0xd3,0x14,0x52,0x04,0x10,0x00,0xd1,0x08,0x10,0x04,0x10,
-+	0x00,0x10,0x09,0x10,0x04,0x10,0x07,0x10,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,
-+	0x00,0x10,0x04,0x12,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd0,0x52,0xcf,0x86,0xd5,
-+	0x3c,0xd4,0x28,0xd3,0x10,0x52,0x04,0x11,0x00,0x51,0x04,0x11,0x00,0x10,0x04,0x11,
-+	0x00,0x00,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x11,0x00,0x00,0x00,0x11,0x00,0x51,
-+	0x04,0x11,0x00,0x10,0x04,0x00,0x00,0x11,0x00,0x53,0x04,0x11,0x00,0x52,0x04,0x11,
-+	0x00,0x51,0x04,0x11,0x00,0x10,0x04,0x00,0x00,0x11,0x00,0x94,0x10,0x53,0x04,0x11,
-+	0x00,0x92,0x08,0x11,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0xcf,0x86,0x55,
-+	0x04,0x10,0x00,0xd4,0x18,0x53,0x04,0x10,0x00,0x92,0x10,0xd1,0x08,0x10,0x04,0x10,
-+	0x00,0x10,0x07,0x10,0x04,0x10,0x09,0x00,0x00,0x00,0x00,0x53,0x04,0x10,0x00,0x92,
-+	0x08,0x11,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xe1,0x27,0x01,0xd0,0x8a,0xcf,0x86,
-+	0xd5,0x44,0xd4,0x2c,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x11,0x00,0x10,0x00,
-+	0x10,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x52,0x04,0x10,0x00,
-+	0xd1,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x93,0x14,
-+	0x92,0x10,0xd1,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,
-+	0x10,0x00,0x10,0x00,0xd4,0x14,0x53,0x04,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,
-+	0x10,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0xd3,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,
-+	0x10,0x00,0x00,0x00,0x10,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,
-+	0xd2,0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x00,0x00,0x14,0x07,0x91,0x08,0x10,0x04,
-+	0x10,0x07,0x10,0x00,0x10,0x00,0xcf,0x86,0xd5,0x6a,0xd4,0x42,0xd3,0x14,0x52,0x04,
-+	0x10,0x00,0xd1,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,
-+	0xd2,0x19,0xd1,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0xff,
-+	0xf0,0x91,0x8d,0x87,0xf0,0x91,0x8c,0xbe,0x00,0x91,0x11,0x10,0x0d,0x10,0xff,0xf0,
-+	0x91,0x8d,0x87,0xf0,0x91,0x8d,0x97,0x00,0x10,0x09,0x00,0x00,0xd3,0x18,0xd2,0x0c,
-+	0x91,0x08,0x10,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,
-+	0x00,0x00,0x10,0x00,0x52,0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,
-+	0x10,0x00,0xd4,0x1c,0xd3,0x0c,0x52,0x04,0x10,0x00,0x11,0x04,0x00,0x00,0x10,0xe6,
-+	0x52,0x04,0x10,0xe6,0x91,0x08,0x10,0x04,0x10,0xe6,0x00,0x00,0x00,0x00,0x93,0x10,
-+	0x52,0x04,0x10,0xe6,0x91,0x08,0x10,0x04,0x10,0xe6,0x00,0x00,0x00,0x00,0x00,0x00,
-+	0xcf,0x06,0x00,0x00,0xe3,0x30,0x01,0xd2,0xb7,0xd1,0x48,0xd0,0x06,0xcf,0x06,0x12,
-+	0x00,0xcf,0x86,0x95,0x3c,0xd4,0x1c,0x93,0x18,0xd2,0x0c,0x51,0x04,0x12,0x00,0x10,
-+	0x04,0x12,0x09,0x12,0x00,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x07,0x12,0x00,0x12,
-+	0x00,0x53,0x04,0x12,0x00,0xd2,0x0c,0x51,0x04,0x12,0x00,0x10,0x04,0x00,0x00,0x12,
-+	0x00,0xd1,0x08,0x10,0x04,0x00,0x00,0x12,0x00,0x10,0x04,0x14,0xe6,0x15,0x00,0x00,
-+	0x00,0xd0,0x45,0xcf,0x86,0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,0x53,0x04,0x10,
-+	0x00,0xd2,0x15,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x10,0xff,0xf0,0x91,0x92,
-+	0xb9,0xf0,0x91,0x92,0xba,0x00,0xd1,0x11,0x10,0x0d,0x10,0xff,0xf0,0x91,0x92,0xb9,
-+	0xf0,0x91,0x92,0xb0,0x00,0x10,0x00,0x10,0x0d,0x10,0xff,0xf0,0x91,0x92,0xb9,0xf0,
-+	0x91,0x92,0xbd,0x00,0x10,0x00,0xcf,0x86,0x95,0x24,0xd4,0x14,0x93,0x10,0x92,0x0c,
-+	0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x09,0x10,0x07,0x10,0x00,0x00,0x00,0x53,0x04,
-+	0x10,0x00,0x92,0x08,0x11,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,0x06,
-+	0xcf,0x06,0x00,0x00,0xd0,0x40,0xcf,0x86,0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,
-+	0xd3,0x0c,0x52,0x04,0x10,0x00,0x11,0x04,0x10,0x00,0x00,0x00,0xd2,0x1e,0x51,0x04,
-+	0x10,0x00,0x10,0x0d,0x10,0xff,0xf0,0x91,0x96,0xb8,0xf0,0x91,0x96,0xaf,0x00,0x10,
-+	0xff,0xf0,0x91,0x96,0xb9,0xf0,0x91,0x96,0xaf,0x00,0x51,0x04,0x10,0x00,0x10,0x04,
-+	0x10,0x00,0x10,0x09,0xcf,0x86,0x95,0x2c,0xd4,0x1c,0xd3,0x10,0x92,0x0c,0x91,0x08,
-+	0x10,0x04,0x10,0x07,0x10,0x00,0x10,0x00,0x10,0x00,0x92,0x08,0x11,0x04,0x10,0x00,
-+	0x11,0x00,0x11,0x00,0x53,0x04,0x11,0x00,0x52,0x04,0x11,0x00,0x11,0x04,0x11,0x00,
-+	0x00,0x00,0x00,0x00,0xd2,0xa0,0xd1,0x5c,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x10,0x00,
-+	0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,
-+	0x10,0x04,0x10,0x00,0x10,0x09,0xcf,0x86,0xd5,0x24,0xd4,0x14,0x93,0x10,0x52,0x04,
-+	0x10,0x00,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x04,
-+	0x10,0x00,0x92,0x08,0x11,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x94,0x14,0x53,0x04,
-+	0x12,0x00,0x52,0x04,0x12,0x00,0x91,0x08,0x10,0x04,0x12,0x00,0x00,0x00,0x00,0x00,
-+	0x00,0x00,0xd0,0x2a,0xcf,0x86,0x55,0x04,0x0d,0x00,0x54,0x04,0x0d,0x00,0xd3,0x10,
-+	0x52,0x04,0x0d,0x00,0x51,0x04,0x0d,0x00,0x10,0x04,0x0d,0x09,0x0d,0x07,0x92,0x0c,
-+	0x91,0x08,0x10,0x04,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0x95,0x14,
-+	0x94,0x10,0x53,0x04,0x0d,0x00,0x92,0x08,0x11,0x04,0x0d,0x00,0x00,0x00,0x00,0x00,
-+	0x00,0x00,0x00,0x00,0xd1,0x40,0xd0,0x3a,0xcf,0x86,0xd5,0x20,0x54,0x04,0x11,0x00,
-+	0x53,0x04,0x11,0x00,0xd2,0x0c,0x51,0x04,0x11,0x00,0x10,0x04,0x14,0x00,0x00,0x00,
-+	0x91,0x08,0x10,0x04,0x00,0x00,0x11,0x00,0x11,0x00,0x94,0x14,0x53,0x04,0x11,0x00,
-+	0x92,0x0c,0x51,0x04,0x11,0x00,0x10,0x04,0x11,0x00,0x11,0x09,0x00,0x00,0x11,0x00,
-+	0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xe4,0x59,0x01,0xd3,0xb2,0xd2,0x5c,0xd1,
-+	0x28,0xd0,0x22,0xcf,0x86,0x55,0x04,0x14,0x00,0x54,0x04,0x14,0x00,0x53,0x04,0x14,
-+	0x00,0x92,0x10,0xd1,0x08,0x10,0x04,0x14,0x00,0x14,0x09,0x10,0x04,0x14,0x07,0x14,
-+	0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd0,0x0a,0xcf,0x86,0x15,0x04,0x00,0x00,0x10,
-+	0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,0xd3,0x10,0x92,0x0c,0x51,
-+	0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x51,
-+	0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0xd1,0x06,0xcf,0x06,0x00,0x00,0xd0,
-+	0x1a,0xcf,0x86,0x55,0x04,0x00,0x00,0x94,0x10,0x53,0x04,0x15,0x00,0x92,0x08,0x11,
-+	0x04,0x00,0x00,0x15,0x00,0x15,0x00,0x15,0x00,0xcf,0x86,0xd5,0x14,0x54,0x04,0x15,
-+	0x00,0x53,0x04,0x15,0x00,0x92,0x08,0x11,0x04,0x00,0x00,0x15,0x00,0x15,0x00,0x94,
-+	0x1c,0x93,0x18,0xd2,0x0c,0x91,0x08,0x10,0x04,0x15,0x09,0x15,0x00,0x15,0x00,0x91,
-+	0x08,0x10,0x04,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd2,0xa0,0xd1,
-+	0x3c,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x13,0x00,0x54,0x04,0x13,0x00,0x93,0x10,0x52,
-+	0x04,0x13,0x00,0x91,0x08,0x10,0x04,0x13,0x09,0x13,0x00,0x13,0x00,0x13,0x00,0xcf,
-+	0x86,0x95,0x18,0x94,0x14,0x93,0x10,0x52,0x04,0x13,0x00,0x51,0x04,0x13,0x00,0x10,
-+	0x04,0x13,0x00,0x13,0x09,0x00,0x00,0x13,0x00,0x13,0x00,0xd0,0x46,0xcf,0x86,0xd5,
-+	0x2c,0xd4,0x10,0x93,0x0c,0x52,0x04,0x13,0x00,0x11,0x04,0x15,0x00,0x13,0x00,0x13,
-+	0x00,0x53,0x04,0x13,0x00,0xd2,0x0c,0x91,0x08,0x10,0x04,0x13,0x00,0x13,0x09,0x13,
-+	0x00,0x91,0x08,0x10,0x04,0x13,0x00,0x14,0x00,0x13,0x00,0x94,0x14,0x93,0x10,0x92,
-+	0x0c,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-+	0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,0x92,
-+	0x0c,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,
-+	0x00,0xe3,0xa9,0x01,0xd2,0xb0,0xd1,0x6c,0xd0,0x3e,0xcf,0x86,0xd5,0x18,0x94,0x14,
-+	0x53,0x04,0x12,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x12,0x00,0x00,0x00,0x12,0x00,
-+	0x12,0x00,0x12,0x00,0x54,0x04,0x12,0x00,0xd3,0x10,0x52,0x04,0x12,0x00,0x51,0x04,
-+	0x12,0x00,0x10,0x04,0x12,0x00,0x00,0x00,0x52,0x04,0x12,0x00,0x51,0x04,0x12,0x00,
-+	0x10,0x04,0x12,0x00,0x12,0x09,0xcf,0x86,0xd5,0x14,0x94,0x10,0x93,0x0c,0x52,0x04,
-+	0x12,0x00,0x11,0x04,0x12,0x00,0x00,0x00,0x00,0x00,0x12,0x00,0x94,0x14,0x53,0x04,
-+	0x12,0x00,0x52,0x04,0x12,0x00,0x91,0x08,0x10,0x04,0x12,0x00,0x00,0x00,0x00,0x00,
-+	0x12,0x00,0xd0,0x3e,0xcf,0x86,0xd5,0x14,0x54,0x04,0x12,0x00,0x93,0x0c,0x92,0x08,
-+	0x11,0x04,0x00,0x00,0x12,0x00,0x12,0x00,0x12,0x00,0xd4,0x14,0x53,0x04,0x12,0x00,
-+	0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x12,0x00,0x12,0x00,0x12,0x00,0x93,0x10,
-+	0x52,0x04,0x12,0x00,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x00,0x00,0x00,0x00,
-+	0xcf,0x06,0x00,0x00,0xd1,0xa0,0xd0,0x52,0xcf,0x86,0xd5,0x24,0x94,0x20,0xd3,0x10,
-+	0x52,0x04,0x13,0x00,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x00,0x00,0x92,0x0c,
-+	0x51,0x04,0x13,0x00,0x10,0x04,0x00,0x00,0x13,0x00,0x13,0x00,0x13,0x00,0x54,0x04,
-+	0x13,0x00,0xd3,0x10,0x52,0x04,0x13,0x00,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x00,
-+	0x00,0x00,0xd2,0x0c,0x51,0x04,0x00,0x00,0x10,0x04,0x13,0x00,0x00,0x00,0x51,0x04,
-+	0x13,0x00,0x10,0x04,0x00,0x00,0x13,0x00,0xcf,0x86,0xd5,0x28,0xd4,0x18,0x93,0x14,
-+	0xd2,0x0c,0x51,0x04,0x13,0x00,0x10,0x04,0x13,0x07,0x13,0x00,0x11,0x04,0x13,0x09,
-+	0x13,0x00,0x00,0x00,0x53,0x04,0x13,0x00,0x92,0x08,0x11,0x04,0x13,0x00,0x00,0x00,
-+	0x00,0x00,0x94,0x20,0xd3,0x10,0x52,0x04,0x14,0x00,0x51,0x04,0x14,0x00,0x10,0x04,
-+	0x00,0x00,0x14,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,0x14,0x00,
-+	0x14,0x00,0x14,0x00,0xd0,0x52,0xcf,0x86,0xd5,0x3c,0xd4,0x14,0x53,0x04,0x14,0x00,
-+	0x52,0x04,0x14,0x00,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x00,0x00,0xd3,0x18,
-+	0xd2,0x0c,0x51,0x04,0x14,0x00,0x10,0x04,0x00,0x00,0x14,0x00,0x51,0x04,0x14,0x00,
-+	0x10,0x04,0x14,0x00,0x14,0x09,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,
-+	0x00,0x00,0x00,0x00,0x94,0x10,0x53,0x04,0x14,0x00,0x92,0x08,0x11,0x04,0x14,0x00,
-+	0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd2,0x2a,0xd1,0x06,0xcf,0x06,
-+	0x00,0x00,0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,0x04,
-+	0x14,0x00,0x53,0x04,0x14,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x14,0x00,0x00,0x00,
-+	0x00,0x00,0x00,0x00,0xd1,0x06,0xcf,0x06,0x00,0x00,0xd0,0x06,0xcf,0x06,0x00,0x00,
-+	0xcf,0x86,0x55,0x04,0x15,0x00,0x54,0x04,0x15,0x00,0xd3,0x0c,0x92,0x08,0x11,0x04,
-+	0x15,0x00,0x00,0x00,0x00,0x00,0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,
-+	0x00,0x00,0x15,0x00,0xd0,0xca,0xcf,0x86,0xd5,0xc2,0xd4,0x54,0xd3,0x06,0xcf,0x06,
-+	0x09,0x00,0xd2,0x06,0xcf,0x06,0x09,0x00,0xd1,0x24,0xd0,0x06,0xcf,0x06,0x09,0x00,
-+	0xcf,0x86,0x55,0x04,0x09,0x00,0x94,0x14,0x53,0x04,0x09,0x00,0x52,0x04,0x09,0x00,
-+	0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x10,0x00,0x10,0x00,0xd0,0x1e,0xcf,0x86,
-+	0x95,0x18,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,
-+	0x10,0x00,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd3,0x68,
-+	0xd2,0x46,0xd1,0x40,0xd0,0x06,0xcf,0x06,0x09,0x00,0xcf,0x86,0x55,0x04,0x09,0x00,
-+	0xd4,0x20,0xd3,0x10,0x92,0x0c,0x51,0x04,0x09,0x00,0x10,0x04,0x09,0x00,0x10,0x00,
-+	0x10,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,
-+	0x93,0x10,0x52,0x04,0x09,0x00,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,
-+	0x00,0x00,0xcf,0x06,0x11,0x00,0xd1,0x1c,0xd0,0x06,0xcf,0x06,0x11,0x00,0xcf,0x86,
-+	0x95,0x10,0x94,0x0c,0x93,0x08,0x12,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-+	0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x86,
-+	0xd5,0x4c,0xd4,0x06,0xcf,0x06,0x0b,0x00,0xd3,0x40,0xd2,0x3a,0xd1,0x34,0xd0,0x2e,
-+	0xcf,0x86,0x55,0x04,0x0b,0x00,0xd4,0x14,0x53,0x04,0x0b,0x00,0x52,0x04,0x0b,0x00,
-+	0x51,0x04,0x0b,0x00,0x10,0x04,0x0b,0x00,0x00,0x00,0x53,0x04,0x15,0x00,0x92,0x0c,
-+	0x91,0x08,0x10,0x04,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,
-+	0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,
-+	0xd1,0x4c,0xd0,0x44,0xcf,0x86,0xd5,0x3c,0xd4,0x06,0xcf,0x06,0x00,0x00,0xd3,0x06,
-+	0xcf,0x06,0x11,0x00,0xd2,0x2a,0xd1,0x24,0xd0,0x06,0xcf,0x06,0x11,0x00,0xcf,0x86,
-+	0x95,0x18,0x94,0x14,0x93,0x10,0x52,0x04,0x11,0x00,0x51,0x04,0x11,0x00,0x10,0x04,
-+	0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,
-+	0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x86,0xcf,0x06,0x00,0x00,0xe0,0xd2,0x01,0xcf,
-+	0x86,0xd5,0x06,0xcf,0x06,0x00,0x00,0xe4,0x0b,0x01,0xd3,0x06,0xcf,0x06,0x0c,0x00,
-+	0xd2,0x84,0xd1,0x50,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x0c,0x00,0x54,0x04,0x0c,0x00,
-+	0x53,0x04,0x0c,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,
-+	0x00,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,0x52,0x04,
-+	0x10,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x94,0x14,0x53,0x04,
-+	0x10,0x00,0xd2,0x08,0x11,0x04,0x10,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x10,0x00,
-+	0x00,0x00,0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x86,0xd5,0x08,0x14,0x04,0x00,0x00,
-+	0x10,0x00,0xd4,0x10,0x53,0x04,0x10,0x00,0x52,0x04,0x10,0x00,0x11,0x04,0x10,0x00,
-+	0x00,0x00,0x93,0x10,0x52,0x04,0x10,0x01,0x91,0x08,0x10,0x04,0x10,0x01,0x10,0x00,
-+	0x00,0x00,0x00,0x00,0xd1,0x6c,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x10,0x00,0x54,0x04,
-+	0x10,0x00,0x93,0x10,0x52,0x04,0x10,0xe6,0x51,0x04,0x10,0xe6,0x10,0x04,0x10,0xe6,
-+	0x10,0x00,0x10,0x00,0xcf,0x86,0xd5,0x24,0xd4,0x10,0x93,0x0c,0x52,0x04,0x10,0x00,
-+	0x11,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x10,0x00,0x92,0x0c,0x51,0x04,
-+	0x10,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0xd4,0x14,0x93,0x10,0x92,0x0c,
-+	0x51,0x04,0x10,0x00,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x53,0x04,
-+	0x10,0x00,0x52,0x04,0x00,0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,
-+	0xd0,0x0e,0xcf,0x86,0x95,0x08,0x14,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,
-+	0x00,0x00,0xd3,0x06,0xcf,0x06,0x00,0x00,0xd2,0x30,0xd1,0x0c,0xd0,0x06,0xcf,0x06,
-+	0x00,0x00,0xcf,0x06,0x14,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x14,0x00,
-+	0x53,0x04,0x14,0x00,0x92,0x0c,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x00,0x00,
-+	0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd1,0x4c,0xd0,0x06,0xcf,0x06,0x0d,0x00,
-+	0xcf,0x86,0xd5,0x2c,0x94,0x28,0xd3,0x10,0x52,0x04,0x0d,0x00,0x91,0x08,0x10,0x04,
-+	0x0d,0x00,0x15,0x00,0x15,0x00,0xd2,0x0c,0x51,0x04,0x15,0x00,0x10,0x04,0x15,0x00,
-+	0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x15,0x00,0x0d,0x00,0x54,0x04,
-+	0x0d,0x00,0x53,0x04,0x0d,0x00,0x52,0x04,0x0d,0x00,0x51,0x04,0x0d,0x00,0x10,0x04,
-+	0x0d,0x00,0x15,0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x94,0x14,0x53,0x04,0x15,0x00,
-+	0x52,0x04,0x00,0x00,0x51,0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0d,0x00,0x0d,0x00,
-+	0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,
-+	0x10,0x04,0x12,0x00,0x13,0x00,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,
-+	0xcf,0x06,0x12,0x00,0xe2,0xc5,0x01,0xd1,0x8e,0xd0,0x86,0xcf,0x86,0xd5,0x48,0xd4,
-+	0x06,0xcf,0x06,0x12,0x00,0xd3,0x06,0xcf,0x06,0x12,0x00,0xd2,0x06,0xcf,0x06,0x12,
-+	0x00,0xd1,0x06,0xcf,0x06,0x12,0x00,0xd0,0x06,0xcf,0x06,0x12,0x00,0xcf,0x86,0x55,
-+	0x04,0x12,0x00,0xd4,0x14,0x53,0x04,0x12,0x00,0x52,0x04,0x12,0x00,0x91,0x08,0x10,
-+	0x04,0x12,0x00,0x14,0x00,0x14,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x14,0x00,0x15,
-+	0x00,0x15,0x00,0x00,0x00,0xd4,0x36,0xd3,0x06,0xcf,0x06,0x12,0x00,0xd2,0x2a,0xd1,
-+	0x06,0xcf,0x06,0x12,0x00,0xd0,0x06,0xcf,0x06,0x12,0x00,0xcf,0x86,0x55,0x04,0x12,
-+	0x00,0x54,0x04,0x12,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x12,0x00,0x10,0x04,0x12,
- 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,
--	0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xd1,0x4c,0xd0,0x44,0xcf,
--	0x86,0xd5,0x3c,0xd4,0x06,0xcf,0x06,0x00,0x00,0xd3,0x06,0xcf,0x06,0x11,0x00,0xd2,
--	0x2a,0xd1,0x24,0xd0,0x06,0xcf,0x06,0x11,0x00,0xcf,0x86,0x95,0x18,0x94,0x14,0x93,
--	0x10,0x52,0x04,0x11,0x00,0x51,0x04,0x11,0x00,0x10,0x04,0x11,0x00,0x00,0x00,0x00,
--	0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,
--	0x00,0xcf,0x86,0xcf,0x06,0x00,0x00,0xe0,0xd2,0x01,0xcf,0x86,0xd5,0x06,0xcf,0x06,
--	0x00,0x00,0xe4,0x0b,0x01,0xd3,0x06,0xcf,0x06,0x0c,0x00,0xd2,0x84,0xd1,0x50,0xd0,
--	0x1e,0xcf,0x86,0x55,0x04,0x0c,0x00,0x54,0x04,0x0c,0x00,0x53,0x04,0x0c,0x00,0x92,
--	0x0c,0x91,0x08,0x10,0x04,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,
--	0x18,0x54,0x04,0x10,0x00,0x53,0x04,0x10,0x00,0x52,0x04,0x10,0x00,0x51,0x04,0x10,
--	0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x94,0x14,0x53,0x04,0x10,0x00,0xd2,0x08,0x11,
--	0x04,0x10,0x00,0x00,0x00,0x11,0x04,0x00,0x00,0x10,0x00,0x00,0x00,0xd0,0x06,0xcf,
--	0x06,0x00,0x00,0xcf,0x86,0xd5,0x08,0x14,0x04,0x00,0x00,0x10,0x00,0xd4,0x10,0x53,
--	0x04,0x10,0x00,0x52,0x04,0x10,0x00,0x11,0x04,0x10,0x00,0x00,0x00,0x93,0x10,0x52,
--	0x04,0x10,0x01,0x91,0x08,0x10,0x04,0x10,0x01,0x10,0x00,0x00,0x00,0x00,0x00,0xd1,
--	0x6c,0xd0,0x1e,0xcf,0x86,0x55,0x04,0x10,0x00,0x54,0x04,0x10,0x00,0x93,0x10,0x52,
--	0x04,0x10,0xe6,0x51,0x04,0x10,0xe6,0x10,0x04,0x10,0xe6,0x10,0x00,0x10,0x00,0xcf,
--	0x86,0xd5,0x24,0xd4,0x10,0x93,0x0c,0x52,0x04,0x10,0x00,0x11,0x04,0x10,0x00,0x00,
--	0x00,0x00,0x00,0x53,0x04,0x10,0x00,0x92,0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x00,
--	0x00,0x10,0x00,0x10,0x00,0xd4,0x14,0x93,0x10,0x92,0x0c,0x51,0x04,0x10,0x00,0x10,
--	0x04,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x53,0x04,0x10,0x00,0x52,0x04,0x00,
--	0x00,0x91,0x08,0x10,0x04,0x00,0x00,0x10,0x00,0x10,0x00,0xd0,0x0e,0xcf,0x86,0x95,
--	0x08,0x14,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xd3,0x06,0xcf,
--	0x06,0x00,0x00,0xd2,0x30,0xd1,0x0c,0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x06,0x14,
--	0x00,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,0x14,0x00,0x53,0x04,0x14,0x00,0x92,
--	0x0c,0x51,0x04,0x14,0x00,0x10,0x04,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,
--	0x06,0x00,0x00,0xd1,0x4c,0xd0,0x06,0xcf,0x06,0x0d,0x00,0xcf,0x86,0xd5,0x2c,0x94,
--	0x28,0xd3,0x10,0x52,0x04,0x0d,0x00,0x91,0x08,0x10,0x04,0x0d,0x00,0x15,0x00,0x15,
--	0x00,0xd2,0x0c,0x51,0x04,0x15,0x00,0x10,0x04,0x15,0x00,0x00,0x00,0x51,0x04,0x00,
--	0x00,0x10,0x04,0x00,0x00,0x15,0x00,0x0d,0x00,0x54,0x04,0x0d,0x00,0x53,0x04,0x0d,
--	0x00,0x52,0x04,0x0d,0x00,0x51,0x04,0x0d,0x00,0x10,0x04,0x0d,0x00,0x15,0x00,0xd0,
--	0x1e,0xcf,0x86,0x95,0x18,0x94,0x14,0x53,0x04,0x15,0x00,0x52,0x04,0x00,0x00,0x51,
--	0x04,0x00,0x00,0x10,0x04,0x00,0x00,0x0d,0x00,0x0d,0x00,0x00,0x00,0xcf,0x86,0x55,
--	0x04,0x00,0x00,0x94,0x14,0x93,0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x12,0x00,0x13,
--	0x00,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xcf,0x06,0x12,0x00,0xe2,
--	0xc6,0x01,0xd1,0x8e,0xd0,0x86,0xcf,0x86,0xd5,0x48,0xd4,0x06,0xcf,0x06,0x12,0x00,
--	0xd3,0x06,0xcf,0x06,0x12,0x00,0xd2,0x06,0xcf,0x06,0x12,0x00,0xd1,0x06,0xcf,0x06,
--	0x12,0x00,0xd0,0x06,0xcf,0x06,0x12,0x00,0xcf,0x86,0x55,0x04,0x12,0x00,0xd4,0x14,
--	0x53,0x04,0x12,0x00,0x52,0x04,0x12,0x00,0x91,0x08,0x10,0x04,0x12,0x00,0x14,0x00,
--	0x14,0x00,0x93,0x0c,0x92,0x08,0x11,0x04,0x14,0x00,0x15,0x00,0x15,0x00,0x00,0x00,
--	0xd4,0x36,0xd3,0x06,0xcf,0x06,0x12,0x00,0xd2,0x2a,0xd1,0x06,0xcf,0x06,0x12,0x00,
--	0xd0,0x06,0xcf,0x06,0x12,0x00,0xcf,0x86,0x55,0x04,0x12,0x00,0x54,0x04,0x12,0x00,
--	0x93,0x10,0x92,0x0c,0x51,0x04,0x12,0x00,0x10,0x04,0x12,0x00,0x00,0x00,0x00,0x00,
--	0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x86,0xcf,0x06,0x00,0x00,
--	0xd0,0x08,0xcf,0x86,0xcf,0x06,0x00,0x00,0xcf,0x86,0xd5,0xa2,0xd4,0x9c,0xd3,0x74,
--	0xd2,0x26,0xd1,0x20,0xd0,0x1a,0xcf,0x86,0x95,0x14,0x94,0x10,0x93,0x0c,0x92,0x08,
--	0x11,0x04,0x0c,0x00,0x13,0x00,0x13,0x00,0x13,0x00,0x13,0x00,0x13,0x00,0xcf,0x06,
--	0x13,0x00,0xcf,0x06,0x13,0x00,0xd1,0x48,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x54,0x04,
--	0x13,0x00,0x53,0x04,0x13,0x00,0x52,0x04,0x13,0x00,0x51,0x04,0x13,0x00,0x10,0x04,
--	0x13,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x18,0x54,0x04,0x00,0x00,0x93,0x10,
--	0x92,0x0c,0x51,0x04,0x15,0x00,0x10,0x04,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--	0x94,0x0c,0x93,0x08,0x12,0x04,0x00,0x00,0x15,0x00,0x00,0x00,0x13,0x00,0xcf,0x06,
--	0x13,0x00,0xd2,0x22,0xd1,0x06,0xcf,0x06,0x13,0x00,0xd0,0x06,0xcf,0x06,0x13,0x00,
--	0xcf,0x86,0x55,0x04,0x13,0x00,0x54,0x04,0x13,0x00,0x53,0x04,0x13,0x00,0x12,0x04,
--	0x13,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xd4,0x06,0xcf,0x06,
--	0x00,0x00,0xd3,0x7f,0xd2,0x79,0xd1,0x34,0xd0,0x06,0xcf,0x06,0x10,0x00,0xcf,0x86,
--	0x55,0x04,0x10,0x00,0xd4,0x14,0x53,0x04,0x10,0x00,0x92,0x0c,0x51,0x04,0x10,0x00,
--	0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x10,0x00,0x52,0x04,0x10,0x00,
--	0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xd0,0x3f,0xcf,0x86,0xd5,0x2c,
--	0xd4,0x14,0x53,0x04,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,
--	0x00,0x00,0x00,0x00,0x53,0x04,0x10,0x00,0xd2,0x08,0x11,0x04,0x10,0x00,0x00,0x00,
--	0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x01,0x10,0x00,0x94,0x0d,0x93,0x09,0x12,0x05,
--	0x10,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,
--	0x00,0xcf,0x06,0x00,0x00,0xe1,0x96,0x04,0xd0,0x08,0xcf,0x86,0xcf,0x06,0x00,0x00,
--	0xcf,0x86,0xe5,0x33,0x04,0xe4,0x83,0x02,0xe3,0xf8,0x01,0xd2,0x26,0xd1,0x06,0xcf,
--	0x06,0x05,0x00,0xd0,0x06,0xcf,0x06,0x05,0x00,0xcf,0x86,0x55,0x04,0x05,0x00,0x54,
--	0x04,0x05,0x00,0x93,0x0c,0x52,0x04,0x05,0x00,0x11,0x04,0x05,0x00,0x00,0x00,0x00,
--	0x00,0xd1,0xef,0xd0,0x2a,0xcf,0x86,0x55,0x04,0x05,0x00,0x94,0x20,0xd3,0x10,0x52,
--	0x04,0x05,0x00,0x51,0x04,0x05,0x00,0x10,0x04,0x05,0x00,0x00,0x00,0x92,0x0c,0x91,
--	0x08,0x10,0x04,0x00,0x00,0x0a,0x00,0x05,0x00,0x05,0x00,0x05,0x00,0xcf,0x86,0xd5,
--	0x2a,0x54,0x04,0x05,0x00,0x53,0x04,0x05,0x00,0x52,0x04,0x05,0x00,0x51,0x04,0x05,
--	0x00,0x10,0x0d,0x05,0xff,0xf0,0x9d,0x85,0x97,0xf0,0x9d,0x85,0xa5,0x00,0x05,0xff,
--	0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,0x00,0xd4,0x75,0xd3,0x61,0xd2,0x44,0xd1,
--	0x22,0x10,0x11,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,0xf0,0x9d,0x85,
--	0xae,0x00,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,0xf0,0x9d,0x85,0xaf,
--	0x00,0x10,0x11,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,0xf0,0x9d,0x85,
--	0xb0,0x00,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,0xf0,0x9d,0x85,0xb1,
--	0x00,0xd1,0x15,0x10,0x11,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,0xf0,
--	0x9d,0x85,0xb2,0x00,0x05,0xd8,0x10,0x04,0x05,0xd8,0x05,0x01,0xd2,0x08,0x11,0x04,
--	0x05,0x01,0x05,0x00,0x91,0x08,0x10,0x04,0x05,0x00,0x05,0xe2,0x05,0xd8,0xd3,0x12,
--	0x92,0x0d,0x51,0x04,0x05,0xd8,0x10,0x04,0x05,0xd8,0x05,0xff,0x00,0x05,0xff,0x00,
--	0x92,0x0e,0x51,0x05,0x05,0xff,0x00,0x10,0x05,0x05,0xff,0x00,0x05,0xdc,0x05,0xdc,
-+	0x86,0xcf,0x06,0x00,0x00,0xd0,0x08,0xcf,0x86,0xcf,0x06,0x00,0x00,0xcf,0x86,0xd5,
-+	0xa2,0xd4,0x9c,0xd3,0x74,0xd2,0x26,0xd1,0x20,0xd0,0x1a,0xcf,0x86,0x95,0x14,0x94,
-+	0x10,0x93,0x0c,0x92,0x08,0x11,0x04,0x0c,0x00,0x13,0x00,0x13,0x00,0x13,0x00,0x13,
-+	0x00,0x13,0x00,0xcf,0x06,0x13,0x00,0xcf,0x06,0x13,0x00,0xd1,0x48,0xd0,0x1e,0xcf,
-+	0x86,0x95,0x18,0x54,0x04,0x13,0x00,0x53,0x04,0x13,0x00,0x52,0x04,0x13,0x00,0x51,
-+	0x04,0x13,0x00,0x10,0x04,0x13,0x00,0x00,0x00,0x00,0x00,0xcf,0x86,0xd5,0x18,0x54,
-+	0x04,0x00,0x00,0x93,0x10,0x92,0x0c,0x51,0x04,0x15,0x00,0x10,0x04,0x15,0x00,0x00,
-+	0x00,0x00,0x00,0x00,0x00,0x94,0x0c,0x93,0x08,0x12,0x04,0x00,0x00,0x15,0x00,0x00,
-+	0x00,0x13,0x00,0xcf,0x06,0x13,0x00,0xd2,0x22,0xd1,0x06,0xcf,0x06,0x13,0x00,0xd0,
-+	0x06,0xcf,0x06,0x13,0x00,0xcf,0x86,0x55,0x04,0x13,0x00,0x54,0x04,0x13,0x00,0x53,
-+	0x04,0x13,0x00,0x12,0x04,0x13,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,
-+	0x00,0xd4,0x06,0xcf,0x06,0x00,0x00,0xd3,0x7e,0xd2,0x78,0xd1,0x34,0xd0,0x06,0xcf,
-+	0x06,0x10,0x00,0xcf,0x86,0x55,0x04,0x10,0x00,0xd4,0x14,0x53,0x04,0x10,0x00,0x92,
-+	0x0c,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x10,
-+	0x00,0x52,0x04,0x10,0x00,0x91,0x08,0x10,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0xd0,
-+	0x3e,0xcf,0x86,0xd5,0x2c,0xd4,0x14,0x53,0x04,0x10,0x00,0x92,0x0c,0x91,0x08,0x10,
-+	0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x04,0x10,0x00,0xd2,0x08,0x11,
-+	0x04,0x10,0x00,0x00,0x00,0x51,0x04,0x10,0x00,0x10,0x04,0x10,0x01,0x10,0x00,0x94,
-+	0x0c,0x93,0x08,0x12,0x04,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xcf,0x06,0x00,
-+	0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xe1,0x92,0x04,0xd0,0x08,0xcf,0x86,
-+	0xcf,0x06,0x00,0x00,0xcf,0x86,0xe5,0x2f,0x04,0xe4,0x7f,0x02,0xe3,0xf4,0x01,0xd2,
-+	0x26,0xd1,0x06,0xcf,0x06,0x05,0x00,0xd0,0x06,0xcf,0x06,0x05,0x00,0xcf,0x86,0x55,
-+	0x04,0x05,0x00,0x54,0x04,0x05,0x00,0x93,0x0c,0x52,0x04,0x05,0x00,0x11,0x04,0x05,
-+	0x00,0x00,0x00,0x00,0x00,0xd1,0xeb,0xd0,0x2a,0xcf,0x86,0x55,0x04,0x05,0x00,0x94,
-+	0x20,0xd3,0x10,0x52,0x04,0x05,0x00,0x51,0x04,0x05,0x00,0x10,0x04,0x05,0x00,0x00,
-+	0x00,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x0a,0x00,0x05,0x00,0x05,0x00,0x05,
-+	0x00,0xcf,0x86,0xd5,0x2a,0x54,0x04,0x05,0x00,0x53,0x04,0x05,0x00,0x52,0x04,0x05,
-+	0x00,0x51,0x04,0x05,0x00,0x10,0x0d,0x05,0xff,0xf0,0x9d,0x85,0x97,0xf0,0x9d,0x85,
-+	0xa5,0x00,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,0x00,0xd4,0x75,0xd3,
-+	0x61,0xd2,0x44,0xd1,0x22,0x10,0x11,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,
-+	0xa5,0xf0,0x9d,0x85,0xae,0x00,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,
-+	0xf0,0x9d,0x85,0xaf,0x00,0x10,0x11,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,
-+	0xa5,0xf0,0x9d,0x85,0xb0,0x00,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,0x9d,0x85,0xa5,
-+	0xf0,0x9d,0x85,0xb1,0x00,0xd1,0x15,0x10,0x11,0x05,0xff,0xf0,0x9d,0x85,0x98,0xf0,
-+	0x9d,0x85,0xa5,0xf0,0x9d,0x85,0xb2,0x00,0x05,0xd8,0x10,0x04,0x05,0xd8,0x05,0x01,
-+	0xd2,0x08,0x11,0x04,0x05,0x01,0x05,0x00,0x91,0x08,0x10,0x04,0x05,0x00,0x05,0xe2,
-+	0x05,0xd8,0xd3,0x10,0x92,0x0c,0x51,0x04,0x05,0xd8,0x10,0x04,0x05,0xd8,0x05,0x00,
-+	0x05,0x00,0x92,0x0c,0x51,0x04,0x05,0x00,0x10,0x04,0x05,0x00,0x05,0xdc,0x05,0xdc,
- 	0xd0,0x97,0xcf,0x86,0xd5,0x28,0x94,0x24,0xd3,0x18,0xd2,0x0c,0x51,0x04,0x05,0xdc,
- 	0x10,0x04,0x05,0xdc,0x05,0x00,0x91,0x08,0x10,0x04,0x05,0x00,0x05,0xe6,0x05,0xe6,
- 	0x92,0x08,0x11,0x04,0x05,0xe6,0x05,0xdc,0x05,0x00,0x05,0x00,0xd4,0x14,0x53,0x04,
-@@ -4090,21 +4080,20 @@ static const unsigned char utf8data[64256] = {
- 	0x00,0xd3,0x06,0xcf,0x06,0x00,0x00,0xd2,0x06,0xcf,0x06,0x00,0x00,0xd1,0x06,0xcf,
- 	0x06,0x00,0x00,0xd0,0x06,0xcf,0x06,0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,
- 	0x04,0x00,0x00,0x53,0x04,0x00,0x00,0x52,0x04,0x00,0x00,0x11,0x04,0x00,0x00,0x02,
--	0x00,0xd4,0xd9,0xd3,0x81,0xd2,0x79,0xd1,0x71,0xd0,0x69,0xcf,0x86,0xd5,0x60,0xd4,
--	0x59,0xd3,0x52,0xd2,0x33,0xd1,0x2c,0xd0,0x25,0xcf,0x86,0x95,0x1e,0x94,0x19,0x93,
--	0x14,0x92,0x0f,0x91,0x0a,0x10,0x05,0x00,0xff,0x00,0x05,0xff,0x00,0x00,0xff,0x00,
--	0x00,0xff,0x00,0x00,0xff,0x00,0x00,0xff,0x00,0x05,0xff,0x00,0xcf,0x06,0x05,0xff,
--	0x00,0xcf,0x06,0x00,0xff,0x00,0xd1,0x07,0xcf,0x06,0x07,0xff,0x00,0xd0,0x07,0xcf,
--	0x06,0x07,0xff,0x00,0xcf,0x86,0x55,0x05,0x07,0xff,0x00,0x14,0x05,0x07,0xff,0x00,
--	0x00,0xff,0x00,0xcf,0x06,0x00,0xff,0x00,0xcf,0x06,0x00,0xff,0x00,0xcf,0x06,0x00,
--	0xff,0x00,0xcf,0x86,0xcf,0x06,0x00,0x00,0xcf,0x86,0xcf,0x06,0x00,0x00,0xcf,0x86,
--	0xcf,0x06,0x00,0x00,0xd2,0x08,0xcf,0x86,0xcf,0x06,0x00,0x00,0xd1,0x08,0xcf,0x86,
--	0xcf,0x06,0x00,0x00,0xd0,0x08,0xcf,0x86,0xcf,0x06,0x00,0x00,0xcf,0x86,0xd5,0x06,
--	0xcf,0x06,0x00,0x00,0xd4,0x06,0xcf,0x06,0x00,0x00,0xd3,0x06,0xcf,0x06,0x00,0x00,
--	0xd2,0x06,0xcf,0x06,0x00,0x00,0xd1,0x06,0xcf,0x06,0x00,0x00,0xd0,0x06,0xcf,0x06,
--	0x00,0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,0x04,0x00,0x00,0x53,0x04,0x00,0x00,
--	0x52,0x04,0x00,0x00,0x11,0x04,0x00,0x00,0x02,0x00,0xcf,0x86,0xcf,0x06,0x02,0x00,
--	0x81,0x80,0xcf,0x86,0x85,0x84,0xcf,0x86,0xcf,0x06,0x02,0x00,0x00,0x00,0x00,0x00
-+	0x00,0xd4,0xc8,0xd3,0x70,0xd2,0x68,0xd1,0x60,0xd0,0x58,0xcf,0x86,0xd5,0x50,0xd4,
-+	0x4a,0xd3,0x44,0xd2,0x2a,0xd1,0x24,0xd0,0x1e,0xcf,0x86,0x95,0x18,0x94,0x14,0x93,
-+	0x10,0x92,0x0c,0x91,0x08,0x10,0x04,0x00,0x00,0x05,0x00,0x00,0x00,0x00,0x00,0x00,
-+	0x00,0x00,0x00,0x05,0x00,0xcf,0x06,0x05,0x00,0xcf,0x06,0x00,0x00,0xd1,0x06,0xcf,
-+	0x06,0x07,0x00,0xd0,0x06,0xcf,0x06,0x07,0x00,0xcf,0x86,0x55,0x04,0x07,0x00,0x14,
-+	0x04,0x07,0x00,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,0x00,0xcf,0x06,0x00,
-+	0x00,0xcf,0x86,0xcf,0x06,0x00,0x00,0xcf,0x86,0xcf,0x06,0x00,0x00,0xcf,0x86,0xcf,
-+	0x06,0x00,0x00,0xd2,0x08,0xcf,0x86,0xcf,0x06,0x00,0x00,0xd1,0x08,0xcf,0x86,0xcf,
-+	0x06,0x00,0x00,0xd0,0x08,0xcf,0x86,0xcf,0x06,0x00,0x00,0xcf,0x86,0xd5,0x06,0xcf,
-+	0x06,0x00,0x00,0xd4,0x06,0xcf,0x06,0x00,0x00,0xd3,0x06,0xcf,0x06,0x00,0x00,0xd2,
-+	0x06,0xcf,0x06,0x00,0x00,0xd1,0x06,0xcf,0x06,0x00,0x00,0xd0,0x06,0xcf,0x06,0x00,
-+	0x00,0xcf,0x86,0x55,0x04,0x00,0x00,0x54,0x04,0x00,0x00,0x53,0x04,0x00,0x00,0x52,
-+	0x04,0x00,0x00,0x11,0x04,0x00,0x00,0x02,0x00,0xcf,0x86,0xcf,0x06,0x02,0x00,0x81,
-+	0x80,0xcf,0x86,0x85,0x84,0xcf,0x86,0xcf,0x06,0x02,0x00,0x00,0x00,0x00,0x00,0x00
- };
- 
- struct utf8data_table utf8_data_table = {
-diff --git a/include/linux/bpf.h b/include/linux/bpf.h
-index 722102518dc951..1e05cc80e0485f 100644
---- a/include/linux/bpf.h
-+++ b/include/linux/bpf.h
-@@ -288,6 +288,7 @@ struct bpf_map {
- 	 * same prog type, JITed flag and xdp_has_frags flag.
- 	 */
- 	struct {
-+		const struct btf_type *attach_func_proto;
- 		spinlock_t lock;
- 		enum bpf_prog_type type;
- 		bool jited;
-diff --git a/include/linux/intel_tpmi.h b/include/linux/intel_tpmi.h
-index 04d937ad4dc4f5..ee07393445f9f2 100644
---- a/include/linux/intel_tpmi.h
-+++ b/include/linux/intel_tpmi.h
-@@ -6,6 +6,12 @@
- #ifndef _INTEL_TPMI_H_
- #define _INTEL_TPMI_H_
- 
-+#include <linux/bitfield.h>
-+
-+#define TPMI_VERSION_INVALID	0xff
-+#define TPMI_MINOR_VERSION(val)	FIELD_GET(GENMASK(4, 0), val)
-+#define TPMI_MAJOR_VERSION(val)	FIELD_GET(GENMASK(7, 5), val)
-+
- /**
-  * struct intel_tpmi_plat_info - Platform information for a TPMI device instance
-  * @package_id:	CPU Package id
-diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
-index 8553dc1d0e8983..f0bc9aa5aed3f6 100644
---- a/include/linux/jbd2.h
-+++ b/include/linux/jbd2.h
-@@ -1084,7 +1084,7 @@ struct journal_s
- 	int			j_revoke_records_per_block;
- 
- 	/**
--	 * @j_transaction_overhead:
-+	 * @j_transaction_overhead_buffers:
- 	 *
- 	 * Number of blocks each transaction needs for its own bookkeeping
- 	 */
-diff --git a/include/linux/mhi_ep.h b/include/linux/mhi_ep.h
-index 96f3a133540dba..11bf3212f7822d 100644
---- a/include/linux/mhi_ep.h
-+++ b/include/linux/mhi_ep.h
-@@ -51,14 +51,23 @@ struct mhi_ep_db_info {
- 
- /**
-  * struct mhi_ep_buf_info - MHI Endpoint transfer buffer info
-+ * @mhi_dev: MHI device associated with this buffer
-  * @dev_addr: Address of the buffer in endpoint
-  * @host_addr: Address of the bufffer in host
-  * @size: Size of the buffer
-+ * @code: Transfer completion code
-+ * @cb: Callback to be executed by controller drivers after transfer completion (async)
-+ * @cb_buf: Opaque buffer to be passed to the callback
-  */
- struct mhi_ep_buf_info {
-+	struct mhi_ep_device *mhi_dev;
- 	void *dev_addr;
- 	u64 host_addr;
- 	size_t size;
-+	int code;
-+
-+	void (*cb)(struct mhi_ep_buf_info *buf_info);
-+	void *cb_buf;
- };
- 
- /**
-@@ -94,8 +103,10 @@ struct mhi_ep_buf_info {
-  * @raise_irq: CB function for raising IRQ to the host
-  * @alloc_map: CB function for allocating memory in endpoint for storing host context and mapping it
-  * @unmap_free: CB function to unmap and free the allocated memory in endpoint for storing host context
-- * @read_from_host: CB function for reading from host memory from endpoint
-- * @write_to_host: CB function for writing to host memory from endpoint
-+ * @read_sync: CB function for reading from host memory synchronously
-+ * @write_sync: CB function for writing to host memory synchronously
-+ * @read_async: CB function for reading from host memory asynchronously
-+ * @write_async: CB function for writing to host memory asynchronously
-  * @mhi_state: MHI Endpoint state
-  * @max_chan: Maximum channels supported by the endpoint controller
-  * @mru: MRU (Maximum Receive Unit) value of the endpoint controller
-@@ -149,8 +160,10 @@ struct mhi_ep_cntrl {
- 			 void __iomem **virt, size_t size);
- 	void (*unmap_free)(struct mhi_ep_cntrl *mhi_cntrl, u64 pci_addr, phys_addr_t phys,
- 			   void __iomem *virt, size_t size);
--	int (*read_from_host)(struct mhi_ep_cntrl *mhi_cntrl, struct mhi_ep_buf_info *buf_info);
--	int (*write_to_host)(struct mhi_ep_cntrl *mhi_cntrl, struct mhi_ep_buf_info *buf_info);
-+	int (*read_sync)(struct mhi_ep_cntrl *mhi_cntrl, struct mhi_ep_buf_info *buf_info);
-+	int (*write_sync)(struct mhi_ep_cntrl *mhi_cntrl, struct mhi_ep_buf_info *buf_info);
-+	int (*read_async)(struct mhi_ep_cntrl *mhi_cntrl, struct mhi_ep_buf_info *buf_info);
-+	int (*write_async)(struct mhi_ep_cntrl *mhi_cntrl, struct mhi_ep_buf_info *buf_info);
- 
- 	enum mhi_state mhi_state;
- 
-diff --git a/include/linux/netlink.h b/include/linux/netlink.h
-index 75d7de34c90874..e8d713a37d1769 100644
---- a/include/linux/netlink.h
-+++ b/include/linux/netlink.h
-@@ -289,6 +289,7 @@ struct netlink_callback {
- 	u16			answer_flags;
- 	u32			min_dump_alloc;
- 	unsigned int		prev_seq, seq;
-+	int			flags;
- 	bool			strict_check;
- 	union {
- 		u8		ctx[48];
-@@ -321,6 +322,7 @@ struct netlink_dump_control {
- 	void *data;
- 	struct module *module;
- 	u32 min_dump_alloc;
-+	int flags;
- };
- 
- int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
-diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
-index cd628c4b011e54..86d96e00c2e3de 100644
---- a/include/linux/nfs_fs_sb.h
-+++ b/include/linux/nfs_fs_sb.h
-@@ -238,6 +238,7 @@ struct nfs_server {
- 	struct list_head	layouts;
- 	struct list_head	delegations;
- 	struct list_head	ss_copies;
-+	struct list_head	ss_src_copies;
- 
- 	unsigned long		mig_gen;
- 	unsigned long		mig_status;
-diff --git a/include/linux/pci.h b/include/linux/pci.h
-index 7b18a4b3efb0e7..2b7e45bae94089 100644
---- a/include/linux/pci.h
-+++ b/include/linux/pci.h
-@@ -1630,8 +1630,6 @@ struct msix_entry {
- 	u16	entry;	/* Driver uses to specify entry, OS writes */
- };
- 
--struct msi_domain_template;
--
- #ifdef CONFIG_PCI_MSI
- int pci_msi_vec_count(struct pci_dev *dev);
- void pci_disable_msi(struct pci_dev *dev);
-@@ -1664,11 +1662,6 @@ void pci_msix_free_irq(struct pci_dev *pdev, struct msi_map map);
- void pci_free_irq_vectors(struct pci_dev *dev);
- int pci_irq_vector(struct pci_dev *dev, unsigned int nr);
- const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev, int vec);
--bool pci_create_ims_domain(struct pci_dev *pdev, const struct msi_domain_template *template,
--			   unsigned int hwsize, void *data);
--struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev, union msi_instance_cookie *icookie,
--				 const struct irq_affinity_desc *affdesc);
--void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map);
- 
- #else
- static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; }
-@@ -1732,25 +1725,6 @@ static inline const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev,
- {
- 	return cpu_possible_mask;
- }
--
--static inline bool pci_create_ims_domain(struct pci_dev *pdev,
--					 const struct msi_domain_template *template,
--					 unsigned int hwsize, void *data)
--{ return false; }
--
--static inline struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev,
--					       union msi_instance_cookie *icookie,
--					       const struct irq_affinity_desc *affdesc)
--{
--	struct msi_map map = { .index = -ENOSYS, };
--
--	return map;
--}
--
--static inline void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map)
--{
--}
--
- #endif
- 
- /**
-@@ -2667,6 +2641,14 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev)
- void pci_uevent_ers(struct pci_dev *pdev, enum  pci_ers_result err_type);
- #endif
- 
-+struct msi_domain_template;
-+
-+bool pci_create_ims_domain(struct pci_dev *pdev, const struct msi_domain_template *template,
-+			   unsigned int hwsize, void *data);
-+struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev, union msi_instance_cookie *icookie,
-+				 const struct irq_affinity_desc *affdesc);
-+void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map);
-+
- #include <linux/dma-mapping.h>
- 
- #define pci_printk(level, pdev, fmt, arg...) \
-diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
-index abff4e3b6a58b9..3dce2be622e745 100644
---- a/include/linux/pci_ids.h
-+++ b/include/linux/pci_ids.h
-@@ -580,6 +580,8 @@
- #define PCI_DEVICE_ID_AMD_19H_M78H_DF_F3 0x12fb
- #define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3 0x12c3
- #define PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3 0x16fb
-+#define PCI_DEVICE_ID_AMD_1AH_M60H_DF_F3 0x124b
-+#define PCI_DEVICE_ID_AMD_1AH_M70H_DF_F3 0x12bb
- #define PCI_DEVICE_ID_AMD_MI200_DF_F3	0x14d3
- #define PCI_DEVICE_ID_AMD_VANGOGH_USB	0x163a
- #define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703
-@@ -2653,6 +2655,8 @@
- #define PCI_DEVICE_ID_DCI_PCCOM8	0x0002
- #define PCI_DEVICE_ID_DCI_PCCOM2	0x0004
- 
-+#define PCI_VENDOR_ID_GLENFLY		0x6766
-+
- #define PCI_VENDOR_ID_INTEL		0x8086
- #define PCI_DEVICE_ID_INTEL_EESSC	0x0008
- #define PCI_DEVICE_ID_INTEL_HDA_CML_LP	0x02c8
-diff --git a/include/linux/tcp.h b/include/linux/tcp.h
-index 3c5efeeb024f65..9b371aa7c79623 100644
---- a/include/linux/tcp.h
-+++ b/include/linux/tcp.h
-@@ -377,6 +377,14 @@ struct tcp_sock {
- 				 * Total data bytes retransmitted
- 				 */
- 	u32	total_retrans;	/* Total retransmits for entire connection */
-+	u32	rto_stamp;	/* Start time (ms) of last CA_Loss recovery */
-+	u16	total_rto;	/* Total number of RTO timeouts, including
-+				 * SYN/SYN-ACK and recurring timeouts.
-+				 */
-+	u16	total_rto_recoveries;	/* Total number of RTO recoveries,
-+					 * including any unfinished recovery.
-+					 */
-+	u32	total_rto_time;	/* ms spent in (completed) RTO recoveries. */
- 
- 	u32	urg_seq;	/* Seq of received urgent pointer */
- 	unsigned int		keepalive_time;	  /* time before keep alive takes place */
-diff --git a/include/net/mctp.h b/include/net/mctp.h
-index 2bff5f47ce82f1..1eb1b4393e46bd 100644
---- a/include/net/mctp.h
-+++ b/include/net/mctp.h
-@@ -293,7 +293,7 @@ void mctp_neigh_remove_dev(struct mctp_dev *mdev);
- int mctp_routes_init(void);
- void mctp_routes_exit(void);
- 
--void mctp_device_init(void);
-+int mctp_device_init(void);
- void mctp_device_exit(void);
- 
- #endif /* __NET_MCTP_H */
-diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
-index 6506221c5fe31f..c1fa6fee0acfa7 100644
---- a/include/net/rtnetlink.h
-+++ b/include/net/rtnetlink.h
-@@ -12,6 +12,7 @@ typedef int (*rtnl_dumpit_func)(struct sk_buff *, struct netlink_callback *);
- enum rtnl_link_flags {
- 	RTNL_FLAG_DOIT_UNLOCKED		= BIT(0),
- 	RTNL_FLAG_BULK_DEL_SUPPORTED	= BIT(1),
-+	RTNL_FLAG_DUMP_UNLOCKED		= BIT(2),
- };
- 
- enum rtnl_kinds {
-@@ -27,6 +28,15 @@ static inline enum rtnl_kinds rtnl_msgtype_kind(int msgtype)
- 	return msgtype & RTNL_KIND_MASK;
- }
- 
-+struct rtnl_msg_handler {
-+	struct module *owner;
-+	int protocol;
-+	int msgtype;
-+	rtnl_doit_func doit;
-+	rtnl_dumpit_func dumpit;
-+	int flags;
-+};
-+
- void rtnl_register(int protocol, int msgtype,
- 		   rtnl_doit_func, rtnl_dumpit_func, unsigned int flags);
- int rtnl_register_module(struct module *owner, int protocol, int msgtype,
-@@ -34,6 +44,14 @@ int rtnl_register_module(struct module *owner, int protocol, int msgtype,
- int rtnl_unregister(int protocol, int msgtype);
- void rtnl_unregister_all(int protocol);
- 
-+int __rtnl_register_many(const struct rtnl_msg_handler *handlers, int n);
-+void __rtnl_unregister_many(const struct rtnl_msg_handler *handlers, int n);
-+
-+#define rtnl_register_many(handlers)				\
-+	__rtnl_register_many(handlers, ARRAY_SIZE(handlers))
-+#define rtnl_unregister_many(handlers)				\
-+	__rtnl_unregister_many(handlers, ARRAY_SIZE(handlers))
-+
- static inline int rtnl_msg_family(const struct nlmsghdr *nlh)
- {
- 	if (nlmsg_len(nlh) >= sizeof(struct rtgenmsg))
-diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
-index 2799d44e5b9798..326d3a322c109e 100644
---- a/include/net/sch_generic.h
-+++ b/include/net/sch_generic.h
-@@ -845,7 +845,6 @@ static inline void qdisc_calculate_pkt_len(struct sk_buff *skb,
- static inline int qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch,
- 				struct sk_buff **to_free)
- {
--	qdisc_calculate_pkt_len(skb, sch);
- 	return sch->enqueue(skb, sch, to_free);
- }
- 
-diff --git a/include/net/sock.h b/include/net/sock.h
-index 2a1aee50384828..c3961050b8e394 100644
---- a/include/net/sock.h
-+++ b/include/net/sock.h
-@@ -902,6 +902,8 @@ static inline void sk_add_bind2_node(struct sock *sk, struct hlist_head *list)
- 	hlist_for_each_entry(__sk, list, sk_bind_node)
- #define sk_for_each_bound_bhash2(__sk, list) \
- 	hlist_for_each_entry(__sk, list, sk_bind2_node)
-+#define sk_for_each_bound_safe(__sk, tmp, list) \
-+	hlist_for_each_entry_safe(__sk, tmp, list, sk_bind_node)
- 
- /**
-  * sk_for_each_entry_offset_rcu - iterate over a list at a given struct offset
-diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
-index 9c8b6f611330c2..c38f4fe5e64cf4 100644
---- a/include/scsi/scsi_device.h
-+++ b/include/scsi/scsi_device.h
-@@ -216,7 +216,6 @@ struct scsi_device {
- 	unsigned use_192_bytes_for_3f:1; /* ask for 192 bytes from page 0x3f */
- 	unsigned no_start_on_add:1;	/* do not issue start on add */
- 	unsigned allow_restart:1; /* issue START_UNIT in error handler */
--	unsigned no_start_on_resume:1; /* Do not issue START_STOP_UNIT on resume */
- 	unsigned start_stop_pwr_cond:1;	/* Set power cond. in START_STOP_UNIT */
- 	unsigned no_uld_attach:1; /* disable connecting to upper level drivers */
- 	unsigned select_no_atn:1;
-diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h
-index 4e5f35dc042a17..c0f2135968fec1 100644
---- a/include/sound/cs35l56.h
-+++ b/include/sound/cs35l56.h
-@@ -287,6 +287,7 @@ int cs35l56_runtime_suspend_common(struct cs35l56_base *cs35l56_base);
- int cs35l56_runtime_resume_common(struct cs35l56_base *cs35l56_base, bool is_soundwire);
- void cs35l56_init_cs_dsp(struct cs35l56_base *cs35l56_base, struct cs_dsp *cs_dsp);
- int cs35l56_hw_init(struct cs35l56_base *cs35l56_base);
-+int cs35l56_get_speaker_id(struct cs35l56_base *cs35l56_base);
- int cs35l56_get_bclk_freq_id(unsigned int freq);
- void cs35l56_fill_supply_names(struct regulator_bulk_data *data);
- 
-diff --git a/include/sound/tas2781-tlv.h b/include/sound/tas2781-tlv.h
-index 4038dd421150a3..1dc59005d241fb 100644
---- a/include/sound/tas2781-tlv.h
-+++ b/include/sound/tas2781-tlv.h
-@@ -15,7 +15,7 @@
- #ifndef __TAS2781_TLV_H__
- #define __TAS2781_TLV_H__
- 
--static const DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0);
-+static const __maybe_unused DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0);
- static const DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0);
- 
- #endif
-diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
-index 879eeb0a084b4d..d1d08da6331ab5 100644
---- a/include/uapi/linux/tcp.h
-+++ b/include/uapi/linux/tcp.h
-@@ -289,6 +289,18 @@ struct tcp_info {
- 				      */
- 
- 	__u32   tcpi_rehash;         /* PLB or timeout triggered rehash attempts */
-+
-+	__u16	tcpi_total_rto;	/* Total number of RTO timeouts, including
-+				 * SYN/SYN-ACK and recurring timeouts.
-+				 */
-+	__u16	tcpi_total_rto_recoveries;	/* Total number of RTO
-+						 * recoveries, including any
-+						 * unfinished recovery.
-+						 */
-+	__u32	tcpi_total_rto_time;	/* Total time spent in RTO recoveries
-+					 * in milliseconds, including any
-+					 * unfinished recovery.
-+					 */
- };
- 
- /* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */
-diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
-index 7b0a100e1139ae..39d8d1fc5c2bc0 100644
---- a/io_uring/io_uring.c
-+++ b/io_uring/io_uring.c
-@@ -701,6 +701,21 @@ static void __io_cqring_overflow_flush(struct io_ring_ctx *ctx)
- 		memcpy(cqe, &ocqe->cqe, cqe_size);
- 		list_del(&ocqe->list);
- 		kfree(ocqe);
-+
-+		/*
-+		 * For silly syzbot cases that deliberately overflow by huge
-+		 * amounts, check if we need to resched and drop and
-+		 * reacquire the locks if so. Nothing real would ever hit this.
-+		 * Ideally we'd have a non-posting unlock for this, but hard
-+		 * to care for a non-real case.
-+		 */
-+		if (need_resched()) {
-+			io_cq_unlock_post(ctx);
-+			mutex_unlock(&ctx->uring_lock);
-+			cond_resched();
-+			mutex_lock(&ctx->uring_lock);
-+			io_cq_lock(ctx);
-+		}
- 	}
- 
- 	if (list_empty(&ctx->cq_overflow_list)) {
-diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c
-index c9843dde690813..1811efcfbd6e3b 100644
---- a/kernel/bpf/arraymap.c
-+++ b/kernel/bpf/arraymap.c
-@@ -73,6 +73,9 @@ int array_map_alloc_check(union bpf_attr *attr)
- 	/* avoid overflow on round_up(map->value_size) */
- 	if (attr->value_size > INT_MAX)
- 		return -E2BIG;
-+	/* percpu map value size is bound by PCPU_MIN_UNIT_SIZE */
-+	if (percpu && round_up(attr->value_size, 8) > PCPU_MIN_UNIT_SIZE)
-+		return -E2BIG;
- 
- 	return 0;
- }
-diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
-index 4124805ad7ba5f..58ee17f429a33a 100644
---- a/kernel/bpf/core.c
-+++ b/kernel/bpf/core.c
-@@ -2259,6 +2259,7 @@ bool bpf_prog_map_compatible(struct bpf_map *map,
- {
- 	enum bpf_prog_type prog_type = resolve_prog_type(fp);
- 	bool ret;
-+	struct bpf_prog_aux *aux = fp->aux;
- 
- 	if (fp->kprobe_override)
- 		return false;
-@@ -2268,7 +2269,7 @@ bool bpf_prog_map_compatible(struct bpf_map *map,
- 	 * in the case of devmap and cpumap). Until device checks
- 	 * are implemented, prohibit adding dev-bound programs to program maps.
- 	 */
--	if (bpf_prog_is_dev_bound(fp->aux))
-+	if (bpf_prog_is_dev_bound(aux))
- 		return false;
- 
- 	spin_lock(&map->owner.lock);
-@@ -2278,12 +2279,26 @@ bool bpf_prog_map_compatible(struct bpf_map *map,
- 		 */
- 		map->owner.type  = prog_type;
- 		map->owner.jited = fp->jited;
--		map->owner.xdp_has_frags = fp->aux->xdp_has_frags;
-+		map->owner.xdp_has_frags = aux->xdp_has_frags;
-+		map->owner.attach_func_proto = aux->attach_func_proto;
- 		ret = true;
- 	} else {
- 		ret = map->owner.type  == prog_type &&
- 		      map->owner.jited == fp->jited &&
--		      map->owner.xdp_has_frags == fp->aux->xdp_has_frags;
-+		      map->owner.xdp_has_frags == aux->xdp_has_frags;
-+		if (ret &&
-+		    map->owner.attach_func_proto != aux->attach_func_proto) {
-+			switch (prog_type) {
-+			case BPF_PROG_TYPE_TRACING:
-+			case BPF_PROG_TYPE_LSM:
-+			case BPF_PROG_TYPE_EXT:
-+			case BPF_PROG_TYPE_STRUCT_OPS:
-+				ret = false;
-+				break;
-+			default:
-+				break;
-+			}
-+		}
- 	}
- 	spin_unlock(&map->owner.lock);
- 
-diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c
-index 85cd17ca382905..7c64ad4f3732be 100644
---- a/kernel/bpf/hashtab.c
-+++ b/kernel/bpf/hashtab.c
-@@ -458,6 +458,9 @@ static int htab_map_alloc_check(union bpf_attr *attr)
- 		 * kmalloc-able later in htab_map_update_elem()
- 		 */
- 		return -E2BIG;
-+	/* percpu map value size is bound by PCPU_MIN_UNIT_SIZE */
-+	if (percpu && round_up(attr->value_size, 8) > PCPU_MIN_UNIT_SIZE)
-+		return -E2BIG;
- 
- 	return 0;
- }
-diff --git a/kernel/kthread.c b/kernel/kthread.c
-index ac03bc55e17caf..980e6b325b7dc7 100644
---- a/kernel/kthread.c
-+++ b/kernel/kthread.c
-@@ -622,6 +622,8 @@ void kthread_unpark(struct task_struct *k)
- {
- 	struct kthread *kthread = to_kthread(k);
- 
-+	if (!test_bit(KTHREAD_SHOULD_PARK, &kthread->flags))
-+		return;
- 	/*
- 	 * Newly created kthread was parked when the CPU was offline.
- 	 * The binding was lost and we need to set it again.
-diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
-index 8541084eeba504..3d7b119f6e2a36 100644
---- a/kernel/rcu/tree.c
-+++ b/kernel/rcu/tree.c
-@@ -2727,8 +2727,10 @@ __call_rcu_common(struct rcu_head *head, rcu_callback_t func, bool lazy_in)
- 	}
- 
- 	check_cb_ovld(rdp);
--	if (rcu_nocb_try_bypass(rdp, head, &was_alldone, flags, lazy))
-+	if (rcu_nocb_try_bypass(rdp, head, &was_alldone, flags, lazy)) {
-+		local_irq_restore(flags);
- 		return; // Enqueued onto ->nocb_bypass, so just leave.
-+	}
- 	// If no-CBs CPU gets here, rcu_nocb_try_bypass() acquired ->nocb_lock.
- 	rcu_segcblist_enqueue(&rdp->cblist, head);
- 	if (__is_kvfree_rcu_offset((unsigned long)func))
-@@ -2746,8 +2748,8 @@ __call_rcu_common(struct rcu_head *head, rcu_callback_t func, bool lazy_in)
- 		__call_rcu_nocb_wake(rdp, was_alldone, flags); /* unlocks */
- 	} else {
- 		__call_rcu_core(rdp, head, flags);
--		local_irq_restore(flags);
- 	}
-+	local_irq_restore(flags);
- }
- 
- #ifdef CONFIG_RCU_LAZY
-@@ -4626,8 +4628,9 @@ void rcutree_migrate_callbacks(int cpu)
- 		__call_rcu_nocb_wake(my_rdp, true, flags);
- 	} else {
- 		rcu_nocb_unlock(my_rdp); /* irqs remain disabled. */
--		raw_spin_unlock_irqrestore_rcu_node(my_rnp, flags);
-+		raw_spin_unlock_rcu_node(my_rnp); /* irqs remain disabled. */
- 	}
-+	local_irq_restore(flags);
- 	if (needwake)
- 		rcu_gp_kthread_wake();
- 	lockdep_assert_irqs_enabled();
-diff --git a/kernel/rcu/tree_nocb.h b/kernel/rcu/tree_nocb.h
-index e019f166daa61b..8993b2322be2b0 100644
---- a/kernel/rcu/tree_nocb.h
-+++ b/kernel/rcu/tree_nocb.h
-@@ -516,9 +516,7 @@ static bool rcu_nocb_try_bypass(struct rcu_data *rdp, struct rcu_head *rhp,
- 	// 2. Both of these conditions are met:
- 	//    a. The bypass list previously had only lazy CBs, and:
- 	//    b. The new CB is non-lazy.
--	if (ncbs && (!bypass_is_lazy || lazy)) {
--		local_irq_restore(flags);
--	} else {
-+	if (!ncbs || (bypass_is_lazy && !lazy)) {
- 		// No-CBs GP kthread might be indefinitely asleep, if so, wake.
- 		rcu_nocb_lock(rdp); // Rare during call_rcu() flood.
- 		if (!rcu_segcblist_pend_cbs(&rdp->cblist)) {
-@@ -528,7 +526,7 @@ static bool rcu_nocb_try_bypass(struct rcu_data *rdp, struct rcu_head *rhp,
- 		} else {
- 			trace_rcu_nocb_wake(rcu_state.name, rdp->cpu,
- 					    TPS("FirstBQnoWake"));
--			rcu_nocb_unlock_irqrestore(rdp, flags);
-+			rcu_nocb_unlock(rdp);
- 		}
- 	}
- 	return true; // Callback already enqueued.
-@@ -554,7 +552,7 @@ static void __call_rcu_nocb_wake(struct rcu_data *rdp, bool was_alldone,
- 	// If we are being polled or there is no kthread, just leave.
- 	t = READ_ONCE(rdp->nocb_gp_kthread);
- 	if (rcu_nocb_poll || !t) {
--		rcu_nocb_unlock_irqrestore(rdp, flags);
-+		rcu_nocb_unlock(rdp);
- 		trace_rcu_nocb_wake(rcu_state.name, rdp->cpu,
- 				    TPS("WakeNotPoll"));
- 		return;
-@@ -567,17 +565,23 @@ static void __call_rcu_nocb_wake(struct rcu_data *rdp, bool was_alldone,
- 		rdp->qlen_last_fqs_check = len;
- 		// Only lazy CBs in bypass list
- 		if (lazy_len && bypass_len == lazy_len) {
--			rcu_nocb_unlock_irqrestore(rdp, flags);
-+			rcu_nocb_unlock(rdp);
- 			wake_nocb_gp_defer(rdp, RCU_NOCB_WAKE_LAZY,
- 					   TPS("WakeLazy"));
--		} else if (!irqs_disabled_flags(flags)) {
-+		} else if (!irqs_disabled_flags(flags) && cpu_online(rdp->cpu)) {
- 			/* ... if queue was empty ... */
--			rcu_nocb_unlock_irqrestore(rdp, flags);
-+			rcu_nocb_unlock(rdp);
- 			wake_nocb_gp(rdp, false);
- 			trace_rcu_nocb_wake(rcu_state.name, rdp->cpu,
- 					    TPS("WakeEmpty"));
- 		} else {
--			rcu_nocb_unlock_irqrestore(rdp, flags);
-+			/*
-+			 * Don't do the wake-up upfront on fragile paths.
-+			 * Also offline CPUs can't call swake_up_one_online() from
-+			 * (soft-)IRQs. Rely on the final deferred wake-up from
-+			 * rcutree_report_cpu_dead()
-+			 */
-+			rcu_nocb_unlock(rdp);
- 			wake_nocb_gp_defer(rdp, RCU_NOCB_WAKE,
- 					   TPS("WakeEmptyIsDeferred"));
- 		}
-@@ -595,15 +599,15 @@ static void __call_rcu_nocb_wake(struct rcu_data *rdp, bool was_alldone,
- 		if ((rdp->nocb_cb_sleep ||
- 		     !rcu_segcblist_ready_cbs(&rdp->cblist)) &&
- 		    !timer_pending(&rdp->nocb_timer)) {
--			rcu_nocb_unlock_irqrestore(rdp, flags);
-+			rcu_nocb_unlock(rdp);
- 			wake_nocb_gp_defer(rdp, RCU_NOCB_WAKE_FORCE,
- 					   TPS("WakeOvfIsDeferred"));
- 		} else {
--			rcu_nocb_unlock_irqrestore(rdp, flags);
-+			rcu_nocb_unlock(rdp);
- 			trace_rcu_nocb_wake(rcu_state.name, rdp->cpu, TPS("WakeNot"));
- 		}
- 	} else {
--		rcu_nocb_unlock_irqrestore(rdp, flags);
-+		rcu_nocb_unlock(rdp);
- 		trace_rcu_nocb_wake(rcu_state.name, rdp->cpu, TPS("WakeNot"));
- 	}
- }
-diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index be878005e34499..4f93d57cc02990 100644
---- a/kernel/trace/trace.c
-+++ b/kernel/trace/trace.c
-@@ -2316,6 +2316,10 @@ struct saved_cmdlines_buffer {
- };
- static struct saved_cmdlines_buffer *savedcmd;
- 
-+/* Holds the size of a cmdline and pid element */
-+#define SAVED_CMDLINE_MAP_ELEMENT_SIZE(s)			\
-+	(TASK_COMM_LEN + sizeof((s)->map_cmdline_to_pid[0]))
-+
- static inline char *get_saved_cmdlines(int idx)
- {
- 	return &savedcmd->saved_cmdlines[idx * TASK_COMM_LEN];
-@@ -2330,7 +2334,6 @@ static void free_saved_cmdlines_buffer(struct saved_cmdlines_buffer *s)
- {
- 	int order = get_order(sizeof(*s) + s->cmdline_num * TASK_COMM_LEN);
- 
--	kfree(s->map_cmdline_to_pid);
- 	kmemleak_free(s);
- 	free_pages((unsigned long)s, order);
- }
-@@ -2343,7 +2346,7 @@ static struct saved_cmdlines_buffer *allocate_cmdlines_buffer(unsigned int val)
- 	int order;
- 
- 	/* Figure out how much is needed to hold the given number of cmdlines */
--	orig_size = sizeof(*s) + val * TASK_COMM_LEN;
-+	orig_size = sizeof(*s) + val * SAVED_CMDLINE_MAP_ELEMENT_SIZE(s);
- 	order = get_order(orig_size);
- 	size = 1 << (order + PAGE_SHIFT);
- 	page = alloc_pages(GFP_KERNEL, order);
-@@ -2355,16 +2358,11 @@ static struct saved_cmdlines_buffer *allocate_cmdlines_buffer(unsigned int val)
- 	memset(s, 0, sizeof(*s));
- 
- 	/* Round up to actual allocation */
--	val = (size - sizeof(*s)) / TASK_COMM_LEN;
-+	val = (size - sizeof(*s)) / SAVED_CMDLINE_MAP_ELEMENT_SIZE(s);
- 	s->cmdline_num = val;
- 
--	s->map_cmdline_to_pid = kmalloc_array(val,
--					      sizeof(*s->map_cmdline_to_pid),
--					      GFP_KERNEL);
--	if (!s->map_cmdline_to_pid) {
--		free_saved_cmdlines_buffer(s);
--		return NULL;
--	}
-+	/* Place map_cmdline_to_pid array right after saved_cmdlines */
-+	s->map_cmdline_to_pid = (unsigned *)&s->saved_cmdlines[val * TASK_COMM_LEN];
- 
- 	s->cmdline_idx = 0;
- 	memset(&s->map_pid_to_cmdline, NO_CMDLINE_MAP,
-diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
-index 3b7d3e9eb6ea45..db575094c49825 100644
---- a/kernel/trace/trace_output.c
-+++ b/kernel/trace/trace_output.c
-@@ -1587,12 +1587,11 @@ static enum print_line_t trace_print_print(struct trace_iterator *iter,
- {
- 	struct print_entry *field;
- 	struct trace_seq *s = &iter->seq;
--	int max = iter->ent_size - offsetof(struct print_entry, buf);
- 
- 	trace_assign_type(field, iter->ent);
- 
- 	seq_print_ip_sym(s, field->ip, flags);
--	trace_seq_printf(s, ": %.*s", max, field->buf);
-+	trace_seq_printf(s, ": %s", field->buf);
- 
- 	return trace_handle_return(s);
- }
-@@ -1601,11 +1600,10 @@ static enum print_line_t trace_print_raw(struct trace_iterator *iter, int flags,
- 					 struct trace_event *event)
- {
- 	struct print_entry *field;
--	int max = iter->ent_size - offsetof(struct print_entry, buf);
- 
- 	trace_assign_type(field, iter->ent);
- 
--	trace_seq_printf(&iter->seq, "# %lx %.*s", field->ip, max, field->buf);
-+	trace_seq_printf(&iter->seq, "# %lx %s", field->ip, field->buf);
- 
- 	return trace_handle_return(&iter->seq);
- }
-diff --git a/lib/bootconfig.c b/lib/bootconfig.c
-index 8841554432d5b4..97f8911ea339e6 100644
---- a/lib/bootconfig.c
-+++ b/lib/bootconfig.c
-@@ -901,7 +901,8 @@ static int __init xbc_parse_tree(void)
- }
- 
- /**
-- * xbc_exit() - Clean up all parsed bootconfig
-+ * _xbc_exit() - Clean up all parsed bootconfig
-+ * @early: Set true if this is called before budy system is initialized.
-  *
-  * This clears all data structures of parsed bootconfig on memory.
-  * If you need to reuse xbc_init() with new boot config, you can
-diff --git a/lib/build_OID_registry b/lib/build_OID_registry
-index 56d8bafeb848b0..8267e8d71338b0 100755
---- a/lib/build_OID_registry
-+++ b/lib/build_OID_registry
-@@ -38,7 +38,9 @@ close IN_FILE || die;
- #
- open C_FILE, ">$ARGV[1]" or die;
- print C_FILE "/*\n";
--print C_FILE " * Automatically generated by ", $0 =~ s#^\Q$abs_srctree/\E##r, ".  Do not edit\n";
-+my $scriptname = $0;
-+$scriptname =~ s#^\Q$abs_srctree/\E##;
-+print C_FILE " * Automatically generated by ", $scriptname, ".  Do not edit\n";
- print C_FILE " */\n";
- 
- #
-diff --git a/mm/secretmem.c b/mm/secretmem.c
-index 3afb5ad701e14a..399552814fd0ff 100644
---- a/mm/secretmem.c
-+++ b/mm/secretmem.c
-@@ -238,7 +238,7 @@ SYSCALL_DEFINE1(memfd_secret, unsigned int, flags)
- 	/* make sure local flags do not confict with global fcntl.h */
- 	BUILD_BUG_ON(SECRETMEM_FLAGS_MASK & O_CLOEXEC);
- 
--	if (!secretmem_enable)
-+	if (!secretmem_enable || !can_set_direct_map())
- 		return -ENOSYS;
- 
- 	if (flags & ~(SECRETMEM_FLAGS_MASK | O_CLOEXEC))
-@@ -280,7 +280,7 @@ static struct file_system_type secretmem_fs = {
- 
- static int __init secretmem_init(void)
- {
--	if (!secretmem_enable)
-+	if (!secretmem_enable || !can_set_direct_map())
- 		return 0;
- 
- 	secretmem_mnt = kern_mount(&secretmem_fs);
-diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
-index ed95a87ef9ab6d..35d739988ce3e4 100644
---- a/net/bluetooth/hci_conn.c
-+++ b/net/bluetooth/hci_conn.c
-@@ -290,6 +290,9 @@ static int hci_enhanced_setup_sync(struct hci_dev *hdev, void *data)
- 
- 	kfree(conn_handle);
- 
-+	if (!hci_conn_valid(hdev, conn))
-+		return -ECANCELED;
-+
- 	bt_dev_dbg(hdev, "hcon %p", conn);
- 
- 	configure_datapath_sync(hdev, &conn->codec);
-diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
-index f787b0eb7d669b..d4e607bf35baff 100644
---- a/net/bluetooth/hci_core.c
-+++ b/net/bluetooth/hci_core.c
-@@ -711,8 +711,8 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
- 
- 	switch (cmd) {
- 	case HCISETAUTH:
--		err = __hci_cmd_sync_status(hdev, HCI_OP_WRITE_AUTH_ENABLE,
--					    1, &dr.dev_opt, HCI_CMD_TIMEOUT);
-+		err = hci_cmd_sync_status(hdev, HCI_OP_WRITE_AUTH_ENABLE,
-+					  1, &dr.dev_opt, HCI_CMD_TIMEOUT);
- 		break;
- 
- 	case HCISETENCRYPT:
-@@ -723,23 +723,21 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
- 
- 		if (!test_bit(HCI_AUTH, &hdev->flags)) {
- 			/* Auth must be enabled first */
--			err = __hci_cmd_sync_status(hdev,
--						    HCI_OP_WRITE_AUTH_ENABLE,
--						    1, &dr.dev_opt,
--						    HCI_CMD_TIMEOUT);
-+			err = hci_cmd_sync_status(hdev,
-+						  HCI_OP_WRITE_AUTH_ENABLE,
-+						  1, &dr.dev_opt,
-+						  HCI_CMD_TIMEOUT);
- 			if (err)
- 				break;
- 		}
- 
--		err = __hci_cmd_sync_status(hdev, HCI_OP_WRITE_ENCRYPT_MODE,
--					    1, &dr.dev_opt,
--					    HCI_CMD_TIMEOUT);
-+		err = hci_cmd_sync_status(hdev, HCI_OP_WRITE_ENCRYPT_MODE,
-+					  1, &dr.dev_opt, HCI_CMD_TIMEOUT);
- 		break;
- 
- 	case HCISETSCAN:
--		err = __hci_cmd_sync_status(hdev, HCI_OP_WRITE_SCAN_ENABLE,
--					    1, &dr.dev_opt,
--					    HCI_CMD_TIMEOUT);
-+		err = hci_cmd_sync_status(hdev, HCI_OP_WRITE_SCAN_ENABLE,
-+					  1, &dr.dev_opt, HCI_CMD_TIMEOUT);
- 
- 		/* Ensure that the connectable and discoverable states
- 		 * get correctly modified as this was a non-mgmt change.
-@@ -751,9 +749,8 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
- 	case HCISETLINKPOL:
- 		policy = cpu_to_le16(dr.dev_opt);
- 
--		err = __hci_cmd_sync_status(hdev, HCI_OP_WRITE_DEF_LINK_POLICY,
--					    2, &policy,
--					    HCI_CMD_TIMEOUT);
-+		err = hci_cmd_sync_status(hdev, HCI_OP_WRITE_DEF_LINK_POLICY,
-+					  2, &policy, HCI_CMD_TIMEOUT);
- 		break;
- 
- 	case HCISETLINKMODE:
-diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
-index 29aa07e9db9d71..cbff37b3273407 100644
---- a/net/bluetooth/rfcomm/sock.c
-+++ b/net/bluetooth/rfcomm/sock.c
-@@ -865,9 +865,7 @@ static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned lon
- 
- 	if (err == -ENOIOCTLCMD) {
- #ifdef CONFIG_BT_RFCOMM_TTY
--		lock_sock(sk);
- 		err = rfcomm_dev_ioctl(sk, cmd, (void __user *) arg);
--		release_sock(sk);
- #else
- 		err = -EOPNOTSUPP;
- #endif
-diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c
-index 68d55386130326..a1cfa75bbadb97 100644
---- a/net/bridge/br_netfilter_hooks.c
-+++ b/net/bridge/br_netfilter_hooks.c
-@@ -33,6 +33,7 @@
- #include <net/ip.h>
- #include <net/ipv6.h>
- #include <net/addrconf.h>
-+#include <net/dst_metadata.h>
- #include <net/route.h>
- #include <net/netfilter/br_netfilter.h>
- #include <net/netns/generic.h>
-@@ -871,6 +872,10 @@ static int br_nf_dev_queue_xmit(struct net *net, struct sock *sk, struct sk_buff
- 		return br_dev_queue_push_xmit(net, sk, skb);
- 	}
- 
-+	/* Fragmentation on metadata/template dst is not supported */
-+	if (unlikely(!skb_valid_dst(skb)))
-+		goto drop;
-+
- 	/* This is wrong! We should preserve the original fragment
- 	 * boundaries by preserving frag_list rather than refragmenting.
- 	 */
-diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
-index 4488faf059a363..4b80ec5ae57003 100644
---- a/net/bridge/br_netlink.c
-+++ b/net/bridge/br_netlink.c
-@@ -1905,7 +1905,10 @@ int __init br_netlink_init(void)
- {
- 	int err;
- 
--	br_vlan_rtnl_init();
-+	err = br_vlan_rtnl_init();
-+	if (err)
-+		goto out;
-+
- 	rtnl_af_register(&br_af_ops);
- 
- 	err = rtnl_link_register(&br_link_ops);
-@@ -1916,6 +1919,7 @@ int __init br_netlink_init(void)
- 
- out_af:
- 	rtnl_af_unregister(&br_af_ops);
-+out:
- 	return err;
- }
- 
-diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index e4f1a08322da92..72d80fd943a8a2 100644
---- a/net/bridge/br_private.h
-+++ b/net/bridge/br_private.h
-@@ -1547,7 +1547,7 @@ void br_vlan_get_stats(const struct net_bridge_vlan *v,
- void br_vlan_port_event(struct net_bridge_port *p, unsigned long event);
- int br_vlan_bridge_event(struct net_device *dev, unsigned long event,
- 			 void *ptr);
--void br_vlan_rtnl_init(void);
-+int br_vlan_rtnl_init(void);
- void br_vlan_rtnl_uninit(void);
- void br_vlan_notify(const struct net_bridge *br,
- 		    const struct net_bridge_port *p,
-@@ -1778,8 +1778,9 @@ static inline int br_vlan_bridge_event(struct net_device *dev,
- 	return 0;
- }
- 
--static inline void br_vlan_rtnl_init(void)
-+static inline int br_vlan_rtnl_init(void)
- {
-+	return 0;
- }
- 
- static inline void br_vlan_rtnl_uninit(void)
-diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
-index 15f44d026e75a8..be714b4d7b4307 100644
---- a/net/bridge/br_vlan.c
-+++ b/net/bridge/br_vlan.c
-@@ -2296,19 +2296,18 @@ static int br_vlan_rtm_process(struct sk_buff *skb, struct nlmsghdr *nlh,
- 	return err;
- }
- 
--void br_vlan_rtnl_init(void)
-+static const struct rtnl_msg_handler br_vlan_rtnl_msg_handlers[] = {
-+	{THIS_MODULE, PF_BRIDGE, RTM_NEWVLAN, br_vlan_rtm_process, NULL, 0},
-+	{THIS_MODULE, PF_BRIDGE, RTM_DELVLAN, br_vlan_rtm_process, NULL, 0},
-+	{THIS_MODULE, PF_BRIDGE, RTM_GETVLAN, NULL, br_vlan_rtm_dump, 0},
-+};
-+
-+int br_vlan_rtnl_init(void)
- {
--	rtnl_register_module(THIS_MODULE, PF_BRIDGE, RTM_GETVLAN, NULL,
--			     br_vlan_rtm_dump, 0);
--	rtnl_register_module(THIS_MODULE, PF_BRIDGE, RTM_NEWVLAN,
--			     br_vlan_rtm_process, NULL, 0);
--	rtnl_register_module(THIS_MODULE, PF_BRIDGE, RTM_DELVLAN,
--			     br_vlan_rtm_process, NULL, 0);
-+	return rtnl_register_many(br_vlan_rtnl_msg_handlers);
- }
- 
- void br_vlan_rtnl_uninit(void)
- {
--	rtnl_unregister(PF_BRIDGE, RTM_GETVLAN);
--	rtnl_unregister(PF_BRIDGE, RTM_NEWVLAN);
--	rtnl_unregister(PF_BRIDGE, RTM_DELVLAN);
-+	rtnl_unregister_many(br_vlan_rtnl_msg_handlers);
- }
-diff --git a/net/ceph/messenger_v2.c b/net/ceph/messenger_v2.c
-index a901cae2f1060a..f9ed6bf6c4776a 100644
---- a/net/ceph/messenger_v2.c
-+++ b/net/ceph/messenger_v2.c
-@@ -2038,6 +2038,9 @@ static int prepare_sparse_read_data(struct ceph_connection *con)
- 	if (!con_secure(con))
- 		con->in_data_crc = -1;
- 
-+	ceph_msg_data_cursor_init(&con->v2.in_cursor, msg,
-+				  msg->sparse_read_total);
-+
- 	reset_in_kvecs(con);
- 	con->v2.in_state = IN_S_PREPARE_SPARSE_DATA_CONT;
- 	con->v2.data_len_remain = data_len(msg);
-diff --git a/net/core/dst.c b/net/core/dst.c
-index 980e2fd2f013b3..137b8d1c72203a 100644
---- a/net/core/dst.c
-+++ b/net/core/dst.c
-@@ -109,9 +109,6 @@ struct dst_entry *dst_destroy(struct dst_entry * dst)
- 		child = xdst->child;
- 	}
- #endif
--	if (!(dst->flags & DST_NOCOUNT))
--		dst_entries_add(dst->ops, -1);
--
- 	if (dst->ops->destroy)
- 		dst->ops->destroy(dst);
- 	netdev_put(dst->dev, &dst->dev_tracker);
-@@ -161,17 +158,27 @@ void dst_dev_put(struct dst_entry *dst)
- }
- EXPORT_SYMBOL(dst_dev_put);
- 
-+static void dst_count_dec(struct dst_entry *dst)
-+{
-+	if (!(dst->flags & DST_NOCOUNT))
-+		dst_entries_add(dst->ops, -1);
-+}
-+
- void dst_release(struct dst_entry *dst)
- {
--	if (dst && rcuref_put(&dst->__rcuref))
-+	if (dst && rcuref_put(&dst->__rcuref)) {
-+		dst_count_dec(dst);
- 		call_rcu_hurry(&dst->rcu_head, dst_destroy_rcu);
-+	}
- }
- EXPORT_SYMBOL(dst_release);
- 
- void dst_release_immediate(struct dst_entry *dst)
- {
--	if (dst && rcuref_put(&dst->__rcuref))
-+	if (dst && rcuref_put(&dst->__rcuref)) {
-+		dst_count_dec(dst);
- 		dst_destroy(dst);
-+	}
- }
- EXPORT_SYMBOL(dst_release_immediate);
- 
-diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
-index 8573dad6d81716..c76c54879fdddb 100644
---- a/net/core/rtnetlink.c
-+++ b/net/core/rtnetlink.c
-@@ -389,6 +389,35 @@ void rtnl_unregister_all(int protocol)
- }
- EXPORT_SYMBOL_GPL(rtnl_unregister_all);
- 
-+int __rtnl_register_many(const struct rtnl_msg_handler *handlers, int n)
-+{
-+	const struct rtnl_msg_handler *handler;
-+	int i, err;
-+
-+	for (i = 0, handler = handlers; i < n; i++, handler++) {
-+		err = rtnl_register_internal(handler->owner, handler->protocol,
-+					     handler->msgtype, handler->doit,
-+					     handler->dumpit, handler->flags);
-+		if (err) {
-+			__rtnl_unregister_many(handlers, i);
-+			break;
-+		}
-+	}
-+
-+	return err;
-+}
-+EXPORT_SYMBOL_GPL(__rtnl_register_many);
-+
-+void __rtnl_unregister_many(const struct rtnl_msg_handler *handlers, int n)
-+{
-+	const struct rtnl_msg_handler *handler;
-+	int i;
-+
-+	for (i = n - 1, handler = handlers + n - 1; i >= 0; i--, handler--)
-+		rtnl_unregister(handler->protocol, handler->msgtype);
-+}
-+EXPORT_SYMBOL_GPL(__rtnl_unregister_many);
-+
- static LIST_HEAD(link_ops);
- 
- static const struct rtnl_link_ops *rtnl_link_ops_get(const char *kind)
-@@ -6376,6 +6405,7 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
- 		}
- 		owner = link->owner;
- 		dumpit = link->dumpit;
-+		flags = link->flags;
- 
- 		if (type == RTM_GETLINK - RTM_BASE)
- 			min_dump_alloc = rtnl_calcit(skb, nlh);
-@@ -6393,6 +6423,7 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
- 				.dump		= dumpit,
- 				.min_dump_alloc	= min_dump_alloc,
- 				.module		= owner,
-+				.flags		= flags,
- 			};
- 			err = netlink_dump_start(rtnl, skb, nlh, &c);
- 			/* netlink_dump_start() will keep a reference on
-diff --git a/net/ipv4/netfilter/nf_reject_ipv4.c b/net/ipv4/netfilter/nf_reject_ipv4.c
-index fc761915c5f6fb..675b5bbed638e4 100644
---- a/net/ipv4/netfilter/nf_reject_ipv4.c
-+++ b/net/ipv4/netfilter/nf_reject_ipv4.c
-@@ -239,9 +239,8 @@ static int nf_reject_fill_skb_dst(struct sk_buff *skb_in)
- void nf_send_reset(struct net *net, struct sock *sk, struct sk_buff *oldskb,
- 		   int hook)
- {
--	struct sk_buff *nskb;
--	struct iphdr *niph;
- 	const struct tcphdr *oth;
-+	struct sk_buff *nskb;
- 	struct tcphdr _oth;
- 
- 	oth = nf_reject_ip_tcphdr_get(oldskb, &_oth, hook);
-@@ -266,14 +265,12 @@ void nf_send_reset(struct net *net, struct sock *sk, struct sk_buff *oldskb,
- 	nskb->mark = IP4_REPLY_MARK(net, oldskb->mark);
- 
- 	skb_reserve(nskb, LL_MAX_HEADER);
--	niph = nf_reject_iphdr_put(nskb, oldskb, IPPROTO_TCP,
--				   ip4_dst_hoplimit(skb_dst(nskb)));
-+	nf_reject_iphdr_put(nskb, oldskb, IPPROTO_TCP,
-+			    ip4_dst_hoplimit(skb_dst(nskb)));
- 	nf_reject_ip_tcphdr_put(nskb, oldskb, oth);
- 	if (ip_route_me_harder(net, sk, nskb, RTN_UNSPEC))
- 		goto free_nskb;
- 
--	niph = ip_hdr(nskb);
--
- 	/* "Never happens" */
- 	if (nskb->len > dst_mtu(skb_dst(nskb)))
- 		goto free_nskb;
-@@ -290,6 +287,7 @@ void nf_send_reset(struct net *net, struct sock *sk, struct sk_buff *oldskb,
- 	 */
- 	if (nf_bridge_info_exists(oldskb)) {
- 		struct ethhdr *oeth = eth_hdr(oldskb);
-+		struct iphdr *niph = ip_hdr(nskb);
- 		struct net_device *br_indev;
- 
- 		br_indev = nf_bridge_get_physindev(oldskb, net);
-diff --git a/net/ipv4/netfilter/nft_fib_ipv4.c b/net/ipv4/netfilter/nft_fib_ipv4.c
-index 9eee535c64dd48..ba233fdd81886b 100644
---- a/net/ipv4/netfilter/nft_fib_ipv4.c
-+++ b/net/ipv4/netfilter/nft_fib_ipv4.c
-@@ -66,6 +66,7 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,
- 		.flowi4_scope = RT_SCOPE_UNIVERSE,
- 		.flowi4_iif = LOOPBACK_IFINDEX,
- 		.flowi4_uid = sock_net_uid(nft_net(pkt), NULL),
-+		.flowi4_l3mdev = l3mdev_master_ifindex_rcu(nft_in(pkt)),
- 	};
- 	const struct net_device *oif;
- 	const struct net_device *found;
-@@ -84,9 +85,6 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,
- 	else
- 		oif = NULL;
- 
--	if (priv->flags & NFTA_FIB_F_IIF)
--		fl4.flowi4_l3mdev = l3mdev_master_ifindex_rcu(oif);
--
- 	if (nft_hook(pkt) == NF_INET_PRE_ROUTING &&
- 	    nft_fib_is_loopback(pkt->skb, nft_in(pkt))) {
- 		nft_fib_store_result(dest, priv, nft_in(pkt));
-diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
-index 1e3202f2b7a87f..75371928d94f6e 100644
---- a/net/ipv4/tcp.c
-+++ b/net/ipv4/tcp.c
-@@ -3851,6 +3851,15 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info)
- 	info->tcpi_rcv_wnd = tp->rcv_wnd;
- 	info->tcpi_rehash = tp->plb_rehash + tp->timeout_rehash;
- 	info->tcpi_fastopen_client_fail = tp->fastopen_client_fail;
-+
-+	info->tcpi_total_rto = tp->total_rto;
-+	info->tcpi_total_rto_recoveries = tp->total_rto_recoveries;
-+	info->tcpi_total_rto_time = tp->total_rto_time;
-+	if (tp->rto_stamp) {
-+		info->tcpi_total_rto_time += tcp_time_stamp_raw() -
-+						tp->rto_stamp;
-+	}
-+
- 	unlock_sock_fast(sk, slow);
- }
- EXPORT_SYMBOL_GPL(tcp_get_info);
-diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index b565c8a8e7badf..fb053942dba2a1 100644
---- a/net/ipv4/tcp_input.c
-+++ b/net/ipv4/tcp_input.c
-@@ -2108,6 +2108,10 @@ void tcp_clear_retrans(struct tcp_sock *tp)
- 	tp->undo_marker = 0;
- 	tp->undo_retrans = -1;
- 	tp->sacked_out = 0;
-+	tp->rto_stamp = 0;
-+	tp->total_rto = 0;
-+	tp->total_rto_recoveries = 0;
-+	tp->total_rto_time = 0;
- }
- 
- static inline void tcp_init_undo(struct tcp_sock *tp)
-@@ -2452,8 +2456,22 @@ static bool tcp_skb_spurious_retrans(const struct tcp_sock *tp,
-  */
- static inline bool tcp_packet_delayed(const struct tcp_sock *tp)
- {
--	return tp->retrans_stamp &&
--	       tcp_tsopt_ecr_before(tp, tp->retrans_stamp);
-+	const struct sock *sk = (const struct sock *)tp;
-+
-+	if (tp->retrans_stamp &&
-+	    tcp_tsopt_ecr_before(tp, tp->retrans_stamp))
-+		return true;  /* got echoed TS before first retransmission */
-+
-+	/* Check if nothing was retransmitted (retrans_stamp==0), which may
-+	 * happen in fast recovery due to TSQ. But we ignore zero retrans_stamp
-+	 * in TCP_SYN_SENT, since when we set FLAG_SYN_ACKED we also clear
-+	 * retrans_stamp even if we had retransmitted the SYN.
-+	 */
-+	if (!tp->retrans_stamp &&	   /* no record of a retransmit/SYN? */
-+	    sk->sk_state != TCP_SYN_SENT)  /* not the FLAG_SYN_ACKED case? */
-+		return true;  /* nothing was retransmitted */
-+
-+	return false;
- }
- 
- /* Undo procedures. */
-@@ -2487,6 +2505,16 @@ static bool tcp_any_retrans_done(const struct sock *sk)
- 	return false;
- }
- 
-+/* If loss recovery is finished and there are no retransmits out in the
-+ * network, then we clear retrans_stamp so that upon the next loss recovery
-+ * retransmits_timed_out() and timestamp-undo are using the correct value.
-+ */
-+static void tcp_retrans_stamp_cleanup(struct sock *sk)
-+{
-+	if (!tcp_any_retrans_done(sk))
-+		tcp_sk(sk)->retrans_stamp = 0;
-+}
-+
- static void DBGUNDO(struct sock *sk, const char *msg)
- {
- #if FASTRETRANS_DEBUG > 1
-@@ -2854,6 +2882,9 @@ void tcp_enter_recovery(struct sock *sk, bool ece_ack)
- 	struct tcp_sock *tp = tcp_sk(sk);
- 	int mib_idx;
- 
-+	/* Start the clock with our fast retransmit, for undo and ETIMEDOUT. */
-+	tcp_retrans_stamp_cleanup(sk);
-+
- 	if (tcp_is_reno(tp))
- 		mib_idx = LINUX_MIB_TCPRENORECOVERY;
- 	else
-@@ -2872,6 +2903,14 @@ void tcp_enter_recovery(struct sock *sk, bool ece_ack)
- 	tcp_set_ca_state(sk, TCP_CA_Recovery);
- }
- 
-+static void tcp_update_rto_time(struct tcp_sock *tp)
-+{
-+	if (tp->rto_stamp) {
-+		tp->total_rto_time += tcp_time_stamp(tp) - tp->rto_stamp;
-+		tp->rto_stamp = 0;
-+	}
-+}
-+
- /* Process an ACK in CA_Loss state. Move to CA_Open if lost data are
-  * recovered or spurious. Otherwise retransmits more on partial ACKs.
-  */
-@@ -3076,6 +3115,8 @@ static void tcp_fastretrans_alert(struct sock *sk, const u32 prior_snd_una,
- 		break;
- 	case TCP_CA_Loss:
- 		tcp_process_loss(sk, flag, num_dupack, rexmit);
-+		if (icsk->icsk_ca_state != TCP_CA_Loss)
-+			tcp_update_rto_time(tp);
- 		tcp_identify_packet_loss(sk, ack_flag);
- 		if (!(icsk->icsk_ca_state == TCP_CA_Open ||
- 		      (*ack_flag & FLAG_LOST_RETRANS)))
-@@ -6513,9 +6554,17 @@ static void tcp_rcv_synrecv_state_fastopen(struct sock *sk)
- 	if (inet_csk(sk)->icsk_ca_state == TCP_CA_Loss && !tp->packets_out)
- 		tcp_try_undo_recovery(sk);
- 
--	/* Reset rtx states to prevent spurious retransmits_timed_out() */
--	tp->retrans_stamp = 0;
-+	tcp_update_rto_time(tp);
- 	inet_csk(sk)->icsk_retransmits = 0;
-+	/* In tcp_fastopen_synack_timer() on the first SYNACK RTO we set
-+	 * retrans_stamp but don't enter CA_Loss, so in case that happened we
-+	 * need to zero retrans_stamp here to prevent spurious
-+	 * retransmits_timed_out(). However, if the ACK of our SYNACK caused us
-+	 * to enter CA_Recovery then we need to leave retrans_stamp as it was
-+	 * set entering CA_Recovery, for correct retransmits_timed_out() and
-+	 * undo behavior.
-+	 */
-+	tcp_retrans_stamp_cleanup(sk);
- 
- 	/* Once we leave TCP_SYN_RECV or TCP_FIN_WAIT_1,
- 	 * we no longer need req so release it.
-diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
-index 0c04c460001f10..cc2b608b1a8e78 100644
---- a/net/ipv4/tcp_minisocks.c
-+++ b/net/ipv4/tcp_minisocks.c
-@@ -560,6 +560,10 @@ struct sock *tcp_create_openreq_child(const struct sock *sk,
- 		newtp->undo_marker = treq->snt_isn;
- 		newtp->retrans_stamp = div_u64(treq->snt_synack,
- 					       USEC_PER_SEC / TCP_TS_HZ);
-+		newtp->total_rto = req->num_timeout;
-+		newtp->total_rto_recoveries = 1;
-+		newtp->total_rto_time = tcp_time_stamp_raw() -
-+						newtp->retrans_stamp;
- 	}
- 	newtp->tsoffset = treq->ts_off;
- #ifdef CONFIG_TCP_MD5SIG
-diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
-index 64bcf384e9ddcc..b65cd417b0f7ca 100644
---- a/net/ipv4/tcp_timer.c
-+++ b/net/ipv4/tcp_timer.c
-@@ -411,6 +411,19 @@ abort:		tcp_write_err(sk);
- 	}
- }
- 
-+static void tcp_update_rto_stats(struct sock *sk)
-+{
-+	struct inet_connection_sock *icsk = inet_csk(sk);
-+	struct tcp_sock *tp = tcp_sk(sk);
-+
-+	if (!icsk->icsk_retransmits) {
-+		tp->total_rto_recoveries++;
-+		tp->rto_stamp = tcp_time_stamp(tp);
-+	}
-+	icsk->icsk_retransmits++;
-+	tp->total_rto++;
-+}
-+
- /*
-  *	Timer for Fast Open socket to retransmit SYNACK. Note that the
-  *	sk here is the child socket, not the parent (listener) socket.
-@@ -443,7 +456,7 @@ static void tcp_fastopen_synack_timer(struct sock *sk, struct request_sock *req)
- 	 */
- 	inet_rtx_syn_ack(sk, req);
- 	req->num_timeout++;
--	icsk->icsk_retransmits++;
-+	tcp_update_rto_stats(sk);
- 	if (!tp->retrans_stamp)
- 		tp->retrans_stamp = tcp_time_stamp(tp);
- 	inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
-@@ -586,7 +599,7 @@ void tcp_retransmit_timer(struct sock *sk)
- 
- 	tcp_enter_loss(sk);
- 
--	icsk->icsk_retransmits++;
-+	tcp_update_rto_stats(sk);
- 	if (tcp_retransmit_skb(sk, tcp_rtx_queue_head(sk), 1) > 0) {
- 		/* Retransmission failed because of local congestion,
- 		 * Let senders fight for local resources conservatively.
-diff --git a/net/ipv6/netfilter/nf_reject_ipv6.c b/net/ipv6/netfilter/nf_reject_ipv6.c
-index 690d1c04769133..4e0976534648c4 100644
---- a/net/ipv6/netfilter/nf_reject_ipv6.c
-+++ b/net/ipv6/netfilter/nf_reject_ipv6.c
-@@ -273,7 +273,6 @@ void nf_send_reset6(struct net *net, struct sock *sk, struct sk_buff *oldskb,
- 	const struct tcphdr *otcph;
- 	unsigned int otcplen, hh_len;
- 	const struct ipv6hdr *oip6h = ipv6_hdr(oldskb);
--	struct ipv6hdr *ip6h;
- 	struct dst_entry *dst = NULL;
- 	struct flowi6 fl6;
- 
-@@ -329,8 +328,7 @@ void nf_send_reset6(struct net *net, struct sock *sk, struct sk_buff *oldskb,
- 	nskb->mark = fl6.flowi6_mark;
- 
- 	skb_reserve(nskb, hh_len + dst->header_len);
--	ip6h = nf_reject_ip6hdr_put(nskb, oldskb, IPPROTO_TCP,
--				    ip6_dst_hoplimit(dst));
-+	nf_reject_ip6hdr_put(nskb, oldskb, IPPROTO_TCP, ip6_dst_hoplimit(dst));
- 	nf_reject_ip6_tcphdr_put(nskb, oldskb, otcph, otcplen);
- 
- 	nf_ct_attach(nskb, oldskb);
-@@ -345,6 +343,7 @@ void nf_send_reset6(struct net *net, struct sock *sk, struct sk_buff *oldskb,
- 	 */
- 	if (nf_bridge_info_exists(oldskb)) {
- 		struct ethhdr *oeth = eth_hdr(oldskb);
-+		struct ipv6hdr *ip6h = ipv6_hdr(nskb);
- 		struct net_device *br_indev;
- 
- 		br_indev = nf_bridge_get_physindev(oldskb, net);
-diff --git a/net/ipv6/netfilter/nft_fib_ipv6.c b/net/ipv6/netfilter/nft_fib_ipv6.c
-index 36dc14b34388c8..c9f1634b3838ae 100644
---- a/net/ipv6/netfilter/nft_fib_ipv6.c
-+++ b/net/ipv6/netfilter/nft_fib_ipv6.c
-@@ -41,8 +41,6 @@ static int nft_fib6_flowi_init(struct flowi6 *fl6, const struct nft_fib *priv,
- 	if (ipv6_addr_type(&fl6->daddr) & IPV6_ADDR_LINKLOCAL) {
- 		lookup_flags |= RT6_LOOKUP_F_IFACE;
- 		fl6->flowi6_oif = get_ifindex(dev ? dev : pkt->skb->dev);
--	} else if (priv->flags & NFTA_FIB_F_IIF) {
--		fl6->flowi6_l3mdev = l3mdev_master_ifindex_rcu(dev);
- 	}
- 
- 	if (ipv6_addr_type(&fl6->saddr) & IPV6_ADDR_UNICAST)
-@@ -75,6 +73,8 @@ static u32 __nft_fib6_eval_type(const struct nft_fib *priv,
- 	else if (priv->flags & NFTA_FIB_F_OIF)
- 		dev = nft_out(pkt);
- 
-+	fl6.flowi6_l3mdev = l3mdev_master_ifindex_rcu(dev);
-+
- 	nft_fib6_flowi_init(&fl6, priv, pkt, dev, iph);
- 
- 	if (dev && nf_ipv6_chk_addr(nft_net(pkt), &fl6.daddr, dev, true))
-@@ -165,6 +165,7 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs,
- 		.flowi6_iif = LOOPBACK_IFINDEX,
- 		.flowi6_proto = pkt->tprot,
- 		.flowi6_uid = sock_net_uid(nft_net(pkt), NULL),
-+		.flowi6_l3mdev = l3mdev_master_ifindex_rcu(nft_in(pkt)),
- 	};
- 	struct rt6_info *rt;
- 	int lookup_flags;
-diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
-index 933a58895432f0..d4a032f3457732 100644
---- a/net/mac80211/scan.c
-+++ b/net/mac80211/scan.c
-@@ -346,7 +346,8 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_sub_if_data *sdata)
- 	struct cfg80211_scan_request *req;
- 	struct cfg80211_chan_def chandef;
- 	u8 bands_used = 0;
--	int i, ielen, n_chans;
-+	int i, ielen;
-+	u32 *n_chans;
- 	u32 flags = 0;
- 
- 	req = rcu_dereference_protected(local->scan_req,
-@@ -356,34 +357,34 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_sub_if_data *sdata)
- 		return false;
- 
- 	if (ieee80211_hw_check(&local->hw, SINGLE_SCAN_ON_ALL_BANDS)) {
-+		local->hw_scan_req->req.n_channels = req->n_channels;
-+
- 		for (i = 0; i < req->n_channels; i++) {
- 			local->hw_scan_req->req.channels[i] = req->channels[i];
- 			bands_used |= BIT(req->channels[i]->band);
- 		}
--
--		n_chans = req->n_channels;
- 	} else {
- 		do {
- 			if (local->hw_scan_band == NUM_NL80211_BANDS)
- 				return false;
- 
--			n_chans = 0;
-+			n_chans = &local->hw_scan_req->req.n_channels;
-+			*n_chans = 0;
- 
- 			for (i = 0; i < req->n_channels; i++) {
- 				if (req->channels[i]->band !=
- 				    local->hw_scan_band)
- 					continue;
--				local->hw_scan_req->req.channels[n_chans] =
-+				local->hw_scan_req->req.channels[(*n_chans)++] =
- 							req->channels[i];
--				n_chans++;
-+
- 				bands_used |= BIT(req->channels[i]->band);
- 			}
- 
- 			local->hw_scan_band++;
--		} while (!n_chans);
-+		} while (!*n_chans);
- 	}
- 
--	local->hw_scan_req->req.n_channels = n_chans;
- 	ieee80211_prepare_scan_chandef(&chandef, req->scan_width);
- 
- 	if (req->flags & NL80211_SCAN_FLAG_MIN_PREQ_CONTENT)
-diff --git a/net/mctp/af_mctp.c b/net/mctp/af_mctp.c
-index f6be58b68c6f36..28be85d055330b 100644
---- a/net/mctp/af_mctp.c
-+++ b/net/mctp/af_mctp.c
-@@ -676,10 +676,14 @@ static __init int mctp_init(void)
- 	if (rc)
- 		goto err_unreg_routes;
- 
--	mctp_device_init();
-+	rc = mctp_device_init();
-+	if (rc)
-+		goto err_unreg_neigh;
- 
- 	return 0;
- 
-+err_unreg_neigh:
-+	mctp_neigh_exit();
- err_unreg_routes:
- 	mctp_routes_exit();
- err_unreg_proto:
-diff --git a/net/mctp/device.c b/net/mctp/device.c
-index acb97b25742896..85cc5f31f1e7c0 100644
---- a/net/mctp/device.c
-+++ b/net/mctp/device.c
-@@ -524,25 +524,31 @@ static struct notifier_block mctp_dev_nb = {
- 	.priority = ADDRCONF_NOTIFY_PRIORITY,
- };
- 
--void __init mctp_device_init(void)
-+static const struct rtnl_msg_handler mctp_device_rtnl_msg_handlers[] = {
-+	{THIS_MODULE, PF_MCTP, RTM_NEWADDR, mctp_rtm_newaddr, NULL, 0},
-+	{THIS_MODULE, PF_MCTP, RTM_DELADDR, mctp_rtm_deladdr, NULL, 0},
-+	{THIS_MODULE, PF_MCTP, RTM_GETADDR, NULL, mctp_dump_addrinfo, 0},
-+};
-+
-+int __init mctp_device_init(void)
- {
--	register_netdevice_notifier(&mctp_dev_nb);
-+	int err;
- 
--	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_GETADDR,
--			     NULL, mctp_dump_addrinfo, 0);
--	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_NEWADDR,
--			     mctp_rtm_newaddr, NULL, 0);
--	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_DELADDR,
--			     mctp_rtm_deladdr, NULL, 0);
-+	register_netdevice_notifier(&mctp_dev_nb);
- 	rtnl_af_register(&mctp_af_ops);
-+
-+	err = rtnl_register_many(mctp_device_rtnl_msg_handlers);
-+	if (err) {
-+		rtnl_af_unregister(&mctp_af_ops);
-+		unregister_netdevice_notifier(&mctp_dev_nb);
-+	}
-+
-+	return err;
- }
- 
- void __exit mctp_device_exit(void)
- {
-+	rtnl_unregister_many(mctp_device_rtnl_msg_handlers);
- 	rtnl_af_unregister(&mctp_af_ops);
--	rtnl_unregister(PF_MCTP, RTM_DELADDR);
--	rtnl_unregister(PF_MCTP, RTM_NEWADDR);
--	rtnl_unregister(PF_MCTP, RTM_GETADDR);
--
- 	unregister_netdevice_notifier(&mctp_dev_nb);
- }
-diff --git a/net/mctp/neigh.c b/net/mctp/neigh.c
-index ffa0f9e0983fba..590f642413e4ef 100644
---- a/net/mctp/neigh.c
-+++ b/net/mctp/neigh.c
-@@ -322,22 +322,29 @@ static struct pernet_operations mctp_net_ops = {
- 	.exit = mctp_neigh_net_exit,
- };
- 
-+static const struct rtnl_msg_handler mctp_neigh_rtnl_msg_handlers[] = {
-+	{THIS_MODULE, PF_MCTP, RTM_NEWNEIGH, mctp_rtm_newneigh, NULL, 0},
-+	{THIS_MODULE, PF_MCTP, RTM_DELNEIGH, mctp_rtm_delneigh, NULL, 0},
-+	{THIS_MODULE, PF_MCTP, RTM_GETNEIGH, NULL, mctp_rtm_getneigh, 0},
-+};
-+
- int __init mctp_neigh_init(void)
- {
--	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_NEWNEIGH,
--			     mctp_rtm_newneigh, NULL, 0);
--	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_DELNEIGH,
--			     mctp_rtm_delneigh, NULL, 0);
--	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_GETNEIGH,
--			     NULL, mctp_rtm_getneigh, 0);
--
--	return register_pernet_subsys(&mctp_net_ops);
-+	int err;
-+
-+	err = register_pernet_subsys(&mctp_net_ops);
-+	if (err)
-+		return err;
-+
-+	err = rtnl_register_many(mctp_neigh_rtnl_msg_handlers);
-+	if (err)
-+		unregister_pernet_subsys(&mctp_net_ops);
-+
-+	return err;
- }
- 
--void __exit mctp_neigh_exit(void)
-+void mctp_neigh_exit(void)
- {
-+	rtnl_unregister_many(mctp_neigh_rtnl_msg_handlers);
- 	unregister_pernet_subsys(&mctp_net_ops);
--	rtnl_unregister(PF_MCTP, RTM_GETNEIGH);
--	rtnl_unregister(PF_MCTP, RTM_DELNEIGH);
--	rtnl_unregister(PF_MCTP, RTM_NEWNEIGH);
- }
-diff --git a/net/mctp/route.c b/net/mctp/route.c
-index 01c530dbc1a657..c6a815df9d358c 100644
---- a/net/mctp/route.c
-+++ b/net/mctp/route.c
-@@ -1410,26 +1410,39 @@ static struct pernet_operations mctp_net_ops = {
- 	.exit = mctp_routes_net_exit,
- };
- 
-+static const struct rtnl_msg_handler mctp_route_rtnl_msg_handlers[] = {
-+	{THIS_MODULE, PF_MCTP, RTM_NEWROUTE, mctp_newroute, NULL, 0},
-+	{THIS_MODULE, PF_MCTP, RTM_DELROUTE, mctp_delroute, NULL, 0},
-+	{THIS_MODULE, PF_MCTP, RTM_GETROUTE, NULL, mctp_dump_rtinfo, 0},
-+};
-+
- int __init mctp_routes_init(void)
- {
-+	int err;
-+
- 	dev_add_pack(&mctp_packet_type);
- 
--	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_GETROUTE,
--			     NULL, mctp_dump_rtinfo, 0);
--	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_NEWROUTE,
--			     mctp_newroute, NULL, 0);
--	rtnl_register_module(THIS_MODULE, PF_MCTP, RTM_DELROUTE,
--			     mctp_delroute, NULL, 0);
-+	err = register_pernet_subsys(&mctp_net_ops);
-+	if (err)
-+		goto err_pernet;
-+
-+	err = rtnl_register_many(mctp_route_rtnl_msg_handlers);
-+	if (err)
-+		goto err_rtnl;
- 
--	return register_pernet_subsys(&mctp_net_ops);
-+	return 0;
-+
-+err_rtnl:
-+	unregister_pernet_subsys(&mctp_net_ops);
-+err_pernet:
-+	dev_remove_pack(&mctp_packet_type);
-+	return err;
- }
- 
- void mctp_routes_exit(void)
- {
-+	rtnl_unregister_many(mctp_route_rtnl_msg_handlers);
- 	unregister_pernet_subsys(&mctp_net_ops);
--	rtnl_unregister(PF_MCTP, RTM_DELROUTE);
--	rtnl_unregister(PF_MCTP, RTM_NEWROUTE);
--	rtnl_unregister(PF_MCTP, RTM_GETROUTE);
- 	dev_remove_pack(&mctp_packet_type);
- }
- 
-diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
-index 1af29af6538858..43e8343df0db71 100644
---- a/net/mpls/af_mpls.c
-+++ b/net/mpls/af_mpls.c
-@@ -1154,7 +1154,7 @@ static int mpls_netconf_fill_devconf(struct sk_buff *skb, struct mpls_dev *mdev,
- 
- 	if ((all || type == NETCONFA_INPUT) &&
- 	    nla_put_s32(skb, NETCONFA_INPUT,
--			mdev->input_enabled) < 0)
-+			READ_ONCE(mdev->input_enabled)) < 0)
- 		goto nla_put_failure;
- 
- 	nlmsg_end(skb, nlh);
-@@ -1303,11 +1303,12 @@ static int mpls_netconf_dump_devconf(struct sk_buff *skb,
- {
- 	const struct nlmsghdr *nlh = cb->nlh;
- 	struct net *net = sock_net(skb->sk);
--	struct hlist_head *head;
-+	struct {
-+		unsigned long ifindex;
-+	} *ctx = (void *)cb->ctx;
- 	struct net_device *dev;
- 	struct mpls_dev *mdev;
--	int idx, s_idx;
--	int h, s_h;
-+	int err = 0;
- 
- 	if (cb->strict_check) {
- 		struct netlink_ext_ack *extack = cb->extack;
-@@ -1324,40 +1325,23 @@ static int mpls_netconf_dump_devconf(struct sk_buff *skb,
- 		}
- 	}
- 
--	s_h = cb->args[0];
--	s_idx = idx = cb->args[1];
--
--	for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
--		idx = 0;
--		head = &net->dev_index_head[h];
--		rcu_read_lock();
--		cb->seq = net->dev_base_seq;
--		hlist_for_each_entry_rcu(dev, head, index_hlist) {
--			if (idx < s_idx)
--				goto cont;
--			mdev = mpls_dev_get(dev);
--			if (!mdev)
--				goto cont;
--			if (mpls_netconf_fill_devconf(skb, mdev,
--						      NETLINK_CB(cb->skb).portid,
--						      nlh->nlmsg_seq,
--						      RTM_NEWNETCONF,
--						      NLM_F_MULTI,
--						      NETCONFA_ALL) < 0) {
--				rcu_read_unlock();
--				goto done;
--			}
--			nl_dump_check_consistent(cb, nlmsg_hdr(skb));
--cont:
--			idx++;
--		}
--		rcu_read_unlock();
-+	rcu_read_lock();
-+	for_each_netdev_dump(net, dev, ctx->ifindex) {
-+		mdev = mpls_dev_get(dev);
-+		if (!mdev)
-+			continue;
-+		err = mpls_netconf_fill_devconf(skb, mdev,
-+						NETLINK_CB(cb->skb).portid,
-+						nlh->nlmsg_seq,
-+						RTM_NEWNETCONF,
-+						NLM_F_MULTI,
-+						NETCONFA_ALL);
-+		if (err < 0)
-+			break;
- 	}
--done:
--	cb->args[0] = h;
--	cb->args[1] = idx;
-+	rcu_read_unlock();
- 
--	return skb->len;
-+	return err;
- }
- 
- #define MPLS_PERDEV_SYSCTL_OFFSET(field)	\
-@@ -2745,6 +2729,15 @@ static struct rtnl_af_ops mpls_af_ops __read_mostly = {
- 	.get_stats_af_size = mpls_get_stats_af_size,
- };
- 
-+static const struct rtnl_msg_handler mpls_rtnl_msg_handlers[] __initdata_or_module = {
-+	{THIS_MODULE, PF_MPLS, RTM_NEWROUTE, mpls_rtm_newroute, NULL, 0},
-+	{THIS_MODULE, PF_MPLS, RTM_DELROUTE, mpls_rtm_delroute, NULL, 0},
-+	{THIS_MODULE, PF_MPLS, RTM_GETROUTE, mpls_getroute, mpls_dump_routes, 0},
-+	{THIS_MODULE, PF_MPLS, RTM_GETNETCONF,
-+	 mpls_netconf_get_devconf, mpls_netconf_dump_devconf,
-+	 RTNL_FLAG_DUMP_UNLOCKED},
-+};
-+
- static int __init mpls_init(void)
- {
- 	int err;
-@@ -2763,23 +2756,25 @@ static int __init mpls_init(void)
- 
- 	rtnl_af_register(&mpls_af_ops);
- 
--	rtnl_register_module(THIS_MODULE, PF_MPLS, RTM_NEWROUTE,
--			     mpls_rtm_newroute, NULL, 0);
--	rtnl_register_module(THIS_MODULE, PF_MPLS, RTM_DELROUTE,
--			     mpls_rtm_delroute, NULL, 0);
--	rtnl_register_module(THIS_MODULE, PF_MPLS, RTM_GETROUTE,
--			     mpls_getroute, mpls_dump_routes, 0);
--	rtnl_register_module(THIS_MODULE, PF_MPLS, RTM_GETNETCONF,
--			     mpls_netconf_get_devconf,
--			     mpls_netconf_dump_devconf, 0);
--	err = ipgre_tunnel_encap_add_mpls_ops();
-+	err = rtnl_register_many(mpls_rtnl_msg_handlers);
- 	if (err)
-+		goto out_unregister_rtnl_af;
-+
-+	err = ipgre_tunnel_encap_add_mpls_ops();
-+	if (err) {
- 		pr_err("Can't add mpls over gre tunnel ops\n");
-+		goto out_unregister_rtnl;
-+	}
- 
- 	err = 0;
- out:
- 	return err;
- 
-+out_unregister_rtnl:
-+	rtnl_unregister_many(mpls_rtnl_msg_handlers);
-+out_unregister_rtnl_af:
-+	rtnl_af_unregister(&mpls_af_ops);
-+	dev_remove_pack(&mpls_packet_type);
- out_unregister_pernet:
- 	unregister_pernet_subsys(&mpls_net_ops);
- 	goto out;
-diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c
-index 7884217f33eb2f..79f2278434b950 100644
---- a/net/mptcp/mib.c
-+++ b/net/mptcp/mib.c
-@@ -26,6 +26,8 @@ static const struct snmp_mib mptcp_snmp_list[] = {
- 	SNMP_MIB_ITEM("MPJoinAckRx", MPTCP_MIB_JOINACKRX),
- 	SNMP_MIB_ITEM("MPJoinAckHMacFailure", MPTCP_MIB_JOINACKMAC),
- 	SNMP_MIB_ITEM("DSSNotMatching", MPTCP_MIB_DSSNOMATCH),
-+	SNMP_MIB_ITEM("DSSCorruptionFallback", MPTCP_MIB_DSSCORRUPTIONFALLBACK),
-+	SNMP_MIB_ITEM("DSSCorruptionReset", MPTCP_MIB_DSSCORRUPTIONRESET),
- 	SNMP_MIB_ITEM("InfiniteMapTx", MPTCP_MIB_INFINITEMAPTX),
- 	SNMP_MIB_ITEM("InfiniteMapRx", MPTCP_MIB_INFINITEMAPRX),
- 	SNMP_MIB_ITEM("DSSNoMatchTCP", MPTCP_MIB_DSSTCPMISMATCH),
-diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h
-index 443604462ace80..e6e570251d32a4 100644
---- a/net/mptcp/mib.h
-+++ b/net/mptcp/mib.h
-@@ -19,6 +19,8 @@ enum linux_mptcp_mib_field {
- 	MPTCP_MIB_JOINACKRX,		/* Received an ACK + MP_JOIN */
- 	MPTCP_MIB_JOINACKMAC,		/* HMAC was wrong on ACK + MP_JOIN */
- 	MPTCP_MIB_DSSNOMATCH,		/* Received a new mapping that did not match the previous one */
-+	MPTCP_MIB_DSSCORRUPTIONFALLBACK,/* DSS corruption detected, fallback */
-+	MPTCP_MIB_DSSCORRUPTIONRESET,	/* DSS corruption detected, MPJ subflow reset */
- 	MPTCP_MIB_INFINITEMAPTX,	/* Sent an infinite mapping */
- 	MPTCP_MIB_INFINITEMAPRX,	/* Received an infinite mapping */
- 	MPTCP_MIB_DSSTCPMISMATCH,	/* DSS-mapping did not map with TCP's sequence numbers */
-diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
-index 953c22c0ec47ec..131af6be4b678a 100644
---- a/net/mptcp/pm_netlink.c
-+++ b/net/mptcp/pm_netlink.c
-@@ -864,7 +864,8 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk,
- 			int how = RCV_SHUTDOWN | SEND_SHUTDOWN;
- 			u8 id = subflow_get_local_id(subflow);
- 
--			if (inet_sk_state_load(ssk) == TCP_CLOSE)
-+			if ((1 << inet_sk_state_load(ssk)) &
-+			    (TCPF_FIN_WAIT1 | TCPF_FIN_WAIT2 | TCPF_CLOSING | TCPF_CLOSE))
- 				continue;
- 			if (rm_type == MPTCP_MIB_RMADDR && remote_id != rm_id)
- 				continue;
-diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
-index ba6248372aee70..8cdd4ec152e7b5 100644
---- a/net/mptcp/protocol.c
-+++ b/net/mptcp/protocol.c
-@@ -620,6 +620,18 @@ static bool mptcp_check_data_fin(struct sock *sk)
- 	return ret;
- }
- 
-+static void mptcp_dss_corruption(struct mptcp_sock *msk, struct sock *ssk)
-+{
-+	if (READ_ONCE(msk->allow_infinite_fallback)) {
-+		MPTCP_INC_STATS(sock_net(ssk),
-+				MPTCP_MIB_DSSCORRUPTIONFALLBACK);
-+		mptcp_do_fallback(ssk);
-+	} else {
-+		MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DSSCORRUPTIONRESET);
-+		mptcp_subflow_reset(ssk);
-+	}
-+}
-+
- static bool __mptcp_move_skbs_from_subflow(struct mptcp_sock *msk,
- 					   struct sock *ssk,
- 					   unsigned int *bytes)
-@@ -692,10 +704,16 @@ static bool __mptcp_move_skbs_from_subflow(struct mptcp_sock *msk,
- 				moved += len;
- 			seq += len;
- 
--			if (WARN_ON_ONCE(map_remaining < len))
--				break;
-+			if (unlikely(map_remaining < len)) {
-+				DEBUG_NET_WARN_ON_ONCE(1);
-+				mptcp_dss_corruption(msk, ssk);
-+			}
- 		} else {
--			WARN_ON_ONCE(!fin);
-+			if (unlikely(!fin)) {
-+				DEBUG_NET_WARN_ON_ONCE(1);
-+				mptcp_dss_corruption(msk, ssk);
-+			}
-+
- 			sk_eat_skb(ssk, skb);
- 			done = true;
- 		}
-diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
-index 2c779275a0310c..38f46502d76e04 100644
---- a/net/mptcp/subflow.c
-+++ b/net/mptcp/subflow.c
-@@ -944,8 +944,10 @@ static bool skb_is_fully_mapped(struct sock *ssk, struct sk_buff *skb)
- 	unsigned int skb_consumed;
- 
- 	skb_consumed = tcp_sk(ssk)->copied_seq - TCP_SKB_CB(skb)->seq;
--	if (WARN_ON_ONCE(skb_consumed >= skb->len))
-+	if (unlikely(skb_consumed >= skb->len)) {
-+		DEBUG_NET_WARN_ON_ONCE(1);
- 		return true;
-+	}
- 
- 	return skb->len - skb_consumed <= subflow->map_data_len -
- 					  mptcp_subflow_get_map_offset(subflow);
-@@ -1247,7 +1249,7 @@ static bool subflow_can_fallback(struct mptcp_subflow_context *subflow)
- 	else if (READ_ONCE(msk->csum_enabled))
- 		return !subflow->valid_csum_seen;
- 	else
--		return !subflow->fully_established;
-+		return READ_ONCE(msk->allow_infinite_fallback);
- }
- 
- static void mptcp_subflow_fail(struct mptcp_sock *msk, struct sock *ssk)
-diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
-index c4e0516a8dfab4..ccca6e3848bcc8 100644
---- a/net/netfilter/nf_nat_core.c
-+++ b/net/netfilter/nf_nat_core.c
-@@ -183,7 +183,35 @@ hash_by_src(const struct net *net,
- 	return reciprocal_scale(hash, nf_nat_htable_size);
- }
- 
--/* Is this tuple already taken? (not by us) */
-+/**
-+ * nf_nat_used_tuple - check if proposed nat tuple clashes with existing entry
-+ * @tuple: proposed NAT binding
-+ * @ignored_conntrack: our (unconfirmed) conntrack entry
-+ *
-+ * A conntrack entry can be inserted to the connection tracking table
-+ * if there is no existing entry with an identical tuple in either direction.
-+ *
-+ * Example:
-+ * INITIATOR -> NAT/PAT -> RESPONDER
-+ *
-+ * INITIATOR passes through NAT/PAT ("us") and SNAT is done (saddr rewrite).
-+ * Then, later, NAT/PAT itself also connects to RESPONDER.
-+ *
-+ * This will not work if the SNAT done earlier has same IP:PORT source pair.
-+ *
-+ * Conntrack table has:
-+ * ORIGINAL: $IP_INITIATOR:$SPORT -> $IP_RESPONDER:$DPORT
-+ * REPLY:    $IP_RESPONDER:$DPORT -> $IP_NAT:$SPORT
-+ *
-+ * and new locally originating connection wants:
-+ * ORIGINAL: $IP_NAT:$SPORT -> $IP_RESPONDER:$DPORT
-+ * REPLY:    $IP_RESPONDER:$DPORT -> $IP_NAT:$SPORT
-+ *
-+ * ... which would mean incoming packets cannot be distinguished between
-+ * the existing and the newly added entry (identical IP_CT_DIR_REPLY tuple).
-+ *
-+ * @return: true if the proposed NAT mapping collides with an existing entry.
-+ */
- static int
- nf_nat_used_tuple(const struct nf_conntrack_tuple *tuple,
- 		  const struct nf_conn *ignored_conntrack)
-@@ -200,6 +228,94 @@ nf_nat_used_tuple(const struct nf_conntrack_tuple *tuple,
- 	return nf_conntrack_tuple_taken(&reply, ignored_conntrack);
- }
- 
-+static bool nf_nat_allow_clash(const struct nf_conn *ct)
-+{
-+	return nf_ct_l4proto_find(nf_ct_protonum(ct))->allow_clash;
-+}
-+
-+/**
-+ * nf_nat_used_tuple_new - check if to-be-inserted conntrack collides with existing entry
-+ * @tuple: proposed NAT binding
-+ * @ignored_ct: our (unconfirmed) conntrack entry
-+ *
-+ * Same as nf_nat_used_tuple, but also check for rare clash in reverse
-+ * direction. Should be called only when @tuple has not been altered, i.e.
-+ * @ignored_conntrack will not be subject to NAT.
-+ *
-+ * @return: true if the proposed NAT mapping collides with existing entry.
-+ */
-+static noinline bool
-+nf_nat_used_tuple_new(const struct nf_conntrack_tuple *tuple,
-+		      const struct nf_conn *ignored_ct)
-+{
-+	static const unsigned long uses_nat = IPS_NAT_MASK | IPS_SEQ_ADJUST_BIT;
-+	const struct nf_conntrack_tuple_hash *thash;
-+	const struct nf_conntrack_zone *zone;
-+	struct nf_conn *ct;
-+	bool taken = true;
-+	struct net *net;
-+
-+	if (!nf_nat_used_tuple(tuple, ignored_ct))
-+		return false;
-+
-+	if (!nf_nat_allow_clash(ignored_ct))
-+		return true;
-+
-+	/* Initial choice clashes with existing conntrack.
-+	 * Check for (rare) reverse collision.
-+	 *
-+	 * This can happen when new packets are received in both directions
-+	 * at the exact same time on different CPUs.
-+	 *
-+	 * Without SMP, first packet creates new conntrack entry and second
-+	 * packet is resolved as established reply packet.
-+	 *
-+	 * With parallel processing, both packets could be picked up as
-+	 * new and both get their own ct entry allocated.
-+	 *
-+	 * If ignored_conntrack and colliding ct are not subject to NAT then
-+	 * pretend the tuple is available and let later clash resolution
-+	 * handle this at insertion time.
-+	 *
-+	 * Without it, the 'reply' packet has its source port rewritten
-+	 * by nat engine.
-+	 */
-+	if (READ_ONCE(ignored_ct->status) & uses_nat)
-+		return true;
-+
-+	net = nf_ct_net(ignored_ct);
-+	zone = nf_ct_zone(ignored_ct);
-+
-+	thash = nf_conntrack_find_get(net, zone, tuple);
-+	if (unlikely(!thash)) /* clashing entry went away */
-+		return false;
-+
-+	ct = nf_ct_tuplehash_to_ctrack(thash);
-+
-+	/* NB: IP_CT_DIR_ORIGINAL should be impossible because
-+	 * nf_nat_used_tuple() handles origin collisions.
-+	 *
-+	 * Handle remote chance other CPU confirmed its ct right after.
-+	 */
-+	if (thash->tuple.dst.dir != IP_CT_DIR_REPLY)
-+		goto out;
-+
-+	/* clashing connection subject to NAT? Retry with new tuple. */
-+	if (READ_ONCE(ct->status) & uses_nat)
-+		goto out;
-+
-+	if (nf_ct_tuple_equal(&ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple,
-+			      &ignored_ct->tuplehash[IP_CT_DIR_REPLY].tuple) &&
-+	    nf_ct_tuple_equal(&ct->tuplehash[IP_CT_DIR_REPLY].tuple,
-+			      &ignored_ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple)) {
-+		taken = false;
-+		goto out;
-+	}
-+out:
-+	nf_ct_put(ct);
-+	return taken;
-+}
-+
- static bool nf_nat_may_kill(struct nf_conn *ct, unsigned long flags)
- {
- 	static const unsigned long flags_refuse = IPS_FIXED_TIMEOUT |
-@@ -608,7 +724,7 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple,
- 	    !(range->flags & NF_NAT_RANGE_PROTO_RANDOM_ALL)) {
- 		/* try the original tuple first */
- 		if (nf_in_range(orig_tuple, range)) {
--			if (!nf_nat_used_tuple(orig_tuple, ct)) {
-+			if (!nf_nat_used_tuple_new(orig_tuple, ct)) {
- 				*tuple = *orig_tuple;
- 				return;
- 			}
-diff --git a/net/netfilter/xt_CHECKSUM.c b/net/netfilter/xt_CHECKSUM.c
-index c8a639f5616841..9d99f5a3d1764b 100644
---- a/net/netfilter/xt_CHECKSUM.c
-+++ b/net/netfilter/xt_CHECKSUM.c
-@@ -63,24 +63,37 @@ static int checksum_tg_check(const struct xt_tgchk_param *par)
- 	return 0;
- }
- 
--static struct xt_target checksum_tg_reg __read_mostly = {
--	.name		= "CHECKSUM",
--	.family		= NFPROTO_UNSPEC,
--	.target		= checksum_tg,
--	.targetsize	= sizeof(struct xt_CHECKSUM_info),
--	.table		= "mangle",
--	.checkentry	= checksum_tg_check,
--	.me		= THIS_MODULE,
-+static struct xt_target checksum_tg_reg[] __read_mostly = {
-+	{
-+		.name		= "CHECKSUM",
-+		.family		= NFPROTO_IPV4,
-+		.target		= checksum_tg,
-+		.targetsize	= sizeof(struct xt_CHECKSUM_info),
-+		.table		= "mangle",
-+		.checkentry	= checksum_tg_check,
-+		.me		= THIS_MODULE,
-+	},
-+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
-+	{
-+		.name		= "CHECKSUM",
-+		.family		= NFPROTO_IPV6,
-+		.target		= checksum_tg,
-+		.targetsize	= sizeof(struct xt_CHECKSUM_info),
-+		.table		= "mangle",
-+		.checkentry	= checksum_tg_check,
-+		.me		= THIS_MODULE,
-+	},
-+#endif
- };
- 
- static int __init checksum_tg_init(void)
- {
--	return xt_register_target(&checksum_tg_reg);
-+	return xt_register_targets(checksum_tg_reg, ARRAY_SIZE(checksum_tg_reg));
- }
- 
- static void __exit checksum_tg_exit(void)
- {
--	xt_unregister_target(&checksum_tg_reg);
-+	xt_unregister_targets(checksum_tg_reg, ARRAY_SIZE(checksum_tg_reg));
- }
- 
- module_init(checksum_tg_init);
-diff --git a/net/netfilter/xt_CLASSIFY.c b/net/netfilter/xt_CLASSIFY.c
-index 0accac98dea784..0ae8d8a1216e19 100644
---- a/net/netfilter/xt_CLASSIFY.c
-+++ b/net/netfilter/xt_CLASSIFY.c
-@@ -38,9 +38,9 @@ static struct xt_target classify_tg_reg[] __read_mostly = {
- 	{
- 		.name       = "CLASSIFY",
- 		.revision   = 0,
--		.family     = NFPROTO_UNSPEC,
-+		.family     = NFPROTO_IPV4,
- 		.hooks      = (1 << NF_INET_LOCAL_OUT) | (1 << NF_INET_FORWARD) |
--		              (1 << NF_INET_POST_ROUTING),
-+			      (1 << NF_INET_POST_ROUTING),
- 		.target     = classify_tg,
- 		.targetsize = sizeof(struct xt_classify_target_info),
- 		.me         = THIS_MODULE,
-@@ -54,6 +54,18 @@ static struct xt_target classify_tg_reg[] __read_mostly = {
- 		.targetsize = sizeof(struct xt_classify_target_info),
- 		.me         = THIS_MODULE,
- 	},
-+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
-+	{
-+		.name       = "CLASSIFY",
-+		.revision   = 0,
-+		.family     = NFPROTO_IPV6,
-+		.hooks      = (1 << NF_INET_LOCAL_OUT) | (1 << NF_INET_FORWARD) |
-+			      (1 << NF_INET_POST_ROUTING),
-+		.target     = classify_tg,
-+		.targetsize = sizeof(struct xt_classify_target_info),
-+		.me         = THIS_MODULE,
-+	},
-+#endif
- };
- 
- static int __init classify_tg_init(void)
-diff --git a/net/netfilter/xt_CONNSECMARK.c b/net/netfilter/xt_CONNSECMARK.c
-index 76acecf3e757a0..1494b3ee30e11e 100644
---- a/net/netfilter/xt_CONNSECMARK.c
-+++ b/net/netfilter/xt_CONNSECMARK.c
-@@ -114,25 +114,39 @@ static void connsecmark_tg_destroy(const struct xt_tgdtor_param *par)
- 	nf_ct_netns_put(par->net, par->family);
- }
- 
--static struct xt_target connsecmark_tg_reg __read_mostly = {
--	.name       = "CONNSECMARK",
--	.revision   = 0,
--	.family     = NFPROTO_UNSPEC,
--	.checkentry = connsecmark_tg_check,
--	.destroy    = connsecmark_tg_destroy,
--	.target     = connsecmark_tg,
--	.targetsize = sizeof(struct xt_connsecmark_target_info),
--	.me         = THIS_MODULE,
-+static struct xt_target connsecmark_tg_reg[] __read_mostly = {
-+	{
-+		.name       = "CONNSECMARK",
-+		.revision   = 0,
-+		.family     = NFPROTO_IPV4,
-+		.checkentry = connsecmark_tg_check,
-+		.destroy    = connsecmark_tg_destroy,
-+		.target     = connsecmark_tg,
-+		.targetsize = sizeof(struct xt_connsecmark_target_info),
-+		.me         = THIS_MODULE,
-+	},
-+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
-+	{
-+		.name       = "CONNSECMARK",
-+		.revision   = 0,
-+		.family     = NFPROTO_IPV6,
-+		.checkentry = connsecmark_tg_check,
-+		.destroy    = connsecmark_tg_destroy,
-+		.target     = connsecmark_tg,
-+		.targetsize = sizeof(struct xt_connsecmark_target_info),
-+		.me         = THIS_MODULE,
-+	},
-+#endif
- };
- 
- static int __init connsecmark_tg_init(void)
- {
--	return xt_register_target(&connsecmark_tg_reg);
-+	return xt_register_targets(connsecmark_tg_reg, ARRAY_SIZE(connsecmark_tg_reg));
- }
- 
- static void __exit connsecmark_tg_exit(void)
- {
--	xt_unregister_target(&connsecmark_tg_reg);
-+	xt_unregister_targets(connsecmark_tg_reg, ARRAY_SIZE(connsecmark_tg_reg));
- }
- 
- module_init(connsecmark_tg_init);
-diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c
-index 2be2f7a7b60f4e..3ba94c34297cf5 100644
---- a/net/netfilter/xt_CT.c
-+++ b/net/netfilter/xt_CT.c
-@@ -313,10 +313,30 @@ static void xt_ct_tg_destroy_v1(const struct xt_tgdtor_param *par)
- 	xt_ct_tg_destroy(par, par->targinfo);
- }
- 
-+static unsigned int
-+notrack_tg(struct sk_buff *skb, const struct xt_action_param *par)
-+{
-+	/* Previously seen (loopback)? Ignore. */
-+	if (skb->_nfct != 0)
-+		return XT_CONTINUE;
-+
-+	nf_ct_set(skb, NULL, IP_CT_UNTRACKED);
-+
-+	return XT_CONTINUE;
-+}
-+
- static struct xt_target xt_ct_tg_reg[] __read_mostly = {
-+	{
-+		.name		= "NOTRACK",
-+		.revision	= 0,
-+		.family		= NFPROTO_IPV4,
-+		.target		= notrack_tg,
-+		.table		= "raw",
-+		.me		= THIS_MODULE,
-+	},
- 	{
- 		.name		= "CT",
--		.family		= NFPROTO_UNSPEC,
-+		.family		= NFPROTO_IPV4,
- 		.targetsize	= sizeof(struct xt_ct_target_info),
- 		.usersize	= offsetof(struct xt_ct_target_info, ct),
- 		.checkentry	= xt_ct_tg_check_v0,
-@@ -327,7 +347,7 @@ static struct xt_target xt_ct_tg_reg[] __read_mostly = {
- 	},
- 	{
- 		.name		= "CT",
--		.family		= NFPROTO_UNSPEC,
-+		.family		= NFPROTO_IPV4,
- 		.revision	= 1,
- 		.targetsize	= sizeof(struct xt_ct_target_info_v1),
- 		.usersize	= offsetof(struct xt_ct_target_info, ct),
-@@ -339,7 +359,7 @@ static struct xt_target xt_ct_tg_reg[] __read_mostly = {
- 	},
- 	{
- 		.name		= "CT",
--		.family		= NFPROTO_UNSPEC,
-+		.family		= NFPROTO_IPV4,
- 		.revision	= 2,
- 		.targetsize	= sizeof(struct xt_ct_target_info_v1),
- 		.usersize	= offsetof(struct xt_ct_target_info, ct),
-@@ -349,49 +369,61 @@ static struct xt_target xt_ct_tg_reg[] __read_mostly = {
- 		.table		= "raw",
- 		.me		= THIS_MODULE,
- 	},
--};
--
--static unsigned int
--notrack_tg(struct sk_buff *skb, const struct xt_action_param *par)
--{
--	/* Previously seen (loopback)? Ignore. */
--	if (skb->_nfct != 0)
--		return XT_CONTINUE;
--
--	nf_ct_set(skb, NULL, IP_CT_UNTRACKED);
--
--	return XT_CONTINUE;
--}
--
--static struct xt_target notrack_tg_reg __read_mostly = {
--	.name		= "NOTRACK",
--	.revision	= 0,
--	.family		= NFPROTO_UNSPEC,
--	.target		= notrack_tg,
--	.table		= "raw",
--	.me		= THIS_MODULE,
-+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
-+	{
-+		.name		= "NOTRACK",
-+		.revision	= 0,
-+		.family		= NFPROTO_IPV6,
-+		.target		= notrack_tg,
-+		.table		= "raw",
-+		.me		= THIS_MODULE,
-+	},
-+	{
-+		.name		= "CT",
-+		.family		= NFPROTO_IPV6,
-+		.targetsize	= sizeof(struct xt_ct_target_info),
-+		.usersize	= offsetof(struct xt_ct_target_info, ct),
-+		.checkentry	= xt_ct_tg_check_v0,
-+		.destroy	= xt_ct_tg_destroy_v0,
-+		.target		= xt_ct_target_v0,
-+		.table		= "raw",
-+		.me		= THIS_MODULE,
-+	},
-+	{
-+		.name		= "CT",
-+		.family		= NFPROTO_IPV6,
-+		.revision	= 1,
-+		.targetsize	= sizeof(struct xt_ct_target_info_v1),
-+		.usersize	= offsetof(struct xt_ct_target_info, ct),
-+		.checkentry	= xt_ct_tg_check_v1,
-+		.destroy	= xt_ct_tg_destroy_v1,
-+		.target		= xt_ct_target_v1,
-+		.table		= "raw",
-+		.me		= THIS_MODULE,
-+	},
-+	{
-+		.name		= "CT",
-+		.family		= NFPROTO_IPV6,
-+		.revision	= 2,
-+		.targetsize	= sizeof(struct xt_ct_target_info_v1),
-+		.usersize	= offsetof(struct xt_ct_target_info, ct),
-+		.checkentry	= xt_ct_tg_check_v2,
-+		.destroy	= xt_ct_tg_destroy_v1,
-+		.target		= xt_ct_target_v1,
-+		.table		= "raw",
-+		.me		= THIS_MODULE,
-+	},
-+#endif
- };
- 
- static int __init xt_ct_tg_init(void)
- {
--	int ret;
--
--	ret = xt_register_target(&notrack_tg_reg);
--	if (ret < 0)
--		return ret;
--
--	ret = xt_register_targets(xt_ct_tg_reg, ARRAY_SIZE(xt_ct_tg_reg));
--	if (ret < 0) {
--		xt_unregister_target(&notrack_tg_reg);
--		return ret;
--	}
--	return 0;
-+	return xt_register_targets(xt_ct_tg_reg, ARRAY_SIZE(xt_ct_tg_reg));
- }
- 
- static void __exit xt_ct_tg_exit(void)
- {
- 	xt_unregister_targets(xt_ct_tg_reg, ARRAY_SIZE(xt_ct_tg_reg));
--	xt_unregister_target(&notrack_tg_reg);
- }
- 
- module_init(xt_ct_tg_init);
-diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c
-index db720efa811d58..f8b25b6f5da736 100644
---- a/net/netfilter/xt_IDLETIMER.c
-+++ b/net/netfilter/xt_IDLETIMER.c
-@@ -458,28 +458,49 @@ static void idletimer_tg_destroy_v1(const struct xt_tgdtor_param *par)
- 
- static struct xt_target idletimer_tg[] __read_mostly = {
- 	{
--	.name		= "IDLETIMER",
--	.family		= NFPROTO_UNSPEC,
--	.target		= idletimer_tg_target,
--	.targetsize     = sizeof(struct idletimer_tg_info),
--	.usersize	= offsetof(struct idletimer_tg_info, timer),
--	.checkentry	= idletimer_tg_checkentry,
--	.destroy        = idletimer_tg_destroy,
--	.me		= THIS_MODULE,
-+		.name		= "IDLETIMER",
-+		.family		= NFPROTO_IPV4,
-+		.target		= idletimer_tg_target,
-+		.targetsize     = sizeof(struct idletimer_tg_info),
-+		.usersize	= offsetof(struct idletimer_tg_info, timer),
-+		.checkentry	= idletimer_tg_checkentry,
-+		.destroy        = idletimer_tg_destroy,
-+		.me		= THIS_MODULE,
- 	},
- 	{
--	.name		= "IDLETIMER",
--	.family		= NFPROTO_UNSPEC,
--	.revision	= 1,
--	.target		= idletimer_tg_target_v1,
--	.targetsize     = sizeof(struct idletimer_tg_info_v1),
--	.usersize	= offsetof(struct idletimer_tg_info_v1, timer),
--	.checkentry	= idletimer_tg_checkentry_v1,
--	.destroy        = idletimer_tg_destroy_v1,
--	.me		= THIS_MODULE,
-+		.name		= "IDLETIMER",
-+		.family		= NFPROTO_IPV4,
-+		.revision	= 1,
-+		.target		= idletimer_tg_target_v1,
-+		.targetsize     = sizeof(struct idletimer_tg_info_v1),
-+		.usersize	= offsetof(struct idletimer_tg_info_v1, timer),
-+		.checkentry	= idletimer_tg_checkentry_v1,
-+		.destroy        = idletimer_tg_destroy_v1,
-+		.me		= THIS_MODULE,
- 	},
--
--
-+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
-+	{
-+		.name		= "IDLETIMER",
-+		.family		= NFPROTO_IPV6,
-+		.target		= idletimer_tg_target,
-+		.targetsize     = sizeof(struct idletimer_tg_info),
-+		.usersize	= offsetof(struct idletimer_tg_info, timer),
-+		.checkentry	= idletimer_tg_checkentry,
-+		.destroy        = idletimer_tg_destroy,
-+		.me		= THIS_MODULE,
-+	},
-+	{
-+		.name		= "IDLETIMER",
-+		.family		= NFPROTO_IPV6,
-+		.revision	= 1,
-+		.target		= idletimer_tg_target_v1,
-+		.targetsize     = sizeof(struct idletimer_tg_info_v1),
-+		.usersize	= offsetof(struct idletimer_tg_info_v1, timer),
-+		.checkentry	= idletimer_tg_checkentry_v1,
-+		.destroy        = idletimer_tg_destroy_v1,
-+		.me		= THIS_MODULE,
-+	},
-+#endif
- };
- 
- static struct class *idletimer_tg_class;
-diff --git a/net/netfilter/xt_LED.c b/net/netfilter/xt_LED.c
-index 36c9720ad8d6d4..f7b0286d106ac1 100644
---- a/net/netfilter/xt_LED.c
-+++ b/net/netfilter/xt_LED.c
-@@ -175,26 +175,41 @@ static void led_tg_destroy(const struct xt_tgdtor_param *par)
- 	kfree(ledinternal);
- }
- 
--static struct xt_target led_tg_reg __read_mostly = {
--	.name		= "LED",
--	.revision	= 0,
--	.family		= NFPROTO_UNSPEC,
--	.target		= led_tg,
--	.targetsize	= sizeof(struct xt_led_info),
--	.usersize	= offsetof(struct xt_led_info, internal_data),
--	.checkentry	= led_tg_check,
--	.destroy	= led_tg_destroy,
--	.me		= THIS_MODULE,
-+static struct xt_target led_tg_reg[] __read_mostly = {
-+	{
-+		.name		= "LED",
-+		.revision	= 0,
-+		.family		= NFPROTO_IPV4,
-+		.target		= led_tg,
-+		.targetsize	= sizeof(struct xt_led_info),
-+		.usersize	= offsetof(struct xt_led_info, internal_data),
-+		.checkentry	= led_tg_check,
-+		.destroy	= led_tg_destroy,
-+		.me		= THIS_MODULE,
-+	},
-+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
-+	{
-+		.name		= "LED",
-+		.revision	= 0,
-+		.family		= NFPROTO_IPV6,
-+		.target		= led_tg,
-+		.targetsize	= sizeof(struct xt_led_info),
-+		.usersize	= offsetof(struct xt_led_info, internal_data),
-+		.checkentry	= led_tg_check,
-+		.destroy	= led_tg_destroy,
-+		.me		= THIS_MODULE,
-+	},
-+#endif
- };
- 
- static int __init led_tg_init(void)
- {
--	return xt_register_target(&led_tg_reg);
-+	return xt_register_targets(led_tg_reg, ARRAY_SIZE(led_tg_reg));
- }
- 
- static void __exit led_tg_exit(void)
- {
--	xt_unregister_target(&led_tg_reg);
-+	xt_unregister_targets(led_tg_reg, ARRAY_SIZE(led_tg_reg));
- }
- 
- module_init(led_tg_init);
-diff --git a/net/netfilter/xt_NFLOG.c b/net/netfilter/xt_NFLOG.c
-index e660c3710a1096..d80abd6ccaf8f7 100644
---- a/net/netfilter/xt_NFLOG.c
-+++ b/net/netfilter/xt_NFLOG.c
-@@ -64,25 +64,39 @@ static void nflog_tg_destroy(const struct xt_tgdtor_param *par)
- 	nf_logger_put(par->family, NF_LOG_TYPE_ULOG);
- }
- 
--static struct xt_target nflog_tg_reg __read_mostly = {
--	.name       = "NFLOG",
--	.revision   = 0,
--	.family     = NFPROTO_UNSPEC,
--	.checkentry = nflog_tg_check,
--	.destroy    = nflog_tg_destroy,
--	.target     = nflog_tg,
--	.targetsize = sizeof(struct xt_nflog_info),
--	.me         = THIS_MODULE,
-+static struct xt_target nflog_tg_reg[] __read_mostly = {
-+	{
-+		.name       = "NFLOG",
-+		.revision   = 0,
-+		.family     = NFPROTO_IPV4,
-+		.checkentry = nflog_tg_check,
-+		.destroy    = nflog_tg_destroy,
-+		.target     = nflog_tg,
-+		.targetsize = sizeof(struct xt_nflog_info),
-+		.me         = THIS_MODULE,
-+	},
-+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
-+	{
-+		.name       = "NFLOG",
-+		.revision   = 0,
-+		.family     = NFPROTO_IPV4,
-+		.checkentry = nflog_tg_check,
-+		.destroy    = nflog_tg_destroy,
-+		.target     = nflog_tg,
-+		.targetsize = sizeof(struct xt_nflog_info),
-+		.me         = THIS_MODULE,
-+	},
-+#endif
- };
- 
- static int __init nflog_tg_init(void)
- {
--	return xt_register_target(&nflog_tg_reg);
-+	return xt_register_targets(nflog_tg_reg, ARRAY_SIZE(nflog_tg_reg));
- }
- 
- static void __exit nflog_tg_exit(void)
- {
--	xt_unregister_target(&nflog_tg_reg);
-+	xt_unregister_targets(nflog_tg_reg, ARRAY_SIZE(nflog_tg_reg));
- }
- 
- module_init(nflog_tg_init);
-diff --git a/net/netfilter/xt_RATEEST.c b/net/netfilter/xt_RATEEST.c
-index 80f6624e23554b..4f49cfc2783120 100644
---- a/net/netfilter/xt_RATEEST.c
-+++ b/net/netfilter/xt_RATEEST.c
-@@ -179,16 +179,31 @@ static void xt_rateest_tg_destroy(const struct xt_tgdtor_param *par)
- 	xt_rateest_put(par->net, info->est);
- }
- 
--static struct xt_target xt_rateest_tg_reg __read_mostly = {
--	.name       = "RATEEST",
--	.revision   = 0,
--	.family     = NFPROTO_UNSPEC,
--	.target     = xt_rateest_tg,
--	.checkentry = xt_rateest_tg_checkentry,
--	.destroy    = xt_rateest_tg_destroy,
--	.targetsize = sizeof(struct xt_rateest_target_info),
--	.usersize   = offsetof(struct xt_rateest_target_info, est),
--	.me         = THIS_MODULE,
-+static struct xt_target xt_rateest_tg_reg[] __read_mostly = {
-+	{
-+		.name       = "RATEEST",
-+		.revision   = 0,
-+		.family     = NFPROTO_IPV4,
-+		.target     = xt_rateest_tg,
-+		.checkentry = xt_rateest_tg_checkentry,
-+		.destroy    = xt_rateest_tg_destroy,
-+		.targetsize = sizeof(struct xt_rateest_target_info),
-+		.usersize   = offsetof(struct xt_rateest_target_info, est),
-+		.me         = THIS_MODULE,
-+	},
-+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
-+	{
-+		.name       = "RATEEST",
-+		.revision   = 0,
-+		.family     = NFPROTO_IPV6,
-+		.target     = xt_rateest_tg,
-+		.checkentry = xt_rateest_tg_checkentry,
-+		.destroy    = xt_rateest_tg_destroy,
-+		.targetsize = sizeof(struct xt_rateest_target_info),
-+		.usersize   = offsetof(struct xt_rateest_target_info, est),
-+		.me         = THIS_MODULE,
-+	},
-+#endif
- };
- 
- static __net_init int xt_rateest_net_init(struct net *net)
-@@ -214,12 +229,12 @@ static int __init xt_rateest_tg_init(void)
- 
- 	if (err)
- 		return err;
--	return xt_register_target(&xt_rateest_tg_reg);
-+	return xt_register_targets(xt_rateest_tg_reg, ARRAY_SIZE(xt_rateest_tg_reg));
- }
- 
- static void __exit xt_rateest_tg_fini(void)
- {
--	xt_unregister_target(&xt_rateest_tg_reg);
-+	xt_unregister_targets(xt_rateest_tg_reg, ARRAY_SIZE(xt_rateest_tg_reg));
- 	unregister_pernet_subsys(&xt_rateest_net_ops);
- }
- 
-diff --git a/net/netfilter/xt_SECMARK.c b/net/netfilter/xt_SECMARK.c
-index 498a0bf6f0444a..5bc5ea505eb9e0 100644
---- a/net/netfilter/xt_SECMARK.c
-+++ b/net/netfilter/xt_SECMARK.c
-@@ -157,7 +157,7 @@ static struct xt_target secmark_tg_reg[] __read_mostly = {
- 	{
- 		.name		= "SECMARK",
- 		.revision	= 0,
--		.family		= NFPROTO_UNSPEC,
-+		.family		= NFPROTO_IPV4,
- 		.checkentry	= secmark_tg_check_v0,
- 		.destroy	= secmark_tg_destroy,
- 		.target		= secmark_tg_v0,
-@@ -167,7 +167,7 @@ static struct xt_target secmark_tg_reg[] __read_mostly = {
- 	{
- 		.name		= "SECMARK",
- 		.revision	= 1,
--		.family		= NFPROTO_UNSPEC,
-+		.family		= NFPROTO_IPV4,
- 		.checkentry	= secmark_tg_check_v1,
- 		.destroy	= secmark_tg_destroy,
- 		.target		= secmark_tg_v1,
-@@ -175,6 +175,29 @@ static struct xt_target secmark_tg_reg[] __read_mostly = {
- 		.usersize	= offsetof(struct xt_secmark_target_info_v1, secid),
- 		.me		= THIS_MODULE,
- 	},
-+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
-+	{
-+		.name		= "SECMARK",
-+		.revision	= 0,
-+		.family		= NFPROTO_IPV6,
-+		.checkentry	= secmark_tg_check_v0,
-+		.destroy	= secmark_tg_destroy,
-+		.target		= secmark_tg_v0,
-+		.targetsize	= sizeof(struct xt_secmark_target_info),
-+		.me		= THIS_MODULE,
-+	},
-+	{
-+		.name		= "SECMARK",
-+		.revision	= 1,
-+		.family		= NFPROTO_IPV6,
-+		.checkentry	= secmark_tg_check_v1,
-+		.destroy	= secmark_tg_destroy,
-+		.target		= secmark_tg_v1,
-+		.targetsize	= sizeof(struct xt_secmark_target_info_v1),
-+		.usersize	= offsetof(struct xt_secmark_target_info_v1, secid),
-+		.me		= THIS_MODULE,
-+	},
-+#endif
- };
- 
- static int __init secmark_tg_init(void)
-diff --git a/net/netfilter/xt_TRACE.c b/net/netfilter/xt_TRACE.c
-index 5582dce98cae7d..f3fa4f11348cd8 100644
---- a/net/netfilter/xt_TRACE.c
-+++ b/net/netfilter/xt_TRACE.c
-@@ -29,25 +29,38 @@ trace_tg(struct sk_buff *skb, const struct xt_action_param *par)
- 	return XT_CONTINUE;
- }
- 
--static struct xt_target trace_tg_reg __read_mostly = {
--	.name		= "TRACE",
--	.revision	= 0,
--	.family		= NFPROTO_UNSPEC,
--	.table		= "raw",
--	.target		= trace_tg,
--	.checkentry	= trace_tg_check,
--	.destroy	= trace_tg_destroy,
--	.me		= THIS_MODULE,
-+static struct xt_target trace_tg_reg[] __read_mostly = {
-+	{
-+		.name		= "TRACE",
-+		.revision	= 0,
-+		.family		= NFPROTO_IPV4,
-+		.table		= "raw",
-+		.target		= trace_tg,
-+		.checkentry	= trace_tg_check,
-+		.destroy	= trace_tg_destroy,
-+		.me		= THIS_MODULE,
-+	},
-+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
-+	{
-+		.name		= "TRACE",
-+		.revision	= 0,
-+		.family		= NFPROTO_IPV6,
-+		.table		= "raw",
-+		.target		= trace_tg,
-+		.checkentry	= trace_tg_check,
-+		.destroy	= trace_tg_destroy,
-+	},
-+#endif
- };
- 
- static int __init trace_tg_init(void)
- {
--	return xt_register_target(&trace_tg_reg);
-+	return xt_register_targets(trace_tg_reg, ARRAY_SIZE(trace_tg_reg));
- }
- 
- static void __exit trace_tg_exit(void)
- {
--	xt_unregister_target(&trace_tg_reg);
-+	xt_unregister_targets(trace_tg_reg, ARRAY_SIZE(trace_tg_reg));
- }
- 
- module_init(trace_tg_init);
-diff --git a/net/netfilter/xt_addrtype.c b/net/netfilter/xt_addrtype.c
-index e9b2181e8c425f..a7708894310716 100644
---- a/net/netfilter/xt_addrtype.c
-+++ b/net/netfilter/xt_addrtype.c
-@@ -208,13 +208,24 @@ static struct xt_match addrtype_mt_reg[] __read_mostly = {
- 	},
- 	{
- 		.name		= "addrtype",
--		.family		= NFPROTO_UNSPEC,
-+		.family		= NFPROTO_IPV4,
- 		.revision	= 1,
- 		.match		= addrtype_mt_v1,
- 		.checkentry	= addrtype_mt_checkentry_v1,
- 		.matchsize	= sizeof(struct xt_addrtype_info_v1),
- 		.me		= THIS_MODULE
--	}
-+	},
-+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
-+	{
-+		.name		= "addrtype",
-+		.family		= NFPROTO_IPV6,
-+		.revision	= 1,
-+		.match		= addrtype_mt_v1,
-+		.checkentry	= addrtype_mt_checkentry_v1,
-+		.matchsize	= sizeof(struct xt_addrtype_info_v1),
-+		.me		= THIS_MODULE
-+	},
-+#endif
- };
- 
- static int __init addrtype_mt_init(void)
-diff --git a/net/netfilter/xt_cluster.c b/net/netfilter/xt_cluster.c
-index a047a545371e18..908fd5f2c3c848 100644
---- a/net/netfilter/xt_cluster.c
-+++ b/net/netfilter/xt_cluster.c
-@@ -146,24 +146,37 @@ static void xt_cluster_mt_destroy(const struct xt_mtdtor_param *par)
- 	nf_ct_netns_put(par->net, par->family);
- }
- 
--static struct xt_match xt_cluster_match __read_mostly = {
--	.name		= "cluster",
--	.family		= NFPROTO_UNSPEC,
--	.match		= xt_cluster_mt,
--	.checkentry	= xt_cluster_mt_checkentry,
--	.matchsize	= sizeof(struct xt_cluster_match_info),
--	.destroy	= xt_cluster_mt_destroy,
--	.me		= THIS_MODULE,
-+static struct xt_match xt_cluster_match[] __read_mostly = {
-+	{
-+		.name		= "cluster",
-+		.family		= NFPROTO_IPV4,
-+		.match		= xt_cluster_mt,
-+		.checkentry	= xt_cluster_mt_checkentry,
-+		.matchsize	= sizeof(struct xt_cluster_match_info),
-+		.destroy	= xt_cluster_mt_destroy,
-+		.me		= THIS_MODULE,
-+	},
-+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
-+	{
-+		.name		= "cluster",
-+		.family		= NFPROTO_IPV6,
-+		.match		= xt_cluster_mt,
-+		.checkentry	= xt_cluster_mt_checkentry,
-+		.matchsize	= sizeof(struct xt_cluster_match_info),
-+		.destroy	= xt_cluster_mt_destroy,
-+		.me		= THIS_MODULE,
-+	},
-+#endif
- };
- 
- static int __init xt_cluster_mt_init(void)
- {
--	return xt_register_match(&xt_cluster_match);
-+	return xt_register_matches(xt_cluster_match, ARRAY_SIZE(xt_cluster_match));
- }
- 
- static void __exit xt_cluster_mt_fini(void)
- {
--	xt_unregister_match(&xt_cluster_match);
-+	xt_unregister_matches(xt_cluster_match, ARRAY_SIZE(xt_cluster_match));
- }
- 
- MODULE_AUTHOR("Pablo Neira Ayuso <pablo@netfilter.org>");
-diff --git a/net/netfilter/xt_connbytes.c b/net/netfilter/xt_connbytes.c
-index 93cb018c3055f8..2aabdcea870723 100644
---- a/net/netfilter/xt_connbytes.c
-+++ b/net/netfilter/xt_connbytes.c
-@@ -111,9 +111,11 @@ static int connbytes_mt_check(const struct xt_mtchk_param *par)
- 		return -EINVAL;
- 
- 	ret = nf_ct_netns_get(par->net, par->family);
--	if (ret < 0)
-+	if (ret < 0) {
- 		pr_info_ratelimited("cannot load conntrack support for proto=%u\n",
- 				    par->family);
-+		return ret;
-+	}
- 
- 	/*
- 	 * This filter cannot function correctly unless connection tracking
-diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c
-index 5d04ef80a61dcf..d1d0fa6c8061e9 100644
---- a/net/netfilter/xt_connlimit.c
-+++ b/net/netfilter/xt_connlimit.c
-@@ -106,26 +106,41 @@ static void connlimit_mt_destroy(const struct xt_mtdtor_param *par)
- 	nf_conncount_destroy(par->net, par->family, info->data);
- }
- 
--static struct xt_match connlimit_mt_reg __read_mostly = {
--	.name       = "connlimit",
--	.revision   = 1,
--	.family     = NFPROTO_UNSPEC,
--	.checkentry = connlimit_mt_check,
--	.match      = connlimit_mt,
--	.matchsize  = sizeof(struct xt_connlimit_info),
--	.usersize   = offsetof(struct xt_connlimit_info, data),
--	.destroy    = connlimit_mt_destroy,
--	.me         = THIS_MODULE,
-+static struct xt_match connlimit_mt_reg[] __read_mostly = {
-+	{
-+		.name       = "connlimit",
-+		.revision   = 1,
-+		.family     = NFPROTO_IPV4,
-+		.checkentry = connlimit_mt_check,
-+		.match      = connlimit_mt,
-+		.matchsize  = sizeof(struct xt_connlimit_info),
-+		.usersize   = offsetof(struct xt_connlimit_info, data),
-+		.destroy    = connlimit_mt_destroy,
-+		.me         = THIS_MODULE,
-+	},
-+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
-+	{
-+		.name       = "connlimit",
-+		.revision   = 1,
-+		.family     = NFPROTO_IPV6,
-+		.checkentry = connlimit_mt_check,
-+		.match      = connlimit_mt,
-+		.matchsize  = sizeof(struct xt_connlimit_info),
-+		.usersize   = offsetof(struct xt_connlimit_info, data),
-+		.destroy    = connlimit_mt_destroy,
-+		.me         = THIS_MODULE,
-+	},
-+#endif
- };
- 
- static int __init connlimit_mt_init(void)
- {
--	return xt_register_match(&connlimit_mt_reg);
-+	return xt_register_matches(connlimit_mt_reg, ARRAY_SIZE(connlimit_mt_reg));
- }
- 
- static void __exit connlimit_mt_exit(void)
- {
--	xt_unregister_match(&connlimit_mt_reg);
-+	xt_unregister_matches(connlimit_mt_reg, ARRAY_SIZE(connlimit_mt_reg));
- }
- 
- module_init(connlimit_mt_init);
-diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c
-index ad3c033db64e70..4277084de2e70c 100644
---- a/net/netfilter/xt_connmark.c
-+++ b/net/netfilter/xt_connmark.c
-@@ -151,7 +151,7 @@ static struct xt_target connmark_tg_reg[] __read_mostly = {
- 	{
- 		.name           = "CONNMARK",
- 		.revision       = 1,
--		.family         = NFPROTO_UNSPEC,
-+		.family         = NFPROTO_IPV4,
- 		.checkentry     = connmark_tg_check,
- 		.target         = connmark_tg,
- 		.targetsize     = sizeof(struct xt_connmark_tginfo1),
-@@ -161,13 +161,35 @@ static struct xt_target connmark_tg_reg[] __read_mostly = {
- 	{
- 		.name           = "CONNMARK",
- 		.revision       = 2,
--		.family         = NFPROTO_UNSPEC,
-+		.family         = NFPROTO_IPV4,
- 		.checkentry     = connmark_tg_check,
- 		.target         = connmark_tg_v2,
- 		.targetsize     = sizeof(struct xt_connmark_tginfo2),
- 		.destroy        = connmark_tg_destroy,
- 		.me             = THIS_MODULE,
--	}
-+	},
-+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
-+	{
-+		.name           = "CONNMARK",
-+		.revision       = 1,
-+		.family         = NFPROTO_IPV6,
-+		.checkentry     = connmark_tg_check,
-+		.target         = connmark_tg,
-+		.targetsize     = sizeof(struct xt_connmark_tginfo1),
-+		.destroy        = connmark_tg_destroy,
-+		.me             = THIS_MODULE,
-+	},
-+	{
-+		.name           = "CONNMARK",
-+		.revision       = 2,
-+		.family         = NFPROTO_IPV6,
-+		.checkentry     = connmark_tg_check,
-+		.target         = connmark_tg_v2,
-+		.targetsize     = sizeof(struct xt_connmark_tginfo2),
-+		.destroy        = connmark_tg_destroy,
-+		.me             = THIS_MODULE,
-+	},
-+#endif
- };
- 
- static struct xt_match connmark_mt_reg __read_mostly = {
-diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
-index 1ad74b5920b533..f76fe04fc9a4e1 100644
---- a/net/netfilter/xt_mark.c
-+++ b/net/netfilter/xt_mark.c
-@@ -39,13 +39,35 @@ mark_mt(const struct sk_buff *skb, struct xt_action_param *par)
- 	return ((skb->mark & info->mask) == info->mark) ^ info->invert;
- }
- 
--static struct xt_target mark_tg_reg __read_mostly = {
--	.name           = "MARK",
--	.revision       = 2,
--	.family         = NFPROTO_UNSPEC,
--	.target         = mark_tg,
--	.targetsize     = sizeof(struct xt_mark_tginfo2),
--	.me             = THIS_MODULE,
-+static struct xt_target mark_tg_reg[] __read_mostly = {
-+	{
-+		.name           = "MARK",
-+		.revision       = 2,
-+		.family         = NFPROTO_IPV4,
-+		.target         = mark_tg,
-+		.targetsize     = sizeof(struct xt_mark_tginfo2),
-+		.me             = THIS_MODULE,
-+	},
-+#if IS_ENABLED(CONFIG_IP_NF_ARPTABLES)
-+	{
-+		.name           = "MARK",
-+		.revision       = 2,
-+		.family         = NFPROTO_ARP,
-+		.target         = mark_tg,
-+		.targetsize     = sizeof(struct xt_mark_tginfo2),
-+		.me             = THIS_MODULE,
-+	},
-+#endif
-+#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
-+	{
-+		.name           = "MARK",
-+		.revision       = 2,
-+		.family         = NFPROTO_IPV4,
-+		.target         = mark_tg,
-+		.targetsize     = sizeof(struct xt_mark_tginfo2),
-+		.me             = THIS_MODULE,
-+	},
-+#endif
- };
- 
- static struct xt_match mark_mt_reg __read_mostly = {
-@@ -61,12 +83,12 @@ static int __init mark_mt_init(void)
- {
- 	int ret;
- 
--	ret = xt_register_target(&mark_tg_reg);
-+	ret = xt_register_targets(mark_tg_reg, ARRAY_SIZE(mark_tg_reg));
- 	if (ret < 0)
- 		return ret;
- 	ret = xt_register_match(&mark_mt_reg);
- 	if (ret < 0) {
--		xt_unregister_target(&mark_tg_reg);
-+		xt_unregister_targets(mark_tg_reg, ARRAY_SIZE(mark_tg_reg));
- 		return ret;
- 	}
- 	return 0;
-@@ -75,7 +97,7 @@ static int __init mark_mt_init(void)
- static void __exit mark_mt_exit(void)
- {
- 	xt_unregister_match(&mark_mt_reg);
--	xt_unregister_target(&mark_tg_reg);
-+	xt_unregister_targets(mark_tg_reg, ARRAY_SIZE(mark_tg_reg));
- }
- 
- module_init(mark_mt_init);
-diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
-index db49fc4d42cf7c..50e13207a05aa5 100644
---- a/net/netlink/af_netlink.c
-+++ b/net/netlink/af_netlink.c
-@@ -636,7 +636,7 @@ static struct proto netlink_proto = {
- };
- 
- static int __netlink_create(struct net *net, struct socket *sock,
--			    struct mutex *cb_mutex, int protocol,
-+			    struct mutex *dump_cb_mutex, int protocol,
- 			    int kern)
- {
- 	struct sock *sk;
-@@ -651,15 +651,11 @@ static int __netlink_create(struct net *net, struct socket *sock,
- 	sock_init_data(sock, sk);
- 
- 	nlk = nlk_sk(sk);
--	if (cb_mutex) {
--		nlk->cb_mutex = cb_mutex;
--	} else {
--		nlk->cb_mutex = &nlk->cb_def_mutex;
--		mutex_init(nlk->cb_mutex);
--		lockdep_set_class_and_name(nlk->cb_mutex,
-+	mutex_init(&nlk->nl_cb_mutex);
-+	lockdep_set_class_and_name(&nlk->nl_cb_mutex,
- 					   nlk_cb_mutex_keys + protocol,
- 					   nlk_cb_mutex_key_strings[protocol]);
--	}
-+	nlk->dump_cb_mutex = dump_cb_mutex;
- 	init_waitqueue_head(&nlk->wait);
- 
- 	sk->sk_destruct = netlink_sock_destruct;
-@@ -2147,8 +2143,9 @@ void __netlink_clear_multicast_users(struct sock *ksk, unsigned int group)
- {
- 	struct sock *sk;
- 	struct netlink_table *tbl = &nl_table[ksk->sk_protocol];
-+	struct hlist_node *tmp;
- 
--	sk_for_each_bound(sk, &tbl->mc_list)
-+	sk_for_each_bound_safe(sk, tmp, &tbl->mc_list)
- 		netlink_update_socket_mc(nlk_sk(sk), group, 0);
- }
- 
-@@ -2211,7 +2208,7 @@ static int netlink_dump(struct sock *sk, bool lock_taken)
- 	int alloc_size;
- 
- 	if (!lock_taken)
--		mutex_lock(nlk->cb_mutex);
-+		mutex_lock(&nlk->nl_cb_mutex);
- 	if (!nlk->cb_running) {
- 		err = -EINVAL;
- 		goto errout_skb;
-@@ -2263,14 +2260,24 @@ static int netlink_dump(struct sock *sk, bool lock_taken)
- 	netlink_skb_set_owner_r(skb, sk);
- 
- 	if (nlk->dump_done_errno > 0) {
-+		struct mutex *extra_mutex = nlk->dump_cb_mutex;
-+
- 		cb->extack = &extack;
-+
-+		if (cb->flags & RTNL_FLAG_DUMP_UNLOCKED)
-+			extra_mutex = NULL;
-+		if (extra_mutex)
-+			mutex_lock(extra_mutex);
- 		nlk->dump_done_errno = cb->dump(skb, cb);
-+		if (extra_mutex)
-+			mutex_unlock(extra_mutex);
-+
- 		cb->extack = NULL;
- 	}
- 
- 	if (nlk->dump_done_errno > 0 ||
- 	    skb_tailroom(skb) < nlmsg_total_size(sizeof(nlk->dump_done_errno))) {
--		mutex_unlock(nlk->cb_mutex);
-+		mutex_unlock(&nlk->nl_cb_mutex);
- 
- 		if (sk_filter(sk, skb))
- 			kfree_skb(skb);
-@@ -2304,13 +2311,13 @@ static int netlink_dump(struct sock *sk, bool lock_taken)
- 	WRITE_ONCE(nlk->cb_running, false);
- 	module = cb->module;
- 	skb = cb->skb;
--	mutex_unlock(nlk->cb_mutex);
-+	mutex_unlock(&nlk->nl_cb_mutex);
- 	module_put(module);
- 	consume_skb(skb);
- 	return 0;
- 
- errout_skb:
--	mutex_unlock(nlk->cb_mutex);
-+	mutex_unlock(&nlk->nl_cb_mutex);
- 	kfree_skb(skb);
- 	return err;
- }
-@@ -2333,7 +2340,7 @@ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
- 	}
- 
- 	nlk = nlk_sk(sk);
--	mutex_lock(nlk->cb_mutex);
-+	mutex_lock(&nlk->nl_cb_mutex);
- 	/* A dump is in progress... */
- 	if (nlk->cb_running) {
- 		ret = -EBUSY;
-@@ -2353,6 +2360,7 @@ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
- 	cb->data = control->data;
- 	cb->module = control->module;
- 	cb->min_dump_alloc = control->min_dump_alloc;
-+	cb->flags = control->flags;
- 	cb->skb = skb;
- 
- 	cb->strict_check = nlk_test_bit(STRICT_CHK, NETLINK_CB(skb).sk);
-@@ -2384,7 +2392,7 @@ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
- 	module_put(control->module);
- error_unlock:
- 	sock_put(sk);
--	mutex_unlock(nlk->cb_mutex);
-+	mutex_unlock(&nlk->nl_cb_mutex);
- error_free:
- 	kfree_skb(skb);
- 	return ret;
-diff --git a/net/netlink/af_netlink.h b/net/netlink/af_netlink.h
-index 2145979b9986a0..9751e29d4bbb9a 100644
---- a/net/netlink/af_netlink.h
-+++ b/net/netlink/af_netlink.h
-@@ -39,8 +39,9 @@ struct netlink_sock {
- 	bool			cb_running;
- 	int			dump_done_errno;
- 	struct netlink_callback	cb;
--	struct mutex		*cb_mutex;
--	struct mutex		cb_def_mutex;
-+	struct mutex		nl_cb_mutex;
-+
-+	struct mutex		*dump_cb_mutex;
- 	void			(*netlink_rcv)(struct sk_buff *skb);
- 	int			(*netlink_bind)(struct net *net, int group);
- 	void			(*netlink_unbind)(struct net *net, int group);
-diff --git a/net/phonet/pn_netlink.c b/net/phonet/pn_netlink.c
-index dd4c7e9a634fbe..894e5c72d6bfff 100644
---- a/net/phonet/pn_netlink.c
-+++ b/net/phonet/pn_netlink.c
-@@ -178,7 +178,7 @@ static int fill_route(struct sk_buff *skb, struct net_device *dev, u8 dst,
- 	rtm->rtm_type = RTN_UNICAST;
- 	rtm->rtm_flags = 0;
- 	if (nla_put_u8(skb, RTA_DST, dst) ||
--	    nla_put_u32(skb, RTA_OIF, dev->ifindex))
-+	    nla_put_u32(skb, RTA_OIF, READ_ONCE(dev->ifindex)))
- 		goto nla_put_failure;
- 	nlmsg_end(skb, nlh);
- 	return 0;
-@@ -263,6 +263,7 @@ static int route_doit(struct sk_buff *skb, struct nlmsghdr *nlh,
- static int route_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
- {
- 	struct net *net = sock_net(skb->sk);
-+	int err = 0;
- 	u8 addr;
- 
- 	rcu_read_lock();
-@@ -272,35 +273,29 @@ static int route_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
- 		if (!dev)
- 			continue;
- 
--		if (fill_route(skb, dev, addr << 2, NETLINK_CB(cb->skb).portid,
--			       cb->nlh->nlmsg_seq, RTM_NEWROUTE) < 0)
--			goto out;
-+		err = fill_route(skb, dev, addr << 2,
-+				 NETLINK_CB(cb->skb).portid,
-+				 cb->nlh->nlmsg_seq, RTM_NEWROUTE);
-+		if (err < 0)
-+			break;
- 	}
--
--out:
- 	rcu_read_unlock();
- 	cb->args[0] = addr;
- 
--	return skb->len;
-+	return err;
- }
- 
-+static const struct rtnl_msg_handler phonet_rtnl_msg_handlers[] __initdata_or_module = {
-+	{THIS_MODULE, PF_PHONET, RTM_NEWADDR, addr_doit, NULL, 0},
-+	{THIS_MODULE, PF_PHONET, RTM_DELADDR, addr_doit, NULL, 0},
-+	{THIS_MODULE, PF_PHONET, RTM_GETADDR, NULL, getaddr_dumpit, 0},
-+	{THIS_MODULE, PF_PHONET, RTM_NEWROUTE, route_doit, NULL, 0},
-+	{THIS_MODULE, PF_PHONET, RTM_DELROUTE, route_doit, NULL, 0},
-+	{THIS_MODULE, PF_PHONET, RTM_GETROUTE, NULL, route_dumpit,
-+	 RTNL_FLAG_DUMP_UNLOCKED},
-+};
-+
- int __init phonet_netlink_register(void)
- {
--	int err = rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_NEWADDR,
--				       addr_doit, NULL, 0);
--	if (err)
--		return err;
--
--	/* Further rtnl_register_module() cannot fail */
--	rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_DELADDR,
--			     addr_doit, NULL, 0);
--	rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_GETADDR,
--			     NULL, getaddr_dumpit, 0);
--	rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_NEWROUTE,
--			     route_doit, NULL, 0);
--	rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_DELROUTE,
--			     route_doit, NULL, 0);
--	rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_GETROUTE,
--			     NULL, route_dumpit, 0);
--	return 0;
-+	return rtnl_register_many(phonet_rtnl_msg_handlers);
- }
-diff --git a/net/rxrpc/sendmsg.c b/net/rxrpc/sendmsg.c
-index 8e0b94714e849f..24f765d243db1c 100644
---- a/net/rxrpc/sendmsg.c
-+++ b/net/rxrpc/sendmsg.c
-@@ -303,6 +303,11 @@ static int rxrpc_send_data(struct rxrpc_sock *rx,
- 	sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk);
- 
- reload:
-+	txb = call->tx_pending;
-+	call->tx_pending = NULL;
-+	if (txb)
-+		rxrpc_see_txbuf(txb, rxrpc_txbuf_see_send_more);
-+
- 	ret = -EPIPE;
- 	if (sk->sk_shutdown & SEND_SHUTDOWN)
- 		goto maybe_error;
-@@ -329,11 +334,6 @@ static int rxrpc_send_data(struct rxrpc_sock *rx,
- 			goto maybe_error;
- 	}
- 
--	txb = call->tx_pending;
--	call->tx_pending = NULL;
--	if (txb)
--		rxrpc_see_txbuf(txb, rxrpc_txbuf_see_send_more);
--
- 	do {
- 		if (!txb) {
- 			size_t remain, bufsize, chunk, offset;
-diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
-index 0feb824242a68b..1455892694c001 100644
---- a/net/sched/sch_api.c
-+++ b/net/sched/sch_api.c
-@@ -593,7 +593,6 @@ void __qdisc_calculate_pkt_len(struct sk_buff *skb,
- 		pkt_len = 1;
- 	qdisc_skb_cb(skb)->pkt_len = pkt_len;
- }
--EXPORT_SYMBOL(__qdisc_calculate_pkt_len);
- 
- void qdisc_warn_nonwc(const char *txt, struct Qdisc *qdisc)
- {
-@@ -1172,6 +1171,12 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
- 			return -EINVAL;
- 		}
- 
-+		if (new &&
-+		    !(parent->flags & TCQ_F_MQROOT) &&
-+		    rcu_access_pointer(new->stab)) {
-+			NL_SET_ERR_MSG(extack, "STAB not supported on a non root");
-+			return -EINVAL;
-+		}
- 		err = cops->graft(parent, cl, new, &old, extack);
- 		if (err)
- 			return err;
-diff --git a/net/sctp/socket.c b/net/sctp/socket.c
-index 4a1ebe46d045d8..108a0745c0c3ca 100644
---- a/net/sctp/socket.c
-+++ b/net/sctp/socket.c
-@@ -8525,6 +8525,7 @@ static int sctp_listen_start(struct sock *sk, int backlog)
- 	struct sctp_endpoint *ep = sp->ep;
- 	struct crypto_shash *tfm = NULL;
- 	char alg[32];
-+	int err;
- 
- 	/* Allocate HMAC for generating cookie. */
- 	if (!sp->hmac && sp->sctp_hmac_alg) {
-@@ -8552,18 +8553,25 @@ static int sctp_listen_start(struct sock *sk, int backlog)
- 	inet_sk_set_state(sk, SCTP_SS_LISTENING);
- 	if (!ep->base.bind_addr.port) {
- 		if (sctp_autobind(sk)) {
--			inet_sk_set_state(sk, SCTP_SS_CLOSED);
--			return -EAGAIN;
-+			err = -EAGAIN;
-+			goto err;
- 		}
- 	} else {
- 		if (sctp_get_port(sk, inet_sk(sk)->inet_num)) {
--			inet_sk_set_state(sk, SCTP_SS_CLOSED);
--			return -EADDRINUSE;
-+			err = -EADDRINUSE;
-+			goto err;
- 		}
- 	}
- 
- 	WRITE_ONCE(sk->sk_max_ack_backlog, backlog);
--	return sctp_hash_endpoint(ep);
-+	err = sctp_hash_endpoint(ep);
-+	if (err)
-+		goto err;
-+
-+	return 0;
-+err:
-+	inet_sk_set_state(sk, SCTP_SS_CLOSED);
-+	return err;
- }
- 
- /*
-diff --git a/net/socket.c b/net/socket.c
-index 9db33cd4a71b89..bad58f23f30722 100644
---- a/net/socket.c
-+++ b/net/socket.c
-@@ -1569,8 +1569,13 @@ int __sock_create(struct net *net, int family, int type, int protocol,
- 	rcu_read_unlock();
- 
- 	err = pf->create(net, sock, protocol, kern);
--	if (err < 0)
-+	if (err < 0) {
-+		/* ->create should release the allocated sock->sk object on error
-+		 * but it may leave the dangling pointer
-+		 */
-+		sock->sk = NULL;
- 		goto out_module_put;
-+	}
- 
- 	/*
- 	 * Now to bump the refcnt of the [loadable] module that owns this
-diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
-index a6a9d353fe635a..134c6f6e0959ae 100644
---- a/sound/pci/hda/hda_intel.c
-+++ b/sound/pci/hda/hda_intel.c
-@@ -2682,7 +2682,7 @@ static const struct pci_device_id azx_ids[] = {
- 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
- 	  AZX_DCAPS_PM_RUNTIME },
- 	/* GLENFLY */
--	{ PCI_DEVICE(0x6766, PCI_ANY_ID),
-+	{ PCI_DEVICE(PCI_VENDOR_ID_GLENFLY, PCI_ANY_ID),
- 	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
- 	  .class_mask = 0xffffff,
- 	  .driver_data = AZX_DRIVER_GFHDMI | AZX_DCAPS_POSFIX_LPIB |
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index ebdd7c43233636..07e1547fff2e51 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -10053,6 +10053,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
- 	SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK),
- 	SND_PCI_QUIRK(0x1043, 0x1663, "ASUS GU603ZV", ALC285_FIXUP_ASUS_HEADSET_MIC),
- 	SND_PCI_QUIRK(0x1043, 0x1683, "ASUS UM3402YAR", ALC287_FIXUP_CS35L41_I2C_2),
-+	SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS UX3402VA", ALC245_FIXUP_CS35L41_SPI_2),
- 	SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),
- 	SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC),
- 	SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS),
-@@ -10090,14 +10091,12 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
- 	SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE),
- 	SND_PCI_QUIRK(0x1043, 0x1da2, "ASUS UP6502ZA/ZD", ALC245_FIXUP_CS35L41_SPI_2),
- 	SND_PCI_QUIRK(0x1043, 0x1e02, "ASUS UX3402ZA", ALC245_FIXUP_CS35L41_SPI_2),
--	SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS UX3402VA", ALC245_FIXUP_CS35L41_SPI_2),
--	SND_PCI_QUIRK(0x1043, 0x1f62, "ASUS UX7602ZM", ALC245_FIXUP_CS35L41_SPI_2),
- 	SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502),
--	SND_PCI_QUIRK(0x1043, 0x1e12, "ASUS UM6702RA/RC", ALC287_FIXUP_CS35L41_I2C_2),
-+	SND_PCI_QUIRK(0x1043, 0x1e12, "ASUS UM3402", ALC287_FIXUP_CS35L41_I2C_2),
- 	SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS),
- 	SND_PCI_QUIRK(0x1043, 0x1e5e, "ASUS ROG Strix G513", ALC294_FIXUP_ASUS_G513_PINS),
- 	SND_PCI_QUIRK(0x1043, 0x1e8e, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA401),
--	SND_PCI_QUIRK(0x1043, 0x1ee2, "ASUS UM3402", ALC287_FIXUP_CS35L41_I2C_2),
-+	SND_PCI_QUIRK(0x1043, 0x1ee2, "ASUS UM6702RA/RC", ALC287_FIXUP_CS35L41_I2C_2),
- 	SND_PCI_QUIRK(0x1043, 0x1c52, "ASUS Zephyrus G15 2022", ALC289_FIXUP_ASUS_GA401),
- 	SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401),
- 	SND_PCI_QUIRK(0x1043, 0x1f12, "ASUS UM5302", ALC287_FIXUP_CS35L41_I2C_2),
-diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c
-index 69c951e3058424..d3db89c93b331d 100644
---- a/sound/soc/codecs/cs35l56-shared.c
-+++ b/sound/soc/codecs/cs35l56-shared.c
-@@ -5,6 +5,7 @@
- // Copyright (C) 2023 Cirrus Logic, Inc. and
- //                    Cirrus Logic International Semiconductor Ltd.
- 
-+#include <linux/gpio/consumer.h>
- #include <linux/regmap.h>
- #include <linux/regulator/consumer.h>
- #include <linux/types.h>
-@@ -695,6 +696,41 @@ int cs35l56_hw_init(struct cs35l56_base *cs35l56_base)
- }
- EXPORT_SYMBOL_NS_GPL(cs35l56_hw_init, SND_SOC_CS35L56_SHARED);
- 
-+int cs35l56_get_speaker_id(struct cs35l56_base *cs35l56_base)
-+{
-+	struct gpio_descs *descs;
-+	int speaker_id;
-+	int i, ret;
-+
-+	/* Read the speaker type qualifier from the motherboard GPIOs */
-+	descs = gpiod_get_array_optional(cs35l56_base->dev, "spk-id", GPIOD_IN);
-+	if (!descs) {
-+		return -ENOENT;
-+	} else if (IS_ERR(descs)) {
-+		ret = PTR_ERR(descs);
-+		return dev_err_probe(cs35l56_base->dev, ret, "Failed to get spk-id-gpios\n");
-+	}
-+
-+	speaker_id = 0;
-+	for (i = 0; i < descs->ndescs; i++) {
-+		ret = gpiod_get_value_cansleep(descs->desc[i]);
-+		if (ret < 0) {
-+			dev_err_probe(cs35l56_base->dev, ret, "Failed to read spk-id[%d]\n", i);
-+			goto err;
-+		}
-+
-+		speaker_id |= (ret << i);
-+	}
-+
-+	dev_dbg(cs35l56_base->dev, "Speaker ID = %d\n", speaker_id);
-+	ret = speaker_id;
-+err:
-+	gpiod_put_array(descs);
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL_NS_GPL(cs35l56_get_speaker_id, SND_SOC_CS35L56_SHARED);
-+
- static const u32 cs35l56_bclk_valid_for_pll_freq_table[] = {
- 	[0x0C] = 128000,
- 	[0x0F] = 256000,
-diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c
-index c855ef3ec665ef..015269f0db54cf 100644
---- a/sound/soc/codecs/cs35l56.c
-+++ b/sound/soc/codecs/cs35l56.c
-@@ -941,10 +941,19 @@ static int cs35l56_component_probe(struct snd_soc_component *component)
- 
- 	if (!cs35l56->dsp.system_name &&
- 	    (snd_soc_card_get_pci_ssid(component->card, &vendor, &device) == 0)) {
--		cs35l56->dsp.system_name = devm_kasprintf(cs35l56->base.dev,
--							  GFP_KERNEL,
--							  "%04x%04x",
--							  vendor, device);
-+		/* Append a speaker qualifier if there is a speaker ID */
-+		if (cs35l56->speaker_id >= 0) {
-+			cs35l56->dsp.system_name = devm_kasprintf(cs35l56->base.dev,
-+								  GFP_KERNEL,
-+								  "%04x%04x-spkid%d",
-+								  vendor, device,
-+								  cs35l56->speaker_id);
-+		} else {
-+			cs35l56->dsp.system_name = devm_kasprintf(cs35l56->base.dev,
-+								  GFP_KERNEL,
-+								  "%04x%04x",
-+								  vendor, device);
-+		}
- 		if (!cs35l56->dsp.system_name)
- 			return -ENOMEM;
- 	}
-@@ -1230,7 +1239,13 @@ static int cs35l56_get_firmware_uid(struct cs35l56_private *cs35l56)
- 	if (ret < 0)
- 		return 0;
- 
--	cs35l56->dsp.system_name = devm_kstrdup(dev, prop, GFP_KERNEL);
-+	/* Append a speaker qualifier if there is a speaker ID */
-+	if (cs35l56->speaker_id >= 0)
-+		cs35l56->dsp.system_name = devm_kasprintf(dev, GFP_KERNEL, "%s-spkid%d",
-+							  prop, cs35l56->speaker_id);
-+	else
-+		cs35l56->dsp.system_name = devm_kstrdup(dev, prop, GFP_KERNEL);
-+
- 	if (cs35l56->dsp.system_name == NULL)
- 		return -ENOMEM;
- 
-@@ -1245,6 +1260,7 @@ int cs35l56_common_probe(struct cs35l56_private *cs35l56)
- 
- 	init_completion(&cs35l56->init_completion);
- 	mutex_init(&cs35l56->base.irq_lock);
-+	cs35l56->speaker_id = -ENOENT;
- 
- 	dev_set_drvdata(cs35l56->base.dev, cs35l56);
- 
-@@ -1281,6 +1297,12 @@ int cs35l56_common_probe(struct cs35l56_private *cs35l56)
- 		gpiod_set_value_cansleep(cs35l56->base.reset_gpio, 1);
- 	}
- 
-+	ret = cs35l56_get_speaker_id(&cs35l56->base);
-+	if ((ret < 0) && (ret != -ENOENT))
-+		goto err;
-+
-+	cs35l56->speaker_id = ret;
-+
- 	ret = cs35l56_get_firmware_uid(cs35l56);
- 	if (ret != 0)
- 		goto err;
-diff --git a/sound/soc/codecs/cs35l56.h b/sound/soc/codecs/cs35l56.h
-index d9fbf568a19586..b000e7365e4065 100644
---- a/sound/soc/codecs/cs35l56.h
-+++ b/sound/soc/codecs/cs35l56.h
-@@ -44,6 +44,7 @@ struct cs35l56_private {
- 	bool sdw_attached;
- 	struct completion init_completion;
- 
-+	int speaker_id;
- 	u32 rx_mask;
- 	u32 tx_mask;
- 	u8 asp_slot_width;
-diff --git a/tools/iio/iio_generic_buffer.c b/tools/iio/iio_generic_buffer.c
-index 0d0a7a19d6f952..9ef5ee087eda36 100644
---- a/tools/iio/iio_generic_buffer.c
-+++ b/tools/iio/iio_generic_buffer.c
-@@ -498,6 +498,10 @@ int main(int argc, char **argv)
- 			return -ENOMEM;
- 		}
- 		trigger_name = malloc(IIO_MAX_NAME_LENGTH);
-+		if (!trigger_name) {
-+			ret = -ENOMEM;
-+			goto error;
-+		}
- 		ret = read_sysfs_string("name", trig_dev_name, trigger_name);
- 		free(trig_dev_name);
- 		if (ret < 0) {
-diff --git a/tools/lib/subcmd/parse-options.c b/tools/lib/subcmd/parse-options.c
-index d943d78b787ed7..9fa75943f2ed17 100644
---- a/tools/lib/subcmd/parse-options.c
-+++ b/tools/lib/subcmd/parse-options.c
-@@ -633,10 +633,11 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o
- 			const char *const subcommands[], const char *usagestr[], int flags)
- {
- 	struct parse_opt_ctx_t ctx;
--	char *buf = NULL;
- 
- 	/* build usage string if it's not provided */
- 	if (subcommands && !usagestr[0]) {
-+		char *buf = NULL;
-+
- 		astrcatf(&buf, "%s %s [<options>] {", subcmd_config.exec_name, argv[0]);
- 
- 		for (int i = 0; subcommands[i]; i++) {
-@@ -678,10 +679,7 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o
- 			astrcatf(&error_buf, "unknown switch `%c'", *ctx.opt);
- 		usage_with_options(usagestr, options);
- 	}
--	if (buf) {
--		usagestr[0] = NULL;
--		free(buf);
--	}
-+
- 	return parse_options_end(&ctx);
- }
- 
-diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
-index 9714327fd0eadd..cf623c1490d959 100644
---- a/tools/perf/builtin-kmem.c
-+++ b/tools/perf/builtin-kmem.c
-@@ -2058,6 +2058,8 @@ int cmd_kmem(int argc, const char **argv)
- 
- out_delete:
- 	perf_session__delete(session);
-+	/* free usage string allocated by parse_options_subcommand */
-+	free((void *)kmem_usage[0]);
- 
- 	return ret;
- }
-diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
-index 71165036e4cac8..988bef73bd0957 100644
---- a/tools/perf/builtin-kvm.c
-+++ b/tools/perf/builtin-kvm.c
-@@ -2187,5 +2187,8 @@ int cmd_kvm(int argc, const char **argv)
- 	else
- 		usage_with_options(kvm_usage, kvm_options);
- 
-+	/* free usage string allocated by parse_options_subcommand */
-+	free((void *)kvm_usage[0]);
-+
- 	return 0;
- }
-diff --git a/tools/perf/builtin-kwork.c b/tools/perf/builtin-kwork.c
-index de2fbb7c56c325..be210be42c77b3 100644
---- a/tools/perf/builtin-kwork.c
-+++ b/tools/perf/builtin-kwork.c
-@@ -1853,5 +1853,8 @@ int cmd_kwork(int argc, const char **argv)
- 	} else
- 		usage_with_options(kwork_usage, kwork_options);
- 
-+	/* free usage string allocated by parse_options_subcommand */
-+	free((void *)kwork_usage[0]);
-+
- 	return 0;
- }
-diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
-index 0b4b4445c52077..fcb32c58bee7e4 100644
---- a/tools/perf/builtin-lock.c
-+++ b/tools/perf/builtin-lock.c
-@@ -2622,6 +2622,9 @@ int cmd_lock(int argc, const char **argv)
- 		usage_with_options(lock_usage, lock_options);
- 	}
- 
-+	/* free usage string allocated by parse_options_subcommand */
-+	free((void *)lock_usage[0]);
-+
- 	zfree(&lockhash_table);
- 	return rc;
- }
-diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
-index 865f321d729b69..286105be91cec9 100644
---- a/tools/perf/builtin-mem.c
-+++ b/tools/perf/builtin-mem.c
-@@ -518,5 +518,8 @@ int cmd_mem(int argc, const char **argv)
- 	else
- 		usage_with_options(mem_usage, mem_options);
- 
-+	/* free usage string allocated by parse_options_subcommand */
-+	free((void *)mem_usage[0]);
-+
- 	return 0;
- }
-diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
-index 42185da0f000a0..ac9d94dbbeefae 100644
---- a/tools/perf/builtin-sched.c
-+++ b/tools/perf/builtin-sched.c
-@@ -3211,14 +3211,44 @@ static void perf_sched__merge_lat(struct perf_sched *sched)
- 	}
- }
- 
-+static int setup_cpus_switch_event(struct perf_sched *sched)
-+{
-+	unsigned int i;
-+
-+	sched->cpu_last_switched = calloc(MAX_CPUS, sizeof(*(sched->cpu_last_switched)));
-+	if (!sched->cpu_last_switched)
-+		return -1;
-+
-+	sched->curr_pid = malloc(MAX_CPUS * sizeof(*(sched->curr_pid)));
-+	if (!sched->curr_pid) {
-+		zfree(&sched->cpu_last_switched);
-+		return -1;
-+	}
-+
-+	for (i = 0; i < MAX_CPUS; i++)
-+		sched->curr_pid[i] = -1;
-+
-+	return 0;
-+}
-+
-+static void free_cpus_switch_event(struct perf_sched *sched)
-+{
-+	zfree(&sched->curr_pid);
-+	zfree(&sched->cpu_last_switched);
-+}
-+
- static int perf_sched__lat(struct perf_sched *sched)
- {
-+	int rc = -1;
- 	struct rb_node *next;
- 
- 	setup_pager();
- 
-+	if (setup_cpus_switch_event(sched))
-+		return rc;
-+
- 	if (perf_sched__read_events(sched))
--		return -1;
-+		goto out_free_cpus_switch_event;
- 
- 	perf_sched__merge_lat(sched);
- 	perf_sched__sort_lat(sched);
-@@ -3247,13 +3277,15 @@ static int perf_sched__lat(struct perf_sched *sched)
- 	print_bad_events(sched);
- 	printf("\n");
- 
--	return 0;
-+	rc = 0;
-+
-+out_free_cpus_switch_event:
-+	free_cpus_switch_event(sched);
-+	return rc;
- }
- 
- static int setup_map_cpus(struct perf_sched *sched)
- {
--	struct perf_cpu_map *map;
--
- 	sched->max_cpu.cpu  = sysconf(_SC_NPROCESSORS_CONF);
- 
- 	if (sched->map.comp) {
-@@ -3262,16 +3294,15 @@ static int setup_map_cpus(struct perf_sched *sched)
- 			return -1;
- 	}
- 
--	if (!sched->map.cpus_str)
--		return 0;
--
--	map = perf_cpu_map__new(sched->map.cpus_str);
--	if (!map) {
--		pr_err("failed to get cpus map from %s\n", sched->map.cpus_str);
--		return -1;
-+	if (sched->map.cpus_str) {
-+		sched->map.cpus = perf_cpu_map__new(sched->map.cpus_str);
-+		if (!sched->map.cpus) {
-+			pr_err("failed to get cpus map from %s\n", sched->map.cpus_str);
-+			zfree(&sched->map.comp_cpus);
-+			return -1;
-+		}
- 	}
- 
--	sched->map.cpus = map;
- 	return 0;
- }
- 
-@@ -3311,33 +3342,69 @@ static int setup_color_cpus(struct perf_sched *sched)
- 
- static int perf_sched__map(struct perf_sched *sched)
- {
-+	int rc = -1;
-+
-+	sched->curr_thread = calloc(MAX_CPUS, sizeof(*(sched->curr_thread)));
-+	if (!sched->curr_thread)
-+		return rc;
-+
-+	if (setup_cpus_switch_event(sched))
-+		goto out_free_curr_thread;
-+
- 	if (setup_map_cpus(sched))
--		return -1;
-+		goto out_free_cpus_switch_event;
- 
- 	if (setup_color_pids(sched))
--		return -1;
-+		goto out_put_map_cpus;
- 
- 	if (setup_color_cpus(sched))
--		return -1;
-+		goto out_put_color_pids;
- 
- 	setup_pager();
- 	if (perf_sched__read_events(sched))
--		return -1;
-+		goto out_put_color_cpus;
-+
-+	rc = 0;
- 	print_bad_events(sched);
--	return 0;
-+
-+out_put_color_cpus:
-+	perf_cpu_map__put(sched->map.color_cpus);
-+
-+out_put_color_pids:
-+	perf_thread_map__put(sched->map.color_pids);
-+
-+out_put_map_cpus:
-+	zfree(&sched->map.comp_cpus);
-+	perf_cpu_map__put(sched->map.cpus);
-+
-+out_free_cpus_switch_event:
-+	free_cpus_switch_event(sched);
-+
-+out_free_curr_thread:
-+	zfree(&sched->curr_thread);
-+	return rc;
- }
- 
- static int perf_sched__replay(struct perf_sched *sched)
- {
-+	int ret;
- 	unsigned long i;
- 
-+	mutex_init(&sched->start_work_mutex);
-+	mutex_init(&sched->work_done_wait_mutex);
-+
-+	ret = setup_cpus_switch_event(sched);
-+	if (ret)
-+		goto out_mutex_destroy;
-+
- 	calibrate_run_measurement_overhead(sched);
- 	calibrate_sleep_measurement_overhead(sched);
- 
- 	test_calibrations(sched);
- 
--	if (perf_sched__read_events(sched))
--		return -1;
-+	ret = perf_sched__read_events(sched);
-+	if (ret)
-+		goto out_free_cpus_switch_event;
- 
- 	printf("nr_run_events:        %ld\n", sched->nr_run_events);
- 	printf("nr_sleep_events:      %ld\n", sched->nr_sleep_events);
-@@ -3362,7 +3429,14 @@ static int perf_sched__replay(struct perf_sched *sched)
- 
- 	sched->thread_funcs_exit = true;
- 	destroy_tasks(sched);
--	return 0;
-+
-+out_free_cpus_switch_event:
-+	free_cpus_switch_event(sched);
-+
-+out_mutex_destroy:
-+	mutex_destroy(&sched->start_work_mutex);
-+	mutex_destroy(&sched->work_done_wait_mutex);
-+	return ret;
- }
- 
- static void setup_sorting(struct perf_sched *sched, const struct option *options,
-@@ -3597,28 +3671,7 @@ int cmd_sched(int argc, const char **argv)
- 		.switch_event	    = replay_switch_event,
- 		.fork_event	    = replay_fork_event,
- 	};
--	unsigned int i;
--	int ret = 0;
--
--	mutex_init(&sched.start_work_mutex);
--	mutex_init(&sched.work_done_wait_mutex);
--	sched.curr_thread = calloc(MAX_CPUS, sizeof(*sched.curr_thread));
--	if (!sched.curr_thread) {
--		ret = -ENOMEM;
--		goto out;
--	}
--	sched.cpu_last_switched = calloc(MAX_CPUS, sizeof(*sched.cpu_last_switched));
--	if (!sched.cpu_last_switched) {
--		ret = -ENOMEM;
--		goto out;
--	}
--	sched.curr_pid = malloc(MAX_CPUS * sizeof(*sched.curr_pid));
--	if (!sched.curr_pid) {
--		ret = -ENOMEM;
--		goto out;
--	}
--	for (i = 0; i < MAX_CPUS; i++)
--		sched.curr_pid[i] = -1;
-+	int ret;
- 
- 	argc = parse_options_subcommand(argc, argv, sched_options, sched_subcommands,
- 					sched_usage, PARSE_OPT_STOP_AT_NON_OPTION);
-@@ -3629,9 +3682,9 @@ int cmd_sched(int argc, const char **argv)
- 	 * Aliased to 'perf script' for now:
- 	 */
- 	if (!strcmp(argv[0], "script")) {
--		ret = cmd_script(argc, argv);
-+		return cmd_script(argc, argv);
- 	} else if (strlen(argv[0]) > 2 && strstarts("record", argv[0])) {
--		ret = __cmd_record(argc, argv);
-+		return __cmd_record(argc, argv);
- 	} else if (strlen(argv[0]) > 2 && strstarts("latency", argv[0])) {
- 		sched.tp_handler = &lat_ops;
- 		if (argc > 1) {
-@@ -3640,7 +3693,7 @@ int cmd_sched(int argc, const char **argv)
- 				usage_with_options(latency_usage, latency_options);
- 		}
- 		setup_sorting(&sched, latency_options, latency_usage);
--		ret = perf_sched__lat(&sched);
-+		return perf_sched__lat(&sched);
- 	} else if (!strcmp(argv[0], "map")) {
- 		if (argc) {
- 			argc = parse_options(argc, argv, map_options, map_usage, 0);
-@@ -3649,7 +3702,7 @@ int cmd_sched(int argc, const char **argv)
- 		}
- 		sched.tp_handler = &map_ops;
- 		setup_sorting(&sched, latency_options, latency_usage);
--		ret = perf_sched__map(&sched);
-+		return perf_sched__map(&sched);
- 	} else if (strlen(argv[0]) > 2 && strstarts("replay", argv[0])) {
- 		sched.tp_handler = &replay_ops;
- 		if (argc) {
-@@ -3657,7 +3710,7 @@ int cmd_sched(int argc, const char **argv)
- 			if (argc)
- 				usage_with_options(replay_usage, replay_options);
- 		}
--		ret = perf_sched__replay(&sched);
-+		return perf_sched__replay(&sched);
- 	} else if (!strcmp(argv[0], "timehist")) {
- 		if (argc) {
- 			argc = parse_options(argc, argv, timehist_options,
-@@ -3673,24 +3726,19 @@ int cmd_sched(int argc, const char **argv)
- 				parse_options_usage(NULL, timehist_options, "w", true);
- 			if (sched.show_next)
- 				parse_options_usage(NULL, timehist_options, "n", true);
--			ret = -EINVAL;
--			goto out;
-+			return -EINVAL;
- 		}
- 		ret = symbol__validate_sym_arguments();
- 		if (ret)
--			goto out;
-+			return ret;
- 
--		ret = perf_sched__timehist(&sched);
-+		return perf_sched__timehist(&sched);
- 	} else {
- 		usage_with_options(sched_usage, sched_options);
- 	}
- 
--out:
--	free(sched.curr_pid);
--	free(sched.cpu_last_switched);
--	free(sched.curr_thread);
--	mutex_destroy(&sched.start_work_mutex);
--	mutex_destroy(&sched.work_done_wait_mutex);
-+	/* free usage string allocated by parse_options_subcommand */
-+	free((void *)sched_usage[0]);
- 
--	return ret;
-+	return 0;
- }
-diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
-index 24451f8f429106..045090085ac5bd 100755
---- a/tools/testing/ktest/ktest.pl
-+++ b/tools/testing/ktest/ktest.pl
-@@ -2043,7 +2043,7 @@ sub get_grub_index {
-     } elsif ($reboot_type eq "grub2") {
- 	$command = "cat $grub_file";
- 	$target = '^\s*menuentry.*' . $grub_menu_qt;
--	$skip = '^\s*menuentry';
-+	$skip = '^\s*menuentry\s';
- 	$submenu = '^\s*submenu\s';
-     } elsif ($reboot_type eq "grub2bls") {
- 	$command = $grub_bls_get;
-diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
-index 697f13bbbc3217..5b61b8bb29f846 100644
---- a/tools/testing/selftests/Makefile
-+++ b/tools/testing/selftests/Makefile
-@@ -184,6 +184,8 @@ run_tests: all
- 	@for TARGET in $(TARGETS); do \
- 		BUILD_TARGET=$$BUILD/$$TARGET;	\
- 		$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests \
-+				SRC_PATH=$(shell readlink -e $$(pwd)) \
-+				OBJ_PATH=$(BUILD)                   \
- 				O=$(abs_objtree);		    \
- 	done;
- 
-@@ -234,7 +236,10 @@ ifdef INSTALL_PATH
- 	@ret=1;	\
- 	for TARGET in $(TARGETS); do \
- 		BUILD_TARGET=$$BUILD/$$TARGET;	\
--		$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET INSTALL_PATH=$(INSTALL_PATH)/$$TARGET install \
-+		$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET install \
-+				INSTALL_PATH=$(INSTALL_PATH)/$$TARGET \
-+				SRC_PATH=$(shell readlink -e $$(pwd)) \
-+				OBJ_PATH=$(INSTALL_PATH) \
- 				O=$(abs_objtree)		\
- 				$(if $(FORCE_TARGETS),|| exit);	\
- 		ret=$$((ret * $$?));		\
-diff --git a/tools/testing/selftests/bpf/progs/verifier_int_ptr.c b/tools/testing/selftests/bpf/progs/verifier_int_ptr.c
-index 589e8270de4628..d873da71f14363 100644
---- a/tools/testing/selftests/bpf/progs/verifier_int_ptr.c
-+++ b/tools/testing/selftests/bpf/progs/verifier_int_ptr.c
-@@ -8,7 +8,6 @@
- SEC("socket")
- __description("ARG_PTR_TO_LONG uninitialized")
- __success
--__failure_unpriv __msg_unpriv("invalid indirect read from stack R4 off -16+0 size 8")
- __naked void arg_ptr_to_long_uninitialized(void)
- {
- 	asm volatile ("					\
-@@ -36,9 +35,7 @@ __naked void arg_ptr_to_long_uninitialized(void)
- 
- SEC("socket")
- __description("ARG_PTR_TO_LONG half-uninitialized")
--/* in privileged mode reads from uninitialized stack locations are permitted */
--__success __failure_unpriv
--__msg_unpriv("invalid indirect read from stack R4 off -16+4 size 8")
-+__success
- __retval(0)
- __naked void ptr_to_long_half_uninitialized(void)
- {
-diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk
-index a8f0442a36bca0..01db65c0e84ca3 100644
---- a/tools/testing/selftests/lib.mk
-+++ b/tools/testing/selftests/lib.mk
-@@ -77,11 +77,29 @@ define RUN_TESTS
- 	run_many $(1)
- endef
- 
-+define INSTALL_INCLUDES
-+	$(if $(TEST_INCLUDES), \
-+		relative_files=""; \
-+		for entry in $(TEST_INCLUDES); do \
-+			entry_dir=$$(readlink -e "$$(dirname "$$entry")"); \
-+			entry_name=$$(basename "$$entry"); \
-+			relative_dir=$${entry_dir#"$$SRC_PATH"/}; \
-+			if [ "$$relative_dir" = "$$entry_dir" ]; then \
-+				echo "Error: TEST_INCLUDES entry \"$$entry\" not located inside selftests directory ($$SRC_PATH)" >&2; \
-+				exit 1; \
-+			fi; \
-+			relative_files="$$relative_files $$relative_dir/$$entry_name"; \
-+		done; \
-+		cd $(SRC_PATH) && rsync -aR $$relative_files $(OBJ_PATH)/ \
-+	)
-+endef
-+
- run_tests: all
- ifdef building_out_of_srctree
- 	@if [ "X$(TEST_PROGS)$(TEST_PROGS_EXTENDED)$(TEST_FILES)" != "X" ]; then \
- 		rsync -aq --copy-unsafe-links $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(OUTPUT); \
- 	fi
-+	@$(INSTALL_INCLUDES)
- 	@if [ "X$(TEST_PROGS)" != "X" ]; then \
- 		$(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) \
- 				  $(addprefix $(OUTPUT)/,$(TEST_PROGS))) ; \
-@@ -111,6 +129,7 @@ endef
- install: all
- ifdef INSTALL_PATH
- 	$(INSTALL_RULE)
-+	$(INSTALL_INCLUDES)
- else
- 	$(error Error: set INSTALL_PATH to use install)
- endif
-diff --git a/tools/testing/selftests/mm/hmm-tests.c b/tools/testing/selftests/mm/hmm-tests.c
-index 20294553a5dd7a..2840924ec97680 100644
---- a/tools/testing/selftests/mm/hmm-tests.c
-+++ b/tools/testing/selftests/mm/hmm-tests.c
-@@ -1657,7 +1657,7 @@ TEST_F(hmm2, double_map)
- 
- 	buffer->fd = -1;
- 	buffer->size = size;
--	buffer->mirror = malloc(npages);
-+	buffer->mirror = malloc(size);
- 	ASSERT_NE(buffer->mirror, NULL);
- 
- 	/* Reserve a range of addresses. */
-diff --git a/tools/testing/selftests/net/forwarding/no_forwarding.sh b/tools/testing/selftests/net/forwarding/no_forwarding.sh
-index 9e677aa64a06a6..694ece9ba3a742 100755
---- a/tools/testing/selftests/net/forwarding/no_forwarding.sh
-+++ b/tools/testing/selftests/net/forwarding/no_forwarding.sh
-@@ -202,7 +202,7 @@ one_bridge_two_pvids()
- 	ip link set $swp2 master br0
- 
- 	bridge vlan add dev $swp1 vid 1 pvid untagged
--	bridge vlan add dev $swp1 vid 2 pvid untagged
-+	bridge vlan add dev $swp2 vid 2 pvid untagged
- 
- 	run_test "Switch ports in VLAN-aware bridge with different PVIDs"
- 
-diff --git a/tools/testing/selftests/net/setup_loopback.sh b/tools/testing/selftests/net/setup_loopback.sh
-old mode 100755
-new mode 100644
-diff --git a/tools/testing/selftests/rseq/rseq.c b/tools/testing/selftests/rseq/rseq.c
-index 96e812bdf8a45c..5b9772cdf2651b 100644
---- a/tools/testing/selftests/rseq/rseq.c
-+++ b/tools/testing/selftests/rseq/rseq.c
-@@ -60,12 +60,6 @@ unsigned int rseq_size = -1U;
- /* Flags used during rseq registration.  */
- unsigned int rseq_flags;
- 
--/*
-- * rseq feature size supported by the kernel. 0 if the registration was
-- * unsuccessful.
-- */
--unsigned int rseq_feature_size = -1U;
--
- static int rseq_ownership;
- static int rseq_reg_success;	/* At least one rseq registration has succeded. */
- 
-@@ -111,6 +105,43 @@ int rseq_available(void)
- 	}
- }
- 
-+/* The rseq areas need to be at least 32 bytes. */
-+static
-+unsigned int get_rseq_min_alloc_size(void)
-+{
-+	unsigned int alloc_size = rseq_size;
-+
-+	if (alloc_size < ORIG_RSEQ_ALLOC_SIZE)
-+		alloc_size = ORIG_RSEQ_ALLOC_SIZE;
-+	return alloc_size;
-+}
-+
-+/*
-+ * Return the feature size supported by the kernel.
-+ *
-+ * Depending on the value returned by getauxval(AT_RSEQ_FEATURE_SIZE):
-+ *
-+ * 0:   Return ORIG_RSEQ_FEATURE_SIZE (20)
-+ * > 0: Return the value from getauxval(AT_RSEQ_FEATURE_SIZE).
-+ *
-+ * It should never return a value below ORIG_RSEQ_FEATURE_SIZE.
-+ */
-+static
-+unsigned int get_rseq_kernel_feature_size(void)
-+{
-+	unsigned long auxv_rseq_feature_size, auxv_rseq_align;
-+
-+	auxv_rseq_align = getauxval(AT_RSEQ_ALIGN);
-+	assert(!auxv_rseq_align || auxv_rseq_align <= RSEQ_THREAD_AREA_ALLOC_SIZE);
-+
-+	auxv_rseq_feature_size = getauxval(AT_RSEQ_FEATURE_SIZE);
-+	assert(!auxv_rseq_feature_size || auxv_rseq_feature_size <= RSEQ_THREAD_AREA_ALLOC_SIZE);
-+	if (auxv_rseq_feature_size)
-+		return auxv_rseq_feature_size;
-+	else
-+		return ORIG_RSEQ_FEATURE_SIZE;
-+}
-+
- int rseq_register_current_thread(void)
- {
- 	int rc;
-@@ -119,7 +150,7 @@ int rseq_register_current_thread(void)
- 		/* Treat libc's ownership as a successful registration. */
- 		return 0;
- 	}
--	rc = sys_rseq(&__rseq_abi, rseq_size, 0, RSEQ_SIG);
-+	rc = sys_rseq(&__rseq_abi, get_rseq_min_alloc_size(), 0, RSEQ_SIG);
- 	if (rc) {
- 		if (RSEQ_READ_ONCE(rseq_reg_success)) {
- 			/* Incoherent success/failure within process. */
-@@ -140,28 +171,12 @@ int rseq_unregister_current_thread(void)
- 		/* Treat libc's ownership as a successful unregistration. */
- 		return 0;
- 	}
--	rc = sys_rseq(&__rseq_abi, rseq_size, RSEQ_ABI_FLAG_UNREGISTER, RSEQ_SIG);
-+	rc = sys_rseq(&__rseq_abi, get_rseq_min_alloc_size(), RSEQ_ABI_FLAG_UNREGISTER, RSEQ_SIG);
- 	if (rc)
- 		return -1;
- 	return 0;
- }
- 
--static
--unsigned int get_rseq_feature_size(void)
--{
--	unsigned long auxv_rseq_feature_size, auxv_rseq_align;
--
--	auxv_rseq_align = getauxval(AT_RSEQ_ALIGN);
--	assert(!auxv_rseq_align || auxv_rseq_align <= RSEQ_THREAD_AREA_ALLOC_SIZE);
--
--	auxv_rseq_feature_size = getauxval(AT_RSEQ_FEATURE_SIZE);
--	assert(!auxv_rseq_feature_size || auxv_rseq_feature_size <= RSEQ_THREAD_AREA_ALLOC_SIZE);
--	if (auxv_rseq_feature_size)
--		return auxv_rseq_feature_size;
--	else
--		return ORIG_RSEQ_FEATURE_SIZE;
--}
--
- static __attribute__((constructor))
- void rseq_init(void)
- {
-@@ -178,28 +193,54 @@ void rseq_init(void)
- 	}
- 	if (libc_rseq_size_p && libc_rseq_offset_p && libc_rseq_flags_p &&
- 			*libc_rseq_size_p != 0) {
-+		unsigned int libc_rseq_size;
-+
- 		/* rseq registration owned by glibc */
- 		rseq_offset = *libc_rseq_offset_p;
--		rseq_size = *libc_rseq_size_p;
-+		libc_rseq_size = *libc_rseq_size_p;
- 		rseq_flags = *libc_rseq_flags_p;
--		rseq_feature_size = get_rseq_feature_size();
--		if (rseq_feature_size > rseq_size)
--			rseq_feature_size = rseq_size;
-+
-+		/*
-+		 * Previous versions of glibc expose the value
-+		 * 32 even though the kernel only supported 20
-+		 * bytes initially. Therefore treat 32 as a
-+		 * special-case. glibc 2.40 exposes a 20 bytes
-+		 * __rseq_size without using getauxval(3) to
-+		 * query the supported size, while still allocating a 32
-+		 * bytes area. Also treat 20 as a special-case.
-+		 *
-+		 * Special-cases are handled by using the following
-+		 * value as active feature set size:
-+		 *
-+		 *   rseq_size = min(32, get_rseq_kernel_feature_size())
-+		 */
-+		switch (libc_rseq_size) {
-+		case ORIG_RSEQ_FEATURE_SIZE:
-+			fallthrough;
-+		case ORIG_RSEQ_ALLOC_SIZE:
-+		{
-+			unsigned int rseq_kernel_feature_size = get_rseq_kernel_feature_size();
-+
-+			if (rseq_kernel_feature_size < ORIG_RSEQ_ALLOC_SIZE)
-+				rseq_size = rseq_kernel_feature_size;
-+			else
-+				rseq_size = ORIG_RSEQ_ALLOC_SIZE;
-+			break;
-+		}
-+		default:
-+			/* Otherwise just use the __rseq_size from libc as rseq_size. */
-+			rseq_size = libc_rseq_size;
-+			break;
-+		}
- 		return;
- 	}
- 	rseq_ownership = 1;
- 	if (!rseq_available()) {
- 		rseq_size = 0;
--		rseq_feature_size = 0;
- 		return;
- 	}
- 	rseq_offset = (void *)&__rseq_abi - rseq_thread_pointer();
- 	rseq_flags = 0;
--	rseq_feature_size = get_rseq_feature_size();
--	if (rseq_feature_size == ORIG_RSEQ_FEATURE_SIZE)
--		rseq_size = ORIG_RSEQ_ALLOC_SIZE;
--	else
--		rseq_size = RSEQ_THREAD_AREA_ALLOC_SIZE;
- }
- 
- static __attribute__((destructor))
-@@ -209,7 +250,6 @@ void rseq_exit(void)
- 		return;
- 	rseq_offset = 0;
- 	rseq_size = -1U;
--	rseq_feature_size = -1U;
- 	rseq_ownership = 0;
- }
- 
-diff --git a/tools/testing/selftests/rseq/rseq.h b/tools/testing/selftests/rseq/rseq.h
-index d7364ea4d201d2..4e217b620e0c7a 100644
---- a/tools/testing/selftests/rseq/rseq.h
-+++ b/tools/testing/selftests/rseq/rseq.h
-@@ -68,12 +68,6 @@ extern unsigned int rseq_size;
- /* Flags used during rseq registration. */
- extern unsigned int rseq_flags;
- 
--/*
-- * rseq feature size supported by the kernel. 0 if the registration was
-- * unsuccessful.
-- */
--extern unsigned int rseq_feature_size;
--
- enum rseq_mo {
- 	RSEQ_MO_RELAXED = 0,
- 	RSEQ_MO_CONSUME = 1,	/* Unused */
-@@ -193,7 +187,7 @@ static inline uint32_t rseq_current_cpu(void)
- 
- static inline bool rseq_node_id_available(void)
- {
--	return (int) rseq_feature_size >= rseq_offsetofend(struct rseq_abi, node_id);
-+	return (int) rseq_size >= rseq_offsetofend(struct rseq_abi, node_id);
- }
- 
- /*
-@@ -207,7 +201,7 @@ static inline uint32_t rseq_current_node_id(void)
- 
- static inline bool rseq_mm_cid_available(void)
- {
--	return (int) rseq_feature_size >= rseq_offsetofend(struct rseq_abi, mm_cid);
-+	return (int) rseq_size >= rseq_offsetofend(struct rseq_abi, mm_cid);
- }
- 
- static inline uint32_t rseq_current_mm_cid(void)
diff --git a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.57-58.patch b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.57-58.patch
deleted file mode 100644
index 62597ba3abe9..000000000000
--- a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.57-58.patch
+++ /dev/null
@@ -1,4422 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 5b5e40c4088c1c..f80e78c7cf2006 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- VERSION = 6
- PATCHLEVEL = 6
--SUBLEVEL = 57
-+SUBLEVEL = 58
- EXTRAVERSION =
- NAME = Pinguïn Aangedreven
- 
-diff --git a/arch/arm64/include/asm/uprobes.h b/arch/arm64/include/asm/uprobes.h
-index 2b09495499c618..014b02897f8e22 100644
---- a/arch/arm64/include/asm/uprobes.h
-+++ b/arch/arm64/include/asm/uprobes.h
-@@ -10,11 +10,9 @@
- #include <asm/insn.h>
- #include <asm/probes.h>
- 
--#define MAX_UINSN_BYTES		AARCH64_INSN_SIZE
--
- #define UPROBE_SWBP_INSN	cpu_to_le32(BRK64_OPCODE_UPROBES)
- #define UPROBE_SWBP_INSN_SIZE	AARCH64_INSN_SIZE
--#define UPROBE_XOL_SLOT_BYTES	MAX_UINSN_BYTES
-+#define UPROBE_XOL_SLOT_BYTES	AARCH64_INSN_SIZE
- 
- typedef __le32 uprobe_opcode_t;
- 
-@@ -23,8 +21,8 @@ struct arch_uprobe_task {
- 
- struct arch_uprobe {
- 	union {
--		u8 insn[MAX_UINSN_BYTES];
--		u8 ixol[MAX_UINSN_BYTES];
-+		__le32 insn;
-+		__le32 ixol;
- 	};
- 	struct arch_probe_insn api;
- 	bool simulate;
-diff --git a/arch/arm64/kernel/probes/decode-insn.c b/arch/arm64/kernel/probes/decode-insn.c
-index 968d5fffe23302..3496d6169e59b2 100644
---- a/arch/arm64/kernel/probes/decode-insn.c
-+++ b/arch/arm64/kernel/probes/decode-insn.c
-@@ -99,10 +99,6 @@ arm_probe_decode_insn(probe_opcode_t insn, struct arch_probe_insn *api)
- 	    aarch64_insn_is_blr(insn) ||
- 	    aarch64_insn_is_ret(insn)) {
- 		api->handler = simulate_br_blr_ret;
--	} else if (aarch64_insn_is_ldr_lit(insn)) {
--		api->handler = simulate_ldr_literal;
--	} else if (aarch64_insn_is_ldrsw_lit(insn)) {
--		api->handler = simulate_ldrsw_literal;
- 	} else {
- 		/*
- 		 * Instruction cannot be stepped out-of-line and we don't
-@@ -140,6 +136,17 @@ arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi)
- 	probe_opcode_t insn = le32_to_cpu(*addr);
- 	probe_opcode_t *scan_end = NULL;
- 	unsigned long size = 0, offset = 0;
-+	struct arch_probe_insn *api = &asi->api;
-+
-+	if (aarch64_insn_is_ldr_lit(insn)) {
-+		api->handler = simulate_ldr_literal;
-+		decoded = INSN_GOOD_NO_SLOT;
-+	} else if (aarch64_insn_is_ldrsw_lit(insn)) {
-+		api->handler = simulate_ldrsw_literal;
-+		decoded = INSN_GOOD_NO_SLOT;
-+	} else {
-+		decoded = arm_probe_decode_insn(insn, &asi->api);
-+	}
- 
- 	/*
- 	 * If there's a symbol defined in front of and near enough to
-@@ -157,7 +164,6 @@ arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi)
- 		else
- 			scan_end = addr - MAX_ATOMIC_CONTEXT_SIZE;
- 	}
--	decoded = arm_probe_decode_insn(insn, &asi->api);
- 
- 	if (decoded != INSN_REJECTED && scan_end)
- 		if (is_probed_address_atomic(addr - 1, scan_end))
-diff --git a/arch/arm64/kernel/probes/simulate-insn.c b/arch/arm64/kernel/probes/simulate-insn.c
-index 22d0b32524763e..b65334ab79d2b0 100644
---- a/arch/arm64/kernel/probes/simulate-insn.c
-+++ b/arch/arm64/kernel/probes/simulate-insn.c
-@@ -171,17 +171,15 @@ simulate_tbz_tbnz(u32 opcode, long addr, struct pt_regs *regs)
- void __kprobes
- simulate_ldr_literal(u32 opcode, long addr, struct pt_regs *regs)
- {
--	u64 *load_addr;
-+	unsigned long load_addr;
- 	int xn = opcode & 0x1f;
--	int disp;
- 
--	disp = ldr_displacement(opcode);
--	load_addr = (u64 *) (addr + disp);
-+	load_addr = addr + ldr_displacement(opcode);
- 
- 	if (opcode & (1 << 30))	/* x0-x30 */
--		set_x_reg(regs, xn, *load_addr);
-+		set_x_reg(regs, xn, READ_ONCE(*(u64 *)load_addr));
- 	else			/* w0-w30 */
--		set_w_reg(regs, xn, *load_addr);
-+		set_w_reg(regs, xn, READ_ONCE(*(u32 *)load_addr));
- 
- 	instruction_pointer_set(regs, instruction_pointer(regs) + 4);
- }
-@@ -189,14 +187,12 @@ simulate_ldr_literal(u32 opcode, long addr, struct pt_regs *regs)
- void __kprobes
- simulate_ldrsw_literal(u32 opcode, long addr, struct pt_regs *regs)
- {
--	s32 *load_addr;
-+	unsigned long load_addr;
- 	int xn = opcode & 0x1f;
--	int disp;
- 
--	disp = ldr_displacement(opcode);
--	load_addr = (s32 *) (addr + disp);
-+	load_addr = addr + ldr_displacement(opcode);
- 
--	set_x_reg(regs, xn, *load_addr);
-+	set_x_reg(regs, xn, READ_ONCE(*(s32 *)load_addr));
- 
- 	instruction_pointer_set(regs, instruction_pointer(regs) + 4);
- }
-diff --git a/arch/arm64/kernel/probes/uprobes.c b/arch/arm64/kernel/probes/uprobes.c
-index d49aef2657cdf7..a2f137a595fc1c 100644
---- a/arch/arm64/kernel/probes/uprobes.c
-+++ b/arch/arm64/kernel/probes/uprobes.c
-@@ -42,7 +42,7 @@ int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm,
- 	else if (!IS_ALIGNED(addr, AARCH64_INSN_SIZE))
- 		return -EINVAL;
- 
--	insn = *(probe_opcode_t *)(&auprobe->insn[0]);
-+	insn = le32_to_cpu(auprobe->insn);
- 
- 	switch (arm_probe_decode_insn(insn, &auprobe->api)) {
- 	case INSN_REJECTED:
-@@ -108,7 +108,7 @@ bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs)
- 	if (!auprobe->simulate)
- 		return false;
- 
--	insn = *(probe_opcode_t *)(&auprobe->insn[0]);
-+	insn = le32_to_cpu(auprobe->insn);
- 	addr = instruction_pointer(regs);
- 
- 	if (auprobe->api.handler)
-diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c
-index 3c65b8258ae67a..2cc3ec034046c9 100644
---- a/arch/s390/kvm/diag.c
-+++ b/arch/s390/kvm/diag.c
-@@ -77,7 +77,7 @@ static int __diag_page_ref_service(struct kvm_vcpu *vcpu)
- 	vcpu->stat.instruction_diagnose_258++;
- 	if (vcpu->run->s.regs.gprs[rx] & 7)
- 		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);
--	rc = read_guest(vcpu, vcpu->run->s.regs.gprs[rx], rx, &parm, sizeof(parm));
-+	rc = read_guest_real(vcpu, vcpu->run->s.regs.gprs[rx], &parm, sizeof(parm));
- 	if (rc)
- 		return kvm_s390_inject_prog_cond(vcpu, rc);
- 	if (parm.parm_version != 2 || parm.parm_len < 5 || parm.code != 0x258)
-diff --git a/arch/s390/kvm/gaccess.c b/arch/s390/kvm/gaccess.c
-index ff8349d17b331a..090dc38334336b 100644
---- a/arch/s390/kvm/gaccess.c
-+++ b/arch/s390/kvm/gaccess.c
-@@ -1001,6 +1001,8 @@ static int access_guest_page(struct kvm *kvm, enum gacc_mode mode, gpa_t gpa,
- 	const gfn_t gfn = gpa_to_gfn(gpa);
- 	int rc;
- 
-+	if (!gfn_to_memslot(kvm, gfn))
-+		return PGM_ADDRESSING;
- 	if (mode == GACC_STORE)
- 		rc = kvm_write_guest_page(kvm, gfn, data, offset, len);
- 	else
-@@ -1158,6 +1160,8 @@ int access_guest_real(struct kvm_vcpu *vcpu, unsigned long gra,
- 		gra += fragment_len;
- 		data += fragment_len;
- 	}
-+	if (rc > 0)
-+		vcpu->arch.pgm.code = rc;
- 	return rc;
- }
- 
-diff --git a/arch/s390/kvm/gaccess.h b/arch/s390/kvm/gaccess.h
-index b320d12aa04934..3fde45a151f22e 100644
---- a/arch/s390/kvm/gaccess.h
-+++ b/arch/s390/kvm/gaccess.h
-@@ -405,11 +405,12 @@ int read_guest_abs(struct kvm_vcpu *vcpu, unsigned long gpa, void *data,
-  * @len: number of bytes to copy
-  *
-  * Copy @len bytes from @data (kernel space) to @gra (guest real address).
-- * It is up to the caller to ensure that the entire guest memory range is
-- * valid memory before calling this function.
-  * Guest low address and key protection are not checked.
-  *
-- * Returns zero on success or -EFAULT on error.
-+ * Returns zero on success, -EFAULT when copying from @data failed, or
-+ * PGM_ADRESSING in case @gra is outside a memslot. In this case, pgm check info
-+ * is also stored to allow injecting into the guest (if applicable) using
-+ * kvm_s390_inject_prog_cond().
-  *
-  * If an error occurs data may have been copied partially to guest memory.
-  */
-@@ -428,11 +429,12 @@ int write_guest_real(struct kvm_vcpu *vcpu, unsigned long gra, void *data,
-  * @len: number of bytes to copy
-  *
-  * Copy @len bytes from @gra (guest real address) to @data (kernel space).
-- * It is up to the caller to ensure that the entire guest memory range is
-- * valid memory before calling this function.
-  * Guest key protection is not checked.
-  *
-- * Returns zero on success or -EFAULT on error.
-+ * Returns zero on success, -EFAULT when copying to @data failed, or
-+ * PGM_ADRESSING in case @gra is outside a memslot. In this case, pgm check info
-+ * is also stored to allow injecting into the guest (if applicable) using
-+ * kvm_s390_inject_prog_cond().
-  *
-  * If an error occurs data may have been copied partially to kernel space.
-  */
-diff --git a/arch/x86/entry/entry.S b/arch/x86/entry/entry.S
-index 718c00367f9a5a..34eca8015b64bc 100644
---- a/arch/x86/entry/entry.S
-+++ b/arch/x86/entry/entry.S
-@@ -9,6 +9,8 @@
- #include <asm/unwind_hints.h>
- #include <asm/segment.h>
- #include <asm/cache.h>
-+#include <asm/cpufeatures.h>
-+#include <asm/nospec-branch.h>
- 
- .pushsection .noinstr.text, "ax"
- 
-@@ -17,6 +19,9 @@ SYM_FUNC_START(entry_ibpb)
- 	movl	$PRED_CMD_IBPB, %eax
- 	xorl	%edx, %edx
- 	wrmsr
-+
-+	/* Make sure IBPB clears return stack preductions too. */
-+	FILL_RETURN_BUFFER %rax, RSB_CLEAR_LOOPS, X86_BUG_IBPB_NO_RET
- 	RET
- SYM_FUNC_END(entry_ibpb)
- /* For KVM */
-diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
-index 74a4358c7f4500..3894acc54b79c4 100644
---- a/arch/x86/entry/entry_32.S
-+++ b/arch/x86/entry/entry_32.S
-@@ -875,6 +875,8 @@ SYM_FUNC_START(entry_SYSENTER_32)
- 
- 	/* Now ready to switch the cr3 */
- 	SWITCH_TO_USER_CR3 scratch_reg=%eax
-+	/* Clobbers ZF */
-+	CLEAR_CPU_BUFFERS
- 
- 	/*
- 	 * Restore all flags except IF. (We restore IF separately because
-@@ -885,7 +887,6 @@ SYM_FUNC_START(entry_SYSENTER_32)
- 	BUG_IF_WRONG_CR3 no_user_check=1
- 	popfl
- 	popl	%eax
--	CLEAR_CPU_BUFFERS
- 
- 	/*
- 	 * Return back to the vDSO, which will pop ecx and edx.
-@@ -1148,7 +1149,6 @@ SYM_CODE_START(asm_exc_nmi)
- 
- 	/* Not on SYSENTER stack. */
- 	call	exc_nmi
--	CLEAR_CPU_BUFFERS
- 	jmp	.Lnmi_return
- 
- .Lnmi_from_sysenter_stack:
-@@ -1169,6 +1169,7 @@ SYM_CODE_START(asm_exc_nmi)
- 
- 	CHECK_AND_APPLY_ESPFIX
- 	RESTORE_ALL_NMI cr3_reg=%edi pop=4
-+	CLEAR_CPU_BUFFERS
- 	jmp	.Lirq_return
- 
- #ifdef CONFIG_X86_ESPFIX32
-@@ -1210,6 +1211,7 @@ SYM_CODE_START(asm_exc_nmi)
- 	 *  1 - orig_ax
- 	 */
- 	lss	(1+5+6)*4(%esp), %esp			# back to espfix stack
-+	CLEAR_CPU_BUFFERS
- 	jmp	.Lirq_return
- #endif
- SYM_CODE_END(asm_exc_nmi)
-diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h
-index 8c1593dd2c3171..55d18eef6775a6 100644
---- a/arch/x86/include/asm/cpufeatures.h
-+++ b/arch/x86/include/asm/cpufeatures.h
-@@ -216,7 +216,7 @@
- #define X86_FEATURE_SPEC_STORE_BYPASS_DISABLE	( 7*32+23) /* "" Disable Speculative Store Bypass. */
- #define X86_FEATURE_LS_CFG_SSBD		( 7*32+24)  /* "" AMD SSBD implementation via LS_CFG MSR */
- #define X86_FEATURE_IBRS		( 7*32+25) /* Indirect Branch Restricted Speculation */
--#define X86_FEATURE_IBPB		( 7*32+26) /* Indirect Branch Prediction Barrier */
-+#define X86_FEATURE_IBPB		( 7*32+26) /* "ibpb" Indirect Branch Prediction Barrier without a guaranteed RSB flush */
- #define X86_FEATURE_STIBP		( 7*32+27) /* Single Thread Indirect Branch Predictors */
- #define X86_FEATURE_ZEN			( 7*32+28) /* "" Generic flag for all Zen and newer */
- #define X86_FEATURE_L1TF_PTEINV		( 7*32+29) /* "" L1TF workaround PTE inversion */
-@@ -347,6 +347,7 @@
- #define X86_FEATURE_CPPC		(13*32+27) /* Collaborative Processor Performance Control */
- #define X86_FEATURE_AMD_PSFD            (13*32+28) /* "" Predictive Store Forwarding Disable */
- #define X86_FEATURE_BTC_NO		(13*32+29) /* "" Not vulnerable to Branch Type Confusion */
-+#define X86_FEATURE_AMD_IBPB_RET	(13*32+30) /* "" IBPB clears return address predictor */
- #define X86_FEATURE_BRS			(13*32+31) /* Branch Sampling available */
- 
- /* Thermal and Power Management Leaf, CPUID level 0x00000006 (EAX), word 14 */
-@@ -516,4 +517,5 @@
- #define X86_BUG_DIV0			X86_BUG(1*32 + 1) /* AMD DIV0 speculation bug */
- #define X86_BUG_RFDS			X86_BUG(1*32 + 2) /* CPU is vulnerable to Register File Data Sampling */
- #define X86_BUG_BHI			X86_BUG(1*32 + 3) /* CPU is affected by Branch History Injection */
-+#define X86_BUG_IBPB_NO_RET		X86_BUG(1*32 + 4) /* "ibpb_no_ret" IBPB omits return target predictions */
- #endif /* _ASM_X86_CPUFEATURES_H */
-diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
-index a8781c8763b44f..ee642d26e30457 100644
---- a/arch/x86/include/asm/nospec-branch.h
-+++ b/arch/x86/include/asm/nospec-branch.h
-@@ -332,7 +332,16 @@
-  * Note: Only the memory operand variant of VERW clears the CPU buffers.
-  */
- .macro CLEAR_CPU_BUFFERS
--	ALTERNATIVE "", __stringify(verw _ASM_RIP(mds_verw_sel)), X86_FEATURE_CLEAR_CPU_BUF
-+#ifdef CONFIG_X86_64
-+	ALTERNATIVE "", "verw mds_verw_sel(%rip)", X86_FEATURE_CLEAR_CPU_BUF
-+#else
-+	/*
-+	 * In 32bit mode, the memory operand must be a %cs reference. The data
-+	 * segments may not be usable (vm86 mode), and the stack segment may not
-+	 * be flat (ESPFIX32).
-+	 */
-+	ALTERNATIVE "", "verw %cs:mds_verw_sel", X86_FEATURE_CLEAR_CPU_BUF
-+#endif
- .endm
- 
- #ifdef CONFIG_X86_64
-diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
-index f2e605ee75d966..00ca9c3c1d8bf8 100644
---- a/arch/x86/kernel/apic/apic.c
-+++ b/arch/x86/kernel/apic/apic.c
-@@ -473,7 +473,19 @@ static int lapic_timer_shutdown(struct clock_event_device *evt)
- 	v = apic_read(APIC_LVTT);
- 	v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
- 	apic_write(APIC_LVTT, v);
--	apic_write(APIC_TMICT, 0);
-+
-+	/*
-+	 * Setting APIC_LVT_MASKED (above) should be enough to tell
-+	 * the hardware that this timer will never fire. But AMD
-+	 * erratum 411 and some Intel CPU behavior circa 2024 say
-+	 * otherwise.  Time for belt and suspenders programming: mask
-+	 * the timer _and_ zero the counter registers:
-+	 */
-+	if (v & APIC_LVT_TIMER_TSCDEADLINE)
-+		wrmsrl(MSR_IA32_TSC_DEADLINE, 0);
-+	else
-+		apic_write(APIC_TMICT, 0);
-+
- 	return 0;
- }
- 
-diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
-index 9fd91022d92d0f..145c81c68394be 100644
---- a/arch/x86/kernel/cpu/amd.c
-+++ b/arch/x86/kernel/cpu/amd.c
-@@ -1374,7 +1374,8 @@ void amd_check_microcode(void)
- 	if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
- 		return;
- 
--	on_each_cpu(zenbleed_check_cpu, NULL, 1);
-+	if (cpu_feature_enabled(X86_FEATURE_ZEN2))
-+		on_each_cpu(zenbleed_check_cpu, NULL, 1);
- }
- 
- /*
-diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
-index c2dc9b7426acb4..7b5ba5b8592a25 100644
---- a/arch/x86/kernel/cpu/bugs.c
-+++ b/arch/x86/kernel/cpu/bugs.c
-@@ -1113,8 +1113,25 @@ static void __init retbleed_select_mitigation(void)
- 
- 	case RETBLEED_MITIGATION_IBPB:
- 		setup_force_cpu_cap(X86_FEATURE_ENTRY_IBPB);
-+
-+		/*
-+		 * IBPB on entry already obviates the need for
-+		 * software-based untraining so clear those in case some
-+		 * other mitigation like SRSO has selected them.
-+		 */
-+		setup_clear_cpu_cap(X86_FEATURE_UNRET);
-+		setup_clear_cpu_cap(X86_FEATURE_RETHUNK);
-+
- 		setup_force_cpu_cap(X86_FEATURE_IBPB_ON_VMEXIT);
- 		mitigate_smt = true;
-+
-+		/*
-+		 * There is no need for RSB filling: entry_ibpb() ensures
-+		 * all predictions, including the RSB, are invalidated,
-+		 * regardless of IBPB implementation.
-+		 */
-+		setup_clear_cpu_cap(X86_FEATURE_RSB_VMEXIT);
-+
- 		break;
- 
- 	case RETBLEED_MITIGATION_STUFF:
-@@ -2610,6 +2627,14 @@ static void __init srso_select_mitigation(void)
- 			if (has_microcode) {
- 				setup_force_cpu_cap(X86_FEATURE_ENTRY_IBPB);
- 				srso_mitigation = SRSO_MITIGATION_IBPB;
-+
-+				/*
-+				 * IBPB on entry already obviates the need for
-+				 * software-based untraining so clear those in case some
-+				 * other mitigation like Retbleed has selected them.
-+				 */
-+				setup_clear_cpu_cap(X86_FEATURE_UNRET);
-+				setup_clear_cpu_cap(X86_FEATURE_RETHUNK);
- 			}
- 		} else {
- 			pr_err("WARNING: kernel not compiled with CPU_IBPB_ENTRY.\n");
-@@ -2622,6 +2647,13 @@ static void __init srso_select_mitigation(void)
- 			if (!boot_cpu_has(X86_FEATURE_ENTRY_IBPB) && has_microcode) {
- 				setup_force_cpu_cap(X86_FEATURE_IBPB_ON_VMEXIT);
- 				srso_mitigation = SRSO_MITIGATION_IBPB_ON_VMEXIT;
-+
-+				/*
-+				 * There is no need for RSB filling: entry_ibpb() ensures
-+				 * all predictions, including the RSB, are invalidated,
-+				 * regardless of IBPB implementation.
-+				 */
-+				setup_clear_cpu_cap(X86_FEATURE_RSB_VMEXIT);
- 			}
- 		} else {
- 			pr_err("WARNING: kernel not compiled with CPU_SRSO.\n");
-diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index 74d566263467ed..7a1e58fb43a033 100644
---- a/arch/x86/kernel/cpu/common.c
-+++ b/arch/x86/kernel/cpu/common.c
-@@ -1483,6 +1483,9 @@ static void __init cpu_set_bug_bits(struct cpuinfo_x86 *c)
- 	     boot_cpu_has(X86_FEATURE_HYPERVISOR)))
- 		setup_force_cpu_bug(X86_BUG_BHI);
- 
-+	if (cpu_has(c, X86_FEATURE_AMD_IBPB) && !cpu_has(c, X86_FEATURE_AMD_IBPB_RET))
-+		setup_force_cpu_bug(X86_BUG_IBPB_NO_RET);
-+
- 	if (cpu_matches(cpu_vuln_whitelist, NO_MELTDOWN))
- 		return;
- 
-diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c
-index 8073fd3042939c..10830995eadab6 100644
---- a/arch/x86/kernel/cpu/resctrl/core.c
-+++ b/arch/x86/kernel/cpu/resctrl/core.c
-@@ -193,7 +193,7 @@ static inline bool rdt_get_mb_table(struct rdt_resource *r)
- 	return false;
- }
- 
--static bool __get_mem_config_intel(struct rdt_resource *r)
-+static __init bool __get_mem_config_intel(struct rdt_resource *r)
- {
- 	struct rdt_hw_resource *hw_res = resctrl_to_arch_res(r);
- 	union cpuid_0x10_3_eax eax;
-@@ -227,7 +227,7 @@ static bool __get_mem_config_intel(struct rdt_resource *r)
- 	return true;
- }
- 
--static bool __rdt_get_mem_config_amd(struct rdt_resource *r)
-+static __init bool __rdt_get_mem_config_amd(struct rdt_resource *r)
- {
- 	struct rdt_hw_resource *hw_res = resctrl_to_arch_res(r);
- 	u32 eax, ebx, ecx, edx, subleaf;
-diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
-index dd7310c94713c9..dc510f493ba572 100644
---- a/block/blk-rq-qos.c
-+++ b/block/blk-rq-qos.c
-@@ -219,8 +219,8 @@ static int rq_qos_wake_function(struct wait_queue_entry *curr,
- 
- 	data->got_token = true;
- 	smp_wmb();
--	list_del_init(&curr->entry);
- 	wake_up_process(data->task);
-+	list_del_init_careful(&curr->entry);
- 	return 1;
- }
- 
-diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
-index 9cafbce1faf388..f31607a24f5735 100644
---- a/drivers/block/ublk_drv.c
-+++ b/drivers/block/ublk_drv.c
-@@ -2327,10 +2327,19 @@ static int ublk_ctrl_add_dev(struct io_uring_cmd *cmd)
- 	 * TODO: provide forward progress for RECOVERY handler, so that
- 	 * unprivileged device can benefit from it
- 	 */
--	if (info.flags & UBLK_F_UNPRIVILEGED_DEV)
-+	if (info.flags & UBLK_F_UNPRIVILEGED_DEV) {
- 		info.flags &= ~(UBLK_F_USER_RECOVERY_REISSUE |
- 				UBLK_F_USER_RECOVERY);
- 
-+		/*
-+		 * For USER_COPY, we depends on userspace to fill request
-+		 * buffer by pwrite() to ublk char device, which can't be
-+		 * used for unprivileged device
-+		 */
-+		if (info.flags & UBLK_F_USER_COPY)
-+			return -EINVAL;
-+	}
-+
- 	/* the created device is always owned by current user */
- 	ublk_store_owner_uid_gid(&info.owner_uid, &info.owner_gid);
- 
-diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index bc53da383f855a..b3a9b93f027a90 100644
---- a/drivers/bluetooth/btusb.c
-+++ b/drivers/bluetooth/btusb.c
-@@ -1354,10 +1354,15 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags)
- 	if (!urb)
- 		return -ENOMEM;
- 
--	/* Use maximum HCI Event size so the USB stack handles
--	 * ZPL/short-transfer automatically.
--	 */
--	size = HCI_MAX_EVENT_SIZE;
-+	if (le16_to_cpu(data->udev->descriptor.idVendor)  == 0x0a12 &&
-+	    le16_to_cpu(data->udev->descriptor.idProduct) == 0x0001)
-+		/* Fake CSR devices don't seem to support sort-transter */
-+		size = le16_to_cpu(data->intr_ep->wMaxPacketSize);
-+	else
-+		/* Use maximum HCI Event size so the USB stack handles
-+		 * ZPL/short-transfer automatically.
-+		 */
-+		size = HCI_MAX_EVENT_SIZE;
- 
- 	buf = kmalloc(size, mem_flags);
- 	if (!buf) {
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-index 7abcd618e70bd1..13c97ba7a820b4 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-@@ -265,7 +265,7 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
- 
- 			/* Only a single BO list is allowed to simplify handling. */
- 			if (p->bo_list)
--				ret = -EINVAL;
-+				goto free_partial_kdata;
- 
- 			ret = amdgpu_cs_p1_bo_handles(p, p->chunks[i].kdata);
- 			if (ret)
-diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
-index c0d7fe5102e6d3..4d17b6958397ed 100644
---- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
-+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
-@@ -1843,7 +1843,7 @@ static int smu_bump_power_profile_mode(struct smu_context *smu,
- static int smu_adjust_power_state_dynamic(struct smu_context *smu,
- 					  enum amd_dpm_forced_level level,
- 					  bool skip_display_settings,
--					  bool force_update)
-+					  bool init)
- {
- 	int ret = 0;
- 	int index = 0;
-@@ -1872,7 +1872,7 @@ static int smu_adjust_power_state_dynamic(struct smu_context *smu,
- 		}
- 	}
- 
--	if (force_update || smu_dpm_ctx->dpm_level != level) {
-+	if (smu_dpm_ctx->dpm_level != level) {
- 		ret = smu_asic_set_performance_level(smu, level);
- 		if (ret) {
- 			dev_err(smu->adev->dev, "Failed to set performance level!");
-@@ -1889,7 +1889,7 @@ static int smu_adjust_power_state_dynamic(struct smu_context *smu,
- 		index = index > 0 && index <= WORKLOAD_POLICY_MAX ? index - 1 : 0;
- 		workload[0] = smu->workload_setting[index];
- 
--		if (force_update || smu->power_profile_mode != workload[0])
-+		if (init || smu->power_profile_mode != workload[0])
- 			smu_bump_power_profile_mode(smu, workload, 0);
- 	}
- 
-diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
-index 9cb6401fe97ed3..bb908f125269dc 100644
---- a/drivers/gpu/drm/radeon/radeon_encoders.c
-+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
-@@ -42,7 +42,7 @@ static uint32_t radeon_encoder_clones(struct drm_encoder *encoder)
- 	struct radeon_device *rdev = dev->dev_private;
- 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
- 	struct drm_encoder *clone_encoder;
--	uint32_t index_mask = 0;
-+	uint32_t index_mask = drm_encoder_mask(encoder);
- 	int count;
- 
- 	/* DIG routing gets problematic */
-diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
-index 08f2470edab275..11f7c0e5420e04 100644
---- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
-+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
-@@ -1659,6 +1659,7 @@ static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev,
- 		DRM_ERROR("Surface size cannot exceed %dx%d\n",
- 			dev_priv->texture_max_width,
- 			dev_priv->texture_max_height);
-+		ret = -EINVAL;
- 		goto err_out;
- 	}
- 
-diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
-index 0398974c9d2b09..df60986d98369e 100644
---- a/drivers/iio/accel/Kconfig
-+++ b/drivers/iio/accel/Kconfig
-@@ -415,6 +415,8 @@ config IIO_ST_ACCEL_SPI_3AXIS
- 
- config IIO_KX022A
- 	tristate
-+	select IIO_BUFFER
-+	select IIO_TRIGGERED_BUFFER
- 
- config IIO_KX022A_SPI
- 	tristate "Kionix KX022A tri-axis digital accelerometer SPI interface"
-diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
-index dfb925cfe38ef2..e46817cb5581cf 100644
---- a/drivers/iio/adc/Kconfig
-+++ b/drivers/iio/adc/Kconfig
-@@ -1286,6 +1286,8 @@ config TI_ADS8344
- config TI_ADS8688
- 	tristate "Texas Instruments ADS8688"
- 	depends on SPI
-+	select IIO_BUFFER
-+	select IIO_TRIGGERED_BUFFER
- 	help
- 	  If you say yes here you get support for Texas Instruments ADS8684 and
- 	  and ADS8688 ADC chips
-@@ -1296,6 +1298,8 @@ config TI_ADS8688
- config TI_ADS124S08
- 	tristate "Texas Instruments ADS124S08"
- 	depends on SPI
-+	select IIO_BUFFER
-+	select IIO_TRIGGERED_BUFFER
- 	help
- 	  If you say yes here you get support for Texas Instruments ADS124S08
- 	  and ADS124S06 ADC chips
-@@ -1330,6 +1334,7 @@ config TI_AM335X_ADC
- config TI_LMP92064
- 	tristate "Texas Instruments LMP92064 ADC driver"
- 	depends on SPI
-+	select REGMAP_SPI
- 	help
- 	  Say yes here to build support for the LMP92064 Precision Current and Voltage
- 	  sensor.
-diff --git a/drivers/iio/amplifiers/Kconfig b/drivers/iio/amplifiers/Kconfig
-index b54fe01734b0d7..55eb16b32f6c9a 100644
---- a/drivers/iio/amplifiers/Kconfig
-+++ b/drivers/iio/amplifiers/Kconfig
-@@ -27,6 +27,7 @@ config AD8366
- config ADA4250
- 	tristate "Analog Devices ADA4250 Instrumentation Amplifier"
- 	depends on SPI
-+	select REGMAP_SPI
- 	help
- 	  Say yes here to build support for Analog Devices ADA4250
- 	  SPI Amplifier's support. The driver provides direct access via
-diff --git a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
-index ad8910e6ad59df..abb09fefc792c5 100644
---- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
-+++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
-@@ -32,7 +32,7 @@ static ssize_t _hid_sensor_set_report_latency(struct device *dev,
- 	latency = integer * 1000 + fract / 1000;
- 	ret = hid_sensor_set_report_latency(attrb, latency);
- 	if (ret < 0)
--		return len;
-+		return ret;
- 
- 	attrb->latency_ms = hid_sensor_get_report_latency(attrb);
- 
-diff --git a/drivers/iio/dac/Kconfig b/drivers/iio/dac/Kconfig
-index 93b8be183de6b4..b8ff547bc4dada 100644
---- a/drivers/iio/dac/Kconfig
-+++ b/drivers/iio/dac/Kconfig
-@@ -9,6 +9,8 @@ menu "Digital to analog converters"
- config AD3552R
- 	tristate "Analog Devices AD3552R DAC driver"
- 	depends on SPI_MASTER
-+	select IIO_BUFFER
-+	select IIO_TRIGGERED_BUFFER
- 	help
- 	  Say yes here to build support for Analog Devices AD3552R
- 	  Digital to Analog Converter.
-@@ -214,6 +216,8 @@ config AD5764
- config AD5766
- 	tristate "Analog Devices AD5766/AD5767 DAC driver"
- 	depends on SPI_MASTER
-+	select IIO_BUFFER
-+	select IIO_TRIGGERED_BUFFER
- 	help
- 	  Say yes here to build support for Analog Devices AD5766, AD5767
- 	  Digital to Analog Converter.
-@@ -224,6 +228,7 @@ config AD5766
- config AD5770R
- 	tristate "Analog Devices AD5770R IDAC driver"
- 	depends on SPI_MASTER
-+	select REGMAP_SPI
- 	help
- 	  Say yes here to build support for Analog Devices AD5770R Digital to
- 	  Analog Converter.
-@@ -315,6 +320,7 @@ config LPC18XX_DAC
- config LTC1660
- 	tristate "Linear Technology LTC1660/LTC1665 DAC SPI driver"
- 	depends on SPI
-+	select REGMAP_SPI
- 	help
- 	  Say yes here to build support for Linear Technology
- 	  LTC1660 and LTC1665 Digital to Analog Converters.
-@@ -424,6 +430,7 @@ config STM32_DAC
- 
- config STM32_DAC_CORE
- 	tristate
-+	select REGMAP_MMIO
- 
- config TI_DAC082S085
- 	tristate "Texas Instruments 8/10/12-bit 2/4-channel DAC driver"
-diff --git a/drivers/iio/frequency/Kconfig b/drivers/iio/frequency/Kconfig
-index 9e85dfa585081c..71de6cc4a1584f 100644
---- a/drivers/iio/frequency/Kconfig
-+++ b/drivers/iio/frequency/Kconfig
-@@ -53,6 +53,7 @@ config ADF4371
- config ADF4377
- 	tristate "Analog Devices ADF4377 Microwave Wideband Synthesizer"
- 	depends on SPI && COMMON_CLK
-+	select REGMAP_SPI
- 	help
- 	  Say yes here to build support for Analog Devices ADF4377 Microwave
- 	  Wideband Synthesizer.
-diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
-index 45edba797e4c7e..ddbd1838650ec8 100644
---- a/drivers/iio/light/Kconfig
-+++ b/drivers/iio/light/Kconfig
-@@ -294,6 +294,8 @@ config ROHM_BU27008
- 	depends on I2C
- 	select REGMAP_I2C
- 	select IIO_GTS_HELPER
-+	select IIO_BUFFER
-+	select IIO_TRIGGERED_BUFFER
- 	help
- 	  Enable support for the ROHM BU27008 color sensor.
- 	  The ROHM BU27008 is a sensor with 5 photodiodes (red, green,
-diff --git a/drivers/iio/light/opt3001.c b/drivers/iio/light/opt3001.c
-index cb41e5ee8ec10b..dc529cbe3805e2 100644
---- a/drivers/iio/light/opt3001.c
-+++ b/drivers/iio/light/opt3001.c
-@@ -138,6 +138,10 @@ static const struct opt3001_scale opt3001_scales[] = {
- 		.val = 20966,
- 		.val2 = 400000,
- 	},
-+	{
-+		.val = 41932,
-+		.val2 = 800000,
-+	},
- 	{
- 		.val = 83865,
- 		.val2 = 600000,
-diff --git a/drivers/iio/light/veml6030.c b/drivers/iio/light/veml6030.c
-index 043f233d9bdb06..433f58e1dd66c5 100644
---- a/drivers/iio/light/veml6030.c
-+++ b/drivers/iio/light/veml6030.c
-@@ -99,9 +99,8 @@ static const char * const period_values[] = {
- static ssize_t in_illuminance_period_available_show(struct device *dev,
- 				struct device_attribute *attr, char *buf)
- {
-+	struct veml6030_data *data = iio_priv(dev_to_iio_dev(dev));
- 	int ret, reg, x;
--	struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
--	struct veml6030_data *data = iio_priv(indio_dev);
- 
- 	ret = regmap_read(data->regmap, VEML6030_REG_ALS_CONF, &reg);
- 	if (ret) {
-@@ -780,7 +779,7 @@ static int veml6030_hw_init(struct iio_dev *indio_dev)
- 
- 	/* Cache currently active measurement parameters */
- 	data->cur_gain = 3;
--	data->cur_resolution = 4608;
-+	data->cur_resolution = 5376;
- 	data->cur_integration_time = 3;
- 
- 	return ret;
-diff --git a/drivers/iio/proximity/Kconfig b/drivers/iio/proximity/Kconfig
-index 2ca3b0bc5eba10..931eaea046b328 100644
---- a/drivers/iio/proximity/Kconfig
-+++ b/drivers/iio/proximity/Kconfig
-@@ -72,6 +72,8 @@ config LIDAR_LITE_V2
- config MB1232
- 	tristate "MaxSonar I2CXL family ultrasonic sensors"
- 	depends on I2C
-+	select IIO_BUFFER
-+	select IIO_TRIGGERED_BUFFER
- 	help
- 	  Say Y to build a driver for the ultrasonic sensors I2CXL of
- 	  MaxBotix which have an i2c interface. It can be used to measure
-diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
-index daf2a46521f018..1cb47488375be4 100644
---- a/drivers/input/joystick/xpad.c
-+++ b/drivers/input/joystick/xpad.c
-@@ -217,6 +217,7 @@ static const struct xpad_device {
- 	{ 0x0c12, 0x8810, "Zeroplus Xbox Controller", 0, XTYPE_XBOX },
- 	{ 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", 0, XTYPE_XBOX },
- 	{ 0x0d2f, 0x0002, "Andamiro Pump It Up pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
-+	{ 0x0db0, 0x1901, "Micro Star International Xbox360 Controller for Windows", 0, XTYPE_XBOX360 },
- 	{ 0x0e4c, 0x1097, "Radica Gamester Controller", 0, XTYPE_XBOX },
- 	{ 0x0e4c, 0x1103, "Radica Gamester Reflex", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX },
- 	{ 0x0e4c, 0x2390, "Radica Games Jtech Controller", 0, XTYPE_XBOX },
-@@ -486,6 +487,7 @@ static const struct usb_device_id xpad_table[] = {
- 	XPAD_XBOX360_VENDOR(0x07ff),		/* Mad Catz Gamepad */
- 	XPAD_XBOXONE_VENDOR(0x0b05),		/* ASUS controllers */
- 	XPAD_XBOX360_VENDOR(0x0c12),		/* Zeroplus X-Box 360 controllers */
-+	XPAD_XBOX360_VENDOR(0x0db0),		/* Micro Star International X-Box 360 controllers */
- 	XPAD_XBOX360_VENDOR(0x0e6f),		/* 0x0e6f Xbox 360 controllers */
- 	XPAD_XBOXONE_VENDOR(0x0e6f),		/* 0x0e6f Xbox One controllers */
- 	XPAD_XBOX360_VENDOR(0x0f0d),		/* Hori controllers */
-diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
-index b7317016834cf1..3a7c647d3affa8 100644
---- a/drivers/iommu/intel/iommu.c
-+++ b/drivers/iommu/intel/iommu.c
-@@ -3925,8 +3925,10 @@ static int domain_context_clear_one_cb(struct pci_dev *pdev, u16 alias, void *op
-  */
- static void domain_context_clear(struct device_domain_info *info)
- {
--	if (!dev_is_pci(info->dev))
-+	if (!dev_is_pci(info->dev)) {
- 		domain_context_clear_one(info, info->bus, info->devfn);
-+		return;
-+	}
- 
- 	pci_for_each_dma_alias(to_pci_dev(info->dev),
- 			       &domain_context_clear_one_cb, info);
-diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
-index 350abbb36e04bb..b1e60c13c1e1e7 100644
---- a/drivers/irqchip/irq-gic-v3-its.c
-+++ b/drivers/irqchip/irq-gic-v3-its.c
-@@ -786,6 +786,7 @@ static struct its_vpe *its_build_vmapp_cmd(struct its_node *its,
- 					   struct its_cmd_block *cmd,
- 					   struct its_cmd_desc *desc)
- {
-+	struct its_vpe *vpe = valid_vpe(its, desc->its_vmapp_cmd.vpe);
- 	unsigned long vpt_addr, vconf_addr;
- 	u64 target;
- 	bool alloc;
-@@ -795,9 +796,14 @@ static struct its_vpe *its_build_vmapp_cmd(struct its_node *its,
- 	its_encode_valid(cmd, desc->its_vmapp_cmd.valid);
- 
- 	if (!desc->its_vmapp_cmd.valid) {
-+		alloc = !atomic_dec_return(&desc->its_vmapp_cmd.vpe->vmapp_count);
- 		if (is_v4_1(its)) {
--			alloc = !atomic_dec_return(&desc->its_vmapp_cmd.vpe->vmapp_count);
- 			its_encode_alloc(cmd, alloc);
-+			/*
-+			 * Unmapping a VPE is self-synchronizing on GICv4.1,
-+			 * no need to issue a VSYNC.
-+			 */
-+			vpe = NULL;
- 		}
- 
- 		goto out;
-@@ -810,13 +816,13 @@ static struct its_vpe *its_build_vmapp_cmd(struct its_node *its,
- 	its_encode_vpt_addr(cmd, vpt_addr);
- 	its_encode_vpt_size(cmd, LPI_NRBITS - 1);
- 
-+	alloc = !atomic_fetch_inc(&desc->its_vmapp_cmd.vpe->vmapp_count);
-+
- 	if (!is_v4_1(its))
- 		goto out;
- 
- 	vconf_addr = virt_to_phys(page_address(desc->its_vmapp_cmd.vpe->its_vm->vprop_page));
- 
--	alloc = !atomic_fetch_inc(&desc->its_vmapp_cmd.vpe->vmapp_count);
--
- 	its_encode_alloc(cmd, alloc);
- 
- 	/*
-@@ -832,7 +838,7 @@ static struct its_vpe *its_build_vmapp_cmd(struct its_node *its,
- out:
- 	its_fixup_cmd(cmd);
- 
--	return valid_vpe(its, desc->its_vmapp_cmd.vpe);
-+	return vpe;
- }
- 
- static struct its_vpe *its_build_vmapti_cmd(struct its_node *its,
-@@ -3810,6 +3816,13 @@ static int its_vpe_set_affinity(struct irq_data *d,
- 	unsigned long flags;
- 	int from, cpu;
- 
-+	/*
-+	 * Check if we're racing against a VPE being destroyed, for
-+	 * which we don't want to allow a VMOVP.
-+	 */
-+	if (!atomic_read(&vpe->vmapp_count))
-+		return -EINVAL;
-+
- 	/*
- 	 * Changing affinity is mega expensive, so let's be as lazy as
- 	 * we can and only do it if we really have to. Also, if mapped
-@@ -4450,9 +4463,8 @@ static int its_vpe_init(struct its_vpe *vpe)
- 	raw_spin_lock_init(&vpe->vpe_lock);
- 	vpe->vpe_id = vpe_id;
- 	vpe->vpt_page = vpt_page;
--	if (gic_rdists->has_rvpeid)
--		atomic_set(&vpe->vmapp_count, 0);
--	else
-+	atomic_set(&vpe->vmapp_count, 0);
-+	if (!gic_rdists->has_rvpeid)
- 		vpe->vpe_proxy_event = -1;
- 
- 	return 0;
-diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c
-index bf0b40b0fad4b2..57289966915492 100644
---- a/drivers/irqchip/irq-sifive-plic.c
-+++ b/drivers/irqchip/irq-sifive-plic.c
-@@ -120,16 +120,6 @@ static inline void plic_irq_toggle(const struct cpumask *mask,
- 	}
- }
- 
--static void plic_irq_enable(struct irq_data *d)
--{
--	plic_irq_toggle(irq_data_get_effective_affinity_mask(d), d, 1);
--}
--
--static void plic_irq_disable(struct irq_data *d)
--{
--	plic_irq_toggle(irq_data_get_effective_affinity_mask(d), d, 0);
--}
--
- static void plic_irq_unmask(struct irq_data *d)
- {
- 	struct plic_priv *priv = irq_data_get_irq_chip_data(d);
-@@ -144,6 +134,17 @@ static void plic_irq_mask(struct irq_data *d)
- 	writel(0, priv->regs + PRIORITY_BASE + d->hwirq * PRIORITY_PER_ID);
- }
- 
-+static void plic_irq_enable(struct irq_data *d)
-+{
-+	plic_irq_toggle(irq_data_get_effective_affinity_mask(d), d, 1);
-+	plic_irq_unmask(d);
-+}
-+
-+static void plic_irq_disable(struct irq_data *d)
-+{
-+	plic_irq_toggle(irq_data_get_effective_affinity_mask(d), d, 0);
-+}
-+
- static void plic_irq_eoi(struct irq_data *d)
- {
- 	struct plic_handler *handler = this_cpu_ptr(&plic_handlers);
-diff --git a/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c b/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c
-index 7c3d8bedf90ba2..a2ed477e0370bc 100644
---- a/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c
-+++ b/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c
-@@ -364,6 +364,7 @@ static int pci1xxxx_otp_eeprom_probe(struct auxiliary_device *aux_dev,
- 	if (is_eeprom_responsive(priv)) {
- 		priv->nvmem_config_eeprom.type = NVMEM_TYPE_EEPROM;
- 		priv->nvmem_config_eeprom.name = EEPROM_NAME;
-+		priv->nvmem_config_eeprom.id = NVMEM_DEVID_AUTO;
- 		priv->nvmem_config_eeprom.dev = &aux_dev->dev;
- 		priv->nvmem_config_eeprom.owner = THIS_MODULE;
- 		priv->nvmem_config_eeprom.reg_read = pci1xxxx_eeprom_read;
-@@ -383,6 +384,7 @@ static int pci1xxxx_otp_eeprom_probe(struct auxiliary_device *aux_dev,
- 
- 	priv->nvmem_config_otp.type = NVMEM_TYPE_OTP;
- 	priv->nvmem_config_otp.name = OTP_NAME;
-+	priv->nvmem_config_otp.id = NVMEM_DEVID_AUTO;
- 	priv->nvmem_config_otp.dev = &aux_dev->dev;
- 	priv->nvmem_config_otp.owner = THIS_MODULE;
- 	priv->nvmem_config_otp.reg_read = pci1xxxx_otp_read;
-diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
-index b940dcd3ace681..8f61731e4554ba 100644
---- a/drivers/net/ethernet/cadence/macb_main.c
-+++ b/drivers/net/ethernet/cadence/macb_main.c
-@@ -930,9 +930,6 @@ static int macb_mdiobus_register(struct macb *bp)
- 		return ret;
- 	}
- 
--	if (of_phy_is_fixed_link(np))
--		return mdiobus_register(bp->mii_bus);
--
- 	/* Only create the PHY from the device tree if at least one PHY is
- 	 * described. Otherwise scan the entire MDIO bus. We do this to support
- 	 * old device tree that did not follow the best practices and did not
-@@ -953,8 +950,19 @@ static int macb_mdiobus_register(struct macb *bp)
- 
- static int macb_mii_init(struct macb *bp)
- {
-+	struct device_node *child, *np = bp->pdev->dev.of_node;
- 	int err = -ENXIO;
- 
-+	/* With fixed-link, we don't need to register the MDIO bus,
-+	 * except if we have a child named "mdio" in the device tree.
-+	 * In that case, some devices may be attached to the MACB's MDIO bus.
-+	 */
-+	child = of_get_child_by_name(np, "mdio");
-+	if (child)
-+		of_node_put(child);
-+	else if (of_phy_is_fixed_link(np))
-+		return macb_mii_probe(bp->dev);
-+
- 	/* Enable management port */
- 	macb_writel(bp, NCR, MACB_BIT(MPE));
- 
-diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
-index 18e3a9cd4fc017..c17b9e3385168f 100644
---- a/drivers/net/ethernet/freescale/enetc/enetc.c
-+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
-@@ -902,6 +902,7 @@ static bool enetc_clean_tx_ring(struct enetc_bdr *tx_ring, int napi_budget)
- 
- 	if (unlikely(tx_frm_cnt && netif_carrier_ok(ndev) &&
- 		     __netif_subqueue_stopped(ndev, tx_ring->index) &&
-+		     !test_bit(ENETC_TX_DOWN, &priv->flags) &&
- 		     (enetc_bd_unused(tx_ring) >= ENETC_TXBDS_MAX_NEEDED))) {
- 		netif_wake_subqueue(ndev, tx_ring->index);
- 	}
-@@ -1380,6 +1381,9 @@ int enetc_xdp_xmit(struct net_device *ndev, int num_frames,
- 	int xdp_tx_bd_cnt, i, k;
- 	int xdp_tx_frm_cnt = 0;
- 
-+	if (unlikely(test_bit(ENETC_TX_DOWN, &priv->flags)))
-+		return -ENETDOWN;
-+
- 	enetc_lock_mdio();
- 
- 	tx_ring = priv->xdp_tx_ring[smp_processor_id()];
-@@ -1524,7 +1528,6 @@ static void enetc_xdp_drop(struct enetc_bdr *rx_ring, int rx_ring_first,
- 				  &rx_ring->rx_swbd[rx_ring_first]);
- 		enetc_bdr_idx_inc(rx_ring, &rx_ring_first);
- 	}
--	rx_ring->stats.xdp_drops++;
- }
- 
- static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring,
-@@ -1589,6 +1592,7 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring,
- 			fallthrough;
- 		case XDP_DROP:
- 			enetc_xdp_drop(rx_ring, orig_i, i);
-+			rx_ring->stats.xdp_drops++;
- 			break;
- 		case XDP_PASS:
- 			rxbd = orig_rxbd;
-@@ -1605,6 +1609,12 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring,
- 			break;
- 		case XDP_TX:
- 			tx_ring = priv->xdp_tx_ring[rx_ring->index];
-+			if (unlikely(test_bit(ENETC_TX_DOWN, &priv->flags))) {
-+				enetc_xdp_drop(rx_ring, orig_i, i);
-+				tx_ring->stats.xdp_tx_drops++;
-+				break;
-+			}
-+
- 			xdp_tx_bd_cnt = enetc_rx_swbd_to_xdp_tx_swbd(xdp_tx_arr,
- 								     rx_ring,
- 								     orig_i, i);
-@@ -2226,18 +2236,24 @@ static void enetc_enable_rxbdr(struct enetc_hw *hw, struct enetc_bdr *rx_ring)
- 	enetc_rxbdr_wr(hw, idx, ENETC_RBMR, rbmr);
- }
- 
--static void enetc_enable_bdrs(struct enetc_ndev_priv *priv)
-+static void enetc_enable_rx_bdrs(struct enetc_ndev_priv *priv)
- {
- 	struct enetc_hw *hw = &priv->si->hw;
- 	int i;
- 
--	for (i = 0; i < priv->num_tx_rings; i++)
--		enetc_enable_txbdr(hw, priv->tx_ring[i]);
--
- 	for (i = 0; i < priv->num_rx_rings; i++)
- 		enetc_enable_rxbdr(hw, priv->rx_ring[i]);
- }
- 
-+static void enetc_enable_tx_bdrs(struct enetc_ndev_priv *priv)
-+{
-+	struct enetc_hw *hw = &priv->si->hw;
-+	int i;
-+
-+	for (i = 0; i < priv->num_tx_rings; i++)
-+		enetc_enable_txbdr(hw, priv->tx_ring[i]);
-+}
-+
- static void enetc_disable_rxbdr(struct enetc_hw *hw, struct enetc_bdr *rx_ring)
- {
- 	int idx = rx_ring->index;
-@@ -2254,18 +2270,24 @@ static void enetc_disable_txbdr(struct enetc_hw *hw, struct enetc_bdr *rx_ring)
- 	enetc_txbdr_wr(hw, idx, ENETC_TBMR, 0);
- }
- 
--static void enetc_disable_bdrs(struct enetc_ndev_priv *priv)
-+static void enetc_disable_rx_bdrs(struct enetc_ndev_priv *priv)
- {
- 	struct enetc_hw *hw = &priv->si->hw;
- 	int i;
- 
--	for (i = 0; i < priv->num_tx_rings; i++)
--		enetc_disable_txbdr(hw, priv->tx_ring[i]);
--
- 	for (i = 0; i < priv->num_rx_rings; i++)
- 		enetc_disable_rxbdr(hw, priv->rx_ring[i]);
- }
- 
-+static void enetc_disable_tx_bdrs(struct enetc_ndev_priv *priv)
-+{
-+	struct enetc_hw *hw = &priv->si->hw;
-+	int i;
-+
-+	for (i = 0; i < priv->num_tx_rings; i++)
-+		enetc_disable_txbdr(hw, priv->tx_ring[i]);
-+}
-+
- static void enetc_wait_txbdr(struct enetc_hw *hw, struct enetc_bdr *tx_ring)
- {
- 	int delay = 8, timeout = 100;
-@@ -2463,9 +2485,13 @@ void enetc_start(struct net_device *ndev)
- 		enable_irq(irq);
- 	}
- 
--	enetc_enable_bdrs(priv);
-+	enetc_enable_tx_bdrs(priv);
-+
-+	enetc_enable_rx_bdrs(priv);
- 
- 	netif_tx_start_all_queues(ndev);
-+
-+	clear_bit(ENETC_TX_DOWN, &priv->flags);
- }
- EXPORT_SYMBOL_GPL(enetc_start);
- 
-@@ -2523,9 +2549,15 @@ void enetc_stop(struct net_device *ndev)
- 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
- 	int i;
- 
-+	set_bit(ENETC_TX_DOWN, &priv->flags);
-+
- 	netif_tx_stop_all_queues(ndev);
- 
--	enetc_disable_bdrs(priv);
-+	enetc_disable_rx_bdrs(priv);
-+
-+	enetc_wait_bdrs(priv);
-+
-+	enetc_disable_tx_bdrs(priv);
- 
- 	for (i = 0; i < priv->bdr_int_num; i++) {
- 		int irq = pci_irq_vector(priv->si->pdev,
-@@ -2536,8 +2568,6 @@ void enetc_stop(struct net_device *ndev)
- 		napi_disable(&priv->int_vector[i]->napi);
- 	}
- 
--	enetc_wait_bdrs(priv);
--
- 	enetc_clear_interrupts(priv);
- }
- EXPORT_SYMBOL_GPL(enetc_stop);
-diff --git a/drivers/net/ethernet/freescale/enetc/enetc.h b/drivers/net/ethernet/freescale/enetc/enetc.h
-index 7439739cd81a23..fcadb0848d2541 100644
---- a/drivers/net/ethernet/freescale/enetc/enetc.h
-+++ b/drivers/net/ethernet/freescale/enetc/enetc.h
-@@ -328,6 +328,7 @@ enum enetc_active_offloads {
- 
- enum enetc_flags_bit {
- 	ENETC_TX_ONESTEP_TSTAMP_IN_PROGRESS = 0,
-+	ENETC_TX_DOWN,
- };
- 
- /* interrupt coalescing modes */
-diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
-index 5e8fac50f945d4..a4eb6edb850add 100644
---- a/drivers/net/ethernet/freescale/fec_ptp.c
-+++ b/drivers/net/ethernet/freescale/fec_ptp.c
-@@ -90,6 +90,30 @@
- #define FEC_PTP_MAX_NSEC_PERIOD		4000000000ULL
- #define FEC_PTP_MAX_NSEC_COUNTER	0x80000000ULL
- 
-+/**
-+ * fec_ptp_read - read raw cycle counter (to be used by time counter)
-+ * @cc: the cyclecounter structure
-+ *
-+ * this function reads the cyclecounter registers and is called by the
-+ * cyclecounter structure used to construct a ns counter from the
-+ * arbitrary fixed point registers
-+ */
-+static u64 fec_ptp_read(const struct cyclecounter *cc)
-+{
-+	struct fec_enet_private *fep =
-+		container_of(cc, struct fec_enet_private, cc);
-+	u32 tempval;
-+
-+	tempval = readl(fep->hwp + FEC_ATIME_CTRL);
-+	tempval |= FEC_T_CTRL_CAPTURE;
-+	writel(tempval, fep->hwp + FEC_ATIME_CTRL);
-+
-+	if (fep->quirks & FEC_QUIRK_BUG_CAPTURE)
-+		udelay(1);
-+
-+	return readl(fep->hwp + FEC_ATIME);
-+}
-+
- /**
-  * fec_ptp_enable_pps
-  * @fep: the fec_enet_private structure handle
-@@ -136,7 +160,7 @@ static int fec_ptp_enable_pps(struct fec_enet_private *fep, uint enable)
- 		 * NSEC_PER_SEC - ts.tv_nsec. Add the remaining nanoseconds
- 		 * to current timer would be next second.
- 		 */
--		tempval = fep->cc.read(&fep->cc);
-+		tempval = fec_ptp_read(&fep->cc);
- 		/* Convert the ptp local counter to 1588 timestamp */
- 		ns = timecounter_cyc2time(&fep->tc, tempval);
- 		ts = ns_to_timespec64(ns);
-@@ -211,13 +235,7 @@ static int fec_ptp_pps_perout(struct fec_enet_private *fep)
- 	timecounter_read(&fep->tc);
- 
- 	/* Get the current ptp hardware time counter */
--	temp_val = readl(fep->hwp + FEC_ATIME_CTRL);
--	temp_val |= FEC_T_CTRL_CAPTURE;
--	writel(temp_val, fep->hwp + FEC_ATIME_CTRL);
--	if (fep->quirks & FEC_QUIRK_BUG_CAPTURE)
--		udelay(1);
--
--	ptp_hc = readl(fep->hwp + FEC_ATIME);
-+	ptp_hc = fec_ptp_read(&fep->cc);
- 
- 	/* Convert the ptp local counter to 1588 timestamp */
- 	curr_time = timecounter_cyc2time(&fep->tc, ptp_hc);
-@@ -271,30 +289,6 @@ static enum hrtimer_restart fec_ptp_pps_perout_handler(struct hrtimer *timer)
- 	return HRTIMER_NORESTART;
- }
- 
--/**
-- * fec_ptp_read - read raw cycle counter (to be used by time counter)
-- * @cc: the cyclecounter structure
-- *
-- * this function reads the cyclecounter registers and is called by the
-- * cyclecounter structure used to construct a ns counter from the
-- * arbitrary fixed point registers
-- */
--static u64 fec_ptp_read(const struct cyclecounter *cc)
--{
--	struct fec_enet_private *fep =
--		container_of(cc, struct fec_enet_private, cc);
--	u32 tempval;
--
--	tempval = readl(fep->hwp + FEC_ATIME_CTRL);
--	tempval |= FEC_T_CTRL_CAPTURE;
--	writel(tempval, fep->hwp + FEC_ATIME_CTRL);
--
--	if (fep->quirks & FEC_QUIRK_BUG_CAPTURE)
--		udelay(1);
--
--	return readl(fep->hwp + FEC_ATIME);
--}
--
- /**
-  * fec_ptp_start_cyclecounter - create the cycle counter from hw
-  * @ndev: network device
-diff --git a/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c b/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c
-index 79276bc3d49519..66ef14d95bf6f7 100644
---- a/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c
-+++ b/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c
-@@ -1444,6 +1444,8 @@ static void vcap_api_encode_rule_test(struct kunit *test)
- 
- 	ret = vcap_del_rule(&test_vctrl, &test_netdev, id);
- 	KUNIT_EXPECT_EQ(test, 0, ret);
-+
-+	vcap_free_rule(rule);
- }
- 
- static void vcap_api_set_rule_counter_test(struct kunit *test)
-diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
-index c334ef6e3b3ff4..3b7d7e23602af2 100644
---- a/drivers/parport/procfs.c
-+++ b/drivers/parport/procfs.c
-@@ -58,12 +58,12 @@ static int do_active_device(struct ctl_table *table, int write,
- 	
- 	for (dev = port->devices; dev ; dev = dev->next) {
- 		if(dev == port->cad) {
--			len += snprintf(buffer, sizeof(buffer), "%s\n", dev->name);
-+			len += scnprintf(buffer, sizeof(buffer), "%s\n", dev->name);
- 		}
- 	}
- 
- 	if(!len) {
--		len += snprintf(buffer, sizeof(buffer), "%s\n", "none");
-+		len += scnprintf(buffer, sizeof(buffer), "%s\n", "none");
- 	}
- 
- 	if (len > *lenp)
-@@ -94,19 +94,19 @@ static int do_autoprobe(struct ctl_table *table, int write,
- 	}
- 	
- 	if ((str = info->class_name) != NULL)
--		len += snprintf (buffer + len, sizeof(buffer) - len, "CLASS:%s;\n", str);
-+		len += scnprintf (buffer + len, sizeof(buffer) - len, "CLASS:%s;\n", str);
- 
- 	if ((str = info->model) != NULL)
--		len += snprintf (buffer + len, sizeof(buffer) - len, "MODEL:%s;\n", str);
-+		len += scnprintf (buffer + len, sizeof(buffer) - len, "MODEL:%s;\n", str);
- 
- 	if ((str = info->mfr) != NULL)
--		len += snprintf (buffer + len, sizeof(buffer) - len, "MANUFACTURER:%s;\n", str);
-+		len += scnprintf (buffer + len, sizeof(buffer) - len, "MANUFACTURER:%s;\n", str);
- 
- 	if ((str = info->description) != NULL)
--		len += snprintf (buffer + len, sizeof(buffer) - len, "DESCRIPTION:%s;\n", str);
-+		len += scnprintf (buffer + len, sizeof(buffer) - len, "DESCRIPTION:%s;\n", str);
- 
- 	if ((str = info->cmdset) != NULL)
--		len += snprintf (buffer + len, sizeof(buffer) - len, "COMMAND SET:%s;\n", str);
-+		len += scnprintf (buffer + len, sizeof(buffer) - len, "COMMAND SET:%s;\n", str);
- 
- 	if (len > *lenp)
- 		len = *lenp;
-@@ -135,7 +135,7 @@ static int do_hardware_base_addr(struct ctl_table *table, int write,
- 	if (write) /* permissions prevent this anyway */
- 		return -EACCES;
- 
--	len += snprintf (buffer, sizeof(buffer), "%lu\t%lu\n", port->base, port->base_hi);
-+	len += scnprintf (buffer, sizeof(buffer), "%lu\t%lu\n", port->base, port->base_hi);
- 
- 	if (len > *lenp)
- 		len = *lenp;
-@@ -162,7 +162,7 @@ static int do_hardware_irq(struct ctl_table *table, int write,
- 	if (write) /* permissions prevent this anyway */
- 		return -EACCES;
- 
--	len += snprintf (buffer, sizeof(buffer), "%d\n", port->irq);
-+	len += scnprintf (buffer, sizeof(buffer), "%d\n", port->irq);
- 
- 	if (len > *lenp)
- 		len = *lenp;
-@@ -189,7 +189,7 @@ static int do_hardware_dma(struct ctl_table *table, int write,
- 	if (write) /* permissions prevent this anyway */
- 		return -EACCES;
- 
--	len += snprintf (buffer, sizeof(buffer), "%d\n", port->dma);
-+	len += scnprintf (buffer, sizeof(buffer), "%d\n", port->dma);
- 
- 	if (len > *lenp)
- 		len = *lenp;
-@@ -220,7 +220,7 @@ static int do_hardware_modes(struct ctl_table *table, int write,
- #define printmode(x)							\
- do {									\
- 	if (port->modes & PARPORT_MODE_##x)				\
--		len += snprintf(buffer + len, sizeof(buffer) - len, "%s%s", f++ ? "," : "", #x); \
-+		len += scnprintf(buffer + len, sizeof(buffer) - len, "%s%s", f++ ? "," : "", #x); \
- } while (0)
- 		int f = 0;
- 		printmode(PCSPP);
-diff --git a/drivers/pinctrl/pinctrl-apple-gpio.c b/drivers/pinctrl/pinctrl-apple-gpio.c
-index 3751c7de37aa9f..f861e63f411521 100644
---- a/drivers/pinctrl/pinctrl-apple-gpio.c
-+++ b/drivers/pinctrl/pinctrl-apple-gpio.c
-@@ -474,6 +474,9 @@ static int apple_gpio_pinctrl_probe(struct platform_device *pdev)
- 	for (i = 0; i < npins; i++) {
- 		pins[i].number = i;
- 		pins[i].name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "PIN%u", i);
-+		if (!pins[i].name)
-+			return -ENOMEM;
-+
- 		pins[i].drv_data = pctl;
- 		pin_names[i] = pins[i].name;
- 		pin_nums[i] = i;
-diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c
-index f8ae2e9742217c..8d26c8061c77eb 100644
---- a/drivers/pinctrl/pinctrl-ocelot.c
-+++ b/drivers/pinctrl/pinctrl-ocelot.c
-@@ -1962,21 +1962,21 @@ static void ocelot_irq_handler(struct irq_desc *desc)
- 	unsigned int reg = 0, irq, i;
- 	unsigned long irqs;
- 
-+	chained_irq_enter(parent_chip, desc);
-+
- 	for (i = 0; i < info->stride; i++) {
- 		regmap_read(info->map, id_reg + 4 * i, &reg);
- 		if (!reg)
- 			continue;
- 
--		chained_irq_enter(parent_chip, desc);
--
- 		irqs = reg;
- 
- 		for_each_set_bit(irq, &irqs,
- 				 min(32U, info->desc->npins - 32 * i))
- 			generic_handle_domain_irq(chip->irq.domain, irq + 32 * i);
--
--		chained_irq_exit(parent_chip, desc);
- 	}
-+
-+	chained_irq_exit(parent_chip, desc);
- }
- 
- static int ocelot_gpiochip_register(struct platform_device *pdev,
-diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
-index 346a31f31bba80..5e91def6078474 100644
---- a/drivers/pinctrl/stm32/pinctrl-stm32.c
-+++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
-@@ -1387,10 +1387,15 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl, struct fwnode
- 
- 	for (i = 0; i < npins; i++) {
- 		stm32_pin = stm32_pctrl_get_desc_pin_from_gpio(pctl, bank, i);
--		if (stm32_pin && stm32_pin->pin.name)
-+		if (stm32_pin && stm32_pin->pin.name) {
- 			names[i] = devm_kasprintf(dev, GFP_KERNEL, "%s", stm32_pin->pin.name);
--		else
-+			if (!names[i]) {
-+				err = -ENOMEM;
-+				goto err_clk;
-+			}
-+		} else {
- 			names[i] = NULL;
-+		}
- 	}
- 
- 	bank->gpio_chip.names = (const char * const *)names;
-diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
-index ba10f9b8fac724..6fa0fb35e5210f 100644
---- a/drivers/s390/char/sclp.c
-+++ b/drivers/s390/char/sclp.c
-@@ -1195,7 +1195,8 @@ sclp_reboot_event(struct notifier_block *this, unsigned long event, void *ptr)
- }
- 
- static struct notifier_block sclp_reboot_notifier = {
--	.notifier_call = sclp_reboot_event
-+	.notifier_call = sclp_reboot_event,
-+	.priority      = INT_MIN,
- };
- 
- static ssize_t con_pages_show(struct device_driver *dev, char *buf)
-diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
-index 218ae604f737ff..33b9c968dbcba6 100644
---- a/drivers/s390/char/sclp_vt220.c
-+++ b/drivers/s390/char/sclp_vt220.c
-@@ -319,7 +319,7 @@ sclp_vt220_add_msg(struct sclp_vt220_request *request,
- 	buffer = (void *) ((addr_t) sccb + sccb->header.length);
- 
- 	if (convertlf) {
--		/* Perform Linefeed conversion (0x0a -> 0x0a 0x0d)*/
-+		/* Perform Linefeed conversion (0x0a -> 0x0d 0x0a)*/
- 		for (from=0, to=0;
- 		     (from < count) && (to < sclp_vt220_space_left(request));
- 		     from++) {
-@@ -328,8 +328,8 @@ sclp_vt220_add_msg(struct sclp_vt220_request *request,
- 			/* Perform conversion */
- 			if (c == 0x0a) {
- 				if (to + 1 < sclp_vt220_space_left(request)) {
--					((unsigned char *) buffer)[to++] = c;
- 					((unsigned char *) buffer)[to++] = 0x0d;
-+					((unsigned char *) buffer)[to++] = c;
- 				} else
- 					break;
- 
-diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
-index 5fc8540a83e315..8559ba1361c645 100644
---- a/drivers/tty/n_gsm.c
-+++ b/drivers/tty/n_gsm.c
-@@ -3156,6 +3156,8 @@ static void gsm_cleanup_mux(struct gsm_mux *gsm, bool disc)
- 	mutex_unlock(&gsm->mutex);
- 	/* Now wipe the queues */
- 	tty_ldisc_flush(gsm->tty);
-+
-+	guard(spinlock_irqsave)(&gsm->tx_lock);
- 	list_for_each_entry_safe(txq, ntxq, &gsm->tx_ctrl_list, list)
- 		kfree(txq);
- 	INIT_LIST_HEAD(&gsm->tx_ctrl_list);
-diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
-index a5d0df2ba5c556..349d4849ba5e3b 100644
---- a/drivers/tty/serial/imx.c
-+++ b/drivers/tty/serial/imx.c
-@@ -771,6 +771,21 @@ static irqreturn_t __imx_uart_rtsint(int irq, void *dev_id)
- 
- 	imx_uart_writel(sport, USR1_RTSD, USR1);
- 	usr1 = imx_uart_readl(sport, USR1) & USR1_RTSS;
-+	/*
-+	 * Update sport->old_status here, so any follow-up calls to
-+	 * imx_uart_mctrl_check() will be able to recognize that RTS
-+	 * state changed since last imx_uart_mctrl_check() call.
-+	 *
-+	 * In case RTS has been detected as asserted here and later on
-+	 * deasserted by the time imx_uart_mctrl_check() was called,
-+	 * imx_uart_mctrl_check() can detect the RTS state change and
-+	 * trigger uart_handle_cts_change() to unblock the port for
-+	 * further TX transfers.
-+	 */
-+	if (usr1 & USR1_RTSS)
-+		sport->old_status |= TIOCM_CTS;
-+	else
-+		sport->old_status &= ~TIOCM_CTS;
- 	uart_handle_cts_change(&sport->port, usr1);
- 	wake_up_interruptible(&sport->port.state->port.delta_msr_wait);
- 
-diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
-index f798ef3c41309e..f820a09cb5c39b 100644
---- a/drivers/tty/serial/qcom_geni_serial.c
-+++ b/drivers/tty/serial/qcom_geni_serial.c
-@@ -144,6 +144,8 @@ static const struct uart_ops qcom_geni_uart_pops;
- static struct uart_driver qcom_geni_console_driver;
- static struct uart_driver qcom_geni_uart_driver;
- 
-+static int qcom_geni_serial_port_setup(struct uart_port *uport);
-+
- static inline struct qcom_geni_serial_port *to_dev_port(struct uart_port *uport)
- {
- 	return container_of(uport, struct qcom_geni_serial_port, uport);
-@@ -385,6 +387,23 @@ static void qcom_geni_serial_poll_put_char(struct uart_port *uport,
- 	writel(M_TX_FIFO_WATERMARK_EN, uport->membase + SE_GENI_M_IRQ_CLEAR);
- 	qcom_geni_serial_poll_tx_done(uport);
- }
-+
-+static int qcom_geni_serial_poll_init(struct uart_port *uport)
-+{
-+	struct qcom_geni_serial_port *port = to_dev_port(uport);
-+	int ret;
-+
-+	if (!port->setup) {
-+		ret = qcom_geni_serial_port_setup(uport);
-+		if (ret)
-+			return ret;
-+	}
-+
-+	if (!qcom_geni_serial_secondary_active(uport))
-+		geni_se_setup_s_cmd(&port->se, UART_START_READ, 0);
-+
-+	return 0;
-+}
- #endif
- 
- #ifdef CONFIG_SERIAL_QCOM_GENI_CONSOLE
-@@ -756,17 +775,27 @@ static void qcom_geni_serial_start_rx_fifo(struct uart_port *uport)
- static void qcom_geni_serial_stop_rx_dma(struct uart_port *uport)
- {
- 	struct qcom_geni_serial_port *port = to_dev_port(uport);
-+	bool done;
- 
- 	if (!qcom_geni_serial_secondary_active(uport))
- 		return;
- 
- 	geni_se_cancel_s_cmd(&port->se);
--	qcom_geni_serial_poll_bit(uport, SE_GENI_S_IRQ_STATUS,
--				  S_CMD_CANCEL_EN, true);
--
--	if (qcom_geni_serial_secondary_active(uport))
-+	done = qcom_geni_serial_poll_bit(uport, SE_DMA_RX_IRQ_STAT,
-+			RX_EOT, true);
-+	if (done) {
-+		writel(RX_EOT | RX_DMA_DONE,
-+				uport->membase + SE_DMA_RX_IRQ_CLR);
-+	} else {
- 		qcom_geni_serial_abort_rx(uport);
- 
-+		writel(1, uport->membase + SE_DMA_RX_FSM_RST);
-+		qcom_geni_serial_poll_bit(uport, SE_DMA_RX_IRQ_STAT,
-+				RX_RESET_DONE, true);
-+		writel(RX_RESET_DONE | RX_DMA_DONE,
-+				uport->membase + SE_DMA_RX_IRQ_CLR);
-+	}
-+
- 	if (port->rx_dma_addr) {
- 		geni_se_rx_dma_unprep(&port->se, port->rx_dma_addr,
- 				      DMA_RX_BUF_SIZE);
-@@ -1115,7 +1144,6 @@ static int qcom_geni_serial_port_setup(struct uart_port *uport)
- 			       false, true, true);
- 	geni_se_init(&port->se, UART_RX_WM, port->rx_fifo_depth - 2);
- 	geni_se_select_mode(&port->se, port->dev_data->mode);
--	qcom_geni_serial_start_rx(uport);
- 	port->setup = true;
- 
- 	return 0;
-@@ -1131,6 +1159,11 @@ static int qcom_geni_serial_startup(struct uart_port *uport)
- 		if (ret)
- 			return ret;
- 	}
-+
-+	uart_port_lock_irq(uport);
-+	qcom_geni_serial_start_rx(uport);
-+	uart_port_unlock_irq(uport);
-+
- 	enable_irq(uport->irq);
- 
- 	return 0;
-@@ -1216,7 +1249,6 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport,
- 	unsigned int avg_bw_core;
- 	unsigned long timeout;
- 
--	qcom_geni_serial_stop_rx(uport);
- 	/* baud rate */
- 	baud = uart_get_baud_rate(uport, termios, old, 300, 4000000);
- 
-@@ -1232,7 +1264,7 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport,
- 		dev_err(port->se.dev,
- 			"Couldn't find suitable clock rate for %u\n",
- 			baud * sampling_rate);
--		goto out_restart_rx;
-+		return;
- 	}
- 
- 	dev_dbg(port->se.dev, "desired_rate = %u, clk_rate = %lu, clk_div = %u\n",
-@@ -1323,8 +1355,6 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport,
- 	writel(stop_bit_len, uport->membase + SE_UART_TX_STOP_BIT_LEN);
- 	writel(ser_clk_cfg, uport->membase + GENI_SER_M_CLK_CFG);
- 	writel(ser_clk_cfg, uport->membase + GENI_SER_S_CLK_CFG);
--out_restart_rx:
--	qcom_geni_serial_start_rx(uport);
- }
- 
- #ifdef CONFIG_SERIAL_QCOM_GENI_CONSOLE
-@@ -1544,7 +1574,7 @@ static const struct uart_ops qcom_geni_console_pops = {
- #ifdef CONFIG_CONSOLE_POLL
- 	.poll_get_char	= qcom_geni_serial_get_char,
- 	.poll_put_char	= qcom_geni_serial_poll_put_char,
--	.poll_init = qcom_geni_serial_port_setup,
-+	.poll_init = qcom_geni_serial_poll_init,
- #endif
- 	.pm = qcom_geni_serial_pm,
- };
-@@ -1745,38 +1775,6 @@ static int qcom_geni_serial_sys_resume(struct device *dev)
- 	return ret;
- }
- 
--static int qcom_geni_serial_sys_hib_resume(struct device *dev)
--{
--	int ret = 0;
--	struct uart_port *uport;
--	struct qcom_geni_private_data *private_data;
--	struct qcom_geni_serial_port *port = dev_get_drvdata(dev);
--
--	uport = &port->uport;
--	private_data = uport->private_data;
--
--	if (uart_console(uport)) {
--		geni_icc_set_tag(&port->se, QCOM_ICC_TAG_ALWAYS);
--		geni_icc_set_bw(&port->se);
--		ret = uart_resume_port(private_data->drv, uport);
--		/*
--		 * For hibernation usecase clients for
--		 * console UART won't call port setup during restore,
--		 * hence call port setup for console uart.
--		 */
--		qcom_geni_serial_port_setup(uport);
--	} else {
--		/*
--		 * Peripheral register settings are lost during hibernation.
--		 * Update setup flag such that port setup happens again
--		 * during next session. Clients of HS-UART will close and
--		 * open the port during hibernation.
--		 */
--		port->setup = false;
--	}
--	return ret;
--}
--
- static const struct qcom_geni_device_data qcom_geni_console_data = {
- 	.console = true,
- 	.mode = GENI_SE_FIFO,
-@@ -1788,12 +1786,8 @@ static const struct qcom_geni_device_data qcom_geni_uart_data = {
- };
- 
- static const struct dev_pm_ops qcom_geni_serial_pm_ops = {
--	.suspend = pm_sleep_ptr(qcom_geni_serial_sys_suspend),
--	.resume = pm_sleep_ptr(qcom_geni_serial_sys_resume),
--	.freeze = pm_sleep_ptr(qcom_geni_serial_sys_suspend),
--	.poweroff = pm_sleep_ptr(qcom_geni_serial_sys_suspend),
--	.restore = pm_sleep_ptr(qcom_geni_serial_sys_hib_resume),
--	.thaw = pm_sleep_ptr(qcom_geni_serial_sys_hib_resume),
-+	SYSTEM_SLEEP_PM_OPS(qcom_geni_serial_sys_suspend,
-+					qcom_geni_serial_sys_resume)
- };
- 
- static const struct of_device_id qcom_geni_serial_match_table[] = {
-diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
-index a22da757ca6d18..6bd1a7785e888c 100644
---- a/drivers/tty/vt/vt.c
-+++ b/drivers/tty/vt/vt.c
-@@ -4550,7 +4550,7 @@ static int con_font_get(struct vc_data *vc, struct console_font_op *op)
- 		return -EINVAL;
- 
- 	if (op->data) {
--		font.data = kvmalloc(max_font_size, GFP_KERNEL);
-+		font.data = kvzalloc(max_font_size, GFP_KERNEL);
- 		if (!font.data)
- 			return -ENOMEM;
- 	} else
-diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c
-index af5ce45315b3c9..da8c1734d33358 100644
---- a/drivers/ufs/core/ufs-mcq.c
-+++ b/drivers/ufs/core/ufs-mcq.c
-@@ -498,7 +498,7 @@ int ufshcd_mcq_sq_cleanup(struct ufs_hba *hba, int task_tag)
- 	struct scsi_cmnd *cmd = lrbp->cmd;
- 	struct ufs_hw_queue *hwq;
- 	void __iomem *reg, *opr_sqd_base;
--	u32 nexus, id, val;
-+	u32 nexus, id, val, rtc;
- 	int err;
- 
- 	if (hba->quirks & UFSHCD_QUIRK_MCQ_BROKEN_RTC)
-@@ -528,17 +528,18 @@ int ufshcd_mcq_sq_cleanup(struct ufs_hba *hba, int task_tag)
- 	opr_sqd_base = mcq_opr_base(hba, OPR_SQD, id);
- 	writel(nexus, opr_sqd_base + REG_SQCTI);
- 
--	/* SQRTCy.ICU = 1 */
--	writel(SQ_ICU, opr_sqd_base + REG_SQRTC);
-+	/* Initiate Cleanup */
-+	writel(readl(opr_sqd_base + REG_SQRTC) | SQ_ICU,
-+		opr_sqd_base + REG_SQRTC);
- 
- 	/* Poll SQRTSy.CUS = 1. Return result from SQRTSy.RTC */
- 	reg = opr_sqd_base + REG_SQRTS;
- 	err = read_poll_timeout(readl, val, val & SQ_CUS, 20,
- 				MCQ_POLL_US, false, reg);
--	if (err)
--		dev_err(hba->dev, "%s: failed. hwq=%d, tag=%d err=%ld\n",
--			__func__, id, task_tag,
--			FIELD_GET(SQ_ICU_ERR_CODE_MASK, readl(reg)));
-+	rtc = FIELD_GET(SQ_ICU_ERR_CODE_MASK, readl(reg));
-+	if (err || rtc)
-+		dev_err(hba->dev, "%s: failed. hwq=%d, tag=%d err=%d RTC=%d\n",
-+			__func__, id, task_tag, err, rtc);
- 
- 	if (ufshcd_mcq_sq_start(hba, hwq))
- 		err = -ETIMEDOUT;
-diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
-index 59d53ea100c003..db4044358e22d8 100644
---- a/drivers/ufs/core/ufshcd.c
-+++ b/drivers/ufs/core/ufshcd.c
-@@ -10100,7 +10100,9 @@ static void ufshcd_wl_shutdown(struct device *dev)
- 	shost_for_each_device(sdev, hba->host) {
- 		if (sdev == hba->ufs_device_wlun)
- 			continue;
--		scsi_device_quiesce(sdev);
-+		mutex_lock(&sdev->state_mutex);
-+		scsi_device_set_state(sdev, SDEV_OFFLINE);
-+		mutex_unlock(&sdev->state_mutex);
- 	}
- 	__ufshcd_wl_suspend(hba, UFS_SHUTDOWN_PM);
- 
-diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
-index 6d439aba646008..867000cdeb9653 100644
---- a/drivers/usb/dwc3/gadget.c
-+++ b/drivers/usb/dwc3/gadget.c
-@@ -438,6 +438,10 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd,
- 			dwc3_gadget_ep_get_transfer_index(dep);
- 	}
- 
-+	if (DWC3_DEPCMD_CMD(cmd) == DWC3_DEPCMD_ENDTRANSFER &&
-+	    !(cmd & DWC3_DEPCMD_CMDIOC))
-+		mdelay(1);
-+
- 	if (saved_config) {
- 		reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));
- 		reg |= saved_config;
-@@ -1734,12 +1738,10 @@ static int __dwc3_stop_active_transfer(struct dwc3_ep *dep, bool force, bool int
- 	WARN_ON_ONCE(ret);
- 	dep->resource_index = 0;
- 
--	if (!interrupt) {
--		mdelay(1);
-+	if (!interrupt)
- 		dep->flags &= ~DWC3_EP_TRANSFER_STARTED;
--	} else if (!ret) {
-+	else if (!ret)
- 		dep->flags |= DWC3_EP_END_TRANSFER_PENDING;
--	}
- 
- 	dep->flags &= ~DWC3_EP_DELAY_STOP;
- 	return ret;
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index 95d8cf24b01546..7d959e2753f906 100644
---- a/drivers/usb/host/xhci-ring.c
-+++ b/drivers/usb/host/xhci-ring.c
-@@ -1046,7 +1046,7 @@ static int xhci_invalidate_cancelled_tds(struct xhci_virt_ep *ep)
- 					td_to_noop(xhci, ring, cached_td, false);
- 					cached_td->cancel_status = TD_CLEARED;
- 				}
--
-+				td_to_noop(xhci, ring, td, false);
- 				td->cancel_status = TD_CLEARING_CACHE;
- 				cached_td = td;
- 				break;
-diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
-index 6246d5ad146848..76f228e7443cb6 100644
---- a/drivers/usb/host/xhci-tegra.c
-+++ b/drivers/usb/host/xhci-tegra.c
-@@ -2183,7 +2183,7 @@ static int tegra_xusb_enter_elpg(struct tegra_xusb *tegra, bool runtime)
- 		goto out;
- 	}
- 
--	for (i = 0; i < tegra->num_usb_phys; i++) {
-+	for (i = 0; i < xhci->usb2_rhub.num_ports; i++) {
- 		if (!xhci->usb2_rhub.ports[i])
- 			continue;
- 		portsc = readl(xhci->usb2_rhub.ports[i]->addr);
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index f5efee06ff0674..7754ed55d220b3 100644
---- a/drivers/usb/host/xhci.h
-+++ b/drivers/usb/host/xhci.h
-@@ -1286,7 +1286,7 @@ enum xhci_setup_dev {
- /* Set TR Dequeue Pointer command TRB fields, 6.4.3.9 */
- #define TRB_TO_STREAM_ID(p)		((((p) & (0xffff << 16)) >> 16))
- #define STREAM_ID_FOR_TRB(p)		((((p)) & 0xffff) << 16)
--#define SCT_FOR_TRB(p)			(((p) << 1) & 0x7)
-+#define SCT_FOR_TRB(p)			(((p) & 0x7) << 1)
- 
- /* Link TRB specific fields */
- #define TRB_TC			(1<<1)
-diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
-index 176f38750ad589..55886b64cadd83 100644
---- a/drivers/usb/serial/option.c
-+++ b/drivers/usb/serial/option.c
-@@ -279,6 +279,7 @@ static void option_instat_callback(struct urb *urb);
- #define QUECTEL_PRODUCT_EG912Y			0x6001
- #define QUECTEL_PRODUCT_EC200S_CN		0x6002
- #define QUECTEL_PRODUCT_EC200A			0x6005
-+#define QUECTEL_PRODUCT_EG916Q			0x6007
- #define QUECTEL_PRODUCT_EM061K_LWW		0x6008
- #define QUECTEL_PRODUCT_EM061K_LCN		0x6009
- #define QUECTEL_PRODUCT_EC200T			0x6026
-@@ -1270,6 +1271,7 @@ static const struct usb_device_id option_ids[] = {
- 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG912Y, 0xff, 0, 0) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG916Q, 0xff, 0x00, 0x00) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) },
- 
- 	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },
-@@ -1380,10 +1382,16 @@ static const struct usb_device_id option_ids[] = {
- 	  .driver_info = NCTRL(0) | RSVD(1) },
- 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a0, 0xff),	/* Telit FN20C04 (rmnet) */
- 	  .driver_info = RSVD(0) | NCTRL(3) },
-+	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a2, 0xff),	/* Telit FN920C04 (MBIM) */
-+	  .driver_info = NCTRL(4) },
- 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a4, 0xff),	/* Telit FN20C04 (rmnet) */
- 	  .driver_info = RSVD(0) | NCTRL(3) },
-+	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a7, 0xff),	/* Telit FN920C04 (MBIM) */
-+	  .driver_info = NCTRL(4) },
- 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a9, 0xff),	/* Telit FN20C04 (rmnet) */
- 	  .driver_info = RSVD(0) | NCTRL(2) | RSVD(3) | RSVD(4) },
-+	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10aa, 0xff),	/* Telit FN920C04 (MBIM) */
-+	  .driver_info = NCTRL(3) | RSVD(4) | RSVD(5) },
- 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910),
- 	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(3) },
- 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910_DUAL_MODEM),
-diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c
-index a8f3f4d3a4509d..d6607491fcef48 100644
---- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c
-+++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c
-@@ -252,7 +252,6 @@ int qcom_pmic_typec_port_get_cc(struct pmic_typec_port *pmic_typec_port,
- 			val = TYPEC_CC_RP_DEF;
- 			break;
- 		}
--		val = TYPEC_CC_RP_DEF;
- 	}
- 
- 	if (misc & CC_ORIENTATION)
-diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
-index e0037665aa9279..cc9a2f8a4ae3b7 100644
---- a/fs/btrfs/tree-log.c
-+++ b/fs/btrfs/tree-log.c
-@@ -1374,7 +1374,7 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,
- 	struct inode *inode = NULL;
- 	unsigned long ref_ptr;
- 	unsigned long ref_end;
--	struct fscrypt_str name;
-+	struct fscrypt_str name = { 0 };
- 	int ret;
- 	int log_ref_ver = 0;
- 	u64 parent_objectid;
-@@ -1846,7 +1846,7 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans,
- 				    struct btrfs_dir_item *di,
- 				    struct btrfs_key *key)
- {
--	struct fscrypt_str name;
-+	struct fscrypt_str name = { 0 };
- 	struct btrfs_dir_item *dir_dst_di;
- 	struct btrfs_dir_item *index_dst_di;
- 	bool dir_dst_matches = false;
-@@ -2126,7 +2126,7 @@ static noinline int check_item_in_log(struct btrfs_trans_handle *trans,
- 	struct extent_buffer *eb;
- 	int slot;
- 	struct btrfs_dir_item *di;
--	struct fscrypt_str name;
-+	struct fscrypt_str name = { 0 };
- 	struct inode *inode = NULL;
- 	struct btrfs_key location;
- 
-diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
-index c4d00999a43300..3cf22a6727f1b6 100644
---- a/fs/fat/namei_vfat.c
-+++ b/fs/fat/namei_vfat.c
-@@ -1037,7 +1037,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
- 	if (corrupt < 0) {
- 		fat_fs_error(new_dir->i_sb,
- 			     "%s: Filesystem corrupted (i_pos %lld)",
--			     __func__, sinfo.i_pos);
-+			     __func__, new_i_pos);
- 	}
- 	goto out;
- }
-diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c
-index 53e4e63c607e7c..ddf8e575e489ca 100644
---- a/fs/nilfs2/dir.c
-+++ b/fs/nilfs2/dir.c
-@@ -331,6 +331,8 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx)
-  * returns the page in which the entry was found, and the entry itself
-  * (as a parameter - res_dir). Page is returned mapped and unlocked.
-  * Entry is guaranteed to be valid.
-+ *
-+ * On failure, returns an error pointer and the caller should ignore res_page.
-  */
- struct nilfs_dir_entry *
- nilfs_find_entry(struct inode *dir, const struct qstr *qstr,
-@@ -358,22 +360,24 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr,
- 	do {
- 		char *kaddr = nilfs_get_page(dir, n, &page);
- 
--		if (!IS_ERR(kaddr)) {
--			de = (struct nilfs_dir_entry *)kaddr;
--			kaddr += nilfs_last_byte(dir, n) - reclen;
--			while ((char *) de <= kaddr) {
--				if (de->rec_len == 0) {
--					nilfs_error(dir->i_sb,
--						"zero-length directory entry");
--					nilfs_put_page(page);
--					goto out;
--				}
--				if (nilfs_match(namelen, name, de))
--					goto found;
--				de = nilfs_next_entry(de);
-+		if (IS_ERR(kaddr))
-+			return ERR_CAST(kaddr);
-+
-+		de = (struct nilfs_dir_entry *)kaddr;
-+		kaddr += nilfs_last_byte(dir, n) - reclen;
-+		while ((char *)de <= kaddr) {
-+			if (de->rec_len == 0) {
-+				nilfs_error(dir->i_sb,
-+					    "zero-length directory entry");
-+				nilfs_put_page(page);
-+				goto out;
- 			}
--			nilfs_put_page(page);
-+			if (nilfs_match(namelen, name, de))
-+				goto found;
-+			de = nilfs_next_entry(de);
- 		}
-+		nilfs_put_page(page);
-+
- 		if (++n >= npages)
- 			n = 0;
- 		/* next page is past the blocks we've got */
-@@ -386,7 +390,7 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr,
- 		}
- 	} while (n != start);
- out:
--	return NULL;
-+	return ERR_PTR(-ENOENT);
- 
- found:
- 	*res_page = page;
-@@ -431,19 +435,19 @@ struct nilfs_dir_entry *nilfs_dotdot(struct inode *dir, struct page **p)
- 	return NULL;
- }
- 
--ino_t nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr)
-+int nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr, ino_t *ino)
- {
--	ino_t res = 0;
- 	struct nilfs_dir_entry *de;
- 	struct page *page;
- 
- 	de = nilfs_find_entry(dir, qstr, &page);
--	if (de) {
--		res = le64_to_cpu(de->inode);
--		kunmap(page);
--		put_page(page);
--	}
--	return res;
-+	if (IS_ERR(de))
-+		return PTR_ERR(de);
-+
-+	*ino = le64_to_cpu(de->inode);
-+	kunmap(page);
-+	put_page(page);
-+	return 0;
- }
- 
- /* Releases the page */
-diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c
-index 2a4e7f4a8102f6..9f9b0762ff6901 100644
---- a/fs/nilfs2/namei.c
-+++ b/fs/nilfs2/namei.c
-@@ -55,12 +55,20 @@ nilfs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
- {
- 	struct inode *inode;
- 	ino_t ino;
-+	int res;
- 
- 	if (dentry->d_name.len > NILFS_NAME_LEN)
- 		return ERR_PTR(-ENAMETOOLONG);
- 
--	ino = nilfs_inode_by_name(dir, &dentry->d_name);
--	inode = ino ? nilfs_iget(dir->i_sb, NILFS_I(dir)->i_root, ino) : NULL;
-+	res = nilfs_inode_by_name(dir, &dentry->d_name, &ino);
-+	if (res) {
-+		if (res != -ENOENT)
-+			return ERR_PTR(res);
-+		inode = NULL;
-+	} else {
-+		inode = nilfs_iget(dir->i_sb, NILFS_I(dir)->i_root, ino);
-+	}
-+
- 	return d_splice_alias(inode, dentry);
- }
- 
-@@ -263,10 +271,11 @@ static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry)
- 	struct page *page;
- 	int err;
- 
--	err = -ENOENT;
- 	de = nilfs_find_entry(dir, &dentry->d_name, &page);
--	if (!de)
-+	if (IS_ERR(de)) {
-+		err = PTR_ERR(de);
- 		goto out;
-+	}
- 
- 	inode = d_inode(dentry);
- 	err = -EIO;
-@@ -361,10 +370,11 @@ static int nilfs_rename(struct mnt_idmap *idmap,
- 	if (unlikely(err))
- 		return err;
- 
--	err = -ENOENT;
- 	old_de = nilfs_find_entry(old_dir, &old_dentry->d_name, &old_page);
--	if (!old_de)
-+	if (IS_ERR(old_de)) {
-+		err = PTR_ERR(old_de);
- 		goto out;
-+	}
- 
- 	if (S_ISDIR(old_inode->i_mode)) {
- 		err = -EIO;
-@@ -381,10 +391,12 @@ static int nilfs_rename(struct mnt_idmap *idmap,
- 		if (dir_de && !nilfs_empty_dir(new_inode))
- 			goto out_dir;
- 
--		err = -ENOENT;
--		new_de = nilfs_find_entry(new_dir, &new_dentry->d_name, &new_page);
--		if (!new_de)
-+		new_de = nilfs_find_entry(new_dir, &new_dentry->d_name,
-+					  &new_page);
-+		if (IS_ERR(new_de)) {
-+			err = PTR_ERR(new_de);
- 			goto out_dir;
-+		}
- 		nilfs_set_link(new_dir, new_de, new_page, old_inode);
- 		nilfs_mark_inode_dirty(new_dir);
- 		inode_set_ctime_current(new_inode);
-@@ -438,13 +450,14 @@ static int nilfs_rename(struct mnt_idmap *idmap,
-  */
- static struct dentry *nilfs_get_parent(struct dentry *child)
- {
--	unsigned long ino;
-+	ino_t ino;
-+	int res;
- 	struct inode *inode;
- 	struct nilfs_root *root;
- 
--	ino = nilfs_inode_by_name(d_inode(child), &dotdot_name);
--	if (!ino)
--		return ERR_PTR(-ENOENT);
-+	res = nilfs_inode_by_name(d_inode(child), &dotdot_name, &ino);
-+	if (res)
-+		return ERR_PTR(res);
- 
- 	root = NILFS_I(d_inode(child))->i_root;
- 
-diff --git a/fs/nilfs2/nilfs.h b/fs/nilfs2/nilfs.h
-index 9a157e5051d0c4..ad13e74af65f92 100644
---- a/fs/nilfs2/nilfs.h
-+++ b/fs/nilfs2/nilfs.h
-@@ -233,7 +233,7 @@ static inline __u32 nilfs_mask_flags(umode_t mode, __u32 flags)
- 
- /* dir.c */
- extern int nilfs_add_link(struct dentry *, struct inode *);
--extern ino_t nilfs_inode_by_name(struct inode *, const struct qstr *);
-+int nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr, ino_t *ino);
- extern int nilfs_make_empty(struct inode *, struct inode *);
- extern struct nilfs_dir_entry *
- nilfs_find_entry(struct inode *, const struct qstr *, struct page **);
-diff --git a/fs/smb/server/mgmt/user_session.c b/fs/smb/server/mgmt/user_session.c
-index dac5f984f17544..9f40b9c473ba42 100644
---- a/fs/smb/server/mgmt/user_session.c
-+++ b/fs/smb/server/mgmt/user_session.c
-@@ -176,9 +176,10 @@ static void ksmbd_expire_session(struct ksmbd_conn *conn)
- 
- 	down_write(&conn->session_lock);
- 	xa_for_each(&conn->sessions, id, sess) {
--		if (sess->state != SMB2_SESSION_VALID ||
--		    time_after(jiffies,
--			       sess->last_active + SMB2_SESSION_TIMEOUT)) {
-+		if (atomic_read(&sess->refcnt) == 0 &&
-+		    (sess->state != SMB2_SESSION_VALID ||
-+		     time_after(jiffies,
-+			       sess->last_active + SMB2_SESSION_TIMEOUT))) {
- 			xa_erase(&conn->sessions, sess->id);
- 			hash_del(&sess->hlist);
- 			ksmbd_session_destroy(sess);
-@@ -268,8 +269,6 @@ struct ksmbd_session *ksmbd_session_lookup_slowpath(unsigned long long id)
- 
- 	down_read(&sessions_table_lock);
- 	sess = __session_lookup(id);
--	if (sess)
--		sess->last_active = jiffies;
- 	up_read(&sessions_table_lock);
- 
- 	return sess;
-@@ -288,6 +287,22 @@ struct ksmbd_session *ksmbd_session_lookup_all(struct ksmbd_conn *conn,
- 	return sess;
- }
- 
-+void ksmbd_user_session_get(struct ksmbd_session *sess)
-+{
-+	atomic_inc(&sess->refcnt);
-+}
-+
-+void ksmbd_user_session_put(struct ksmbd_session *sess)
-+{
-+	if (!sess)
-+		return;
-+
-+	if (atomic_read(&sess->refcnt) <= 0)
-+		WARN_ON(1);
-+	else
-+		atomic_dec(&sess->refcnt);
-+}
-+
- struct preauth_session *ksmbd_preauth_session_alloc(struct ksmbd_conn *conn,
- 						    u64 sess_id)
- {
-@@ -390,6 +405,7 @@ static struct ksmbd_session *__session_create(int protocol)
- 	xa_init(&sess->rpc_handle_list);
- 	sess->sequence_number = 1;
- 	rwlock_init(&sess->tree_conns_lock);
-+	atomic_set(&sess->refcnt, 1);
- 
- 	ret = __init_smb2_session(sess);
- 	if (ret)
-diff --git a/fs/smb/server/mgmt/user_session.h b/fs/smb/server/mgmt/user_session.h
-index dc9fded2cd4379..c1c4b20bd5c6cf 100644
---- a/fs/smb/server/mgmt/user_session.h
-+++ b/fs/smb/server/mgmt/user_session.h
-@@ -61,6 +61,8 @@ struct ksmbd_session {
- 	struct ksmbd_file_table		file_table;
- 	unsigned long			last_active;
- 	rwlock_t			tree_conns_lock;
-+
-+	atomic_t			refcnt;
- };
- 
- static inline int test_session_flag(struct ksmbd_session *sess, int bit)
-@@ -104,4 +106,6 @@ void ksmbd_release_tree_conn_id(struct ksmbd_session *sess, int id);
- int ksmbd_session_rpc_open(struct ksmbd_session *sess, char *rpc_name);
- void ksmbd_session_rpc_close(struct ksmbd_session *sess, int id);
- int ksmbd_session_rpc_method(struct ksmbd_session *sess, int id);
-+void ksmbd_user_session_get(struct ksmbd_session *sess);
-+void ksmbd_user_session_put(struct ksmbd_session *sess);
- #endif /* __USER_SESSION_MANAGEMENT_H__ */
-diff --git a/fs/smb/server/server.c b/fs/smb/server/server.c
-index 2bbc3c3316f0ff..d5d85300560d03 100644
---- a/fs/smb/server/server.c
-+++ b/fs/smb/server/server.c
-@@ -238,6 +238,8 @@ static void __handle_ksmbd_work(struct ksmbd_work *work,
- 	} while (is_chained == true);
- 
- send:
-+	if (work->sess)
-+		ksmbd_user_session_put(work->sess);
- 	if (work->tcon)
- 		ksmbd_tree_connect_put(work->tcon);
- 	smb3_preauth_hash_rsp(work);
-diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
-index c6473b08b1f358..cac9eb4663aadc 100644
---- a/fs/smb/server/smb2pdu.c
-+++ b/fs/smb/server/smb2pdu.c
-@@ -605,8 +605,10 @@ int smb2_check_user_session(struct ksmbd_work *work)
- 
- 	/* Check for validity of user session */
- 	work->sess = ksmbd_session_lookup_all(conn, sess_id);
--	if (work->sess)
-+	if (work->sess) {
-+		ksmbd_user_session_get(work->sess);
- 		return 1;
-+	}
- 	ksmbd_debug(SMB, "Invalid user session, Uid %llu\n", sess_id);
- 	return -ENOENT;
- }
-@@ -1743,6 +1745,7 @@ int smb2_sess_setup(struct ksmbd_work *work)
- 		}
- 
- 		conn->binding = true;
-+		ksmbd_user_session_get(sess);
- 	} else if ((conn->dialect < SMB30_PROT_ID ||
- 		    server_conf.flags & KSMBD_GLOBAL_FLAG_SMB3_MULTICHANNEL) &&
- 		   (req->Flags & SMB2_SESSION_REQ_FLAG_BINDING)) {
-@@ -1769,6 +1772,7 @@ int smb2_sess_setup(struct ksmbd_work *work)
- 		}
- 
- 		conn->binding = false;
-+		ksmbd_user_session_get(sess);
- 	}
- 	work->sess = sess;
- 
-@@ -2229,7 +2233,9 @@ int smb2_session_logoff(struct ksmbd_work *work)
- 	}
- 
- 	ksmbd_destroy_file_table(&sess->file_table);
-+	down_write(&conn->session_lock);
- 	sess->state = SMB2_SESSION_EXPIRED;
-+	up_write(&conn->session_lock);
- 
- 	ksmbd_free_user(sess->user);
- 	sess->user = NULL;
-diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
-index 32d350e97e0f66..33edf047e0ad2f 100644
---- a/fs/xfs/libxfs/xfs_attr.c
-+++ b/fs/xfs/libxfs/xfs_attr.c
-@@ -1565,12 +1565,23 @@ xfs_attr_node_get(
- 	return error;
- }
- 
-+/* Enforce that there is at most one namespace bit per attr. */
-+inline bool xfs_attr_check_namespace(unsigned int attr_flags)
-+{
-+	return hweight32(attr_flags & XFS_ATTR_NSP_ONDISK_MASK) < 2;
-+}
-+
- /* Returns true if the attribute entry name is valid. */
- bool
- xfs_attr_namecheck(
-+	unsigned int	attr_flags,
- 	const void	*name,
- 	size_t		length)
- {
-+	/* Only one namespace bit allowed. */
-+	if (!xfs_attr_check_namespace(attr_flags))
-+		return false;
-+
- 	/*
- 	 * MAXNAMELEN includes the trailing null, but (name/length) leave it
- 	 * out, so use >= for the length check.
-diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
-index 81be9b3e40047b..c877f05e3cd1a4 100644
---- a/fs/xfs/libxfs/xfs_attr.h
-+++ b/fs/xfs/libxfs/xfs_attr.h
-@@ -547,7 +547,9 @@ int xfs_attr_get(struct xfs_da_args *args);
- int xfs_attr_set(struct xfs_da_args *args);
- int xfs_attr_set_iter(struct xfs_attr_intent *attr);
- int xfs_attr_remove_iter(struct xfs_attr_intent *attr);
--bool xfs_attr_namecheck(const void *name, size_t length);
-+bool xfs_attr_check_namespace(unsigned int attr_flags);
-+bool xfs_attr_namecheck(unsigned int attr_flags, const void *name,
-+		size_t length);
- int xfs_attr_calc_size(struct xfs_da_args *args, int *local);
- void xfs_init_attr_trans(struct xfs_da_args *args, struct xfs_trans_res *tres,
- 			 unsigned int *total);
-diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c
-index 2580ae47209a6b..51ff4406867539 100644
---- a/fs/xfs/libxfs/xfs_attr_leaf.c
-+++ b/fs/xfs/libxfs/xfs_attr_leaf.c
-@@ -984,6 +984,10 @@ xfs_attr_shortform_to_leaf(
- 		nargs.hashval = xfs_da_hashname(sfe->nameval,
- 						sfe->namelen);
- 		nargs.attr_filter = sfe->flags & XFS_ATTR_NSP_ONDISK_MASK;
-+		if (!xfs_attr_check_namespace(sfe->flags)) {
-+			error = -EFSCORRUPTED;
-+			goto out;
-+		}
- 		error = xfs_attr3_leaf_lookup_int(bp, &nargs); /* set a->index */
- 		ASSERT(error == -ENOATTR);
- 		error = xfs_attr3_leaf_add(bp, &nargs);
-@@ -1105,7 +1109,7 @@ xfs_attr_shortform_verify(
- 		 * one namespace flag per xattr, so we can just count the
- 		 * bits (i.e. hweight) here.
- 		 */
--		if (hweight8(sfep->flags & XFS_ATTR_NSP_ONDISK_MASK) > 1)
-+		if (!xfs_attr_check_namespace(sfep->flags))
- 			return __this_address;
- 
- 		sfep = next_sfep;
-diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c
-index d440393b40eb8e..54de405cbab5ac 100644
---- a/fs/xfs/libxfs/xfs_attr_remote.c
-+++ b/fs/xfs/libxfs/xfs_attr_remote.c
-@@ -619,7 +619,6 @@ xfs_attr_rmtval_set_blk(
- 	if (error)
- 		return error;
- 
--	ASSERT(nmap == 1);
- 	ASSERT((map->br_startblock != DELAYSTARTBLOCK) &&
- 	       (map->br_startblock != HOLESTARTBLOCK));
- 
-diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
-index 48f0d0698ec438..e6ea35098e07f8 100644
---- a/fs/xfs/libxfs/xfs_bmap.c
-+++ b/fs/xfs/libxfs/xfs_bmap.c
-@@ -1549,6 +1549,7 @@ xfs_bmap_add_extent_delay_real(
- 			if (error)
- 				goto done;
- 		}
-+		ASSERT(da_new <= da_old);
- 		break;
- 
- 	case BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING | BMAP_LEFT_CONTIG:
-@@ -1578,6 +1579,7 @@ xfs_bmap_add_extent_delay_real(
- 			if (error)
- 				goto done;
- 		}
-+		ASSERT(da_new <= da_old);
- 		break;
- 
- 	case BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING | BMAP_RIGHT_CONTIG:
-@@ -1611,6 +1613,7 @@ xfs_bmap_add_extent_delay_real(
- 			if (error)
- 				goto done;
- 		}
-+		ASSERT(da_new <= da_old);
- 		break;
- 
- 	case BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING:
-@@ -1643,6 +1646,7 @@ xfs_bmap_add_extent_delay_real(
- 				goto done;
- 			}
- 		}
-+		ASSERT(da_new <= da_old);
- 		break;
- 
- 	case BMAP_LEFT_FILLING | BMAP_LEFT_CONTIG:
-@@ -1680,6 +1684,7 @@ xfs_bmap_add_extent_delay_real(
- 			if (error)
- 				goto done;
- 		}
-+		ASSERT(da_new <= da_old);
- 		break;
- 
- 	case BMAP_LEFT_FILLING:
-@@ -1767,6 +1772,7 @@ xfs_bmap_add_extent_delay_real(
- 		xfs_iext_update_extent(bma->ip, state, &bma->icur, &PREV);
- 		xfs_iext_next(ifp, &bma->icur);
- 		xfs_iext_update_extent(bma->ip, state, &bma->icur, &RIGHT);
-+		ASSERT(da_new <= da_old);
- 		break;
- 
- 	case BMAP_RIGHT_FILLING:
-@@ -1814,6 +1820,7 @@ xfs_bmap_add_extent_delay_real(
- 		PREV.br_blockcount = temp;
- 		xfs_iext_insert(bma->ip, &bma->icur, &PREV, state);
- 		xfs_iext_next(ifp, &bma->icur);
-+		ASSERT(da_new <= da_old);
- 		break;
- 
- 	case 0:
-@@ -1934,11 +1941,9 @@ xfs_bmap_add_extent_delay_real(
- 	}
- 
- 	/* adjust for changes in reserved delayed indirect blocks */
--	if (da_new != da_old) {
--		ASSERT(state == 0 || da_new < da_old);
-+	if (da_new != da_old)
- 		error = xfs_mod_fdblocks(mp, (int64_t)(da_old - da_new),
--				false);
--	}
-+				true);
- 
- 	xfs_bmap_check_leaf_extents(bma->cur, bma->ip, whichfork);
- done:
-@@ -3969,20 +3974,32 @@ xfs_bmapi_reserve_delalloc(
- 	xfs_extlen_t		alen;
- 	xfs_extlen_t		indlen;
- 	int			error;
--	xfs_fileoff_t		aoff = off;
-+	xfs_fileoff_t		aoff;
-+	bool			use_cowextszhint =
-+					whichfork == XFS_COW_FORK && !prealloc;
- 
-+retry:
- 	/*
- 	 * Cap the alloc length. Keep track of prealloc so we know whether to
- 	 * tag the inode before we return.
- 	 */
-+	aoff = off;
- 	alen = XFS_FILBLKS_MIN(len + prealloc, XFS_MAX_BMBT_EXTLEN);
- 	if (!eof)
- 		alen = XFS_FILBLKS_MIN(alen, got->br_startoff - aoff);
- 	if (prealloc && alen >= len)
- 		prealloc = alen - len;
- 
--	/* Figure out the extent size, adjust alen */
--	if (whichfork == XFS_COW_FORK) {
-+	/*
-+	 * If we're targetting the COW fork but aren't creating a speculative
-+	 * posteof preallocation, try to expand the reservation to align with
-+	 * the COW extent size hint if there's sufficient free space.
-+	 *
-+	 * Unlike the data fork, the CoW cancellation functions will free all
-+	 * the reservations at inactivation, so we don't require that every
-+	 * delalloc reservation have a dirty pagecache.
-+	 */
-+	if (use_cowextszhint) {
- 		struct xfs_bmbt_irec	prev;
- 		xfs_extlen_t		extsz = xfs_get_cowextsz_hint(ip);
- 
-@@ -4001,7 +4018,7 @@ xfs_bmapi_reserve_delalloc(
- 	 */
- 	error = xfs_quota_reserve_blkres(ip, alen);
- 	if (error)
--		return error;
-+		goto out;
- 
- 	/*
- 	 * Split changing sb for alen and indlen since they could be coming
-@@ -4046,6 +4063,17 @@ xfs_bmapi_reserve_delalloc(
- out_unreserve_quota:
- 	if (XFS_IS_QUOTA_ON(mp))
- 		xfs_quota_unreserve_blkres(ip, alen);
-+out:
-+	if (error == -ENOSPC || error == -EDQUOT) {
-+		trace_xfs_delalloc_enospc(ip, off, len);
-+
-+		if (prealloc || use_cowextszhint) {
-+			/* retry without any preallocation */
-+			use_cowextszhint = false;
-+			prealloc = 0;
-+			goto retry;
-+		}
-+	}
- 	return error;
- }
- 
-@@ -4128,8 +4156,10 @@ xfs_bmapi_allocate(
- 	} else {
- 		error = xfs_bmap_alloc_userdata(bma);
- 	}
--	if (error || bma->blkno == NULLFSBLOCK)
-+	if (error)
- 		return error;
-+	if (bma->blkno == NULLFSBLOCK)
-+		return -ENOSPC;
- 
- 	if (bma->flags & XFS_BMAPI_ZERO) {
- 		error = xfs_zero_extent(bma->ip, bma->blkno, bma->length);
-@@ -4309,6 +4339,15 @@ xfs_bmapi_finish(
-  * extent state if necessary.  Details behaviour is controlled by the flags
-  * parameter.  Only allocates blocks from a single allocation group, to avoid
-  * locking problems.
-+ *
-+ * Returns 0 on success and places the extent mappings in mval.  nmaps is used
-+ * as an input/output parameter where the caller specifies the maximum number
-+ * of mappings that may be returned and xfs_bmapi_write passes back the number
-+ * of mappings (including existing mappings) it found.
-+ *
-+ * Returns a negative error code on failure, including -ENOSPC when it could not
-+ * allocate any blocks and -ENOSR when it did allocate blocks to convert a
-+ * delalloc range, but those blocks were before the passed in range.
-  */
- int
- xfs_bmapi_write(
-@@ -4436,10 +4475,16 @@ xfs_bmapi_write(
- 			ASSERT(len > 0);
- 			ASSERT(bma.length > 0);
- 			error = xfs_bmapi_allocate(&bma);
--			if (error)
-+			if (error) {
-+				/*
-+				 * If we already allocated space in a previous
-+				 * iteration return what we go so far when
-+				 * running out of space.
-+				 */
-+				if (error == -ENOSPC && bma.nallocs)
-+					break;
- 				goto error0;
--			if (bma.blkno == NULLFSBLOCK)
--				break;
-+			}
- 
- 			/*
- 			 * If this is a CoW allocation, record the data in
-@@ -4477,7 +4522,6 @@ xfs_bmapi_write(
- 		if (!xfs_iext_next_extent(ifp, &bma.icur, &bma.got))
- 			eof = true;
- 	}
--	*nmap = n;
- 
- 	error = xfs_bmap_btree_to_extents(tp, ip, bma.cur, &bma.logflags,
- 			whichfork);
-@@ -4488,7 +4532,22 @@ xfs_bmapi_write(
- 	       ifp->if_nextents > XFS_IFORK_MAXEXT(ip, whichfork));
- 	xfs_bmapi_finish(&bma, whichfork, 0);
- 	xfs_bmap_validate_ret(orig_bno, orig_len, orig_flags, orig_mval,
--		orig_nmap, *nmap);
-+		orig_nmap, n);
-+
-+	/*
-+	 * When converting delayed allocations, xfs_bmapi_allocate ignores
-+	 * the passed in bno and always converts from the start of the found
-+	 * delalloc extent.
-+	 *
-+	 * To avoid a successful return with *nmap set to 0, return the magic
-+	 * -ENOSR error code for this particular case so that the caller can
-+	 * handle it.
-+	 */
-+	if (!n) {
-+		ASSERT(bma.nallocs >= *nmap);
-+		return -ENOSR;
-+	}
-+	*nmap = n;
- 	return 0;
- error0:
- 	xfs_bmapi_finish(&bma, whichfork, error);
-@@ -4501,8 +4560,8 @@ xfs_bmapi_write(
-  * invocations to allocate the target offset if a large enough physical extent
-  * is not available.
-  */
--int
--xfs_bmapi_convert_delalloc(
-+static int
-+xfs_bmapi_convert_one_delalloc(
- 	struct xfs_inode	*ip,
- 	int			whichfork,
- 	xfs_off_t		offset,
-@@ -4559,7 +4618,8 @@ xfs_bmapi_convert_delalloc(
- 	if (!isnullstartblock(bma.got.br_startblock)) {
- 		xfs_bmbt_to_iomap(ip, iomap, &bma.got, 0, flags,
- 				xfs_iomap_inode_sequence(ip, flags));
--		*seq = READ_ONCE(ifp->if_seq);
-+		if (seq)
-+			*seq = READ_ONCE(ifp->if_seq);
- 		goto out_trans_cancel;
- 	}
- 
-@@ -4595,9 +4655,6 @@ xfs_bmapi_convert_delalloc(
- 	if (error)
- 		goto out_finish;
- 
--	error = -ENOSPC;
--	if (WARN_ON_ONCE(bma.blkno == NULLFSBLOCK))
--		goto out_finish;
- 	error = -EFSCORRUPTED;
- 	if (WARN_ON_ONCE(!xfs_valid_startblock(ip, bma.got.br_startblock)))
- 		goto out_finish;
-@@ -4608,7 +4665,8 @@ xfs_bmapi_convert_delalloc(
- 	ASSERT(!isnullstartblock(bma.got.br_startblock));
- 	xfs_bmbt_to_iomap(ip, iomap, &bma.got, 0, flags,
- 				xfs_iomap_inode_sequence(ip, flags));
--	*seq = READ_ONCE(ifp->if_seq);
-+	if (seq)
-+		*seq = READ_ONCE(ifp->if_seq);
- 
- 	if (whichfork == XFS_COW_FORK)
- 		xfs_refcount_alloc_cow_extent(tp, bma.blkno, bma.length);
-@@ -4631,6 +4689,36 @@ xfs_bmapi_convert_delalloc(
- 	return error;
- }
- 
-+/*
-+ * Pass in a dellalloc extent and convert it to real extents, return the real
-+ * extent that maps offset_fsb in iomap.
-+ */
-+int
-+xfs_bmapi_convert_delalloc(
-+	struct xfs_inode	*ip,
-+	int			whichfork,
-+	loff_t			offset,
-+	struct iomap		*iomap,
-+	unsigned int		*seq)
-+{
-+	int			error;
-+
-+	/*
-+	 * Attempt to allocate whatever delalloc extent currently backs offset
-+	 * and put the result into iomap.  Allocate in a loop because it may
-+	 * take several attempts to allocate real blocks for a contiguous
-+	 * delalloc extent if free space is sufficiently fragmented.
-+	 */
-+	do {
-+		error = xfs_bmapi_convert_one_delalloc(ip, whichfork, offset,
-+					iomap, seq);
-+		if (error)
-+			return error;
-+	} while (iomap->offset + iomap->length <= offset);
-+
-+	return 0;
-+}
-+
- int
- xfs_bmapi_remap(
- 	struct xfs_trans	*tp,
-diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c
-index 282c7cf032f406..12e3cca804b7ec 100644
---- a/fs/xfs/libxfs/xfs_da_btree.c
-+++ b/fs/xfs/libxfs/xfs_da_btree.c
-@@ -2158,8 +2158,8 @@ xfs_da_grow_inode_int(
- 	struct xfs_inode	*dp = args->dp;
- 	int			w = args->whichfork;
- 	xfs_rfsblock_t		nblks = dp->i_nblocks;
--	struct xfs_bmbt_irec	map, *mapp;
--	int			nmap, error, got, i, mapi;
-+	struct xfs_bmbt_irec	map, *mapp = &map;
-+	int			nmap, error, got, i, mapi = 1;
- 
- 	/*
- 	 * Find a spot in the file space to put the new block.
-@@ -2175,14 +2175,7 @@ xfs_da_grow_inode_int(
- 	error = xfs_bmapi_write(tp, dp, *bno, count,
- 			xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA|XFS_BMAPI_CONTIG,
- 			args->total, &map, &nmap);
--	if (error)
--		return error;
--
--	ASSERT(nmap <= 1);
--	if (nmap == 1) {
--		mapp = &map;
--		mapi = 1;
--	} else if (nmap == 0 && count > 1) {
-+	if (error == -ENOSPC && count > 1) {
- 		xfs_fileoff_t		b;
- 		int			c;
- 
-@@ -2199,16 +2192,13 @@ xfs_da_grow_inode_int(
- 					args->total, &mapp[mapi], &nmap);
- 			if (error)
- 				goto out_free_map;
--			if (nmap < 1)
--				break;
- 			mapi += nmap;
- 			b = mapp[mapi - 1].br_startoff +
- 			    mapp[mapi - 1].br_blockcount;
- 		}
--	} else {
--		mapi = 0;
--		mapp = NULL;
- 	}
-+	if (error)
-+		goto out_free_map;
- 
- 	/*
- 	 * Count the blocks we got, make sure it matches the total.
-diff --git a/fs/xfs/libxfs/xfs_da_format.h b/fs/xfs/libxfs/xfs_da_format.h
-index f9015f88eca706..ebcb9066398f47 100644
---- a/fs/xfs/libxfs/xfs_da_format.h
-+++ b/fs/xfs/libxfs/xfs_da_format.h
-@@ -703,8 +703,13 @@ struct xfs_attr3_leafblock {
- #define XFS_ATTR_ROOT		(1u << XFS_ATTR_ROOT_BIT)
- #define XFS_ATTR_SECURE		(1u << XFS_ATTR_SECURE_BIT)
- #define XFS_ATTR_INCOMPLETE	(1u << XFS_ATTR_INCOMPLETE_BIT)
-+
- #define XFS_ATTR_NSP_ONDISK_MASK	(XFS_ATTR_ROOT | XFS_ATTR_SECURE)
- 
-+#define XFS_ATTR_ONDISK_MASK	(XFS_ATTR_NSP_ONDISK_MASK | \
-+				 XFS_ATTR_LOCAL | \
-+				 XFS_ATTR_INCOMPLETE)
-+
- /*
-  * Alignment for namelist and valuelist entries (since they are mixed
-  * there can be only one alignment value)
-diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
-index 0f970a0b33824c..423d39b6b91744 100644
---- a/fs/xfs/libxfs/xfs_inode_buf.c
-+++ b/fs/xfs/libxfs/xfs_inode_buf.c
-@@ -366,17 +366,40 @@ xfs_dinode_verify_fork(
- 	/*
- 	 * For fork types that can contain local data, check that the fork
- 	 * format matches the size of local data contained within the fork.
--	 *
--	 * For all types, check that when the size says the should be in extent
--	 * or btree format, the inode isn't claiming it is in local format.
- 	 */
- 	if (whichfork == XFS_DATA_FORK) {
--		if (S_ISDIR(mode) || S_ISLNK(mode)) {
-+		/*
-+		 * A directory small enough to fit in the inode must be stored
-+		 * in local format.  The directory sf <-> extents conversion
-+		 * code updates the directory size accordingly.  Directories
-+		 * being truncated have zero size and are not subject to this
-+		 * check.
-+		 */
-+		if (S_ISDIR(mode)) {
-+			if (dip->di_size &&
-+			    be64_to_cpu(dip->di_size) <= fork_size &&
-+			    fork_format != XFS_DINODE_FMT_LOCAL)
-+				return __this_address;
-+		}
-+
-+		/*
-+		 * A symlink with a target small enough to fit in the inode can
-+		 * be stored in extents format if xattrs were added (thus
-+		 * converting the data fork from shortform to remote format)
-+		 * and then removed.
-+		 */
-+		if (S_ISLNK(mode)) {
- 			if (be64_to_cpu(dip->di_size) <= fork_size &&
-+			    fork_format != XFS_DINODE_FMT_EXTENTS &&
- 			    fork_format != XFS_DINODE_FMT_LOCAL)
- 				return __this_address;
- 		}
- 
-+		/*
-+		 * For all types, check that when the size says the fork should
-+		 * be in extent or btree format, the inode isn't claiming to be
-+		 * in local format.
-+		 */
- 		if (be64_to_cpu(dip->di_size) > fork_size &&
- 		    fork_format == XFS_DINODE_FMT_LOCAL)
- 			return __this_address;
-@@ -492,9 +515,19 @@ xfs_dinode_verify(
- 	if (mode && xfs_mode_to_ftype(mode) == XFS_DIR3_FT_UNKNOWN)
- 		return __this_address;
- 
--	/* No zero-length symlinks/dirs. */
--	if ((S_ISLNK(mode) || S_ISDIR(mode)) && di_size == 0)
--		return __this_address;
-+	/*
-+	 * No zero-length symlinks/dirs unless they're unlinked and hence being
-+	 * inactivated.
-+	 */
-+	if ((S_ISLNK(mode) || S_ISDIR(mode)) && di_size == 0) {
-+		if (dip->di_version > 1) {
-+			if (dip->di_nlink)
-+				return __this_address;
-+		} else {
-+			if (dip->di_onlink)
-+				return __this_address;
-+		}
-+	}
- 
- 	fa = xfs_dinode_verify_nrext64(mp, dip);
- 	if (fa)
-diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c
-index 59c4804e4d790a..424acdd4b0fca4 100644
---- a/fs/xfs/libxfs/xfs_sb.c
-+++ b/fs/xfs/libxfs/xfs_sb.c
-@@ -1031,11 +1031,12 @@ xfs_log_sb(
- 	 * and hence we don't need have to update it here.
- 	 */
- 	if (xfs_has_lazysbcount(mp)) {
--		mp->m_sb.sb_icount = percpu_counter_sum(&mp->m_icount);
-+		mp->m_sb.sb_icount = percpu_counter_sum_positive(&mp->m_icount);
- 		mp->m_sb.sb_ifree = min_t(uint64_t,
--				percpu_counter_sum(&mp->m_ifree),
-+				percpu_counter_sum_positive(&mp->m_ifree),
- 				mp->m_sb.sb_icount);
--		mp->m_sb.sb_fdblocks = percpu_counter_sum(&mp->m_fdblocks);
-+		mp->m_sb.sb_fdblocks =
-+				percpu_counter_sum_positive(&mp->m_fdblocks);
- 	}
- 
- 	xfs_sb_to_disk(bp->b_addr, &mp->m_sb);
-diff --git a/fs/xfs/scrub/attr.c b/fs/xfs/scrub/attr.c
-index 6c16d9530ccaca..147babe738d201 100644
---- a/fs/xfs/scrub/attr.c
-+++ b/fs/xfs/scrub/attr.c
-@@ -182,32 +182,23 @@ xchk_xattr_listent(
- 		return;
- 	}
- 
-+	if (flags & ~XFS_ATTR_ONDISK_MASK) {
-+		xchk_fblock_set_corrupt(sx->sc, XFS_ATTR_FORK, args.blkno);
-+		goto fail_xref;
-+	}
-+
- 	if (flags & XFS_ATTR_INCOMPLETE) {
- 		/* Incomplete attr key, just mark the inode for preening. */
- 		xchk_ino_set_preen(sx->sc, context->dp->i_ino);
- 		return;
- 	}
- 
--	/* Only one namespace bit allowed. */
--	if (hweight32(flags & XFS_ATTR_NSP_ONDISK_MASK) > 1) {
--		xchk_fblock_set_corrupt(sx->sc, XFS_ATTR_FORK, args.blkno);
--		goto fail_xref;
--	}
--
- 	/* Does this name make sense? */
--	if (!xfs_attr_namecheck(name, namelen)) {
-+	if (!xfs_attr_namecheck(flags, name, namelen)) {
- 		xchk_fblock_set_corrupt(sx->sc, XFS_ATTR_FORK, args.blkno);
- 		goto fail_xref;
- 	}
- 
--	/*
--	 * Local xattr values are stored in the attr leaf block, so we don't
--	 * need to retrieve the value from a remote block to detect corruption
--	 * problems.
--	 */
--	if (flags & XFS_ATTR_LOCAL)
--		goto fail_xref;
--
- 	/*
- 	 * Try to allocate enough memory to extrat the attr value.  If that
- 	 * doesn't work, we overload the seen_enough variable to convey
-@@ -223,6 +214,11 @@ xchk_xattr_listent(
- 
- 	args.value = ab->value;
- 
-+	/*
-+	 * Get the attr value to ensure that lookup can find this attribute
-+	 * through the dabtree indexing and that remote value retrieval also
-+	 * works correctly.
-+	 */
- 	error = xfs_attr_get_ilocked(&args);
- 	/* ENODATA means the hash lookup failed and the attr is bad */
- 	if (error == -ENODATA)
-@@ -463,7 +459,6 @@ xchk_xattr_rec(
- 	xfs_dahash_t			hash;
- 	int				nameidx;
- 	int				hdrsize;
--	unsigned int			badflags;
- 	int				error;
- 
- 	ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC);
-@@ -493,10 +488,15 @@ xchk_xattr_rec(
- 
- 	/* Retrieve the entry and check it. */
- 	hash = be32_to_cpu(ent->hashval);
--	badflags = ~(XFS_ATTR_LOCAL | XFS_ATTR_ROOT | XFS_ATTR_SECURE |
--			XFS_ATTR_INCOMPLETE);
--	if ((ent->flags & badflags) != 0)
-+	if (ent->flags & ~XFS_ATTR_ONDISK_MASK) {
-+		xchk_da_set_corrupt(ds, level);
-+		return 0;
-+	}
-+	if (!xfs_attr_check_namespace(ent->flags)) {
- 		xchk_da_set_corrupt(ds, level);
-+		return 0;
-+	}
-+
- 	if (ent->flags & XFS_ATTR_LOCAL) {
- 		lentry = (struct xfs_attr_leaf_name_local *)
- 				(((char *)bp->b_addr) + nameidx);
-@@ -561,6 +561,15 @@ xchk_xattr_check_sf(
- 			break;
- 		}
- 
-+		/*
-+		 * Shortform entries do not set LOCAL or INCOMPLETE, so the
-+		 * only valid flag bits here are for namespaces.
-+		 */
-+		if (sfe->flags & ~XFS_ATTR_NSP_ONDISK_MASK) {
-+			xchk_fblock_set_corrupt(sc, XFS_ATTR_FORK, 0);
-+			break;
-+		}
-+
- 		if (!xchk_xattr_set_map(sc, ab->usedmap,
- 				(char *)sfe - (char *)sf,
- 				sizeof(struct xfs_attr_sf_entry))) {
-diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c
-index 08e29248526881..f10cd4fb0abd0d 100644
---- a/fs/xfs/scrub/common.c
-+++ b/fs/xfs/scrub/common.c
-@@ -735,7 +735,7 @@ xchk_iget(
- {
- 	ASSERT(sc->tp != NULL);
- 
--	return xfs_iget(sc->mp, sc->tp, inum, XFS_IGET_UNTRUSTED, 0, ipp);
-+	return xfs_iget(sc->mp, sc->tp, inum, XCHK_IGET_FLAGS, 0, ipp);
- }
- 
- /*
-@@ -786,8 +786,8 @@ xchk_iget_agi(
- 	if (error)
- 		return error;
- 
--	error = xfs_iget(mp, tp, inum,
--			XFS_IGET_NORETRY | XFS_IGET_UNTRUSTED, 0, ipp);
-+	error = xfs_iget(mp, tp, inum, XFS_IGET_NORETRY | XCHK_IGET_FLAGS, 0,
-+			ipp);
- 	if (error == -EAGAIN) {
- 		/*
- 		 * The inode may be in core but temporarily unavailable and may
-@@ -994,12 +994,6 @@ xchk_irele(
- 		spin_lock(&VFS_I(ip)->i_lock);
- 		VFS_I(ip)->i_state &= ~I_DONTCACHE;
- 		spin_unlock(&VFS_I(ip)->i_lock);
--	} else if (atomic_read(&VFS_I(ip)->i_count) == 1) {
--		/*
--		 * If this is the last reference to the inode and the caller
--		 * permits it, set DONTCACHE to avoid thrashing.
--		 */
--		d_mark_dontcache(VFS_I(ip));
- 	}
- 
- 	xfs_irele(ip);
-diff --git a/fs/xfs/scrub/scrub.h b/fs/xfs/scrub/scrub.h
-index 1ef9c6b4842a13..869a10fe9d7d77 100644
---- a/fs/xfs/scrub/scrub.h
-+++ b/fs/xfs/scrub/scrub.h
-@@ -17,6 +17,13 @@ struct xfs_scrub;
- #define XCHK_GFP_FLAGS	((__force gfp_t)(GFP_KERNEL | __GFP_NOWARN | \
- 					 __GFP_RETRY_MAYFAIL))
- 
-+/*
-+ * For opening files by handle for fsck operations, we don't trust the inumber
-+ * or the allocation state; therefore, perform an untrusted lookup.  We don't
-+ * want these inodes to pollute the cache, so mark them for immediate removal.
-+ */
-+#define XCHK_IGET_FLAGS	(XFS_IGET_UNTRUSTED | XFS_IGET_DONTCACHE)
-+
- /* Type info and names for the scrub types. */
- enum xchk_type {
- 	ST_NONE = 1,	/* disabled */
-diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
-index e74097e58097b9..688ac031d3a1c0 100644
---- a/fs/xfs/xfs_aops.c
-+++ b/fs/xfs/xfs_aops.c
-@@ -233,45 +233,6 @@ xfs_imap_valid(
- 	return true;
- }
- 
--/*
-- * Pass in a dellalloc extent and convert it to real extents, return the real
-- * extent that maps offset_fsb in wpc->iomap.
-- *
-- * The current page is held locked so nothing could have removed the block
-- * backing offset_fsb, although it could have moved from the COW to the data
-- * fork by another thread.
-- */
--static int
--xfs_convert_blocks(
--	struct iomap_writepage_ctx *wpc,
--	struct xfs_inode	*ip,
--	int			whichfork,
--	loff_t			offset)
--{
--	int			error;
--	unsigned		*seq;
--
--	if (whichfork == XFS_COW_FORK)
--		seq = &XFS_WPC(wpc)->cow_seq;
--	else
--		seq = &XFS_WPC(wpc)->data_seq;
--
--	/*
--	 * Attempt to allocate whatever delalloc extent currently backs offset
--	 * and put the result into wpc->iomap.  Allocate in a loop because it
--	 * may take several attempts to allocate real blocks for a contiguous
--	 * delalloc extent if free space is sufficiently fragmented.
--	 */
--	do {
--		error = xfs_bmapi_convert_delalloc(ip, whichfork, offset,
--				&wpc->iomap, seq);
--		if (error)
--			return error;
--	} while (wpc->iomap.offset + wpc->iomap.length <= offset);
--
--	return 0;
--}
--
- static int
- xfs_map_blocks(
- 	struct iomap_writepage_ctx *wpc,
-@@ -289,6 +250,7 @@ xfs_map_blocks(
- 	struct xfs_iext_cursor	icur;
- 	int			retries = 0;
- 	int			error = 0;
-+	unsigned int		*seq;
- 
- 	if (xfs_is_shutdown(mp))
- 		return -EIO;
-@@ -386,7 +348,19 @@ xfs_map_blocks(
- 	trace_xfs_map_blocks_found(ip, offset, count, whichfork, &imap);
- 	return 0;
- allocate_blocks:
--	error = xfs_convert_blocks(wpc, ip, whichfork, offset);
-+	/*
-+	 * Convert a dellalloc extent to a real one. The current page is held
-+	 * locked so nothing could have removed the block backing offset_fsb,
-+	 * although it could have moved from the COW to the data fork by another
-+	 * thread.
-+	 */
-+	if (whichfork == XFS_COW_FORK)
-+		seq = &XFS_WPC(wpc)->cow_seq;
-+	else
-+		seq = &XFS_WPC(wpc)->data_seq;
-+
-+	error = xfs_bmapi_convert_delalloc(ip, whichfork, offset,
-+				&wpc->iomap, seq);
- 	if (error) {
- 		/*
- 		 * If we failed to find the extent in the COW fork we might have
-diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
-index 82775e9537df8b..df86c9c097209e 100644
---- a/fs/xfs/xfs_attr_item.c
-+++ b/fs/xfs/xfs_attr_item.c
-@@ -510,6 +510,9 @@ xfs_attri_validate(
- 	unsigned int			op = attrp->alfi_op_flags &
- 					     XFS_ATTRI_OP_FLAGS_TYPE_MASK;
- 
-+	if (!xfs_sb_version_haslogxattrs(&mp->m_sb))
-+		return false;
-+
- 	if (attrp->__pad != 0)
- 		return false;
- 
-@@ -519,6 +522,10 @@ xfs_attri_validate(
- 	if (attrp->alfi_attr_filter & ~XFS_ATTRI_FILTER_MASK)
- 		return false;
- 
-+	if (!xfs_attr_check_namespace(attrp->alfi_attr_filter &
-+				      XFS_ATTR_NSP_ONDISK_MASK))
-+		return false;
-+
- 	/* alfi_op_flags should be either a set or remove */
- 	switch (op) {
- 	case XFS_ATTRI_OP_FLAGS_SET:
-@@ -569,7 +576,8 @@ xfs_attri_item_recover(
- 	 */
- 	attrp = &attrip->attri_format;
- 	if (!xfs_attri_validate(mp, attrp) ||
--	    !xfs_attr_namecheck(nv->name.i_addr, nv->name.i_len))
-+	    !xfs_attr_namecheck(attrp->alfi_attr_filter, nv->name.i_addr,
-+				nv->name.i_len))
- 		return -EFSCORRUPTED;
- 
- 	error = xlog_recover_iget(mp,  attrp->alfi_ino, &ip);
-@@ -602,8 +610,6 @@ xfs_attri_item_recover(
- 	args->op_flags = XFS_DA_OP_RECOVERY | XFS_DA_OP_OKNOENT |
- 			 XFS_DA_OP_LOGGED;
- 
--	ASSERT(xfs_sb_version_haslogxattrs(&mp->m_sb));
--
- 	switch (attr->xattri_op_flags) {
- 	case XFS_ATTRI_OP_FLAGS_SET:
- 	case XFS_ATTRI_OP_FLAGS_REPLACE:
-@@ -718,48 +724,112 @@ xlog_recover_attri_commit_pass2(
- 	const void			*attr_value = NULL;
- 	const void			*attr_name;
- 	size_t				len;
--
--	attri_formatp = item->ri_buf[0].i_addr;
--	attr_name = item->ri_buf[1].i_addr;
-+	unsigned int			op, i = 0;
- 
- 	/* Validate xfs_attri_log_format before the large memory allocation */
- 	len = sizeof(struct xfs_attri_log_format);
--	if (item->ri_buf[0].i_len != len) {
-+	if (item->ri_buf[i].i_len != len) {
- 		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
- 				item->ri_buf[0].i_addr, item->ri_buf[0].i_len);
- 		return -EFSCORRUPTED;
- 	}
- 
-+	attri_formatp = item->ri_buf[i].i_addr;
- 	if (!xfs_attri_validate(mp, attri_formatp)) {
- 		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
--				item->ri_buf[0].i_addr, item->ri_buf[0].i_len);
-+				attri_formatp, len);
-+		return -EFSCORRUPTED;
-+	}
-+
-+	/* Check the number of log iovecs makes sense for the op code. */
-+	op = attri_formatp->alfi_op_flags & XFS_ATTRI_OP_FLAGS_TYPE_MASK;
-+	switch (op) {
-+	case XFS_ATTRI_OP_FLAGS_SET:
-+	case XFS_ATTRI_OP_FLAGS_REPLACE:
-+		/* Log item, attr name, attr value */
-+		if (item->ri_total != 3) {
-+			XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
-+					     attri_formatp, len);
-+			return -EFSCORRUPTED;
-+		}
-+		break;
-+	case XFS_ATTRI_OP_FLAGS_REMOVE:
-+		/* Log item, attr name */
-+		if (item->ri_total != 2) {
-+			XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
-+					     attri_formatp, len);
-+			return -EFSCORRUPTED;
-+		}
-+		break;
-+	default:
-+		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
-+				     attri_formatp, len);
- 		return -EFSCORRUPTED;
- 	}
-+	i++;
- 
- 	/* Validate the attr name */
--	if (item->ri_buf[1].i_len !=
-+	if (item->ri_buf[i].i_len !=
- 			xlog_calc_iovec_len(attri_formatp->alfi_name_len)) {
- 		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
--				item->ri_buf[0].i_addr, item->ri_buf[0].i_len);
-+				attri_formatp, len);
- 		return -EFSCORRUPTED;
- 	}
- 
--	if (!xfs_attr_namecheck(attr_name, attri_formatp->alfi_name_len)) {
-+	attr_name = item->ri_buf[i].i_addr;
-+	if (!xfs_attr_namecheck(attri_formatp->alfi_attr_filter, attr_name,
-+				attri_formatp->alfi_name_len)) {
- 		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
--				item->ri_buf[1].i_addr, item->ri_buf[1].i_len);
-+				attri_formatp, len);
- 		return -EFSCORRUPTED;
- 	}
-+	i++;
- 
- 	/* Validate the attr value, if present */
- 	if (attri_formatp->alfi_value_len != 0) {
--		if (item->ri_buf[2].i_len != xlog_calc_iovec_len(attri_formatp->alfi_value_len)) {
-+		if (item->ri_buf[i].i_len != xlog_calc_iovec_len(attri_formatp->alfi_value_len)) {
- 			XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
- 					item->ri_buf[0].i_addr,
- 					item->ri_buf[0].i_len);
- 			return -EFSCORRUPTED;
- 		}
- 
--		attr_value = item->ri_buf[2].i_addr;
-+		attr_value = item->ri_buf[i].i_addr;
-+		i++;
-+	}
-+
-+	/*
-+	 * Make sure we got the correct number of buffers for the operation
-+	 * that we just loaded.
-+	 */
-+	if (i != item->ri_total) {
-+		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
-+				attri_formatp, len);
-+		return -EFSCORRUPTED;
-+	}
-+
-+	switch (op) {
-+	case XFS_ATTRI_OP_FLAGS_REMOVE:
-+		/* Regular remove operations operate only on names. */
-+		if (attr_value != NULL || attri_formatp->alfi_value_len != 0) {
-+			XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
-+					     attri_formatp, len);
-+			return -EFSCORRUPTED;
-+		}
-+		fallthrough;
-+	case XFS_ATTRI_OP_FLAGS_SET:
-+	case XFS_ATTRI_OP_FLAGS_REPLACE:
-+		/*
-+		 * Regular xattr set/remove/replace operations require a name
-+		 * and do not take a newname.  Values are optional for set and
-+		 * replace.
-+		 */
-+		if (attr_name == NULL || attri_formatp->alfi_name_len == 0) {
-+			XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
-+					     attri_formatp, len);
-+			return -EFSCORRUPTED;
-+		}
-+		break;
- 	}
- 
- 	/*
-diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
-index 99bbbe1a0e4478..9ee1d7d2ba76c2 100644
---- a/fs/xfs/xfs_attr_list.c
-+++ b/fs/xfs/xfs_attr_list.c
-@@ -82,7 +82,8 @@ xfs_attr_shortform_list(
- 	     (dp->i_af.if_bytes + sf->hdr.count * 16) < context->bufsize)) {
- 		for (i = 0, sfe = &sf->list[0]; i < sf->hdr.count; i++) {
- 			if (XFS_IS_CORRUPT(context->dp->i_mount,
--					   !xfs_attr_namecheck(sfe->nameval,
-+					   !xfs_attr_namecheck(sfe->flags,
-+							       sfe->nameval,
- 							       sfe->namelen)))
- 				return -EFSCORRUPTED;
- 			context->put_listent(context,
-@@ -120,7 +121,8 @@ xfs_attr_shortform_list(
- 	for (i = 0, sfe = &sf->list[0]; i < sf->hdr.count; i++) {
- 		if (unlikely(
- 		    ((char *)sfe < (char *)sf) ||
--		    ((char *)sfe >= ((char *)sf + dp->i_af.if_bytes)))) {
-+		    ((char *)sfe >= ((char *)sf + dp->i_af.if_bytes)) ||
-+		    !xfs_attr_check_namespace(sfe->flags))) {
- 			XFS_CORRUPTION_ERROR("xfs_attr_shortform_list",
- 					     XFS_ERRLEVEL_LOW,
- 					     context->dp->i_mount, sfe,
-@@ -174,7 +176,7 @@ xfs_attr_shortform_list(
- 			cursor->offset = 0;
- 		}
- 		if (XFS_IS_CORRUPT(context->dp->i_mount,
--				   !xfs_attr_namecheck(sbp->name,
-+				   !xfs_attr_namecheck(sbp->flags, sbp->name,
- 						       sbp->namelen))) {
- 			error = -EFSCORRUPTED;
- 			goto out;
-@@ -465,7 +467,8 @@ xfs_attr3_leaf_list_int(
- 		}
- 
- 		if (XFS_IS_CORRUPT(context->dp->i_mount,
--				   !xfs_attr_namecheck(name, namelen)))
-+				   !xfs_attr_namecheck(entry->flags, name,
-+						       namelen)))
- 			return -EFSCORRUPTED;
- 		context->put_listent(context, entry->flags,
- 					      name, namelen, valuelen);
-diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
-index ad4aba5002c12d..f9d72d8e3c3599 100644
---- a/fs/xfs/xfs_bmap_util.c
-+++ b/fs/xfs/xfs_bmap_util.c
-@@ -636,13 +636,11 @@ xfs_bmap_punch_delalloc_range(
- 
- /*
-  * Test whether it is appropriate to check an inode for and free post EOF
-- * blocks. The 'force' parameter determines whether we should also consider
-- * regular files that are marked preallocated or append-only.
-+ * blocks.
-  */
- bool
- xfs_can_free_eofblocks(
--	struct xfs_inode	*ip,
--	bool			force)
-+	struct xfs_inode	*ip)
- {
- 	struct xfs_bmbt_irec	imap;
- 	struct xfs_mount	*mp = ip->i_mount;
-@@ -676,11 +674,11 @@ xfs_can_free_eofblocks(
- 		return false;
- 
- 	/*
--	 * Do not free real preallocated or append-only files unless the file
--	 * has delalloc blocks and we are forced to remove them.
-+	 * Only free real extents for inodes with persistent preallocations or
-+	 * the append-only flag.
- 	 */
- 	if (ip->i_diflags & (XFS_DIFLAG_PREALLOC | XFS_DIFLAG_APPEND))
--		if (!force || ip->i_delayed_blks == 0)
-+		if (ip->i_delayed_blks == 0)
- 			return false;
- 
- 	/*
-@@ -734,6 +732,22 @@ xfs_free_eofblocks(
- 	/* Wait on dio to ensure i_size has settled. */
- 	inode_dio_wait(VFS_I(ip));
- 
-+	/*
-+	 * For preallocated files only free delayed allocations.
-+	 *
-+	 * Note that this means we also leave speculative preallocations in
-+	 * place for preallocated files.
-+	 */
-+	if (ip->i_diflags & (XFS_DIFLAG_PREALLOC | XFS_DIFLAG_APPEND)) {
-+		if (ip->i_delayed_blks) {
-+			xfs_bmap_punch_delalloc_range(ip,
-+				round_up(XFS_ISIZE(ip), mp->m_sb.sb_blocksize),
-+				LLONG_MAX);
-+		}
-+		xfs_inode_clear_eofblocks_tag(ip);
-+		return 0;
-+	}
-+
- 	error = xfs_trans_alloc(mp, &M_RES(mp)->tr_itruncate, 0, 0, 0, &tp);
- 	if (error) {
- 		ASSERT(xfs_is_shutdown(mp));
-@@ -868,33 +882,32 @@ xfs_alloc_file_space(
- 		if (error)
- 			goto error;
- 
--		error = xfs_bmapi_write(tp, ip, startoffset_fsb,
--				allocatesize_fsb, XFS_BMAPI_PREALLOC, 0, imapp,
--				&nimaps);
--		if (error)
--			goto error;
--
--		ip->i_diflags |= XFS_DIFLAG_PREALLOC;
--		xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
--
--		error = xfs_trans_commit(tp);
--		xfs_iunlock(ip, XFS_ILOCK_EXCL);
--		if (error)
--			break;
--
- 		/*
- 		 * If the allocator cannot find a single free extent large
- 		 * enough to cover the start block of the requested range,
--		 * xfs_bmapi_write will return 0 but leave *nimaps set to 0.
-+		 * xfs_bmapi_write will return -ENOSR.
- 		 *
- 		 * In that case we simply need to keep looping with the same
- 		 * startoffset_fsb so that one of the following allocations
- 		 * will eventually reach the requested range.
- 		 */
--		if (nimaps) {
-+		error = xfs_bmapi_write(tp, ip, startoffset_fsb,
-+				allocatesize_fsb, XFS_BMAPI_PREALLOC, 0, imapp,
-+				&nimaps);
-+		if (error) {
-+			if (error != -ENOSR)
-+				goto error;
-+			error = 0;
-+		} else {
- 			startoffset_fsb += imapp->br_blockcount;
- 			allocatesize_fsb -= imapp->br_blockcount;
- 		}
-+
-+		ip->i_diflags |= XFS_DIFLAG_PREALLOC;
-+		xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
-+
-+		error = xfs_trans_commit(tp);
-+		xfs_iunlock(ip, XFS_ILOCK_EXCL);
- 	}
- 
- 	return error;
-@@ -1049,7 +1062,7 @@ xfs_prepare_shift(
- 	 * Trim eofblocks to avoid shifting uninitialized post-eof preallocation
- 	 * into the accessible region of the file.
- 	 */
--	if (xfs_can_free_eofblocks(ip, true)) {
-+	if (xfs_can_free_eofblocks(ip)) {
- 		error = xfs_free_eofblocks(ip);
- 		if (error)
- 			return error;
-diff --git a/fs/xfs/xfs_bmap_util.h b/fs/xfs/xfs_bmap_util.h
-index 6888078f5c31e0..1383019ccdb755 100644
---- a/fs/xfs/xfs_bmap_util.h
-+++ b/fs/xfs/xfs_bmap_util.h
-@@ -63,7 +63,7 @@ int	xfs_insert_file_space(struct xfs_inode *, xfs_off_t offset,
- 				xfs_off_t len);
- 
- /* EOF block manipulation functions */
--bool	xfs_can_free_eofblocks(struct xfs_inode *ip, bool force);
-+bool	xfs_can_free_eofblocks(struct xfs_inode *ip);
- int	xfs_free_eofblocks(struct xfs_inode *ip);
- 
- int	xfs_swap_extents(struct xfs_inode *ip, struct xfs_inode *tip,
-diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
-index a013b87ab8d5e5..9b67f05d92a193 100644
---- a/fs/xfs/xfs_dquot.c
-+++ b/fs/xfs/xfs_dquot.c
-@@ -333,7 +333,6 @@ xfs_dquot_disk_alloc(
- 		goto err_cancel;
- 
- 	ASSERT(map.br_blockcount == XFS_DQUOT_CLUSTER_SIZE_FSB);
--	ASSERT(nmaps == 1);
- 	ASSERT((map.br_startblock != DELAYSTARTBLOCK) &&
- 	       (map.br_startblock != HOLESTARTBLOCK));
- 
-diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
-index db88f41c94c6ba..57a9f23175250a 100644
---- a/fs/xfs/xfs_icache.c
-+++ b/fs/xfs/xfs_icache.c
-@@ -1149,7 +1149,7 @@ xfs_inode_free_eofblocks(
- 	}
- 	*lockflags |= XFS_IOLOCK_EXCL;
- 
--	if (xfs_can_free_eofblocks(ip, false))
-+	if (xfs_can_free_eofblocks(ip))
- 		return xfs_free_eofblocks(ip);
- 
- 	/* inode could be preallocated or append-only */
-diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
-index efb6b8f3561743..7aa73855fab65a 100644
---- a/fs/xfs/xfs_inode.c
-+++ b/fs/xfs/xfs_inode.c
-@@ -1469,7 +1469,7 @@ xfs_release(
- 	if (!xfs_ilock_nowait(ip, XFS_IOLOCK_EXCL))
- 		return 0;
- 
--	if (xfs_can_free_eofblocks(ip, false)) {
-+	if (xfs_can_free_eofblocks(ip)) {
- 		/*
- 		 * Check if the inode is being opened, written and closed
- 		 * frequently and we have delayed allocation blocks outstanding
-@@ -1685,15 +1685,13 @@ xfs_inode_needs_inactive(
- 
- 	/*
- 	 * This file isn't being freed, so check if there are post-eof blocks
--	 * to free.  @force is true because we are evicting an inode from the
--	 * cache.  Post-eof blocks must be freed, lest we end up with broken
--	 * free space accounting.
-+	 * to free.
- 	 *
- 	 * Note: don't bother with iolock here since lockdep complains about
- 	 * acquiring it in reclaim context. We have the only reference to the
- 	 * inode at this point anyways.
- 	 */
--	return xfs_can_free_eofblocks(ip, true);
-+	return xfs_can_free_eofblocks(ip);
- }
- 
- /*
-@@ -1741,15 +1739,11 @@ xfs_inactive(
- 
- 	if (VFS_I(ip)->i_nlink != 0) {
- 		/*
--		 * force is true because we are evicting an inode from the
--		 * cache. Post-eof blocks must be freed, lest we end up with
--		 * broken free space accounting.
--		 *
- 		 * Note: don't bother with iolock here since lockdep complains
- 		 * about acquiring it in reclaim context. We have the only
- 		 * reference to the inode at this point anyways.
- 		 */
--		if (xfs_can_free_eofblocks(ip, true))
-+		if (xfs_can_free_eofblocks(ip))
- 			error = xfs_free_eofblocks(ip);
- 
- 		goto out;
-@@ -2329,11 +2323,26 @@ xfs_ifree_cluster(
- 		 * This buffer may not have been correctly initialised as we
- 		 * didn't read it from disk. That's not important because we are
- 		 * only using to mark the buffer as stale in the log, and to
--		 * attach stale cached inodes on it. That means it will never be
--		 * dispatched for IO. If it is, we want to know about it, and we
--		 * want it to fail. We can acheive this by adding a write
--		 * verifier to the buffer.
-+		 * attach stale cached inodes on it.
-+		 *
-+		 * For the inode that triggered the cluster freeing, this
-+		 * attachment may occur in xfs_inode_item_precommit() after we
-+		 * have marked this buffer stale.  If this buffer was not in
-+		 * memory before xfs_ifree_cluster() started, it will not be
-+		 * marked XBF_DONE and this will cause problems later in
-+		 * xfs_inode_item_precommit() when we trip over a (stale, !done)
-+		 * buffer to attached to the transaction.
-+		 *
-+		 * Hence we have to mark the buffer as XFS_DONE here. This is
-+		 * safe because we are also marking the buffer as XBF_STALE and
-+		 * XFS_BLI_STALE. That means it will never be dispatched for
-+		 * IO and it won't be unlocked until the cluster freeing has
-+		 * been committed to the journal and the buffer unpinned. If it
-+		 * is written, we want to know about it, and we want it to
-+		 * fail. We can acheive this by adding a write verifier to the
-+		 * buffer.
- 		 */
-+		bp->b_flags |= XBF_DONE;
- 		bp->b_ops = &xfs_inode_buf_ops;
- 
- 		/*
-diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
-index 055cdec2e9ad64..9ce2f48b4ebc01 100644
---- a/fs/xfs/xfs_iomap.c
-+++ b/fs/xfs/xfs_iomap.c
-@@ -317,14 +317,6 @@ xfs_iomap_write_direct(
- 	if (error)
- 		goto out_unlock;
- 
--	/*
--	 * Copy any maps to caller's array and return any error.
--	 */
--	if (nimaps == 0) {
--		error = -ENOSPC;
--		goto out_unlock;
--	}
--
- 	if (unlikely(!xfs_valid_startblock(ip, imap->br_startblock)))
- 		error = xfs_alert_fsblock_zero(ip, imap);
- 
-@@ -1013,6 +1005,24 @@ xfs_buffered_write_iomap_begin(
- 		goto out_unlock;
- 	}
- 
-+	/*
-+	 * For zeroing, trim a delalloc extent that extends beyond the EOF
-+	 * block.  If it starts beyond the EOF block, convert it to an
-+	 * unwritten extent.
-+	 */
-+	if ((flags & IOMAP_ZERO) && imap.br_startoff <= offset_fsb &&
-+	    isnullstartblock(imap.br_startblock)) {
-+		xfs_fileoff_t eof_fsb = XFS_B_TO_FSB(mp, XFS_ISIZE(ip));
-+
-+		if (offset_fsb >= eof_fsb)
-+			goto convert_delay;
-+		if (end_fsb > eof_fsb) {
-+			end_fsb = eof_fsb;
-+			xfs_trim_extent(&imap, offset_fsb,
-+					end_fsb - offset_fsb);
-+		}
-+	}
-+
- 	/*
- 	 * Search the COW fork extent list even if we did not find a data fork
- 	 * extent.  This serves two purposes: first this implements the
-@@ -1117,47 +1127,48 @@ xfs_buffered_write_iomap_begin(
- 		}
- 	}
- 
--retry:
--	error = xfs_bmapi_reserve_delalloc(ip, allocfork, offset_fsb,
--			end_fsb - offset_fsb, prealloc_blocks,
--			allocfork == XFS_DATA_FORK ? &imap : &cmap,
--			allocfork == XFS_DATA_FORK ? &icur : &ccur,
--			allocfork == XFS_DATA_FORK ? eof : cow_eof);
--	switch (error) {
--	case 0:
--		break;
--	case -ENOSPC:
--	case -EDQUOT:
--		/* retry without any preallocation */
--		trace_xfs_delalloc_enospc(ip, offset, count);
--		if (prealloc_blocks) {
--			prealloc_blocks = 0;
--			goto retry;
--		}
--		fallthrough;
--	default:
--		goto out_unlock;
--	}
--
- 	if (allocfork == XFS_COW_FORK) {
-+		error = xfs_bmapi_reserve_delalloc(ip, allocfork, offset_fsb,
-+				end_fsb - offset_fsb, prealloc_blocks, &cmap,
-+				&ccur, cow_eof);
-+		if (error)
-+			goto out_unlock;
-+
- 		trace_xfs_iomap_alloc(ip, offset, count, allocfork, &cmap);
- 		goto found_cow;
- 	}
- 
-+	error = xfs_bmapi_reserve_delalloc(ip, allocfork, offset_fsb,
-+			end_fsb - offset_fsb, prealloc_blocks, &imap, &icur,
-+			eof);
-+	if (error)
-+		goto out_unlock;
-+
- 	/*
- 	 * Flag newly allocated delalloc blocks with IOMAP_F_NEW so we punch
- 	 * them out if the write happens to fail.
- 	 */
- 	seq = xfs_iomap_inode_sequence(ip, IOMAP_F_NEW);
--	xfs_iunlock(ip, XFS_ILOCK_EXCL);
-+	xfs_iunlock(ip, lockmode);
- 	trace_xfs_iomap_alloc(ip, offset, count, allocfork, &imap);
- 	return xfs_bmbt_to_iomap(ip, iomap, &imap, flags, IOMAP_F_NEW, seq);
- 
- found_imap:
- 	seq = xfs_iomap_inode_sequence(ip, 0);
--	xfs_iunlock(ip, XFS_ILOCK_EXCL);
-+	xfs_iunlock(ip, lockmode);
- 	return xfs_bmbt_to_iomap(ip, iomap, &imap, flags, 0, seq);
- 
-+convert_delay:
-+	xfs_iunlock(ip, lockmode);
-+	truncate_pagecache(inode, offset);
-+	error = xfs_bmapi_convert_delalloc(ip, XFS_DATA_FORK, offset,
-+					   iomap, NULL);
-+	if (error)
-+		return error;
-+
-+	trace_xfs_iomap_alloc(ip, offset, count, XFS_DATA_FORK, &imap);
-+	return 0;
-+
- found_cow:
- 	seq = xfs_iomap_inode_sequence(ip, 0);
- 	if (imap.br_startoff <= offset_fsb) {
-@@ -1165,17 +1176,17 @@ xfs_buffered_write_iomap_begin(
- 		if (error)
- 			goto out_unlock;
- 		seq = xfs_iomap_inode_sequence(ip, IOMAP_F_SHARED);
--		xfs_iunlock(ip, XFS_ILOCK_EXCL);
-+		xfs_iunlock(ip, lockmode);
- 		return xfs_bmbt_to_iomap(ip, iomap, &cmap, flags,
- 					 IOMAP_F_SHARED, seq);
- 	}
- 
- 	xfs_trim_extent(&cmap, offset_fsb, imap.br_startoff - offset_fsb);
--	xfs_iunlock(ip, XFS_ILOCK_EXCL);
-+	xfs_iunlock(ip, lockmode);
- 	return xfs_bmbt_to_iomap(ip, iomap, &cmap, flags, 0, seq);
- 
- out_unlock:
--	xfs_iunlock(ip, XFS_ILOCK_EXCL);
-+	xfs_iunlock(ip, lockmode);
- 	return error;
- }
- 
-diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
-index e5b62dc2846644..3431d0d8b6f3a1 100644
---- a/fs/xfs/xfs_reflink.c
-+++ b/fs/xfs/xfs_reflink.c
-@@ -429,13 +429,6 @@ xfs_reflink_fill_cow_hole(
- 	if (error)
- 		return error;
- 
--	/*
--	 * Allocation succeeded but the requested range was not even partially
--	 * satisfied?  Bail out!
--	 */
--	if (nimaps == 0)
--		return -ENOSPC;
--
- convert:
- 	return xfs_reflink_convert_unwritten(ip, imap, cmap, convert_now);
- 
-@@ -498,13 +491,6 @@ xfs_reflink_fill_delalloc(
- 		error = xfs_trans_commit(tp);
- 		if (error)
- 			return error;
--
--		/*
--		 * Allocation succeeded but the requested range was not even
--		 * partially satisfied?  Bail out!
--		 */
--		if (nimaps == 0)
--			return -ENOSPC;
- 	} while (cmap->br_startoff + cmap->br_blockcount <= imap->br_startoff);
- 
- 	return xfs_reflink_convert_unwritten(ip, imap, cmap, convert_now);
-@@ -730,12 +716,6 @@ xfs_reflink_end_cow_extent(
- 	int			nmaps;
- 	int			error;
- 
--	/* No COW extents?  That's easy! */
--	if (ifp->if_bytes == 0) {
--		*offset_fsb = end_fsb;
--		return 0;
--	}
--
- 	resblks = XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK);
- 	error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, resblks, 0,
- 			XFS_TRANS_RESERVE, &tp);
-diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
-index 4bec890d93d2c5..608db1ab88a485 100644
---- a/fs/xfs/xfs_rtalloc.c
-+++ b/fs/xfs/xfs_rtalloc.c
-@@ -840,8 +840,6 @@ xfs_growfs_rt_alloc(
- 		nmap = 1;
- 		error = xfs_bmapi_write(tp, ip, oblocks, nblocks - oblocks,
- 					XFS_BMAPI_METADATA, 0, &map, &nmap);
--		if (!error && nmap < 1)
--			error = -ENOSPC;
- 		if (error)
- 			goto out_trans_cancel;
- 		/*
-diff --git a/include/linux/fsl/enetc_mdio.h b/include/linux/fsl/enetc_mdio.h
-index df25fffdc0ae71..623ccfcbf39c35 100644
---- a/include/linux/fsl/enetc_mdio.h
-+++ b/include/linux/fsl/enetc_mdio.h
-@@ -59,7 +59,8 @@ static inline int enetc_mdio_read_c45(struct mii_bus *bus, int phy_id,
- static inline int enetc_mdio_write_c45(struct mii_bus *bus, int phy_id,
- 				       int devad, int regnum, u16 value)
- { return -EINVAL; }
--struct enetc_hw *enetc_hw_alloc(struct device *dev, void __iomem *port_regs)
-+static inline struct enetc_hw *enetc_hw_alloc(struct device *dev,
-+					      void __iomem *port_regs)
- { return ERR_PTR(-EINVAL); }
- 
- #endif
-diff --git a/include/linux/irqchip/arm-gic-v4.h b/include/linux/irqchip/arm-gic-v4.h
-index 2c63375bbd43f4..bf9e0640288d1d 100644
---- a/include/linux/irqchip/arm-gic-v4.h
-+++ b/include/linux/irqchip/arm-gic-v4.h
-@@ -58,10 +58,12 @@ struct its_vpe {
- 				bool	enabled;
- 				bool	group;
- 			}			sgi_config[16];
--			atomic_t vmapp_count;
- 		};
- 	};
- 
-+	/* Track the VPE being mapped */
-+	atomic_t vmapp_count;
-+
- 	/*
- 	 * Ensures mutual exclusion between affinity setting of the
- 	 * vPE and vLPI operations using vpe->col_idx.
-diff --git a/include/uapi/linux/ublk_cmd.h b/include/uapi/linux/ublk_cmd.h
-index b9cfc5c9626823..3830b428ecf19d 100644
---- a/include/uapi/linux/ublk_cmd.h
-+++ b/include/uapi/linux/ublk_cmd.h
-@@ -173,7 +173,13 @@
- /* use ioctl encoding for uring command */
- #define UBLK_F_CMD_IOCTL_ENCODE	(1UL << 6)
- 
--/* Copy between request and user buffer by pread()/pwrite() */
-+/*
-+ *  Copy between request and user buffer by pread()/pwrite()
-+ *
-+ *  Not available for UBLK_F_UNPRIVILEGED_DEV, otherwise userspace may
-+ *  deceive us by not filling request buffer, then kernel uninitialized
-+ *  data may be leaked.
-+ */
- #define UBLK_F_USER_COPY	(1UL << 7)
- 
- /*
-diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h
-index 19ac1b2f1ea45d..8242820742eef3 100644
---- a/io_uring/io_uring.h
-+++ b/io_uring/io_uring.h
-@@ -262,7 +262,14 @@ static inline bool io_sqring_full(struct io_ring_ctx *ctx)
- {
- 	struct io_rings *r = ctx->rings;
- 
--	return READ_ONCE(r->sq.tail) - ctx->cached_sq_head == ctx->sq_entries;
-+	/*
-+	 * SQPOLL must use the actual sqring head, as using the cached_sq_head
-+	 * is race prone if the SQPOLL thread has grabbed entries but not yet
-+	 * committed them to the ring. For !SQPOLL, this doesn't matter, but
-+	 * since this helper is just used for SQPOLL sqring waits (or POLLOUT),
-+	 * just read the actual sqring head unconditionally.
-+	 */
-+	return READ_ONCE(r->sq.tail) - READ_ONCE(r->sq.head) == ctx->sq_entries;
- }
- 
- static inline unsigned int io_sqring_entries(struct io_ring_ctx *ctx)
-diff --git a/kernel/time/posix-clock.c b/kernel/time/posix-clock.c
-index 77c0c2370b6d1d..8127673bfc45e6 100644
---- a/kernel/time/posix-clock.c
-+++ b/kernel/time/posix-clock.c
-@@ -299,6 +299,9 @@ static int pc_clock_settime(clockid_t id, const struct timespec64 *ts)
- 		goto out;
- 	}
- 
-+	if (!timespec64_valid_strict(ts))
-+		return -EINVAL;
-+
- 	if (cd.clk->ops.clock_settime)
- 		err = cd.clk->ops.clock_settime(cd.clk, ts);
- 	else
-diff --git a/lib/maple_tree.c b/lib/maple_tree.c
-index 41ef91590761b1..4e05511c8d1eba 100644
---- a/lib/maple_tree.c
-+++ b/lib/maple_tree.c
-@@ -2228,6 +2228,8 @@ static inline struct maple_enode *mte_node_or_none(struct maple_enode *enode)
- 
- /*
-  * mas_wr_node_walk() - Find the correct offset for the index in the @mas.
-+ *                      If @mas->index cannot be found within the containing
-+ *                      node, we traverse to the last entry in the node.
-  * @wr_mas: The maple write state
-  *
-  * Uses mas_slot_locked() and does not need to worry about dead nodes.
-@@ -3643,7 +3645,7 @@ static bool mas_wr_walk(struct ma_wr_state *wr_mas)
- 	return true;
- }
- 
--static bool mas_wr_walk_index(struct ma_wr_state *wr_mas)
-+static void mas_wr_walk_index(struct ma_wr_state *wr_mas)
- {
- 	struct ma_state *mas = wr_mas->mas;
- 
-@@ -3652,11 +3654,9 @@ static bool mas_wr_walk_index(struct ma_wr_state *wr_mas)
- 		wr_mas->content = mas_slot_locked(mas, wr_mas->slots,
- 						  mas->offset);
- 		if (ma_is_leaf(wr_mas->type))
--			return true;
-+			return;
- 		mas_wr_walk_traverse(wr_mas);
--
- 	}
--	return true;
- }
- /*
-  * mas_extend_spanning_null() - Extend a store of a %NULL to include surrounding %NULLs.
-@@ -3892,8 +3892,8 @@ static inline int mas_wr_spanning_store(struct ma_wr_state *wr_mas)
- 	memset(&b_node, 0, sizeof(struct maple_big_node));
- 	/* Copy l_mas and store the value in b_node. */
- 	mas_store_b_node(&l_wr_mas, &b_node, l_wr_mas.node_end);
--	/* Copy r_mas into b_node. */
--	if (r_mas.offset <= r_wr_mas.node_end)
-+	/* Copy r_mas into b_node if there is anything to copy. */
-+	if (r_mas.max > r_mas.last)
- 		mas_mab_cp(&r_mas, r_mas.offset, r_wr_mas.node_end,
- 			   &b_node, b_node.b_end + 1);
- 	else
-diff --git a/mm/mremap.c b/mm/mremap.c
-index 382e81c33fc437..df71010baabe7e 100644
---- a/mm/mremap.c
-+++ b/mm/mremap.c
-@@ -238,6 +238,7 @@ static bool move_normal_pmd(struct vm_area_struct *vma, unsigned long old_addr,
- {
- 	spinlock_t *old_ptl, *new_ptl;
- 	struct mm_struct *mm = vma->vm_mm;
-+	bool res = false;
- 	pmd_t pmd;
- 
- 	if (!arch_supports_page_table_move())
-@@ -277,19 +278,25 @@ static bool move_normal_pmd(struct vm_area_struct *vma, unsigned long old_addr,
- 	if (new_ptl != old_ptl)
- 		spin_lock_nested(new_ptl, SINGLE_DEPTH_NESTING);
- 
--	/* Clear the pmd */
- 	pmd = *old_pmd;
-+
-+	/* Racing with collapse? */
-+	if (unlikely(!pmd_present(pmd) || pmd_leaf(pmd)))
-+		goto out_unlock;
-+	/* Clear the pmd */
- 	pmd_clear(old_pmd);
-+	res = true;
- 
- 	VM_BUG_ON(!pmd_none(*new_pmd));
- 
- 	pmd_populate(mm, new_pmd, pmd_pgtable(pmd));
- 	flush_tlb_range(vma, old_addr, old_addr + PMD_SIZE);
-+out_unlock:
- 	if (new_ptl != old_ptl)
- 		spin_unlock(new_ptl);
- 	spin_unlock(old_ptl);
- 
--	return true;
-+	return res;
- }
- #else
- static inline bool move_normal_pmd(struct vm_area_struct *vma,
-diff --git a/mm/swapfile.c b/mm/swapfile.c
-index eada1351753e34..c856d6bb2daf3c 100644
---- a/mm/swapfile.c
-+++ b/mm/swapfile.c
-@@ -2003,7 +2003,7 @@ static int unuse_mm(struct mm_struct *mm, unsigned int type)
- 
- 	mmap_read_lock(mm);
- 	for_each_vma(vmi, vma) {
--		if (vma->anon_vma) {
-+		if (vma->anon_vma && !is_vm_hugetlb_page(vma)) {
- 			ret = unuse_vma(vma, type);
- 			if (ret)
- 				break;
-diff --git a/mm/vmscan.c b/mm/vmscan.c
-index 81533bed0b4629..3c91b86d59e935 100644
---- a/mm/vmscan.c
-+++ b/mm/vmscan.c
-@@ -5603,8 +5603,8 @@ static void lru_gen_shrink_node(struct pglist_data *pgdat, struct scan_control *
- 
- 	blk_finish_plug(&plug);
- done:
--	/* kswapd should never fail */
--	pgdat->kswapd_failures = 0;
-+	if (sc->nr_reclaimed > reclaimed)
-+		pgdat->kswapd_failures = 0;
- }
- 
- /******************************************************************************
-diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
-index 67604ccec2f427..e39fba5565c5d4 100644
---- a/net/bluetooth/af_bluetooth.c
-+++ b/net/bluetooth/af_bluetooth.c
-@@ -825,11 +825,14 @@ static int __init bt_init(void)
- 	bt_sysfs_cleanup();
- cleanup_led:
- 	bt_leds_cleanup();
-+	debugfs_remove_recursive(bt_debugfs);
- 	return err;
- }
- 
- static void __exit bt_exit(void)
- {
-+	iso_exit();
-+
- 	mgmt_exit();
- 
- 	sco_exit();
-diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
-index c46d123c30e14a..9b365fb44fac6d 100644
---- a/net/bluetooth/iso.c
-+++ b/net/bluetooth/iso.c
-@@ -2112,13 +2112,9 @@ int iso_init(void)
- 
- 	hci_register_cb(&iso_cb);
- 
--	if (IS_ERR_OR_NULL(bt_debugfs))
--		return 0;
--
--	if (!iso_debugfs) {
-+	if (!IS_ERR_OR_NULL(bt_debugfs))
- 		iso_debugfs = debugfs_create_file("iso", 0444, bt_debugfs,
- 						  NULL, &iso_debugfs_fops);
--	}
- 
- 	iso_inited = true;
- 
-diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
-index 15c49d559db536..328640d9b60762 100644
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -2314,9 +2314,7 @@ static bool tcp_can_coalesce_send_queue_head(struct sock *sk, int len)
- 		if (len <= skb->len)
- 			break;
- 
--		if (unlikely(TCP_SKB_CB(skb)->eor) ||
--		    tcp_has_tx_tstamp(skb) ||
--		    !skb_pure_zcopy_same(skb, next))
-+		if (tcp_has_tx_tstamp(skb) || !tcp_skb_can_collapse(skb, next))
- 			return false;
- 
- 		len -= skb->len;
-diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c
-index 79f2278434b950..3dc49c3169f20e 100644
---- a/net/mptcp/mib.c
-+++ b/net/mptcp/mib.c
-@@ -15,6 +15,7 @@ static const struct snmp_mib mptcp_snmp_list[] = {
- 	SNMP_MIB_ITEM("MPCapableACKRX", MPTCP_MIB_MPCAPABLEPASSIVEACK),
- 	SNMP_MIB_ITEM("MPCapableFallbackACK", MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK),
- 	SNMP_MIB_ITEM("MPCapableFallbackSYNACK", MPTCP_MIB_MPCAPABLEACTIVEFALLBACK),
-+	SNMP_MIB_ITEM("MPCapableEndpAttempt", MPTCP_MIB_MPCAPABLEENDPATTEMPT),
- 	SNMP_MIB_ITEM("MPFallbackTokenInit", MPTCP_MIB_TOKENFALLBACKINIT),
- 	SNMP_MIB_ITEM("MPTCPRetrans", MPTCP_MIB_RETRANSSEGS),
- 	SNMP_MIB_ITEM("MPJoinNoTokenFound", MPTCP_MIB_JOINNOTOKEN),
-diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h
-index e6e570251d32a4..007d7a74947272 100644
---- a/net/mptcp/mib.h
-+++ b/net/mptcp/mib.h
-@@ -8,6 +8,7 @@ enum linux_mptcp_mib_field {
- 	MPTCP_MIB_MPCAPABLEPASSIVEACK,	/* Received third ACK with MP_CAPABLE */
- 	MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK,/* Server-side fallback during 3-way handshake */
- 	MPTCP_MIB_MPCAPABLEACTIVEFALLBACK, /* Client-side fallback during 3-way handshake */
-+	MPTCP_MIB_MPCAPABLEENDPATTEMPT,	/* Prohibited MPC to port-based endp */
- 	MPTCP_MIB_TOKENFALLBACKINIT,	/* Could not init/allocate token */
- 	MPTCP_MIB_RETRANSSEGS,		/* Segments retransmitted at the MPTCP-level */
- 	MPTCP_MIB_JOINNOTOKEN,		/* Received MP_JOIN but the token was not found */
-diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
-index 131af6be4b678a..d8c47ca86de4fb 100644
---- a/net/mptcp/pm_netlink.c
-+++ b/net/mptcp/pm_netlink.c
-@@ -877,12 +877,12 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk,
- 				 i, rm_id, id, remote_id, msk->mpc_endpoint_id);
- 			spin_unlock_bh(&msk->pm.lock);
- 			mptcp_subflow_shutdown(sk, ssk, how);
-+			removed |= subflow->request_join;
- 
- 			/* the following takes care of updating the subflows counter */
- 			mptcp_close_ssk(sk, ssk, subflow);
- 			spin_lock_bh(&msk->pm.lock);
- 
--			removed |= subflow->request_join;
- 			if (rm_type == MPTCP_MIB_RMSUBFLOW)
- 				__MPTCP_INC_STATS(sock_net(sk), rm_type);
- 		}
-@@ -1125,6 +1125,7 @@ static int mptcp_pm_nl_create_listen_socket(struct sock *sk,
- 	 */
- 	inet_sk_state_store(newsk, TCP_LISTEN);
- 	lock_sock(ssk);
-+	WRITE_ONCE(mptcp_subflow_ctx(ssk)->pm_listener, true);
- 	err = __inet_listen_sk(ssk, backlog);
- 	if (!err)
- 		mptcp_event_pm_listener(ssk, MPTCP_EVENT_LISTENER_CREATED);
-diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
-index b9a4f6364b7859..89d1c299ff2b9f 100644
---- a/net/mptcp/protocol.h
-+++ b/net/mptcp/protocol.h
-@@ -504,6 +504,7 @@ struct mptcp_subflow_context {
- 		__unused : 9;
- 	enum mptcp_data_avail data_avail;
- 	bool	scheduled;
-+	bool	pm_listener;	    /* a listener managed by the kernel PM? */
- 	u32	remote_nonce;
- 	u64	thmac;
- 	u32	local_nonce;
-diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
-index 38f46502d76e04..282ecc8bf75e80 100644
---- a/net/mptcp/subflow.c
-+++ b/net/mptcp/subflow.c
-@@ -132,6 +132,13 @@ static void subflow_add_reset_reason(struct sk_buff *skb, u8 reason)
- 	}
- }
- 
-+static int subflow_reset_req_endp(struct request_sock *req, struct sk_buff *skb)
-+{
-+	SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_MPCAPABLEENDPATTEMPT);
-+	subflow_add_reset_reason(skb, MPTCP_RST_EPROHIBIT);
-+	return -EPERM;
-+}
-+
- /* Init mptcp request socket.
-  *
-  * Returns an error code if a JOIN has failed and a TCP reset
-@@ -163,6 +170,8 @@ static int subflow_check_req(struct request_sock *req,
- 	if (opt_mp_capable) {
- 		SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_MPCAPABLEPASSIVE);
- 
-+		if (unlikely(listener->pm_listener))
-+			return subflow_reset_req_endp(req, skb);
- 		if (opt_mp_join)
- 			return 0;
- 	} else if (opt_mp_join) {
-@@ -170,6 +179,8 @@ static int subflow_check_req(struct request_sock *req,
- 
- 		if (mp_opt.backup)
- 			SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINSYNBACKUPRX);
-+	} else if (unlikely(listener->pm_listener)) {
-+		return subflow_reset_req_endp(req, skb);
- 	}
- 
- 	if (opt_mp_capable && listener->request_mptcp) {
-diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
-index 8a3abd4babba6e..5833623f6ffafd 100644
---- a/sound/pci/hda/patch_conexant.c
-+++ b/sound/pci/hda/patch_conexant.c
-@@ -307,6 +307,7 @@ enum {
- 	CXT_FIXUP_HP_SPECTRE,
- 	CXT_FIXUP_HP_GATE_MIC,
- 	CXT_FIXUP_MUTE_LED_GPIO,
-+	CXT_FIXUP_HP_ELITEONE_OUT_DIS,
- 	CXT_FIXUP_HP_ZBOOK_MUTE_LED,
- 	CXT_FIXUP_HEADSET_MIC,
- 	CXT_FIXUP_HP_MIC_NO_PRESENCE,
-@@ -324,6 +325,19 @@ static void cxt_fixup_stereo_dmic(struct hda_codec *codec,
- 	spec->gen.inv_dmic_split = 1;
- }
- 
-+/* fix widget control pin settings */
-+static void cxt_fixup_update_pinctl(struct hda_codec *codec,
-+				   const struct hda_fixup *fix, int action)
-+{
-+	if (action == HDA_FIXUP_ACT_PROBE) {
-+		/* Unset OUT_EN for this Node pin, leaving only HP_EN.
-+		 * This is the value stored in the codec register after
-+		 * the correct initialization of the previous windows boot.
-+		 */
-+		snd_hda_set_pin_ctl_cache(codec, 0x1d, AC_PINCTL_HP_EN);
-+	}
-+}
-+
- static void cxt5066_increase_mic_boost(struct hda_codec *codec,
- 				   const struct hda_fixup *fix, int action)
- {
-@@ -975,6 +989,10 @@ static const struct hda_fixup cxt_fixups[] = {
- 		.type = HDA_FIXUP_FUNC,
- 		.v.func = cxt_fixup_mute_led_gpio,
- 	},
-+	[CXT_FIXUP_HP_ELITEONE_OUT_DIS] = {
-+		.type = HDA_FIXUP_FUNC,
-+		.v.func = cxt_fixup_update_pinctl,
-+	},
- 	[CXT_FIXUP_HP_ZBOOK_MUTE_LED] = {
- 		.type = HDA_FIXUP_FUNC,
- 		.v.func = cxt_fixup_hp_zbook_mute_led,
-@@ -1065,6 +1083,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
- 	SND_PCI_QUIRK(0x103c, 0x83b2, "HP EliteBook 840 G5", CXT_FIXUP_HP_DOCK),
- 	SND_PCI_QUIRK(0x103c, 0x83b3, "HP EliteBook 830 G5", CXT_FIXUP_HP_DOCK),
- 	SND_PCI_QUIRK(0x103c, 0x83d3, "HP ProBook 640 G4", CXT_FIXUP_HP_DOCK),
-+	SND_PCI_QUIRK(0x103c, 0x83e5, "HP EliteOne 1000 G2", CXT_FIXUP_HP_ELITEONE_OUT_DIS),
- 	SND_PCI_QUIRK(0x103c, 0x8402, "HP ProBook 645 G4", CXT_FIXUP_MUTE_LED_GPIO),
- 	SND_PCI_QUIRK(0x103c, 0x8427, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),
- 	SND_PCI_QUIRK(0x103c, 0x844f, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),
-diff --git a/tools/testing/selftests/hid/Makefile b/tools/testing/selftests/hid/Makefile
-index 87b6f5f83d7e0b..2e75fb30f3a5e0 100644
---- a/tools/testing/selftests/hid/Makefile
-+++ b/tools/testing/selftests/hid/Makefile
-@@ -18,6 +18,7 @@ TEST_PROGS += hid-usb_crash.sh
- TEST_PROGS += hid-wacom.sh
- 
- TEST_FILES := run-hid-tools-tests.sh
-+TEST_FILES += tests
- 
- CXX ?= $(CROSS_COMPILE)g++
- 
-diff --git a/tools/testing/selftests/mm/uffd-common.c b/tools/testing/selftests/mm/uffd-common.c
-index ba6777cdf42358..3bdae35e0add01 100644
---- a/tools/testing/selftests/mm/uffd-common.c
-+++ b/tools/testing/selftests/mm/uffd-common.c
-@@ -17,7 +17,7 @@ bool map_shared;
- bool test_uffdio_wp = true;
- unsigned long long *count_verify;
- uffd_test_ops_t *uffd_test_ops;
--atomic_bool ready_for_fork;
-+pthread_barrier_t ready_for_fork;
- 
- static int uffd_mem_fd_create(off_t mem_size, bool hugetlb)
- {
-@@ -508,7 +508,8 @@ void *uffd_poll_thread(void *arg)
- 	pollfd[1].fd = pipefd[cpu*2];
- 	pollfd[1].events = POLLIN;
- 
--	ready_for_fork = true;
-+	/* Ready for parent thread to fork */
-+	pthread_barrier_wait(&ready_for_fork);
- 
- 	for (;;) {
- 		ret = poll(pollfd, 2, -1);
-diff --git a/tools/testing/selftests/mm/uffd-common.h b/tools/testing/selftests/mm/uffd-common.h
-index 2832669bd9fd54..2d78ae0daf0650 100644
---- a/tools/testing/selftests/mm/uffd-common.h
-+++ b/tools/testing/selftests/mm/uffd-common.h
-@@ -33,7 +33,6 @@
- #include <inttypes.h>
- #include <stdint.h>
- #include <sys/random.h>
--#include <stdatomic.h>
- 
- #include "../kselftest.h"
- #include "vm_util.h"
-@@ -99,7 +98,7 @@ extern bool map_shared;
- extern bool test_uffdio_wp;
- extern unsigned long long *count_verify;
- extern volatile bool test_uffdio_copy_eexist;
--extern atomic_bool ready_for_fork;
-+extern pthread_barrier_t ready_for_fork;
- 
- extern uffd_test_ops_t anon_uffd_test_ops;
- extern uffd_test_ops_t shmem_uffd_test_ops;
-diff --git a/tools/testing/selftests/mm/uffd-unit-tests.c b/tools/testing/selftests/mm/uffd-unit-tests.c
-index 92d51768b7be15..42cdba544f81bd 100644
---- a/tools/testing/selftests/mm/uffd-unit-tests.c
-+++ b/tools/testing/selftests/mm/uffd-unit-tests.c
-@@ -237,6 +237,9 @@ static void *fork_event_consumer(void *data)
- 	fork_event_args *args = data;
- 	struct uffd_msg msg = { 0 };
- 
-+	/* Ready for parent thread to fork */
-+	pthread_barrier_wait(&ready_for_fork);
-+
- 	/* Read until a full msg received */
- 	while (uffd_read_msg(args->parent_uffd, &msg));
- 
-@@ -304,8 +307,12 @@ static int pagemap_test_fork(int uffd, bool with_event, bool test_pin)
- 
- 	/* Prepare a thread to resolve EVENT_FORK */
- 	if (with_event) {
-+		pthread_barrier_init(&ready_for_fork, NULL, 2);
- 		if (pthread_create(&thread, NULL, fork_event_consumer, &args))
- 			err("pthread_create()");
-+		/* Wait for child thread to start before forking */
-+		pthread_barrier_wait(&ready_for_fork);
-+		pthread_barrier_destroy(&ready_for_fork);
- 	}
- 
- 	child = fork();
-@@ -770,7 +777,7 @@ static void uffd_sigbus_test_common(bool wp)
- 	char c;
- 	struct uffd_args args = { 0 };
- 
--	ready_for_fork = false;
-+	pthread_barrier_init(&ready_for_fork, NULL, 2);
- 
- 	fcntl(uffd, F_SETFL, uffd_flags | O_NONBLOCK);
- 
-@@ -787,8 +794,9 @@ static void uffd_sigbus_test_common(bool wp)
- 	if (pthread_create(&uffd_mon, NULL, uffd_poll_thread, &args))
- 		err("uffd_poll_thread create");
- 
--	while (!ready_for_fork)
--		; /* Wait for the poll_thread to start executing before forking */
-+	/* Wait for child thread to start before forking */
-+	pthread_barrier_wait(&ready_for_fork);
-+	pthread_barrier_destroy(&ready_for_fork);
- 
- 	pid = fork();
- 	if (pid < 0)
-@@ -829,7 +837,7 @@ static void uffd_events_test_common(bool wp)
- 	char c;
- 	struct uffd_args args = { 0 };
- 
--	ready_for_fork = false;
-+	pthread_barrier_init(&ready_for_fork, NULL, 2);
- 
- 	fcntl(uffd, F_SETFL, uffd_flags | O_NONBLOCK);
- 	if (uffd_register(uffd, area_dst, nr_pages * page_size,
-@@ -840,8 +848,9 @@ static void uffd_events_test_common(bool wp)
- 	if (pthread_create(&uffd_mon, NULL, uffd_poll_thread, &args))
- 		err("uffd_poll_thread create");
- 
--	while (!ready_for_fork)
--		; /* Wait for the poll_thread to start executing before forking */
-+	/* Wait for child thread to start before forking */
-+	pthread_barrier_wait(&ready_for_fork);
-+	pthread_barrier_destroy(&ready_for_fork);
- 
- 	pid = fork();
- 	if (pid < 0)
-diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
-index 3c286fba8d5dc5..17ace5627ce365 100755
---- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
-+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
-@@ -23,6 +23,7 @@ tmpfile=""
- cout=""
- err=""
- capout=""
-+cappid=""
- ns1=""
- ns2=""
- ksft_skip=4
-@@ -30,11 +31,11 @@ iptables="iptables"
- ip6tables="ip6tables"
- timeout_poll=30
- timeout_test=$((timeout_poll * 2 + 1))
--capture=0
--checksum=0
-+capture=false
-+checksum=false
- ip_mptcp=0
- check_invert=0
--validate_checksum=0
-+validate_checksum=false
- init=0
- evts_ns1=""
- evts_ns2=""
-@@ -99,7 +100,7 @@ init_partial()
- 		ip netns exec $netns sysctl -q net.mptcp.pm_type=0 2>/dev/null || true
- 		ip netns exec $netns sysctl -q net.ipv4.conf.all.rp_filter=0
- 		ip netns exec $netns sysctl -q net.ipv4.conf.default.rp_filter=0
--		if [ $checksum -eq 1 ]; then
-+		if $checksum; then
- 			ip netns exec $netns sysctl -q net.mptcp.checksum_enabled=1
- 		fi
- 	done
-@@ -386,7 +387,7 @@ reset_with_checksum()
- 	ip netns exec $ns1 sysctl -q net.mptcp.checksum_enabled=$ns1_enable
- 	ip netns exec $ns2 sysctl -q net.mptcp.checksum_enabled=$ns2_enable
- 
--	validate_checksum=1
-+	validate_checksum=true
- }
- 
- reset_with_allow_join_id0()
-@@ -419,7 +420,7 @@ reset_with_allow_join_id0()
- setup_fail_rules()
- {
- 	check_invert=1
--	validate_checksum=1
-+	validate_checksum=true
- 	local i="$1"
- 	local ip="${2:-4}"
- 	local tables
-@@ -1006,40 +1007,62 @@ pm_nl_set_endpoint()
- 	fi
- }
- 
--do_transfer()
-+cond_start_capture()
- {
--	local listener_ns="$1"
--	local connector_ns="$2"
--	local cl_proto="$3"
--	local srv_proto="$4"
--	local connect_addr="$5"
--
--	local port=$((10000 + TEST_COUNT - 1))
--	local cappid
--	local FAILING_LINKS=${FAILING_LINKS:-""}
--	local fastclose=${fastclose:-""}
--	local speed=${speed:-"fast"}
-+	local ns="$1"
- 
--	:> "$cout"
--	:> "$sout"
- 	:> "$capout"
- 
--	if [ $capture -eq 1 ]; then
--		local capuser
--		if [ -z $SUDO_USER ] ; then
-+	if $capture; then
-+		local capuser capfile
-+		if [ -z $SUDO_USER ]; then
- 			capuser=""
- 		else
- 			capuser="-Z $SUDO_USER"
- 		fi
- 
--		capfile=$(printf "mp_join-%02u-%s.pcap" "$TEST_COUNT" "${listener_ns}")
-+		capfile=$(printf "mp_join-%02u-%s.pcap" "$TEST_COUNT" "$ns")
- 
- 		echo "Capturing traffic for test $TEST_COUNT into $capfile"
--		ip netns exec ${listener_ns} tcpdump -i any -s 65535 -B 32768 $capuser -w $capfile > "$capout" 2>&1 &
-+		ip netns exec "$ns" tcpdump -i any -s 65535 -B 32768 $capuser -w "$capfile" > "$capout" 2>&1 &
- 		cappid=$!
- 
- 		sleep 1
- 	fi
-+}
-+
-+cond_stop_capture()
-+{
-+	if $capture; then
-+		sleep 1
-+		kill $cappid
-+		cat "$capout"
-+	fi
-+}
-+
-+get_port()
-+{
-+	echo "$((10000 + TEST_COUNT - 1))"
-+}
-+
-+do_transfer()
-+{
-+	local listener_ns="$1"
-+	local connector_ns="$2"
-+	local cl_proto="$3"
-+	local srv_proto="$4"
-+	local connect_addr="$5"
-+	local port
-+
-+	local FAILING_LINKS=${FAILING_LINKS:-""}
-+	local fastclose=${fastclose:-""}
-+	local speed=${speed:-"fast"}
-+	port=$(get_port)
-+
-+	:> "$cout"
-+	:> "$sout"
-+
-+	cond_start_capture ${listener_ns}
- 
- 	NSTAT_HISTORY=/tmp/${listener_ns}.nstat ip netns exec ${listener_ns} \
- 		nstat -n
-@@ -1125,10 +1148,7 @@ do_transfer()
- 	wait $spid
- 	local rets=$?
- 
--	if [ $capture -eq 1 ]; then
--	    sleep 1
--	    kill $cappid
--	fi
-+	cond_stop_capture
- 
- 	NSTAT_HISTORY=/tmp/${listener_ns}.nstat ip netns exec ${listener_ns} \
- 		nstat | grep Tcp > /tmp/${listener_ns}.out
-@@ -1144,7 +1164,6 @@ do_transfer()
- 		ip netns exec ${connector_ns} ss -Menita 1>&2 -o "dport = :$port"
- 		cat /tmp/${connector_ns}.out
- 
--		cat "$capout"
- 		return 1
- 	fi
- 
-@@ -1161,13 +1180,7 @@ do_transfer()
- 	fi
- 	rets=$?
- 
--	if [ $retc -eq 0 ] && [ $rets -eq 0 ];then
--		cat "$capout"
--		return 0
--	fi
--
--	cat "$capout"
--	return 1
-+	[ $retc -eq 0 ] && [ $rets -eq 0 ]
- }
- 
- make_file()
-@@ -1514,7 +1527,7 @@ chk_join_nr()
- 	else
- 		print_ok
- 	fi
--	if [ $validate_checksum -eq 1 ]; then
-+	if $validate_checksum; then
- 		chk_csum_nr $csum_ns1 $csum_ns2
- 		chk_fail_nr $fail_nr $fail_nr
- 		chk_rst_nr $rst_nr $rst_nr
-@@ -2944,6 +2957,32 @@ verify_listener_events()
- 	fail_test "$e_type:$type $e_family:$family $e_saddr:$saddr $e_sport:$sport"
- }
- 
-+chk_mpc_endp_attempt()
-+{
-+	local retl=$1
-+	local attempts=$2
-+
-+	print_check "Connect"
-+
-+	if [ ${retl} = 124 ]; then
-+		fail_test "timeout on connect"
-+	elif [ ${retl} = 0 ]; then
-+		fail_test "unexpected successful connect"
-+	else
-+		print_ok
-+
-+		print_check "Attempts"
-+		count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPCapableEndpAttempt")
-+		if [ -z "$count" ]; then
-+			print_skip
-+		elif [ "$count" != "$attempts" ]; then
-+			fail_test "got ${count} MPC attempt[s] on port-based endpoint, expected ${attempts}"
-+		else
-+			print_ok
-+		fi
-+	fi
-+}
-+
- add_addr_ports_tests()
- {
- 	# signal address with port
-@@ -3034,6 +3073,22 @@ add_addr_ports_tests()
- 		chk_join_nr 2 2 2
- 		chk_add_nr 2 2 2
- 	fi
-+
-+	if reset "port-based signal endpoint must not accept mpc"; then
-+		local port retl count
-+		port=$(get_port)
-+
-+		cond_start_capture ${ns1}
-+		pm_nl_add_endpoint ${ns1} 10.0.2.1 flags signal port ${port}
-+		mptcp_lib_wait_local_port_listen ${ns1} ${port}
-+
-+		timeout 1 ip netns exec ${ns2} \
-+			./mptcp_connect -t ${timeout_poll} -p $port -s MPTCP 10.0.2.1 >/dev/null 2>&1
-+		retl=$?
-+		cond_stop_capture
-+
-+		chk_mpc_endp_attempt ${retl} 1
-+	fi
- }
- 
- syncookies_tests()
-@@ -3960,10 +4015,10 @@ while getopts "${all_tests_args}cCih" opt; do
- 			tests+=("${all_tests[${opt}]}")
- 			;;
- 		c)
--			capture=1
-+			capture=true
- 			;;
- 		C)
--			checksum=1
-+			checksum=true
- 			;;
- 		i)
- 			ip_mptcp=1
-diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
-index 869c8eda4bc34d..d98c89f31afe8a 100644
---- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
-+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
-@@ -8,17 +8,6 @@ readonly KSFT_SKIP=4
- # shellcheck disable=SC2155 # declare and assign separately
- readonly KSFT_TEST="${MPTCP_LIB_KSFT_TEST:-$(basename "${0}" .sh)}"
- 
--# These variables are used in some selftests, read-only
--declare -rx MPTCP_LIB_EVENT_ANNOUNCED=6         # MPTCP_EVENT_ANNOUNCED
--declare -rx MPTCP_LIB_EVENT_REMOVED=7           # MPTCP_EVENT_REMOVED
--declare -rx MPTCP_LIB_EVENT_SUB_ESTABLISHED=10  # MPTCP_EVENT_SUB_ESTABLISHED
--declare -rx MPTCP_LIB_EVENT_SUB_CLOSED=11       # MPTCP_EVENT_SUB_CLOSED
--declare -rx MPTCP_LIB_EVENT_LISTENER_CREATED=15 # MPTCP_EVENT_LISTENER_CREATED
--declare -rx MPTCP_LIB_EVENT_LISTENER_CLOSED=16  # MPTCP_EVENT_LISTENER_CLOSED
--
--declare -rx MPTCP_LIB_AF_INET=2
--declare -rx MPTCP_LIB_AF_INET6=10
--
- # These variables are used in some selftests, read-only
- declare -rx MPTCP_LIB_EVENT_CREATED=1           # MPTCP_EVENT_CREATED
- declare -rx MPTCP_LIB_EVENT_ESTABLISHED=2       # MPTCP_EVENT_ESTABLISHED
diff --git a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.58-59.patch b/patch/kernel/archive/odroidxu4-6.6/patch-6.6.58-59.patch
deleted file mode 100644
index aa89d7dfc4ba..000000000000
--- a/patch/kernel/archive/odroidxu4-6.6/patch-6.6.58-59.patch
+++ /dev/null
@@ -1,10051 +0,0 @@
-diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
-index 7735e08d35ba14..beef193aaaeba0 100644
---- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
-+++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
-@@ -102,21 +102,21 @@ properties:
-     default: 2
- 
-   interrupts:
--    anyOf:
--      - minItems: 1
--        items:
--          - description: TX interrupt
--          - description: RX interrupt
--      - items:
--          - description: common/combined interrupt
-+    minItems: 1
-+    maxItems: 2
- 
-   interrupt-names:
-     oneOf:
--      - minItems: 1
-+      - description: TX interrupt
-+        const: tx
-+      - description: RX interrupt
-+        const: rx
-+      - description: TX and RX interrupts
-         items:
-           - const: tx
-           - const: rx
--      - const: common
-+      - description: Common/combined interrupt
-+        const: common
- 
-   fck_parent:
-     $ref: /schemas/types.yaml#/definitions/string
-diff --git a/Makefile b/Makefile
-index f80e78c7cf2006..8a55af189f369a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- VERSION = 6
- PATCHLEVEL = 6
--SUBLEVEL = 58
-+SUBLEVEL = 59
- EXTRAVERSION =
- NAME = Pinguïn Aangedreven
- 
-diff --git a/arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts b/arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts
-index 72d26d130efaa4..85f54fa595aa8f 100644
---- a/arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts
-@@ -77,7 +77,7 @@ &gpio {
- };
- 
- &hdmi {
--	hpd-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
-+	hpd-gpios = <&expgpio 0 GPIO_ACTIVE_LOW>;
- 	power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
- 	status = "okay";
- };
-diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
-index 9a2d3723cd0fa9..11782860717fae 100644
---- a/arch/arm64/Makefile
-+++ b/arch/arm64/Makefile
-@@ -10,7 +10,7 @@
- #
- # Copyright (C) 1995-2001 by Russell King
- 
--LDFLAGS_vmlinux	:=--no-undefined -X
-+LDFLAGS_vmlinux	:=--no-undefined -X --pic-veneer
- 
- ifeq ($(CONFIG_RELOCATABLE), y)
- # Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour
-diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
-index 685cc436146a5a..18413d869cca1a 100644
---- a/arch/arm64/kvm/arm.c
-+++ b/arch/arm64/kvm/arm.c
-@@ -777,6 +777,9 @@ static int kvm_vcpu_suspend(struct kvm_vcpu *vcpu)
- static int check_vcpu_requests(struct kvm_vcpu *vcpu)
- {
- 	if (kvm_request_pending(vcpu)) {
-+		if (kvm_check_request(KVM_REQ_VM_DEAD, vcpu))
-+			return -EIO;
-+
- 		if (kvm_check_request(KVM_REQ_SLEEP, vcpu))
- 			kvm_vcpu_sleep(vcpu);
- 
-diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
-index b233a64df2956a..370a1a7bd369dc 100644
---- a/arch/arm64/kvm/sys_regs.c
-+++ b/arch/arm64/kvm/sys_regs.c
-@@ -1708,7 +1708,7 @@ static u64 reset_clidr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
- 	 * one cache line.
- 	 */
- 	if (kvm_has_mte(vcpu->kvm))
--		clidr |= 2 << CLIDR_TTYPE_SHIFT(loc);
-+		clidr |= 2ULL << CLIDR_TTYPE_SHIFT(loc);
- 
- 	__vcpu_sys_reg(vcpu, r->reg) = clidr;
- 
-diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c
-index a2b439ad387c80..b7306c588d9d34 100644
---- a/arch/arm64/kvm/vgic/vgic-init.c
-+++ b/arch/arm64/kvm/vgic/vgic-init.c
-@@ -494,10 +494,10 @@ int kvm_vgic_map_resources(struct kvm *kvm)
- out:
- 	mutex_unlock(&kvm->arch.config_lock);
- out_slots:
--	mutex_unlock(&kvm->slots_lock);
--
- 	if (ret)
--		kvm_vgic_destroy(kvm);
-+		kvm_vm_dead(kvm);
-+
-+	mutex_unlock(&kvm->slots_lock);
- 
- 	return ret;
- }
-diff --git a/arch/loongarch/include/asm/bootinfo.h b/arch/loongarch/include/asm/bootinfo.h
-index c60796869b2b80..d2317fa6a766d6 100644
---- a/arch/loongarch/include/asm/bootinfo.h
-+++ b/arch/loongarch/include/asm/bootinfo.h
-@@ -24,6 +24,10 @@ struct loongson_board_info {
- 	const char *board_vendor;
- };
- 
-+/*
-+ * The "core" of cores_per_node and cores_per_package stands for a
-+ * logical core, which means in a SMT system it stands for a thread.
-+ */
- struct loongson_system_configuration {
- 	int nr_cpus;
- 	int nr_nodes;
-diff --git a/arch/loongarch/include/asm/kasan.h b/arch/loongarch/include/asm/kasan.h
-index cd6084f4e153fe..c6bce5fbff57b0 100644
---- a/arch/loongarch/include/asm/kasan.h
-+++ b/arch/loongarch/include/asm/kasan.h
-@@ -16,7 +16,7 @@
- #define XRANGE_SHIFT (48)
- 
- /* Valid address length */
--#define XRANGE_SHADOW_SHIFT	(PGDIR_SHIFT + PAGE_SHIFT - 3)
-+#define XRANGE_SHADOW_SHIFT	min(cpu_vabits, VA_BITS)
- /* Used for taking out the valid address */
- #define XRANGE_SHADOW_MASK	GENMASK_ULL(XRANGE_SHADOW_SHIFT - 1, 0)
- /* One segment whole address space size */
-diff --git a/arch/loongarch/kernel/process.c b/arch/loongarch/kernel/process.c
-index f2ff8b5d591e4f..6e58f65455c7ca 100644
---- a/arch/loongarch/kernel/process.c
-+++ b/arch/loongarch/kernel/process.c
-@@ -293,13 +293,15 @@ unsigned long stack_top(void)
- {
- 	unsigned long top = TASK_SIZE & PAGE_MASK;
- 
--	/* Space for the VDSO & data page */
--	top -= PAGE_ALIGN(current->thread.vdso->size);
--	top -= VVAR_SIZE;
--
--	/* Space to randomize the VDSO base */
--	if (current->flags & PF_RANDOMIZE)
--		top -= VDSO_RANDOMIZE_SIZE;
-+	if (current->thread.vdso) {
-+		/* Space for the VDSO & data page */
-+		top -= PAGE_ALIGN(current->thread.vdso->size);
-+		top -= VVAR_SIZE;
-+
-+		/* Space to randomize the VDSO base */
-+		if (current->flags & PF_RANDOMIZE)
-+			top -= VDSO_RANDOMIZE_SIZE;
-+	}
- 
- 	return top;
- }
-diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c
-index 6748d7f3f22198..065f2db57c0992 100644
---- a/arch/loongarch/kernel/setup.c
-+++ b/arch/loongarch/kernel/setup.c
-@@ -55,6 +55,7 @@
- #define SMBIOS_FREQHIGH_OFFSET		0x17
- #define SMBIOS_FREQLOW_MASK		0xFF
- #define SMBIOS_CORE_PACKAGE_OFFSET	0x23
-+#define SMBIOS_THREAD_PACKAGE_OFFSET	0x25
- #define LOONGSON_EFI_ENABLE		(1 << 3)
- 
- #ifdef CONFIG_EFI
-@@ -129,7 +130,7 @@ static void __init parse_cpu_table(const struct dmi_header *dm)
- 	cpu_clock_freq = freq_temp * 1000000;
- 
- 	loongson_sysconf.cpuname = (void *)dmi_string_parse(dm, dmi_data[16]);
--	loongson_sysconf.cores_per_package = *(dmi_data + SMBIOS_CORE_PACKAGE_OFFSET);
-+	loongson_sysconf.cores_per_package = *(dmi_data + SMBIOS_THREAD_PACKAGE_OFFSET);
- 
- 	pr_info("CpuClock = %llu\n", cpu_clock_freq);
- }
-diff --git a/arch/loongarch/kernel/traps.c b/arch/loongarch/kernel/traps.c
-index aebfc3733a7607..d59052c03d9b7e 100644
---- a/arch/loongarch/kernel/traps.c
-+++ b/arch/loongarch/kernel/traps.c
-@@ -529,6 +529,9 @@ asmlinkage void noinstr do_ale(struct pt_regs *regs)
- #else
- 	unsigned int *pc;
- 
-+	if (regs->csr_prmd & CSR_PRMD_PIE)
-+		local_irq_enable();
-+
- 	perf_sw_event(PERF_COUNT_SW_ALIGNMENT_FAULTS, 1, regs, regs->csr_badvaddr);
- 
- 	/*
-@@ -553,6 +556,8 @@ asmlinkage void noinstr do_ale(struct pt_regs *regs)
- 	die_if_kernel("Kernel ale access", regs);
- 	force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)regs->csr_badvaddr);
- out:
-+	if (regs->csr_prmd & CSR_PRMD_PIE)
-+		local_irq_disable();
- #endif
- 	irqentry_exit(regs, state);
- }
-diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
-index 2f041b5cea970e..26eeb397363193 100644
---- a/arch/riscv/net/bpf_jit_comp64.c
-+++ b/arch/riscv/net/bpf_jit_comp64.c
-@@ -555,8 +555,8 @@ static void emit_atomic(u8 rd, u8 rs, s16 off, s32 imm, bool is64,
- 		     rv_lr_w(r0, 0, rd, 0, 0), ctx);
- 		jmp_offset = ninsns_rvoff(8);
- 		emit(rv_bne(RV_REG_T2, r0, jmp_offset >> 1), ctx);
--		emit(is64 ? rv_sc_d(RV_REG_T3, rs, rd, 0, 0) :
--		     rv_sc_w(RV_REG_T3, rs, rd, 0, 0), ctx);
-+		emit(is64 ? rv_sc_d(RV_REG_T3, rs, rd, 0, 1) :
-+		     rv_sc_w(RV_REG_T3, rs, rd, 0, 1), ctx);
- 		jmp_offset = ninsns_rvoff(-6);
- 		emit(rv_bne(RV_REG_T3, 0, jmp_offset >> 1), ctx);
- 		emit(rv_fence(0x3, 0x3), ctx);
-diff --git a/arch/s390/include/asm/perf_event.h b/arch/s390/include/asm/perf_event.h
-index 9917e2717b2b42..66aff768f8151d 100644
---- a/arch/s390/include/asm/perf_event.h
-+++ b/arch/s390/include/asm/perf_event.h
-@@ -73,6 +73,7 @@ struct perf_sf_sde_regs {
- #define SAMPLE_FREQ_MODE(hwc)	(SAMPL_FLAGS(hwc) & PERF_CPUM_SF_FREQ_MODE)
- 
- #define perf_arch_fetch_caller_regs(regs, __ip) do {			\
-+	(regs)->psw.mask = 0;						\
- 	(regs)->psw.addr = (__ip);					\
- 	(regs)->gprs[15] = (unsigned long)__builtin_frame_address(0) -	\
- 		offsetof(struct stack_frame, back_chain);		\
-diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c
-index b9324ca2eb9403..b3961f1016ea0b 100644
---- a/arch/s390/pci/pci_event.c
-+++ b/arch/s390/pci/pci_event.c
-@@ -272,18 +272,19 @@ static void __zpci_event_error(struct zpci_ccdf_err *ccdf)
- 		goto no_pdev;
- 
- 	switch (ccdf->pec) {
--	case 0x003a: /* Service Action or Error Recovery Successful */
-+	case 0x002a: /* Error event concerns FMB */
-+	case 0x002b:
-+	case 0x002c:
-+		break;
-+	case 0x0040: /* Service Action or Error Recovery Failed */
-+	case 0x003b:
-+		zpci_event_io_failure(pdev, pci_channel_io_perm_failure);
-+		break;
-+	default: /* PCI function left in the error state attempt to recover */
- 		ers_res = zpci_event_attempt_error_recovery(pdev);
- 		if (ers_res != PCI_ERS_RESULT_RECOVERED)
- 			zpci_event_io_failure(pdev, pci_channel_io_perm_failure);
- 		break;
--	default:
--		/*
--		 * Mark as frozen not permanently failed because the device
--		 * could be subsequently recovered by the platform.
--		 */
--		zpci_event_io_failure(pdev, pci_channel_io_frozen);
--		break;
- 	}
- 	pci_dev_put(pdev);
- no_pdev:
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 82d12c93feabe6..05c82fd5d0f60b 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -2217,6 +2217,7 @@ config RANDOMIZE_MEMORY_PHYSICAL_PADDING
- config ADDRESS_MASKING
- 	bool "Linear Address Masking support"
- 	depends on X86_64
-+	depends on COMPILE_TEST || !CPU_MITIGATIONS # wait for LASS
- 	help
- 	  Linear Address Masking (LAM) modifies the checking that is applied
- 	  to 64-bit linear addresses, allowing software to use of the
-diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
-index b44c487727d456..a701e7921ea5c7 100644
---- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
-+++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
-@@ -27,10 +27,10 @@
-  * hardware. The allocated bandwidth percentage is rounded to the next
-  * control step available on the hardware.
-  */
--static bool bw_validate(char *buf, unsigned long *data, struct rdt_resource *r)
-+static bool bw_validate(char *buf, u32 *data, struct rdt_resource *r)
- {
--	unsigned long bw;
- 	int ret;
-+	u32 bw;
- 
- 	/*
- 	 * Only linear delay values is supported for current Intel SKUs.
-@@ -40,16 +40,21 @@ static bool bw_validate(char *buf, unsigned long *data, struct rdt_resource *r)
- 		return false;
- 	}
- 
--	ret = kstrtoul(buf, 10, &bw);
-+	ret = kstrtou32(buf, 10, &bw);
- 	if (ret) {
--		rdt_last_cmd_printf("Non-decimal digit in MB value %s\n", buf);
-+		rdt_last_cmd_printf("Invalid MB value %s\n", buf);
- 		return false;
- 	}
- 
--	if ((bw < r->membw.min_bw || bw > r->default_ctrl) &&
--	    !is_mba_sc(r)) {
--		rdt_last_cmd_printf("MB value %ld out of range [%d,%d]\n", bw,
--				    r->membw.min_bw, r->default_ctrl);
-+	/* Nothing else to do if software controller is enabled. */
-+	if (is_mba_sc(r)) {
-+		*data = bw;
-+		return true;
-+	}
-+
-+	if (bw < r->membw.min_bw || bw > r->default_ctrl) {
-+		rdt_last_cmd_printf("MB value %u out of range [%d,%d]\n",
-+				    bw, r->membw.min_bw, r->default_ctrl);
- 		return false;
- 	}
- 
-@@ -63,7 +68,7 @@ int parse_bw(struct rdt_parse_data *data, struct resctrl_schema *s,
- 	struct resctrl_staged_config *cfg;
- 	u32 closid = data->rdtgrp->closid;
- 	struct rdt_resource *r = s->res;
--	unsigned long bw_val;
-+	u32 bw_val;
- 
- 	cfg = &d->staged_config[s->conf_type];
- 	if (cfg->have_new_ctrl) {
-diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
-index 60891b9ce25f61..acf22bd99efcd8 100644
---- a/arch/x86/kvm/svm/nested.c
-+++ b/arch/x86/kvm/svm/nested.c
-@@ -63,8 +63,12 @@ static u64 nested_svm_get_tdp_pdptr(struct kvm_vcpu *vcpu, int index)
- 	u64 pdpte;
- 	int ret;
- 
-+	/*
-+	 * Note, nCR3 is "assumed" to be 32-byte aligned, i.e. the CPU ignores
-+	 * nCR3[4:0] when loading PDPTEs from memory.
-+	 */
- 	ret = kvm_vcpu_read_guest_page(vcpu, gpa_to_gfn(cr3), &pdpte,
--				       offset_in_page(cr3) + index * 8, 8);
-+				       (cr3 & GENMASK(11, 5)) + index * 8, 8);
- 	if (ret)
- 		return 0;
- 	return pdpte;
-diff --git a/drivers/accel/qaic/qaic_control.c b/drivers/accel/qaic/qaic_control.c
-index 388abd40024ba4..f3db3fa91dd52e 100644
---- a/drivers/accel/qaic/qaic_control.c
-+++ b/drivers/accel/qaic/qaic_control.c
-@@ -496,7 +496,7 @@ static int encode_addr_size_pairs(struct dma_xfer *xfer, struct wrapper_list *wr
- 	nents = sgt->nents;
- 	nents_dma = nents;
- 	*size = QAIC_MANAGE_EXT_MSG_LENGTH - msg_hdr_len - sizeof(**out_trans);
--	for_each_sgtable_sg(sgt, sg, i) {
-+	for_each_sgtable_dma_sg(sgt, sg, i) {
- 		*size -= sizeof(*asp);
- 		/* Save 1K for possible follow-up transactions. */
- 		if (*size < SZ_1K) {
-diff --git a/drivers/accel/qaic/qaic_data.c b/drivers/accel/qaic/qaic_data.c
-index ed1a5af434f246..d2f8c70a77a5b4 100644
---- a/drivers/accel/qaic/qaic_data.c
-+++ b/drivers/accel/qaic/qaic_data.c
-@@ -177,7 +177,7 @@ static int clone_range_of_sgt_for_slice(struct qaic_device *qdev, struct sg_tabl
- 	nents = 0;
- 
- 	size = size ? size : PAGE_SIZE;
--	for (sg = sgt_in->sgl; sg; sg = sg_next(sg)) {
-+	for_each_sgtable_dma_sg(sgt_in, sg, j) {
- 		len = sg_dma_len(sg);
- 
- 		if (!len)
-@@ -214,7 +214,7 @@ static int clone_range_of_sgt_for_slice(struct qaic_device *qdev, struct sg_tabl
- 
- 	/* copy relevant sg node and fix page and length */
- 	sgn = sgf;
--	for_each_sgtable_sg(sgt, sg, j) {
-+	for_each_sgtable_dma_sg(sgt, sg, j) {
- 		memcpy(sg, sgn, sizeof(*sg));
- 		if (sgn == sgf) {
- 			sg_dma_address(sg) += offf;
-@@ -294,7 +294,7 @@ static int encode_reqs(struct qaic_device *qdev, struct bo_slice *slice,
- 	 * fence.
- 	 */
- 	dev_addr = req->dev_addr;
--	for_each_sgtable_sg(slice->sgt, sg, i) {
-+	for_each_sgtable_dma_sg(slice->sgt, sg, i) {
- 		slice->reqs[i].cmd = cmd;
- 		slice->reqs[i].src_addr = cpu_to_le64(slice->dir == DMA_TO_DEVICE ?
- 						      sg_dma_address(sg) : dev_addr);
-diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
-index 1e76a64cce0a91..906a7bfa448b31 100644
---- a/drivers/acpi/button.c
-+++ b/drivers/acpi/button.c
-@@ -130,6 +130,17 @@ static const struct dmi_system_id dmi_lid_quirks[] = {
- 		},
- 		.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_OPEN,
- 	},
-+	{
-+		/*
-+		 * Samsung galaxybook2 ,initial _LID device notification returns
-+		 * lid closed.
-+		 */
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "750XED"),
-+		},
-+		.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_OPEN,
-+	},
- 	{}
- };
- 
-diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c
-index 7aced0b9bad7cc..5df417626fd109 100644
---- a/drivers/acpi/cppc_acpi.c
-+++ b/drivers/acpi/cppc_acpi.c
-@@ -39,6 +39,9 @@
- #include <linux/rwsem.h>
- #include <linux/wait.h>
- #include <linux/topology.h>
-+#include <linux/dmi.h>
-+#include <linux/units.h>
-+#include <asm/unaligned.h>
- 
- #include <acpi/cppc_acpi.h>
- 
-@@ -1858,3 +1861,116 @@ unsigned int cppc_get_transition_latency(int cpu_num)
- 	return latency_ns;
- }
- EXPORT_SYMBOL_GPL(cppc_get_transition_latency);
-+
-+/* Minimum struct length needed for the DMI processor entry we want */
-+#define DMI_ENTRY_PROCESSOR_MIN_LENGTH	48
-+
-+/* Offset in the DMI processor structure for the max frequency */
-+#define DMI_PROCESSOR_MAX_SPEED		0x14
-+
-+/* Callback function used to retrieve the max frequency from DMI */
-+static void cppc_find_dmi_mhz(const struct dmi_header *dm, void *private)
-+{
-+	const u8 *dmi_data = (const u8 *)dm;
-+	u16 *mhz = (u16 *)private;
-+
-+	if (dm->type == DMI_ENTRY_PROCESSOR &&
-+	    dm->length >= DMI_ENTRY_PROCESSOR_MIN_LENGTH) {
-+		u16 val = (u16)get_unaligned((const u16 *)
-+				(dmi_data + DMI_PROCESSOR_MAX_SPEED));
-+		*mhz = val > *mhz ? val : *mhz;
-+	}
-+}
-+
-+/* Look up the max frequency in DMI */
-+static u64 cppc_get_dmi_max_khz(void)
-+{
-+	u16 mhz = 0;
-+
-+	dmi_walk(cppc_find_dmi_mhz, &mhz);
-+
-+	/*
-+	 * Real stupid fallback value, just in case there is no
-+	 * actual value set.
-+	 */
-+	mhz = mhz ? mhz : 1;
-+
-+	return KHZ_PER_MHZ * mhz;
-+}
-+
-+/*
-+ * If CPPC lowest_freq and nominal_freq registers are exposed then we can
-+ * use them to convert perf to freq and vice versa. The conversion is
-+ * extrapolated as an affine function passing by the 2 points:
-+ *  - (Low perf, Low freq)
-+ *  - (Nominal perf, Nominal freq)
-+ */
-+unsigned int cppc_perf_to_khz(struct cppc_perf_caps *caps, unsigned int perf)
-+{
-+	s64 retval, offset = 0;
-+	static u64 max_khz;
-+	u64 mul, div;
-+
-+	if (caps->lowest_freq && caps->nominal_freq) {
-+		/* Avoid special case when nominal_freq is equal to lowest_freq */
-+		if (caps->lowest_freq == caps->nominal_freq) {
-+			mul = caps->nominal_freq;
-+			div = caps->nominal_perf;
-+		} else {
-+			mul = caps->nominal_freq - caps->lowest_freq;
-+			div = caps->nominal_perf - caps->lowest_perf;
-+		}
-+		mul *= KHZ_PER_MHZ;
-+		offset = caps->nominal_freq * KHZ_PER_MHZ -
-+			 div64_u64(caps->nominal_perf * mul, div);
-+	} else {
-+		if (!max_khz)
-+			max_khz = cppc_get_dmi_max_khz();
-+		mul = max_khz;
-+		div = caps->highest_perf;
-+	}
-+
-+	retval = offset + div64_u64(perf * mul, div);
-+	if (retval >= 0)
-+		return retval;
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(cppc_perf_to_khz);
-+
-+unsigned int cppc_khz_to_perf(struct cppc_perf_caps *caps, unsigned int freq)
-+{
-+	s64 retval, offset = 0;
-+	static u64 max_khz;
-+	u64 mul, div;
-+
-+	if (caps->lowest_freq && caps->nominal_freq) {
-+		/* Avoid special case when nominal_freq is equal to lowest_freq */
-+		if (caps->lowest_freq == caps->nominal_freq) {
-+			mul = caps->nominal_perf;
-+			div = caps->nominal_freq;
-+		} else {
-+			mul = caps->nominal_perf - caps->lowest_perf;
-+			div = caps->nominal_freq - caps->lowest_freq;
-+		}
-+		/*
-+		 * We don't need to convert to kHz for computing offset and can
-+		 * directly use nominal_freq and lowest_freq as the div64_u64
-+		 * will remove the frequency unit.
-+		 */
-+		offset = caps->nominal_perf -
-+			 div64_u64(caps->nominal_freq * mul, div);
-+		/* But we need it for computing the perf level. */
-+		div *= KHZ_PER_MHZ;
-+	} else {
-+		if (!max_khz)
-+			max_khz = cppc_get_dmi_max_khz();
-+		mul = caps->highest_perf;
-+		div = max_khz;
-+	}
-+
-+	retval = offset + div64_u64(freq * mul, div);
-+	if (retval >= 0)
-+		return retval;
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(cppc_khz_to_perf);
-diff --git a/drivers/acpi/prmt.c b/drivers/acpi/prmt.c
-index 7020584096bfaa..8b391f12853bb6 100644
---- a/drivers/acpi/prmt.c
-+++ b/drivers/acpi/prmt.c
-@@ -52,7 +52,7 @@ struct prm_context_buffer {
- static LIST_HEAD(prm_module_list);
- 
- struct prm_handler_info {
--	guid_t guid;
-+	efi_guid_t guid;
- 	efi_status_t (__efiapi *handler_addr)(u64, void *);
- 	u64 static_data_buffer_addr;
- 	u64 acpi_param_buffer_addr;
-@@ -72,17 +72,21 @@ struct prm_module_info {
- 	struct prm_handler_info handlers[];
- };
- 
--static u64 efi_pa_va_lookup(u64 pa)
-+static u64 efi_pa_va_lookup(efi_guid_t *guid, u64 pa)
- {
- 	efi_memory_desc_t *md;
- 	u64 pa_offset = pa & ~PAGE_MASK;
- 	u64 page = pa & PAGE_MASK;
- 
- 	for_each_efi_memory_desc(md) {
--		if (md->phys_addr < pa && pa < md->phys_addr + PAGE_SIZE * md->num_pages)
-+		if ((md->attribute & EFI_MEMORY_RUNTIME) &&
-+		    (md->phys_addr < pa && pa < md->phys_addr + PAGE_SIZE * md->num_pages)) {
- 			return pa_offset + md->virt_addr + page - md->phys_addr;
-+		}
- 	}
- 
-+	pr_warn("Failed to find VA for GUID: %pUL, PA: 0x%llx", guid, pa);
-+
- 	return 0;
- }
- 
-@@ -148,9 +152,15 @@ acpi_parse_prmt(union acpi_subtable_headers *header, const unsigned long end)
- 		th = &tm->handlers[cur_handler];
- 
- 		guid_copy(&th->guid, (guid_t *)handler_info->handler_guid);
--		th->handler_addr = (void *)efi_pa_va_lookup(handler_info->handler_address);
--		th->static_data_buffer_addr = efi_pa_va_lookup(handler_info->static_data_buffer_address);
--		th->acpi_param_buffer_addr = efi_pa_va_lookup(handler_info->acpi_param_buffer_address);
-+		th->handler_addr =
-+			(void *)efi_pa_va_lookup(&th->guid, handler_info->handler_address);
-+
-+		th->static_data_buffer_addr =
-+			efi_pa_va_lookup(&th->guid, handler_info->static_data_buffer_address);
-+
-+		th->acpi_param_buffer_addr =
-+			efi_pa_va_lookup(&th->guid, handler_info->acpi_param_buffer_address);
-+
- 	} while (++cur_handler < tm->handler_count && (handler_info = get_next_handler(handler_info)));
- 
- 	return 0;
-@@ -253,6 +263,13 @@ static acpi_status acpi_platformrt_space_handler(u32 function,
- 		if (!handler || !module)
- 			goto invalid_guid;
- 
-+		if (!handler->handler_addr ||
-+		    !handler->static_data_buffer_addr ||
-+		    !handler->acpi_param_buffer_addr) {
-+			buffer->prm_status = PRM_HANDLER_ERROR;
-+			return AE_OK;
-+		}
-+
- 		ACPI_COPY_NAMESEG(context.signature, "PRMC");
- 		context.revision = 0x0;
- 		context.reserved = 0x0;
-diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
-index 95233b413c1ac5..d3d776d4fb5a74 100644
---- a/drivers/acpi/resource.c
-+++ b/drivers/acpi/resource.c
-@@ -498,6 +498,13 @@ static const struct dmi_system_id tongfang_gm_rg[] = {
- 			DMI_MATCH(DMI_BOARD_NAME, "GMxRGxx"),
- 		},
- 	},
-+	{
-+		/* LG Electronics 16T90SP */
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "LG Electronics"),
-+			DMI_MATCH(DMI_BOARD_NAME, "16T90SP"),
-+		},
-+	},
- 	{ }
- };
- 
-diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
-index a96566e1b2b84c..9cc02252218497 100644
---- a/drivers/ata/libata-eh.c
-+++ b/drivers/ata/libata-eh.c
-@@ -636,6 +636,7 @@ void ata_scsi_cmd_error_handler(struct Scsi_Host *host, struct ata_port *ap,
- 			/* the scmd has an associated qc */
- 			if (!(qc->flags & ATA_QCFLAG_EH)) {
- 				/* which hasn't failed yet, timeout */
-+				set_host_byte(scmd, DID_TIME_OUT);
- 				qc->err_mask |= AC_ERR_TIMEOUT;
- 				qc->flags |= ATA_QCFLAG_EH;
- 				nr_timedout++;
-diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
-index 01f46caf1f88b7..54b80911f3e286 100644
---- a/drivers/cdrom/cdrom.c
-+++ b/drivers/cdrom/cdrom.c
-@@ -2313,7 +2313,7 @@ static int cdrom_ioctl_media_changed(struct cdrom_device_info *cdi,
- 		return -EINVAL;
- 
- 	/* Prevent arg from speculatively bypassing the length check */
--	barrier_nospec();
-+	arg = array_index_nospec(arg, cdi->capacity);
- 
- 	info = kmalloc(sizeof(*info), GFP_KERNEL);
- 	if (!info)
-diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
-index f461f99eb040c6..8c16d67b98bfe4 100644
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -1061,11 +1061,21 @@ static int amd_pstate_register_driver(int mode)
- 		return -EINVAL;
- 
- 	cppc_state = mode;
-+
-+	ret = amd_pstate_enable(true);
-+	if (ret) {
-+		pr_err("failed to enable cppc during amd-pstate driver registration, return %d\n",
-+		       ret);
-+		amd_pstate_driver_cleanup();
-+		return ret;
-+	}
-+
- 	ret = cpufreq_register_driver(current_pstate_driver);
- 	if (ret) {
- 		amd_pstate_driver_cleanup();
- 		return ret;
- 	}
-+
- 	return 0;
- }
- 
-diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c
-index 1ba3943be8a3dd..15f1d41920a339 100644
---- a/drivers/cpufreq/cppc_cpufreq.c
-+++ b/drivers/cpufreq/cppc_cpufreq.c
-@@ -16,7 +16,6 @@
- #include <linux/delay.h>
- #include <linux/cpu.h>
- #include <linux/cpufreq.h>
--#include <linux/dmi.h>
- #include <linux/irq_work.h>
- #include <linux/kthread.h>
- #include <linux/time.h>
-@@ -27,12 +26,6 @@
- 
- #include <acpi/cppc_acpi.h>
- 
--/* Minimum struct length needed for the DMI processor entry we want */
--#define DMI_ENTRY_PROCESSOR_MIN_LENGTH	48
--
--/* Offset in the DMI processor structure for the max frequency */
--#define DMI_PROCESSOR_MAX_SPEED		0x14
--
- /*
-  * This list contains information parsed from per CPU ACPI _CPC and _PSD
-  * structures: e.g. the highest and lowest supported performance, capabilities,
-@@ -291,97 +284,9 @@ static inline void cppc_freq_invariance_exit(void)
- }
- #endif /* CONFIG_ACPI_CPPC_CPUFREQ_FIE */
- 
--/* Callback function used to retrieve the max frequency from DMI */
--static void cppc_find_dmi_mhz(const struct dmi_header *dm, void *private)
--{
--	const u8 *dmi_data = (const u8 *)dm;
--	u16 *mhz = (u16 *)private;
--
--	if (dm->type == DMI_ENTRY_PROCESSOR &&
--	    dm->length >= DMI_ENTRY_PROCESSOR_MIN_LENGTH) {
--		u16 val = (u16)get_unaligned((const u16 *)
--				(dmi_data + DMI_PROCESSOR_MAX_SPEED));
--		*mhz = val > *mhz ? val : *mhz;
--	}
--}
--
--/* Look up the max frequency in DMI */
--static u64 cppc_get_dmi_max_khz(void)
--{
--	u16 mhz = 0;
--
--	dmi_walk(cppc_find_dmi_mhz, &mhz);
--
--	/*
--	 * Real stupid fallback value, just in case there is no
--	 * actual value set.
--	 */
--	mhz = mhz ? mhz : 1;
--
--	return (1000 * mhz);
--}
--
--/*
-- * If CPPC lowest_freq and nominal_freq registers are exposed then we can
-- * use them to convert perf to freq and vice versa. The conversion is
-- * extrapolated as an affine function passing by the 2 points:
-- *  - (Low perf, Low freq)
-- *  - (Nominal perf, Nominal perf)
-- */
--static unsigned int cppc_cpufreq_perf_to_khz(struct cppc_cpudata *cpu_data,
--					     unsigned int perf)
--{
--	struct cppc_perf_caps *caps = &cpu_data->perf_caps;
--	s64 retval, offset = 0;
--	static u64 max_khz;
--	u64 mul, div;
--
--	if (caps->lowest_freq && caps->nominal_freq) {
--		mul = caps->nominal_freq - caps->lowest_freq;
--		div = caps->nominal_perf - caps->lowest_perf;
--		offset = caps->nominal_freq - div64_u64(caps->nominal_perf * mul, div);
--	} else {
--		if (!max_khz)
--			max_khz = cppc_get_dmi_max_khz();
--		mul = max_khz;
--		div = caps->highest_perf;
--	}
--
--	retval = offset + div64_u64(perf * mul, div);
--	if (retval >= 0)
--		return retval;
--	return 0;
--}
--
--static unsigned int cppc_cpufreq_khz_to_perf(struct cppc_cpudata *cpu_data,
--					     unsigned int freq)
--{
--	struct cppc_perf_caps *caps = &cpu_data->perf_caps;
--	s64 retval, offset = 0;
--	static u64 max_khz;
--	u64  mul, div;
--
--	if (caps->lowest_freq && caps->nominal_freq) {
--		mul = caps->nominal_perf - caps->lowest_perf;
--		div = caps->nominal_freq - caps->lowest_freq;
--		offset = caps->nominal_perf - div64_u64(caps->nominal_freq * mul, div);
--	} else {
--		if (!max_khz)
--			max_khz = cppc_get_dmi_max_khz();
--		mul = caps->highest_perf;
--		div = max_khz;
--	}
--
--	retval = offset + div64_u64(freq * mul, div);
--	if (retval >= 0)
--		return retval;
--	return 0;
--}
--
- static int cppc_cpufreq_set_target(struct cpufreq_policy *policy,
- 				   unsigned int target_freq,
- 				   unsigned int relation)
--
- {
- 	struct cppc_cpudata *cpu_data = policy->driver_data;
- 	unsigned int cpu = policy->cpu;
-@@ -389,7 +294,7 @@ static int cppc_cpufreq_set_target(struct cpufreq_policy *policy,
- 	u32 desired_perf;
- 	int ret = 0;
- 
--	desired_perf = cppc_cpufreq_khz_to_perf(cpu_data, target_freq);
-+	desired_perf = cppc_khz_to_perf(&cpu_data->perf_caps, target_freq);
- 	/* Return if it is exactly the same perf */
- 	if (desired_perf == cpu_data->perf_ctrls.desired_perf)
- 		return ret;
-@@ -417,7 +322,7 @@ static unsigned int cppc_cpufreq_fast_switch(struct cpufreq_policy *policy,
- 	u32 desired_perf;
- 	int ret;
- 
--	desired_perf = cppc_cpufreq_khz_to_perf(cpu_data, target_freq);
-+	desired_perf = cppc_khz_to_perf(&cpu_data->perf_caps, target_freq);
- 	cpu_data->perf_ctrls.desired_perf = desired_perf;
- 	ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls);
- 
-@@ -530,7 +435,7 @@ static int cppc_get_cpu_power(struct device *cpu_dev,
- 	min_step = min_cap / CPPC_EM_CAP_STEP;
- 	max_step = max_cap / CPPC_EM_CAP_STEP;
- 
--	perf_prev = cppc_cpufreq_khz_to_perf(cpu_data, *KHz);
-+	perf_prev = cppc_khz_to_perf(perf_caps, *KHz);
- 	step = perf_prev / perf_step;
- 
- 	if (step > max_step)
-@@ -550,8 +455,8 @@ static int cppc_get_cpu_power(struct device *cpu_dev,
- 			perf = step * perf_step;
- 	}
- 
--	*KHz = cppc_cpufreq_perf_to_khz(cpu_data, perf);
--	perf_check = cppc_cpufreq_khz_to_perf(cpu_data, *KHz);
-+	*KHz = cppc_perf_to_khz(perf_caps, perf);
-+	perf_check = cppc_khz_to_perf(perf_caps, *KHz);
- 	step_check = perf_check / perf_step;
- 
- 	/*
-@@ -561,8 +466,8 @@ static int cppc_get_cpu_power(struct device *cpu_dev,
- 	 */
- 	while ((*KHz == prev_freq) || (step_check != step)) {
- 		perf++;
--		*KHz = cppc_cpufreq_perf_to_khz(cpu_data, perf);
--		perf_check = cppc_cpufreq_khz_to_perf(cpu_data, *KHz);
-+		*KHz = cppc_perf_to_khz(perf_caps, perf);
-+		perf_check = cppc_khz_to_perf(perf_caps, *KHz);
- 		step_check = perf_check / perf_step;
- 	}
- 
-@@ -591,7 +496,7 @@ static int cppc_get_cpu_cost(struct device *cpu_dev, unsigned long KHz,
- 	perf_caps = &cpu_data->perf_caps;
- 	max_cap = arch_scale_cpu_capacity(cpu_dev->id);
- 
--	perf_prev = cppc_cpufreq_khz_to_perf(cpu_data, KHz);
-+	perf_prev = cppc_khz_to_perf(perf_caps, KHz);
- 	perf_step = CPPC_EM_CAP_STEP * perf_caps->highest_perf / max_cap;
- 	step = perf_prev / perf_step;
- 
-@@ -679,10 +584,6 @@ static struct cppc_cpudata *cppc_cpufreq_get_cpu_data(unsigned int cpu)
- 		goto free_mask;
- 	}
- 
--	/* Convert the lowest and nominal freq from MHz to KHz */
--	cpu_data->perf_caps.lowest_freq *= 1000;
--	cpu_data->perf_caps.nominal_freq *= 1000;
--
- 	list_add(&cpu_data->node, &cpu_data_list);
- 
- 	return cpu_data;
-@@ -724,20 +625,16 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
- 	 * Set min to lowest nonlinear perf to avoid any efficiency penalty (see
- 	 * Section 8.4.7.1.1.5 of ACPI 6.1 spec)
- 	 */
--	policy->min = cppc_cpufreq_perf_to_khz(cpu_data,
--					       caps->lowest_nonlinear_perf);
--	policy->max = cppc_cpufreq_perf_to_khz(cpu_data,
--					       caps->nominal_perf);
-+	policy->min = cppc_perf_to_khz(caps, caps->lowest_nonlinear_perf);
-+	policy->max = cppc_perf_to_khz(caps, caps->nominal_perf);
- 
- 	/*
- 	 * Set cpuinfo.min_freq to Lowest to make the full range of performance
- 	 * available if userspace wants to use any perf between lowest & lowest
- 	 * nonlinear perf
- 	 */
--	policy->cpuinfo.min_freq = cppc_cpufreq_perf_to_khz(cpu_data,
--							    caps->lowest_perf);
--	policy->cpuinfo.max_freq = cppc_cpufreq_perf_to_khz(cpu_data,
--							    caps->nominal_perf);
-+	policy->cpuinfo.min_freq = cppc_perf_to_khz(caps, caps->lowest_perf);
-+	policy->cpuinfo.max_freq = cppc_perf_to_khz(caps, caps->nominal_perf);
- 
- 	policy->transition_delay_us = cppc_cpufreq_get_transition_delay_us(cpu);
- 	policy->shared_type = cpu_data->shared_type;
-@@ -773,7 +670,7 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
- 		boost_supported = true;
- 
- 	/* Set policy->cur to max now. The governors will adjust later. */
--	policy->cur = cppc_cpufreq_perf_to_khz(cpu_data, caps->highest_perf);
-+	policy->cur = cppc_perf_to_khz(caps, caps->highest_perf);
- 	cpu_data->perf_ctrls.desired_perf =  caps->highest_perf;
- 
- 	ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls);
-@@ -868,7 +765,7 @@ static unsigned int cppc_cpufreq_get_rate(unsigned int cpu)
- 	delivered_perf = cppc_perf_from_fbctrs(cpu_data, &fb_ctrs_t0,
- 					       &fb_ctrs_t1);
- 
--	return cppc_cpufreq_perf_to_khz(cpu_data, delivered_perf);
-+	return cppc_perf_to_khz(&cpu_data->perf_caps, delivered_perf);
- }
- 
- static int cppc_cpufreq_set_boost(struct cpufreq_policy *policy, int state)
-@@ -883,11 +780,9 @@ static int cppc_cpufreq_set_boost(struct cpufreq_policy *policy, int state)
- 	}
- 
- 	if (state)
--		policy->max = cppc_cpufreq_perf_to_khz(cpu_data,
--						       caps->highest_perf);
-+		policy->max = cppc_perf_to_khz(caps, caps->highest_perf);
- 	else
--		policy->max = cppc_cpufreq_perf_to_khz(cpu_data,
--						       caps->nominal_perf);
-+		policy->max = cppc_perf_to_khz(caps, caps->nominal_perf);
- 	policy->cpuinfo.max_freq = policy->max;
- 
- 	ret = freq_qos_update_request(policy->max_freq_req, policy->max);
-@@ -947,7 +842,7 @@ static unsigned int hisi_cppc_cpufreq_get_rate(unsigned int cpu)
- 	if (ret < 0)
- 		return -EIO;
- 
--	return cppc_cpufreq_perf_to_khz(cpu_data, desired_perf);
-+	return cppc_perf_to_khz(&cpu_data->perf_caps, desired_perf);
- }
- 
- static void cppc_check_hisi_workaround(void)
-diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
-index 87383c05424bdf..3962683e2af9d4 100644
---- a/drivers/firmware/arm_scmi/driver.c
-+++ b/drivers/firmware/arm_scmi/driver.c
-@@ -2603,10 +2603,8 @@ static struct scmi_debug_info *scmi_debugfs_common_setup(struct scmi_info *info)
- 	dbg->top_dentry = top_dentry;
- 
- 	if (devm_add_action_or_reset(info->dev,
--				     scmi_debugfs_common_cleanup, dbg)) {
--		scmi_debugfs_common_cleanup(dbg);
-+				     scmi_debugfs_common_cleanup, dbg))
- 		return NULL;
--	}
- 
- 	return dbg;
- }
-diff --git a/drivers/firmware/arm_scmi/mailbox.c b/drivers/firmware/arm_scmi/mailbox.c
-index b8d470417e8f99..8e513f70b75d4c 100644
---- a/drivers/firmware/arm_scmi/mailbox.c
-+++ b/drivers/firmware/arm_scmi/mailbox.c
-@@ -23,6 +23,7 @@
-  * @chan_receiver: Optional Receiver mailbox unidirectional channel
-  * @cinfo: SCMI channel info
-  * @shmem: Transmit/Receive shared memory area
-+ * @chan_lock: Lock that prevents multiple xfers from being queued
-  */
- struct scmi_mailbox {
- 	struct mbox_client cl;
-@@ -30,6 +31,7 @@ struct scmi_mailbox {
- 	struct mbox_chan *chan_receiver;
- 	struct scmi_chan_info *cinfo;
- 	struct scmi_shared_mem __iomem *shmem;
-+	struct mutex chan_lock;
- };
- 
- #define client_to_scmi_mailbox(c) container_of(c, struct scmi_mailbox, cl)
-@@ -228,6 +230,7 @@ static int mailbox_chan_setup(struct scmi_chan_info *cinfo, struct device *dev,
- 
- 	cinfo->transport_info = smbox;
- 	smbox->cinfo = cinfo;
-+	mutex_init(&smbox->chan_lock);
- 
- 	return 0;
- }
-@@ -255,13 +258,23 @@ static int mailbox_send_message(struct scmi_chan_info *cinfo,
- 	struct scmi_mailbox *smbox = cinfo->transport_info;
- 	int ret;
- 
--	ret = mbox_send_message(smbox->chan, xfer);
-+	/*
-+	 * The mailbox layer has its own queue. However the mailbox queue
-+	 * confuses the per message SCMI timeouts since the clock starts when
-+	 * the message is submitted into the mailbox queue. So when multiple
-+	 * messages are queued up the clock starts on all messages instead of
-+	 * only the one inflight.
-+	 */
-+	mutex_lock(&smbox->chan_lock);
- 
--	/* mbox_send_message returns non-negative value on success, so reset */
--	if (ret > 0)
--		ret = 0;
-+	ret = mbox_send_message(smbox->chan, xfer);
-+	/* mbox_send_message returns non-negative value on success */
-+	if (ret < 0) {
-+		mutex_unlock(&smbox->chan_lock);
-+		return ret;
-+	}
- 
--	return ret;
-+	return 0;
- }
- 
- static void mailbox_mark_txdone(struct scmi_chan_info *cinfo, int ret,
-@@ -269,13 +282,10 @@ static void mailbox_mark_txdone(struct scmi_chan_info *cinfo, int ret,
- {
- 	struct scmi_mailbox *smbox = cinfo->transport_info;
- 
--	/*
--	 * NOTE: we might prefer not to need the mailbox ticker to manage the
--	 * transfer queueing since the protocol layer queues things by itself.
--	 * Unfortunately, we have to kick the mailbox framework after we have
--	 * received our message.
--	 */
- 	mbox_client_txdone(smbox->chan, ret);
-+
-+	/* Release channel */
-+	mutex_unlock(&smbox->chan_lock);
- }
- 
- static void mailbox_fetch_response(struct scmi_chan_info *cinfo,
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
-index 2bca37044ad0fb..fac204d6e0ea2c 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
-@@ -147,6 +147,7 @@ static union acpi_object *amdgpu_atif_call(struct amdgpu_atif *atif,
- 					   struct acpi_buffer *params)
- {
- 	acpi_status status;
-+	union acpi_object *obj;
- 	union acpi_object atif_arg_elements[2];
- 	struct acpi_object_list atif_arg;
- 	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-@@ -169,16 +170,24 @@ static union acpi_object *amdgpu_atif_call(struct amdgpu_atif *atif,
- 
- 	status = acpi_evaluate_object(atif->handle, NULL, &atif_arg,
- 				      &buffer);
-+	obj = (union acpi_object *)buffer.pointer;
- 
--	/* Fail only if calling the method fails and ATIF is supported */
-+	/* Fail if calling the method fails and ATIF is supported */
- 	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
- 		DRM_DEBUG_DRIVER("failed to evaluate ATIF got %s\n",
- 				 acpi_format_exception(status));
--		kfree(buffer.pointer);
-+		kfree(obj);
- 		return NULL;
- 	}
- 
--	return buffer.pointer;
-+	if (obj->type != ACPI_TYPE_BUFFER) {
-+		DRM_DEBUG_DRIVER("bad object returned from ATIF: %d\n",
-+				 obj->type);
-+		kfree(obj);
-+		return NULL;
-+	}
-+
-+	return obj;
- }
- 
- /**
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
-index c5c55e132af21d..5e3abdd0805b6d 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
-@@ -1053,8 +1053,10 @@ int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id,
- 
- 	r = amdgpu_ring_init(adev, ring, 1024, NULL, 0,
- 			     AMDGPU_RING_PRIO_DEFAULT, NULL);
--	if (r)
-+	if (r) {
-+		amdgpu_mes_unlock(&adev->mes);
- 		goto clean_up_memory;
-+	}
- 
- 	amdgpu_mes_ring_to_queue_props(adev, ring, &qprops);
- 
-@@ -1087,7 +1089,6 @@ int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id,
- 	amdgpu_ring_fini(ring);
- clean_up_memory:
- 	kfree(ring);
--	amdgpu_mes_unlock(&adev->mes);
- 	return r;
- }
- 
-diff --git a/drivers/gpu/drm/amd/display/modules/power/power_helpers.c b/drivers/gpu/drm/amd/display/modules/power/power_helpers.c
-index 2b3d5183818aca..4887a360ead4f2 100644
---- a/drivers/gpu/drm/amd/display/modules/power/power_helpers.c
-+++ b/drivers/gpu/drm/amd/display/modules/power/power_helpers.c
-@@ -841,6 +841,8 @@ bool is_psr_su_specific_panel(struct dc_link *link)
- 				isPSRSUSupported = false;
- 			else if (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x03)
- 				isPSRSUSupported = false;
-+			else if (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x01)
-+				isPSRSUSupported = false;
- 			else if (dpcd_caps->psr_info.force_psrsu_cap == 0x1)
- 				isPSRSUSupported = true;
- 		}
-diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
-index e238e4e8116caf..ad57368dc13f03 100644
---- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
-+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
-@@ -722,12 +722,13 @@ void dpu_crtc_complete_commit(struct drm_crtc *crtc)
- 	_dpu_crtc_complete_flip(crtc);
- }
- 
--static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc,
-+static int _dpu_crtc_check_and_setup_lm_bounds(struct drm_crtc *crtc,
- 		struct drm_crtc_state *state)
- {
- 	struct dpu_crtc_state *cstate = to_dpu_crtc_state(state);
- 	struct drm_display_mode *adj_mode = &state->adjusted_mode;
- 	u32 crtc_split_width = adj_mode->hdisplay / cstate->num_mixers;
-+	struct dpu_kms *dpu_kms = _dpu_crtc_get_kms(crtc);
- 	int i;
- 
- 	for (i = 0; i < cstate->num_mixers; i++) {
-@@ -738,7 +739,12 @@ static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc,
- 		r->y2 = adj_mode->vdisplay;
- 
- 		trace_dpu_crtc_setup_lm_bounds(DRMID(crtc), i, r);
-+
-+		if (drm_rect_width(r) > dpu_kms->catalog->caps->max_mixer_width)
-+			return -E2BIG;
- 	}
-+
-+	return 0;
- }
- 
- static void _dpu_crtc_get_pcc_coeff(struct drm_crtc_state *state,
-@@ -814,7 +820,7 @@ static void dpu_crtc_atomic_begin(struct drm_crtc *crtc,
- 
- 	DRM_DEBUG_ATOMIC("crtc%d\n", crtc->base.id);
- 
--	_dpu_crtc_setup_lm_bounds(crtc, crtc->state);
-+	_dpu_crtc_check_and_setup_lm_bounds(crtc, crtc->state);
- 
- 	/* encoder will trigger pending mask now */
- 	drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask)
-@@ -1208,8 +1214,11 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
- 	if (crtc_state->active_changed)
- 		crtc_state->mode_changed = true;
- 
--	if (cstate->num_mixers)
--		_dpu_crtc_setup_lm_bounds(crtc, crtc_state);
-+	if (cstate->num_mixers) {
-+		rc = _dpu_crtc_check_and_setup_lm_bounds(crtc, crtc_state);
-+		if (rc)
-+			return rc;
-+	}
- 
- 	/* FIXME: move this to dpu_plane_atomic_check? */
- 	drm_atomic_crtc_state_for_each_plane_state(plane, pstate, crtc_state) {
-diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
-index 6262ec5e40204c..10c68de1bf22ca 100644
---- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
-+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
-@@ -1122,21 +1122,20 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc,
- 	for (i = 0; i < dpu_enc->num_phys_encs; i++) {
- 		struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
- 
--		if (!dpu_enc->hw_pp[i]) {
-+		phys->hw_pp = dpu_enc->hw_pp[i];
-+		if (!phys->hw_pp) {
- 			DPU_ERROR_ENC(dpu_enc,
- 				"no pp block assigned at idx: %d\n", i);
- 			return;
- 		}
- 
--		if (!hw_ctl[i]) {
-+		phys->hw_ctl = i < num_ctl ? to_dpu_hw_ctl(hw_ctl[i]) : NULL;
-+		if (!phys->hw_ctl) {
- 			DPU_ERROR_ENC(dpu_enc,
- 				"no ctl block assigned at idx: %d\n", i);
- 			return;
- 		}
- 
--		phys->hw_pp = dpu_enc->hw_pp[i];
--		phys->hw_ctl = to_dpu_hw_ctl(hw_ctl[i]);
--
- 		phys->cached_mode = crtc_state->adjusted_mode;
- 		if (phys->ops.atomic_mode_set)
- 			phys->ops.atomic_mode_set(phys, crtc_state, conn_state);
-diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
-index daaf0e60475380..20c8b9af7a2199 100644
---- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
-+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
-@@ -280,7 +280,7 @@ static void dpu_encoder_phys_vid_setup_timing_engine(
- 	intf_cfg.stream_sel = 0; /* Don't care value for video mode */
- 	intf_cfg.mode_3d = dpu_encoder_helper_get_3d_blend_mode(phys_enc);
- 	intf_cfg.dsc = dpu_encoder_helper_get_dsc(phys_enc);
--	if (phys_enc->hw_pp->merge_3d)
-+	if (intf_cfg.mode_3d && phys_enc->hw_pp->merge_3d)
- 		intf_cfg.merge_3d = phys_enc->hw_pp->merge_3d->idx;
- 
- 	spin_lock_irqsave(phys_enc->enc_spinlock, lock_flags);
-diff --git a/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c b/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c
-index add72bbc28b176..4d55e3cf570f0b 100644
---- a/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c
-+++ b/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c
-@@ -26,7 +26,7 @@ static void msm_disp_state_dump_regs(u32 **reg, u32 aligned_len, void __iomem *b
- 	end_addr = base_addr + aligned_len;
- 
- 	if (!(*reg))
--		*reg = kzalloc(len_padded, GFP_KERNEL);
-+		*reg = kvzalloc(len_padded, GFP_KERNEL);
- 
- 	if (*reg)
- 		dump_addr = *reg;
-@@ -48,20 +48,21 @@ static void msm_disp_state_dump_regs(u32 **reg, u32 aligned_len, void __iomem *b
- 	}
- }
- 
--static void msm_disp_state_print_regs(u32 **reg, u32 len, void __iomem *base_addr,
--		struct drm_printer *p)
-+static void msm_disp_state_print_regs(const u32 *dump_addr, u32 len,
-+		void __iomem *base_addr, struct drm_printer *p)
- {
- 	int i;
--	u32 *dump_addr = NULL;
- 	void __iomem *addr;
- 	u32 num_rows;
- 
-+	if (!dump_addr) {
-+		drm_printf(p, "Registers not stored\n");
-+		return;
-+	}
-+
- 	addr = base_addr;
- 	num_rows = len / REG_DUMP_ALIGN;
- 
--	if (*reg)
--		dump_addr = *reg;
--
- 	for (i = 0; i < num_rows; i++) {
- 		drm_printf(p, "0x%lx : %08x %08x %08x %08x\n",
- 				(unsigned long)(addr - base_addr),
-@@ -89,7 +90,7 @@ void msm_disp_state_print(struct msm_disp_state *state, struct drm_printer *p)
- 
- 	list_for_each_entry_safe(block, tmp, &state->blocks, node) {
- 		drm_printf(p, "====================%s================\n", block->name);
--		msm_disp_state_print_regs(&block->state, block->size, block->base_addr, p);
-+		msm_disp_state_print_regs(block->state, block->size, block->base_addr, p);
- 	}
- 
- 	drm_printf(p, "===================dpu drm state================\n");
-@@ -161,7 +162,7 @@ void msm_disp_state_free(void *data)
- 
- 	list_for_each_entry_safe(block, tmp, &disp_state->blocks, node) {
- 		list_del(&block->node);
--		kfree(block->state);
-+		kvfree(block->state);
- 		kfree(block);
- 	}
- 
-diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
-index 77b805eacb1b18..f920329fe2e090 100644
---- a/drivers/gpu/drm/msm/dsi/dsi_host.c
-+++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
-@@ -537,7 +537,7 @@ static unsigned long dsi_adjust_pclk_for_compression(const struct drm_display_mo
- 
- 	int new_htotal = mode->htotal - mode->hdisplay + new_hdisplay;
- 
--	return new_htotal * mode->vtotal * drm_mode_vrefresh(mode);
-+	return mult_frac(mode->clock * 1000u, new_htotal, mode->htotal);
- }
- 
- static unsigned long dsi_get_pclk_rate(const struct drm_display_mode *mode,
-@@ -545,7 +545,7 @@ static unsigned long dsi_get_pclk_rate(const struct drm_display_mode *mode,
- {
- 	unsigned long pclk_rate;
- 
--	pclk_rate = mode->clock * 1000;
-+	pclk_rate = mode->clock * 1000u;
- 
- 	if (dsc)
- 		pclk_rate = dsi_adjust_pclk_for_compression(mode, dsc);
-diff --git a/drivers/gpu/drm/vboxvideo/hgsmi_base.c b/drivers/gpu/drm/vboxvideo/hgsmi_base.c
-index 8c041d7ce4f1bd..87dccaecc3e57d 100644
---- a/drivers/gpu/drm/vboxvideo/hgsmi_base.c
-+++ b/drivers/gpu/drm/vboxvideo/hgsmi_base.c
-@@ -139,7 +139,15 @@ int hgsmi_update_pointer_shape(struct gen_pool *ctx, u32 flags,
- 		flags |= VBOX_MOUSE_POINTER_VISIBLE;
- 	}
- 
--	p = hgsmi_buffer_alloc(ctx, sizeof(*p) + pixel_len, HGSMI_CH_VBVA,
-+	/*
-+	 * The 4 extra bytes come from switching struct vbva_mouse_pointer_shape
-+	 * from having a 4 bytes fixed array at the end to using a proper VLA
-+	 * at the end. These 4 extra bytes were not subtracted from sizeof(*p)
-+	 * before the switch to the VLA, so this way the behavior is unchanged.
-+	 * Chances are these 4 extra bytes are not necessary but they are kept
-+	 * to avoid regressions.
-+	 */
-+	p = hgsmi_buffer_alloc(ctx, sizeof(*p) + pixel_len + 4, HGSMI_CH_VBVA,
- 			       VBVA_MOUSE_POINTER_SHAPE);
- 	if (!p)
- 		return -ENOMEM;
-diff --git a/drivers/gpu/drm/vboxvideo/vboxvideo.h b/drivers/gpu/drm/vboxvideo/vboxvideo.h
-index f60d82504da02c..79ec8481de0e48 100644
---- a/drivers/gpu/drm/vboxvideo/vboxvideo.h
-+++ b/drivers/gpu/drm/vboxvideo/vboxvideo.h
-@@ -351,10 +351,8 @@ struct vbva_mouse_pointer_shape {
- 	 * Bytes in the gap between the AND and the XOR mask are undefined.
- 	 * XOR mask scanlines have no gap between them and size of XOR mask is:
- 	 * xor_len = width * 4 * height.
--	 *
--	 * Preallocate 4 bytes for accessing actual data as p->data.
- 	 */
--	u8 data[4];
-+	u8 data[];
- } __packed;
- 
- /* pointer is visible */
-diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
-index b22ae25db4e17c..52ea0c50c852ce 100644
---- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
-+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
-@@ -881,6 +881,10 @@ static int vmw_stdu_connector_atomic_check(struct drm_connector *conn,
- 	struct drm_crtc_state *new_crtc_state;
- 
- 	conn_state = drm_atomic_get_connector_state(state, conn);
-+
-+	if (IS_ERR(conn_state))
-+		return PTR_ERR(conn_state);
-+
- 	du = vmw_connector_to_stdu(conn);
- 
- 	if (!conn_state->crtc)
-diff --git a/drivers/iio/accel/bma400_core.c b/drivers/iio/accel/bma400_core.c
-index e90e2f01550ad3..04083b7395ab8c 100644
---- a/drivers/iio/accel/bma400_core.c
-+++ b/drivers/iio/accel/bma400_core.c
-@@ -1219,7 +1219,8 @@ static int bma400_activity_event_en(struct bma400_data *data,
- static int bma400_tap_event_en(struct bma400_data *data,
- 			       enum iio_event_direction dir, int state)
- {
--	unsigned int mask, field_value;
-+	unsigned int mask;
-+	unsigned int field_value = 0;
- 	int ret;
- 
- 	/*
-diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
-index e46817cb5581cf..6dee3b686effdc 100644
---- a/drivers/iio/adc/Kconfig
-+++ b/drivers/iio/adc/Kconfig
-@@ -1335,6 +1335,8 @@ config TI_LMP92064
- 	tristate "Texas Instruments LMP92064 ADC driver"
- 	depends on SPI
- 	select REGMAP_SPI
-+	select IIO_BUFFER
-+	select IIO_TRIGGERED_BUFFER
- 	help
- 	  Say yes here to build support for the LMP92064 Precision Current and Voltage
- 	  sensor.
-diff --git a/drivers/iio/frequency/Kconfig b/drivers/iio/frequency/Kconfig
-index 71de6cc4a1584f..036763d3e84c6b 100644
---- a/drivers/iio/frequency/Kconfig
-+++ b/drivers/iio/frequency/Kconfig
-@@ -82,25 +82,26 @@ config ADMV1014
- 	  module will be called admv1014.
- 
- config ADMV4420
--       tristate "Analog Devices ADMV4420 K Band Downconverter"
--       depends on SPI
--       help
--         Say yes here to build support for Analog Devices K Band
--         Downconverter with integrated Fractional-N PLL and VCO.
-+	tristate "Analog Devices ADMV4420 K Band Downconverter"
-+	depends on SPI
-+	select REGMAP_SPI
-+	help
-+	  Say yes here to build support for Analog Devices K Band
-+	  Downconverter with integrated Fractional-N PLL and VCO.
- 
--         To compile this driver as a module, choose M here: the
--         module will be called admv4420.
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called admv4420.
- 
- config ADRF6780
--        tristate "Analog Devices ADRF6780 Microwave Upconverter"
--        depends on SPI
--        depends on COMMON_CLK
--        help
--          Say yes here to build support for Analog Devices ADRF6780
--          5.9 GHz to 23.6 GHz, Wideband, Microwave Upconverter.
--
--          To compile this driver as a module, choose M here: the
--          module will be called adrf6780.
-+	tristate "Analog Devices ADRF6780 Microwave Upconverter"
-+	depends on SPI
-+	depends on COMMON_CLK
-+	help
-+	  Say yes here to build support for Analog Devices ADRF6780
-+	  5.9 GHz to 23.6 GHz, Wideband, Microwave Upconverter.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called adrf6780.
- 
- endmenu
- endmenu
-diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
-index f253295795f0a4..fd78d678877c47 100644
---- a/drivers/infiniband/core/addr.c
-+++ b/drivers/infiniband/core/addr.c
-@@ -269,6 +269,8 @@ rdma_find_ndev_for_src_ip_rcu(struct net *net, const struct sockaddr *src_in)
- 		break;
- #endif
- 	}
-+	if (!ret && dev && is_vlan_dev(dev))
-+		dev = vlan_dev_real_dev(dev);
- 	return ret ? ERR_PTR(ret) : dev;
- }
- 
-diff --git a/drivers/infiniband/hw/bnxt_re/hw_counters.c b/drivers/infiniband/hw/bnxt_re/hw_counters.c
-index 93572405d6fae7..1e63f809174837 100644
---- a/drivers/infiniband/hw/bnxt_re/hw_counters.c
-+++ b/drivers/infiniband/hw/bnxt_re/hw_counters.c
-@@ -366,12 +366,12 @@ int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev,
- 				goto done;
- 			}
- 		}
--		if (rdev->pacing.dbr_pacing)
-+		if (rdev->pacing.dbr_pacing && bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))
- 			bnxt_re_copy_db_pacing_stats(rdev, stats);
- 	}
- 
- done:
--	return bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx) ?
-+	return bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx) ?
- 		BNXT_RE_NUM_EXT_COUNTERS : BNXT_RE_NUM_STD_COUNTERS;
- }
- 
-@@ -381,7 +381,7 @@ struct rdma_hw_stats *bnxt_re_ib_alloc_hw_port_stats(struct ib_device *ibdev,
- 	struct bnxt_re_dev *rdev = to_bnxt_re_dev(ibdev, ibdev);
- 	int num_counters = 0;
- 
--	if (bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx))
-+	if (bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))
- 		num_counters = BNXT_RE_NUM_EXT_COUNTERS;
- 	else
- 		num_counters = BNXT_RE_NUM_STD_COUNTERS;
-diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
-index b4d3e7dfc939f6..f20da108fb2978 100644
---- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
-+++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
-@@ -400,6 +400,10 @@ static void bnxt_re_create_fence_wqe(struct bnxt_re_pd *pd)
- 	struct bnxt_re_fence_data *fence = &pd->fence;
- 	struct ib_mr *ib_mr = &fence->mr->ib_mr;
- 	struct bnxt_qplib_swqe *wqe = &fence->bind_wqe;
-+	struct bnxt_re_dev *rdev = pd->rdev;
-+
-+	if (bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))
-+		return;
- 
- 	memset(wqe, 0, sizeof(*wqe));
- 	wqe->type = BNXT_QPLIB_SWQE_TYPE_BIND_MW;
-@@ -454,6 +458,9 @@ static void bnxt_re_destroy_fence_mr(struct bnxt_re_pd *pd)
- 	struct device *dev = &rdev->en_dev->pdev->dev;
- 	struct bnxt_re_mr *mr = fence->mr;
- 
-+	if (bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))
-+		return;
-+
- 	if (fence->mw) {
- 		bnxt_re_dealloc_mw(fence->mw);
- 		fence->mw = NULL;
-@@ -485,6 +492,9 @@ static int bnxt_re_create_fence_mr(struct bnxt_re_pd *pd)
- 	struct ib_mw *mw;
- 	int rc;
- 
-+	if (bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))
-+		return 0;
-+
- 	dma_addr = dma_map_single(dev, fence->va, BNXT_RE_FENCE_BYTES,
- 				  DMA_BIDIRECTIONAL);
- 	rc = dma_mapping_error(dev, dma_addr);
-@@ -1023,7 +1033,7 @@ static int bnxt_re_init_user_qp(struct bnxt_re_dev *rdev, struct bnxt_re_pd *pd,
- 	bytes = (qplib_qp->sq.max_wqe * qplib_qp->sq.wqe_size);
- 	/* Consider mapping PSN search memory only for RC QPs. */
- 	if (qplib_qp->type == CMDQ_CREATE_QP_TYPE_RC) {
--		psn_sz = bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx) ?
-+		psn_sz = bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx) ?
- 						   sizeof(struct sq_psn_search_ext) :
- 						   sizeof(struct sq_psn_search);
- 		psn_nume = (qplib_qp->wqe_mode == BNXT_QPLIB_WQE_MODE_STATIC) ?
-@@ -1234,7 +1244,7 @@ static void bnxt_re_adjust_gsi_rq_attr(struct bnxt_re_qp *qp)
- 	qplqp = &qp->qplib_qp;
- 	dev_attr = &rdev->dev_attr;
- 
--	if (!bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx)) {
-+	if (!bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx)) {
- 		qplqp->rq.max_sge = dev_attr->max_qp_sges;
- 		if (qplqp->rq.max_sge > dev_attr->max_qp_sges)
- 			qplqp->rq.max_sge = dev_attr->max_qp_sges;
-@@ -1301,7 +1311,7 @@ static void bnxt_re_adjust_gsi_sq_attr(struct bnxt_re_qp *qp,
- 	qplqp = &qp->qplib_qp;
- 	dev_attr = &rdev->dev_attr;
- 
--	if (!bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx)) {
-+	if (!bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx)) {
- 		entries = bnxt_re_init_depth(init_attr->cap.max_send_wr + 1, uctx);
- 		qplqp->sq.max_wqe = min_t(u32, entries,
- 					  dev_attr->max_qp_wqes + 1);
-@@ -1328,7 +1338,7 @@ static int bnxt_re_init_qp_type(struct bnxt_re_dev *rdev,
- 		goto out;
- 	}
- 
--	if (bnxt_qplib_is_chip_gen_p5(chip_ctx) &&
-+	if (bnxt_qplib_is_chip_gen_p5_p7(chip_ctx) &&
- 	    init_attr->qp_type == IB_QPT_GSI)
- 		qptype = CMDQ_CREATE_QP_TYPE_GSI;
- out:
-@@ -1527,7 +1537,7 @@ int bnxt_re_create_qp(struct ib_qp *ib_qp, struct ib_qp_init_attr *qp_init_attr,
- 		goto fail;
- 
- 	if (qp_init_attr->qp_type == IB_QPT_GSI &&
--	    !(bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx))) {
-+	    !(bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))) {
- 		rc = bnxt_re_create_gsi_qp(qp, pd, qp_init_attr);
- 		if (rc == -ENODEV)
- 			goto qp_destroy;
-@@ -2553,11 +2563,6 @@ static int bnxt_re_build_inv_wqe(const struct ib_send_wr *wr,
- 	wqe->type = BNXT_QPLIB_SWQE_TYPE_LOCAL_INV;
- 	wqe->local_inv.inv_l_key = wr->ex.invalidate_rkey;
- 
--	/* Need unconditional fence for local invalidate
--	 * opcode to work as expected.
--	 */
--	wqe->flags |= BNXT_QPLIB_SWQE_FLAGS_UC_FENCE;
--
- 	if (wr->send_flags & IB_SEND_SIGNALED)
- 		wqe->flags |= BNXT_QPLIB_SWQE_FLAGS_SIGNAL_COMP;
- 	if (wr->send_flags & IB_SEND_SOLICITED)
-@@ -2580,12 +2585,6 @@ static int bnxt_re_build_reg_wqe(const struct ib_reg_wr *wr,
- 	wqe->frmr.levels = qplib_frpl->hwq.level;
- 	wqe->type = BNXT_QPLIB_SWQE_TYPE_REG_MR;
- 
--	/* Need unconditional fence for reg_mr
--	 * opcode to function as expected.
--	 */
--
--	wqe->flags |= BNXT_QPLIB_SWQE_FLAGS_UC_FENCE;
--
- 	if (wr->wr.send_flags & IB_SEND_SIGNALED)
- 		wqe->flags |= BNXT_QPLIB_SWQE_FLAGS_SIGNAL_COMP;
- 
-@@ -2716,6 +2715,18 @@ static int bnxt_re_post_send_shadow_qp(struct bnxt_re_dev *rdev,
- 	return rc;
- }
- 
-+static void bnxt_re_legacy_set_uc_fence(struct bnxt_qplib_swqe *wqe)
-+{
-+	/* Need unconditional fence for non-wire memory opcode
-+	 * to work as expected.
-+	 */
-+	if (wqe->type == BNXT_QPLIB_SWQE_TYPE_LOCAL_INV ||
-+	    wqe->type == BNXT_QPLIB_SWQE_TYPE_FAST_REG_MR ||
-+	    wqe->type == BNXT_QPLIB_SWQE_TYPE_REG_MR ||
-+	    wqe->type == BNXT_QPLIB_SWQE_TYPE_BIND_MW)
-+		wqe->flags |= BNXT_QPLIB_SWQE_FLAGS_UC_FENCE;
-+}
-+
- int bnxt_re_post_send(struct ib_qp *ib_qp, const struct ib_send_wr *wr,
- 		      const struct ib_send_wr **bad_wr)
- {
-@@ -2795,8 +2806,11 @@ int bnxt_re_post_send(struct ib_qp *ib_qp, const struct ib_send_wr *wr,
- 			rc = -EINVAL;
- 			goto bad;
- 		}
--		if (!rc)
-+		if (!rc) {
-+			if (!bnxt_qplib_is_chip_gen_p5_p7(qp->rdev->chip_ctx))
-+				bnxt_re_legacy_set_uc_fence(&wqe);
- 			rc = bnxt_qplib_post_send(&qp->qplib_qp, &wqe);
-+		}
- bad:
- 		if (rc) {
- 			ibdev_err(&qp->rdev->ibdev,
-diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
-index 039801d93ed8aa..0373d0e9db6329 100644
---- a/drivers/infiniband/hw/bnxt_re/main.c
-+++ b/drivers/infiniband/hw/bnxt_re/main.c
-@@ -107,9 +107,14 @@ static void bnxt_re_set_db_offset(struct bnxt_re_dev *rdev)
- 		dev_info(rdev_to_dev(rdev),
- 			 "Couldn't get DB bar size, Low latency framework is disabled\n");
- 	/* set register offsets for both UC and WC */
--	res->dpi_tbl.ucreg.offset = res->is_vf ? BNXT_QPLIB_DBR_VF_DB_OFFSET :
--						 BNXT_QPLIB_DBR_PF_DB_OFFSET;
--	res->dpi_tbl.wcreg.offset = res->dpi_tbl.ucreg.offset;
-+	if (bnxt_qplib_is_chip_gen_p7(cctx)) {
-+		res->dpi_tbl.ucreg.offset = offset;
-+		res->dpi_tbl.wcreg.offset = en_dev->l2_db_size;
-+	} else {
-+		res->dpi_tbl.ucreg.offset = res->is_vf ? BNXT_QPLIB_DBR_VF_DB_OFFSET :
-+							 BNXT_QPLIB_DBR_PF_DB_OFFSET;
-+		res->dpi_tbl.wcreg.offset = res->dpi_tbl.ucreg.offset;
-+	}
- 
- 	/* If WC mapping is disabled by L2 driver then en_dev->l2_db_size
- 	 * is equal to the DB-Bar actual size. This indicates that L2
-@@ -128,7 +133,7 @@ static void bnxt_re_set_drv_mode(struct bnxt_re_dev *rdev, u8 mode)
- 	struct bnxt_qplib_chip_ctx *cctx;
- 
- 	cctx = rdev->chip_ctx;
--	cctx->modes.wqe_mode = bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx) ?
-+	cctx->modes.wqe_mode = bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx) ?
- 			       mode : BNXT_QPLIB_WQE_MODE_STATIC;
- 	if (bnxt_re_hwrm_qcaps(rdev))
- 		dev_err(rdev_to_dev(rdev),
-@@ -176,8 +181,11 @@ static int bnxt_re_setup_chip_ctx(struct bnxt_re_dev *rdev, u8 wqe_mode)
- 
- 	bnxt_re_set_db_offset(rdev);
- 	rc = bnxt_qplib_map_db_bar(&rdev->qplib_res);
--	if (rc)
-+	if (rc) {
-+		kfree(rdev->chip_ctx);
-+		rdev->chip_ctx = NULL;
- 		return rc;
-+	}
- 
- 	if (bnxt_qplib_determine_atomics(en_dev->pdev))
- 		ibdev_info(&rdev->ibdev,
-@@ -215,7 +223,7 @@ static void bnxt_re_limit_pf_res(struct bnxt_re_dev *rdev)
- 	ctx->srqc_count = min_t(u32, BNXT_RE_MAX_SRQC_COUNT,
- 				attr->max_srq);
- 	ctx->cq_count = min_t(u32, BNXT_RE_MAX_CQ_COUNT, attr->max_cq);
--	if (!bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx))
-+	if (!bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))
- 		for (i = 0; i < MAX_TQM_ALLOC_REQ; i++)
- 			rdev->qplib_ctx.tqm_ctx.qcount[i] =
- 			rdev->dev_attr.tqm_alloc_reqs[i];
-@@ -264,7 +272,7 @@ static void bnxt_re_set_resource_limits(struct bnxt_re_dev *rdev)
- 	memset(&rdev->qplib_ctx.vf_res, 0, sizeof(struct bnxt_qplib_vf_res));
- 	bnxt_re_limit_pf_res(rdev);
- 
--	num_vfs =  bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx) ?
-+	num_vfs =  bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx) ?
- 			BNXT_RE_GEN_P5_MAX_VF : rdev->num_vfs;
- 	if (num_vfs)
- 		bnxt_re_limit_vf_res(&rdev->qplib_ctx, num_vfs);
-@@ -276,7 +284,7 @@ static void bnxt_re_vf_res_config(struct bnxt_re_dev *rdev)
- 	if (test_bit(BNXT_RE_FLAG_ERR_DEVICE_DETACHED, &rdev->flags))
- 		return;
- 	rdev->num_vfs = pci_sriov_get_totalvfs(rdev->en_dev->pdev);
--	if (!bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx)) {
-+	if (!bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx)) {
- 		bnxt_re_set_resource_limits(rdev);
- 		bnxt_qplib_set_func_resources(&rdev->qplib_res, &rdev->rcfw,
- 					      &rdev->qplib_ctx);
-@@ -1067,16 +1075,6 @@ static int bnxt_re_cqn_handler(struct bnxt_qplib_nq *nq,
- 	return 0;
- }
- 
--#define BNXT_RE_GEN_P5_PF_NQ_DB		0x10000
--#define BNXT_RE_GEN_P5_VF_NQ_DB		0x4000
--static u32 bnxt_re_get_nqdb_offset(struct bnxt_re_dev *rdev, u16 indx)
--{
--	return bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx) ?
--		(rdev->is_virtfn ? BNXT_RE_GEN_P5_VF_NQ_DB :
--				   BNXT_RE_GEN_P5_PF_NQ_DB) :
--				   rdev->en_dev->msix_entries[indx].db_offset;
--}
--
- static void bnxt_re_cleanup_res(struct bnxt_re_dev *rdev)
- {
- 	int i;
-@@ -1097,7 +1095,7 @@ static int bnxt_re_init_res(struct bnxt_re_dev *rdev)
- 	bnxt_qplib_init_res(&rdev->qplib_res);
- 
- 	for (i = 1; i < rdev->num_msix ; i++) {
--		db_offt = bnxt_re_get_nqdb_offset(rdev, i);
-+		db_offt = rdev->en_dev->msix_entries[i].db_offset;
- 		rc = bnxt_qplib_enable_nq(rdev->en_dev->pdev, &rdev->nq[i - 1],
- 					  i - 1, rdev->en_dev->msix_entries[i].vector,
- 					  db_offt, &bnxt_re_cqn_handler,
-@@ -1508,7 +1506,7 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 wqe_mode)
- 		ibdev_err(&rdev->ibdev, "Failed to allocate CREQ: %#x\n", rc);
- 		goto free_rcfw;
- 	}
--	db_offt = bnxt_re_get_nqdb_offset(rdev, BNXT_RE_AEQ_IDX);
-+	db_offt = rdev->en_dev->msix_entries[BNXT_RE_AEQ_IDX].db_offset;
- 	vid = rdev->en_dev->msix_entries[BNXT_RE_AEQ_IDX].vector;
- 	rc = bnxt_qplib_enable_rcfw_channel(&rdev->rcfw,
- 					    vid, db_offt,
-@@ -1536,7 +1534,7 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 wqe_mode)
- 	bnxt_re_set_resource_limits(rdev);
- 
- 	rc = bnxt_qplib_alloc_ctx(&rdev->qplib_res, &rdev->qplib_ctx, 0,
--				  bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx));
-+				  bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx));
- 	if (rc) {
- 		ibdev_err(&rdev->ibdev,
- 			  "Failed to allocate QPLIB context: %#x\n", rc);
-@@ -1659,7 +1657,7 @@ static void bnxt_re_setup_cc(struct bnxt_re_dev *rdev, bool enable)
- 		return;
- 
- 	/* Currently enabling only for GenP5 adapters */
--	if (!bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx))
-+	if (!bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))
- 		return;
- 
- 	if (enable) {
-diff --git a/drivers/infiniband/hw/bnxt_re/qplib_fp.c b/drivers/infiniband/hw/bnxt_re/qplib_fp.c
-index 3b28878f62062f..4ee11cb4f2bd38 100644
---- a/drivers/infiniband/hw/bnxt_re/qplib_fp.c
-+++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.c
-@@ -995,7 +995,7 @@ int bnxt_qplib_create_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp)
- 
- 	/* SQ */
- 	if (qp->type == CMDQ_CREATE_QP_TYPE_RC) {
--		psn_sz = bnxt_qplib_is_chip_gen_p5(res->cctx) ?
-+		psn_sz = bnxt_qplib_is_chip_gen_p5_p7(res->cctx) ?
- 			 sizeof(struct sq_psn_search_ext) :
- 			 sizeof(struct sq_psn_search);
- 
-@@ -1649,7 +1649,7 @@ static void bnxt_qplib_fill_psn_search(struct bnxt_qplib_qp *qp,
- 	flg_npsn = ((swq->next_psn << SQ_PSN_SEARCH_NEXT_PSN_SFT) &
- 		     SQ_PSN_SEARCH_NEXT_PSN_MASK);
- 
--	if (bnxt_qplib_is_chip_gen_p5(qp->cctx)) {
-+	if (bnxt_qplib_is_chip_gen_p5_p7(qp->cctx)) {
- 		psns_ext->opcode_start_psn = cpu_to_le32(op_spsn);
- 		psns_ext->flags_next_psn = cpu_to_le32(flg_npsn);
- 		psns_ext->start_slot_idx = cpu_to_le16(swq->slot_idx);
-diff --git a/drivers/infiniband/hw/bnxt_re/qplib_fp.h b/drivers/infiniband/hw/bnxt_re/qplib_fp.h
-index a6f38d8f12efe2..56ddff96b5083b 100644
---- a/drivers/infiniband/hw/bnxt_re/qplib_fp.h
-+++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.h
-@@ -169,7 +169,7 @@ struct bnxt_qplib_swqe {
- 			};
- 			u32		q_key;
- 			u32		dst_qp;
--			u16		avid;
-+			u32		avid;
- 		} send;
- 
- 		/* Send Raw Ethernet and QP1 */
-diff --git a/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c b/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c
-index 5680fe8b890ad1..7294221b3316cf 100644
---- a/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c
-+++ b/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c
-@@ -525,7 +525,7 @@ static int __bnxt_qplib_rcfw_send_message(struct bnxt_qplib_rcfw *rcfw,
- 		/* failed with status */
- 		dev_err(&rcfw->pdev->dev, "cmdq[%#x]=%#x status %#x\n",
- 			cookie, opcode, evnt->status);
--		rc = -EFAULT;
-+		rc = -EIO;
- 	}
- 
- 	return rc;
-@@ -852,7 +852,7 @@ int bnxt_qplib_init_rcfw(struct bnxt_qplib_rcfw *rcfw,
- 	 */
- 	if (is_virtfn)
- 		goto skip_ctx_setup;
--	if (bnxt_qplib_is_chip_gen_p5(rcfw->res->cctx))
-+	if (bnxt_qplib_is_chip_gen_p5_p7(rcfw->res->cctx))
- 		goto config_vf_res;
- 
- 	lvl = ctx->qpc_tbl.level;
-diff --git a/drivers/infiniband/hw/bnxt_re/qplib_res.c b/drivers/infiniband/hw/bnxt_re/qplib_res.c
-index ae2bde34e785b7..96ceec1e8199a6 100644
---- a/drivers/infiniband/hw/bnxt_re/qplib_res.c
-+++ b/drivers/infiniband/hw/bnxt_re/qplib_res.c
-@@ -244,6 +244,8 @@ int bnxt_qplib_alloc_init_hwq(struct bnxt_qplib_hwq *hwq,
- 			sginfo.pgsize = npde * pg_size;
- 			sginfo.npages = 1;
- 			rc = __alloc_pbl(res, &hwq->pbl[PBL_LVL_0], &sginfo);
-+			if (rc)
-+				goto fail;
- 
- 			/* Alloc PBL pages */
- 			sginfo.npages = npbl;
-@@ -255,22 +257,9 @@ int bnxt_qplib_alloc_init_hwq(struct bnxt_qplib_hwq *hwq,
- 			dst_virt_ptr =
- 				(dma_addr_t **)hwq->pbl[PBL_LVL_0].pg_arr;
- 			src_phys_ptr = hwq->pbl[PBL_LVL_1].pg_map_arr;
--			if (hwq_attr->type == HWQ_TYPE_MR) {
--			/* For MR it is expected that we supply only 1 contigous
--			 * page i.e only 1 entry in the PDL that will contain
--			 * all the PBLs for the user supplied memory region
--			 */
--				for (i = 0; i < hwq->pbl[PBL_LVL_1].pg_count;
--				     i++)
--					dst_virt_ptr[0][i] = src_phys_ptr[i] |
--						flag;
--			} else {
--				for (i = 0; i < hwq->pbl[PBL_LVL_1].pg_count;
--				     i++)
--					dst_virt_ptr[PTR_PG(i)][PTR_IDX(i)] =
--						src_phys_ptr[i] |
--						PTU_PDE_VALID;
--			}
-+			for (i = 0; i < hwq->pbl[PBL_LVL_1].pg_count; i++)
-+				dst_virt_ptr[0][i] = src_phys_ptr[i] | flag;
-+
- 			/* Alloc or init PTEs */
- 			rc = __alloc_pbl(res, &hwq->pbl[PBL_LVL_2],
- 					 hwq_attr->sginfo);
-@@ -805,7 +794,7 @@ static int bnxt_qplib_alloc_dpi_tbl(struct bnxt_qplib_res *res,
- 	dpit = &res->dpi_tbl;
- 	reg = &dpit->wcreg;
- 
--	if (!bnxt_qplib_is_chip_gen_p5(res->cctx)) {
-+	if (!bnxt_qplib_is_chip_gen_p5_p7(res->cctx)) {
- 		/* Offest should come from L2 driver */
- 		dbr_offset = dev_attr->l2_db_size;
- 		dpit->ucreg.offset = dbr_offset;
-diff --git a/drivers/infiniband/hw/bnxt_re/qplib_res.h b/drivers/infiniband/hw/bnxt_re/qplib_res.h
-index 534db462216ac9..f9e7aa3757cfb2 100644
---- a/drivers/infiniband/hw/bnxt_re/qplib_res.h
-+++ b/drivers/infiniband/hw/bnxt_re/qplib_res.h
-@@ -44,6 +44,9 @@ extern const struct bnxt_qplib_gid bnxt_qplib_gid_zero;
- #define CHIP_NUM_57508		0x1750
- #define CHIP_NUM_57504		0x1751
- #define CHIP_NUM_57502		0x1752
-+#define CHIP_NUM_58818          0xd818
-+#define CHIP_NUM_57608          0x1760
-+
- 
- struct bnxt_qplib_drv_modes {
- 	u8	wqe_mode;
-@@ -296,6 +299,12 @@ struct bnxt_qplib_res {
- 	struct bnxt_qplib_db_pacing_data *pacing_data;
- };
- 
-+static inline bool bnxt_qplib_is_chip_gen_p7(struct bnxt_qplib_chip_ctx *cctx)
-+{
-+	return (cctx->chip_num == CHIP_NUM_58818 ||
-+		cctx->chip_num == CHIP_NUM_57608);
-+}
-+
- static inline bool bnxt_qplib_is_chip_gen_p5(struct bnxt_qplib_chip_ctx *cctx)
- {
- 	return (cctx->chip_num == CHIP_NUM_57508 ||
-@@ -303,15 +312,20 @@ static inline bool bnxt_qplib_is_chip_gen_p5(struct bnxt_qplib_chip_ctx *cctx)
- 		cctx->chip_num == CHIP_NUM_57502);
- }
- 
-+static inline bool bnxt_qplib_is_chip_gen_p5_p7(struct bnxt_qplib_chip_ctx *cctx)
-+{
-+	return bnxt_qplib_is_chip_gen_p5(cctx) || bnxt_qplib_is_chip_gen_p7(cctx);
-+}
-+
- static inline u8 bnxt_qplib_get_hwq_type(struct bnxt_qplib_res *res)
- {
--	return bnxt_qplib_is_chip_gen_p5(res->cctx) ?
-+	return bnxt_qplib_is_chip_gen_p5_p7(res->cctx) ?
- 					HWQ_TYPE_QUEUE : HWQ_TYPE_L2_CMPL;
- }
- 
- static inline u8 bnxt_qplib_get_ring_type(struct bnxt_qplib_chip_ctx *cctx)
- {
--	return bnxt_qplib_is_chip_gen_p5(cctx) ?
-+	return bnxt_qplib_is_chip_gen_p5_p7(cctx) ?
- 	       RING_ALLOC_REQ_RING_TYPE_NQ :
- 	       RING_ALLOC_REQ_RING_TYPE_ROCE_CMPL;
- }
-@@ -488,7 +502,7 @@ static inline void bnxt_qplib_ring_nq_db(struct bnxt_qplib_db_info *info,
- 	u32 type;
- 
- 	type = arm ? DBC_DBC_TYPE_NQ_ARM : DBC_DBC_TYPE_NQ;
--	if (bnxt_qplib_is_chip_gen_p5(cctx))
-+	if (bnxt_qplib_is_chip_gen_p5_p7(cctx))
- 		bnxt_qplib_ring_db(info, type);
- 	else
- 		bnxt_qplib_ring_db32(info, arm);
-diff --git a/drivers/infiniband/hw/bnxt_re/qplib_sp.c b/drivers/infiniband/hw/bnxt_re/qplib_sp.c
-index a27b6851516477..0b98577cd7082e 100644
---- a/drivers/infiniband/hw/bnxt_re/qplib_sp.c
-+++ b/drivers/infiniband/hw/bnxt_re/qplib_sp.c
-@@ -59,7 +59,7 @@ static bool bnxt_qplib_is_atomic_cap(struct bnxt_qplib_rcfw *rcfw)
- {
- 	u16 pcie_ctl2 = 0;
- 
--	if (!bnxt_qplib_is_chip_gen_p5(rcfw->res->cctx))
-+	if (!bnxt_qplib_is_chip_gen_p5_p7(rcfw->res->cctx))
- 		return false;
- 
- 	pcie_capability_read_word(rcfw->pdev, PCI_EXP_DEVCTL2, &pcie_ctl2);
-@@ -133,10 +133,12 @@ int bnxt_qplib_get_dev_attr(struct bnxt_qplib_rcfw *rcfw,
- 	 * reporting the max number
- 	 */
- 	attr->max_qp_wqes -= BNXT_QPLIB_RESERVED_QP_WRS + 1;
--	attr->max_qp_sges = bnxt_qplib_is_chip_gen_p5(rcfw->res->cctx) ?
-+	attr->max_qp_sges = bnxt_qplib_is_chip_gen_p5_p7(rcfw->res->cctx) ?
- 			    6 : sb->max_sge;
- 	attr->max_cq = le32_to_cpu(sb->max_cq);
- 	attr->max_cq_wqes = le32_to_cpu(sb->max_cqe);
-+	if (!bnxt_qplib_is_chip_gen_p7(rcfw->res->cctx))
-+		attr->max_cq_wqes = min_t(u32, BNXT_QPLIB_MAX_CQ_WQES, attr->max_cq_wqes);
- 	attr->max_cq_sges = attr->max_qp_sges;
- 	attr->max_mr = le32_to_cpu(sb->max_mr);
- 	attr->max_mw = le32_to_cpu(sb->max_mw);
-@@ -151,9 +153,17 @@ int bnxt_qplib_get_dev_attr(struct bnxt_qplib_rcfw *rcfw,
- 	attr->max_srq_sges = sb->max_srq_sge;
- 	attr->max_pkey = 1;
- 	attr->max_inline_data = le32_to_cpu(sb->max_inline_data);
--	attr->l2_db_size = (sb->l2_db_space_size + 1) *
--			    (0x01 << RCFW_DBR_BASE_PAGE_SHIFT);
--	attr->max_sgid = BNXT_QPLIB_NUM_GIDS_SUPPORTED;
-+	if (!bnxt_qplib_is_chip_gen_p7(rcfw->res->cctx))
-+		attr->l2_db_size = (sb->l2_db_space_size + 1) *
-+				    (0x01 << RCFW_DBR_BASE_PAGE_SHIFT);
-+	/*
-+	 * Read the max gid supported by HW.
-+	 * For each entry in HW  GID in HW table, we consume 2
-+	 * GID entries in the kernel GID table.  So max_gid reported
-+	 * to stack can be up to twice the value reported by the HW, up to 256 gids.
-+	 */
-+	attr->max_sgid = le32_to_cpu(sb->max_gid);
-+	attr->max_sgid = min_t(u32, BNXT_QPLIB_NUM_GIDS_SUPPORTED, 2 * attr->max_sgid);
- 	attr->dev_cap_flags = le16_to_cpu(sb->dev_cap_flags);
- 
- 	bnxt_qplib_query_version(rcfw, attr->fw_ver);
-@@ -934,7 +944,7 @@ int bnxt_qplib_modify_cc(struct bnxt_qplib_res *res,
- 	req->inactivity_th = cpu_to_le16(cc_param->inact_th);
- 
- 	/* For chip gen P5 onwards fill extended cmd and header */
--	if (bnxt_qplib_is_chip_gen_p5(res->cctx)) {
-+	if (bnxt_qplib_is_chip_gen_p5_p7(res->cctx)) {
- 		struct roce_tlv *hdr;
- 		u32 payload;
- 		u32 chunks;
-diff --git a/drivers/infiniband/hw/bnxt_re/qplib_sp.h b/drivers/infiniband/hw/bnxt_re/qplib_sp.h
-index d33c78b96217a8..755765e68eaab2 100644
---- a/drivers/infiniband/hw/bnxt_re/qplib_sp.h
-+++ b/drivers/infiniband/hw/bnxt_re/qplib_sp.h
-@@ -55,6 +55,7 @@ struct bnxt_qplib_dev_attr {
- 	u32				max_qp_wqes;
- 	u32				max_qp_sges;
- 	u32				max_cq;
-+#define BNXT_QPLIB_MAX_CQ_WQES          0xfffff
- 	u32				max_cq_wqes;
- 	u32				max_cq_sges;
- 	u32				max_mr;
-diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
-index b3757c6a0457a1..8d753e6e0c7190 100644
---- a/drivers/infiniband/hw/cxgb4/cm.c
-+++ b/drivers/infiniband/hw/cxgb4/cm.c
-@@ -2086,7 +2086,7 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip,
- 	err = -ENOMEM;
- 	if (n->dev->flags & IFF_LOOPBACK) {
- 		if (iptype == 4)
--			pdev = ip_dev_find(&init_net, *(__be32 *)peer_ip);
-+			pdev = __ip_dev_find(&init_net, *(__be32 *)peer_ip, false);
- 		else if (IS_ENABLED(CONFIG_IPV6))
- 			for_each_netdev(&init_net, pdev) {
- 				if (ipv6_chk_addr(&init_net,
-@@ -2101,12 +2101,12 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip,
- 			err = -ENODEV;
- 			goto out;
- 		}
-+		if (is_vlan_dev(pdev))
-+			pdev = vlan_dev_real_dev(pdev);
- 		ep->l2t = cxgb4_l2t_get(cdev->rdev.lldi.l2t,
- 					n, pdev, rt_tos2priority(tos));
--		if (!ep->l2t) {
--			dev_put(pdev);
-+		if (!ep->l2t)
- 			goto out;
--		}
- 		ep->mtu = pdev->mtu;
- 		ep->tx_chan = cxgb4_port_chan(pdev);
- 		ep->smac_idx = ((struct port_info *)netdev_priv(pdev))->smt_idx;
-@@ -2119,7 +2119,6 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip,
- 		ep->rss_qid = cdev->rdev.lldi.rxq_ids[
- 			cxgb4_port_idx(pdev) * step];
- 		set_tcp_window(ep, (struct port_info *)netdev_priv(pdev));
--		dev_put(pdev);
- 	} else {
- 		pdev = get_real_dev(n->dev);
- 		ep->l2t = cxgb4_l2t_get(cdev->rdev.lldi.l2t,
-diff --git a/drivers/infiniband/hw/irdma/cm.c b/drivers/infiniband/hw/irdma/cm.c
-index 42d1e977106696..1916daa8c33230 100644
---- a/drivers/infiniband/hw/irdma/cm.c
-+++ b/drivers/infiniband/hw/irdma/cm.c
-@@ -3630,7 +3630,7 @@ void irdma_free_lsmm_rsrc(struct irdma_qp *iwqp)
- /**
-  * irdma_accept - registered call for connection to be accepted
-  * @cm_id: cm information for passive connection
-- * @conn_param: accpet parameters
-+ * @conn_param: accept parameters
-  */
- int irdma_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
- {
-diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
-index 45547bf281e312..4bebc34a2929b1 100644
---- a/drivers/infiniband/ulp/srpt/ib_srpt.c
-+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
-@@ -68,6 +68,8 @@ MODULE_LICENSE("Dual BSD/GPL");
- static u64 srpt_service_guid;
- static DEFINE_SPINLOCK(srpt_dev_lock);	/* Protects srpt_dev_list. */
- static LIST_HEAD(srpt_dev_list);	/* List of srpt_device structures. */
-+static DEFINE_MUTEX(srpt_mc_mutex);	/* Protects srpt_memory_caches. */
-+static DEFINE_XARRAY(srpt_memory_caches); /* See also srpt_memory_cache_entry */
- 
- static unsigned srp_max_req_size = DEFAULT_MAX_REQ_SIZE;
- module_param(srp_max_req_size, int, 0444);
-@@ -105,6 +107,63 @@ static void srpt_recv_done(struct ib_cq *cq, struct ib_wc *wc);
- static void srpt_send_done(struct ib_cq *cq, struct ib_wc *wc);
- static void srpt_process_wait_list(struct srpt_rdma_ch *ch);
- 
-+/* Type of the entries in srpt_memory_caches. */
-+struct srpt_memory_cache_entry {
-+	refcount_t ref;
-+	struct kmem_cache *c;
-+};
-+
-+static struct kmem_cache *srpt_cache_get(unsigned int object_size)
-+{
-+	struct srpt_memory_cache_entry *e;
-+	char name[32];
-+	void *res;
-+
-+	guard(mutex)(&srpt_mc_mutex);
-+	e = xa_load(&srpt_memory_caches, object_size);
-+	if (e) {
-+		refcount_inc(&e->ref);
-+		return e->c;
-+	}
-+	snprintf(name, sizeof(name), "srpt-%u", object_size);
-+	e = kmalloc(sizeof(*e), GFP_KERNEL);
-+	if (!e)
-+		return NULL;
-+	refcount_set(&e->ref, 1);
-+	e->c = kmem_cache_create(name, object_size, /*align=*/512, 0, NULL);
-+	if (!e->c)
-+		goto free_entry;
-+	res = xa_store(&srpt_memory_caches, object_size, e, GFP_KERNEL);
-+	if (xa_is_err(res))
-+		goto destroy_cache;
-+	return e->c;
-+
-+destroy_cache:
-+	kmem_cache_destroy(e->c);
-+
-+free_entry:
-+	kfree(e);
-+	return NULL;
-+}
-+
-+static void srpt_cache_put(struct kmem_cache *c)
-+{
-+	struct srpt_memory_cache_entry *e = NULL;
-+	unsigned long object_size;
-+
-+	guard(mutex)(&srpt_mc_mutex);
-+	xa_for_each(&srpt_memory_caches, object_size, e)
-+		if (e->c == c)
-+			break;
-+	if (WARN_ON_ONCE(!e))
-+		return;
-+	if (!refcount_dec_and_test(&e->ref))
-+		return;
-+	WARN_ON_ONCE(xa_erase(&srpt_memory_caches, object_size) != e);
-+	kmem_cache_destroy(e->c);
-+	kfree(e);
-+}
-+
- /*
-  * The only allowed channel state changes are those that change the channel
-  * state into a state with a higher numerical value. Hence the new > prev test.
-@@ -2119,13 +2178,13 @@ static void srpt_release_channel_work(struct work_struct *w)
- 			     ch->sport->sdev, ch->rq_size,
- 			     ch->rsp_buf_cache, DMA_TO_DEVICE);
- 
--	kmem_cache_destroy(ch->rsp_buf_cache);
-+	srpt_cache_put(ch->rsp_buf_cache);
- 
- 	srpt_free_ioctx_ring((struct srpt_ioctx **)ch->ioctx_recv_ring,
- 			     sdev, ch->rq_size,
- 			     ch->req_buf_cache, DMA_FROM_DEVICE);
- 
--	kmem_cache_destroy(ch->req_buf_cache);
-+	srpt_cache_put(ch->req_buf_cache);
- 
- 	kref_put(&ch->kref, srpt_free_ch);
- }
-@@ -2245,8 +2304,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
- 	INIT_LIST_HEAD(&ch->cmd_wait_list);
- 	ch->max_rsp_size = ch->sport->port_attrib.srp_max_rsp_size;
- 
--	ch->rsp_buf_cache = kmem_cache_create("srpt-rsp-buf", ch->max_rsp_size,
--					      512, 0, NULL);
-+	ch->rsp_buf_cache = srpt_cache_get(ch->max_rsp_size);
- 	if (!ch->rsp_buf_cache)
- 		goto free_ch;
- 
-@@ -2280,8 +2338,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
- 		alignment_offset = round_up(imm_data_offset, 512) -
- 			imm_data_offset;
- 		req_sz = alignment_offset + imm_data_offset + srp_max_req_size;
--		ch->req_buf_cache = kmem_cache_create("srpt-req-buf", req_sz,
--						      512, 0, NULL);
-+		ch->req_buf_cache = srpt_cache_get(req_sz);
- 		if (!ch->req_buf_cache)
- 			goto free_rsp_ring;
- 
-@@ -2478,7 +2535,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
- 			     ch->req_buf_cache, DMA_FROM_DEVICE);
- 
- free_recv_cache:
--	kmem_cache_destroy(ch->req_buf_cache);
-+	srpt_cache_put(ch->req_buf_cache);
- 
- free_rsp_ring:
- 	srpt_free_ioctx_ring((struct srpt_ioctx **)ch->ioctx_ring,
-@@ -2486,7 +2543,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
- 			     ch->rsp_buf_cache, DMA_TO_DEVICE);
- 
- free_rsp_cache:
--	kmem_cache_destroy(ch->rsp_buf_cache);
-+	srpt_cache_put(ch->rsp_buf_cache);
- 
- free_ch:
- 	if (rdma_cm_id)
-@@ -3055,7 +3112,7 @@ static void srpt_free_srq(struct srpt_device *sdev)
- 	srpt_free_ioctx_ring((struct srpt_ioctx **)sdev->ioctx_ring, sdev,
- 			     sdev->srq_size, sdev->req_buf_cache,
- 			     DMA_FROM_DEVICE);
--	kmem_cache_destroy(sdev->req_buf_cache);
-+	srpt_cache_put(sdev->req_buf_cache);
- 	sdev->srq = NULL;
- }
- 
-@@ -3082,8 +3139,7 @@ static int srpt_alloc_srq(struct srpt_device *sdev)
- 	pr_debug("create SRQ #wr= %d max_allow=%d dev= %s\n", sdev->srq_size,
- 		 sdev->device->attrs.max_srq_wr, dev_name(&device->dev));
- 
--	sdev->req_buf_cache = kmem_cache_create("srpt-srq-req-buf",
--						srp_max_req_size, 0, 0, NULL);
-+	sdev->req_buf_cache = srpt_cache_get(srp_max_req_size);
- 	if (!sdev->req_buf_cache)
- 		goto free_srq;
- 
-@@ -3105,7 +3161,7 @@ static int srpt_alloc_srq(struct srpt_device *sdev)
- 	return 0;
- 
- free_cache:
--	kmem_cache_destroy(sdev->req_buf_cache);
-+	srpt_cache_put(sdev->req_buf_cache);
- 
- free_srq:
- 	ib_destroy_srq(srq);
-diff --git a/drivers/irqchip/irq-renesas-rzg2l.c b/drivers/irqchip/irq-renesas-rzg2l.c
-index ea4b921e5e1588..5a7836186fd414 100644
---- a/drivers/irqchip/irq-renesas-rzg2l.c
-+++ b/drivers/irqchip/irq-renesas-rzg2l.c
-@@ -8,6 +8,7 @@
-  */
- 
- #include <linux/bitfield.h>
-+#include <linux/cleanup.h>
- #include <linux/clk.h>
- #include <linux/err.h>
- #include <linux/io.h>
-@@ -18,6 +19,7 @@
- #include <linux/pm_runtime.h>
- #include <linux/reset.h>
- #include <linux/spinlock.h>
-+#include <linux/syscore_ops.h>
- 
- #define IRQC_IRQ_START			1
- #define IRQC_IRQ_COUNT			8
-@@ -55,12 +57,30 @@
- #define TINT_EXTRACT_HWIRQ(x)           FIELD_GET(GENMASK(15, 0), (x))
- #define TINT_EXTRACT_GPIOINT(x)         FIELD_GET(GENMASK(31, 16), (x))
- 
--struct rzg2l_irqc_priv {
--	void __iomem *base;
--	struct irq_fwspec fwspec[IRQC_NUM_IRQ];
--	raw_spinlock_t lock;
-+/**
-+ * struct rzg2l_irqc_reg_cache - registers cache (necessary for suspend/resume)
-+ * @iitsr: IITSR register
-+ * @titsr: TITSR registers
-+ */
-+struct rzg2l_irqc_reg_cache {
-+	u32	iitsr;
-+	u32	titsr[2];
- };
- 
-+/**
-+ * struct rzg2l_irqc_priv - IRQ controller private data structure
-+ * @base:	Controller's base address
-+ * @fwspec:	IRQ firmware specific data
-+ * @lock:	Lock to serialize access to hardware registers
-+ * @cache:	Registers cache for suspend/resume
-+ */
-+static struct rzg2l_irqc_priv {
-+	void __iomem			*base;
-+	struct irq_fwspec		fwspec[IRQC_NUM_IRQ];
-+	raw_spinlock_t			lock;
-+	struct rzg2l_irqc_reg_cache	cache;
-+} *rzg2l_irqc_data;
-+
- static struct rzg2l_irqc_priv *irq_data_to_priv(struct irq_data *data)
- {
- 	return data->domain->host_data;
-@@ -276,6 +296,38 @@ static int rzg2l_irqc_set_type(struct irq_data *d, unsigned int type)
- 	return irq_chip_set_type_parent(d, IRQ_TYPE_LEVEL_HIGH);
- }
- 
-+static int rzg2l_irqc_irq_suspend(void)
-+{
-+	struct rzg2l_irqc_reg_cache *cache = &rzg2l_irqc_data->cache;
-+	void __iomem *base = rzg2l_irqc_data->base;
-+
-+	cache->iitsr = readl_relaxed(base + IITSR);
-+	for (u8 i = 0; i < 2; i++)
-+		cache->titsr[i] = readl_relaxed(base + TITSR(i));
-+
-+	return 0;
-+}
-+
-+static void rzg2l_irqc_irq_resume(void)
-+{
-+	struct rzg2l_irqc_reg_cache *cache = &rzg2l_irqc_data->cache;
-+	void __iomem *base = rzg2l_irqc_data->base;
-+
-+	/*
-+	 * Restore only interrupt type. TSSRx will be restored at the
-+	 * request of pin controller to avoid spurious interrupts due
-+	 * to invalid PIN states.
-+	 */
-+	for (u8 i = 0; i < 2; i++)
-+		writel_relaxed(cache->titsr[i], base + TITSR(i));
-+	writel_relaxed(cache->iitsr, base + IITSR);
-+}
-+
-+static struct syscore_ops rzg2l_irqc_syscore_ops = {
-+	.suspend	= rzg2l_irqc_irq_suspend,
-+	.resume		= rzg2l_irqc_irq_resume,
-+};
-+
- static const struct irq_chip irqc_chip = {
- 	.name			= "rzg2l-irqc",
- 	.irq_eoi		= rzg2l_irqc_eoi,
-@@ -357,13 +409,12 @@ static int rzg2l_irqc_parse_interrupts(struct rzg2l_irqc_priv *priv,
- 
- static int rzg2l_irqc_init(struct device_node *node, struct device_node *parent)
- {
-+	struct platform_device *pdev = of_find_device_by_node(node);
-+	struct device *dev __free(put_device) = pdev ? &pdev->dev : NULL;
- 	struct irq_domain *irq_domain, *parent_domain;
--	struct platform_device *pdev;
- 	struct reset_control *resetn;
--	struct rzg2l_irqc_priv *priv;
- 	int ret;
- 
--	pdev = of_find_device_by_node(node);
- 	if (!pdev)
- 		return -ENODEV;
- 
-@@ -373,15 +424,15 @@ static int rzg2l_irqc_init(struct device_node *node, struct device_node *parent)
- 		return -ENODEV;
- 	}
- 
--	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
--	if (!priv)
-+	rzg2l_irqc_data = devm_kzalloc(&pdev->dev, sizeof(*rzg2l_irqc_data), GFP_KERNEL);
-+	if (!rzg2l_irqc_data)
- 		return -ENOMEM;
- 
--	priv->base = devm_of_iomap(&pdev->dev, pdev->dev.of_node, 0, NULL);
--	if (IS_ERR(priv->base))
--		return PTR_ERR(priv->base);
-+	rzg2l_irqc_data->base = devm_of_iomap(&pdev->dev, pdev->dev.of_node, 0, NULL);
-+	if (IS_ERR(rzg2l_irqc_data->base))
-+		return PTR_ERR(rzg2l_irqc_data->base);
- 
--	ret = rzg2l_irqc_parse_interrupts(priv, node);
-+	ret = rzg2l_irqc_parse_interrupts(rzg2l_irqc_data, node);
- 	if (ret) {
- 		dev_err(&pdev->dev, "cannot parse interrupts: %d\n", ret);
- 		return ret;
-@@ -404,17 +455,30 @@ static int rzg2l_irqc_init(struct device_node *node, struct device_node *parent)
- 		goto pm_disable;
- 	}
- 
--	raw_spin_lock_init(&priv->lock);
-+	raw_spin_lock_init(&rzg2l_irqc_data->lock);
- 
- 	irq_domain = irq_domain_add_hierarchy(parent_domain, 0, IRQC_NUM_IRQ,
- 					      node, &rzg2l_irqc_domain_ops,
--					      priv);
-+					      rzg2l_irqc_data);
- 	if (!irq_domain) {
- 		dev_err(&pdev->dev, "failed to add irq domain\n");
- 		ret = -ENOMEM;
- 		goto pm_put;
- 	}
- 
-+	register_syscore_ops(&rzg2l_irqc_syscore_ops);
-+
-+	/*
-+	 * Prevent the cleanup function from invoking put_device by assigning
-+	 * NULL to dev.
-+	 *
-+	 * make coccicheck will complain about missing put_device calls, but
-+	 * those are false positives, as dev will be automatically "put" via
-+	 * __free_put_device on the failing path.
-+	 * On the successful path we don't actually want to "put" dev.
-+	 */
-+	dev = NULL;
-+
- 	return 0;
- 
- pm_put:
-diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index 3877744193e2a0..062bcbe6255cff 100644
---- a/drivers/net/dsa/mv88e6xxx/chip.c
-+++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -6208,7 +6208,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
- 		.invalid_port_mask = BIT(1) | BIT(2) | BIT(8),
- 		.num_internal_phys = 5,
- 		.internal_phys_offset = 3,
--		.max_vid = 4095,
-+		.max_vid = 8191,
- 		.max_sid = 63,
- 		.port_base_addr = 0x0,
- 		.phy_base_addr = 0x0,
-diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h
-index f48a3c0ac7f968..f02518e93b60dc 100644
---- a/drivers/net/dsa/mv88e6xxx/chip.h
-+++ b/drivers/net/dsa/mv88e6xxx/chip.h
-@@ -206,6 +206,7 @@ struct mv88e6xxx_gpio_ops;
- struct mv88e6xxx_avb_ops;
- struct mv88e6xxx_ptp_ops;
- struct mv88e6xxx_pcs_ops;
-+struct mv88e6xxx_cc_coeffs;
- 
- struct mv88e6xxx_irq {
- 	u16 masked;
-@@ -397,6 +398,7 @@ struct mv88e6xxx_chip {
- 	struct cyclecounter	tstamp_cc;
- 	struct timecounter	tstamp_tc;
- 	struct delayed_work	overflow_work;
-+	const struct mv88e6xxx_cc_coeffs *cc_coeffs;
- 
- 	struct ptp_clock	*ptp_clock;
- 	struct ptp_clock_info	ptp_clock_info;
-@@ -719,10 +721,6 @@ struct mv88e6xxx_ptp_ops {
- 	int arr1_sts_reg;
- 	int dep_sts_reg;
- 	u32 rx_filters;
--	u32 cc_shift;
--	u32 cc_mult;
--	u32 cc_mult_num;
--	u32 cc_mult_dem;
- };
- 
- struct mv88e6xxx_pcs_ops {
-diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c
-index 5394a8cf7bf1d4..04053fdc6489af 100644
---- a/drivers/net/dsa/mv88e6xxx/port.c
-+++ b/drivers/net/dsa/mv88e6xxx/port.c
-@@ -1713,6 +1713,7 @@ int mv88e6393x_port_set_policy(struct mv88e6xxx_chip *chip, int port,
- 	ptr = shift / 8;
- 	shift %= 8;
- 	mask >>= ptr * 8;
-+	ptr <<= 8;
- 
- 	err = mv88e6393x_port_policy_read(chip, port, ptr, &reg);
- 	if (err)
-diff --git a/drivers/net/dsa/mv88e6xxx/ptp.c b/drivers/net/dsa/mv88e6xxx/ptp.c
-index ea17231dc34e3e..5980bb4ce43e0a 100644
---- a/drivers/net/dsa/mv88e6xxx/ptp.c
-+++ b/drivers/net/dsa/mv88e6xxx/ptp.c
-@@ -18,6 +18,13 @@
- 
- #define MV88E6XXX_MAX_ADJ_PPB	1000000
- 
-+struct mv88e6xxx_cc_coeffs {
-+	u32 cc_shift;
-+	u32 cc_mult;
-+	u32 cc_mult_num;
-+	u32 cc_mult_dem;
-+};
-+
- /* Family MV88E6250:
-  * Raw timestamps are in units of 10-ns clock periods.
-  *
-@@ -25,22 +32,43 @@
-  * simplifies to
-  * clkadj = scaled_ppm * 2^7 / 5^5
-  */
--#define MV88E6250_CC_SHIFT	28
--#define MV88E6250_CC_MULT	(10 << MV88E6250_CC_SHIFT)
--#define MV88E6250_CC_MULT_NUM	(1 << 7)
--#define MV88E6250_CC_MULT_DEM	3125ULL
-+#define MV88E6XXX_CC_10NS_SHIFT 28
-+static const struct mv88e6xxx_cc_coeffs mv88e6xxx_cc_10ns_coeffs = {
-+	.cc_shift = MV88E6XXX_CC_10NS_SHIFT,
-+	.cc_mult = 10 << MV88E6XXX_CC_10NS_SHIFT,
-+	.cc_mult_num = 1 << 7,
-+	.cc_mult_dem = 3125ULL,
-+};
- 
--/* Other families:
-+/* Other families except MV88E6393X in internal clock mode:
-  * Raw timestamps are in units of 8-ns clock periods.
-  *
-  * clkadj = scaled_ppm * 8*2^28 / (10^6 * 2^16)
-  * simplifies to
-  * clkadj = scaled_ppm * 2^9 / 5^6
-  */
--#define MV88E6XXX_CC_SHIFT	28
--#define MV88E6XXX_CC_MULT	(8 << MV88E6XXX_CC_SHIFT)
--#define MV88E6XXX_CC_MULT_NUM	(1 << 9)
--#define MV88E6XXX_CC_MULT_DEM	15625ULL
-+#define MV88E6XXX_CC_8NS_SHIFT 28
-+static const struct mv88e6xxx_cc_coeffs mv88e6xxx_cc_8ns_coeffs = {
-+	.cc_shift = MV88E6XXX_CC_8NS_SHIFT,
-+	.cc_mult = 8 << MV88E6XXX_CC_8NS_SHIFT,
-+	.cc_mult_num = 1 << 9,
-+	.cc_mult_dem = 15625ULL
-+};
-+
-+/* Family MV88E6393X using internal clock:
-+ * Raw timestamps are in units of 4-ns clock periods.
-+ *
-+ * clkadj = scaled_ppm * 4*2^28 / (10^6 * 2^16)
-+ * simplifies to
-+ * clkadj = scaled_ppm * 2^8 / 5^6
-+ */
-+#define MV88E6XXX_CC_4NS_SHIFT 28
-+static const struct mv88e6xxx_cc_coeffs mv88e6xxx_cc_4ns_coeffs = {
-+	.cc_shift = MV88E6XXX_CC_4NS_SHIFT,
-+	.cc_mult = 4 << MV88E6XXX_CC_4NS_SHIFT,
-+	.cc_mult_num = 1 << 8,
-+	.cc_mult_dem = 15625ULL
-+};
- 
- #define TAI_EVENT_WORK_INTERVAL msecs_to_jiffies(100)
- 
-@@ -83,6 +111,33 @@ static int mv88e6352_set_gpio_func(struct mv88e6xxx_chip *chip, int pin,
- 	return chip->info->ops->gpio_ops->set_pctl(chip, pin, func);
- }
- 
-+static const struct mv88e6xxx_cc_coeffs *
-+mv88e6xxx_cc_coeff_get(struct mv88e6xxx_chip *chip)
-+{
-+	u16 period_ps;
-+	int err;
-+
-+	err = mv88e6xxx_tai_read(chip, MV88E6XXX_TAI_CLOCK_PERIOD, &period_ps, 1);
-+	if (err) {
-+		dev_err(chip->dev, "failed to read cycle counter period: %d\n",
-+			err);
-+		return ERR_PTR(err);
-+	}
-+
-+	switch (period_ps) {
-+	case 4000:
-+		return &mv88e6xxx_cc_4ns_coeffs;
-+	case 8000:
-+		return &mv88e6xxx_cc_8ns_coeffs;
-+	case 10000:
-+		return &mv88e6xxx_cc_10ns_coeffs;
-+	default:
-+		dev_err(chip->dev, "unexpected cycle counter period of %u ps\n",
-+			period_ps);
-+		return ERR_PTR(-ENODEV);
-+	}
-+}
-+
- static u64 mv88e6352_ptp_clock_read(const struct cyclecounter *cc)
- {
- 	struct mv88e6xxx_chip *chip = cc_to_chip(cc);
-@@ -200,7 +255,6 @@ static void mv88e6352_tai_event_work(struct work_struct *ugly)
- static int mv88e6xxx_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)
- {
- 	struct mv88e6xxx_chip *chip = ptp_to_chip(ptp);
--	const struct mv88e6xxx_ptp_ops *ptp_ops = chip->info->ops->ptp_ops;
- 	int neg_adj = 0;
- 	u32 diff, mult;
- 	u64 adj;
-@@ -210,10 +264,10 @@ static int mv88e6xxx_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)
- 		scaled_ppm = -scaled_ppm;
- 	}
- 
--	mult = ptp_ops->cc_mult;
--	adj = ptp_ops->cc_mult_num;
-+	mult = chip->cc_coeffs->cc_mult;
-+	adj = chip->cc_coeffs->cc_mult_num;
- 	adj *= scaled_ppm;
--	diff = div_u64(adj, ptp_ops->cc_mult_dem);
-+	diff = div_u64(adj, chip->cc_coeffs->cc_mult_dem);
- 
- 	mv88e6xxx_reg_lock(chip);
- 
-@@ -360,10 +414,6 @@ const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops = {
- 		(1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |
- 		(1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |
- 		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),
--	.cc_shift = MV88E6XXX_CC_SHIFT,
--	.cc_mult = MV88E6XXX_CC_MULT,
--	.cc_mult_num = MV88E6XXX_CC_MULT_NUM,
--	.cc_mult_dem = MV88E6XXX_CC_MULT_DEM,
- };
- 
- const struct mv88e6xxx_ptp_ops mv88e6250_ptp_ops = {
-@@ -387,10 +437,6 @@ const struct mv88e6xxx_ptp_ops mv88e6250_ptp_ops = {
- 		(1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |
- 		(1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |
- 		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),
--	.cc_shift = MV88E6250_CC_SHIFT,
--	.cc_mult = MV88E6250_CC_MULT,
--	.cc_mult_num = MV88E6250_CC_MULT_NUM,
--	.cc_mult_dem = MV88E6250_CC_MULT_DEM,
- };
- 
- const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops = {
-@@ -414,10 +460,6 @@ const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops = {
- 		(1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |
- 		(1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |
- 		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),
--	.cc_shift = MV88E6XXX_CC_SHIFT,
--	.cc_mult = MV88E6XXX_CC_MULT,
--	.cc_mult_num = MV88E6XXX_CC_MULT_NUM,
--	.cc_mult_dem = MV88E6XXX_CC_MULT_DEM,
- };
- 
- const struct mv88e6xxx_ptp_ops mv88e6390_ptp_ops = {
-@@ -442,10 +484,6 @@ const struct mv88e6xxx_ptp_ops mv88e6390_ptp_ops = {
- 		(1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |
- 		(1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |
- 		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),
--	.cc_shift = MV88E6XXX_CC_SHIFT,
--	.cc_mult = MV88E6XXX_CC_MULT,
--	.cc_mult_num = MV88E6XXX_CC_MULT_NUM,
--	.cc_mult_dem = MV88E6XXX_CC_MULT_DEM,
- };
- 
- static u64 mv88e6xxx_ptp_clock_read(const struct cyclecounter *cc)
-@@ -458,10 +496,10 @@ static u64 mv88e6xxx_ptp_clock_read(const struct cyclecounter *cc)
- 	return 0;
- }
- 
--/* With a 125MHz input clock, the 32-bit timestamp counter overflows in ~34.3
-+/* With a 250MHz input clock, the 32-bit timestamp counter overflows in ~17.2
-  * seconds; this task forces periodic reads so that we don't miss any.
-  */
--#define MV88E6XXX_TAI_OVERFLOW_PERIOD (HZ * 16)
-+#define MV88E6XXX_TAI_OVERFLOW_PERIOD (HZ * 8)
- static void mv88e6xxx_ptp_overflow_check(struct work_struct *work)
- {
- 	struct delayed_work *dw = to_delayed_work(work);
-@@ -480,11 +518,15 @@ int mv88e6xxx_ptp_setup(struct mv88e6xxx_chip *chip)
- 	int i;
- 
- 	/* Set up the cycle counter */
-+	chip->cc_coeffs = mv88e6xxx_cc_coeff_get(chip);
-+	if (IS_ERR(chip->cc_coeffs))
-+		return PTR_ERR(chip->cc_coeffs);
-+
- 	memset(&chip->tstamp_cc, 0, sizeof(chip->tstamp_cc));
- 	chip->tstamp_cc.read	= mv88e6xxx_ptp_clock_read;
- 	chip->tstamp_cc.mask	= CYCLECOUNTER_MASK(32);
--	chip->tstamp_cc.mult	= ptp_ops->cc_mult;
--	chip->tstamp_cc.shift	= ptp_ops->cc_shift;
-+	chip->tstamp_cc.mult	= chip->cc_coeffs->cc_mult;
-+	chip->tstamp_cc.shift	= chip->cc_coeffs->cc_shift;
- 
- 	timecounter_init(&chip->tstamp_tc, &chip->tstamp_cc,
- 			 ktime_to_ns(ktime_get_real()));
-diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
-index 597a02c75d527f..e624d31d20d891 100644
---- a/drivers/net/ethernet/aeroflex/greth.c
-+++ b/drivers/net/ethernet/aeroflex/greth.c
-@@ -484,7 +484,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
- 
- 	if (unlikely(skb->len > MAX_FRAME_SIZE)) {
- 		dev->stats.tx_errors++;
--		goto out;
-+		goto len_error;
- 	}
- 
- 	/* Save skb pointer. */
-@@ -575,6 +575,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
- map_error:
- 	if (net_ratelimit())
- 		dev_warn(greth->dev, "Could not create TX DMA mapping\n");
-+len_error:
- 	dev_kfree_skb(skb);
- out:
- 	return err;
-diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
-index 6bf149d6459418..f0647286c68b25 100644
---- a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
-+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
-@@ -322,6 +322,7 @@ static netdev_tx_t bcmasp_xmit(struct sk_buff *skb, struct net_device *dev)
- 			}
- 			/* Rewind so we do not have a hole */
- 			spb_index = intf->tx_spb_index;
-+			dev_kfree_skb(skb);
- 			return NETDEV_TX_OK;
- 		}
- 
-diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
-index bf1611cce974a9..49e890a7e04a37 100644
---- a/drivers/net/ethernet/broadcom/bcmsysport.c
-+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
-@@ -1359,6 +1359,7 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,
- 		netif_err(priv, tx_err, dev, "DMA map failed at %p (len=%d)\n",
- 			  skb->data, skb_len);
- 		ret = NETDEV_TX_OK;
-+		dev_kfree_skb_any(skb);
- 		goto out;
- 	}
- 
-diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
-index ad862ed7888ac4..9d425ece33fd2a 100644
---- a/drivers/net/ethernet/emulex/benet/be_main.c
-+++ b/drivers/net/ethernet/emulex/benet/be_main.c
-@@ -1381,10 +1381,8 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev)
- 	be_get_wrb_params_from_skb(adapter, skb, &wrb_params);
- 
- 	wrb_cnt = be_xmit_enqueue(adapter, txo, skb, &wrb_params);
--	if (unlikely(!wrb_cnt)) {
--		dev_kfree_skb_any(skb);
--		goto drop;
--	}
-+	if (unlikely(!wrb_cnt))
-+		goto drop_skb;
- 
- 	/* if os2bmc is enabled and if the pkt is destined to bmc,
- 	 * enqueue the pkt a 2nd time with mgmt bit set.
-@@ -1393,7 +1391,7 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev)
- 		BE_WRB_F_SET(wrb_params.features, OS2BMC, 1);
- 		wrb_cnt = be_xmit_enqueue(adapter, txo, skb, &wrb_params);
- 		if (unlikely(!wrb_cnt))
--			goto drop;
-+			goto drop_skb;
- 		else
- 			skb_get(skb);
- 	}
-@@ -1407,6 +1405,8 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev)
- 		be_xmit_flush(adapter, txo);
- 
- 	return NETDEV_TX_OK;
-+drop_skb:
-+	dev_kfree_skb_any(skb);
- drop:
- 	tx_stats(txo)->tx_drv_drops++;
- 	/* Flush the already enqueued tx requests */
-diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c
-index 9767586b4eb329..11da139082e1bf 100644
---- a/drivers/net/ethernet/freescale/fman/mac.c
-+++ b/drivers/net/ethernet/freescale/fman/mac.c
-@@ -197,55 +197,67 @@ static int mac_probe(struct platform_device *_of_dev)
- 		err = -EINVAL;
- 		goto _return_of_node_put;
- 	}
-+	mac_dev->fman_dev = &of_dev->dev;
- 
- 	/* Get the FMan cell-index */
- 	err = of_property_read_u32(dev_node, "cell-index", &val);
- 	if (err) {
- 		dev_err(dev, "failed to read cell-index for %pOF\n", dev_node);
- 		err = -EINVAL;
--		goto _return_of_node_put;
-+		goto _return_dev_put;
- 	}
- 	/* cell-index 0 => FMan id 1 */
- 	fman_id = (u8)(val + 1);
- 
--	priv->fman = fman_bind(&of_dev->dev);
-+	priv->fman = fman_bind(mac_dev->fman_dev);
- 	if (!priv->fman) {
- 		dev_err(dev, "fman_bind(%pOF) failed\n", dev_node);
- 		err = -ENODEV;
--		goto _return_of_node_put;
-+		goto _return_dev_put;
- 	}
- 
-+	/* Two references have been taken in of_find_device_by_node()
-+	 * and fman_bind(). Release one of them here. The second one
-+	 * will be released in mac_remove().
-+	 */
-+	put_device(mac_dev->fman_dev);
- 	of_node_put(dev_node);
-+	dev_node = NULL;
- 
- 	/* Get the address of the memory mapped registers */
- 	mac_dev->res = platform_get_mem_or_io(_of_dev, 0);
- 	if (!mac_dev->res) {
- 		dev_err(dev, "could not get registers\n");
--		return -EINVAL;
-+		err = -EINVAL;
-+		goto _return_dev_put;
- 	}
- 
- 	err = devm_request_resource(dev, fman_get_mem_region(priv->fman),
- 				    mac_dev->res);
- 	if (err) {
- 		dev_err_probe(dev, err, "could not request resource\n");
--		return err;
-+		goto _return_dev_put;
- 	}
- 
- 	mac_dev->vaddr = devm_ioremap(dev, mac_dev->res->start,
- 				      resource_size(mac_dev->res));
- 	if (!mac_dev->vaddr) {
- 		dev_err(dev, "devm_ioremap() failed\n");
--		return -EIO;
-+		err = -EIO;
-+		goto _return_dev_put;
- 	}
- 
--	if (!of_device_is_available(mac_node))
--		return -ENODEV;
-+	if (!of_device_is_available(mac_node)) {
-+		err = -ENODEV;
-+		goto _return_dev_put;
-+	}
- 
- 	/* Get the cell-index */
- 	err = of_property_read_u32(mac_node, "cell-index", &val);
- 	if (err) {
- 		dev_err(dev, "failed to read cell-index for %pOF\n", mac_node);
--		return -EINVAL;
-+		err = -EINVAL;
-+		goto _return_dev_put;
- 	}
- 	priv->cell_index = (u8)val;
- 
-@@ -259,22 +271,26 @@ static int mac_probe(struct platform_device *_of_dev)
- 	if (unlikely(nph < 0)) {
- 		dev_err(dev, "of_count_phandle_with_args(%pOF, fsl,fman-ports) failed\n",
- 			mac_node);
--		return nph;
-+		err = nph;
-+		goto _return_dev_put;
- 	}
- 
- 	if (nph != ARRAY_SIZE(mac_dev->port)) {
- 		dev_err(dev, "Not supported number of fman-ports handles of mac node %pOF from device tree\n",
- 			mac_node);
--		return -EINVAL;
-+		err = -EINVAL;
-+		goto _return_dev_put;
- 	}
- 
--	for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) {
-+	/* PORT_NUM determines the size of the port array */
-+	for (i = 0; i < PORT_NUM; i++) {
- 		/* Find the port node */
- 		dev_node = of_parse_phandle(mac_node, "fsl,fman-ports", i);
- 		if (!dev_node) {
- 			dev_err(dev, "of_parse_phandle(%pOF, fsl,fman-ports) failed\n",
- 				mac_node);
--			return -EINVAL;
-+			err = -EINVAL;
-+			goto _return_dev_arr_put;
- 		}
- 
- 		of_dev = of_find_device_by_node(dev_node);
-@@ -282,17 +298,24 @@ static int mac_probe(struct platform_device *_of_dev)
- 			dev_err(dev, "of_find_device_by_node(%pOF) failed\n",
- 				dev_node);
- 			err = -EINVAL;
--			goto _return_of_node_put;
-+			goto _return_dev_arr_put;
- 		}
-+		mac_dev->fman_port_devs[i] = &of_dev->dev;
- 
--		mac_dev->port[i] = fman_port_bind(&of_dev->dev);
-+		mac_dev->port[i] = fman_port_bind(mac_dev->fman_port_devs[i]);
- 		if (!mac_dev->port[i]) {
- 			dev_err(dev, "dev_get_drvdata(%pOF) failed\n",
- 				dev_node);
- 			err = -EINVAL;
--			goto _return_of_node_put;
-+			goto _return_dev_arr_put;
- 		}
-+		/* Two references have been taken in of_find_device_by_node()
-+		 * and fman_port_bind(). Release one of them here. The second
-+		 * one will be released in mac_remove().
-+		 */
-+		put_device(mac_dev->fman_port_devs[i]);
- 		of_node_put(dev_node);
-+		dev_node = NULL;
- 	}
- 
- 	/* Get the PHY connection type */
-@@ -312,7 +335,7 @@ static int mac_probe(struct platform_device *_of_dev)
- 
- 	err = init(mac_dev, mac_node, &params);
- 	if (err < 0)
--		return err;
-+		goto _return_dev_arr_put;
- 
- 	if (!is_zero_ether_addr(mac_dev->addr))
- 		dev_info(dev, "FMan MAC address: %pM\n", mac_dev->addr);
-@@ -327,6 +350,12 @@ static int mac_probe(struct platform_device *_of_dev)
- 
- 	return err;
- 
-+_return_dev_arr_put:
-+	/* mac_dev is kzalloc'ed */
-+	for (i = 0; i < PORT_NUM; i++)
-+		put_device(mac_dev->fman_port_devs[i]);
-+_return_dev_put:
-+	put_device(mac_dev->fman_dev);
- _return_of_node_put:
- 	of_node_put(dev_node);
- 	return err;
-@@ -335,6 +364,11 @@ static int mac_probe(struct platform_device *_of_dev)
- static void mac_remove(struct platform_device *pdev)
- {
- 	struct mac_device *mac_dev = platform_get_drvdata(pdev);
-+	int		   i;
-+
-+	for (i = 0; i < PORT_NUM; i++)
-+		put_device(mac_dev->fman_port_devs[i]);
-+	put_device(mac_dev->fman_dev);
- 
- 	platform_device_unregister(mac_dev->priv->eth_dev);
- }
-diff --git a/drivers/net/ethernet/freescale/fman/mac.h b/drivers/net/ethernet/freescale/fman/mac.h
-index fe747915cc7379..8b5b43d50f8efb 100644
---- a/drivers/net/ethernet/freescale/fman/mac.h
-+++ b/drivers/net/ethernet/freescale/fman/mac.h
-@@ -19,12 +19,13 @@
- struct fman_mac;
- struct mac_priv_s;
- 
-+#define PORT_NUM 2
- struct mac_device {
- 	void __iomem		*vaddr;
- 	struct device		*dev;
- 	struct resource		*res;
- 	u8			 addr[ETH_ALEN];
--	struct fman_port	*port[2];
-+	struct fman_port	*port[PORT_NUM];
- 	struct phylink		*phylink;
- 	struct phylink_config	phylink_config;
- 	phy_interface_t		phy_if;
-@@ -52,6 +53,9 @@ struct mac_device {
- 
- 	struct fman_mac		*fman_mac;
- 	struct mac_priv_s	*priv;
-+
-+	struct device		*fman_dev;
-+	struct device		*fman_port_devs[PORT_NUM];
- };
- 
- static inline struct mac_device
-diff --git a/drivers/net/ethernet/i825xx/sun3_82586.c b/drivers/net/ethernet/i825xx/sun3_82586.c
-index f2d4669c81cf29..58a3d28d938c32 100644
---- a/drivers/net/ethernet/i825xx/sun3_82586.c
-+++ b/drivers/net/ethernet/i825xx/sun3_82586.c
-@@ -1012,6 +1012,7 @@ sun3_82586_send_packet(struct sk_buff *skb, struct net_device *dev)
- 	if(skb->len > XMIT_BUFF_SIZE)
- 	{
- 		printk("%s: Sorry, max. framelength is %d bytes. The length of your frame is %d bytes.\n",dev->name,XMIT_BUFF_SIZE,skb->len);
-+		dev_kfree_skb(skb);
- 		return NETDEV_TX_OK;
- 	}
- 
-diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c b/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c
-index 3c43f807852850..c7f4e3c058b7fa 100644
---- a/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c
-+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c
-@@ -336,6 +336,51 @@ static int octep_oq_check_hw_for_pkts(struct octep_device *oct,
- 	return new_pkts;
- }
- 
-+/**
-+ * octep_oq_next_pkt() - Move to the next packet in Rx queue.
-+ *
-+ * @oq: Octeon Rx queue data structure.
-+ * @buff_info: Current packet buffer info.
-+ * @read_idx: Current packet index in the ring.
-+ * @desc_used: Current packet descriptor number.
-+ *
-+ * Free the resources associated with a packet.
-+ * Increment packet index in the ring and packet descriptor number.
-+ */
-+static void octep_oq_next_pkt(struct octep_oq *oq,
-+			      struct octep_rx_buffer *buff_info,
-+			      u32 *read_idx, u32 *desc_used)
-+{
-+	dma_unmap_page(oq->dev, oq->desc_ring[*read_idx].buffer_ptr,
-+		       PAGE_SIZE, DMA_FROM_DEVICE);
-+	buff_info->page = NULL;
-+	(*read_idx)++;
-+	(*desc_used)++;
-+	if (*read_idx == oq->max_count)
-+		*read_idx = 0;
-+}
-+
-+/**
-+ * octep_oq_drop_rx() - Free the resources associated with a packet.
-+ *
-+ * @oq: Octeon Rx queue data structure.
-+ * @buff_info: Current packet buffer info.
-+ * @read_idx: Current packet index in the ring.
-+ * @desc_used: Current packet descriptor number.
-+ *
-+ */
-+static void octep_oq_drop_rx(struct octep_oq *oq,
-+			     struct octep_rx_buffer *buff_info,
-+			     u32 *read_idx, u32 *desc_used)
-+{
-+	int data_len = buff_info->len - oq->max_single_buffer_size;
-+
-+	while (data_len > 0) {
-+		octep_oq_next_pkt(oq, buff_info, read_idx, desc_used);
-+		data_len -= oq->buffer_size;
-+	};
-+}
-+
- /**
-  * __octep_oq_process_rx() - Process hardware Rx queue and push to stack.
-  *
-@@ -365,10 +410,7 @@ static int __octep_oq_process_rx(struct octep_device *oct,
- 	desc_used = 0;
- 	for (pkt = 0; pkt < pkts_to_process; pkt++) {
- 		buff_info = (struct octep_rx_buffer *)&oq->buff_info[read_idx];
--		dma_unmap_page(oq->dev, oq->desc_ring[read_idx].buffer_ptr,
--			       PAGE_SIZE, DMA_FROM_DEVICE);
- 		resp_hw = page_address(buff_info->page);
--		buff_info->page = NULL;
- 
- 		/* Swap the length field that is in Big-Endian to CPU */
- 		buff_info->len = be64_to_cpu(resp_hw->length);
-@@ -390,36 +432,33 @@ static int __octep_oq_process_rx(struct octep_device *oct,
- 			 */
- 			data_offset = OCTEP_OQ_RESP_HW_SIZE;
- 		}
-+
-+		octep_oq_next_pkt(oq, buff_info, &read_idx, &desc_used);
-+
-+		skb = build_skb((void *)resp_hw, PAGE_SIZE);
-+		if (!skb) {
-+			octep_oq_drop_rx(oq, buff_info,
-+					 &read_idx, &desc_used);
-+			oq->stats.alloc_failures++;
-+			continue;
-+		}
-+		skb_reserve(skb, data_offset);
-+
- 		rx_bytes += buff_info->len;
- 
- 		if (buff_info->len <= oq->max_single_buffer_size) {
--			skb = build_skb((void *)resp_hw, PAGE_SIZE);
--			skb_reserve(skb, data_offset);
- 			skb_put(skb, buff_info->len);
--			read_idx++;
--			desc_used++;
--			if (read_idx == oq->max_count)
--				read_idx = 0;
- 		} else {
- 			struct skb_shared_info *shinfo;
- 			u16 data_len;
- 
--			skb = build_skb((void *)resp_hw, PAGE_SIZE);
--			skb_reserve(skb, data_offset);
- 			/* Head fragment includes response header(s);
- 			 * subsequent fragments contains only data.
- 			 */
- 			skb_put(skb, oq->max_single_buffer_size);
--			read_idx++;
--			desc_used++;
--			if (read_idx == oq->max_count)
--				read_idx = 0;
--
- 			shinfo = skb_shinfo(skb);
- 			data_len = buff_info->len - oq->max_single_buffer_size;
- 			while (data_len) {
--				dma_unmap_page(oq->dev, oq->desc_ring[read_idx].buffer_ptr,
--					       PAGE_SIZE, DMA_FROM_DEVICE);
- 				buff_info = (struct octep_rx_buffer *)
- 					    &oq->buff_info[read_idx];
- 				if (data_len < oq->buffer_size) {
-@@ -434,11 +473,8 @@ static int __octep_oq_process_rx(struct octep_device *oct,
- 						buff_info->page, 0,
- 						buff_info->len,
- 						buff_info->len);
--				buff_info->page = NULL;
--				read_idx++;
--				desc_used++;
--				if (read_idx == oq->max_count)
--					read_idx = 0;
-+
-+				octep_oq_next_pkt(oq, buff_info, &read_idx, &desc_used);
- 			}
- 		}
- 
-diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
-index 224a025283ca7d..29487518ca6724 100644
---- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
-+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
-@@ -2298,7 +2298,7 @@ static int nix_smq_flush(struct rvu *rvu, int blkaddr,
- 				 NIX_AF_TL3_TL2X_LINKX_CFG(tl2_tl3_link_schq, link));
- 		if (!(cfg & BIT_ULL(12)))
- 			continue;
--		bmap |= (1 << i);
-+		bmap |= BIT_ULL(i);
- 		cfg &= ~BIT_ULL(12);
- 		rvu_write64(rvu, blkaddr,
- 			    NIX_AF_TL3_TL2X_LINKX_CFG(tl2_tl3_link_schq, link), cfg);
-@@ -2319,7 +2319,7 @@ static int nix_smq_flush(struct rvu *rvu, int blkaddr,
- 
- 	/* Set NIX_AF_TL3_TL2_LINKX_CFG[ENA] for the TL3/TL2 queue */
- 	for (i = 0; i < (rvu->hw->cgx_links + rvu->hw->lbk_links); i++) {
--		if (!(bmap & (1 << i)))
-+		if (!(bmap & BIT_ULL(i)))
- 			continue;
- 		cfg = rvu_read64(rvu, blkaddr,
- 				 NIX_AF_TL3_TL2X_LINKX_CFG(tl2_tl3_link_schq, link));
-diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
-index 48dc4ae87af092..80af0fc7101fdc 100644
---- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
-+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
-@@ -1758,6 +1758,10 @@ static void mlx5_cmd_comp_handler(struct mlx5_core_dev *dev, u64 vec, bool force
- 	}
- }
- 
-+#define MLX5_MAX_MANAGE_PAGES_CMD_ENT 1
-+#define MLX5_CMD_MASK ((1UL << (cmd->vars.max_reg_cmds + \
-+			   MLX5_MAX_MANAGE_PAGES_CMD_ENT)) - 1)
-+
- static void mlx5_cmd_trigger_completions(struct mlx5_core_dev *dev)
- {
- 	struct mlx5_cmd *cmd = &dev->cmd;
-@@ -1769,7 +1773,7 @@ static void mlx5_cmd_trigger_completions(struct mlx5_core_dev *dev)
- 	/* wait for pending handlers to complete */
- 	mlx5_eq_synchronize_cmd_irq(dev);
- 	spin_lock_irqsave(&dev->cmd.alloc_lock, flags);
--	vector = ~dev->cmd.vars.bitmask & ((1ul << (1 << dev->cmd.vars.log_sz)) - 1);
-+	vector = ~dev->cmd.vars.bitmask & MLX5_CMD_MASK;
- 	if (!vector)
- 		goto no_trig;
- 
-@@ -2275,7 +2279,7 @@ int mlx5_cmd_enable(struct mlx5_core_dev *dev)
- 
- 	cmd->state = MLX5_CMDIF_STATE_DOWN;
- 	cmd->vars.max_reg_cmds = (1 << cmd->vars.log_sz) - 1;
--	cmd->vars.bitmask = (1UL << cmd->vars.max_reg_cmds) - 1;
-+	cmd->vars.bitmask = MLX5_CMD_MASK;
- 
- 	sema_init(&cmd->vars.sem, cmd->vars.max_reg_cmds);
- 	sema_init(&cmd->vars.pages_sem, 1);
-diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
-index 40a6cb052a2da3..07a04195490920 100644
---- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c
-+++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
-@@ -1073,6 +1073,12 @@ int mlx5_comp_eqn_get(struct mlx5_core_dev *dev, u16 vecidx, int *eqn)
- 	struct mlx5_eq_comp *eq;
- 	int ret = 0;
- 
-+	if (vecidx >= table->max_comp_eqs) {
-+		mlx5_core_dbg(dev, "Requested vector index %u should be less than %u",
-+			      vecidx, table->max_comp_eqs);
-+		return -EINVAL;
-+	}
-+
- 	mutex_lock(&table->comp_lock);
- 	eq = xa_load(&table->comp_eqs, vecidx);
- 	if (eq) {
-diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
-index 1789800faaeb62..f6022c135ec023 100644
---- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
-+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
-@@ -1489,7 +1489,7 @@ int mlx5_eswitch_enable_locked(struct mlx5_eswitch *esw, int num_vfs)
- 	}
- 
- 	if (err)
--		goto abort;
-+		goto err_esw_enable;
- 
- 	esw->fdb_table.flags |= MLX5_ESW_FDB_CREATED;
- 
-@@ -1503,7 +1503,8 @@ int mlx5_eswitch_enable_locked(struct mlx5_eswitch *esw, int num_vfs)
- 
- 	return 0;
- 
--abort:
-+err_esw_enable:
-+	mlx5_eq_notifier_unregister(esw->dev, &esw->nb);
- 	mlx5_esw_acls_ns_cleanup(esw);
- 	return err;
- }
-diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
-index b499d8ea6d216f..6856eb602f8260 100644
---- a/drivers/net/ethernet/realtek/r8169_main.c
-+++ b/drivers/net/ethernet/realtek/r8169_main.c
-@@ -4576,7 +4576,9 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
- 	if ((status & 0xffff) == 0xffff || !(status & tp->irq_mask))
- 		return IRQ_NONE;
- 
--	if (unlikely(status & SYSErr)) {
-+	/* At least RTL8168fp may unexpectedly set the SYSErr bit */
-+	if (unlikely(status & SYSErr &&
-+	    tp->mac_version <= RTL_GIGA_MAC_VER_06)) {
- 		rtl8169_pcierr_interrupt(tp->dev);
- 		goto out;
- 	}
-diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
-index c6897e6ea362d9..58fdc4f8dd4835 100644
---- a/drivers/net/ethernet/renesas/ravb_main.c
-+++ b/drivers/net/ethernet/renesas/ravb_main.c
-@@ -1673,20 +1673,19 @@ static int ravb_get_ts_info(struct net_device *ndev,
- 	struct ravb_private *priv = netdev_priv(ndev);
- 	const struct ravb_hw_info *hw_info = priv->info;
- 
--	info->so_timestamping =
--		SOF_TIMESTAMPING_TX_SOFTWARE |
--		SOF_TIMESTAMPING_RX_SOFTWARE |
--		SOF_TIMESTAMPING_SOFTWARE |
--		SOF_TIMESTAMPING_TX_HARDWARE |
--		SOF_TIMESTAMPING_RX_HARDWARE |
--		SOF_TIMESTAMPING_RAW_HARDWARE;
--	info->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON);
--	info->rx_filters =
--		(1 << HWTSTAMP_FILTER_NONE) |
--		(1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |
--		(1 << HWTSTAMP_FILTER_ALL);
--	if (hw_info->gptp || hw_info->ccc_gac)
-+	if (hw_info->gptp || hw_info->ccc_gac) {
-+		info->so_timestamping =
-+			SOF_TIMESTAMPING_TX_SOFTWARE |
-+			SOF_TIMESTAMPING_TX_HARDWARE |
-+			SOF_TIMESTAMPING_RX_HARDWARE |
-+			SOF_TIMESTAMPING_RAW_HARDWARE;
-+		info->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON);
-+		info->rx_filters =
-+			(1 << HWTSTAMP_FILTER_NONE) |
-+			(1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |
-+			(1 << HWTSTAMP_FILTER_ALL);
- 		info->phc_index = ptp_clock_index(priv->ptp.clock);
-+	}
- 
- 	return 0;
- }
-diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c
-index e0f3cbd36852e3..e2d61a3a7712d3 100644
---- a/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c
-@@ -127,10 +127,12 @@ static int mgbe_uphy_lane_bringup_serdes_up(struct net_device *ndev, void *mgbe_
- 	value &= ~XPCS_WRAP_UPHY_RX_CONTROL_AUX_RX_IDDQ;
- 	writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
- 
-+	usleep_range(10, 20);  /* 50ns min delay needed as per HW design */
- 	value = readl(mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
- 	value &= ~XPCS_WRAP_UPHY_RX_CONTROL_RX_SLEEP;
- 	writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
- 
-+	usleep_range(10, 20);  /* 500ns min delay needed as per HW design */
- 	value = readl(mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
- 	value |= XPCS_WRAP_UPHY_RX_CONTROL_RX_CAL_EN;
- 	writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
-@@ -143,22 +145,30 @@ static int mgbe_uphy_lane_bringup_serdes_up(struct net_device *ndev, void *mgbe_
- 		return err;
- 	}
- 
-+	usleep_range(10, 20);  /* 50ns min delay needed as per HW design */
- 	value = readl(mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
- 	value |= XPCS_WRAP_UPHY_RX_CONTROL_RX_DATA_EN;
- 	writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
- 
- 	value = readl(mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
--	value |= XPCS_WRAP_UPHY_RX_CONTROL_RX_CDR_RESET;
-+	value &= ~XPCS_WRAP_UPHY_RX_CONTROL_RX_PCS_PHY_RDY;
- 	writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
- 
-+	usleep_range(10, 20);  /* 50ns min delay needed as per HW design */
- 	value = readl(mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
--	value &= ~XPCS_WRAP_UPHY_RX_CONTROL_RX_CDR_RESET;
-+	value |= XPCS_WRAP_UPHY_RX_CONTROL_RX_CDR_RESET;
- 	writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
- 
-+	usleep_range(10, 20);  /* 50ns min delay needed as per HW design */
- 	value = readl(mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
- 	value |= XPCS_WRAP_UPHY_RX_CONTROL_RX_PCS_PHY_RDY;
- 	writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
- 
-+	msleep(30);  /* 30ms delay needed as per HW design */
-+	value = readl(mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
-+	value &= ~XPCS_WRAP_UPHY_RX_CONTROL_RX_CDR_RESET;
-+	writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL);
-+
- 	err = readl_poll_timeout(mgbe->xpcs + XPCS_WRAP_IRQ_STATUS, value,
- 				 value & XPCS_WRAP_IRQ_STATUS_PCS_LINK_STS,
- 				 500, 500 * 2000);
-diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
-index 62c10eb4f0adf1..9f779653ed6225 100644
---- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
-+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
-@@ -845,6 +845,7 @@ axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
- 		if (net_ratelimit())
- 			netdev_err(ndev, "TX DMA mapping error\n");
- 		ndev->stats.tx_dropped++;
-+		dev_kfree_skb_any(skb);
- 		return NETDEV_TX_OK;
- 	}
- 	desc_set_phys_addr(lp, phys, cur_p);
-@@ -865,6 +866,7 @@ axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
- 			ndev->stats.tx_dropped++;
- 			axienet_free_tx_chain(lp, orig_tail_ptr, ii + 1,
- 					      true, NULL, 0);
-+			dev_kfree_skb_any(skb);
- 			return NETDEV_TX_OK;
- 		}
- 		desc_set_phys_addr(lp, phys, cur_p);
-diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
-index 9d2d66a4aafd56..8698d2db3dc8e1 100644
---- a/drivers/net/hyperv/netvsc_drv.c
-+++ b/drivers/net/hyperv/netvsc_drv.c
-@@ -2795,6 +2795,31 @@ static struct  hv_driver netvsc_drv = {
- 	},
- };
- 
-+/* Set VF's namespace same as the synthetic NIC */
-+static void netvsc_event_set_vf_ns(struct net_device *ndev)
-+{
-+	struct net_device_context *ndev_ctx = netdev_priv(ndev);
-+	struct net_device *vf_netdev;
-+	int ret;
-+
-+	vf_netdev = rtnl_dereference(ndev_ctx->vf_netdev);
-+	if (!vf_netdev)
-+		return;
-+
-+	if (!net_eq(dev_net(ndev), dev_net(vf_netdev))) {
-+		ret = dev_change_net_namespace(vf_netdev, dev_net(ndev),
-+					       "eth%d");
-+		if (ret)
-+			netdev_err(vf_netdev,
-+				   "Cannot move to same namespace as %s: %d\n",
-+				   ndev->name, ret);
-+		else
-+			netdev_info(vf_netdev,
-+				    "Moved VF to namespace with: %s\n",
-+				    ndev->name);
-+	}
-+}
-+
- /*
-  * On Hyper-V, every VF interface is matched with a corresponding
-  * synthetic interface. The synthetic interface is presented first
-@@ -2807,6 +2832,11 @@ static int netvsc_netdev_event(struct notifier_block *this,
- 	struct net_device *event_dev = netdev_notifier_info_to_dev(ptr);
- 	int ret = 0;
- 
-+	if (event_dev->netdev_ops == &device_ops && event == NETDEV_REGISTER) {
-+		netvsc_event_set_vf_ns(event_dev);
-+		return NOTIFY_DONE;
-+	}
-+
- 	ret = check_dev_is_matching_vf(event_dev);
- 	if (ret != 0)
- 		return NOTIFY_DONE;
-diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
-index 778fb77c5a9372..2ada8baf815b15 100644
---- a/drivers/net/macsec.c
-+++ b/drivers/net/macsec.c
-@@ -151,19 +151,6 @@ static struct macsec_rx_sa *macsec_rxsa_get(struct macsec_rx_sa __rcu *ptr)
- 	return sa;
- }
- 
--static struct macsec_rx_sa *macsec_active_rxsa_get(struct macsec_rx_sc *rx_sc)
--{
--	struct macsec_rx_sa *sa = NULL;
--	int an;
--
--	for (an = 0; an < MACSEC_NUM_AN; an++)	{
--		sa = macsec_rxsa_get(rx_sc->sa[an]);
--		if (sa)
--			break;
--	}
--	return sa;
--}
--
- static void free_rx_sc_rcu(struct rcu_head *head)
- {
- 	struct macsec_rx_sc *rx_sc = container_of(head, struct macsec_rx_sc, rcu_head);
-@@ -1205,15 +1192,12 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb)
- 		/* If validateFrames is Strict or the C bit in the
- 		 * SecTAG is set, discard
- 		 */
--		struct macsec_rx_sa *active_rx_sa = macsec_active_rxsa_get(rx_sc);
- 		if (hdr->tci_an & MACSEC_TCI_C ||
- 		    secy->validate_frames == MACSEC_VALIDATE_STRICT) {
- 			u64_stats_update_begin(&rxsc_stats->syncp);
- 			rxsc_stats->stats.InPktsNotUsingSA++;
- 			u64_stats_update_end(&rxsc_stats->syncp);
- 			DEV_STATS_INC(secy->netdev, rx_errors);
--			if (active_rx_sa)
--				this_cpu_inc(active_rx_sa->stats->InPktsNotUsingSA);
- 			goto drop_nosa;
- 		}
- 
-@@ -1223,8 +1207,6 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb)
- 		u64_stats_update_begin(&rxsc_stats->syncp);
- 		rxsc_stats->stats.InPktsUnusedSA++;
- 		u64_stats_update_end(&rxsc_stats->syncp);
--		if (active_rx_sa)
--			this_cpu_inc(active_rx_sa->stats->InPktsUnusedSA);
- 		goto deliver;
- 	}
- 
-diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
-index 92a7a36b93ac0c..3e0b61202f0c98 100644
---- a/drivers/net/netdevsim/dev.c
-+++ b/drivers/net/netdevsim/dev.c
-@@ -836,7 +836,8 @@ static void nsim_dev_trap_report_work(struct work_struct *work)
- 	nsim_dev = nsim_trap_data->nsim_dev;
- 
- 	if (!devl_trylock(priv_to_devlink(nsim_dev))) {
--		schedule_delayed_work(&nsim_dev->trap_data->trap_report_dw, 1);
-+		queue_delayed_work(system_unbound_wq,
-+				   &nsim_dev->trap_data->trap_report_dw, 1);
- 		return;
- 	}
- 
-@@ -848,11 +849,12 @@ static void nsim_dev_trap_report_work(struct work_struct *work)
- 			continue;
- 
- 		nsim_dev_trap_report(nsim_dev_port);
-+		cond_resched();
- 	}
- 	devl_unlock(priv_to_devlink(nsim_dev));
--
--	schedule_delayed_work(&nsim_dev->trap_data->trap_report_dw,
--			      msecs_to_jiffies(NSIM_TRAP_REPORT_INTERVAL_MS));
-+	queue_delayed_work(system_unbound_wq,
-+			   &nsim_dev->trap_data->trap_report_dw,
-+			   msecs_to_jiffies(NSIM_TRAP_REPORT_INTERVAL_MS));
- }
- 
- static int nsim_dev_traps_init(struct devlink *devlink)
-@@ -907,8 +909,9 @@ static int nsim_dev_traps_init(struct devlink *devlink)
- 
- 	INIT_DELAYED_WORK(&nsim_dev->trap_data->trap_report_dw,
- 			  nsim_dev_trap_report_work);
--	schedule_delayed_work(&nsim_dev->trap_data->trap_report_dw,
--			      msecs_to_jiffies(NSIM_TRAP_REPORT_INTERVAL_MS));
-+	queue_delayed_work(system_unbound_wq,
-+			   &nsim_dev->trap_data->trap_report_dw,
-+			   msecs_to_jiffies(NSIM_TRAP_REPORT_INTERVAL_MS));
- 
- 	return 0;
- 
-diff --git a/drivers/net/phy/dp83822.c b/drivers/net/phy/dp83822.c
-index 29e1cbea6dc0c3..507726a08f82d1 100644
---- a/drivers/net/phy/dp83822.c
-+++ b/drivers/net/phy/dp83822.c
-@@ -40,8 +40,8 @@
- /* Control Register 2 bits */
- #define DP83822_FX_ENABLE	BIT(14)
- 
--#define DP83822_HW_RESET	BIT(15)
--#define DP83822_SW_RESET	BIT(14)
-+#define DP83822_SW_RESET	BIT(15)
-+#define DP83822_DIG_RESTART	BIT(14)
- 
- /* PHY STS bits */
- #define DP83822_PHYSTS_DUPLEX			BIT(2)
-diff --git a/drivers/net/plip/plip.c b/drivers/net/plip/plip.c
-index 40ce8abe699954..6019811920a441 100644
---- a/drivers/net/plip/plip.c
-+++ b/drivers/net/plip/plip.c
-@@ -815,7 +815,7 @@ plip_send_packet(struct net_device *dev, struct net_local *nl,
- 				return HS_TIMEOUT;
- 			}
- 		}
--		break;
-+		fallthrough;
- 
- 	case PLIP_PK_LENGTH_LSB:
- 		if (plip_send(nibble_timeout, dev,
-diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
-index 60c58dd6d25311..9f66c47dc58bc7 100644
---- a/drivers/net/usb/usbnet.c
-+++ b/drivers/net/usb/usbnet.c
-@@ -1771,7 +1771,8 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
- 		// can rename the link if it knows better.
- 		if ((dev->driver_info->flags & FLAG_ETHER) != 0 &&
- 		    ((dev->driver_info->flags & FLAG_POINTTOPOINT) == 0 ||
--		     (net->dev_addr [0] & 0x02) == 0))
-+		     /* somebody touched it*/
-+		     !is_zero_ether_addr(net->dev_addr)))
- 			strscpy(net->name, "eth%d", sizeof(net->name));
- 		/* WLAN devices should always be named "wlan%d" */
- 		if ((dev->driver_info->flags & FLAG_WLAN) != 0)
-@@ -1874,6 +1875,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
- 	 * may trigger an error resubmitting itself and, worse,
- 	 * schedule a timer. So we kill it all just in case.
- 	 */
-+	usbnet_mark_going_away(dev);
- 	cancel_work_sync(&dev->kevent);
- 	del_timer_sync(&dev->delay);
- 	free_percpu(net->tstats);
-diff --git a/drivers/net/vmxnet3/vmxnet3_xdp.c b/drivers/net/vmxnet3/vmxnet3_xdp.c
-index a6c787454a1aeb..1341374a4588a0 100644
---- a/drivers/net/vmxnet3/vmxnet3_xdp.c
-+++ b/drivers/net/vmxnet3/vmxnet3_xdp.c
-@@ -148,7 +148,7 @@ vmxnet3_xdp_xmit_frame(struct vmxnet3_adapter *adapter,
- 	} else { /* XDP buffer from page pool */
- 		page = virt_to_page(xdpf->data);
- 		tbi->dma_addr = page_pool_get_dma_addr(page) +
--				VMXNET3_XDP_HEADROOM;
-+				(xdpf->data - (void *)xdpf);
- 		dma_sync_single_for_device(&adapter->pdev->dev,
- 					   tbi->dma_addr, buf_size,
- 					   DMA_TO_DEVICE);
-diff --git a/drivers/net/wwan/wwan_core.c b/drivers/net/wwan/wwan_core.c
-index 284ab1f56391aa..45ed3afc443df9 100644
---- a/drivers/net/wwan/wwan_core.c
-+++ b/drivers/net/wwan/wwan_core.c
-@@ -1031,7 +1031,7 @@ static const struct nla_policy wwan_rtnl_policy[IFLA_WWAN_MAX + 1] = {
- 
- static struct rtnl_link_ops wwan_rtnl_link_ops __read_mostly = {
- 	.kind = "wwan",
--	.maxtype = __IFLA_WWAN_MAX,
-+	.maxtype = IFLA_WWAN_MAX,
- 	.alloc = wwan_rtnl_alloc,
- 	.validate = wwan_rtnl_validate,
- 	.newlink = wwan_rtnl_newlink,
-diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
-index 32b5cc76a0223c..b701969cf1c2aa 100644
---- a/drivers/nvme/host/pci.c
-+++ b/drivers/nvme/host/pci.c
-@@ -2469,17 +2469,29 @@ static unsigned int nvme_pci_nr_maps(struct nvme_dev *dev)
- 	return 1;
- }
- 
--static void nvme_pci_update_nr_queues(struct nvme_dev *dev)
-+static bool nvme_pci_update_nr_queues(struct nvme_dev *dev)
- {
- 	if (!dev->ctrl.tagset) {
- 		nvme_alloc_io_tag_set(&dev->ctrl, &dev->tagset, &nvme_mq_ops,
- 				nvme_pci_nr_maps(dev), sizeof(struct nvme_iod));
--		return;
-+		return true;
-+	}
-+
-+	/* Give up if we are racing with nvme_dev_disable() */
-+	if (!mutex_trylock(&dev->shutdown_lock))
-+		return false;
-+
-+	/* Check if nvme_dev_disable() has been executed already */
-+	if (!dev->online_queues) {
-+		mutex_unlock(&dev->shutdown_lock);
-+		return false;
- 	}
- 
- 	blk_mq_update_nr_hw_queues(&dev->tagset, dev->online_queues - 1);
- 	/* free previously allocated queues that are no longer usable */
- 	nvme_free_queues(dev, dev->online_queues);
-+	mutex_unlock(&dev->shutdown_lock);
-+	return true;
- }
- 
- static int nvme_pci_enable(struct nvme_dev *dev)
-@@ -2757,10 +2769,11 @@ static void nvme_reset_work(struct work_struct *work)
- 	 * controller around but remove all namespaces.
- 	 */
- 	if (dev->online_queues > 1) {
-+		nvme_dbbuf_set(dev);
- 		nvme_unquiesce_io_queues(&dev->ctrl);
- 		nvme_wait_freeze(&dev->ctrl);
--		nvme_pci_update_nr_queues(dev);
--		nvme_dbbuf_set(dev);
-+		if (!nvme_pci_update_nr_queues(dev))
-+			goto out;
- 		nvme_unfreeze(&dev->ctrl);
- 	} else {
- 		dev_warn(dev->ctrl.device, "IO queues lost\n");
-diff --git a/drivers/platform/x86/dell/dell-wmi-base.c b/drivers/platform/x86/dell/dell-wmi-base.c
-index 502783a7adb118..24fd7ffadda952 100644
---- a/drivers/platform/x86/dell/dell-wmi-base.c
-+++ b/drivers/platform/x86/dell/dell-wmi-base.c
-@@ -264,6 +264,15 @@ static const struct key_entry dell_wmi_keymap_type_0010[] = {
- 	/*Speaker Mute*/
- 	{ KE_KEY, 0x109, { KEY_MUTE} },
- 
-+	/* S2Idle screen off */
-+	{ KE_IGNORE, 0x120, { KEY_RESERVED }},
-+
-+	/* Leaving S4 or S2Idle suspend */
-+	{ KE_IGNORE, 0x130, { KEY_RESERVED }},
-+
-+	/* Entering S2Idle suspend */
-+	{ KE_IGNORE, 0x140, { KEY_RESERVED }},
-+
- 	/* Mic mute */
- 	{ KE_KEY, 0x150, { KEY_MICMUTE } },
- 
-diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
-index b929b4f824205e..af49dd6b31ade7 100644
---- a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
-+++ b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
-@@ -521,6 +521,7 @@ static int __init sysman_init(void)
- 	int ret = 0;
- 
- 	if (!dmi_find_device(DMI_DEV_TYPE_OEM_STRING, "Dell System", NULL) &&
-+	    !dmi_find_device(DMI_DEV_TYPE_OEM_STRING, "Alienware", NULL) &&
- 	    !dmi_find_device(DMI_DEV_TYPE_OEM_STRING, "www.dell.com", NULL)) {
- 		pr_err("Unable to run on non-Dell system\n");
- 		return -ENODEV;
-diff --git a/drivers/powercap/dtpm_devfreq.c b/drivers/powercap/dtpm_devfreq.c
-index 612c3b59dd5bef..0ca53db7a90eb3 100644
---- a/drivers/powercap/dtpm_devfreq.c
-+++ b/drivers/powercap/dtpm_devfreq.c
-@@ -166,7 +166,7 @@ static int __dtpm_devfreq_setup(struct devfreq *devfreq, struct dtpm *parent)
- 	ret = dev_pm_qos_add_request(dev, &dtpm_devfreq->qos_req,
- 				     DEV_PM_QOS_MAX_FREQUENCY,
- 				     PM_QOS_MAX_FREQUENCY_DEFAULT_VALUE);
--	if (ret) {
-+	if (ret < 0) {
- 		pr_err("Failed to add QoS request: %d\n", ret);
- 		goto out_dtpm_unregister;
- 	}
-diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
-index 86590a7e29f6ae..dd041ee18ac9be 100644
---- a/drivers/target/target_core_device.c
-+++ b/drivers/target/target_core_device.c
-@@ -692,7 +692,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
- 
- 	dev->queues = kcalloc(nr_cpu_ids, sizeof(*dev->queues), GFP_KERNEL);
- 	if (!dev->queues) {
--		dev->transport->free_device(dev);
-+		hba->backend->ops->free_device(dev);
- 		return NULL;
- 	}
- 
-diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
-index 22cc6cac0ba2b5..2e100b76914a06 100644
---- a/drivers/target/target_core_user.c
-+++ b/drivers/target/target_core_user.c
-@@ -2130,7 +2130,7 @@ static int tcmu_netlink_event_send(struct tcmu_dev *udev,
- 	}
- 
- 	ret = genlmsg_multicast_allns(&tcmu_genl_family, skb, 0,
--				      TCMU_MCGRP_CONFIG, GFP_KERNEL);
-+				      TCMU_MCGRP_CONFIG);
- 
- 	/* Wait during an add as the listener may not be up yet */
- 	if (ret == 0 ||
-diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
-index af851e4e8c8a76..8cbe19574bbcbc 100644
---- a/drivers/usb/dwc3/core.c
-+++ b/drivers/usb/dwc3/core.c
-@@ -2106,6 +2106,11 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
- {
- 	u32 reg;
- 
-+	dwc->susphy_state = (dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)) &
-+			    DWC3_GUSB2PHYCFG_SUSPHY) ||
-+			    (dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0)) &
-+			    DWC3_GUSB3PIPECTL_SUSPHY);
-+
- 	switch (dwc->current_dr_role) {
- 	case DWC3_GCTL_PRTCAP_DEVICE:
- 		if (pm_runtime_suspended(dwc->dev))
-@@ -2153,6 +2158,15 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
- 		break;
- 	}
- 
-+	if (!PMSG_IS_AUTO(msg)) {
-+		/*
-+		 * TI AM62 platform requires SUSPHY to be
-+		 * enabled for system suspend to work.
-+		 */
-+		if (!dwc->susphy_state)
-+			dwc3_enable_susphy(dwc, true);
-+	}
-+
- 	return 0;
- }
- 
-@@ -2215,6 +2229,11 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg)
- 		break;
- 	}
- 
-+	if (!PMSG_IS_AUTO(msg)) {
-+		/* restore SUSPHY state to that before system suspend. */
-+		dwc3_enable_susphy(dwc, dwc->susphy_state);
-+	}
-+
- 	return 0;
- }
- 
-diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
-index 420753205fafa1..3325796f3cb451 100644
---- a/drivers/usb/dwc3/core.h
-+++ b/drivers/usb/dwc3/core.h
-@@ -1127,6 +1127,8 @@ struct dwc3_scratchpad_array {
-  * @sys_wakeup: set if the device may do system wakeup.
-  * @wakeup_configured: set if the device is configured for remote wakeup.
-  * @suspended: set to track suspend event due to U3/L2.
-+ * @susphy_state: state of DWC3_GUSB2PHYCFG_SUSPHY + DWC3_GUSB3PIPECTL_SUSPHY
-+ *		  before PM suspend.
-  * @imod_interval: set the interrupt moderation interval in 250ns
-  *			increments or 0 to disable.
-  * @max_cfg_eps: current max number of IN eps used across all USB configs.
-@@ -1351,6 +1353,7 @@ struct dwc3 {
- 	unsigned		sys_wakeup:1;
- 	unsigned		wakeup_configured:1;
- 	unsigned		suspended:1;
-+	unsigned		susphy_state:1;
- 
- 	u16			imod_interval;
- 
-diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c
-index 0219cd79493a73..b3dc5f5164f42c 100644
---- a/drivers/usb/gadget/function/f_uac2.c
-+++ b/drivers/usb/gadget/function/f_uac2.c
-@@ -2042,7 +2042,7 @@ static ssize_t f_uac2_opts_##name##_show(struct config_item *item,	\
- 	int result;							\
- 									\
- 	mutex_lock(&opts->lock);					\
--	result = snprintf(page, sizeof(opts->name), "%s", opts->name);	\
-+	result = scnprintf(page, sizeof(opts->name), "%s", opts->name);	\
- 	mutex_unlock(&opts->lock);					\
- 									\
- 	return result;							\
-@@ -2052,7 +2052,7 @@ static ssize_t f_uac2_opts_##name##_store(struct config_item *item,	\
- 					  const char *page, size_t len)	\
- {									\
- 	struct f_uac2_opts *opts = to_f_uac2_opts(item);		\
--	int ret = 0;							\
-+	int ret = len;							\
- 									\
- 	mutex_lock(&opts->lock);					\
- 	if (opts->refcnt) {						\
-@@ -2060,8 +2060,11 @@ static ssize_t f_uac2_opts_##name##_store(struct config_item *item,	\
- 		goto end;						\
- 	}								\
- 									\
--	ret = snprintf(opts->name, min(sizeof(opts->name), len),	\
--			"%s", page);					\
-+	if (len && page[len - 1] == '\n')				\
-+		len--;							\
-+									\
-+	scnprintf(opts->name, min(sizeof(opts->name), len + 1),		\
-+		  "%s", page);						\
- 									\
- end:									\
- 	mutex_unlock(&opts->lock);					\
-@@ -2178,7 +2181,7 @@ static struct usb_function_instance *afunc_alloc_inst(void)
- 	opts->req_number = UAC2_DEF_REQ_NUM;
- 	opts->fb_max = FBACK_FAST_MAX;
- 
--	snprintf(opts->function_name, sizeof(opts->function_name), "Source/Sink");
-+	scnprintf(opts->function_name, sizeof(opts->function_name), "Source/Sink");
- 
- 	return &opts->func_inst;
- }
-diff --git a/drivers/usb/host/xhci-caps.h b/drivers/usb/host/xhci-caps.h
-new file mode 100644
-index 00000000000000..9e94cebf4a56d1
---- /dev/null
-+++ b/drivers/usb/host/xhci-caps.h
-@@ -0,0 +1,85 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+
-+/* hc_capbase bitmasks */
-+/* bits 7:0 - how long is the Capabilities register */
-+#define HC_LENGTH(p)		XHCI_HC_LENGTH(p)
-+/* bits 31:16	*/
-+#define HC_VERSION(p)		(((p) >> 16) & 0xffff)
-+
-+/* HCSPARAMS1 - hcs_params1 - bitmasks */
-+/* bits 0:7, Max Device Slots */
-+#define HCS_MAX_SLOTS(p)	(((p) >> 0) & 0xff)
-+#define HCS_SLOTS_MASK		0xff
-+/* bits 8:18, Max Interrupters */
-+#define HCS_MAX_INTRS(p)	(((p) >> 8) & 0x7ff)
-+/* bits 24:31, Max Ports - max value is 0x7F = 127 ports */
-+#define HCS_MAX_PORTS(p)	(((p) >> 24) & 0x7f)
-+
-+/* HCSPARAMS2 - hcs_params2 - bitmasks */
-+/* bits 0:3, frames or uframes that SW needs to queue transactions
-+ * ahead of the HW to meet periodic deadlines */
-+#define HCS_IST(p)		(((p) >> 0) & 0xf)
-+/* bits 4:7, max number of Event Ring segments */
-+#define HCS_ERST_MAX(p)		(((p) >> 4) & 0xf)
-+/* bits 21:25 Hi 5 bits of Scratchpad buffers SW must allocate for the HW */
-+/* bit 26 Scratchpad restore - for save/restore HW state - not used yet */
-+/* bits 27:31 Lo 5 bits of Scratchpad buffers SW must allocate for the HW */
-+#define HCS_MAX_SCRATCHPAD(p)   ((((p) >> 16) & 0x3e0) | (((p) >> 27) & 0x1f))
-+
-+/* HCSPARAMS3 - hcs_params3 - bitmasks */
-+/* bits 0:7, Max U1 to U0 latency for the roothub ports */
-+#define HCS_U1_LATENCY(p)	(((p) >> 0) & 0xff)
-+/* bits 16:31, Max U2 to U0 latency for the roothub ports */
-+#define HCS_U2_LATENCY(p)	(((p) >> 16) & 0xffff)
-+
-+/* HCCPARAMS - hcc_params - bitmasks */
-+/* true: HC can use 64-bit address pointers */
-+#define HCC_64BIT_ADDR(p)	((p) & (1 << 0))
-+/* true: HC can do bandwidth negotiation */
-+#define HCC_BANDWIDTH_NEG(p)	((p) & (1 << 1))
-+/* true: HC uses 64-byte Device Context structures
-+ * FIXME 64-byte context structures aren't supported yet.
-+ */
-+#define HCC_64BYTE_CONTEXT(p)	((p) & (1 << 2))
-+/* true: HC has port power switches */
-+#define HCC_PPC(p)		((p) & (1 << 3))
-+/* true: HC has port indicators */
-+#define HCS_INDICATOR(p)	((p) & (1 << 4))
-+/* true: HC has Light HC Reset Capability */
-+#define HCC_LIGHT_RESET(p)	((p) & (1 << 5))
-+/* true: HC supports latency tolerance messaging */
-+#define HCC_LTC(p)		((p) & (1 << 6))
-+/* true: no secondary Stream ID Support */
-+#define HCC_NSS(p)		((p) & (1 << 7))
-+/* true: HC supports Stopped - Short Packet */
-+#define HCC_SPC(p)		((p) & (1 << 9))
-+/* true: HC has Contiguous Frame ID Capability */
-+#define HCC_CFC(p)		((p) & (1 << 11))
-+/* Max size for Primary Stream Arrays - 2^(n+1), where n is bits 12:15 */
-+#define HCC_MAX_PSA(p)		(1 << ((((p) >> 12) & 0xf) + 1))
-+/* Extended Capabilities pointer from PCI base - section 5.3.6 */
-+#define HCC_EXT_CAPS(p)		XHCI_HCC_EXT_CAPS(p)
-+
-+#define CTX_SIZE(_hcc)		(HCC_64BYTE_CONTEXT(_hcc) ? 64 : 32)
-+
-+/* db_off bitmask - bits 0:1 reserved */
-+#define	DBOFF_MASK	(~0x3)
-+
-+/* run_regs_off bitmask - bits 0:4 reserved */
-+#define	RTSOFF_MASK	(~0x1f)
-+
-+/* HCCPARAMS2 - hcc_params2 - bitmasks */
-+/* true: HC supports U3 entry Capability */
-+#define	HCC2_U3C(p)		((p) & (1 << 0))
-+/* true: HC supports Configure endpoint command Max exit latency too large */
-+#define	HCC2_CMC(p)		((p) & (1 << 1))
-+/* true: HC supports Force Save context Capability */
-+#define	HCC2_FSC(p)		((p) & (1 << 2))
-+/* true: HC supports Compliance Transition Capability */
-+#define	HCC2_CTC(p)		((p) & (1 << 3))
-+/* true: HC support Large ESIT payload Capability > 48k */
-+#define	HCC2_LEC(p)		((p) & (1 << 4))
-+/* true: HC support Configuration Information Capability */
-+#define	HCC2_CIC(p)		((p) & (1 << 5))
-+/* true: HC support Extended TBC Capability, Isoc burst count > 65535 */
-+#define	HCC2_ETC(p)		((p) & (1 << 6))
-diff --git a/drivers/usb/host/xhci-dbgcap.h b/drivers/usb/host/xhci-dbgcap.h
-index 51a7ab3ba0cac0..76170d7a7e7c35 100644
---- a/drivers/usb/host/xhci-dbgcap.h
-+++ b/drivers/usb/host/xhci-dbgcap.h
-@@ -108,7 +108,7 @@ struct dbc_port {
- 	struct tasklet_struct		push;
- 
- 	struct list_head		write_pool;
--	struct kfifo			write_fifo;
-+	unsigned int			tx_boundary;
- 
- 	bool				registered;
- };
-diff --git a/drivers/usb/host/xhci-dbgtty.c b/drivers/usb/host/xhci-dbgtty.c
-index b74e98e9439326..0266c2f5bc0d8e 100644
---- a/drivers/usb/host/xhci-dbgtty.c
-+++ b/drivers/usb/host/xhci-dbgtty.c
-@@ -25,16 +25,26 @@ static inline struct dbc_port *dbc_to_port(struct xhci_dbc *dbc)
- }
- 
- static unsigned int
--dbc_send_packet(struct dbc_port *port, char *packet, unsigned int size)
-+dbc_kfifo_to_req(struct dbc_port *port, char *packet)
- {
--	unsigned int		len;
--
--	len = kfifo_len(&port->write_fifo);
--	if (len < size)
--		size = len;
--	if (size != 0)
--		size = kfifo_out(&port->write_fifo, packet, size);
--	return size;
-+	unsigned int	len;
-+
-+	len = kfifo_len(&port->port.xmit_fifo);
-+
-+	if (len == 0)
-+		return 0;
-+
-+	len = min(len, DBC_MAX_PACKET);
-+
-+	if (port->tx_boundary)
-+		len = min(port->tx_boundary, len);
-+
-+	len = kfifo_out(&port->port.xmit_fifo, packet, len);
-+
-+	if (port->tx_boundary)
-+		port->tx_boundary -= len;
-+
-+	return len;
- }
- 
- static int dbc_start_tx(struct dbc_port *port)
-@@ -49,7 +59,7 @@ static int dbc_start_tx(struct dbc_port *port)
- 
- 	while (!list_empty(pool)) {
- 		req = list_entry(pool->next, struct dbc_request, list_pool);
--		len = dbc_send_packet(port, req->buf, DBC_MAX_PACKET);
-+		len = dbc_kfifo_to_req(port, req->buf);
- 		if (len == 0)
- 			break;
- 		do_tty_wake = true;
-@@ -213,14 +223,32 @@ static ssize_t dbc_tty_write(struct tty_struct *tty, const u8 *buf,
- {
- 	struct dbc_port		*port = tty->driver_data;
- 	unsigned long		flags;
-+	unsigned int		written = 0;
- 
- 	spin_lock_irqsave(&port->port_lock, flags);
--	if (count)
--		count = kfifo_in(&port->write_fifo, buf, count);
--	dbc_start_tx(port);
-+
-+	/*
-+	 * Treat tty write as one usb transfer. Make sure the writes are turned
-+	 * into TRB request having the same size boundaries as the tty writes.
-+	 * Don't add data to kfifo before previous write is turned into TRBs
-+	 */
-+	if (port->tx_boundary) {
-+		spin_unlock_irqrestore(&port->port_lock, flags);
-+		return 0;
-+	}
-+
-+	if (count) {
-+		written = kfifo_in(&port->port.xmit_fifo, buf, count);
-+
-+		if (written == count)
-+			port->tx_boundary = kfifo_len(&port->port.xmit_fifo);
-+
-+		dbc_start_tx(port);
-+	}
-+
- 	spin_unlock_irqrestore(&port->port_lock, flags);
- 
--	return count;
-+	return written;
- }
- 
- static int dbc_tty_put_char(struct tty_struct *tty, u8 ch)
-@@ -230,7 +258,7 @@ static int dbc_tty_put_char(struct tty_struct *tty, u8 ch)
- 	int			status;
- 
- 	spin_lock_irqsave(&port->port_lock, flags);
--	status = kfifo_put(&port->write_fifo, ch);
-+	status = kfifo_put(&port->port.xmit_fifo, ch);
- 	spin_unlock_irqrestore(&port->port_lock, flags);
- 
- 	return status;
-@@ -253,7 +281,11 @@ static unsigned int dbc_tty_write_room(struct tty_struct *tty)
- 	unsigned int		room;
- 
- 	spin_lock_irqsave(&port->port_lock, flags);
--	room = kfifo_avail(&port->write_fifo);
-+	room = kfifo_avail(&port->port.xmit_fifo);
-+
-+	if (port->tx_boundary)
-+		room = 0;
-+
- 	spin_unlock_irqrestore(&port->port_lock, flags);
- 
- 	return room;
-@@ -266,7 +298,7 @@ static unsigned int dbc_tty_chars_in_buffer(struct tty_struct *tty)
- 	unsigned int		chars;
- 
- 	spin_lock_irqsave(&port->port_lock, flags);
--	chars = kfifo_len(&port->write_fifo);
-+	chars = kfifo_len(&port->port.xmit_fifo);
- 	spin_unlock_irqrestore(&port->port_lock, flags);
- 
- 	return chars;
-@@ -424,7 +456,8 @@ static int xhci_dbc_tty_register_device(struct xhci_dbc *dbc)
- 		goto err_idr;
- 	}
- 
--	ret = kfifo_alloc(&port->write_fifo, DBC_WRITE_BUF_SIZE, GFP_KERNEL);
-+	ret = kfifo_alloc(&port->port.xmit_fifo, DBC_WRITE_BUF_SIZE,
-+			  GFP_KERNEL);
- 	if (ret)
- 		goto err_exit_port;
- 
-@@ -453,7 +486,7 @@ static int xhci_dbc_tty_register_device(struct xhci_dbc *dbc)
- 	xhci_dbc_free_requests(&port->read_pool);
- 	xhci_dbc_free_requests(&port->write_pool);
- err_free_fifo:
--	kfifo_free(&port->write_fifo);
-+	kfifo_free(&port->port.xmit_fifo);
- err_exit_port:
- 	idr_remove(&dbc_tty_minors, port->minor);
- err_idr:
-@@ -478,7 +511,7 @@ static void xhci_dbc_tty_unregister_device(struct xhci_dbc *dbc)
- 	idr_remove(&dbc_tty_minors, port->minor);
- 	mutex_unlock(&dbc_tty_minors_lock);
- 
--	kfifo_free(&port->write_fifo);
-+	kfifo_free(&port->port.xmit_fifo);
- 	xhci_dbc_free_requests(&port->read_pool);
- 	xhci_dbc_free_requests(&port->read_queue);
- 	xhci_dbc_free_requests(&port->write_pool);
-diff --git a/drivers/usb/host/xhci-port.h b/drivers/usb/host/xhci-port.h
-new file mode 100644
-index 00000000000000..f19efb966d180c
---- /dev/null
-+++ b/drivers/usb/host/xhci-port.h
-@@ -0,0 +1,176 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+
-+/* PORTSC - Port Status and Control Register - port_status_base bitmasks */
-+/* true: device connected */
-+#define PORT_CONNECT	(1 << 0)
-+/* true: port enabled */
-+#define PORT_PE		(1 << 1)
-+/* bit 2 reserved and zeroed */
-+/* true: port has an over-current condition */
-+#define PORT_OC		(1 << 3)
-+/* true: port reset signaling asserted */
-+#define PORT_RESET	(1 << 4)
-+/* Port Link State - bits 5:8
-+ * A read gives the current link PM state of the port,
-+ * a write with Link State Write Strobe set sets the link state.
-+ */
-+#define PORT_PLS_MASK	(0xf << 5)
-+#define XDEV_U0		(0x0 << 5)
-+#define XDEV_U1		(0x1 << 5)
-+#define XDEV_U2		(0x2 << 5)
-+#define XDEV_U3		(0x3 << 5)
-+#define XDEV_DISABLED	(0x4 << 5)
-+#define XDEV_RXDETECT	(0x5 << 5)
-+#define XDEV_INACTIVE	(0x6 << 5)
-+#define XDEV_POLLING	(0x7 << 5)
-+#define XDEV_RECOVERY	(0x8 << 5)
-+#define XDEV_HOT_RESET	(0x9 << 5)
-+#define XDEV_COMP_MODE	(0xa << 5)
-+#define XDEV_TEST_MODE	(0xb << 5)
-+#define XDEV_RESUME	(0xf << 5)
-+
-+/* true: port has power (see HCC_PPC) */
-+#define PORT_POWER	(1 << 9)
-+/* bits 10:13 indicate device speed:
-+ * 0 - undefined speed - port hasn't be initialized by a reset yet
-+ * 1 - full speed
-+ * 2 - low speed
-+ * 3 - high speed
-+ * 4 - super speed
-+ * 5-15 reserved
-+ */
-+#define DEV_SPEED_MASK		(0xf << 10)
-+#define	XDEV_FS			(0x1 << 10)
-+#define	XDEV_LS			(0x2 << 10)
-+#define	XDEV_HS			(0x3 << 10)
-+#define	XDEV_SS			(0x4 << 10)
-+#define	XDEV_SSP		(0x5 << 10)
-+#define DEV_UNDEFSPEED(p)	(((p) & DEV_SPEED_MASK) == (0x0<<10))
-+#define DEV_FULLSPEED(p)	(((p) & DEV_SPEED_MASK) == XDEV_FS)
-+#define DEV_LOWSPEED(p)		(((p) & DEV_SPEED_MASK) == XDEV_LS)
-+#define DEV_HIGHSPEED(p)	(((p) & DEV_SPEED_MASK) == XDEV_HS)
-+#define DEV_SUPERSPEED(p)	(((p) & DEV_SPEED_MASK) == XDEV_SS)
-+#define DEV_SUPERSPEEDPLUS(p)	(((p) & DEV_SPEED_MASK) == XDEV_SSP)
-+#define DEV_SUPERSPEED_ANY(p)	(((p) & DEV_SPEED_MASK) >= XDEV_SS)
-+#define DEV_PORT_SPEED(p)	(((p) >> 10) & 0x0f)
-+
-+/* Bits 20:23 in the Slot Context are the speed for the device */
-+#define	SLOT_SPEED_FS		(XDEV_FS << 10)
-+#define	SLOT_SPEED_LS		(XDEV_LS << 10)
-+#define	SLOT_SPEED_HS		(XDEV_HS << 10)
-+#define	SLOT_SPEED_SS		(XDEV_SS << 10)
-+#define	SLOT_SPEED_SSP		(XDEV_SSP << 10)
-+/* Port Indicator Control */
-+#define PORT_LED_OFF	(0 << 14)
-+#define PORT_LED_AMBER	(1 << 14)
-+#define PORT_LED_GREEN	(2 << 14)
-+#define PORT_LED_MASK	(3 << 14)
-+/* Port Link State Write Strobe - set this when changing link state */
-+#define PORT_LINK_STROBE	(1 << 16)
-+/* true: connect status change */
-+#define PORT_CSC	(1 << 17)
-+/* true: port enable change */
-+#define PORT_PEC	(1 << 18)
-+/* true: warm reset for a USB 3.0 device is done.  A "hot" reset puts the port
-+ * into an enabled state, and the device into the default state.  A "warm" reset
-+ * also resets the link, forcing the device through the link training sequence.
-+ * SW can also look at the Port Reset register to see when warm reset is done.
-+ */
-+#define PORT_WRC	(1 << 19)
-+/* true: over-current change */
-+#define PORT_OCC	(1 << 20)
-+/* true: reset change - 1 to 0 transition of PORT_RESET */
-+#define PORT_RC		(1 << 21)
-+/* port link status change - set on some port link state transitions:
-+ *  Transition				Reason
-+ *  ------------------------------------------------------------------------------
-+ *  - U3 to Resume			Wakeup signaling from a device
-+ *  - Resume to Recovery to U0		USB 3.0 device resume
-+ *  - Resume to U0			USB 2.0 device resume
-+ *  - U3 to Recovery to U0		Software resume of USB 3.0 device complete
-+ *  - U3 to U0				Software resume of USB 2.0 device complete
-+ *  - U2 to U0				L1 resume of USB 2.1 device complete
-+ *  - U0 to U0 (???)			L1 entry rejection by USB 2.1 device
-+ *  - U0 to disabled			L1 entry error with USB 2.1 device
-+ *  - Any state to inactive		Error on USB 3.0 port
-+ */
-+#define PORT_PLC	(1 << 22)
-+/* port configure error change - port failed to configure its link partner */
-+#define PORT_CEC	(1 << 23)
-+#define PORT_CHANGE_MASK	(PORT_CSC | PORT_PEC | PORT_WRC | PORT_OCC | \
-+				 PORT_RC | PORT_PLC | PORT_CEC)
-+
-+
-+/* Cold Attach Status - xHC can set this bit to report device attached during
-+ * Sx state. Warm port reset should be perfomed to clear this bit and move port
-+ * to connected state.
-+ */
-+#define PORT_CAS	(1 << 24)
-+/* wake on connect (enable) */
-+#define PORT_WKCONN_E	(1 << 25)
-+/* wake on disconnect (enable) */
-+#define PORT_WKDISC_E	(1 << 26)
-+/* wake on over-current (enable) */
-+#define PORT_WKOC_E	(1 << 27)
-+/* bits 28:29 reserved */
-+/* true: device is non-removable - for USB 3.0 roothub emulation */
-+#define PORT_DEV_REMOVE	(1 << 30)
-+/* Initiate a warm port reset - complete when PORT_WRC is '1' */
-+#define PORT_WR		(1 << 31)
-+
-+/* We mark duplicate entries with -1 */
-+#define DUPLICATE_ENTRY ((u8)(-1))
-+
-+/* Port Power Management Status and Control - port_power_base bitmasks */
-+/* Inactivity timer value for transitions into U1, in microseconds.
-+ * Timeout can be up to 127us.  0xFF means an infinite timeout.
-+ */
-+#define PORT_U1_TIMEOUT(p)	((p) & 0xff)
-+#define PORT_U1_TIMEOUT_MASK	0xff
-+/* Inactivity timer value for transitions into U2 */
-+#define PORT_U2_TIMEOUT(p)	(((p) & 0xff) << 8)
-+#define PORT_U2_TIMEOUT_MASK	(0xff << 8)
-+/* Bits 24:31 for port testing */
-+
-+/* USB2 Protocol PORTSPMSC */
-+#define	PORT_L1S_MASK		7
-+#define	PORT_L1S_SUCCESS	1
-+#define	PORT_RWE		(1 << 3)
-+#define	PORT_HIRD(p)		(((p) & 0xf) << 4)
-+#define	PORT_HIRD_MASK		(0xf << 4)
-+#define	PORT_L1DS_MASK		(0xff << 8)
-+#define	PORT_L1DS(p)		(((p) & 0xff) << 8)
-+#define	PORT_HLE		(1 << 16)
-+#define PORT_TEST_MODE_SHIFT	28
-+
-+/* USB3 Protocol PORTLI  Port Link Information */
-+#define PORT_RX_LANES(p)	(((p) >> 16) & 0xf)
-+#define PORT_TX_LANES(p)	(((p) >> 20) & 0xf)
-+
-+/* USB2 Protocol PORTHLPMC */
-+#define PORT_HIRDM(p)((p) & 3)
-+#define PORT_L1_TIMEOUT(p)(((p) & 0xff) << 2)
-+#define PORT_BESLD(p)(((p) & 0xf) << 10)
-+
-+/* use 512 microseconds as USB2 LPM L1 default timeout. */
-+#define XHCI_L1_TIMEOUT		512
-+
-+/* Set default HIRD/BESL value to 4 (350/400us) for USB2 L1 LPM resume latency.
-+ * Safe to use with mixed HIRD and BESL systems (host and device) and is used
-+ * by other operating systems.
-+ *
-+ * XHCI 1.0 errata 8/14/12 Table 13 notes:
-+ * "Software should choose xHC BESL/BESLD field values that do not violate a
-+ * device's resume latency requirements,
-+ * e.g. not program values > '4' if BLC = '1' and a HIRD device is attached,
-+ * or not program values < '4' if BLC = '0' and a BESL device is attached.
-+ */
-+#define XHCI_DEFAULT_BESL	4
-+
-+/*
-+ * USB3 specification define a 360ms tPollingLFPSTiemout for USB3 ports
-+ * to complete link training. usually link trainig completes much faster
-+ * so check status 10 times with 36ms sleep in places we need to wait for
-+ * polling to complete.
-+ */
-+#define XHCI_PORT_POLLING_LFPS_TIME  36
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index 7754ed55d220b3..f2190d121233b2 100644
---- a/drivers/usb/host/xhci.h
-+++ b/drivers/usb/host/xhci.h
-@@ -23,6 +23,9 @@
- #include	"xhci-ext-caps.h"
- #include "pci-quirks.h"
- 
-+#include "xhci-port.h"
-+#include "xhci-caps.h"
-+
- /* max buffer size for trace and debug messages */
- #define XHCI_MSG_MAX		500
- 
-@@ -63,90 +66,6 @@ struct xhci_cap_regs {
- 	/* Reserved up to (CAPLENGTH - 0x1C) */
- };
- 
--/* hc_capbase bitmasks */
--/* bits 7:0 - how long is the Capabilities register */
--#define HC_LENGTH(p)		XHCI_HC_LENGTH(p)
--/* bits 31:16	*/
--#define HC_VERSION(p)		(((p) >> 16) & 0xffff)
--
--/* HCSPARAMS1 - hcs_params1 - bitmasks */
--/* bits 0:7, Max Device Slots */
--#define HCS_MAX_SLOTS(p)	(((p) >> 0) & 0xff)
--#define HCS_SLOTS_MASK		0xff
--/* bits 8:18, Max Interrupters */
--#define HCS_MAX_INTRS(p)	(((p) >> 8) & 0x7ff)
--/* bits 24:31, Max Ports - max value is 0x7F = 127 ports */
--#define HCS_MAX_PORTS(p)	(((p) >> 24) & 0x7f)
--
--/* HCSPARAMS2 - hcs_params2 - bitmasks */
--/* bits 0:3, frames or uframes that SW needs to queue transactions
-- * ahead of the HW to meet periodic deadlines */
--#define HCS_IST(p)		(((p) >> 0) & 0xf)
--/* bits 4:7, max number of Event Ring segments */
--#define HCS_ERST_MAX(p)		(((p) >> 4) & 0xf)
--/* bits 21:25 Hi 5 bits of Scratchpad buffers SW must allocate for the HW */
--/* bit 26 Scratchpad restore - for save/restore HW state - not used yet */
--/* bits 27:31 Lo 5 bits of Scratchpad buffers SW must allocate for the HW */
--#define HCS_MAX_SCRATCHPAD(p)   ((((p) >> 16) & 0x3e0) | (((p) >> 27) & 0x1f))
--
--/* HCSPARAMS3 - hcs_params3 - bitmasks */
--/* bits 0:7, Max U1 to U0 latency for the roothub ports */
--#define HCS_U1_LATENCY(p)	(((p) >> 0) & 0xff)
--/* bits 16:31, Max U2 to U0 latency for the roothub ports */
--#define HCS_U2_LATENCY(p)	(((p) >> 16) & 0xffff)
--
--/* HCCPARAMS - hcc_params - bitmasks */
--/* true: HC can use 64-bit address pointers */
--#define HCC_64BIT_ADDR(p)	((p) & (1 << 0))
--/* true: HC can do bandwidth negotiation */
--#define HCC_BANDWIDTH_NEG(p)	((p) & (1 << 1))
--/* true: HC uses 64-byte Device Context structures
-- * FIXME 64-byte context structures aren't supported yet.
-- */
--#define HCC_64BYTE_CONTEXT(p)	((p) & (1 << 2))
--/* true: HC has port power switches */
--#define HCC_PPC(p)		((p) & (1 << 3))
--/* true: HC has port indicators */
--#define HCS_INDICATOR(p)	((p) & (1 << 4))
--/* true: HC has Light HC Reset Capability */
--#define HCC_LIGHT_RESET(p)	((p) & (1 << 5))
--/* true: HC supports latency tolerance messaging */
--#define HCC_LTC(p)		((p) & (1 << 6))
--/* true: no secondary Stream ID Support */
--#define HCC_NSS(p)		((p) & (1 << 7))
--/* true: HC supports Stopped - Short Packet */
--#define HCC_SPC(p)		((p) & (1 << 9))
--/* true: HC has Contiguous Frame ID Capability */
--#define HCC_CFC(p)		((p) & (1 << 11))
--/* Max size for Primary Stream Arrays - 2^(n+1), where n is bits 12:15 */
--#define HCC_MAX_PSA(p)		(1 << ((((p) >> 12) & 0xf) + 1))
--/* Extended Capabilities pointer from PCI base - section 5.3.6 */
--#define HCC_EXT_CAPS(p)		XHCI_HCC_EXT_CAPS(p)
--
--#define CTX_SIZE(_hcc)		(HCC_64BYTE_CONTEXT(_hcc) ? 64 : 32)
--
--/* db_off bitmask - bits 0:1 reserved */
--#define	DBOFF_MASK	(~0x3)
--
--/* run_regs_off bitmask - bits 0:4 reserved */
--#define	RTSOFF_MASK	(~0x1f)
--
--/* HCCPARAMS2 - hcc_params2 - bitmasks */
--/* true: HC supports U3 entry Capability */
--#define	HCC2_U3C(p)		((p) & (1 << 0))
--/* true: HC supports Configure endpoint command Max exit latency too large */
--#define	HCC2_CMC(p)		((p) & (1 << 1))
--/* true: HC supports Force Save context Capability */
--#define	HCC2_FSC(p)		((p) & (1 << 2))
--/* true: HC supports Compliance Transition Capability */
--#define	HCC2_CTC(p)		((p) & (1 << 3))
--/* true: HC support Large ESIT payload Capability > 48k */
--#define	HCC2_LEC(p)		((p) & (1 << 4))
--/* true: HC support Configuration Information Capability */
--#define	HCC2_CIC(p)		((p) & (1 << 5))
--/* true: HC support Extended TBC Capability, Isoc burst count > 65535 */
--#define	HCC2_ETC(p)		((p) & (1 << 6))
--
- /* Number of registers per port */
- #define	NUM_PORT_REGS	4
- 
-@@ -292,181 +211,6 @@ struct xhci_op_regs {
- #define CONFIG_CIE		(1 << 9)
- /* bits 10:31 - reserved and should be preserved */
- 
--/* PORTSC - Port Status and Control Register - port_status_base bitmasks */
--/* true: device connected */
--#define PORT_CONNECT	(1 << 0)
--/* true: port enabled */
--#define PORT_PE		(1 << 1)
--/* bit 2 reserved and zeroed */
--/* true: port has an over-current condition */
--#define PORT_OC		(1 << 3)
--/* true: port reset signaling asserted */
--#define PORT_RESET	(1 << 4)
--/* Port Link State - bits 5:8
-- * A read gives the current link PM state of the port,
-- * a write with Link State Write Strobe set sets the link state.
-- */
--#define PORT_PLS_MASK	(0xf << 5)
--#define XDEV_U0		(0x0 << 5)
--#define XDEV_U1		(0x1 << 5)
--#define XDEV_U2		(0x2 << 5)
--#define XDEV_U3		(0x3 << 5)
--#define XDEV_DISABLED	(0x4 << 5)
--#define XDEV_RXDETECT	(0x5 << 5)
--#define XDEV_INACTIVE	(0x6 << 5)
--#define XDEV_POLLING	(0x7 << 5)
--#define XDEV_RECOVERY	(0x8 << 5)
--#define XDEV_HOT_RESET	(0x9 << 5)
--#define XDEV_COMP_MODE	(0xa << 5)
--#define XDEV_TEST_MODE	(0xb << 5)
--#define XDEV_RESUME	(0xf << 5)
--
--/* true: port has power (see HCC_PPC) */
--#define PORT_POWER	(1 << 9)
--/* bits 10:13 indicate device speed:
-- * 0 - undefined speed - port hasn't be initialized by a reset yet
-- * 1 - full speed
-- * 2 - low speed
-- * 3 - high speed
-- * 4 - super speed
-- * 5-15 reserved
-- */
--#define DEV_SPEED_MASK		(0xf << 10)
--#define	XDEV_FS			(0x1 << 10)
--#define	XDEV_LS			(0x2 << 10)
--#define	XDEV_HS			(0x3 << 10)
--#define	XDEV_SS			(0x4 << 10)
--#define	XDEV_SSP		(0x5 << 10)
--#define DEV_UNDEFSPEED(p)	(((p) & DEV_SPEED_MASK) == (0x0<<10))
--#define DEV_FULLSPEED(p)	(((p) & DEV_SPEED_MASK) == XDEV_FS)
--#define DEV_LOWSPEED(p)		(((p) & DEV_SPEED_MASK) == XDEV_LS)
--#define DEV_HIGHSPEED(p)	(((p) & DEV_SPEED_MASK) == XDEV_HS)
--#define DEV_SUPERSPEED(p)	(((p) & DEV_SPEED_MASK) == XDEV_SS)
--#define DEV_SUPERSPEEDPLUS(p)	(((p) & DEV_SPEED_MASK) == XDEV_SSP)
--#define DEV_SUPERSPEED_ANY(p)	(((p) & DEV_SPEED_MASK) >= XDEV_SS)
--#define DEV_PORT_SPEED(p)	(((p) >> 10) & 0x0f)
--
--/* Bits 20:23 in the Slot Context are the speed for the device */
--#define	SLOT_SPEED_FS		(XDEV_FS << 10)
--#define	SLOT_SPEED_LS		(XDEV_LS << 10)
--#define	SLOT_SPEED_HS		(XDEV_HS << 10)
--#define	SLOT_SPEED_SS		(XDEV_SS << 10)
--#define	SLOT_SPEED_SSP		(XDEV_SSP << 10)
--/* Port Indicator Control */
--#define PORT_LED_OFF	(0 << 14)
--#define PORT_LED_AMBER	(1 << 14)
--#define PORT_LED_GREEN	(2 << 14)
--#define PORT_LED_MASK	(3 << 14)
--/* Port Link State Write Strobe - set this when changing link state */
--#define PORT_LINK_STROBE	(1 << 16)
--/* true: connect status change */
--#define PORT_CSC	(1 << 17)
--/* true: port enable change */
--#define PORT_PEC	(1 << 18)
--/* true: warm reset for a USB 3.0 device is done.  A "hot" reset puts the port
-- * into an enabled state, and the device into the default state.  A "warm" reset
-- * also resets the link, forcing the device through the link training sequence.
-- * SW can also look at the Port Reset register to see when warm reset is done.
-- */
--#define PORT_WRC	(1 << 19)
--/* true: over-current change */
--#define PORT_OCC	(1 << 20)
--/* true: reset change - 1 to 0 transition of PORT_RESET */
--#define PORT_RC		(1 << 21)
--/* port link status change - set on some port link state transitions:
-- *  Transition				Reason
-- *  ------------------------------------------------------------------------------
-- *  - U3 to Resume			Wakeup signaling from a device
-- *  - Resume to Recovery to U0		USB 3.0 device resume
-- *  - Resume to U0			USB 2.0 device resume
-- *  - U3 to Recovery to U0		Software resume of USB 3.0 device complete
-- *  - U3 to U0				Software resume of USB 2.0 device complete
-- *  - U2 to U0				L1 resume of USB 2.1 device complete
-- *  - U0 to U0 (???)			L1 entry rejection by USB 2.1 device
-- *  - U0 to disabled			L1 entry error with USB 2.1 device
-- *  - Any state to inactive		Error on USB 3.0 port
-- */
--#define PORT_PLC	(1 << 22)
--/* port configure error change - port failed to configure its link partner */
--#define PORT_CEC	(1 << 23)
--#define PORT_CHANGE_MASK	(PORT_CSC | PORT_PEC | PORT_WRC | PORT_OCC | \
--				 PORT_RC | PORT_PLC | PORT_CEC)
--
--
--/* Cold Attach Status - xHC can set this bit to report device attached during
-- * Sx state. Warm port reset should be perfomed to clear this bit and move port
-- * to connected state.
-- */
--#define PORT_CAS	(1 << 24)
--/* wake on connect (enable) */
--#define PORT_WKCONN_E	(1 << 25)
--/* wake on disconnect (enable) */
--#define PORT_WKDISC_E	(1 << 26)
--/* wake on over-current (enable) */
--#define PORT_WKOC_E	(1 << 27)
--/* bits 28:29 reserved */
--/* true: device is non-removable - for USB 3.0 roothub emulation */
--#define PORT_DEV_REMOVE	(1 << 30)
--/* Initiate a warm port reset - complete when PORT_WRC is '1' */
--#define PORT_WR		(1 << 31)
--
--/* We mark duplicate entries with -1 */
--#define DUPLICATE_ENTRY ((u8)(-1))
--
--/* Port Power Management Status and Control - port_power_base bitmasks */
--/* Inactivity timer value for transitions into U1, in microseconds.
-- * Timeout can be up to 127us.  0xFF means an infinite timeout.
-- */
--#define PORT_U1_TIMEOUT(p)	((p) & 0xff)
--#define PORT_U1_TIMEOUT_MASK	0xff
--/* Inactivity timer value for transitions into U2 */
--#define PORT_U2_TIMEOUT(p)	(((p) & 0xff) << 8)
--#define PORT_U2_TIMEOUT_MASK	(0xff << 8)
--/* Bits 24:31 for port testing */
--
--/* USB2 Protocol PORTSPMSC */
--#define	PORT_L1S_MASK		7
--#define	PORT_L1S_SUCCESS	1
--#define	PORT_RWE		(1 << 3)
--#define	PORT_HIRD(p)		(((p) & 0xf) << 4)
--#define	PORT_HIRD_MASK		(0xf << 4)
--#define	PORT_L1DS_MASK		(0xff << 8)
--#define	PORT_L1DS(p)		(((p) & 0xff) << 8)
--#define	PORT_HLE		(1 << 16)
--#define PORT_TEST_MODE_SHIFT	28
--
--/* USB3 Protocol PORTLI  Port Link Information */
--#define PORT_RX_LANES(p)	(((p) >> 16) & 0xf)
--#define PORT_TX_LANES(p)	(((p) >> 20) & 0xf)
--
--/* USB2 Protocol PORTHLPMC */
--#define PORT_HIRDM(p)((p) & 3)
--#define PORT_L1_TIMEOUT(p)(((p) & 0xff) << 2)
--#define PORT_BESLD(p)(((p) & 0xf) << 10)
--
--/* use 512 microseconds as USB2 LPM L1 default timeout. */
--#define XHCI_L1_TIMEOUT		512
--
--/* Set default HIRD/BESL value to 4 (350/400us) for USB2 L1 LPM resume latency.
-- * Safe to use with mixed HIRD and BESL systems (host and device) and is used
-- * by other operating systems.
-- *
-- * XHCI 1.0 errata 8/14/12 Table 13 notes:
-- * "Software should choose xHC BESL/BESLD field values that do not violate a
-- * device's resume latency requirements,
-- * e.g. not program values > '4' if BLC = '1' and a HIRD device is attached,
-- * or not program values < '4' if BLC = '0' and a BESL device is attached.
-- */
--#define XHCI_DEFAULT_BESL	4
--
--/*
-- * USB3 specification define a 360ms tPollingLFPSTiemout for USB3 ports
-- * to complete link training. usually link trainig completes much faster
-- * so check status 10 times with 36ms sleep in places we need to wait for
-- * polling to complete.
-- */
--#define XHCI_PORT_POLLING_LFPS_TIME  36
--
- /**
-  * struct xhci_intr_reg - Interrupt Register Set
-  * @irq_pending:	IMAN - Interrupt Management Register.  Used to enable
-diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c
-index f92fc2acfcba04..79cad8d61dacdd 100644
---- a/drivers/usb/typec/class.c
-+++ b/drivers/usb/typec/class.c
-@@ -502,6 +502,7 @@ static void typec_altmode_release(struct device *dev)
- 		typec_altmode_put_partner(alt);
- 
- 	altmode_id_remove(alt->adev.dev.parent, alt->id);
-+	put_device(alt->adev.dev.parent);
- 	kfree(alt);
- }
- 
-@@ -551,6 +552,8 @@ typec_register_altmode(struct device *parent,
- 	alt->adev.dev.type = &typec_altmode_dev_type;
- 	dev_set_name(&alt->adev.dev, "%s.%u", dev_name(parent), id);
- 
-+	get_device(alt->adev.dev.parent);
-+
- 	/* Link partners and plugs with the ports */
- 	if (!is_port)
- 		typec_altmode_set_partner(alt);
-diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
-index 4e999e1c14075d..434cf3d5f4cf18 100644
---- a/fs/btrfs/block-group.c
-+++ b/fs/btrfs/block-group.c
-@@ -3794,6 +3794,8 @@ void btrfs_free_reserved_bytes(struct btrfs_block_group *cache,
- 	spin_lock(&cache->lock);
- 	if (cache->ro)
- 		space_info->bytes_readonly += num_bytes;
-+	else if (btrfs_is_zoned(cache->fs_info))
-+		space_info->bytes_zone_unusable += num_bytes;
- 	cache->reserved -= num_bytes;
- 	space_info->bytes_reserved -= num_bytes;
- 	space_info->max_extent_size = 0;
-diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
-index 9c07d5c3e5ad29..7066414be6ee8a 100644
---- a/fs/btrfs/dir-item.c
-+++ b/fs/btrfs/dir-item.c
-@@ -347,8 +347,8 @@ btrfs_search_dir_index_item(struct btrfs_root *root, struct btrfs_path *path,
- 			return di;
- 	}
- 	/* Adjust return code if the key was not found in the next leaf. */
--	if (ret > 0)
--		ret = 0;
-+	if (ret >= 0)
-+		ret = -ENOENT;
- 
- 	return ERR_PTR(ret);
- }
-diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
-index ee04185d8e0f58..ea19ea75674d2f 100644
---- a/fs/btrfs/inode.c
-+++ b/fs/btrfs/inode.c
-@@ -4293,11 +4293,8 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans,
- 	 */
- 	if (btrfs_ino(inode) == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID) {
- 		di = btrfs_search_dir_index_item(root, path, dir_ino, &fname.disk_name);
--		if (IS_ERR_OR_NULL(di)) {
--			if (!di)
--				ret = -ENOENT;
--			else
--				ret = PTR_ERR(di);
-+		if (IS_ERR(di)) {
-+			ret = PTR_ERR(di);
- 			btrfs_abort_transaction(trans, ret);
- 			goto out;
- 		}
-diff --git a/fs/exec.c b/fs/exec.c
-index f49b352a60323a..7776209d98c10b 100644
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -143,13 +143,11 @@ SYSCALL_DEFINE1(uselib, const char __user *, library)
- 		goto out;
- 
- 	/*
--	 * may_open() has already checked for this, so it should be
--	 * impossible to trip now. But we need to be extra cautious
--	 * and check again at the very end too.
-+	 * Check do_open_execat() for an explanation.
- 	 */
- 	error = -EACCES;
--	if (WARN_ON_ONCE(!S_ISREG(file_inode(file)->i_mode) ||
--			 path_noexec(&file->f_path)))
-+	if (WARN_ON_ONCE(!S_ISREG(file_inode(file)->i_mode)) ||
-+	    path_noexec(&file->f_path))
- 		goto exit;
- 
- 	error = -ENOEXEC;
-@@ -925,23 +923,22 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)
- 
- 	file = do_filp_open(fd, name, &open_exec_flags);
- 	if (IS_ERR(file))
--		goto out;
-+		return file;
- 
- 	/*
--	 * may_open() has already checked for this, so it should be
--	 * impossible to trip now. But we need to be extra cautious
--	 * and check again at the very end too.
-+	 * In the past the regular type check was here. It moved to may_open() in
-+	 * 633fb6ac3980 ("exec: move S_ISREG() check earlier"). Since then it is
-+	 * an invariant that all non-regular files error out before we get here.
- 	 */
- 	err = -EACCES;
--	if (WARN_ON_ONCE(!S_ISREG(file_inode(file)->i_mode) ||
--			 path_noexec(&file->f_path)))
-+	if (WARN_ON_ONCE(!S_ISREG(file_inode(file)->i_mode)) ||
-+	    path_noexec(&file->f_path))
- 		goto exit;
- 
- 	err = deny_write_access(file);
- 	if (err)
- 		goto exit;
- 
--out:
- 	return file;
- 
- exit:
-diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
-index 974ecf5e0d9522..3ab410059dc202 100644
---- a/fs/jfs/jfs_dmap.c
-+++ b/fs/jfs/jfs_dmap.c
-@@ -187,7 +187,7 @@ int dbMount(struct inode *ipbmap)
- 	}
- 
- 	bmp->db_numag = le32_to_cpu(dbmp_le->dn_numag);
--	if (!bmp->db_numag || bmp->db_numag >= MAXAG) {
-+	if (!bmp->db_numag || bmp->db_numag > MAXAG) {
- 		err = -EINVAL;
- 		goto err_release_metapage;
- 	}
-diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
-index f16bbbfcf672c8..975dd74a7a4db4 100644
---- a/fs/nfsd/nfs4state.c
-+++ b/fs/nfsd/nfs4state.c
-@@ -8254,7 +8254,7 @@ nfs4_state_shutdown_net(struct net *net)
- 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);
- 
- 	unregister_shrinker(&nn->nfsd_client_shrinker);
--	cancel_work(&nn->nfsd_shrinker_work);
-+	cancel_work_sync(&nn->nfsd_shrinker_work);
- 	cancel_delayed_work_sync(&nn->laundromat_work);
- 	locks_end_grace(&nn->nfsd4_manager);
- 
-diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c
-index b4e54d079b7d03..36d29c183bb7fa 100644
---- a/fs/nilfs2/page.c
-+++ b/fs/nilfs2/page.c
-@@ -77,7 +77,8 @@ void nilfs_forget_buffer(struct buffer_head *bh)
- 	const unsigned long clear_bits =
- 		(BIT(BH_Uptodate) | BIT(BH_Dirty) | BIT(BH_Mapped) |
- 		 BIT(BH_Async_Write) | BIT(BH_NILFS_Volatile) |
--		 BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected));
-+		 BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected) |
-+		 BIT(BH_Delay));
- 
- 	lock_buffer(bh);
- 	set_mask_bits(&bh->b_state, clear_bits, 0);
-@@ -410,7 +411,8 @@ void nilfs_clear_dirty_page(struct page *page, bool silent)
- 		const unsigned long clear_bits =
- 			(BIT(BH_Uptodate) | BIT(BH_Dirty) | BIT(BH_Mapped) |
- 			 BIT(BH_Async_Write) | BIT(BH_NILFS_Volatile) |
--			 BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected));
-+			 BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected) |
-+			 BIT(BH_Delay));
- 
- 		bh = head = page_buffers(page);
- 		do {
-diff --git a/fs/open.c b/fs/open.c
-index 59db720693f9a0..f9ac703ec1b2d3 100644
---- a/fs/open.c
-+++ b/fs/open.c
-@@ -1461,6 +1461,8 @@ SYSCALL_DEFINE4(openat2, int, dfd, const char __user *, filename,
- 
- 	if (unlikely(usize < OPEN_HOW_SIZE_VER0))
- 		return -EINVAL;
-+	if (unlikely(usize > PAGE_SIZE))
-+		return -E2BIG;
- 
- 	err = copy_struct_from_user(&tmp, sizeof(tmp), how, usize);
- 	if (err)
-diff --git a/fs/smb/client/fs_context.c b/fs/smb/client/fs_context.c
-index 3bbac925d0766b..8d7484400fe8e1 100644
---- a/fs/smb/client/fs_context.c
-+++ b/fs/smb/client/fs_context.c
-@@ -918,8 +918,15 @@ static int smb3_reconfigure(struct fs_context *fc)
- 	else  {
- 		kfree_sensitive(ses->password);
- 		ses->password = kstrdup(ctx->password, GFP_KERNEL);
-+		if (!ses->password)
-+			return -ENOMEM;
- 		kfree_sensitive(ses->password2);
- 		ses->password2 = kstrdup(ctx->password2, GFP_KERNEL);
-+		if (!ses->password2) {
-+			kfree_sensitive(ses->password);
-+			ses->password = NULL;
-+			return -ENOMEM;
-+		}
- 	}
- 	STEAL_STRING(cifs_sb, ctx, domainname);
- 	STEAL_STRING(cifs_sb, ctx, nodename);
-diff --git a/fs/smb/client/reparse.c b/fs/smb/client/reparse.c
-index ad0e0de9a165d4..7429b96a6ae5ef 100644
---- a/fs/smb/client/reparse.c
-+++ b/fs/smb/client/reparse.c
-@@ -330,6 +330,18 @@ static int parse_reparse_posix(struct reparse_posix_data *buf,
- 
- 	switch ((type = le64_to_cpu(buf->InodeType))) {
- 	case NFS_SPECFILE_LNK:
-+		if (len == 0 || (len % 2)) {
-+			cifs_dbg(VFS, "srv returned malformed nfs symlink buffer\n");
-+			return -EIO;
-+		}
-+		/*
-+		 * Check that buffer does not contain UTF-16 null codepoint
-+		 * because Linux cannot process symlink with null byte.
-+		 */
-+		if (UniStrnlen((wchar_t *)buf->DataBuffer, len/2) != len/2) {
-+			cifs_dbg(VFS, "srv returned null byte in nfs symlink target location\n");
-+			return -EIO;
-+		}
- 		data->symlink_target = cifs_strndup_from_utf16(buf->DataBuffer,
- 							       len, true,
- 							       cifs_sb->local_nls);
-@@ -340,8 +352,19 @@ static int parse_reparse_posix(struct reparse_posix_data *buf,
- 		break;
- 	case NFS_SPECFILE_CHR:
- 	case NFS_SPECFILE_BLK:
-+		/* DataBuffer for block and char devices contains two 32-bit numbers */
-+		if (len != 8) {
-+			cifs_dbg(VFS, "srv returned malformed nfs buffer for type: 0x%llx\n", type);
-+			return -EIO;
-+		}
-+		break;
- 	case NFS_SPECFILE_FIFO:
- 	case NFS_SPECFILE_SOCK:
-+		/* DataBuffer for fifos and sockets is empty */
-+		if (len != 0) {
-+			cifs_dbg(VFS, "srv returned malformed nfs buffer for type: 0x%llx\n", type);
-+			return -EIO;
-+		}
- 		break;
- 	default:
- 		cifs_dbg(VFS, "%s: unhandled inode type: 0x%llx\n",
-diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
-index 450e3050324c6c..ab6e79be2c15dd 100644
---- a/fs/smb/client/smb2ops.c
-+++ b/fs/smb/client/smb2ops.c
-@@ -1122,7 +1122,7 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
- 	struct cifs_fid fid;
- 	unsigned int size[1];
- 	void *data[1];
--	struct smb2_file_full_ea_info *ea = NULL;
-+	struct smb2_file_full_ea_info *ea;
- 	struct smb2_query_info_rsp *rsp;
- 	int rc, used_len = 0;
- 	int retries = 0, cur_sleep = 1;
-@@ -1143,6 +1143,7 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
- 	if (!utf16_path)
- 		return -ENOMEM;
- 
-+	ea = NULL;
- 	resp_buftype[0] = resp_buftype[1] = resp_buftype[2] = CIFS_NO_BUFFER;
- 	vars = kzalloc(sizeof(*vars), GFP_KERNEL);
- 	if (!vars) {
-diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c
-index 83a03201bb8628..a86a3fbfb5a49c 100644
---- a/fs/smb/client/smb2pdu.c
-+++ b/fs/smb/client/smb2pdu.c
-@@ -3300,6 +3300,15 @@ SMB2_ioctl_init(struct cifs_tcon *tcon, struct TCP_Server_Info *server,
- 		return rc;
- 
- 	if (indatalen) {
-+		unsigned int len;
-+
-+		if (WARN_ON_ONCE(smb3_encryption_required(tcon) &&
-+				 (check_add_overflow(total_len - 1,
-+						     ALIGN(indatalen, 8), &len) ||
-+				  len > MAX_CIFS_SMALL_BUFFER_SIZE))) {
-+			cifs_small_buf_release(req);
-+			return -EIO;
-+		}
- 		/*
- 		 * indatalen is usually small at a couple of bytes max, so
- 		 * just allocate through generic pool
-diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
-index bb471ec3640467..f5de2030e769a4 100644
---- a/fs/udf/balloc.c
-+++ b/fs/udf/balloc.c
-@@ -387,6 +387,7 @@ static void udf_table_free_blocks(struct super_block *sb,
- 	struct extent_position oepos, epos;
- 	int8_t etype;
- 	struct udf_inode_info *iinfo;
-+	int ret = 0;
- 
- 	mutex_lock(&sbi->s_alloc_mutex);
- 	iinfo = UDF_I(table);
-@@ -400,8 +401,12 @@ static void udf_table_free_blocks(struct super_block *sb,
- 	epos.block = oepos.block = iinfo->i_location;
- 	epos.bh = oepos.bh = NULL;
- 
--	while (count &&
--	       (etype = udf_next_aext(table, &epos, &eloc, &elen, 1)) != -1) {
-+	while (count) {
-+		ret = udf_next_aext(table, &epos, &eloc, &elen, &etype, 1);
-+		if (ret < 0)
-+			goto error_return;
-+		if (ret == 0)
-+			break;
- 		if (((eloc.logicalBlockNum +
- 			(elen >> sb->s_blocksize_bits)) == start)) {
- 			if ((0x3FFFFFFF - elen) <
-@@ -476,11 +481,8 @@ static void udf_table_free_blocks(struct super_block *sb,
- 			adsize = sizeof(struct short_ad);
- 		else if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_LONG)
- 			adsize = sizeof(struct long_ad);
--		else {
--			brelse(oepos.bh);
--			brelse(epos.bh);
-+		else
- 			goto error_return;
--		}
- 
- 		if (epos.offset + (2 * adsize) > sb->s_blocksize) {
- 			/* Steal a block from the extent being free'd */
-@@ -496,10 +498,10 @@ static void udf_table_free_blocks(struct super_block *sb,
- 			__udf_add_aext(table, &epos, &eloc, elen, 1);
- 	}
- 
-+error_return:
- 	brelse(epos.bh);
- 	brelse(oepos.bh);
- 
--error_return:
- 	mutex_unlock(&sbi->s_alloc_mutex);
- 	return;
- }
-@@ -515,6 +517,7 @@ static int udf_table_prealloc_blocks(struct super_block *sb,
- 	struct extent_position epos;
- 	int8_t etype = -1;
- 	struct udf_inode_info *iinfo;
-+	int ret = 0;
- 
- 	if (first_block >= sbi->s_partmaps[partition].s_partition_len)
- 		return 0;
-@@ -533,11 +536,14 @@ static int udf_table_prealloc_blocks(struct super_block *sb,
- 	epos.bh = NULL;
- 	eloc.logicalBlockNum = 0xFFFFFFFF;
- 
--	while (first_block != eloc.logicalBlockNum &&
--	       (etype = udf_next_aext(table, &epos, &eloc, &elen, 1)) != -1) {
-+	while (first_block != eloc.logicalBlockNum) {
-+		ret = udf_next_aext(table, &epos, &eloc, &elen, &etype, 1);
-+		if (ret < 0)
-+			goto err_out;
-+		if (ret == 0)
-+			break;
- 		udf_debug("eloc=%u, elen=%u, first_block=%u\n",
- 			  eloc.logicalBlockNum, elen, first_block);
--		; /* empty loop body */
- 	}
- 
- 	if (first_block == eloc.logicalBlockNum) {
-@@ -556,6 +562,7 @@ static int udf_table_prealloc_blocks(struct super_block *sb,
- 		alloc_count = 0;
- 	}
- 
-+err_out:
- 	brelse(epos.bh);
- 
- 	if (alloc_count)
-@@ -577,6 +584,7 @@ static udf_pblk_t udf_table_new_block(struct super_block *sb,
- 	struct extent_position epos, goal_epos;
- 	int8_t etype;
- 	struct udf_inode_info *iinfo = UDF_I(table);
-+	int ret = 0;
- 
- 	*err = -ENOSPC;
- 
-@@ -600,8 +608,10 @@ static udf_pblk_t udf_table_new_block(struct super_block *sb,
- 	epos.block = iinfo->i_location;
- 	epos.bh = goal_epos.bh = NULL;
- 
--	while (spread &&
--	       (etype = udf_next_aext(table, &epos, &eloc, &elen, 1)) != -1) {
-+	while (spread) {
-+		ret = udf_next_aext(table, &epos, &eloc, &elen, &etype, 1);
-+		if (ret <= 0)
-+			break;
- 		if (goal >= eloc.logicalBlockNum) {
- 			if (goal < eloc.logicalBlockNum +
- 					(elen >> sb->s_blocksize_bits))
-@@ -629,9 +639,11 @@ static udf_pblk_t udf_table_new_block(struct super_block *sb,
- 
- 	brelse(epos.bh);
- 
--	if (spread == 0xFFFFFFFF) {
-+	if (ret < 0 || spread == 0xFFFFFFFF) {
- 		brelse(goal_epos.bh);
- 		mutex_unlock(&sbi->s_alloc_mutex);
-+		if (ret < 0)
-+			*err = ret;
- 		return 0;
- 	}
- 
-diff --git a/fs/udf/directory.c b/fs/udf/directory.c
-index 93153665eb3747..632453aa38934a 100644
---- a/fs/udf/directory.c
-+++ b/fs/udf/directory.c
-@@ -166,13 +166,19 @@ static struct buffer_head *udf_fiiter_bread_blk(struct udf_fileident_iter *iter)
-  */
- static int udf_fiiter_advance_blk(struct udf_fileident_iter *iter)
- {
-+	int8_t etype = -1;
-+	int err = 0;
-+
- 	iter->loffset++;
- 	if (iter->loffset < DIV_ROUND_UP(iter->elen, 1<<iter->dir->i_blkbits))
- 		return 0;
- 
- 	iter->loffset = 0;
--	if (udf_next_aext(iter->dir, &iter->epos, &iter->eloc, &iter->elen, 1)
--			!= (EXT_RECORDED_ALLOCATED >> 30)) {
-+	err = udf_next_aext(iter->dir, &iter->epos, &iter->eloc,
-+			    &iter->elen, &etype, 1);
-+	if (err < 0)
-+		return err;
-+	else if (err == 0 || etype != (EXT_RECORDED_ALLOCATED >> 30)) {
- 		if (iter->pos == iter->dir->i_size) {
- 			iter->elen = 0;
- 			return 0;
-@@ -240,6 +246,7 @@ int udf_fiiter_init(struct udf_fileident_iter *iter, struct inode *dir,
- {
- 	struct udf_inode_info *iinfo = UDF_I(dir);
- 	int err = 0;
-+	int8_t etype;
- 
- 	iter->dir = dir;
- 	iter->bh[0] = iter->bh[1] = NULL;
-@@ -259,9 +266,9 @@ int udf_fiiter_init(struct udf_fileident_iter *iter, struct inode *dir,
- 		goto out;
- 	}
- 
--	if (inode_bmap(dir, iter->pos >> dir->i_blkbits, &iter->epos,
--		       &iter->eloc, &iter->elen, &iter->loffset) !=
--	    (EXT_RECORDED_ALLOCATED >> 30)) {
-+	err = inode_bmap(dir, iter->pos >> dir->i_blkbits, &iter->epos,
-+			 &iter->eloc, &iter->elen, &iter->loffset, &etype);
-+	if (err <= 0 || etype != (EXT_RECORDED_ALLOCATED >> 30)) {
- 		if (pos == dir->i_size)
- 			return 0;
- 		udf_err(dir->i_sb,
-@@ -457,6 +464,7 @@ int udf_fiiter_append_blk(struct udf_fileident_iter *iter)
- 	sector_t block;
- 	uint32_t old_elen = iter->elen;
- 	int err;
-+	int8_t etype;
- 
- 	if (WARN_ON_ONCE(iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB))
- 		return -EINVAL;
-@@ -471,8 +479,9 @@ int udf_fiiter_append_blk(struct udf_fileident_iter *iter)
- 		udf_fiiter_update_elen(iter, old_elen);
- 		return err;
- 	}
--	if (inode_bmap(iter->dir, block, &iter->epos, &iter->eloc, &iter->elen,
--		       &iter->loffset) != (EXT_RECORDED_ALLOCATED >> 30)) {
-+	err = inode_bmap(iter->dir, block, &iter->epos, &iter->eloc, &iter->elen,
-+		   &iter->loffset, &etype);
-+	if (err <= 0 || etype != (EXT_RECORDED_ALLOCATED >> 30)) {
- 		udf_err(iter->dir->i_sb,
- 			"block %llu not allocated in directory (ino %lu)\n",
- 			(unsigned long long)block, iter->dir->i_ino);
-diff --git a/fs/udf/inode.c b/fs/udf/inode.c
-index 8db07d1f56bc94..e98c198f85b964 100644
---- a/fs/udf/inode.c
-+++ b/fs/udf/inode.c
-@@ -408,7 +408,7 @@ struct udf_map_rq {
- 
- static int udf_map_block(struct inode *inode, struct udf_map_rq *map)
- {
--	int err;
-+	int ret;
- 	struct udf_inode_info *iinfo = UDF_I(inode);
- 
- 	if (WARN_ON_ONCE(iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB))
-@@ -420,18 +420,24 @@ static int udf_map_block(struct inode *inode, struct udf_map_rq *map)
- 		uint32_t elen;
- 		sector_t offset;
- 		struct extent_position epos = {};
-+		int8_t etype;
- 
- 		down_read(&iinfo->i_data_sem);
--		if (inode_bmap(inode, map->lblk, &epos, &eloc, &elen, &offset)
--				== (EXT_RECORDED_ALLOCATED >> 30)) {
-+		ret = inode_bmap(inode, map->lblk, &epos, &eloc, &elen, &offset,
-+				 &etype);
-+		if (ret < 0)
-+			goto out_read;
-+		if (ret > 0 && etype == (EXT_RECORDED_ALLOCATED >> 30)) {
- 			map->pblk = udf_get_lb_pblock(inode->i_sb, &eloc,
- 							offset);
- 			map->oflags |= UDF_BLK_MAPPED;
-+			ret = 0;
- 		}
-+out_read:
- 		up_read(&iinfo->i_data_sem);
- 		brelse(epos.bh);
- 
--		return 0;
-+		return ret;
- 	}
- 
- 	down_write(&iinfo->i_data_sem);
-@@ -442,9 +448,9 @@ static int udf_map_block(struct inode *inode, struct udf_map_rq *map)
- 	if (((loff_t)map->lblk) << inode->i_blkbits >= iinfo->i_lenExtents)
- 		udf_discard_prealloc(inode);
- 	udf_clear_extent_cache(inode);
--	err = inode_getblk(inode, map);
-+	ret = inode_getblk(inode, map);
- 	up_write(&iinfo->i_data_sem);
--	return err;
-+	return ret;
- }
- 
- static int __udf_get_block(struct inode *inode, sector_t block,
-@@ -547,6 +553,7 @@ static int udf_do_extend_file(struct inode *inode,
- 	} else {
- 		struct kernel_lb_addr tmploc;
- 		uint32_t tmplen;
-+		int8_t tmptype;
- 
- 		udf_write_aext(inode, last_pos, &last_ext->extLocation,
- 				last_ext->extLength, 1);
-@@ -556,8 +563,12 @@ static int udf_do_extend_file(struct inode *inode,
- 		 * more extents, we may need to enter possible following
- 		 * empty indirect extent.
- 		 */
--		if (new_block_bytes)
--			udf_next_aext(inode, last_pos, &tmploc, &tmplen, 0);
-+		if (new_block_bytes) {
-+			err = udf_next_aext(inode, last_pos, &tmploc, &tmplen,
-+					    &tmptype, 0);
-+			if (err < 0)
-+				goto out_err;
-+		}
- 	}
- 	iinfo->i_lenExtents += add;
- 
-@@ -661,8 +672,10 @@ static int udf_extend_file(struct inode *inode, loff_t newsize)
- 	 */
- 	udf_discard_prealloc(inode);
- 
--	etype = inode_bmap(inode, first_block, &epos, &eloc, &elen, &offset);
--	within_last_ext = (etype != -1);
-+	err = inode_bmap(inode, first_block, &epos, &eloc, &elen, &offset, &etype);
-+	if (err < 0)
-+		goto out;
-+	within_last_ext = (err == 1);
- 	/* We don't expect extents past EOF... */
- 	WARN_ON_ONCE(within_last_ext &&
- 		     elen > ((loff_t)offset + 1) << inode->i_blkbits);
-@@ -676,8 +689,10 @@ static int udf_extend_file(struct inode *inode, loff_t newsize)
- 		extent.extLength = EXT_NOT_RECORDED_NOT_ALLOCATED;
- 	} else {
- 		epos.offset -= adsize;
--		etype = udf_next_aext(inode, &epos, &extent.extLocation,
--				      &extent.extLength, 0);
-+		err = udf_next_aext(inode, &epos, &extent.extLocation,
-+				    &extent.extLength, &etype, 0);
-+		if (err <= 0)
-+			goto out;
- 		extent.extLength |= etype << 30;
- 	}
- 
-@@ -714,11 +729,11 @@ static int inode_getblk(struct inode *inode, struct udf_map_rq *map)
- 	loff_t lbcount = 0, b_off = 0;
- 	udf_pblk_t newblocknum;
- 	sector_t offset = 0;
--	int8_t etype;
-+	int8_t etype, tmpetype;
- 	struct udf_inode_info *iinfo = UDF_I(inode);
- 	udf_pblk_t goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
- 	int lastblock = 0;
--	bool isBeyondEOF;
-+	bool isBeyondEOF = false;
- 	int ret = 0;
- 
- 	prev_epos.offset = udf_file_entry_alloc_offset(inode);
-@@ -750,9 +765,13 @@ static int inode_getblk(struct inode *inode, struct udf_map_rq *map)
- 		prev_epos.offset = cur_epos.offset;
- 		cur_epos.offset = next_epos.offset;
- 
--		etype = udf_next_aext(inode, &next_epos, &eloc, &elen, 1);
--		if (etype == -1)
-+		ret = udf_next_aext(inode, &next_epos, &eloc, &elen, &etype, 1);
-+		if (ret < 0) {
-+			goto out_free;
-+		} else if (ret == 0) {
-+			isBeyondEOF = true;
- 			break;
-+		}
- 
- 		c = !c;
- 
-@@ -773,13 +792,17 @@ static int inode_getblk(struct inode *inode, struct udf_map_rq *map)
- 	 * Move prev_epos and cur_epos into indirect extent if we are at
- 	 * the pointer to it
- 	 */
--	udf_next_aext(inode, &prev_epos, &tmpeloc, &tmpelen, 0);
--	udf_next_aext(inode, &cur_epos, &tmpeloc, &tmpelen, 0);
-+	ret = udf_next_aext(inode, &prev_epos, &tmpeloc, &tmpelen, &tmpetype, 0);
-+	if (ret < 0)
-+		goto out_free;
-+	ret = udf_next_aext(inode, &cur_epos, &tmpeloc, &tmpelen, &tmpetype, 0);
-+	if (ret < 0)
-+		goto out_free;
- 
- 	/* if the extent is allocated and recorded, return the block
- 	   if the extent is not a multiple of the blocksize, round up */
- 
--	if (etype == (EXT_RECORDED_ALLOCATED >> 30)) {
-+	if (!isBeyondEOF && etype == (EXT_RECORDED_ALLOCATED >> 30)) {
- 		if (elen & (inode->i_sb->s_blocksize - 1)) {
- 			elen = EXT_RECORDED_ALLOCATED |
- 				((elen + inode->i_sb->s_blocksize - 1) &
-@@ -795,10 +818,9 @@ static int inode_getblk(struct inode *inode, struct udf_map_rq *map)
- 	}
- 
- 	/* Are we beyond EOF and preallocated extent? */
--	if (etype == -1) {
-+	if (isBeyondEOF) {
- 		loff_t hole_len;
- 
--		isBeyondEOF = true;
- 		if (count) {
- 			if (c)
- 				laarr[0] = laarr[1];
-@@ -834,7 +856,6 @@ static int inode_getblk(struct inode *inode, struct udf_map_rq *map)
- 		endnum = c + 1;
- 		lastblock = 1;
- 	} else {
--		isBeyondEOF = false;
- 		endnum = startnum = ((count > 2) ? 2 : count);
- 
- 		/* if the current extent is in position 0,
-@@ -848,15 +869,17 @@ static int inode_getblk(struct inode *inode, struct udf_map_rq *map)
- 
- 		/* if the current block is located in an extent,
- 		   read the next extent */
--		etype = udf_next_aext(inode, &next_epos, &eloc, &elen, 0);
--		if (etype != -1) {
-+		ret = udf_next_aext(inode, &next_epos, &eloc, &elen, &etype, 0);
-+		if (ret > 0) {
- 			laarr[c + 1].extLength = (etype << 30) | elen;
- 			laarr[c + 1].extLocation = eloc;
- 			count++;
- 			startnum++;
- 			endnum++;
--		} else
-+		} else if (ret == 0)
- 			lastblock = 1;
-+		else
-+			goto out_free;
- 	}
- 
- 	/* if the current extent is not recorded but allocated, get the
-@@ -1174,6 +1197,7 @@ static int udf_update_extents(struct inode *inode, struct kernel_long_ad *laarr,
- 	int start = 0, i;
- 	struct kernel_lb_addr tmploc;
- 	uint32_t tmplen;
-+	int8_t tmpetype;
- 	int err;
- 
- 	if (startnum > endnum) {
-@@ -1191,14 +1215,19 @@ static int udf_update_extents(struct inode *inode, struct kernel_long_ad *laarr,
- 			 */
- 			if (err < 0)
- 				return err;
--			udf_next_aext(inode, epos, &laarr[i].extLocation,
--				      &laarr[i].extLength, 1);
-+			err = udf_next_aext(inode, epos, &laarr[i].extLocation,
-+				      &laarr[i].extLength, &tmpetype, 1);
-+			if (err < 0)
-+				return err;
- 			start++;
- 		}
- 	}
- 
- 	for (i = start; i < endnum; i++) {
--		udf_next_aext(inode, epos, &tmploc, &tmplen, 0);
-+		err = udf_next_aext(inode, epos, &tmploc, &tmplen, &tmpetype, 0);
-+		if (err < 0)
-+			return err;
-+
- 		udf_write_aext(inode, epos, &laarr[i].extLocation,
- 			       laarr[i].extLength, 1);
- 	}
-@@ -1953,6 +1982,7 @@ int udf_setup_indirect_aext(struct inode *inode, udf_pblk_t block,
- 	struct extent_position nepos;
- 	struct kernel_lb_addr neloc;
- 	int ver, adsize;
-+	int err = 0;
- 
- 	if (UDF_I(inode)->i_alloc_type == ICBTAG_FLAG_AD_SHORT)
- 		adsize = sizeof(struct short_ad);
-@@ -1997,10 +2027,12 @@ int udf_setup_indirect_aext(struct inode *inode, udf_pblk_t block,
- 	if (epos->offset + adsize > sb->s_blocksize) {
- 		struct kernel_lb_addr cp_loc;
- 		uint32_t cp_len;
--		int cp_type;
-+		int8_t cp_type;
- 
- 		epos->offset -= adsize;
--		cp_type = udf_current_aext(inode, epos, &cp_loc, &cp_len, 0);
-+		err = udf_current_aext(inode, epos, &cp_loc, &cp_len, &cp_type, 0);
-+		if (err <= 0)
-+			goto err_out;
- 		cp_len |= ((uint32_t)cp_type) << 30;
- 
- 		__udf_add_aext(inode, &nepos, &cp_loc, cp_len, 1);
-@@ -2015,6 +2047,9 @@ int udf_setup_indirect_aext(struct inode *inode, udf_pblk_t block,
- 	*epos = nepos;
- 
- 	return 0;
-+err_out:
-+	brelse(bh);
-+	return err;
- }
- 
- /*
-@@ -2160,21 +2195,30 @@ void udf_write_aext(struct inode *inode, struct extent_position *epos,
-  */
- #define UDF_MAX_INDIR_EXTS 16
- 
--int8_t udf_next_aext(struct inode *inode, struct extent_position *epos,
--		     struct kernel_lb_addr *eloc, uint32_t *elen, int inc)
-+/*
-+ * Returns 1 on success, -errno on error, 0 on hit EOF.
-+ */
-+int udf_next_aext(struct inode *inode, struct extent_position *epos,
-+		  struct kernel_lb_addr *eloc, uint32_t *elen, int8_t *etype,
-+		  int inc)
- {
--	int8_t etype;
- 	unsigned int indirections = 0;
-+	int ret = 0;
-+	udf_pblk_t block;
- 
--	while ((etype = udf_current_aext(inode, epos, eloc, elen, inc)) ==
--	       (EXT_NEXT_EXTENT_ALLOCDESCS >> 30)) {
--		udf_pblk_t block;
-+	while (1) {
-+		ret = udf_current_aext(inode, epos, eloc, elen,
-+				       etype, inc);
-+		if (ret <= 0)
-+			return ret;
-+		if (*etype != (EXT_NEXT_EXTENT_ALLOCDESCS >> 30))
-+			return ret;
- 
- 		if (++indirections > UDF_MAX_INDIR_EXTS) {
- 			udf_err(inode->i_sb,
- 				"too many indirect extents in inode %lu\n",
- 				inode->i_ino);
--			return -1;
-+			return -EFSCORRUPTED;
- 		}
- 
- 		epos->block = *eloc;
-@@ -2184,18 +2228,19 @@ int8_t udf_next_aext(struct inode *inode, struct extent_position *epos,
- 		epos->bh = sb_bread(inode->i_sb, block);
- 		if (!epos->bh) {
- 			udf_debug("reading block %u failed!\n", block);
--			return -1;
-+			return -EIO;
- 		}
- 	}
--
--	return etype;
- }
- 
--int8_t udf_current_aext(struct inode *inode, struct extent_position *epos,
--			struct kernel_lb_addr *eloc, uint32_t *elen, int inc)
-+/*
-+ * Returns 1 on success, -errno on error, 0 on hit EOF.
-+ */
-+int udf_current_aext(struct inode *inode, struct extent_position *epos,
-+		     struct kernel_lb_addr *eloc, uint32_t *elen, int8_t *etype,
-+		     int inc)
- {
- 	int alen;
--	int8_t etype;
- 	uint8_t *ptr;
- 	struct short_ad *sad;
- 	struct long_ad *lad;
-@@ -2210,20 +2255,23 @@ int8_t udf_current_aext(struct inode *inode, struct extent_position *epos,
- 		alen = udf_file_entry_alloc_offset(inode) +
- 							iinfo->i_lenAlloc;
- 	} else {
-+		struct allocExtDesc *header =
-+			(struct allocExtDesc *)epos->bh->b_data;
-+
- 		if (!epos->offset)
- 			epos->offset = sizeof(struct allocExtDesc);
- 		ptr = epos->bh->b_data + epos->offset;
--		alen = sizeof(struct allocExtDesc) +
--			le32_to_cpu(((struct allocExtDesc *)epos->bh->b_data)->
--							lengthAllocDescs);
-+		if (check_add_overflow(sizeof(struct allocExtDesc),
-+				le32_to_cpu(header->lengthAllocDescs), &alen))
-+			return -1;
- 	}
- 
- 	switch (iinfo->i_alloc_type) {
- 	case ICBTAG_FLAG_AD_SHORT:
- 		sad = udf_get_fileshortad(ptr, alen, &epos->offset, inc);
- 		if (!sad)
--			return -1;
--		etype = le32_to_cpu(sad->extLength) >> 30;
-+			return 0;
-+		*etype = le32_to_cpu(sad->extLength) >> 30;
- 		eloc->logicalBlockNum = le32_to_cpu(sad->extPosition);
- 		eloc->partitionReferenceNum =
- 				iinfo->i_location.partitionReferenceNum;
-@@ -2232,17 +2280,17 @@ int8_t udf_current_aext(struct inode *inode, struct extent_position *epos,
- 	case ICBTAG_FLAG_AD_LONG:
- 		lad = udf_get_filelongad(ptr, alen, &epos->offset, inc);
- 		if (!lad)
--			return -1;
--		etype = le32_to_cpu(lad->extLength) >> 30;
-+			return 0;
-+		*etype = le32_to_cpu(lad->extLength) >> 30;
- 		*eloc = lelb_to_cpu(lad->extLocation);
- 		*elen = le32_to_cpu(lad->extLength) & UDF_EXTENT_LENGTH_MASK;
- 		break;
- 	default:
- 		udf_debug("alloc_type = %u unsupported\n", iinfo->i_alloc_type);
--		return -1;
-+		return -EINVAL;
- 	}
- 
--	return etype;
-+	return 1;
- }
- 
- static int udf_insert_aext(struct inode *inode, struct extent_position epos,
-@@ -2251,20 +2299,24 @@ static int udf_insert_aext(struct inode *inode, struct extent_position epos,
- 	struct kernel_lb_addr oeloc;
- 	uint32_t oelen;
- 	int8_t etype;
--	int err;
-+	int ret;
- 
- 	if (epos.bh)
- 		get_bh(epos.bh);
- 
--	while ((etype = udf_next_aext(inode, &epos, &oeloc, &oelen, 0)) != -1) {
-+	while (1) {
-+		ret = udf_next_aext(inode, &epos, &oeloc, &oelen, &etype, 0);
-+		if (ret <= 0)
-+			break;
- 		udf_write_aext(inode, &epos, &neloc, nelen, 1);
- 		neloc = oeloc;
- 		nelen = (etype << 30) | oelen;
- 	}
--	err = udf_add_aext(inode, &epos, &neloc, nelen, 1);
-+	if (ret == 0)
-+		ret = udf_add_aext(inode, &epos, &neloc, nelen, 1);
- 	brelse(epos.bh);
- 
--	return err;
-+	return ret;
- }
- 
- int8_t udf_delete_aext(struct inode *inode, struct extent_position epos)
-@@ -2276,6 +2328,7 @@ int8_t udf_delete_aext(struct inode *inode, struct extent_position epos)
- 	struct udf_inode_info *iinfo;
- 	struct kernel_lb_addr eloc;
- 	uint32_t elen;
-+	int ret;
- 
- 	if (epos.bh) {
- 		get_bh(epos.bh);
-@@ -2291,10 +2344,18 @@ int8_t udf_delete_aext(struct inode *inode, struct extent_position epos)
- 		adsize = 0;
- 
- 	oepos = epos;
--	if (udf_next_aext(inode, &epos, &eloc, &elen, 1) == -1)
-+	if (udf_next_aext(inode, &epos, &eloc, &elen, &etype, 1) <= 0)
- 		return -1;
- 
--	while ((etype = udf_next_aext(inode, &epos, &eloc, &elen, 1)) != -1) {
-+	while (1) {
-+		ret = udf_next_aext(inode, &epos, &eloc, &elen, &etype, 1);
-+		if (ret < 0) {
-+			brelse(epos.bh);
-+			brelse(oepos.bh);
-+			return -1;
-+		}
-+		if (ret == 0)
-+			break;
- 		udf_write_aext(inode, &oepos, &eloc, (etype << 30) | elen, 1);
- 		if (oepos.bh != epos.bh) {
- 			oepos.block = epos.block;
-@@ -2351,14 +2412,17 @@ int8_t udf_delete_aext(struct inode *inode, struct extent_position epos)
- 	return (elen >> 30);
- }
- 
--int8_t inode_bmap(struct inode *inode, sector_t block,
--		  struct extent_position *pos, struct kernel_lb_addr *eloc,
--		  uint32_t *elen, sector_t *offset)
-+/*
-+ * Returns 1 on success, -errno on error, 0 on hit EOF.
-+ */
-+int inode_bmap(struct inode *inode, sector_t block, struct extent_position *pos,
-+	       struct kernel_lb_addr *eloc, uint32_t *elen, sector_t *offset,
-+	       int8_t *etype)
- {
- 	unsigned char blocksize_bits = inode->i_sb->s_blocksize_bits;
- 	loff_t lbcount = 0, bcount = (loff_t) block << blocksize_bits;
--	int8_t etype;
- 	struct udf_inode_info *iinfo;
-+	int err = 0;
- 
- 	iinfo = UDF_I(inode);
- 	if (!udf_read_extent_cache(inode, bcount, &lbcount, pos)) {
-@@ -2368,11 +2432,13 @@ int8_t inode_bmap(struct inode *inode, sector_t block,
- 	}
- 	*elen = 0;
- 	do {
--		etype = udf_next_aext(inode, pos, eloc, elen, 1);
--		if (etype == -1) {
--			*offset = (bcount - lbcount) >> blocksize_bits;
--			iinfo->i_lenExtents = lbcount;
--			return -1;
-+		err = udf_next_aext(inode, pos, eloc, elen, etype, 1);
-+		if (err <= 0) {
-+			if (err == 0) {
-+				*offset = (bcount - lbcount) >> blocksize_bits;
-+				iinfo->i_lenExtents = lbcount;
-+			}
-+			return err;
- 		}
- 		lbcount += *elen;
- 	} while (lbcount <= bcount);
-@@ -2380,5 +2446,5 @@ int8_t inode_bmap(struct inode *inode, sector_t block,
- 	udf_update_extent_cache(inode, lbcount - *elen, pos);
- 	*offset = (bcount + *elen - lbcount) >> blocksize_bits;
- 
--	return etype;
-+	return 1;
- }
-diff --git a/fs/udf/partition.c b/fs/udf/partition.c
-index af877991edc13a..2b85c9501bed89 100644
---- a/fs/udf/partition.c
-+++ b/fs/udf/partition.c
-@@ -282,9 +282,11 @@ static uint32_t udf_try_read_meta(struct inode *inode, uint32_t block,
- 	sector_t ext_offset;
- 	struct extent_position epos = {};
- 	uint32_t phyblock;
-+	int8_t etype;
-+	int err = 0;
- 
--	if (inode_bmap(inode, block, &epos, &eloc, &elen, &ext_offset) !=
--						(EXT_RECORDED_ALLOCATED >> 30))
-+	err = inode_bmap(inode, block, &epos, &eloc, &elen, &ext_offset, &etype);
-+	if (err <= 0 || etype != (EXT_RECORDED_ALLOCATED >> 30))
- 		phyblock = 0xFFFFFFFF;
- 	else {
- 		map = &UDF_SB(sb)->s_partmaps[partition];
-diff --git a/fs/udf/super.c b/fs/udf/super.c
-index 3c78535f406b00..20dff9ed2471da 100644
---- a/fs/udf/super.c
-+++ b/fs/udf/super.c
-@@ -2454,13 +2454,14 @@ static unsigned int udf_count_free_table(struct super_block *sb,
- 	uint32_t elen;
- 	struct kernel_lb_addr eloc;
- 	struct extent_position epos;
-+	int8_t etype;
- 
- 	mutex_lock(&UDF_SB(sb)->s_alloc_mutex);
- 	epos.block = UDF_I(table)->i_location;
- 	epos.offset = sizeof(struct unallocSpaceEntry);
- 	epos.bh = NULL;
- 
--	while (udf_next_aext(table, &epos, &eloc, &elen, 1) != -1)
-+	while (udf_next_aext(table, &epos, &eloc, &elen, &etype, 1) > 0)
- 		accum += (elen >> table->i_sb->s_blocksize_bits);
- 
- 	brelse(epos.bh);
-diff --git a/fs/udf/truncate.c b/fs/udf/truncate.c
-index a686c10fd709d1..4f33a4a4888613 100644
---- a/fs/udf/truncate.c
-+++ b/fs/udf/truncate.c
-@@ -69,6 +69,7 @@ void udf_truncate_tail_extent(struct inode *inode)
- 	int8_t etype = -1, netype;
- 	int adsize;
- 	struct udf_inode_info *iinfo = UDF_I(inode);
-+	int ret;
- 
- 	if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB ||
- 	    inode->i_size == iinfo->i_lenExtents)
-@@ -85,7 +86,10 @@ void udf_truncate_tail_extent(struct inode *inode)
- 		BUG();
- 
- 	/* Find the last extent in the file */
--	while ((netype = udf_next_aext(inode, &epos, &eloc, &elen, 1)) != -1) {
-+	while (1) {
-+		ret = udf_next_aext(inode, &epos, &eloc, &elen, &netype, 1);
-+		if (ret <= 0)
-+			break;
- 		etype = netype;
- 		lbcount += elen;
- 		if (lbcount > inode->i_size) {
-@@ -101,7 +105,8 @@ void udf_truncate_tail_extent(struct inode *inode)
- 			epos.offset -= adsize;
- 			extent_trunc(inode, &epos, &eloc, etype, elen, nelen);
- 			epos.offset += adsize;
--			if (udf_next_aext(inode, &epos, &eloc, &elen, 1) != -1)
-+			if (udf_next_aext(inode, &epos, &eloc, &elen,
-+					  &netype, 1) > 0)
- 				udf_err(inode->i_sb,
- 					"Extent after EOF in inode %u\n",
- 					(unsigned)inode->i_ino);
-@@ -110,7 +115,8 @@ void udf_truncate_tail_extent(struct inode *inode)
- 	}
- 	/* This inode entry is in-memory only and thus we don't have to mark
- 	 * the inode dirty */
--	iinfo->i_lenExtents = inode->i_size;
-+	if (ret == 0)
-+		iinfo->i_lenExtents = inode->i_size;
- 	brelse(epos.bh);
- }
- 
-@@ -124,6 +130,8 @@ void udf_discard_prealloc(struct inode *inode)
- 	int8_t etype = -1;
- 	struct udf_inode_info *iinfo = UDF_I(inode);
- 	int bsize = i_blocksize(inode);
-+	int8_t tmpetype = -1;
-+	int ret;
- 
- 	if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB ||
- 	    ALIGN(inode->i_size, bsize) == ALIGN(iinfo->i_lenExtents, bsize))
-@@ -132,15 +140,23 @@ void udf_discard_prealloc(struct inode *inode)
- 	epos.block = iinfo->i_location;
- 
- 	/* Find the last extent in the file */
--	while (udf_next_aext(inode, &epos, &eloc, &elen, 0) != -1) {
-+	while (1) {
-+		ret = udf_next_aext(inode, &epos, &eloc, &elen, &tmpetype, 0);
-+		if (ret < 0)
-+			goto out;
-+		if (ret == 0)
-+			break;
- 		brelse(prev_epos.bh);
- 		prev_epos = epos;
- 		if (prev_epos.bh)
- 			get_bh(prev_epos.bh);
- 
--		etype = udf_next_aext(inode, &epos, &eloc, &elen, 1);
-+		ret = udf_next_aext(inode, &epos, &eloc, &elen, &etype, 1);
-+		if (ret < 0)
-+			goto out;
- 		lbcount += elen;
- 	}
-+
- 	if (etype == (EXT_NOT_RECORDED_ALLOCATED >> 30)) {
- 		lbcount -= elen;
- 		udf_delete_aext(inode, prev_epos);
-@@ -150,6 +166,7 @@ void udf_discard_prealloc(struct inode *inode)
- 	/* This inode entry is in-memory only and thus we don't have to mark
- 	 * the inode dirty */
- 	iinfo->i_lenExtents = lbcount;
-+out:
- 	brelse(epos.bh);
- 	brelse(prev_epos.bh);
- }
-@@ -188,6 +205,7 @@ int udf_truncate_extents(struct inode *inode)
- 	loff_t byte_offset;
- 	int adsize;
- 	struct udf_inode_info *iinfo = UDF_I(inode);
-+	int ret = 0;
- 
- 	if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_SHORT)
- 		adsize = sizeof(struct short_ad);
-@@ -196,10 +214,12 @@ int udf_truncate_extents(struct inode *inode)
- 	else
- 		BUG();
- 
--	etype = inode_bmap(inode, first_block, &epos, &eloc, &elen, &offset);
-+	ret = inode_bmap(inode, first_block, &epos, &eloc, &elen, &offset, &etype);
-+	if (ret < 0)
-+		return ret;
- 	byte_offset = (offset << sb->s_blocksize_bits) +
- 		(inode->i_size & (sb->s_blocksize - 1));
--	if (etype == -1) {
-+	if (ret == 0) {
- 		/* We should extend the file? */
- 		WARN_ON(byte_offset);
- 		return 0;
-@@ -217,8 +237,8 @@ int udf_truncate_extents(struct inode *inode)
- 	else
- 		lenalloc -= sizeof(struct allocExtDesc);
- 
--	while ((etype = udf_current_aext(inode, &epos, &eloc,
--					 &elen, 0)) != -1) {
-+	while ((ret = udf_current_aext(inode, &epos, &eloc,
-+				       &elen, &etype, 0)) > 0) {
- 		if (etype == (EXT_NEXT_EXTENT_ALLOCDESCS >> 30)) {
- 			udf_write_aext(inode, &epos, &neloc, nelen, 0);
- 			if (indirect_ext_len) {
-@@ -253,6 +273,11 @@ int udf_truncate_extents(struct inode *inode)
- 		}
- 	}
- 
-+	if (ret < 0) {
-+		brelse(epos.bh);
-+		return ret;
-+	}
-+
- 	if (indirect_ext_len) {
- 		BUG_ON(!epos.bh);
- 		udf_free_blocks(sb, NULL, &epos.block, 0, indirect_ext_len);
-diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
-index 88692512a46687..d159f20d61e89a 100644
---- a/fs/udf/udfdecl.h
-+++ b/fs/udf/udfdecl.h
-@@ -157,8 +157,9 @@ extern struct buffer_head *udf_bread(struct inode *inode, udf_pblk_t block,
- extern int udf_setsize(struct inode *, loff_t);
- extern void udf_evict_inode(struct inode *);
- extern int udf_write_inode(struct inode *, struct writeback_control *wbc);
--extern int8_t inode_bmap(struct inode *, sector_t, struct extent_position *,
--			 struct kernel_lb_addr *, uint32_t *, sector_t *);
-+extern int inode_bmap(struct inode *inode, sector_t block,
-+		      struct extent_position *pos, struct kernel_lb_addr *eloc,
-+		      uint32_t *elen, sector_t *offset, int8_t *etype);
- int udf_get_block(struct inode *, sector_t, struct buffer_head *, int);
- extern int udf_setup_indirect_aext(struct inode *inode, udf_pblk_t block,
- 				   struct extent_position *epos);
-@@ -169,10 +170,12 @@ extern int udf_add_aext(struct inode *, struct extent_position *,
- extern void udf_write_aext(struct inode *, struct extent_position *,
- 			   struct kernel_lb_addr *, uint32_t, int);
- extern int8_t udf_delete_aext(struct inode *, struct extent_position);
--extern int8_t udf_next_aext(struct inode *, struct extent_position *,
--			    struct kernel_lb_addr *, uint32_t *, int);
--extern int8_t udf_current_aext(struct inode *, struct extent_position *,
--			       struct kernel_lb_addr *, uint32_t *, int);
-+extern int udf_next_aext(struct inode *inode, struct extent_position *epos,
-+			 struct kernel_lb_addr *eloc, uint32_t *elen,
-+			 int8_t *etype, int inc);
-+extern int udf_current_aext(struct inode *inode, struct extent_position *epos,
-+			    struct kernel_lb_addr *eloc, uint32_t *elen,
-+			    int8_t *etype, int inc);
- extern void udf_update_extra_perms(struct inode *inode, umode_t mode);
- 
- /* misc.c */
-diff --git a/include/acpi/cppc_acpi.h b/include/acpi/cppc_acpi.h
-index ec425d2834f869..e1720d93066695 100644
---- a/include/acpi/cppc_acpi.h
-+++ b/include/acpi/cppc_acpi.h
-@@ -147,6 +147,8 @@ extern int cppc_set_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls);
- extern int cppc_set_enable(int cpu, bool enable);
- extern int cppc_get_perf_caps(int cpu, struct cppc_perf_caps *caps);
- extern bool cppc_perf_ctrs_in_pcc(void);
-+extern unsigned int cppc_perf_to_khz(struct cppc_perf_caps *caps, unsigned int perf);
-+extern unsigned int cppc_khz_to_perf(struct cppc_perf_caps *caps, unsigned int freq);
- extern bool acpi_cpc_valid(void);
- extern bool cppc_allow_fast_switch(void);
- extern int acpi_get_psd_map(unsigned int cpu, struct cppc_cpudata *cpu_data);
-diff --git a/include/linux/bpf.h b/include/linux/bpf.h
-index 1e05cc80e0485f..5a27fd533fabc8 100644
---- a/include/linux/bpf.h
-+++ b/include/linux/bpf.h
-@@ -616,6 +616,7 @@ enum bpf_type_flag {
- 	 */
- 	PTR_UNTRUSTED		= BIT(6 + BPF_BASE_TYPE_BITS),
- 
-+	/* MEM can be uninitialized. */
- 	MEM_UNINIT		= BIT(7 + BPF_BASE_TYPE_BITS),
- 
- 	/* DYNPTR points to memory local to the bpf program. */
-@@ -681,6 +682,13 @@ enum bpf_type_flag {
- 	 */
- 	MEM_ALIGNED		= BIT(17 + BPF_BASE_TYPE_BITS),
- 
-+	/* MEM is being written to, often combined with MEM_UNINIT. Non-presence
-+	 * of MEM_WRITE means that MEM is only being read. MEM_WRITE without the
-+	 * MEM_UNINIT means that memory needs to be initialized since it is also
-+	 * read.
-+	 */
-+	MEM_WRITE		= BIT(18 + BPF_BASE_TYPE_BITS),
-+
- 	__BPF_TYPE_FLAG_MAX,
- 	__BPF_TYPE_LAST_FLAG	= __BPF_TYPE_FLAG_MAX - 1,
- };
-@@ -738,10 +746,10 @@ enum bpf_arg_type {
- 	ARG_PTR_TO_SOCKET_OR_NULL	= PTR_MAYBE_NULL | ARG_PTR_TO_SOCKET,
- 	ARG_PTR_TO_STACK_OR_NULL	= PTR_MAYBE_NULL | ARG_PTR_TO_STACK,
- 	ARG_PTR_TO_BTF_ID_OR_NULL	= PTR_MAYBE_NULL | ARG_PTR_TO_BTF_ID,
--	/* pointer to memory does not need to be initialized, helper function must fill
--	 * all bytes or clear them in error case.
-+	/* Pointer to memory does not need to be initialized, since helper function
-+	 * fills all bytes or clears them in error case.
- 	 */
--	ARG_PTR_TO_UNINIT_MEM		= MEM_UNINIT | ARG_PTR_TO_MEM,
-+	ARG_PTR_TO_UNINIT_MEM		= MEM_UNINIT | MEM_WRITE | ARG_PTR_TO_MEM,
- 	/* Pointer to valid memory of size known at compile time. */
- 	ARG_PTR_TO_FIXED_SIZE_MEM	= MEM_FIXED_SIZE | ARG_PTR_TO_MEM,
- 
-diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
-index e4e24da16d2c39..b1fdb1554f2f9c 100644
---- a/include/linux/memcontrol.h
-+++ b/include/linux/memcontrol.h
-@@ -1080,15 +1080,6 @@ static inline void count_memcg_events(struct mem_cgroup *memcg,
- 	local_irq_restore(flags);
- }
- 
--static inline void count_memcg_page_event(struct page *page,
--					  enum vm_event_item idx)
--{
--	struct mem_cgroup *memcg = page_memcg(page);
--
--	if (memcg)
--		count_memcg_events(memcg, idx, 1);
--}
--
- static inline void count_memcg_folio_events(struct folio *folio,
- 		enum vm_event_item idx, unsigned long nr)
- {
-@@ -1565,11 +1556,6 @@ static inline void __count_memcg_events(struct mem_cgroup *memcg,
- {
- }
- 
--static inline void count_memcg_page_event(struct page *page,
--					  int idx)
--{
--}
--
- static inline void count_memcg_folio_events(struct folio *folio,
- 		enum vm_event_item idx, unsigned long nr)
- {
-diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index 8f5ac20b4c03d9..1576e7443eee50 100644
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -3363,6 +3363,12 @@ static inline void netif_tx_wake_all_queues(struct net_device *dev)
- 
- static __always_inline void netif_tx_stop_queue(struct netdev_queue *dev_queue)
- {
-+	/* Paired with READ_ONCE() from dev_watchdog() */
-+	WRITE_ONCE(dev_queue->trans_start, jiffies);
-+
-+	/* This barrier is paired with smp_mb() from dev_watchdog() */
-+	smp_mb__before_atomic();
-+
- 	/* Must be an atomic op see netif_txq_try_stop() */
- 	set_bit(__QUEUE_STATE_DRV_XOFF, &dev_queue->state);
- }
-@@ -3479,6 +3485,12 @@ static inline void netdev_tx_sent_queue(struct netdev_queue *dev_queue,
- 	if (likely(dql_avail(&dev_queue->dql) >= 0))
- 		return;
- 
-+	/* Paired with READ_ONCE() from dev_watchdog() */
-+	WRITE_ONCE(dev_queue->trans_start, jiffies);
-+
-+	/* This barrier is paired with smp_mb() from dev_watchdog() */
-+	smp_mb__before_atomic();
-+
- 	set_bit(__QUEUE_STATE_STACK_XOFF, &dev_queue->state);
- 
- 	/*
-diff --git a/include/linux/task_work.h b/include/linux/task_work.h
-index 26b8a47f41fcac..2964171856e00d 100644
---- a/include/linux/task_work.h
-+++ b/include/linux/task_work.h
-@@ -14,10 +14,14 @@ init_task_work(struct callback_head *twork, task_work_func_t func)
- }
- 
- enum task_work_notify_mode {
--	TWA_NONE,
-+	TWA_NONE = 0,
- 	TWA_RESUME,
- 	TWA_SIGNAL,
- 	TWA_SIGNAL_NO_IPI,
-+	TWA_NMI_CURRENT,
-+
-+	TWA_FLAGS = 0xff00,
-+	TWAF_NO_ALLOC = 0x0100,
- };
- 
- static inline bool task_work_pending(struct task_struct *task)
-diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
-index cb8bd759e80057..9d799777c333c0 100644
---- a/include/linux/trace_events.h
-+++ b/include/linux/trace_events.h
-@@ -765,7 +765,8 @@ struct bpf_raw_event_map *bpf_get_raw_tracepoint(const char *name);
- void bpf_put_raw_tracepoint(struct bpf_raw_event_map *btp);
- int bpf_get_perf_event_info(const struct perf_event *event, u32 *prog_id,
- 			    u32 *fd_type, const char **buf,
--			    u64 *probe_offset, u64 *probe_addr);
-+			    u64 *probe_offset, u64 *probe_addr,
-+			    unsigned long *missed);
- int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *prog);
- int bpf_uprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *prog);
- #else
-@@ -805,7 +806,7 @@ static inline void bpf_put_raw_tracepoint(struct bpf_raw_event_map *btp)
- static inline int bpf_get_perf_event_info(const struct perf_event *event,
- 					  u32 *prog_id, u32 *fd_type,
- 					  const char **buf, u64 *probe_offset,
--					  u64 *probe_addr)
-+					  u64 *probe_addr, unsigned long *missed)
- {
- 	return -EOPNOTSUPP;
- }
-@@ -880,6 +881,7 @@ extern void perf_kprobe_destroy(struct perf_event *event);
- extern int bpf_get_kprobe_info(const struct perf_event *event,
- 			       u32 *fd_type, const char **symbol,
- 			       u64 *probe_offset, u64 *probe_addr,
-+			       unsigned long *missed,
- 			       bool perf_type_tracepoint);
- #endif
- #ifdef CONFIG_UPROBE_EVENTS
-diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
-index e4a6831133f818..4763a47bf8c8a8 100644
---- a/include/net/bluetooth/bluetooth.h
-+++ b/include/net/bluetooth/bluetooth.h
-@@ -403,6 +403,7 @@ int  bt_sock_register(int proto, const struct net_proto_family *ops);
- void bt_sock_unregister(int proto);
- void bt_sock_link(struct bt_sock_list *l, struct sock *s);
- void bt_sock_unlink(struct bt_sock_list *l, struct sock *s);
-+bool bt_sock_linked(struct bt_sock_list *l, struct sock *s);
- struct sock *bt_sock_alloc(struct net *net, struct socket *sock,
- 			   struct proto *prot, int proto, gfp_t prio, int kern);
- int  bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
-diff --git a/include/net/genetlink.h b/include/net/genetlink.h
-index c53244f2043704..e8c34aa4a640db 100644
---- a/include/net/genetlink.h
-+++ b/include/net/genetlink.h
-@@ -478,13 +478,12 @@ static inline int genlmsg_multicast(const struct genl_family *family,
-  * @skb: netlink message as socket buffer
-  * @portid: own netlink portid to avoid sending to yourself
-  * @group: offset of multicast group in groups array
-- * @flags: allocation flags
-  *
-  * This function must hold the RTNL or rcu_read_lock().
-  */
- int genlmsg_multicast_allns(const struct genl_family *family,
- 			    struct sk_buff *skb, u32 portid,
--			    unsigned int group, gfp_t flags);
-+			    unsigned int group);
- 
- /**
-  * genlmsg_unicast - unicast a netlink message
-diff --git a/include/net/sock.h b/include/net/sock.h
-index c3961050b8e394..e0be8bd9839602 100644
---- a/include/net/sock.h
-+++ b/include/net/sock.h
-@@ -2826,6 +2826,11 @@ static inline bool sk_is_stream_unix(const struct sock *sk)
- 	return sk->sk_family == AF_UNIX && sk->sk_type == SOCK_STREAM;
- }
- 
-+static inline bool sk_is_vsock(const struct sock *sk)
-+{
-+	return sk->sk_family == AF_VSOCK;
-+}
-+
- /**
-  * sk_eat_skb - Release a skb if it is no longer needed
-  * @sk: socket to eat this skb from
-diff --git a/include/net/xfrm.h b/include/net/xfrm.h
-index b280e7c4601160..93a9866ee481fa 100644
---- a/include/net/xfrm.h
-+++ b/include/net/xfrm.h
-@@ -342,20 +342,25 @@ struct xfrm_if_cb {
- void xfrm_if_register_cb(const struct xfrm_if_cb *ifcb);
- void xfrm_if_unregister_cb(void);
- 
-+struct xfrm_dst_lookup_params {
-+	struct net *net;
-+	int tos;
-+	int oif;
-+	xfrm_address_t *saddr;
-+	xfrm_address_t *daddr;
-+	u32 mark;
-+	__u8 ipproto;
-+	union flowi_uli uli;
-+};
-+
- struct net_device;
- struct xfrm_type;
- struct xfrm_dst;
- struct xfrm_policy_afinfo {
- 	struct dst_ops		*dst_ops;
--	struct dst_entry	*(*dst_lookup)(struct net *net,
--					       int tos, int oif,
--					       const xfrm_address_t *saddr,
--					       const xfrm_address_t *daddr,
--					       u32 mark);
--	int			(*get_saddr)(struct net *net, int oif,
--					     xfrm_address_t *saddr,
--					     xfrm_address_t *daddr,
--					     u32 mark);
-+	struct dst_entry	*(*dst_lookup)(const struct xfrm_dst_lookup_params *params);
-+	int			(*get_saddr)(xfrm_address_t *saddr,
-+					     const struct xfrm_dst_lookup_params *params);
- 	int			(*fill_dst)(struct xfrm_dst *xdst,
- 					    struct net_device *dev,
- 					    const struct flowi *fl);
-@@ -1728,10 +1733,7 @@ static inline int xfrm_user_policy(struct sock *sk, int optname,
- }
- #endif
- 
--struct dst_entry *__xfrm_dst_lookup(struct net *net, int tos, int oif,
--				    const xfrm_address_t *saddr,
--				    const xfrm_address_t *daddr,
--				    int family, u32 mark);
-+struct dst_entry *__xfrm_dst_lookup(int family, const struct xfrm_dst_lookup_params *params);
- 
- struct xfrm_policy *xfrm_policy_alloc(struct net *net, gfp_t gfp);
- 
-diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h
-index 6e2ef1d4b0028d..37f2443b3cdb0f 100644
---- a/include/trace/events/huge_memory.h
-+++ b/include/trace/events/huge_memory.h
-@@ -207,10 +207,10 @@ TRACE_EVENT(mm_khugepaged_scan_file,
- );
- 
- TRACE_EVENT(mm_khugepaged_collapse_file,
--	TP_PROTO(struct mm_struct *mm, struct page *hpage, pgoff_t index,
--			bool is_shmem, unsigned long addr, struct file *file,
-+	TP_PROTO(struct mm_struct *mm, struct folio *new_folio, pgoff_t index,
-+			unsigned long addr, bool is_shmem, struct file *file,
- 			int nr, int result),
--	TP_ARGS(mm, hpage, index, addr, is_shmem, file, nr, result),
-+	TP_ARGS(mm, new_folio, index, addr, is_shmem, file, nr, result),
- 	TP_STRUCT__entry(
- 		__field(struct mm_struct *, mm)
- 		__field(unsigned long, hpfn)
-@@ -224,7 +224,7 @@ TRACE_EVENT(mm_khugepaged_collapse_file,
- 
- 	TP_fast_assign(
- 		__entry->mm = mm;
--		__entry->hpfn = hpage ? page_to_pfn(hpage) : -1;
-+		__entry->hpfn = new_folio ? folio_pfn(new_folio) : -1;
- 		__entry->index = index;
- 		__entry->addr = addr;
- 		__entry->is_shmem = is_shmem;
-@@ -233,7 +233,7 @@ TRACE_EVENT(mm_khugepaged_collapse_file,
- 		__entry->result = result;
- 	),
- 
--	TP_printk("mm=%p, hpage_pfn=0x%lx, index=%ld, addr=%ld, is_shmem=%d, filename=%s, nr=%d, result=%s",
-+	TP_printk("mm=%p, hpage_pfn=0x%lx, index=%ld, addr=%lx, is_shmem=%d, filename=%s, nr=%d, result=%s",
- 		__entry->mm,
- 		__entry->hpfn,
- 		__entry->index,
-diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
-index ba6e346c8d669a..431bc700bcfb93 100644
---- a/include/uapi/linux/bpf.h
-+++ b/include/uapi/linux/bpf.h
-@@ -5921,11 +5921,6 @@ enum {
- 	BPF_F_MARK_ENFORCE		= (1ULL << 6),
- };
- 
--/* BPF_FUNC_clone_redirect and BPF_FUNC_redirect flags. */
--enum {
--	BPF_F_INGRESS			= (1ULL << 0),
--};
--
- /* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
- enum {
- 	BPF_F_TUNINFO_IPV6		= (1ULL << 0),
-@@ -6072,10 +6067,12 @@ enum {
- 	BPF_F_BPRM_SECUREEXEC	= (1ULL << 0),
- };
- 
--/* Flags for bpf_redirect_map helper */
-+/* Flags for bpf_redirect and bpf_redirect_map helpers */
- enum {
--	BPF_F_BROADCAST		= (1ULL << 3),
--	BPF_F_EXCLUDE_INGRESS	= (1ULL << 4),
-+	BPF_F_INGRESS		= (1ULL << 0), /* used for skb path */
-+	BPF_F_BROADCAST		= (1ULL << 3), /* used for XDP path */
-+	BPF_F_EXCLUDE_INGRESS	= (1ULL << 4), /* used for XDP path */
-+#define BPF_F_REDIRECT_FLAGS (BPF_F_INGRESS | BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS)
- };
- 
- #define __bpf_md_ptr(type, name)	\
-@@ -6559,20 +6556,27 @@ struct bpf_link_info {
- 					__aligned_u64 file_name; /* in/out */
- 					__u32 name_len;
- 					__u32 offset; /* offset from file_name */
-+					__u64 cookie;
- 				} uprobe; /* BPF_PERF_EVENT_UPROBE, BPF_PERF_EVENT_URETPROBE */
- 				struct {
- 					__aligned_u64 func_name; /* in/out */
- 					__u32 name_len;
- 					__u32 offset; /* offset from func_name */
- 					__u64 addr;
-+					__u64 missed;
-+					__u64 cookie;
- 				} kprobe; /* BPF_PERF_EVENT_KPROBE, BPF_PERF_EVENT_KRETPROBE */
- 				struct {
- 					__aligned_u64 tp_name;   /* in/out */
- 					__u32 name_len;
-+					__u32 :32;
-+					__u64 cookie;
- 				} tracepoint; /* BPF_PERF_EVENT_TRACEPOINT */
- 				struct {
- 					__u64 config;
- 					__u32 type;
-+					__u32 :32;
-+					__u64 cookie;
- 				} event; /* BPF_PERF_EVENT_EVENT */
- 			};
- 		} perf_event;
-diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
-index e0e4d4f490e87c..c8828016a66fdc 100644
---- a/kernel/bpf/btf.c
-+++ b/kernel/bpf/btf.c
-@@ -8435,6 +8435,7 @@ int bpf_core_apply(struct bpf_core_ctx *ctx, const struct bpf_core_relo *relo,
- 	if (!type) {
- 		bpf_log(ctx->log, "relo #%u: bad type id %u\n",
- 			relo_idx, relo->type_id);
-+		kfree(specs);
- 		return -EINVAL;
- 	}
- 
-diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
-index 69e78dc4bb18e8..96b0345f76c2ce 100644
---- a/kernel/bpf/devmap.c
-+++ b/kernel/bpf/devmap.c
-@@ -322,9 +322,11 @@ static int dev_map_hash_get_next_key(struct bpf_map *map, void *key,
- 
- static int dev_map_bpf_prog_run(struct bpf_prog *xdp_prog,
- 				struct xdp_frame **frames, int n,
--				struct net_device *dev)
-+				struct net_device *tx_dev,
-+				struct net_device *rx_dev)
- {
--	struct xdp_txq_info txq = { .dev = dev };
-+	struct xdp_txq_info txq = { .dev = tx_dev };
-+	struct xdp_rxq_info rxq = { .dev = rx_dev };
- 	struct xdp_buff xdp;
- 	int i, nframes = 0;
- 
-@@ -335,6 +337,7 @@ static int dev_map_bpf_prog_run(struct bpf_prog *xdp_prog,
- 
- 		xdp_convert_frame_to_buff(xdpf, &xdp);
- 		xdp.txq = &txq;
-+		xdp.rxq = &rxq;
- 
- 		act = bpf_prog_run_xdp(xdp_prog, &xdp);
- 		switch (act) {
-@@ -349,7 +352,7 @@ static int dev_map_bpf_prog_run(struct bpf_prog *xdp_prog,
- 			bpf_warn_invalid_xdp_action(NULL, xdp_prog, act);
- 			fallthrough;
- 		case XDP_ABORTED:
--			trace_xdp_exception(dev, xdp_prog, act);
-+			trace_xdp_exception(tx_dev, xdp_prog, act);
- 			fallthrough;
- 		case XDP_DROP:
- 			xdp_return_frame_rx_napi(xdpf);
-@@ -377,7 +380,7 @@ static void bq_xmit_all(struct xdp_dev_bulk_queue *bq, u32 flags)
- 	}
- 
- 	if (bq->xdp_prog) {
--		to_send = dev_map_bpf_prog_run(bq->xdp_prog, bq->q, cnt, dev);
-+		to_send = dev_map_bpf_prog_run(bq->xdp_prog, bq->q, cnt, dev, bq->dev_rx);
- 		if (!to_send)
- 			goto out;
- 	}
-diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c
-index 3dba5bb294d8e4..41d62405c85214 100644
---- a/kernel/bpf/helpers.c
-+++ b/kernel/bpf/helpers.c
-@@ -110,7 +110,7 @@ const struct bpf_func_proto bpf_map_pop_elem_proto = {
- 	.gpl_only	= false,
- 	.ret_type	= RET_INTEGER,
- 	.arg1_type	= ARG_CONST_MAP_PTR,
--	.arg2_type	= ARG_PTR_TO_MAP_VALUE | MEM_UNINIT,
-+	.arg2_type	= ARG_PTR_TO_MAP_VALUE | MEM_UNINIT | MEM_WRITE,
- };
- 
- BPF_CALL_2(bpf_map_peek_elem, struct bpf_map *, map, void *, value)
-@@ -123,7 +123,7 @@ const struct bpf_func_proto bpf_map_peek_elem_proto = {
- 	.gpl_only	= false,
- 	.ret_type	= RET_INTEGER,
- 	.arg1_type	= ARG_CONST_MAP_PTR,
--	.arg2_type	= ARG_PTR_TO_MAP_VALUE | MEM_UNINIT,
-+	.arg2_type	= ARG_PTR_TO_MAP_VALUE | MEM_UNINIT | MEM_WRITE,
- };
- 
- BPF_CALL_3(bpf_map_lookup_percpu_elem, struct bpf_map *, map, void *, key, u32, cpu)
-@@ -538,7 +538,7 @@ const struct bpf_func_proto bpf_strtol_proto = {
- 	.arg1_type	= ARG_PTR_TO_MEM | MEM_RDONLY,
- 	.arg2_type	= ARG_CONST_SIZE,
- 	.arg3_type	= ARG_ANYTHING,
--	.arg4_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_ALIGNED,
-+	.arg4_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_WRITE | MEM_ALIGNED,
- 	.arg4_size	= sizeof(s64),
- };
- 
-@@ -568,7 +568,7 @@ const struct bpf_func_proto bpf_strtoul_proto = {
- 	.arg1_type	= ARG_PTR_TO_MEM | MEM_RDONLY,
- 	.arg2_type	= ARG_CONST_SIZE,
- 	.arg3_type	= ARG_ANYTHING,
--	.arg4_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_ALIGNED,
-+	.arg4_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_WRITE | MEM_ALIGNED,
- 	.arg4_size	= sizeof(u64),
- };
- 
-@@ -1607,7 +1607,7 @@ static const struct bpf_func_proto bpf_dynptr_from_mem_proto = {
- 	.arg1_type	= ARG_PTR_TO_UNINIT_MEM,
- 	.arg2_type	= ARG_CONST_SIZE_OR_ZERO,
- 	.arg3_type	= ARG_ANYTHING,
--	.arg4_type	= ARG_PTR_TO_DYNPTR | DYNPTR_TYPE_LOCAL | MEM_UNINIT,
-+	.arg4_type	= ARG_PTR_TO_DYNPTR | DYNPTR_TYPE_LOCAL | MEM_UNINIT | MEM_WRITE,
- };
- 
- BPF_CALL_5(bpf_dynptr_read, void *, dst, u32, len, const struct bpf_dynptr_kern *, src,
-diff --git a/kernel/bpf/ringbuf.c b/kernel/bpf/ringbuf.c
-index 238d9b206bbdec..246559c3e93d0d 100644
---- a/kernel/bpf/ringbuf.c
-+++ b/kernel/bpf/ringbuf.c
-@@ -632,7 +632,7 @@ const struct bpf_func_proto bpf_ringbuf_reserve_dynptr_proto = {
- 	.arg1_type	= ARG_CONST_MAP_PTR,
- 	.arg2_type	= ARG_ANYTHING,
- 	.arg3_type	= ARG_ANYTHING,
--	.arg4_type	= ARG_PTR_TO_DYNPTR | DYNPTR_TYPE_RINGBUF | MEM_UNINIT,
-+	.arg4_type	= ARG_PTR_TO_DYNPTR | DYNPTR_TYPE_RINGBUF | MEM_UNINIT | MEM_WRITE,
- };
- 
- BPF_CALL_2(bpf_ringbuf_submit_dynptr, struct bpf_dynptr_kern *, ptr, u64, flags)
-diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index b1933d074f0519..8a1cadc1ff9dd9 100644
---- a/kernel/bpf/syscall.c
-+++ b/kernel/bpf/syscall.c
-@@ -3442,26 +3442,34 @@ static void bpf_perf_link_dealloc(struct bpf_link *link)
- }
- 
- static int bpf_perf_link_fill_common(const struct perf_event *event,
--				     char __user *uname, u32 ulen,
-+				     char __user *uname, u32 *ulenp,
- 				     u64 *probe_offset, u64 *probe_addr,
--				     u32 *fd_type)
-+				     u32 *fd_type, unsigned long *missed)
- {
- 	const char *buf;
--	u32 prog_id;
-+	u32 prog_id, ulen;
- 	size_t len;
- 	int err;
- 
-+	ulen = *ulenp;
- 	if (!ulen ^ !uname)
- 		return -EINVAL;
- 
- 	err = bpf_get_perf_event_info(event, &prog_id, fd_type, &buf,
--				      probe_offset, probe_addr);
-+				      probe_offset, probe_addr, missed);
- 	if (err)
- 		return err;
-+
-+	if (buf) {
-+		len = strlen(buf);
-+		*ulenp = len + 1;
-+	} else {
-+		*ulenp = 1;
-+	}
- 	if (!uname)
- 		return 0;
-+
- 	if (buf) {
--		len = strlen(buf);
- 		err = bpf_copy_to_user(uname, buf, ulen, len);
- 		if (err)
- 			return err;
-@@ -3478,6 +3486,7 @@ static int bpf_perf_link_fill_common(const struct perf_event *event,
- static int bpf_perf_link_fill_kprobe(const struct perf_event *event,
- 				     struct bpf_link_info *info)
- {
-+	unsigned long missed;
- 	char __user *uname;
- 	u64 addr, offset;
- 	u32 ulen, type;
-@@ -3485,19 +3494,21 @@ static int bpf_perf_link_fill_kprobe(const struct perf_event *event,
- 
- 	uname = u64_to_user_ptr(info->perf_event.kprobe.func_name);
- 	ulen = info->perf_event.kprobe.name_len;
--	err = bpf_perf_link_fill_common(event, uname, ulen, &offset, &addr,
--					&type);
-+	err = bpf_perf_link_fill_common(event, uname, &ulen, &offset, &addr,
-+					&type, &missed);
- 	if (err)
- 		return err;
- 	if (type == BPF_FD_TYPE_KRETPROBE)
- 		info->perf_event.type = BPF_PERF_EVENT_KRETPROBE;
- 	else
- 		info->perf_event.type = BPF_PERF_EVENT_KPROBE;
--
-+	info->perf_event.kprobe.name_len = ulen;
- 	info->perf_event.kprobe.offset = offset;
-+	info->perf_event.kprobe.missed = missed;
- 	if (!kallsyms_show_value(current_cred()))
- 		addr = 0;
- 	info->perf_event.kprobe.addr = addr;
-+	info->perf_event.kprobe.cookie = event->bpf_cookie;
- 	return 0;
- }
- #endif
-@@ -3513,8 +3524,8 @@ static int bpf_perf_link_fill_uprobe(const struct perf_event *event,
- 
- 	uname = u64_to_user_ptr(info->perf_event.uprobe.file_name);
- 	ulen = info->perf_event.uprobe.name_len;
--	err = bpf_perf_link_fill_common(event, uname, ulen, &offset, &addr,
--					&type);
-+	err = bpf_perf_link_fill_common(event, uname, &ulen, &offset, &addr,
-+					&type, NULL);
- 	if (err)
- 		return err;
- 
-@@ -3522,7 +3533,9 @@ static int bpf_perf_link_fill_uprobe(const struct perf_event *event,
- 		info->perf_event.type = BPF_PERF_EVENT_URETPROBE;
- 	else
- 		info->perf_event.type = BPF_PERF_EVENT_UPROBE;
-+	info->perf_event.uprobe.name_len = ulen;
- 	info->perf_event.uprobe.offset = offset;
-+	info->perf_event.uprobe.cookie = event->bpf_cookie;
- 	return 0;
- }
- #endif
-@@ -3546,11 +3559,18 @@ static int bpf_perf_link_fill_tracepoint(const struct perf_event *event,
- {
- 	char __user *uname;
- 	u32 ulen;
-+	int err;
- 
- 	uname = u64_to_user_ptr(info->perf_event.tracepoint.tp_name);
- 	ulen = info->perf_event.tracepoint.name_len;
-+	err = bpf_perf_link_fill_common(event, uname, &ulen, NULL, NULL, NULL, NULL);
-+	if (err)
-+		return err;
-+
- 	info->perf_event.type = BPF_PERF_EVENT_TRACEPOINT;
--	return bpf_perf_link_fill_common(event, uname, ulen, NULL, NULL, NULL);
-+	info->perf_event.tracepoint.name_len = ulen;
-+	info->perf_event.tracepoint.cookie = event->bpf_cookie;
-+	return 0;
- }
- 
- static int bpf_perf_link_fill_perf_event(const struct perf_event *event,
-@@ -3558,6 +3578,7 @@ static int bpf_perf_link_fill_perf_event(const struct perf_event *event,
- {
- 	info->perf_event.event.type = event->attr.type;
- 	info->perf_event.event.config = event->attr.config;
-+	info->perf_event.event.cookie = event->bpf_cookie;
- 	info->perf_event.type = BPF_PERF_EVENT_EVENT;
- 	return 0;
- }
-@@ -4897,7 +4918,7 @@ static int bpf_task_fd_query(const union bpf_attr *attr,
- 
- 		err = bpf_get_perf_event_info(event, &prog_id, &fd_type,
- 					      &buf, &probe_offset,
--					      &probe_addr);
-+					      &probe_addr, NULL);
- 		if (!err)
- 			err = bpf_task_fd_query_copy(attr, uattr, prog_id,
- 						     fd_type, buf,
-@@ -5668,7 +5689,7 @@ static const struct bpf_func_proto bpf_kallsyms_lookup_name_proto = {
- 	.arg1_type	= ARG_PTR_TO_MEM,
- 	.arg2_type	= ARG_CONST_SIZE_OR_ZERO,
- 	.arg3_type	= ARG_ANYTHING,
--	.arg4_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_ALIGNED,
-+	.arg4_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_WRITE | MEM_ALIGNED,
- 	.arg4_size	= sizeof(u64),
- };
- 
-diff --git a/kernel/bpf/task_iter.c b/kernel/bpf/task_iter.c
-index c4ab9d6cdbe9c8..f7ef58090c7d0b 100644
---- a/kernel/bpf/task_iter.c
-+++ b/kernel/bpf/task_iter.c
-@@ -119,7 +119,7 @@ static struct task_struct *task_seq_get_next(struct bpf_iter_seq_task_common *co
- 		rcu_read_lock();
- 		pid = find_pid_ns(common->pid, common->ns);
- 		if (pid) {
--			task = get_pid_task(pid, PIDTYPE_TGID);
-+			task = get_pid_task(pid, PIDTYPE_PID);
- 			*tid = common->pid;
- 		}
- 		rcu_read_unlock();
-diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
-index 3032a464d31bbf..03b5797b8fca9e 100644
---- a/kernel/bpf/verifier.c
-+++ b/kernel/bpf/verifier.c
-@@ -2799,10 +2799,16 @@ static struct btf *__find_kfunc_desc_btf(struct bpf_verifier_env *env,
- 		b->module = mod;
- 		b->offset = offset;
- 
-+		/* sort() reorders entries by value, so b may no longer point
-+		 * to the right entry after this
-+		 */
- 		sort(tab->descs, tab->nr_descs, sizeof(tab->descs[0]),
- 		     kfunc_btf_cmp_by_off, NULL);
-+	} else {
-+		btf = b->btf;
- 	}
--	return b->btf;
-+
-+	return btf;
- }
- 
- void bpf_free_kfunc_btf_tab(struct bpf_kfunc_btf_tab *tab)
-@@ -6137,10 +6143,10 @@ static void coerce_reg_to_size_sx(struct bpf_reg_state *reg, int size)
- 
- 	/* both of s64_max/s64_min positive or negative */
- 	if ((s64_max >= 0) == (s64_min >= 0)) {
--		reg->smin_value = reg->s32_min_value = s64_min;
--		reg->smax_value = reg->s32_max_value = s64_max;
--		reg->umin_value = reg->u32_min_value = s64_min;
--		reg->umax_value = reg->u32_max_value = s64_max;
-+		reg->s32_min_value = reg->smin_value = s64_min;
-+		reg->s32_max_value = reg->smax_value = s64_max;
-+		reg->u32_min_value = reg->umin_value = s64_min;
-+		reg->u32_max_value = reg->umax_value = s64_max;
- 		reg->var_off = tnum_range(s64_min, s64_max);
- 		return;
- 	}
-@@ -7192,7 +7198,8 @@ static int check_stack_range_initialized(
- }
- 
- static int check_helper_mem_access(struct bpf_verifier_env *env, int regno,
--				   int access_size, bool zero_size_allowed,
-+				   int access_size, enum bpf_access_type access_type,
-+				   bool zero_size_allowed,
- 				   struct bpf_call_arg_meta *meta)
- {
- 	struct bpf_reg_state *regs = cur_regs(env), *reg = &regs[regno];
-@@ -7204,7 +7211,7 @@ static int check_helper_mem_access(struct bpf_verifier_env *env, int regno,
- 		return check_packet_access(env, regno, reg->off, access_size,
- 					   zero_size_allowed);
- 	case PTR_TO_MAP_KEY:
--		if (meta && meta->raw_mode) {
-+		if (access_type == BPF_WRITE) {
- 			verbose(env, "R%d cannot write into %s\n", regno,
- 				reg_type_str(env, reg->type));
- 			return -EACCES;
-@@ -7212,15 +7219,13 @@ static int check_helper_mem_access(struct bpf_verifier_env *env, int regno,
- 		return check_mem_region_access(env, regno, reg->off, access_size,
- 					       reg->map_ptr->key_size, false);
- 	case PTR_TO_MAP_VALUE:
--		if (check_map_access_type(env, regno, reg->off, access_size,
--					  meta && meta->raw_mode ? BPF_WRITE :
--					  BPF_READ))
-+		if (check_map_access_type(env, regno, reg->off, access_size, access_type))
- 			return -EACCES;
- 		return check_map_access(env, regno, reg->off, access_size,
- 					zero_size_allowed, ACCESS_HELPER);
- 	case PTR_TO_MEM:
- 		if (type_is_rdonly_mem(reg->type)) {
--			if (meta && meta->raw_mode) {
-+			if (access_type == BPF_WRITE) {
- 				verbose(env, "R%d cannot write into %s\n", regno,
- 					reg_type_str(env, reg->type));
- 				return -EACCES;
-@@ -7231,7 +7236,7 @@ static int check_helper_mem_access(struct bpf_verifier_env *env, int regno,
- 					       zero_size_allowed);
- 	case PTR_TO_BUF:
- 		if (type_is_rdonly_mem(reg->type)) {
--			if (meta && meta->raw_mode) {
-+			if (access_type == BPF_WRITE) {
- 				verbose(env, "R%d cannot write into %s\n", regno,
- 					reg_type_str(env, reg->type));
- 				return -EACCES;
-@@ -7259,7 +7264,6 @@ static int check_helper_mem_access(struct bpf_verifier_env *env, int regno,
- 		 * Dynamically check it now.
- 		 */
- 		if (!env->ops->convert_ctx_access) {
--			enum bpf_access_type atype = meta && meta->raw_mode ? BPF_WRITE : BPF_READ;
- 			int offset = access_size - 1;
- 
- 			/* Allow zero-byte read from PTR_TO_CTX */
-@@ -7267,7 +7271,7 @@ static int check_helper_mem_access(struct bpf_verifier_env *env, int regno,
- 				return zero_size_allowed ? 0 : -EACCES;
- 
- 			return check_mem_access(env, env->insn_idx, regno, offset, BPF_B,
--						atype, -1, false, false);
-+						access_type, -1, false, false);
- 		}
- 
- 		fallthrough;
-@@ -7286,6 +7290,7 @@ static int check_helper_mem_access(struct bpf_verifier_env *env, int regno,
- 
- static int check_mem_size_reg(struct bpf_verifier_env *env,
- 			      struct bpf_reg_state *reg, u32 regno,
-+			      enum bpf_access_type access_type,
- 			      bool zero_size_allowed,
- 			      struct bpf_call_arg_meta *meta)
- {
-@@ -7301,15 +7306,12 @@ static int check_mem_size_reg(struct bpf_verifier_env *env,
- 	 */
- 	meta->msize_max_value = reg->umax_value;
- 
--	/* The register is SCALAR_VALUE; the access check
--	 * happens using its boundaries.
-+	/* The register is SCALAR_VALUE; the access check happens using
-+	 * its boundaries. For unprivileged variable accesses, disable
-+	 * raw mode so that the program is required to initialize all
-+	 * the memory that the helper could just partially fill up.
- 	 */
- 	if (!tnum_is_const(reg->var_off))
--		/* For unprivileged variable accesses, disable raw
--		 * mode so that the program is required to
--		 * initialize all the memory that the helper could
--		 * just partially fill up.
--		 */
- 		meta = NULL;
- 
- 	if (reg->smin_value < 0) {
-@@ -7318,12 +7320,10 @@ static int check_mem_size_reg(struct bpf_verifier_env *env,
- 		return -EACCES;
- 	}
- 
--	if (reg->umin_value == 0) {
--		err = check_helper_mem_access(env, regno - 1, 0,
--					      zero_size_allowed,
--					      meta);
--		if (err)
--			return err;
-+	if (reg->umin_value == 0 && !zero_size_allowed) {
-+		verbose(env, "R%d invalid zero-sized read: u64=[%lld,%lld]\n",
-+			regno, reg->umin_value, reg->umax_value);
-+		return -EACCES;
- 	}
- 
- 	if (reg->umax_value >= BPF_MAX_VAR_SIZ) {
-@@ -7331,9 +7331,8 @@ static int check_mem_size_reg(struct bpf_verifier_env *env,
- 			regno);
- 		return -EACCES;
- 	}
--	err = check_helper_mem_access(env, regno - 1,
--				      reg->umax_value,
--				      zero_size_allowed, meta);
-+	err = check_helper_mem_access(env, regno - 1, reg->umax_value,
-+				      access_type, zero_size_allowed, meta);
- 	if (!err)
- 		err = mark_chain_precision(env, regno);
- 	return err;
-@@ -7344,13 +7343,11 @@ int check_mem_reg(struct bpf_verifier_env *env, struct bpf_reg_state *reg,
- {
- 	bool may_be_null = type_may_be_null(reg->type);
- 	struct bpf_reg_state saved_reg;
--	struct bpf_call_arg_meta meta;
- 	int err;
- 
- 	if (register_is_null(reg))
- 		return 0;
- 
--	memset(&meta, 0, sizeof(meta));
- 	/* Assuming that the register contains a value check if the memory
- 	 * access is safe. Temporarily save and restore the register's state as
- 	 * the conversion shouldn't be visible to a caller.
-@@ -7360,10 +7357,8 @@ int check_mem_reg(struct bpf_verifier_env *env, struct bpf_reg_state *reg,
- 		mark_ptr_not_null_reg(reg);
- 	}
- 
--	err = check_helper_mem_access(env, regno, mem_size, true, &meta);
--	/* Check access for BPF_WRITE */
--	meta.raw_mode = true;
--	err = err ?: check_helper_mem_access(env, regno, mem_size, true, &meta);
-+	err = check_helper_mem_access(env, regno, mem_size, BPF_READ, true, NULL);
-+	err = err ?: check_helper_mem_access(env, regno, mem_size, BPF_WRITE, true, NULL);
- 
- 	if (may_be_null)
- 		*reg = saved_reg;
-@@ -7389,13 +7384,12 @@ static int check_kfunc_mem_size_reg(struct bpf_verifier_env *env, struct bpf_reg
- 		mark_ptr_not_null_reg(mem_reg);
- 	}
- 
--	err = check_mem_size_reg(env, reg, regno, true, &meta);
--	/* Check access for BPF_WRITE */
--	meta.raw_mode = true;
--	err = err ?: check_mem_size_reg(env, reg, regno, true, &meta);
-+	err = check_mem_size_reg(env, reg, regno, BPF_READ, true, &meta);
-+	err = err ?: check_mem_size_reg(env, reg, regno, BPF_WRITE, true, &meta);
- 
- 	if (may_be_null)
- 		*mem_reg = saved_reg;
-+
- 	return err;
- }
- 
-@@ -8581,9 +8575,8 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 arg,
- 			verbose(env, "invalid map_ptr to access map->key\n");
- 			return -EACCES;
- 		}
--		err = check_helper_mem_access(env, regno,
--					      meta->map_ptr->key_size, false,
--					      NULL);
-+		err = check_helper_mem_access(env, regno, meta->map_ptr->key_size,
-+					      BPF_READ, false, NULL);
- 		break;
- 	case ARG_PTR_TO_MAP_VALUE:
- 		if (type_may_be_null(arg_type) && register_is_null(reg))
-@@ -8598,9 +8591,9 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 arg,
- 			return -EACCES;
- 		}
- 		meta->raw_mode = arg_type & MEM_UNINIT;
--		err = check_helper_mem_access(env, regno,
--					      meta->map_ptr->value_size, false,
--					      meta);
-+		err = check_helper_mem_access(env, regno, meta->map_ptr->value_size,
-+					      arg_type & MEM_WRITE ? BPF_WRITE : BPF_READ,
-+					      false, meta);
- 		break;
- 	case ARG_PTR_TO_PERCPU_BTF_ID:
- 		if (!reg->btf_id) {
-@@ -8642,7 +8635,9 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 arg,
- 		 */
- 		meta->raw_mode = arg_type & MEM_UNINIT;
- 		if (arg_type & MEM_FIXED_SIZE) {
--			err = check_helper_mem_access(env, regno, fn->arg_size[arg], false, meta);
-+			err = check_helper_mem_access(env, regno, fn->arg_size[arg],
-+						      arg_type & MEM_WRITE ? BPF_WRITE : BPF_READ,
-+						      false, meta);
- 			if (err)
- 				return err;
- 			if (arg_type & MEM_ALIGNED)
-@@ -8650,10 +8645,16 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 arg,
- 		}
- 		break;
- 	case ARG_CONST_SIZE:
--		err = check_mem_size_reg(env, reg, regno, false, meta);
-+		err = check_mem_size_reg(env, reg, regno,
-+					 fn->arg_type[arg - 1] & MEM_WRITE ?
-+					 BPF_WRITE : BPF_READ,
-+					 false, meta);
- 		break;
- 	case ARG_CONST_SIZE_OR_ZERO:
--		err = check_mem_size_reg(env, reg, regno, true, meta);
-+		err = check_mem_size_reg(env, reg, regno,
-+					 fn->arg_type[arg - 1] & MEM_WRITE ?
-+					 BPF_WRITE : BPF_READ,
-+					 true, meta);
- 		break;
- 	case ARG_PTR_TO_DYNPTR:
- 		err = process_dynptr_func(env, regno, insn_idx, arg_type, 0);
-diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 9b406d9886541b..b6f922a20f83a5 100644
---- a/kernel/sched/core.c
-+++ b/kernel/sched/core.c
-@@ -12050,7 +12050,9 @@ void task_tick_mm_cid(struct rq *rq, struct task_struct *curr)
- 		return;
- 	if (time_before(now, READ_ONCE(curr->mm->mm_cid_next_scan)))
- 		return;
--	task_work_add(curr, work, TWA_RESUME);
-+
-+	/* No page allocation under rq lock */
-+	task_work_add(curr, work, TWA_RESUME | TWAF_NO_ALLOC);
- }
- 
- void sched_mm_cid_exit_signals(struct task_struct *t)
-diff --git a/kernel/task_work.c b/kernel/task_work.c
-index 2134ac8057a94e..c969f1f26be58a 100644
---- a/kernel/task_work.c
-+++ b/kernel/task_work.c
-@@ -1,10 +1,20 @@
- // SPDX-License-Identifier: GPL-2.0
-+#include <linux/irq_work.h>
- #include <linux/spinlock.h>
- #include <linux/task_work.h>
- #include <linux/resume_user_mode.h>
- 
- static struct callback_head work_exited; /* all we need is ->next == NULL */
- 
-+#ifdef CONFIG_IRQ_WORK
-+static void task_work_set_notify_irq(struct irq_work *entry)
-+{
-+	test_and_set_tsk_thread_flag(current, TIF_NOTIFY_RESUME);
-+}
-+static DEFINE_PER_CPU(struct irq_work, irq_work_NMI_resume) =
-+	IRQ_WORK_INIT_HARD(task_work_set_notify_irq);
-+#endif
-+
- /**
-  * task_work_add - ask the @task to execute @work->func()
-  * @task: the task which should run the callback
-@@ -12,7 +22,7 @@ static struct callback_head work_exited; /* all we need is ->next == NULL */
-  * @notify: how to notify the targeted task
-  *
-  * Queue @work for task_work_run() below and notify the @task if @notify
-- * is @TWA_RESUME, @TWA_SIGNAL, or @TWA_SIGNAL_NO_IPI.
-+ * is @TWA_RESUME, @TWA_SIGNAL, @TWA_SIGNAL_NO_IPI or @TWA_NMI_CURRENT.
-  *
-  * @TWA_SIGNAL works like signals, in that the it will interrupt the targeted
-  * task and run the task_work, regardless of whether the task is currently
-@@ -24,6 +34,8 @@ static struct callback_head work_exited; /* all we need is ->next == NULL */
-  * kernel anyway.
-  * @TWA_RESUME work is run only when the task exits the kernel and returns to
-  * user mode, or before entering guest mode.
-+ * @TWA_NMI_CURRENT works like @TWA_RESUME, except it can only be used for the
-+ * current @task and if the current context is NMI.
-  *
-  * Fails if the @task is exiting/exited and thus it can't process this @work.
-  * Otherwise @work->func() will be called when the @task goes through one of
-@@ -43,9 +55,27 @@ int task_work_add(struct task_struct *task, struct callback_head *work,
- 		  enum task_work_notify_mode notify)
- {
- 	struct callback_head *head;
--
--	/* record the work call stack in order to print it in KASAN reports */
--	kasan_record_aux_stack(work);
-+	int flags = notify & TWA_FLAGS;
-+
-+	notify &= ~TWA_FLAGS;
-+	if (notify == TWA_NMI_CURRENT) {
-+		if (WARN_ON_ONCE(task != current))
-+			return -EINVAL;
-+		if (!IS_ENABLED(CONFIG_IRQ_WORK))
-+			return -EINVAL;
-+	} else {
-+		/*
-+		 * Record the work call stack in order to print it in KASAN
-+		 * reports.
-+		 *
-+		 * Note that stack allocation can fail if TWAF_NO_ALLOC flag
-+		 * is set and new page is needed to expand the stack buffer.
-+		 */
-+		if (flags & TWAF_NO_ALLOC)
-+			kasan_record_aux_stack_noalloc(work);
-+		else
-+			kasan_record_aux_stack(work);
-+	}
- 
- 	head = READ_ONCE(task->task_works);
- 	do {
-@@ -66,6 +96,11 @@ int task_work_add(struct task_struct *task, struct callback_head *work,
- 	case TWA_SIGNAL_NO_IPI:
- 		__set_notify_signal(task);
- 		break;
-+#ifdef CONFIG_IRQ_WORK
-+	case TWA_NMI_CURRENT:
-+		irq_work_queue(this_cpu_ptr(&irq_work_NMI_resume));
-+		break;
-+#endif
- 	default:
- 		WARN_ON_ONCE(1);
- 		break;
-diff --git a/kernel/time/posix-clock.c b/kernel/time/posix-clock.c
-index 8127673bfc45e6..05e73d209aa87e 100644
---- a/kernel/time/posix-clock.c
-+++ b/kernel/time/posix-clock.c
-@@ -290,6 +290,9 @@ static int pc_clock_settime(clockid_t id, const struct timespec64 *ts)
- 	struct posix_clock_desc cd;
- 	int err;
- 
-+	if (!timespec64_valid_strict(ts))
-+		return -EINVAL;
-+
- 	err = get_clock_desc(id, &cd);
- 	if (err)
- 		return err;
-@@ -299,9 +302,6 @@ static int pc_clock_settime(clockid_t id, const struct timespec64 *ts)
- 		goto out;
- 	}
- 
--	if (!timespec64_valid_strict(ts))
--		return -EINVAL;
--
- 	if (cd.clk->ops.clock_settime)
- 		err = cd.clk->ops.clock_settime(cd.clk, ts);
- 	else
-diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
-index eca858bde80470..9064f75de7e468 100644
---- a/kernel/trace/bpf_trace.c
-+++ b/kernel/trace/bpf_trace.c
-@@ -1220,7 +1220,7 @@ static const struct bpf_func_proto bpf_get_func_arg_proto = {
- 	.ret_type	= RET_INTEGER,
- 	.arg1_type	= ARG_PTR_TO_CTX,
- 	.arg2_type	= ARG_ANYTHING,
--	.arg3_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_ALIGNED,
-+	.arg3_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_WRITE | MEM_ALIGNED,
- 	.arg3_size	= sizeof(u64),
- };
- 
-@@ -1237,7 +1237,7 @@ static const struct bpf_func_proto bpf_get_func_ret_proto = {
- 	.func		= get_func_ret,
- 	.ret_type	= RET_INTEGER,
- 	.arg1_type	= ARG_PTR_TO_CTX,
--	.arg2_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_ALIGNED,
-+	.arg2_type	= ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_WRITE | MEM_ALIGNED,
- 	.arg2_size	= sizeof(u64),
- };
- 
-@@ -2217,8 +2217,6 @@ void perf_event_detach_bpf_prog(struct perf_event *event)
- 
- 	old_array = bpf_event_rcu_dereference(event->tp_event->prog_array);
- 	ret = bpf_prog_array_copy(old_array, event->prog, NULL, 0, &new_array);
--	if (ret == -ENOENT)
--		goto unlock;
- 	if (ret < 0) {
- 		bpf_prog_array_delete_safe(old_array, event->prog);
- 	} else {
-@@ -2389,7 +2387,8 @@ int bpf_probe_unregister(struct bpf_raw_event_map *btp, struct bpf_prog *prog)
- 
- int bpf_get_perf_event_info(const struct perf_event *event, u32 *prog_id,
- 			    u32 *fd_type, const char **buf,
--			    u64 *probe_offset, u64 *probe_addr)
-+			    u64 *probe_offset, u64 *probe_addr,
-+			    unsigned long *missed)
- {
- 	bool is_tracepoint, is_syscall_tp;
- 	struct bpf_prog *prog;
-@@ -2424,7 +2423,7 @@ int bpf_get_perf_event_info(const struct perf_event *event, u32 *prog_id,
- #ifdef CONFIG_KPROBE_EVENTS
- 		if (flags & TRACE_EVENT_FL_KPROBE)
- 			err = bpf_get_kprobe_info(event, fd_type, buf,
--						  probe_offset, probe_addr,
-+						  probe_offset, probe_addr, missed,
- 						  event->attr.type == PERF_TYPE_TRACEPOINT);
- #endif
- #ifdef CONFIG_UPROBE_EVENTS
-diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index 4f93d57cc02990..ecd869ed27670c 100644
---- a/kernel/trace/trace.c
-+++ b/kernel/trace/trace.c
-@@ -5757,6 +5757,7 @@ static const char readme_msg[] =
- 	"\t           $stack<index>, $stack, $retval, $comm,\n"
- #endif
- 	"\t           +|-[u]<offset>(<fetcharg>), \\imm-value, \\\"imm-string\"\n"
-+	"\t     kernel return probes support: $retval, $arg<N>, $comm\n"
- 	"\t     type: s8/16/32/64, u8/16/32/64, x8/16/32/64, char, string, symbol,\n"
- 	"\t           b<bit-width>@<bit-offset>/<container-size>, ustring,\n"
- 	"\t           symstr, <type>\\[<array-size>\\]\n"
-diff --git a/kernel/trace/trace_eprobe.c b/kernel/trace/trace_eprobe.c
-index 72714cbf475c78..31bb977670bdfb 100644
---- a/kernel/trace/trace_eprobe.c
-+++ b/kernel/trace/trace_eprobe.c
-@@ -220,7 +220,7 @@ static struct trace_eprobe *alloc_event_probe(const char *group,
- 	if (!ep->event_system)
- 		goto error;
- 
--	ret = trace_probe_init(&ep->tp, this_event, group, false);
-+	ret = trace_probe_init(&ep->tp, this_event, group, false, nargs);
- 	if (ret < 0)
- 		goto error;
- 
-@@ -390,8 +390,8 @@ static int get_eprobe_size(struct trace_probe *tp, void *rec)
- 
- /* Note that we don't verify it, since the code does not come from user space */
- static int
--process_fetch_insn(struct fetch_insn *code, void *rec, void *dest,
--		   void *base)
-+process_fetch_insn(struct fetch_insn *code, void *rec, void *edata,
-+		   void *dest, void *base)
- {
- 	unsigned long val;
- 	int ret;
-@@ -438,7 +438,7 @@ __eprobe_trace_func(struct eprobe_data *edata, void *rec)
- 		return;
- 
- 	entry = fbuffer.entry = ring_buffer_event_data(fbuffer.event);
--	store_trace_args(&entry[1], &edata->ep->tp, rec, sizeof(*entry), dsize);
-+	store_trace_args(&entry[1], &edata->ep->tp, rec, NULL, sizeof(*entry), dsize);
- 
- 	trace_event_buffer_commit(&fbuffer);
- }
-@@ -915,6 +915,11 @@ static int __trace_eprobe_create(int argc, const char *argv[])
- 		}
- 	}
- 
-+	if (argc - 2 > MAX_TRACE_ARGS) {
-+		ret = -E2BIG;
-+		goto error;
-+	}
-+
- 	mutex_lock(&event_mutex);
- 	event_call = find_and_get_event(sys_name, sys_event);
- 	ep = alloc_event_probe(group, event, event_call, argc - 2);
-@@ -940,7 +945,7 @@ static int __trace_eprobe_create(int argc, const char *argv[])
- 
- 	argc -= 2; argv += 2;
- 	/* parse arguments */
--	for (i = 0; i < argc && i < MAX_TRACE_ARGS; i++) {
-+	for (i = 0; i < argc; i++) {
- 		trace_probe_log_set_index(i + 2);
- 		ret = trace_eprobe_tp_update_arg(ep, argv, i);
- 		if (ret)
-diff --git a/kernel/trace/trace_fprobe.c b/kernel/trace/trace_fprobe.c
-index 7d2ddbcfa377cf..f26bb8a90cb541 100644
---- a/kernel/trace/trace_fprobe.c
-+++ b/kernel/trace/trace_fprobe.c
-@@ -4,6 +4,7 @@
-  * Copyright (C) 2022 Google LLC.
-  */
- #define pr_fmt(fmt)	"trace_fprobe: " fmt
-+#include <asm/ptrace.h>
- 
- #include <linux/fprobe.h>
- #include <linux/module.h>
-@@ -129,8 +130,8 @@ static bool trace_fprobe_is_registered(struct trace_fprobe *tf)
-  * from user space.
-  */
- static int
--process_fetch_insn(struct fetch_insn *code, void *rec, void *dest,
--		   void *base)
-+process_fetch_insn(struct fetch_insn *code, void *rec, void *edata,
-+		   void *dest, void *base)
- {
- 	struct pt_regs *regs = rec;
- 	unsigned long val;
-@@ -152,6 +153,9 @@ process_fetch_insn(struct fetch_insn *code, void *rec, void *dest,
- 	case FETCH_OP_ARG:
- 		val = regs_get_kernel_argument(regs, code->param);
- 		break;
-+	case FETCH_OP_EDATA:
-+		val = *(unsigned long *)((unsigned long)edata + code->offset);
-+		break;
- #endif
- 	case FETCH_NOP_SYMBOL:	/* Ignore a place holder */
- 		code++;
-@@ -184,7 +188,7 @@ __fentry_trace_func(struct trace_fprobe *tf, unsigned long entry_ip,
- 	if (trace_trigger_soft_disabled(trace_file))
- 		return;
- 
--	dsize = __get_data_size(&tf->tp, regs);
-+	dsize = __get_data_size(&tf->tp, regs, NULL);
- 
- 	entry = trace_event_buffer_reserve(&fbuffer, trace_file,
- 					   sizeof(*entry) + tf->tp.size + dsize);
-@@ -194,7 +198,7 @@ __fentry_trace_func(struct trace_fprobe *tf, unsigned long entry_ip,
- 	fbuffer.regs = regs;
- 	entry = fbuffer.entry = ring_buffer_event_data(fbuffer.event);
- 	entry->ip = entry_ip;
--	store_trace_args(&entry[1], &tf->tp, regs, sizeof(*entry), dsize);
-+	store_trace_args(&entry[1], &tf->tp, regs, NULL, sizeof(*entry), dsize);
- 
- 	trace_event_buffer_commit(&fbuffer);
- }
-@@ -210,11 +214,24 @@ fentry_trace_func(struct trace_fprobe *tf, unsigned long entry_ip,
- }
- NOKPROBE_SYMBOL(fentry_trace_func);
- 
--/* Kretprobe handler */
-+/* function exit handler */
-+static int trace_fprobe_entry_handler(struct fprobe *fp, unsigned long entry_ip,
-+				unsigned long ret_ip, struct pt_regs *regs,
-+				void *entry_data)
-+{
-+	struct trace_fprobe *tf = container_of(fp, struct trace_fprobe, fp);
-+
-+	if (tf->tp.entry_arg)
-+		store_trace_entry_data(entry_data, &tf->tp, regs);
-+
-+	return 0;
-+}
-+NOKPROBE_SYMBOL(trace_fprobe_entry_handler)
-+
- static nokprobe_inline void
- __fexit_trace_func(struct trace_fprobe *tf, unsigned long entry_ip,
- 		   unsigned long ret_ip, struct pt_regs *regs,
--		   struct trace_event_file *trace_file)
-+		   void *entry_data, struct trace_event_file *trace_file)
- {
- 	struct fexit_trace_entry_head *entry;
- 	struct trace_event_buffer fbuffer;
-@@ -227,7 +244,7 @@ __fexit_trace_func(struct trace_fprobe *tf, unsigned long entry_ip,
- 	if (trace_trigger_soft_disabled(trace_file))
- 		return;
- 
--	dsize = __get_data_size(&tf->tp, regs);
-+	dsize = __get_data_size(&tf->tp, regs, entry_data);
- 
- 	entry = trace_event_buffer_reserve(&fbuffer, trace_file,
- 					   sizeof(*entry) + tf->tp.size + dsize);
-@@ -238,19 +255,19 @@ __fexit_trace_func(struct trace_fprobe *tf, unsigned long entry_ip,
- 	entry = fbuffer.entry = ring_buffer_event_data(fbuffer.event);
- 	entry->func = entry_ip;
- 	entry->ret_ip = ret_ip;
--	store_trace_args(&entry[1], &tf->tp, regs, sizeof(*entry), dsize);
-+	store_trace_args(&entry[1], &tf->tp, regs, entry_data, sizeof(*entry), dsize);
- 
- 	trace_event_buffer_commit(&fbuffer);
- }
- 
- static void
- fexit_trace_func(struct trace_fprobe *tf, unsigned long entry_ip,
--		 unsigned long ret_ip, struct pt_regs *regs)
-+		 unsigned long ret_ip, struct pt_regs *regs, void *entry_data)
- {
- 	struct event_file_link *link;
- 
- 	trace_probe_for_each_link_rcu(link, &tf->tp)
--		__fexit_trace_func(tf, entry_ip, ret_ip, regs, link->file);
-+		__fexit_trace_func(tf, entry_ip, ret_ip, regs, entry_data, link->file);
- }
- NOKPROBE_SYMBOL(fexit_trace_func);
- 
-@@ -269,7 +286,7 @@ static int fentry_perf_func(struct trace_fprobe *tf, unsigned long entry_ip,
- 	if (hlist_empty(head))
- 		return 0;
- 
--	dsize = __get_data_size(&tf->tp, regs);
-+	dsize = __get_data_size(&tf->tp, regs, NULL);
- 	__size = sizeof(*entry) + tf->tp.size + dsize;
- 	size = ALIGN(__size + sizeof(u32), sizeof(u64));
- 	size -= sizeof(u32);
-@@ -280,7 +297,7 @@ static int fentry_perf_func(struct trace_fprobe *tf, unsigned long entry_ip,
- 
- 	entry->ip = entry_ip;
- 	memset(&entry[1], 0, dsize);
--	store_trace_args(&entry[1], &tf->tp, regs, sizeof(*entry), dsize);
-+	store_trace_args(&entry[1], &tf->tp, regs, NULL, sizeof(*entry), dsize);
- 	perf_trace_buf_submit(entry, size, rctx, call->event.type, 1, regs,
- 			      head, NULL);
- 	return 0;
-@@ -289,7 +306,8 @@ NOKPROBE_SYMBOL(fentry_perf_func);
- 
- static void
- fexit_perf_func(struct trace_fprobe *tf, unsigned long entry_ip,
--		unsigned long ret_ip, struct pt_regs *regs)
-+		unsigned long ret_ip, struct pt_regs *regs,
-+		void *entry_data)
- {
- 	struct trace_event_call *call = trace_probe_event_call(&tf->tp);
- 	struct fexit_trace_entry_head *entry;
-@@ -301,7 +319,7 @@ fexit_perf_func(struct trace_fprobe *tf, unsigned long entry_ip,
- 	if (hlist_empty(head))
- 		return;
- 
--	dsize = __get_data_size(&tf->tp, regs);
-+	dsize = __get_data_size(&tf->tp, regs, entry_data);
- 	__size = sizeof(*entry) + tf->tp.size + dsize;
- 	size = ALIGN(__size + sizeof(u32), sizeof(u64));
- 	size -= sizeof(u32);
-@@ -312,7 +330,7 @@ fexit_perf_func(struct trace_fprobe *tf, unsigned long entry_ip,
- 
- 	entry->func = entry_ip;
- 	entry->ret_ip = ret_ip;
--	store_trace_args(&entry[1], &tf->tp, regs, sizeof(*entry), dsize);
-+	store_trace_args(&entry[1], &tf->tp, regs, entry_data, sizeof(*entry), dsize);
- 	perf_trace_buf_submit(entry, size, rctx, call->event.type, 1, regs,
- 			      head, NULL);
- }
-@@ -343,10 +361,10 @@ static void fexit_dispatcher(struct fprobe *fp, unsigned long entry_ip,
- 	struct trace_fprobe *tf = container_of(fp, struct trace_fprobe, fp);
- 
- 	if (trace_probe_test_flag(&tf->tp, TP_FLAG_TRACE))
--		fexit_trace_func(tf, entry_ip, ret_ip, regs);
-+		fexit_trace_func(tf, entry_ip, ret_ip, regs, entry_data);
- #ifdef CONFIG_PERF_EVENTS
- 	if (trace_probe_test_flag(&tf->tp, TP_FLAG_PROFILE))
--		fexit_perf_func(tf, entry_ip, ret_ip, regs);
-+		fexit_perf_func(tf, entry_ip, ret_ip, regs, entry_data);
- #endif
- }
- NOKPROBE_SYMBOL(fexit_dispatcher);
-@@ -389,7 +407,7 @@ static struct trace_fprobe *alloc_trace_fprobe(const char *group,
- 	tf->tpoint = tpoint;
- 	tf->fp.nr_maxactive = maxactive;
- 
--	ret = trace_probe_init(&tf->tp, event, group, false);
-+	ret = trace_probe_init(&tf->tp, event, group, false, nargs);
- 	if (ret < 0)
- 		goto error;
- 
-@@ -1085,6 +1103,10 @@ static int __trace_fprobe_create(int argc, const char *argv[])
- 		argc = new_argc;
- 		argv = new_argv;
- 	}
-+	if (argc > MAX_TRACE_ARGS) {
-+		ret = -E2BIG;
-+		goto out;
-+	}
- 
- 	/* setup a probe */
- 	tf = alloc_trace_fprobe(group, event, symbol, tpoint, maxactive,
-@@ -1101,7 +1123,7 @@ static int __trace_fprobe_create(int argc, const char *argv[])
- 				(unsigned long)tf->tpoint->probestub);
- 
- 	/* parse arguments */
--	for (i = 0; i < argc && i < MAX_TRACE_ARGS; i++) {
-+	for (i = 0; i < argc; i++) {
- 		trace_probe_log_set_index(i + 2);
- 		ctx.offset = 0;
- 		ret = traceprobe_parse_probe_arg(&tf->tp, i, argv[i], &ctx);
-@@ -1109,6 +1131,11 @@ static int __trace_fprobe_create(int argc, const char *argv[])
- 			goto error;	/* This can be -ENOMEM */
- 	}
- 
-+	if (is_return && tf->tp.entry_arg) {
-+		tf->fp.entry_handler = trace_fprobe_entry_handler;
-+		tf->fp.entry_data_size = traceprobe_get_entry_data_size(&tf->tp);
-+	}
-+
- 	ret = traceprobe_set_print_fmt(&tf->tp,
- 			is_return ? PROBE_PRINT_RETURN : PROBE_PRINT_NORMAL);
- 	if (ret < 0)
-diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
-index 47812aa16bb574..12d997bb3e789b 100644
---- a/kernel/trace/trace_kprobe.c
-+++ b/kernel/trace/trace_kprobe.c
-@@ -290,7 +290,7 @@ static struct trace_kprobe *alloc_trace_kprobe(const char *group,
- 	INIT_HLIST_NODE(&tk->rp.kp.hlist);
- 	INIT_LIST_HEAD(&tk->rp.kp.list);
- 
--	ret = trace_probe_init(&tk->tp, event, group, false);
-+	ret = trace_probe_init(&tk->tp, event, group, false, nargs);
- 	if (ret < 0)
- 		goto error;
- 
-@@ -740,6 +740,9 @@ static unsigned int number_of_same_symbols(char *func_name)
- 	return ctx.count;
- }
- 
-+static int trace_kprobe_entry_handler(struct kretprobe_instance *ri,
-+				      struct pt_regs *regs);
-+
- static int __trace_kprobe_create(int argc, const char *argv[])
- {
- 	/*
-@@ -929,6 +932,10 @@ static int __trace_kprobe_create(int argc, const char *argv[])
- 		argc = new_argc;
- 		argv = new_argv;
- 	}
-+	if (argc > MAX_TRACE_ARGS) {
-+		ret = -E2BIG;
-+		goto out;
-+	}
- 
- 	/* setup a probe */
- 	tk = alloc_trace_kprobe(group, event, addr, symbol, offset, maxactive,
-@@ -941,13 +948,18 @@ static int __trace_kprobe_create(int argc, const char *argv[])
- 	}
- 
- 	/* parse arguments */
--	for (i = 0; i < argc && i < MAX_TRACE_ARGS; i++) {
-+	for (i = 0; i < argc; i++) {
- 		trace_probe_log_set_index(i + 2);
- 		ctx.offset = 0;
- 		ret = traceprobe_parse_probe_arg(&tk->tp, i, argv[i], &ctx);
- 		if (ret)
- 			goto error;	/* This can be -ENOMEM */
- 	}
-+	/* entry handler for kretprobe */
-+	if (is_return && tk->tp.entry_arg) {
-+		tk->rp.entry_handler = trace_kprobe_entry_handler;
-+		tk->rp.data_size = traceprobe_get_entry_data_size(&tk->tp);
-+	}
- 
- 	ptype = is_return ? PROBE_PRINT_RETURN : PROBE_PRINT_NORMAL;
- 	ret = traceprobe_set_print_fmt(&tk->tp, ptype);
-@@ -1249,6 +1261,12 @@ static const struct file_operations kprobe_events_ops = {
- 	.write		= probes_write,
- };
- 
-+static unsigned long trace_kprobe_missed(struct trace_kprobe *tk)
-+{
-+	return trace_kprobe_is_return(tk) ?
-+		tk->rp.kp.nmissed + tk->rp.nmissed : tk->rp.kp.nmissed;
-+}
-+
- /* Probes profiling interfaces */
- static int probes_profile_seq_show(struct seq_file *m, void *v)
- {
-@@ -1260,8 +1278,7 @@ static int probes_profile_seq_show(struct seq_file *m, void *v)
- 		return 0;
- 
- 	tk = to_trace_kprobe(ev);
--	nmissed = trace_kprobe_is_return(tk) ?
--		tk->rp.kp.nmissed + tk->rp.nmissed : tk->rp.kp.nmissed;
-+	nmissed = trace_kprobe_missed(tk);
- 	seq_printf(m, "  %-44s %15lu %15lu\n",
- 		   trace_probe_name(&tk->tp),
- 		   trace_kprobe_nhit(tk),
-@@ -1298,8 +1315,8 @@ static const struct file_operations kprobe_profile_ops = {
- 
- /* Note that we don't verify it, since the code does not come from user space */
- static int
--process_fetch_insn(struct fetch_insn *code, void *rec, void *dest,
--		   void *base)
-+process_fetch_insn(struct fetch_insn *code, void *rec, void *edata,
-+		   void *dest, void *base)
- {
- 	struct pt_regs *regs = rec;
- 	unsigned long val;
-@@ -1324,6 +1341,9 @@ process_fetch_insn(struct fetch_insn *code, void *rec, void *dest,
- 	case FETCH_OP_ARG:
- 		val = regs_get_kernel_argument(regs, code->param);
- 		break;
-+	case FETCH_OP_EDATA:
-+		val = *(unsigned long *)((unsigned long)edata + code->offset);
-+		break;
- #endif
- 	case FETCH_NOP_SYMBOL:	/* Ignore a place holder */
- 		code++;
-@@ -1354,7 +1374,7 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs,
- 	if (trace_trigger_soft_disabled(trace_file))
- 		return;
- 
--	dsize = __get_data_size(&tk->tp, regs);
-+	dsize = __get_data_size(&tk->tp, regs, NULL);
- 
- 	entry = trace_event_buffer_reserve(&fbuffer, trace_file,
- 					   sizeof(*entry) + tk->tp.size + dsize);
-@@ -1363,7 +1383,7 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs,
- 
- 	fbuffer.regs = regs;
- 	entry->ip = (unsigned long)tk->rp.kp.addr;
--	store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize);
-+	store_trace_args(&entry[1], &tk->tp, regs, NULL, sizeof(*entry), dsize);
- 
- 	trace_event_buffer_commit(&fbuffer);
- }
-@@ -1379,6 +1399,31 @@ kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs)
- NOKPROBE_SYMBOL(kprobe_trace_func);
- 
- /* Kretprobe handler */
-+
-+static int trace_kprobe_entry_handler(struct kretprobe_instance *ri,
-+				      struct pt_regs *regs)
-+{
-+	struct kretprobe *rp = get_kretprobe(ri);
-+	struct trace_kprobe *tk;
-+
-+	/*
-+	 * There is a small chance that get_kretprobe(ri) returns NULL when
-+	 * the kretprobe is unregister on another CPU between kretprobe's
-+	 * trampoline_handler and this function.
-+	 */
-+	if (unlikely(!rp))
-+		return -ENOENT;
-+
-+	tk = container_of(rp, struct trace_kprobe, rp);
-+
-+	/* store argument values into ri->data as entry data */
-+	if (tk->tp.entry_arg)
-+		store_trace_entry_data(ri->data, &tk->tp, regs);
-+
-+	return 0;
-+}
-+
-+
- static nokprobe_inline void
- __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
- 		       struct pt_regs *regs,
-@@ -1394,7 +1439,7 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
- 	if (trace_trigger_soft_disabled(trace_file))
- 		return;
- 
--	dsize = __get_data_size(&tk->tp, regs);
-+	dsize = __get_data_size(&tk->tp, regs, ri->data);
- 
- 	entry = trace_event_buffer_reserve(&fbuffer, trace_file,
- 					   sizeof(*entry) + tk->tp.size + dsize);
-@@ -1404,7 +1449,7 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
- 	fbuffer.regs = regs;
- 	entry->func = (unsigned long)tk->rp.kp.addr;
- 	entry->ret_ip = get_kretprobe_retaddr(ri);
--	store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize);
-+	store_trace_args(&entry[1], &tk->tp, regs, ri->data, sizeof(*entry), dsize);
- 
- 	trace_event_buffer_commit(&fbuffer);
- }
-@@ -1552,7 +1597,7 @@ kprobe_perf_func(struct trace_kprobe *tk, struct pt_regs *regs)
- 	if (hlist_empty(head))
- 		return 0;
- 
--	dsize = __get_data_size(&tk->tp, regs);
-+	dsize = __get_data_size(&tk->tp, regs, NULL);
- 	__size = sizeof(*entry) + tk->tp.size + dsize;
- 	size = ALIGN(__size + sizeof(u32), sizeof(u64));
- 	size -= sizeof(u32);
-@@ -1563,7 +1608,7 @@ kprobe_perf_func(struct trace_kprobe *tk, struct pt_regs *regs)
- 
- 	entry->ip = (unsigned long)tk->rp.kp.addr;
- 	memset(&entry[1], 0, dsize);
--	store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize);
-+	store_trace_args(&entry[1], &tk->tp, regs, NULL, sizeof(*entry), dsize);
- 	perf_trace_buf_submit(entry, size, rctx, call->event.type, 1, regs,
- 			      head, NULL);
- 	return 0;
-@@ -1588,7 +1633,7 @@ kretprobe_perf_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
- 	if (hlist_empty(head))
- 		return;
- 
--	dsize = __get_data_size(&tk->tp, regs);
-+	dsize = __get_data_size(&tk->tp, regs, ri->data);
- 	__size = sizeof(*entry) + tk->tp.size + dsize;
- 	size = ALIGN(__size + sizeof(u32), sizeof(u64));
- 	size -= sizeof(u32);
-@@ -1599,7 +1644,7 @@ kretprobe_perf_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
- 
- 	entry->func = (unsigned long)tk->rp.kp.addr;
- 	entry->ret_ip = get_kretprobe_retaddr(ri);
--	store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize);
-+	store_trace_args(&entry[1], &tk->tp, regs, ri->data, sizeof(*entry), dsize);
- 	perf_trace_buf_submit(entry, size, rctx, call->event.type, 1, regs,
- 			      head, NULL);
- }
-@@ -1607,7 +1652,8 @@ NOKPROBE_SYMBOL(kretprobe_perf_func);
- 
- int bpf_get_kprobe_info(const struct perf_event *event, u32 *fd_type,
- 			const char **symbol, u64 *probe_offset,
--			u64 *probe_addr, bool perf_type_tracepoint)
-+			u64 *probe_addr, unsigned long *missed,
-+			bool perf_type_tracepoint)
- {
- 	const char *pevent = trace_event_name(event->tp_event);
- 	const char *group = event->tp_event->class->system;
-@@ -1626,6 +1672,8 @@ int bpf_get_kprobe_info(const struct perf_event *event, u32 *fd_type,
- 	*probe_addr = kallsyms_show_value(current_cred()) ?
- 		      (unsigned long)tk->rp.kp.addr : 0;
- 	*symbol = tk->symbol;
-+	if (missed)
-+		*missed = trace_kprobe_missed(tk);
- 	return 0;
- }
- #endif	/* CONFIG_PERF_EVENTS */
-diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
-index ae162ba36a4803..8c73156a7eb94c 100644
---- a/kernel/trace/trace_probe.c
-+++ b/kernel/trace/trace_probe.c
-@@ -275,7 +275,7 @@ int traceprobe_parse_event_name(const char **pevent, const char **pgroup,
- 		}
- 		trace_probe_log_err(offset, NO_EVENT_NAME);
- 		return -EINVAL;
--	} else if (len > MAX_EVENT_NAME_LEN) {
-+	} else if (len >= MAX_EVENT_NAME_LEN) {
- 		trace_probe_log_err(offset, EVENT_TOO_LONG);
- 		return -EINVAL;
- 	}
-@@ -598,6 +598,8 @@ static int parse_btf_field(char *fieldname, const struct btf_type *type,
- 	return 0;
- }
- 
-+static int __store_entry_arg(struct trace_probe *tp, int argnum);
-+
- static int parse_btf_arg(char *varname,
- 			 struct fetch_insn **pcode, struct fetch_insn *end,
- 			 struct traceprobe_parse_context *ctx)
-@@ -622,11 +624,7 @@ static int parse_btf_arg(char *varname,
- 		return -EOPNOTSUPP;
- 	}
- 
--	if (ctx->flags & TPARG_FL_RETURN) {
--		if (strcmp(varname, "$retval") != 0) {
--			trace_probe_log_err(ctx->offset, NO_BTFARG);
--			return -ENOENT;
--		}
-+	if (ctx->flags & TPARG_FL_RETURN && !strcmp(varname, "$retval")) {
- 		code->op = FETCH_OP_RETVAL;
- 		/* Check whether the function return type is not void */
- 		if (query_btf_context(ctx) == 0) {
-@@ -658,11 +656,21 @@ static int parse_btf_arg(char *varname,
- 		const char *name = btf_name_by_offset(ctx->btf, params[i].name_off);
- 
- 		if (name && !strcmp(name, varname)) {
--			code->op = FETCH_OP_ARG;
--			if (ctx->flags & TPARG_FL_TPOINT)
--				code->param = i + 1;
--			else
--				code->param = i;
-+			if (tparg_is_function_entry(ctx->flags)) {
-+				code->op = FETCH_OP_ARG;
-+				if (ctx->flags & TPARG_FL_TPOINT)
-+					code->param = i + 1;
-+				else
-+					code->param = i;
-+			} else if (tparg_is_function_return(ctx->flags)) {
-+				code->op = FETCH_OP_EDATA;
-+				ret = __store_entry_arg(ctx->tp, i);
-+				if (ret < 0) {
-+					/* internal error */
-+					return ret;
-+				}
-+				code->offset = ret;
-+			}
- 			tid = params[i].type;
- 			goto found;
- 		}
-@@ -759,6 +767,110 @@ static int check_prepare_btf_string_fetch(char *typename,
- 
- #endif
- 
-+#ifdef CONFIG_HAVE_FUNCTION_ARG_ACCESS_API
-+
-+static int __store_entry_arg(struct trace_probe *tp, int argnum)
-+{
-+	struct probe_entry_arg *earg = tp->entry_arg;
-+	bool match = false;
-+	int i, offset;
-+
-+	if (!earg) {
-+		earg = kzalloc(sizeof(*tp->entry_arg), GFP_KERNEL);
-+		if (!earg)
-+			return -ENOMEM;
-+		earg->size = 2 * tp->nr_args + 1;
-+		earg->code = kcalloc(earg->size, sizeof(struct fetch_insn),
-+				     GFP_KERNEL);
-+		if (!earg->code) {
-+			kfree(earg);
-+			return -ENOMEM;
-+		}
-+		/* Fill the code buffer with 'end' to simplify it */
-+		for (i = 0; i < earg->size; i++)
-+			earg->code[i].op = FETCH_OP_END;
-+		tp->entry_arg = earg;
-+	}
-+
-+	offset = 0;
-+	for (i = 0; i < earg->size - 1; i++) {
-+		switch (earg->code[i].op) {
-+		case FETCH_OP_END:
-+			earg->code[i].op = FETCH_OP_ARG;
-+			earg->code[i].param = argnum;
-+			earg->code[i + 1].op = FETCH_OP_ST_EDATA;
-+			earg->code[i + 1].offset = offset;
-+			return offset;
-+		case FETCH_OP_ARG:
-+			match = (earg->code[i].param == argnum);
-+			break;
-+		case FETCH_OP_ST_EDATA:
-+			offset = earg->code[i].offset;
-+			if (match)
-+				return offset;
-+			offset += sizeof(unsigned long);
-+			break;
-+		default:
-+			break;
-+		}
-+	}
-+	return -ENOSPC;
-+}
-+
-+int traceprobe_get_entry_data_size(struct trace_probe *tp)
-+{
-+	struct probe_entry_arg *earg = tp->entry_arg;
-+	int i, size = 0;
-+
-+	if (!earg)
-+		return 0;
-+
-+	for (i = 0; i < earg->size; i++) {
-+		switch (earg->code[i].op) {
-+		case FETCH_OP_END:
-+			goto out;
-+		case FETCH_OP_ST_EDATA:
-+			size = earg->code[i].offset + sizeof(unsigned long);
-+			break;
-+		default:
-+			break;
-+		}
-+	}
-+out:
-+	return size;
-+}
-+
-+void store_trace_entry_data(void *edata, struct trace_probe *tp, struct pt_regs *regs)
-+{
-+	struct probe_entry_arg *earg = tp->entry_arg;
-+	unsigned long val = 0;
-+	int i;
-+
-+	if (!earg)
-+		return;
-+
-+	for (i = 0; i < earg->size; i++) {
-+		struct fetch_insn *code = &earg->code[i];
-+
-+		switch (code->op) {
-+		case FETCH_OP_ARG:
-+			val = regs_get_kernel_argument(regs, code->param);
-+			break;
-+		case FETCH_OP_ST_EDATA:
-+			*(unsigned long *)((unsigned long)edata + code->offset) = val;
-+			break;
-+		case FETCH_OP_END:
-+			goto end;
-+		default:
-+			break;
-+		}
-+	}
-+end:
-+	return;
-+}
-+NOKPROBE_SYMBOL(store_trace_entry_data)
-+#endif
-+
- #define PARAM_MAX_STACK (THREAD_SIZE / sizeof(unsigned long))
- 
- /* Parse $vars. @orig_arg points '$', which syncs to @ctx->offset */
-@@ -834,7 +946,7 @@ static int parse_probe_vars(char *orig_arg, const struct fetch_type *t,
- 
- #ifdef CONFIG_HAVE_FUNCTION_ARG_ACCESS_API
- 	len = str_has_prefix(arg, "arg");
--	if (len && tparg_is_function_entry(ctx->flags)) {
-+	if (len) {
- 		ret = kstrtoul(arg + len, 10, &param);
- 		if (ret)
- 			goto inval;
-@@ -843,15 +955,29 @@ static int parse_probe_vars(char *orig_arg, const struct fetch_type *t,
- 			err = TP_ERR_BAD_ARG_NUM;
- 			goto inval;
- 		}
-+		param--; /* argN starts from 1, but internal arg[N] starts from 0 */
- 
--		code->op = FETCH_OP_ARG;
--		code->param = (unsigned int)param - 1;
--		/*
--		 * The tracepoint probe will probe a stub function, and the
--		 * first parameter of the stub is a dummy and should be ignored.
--		 */
--		if (ctx->flags & TPARG_FL_TPOINT)
--			code->param++;
-+		if (tparg_is_function_entry(ctx->flags)) {
-+			code->op = FETCH_OP_ARG;
-+			code->param = (unsigned int)param;
-+			/*
-+			 * The tracepoint probe will probe a stub function, and the
-+			 * first parameter of the stub is a dummy and should be ignored.
-+			 */
-+			if (ctx->flags & TPARG_FL_TPOINT)
-+				code->param++;
-+		} else if (tparg_is_function_return(ctx->flags)) {
-+			/* function entry argument access from return probe */
-+			ret = __store_entry_arg(ctx->tp, param);
-+			if (ret < 0)	/* This error should be an internal error */
-+				return ret;
-+
-+			code->op = FETCH_OP_EDATA;
-+			code->offset = ret;
-+		} else {
-+			err = TP_ERR_NOFENTRY_ARGS;
-+			goto inval;
-+		}
- 		return 0;
- 	}
- #endif
-@@ -1041,7 +1167,8 @@ parse_probe_arg(char *arg, const struct fetch_type *type,
- 		break;
- 	default:
- 		if (isalpha(arg[0]) || arg[0] == '_') {	/* BTF variable */
--			if (!tparg_is_function_entry(ctx->flags)) {
-+			if (!tparg_is_function_entry(ctx->flags) &&
-+			    !tparg_is_function_return(ctx->flags)) {
- 				trace_probe_log_err(ctx->offset, NOSUP_BTFARG);
- 				return -EINVAL;
- 			}
-@@ -1383,9 +1510,7 @@ int traceprobe_parse_probe_arg(struct trace_probe *tp, int i, const char *arg,
- 	struct probe_arg *parg = &tp->args[i];
- 	const char *body;
- 
--	/* Increment count for freeing args in error case */
--	tp->nr_args++;
--
-+	ctx->tp = tp;
- 	body = strchr(arg, '=');
- 	if (body) {
- 		if (body - arg > MAX_ARG_NAME_LEN) {
-@@ -1442,7 +1567,8 @@ static int argv_has_var_arg(int argc, const char *argv[], int *args_idx,
- 		if (str_has_prefix(argv[i], "$arg")) {
- 			trace_probe_log_set_index(i + 2);
- 
--			if (!tparg_is_function_entry(ctx->flags)) {
-+			if (!tparg_is_function_entry(ctx->flags) &&
-+			    !tparg_is_function_return(ctx->flags)) {
- 				trace_probe_log_err(0, NOFENTRY_ARGS);
- 				return -EINVAL;
- 			}
-@@ -1765,12 +1891,18 @@ void trace_probe_cleanup(struct trace_probe *tp)
- 	for (i = 0; i < tp->nr_args; i++)
- 		traceprobe_free_probe_arg(&tp->args[i]);
- 
-+	if (tp->entry_arg) {
-+		kfree(tp->entry_arg->code);
-+		kfree(tp->entry_arg);
-+		tp->entry_arg = NULL;
-+	}
-+
- 	if (tp->event)
- 		trace_probe_unlink(tp);
- }
- 
- int trace_probe_init(struct trace_probe *tp, const char *event,
--		     const char *group, bool alloc_filter)
-+		     const char *group, bool alloc_filter, int nargs)
- {
- 	struct trace_event_call *call;
- 	size_t size = sizeof(struct trace_probe_event);
-@@ -1806,6 +1938,11 @@ int trace_probe_init(struct trace_probe *tp, const char *event,
- 		goto error;
- 	}
- 
-+	tp->nr_args = nargs;
-+	/* Make sure pointers in args[] are NULL */
-+	if (nargs)
-+		memset(tp->args, 0, sizeof(tp->args[0]) * nargs);
-+
- 	return 0;
- 
- error:
-diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h
-index c1877d0182691c..cef3a50628a3e4 100644
---- a/kernel/trace/trace_probe.h
-+++ b/kernel/trace/trace_probe.h
-@@ -92,6 +92,7 @@ enum fetch_op {
- 	FETCH_OP_ARG,		/* Function argument : .param */
- 	FETCH_OP_FOFFS,		/* File offset: .immediate */
- 	FETCH_OP_DATA,		/* Allocated data: .data */
-+	FETCH_OP_EDATA,		/* Entry data: .offset */
- 	// Stage 2 (dereference) op
- 	FETCH_OP_DEREF,		/* Dereference: .offset */
- 	FETCH_OP_UDEREF,	/* User-space Dereference: .offset */
-@@ -102,6 +103,7 @@ enum fetch_op {
- 	FETCH_OP_ST_STRING,	/* String: .offset, .size */
- 	FETCH_OP_ST_USTRING,	/* User String: .offset, .size */
- 	FETCH_OP_ST_SYMSTR,	/* Kernel Symbol String: .offset, .size */
-+	FETCH_OP_ST_EDATA,	/* Store Entry Data: .offset */
- 	// Stage 4 (modify) op
- 	FETCH_OP_MOD_BF,	/* Bitfield: .basesize, .lshift, .rshift */
- 	// Stage 5 (loop) op
-@@ -232,6 +234,11 @@ struct probe_arg {
- 	const struct fetch_type	*type;	/* Type of this argument */
- };
- 
-+struct probe_entry_arg {
-+	struct fetch_insn	*code;
-+	unsigned int		size;	/* The entry data size */
-+};
-+
- struct trace_uprobe_filter {
- 	rwlock_t		rwlock;
- 	int			nr_systemwide;
-@@ -253,6 +260,7 @@ struct trace_probe {
- 	struct trace_probe_event	*event;
- 	ssize_t				size;	/* trace entry size */
- 	unsigned int			nr_args;
-+	struct probe_entry_arg		*entry_arg;	/* This is only for return probe */
- 	struct probe_arg		args[];
- };
- 
-@@ -338,7 +346,7 @@ static inline bool trace_probe_has_single_file(struct trace_probe *tp)
- }
- 
- int trace_probe_init(struct trace_probe *tp, const char *event,
--		     const char *group, bool alloc_filter);
-+		     const char *group, bool alloc_filter, int nargs);
- void trace_probe_cleanup(struct trace_probe *tp);
- int trace_probe_append(struct trace_probe *tp, struct trace_probe *to);
- void trace_probe_unlink(struct trace_probe *tp);
-@@ -355,6 +363,18 @@ int trace_probe_create(const char *raw_command, int (*createfn)(int, const char
- int trace_probe_print_args(struct trace_seq *s, struct probe_arg *args, int nr_args,
- 		 u8 *data, void *field);
- 
-+#ifdef CONFIG_HAVE_FUNCTION_ARG_ACCESS_API
-+int traceprobe_get_entry_data_size(struct trace_probe *tp);
-+/* This is a runtime function to store entry data */
-+void store_trace_entry_data(void *edata, struct trace_probe *tp, struct pt_regs *regs);
-+#else /* !CONFIG_HAVE_FUNCTION_ARG_ACCESS_API */
-+static inline int traceprobe_get_entry_data_size(struct trace_probe *tp)
-+{
-+	return 0;
-+}
-+#define store_trace_entry_data(edata, tp, regs) do { } while (0)
-+#endif
-+
- #define trace_probe_for_each_link(pos, tp)	\
- 	list_for_each_entry(pos, &(tp)->event->files, list)
- #define trace_probe_for_each_link_rcu(pos, tp)	\
-@@ -381,6 +401,11 @@ static inline bool tparg_is_function_entry(unsigned int flags)
- 	return (flags & TPARG_FL_LOC_MASK) == (TPARG_FL_KERNEL | TPARG_FL_FENTRY);
- }
- 
-+static inline bool tparg_is_function_return(unsigned int flags)
-+{
-+	return (flags & TPARG_FL_LOC_MASK) == (TPARG_FL_KERNEL | TPARG_FL_RETURN);
-+}
-+
- struct traceprobe_parse_context {
- 	struct trace_event_call *event;
- 	/* BTF related parameters */
-@@ -392,6 +417,7 @@ struct traceprobe_parse_context {
- 	const struct btf_type *last_type;	/* Saved type */
- 	u32 last_bitoffs;		/* Saved bitoffs */
- 	u32 last_bitsize;		/* Saved bitsize */
-+	struct trace_probe *tp;
- 	unsigned int flags;
- 	int offset;
- };
-@@ -506,7 +532,7 @@ extern int traceprobe_define_arg_fields(struct trace_event_call *event_call,
- 	C(NO_BTFARG,		"This variable is not found at this probe point"),\
- 	C(NO_BTF_ENTRY,		"No BTF entry for this probe point"),	\
- 	C(BAD_VAR_ARGS,		"$arg* must be an independent parameter without name etc."),\
--	C(NOFENTRY_ARGS,	"$arg* can be used only on function entry"),	\
-+	C(NOFENTRY_ARGS,	"$arg* can be used only on function entry or exit"),	\
- 	C(DOUBLE_ARGS,		"$arg* can be used only once in the parameters"),	\
- 	C(ARGS_2LONG,		"$arg* failed because the argument list is too long"),	\
- 	C(ARGIDX_2BIG,		"$argN index is too big"),		\
-diff --git a/kernel/trace/trace_probe_tmpl.h b/kernel/trace/trace_probe_tmpl.h
-index 3935b347f874bc..2caf0d2afb3228 100644
---- a/kernel/trace/trace_probe_tmpl.h
-+++ b/kernel/trace/trace_probe_tmpl.h
-@@ -54,7 +54,7 @@ fetch_apply_bitfield(struct fetch_insn *code, void *buf)
-  * If dest is NULL, don't store result and return required dynamic data size.
-  */
- static int
--process_fetch_insn(struct fetch_insn *code, void *rec,
-+process_fetch_insn(struct fetch_insn *code, void *rec, void *edata,
- 		   void *dest, void *base);
- static nokprobe_inline int fetch_store_strlen(unsigned long addr);
- static nokprobe_inline int
-@@ -232,7 +232,7 @@ process_fetch_insn_bottom(struct fetch_insn *code, unsigned long val,
- 
- /* Sum up total data length for dynamic arrays (strings) */
- static nokprobe_inline int
--__get_data_size(struct trace_probe *tp, struct pt_regs *regs)
-+__get_data_size(struct trace_probe *tp, struct pt_regs *regs, void *edata)
- {
- 	struct probe_arg *arg;
- 	int i, len, ret = 0;
-@@ -240,7 +240,7 @@ __get_data_size(struct trace_probe *tp, struct pt_regs *regs)
- 	for (i = 0; i < tp->nr_args; i++) {
- 		arg = tp->args + i;
- 		if (unlikely(arg->dynamic)) {
--			len = process_fetch_insn(arg->code, regs, NULL, NULL);
-+			len = process_fetch_insn(arg->code, regs, edata, NULL, NULL);
- 			if (len > 0)
- 				ret += len;
- 		}
-@@ -251,7 +251,7 @@ __get_data_size(struct trace_probe *tp, struct pt_regs *regs)
- 
- /* Store the value of each argument */
- static nokprobe_inline void
--store_trace_args(void *data, struct trace_probe *tp, void *rec,
-+store_trace_args(void *data, struct trace_probe *tp, void *rec, void *edata,
- 		 int header_size, int maxlen)
- {
- 	struct probe_arg *arg;
-@@ -266,7 +266,7 @@ store_trace_args(void *data, struct trace_probe *tp, void *rec,
- 		/* Point the dynamic data area if needed */
- 		if (unlikely(arg->dynamic))
- 			*dl = make_data_loc(maxlen, dyndata - base);
--		ret = process_fetch_insn(arg->code, rec, dl, base);
-+		ret = process_fetch_insn(arg->code, rec, edata, dl, base);
- 		if (arg->dynamic && likely(ret > 0)) {
- 			dyndata += ret;
- 			maxlen -= ret;
-diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
-index 99c051de412afa..3e7d92d2650bcc 100644
---- a/kernel/trace/trace_uprobe.c
-+++ b/kernel/trace/trace_uprobe.c
-@@ -211,8 +211,8 @@ static unsigned long translate_user_vaddr(unsigned long file_offset)
- 
- /* Note that we don't verify it, since the code does not come from user space */
- static int
--process_fetch_insn(struct fetch_insn *code, void *rec, void *dest,
--		   void *base)
-+process_fetch_insn(struct fetch_insn *code, void *rec, void *edata,
-+		   void *dest, void *base)
- {
- 	struct pt_regs *regs = rec;
- 	unsigned long val;
-@@ -337,7 +337,7 @@ alloc_trace_uprobe(const char *group, const char *event, int nargs, bool is_ret)
- 	if (!tu)
- 		return ERR_PTR(-ENOMEM);
- 
--	ret = trace_probe_init(&tu->tp, event, group, true);
-+	ret = trace_probe_init(&tu->tp, event, group, true, nargs);
- 	if (ret < 0)
- 		goto error;
- 
-@@ -556,6 +556,8 @@ static int __trace_uprobe_create(int argc, const char **argv)
- 
- 	if (argc < 2)
- 		return -ECANCELED;
-+	if (argc - 2 > MAX_TRACE_ARGS)
-+		return -E2BIG;
- 
- 	if (argv[0][1] == ':')
- 		event = &argv[0][2];
-@@ -681,7 +683,7 @@ static int __trace_uprobe_create(int argc, const char **argv)
- 	tu->filename = filename;
- 
- 	/* parse arguments */
--	for (i = 0; i < argc && i < MAX_TRACE_ARGS; i++) {
-+	for (i = 0; i < argc; i++) {
- 		struct traceprobe_parse_context ctx = {
- 			.flags = (is_return ? TPARG_FL_RETURN : 0) | TPARG_FL_USER,
- 		};
-@@ -854,9 +856,11 @@ static const struct file_operations uprobe_profile_ops = {
- struct uprobe_cpu_buffer {
- 	struct mutex mutex;
- 	void *buf;
-+	int dsize;
- };
- static struct uprobe_cpu_buffer __percpu *uprobe_cpu_buffer;
- static int uprobe_buffer_refcnt;
-+#define MAX_UCB_BUFFER_SIZE PAGE_SIZE
- 
- static int uprobe_buffer_init(void)
- {
-@@ -940,12 +944,41 @@ static struct uprobe_cpu_buffer *uprobe_buffer_get(void)
- 
- static void uprobe_buffer_put(struct uprobe_cpu_buffer *ucb)
- {
-+	if (!ucb)
-+		return;
- 	mutex_unlock(&ucb->mutex);
- }
- 
-+static struct uprobe_cpu_buffer *prepare_uprobe_buffer(struct trace_uprobe *tu,
-+						       struct pt_regs *regs,
-+						       struct uprobe_cpu_buffer **ucbp)
-+{
-+	struct uprobe_cpu_buffer *ucb;
-+	int dsize, esize;
-+
-+	if (*ucbp)
-+		return *ucbp;
-+
-+	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));
-+	dsize = __get_data_size(&tu->tp, regs, NULL);
-+
-+	ucb = uprobe_buffer_get();
-+	ucb->dsize = tu->tp.size + dsize;
-+
-+	if (WARN_ON_ONCE(ucb->dsize > MAX_UCB_BUFFER_SIZE)) {
-+		ucb->dsize = MAX_UCB_BUFFER_SIZE;
-+		dsize = MAX_UCB_BUFFER_SIZE - tu->tp.size;
-+	}
-+
-+	store_trace_args(ucb->buf, &tu->tp, regs, NULL, esize, dsize);
-+
-+	*ucbp = ucb;
-+	return ucb;
-+}
-+
- static void __uprobe_trace_func(struct trace_uprobe *tu,
- 				unsigned long func, struct pt_regs *regs,
--				struct uprobe_cpu_buffer *ucb, int dsize,
-+				struct uprobe_cpu_buffer *ucb,
- 				struct trace_event_file *trace_file)
- {
- 	struct uprobe_trace_entry_head *entry;
-@@ -956,14 +989,11 @@ static void __uprobe_trace_func(struct trace_uprobe *tu,
- 
- 	WARN_ON(call != trace_file->event_call);
- 
--	if (WARN_ON_ONCE(tu->tp.size + dsize > PAGE_SIZE))
--		return;
--
- 	if (trace_trigger_soft_disabled(trace_file))
- 		return;
- 
- 	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));
--	size = esize + tu->tp.size + dsize;
-+	size = esize + ucb->dsize;
- 	entry = trace_event_buffer_reserve(&fbuffer, trace_file, size);
- 	if (!entry)
- 		return;
-@@ -977,23 +1007,26 @@ static void __uprobe_trace_func(struct trace_uprobe *tu,
- 		data = DATAOF_TRACE_ENTRY(entry, false);
- 	}
- 
--	memcpy(data, ucb->buf, tu->tp.size + dsize);
-+	memcpy(data, ucb->buf, ucb->dsize);
- 
- 	trace_event_buffer_commit(&fbuffer);
- }
- 
- /* uprobe handler */
- static int uprobe_trace_func(struct trace_uprobe *tu, struct pt_regs *regs,
--			     struct uprobe_cpu_buffer *ucb, int dsize)
-+			     struct uprobe_cpu_buffer **ucbp)
- {
- 	struct event_file_link *link;
-+	struct uprobe_cpu_buffer *ucb;
- 
- 	if (is_ret_probe(tu))
- 		return 0;
- 
-+	ucb = prepare_uprobe_buffer(tu, regs, ucbp);
-+
- 	rcu_read_lock();
- 	trace_probe_for_each_link_rcu(link, &tu->tp)
--		__uprobe_trace_func(tu, 0, regs, ucb, dsize, link->file);
-+		__uprobe_trace_func(tu, 0, regs, ucb, link->file);
- 	rcu_read_unlock();
- 
- 	return 0;
-@@ -1001,13 +1034,16 @@ static int uprobe_trace_func(struct trace_uprobe *tu, struct pt_regs *regs,
- 
- static void uretprobe_trace_func(struct trace_uprobe *tu, unsigned long func,
- 				 struct pt_regs *regs,
--				 struct uprobe_cpu_buffer *ucb, int dsize)
-+				 struct uprobe_cpu_buffer **ucbp)
- {
- 	struct event_file_link *link;
-+	struct uprobe_cpu_buffer *ucb;
-+
-+	ucb = prepare_uprobe_buffer(tu, regs, ucbp);
- 
- 	rcu_read_lock();
- 	trace_probe_for_each_link_rcu(link, &tu->tp)
--		__uprobe_trace_func(tu, func, regs, ucb, dsize, link->file);
-+		__uprobe_trace_func(tu, func, regs, ucb, link->file);
- 	rcu_read_unlock();
- }
- 
-@@ -1335,10 +1371,11 @@ static bool uprobe_perf_filter(struct uprobe_consumer *uc,
- 
- static void __uprobe_perf_func(struct trace_uprobe *tu,
- 			       unsigned long func, struct pt_regs *regs,
--			       struct uprobe_cpu_buffer *ucb, int dsize)
-+			       struct uprobe_cpu_buffer **ucbp)
- {
- 	struct trace_event_call *call = trace_probe_event_call(&tu->tp);
- 	struct uprobe_trace_entry_head *entry;
-+	struct uprobe_cpu_buffer *ucb;
- 	struct hlist_head *head;
- 	void *data;
- 	int size, esize;
-@@ -1356,7 +1393,8 @@ static void __uprobe_perf_func(struct trace_uprobe *tu,
- 
- 	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));
- 
--	size = esize + tu->tp.size + dsize;
-+	ucb = prepare_uprobe_buffer(tu, regs, ucbp);
-+	size = esize + ucb->dsize;
- 	size = ALIGN(size + sizeof(u32), sizeof(u64)) - sizeof(u32);
- 	if (WARN_ONCE(size > PERF_MAX_TRACE_SIZE, "profile buffer not large enough"))
- 		return;
-@@ -1379,13 +1417,10 @@ static void __uprobe_perf_func(struct trace_uprobe *tu,
- 		data = DATAOF_TRACE_ENTRY(entry, false);
- 	}
- 
--	memcpy(data, ucb->buf, tu->tp.size + dsize);
--
--	if (size - esize > tu->tp.size + dsize) {
--		int len = tu->tp.size + dsize;
-+	memcpy(data, ucb->buf, ucb->dsize);
- 
--		memset(data + len, 0, size - esize - len);
--	}
-+	if (size - esize > ucb->dsize)
-+		memset(data + ucb->dsize, 0, size - esize - ucb->dsize);
- 
- 	perf_trace_buf_submit(entry, size, rctx, call->event.type, 1, regs,
- 			      head, NULL);
-@@ -1395,21 +1430,21 @@ static void __uprobe_perf_func(struct trace_uprobe *tu,
- 
- /* uprobe profile handler */
- static int uprobe_perf_func(struct trace_uprobe *tu, struct pt_regs *regs,
--			    struct uprobe_cpu_buffer *ucb, int dsize)
-+			    struct uprobe_cpu_buffer **ucbp)
- {
- 	if (!uprobe_perf_filter(&tu->consumer, 0, current->mm))
- 		return UPROBE_HANDLER_REMOVE;
- 
- 	if (!is_ret_probe(tu))
--		__uprobe_perf_func(tu, 0, regs, ucb, dsize);
-+		__uprobe_perf_func(tu, 0, regs, ucbp);
- 	return 0;
- }
- 
- static void uretprobe_perf_func(struct trace_uprobe *tu, unsigned long func,
- 				struct pt_regs *regs,
--				struct uprobe_cpu_buffer *ucb, int dsize)
-+				struct uprobe_cpu_buffer **ucbp)
- {
--	__uprobe_perf_func(tu, func, regs, ucb, dsize);
-+	__uprobe_perf_func(tu, func, regs, ucbp);
- }
- 
- int bpf_get_uprobe_info(const struct perf_event *event, u32 *fd_type,
-@@ -1474,11 +1509,9 @@ static int uprobe_dispatcher(struct uprobe_consumer *con, struct pt_regs *regs)
- {
- 	struct trace_uprobe *tu;
- 	struct uprobe_dispatch_data udd;
--	struct uprobe_cpu_buffer *ucb;
--	int dsize, esize;
-+	struct uprobe_cpu_buffer *ucb = NULL;
- 	int ret = 0;
- 
--
- 	tu = container_of(con, struct trace_uprobe, consumer);
- 	tu->nhit++;
- 
-@@ -1490,18 +1523,12 @@ static int uprobe_dispatcher(struct uprobe_consumer *con, struct pt_regs *regs)
- 	if (WARN_ON_ONCE(!uprobe_cpu_buffer))
- 		return 0;
- 
--	dsize = __get_data_size(&tu->tp, regs);
--	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));
--
--	ucb = uprobe_buffer_get();
--	store_trace_args(ucb->buf, &tu->tp, regs, esize, dsize);
--
- 	if (trace_probe_test_flag(&tu->tp, TP_FLAG_TRACE))
--		ret |= uprobe_trace_func(tu, regs, ucb, dsize);
-+		ret |= uprobe_trace_func(tu, regs, &ucb);
- 
- #ifdef CONFIG_PERF_EVENTS
- 	if (trace_probe_test_flag(&tu->tp, TP_FLAG_PROFILE))
--		ret |= uprobe_perf_func(tu, regs, ucb, dsize);
-+		ret |= uprobe_perf_func(tu, regs, &ucb);
- #endif
- 	uprobe_buffer_put(ucb);
- 	return ret;
-@@ -1512,8 +1539,7 @@ static int uretprobe_dispatcher(struct uprobe_consumer *con,
- {
- 	struct trace_uprobe *tu;
- 	struct uprobe_dispatch_data udd;
--	struct uprobe_cpu_buffer *ucb;
--	int dsize, esize;
-+	struct uprobe_cpu_buffer *ucb = NULL;
- 
- 	tu = container_of(con, struct trace_uprobe, consumer);
- 
-@@ -1525,18 +1551,12 @@ static int uretprobe_dispatcher(struct uprobe_consumer *con,
- 	if (WARN_ON_ONCE(!uprobe_cpu_buffer))
- 		return 0;
- 
--	dsize = __get_data_size(&tu->tp, regs);
--	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));
--
--	ucb = uprobe_buffer_get();
--	store_trace_args(ucb->buf, &tu->tp, regs, esize, dsize);
--
- 	if (trace_probe_test_flag(&tu->tp, TP_FLAG_TRACE))
--		uretprobe_trace_func(tu, func, regs, ucb, dsize);
-+		uretprobe_trace_func(tu, func, regs, &ucb);
- 
- #ifdef CONFIG_PERF_EVENTS
- 	if (trace_probe_test_flag(&tu->tp, TP_FLAG_PROFILE))
--		uretprobe_perf_func(tu, func, regs, ucb, dsize);
-+		uretprobe_perf_func(tu, func, regs, &ucb);
- #endif
- 	uprobe_buffer_put(ucb);
- 	return 0;
-diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index da5513cfc12588..f94c3e957b8298 100644
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -2999,7 +2999,7 @@ config RUST_BUILD_ASSERT_ALLOW
- 	bool "Allow unoptimized build-time assertions"
- 	depends on RUST
- 	help
--	  Controls how are `build_error!` and `build_assert!` handled during build.
-+	  Controls how `build_error!` and `build_assert!` are handled during the build.
- 
- 	  If calls to them exist in the binary, it may indicate a violated invariant
- 	  or that the optimizer failed to verify the invariant during compilation.
-diff --git a/mm/khugepaged.c b/mm/khugepaged.c
-index 88433cc25d8a5a..a87cfe1d4b7beb 100644
---- a/mm/khugepaged.c
-+++ b/mm/khugepaged.c
-@@ -887,20 +887,6 @@ static int hpage_collapse_find_target_node(struct collapse_control *cc)
- }
- #endif
- 
--static bool hpage_collapse_alloc_page(struct page **hpage, gfp_t gfp, int node,
--				      nodemask_t *nmask)
--{
--	*hpage = __alloc_pages(gfp, HPAGE_PMD_ORDER, node, nmask);
--	if (unlikely(!*hpage)) {
--		count_vm_event(THP_COLLAPSE_ALLOC_FAILED);
--		return false;
--	}
--
--	folio_prep_large_rmappable((struct folio *)*hpage);
--	count_vm_event(THP_COLLAPSE_ALLOC);
--	return true;
--}
--
- /*
-  * If mmap_lock temporarily dropped, revalidate vma
-  * before taking mmap_lock.
-@@ -1055,7 +1041,7 @@ static int __collapse_huge_page_swapin(struct mm_struct *mm,
- 	return result;
- }
- 
--static int alloc_charge_hpage(struct page **hpage, struct mm_struct *mm,
-+static int alloc_charge_folio(struct folio **foliop, struct mm_struct *mm,
- 			      struct collapse_control *cc)
- {
- 	gfp_t gfp = (cc->is_khugepaged ? alloc_hugepage_khugepaged_gfpmask() :
-@@ -1063,17 +1049,23 @@ static int alloc_charge_hpage(struct page **hpage, struct mm_struct *mm,
- 	int node = hpage_collapse_find_target_node(cc);
- 	struct folio *folio;
- 
--	if (!hpage_collapse_alloc_page(hpage, gfp, node, &cc->alloc_nmask))
-+	folio = __folio_alloc(gfp, HPAGE_PMD_ORDER, node, &cc->alloc_nmask);
-+	if (!folio) {
-+		*foliop = NULL;
-+		count_vm_event(THP_COLLAPSE_ALLOC_FAILED);
- 		return SCAN_ALLOC_HUGE_PAGE_FAIL;
-+	}
- 
--	folio = page_folio(*hpage);
-+	count_vm_event(THP_COLLAPSE_ALLOC);
- 	if (unlikely(mem_cgroup_charge(folio, mm, gfp))) {
- 		folio_put(folio);
--		*hpage = NULL;
-+		*foliop = NULL;
- 		return SCAN_CGROUP_CHARGE_FAIL;
- 	}
--	count_memcg_page_event(*hpage, THP_COLLAPSE_ALLOC);
- 
-+	count_memcg_folio_events(folio, THP_COLLAPSE_ALLOC, 1);
-+
-+	*foliop = folio;
- 	return SCAN_SUCCEED;
- }
- 
-@@ -1085,6 +1077,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address,
- 	pmd_t *pmd, _pmd;
- 	pte_t *pte;
- 	pgtable_t pgtable;
-+	struct folio *folio;
- 	struct page *hpage;
- 	spinlock_t *pmd_ptl, *pte_ptl;
- 	int result = SCAN_FAIL;
-@@ -1101,7 +1094,8 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address,
- 	 */
- 	mmap_read_unlock(mm);
- 
--	result = alloc_charge_hpage(&hpage, mm, cc);
-+	result = alloc_charge_folio(&folio, mm, cc);
-+	hpage = &folio->page;
- 	if (result != SCAN_SUCCEED)
- 		goto out_nolock;
- 
-@@ -1205,12 +1199,11 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address,
- 		goto out_up_write;
- 
- 	/*
--	 * spin_lock() below is not the equivalent of smp_wmb(), but
--	 * the smp_wmb() inside __SetPageUptodate() can be reused to
--	 * avoid the copy_huge_page writes to become visible after
--	 * the set_pmd_at() write.
-+	 * The smp_wmb() inside __folio_mark_uptodate() ensures the
-+	 * copy_huge_page writes become visible before the set_pmd_at()
-+	 * write.
- 	 */
--	__SetPageUptodate(hpage);
-+	__folio_mark_uptodate(folio);
- 	pgtable = pmd_pgtable(_pmd);
- 
- 	_pmd = mk_huge_pmd(hpage, vma->vm_page_prot);
-@@ -1218,8 +1211,8 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address,
- 
- 	spin_lock(pmd_ptl);
- 	BUG_ON(!pmd_none(*pmd));
--	page_add_new_anon_rmap(hpage, vma, address);
--	lru_cache_add_inactive_or_unevictable(hpage, vma);
-+	folio_add_new_anon_rmap(folio, vma, address);
-+	folio_add_lru_vma(folio, vma);
- 	pgtable_trans_huge_deposit(mm, pmd, pgtable);
- 	set_pmd_at(mm, address, pmd, _pmd);
- 	update_mmu_cache_pmd(vma, address, pmd);
-@@ -1790,29 +1783,27 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr,
- 			 struct collapse_control *cc)
- {
- 	struct address_space *mapping = file->f_mapping;
--	struct page *hpage;
- 	struct page *page;
--	struct page *tmp;
--	struct folio *folio;
-+	struct page *tmp, *dst;
-+	struct folio *folio, *new_folio;
- 	pgoff_t index = 0, end = start + HPAGE_PMD_NR;
- 	LIST_HEAD(pagelist);
- 	XA_STATE_ORDER(xas, &mapping->i_pages, start, HPAGE_PMD_ORDER);
- 	int nr_none = 0, result = SCAN_SUCCEED;
- 	bool is_shmem = shmem_file(file);
--	int nr = 0;
- 
- 	VM_BUG_ON(!IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS) && !is_shmem);
- 	VM_BUG_ON(start & (HPAGE_PMD_NR - 1));
- 
--	result = alloc_charge_hpage(&hpage, mm, cc);
-+	result = alloc_charge_folio(&new_folio, mm, cc);
- 	if (result != SCAN_SUCCEED)
- 		goto out;
- 
--	__SetPageLocked(hpage);
-+	__folio_set_locked(new_folio);
- 	if (is_shmem)
--		__SetPageSwapBacked(hpage);
--	hpage->index = start;
--	hpage->mapping = mapping;
-+		__folio_set_swapbacked(new_folio);
-+	new_folio->index = start;
-+	new_folio->mapping = mapping;
- 
- 	/*
- 	 * Ensure we have slots for all the pages in the range.  This is
-@@ -2045,20 +2036,24 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr,
- 	 * The old pages are locked, so they won't change anymore.
- 	 */
- 	index = start;
-+	dst = folio_page(new_folio, 0);
- 	list_for_each_entry(page, &pagelist, lru) {
- 		while (index < page->index) {
--			clear_highpage(hpage + (index % HPAGE_PMD_NR));
-+			clear_highpage(dst);
- 			index++;
-+			dst++;
- 		}
--		if (copy_mc_highpage(hpage + (page->index % HPAGE_PMD_NR), page) > 0) {
-+		if (copy_mc_highpage(dst, page) > 0) {
- 			result = SCAN_COPY_MC;
- 			goto rollback;
- 		}
- 		index++;
-+		dst++;
- 	}
- 	while (index < end) {
--		clear_highpage(hpage + (index % HPAGE_PMD_NR));
-+		clear_highpage(dst);
- 		index++;
-+		dst++;
- 	}
- 
- 	if (nr_none) {
-@@ -2086,16 +2081,17 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr,
- 		}
- 
- 		/*
--		 * If userspace observed a missing page in a VMA with a MODE_MISSING
--		 * userfaultfd, then it might expect a UFFD_EVENT_PAGEFAULT for that
--		 * page. If so, we need to roll back to avoid suppressing such an
--		 * event. Since wp/minor userfaultfds don't give userspace any
--		 * guarantees that the kernel doesn't fill a missing page with a zero
--		 * page, so they don't matter here.
-+		 * If userspace observed a missing page in a VMA with
-+		 * a MODE_MISSING userfaultfd, then it might expect a
-+		 * UFFD_EVENT_PAGEFAULT for that page. If so, we need to
-+		 * roll back to avoid suppressing such an event. Since
-+		 * wp/minor userfaultfds don't give userspace any
-+		 * guarantees that the kernel doesn't fill a missing
-+		 * page with a zero page, so they don't matter here.
- 		 *
--		 * Any userfaultfds registered after this point will not be able to
--		 * observe any missing pages due to the previously inserted retry
--		 * entries.
-+		 * Any userfaultfds registered after this point will
-+		 * not be able to observe any missing pages due to the
-+		 * previously inserted retry entries.
- 		 */
- 		vma_interval_tree_foreach(vma, &mapping->i_mmap, start, end) {
- 			if (userfaultfd_missing(vma)) {
-@@ -2120,33 +2116,32 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr,
- 		xas_lock_irq(&xas);
- 	}
- 
--	nr = thp_nr_pages(hpage);
- 	if (is_shmem)
--		__mod_lruvec_page_state(hpage, NR_SHMEM_THPS, nr);
-+		__lruvec_stat_mod_folio(new_folio, NR_SHMEM_THPS, HPAGE_PMD_NR);
- 	else
--		__mod_lruvec_page_state(hpage, NR_FILE_THPS, nr);
-+		__lruvec_stat_mod_folio(new_folio, NR_FILE_THPS, HPAGE_PMD_NR);
- 
- 	if (nr_none) {
--		__mod_lruvec_page_state(hpage, NR_FILE_PAGES, nr_none);
-+		__lruvec_stat_mod_folio(new_folio, NR_FILE_PAGES, nr_none);
- 		/* nr_none is always 0 for non-shmem. */
--		__mod_lruvec_page_state(hpage, NR_SHMEM, nr_none);
-+		__lruvec_stat_mod_folio(new_folio, NR_SHMEM, nr_none);
- 	}
- 
- 	/*
--	 * Mark hpage as uptodate before inserting it into the page cache so
--	 * that it isn't mistaken for an fallocated but unwritten page.
-+	 * Mark new_folio as uptodate before inserting it into the
-+	 * page cache so that it isn't mistaken for an fallocated but
-+	 * unwritten page.
- 	 */
--	folio = page_folio(hpage);
--	folio_mark_uptodate(folio);
--	folio_ref_add(folio, HPAGE_PMD_NR - 1);
-+	folio_mark_uptodate(new_folio);
-+	folio_ref_add(new_folio, HPAGE_PMD_NR - 1);
- 
- 	if (is_shmem)
--		folio_mark_dirty(folio);
--	folio_add_lru(folio);
-+		folio_mark_dirty(new_folio);
-+	folio_add_lru(new_folio);
- 
- 	/* Join all the small entries into a single multi-index entry. */
- 	xas_set_order(&xas, start, HPAGE_PMD_ORDER);
--	xas_store(&xas, hpage);
-+	xas_store(&xas, new_folio);
- 	WARN_ON_ONCE(xas_error(&xas));
- 	xas_unlock_irq(&xas);
- 
-@@ -2157,7 +2152,7 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr,
- 	retract_page_tables(mapping, start);
- 	if (cc && !cc->is_khugepaged)
- 		result = SCAN_PTE_MAPPED_HUGEPAGE;
--	unlock_page(hpage);
-+	folio_unlock(new_folio);
- 
- 	/*
- 	 * The collapse has succeeded, so free the old pages.
-@@ -2202,13 +2197,13 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr,
- 		smp_mb();
- 	}
- 
--	hpage->mapping = NULL;
-+	new_folio->mapping = NULL;
- 
--	unlock_page(hpage);
--	put_page(hpage);
-+	folio_unlock(new_folio);
-+	folio_put(new_folio);
- out:
- 	VM_BUG_ON(!list_empty(&pagelist));
--	trace_mm_khugepaged_collapse_file(mm, hpage, index, is_shmem, addr, file, nr, result);
-+	trace_mm_khugepaged_collapse_file(mm, new_folio, index, addr, is_shmem, file, HPAGE_PMD_NR, result);
- 	return result;
- }
- 
-diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
-index e39fba5565c5d4..0b4d0a8bd36141 100644
---- a/net/bluetooth/af_bluetooth.c
-+++ b/net/bluetooth/af_bluetooth.c
-@@ -185,6 +185,28 @@ void bt_sock_unlink(struct bt_sock_list *l, struct sock *sk)
- }
- EXPORT_SYMBOL(bt_sock_unlink);
- 
-+bool bt_sock_linked(struct bt_sock_list *l, struct sock *s)
-+{
-+	struct sock *sk;
-+
-+	if (!l || !s)
-+		return false;
-+
-+	read_lock(&l->lock);
-+
-+	sk_for_each(sk, &l->head) {
-+		if (s == sk) {
-+			read_unlock(&l->lock);
-+			return true;
-+		}
-+	}
-+
-+	read_unlock(&l->lock);
-+
-+	return false;
-+}
-+EXPORT_SYMBOL(bt_sock_linked);
-+
- void bt_accept_enqueue(struct sock *parent, struct sock *sk, bool bh)
- {
- 	const struct cred *old_cred;
-diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
-index a660c428e2207c..38f542665f1962 100644
---- a/net/bluetooth/bnep/core.c
-+++ b/net/bluetooth/bnep/core.c
-@@ -745,8 +745,7 @@ static int __init bnep_init(void)
- 	if (flt[0])
- 		BT_INFO("BNEP filters: %s", flt);
- 
--	bnep_sock_init();
--	return 0;
-+	return bnep_sock_init();
- }
- 
- static void __exit bnep_exit(void)
-diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
-index 9b365fb44fac6d..c2c80d6000836b 100644
---- a/net/bluetooth/iso.c
-+++ b/net/bluetooth/iso.c
-@@ -90,6 +90,16 @@ static struct sock *iso_get_sock_listen(bdaddr_t *src, bdaddr_t *dst,
- #define ISO_CONN_TIMEOUT	(HZ * 40)
- #define ISO_DISCONN_TIMEOUT	(HZ * 2)
- 
-+static struct sock *iso_sock_hold(struct iso_conn *conn)
-+{
-+	if (!conn || !bt_sock_linked(&iso_sk_list, conn->sk))
-+		return NULL;
-+
-+	sock_hold(conn->sk);
-+
-+	return conn->sk;
-+}
-+
- static void iso_sock_timeout(struct work_struct *work)
- {
- 	struct iso_conn *conn = container_of(work, struct iso_conn,
-@@ -97,9 +107,7 @@ static void iso_sock_timeout(struct work_struct *work)
- 	struct sock *sk;
- 
- 	iso_conn_lock(conn);
--	sk = conn->sk;
--	if (sk)
--		sock_hold(sk);
-+	sk = iso_sock_hold(conn);
- 	iso_conn_unlock(conn);
- 
- 	if (!sk)
-@@ -217,9 +225,7 @@ static void iso_conn_del(struct hci_conn *hcon, int err)
- 
- 	/* Kill socket */
- 	iso_conn_lock(conn);
--	sk = conn->sk;
--	if (sk)
--		sock_hold(sk);
-+	sk = iso_sock_hold(conn);
- 	iso_conn_unlock(conn);
- 
- 	if (sk) {
-diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
-index 3c3650902c8396..fb368540139a18 100644
---- a/net/bluetooth/sco.c
-+++ b/net/bluetooth/sco.c
-@@ -76,6 +76,16 @@ struct sco_pinfo {
- #define SCO_CONN_TIMEOUT	(HZ * 40)
- #define SCO_DISCONN_TIMEOUT	(HZ * 2)
- 
-+static struct sock *sco_sock_hold(struct sco_conn *conn)
-+{
-+	if (!conn || !bt_sock_linked(&sco_sk_list, conn->sk))
-+		return NULL;
-+
-+	sock_hold(conn->sk);
-+
-+	return conn->sk;
-+}
-+
- static void sco_sock_timeout(struct work_struct *work)
- {
- 	struct sco_conn *conn = container_of(work, struct sco_conn,
-@@ -87,9 +97,7 @@ static void sco_sock_timeout(struct work_struct *work)
- 		sco_conn_unlock(conn);
- 		return;
- 	}
--	sk = conn->sk;
--	if (sk)
--		sock_hold(sk);
-+	sk = sco_sock_hold(conn);
- 	sco_conn_unlock(conn);
- 
- 	if (!sk)
-@@ -194,9 +202,7 @@ static void sco_conn_del(struct hci_conn *hcon, int err)
- 
- 	/* Kill socket */
- 	sco_conn_lock(conn);
--	sk = conn->sk;
--	if (sk)
--		sock_hold(sk);
-+	sk = sco_sock_hold(conn);
- 	sco_conn_unlock(conn);
- 
- 	if (sk) {
-diff --git a/net/core/filter.c b/net/core/filter.c
-index 8bfd46a070c167..a2467a7c01f9ed 100644
---- a/net/core/filter.c
-+++ b/net/core/filter.c
-@@ -2423,9 +2423,9 @@ static int __bpf_redirect_neigh(struct sk_buff *skb, struct net_device *dev,
- 
- /* Internal, non-exposed redirect flags. */
- enum {
--	BPF_F_NEIGH	= (1ULL << 1),
--	BPF_F_PEER	= (1ULL << 2),
--	BPF_F_NEXTHOP	= (1ULL << 3),
-+	BPF_F_NEIGH	= (1ULL << 16),
-+	BPF_F_PEER	= (1ULL << 17),
-+	BPF_F_NEXTHOP	= (1ULL << 18),
- #define BPF_F_REDIRECT_INTERNAL	(BPF_F_NEIGH | BPF_F_PEER | BPF_F_NEXTHOP)
- };
- 
-@@ -2435,6 +2435,8 @@ BPF_CALL_3(bpf_clone_redirect, struct sk_buff *, skb, u32, ifindex, u64, flags)
- 	struct sk_buff *clone;
- 	int ret;
- 
-+	BUILD_BUG_ON(BPF_F_REDIRECT_INTERNAL & BPF_F_REDIRECT_FLAGS);
-+
- 	if (unlikely(flags & (~(BPF_F_INGRESS) | BPF_F_REDIRECT_INTERNAL)))
- 		return -EINVAL;
- 
-@@ -6221,24 +6223,16 @@ BPF_CALL_5(bpf_skb_check_mtu, struct sk_buff *, skb,
- {
- 	int ret = BPF_MTU_CHK_RET_FRAG_NEEDED;
- 	struct net_device *dev = skb->dev;
--	int skb_len, dev_len;
--	int mtu = 0;
--
--	if (unlikely(flags & ~(BPF_MTU_CHK_SEGS))) {
--		ret = -EINVAL;
--		goto out;
--	}
-+	int mtu, dev_len, skb_len;
- 
--	if (unlikely(flags & BPF_MTU_CHK_SEGS && (len_diff || *mtu_len))) {
--		ret = -EINVAL;
--		goto out;
--	}
-+	if (unlikely(flags & ~(BPF_MTU_CHK_SEGS)))
-+		return -EINVAL;
-+	if (unlikely(flags & BPF_MTU_CHK_SEGS && (len_diff || *mtu_len)))
-+		return -EINVAL;
- 
- 	dev = __dev_via_ifindex(dev, ifindex);
--	if (unlikely(!dev)) {
--		ret = -ENODEV;
--		goto out;
--	}
-+	if (unlikely(!dev))
-+		return -ENODEV;
- 
- 	mtu = READ_ONCE(dev->mtu);
- 	dev_len = mtu + dev->hard_header_len;
-@@ -6273,19 +6267,15 @@ BPF_CALL_5(bpf_xdp_check_mtu, struct xdp_buff *, xdp,
- 	struct net_device *dev = xdp->rxq->dev;
- 	int xdp_len = xdp->data_end - xdp->data;
- 	int ret = BPF_MTU_CHK_RET_SUCCESS;
--	int mtu = 0, dev_len;
-+	int mtu, dev_len;
- 
- 	/* XDP variant doesn't support multi-buffer segment check (yet) */
--	if (unlikely(flags)) {
--		ret = -EINVAL;
--		goto out;
--	}
-+	if (unlikely(flags))
-+		return -EINVAL;
- 
- 	dev = __dev_via_ifindex(dev, ifindex);
--	if (unlikely(!dev)) {
--		ret = -ENODEV;
--		goto out;
--	}
-+	if (unlikely(!dev))
-+		return -ENODEV;
- 
- 	mtu = READ_ONCE(dev->mtu);
- 	dev_len = mtu + dev->hard_header_len;
-@@ -6297,7 +6287,7 @@ BPF_CALL_5(bpf_xdp_check_mtu, struct xdp_buff *, xdp,
- 	xdp_len += len_diff; /* minus result pass check */
- 	if (xdp_len > dev_len)
- 		ret = BPF_MTU_CHK_RET_FRAG_NEEDED;
--out:
-+
- 	*mtu_len = mtu;
- 	return ret;
- }
-@@ -6308,7 +6298,7 @@ static const struct bpf_func_proto bpf_skb_check_mtu_proto = {
- 	.ret_type	= RET_INTEGER,
- 	.arg1_type      = ARG_PTR_TO_CTX,
- 	.arg2_type      = ARG_ANYTHING,
--	.arg3_type      = ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_ALIGNED,
-+	.arg3_type      = ARG_PTR_TO_FIXED_SIZE_MEM | MEM_WRITE | MEM_ALIGNED,
- 	.arg3_size	= sizeof(u32),
- 	.arg4_type      = ARG_ANYTHING,
- 	.arg5_type      = ARG_ANYTHING,
-@@ -6320,7 +6310,7 @@ static const struct bpf_func_proto bpf_xdp_check_mtu_proto = {
- 	.ret_type	= RET_INTEGER,
- 	.arg1_type      = ARG_PTR_TO_CTX,
- 	.arg2_type      = ARG_ANYTHING,
--	.arg3_type      = ARG_PTR_TO_FIXED_SIZE_MEM | MEM_UNINIT | MEM_ALIGNED,
-+	.arg3_type      = ARG_PTR_TO_FIXED_SIZE_MEM | MEM_WRITE | MEM_ALIGNED,
- 	.arg3_size	= sizeof(u32),
- 	.arg4_type      = ARG_ANYTHING,
- 	.arg5_type      = ARG_ANYTHING,
-diff --git a/net/core/sock_map.c b/net/core/sock_map.c
-index 2afac40bb83ca1..2da881a8e7983a 100644
---- a/net/core/sock_map.c
-+++ b/net/core/sock_map.c
-@@ -644,6 +644,8 @@ BPF_CALL_4(bpf_sk_redirect_map, struct sk_buff *, skb,
- 	sk = __sock_map_lookup_elem(map, key);
- 	if (unlikely(!sk || !sock_map_redirect_allowed(sk)))
- 		return SK_DROP;
-+	if ((flags & BPF_F_INGRESS) && sk_is_vsock(sk))
-+		return SK_DROP;
- 
- 	skb_bpf_set_redir(skb, sk, flags & BPF_F_INGRESS);
- 	return SK_PASS;
-@@ -672,6 +674,8 @@ BPF_CALL_4(bpf_msg_redirect_map, struct sk_msg *, msg,
- 		return SK_DROP;
- 	if (!(flags & BPF_F_INGRESS) && !sk_is_tcp(sk))
- 		return SK_DROP;
-+	if (sk_is_vsock(sk))
-+		return SK_DROP;
- 
- 	msg->flags = flags;
- 	msg->sk_redir = sk;
-@@ -1246,6 +1250,8 @@ BPF_CALL_4(bpf_sk_redirect_hash, struct sk_buff *, skb,
- 	sk = __sock_hash_lookup_elem(map, key);
- 	if (unlikely(!sk || !sock_map_redirect_allowed(sk)))
- 		return SK_DROP;
-+	if ((flags & BPF_F_INGRESS) && sk_is_vsock(sk))
-+		return SK_DROP;
- 
- 	skb_bpf_set_redir(skb, sk, flags & BPF_F_INGRESS);
- 	return SK_PASS;
-@@ -1274,6 +1280,8 @@ BPF_CALL_4(bpf_msg_redirect_hash, struct sk_msg *, msg,
- 		return SK_DROP;
- 	if (!(flags & BPF_F_INGRESS) && !sk_is_tcp(sk))
- 		return SK_DROP;
-+	if (sk_is_vsock(sk))
-+		return SK_DROP;
- 
- 	msg->flags = flags;
- 	msg->sk_redir = sk;
-diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
-index cb0c80328eebf3..4822f68edbf08b 100644
---- a/net/ipv4/devinet.c
-+++ b/net/ipv4/devinet.c
-@@ -283,17 +283,19 @@ static struct in_device *inetdev_init(struct net_device *dev)
- 	/* Account for reference dev->ip_ptr (below) */
- 	refcount_set(&in_dev->refcnt, 1);
- 
--	err = devinet_sysctl_register(in_dev);
--	if (err) {
--		in_dev->dead = 1;
--		neigh_parms_release(&arp_tbl, in_dev->arp_parms);
--		in_dev_put(in_dev);
--		in_dev = NULL;
--		goto out;
-+	if (dev != blackhole_netdev) {
-+		err = devinet_sysctl_register(in_dev);
-+		if (err) {
-+			in_dev->dead = 1;
-+			neigh_parms_release(&arp_tbl, in_dev->arp_parms);
-+			in_dev_put(in_dev);
-+			in_dev = NULL;
-+			goto out;
-+		}
-+		ip_mc_init_dev(in_dev);
-+		if (dev->flags & IFF_UP)
-+			ip_mc_up(in_dev);
- 	}
--	ip_mc_init_dev(in_dev);
--	if (dev->flags & IFF_UP)
--		ip_mc_up(in_dev);
- 
- 	/* we can receive as soon as ip_ptr is set -- do this last */
- 	rcu_assign_pointer(dev->ip_ptr, in_dev);
-@@ -332,6 +334,19 @@ static void inetdev_destroy(struct in_device *in_dev)
- 	in_dev_put(in_dev);
- }
- 
-+static int __init inet_blackhole_dev_init(void)
-+{
-+	int err = 0;
-+
-+	rtnl_lock();
-+	if (!inetdev_init(blackhole_netdev))
-+		err = -ENOMEM;
-+	rtnl_unlock();
-+
-+	return err;
-+}
-+late_initcall(inet_blackhole_dev_init);
-+
- int inet_addr_onlink(struct in_device *in_dev, __be32 a, __be32 b)
- {
- 	const struct in_ifaddr *ifa;
-diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
-index 8720f3840b6985..ca8cc0988b618c 100644
---- a/net/ipv4/inet_connection_sock.c
-+++ b/net/ipv4/inet_connection_sock.c
-@@ -980,21 +980,31 @@ static bool reqsk_queue_unlink(struct request_sock *req)
- 		found = __sk_nulls_del_node_init_rcu(sk);
- 		spin_unlock(lock);
- 	}
--	if (timer_pending(&req->rsk_timer) && del_timer_sync(&req->rsk_timer))
--		reqsk_put(req);
-+
- 	return found;
- }
- 
--bool inet_csk_reqsk_queue_drop(struct sock *sk, struct request_sock *req)
-+static bool __inet_csk_reqsk_queue_drop(struct sock *sk,
-+					struct request_sock *req,
-+					bool from_timer)
- {
- 	bool unlinked = reqsk_queue_unlink(req);
- 
-+	if (!from_timer && timer_delete_sync(&req->rsk_timer))
-+		reqsk_put(req);
-+
- 	if (unlinked) {
- 		reqsk_queue_removed(&inet_csk(sk)->icsk_accept_queue, req);
- 		reqsk_put(req);
- 	}
-+
- 	return unlinked;
- }
-+
-+bool inet_csk_reqsk_queue_drop(struct sock *sk, struct request_sock *req)
-+{
-+	return __inet_csk_reqsk_queue_drop(sk, req, false);
-+}
- EXPORT_SYMBOL(inet_csk_reqsk_queue_drop);
- 
- void inet_csk_reqsk_queue_drop_and_put(struct sock *sk, struct request_sock *req)
-@@ -1087,7 +1097,7 @@ static void reqsk_timer_handler(struct timer_list *t)
- 
- 		if (!inet_ehash_insert(req_to_sk(nreq), req_to_sk(oreq), NULL)) {
- 			/* delete timer */
--			inet_csk_reqsk_queue_drop(sk_listener, nreq);
-+			__inet_csk_reqsk_queue_drop(sk_listener, nreq, true);
- 			goto no_ownership;
- 		}
- 
-@@ -1113,7 +1123,8 @@ static void reqsk_timer_handler(struct timer_list *t)
- 	}
- 
- drop:
--	inet_csk_reqsk_queue_drop_and_put(oreq->rsk_listener, oreq);
-+	__inet_csk_reqsk_queue_drop(sk_listener, oreq, true);
-+	reqsk_put(req);
- }
- 
- static bool reqsk_queue_hash_req(struct request_sock *req,
-diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
-index c33bca2c384154..63bbc7f6a5a883 100644
---- a/net/ipv4/xfrm4_policy.c
-+++ b/net/ipv4/xfrm4_policy.c
-@@ -17,47 +17,43 @@
- #include <net/ip.h>
- #include <net/l3mdev.h>
- 
--static struct dst_entry *__xfrm4_dst_lookup(struct net *net, struct flowi4 *fl4,
--					    int tos, int oif,
--					    const xfrm_address_t *saddr,
--					    const xfrm_address_t *daddr,
--					    u32 mark)
-+static struct dst_entry *__xfrm4_dst_lookup(struct flowi4 *fl4,
-+					    const struct xfrm_dst_lookup_params *params)
- {
- 	struct rtable *rt;
- 
- 	memset(fl4, 0, sizeof(*fl4));
--	fl4->daddr = daddr->a4;
--	fl4->flowi4_tos = tos;
--	fl4->flowi4_l3mdev = l3mdev_master_ifindex_by_index(net, oif);
--	fl4->flowi4_mark = mark;
--	if (saddr)
--		fl4->saddr = saddr->a4;
--
--	rt = __ip_route_output_key(net, fl4);
-+	fl4->daddr = params->daddr->a4;
-+	fl4->flowi4_tos = params->tos;
-+	fl4->flowi4_l3mdev = l3mdev_master_ifindex_by_index(params->net,
-+							    params->oif);
-+	fl4->flowi4_mark = params->mark;
-+	if (params->saddr)
-+		fl4->saddr = params->saddr->a4;
-+	fl4->flowi4_proto = params->ipproto;
-+	fl4->uli = params->uli;
-+
-+	rt = __ip_route_output_key(params->net, fl4);
- 	if (!IS_ERR(rt))
- 		return &rt->dst;
- 
- 	return ERR_CAST(rt);
- }
- 
--static struct dst_entry *xfrm4_dst_lookup(struct net *net, int tos, int oif,
--					  const xfrm_address_t *saddr,
--					  const xfrm_address_t *daddr,
--					  u32 mark)
-+static struct dst_entry *xfrm4_dst_lookup(const struct xfrm_dst_lookup_params *params)
- {
- 	struct flowi4 fl4;
- 
--	return __xfrm4_dst_lookup(net, &fl4, tos, oif, saddr, daddr, mark);
-+	return __xfrm4_dst_lookup(&fl4, params);
- }
- 
--static int xfrm4_get_saddr(struct net *net, int oif,
--			   xfrm_address_t *saddr, xfrm_address_t *daddr,
--			   u32 mark)
-+static int xfrm4_get_saddr(xfrm_address_t *saddr,
-+			   const struct xfrm_dst_lookup_params *params)
- {
- 	struct dst_entry *dst;
- 	struct flowi4 fl4;
- 
--	dst = __xfrm4_dst_lookup(net, &fl4, 0, oif, NULL, daddr, mark);
-+	dst = __xfrm4_dst_lookup(&fl4, params);
- 	if (IS_ERR(dst))
- 		return -EHOSTUNREACH;
- 
-diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
-index 444b0b4469a49e..4cd625af91e6ce 100644
---- a/net/ipv6/xfrm6_policy.c
-+++ b/net/ipv6/xfrm6_policy.c
-@@ -23,23 +23,24 @@
- #include <net/ip6_route.h>
- #include <net/l3mdev.h>
- 
--static struct dst_entry *xfrm6_dst_lookup(struct net *net, int tos, int oif,
--					  const xfrm_address_t *saddr,
--					  const xfrm_address_t *daddr,
--					  u32 mark)
-+static struct dst_entry *xfrm6_dst_lookup(const struct xfrm_dst_lookup_params *params)
- {
- 	struct flowi6 fl6;
- 	struct dst_entry *dst;
- 	int err;
- 
- 	memset(&fl6, 0, sizeof(fl6));
--	fl6.flowi6_l3mdev = l3mdev_master_ifindex_by_index(net, oif);
--	fl6.flowi6_mark = mark;
--	memcpy(&fl6.daddr, daddr, sizeof(fl6.daddr));
--	if (saddr)
--		memcpy(&fl6.saddr, saddr, sizeof(fl6.saddr));
-+	fl6.flowi6_l3mdev = l3mdev_master_ifindex_by_index(params->net,
-+							   params->oif);
-+	fl6.flowi6_mark = params->mark;
-+	memcpy(&fl6.daddr, params->daddr, sizeof(fl6.daddr));
-+	if (params->saddr)
-+		memcpy(&fl6.saddr, params->saddr, sizeof(fl6.saddr));
- 
--	dst = ip6_route_output(net, NULL, &fl6);
-+	fl6.flowi4_proto = params->ipproto;
-+	fl6.uli = params->uli;
-+
-+	dst = ip6_route_output(params->net, NULL, &fl6);
- 
- 	err = dst->error;
- 	if (dst->error) {
-@@ -50,15 +51,14 @@ static struct dst_entry *xfrm6_dst_lookup(struct net *net, int tos, int oif,
- 	return dst;
- }
- 
--static int xfrm6_get_saddr(struct net *net, int oif,
--			   xfrm_address_t *saddr, xfrm_address_t *daddr,
--			   u32 mark)
-+static int xfrm6_get_saddr(xfrm_address_t *saddr,
-+			   const struct xfrm_dst_lookup_params *params)
- {
- 	struct dst_entry *dst;
- 	struct net_device *dev;
- 	struct inet6_dev *idev;
- 
--	dst = xfrm6_dst_lookup(net, 0, oif, NULL, daddr, mark);
-+	dst = xfrm6_dst_lookup(params);
- 	if (IS_ERR(dst))
- 		return -EHOSTUNREACH;
- 
-@@ -68,7 +68,8 @@ static int xfrm6_get_saddr(struct net *net, int oif,
- 		return -EHOSTUNREACH;
- 	}
- 	dev = idev->dev;
--	ipv6_dev_get_saddr(dev_net(dev), dev, &daddr->in6, 0, &saddr->in6);
-+	ipv6_dev_get_saddr(dev_net(dev), dev, &params->daddr->in6, 0,
-+			   &saddr->in6);
- 	dst_release(dst);
- 	return 0;
- }
-diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c
-index a901fd14fe3bfe..e27e00cb16c6b1 100644
---- a/net/l2tp/l2tp_netlink.c
-+++ b/net/l2tp/l2tp_netlink.c
-@@ -115,7 +115,7 @@ static int l2tp_tunnel_notify(struct genl_family *family,
- 				  NLM_F_ACK, tunnel, cmd);
- 
- 	if (ret >= 0) {
--		ret = genlmsg_multicast_allns(family, msg, 0, 0, GFP_ATOMIC);
-+		ret = genlmsg_multicast_allns(family, msg, 0, 0);
- 		/* We don't care if no one is listening */
- 		if (ret == -ESRCH)
- 			ret = 0;
-@@ -143,7 +143,7 @@ static int l2tp_session_notify(struct genl_family *family,
- 				   NLM_F_ACK, session, cmd);
- 
- 	if (ret >= 0) {
--		ret = genlmsg_multicast_allns(family, msg, 0, 0, GFP_ATOMIC);
-+		ret = genlmsg_multicast_allns(family, msg, 0, 0);
- 		/* We don't care if no one is listening */
- 		if (ret == -ESRCH)
- 			ret = 0;
-diff --git a/net/netfilter/nf_bpf_link.c b/net/netfilter/nf_bpf_link.c
-index 0e4beae421f830..2aad0562a41351 100644
---- a/net/netfilter/nf_bpf_link.c
-+++ b/net/netfilter/nf_bpf_link.c
-@@ -23,6 +23,7 @@ static unsigned int nf_hook_run_bpf(void *bpf_prog, struct sk_buff *skb,
- struct bpf_nf_link {
- 	struct bpf_link link;
- 	struct nf_hook_ops hook_ops;
-+	netns_tracker ns_tracker;
- 	struct net *net;
- 	u32 dead;
- 	const struct nf_defrag_hook *defrag_hook;
-@@ -120,6 +121,7 @@ static void bpf_nf_link_release(struct bpf_link *link)
- 	if (!cmpxchg(&nf_link->dead, 0, 1)) {
- 		nf_unregister_net_hook(nf_link->net, &nf_link->hook_ops);
- 		bpf_nf_disable_defrag(nf_link);
-+		put_net_track(nf_link->net, &nf_link->ns_tracker);
- 	}
- }
- 
-@@ -150,11 +152,12 @@ static int bpf_nf_link_fill_link_info(const struct bpf_link *link,
- 				      struct bpf_link_info *info)
- {
- 	struct bpf_nf_link *nf_link = container_of(link, struct bpf_nf_link, link);
-+	const struct nf_defrag_hook *hook = nf_link->defrag_hook;
- 
- 	info->netfilter.pf = nf_link->hook_ops.pf;
- 	info->netfilter.hooknum = nf_link->hook_ops.hooknum;
- 	info->netfilter.priority = nf_link->hook_ops.priority;
--	info->netfilter.flags = 0;
-+	info->netfilter.flags = hook ? BPF_F_NETFILTER_IP_DEFRAG : 0;
- 
- 	return 0;
- }
-@@ -257,6 +260,8 @@ int bpf_nf_link_attach(const union bpf_attr *attr, struct bpf_prog *prog)
- 		return err;
- 	}
- 
-+	get_net_track(net, &link->ns_tracker, GFP_KERNEL);
-+
- 	return bpf_link_settle(&link_primer);
- }
- 
-diff --git a/net/netfilter/xt_NFLOG.c b/net/netfilter/xt_NFLOG.c
-index d80abd6ccaf8f7..6dcf4bc7e30b2a 100644
---- a/net/netfilter/xt_NFLOG.c
-+++ b/net/netfilter/xt_NFLOG.c
-@@ -79,7 +79,7 @@ static struct xt_target nflog_tg_reg[] __read_mostly = {
- 	{
- 		.name       = "NFLOG",
- 		.revision   = 0,
--		.family     = NFPROTO_IPV4,
-+		.family     = NFPROTO_IPV6,
- 		.checkentry = nflog_tg_check,
- 		.destroy    = nflog_tg_destroy,
- 		.target     = nflog_tg,
-diff --git a/net/netfilter/xt_TRACE.c b/net/netfilter/xt_TRACE.c
-index f3fa4f11348cd8..a642ff09fc8e8c 100644
---- a/net/netfilter/xt_TRACE.c
-+++ b/net/netfilter/xt_TRACE.c
-@@ -49,6 +49,7 @@ static struct xt_target trace_tg_reg[] __read_mostly = {
- 		.target		= trace_tg,
- 		.checkentry	= trace_tg_check,
- 		.destroy	= trace_tg_destroy,
-+		.me		= THIS_MODULE,
- 	},
- #endif
- };
-diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
-index f76fe04fc9a4e1..65b965ca40ea7e 100644
---- a/net/netfilter/xt_mark.c
-+++ b/net/netfilter/xt_mark.c
-@@ -62,7 +62,7 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
- 	{
- 		.name           = "MARK",
- 		.revision       = 2,
--		.family         = NFPROTO_IPV4,
-+		.family         = NFPROTO_IPV6,
- 		.target         = mark_tg,
- 		.targetsize     = sizeof(struct xt_mark_tginfo2),
- 		.me             = THIS_MODULE,
-diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
-index d41c4a936ad0c9..d6eee5140c8be1 100644
---- a/net/netlink/genetlink.c
-+++ b/net/netlink/genetlink.c
-@@ -1355,15 +1355,11 @@ static int genl_ctrl_event(int event, const struct genl_family *family,
- 	if (IS_ERR(msg))
- 		return PTR_ERR(msg);
- 
--	if (!family->netnsok) {
-+	if (!family->netnsok)
- 		genlmsg_multicast_netns(&genl_ctrl, &init_net, msg, 0,
- 					0, GFP_KERNEL);
--	} else {
--		rcu_read_lock();
--		genlmsg_multicast_allns(&genl_ctrl, msg, 0,
--					0, GFP_ATOMIC);
--		rcu_read_unlock();
--	}
-+	else
-+		genlmsg_multicast_allns(&genl_ctrl, msg, 0, 0);
- 
- 	return 0;
- }
-@@ -1752,23 +1748,23 @@ static int __init genl_init(void)
- 
- core_initcall(genl_init);
- 
--static int genlmsg_mcast(struct sk_buff *skb, u32 portid, unsigned long group,
--			 gfp_t flags)
-+static int genlmsg_mcast(struct sk_buff *skb, u32 portid, unsigned long group)
- {
- 	struct sk_buff *tmp;
- 	struct net *net, *prev = NULL;
- 	bool delivered = false;
- 	int err;
- 
-+	rcu_read_lock();
- 	for_each_net_rcu(net) {
- 		if (prev) {
--			tmp = skb_clone(skb, flags);
-+			tmp = skb_clone(skb, GFP_ATOMIC);
- 			if (!tmp) {
- 				err = -ENOMEM;
- 				goto error;
- 			}
- 			err = nlmsg_multicast(prev->genl_sock, tmp,
--					      portid, group, flags);
-+					      portid, group, GFP_ATOMIC);
- 			if (!err)
- 				delivered = true;
- 			else if (err != -ESRCH)
-@@ -1777,27 +1773,31 @@ static int genlmsg_mcast(struct sk_buff *skb, u32 portid, unsigned long group,
- 
- 		prev = net;
- 	}
-+	err = nlmsg_multicast(prev->genl_sock, skb, portid, group, GFP_ATOMIC);
-+
-+	rcu_read_unlock();
- 
--	err = nlmsg_multicast(prev->genl_sock, skb, portid, group, flags);
- 	if (!err)
- 		delivered = true;
- 	else if (err != -ESRCH)
- 		return err;
- 	return delivered ? 0 : -ESRCH;
-  error:
-+	rcu_read_unlock();
-+
- 	kfree_skb(skb);
- 	return err;
- }
- 
- int genlmsg_multicast_allns(const struct genl_family *family,
- 			    struct sk_buff *skb, u32 portid,
--			    unsigned int group, gfp_t flags)
-+			    unsigned int group)
- {
- 	if (WARN_ON_ONCE(group >= family->n_mcgrps))
- 		return -EINVAL;
- 
- 	group = family->mcgrp_offset + group;
--	return genlmsg_mcast(skb, portid, group, flags);
-+	return genlmsg_mcast(skb, portid, group);
- }
- EXPORT_SYMBOL(genlmsg_multicast_allns);
- 
-diff --git a/net/sched/act_api.c b/net/sched/act_api.c
-index 2d6d58e1b278a1..4572aa6e0273f8 100644
---- a/net/sched/act_api.c
-+++ b/net/sched/act_api.c
-@@ -1489,8 +1489,29 @@ int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla,
- 			bool skip_sw = tc_skip_sw(fl_flags);
- 			bool skip_hw = tc_skip_hw(fl_flags);
- 
--			if (tc_act_bind(act->tcfa_flags))
-+			if (tc_act_bind(act->tcfa_flags)) {
-+				/* Action is created by classifier and is not
-+				 * standalone. Check that the user did not set
-+				 * any action flags different than the
-+				 * classifier flags, and inherit the flags from
-+				 * the classifier for the compatibility case
-+				 * where no flags were specified at all.
-+				 */
-+				if ((tc_act_skip_sw(act->tcfa_flags) && !skip_sw) ||
-+				    (tc_act_skip_hw(act->tcfa_flags) && !skip_hw)) {
-+					NL_SET_ERR_MSG(extack,
-+						       "Mismatch between action and filter offload flags");
-+					err = -EINVAL;
-+					goto err;
-+				}
-+				if (skip_sw)
-+					act->tcfa_flags |= TCA_ACT_FLAGS_SKIP_SW;
-+				if (skip_hw)
-+					act->tcfa_flags |= TCA_ACT_FLAGS_SKIP_HW;
- 				continue;
-+			}
-+
-+			/* Action is standalone */
- 			if (skip_sw != tc_act_skip_sw(act->tcfa_flags) ||
- 			    skip_hw != tc_act_skip_hw(act->tcfa_flags)) {
- 				NL_SET_ERR_MSG(extack,
-diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
-index 6ab9359c1706f1..b51af871a621ca 100644
---- a/net/sched/sch_generic.c
-+++ b/net/sched/sch_generic.c
-@@ -505,19 +505,28 @@ static void dev_watchdog(struct timer_list *t)
- 			unsigned int timedout_ms = 0;
- 			unsigned int i;
- 			unsigned long trans_start;
-+			unsigned long oldest_start = jiffies;
- 
- 			for (i = 0; i < dev->num_tx_queues; i++) {
- 				struct netdev_queue *txq;
- 
- 				txq = netdev_get_tx_queue(dev, i);
-+				if (!netif_xmit_stopped(txq))
-+					continue;
-+
-+				/* Paired with WRITE_ONCE() + smp_mb...() in
-+				 * netdev_tx_sent_queue() and netif_tx_stop_queue().
-+				 */
-+				smp_mb();
- 				trans_start = READ_ONCE(txq->trans_start);
--				if (netif_xmit_stopped(txq) &&
--				    time_after(jiffies, (trans_start +
--							 dev->watchdog_timeo))) {
-+
-+				if (time_after(jiffies, trans_start + dev->watchdog_timeo)) {
- 					timedout_ms = jiffies_to_msecs(jiffies - trans_start);
- 					atomic_long_inc(&txq->trans_timeout);
- 					break;
- 				}
-+				if (time_after(oldest_start, trans_start))
-+					oldest_start = trans_start;
- 			}
- 
- 			if (unlikely(timedout_ms)) {
-@@ -530,7 +539,7 @@ static void dev_watchdog(struct timer_list *t)
- 				netif_unfreeze_queues(dev);
- 			}
- 			if (!mod_timer(&dev->watchdog_timer,
--				       round_jiffies(jiffies +
-+				       round_jiffies(oldest_start +
- 						     dev->watchdog_timeo)))
- 				release = false;
- 		}
-diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
-index 87090d67903621..951a87909c2974 100644
---- a/net/sched/sch_taprio.c
-+++ b/net/sched/sch_taprio.c
-@@ -1988,7 +1988,8 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt,
- 
- 		taprio_start_sched(sch, start, new_admin);
- 
--		rcu_assign_pointer(q->admin_sched, new_admin);
-+		admin = rcu_replace_pointer(q->admin_sched, new_admin,
-+					    lockdep_rtnl_is_held());
- 		if (admin)
- 			call_rcu(&admin->rcu, taprio_free_sched_cb);
- 
-@@ -2396,9 +2397,6 @@ static int taprio_dump(struct Qdisc *sch, struct sk_buff *skb)
- 	struct tc_mqprio_qopt opt = { 0 };
- 	struct nlattr *nest, *sched_nest;
- 
--	oper = rtnl_dereference(q->oper_sched);
--	admin = rtnl_dereference(q->admin_sched);
--
- 	mqprio_qopt_reconstruct(dev, &opt);
- 
- 	nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
-@@ -2419,18 +2417,23 @@ static int taprio_dump(struct Qdisc *sch, struct sk_buff *skb)
- 	    nla_put_u32(skb, TCA_TAPRIO_ATTR_TXTIME_DELAY, q->txtime_delay))
- 		goto options_error;
- 
-+	rcu_read_lock();
-+
-+	oper = rtnl_dereference(q->oper_sched);
-+	admin = rtnl_dereference(q->admin_sched);
-+
- 	if (oper && taprio_dump_tc_entries(skb, q, oper))
--		goto options_error;
-+		goto options_error_rcu;
- 
- 	if (oper && dump_schedule(skb, oper))
--		goto options_error;
-+		goto options_error_rcu;
- 
- 	if (!admin)
- 		goto done;
- 
- 	sched_nest = nla_nest_start_noflag(skb, TCA_TAPRIO_ATTR_ADMIN_SCHED);
- 	if (!sched_nest)
--		goto options_error;
-+		goto options_error_rcu;
- 
- 	if (dump_schedule(skb, admin))
- 		goto admin_error;
-@@ -2438,11 +2441,15 @@ static int taprio_dump(struct Qdisc *sch, struct sk_buff *skb)
- 	nla_nest_end(skb, sched_nest);
- 
- done:
-+	rcu_read_unlock();
- 	return nla_nest_end(skb, nest);
- 
- admin_error:
- 	nla_nest_cancel(skb, sched_nest);
- 
-+options_error_rcu:
-+	rcu_read_unlock();
-+
- options_error:
- 	nla_nest_cancel(skb, nest);
- 
-diff --git a/net/smc/smc_pnet.c b/net/smc/smc_pnet.c
-index 306b536fa89e98..284cec1e20ec11 100644
---- a/net/smc/smc_pnet.c
-+++ b/net/smc/smc_pnet.c
-@@ -753,7 +753,7 @@ static int smc_pnet_add_pnetid(struct net *net, u8 *pnetid)
- 
- 	write_lock(&sn->pnetids_ndev.lock);
- 	list_for_each_entry(pi, &sn->pnetids_ndev.list, list) {
--		if (smc_pnet_match(pnetid, pe->pnetid)) {
-+		if (smc_pnet_match(pnetid, pi->pnetid)) {
- 			refcount_inc(&pi->refcnt);
- 			kfree(pe);
- 			goto unlock;
-diff --git a/net/smc/smc_wr.c b/net/smc/smc_wr.c
-index 0021065a600a03..994c0cd4fddbf1 100644
---- a/net/smc/smc_wr.c
-+++ b/net/smc/smc_wr.c
-@@ -648,8 +648,10 @@ void smc_wr_free_link(struct smc_link *lnk)
- 	smc_wr_tx_wait_no_pending_sends(lnk);
- 	percpu_ref_kill(&lnk->wr_reg_refs);
- 	wait_for_completion(&lnk->reg_ref_comp);
-+	percpu_ref_exit(&lnk->wr_reg_refs);
- 	percpu_ref_kill(&lnk->wr_tx_refs);
- 	wait_for_completion(&lnk->tx_ref_comp);
-+	percpu_ref_exit(&lnk->wr_tx_refs);
- 
- 	if (lnk->wr_rx_dma_addr) {
- 		ib_dma_unmap_single(ibdev, lnk->wr_rx_dma_addr,
-@@ -912,11 +914,13 @@ int smc_wr_create_link(struct smc_link *lnk)
- 	init_waitqueue_head(&lnk->wr_reg_wait);
- 	rc = percpu_ref_init(&lnk->wr_reg_refs, smcr_wr_reg_refs_free, 0, GFP_KERNEL);
- 	if (rc)
--		goto dma_unmap;
-+		goto cancel_ref;
- 	init_completion(&lnk->reg_ref_comp);
- 	init_waitqueue_head(&lnk->wr_rx_empty_wait);
- 	return rc;
- 
-+cancel_ref:
-+	percpu_ref_exit(&lnk->wr_tx_refs);
- dma_unmap:
- 	if (lnk->wr_rx_v2_dma_addr) {
- 		ib_dma_unmap_single(ibdev, lnk->wr_rx_v2_dma_addr,
-diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
-index e87fd9480acdac..78b5f4f8808b92 100644
---- a/net/vmw_vsock/virtio_transport_common.c
-+++ b/net/vmw_vsock/virtio_transport_common.c
-@@ -1508,6 +1508,7 @@ int virtio_transport_read_skb(struct vsock_sock *vsk, skb_read_actor_t recv_acto
- {
- 	struct virtio_vsock_sock *vvs = vsk->trans;
- 	struct sock *sk = sk_vsock(vsk);
-+	struct virtio_vsock_hdr *hdr;
- 	struct sk_buff *skb;
- 	int off = 0;
- 	int err;
-@@ -1517,10 +1518,19 @@ int virtio_transport_read_skb(struct vsock_sock *vsk, skb_read_actor_t recv_acto
- 	 * works for types other than dgrams.
- 	 */
- 	skb = __skb_recv_datagram(sk, &vvs->rx_queue, MSG_DONTWAIT, &off, &err);
-+	if (!skb) {
-+		spin_unlock_bh(&vvs->rx_lock);
-+		return err;
-+	}
-+
-+	hdr = virtio_vsock_hdr(skb);
-+	if (le32_to_cpu(hdr->flags) & VIRTIO_VSOCK_SEQ_EOM)
-+		vvs->msg_count--;
-+
-+	virtio_transport_dec_rx_pkt(vvs, le32_to_cpu(hdr->len));
- 	spin_unlock_bh(&vvs->rx_lock);
- 
--	if (!skb)
--		return err;
-+	virtio_transport_send_credit_update(vsk);
- 
- 	return recv_actor(sk, skb);
- }
-diff --git a/net/vmw_vsock/vsock_bpf.c b/net/vmw_vsock/vsock_bpf.c
-index c42c5cc18f3241..4aa6e74ec2957b 100644
---- a/net/vmw_vsock/vsock_bpf.c
-+++ b/net/vmw_vsock/vsock_bpf.c
-@@ -114,14 +114,6 @@ static int vsock_bpf_recvmsg(struct sock *sk, struct msghdr *msg,
- 	return copied;
- }
- 
--/* Copy of original proto with updated sock_map methods */
--static struct proto vsock_bpf_prot = {
--	.close = sock_map_close,
--	.recvmsg = vsock_bpf_recvmsg,
--	.sock_is_readable = sk_msg_is_readable,
--	.unhash = sock_map_unhash,
--};
--
- static void vsock_bpf_rebuild_protos(struct proto *prot, const struct proto *base)
- {
- 	*prot        = *base;
-diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
-index 9e74f249cb45f1..79790730366985 100644
---- a/net/wireless/nl80211.c
-+++ b/net/wireless/nl80211.c
-@@ -17905,10 +17905,8 @@ void nl80211_common_reg_change_event(enum nl80211_commands cmd_id,
- 
- 	genlmsg_end(msg, hdr);
- 
--	rcu_read_lock();
- 	genlmsg_multicast_allns(&nl80211_fam, msg, 0,
--				NL80211_MCGRP_REGULATORY, GFP_ATOMIC);
--	rcu_read_unlock();
-+				NL80211_MCGRP_REGULATORY);
- 
- 	return;
- 
-@@ -18605,10 +18603,8 @@ void nl80211_send_beacon_hint_event(struct wiphy *wiphy,
- 
- 	genlmsg_end(msg, hdr);
- 
--	rcu_read_lock();
- 	genlmsg_multicast_allns(&nl80211_fam, msg, 0,
--				NL80211_MCGRP_REGULATORY, GFP_ATOMIC);
--	rcu_read_unlock();
-+				NL80211_MCGRP_REGULATORY);
- 
- 	return;
- 
-diff --git a/net/xfrm/xfrm_device.c b/net/xfrm/xfrm_device.c
-index 6346690d5c699d..04dc0c8a837076 100644
---- a/net/xfrm/xfrm_device.c
-+++ b/net/xfrm/xfrm_device.c
-@@ -263,6 +263,8 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x,
- 
- 	dev = dev_get_by_index(net, xuo->ifindex);
- 	if (!dev) {
-+		struct xfrm_dst_lookup_params params;
-+
- 		if (!(xuo->flags & XFRM_OFFLOAD_INBOUND)) {
- 			saddr = &x->props.saddr;
- 			daddr = &x->id.daddr;
-@@ -271,9 +273,12 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x,
- 			daddr = &x->props.saddr;
- 		}
- 
--		dst = __xfrm_dst_lookup(net, 0, 0, saddr, daddr,
--					x->props.family,
--					xfrm_smark_get(0, x));
-+		memset(&params, 0, sizeof(params));
-+		params.net = net;
-+		params.saddr = saddr;
-+		params.daddr = daddr;
-+		params.mark = xfrm_smark_get(0, x);
-+		dst = __xfrm_dst_lookup(x->props.family, &params);
- 		if (IS_ERR(dst))
- 			return (is_packet_offload) ? -EINVAL : 0;
- 
-diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
-index b699cc2ec35ac3..d788baffbf104e 100644
---- a/net/xfrm/xfrm_policy.c
-+++ b/net/xfrm/xfrm_policy.c
-@@ -251,10 +251,8 @@ static const struct xfrm_if_cb *xfrm_if_get_cb(void)
- 	return rcu_dereference(xfrm_if_cb);
- }
- 
--struct dst_entry *__xfrm_dst_lookup(struct net *net, int tos, int oif,
--				    const xfrm_address_t *saddr,
--				    const xfrm_address_t *daddr,
--				    int family, u32 mark)
-+struct dst_entry *__xfrm_dst_lookup(int family,
-+				    const struct xfrm_dst_lookup_params *params)
- {
- 	const struct xfrm_policy_afinfo *afinfo;
- 	struct dst_entry *dst;
-@@ -263,7 +261,7 @@ struct dst_entry *__xfrm_dst_lookup(struct net *net, int tos, int oif,
- 	if (unlikely(afinfo == NULL))
- 		return ERR_PTR(-EAFNOSUPPORT);
- 
--	dst = afinfo->dst_lookup(net, tos, oif, saddr, daddr, mark);
-+	dst = afinfo->dst_lookup(params);
- 
- 	rcu_read_unlock();
- 
-@@ -277,6 +275,7 @@ static inline struct dst_entry *xfrm_dst_lookup(struct xfrm_state *x,
- 						xfrm_address_t *prev_daddr,
- 						int family, u32 mark)
- {
-+	struct xfrm_dst_lookup_params params;
- 	struct net *net = xs_net(x);
- 	xfrm_address_t *saddr = &x->props.saddr;
- 	xfrm_address_t *daddr = &x->id.daddr;
-@@ -291,7 +290,29 @@ static inline struct dst_entry *xfrm_dst_lookup(struct xfrm_state *x,
- 		daddr = x->coaddr;
- 	}
- 
--	dst = __xfrm_dst_lookup(net, tos, oif, saddr, daddr, family, mark);
-+	params.net = net;
-+	params.saddr = saddr;
-+	params.daddr = daddr;
-+	params.tos = tos;
-+	params.oif = oif;
-+	params.mark = mark;
-+	params.ipproto = x->id.proto;
-+	if (x->encap) {
-+		switch (x->encap->encap_type) {
-+		case UDP_ENCAP_ESPINUDP:
-+			params.ipproto = IPPROTO_UDP;
-+			params.uli.ports.sport = x->encap->encap_sport;
-+			params.uli.ports.dport = x->encap->encap_dport;
-+			break;
-+		case TCP_ENCAP_ESPINTCP:
-+			params.ipproto = IPPROTO_TCP;
-+			params.uli.ports.sport = x->encap->encap_sport;
-+			params.uli.ports.dport = x->encap->encap_dport;
-+			break;
-+		}
-+	}
-+
-+	dst = __xfrm_dst_lookup(family, &params);
- 
- 	if (!IS_ERR(dst)) {
- 		if (prev_saddr != saddr)
-@@ -2424,15 +2445,15 @@ int __xfrm_sk_clone_policy(struct sock *sk, const struct sock *osk)
- }
- 
- static int
--xfrm_get_saddr(struct net *net, int oif, xfrm_address_t *local,
--	       xfrm_address_t *remote, unsigned short family, u32 mark)
-+xfrm_get_saddr(unsigned short family, xfrm_address_t *saddr,
-+	       const struct xfrm_dst_lookup_params *params)
- {
- 	int err;
- 	const struct xfrm_policy_afinfo *afinfo = xfrm_policy_get_afinfo(family);
- 
- 	if (unlikely(afinfo == NULL))
- 		return -EINVAL;
--	err = afinfo->get_saddr(net, oif, local, remote, mark);
-+	err = afinfo->get_saddr(saddr, params);
- 	rcu_read_unlock();
- 	return err;
- }
-@@ -2461,9 +2482,14 @@ xfrm_tmpl_resolve_one(struct xfrm_policy *policy, const struct flowi *fl,
- 			remote = &tmpl->id.daddr;
- 			local = &tmpl->saddr;
- 			if (xfrm_addr_any(local, tmpl->encap_family)) {
--				error = xfrm_get_saddr(net, fl->flowi_oif,
--						       &tmp, remote,
--						       tmpl->encap_family, 0);
-+				struct xfrm_dst_lookup_params params;
-+
-+				memset(&params, 0, sizeof(params));
-+				params.net = net;
-+				params.oif = fl->flowi_oif;
-+				params.daddr = remote;
-+				error = xfrm_get_saddr(tmpl->encap_family, &tmp,
-+						       &params);
- 				if (error)
- 					goto fail;
- 				local = &tmp;
-diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
-index 979f23cded401a..1d91b42e799710 100644
---- a/net/xfrm/xfrm_user.c
-+++ b/net/xfrm/xfrm_user.c
-@@ -176,6 +176,7 @@ static int verify_newsa_info(struct xfrm_usersa_info *p,
- 			     struct netlink_ext_ack *extack)
- {
- 	int err;
-+	u16 family = p->sel.family;
- 
- 	err = -EINVAL;
- 	switch (p->family) {
-@@ -196,7 +197,10 @@ static int verify_newsa_info(struct xfrm_usersa_info *p,
- 		goto out;
- 	}
- 
--	switch (p->sel.family) {
-+	if (!family && !(p->flags & XFRM_STATE_AF_UNSPEC))
-+		family = p->family;
-+
-+	switch (family) {
- 	case AF_UNSPEC:
- 		break;
- 
-@@ -995,7 +999,9 @@ static int copy_to_user_auth(struct xfrm_algo_auth *auth, struct sk_buff *skb)
- 	if (!nla)
- 		return -EMSGSIZE;
- 	ap = nla_data(nla);
--	memcpy(ap, auth, sizeof(struct xfrm_algo_auth));
-+	strscpy_pad(ap->alg_name, auth->alg_name, sizeof(ap->alg_name));
-+	ap->alg_key_len = auth->alg_key_len;
-+	ap->alg_trunc_len = auth->alg_trunc_len;
- 	if (redact_secret && auth->alg_key_len)
- 		memset(ap->alg_key, 0, (auth->alg_key_len + 7) / 8);
- 	else
-diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
-index 2c23a5a2860860..54bc18e8164b32 100644
---- a/security/selinux/selinuxfs.c
-+++ b/security/selinux/selinuxfs.c
-@@ -582,11 +582,18 @@ static ssize_t sel_write_load(struct file *file, const char __user *buf,
- 			      size_t count, loff_t *ppos)
- 
- {
--	struct selinux_fs_info *fsi = file_inode(file)->i_sb->s_fs_info;
-+	struct selinux_fs_info *fsi;
- 	struct selinux_load_state load_state;
- 	ssize_t length;
- 	void *data = NULL;
- 
-+	/* no partial writes */
-+	if (*ppos)
-+		return -EINVAL;
-+	/* no empty policies */
-+	if (!count)
-+		return -EINVAL;
-+
- 	mutex_lock(&selinux_state.policy_mutex);
- 
- 	length = avc_has_perm(current_sid(), SECINITSID_SECURITY,
-@@ -594,26 +601,22 @@ static ssize_t sel_write_load(struct file *file, const char __user *buf,
- 	if (length)
- 		goto out;
- 
--	/* No partial writes. */
--	length = -EINVAL;
--	if (*ppos != 0)
--		goto out;
--
--	length = -ENOMEM;
- 	data = vmalloc(count);
--	if (!data)
-+	if (!data) {
-+		length = -ENOMEM;
- 		goto out;
--
--	length = -EFAULT;
--	if (copy_from_user(data, buf, count) != 0)
-+	}
-+	if (copy_from_user(data, buf, count) != 0) {
-+		length = -EFAULT;
- 		goto out;
-+	}
- 
- 	length = security_load_policy(data, count, &load_state);
- 	if (length) {
- 		pr_warn_ratelimited("SELinux: failed to load policy\n");
- 		goto out;
- 	}
--
-+	fsi = file_inode(file)->i_sb->s_fs_info;
- 	length = sel_make_policy_nodes(fsi, load_state.policy);
- 	if (length) {
- 		pr_warn_ratelimited("SELinux: failed to initialize selinuxfs\n");
-@@ -622,13 +625,12 @@ static ssize_t sel_write_load(struct file *file, const char __user *buf,
- 	}
- 
- 	selinux_policy_commit(&load_state);
--
- 	length = count;
--
- 	audit_log(audit_context(), GFP_KERNEL, AUDIT_MAC_POLICY_LOAD,
- 		"auid=%u ses=%u lsm=selinux res=1",
- 		from_kuid(&init_user_ns, audit_get_loginuid(current)),
- 		audit_get_sessionid(current));
-+
- out:
- 	mutex_unlock(&selinux_state.policy_mutex);
- 	vfree(data);
-diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c
-index 5f0f8d9c08d1e7..8c6254ff143eb4 100644
---- a/sound/firewire/amdtp-stream.c
-+++ b/sound/firewire/amdtp-stream.c
-@@ -172,6 +172,9 @@ static int apply_constraint_to_size(struct snd_pcm_hw_params *params,
- 			step = max(step, amdtp_syt_intervals[i]);
- 	}
- 
-+	if (step == 0)
-+		return -EINVAL;
-+
- 	t.min = roundup(s->min, step);
- 	t.max = rounddown(s->max, step);
- 	t.integer = 1;
-diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
-index 9698ebe3fbc2e7..233b03bb4f9869 100644
---- a/sound/pci/hda/Kconfig
-+++ b/sound/pci/hda/Kconfig
-@@ -173,7 +173,7 @@ config SND_HDA_SCODEC_TAS2781_I2C
- 	depends on SND_SOC
- 	select SND_SOC_TAS2781_COMLIB
- 	select SND_SOC_TAS2781_FMWLIB
--	select CRC32_SARWATE
-+	select CRC32
- 	help
- 	  Say Y or M here to include TAS2781 I2C HD-audio side codec support
- 	  in snd-hda-intel driver, such as ALC287.
-diff --git a/sound/pci/hda/patch_cs8409.c b/sound/pci/hda/patch_cs8409.c
-index e41316e2e98338..892223d9e64aba 100644
---- a/sound/pci/hda/patch_cs8409.c
-+++ b/sound/pci/hda/patch_cs8409.c
-@@ -1411,8 +1411,9 @@ void dolphin_fixups(struct hda_codec *codec, const struct hda_fixup *fix, int ac
- 		kctrl = snd_hda_gen_add_kctl(&spec->gen, "Line Out Playback Volume",
- 					     &cs42l42_dac_volume_mixer);
- 		/* Update Line Out kcontrol template */
--		kctrl->private_value = HDA_COMPOSE_AMP_VAL_OFS(DOLPHIN_HP_PIN_NID, 3, CS8409_CODEC1,
--				       HDA_OUTPUT, CS42L42_VOL_DAC) | HDA_AMP_VAL_MIN_MUTE;
-+		if (kctrl)
-+			kctrl->private_value = HDA_COMPOSE_AMP_VAL_OFS(DOLPHIN_HP_PIN_NID, 3, CS8409_CODEC1,
-+					       HDA_OUTPUT, CS42L42_VOL_DAC) | HDA_AMP_VAL_MIN_MUTE;
- 		cs8409_enable_ur(codec, 0);
- 		snd_hda_codec_set_name(codec, "CS8409/CS42L42");
- 		break;
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 07e1547fff2e51..9be5a5c509f09a 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -3857,20 +3857,18 @@ static void alc_default_init(struct hda_codec *codec)
- 
- 	hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);
- 
--	if (hp_pin_sense)
-+	if (hp_pin_sense) {
- 		msleep(2);
- 
--	snd_hda_codec_write(codec, hp_pin, 0,
--			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
--
--	if (hp_pin_sense)
--		msleep(85);
-+		snd_hda_codec_write(codec, hp_pin, 0,
-+				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
- 
--	snd_hda_codec_write(codec, hp_pin, 0,
--			    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
-+		msleep(75);
- 
--	if (hp_pin_sense)
--		msleep(100);
-+		snd_hda_codec_write(codec, hp_pin, 0,
-+				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
-+		msleep(75);
-+	}
- }
- 
- static void alc_default_shutup(struct hda_codec *codec)
-@@ -3886,22 +3884,20 @@ static void alc_default_shutup(struct hda_codec *codec)
- 
- 	hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);
- 
--	if (hp_pin_sense)
-+	if (hp_pin_sense) {
- 		msleep(2);
- 
--	snd_hda_codec_write(codec, hp_pin, 0,
--			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
--
--	if (hp_pin_sense)
--		msleep(85);
--
--	if (!spec->no_shutup_pins)
- 		snd_hda_codec_write(codec, hp_pin, 0,
--				    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
-+				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
- 
--	if (hp_pin_sense)
--		msleep(100);
-+		msleep(75);
- 
-+		if (!spec->no_shutup_pins)
-+			snd_hda_codec_write(codec, hp_pin, 0,
-+					    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
-+
-+		msleep(75);
-+	}
- 	alc_auto_setup_eapd(codec, false);
- 	alc_shutup_pins(codec);
- }
-@@ -7362,6 +7358,7 @@ enum {
- 	ALC286_FIXUP_ACER_AIO_HEADSET_MIC,
- 	ALC256_FIXUP_ASUS_HEADSET_MIC,
- 	ALC256_FIXUP_ASUS_MIC_NO_PRESENCE,
-+	ALC255_FIXUP_PREDATOR_SUBWOOFER,
- 	ALC299_FIXUP_PREDATOR_SPK,
- 	ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE,
- 	ALC289_FIXUP_DELL_SPK1,
-@@ -8709,6 +8706,13 @@ static const struct hda_fixup alc269_fixups[] = {
- 		.chained = true,
- 		.chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE
- 	},
-+	[ALC255_FIXUP_PREDATOR_SUBWOOFER] = {
-+		.type = HDA_FIXUP_PINS,
-+		.v.pins = (const struct hda_pintbl[]) {
-+			{ 0x17, 0x90170151 }, /* use as internal speaker (LFE) */
-+			{ 0x1b, 0x90170152 } /* use as internal speaker (back) */
-+		}
-+	},
- 	[ALC299_FIXUP_PREDATOR_SPK] = {
- 		.type = HDA_FIXUP_PINS,
- 		.v.pins = (const struct hda_pintbl[]) {
-@@ -9682,6 +9686,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
- 	SND_PCI_QUIRK(0x1025, 0x110e, "Acer Aspire ES1-432", ALC255_FIXUP_ACER_MIC_NO_PRESENCE),
- 	SND_PCI_QUIRK(0x1025, 0x1166, "Acer Veriton N4640G", ALC269_FIXUP_LIFEBOOK),
- 	SND_PCI_QUIRK(0x1025, 0x1167, "Acer Veriton N6640G", ALC269_FIXUP_LIFEBOOK),
-+	SND_PCI_QUIRK(0x1025, 0x1177, "Acer Predator G9-593", ALC255_FIXUP_PREDATOR_SUBWOOFER),
-+	SND_PCI_QUIRK(0x1025, 0x1178, "Acer Predator G9-593", ALC255_FIXUP_PREDATOR_SUBWOOFER),
- 	SND_PCI_QUIRK(0x1025, 0x1246, "Acer Predator Helios 500", ALC299_FIXUP_PREDATOR_SPK),
- 	SND_PCI_QUIRK(0x1025, 0x1247, "Acer vCopperbox", ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS),
- 	SND_PCI_QUIRK(0x1025, 0x1248, "Acer Veriton N4660G", ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE),
-diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c
-index 248e3bcbf386b0..76f5d926d1eac1 100644
---- a/sound/soc/amd/yc/acp6x-mach.c
-+++ b/sound/soc/amd/yc/acp6x-mach.c
-@@ -444,6 +444,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {
- 			DMI_MATCH(DMI_BOARD_NAME, "8A3E"),
- 		}
- 	},
-+	{
-+		.driver_data = &acp6x_card,
-+		.matches = {
-+			DMI_MATCH(DMI_BOARD_VENDOR, "HP"),
-+			DMI_MATCH(DMI_BOARD_NAME, "8A7F"),
-+		}
-+	},
- 	{
- 		.driver_data = &acp6x_card,
- 		.matches = {
-diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c
-index 29197d34ec099d..7e9f0ab9141245 100644
---- a/sound/soc/codecs/lpass-rx-macro.c
-+++ b/sound/soc/codecs/lpass-rx-macro.c
-@@ -909,7 +909,7 @@ static const struct reg_default rx_defaults[] = {
- 	{ CDC_RX_BCL_VBAT_PK_EST2, 0x01 },
- 	{ CDC_RX_BCL_VBAT_PK_EST3, 0x40 },
- 	{ CDC_RX_BCL_VBAT_RF_PROC1, 0x2A },
--	{ CDC_RX_BCL_VBAT_RF_PROC1, 0x00 },
-+	{ CDC_RX_BCL_VBAT_RF_PROC2, 0x00 },
- 	{ CDC_RX_BCL_VBAT_TAC1, 0x00 },
- 	{ CDC_RX_BCL_VBAT_TAC2, 0x18 },
- 	{ CDC_RX_BCL_VBAT_TAC3, 0x18 },
-diff --git a/sound/soc/codecs/max98388.c b/sound/soc/codecs/max98388.c
-index cde5e85946cb88..87386404129d92 100644
---- a/sound/soc/codecs/max98388.c
-+++ b/sound/soc/codecs/max98388.c
-@@ -764,6 +764,7 @@ static int max98388_dai_tdm_slot(struct snd_soc_dai *dai,
- 			addr = MAX98388_R2044_PCM_TX_CTRL1 + (cnt / 8);
- 			bits = cnt % 8;
- 			regmap_update_bits(max98388->regmap, addr, bits, bits);
-+			slot_found++;
- 			if (slot_found >= MAX_NUM_CH)
- 				break;
- 		}
-diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c
-index 0d37edb70261cb..9407179af5d574 100644
---- a/sound/soc/fsl/fsl_micfil.c
-+++ b/sound/soc/fsl/fsl_micfil.c
-@@ -67,6 +67,7 @@ struct fsl_micfil_soc_data {
- 	bool imx;
- 	bool use_edma;
- 	bool use_verid;
-+	bool volume_sx;
- 	u64  formats;
- };
- 
-@@ -76,6 +77,7 @@ static struct fsl_micfil_soc_data fsl_micfil_imx8mm = {
- 	.fifo_depth = 8,
- 	.dataline =  0xf,
- 	.formats = SNDRV_PCM_FMTBIT_S16_LE,
-+	.volume_sx = true,
- };
- 
- static struct fsl_micfil_soc_data fsl_micfil_imx8mp = {
-@@ -84,6 +86,7 @@ static struct fsl_micfil_soc_data fsl_micfil_imx8mp = {
- 	.fifo_depth = 32,
- 	.dataline =  0xf,
- 	.formats = SNDRV_PCM_FMTBIT_S32_LE,
-+	.volume_sx = false,
- };
- 
- static struct fsl_micfil_soc_data fsl_micfil_imx93 = {
-@@ -94,6 +97,7 @@ static struct fsl_micfil_soc_data fsl_micfil_imx93 = {
- 	.formats = SNDRV_PCM_FMTBIT_S32_LE,
- 	.use_edma = true,
- 	.use_verid = true,
-+	.volume_sx = false,
- };
- 
- static const struct of_device_id fsl_micfil_dt_ids[] = {
-@@ -317,7 +321,26 @@ static int hwvad_detected(struct snd_kcontrol *kcontrol,
- 	return 0;
- }
- 
--static const struct snd_kcontrol_new fsl_micfil_snd_controls[] = {
-+static const struct snd_kcontrol_new fsl_micfil_volume_controls[] = {
-+	SOC_SINGLE_TLV("CH0 Volume", REG_MICFIL_OUT_CTRL,
-+		       MICFIL_OUTGAIN_CHX_SHIFT(0), 0xF, 0, gain_tlv),
-+	SOC_SINGLE_TLV("CH1 Volume", REG_MICFIL_OUT_CTRL,
-+		       MICFIL_OUTGAIN_CHX_SHIFT(1), 0xF, 0, gain_tlv),
-+	SOC_SINGLE_TLV("CH2 Volume", REG_MICFIL_OUT_CTRL,
-+		       MICFIL_OUTGAIN_CHX_SHIFT(2), 0xF, 0, gain_tlv),
-+	SOC_SINGLE_TLV("CH3 Volume", REG_MICFIL_OUT_CTRL,
-+		       MICFIL_OUTGAIN_CHX_SHIFT(3), 0xF, 0, gain_tlv),
-+	SOC_SINGLE_TLV("CH4 Volume", REG_MICFIL_OUT_CTRL,
-+		       MICFIL_OUTGAIN_CHX_SHIFT(4), 0xF, 0, gain_tlv),
-+	SOC_SINGLE_TLV("CH5 Volume", REG_MICFIL_OUT_CTRL,
-+		       MICFIL_OUTGAIN_CHX_SHIFT(5), 0xF, 0, gain_tlv),
-+	SOC_SINGLE_TLV("CH6 Volume", REG_MICFIL_OUT_CTRL,
-+		       MICFIL_OUTGAIN_CHX_SHIFT(6), 0xF, 0, gain_tlv),
-+	SOC_SINGLE_TLV("CH7 Volume", REG_MICFIL_OUT_CTRL,
-+		       MICFIL_OUTGAIN_CHX_SHIFT(7), 0xF, 0, gain_tlv),
-+};
-+
-+static const struct snd_kcontrol_new fsl_micfil_volume_sx_controls[] = {
- 	SOC_SINGLE_SX_TLV("CH0 Volume", REG_MICFIL_OUT_CTRL,
- 			  MICFIL_OUTGAIN_CHX_SHIFT(0), 0x8, 0xF, gain_tlv),
- 	SOC_SINGLE_SX_TLV("CH1 Volume", REG_MICFIL_OUT_CTRL,
-@@ -334,6 +357,9 @@ static const struct snd_kcontrol_new fsl_micfil_snd_controls[] = {
- 			  MICFIL_OUTGAIN_CHX_SHIFT(6), 0x8, 0xF, gain_tlv),
- 	SOC_SINGLE_SX_TLV("CH7 Volume", REG_MICFIL_OUT_CTRL,
- 			  MICFIL_OUTGAIN_CHX_SHIFT(7), 0x8, 0xF, gain_tlv),
-+};
-+
-+static const struct snd_kcontrol_new fsl_micfil_snd_controls[] = {
- 	SOC_ENUM_EXT("MICFIL Quality Select",
- 		     fsl_micfil_quality_enum,
- 		     micfil_quality_get, micfil_quality_set),
-@@ -801,6 +827,20 @@ static int fsl_micfil_dai_probe(struct snd_soc_dai *cpu_dai)
- 	return 0;
- }
- 
-+static int fsl_micfil_component_probe(struct snd_soc_component *component)
-+{
-+	struct fsl_micfil *micfil = snd_soc_component_get_drvdata(component);
-+
-+	if (micfil->soc->volume_sx)
-+		snd_soc_add_component_controls(component, fsl_micfil_volume_sx_controls,
-+					       ARRAY_SIZE(fsl_micfil_volume_sx_controls));
-+	else
-+		snd_soc_add_component_controls(component, fsl_micfil_volume_controls,
-+					       ARRAY_SIZE(fsl_micfil_volume_controls));
-+
-+	return 0;
-+}
-+
- static const struct snd_soc_dai_ops fsl_micfil_dai_ops = {
- 	.probe		= fsl_micfil_dai_probe,
- 	.startup	= fsl_micfil_startup,
-@@ -821,6 +861,7 @@ static struct snd_soc_dai_driver fsl_micfil_dai = {
- 
- static const struct snd_soc_component_driver fsl_micfil_component = {
- 	.name		= "fsl-micfil-dai",
-+	.probe		= fsl_micfil_component_probe,
- 	.controls       = fsl_micfil_snd_controls,
- 	.num_controls   = ARRAY_SIZE(fsl_micfil_snd_controls),
- 	.legacy_dai_naming      = 1,
-diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
-index 3d202398c5411b..aa15f56ca139d2 100644
---- a/sound/soc/fsl/fsl_sai.c
-+++ b/sound/soc/fsl/fsl_sai.c
-@@ -604,6 +604,9 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
- 
- 	val_cr4 |= FSL_SAI_CR4_FRSZ(slots);
- 
-+	/* Set to avoid channel swap */
-+	val_cr4 |= FSL_SAI_CR4_FCONT;
-+
- 	/* Set to output mode to avoid tri-stated data pins */
- 	if (tx)
- 		val_cr4 |= FSL_SAI_CR4_CHMOD;
-@@ -690,7 +693,7 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
- 
- 	regmap_update_bits(sai->regmap, FSL_SAI_xCR4(tx, ofs),
- 			   FSL_SAI_CR4_SYWD_MASK | FSL_SAI_CR4_FRSZ_MASK |
--			   FSL_SAI_CR4_CHMOD_MASK,
-+			   FSL_SAI_CR4_CHMOD_MASK | FSL_SAI_CR4_FCONT_MASK,
- 			   val_cr4);
- 	regmap_update_bits(sai->regmap, FSL_SAI_xCR5(tx, ofs),
- 			   FSL_SAI_CR5_WNW_MASK | FSL_SAI_CR5_W0W_MASK |
-diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h
-index 550df87b6a068c..eba465c2387b6e 100644
---- a/sound/soc/fsl/fsl_sai.h
-+++ b/sound/soc/fsl/fsl_sai.h
-@@ -137,6 +137,7 @@
- 
- /* SAI Transmit and Receive Configuration 4 Register */
- 
-+#define FSL_SAI_CR4_FCONT_MASK	BIT(28)
- #define FSL_SAI_CR4_FCONT	BIT(28)
- #define FSL_SAI_CR4_FCOMB_SHIFT BIT(26)
- #define FSL_SAI_CR4_FCOMB_SOFT  BIT(27)
-diff --git a/sound/soc/loongson/loongson_card.c b/sound/soc/loongson/loongson_card.c
-index 8cc54aedd00242..010e959d4c69a8 100644
---- a/sound/soc/loongson/loongson_card.c
-+++ b/sound/soc/loongson/loongson_card.c
-@@ -137,6 +137,7 @@ static int loongson_card_parse_of(struct loongson_card_data *data)
- 			dev_err(dev, "getting cpu dlc error (%d)\n", ret);
- 			goto err;
- 		}
-+		loongson_dai_links[i].platforms->of_node = loongson_dai_links[i].cpus->of_node;
- 
- 		ret = snd_soc_of_get_dlc(codec, NULL, loongson_dai_links[i].codecs, 0);
- 		if (ret < 0) {
-diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c
-index 73b42d9ee24471..e587455dc40a0e 100644
---- a/sound/soc/qcom/lpass-cpu.c
-+++ b/sound/soc/qcom/lpass-cpu.c
-@@ -1246,6 +1246,8 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev)
- 	/* Allocation for i2sctl regmap fields */
- 	drvdata->i2sctl = devm_kzalloc(&pdev->dev, sizeof(struct lpaif_i2sctl),
- 					GFP_KERNEL);
-+	if (!drvdata->i2sctl)
-+		return -ENOMEM;
- 
- 	/* Initialize bitfields for dai I2SCTL register */
- 	ret = lpass_cpu_init_i2sctl_bitfields(dev, drvdata->i2sctl,
-diff --git a/sound/soc/qcom/sm8250.c b/sound/soc/qcom/sm8250.c
-index 6558bf2e14e83d..9eb8ae0196d91f 100644
---- a/sound/soc/qcom/sm8250.c
-+++ b/sound/soc/qcom/sm8250.c
-@@ -153,6 +153,7 @@ static int sm8250_platform_probe(struct platform_device *pdev)
- 
- static const struct of_device_id snd_sm8250_dt_match[] = {
- 	{.compatible = "qcom,sm8250-sndcard"},
-+	{.compatible = "qcom,qrb4210-rb2-sndcard"},
- 	{.compatible = "qcom,qrb5165-rb5-sndcard"},
- 	{}
- };
-diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index 1bd7114c472a8b..98c7be340a536d 100644
---- a/sound/soc/sh/rcar/core.c
-+++ b/sound/soc/sh/rcar/core.c
-@@ -1297,7 +1297,9 @@ static int rsnd_dai_of_node(struct rsnd_priv *priv, int *is_graph)
- 		if (!of_node_name_eq(ports, "ports") &&
- 		    !of_node_name_eq(ports, "port"))
- 			continue;
--		priv->component_dais[i] = of_graph_get_endpoint_count(ports);
-+		priv->component_dais[i] =
-+			of_graph_get_endpoint_count(of_node_name_eq(ports, "ports") ?
-+						    ports : np);
- 		nr += priv->component_dais[i];
- 		i++;
- 		if (i >= RSND_MAX_COMPONENT) {
-@@ -1510,7 +1512,8 @@ static int rsnd_dai_probe(struct rsnd_priv *priv)
- 			if (!of_node_name_eq(ports, "ports") &&
- 			    !of_node_name_eq(ports, "port"))
- 				continue;
--			for_each_endpoint_of_node(ports, dai_np) {
-+			for_each_endpoint_of_node(of_node_name_eq(ports, "ports") ?
-+						  ports : np, dai_np) {
- 				__rsnd_dai_probe(priv, dai_np, dai_np, 0, dai_i);
- 				if (rsnd_is_gen3(priv) || rsnd_is_gen4(priv)) {
- 					rdai = rsnd_rdai_get(priv, dai_i);
-diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
-index ba6e346c8d669a..977ec094bc2a6c 100644
---- a/tools/include/uapi/linux/bpf.h
-+++ b/tools/include/uapi/linux/bpf.h
-@@ -6559,20 +6559,27 @@ struct bpf_link_info {
- 					__aligned_u64 file_name; /* in/out */
- 					__u32 name_len;
- 					__u32 offset; /* offset from file_name */
-+					__u64 cookie;
- 				} uprobe; /* BPF_PERF_EVENT_UPROBE, BPF_PERF_EVENT_URETPROBE */
- 				struct {
- 					__aligned_u64 func_name; /* in/out */
- 					__u32 name_len;
- 					__u32 offset; /* offset from func_name */
- 					__u64 addr;
-+					__u64 missed;
-+					__u64 cookie;
- 				} kprobe; /* BPF_PERF_EVENT_KPROBE, BPF_PERF_EVENT_KRETPROBE */
- 				struct {
- 					__aligned_u64 tp_name;   /* in/out */
- 					__u32 name_len;
-+					__u32 :32;
-+					__u64 cookie;
- 				} tracepoint; /* BPF_PERF_EVENT_TRACEPOINT */
- 				struct {
- 					__u64 config;
- 					__u32 type;
-+					__u32 :32;
-+					__u64 cookie;
- 				} event; /* BPF_PERF_EVENT_EVENT */
- 			};
- 		} perf_event;
-diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
-index ab364e95a9b23e..f5a3a84fac955b 100644
---- a/tools/testing/selftests/bpf/Makefile
-+++ b/tools/testing/selftests/bpf/Makefile
-@@ -200,7 +200,7 @@ $(OUTPUT)/%:%.c
- ifeq ($(SRCARCH),x86)
- LLD := lld
- else
--LLD := ld
-+LLD := $(shell command -v $(LD))
- endif
- 
- # Filter out -static for liburandom_read.so and its dependent targets so that static builds
-diff --git a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c
-index 9d768e08371495..5b0c6a04cdbfe0 100644
---- a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c
-+++ b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c
-@@ -30,6 +30,8 @@ static noinline void uprobe_func(void)
- 	asm volatile ("");
- }
- 
-+#define PERF_EVENT_COOKIE 0xdeadbeef
-+
- static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long addr,
- 				 ssize_t offset, ssize_t entry_offset)
- {
-@@ -61,8 +63,11 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add
- 			ASSERT_EQ(info.perf_event.kprobe.addr, addr + entry_offset,
- 				  "kprobe_addr");
- 
-+		ASSERT_EQ(info.perf_event.kprobe.cookie, PERF_EVENT_COOKIE, "kprobe_cookie");
-+
-+		ASSERT_EQ(info.perf_event.kprobe.name_len, strlen(KPROBE_FUNC) + 1,
-+				  "name_len");
- 		if (!info.perf_event.kprobe.func_name) {
--			ASSERT_EQ(info.perf_event.kprobe.name_len, 0, "name_len");
- 			info.perf_event.kprobe.func_name = ptr_to_u64(&buf);
- 			info.perf_event.kprobe.name_len = sizeof(buf);
- 			goto again;
-@@ -73,13 +78,16 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add
- 		ASSERT_EQ(err, 0, "cmp_kprobe_func_name");
- 		break;
- 	case BPF_PERF_EVENT_TRACEPOINT:
-+		ASSERT_EQ(info.perf_event.tracepoint.name_len, strlen(TP_NAME) + 1,
-+				  "name_len");
- 		if (!info.perf_event.tracepoint.tp_name) {
--			ASSERT_EQ(info.perf_event.tracepoint.name_len, 0, "name_len");
- 			info.perf_event.tracepoint.tp_name = ptr_to_u64(&buf);
- 			info.perf_event.tracepoint.name_len = sizeof(buf);
- 			goto again;
- 		}
- 
-+		ASSERT_EQ(info.perf_event.tracepoint.cookie, PERF_EVENT_COOKIE, "tracepoint_cookie");
-+
- 		err = strncmp(u64_to_ptr(info.perf_event.tracepoint.tp_name), TP_NAME,
- 			      strlen(TP_NAME));
- 		ASSERT_EQ(err, 0, "cmp_tp_name");
-@@ -88,13 +96,16 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add
- 	case BPF_PERF_EVENT_URETPROBE:
- 		ASSERT_EQ(info.perf_event.uprobe.offset, offset, "uprobe_offset");
- 
-+		ASSERT_EQ(info.perf_event.uprobe.name_len, strlen(UPROBE_FILE) + 1,
-+				  "name_len");
- 		if (!info.perf_event.uprobe.file_name) {
--			ASSERT_EQ(info.perf_event.uprobe.name_len, 0, "name_len");
- 			info.perf_event.uprobe.file_name = ptr_to_u64(&buf);
- 			info.perf_event.uprobe.name_len = sizeof(buf);
- 			goto again;
- 		}
- 
-+		ASSERT_EQ(info.perf_event.uprobe.cookie, PERF_EVENT_COOKIE, "uprobe_cookie");
-+
- 		err = strncmp(u64_to_ptr(info.perf_event.uprobe.file_name), UPROBE_FILE,
- 			      strlen(UPROBE_FILE));
- 			ASSERT_EQ(err, 0, "cmp_file_name");
-@@ -138,16 +149,17 @@ static void test_kprobe_fill_link_info(struct test_fill_link_info *skel,
- 	DECLARE_LIBBPF_OPTS(bpf_kprobe_opts, opts,
- 		.attach_mode = PROBE_ATTACH_MODE_LINK,
- 		.retprobe = type == BPF_PERF_EVENT_KRETPROBE,
-+		.bpf_cookie = PERF_EVENT_COOKIE,
- 	);
- 	ssize_t entry_offset = 0;
-+	struct bpf_link *link;
- 	int link_fd, err;
- 
--	skel->links.kprobe_run = bpf_program__attach_kprobe_opts(skel->progs.kprobe_run,
--								 KPROBE_FUNC, &opts);
--	if (!ASSERT_OK_PTR(skel->links.kprobe_run, "attach_kprobe"))
-+	link = bpf_program__attach_kprobe_opts(skel->progs.kprobe_run, KPROBE_FUNC, &opts);
-+	if (!ASSERT_OK_PTR(link, "attach_kprobe"))
- 		return;
- 
--	link_fd = bpf_link__fd(skel->links.kprobe_run);
-+	link_fd = bpf_link__fd(link);
- 	if (!invalid) {
- 		/* See also arch_adjust_kprobe_addr(). */
- 		if (skel->kconfig->CONFIG_X86_KERNEL_IBT)
-@@ -157,39 +169,48 @@ static void test_kprobe_fill_link_info(struct test_fill_link_info *skel,
- 	} else {
- 		kprobe_fill_invalid_user_buffer(link_fd);
- 	}
--	bpf_link__detach(skel->links.kprobe_run);
-+	bpf_link__destroy(link);
- }
- 
- static void test_tp_fill_link_info(struct test_fill_link_info *skel)
- {
-+	DECLARE_LIBBPF_OPTS(bpf_tracepoint_opts, opts,
-+		.bpf_cookie = PERF_EVENT_COOKIE,
-+	);
-+	struct bpf_link *link;
- 	int link_fd, err;
- 
--	skel->links.tp_run = bpf_program__attach_tracepoint(skel->progs.tp_run, TP_CAT, TP_NAME);
--	if (!ASSERT_OK_PTR(skel->links.tp_run, "attach_tp"))
-+	link = bpf_program__attach_tracepoint_opts(skel->progs.tp_run, TP_CAT, TP_NAME, &opts);
-+	if (!ASSERT_OK_PTR(link, "attach_tp"))
- 		return;
- 
--	link_fd = bpf_link__fd(skel->links.tp_run);
-+	link_fd = bpf_link__fd(link);
- 	err = verify_perf_link_info(link_fd, BPF_PERF_EVENT_TRACEPOINT, 0, 0, 0);
- 	ASSERT_OK(err, "verify_perf_link_info");
--	bpf_link__detach(skel->links.tp_run);
-+	bpf_link__destroy(link);
- }
- 
- static void test_uprobe_fill_link_info(struct test_fill_link_info *skel,
- 				       enum bpf_perf_event_type type)
- {
-+	DECLARE_LIBBPF_OPTS(bpf_uprobe_opts, opts,
-+		.retprobe = type == BPF_PERF_EVENT_URETPROBE,
-+		.bpf_cookie = PERF_EVENT_COOKIE,
-+	);
-+	struct bpf_link *link;
- 	int link_fd, err;
- 
--	skel->links.uprobe_run = bpf_program__attach_uprobe(skel->progs.uprobe_run,
--							    type == BPF_PERF_EVENT_URETPROBE,
--							    0, /* self pid */
--							    UPROBE_FILE, uprobe_offset);
--	if (!ASSERT_OK_PTR(skel->links.uprobe_run, "attach_uprobe"))
-+	link = bpf_program__attach_uprobe_opts(skel->progs.uprobe_run,
-+					       0, /* self pid */
-+					       UPROBE_FILE, uprobe_offset,
-+					       &opts);
-+	if (!ASSERT_OK_PTR(link, "attach_uprobe"))
- 		return;
- 
--	link_fd = bpf_link__fd(skel->links.uprobe_run);
-+	link_fd = bpf_link__fd(link);
- 	err = verify_perf_link_info(link_fd, type, 0, uprobe_offset, 0);
- 	ASSERT_OK(err, "verify_perf_link_info");
--	bpf_link__detach(skel->links.uprobe_run);
-+	bpf_link__destroy(link);
- }
- 
- static int verify_kmulti_link_info(int fd, bool retprobe)
-@@ -278,24 +299,24 @@ static void test_kprobe_multi_fill_link_info(struct test_fill_link_info *skel,
- 					     bool retprobe, bool invalid)
- {
- 	LIBBPF_OPTS(bpf_kprobe_multi_opts, opts);
-+	struct bpf_link *link;
- 	int link_fd, err;
- 
- 	opts.syms = kmulti_syms;
- 	opts.cnt = KMULTI_CNT;
- 	opts.retprobe = retprobe;
--	skel->links.kmulti_run = bpf_program__attach_kprobe_multi_opts(skel->progs.kmulti_run,
--								       NULL, &opts);
--	if (!ASSERT_OK_PTR(skel->links.kmulti_run, "attach_kprobe_multi"))
-+	link = bpf_program__attach_kprobe_multi_opts(skel->progs.kmulti_run, NULL, &opts);
-+	if (!ASSERT_OK_PTR(link, "attach_kprobe_multi"))
- 		return;
- 
--	link_fd = bpf_link__fd(skel->links.kmulti_run);
-+	link_fd = bpf_link__fd(link);
- 	if (!invalid) {
- 		err = verify_kmulti_link_info(link_fd, retprobe);
- 		ASSERT_OK(err, "verify_kmulti_link_info");
- 	} else {
- 		verify_kmulti_invalid_user_buffer(link_fd);
- 	}
--	bpf_link__detach(skel->links.kmulti_run);
-+	bpf_link__destroy(link);
- }
- 
- void test_fill_link_info(void)
-diff --git a/tools/testing/selftests/bpf/progs/verifier_helper_value_access.c b/tools/testing/selftests/bpf/progs/verifier_helper_value_access.c
-index 692216c0ad3d45..3e8340c2408f37 100644
---- a/tools/testing/selftests/bpf/progs/verifier_helper_value_access.c
-+++ b/tools/testing/selftests/bpf/progs/verifier_helper_value_access.c
-@@ -91,7 +91,7 @@ l0_%=:	exit;						\
- 
- SEC("tracepoint")
- __description("helper access to map: empty range")
--__failure __msg("invalid access to map value, value_size=48 off=0 size=0")
-+__failure __msg("R2 invalid zero-sized read")
- __naked void access_to_map_empty_range(void)
- {
- 	asm volatile ("					\
-@@ -221,7 +221,7 @@ l0_%=:	exit;						\
- 
- SEC("tracepoint")
- __description("helper access to adjusted map (via const imm): empty range")
--__failure __msg("invalid access to map value, value_size=48 off=4 size=0")
-+__failure __msg("R2 invalid zero-sized read")
- __naked void via_const_imm_empty_range(void)
- {
- 	asm volatile ("					\
-@@ -386,7 +386,7 @@ l0_%=:	exit;						\
- 
- SEC("tracepoint")
- __description("helper access to adjusted map (via const reg): empty range")
--__failure __msg("R1 min value is outside of the allowed memory range")
-+__failure __msg("R2 invalid zero-sized read")
- __naked void via_const_reg_empty_range(void)
- {
- 	asm volatile ("					\
-@@ -556,7 +556,7 @@ l0_%=:	exit;						\
- 
- SEC("tracepoint")
- __description("helper access to adjusted map (via variable): empty range")
--__failure __msg("R1 min value is outside of the allowed memory range")
-+__failure __msg("R2 invalid zero-sized read")
- __naked void map_via_variable_empty_range(void)
- {
- 	asm volatile ("					\
-diff --git a/tools/testing/selftests/bpf/progs/verifier_raw_stack.c b/tools/testing/selftests/bpf/progs/verifier_raw_stack.c
-index f67390224a9cf9..7cc83acac7271d 100644
---- a/tools/testing/selftests/bpf/progs/verifier_raw_stack.c
-+++ b/tools/testing/selftests/bpf/progs/verifier_raw_stack.c
-@@ -64,7 +64,7 @@ __naked void load_bytes_negative_len_2(void)
- 
- SEC("tc")
- __description("raw_stack: skb_load_bytes, zero len")
--__failure __msg("invalid zero-sized read")
-+__failure __msg("R4 invalid zero-sized read: u64=[0,0]")
- __naked void skb_load_bytes_zero_len(void)
- {
- 	asm volatile ("					\
-diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc b/tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc
-index 20e42c030095b0..61877d16645112 100644
---- a/tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc
-+++ b/tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc
-@@ -34,7 +34,9 @@ check_error 'f vfs_read ^$stack10000'	# BAD_STACK_NUM
- 
- check_error 'f vfs_read ^$arg10000'	# BAD_ARG_NUM
- 
-+if !grep -q 'kernel return probes support:' README; then
- check_error 'f vfs_read $retval ^$arg1' # BAD_VAR
-+fi
- check_error 'f vfs_read ^$none_var'	# BAD_VAR
- check_error 'f vfs_read ^'$REG		# BAD_VAR
- 
-@@ -99,7 +101,9 @@ if grep -q "<argname>" README; then
- check_error 'f vfs_read args=^$arg*'		# BAD_VAR_ARGS
- check_error 'f vfs_read +0(^$arg*)'		# BAD_VAR_ARGS
- check_error 'f vfs_read $arg* ^$arg*'		# DOUBLE_ARGS
-+if !grep -q 'kernel return probes support:' README; then
- check_error 'f vfs_read%return ^$arg*'		# NOFENTRY_ARGS
-+fi
- check_error 'f vfs_read ^hoge'			# NO_BTFARG
- check_error 'f kfree ^$arg10'			# NO_BTFARG (exceed the number of parameters)
- check_error 'f kfree%return ^$retval'		# NO_RETVAL
-diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc
-index 65fbb26fd58c10..a16c6a6f6055cf 100644
---- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc
-+++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc
-@@ -108,7 +108,9 @@ if grep -q "<argname>" README; then
- check_error 'p vfs_read args=^$arg*'		# BAD_VAR_ARGS
- check_error 'p vfs_read +0(^$arg*)'		# BAD_VAR_ARGS
- check_error 'p vfs_read $arg* ^$arg*'		# DOUBLE_ARGS
-+if !grep -q 'kernel return probes support:' README; then
- check_error 'r vfs_read ^$arg*'			# NOFENTRY_ARGS
-+fi
- check_error 'p vfs_read+8 ^$arg*'		# NOFENTRY_ARGS
- check_error 'p vfs_read ^hoge'			# NO_BTFARG
- check_error 'p kfree ^$arg10'			# NO_BTFARG (exceed the number of parameters)

From aaa1ca00069aced92c2a62c5b0d8290f8434cf7c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 19:04:36 +0000
Subject: [PATCH 045/107] build(deps): bump setuptools from 75.2.0 to 75.3.0

Bumps [setuptools](https://github.com/pypa/setuptools) from 75.2.0 to 75.3.0.
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst)
- [Commits](https://github.com/pypa/setuptools/compare/v75.2.0...v75.3.0)

---
updated-dependencies:
- dependency-name: setuptools
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index c081d7271037..4109cfd6a71d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@
 # Always use a fixed version, this is important for correct hashing.
 # Dependabot will keep these versions up to date.
 
-setuptools == 75.2.0   # for building Python packages
+setuptools == 75.3.0   # for building Python packages
 pyelftools == 0.31     # for building U-Boot
 unidiff == 0.7.5       # for parsing unified diff
 GitPython == 3.1.43    # for manipulating git repos

From b766d2a04e14dfdbc5617d2451b0933bcb08fe31 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 19:04:31 +0000
Subject: [PATCH 046/107] build(deps): bump rich from 13.9.3 to 13.9.4

Bumps [rich](https://github.com/Textualize/rich) from 13.9.3 to 13.9.4.
- [Release notes](https://github.com/Textualize/rich/releases)
- [Changelog](https://github.com/Textualize/rich/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Textualize/rich/compare/v13.9.3...v13.9.4)

---
updated-dependencies:
- dependency-name: rich
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 4109cfd6a71d..e20c368470a1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,6 +14,6 @@ coloredlogs == 15.0.1  # for colored logging
 PyYAML == 6.0.2        # for parsing/writing YAML
 oras == 0.1.30         # for OCI stuff in mapper-oci-update
 Jinja2 == 3.1.4        # for templating
-rich == 13.9.3         # for rich text formatting
+rich == 13.9.4         # for rich text formatting
 dtschema == 2024.9     # for checking dts files and dt bindings
 yamllint == 1.35.1     # for checking dts files and dt bindings

From d050df9a0664ffcbe618e954f4cfae96733f7c2d Mon Sep 17 00:00:00 2001
From: Mecid <mecid@mecomediagroup.de>
Date: Tue, 5 Nov 2024 15:09:09 +0100
Subject: [PATCH 047/107] Add community support for Rock5B

---
 config/boards/rock-5b-plus.csc | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 config/boards/rock-5b-plus.csc

diff --git a/config/boards/rock-5b-plus.csc b/config/boards/rock-5b-plus.csc
new file mode 100644
index 000000000000..4c25410447d7
--- /dev/null
+++ b/config/boards/rock-5b-plus.csc
@@ -0,0 +1,27 @@
+# Rockchip RK3588 SoC octa core 4-16GB SoC 2.5GBe eMMC USB3 NvME
+BOARD_NAME="Rock 5B Plus"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER=""
+BOOTCONFIG="rock-5b-plus-rk3588_defconfig"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-radxa-rock-5b+.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"
+declare -g UEFI_EDK2_BOARD_ID="rock-5bplus" # This _only_ used for uefi-edk2-rk3588 extension
+
+function post_family_tweaks__rock5b_naming_audios() {
+	display_alert "$BOARD" "Renaming rock5b audios" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi1-sound", ENV{SOUND_DESCRIPTION}="HDMI1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmiin-sound", ENV{SOUND_DESCRIPTION}="HDMI-In Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp1-sound", ENV{SOUND_DESCRIPTION}="DP1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8316-sound", ENV{SOUND_DESCRIPTION}="ES8316 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+
+	return 0
+}

From cc704f49a6fba83563f25f1134909d3c0adad7c0 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Tue, 5 Nov 2024 13:40:36 +0100
Subject: [PATCH 048/107] Cosmetic bugfix - we need to limit grep to match
 first character only

Without this, we grep upgrade options too and this fill give wrong information
---
 packages/bsp/common/usr/lib/armbian/armbian-firstlogin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
index a983dc9a9870..4d60b873abdf 100755
--- a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
+++ b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
@@ -11,7 +11,7 @@
 [[ -f /etc/lsb-release ]] && . /etc/lsb-release
 [[ -f /etc/os-release ]] && . /etc/os-release
 [[ -z "$DISTRIB_CODENAME" ]] && DISTRIB_CODENAME="${VERSION_CODENAME}"
-[[ -n "$DISTRIB_CODENAME" && -f /etc/armbian-distribution-status ]] && DISTRIBUTION_STATUS=$(grep "$DISTRIB_CODENAME" /etc/armbian-distribution-status | cut -d"=" -f2 | cut -d";" -f1)
+[[ -n "$DISTRIB_CODENAME" && -f /etc/armbian-distribution-status ]] && DISTRIBUTION_STATUS=$(grep "^$DISTRIB_CODENAME" /etc/armbian-distribution-status | cut -d"=" -f2 | cut -d";" -f1)
 
 . /etc/armbian-release
 

From 817519210bfc5233ec19ea8f5f8f38bd3ca78c60 Mon Sep 17 00:00:00 2001
From: user <>
Date: Tue, 5 Nov 2024 10:26:39 +0700
Subject: [PATCH 049/107] Fix partitioning root UUID bug in /etc/crypttab.

---
 lib/functions/image/partitioning.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/functions/image/partitioning.sh b/lib/functions/image/partitioning.sh
index a638410af504..2abf26c4ff1a 100644
--- a/lib/functions/image/partitioning.sh
+++ b/lib/functions/image/partitioning.sh
@@ -300,7 +300,7 @@ function prepare_partitions() {
 		wait_for_disk_sync "after mkfs" # force writes to be really flushed
 
 		# store in readonly global for usage in later hooks
-		root_part_uuid="$(blkid -s UUID -o value ${rootdevice})"
+		root_part_uuid="$(blkid -s UUID -o value ${LOOP}p${rootpart})"
 		declare -g -r ROOT_PART_UUID="${root_part_uuid}"
 
 		display_alert "Mounting rootfs" "$rootdevice (UUID=${ROOT_PART_UUID})"

From 502e1395982ce2002a058eb698509f9cdbee0ecc Mon Sep 17 00:00:00 2001
From: user <>
Date: Tue, 5 Nov 2024 10:28:35 +0700
Subject: [PATCH 050/107] New option: CRYPTROOT_MAPPER. Make ROOT_MAPPER name
 for CRYPTROOT changable.

---
 extensions/fs-cryptroot-support.sh         | 4 ++--
 lib/functions/configuration/main-config.sh | 2 +-
 lib/functions/image/partitioning.sh        | 6 +++---
 lib/functions/image/rootfs-to-image.sh     | 2 +-
 lib/functions/rootfs/trap-rootfs.sh        | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/extensions/fs-cryptroot-support.sh b/extensions/fs-cryptroot-support.sh
index a7b1613b69c2..6d42e88e00e4 100644
--- a/extensions/fs-cryptroot-support.sh
+++ b/extensions/fs-cryptroot-support.sh
@@ -26,10 +26,10 @@ function prepare_root_device__encrypt_root_device() {
 	check_loop_device "$rootdevice"
 	display_alert "Extension: ${EXTENSION}: Encrypting root partition with LUKS..." "cryptsetup luksFormat $rootdevice" ""
 	echo -n $CRYPTROOT_PASSPHRASE | cryptsetup luksFormat $CRYPTROOT_PARAMETERS $rootdevice -
-	echo -n $CRYPTROOT_PASSPHRASE | cryptsetup luksOpen $rootdevice $ROOT_MAPPER -
+	echo -n $CRYPTROOT_PASSPHRASE | cryptsetup luksOpen $rootdevice $CRYPTROOT_MAPPER -
 	display_alert "Extension: ${EXTENSION}: Root partition encryption complete." "" "ext"
 	# TODO: pass /dev/mapper to Docker
-	rootdevice=/dev/mapper/$ROOT_MAPPER # used by `mkfs` and `mount` commands
+	rootdevice=/dev/mapper/$CRYPTROOT_MAPPER # used by `mkfs` and `mount` commands
 }
 
 function pre_install_kernel_debs__adjust_dropbear_configuration() {
diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh
index d0df1d4210da..2833ce4f8d18 100644
--- a/lib/functions/configuration/main-config.sh
+++ b/lib/functions/configuration/main-config.sh
@@ -166,10 +166,10 @@ function do_main_configuration() {
 	# Support for LUKS / cryptroot
 	if [[ $CRYPTROOT_ENABLE == yes ]]; then
 		enable_extension "fs-cryptroot-support" # add the tooling needed, cryptsetup
-		ROOT_MAPPER="armbian-root"              # TODO: fixed name can't be used for parallel image building (rpardini: ?)
 		if [[ -z $CRYPTROOT_PASSPHRASE ]]; then # a passphrase is mandatory if rootfs encryption is enabled
 			exit_with_error "Root encryption is enabled but CRYPTROOT_PASSPHRASE is not set"
 		fi
+		[[ -z $CRYPTROOT_MAPPER ]] && CRYPTROOT_MAPPER="armbian-root" # TODO: fixed name can't be used for parallel image building (rpardini: ?)
 		[[ -z $CRYPTROOT_SSH_UNLOCK ]] && CRYPTROOT_SSH_UNLOCK=yes
 		[[ -z $CRYPTROOT_SSH_UNLOCK_PORT ]] && CRYPTROOT_SSH_UNLOCK_PORT=2022
 		# Default to pdkdf2, this used to be the default with cryptroot <= 2.0, however
diff --git a/lib/functions/image/partitioning.sh b/lib/functions/image/partitioning.sh
index 2abf26c4ff1a..773ed9501579 100644
--- a/lib/functions/image/partitioning.sh
+++ b/lib/functions/image/partitioning.sh
@@ -310,7 +310,7 @@ function prepare_partitions() {
 		local rootfs
 		if [[ $CRYPTROOT_ENABLE == yes ]]; then
 			# map the LUKS container partition via its UUID to be the 'cryptroot' device
-			echo "$ROOT_MAPPER UUID=${root_part_uuid} none luks" >> $SDCARD/etc/crypttab
+			echo "$CRYPTROOT_MAPPER UUID=${root_part_uuid} none luks" >> $SDCARD/etc/crypttab
 			rootfs=$rootdevice # used in fstab
 		else
 			rootfs="UUID=$(blkid -s UUID -o value $rootdevice)"
@@ -369,7 +369,7 @@ function prepare_partitions() {
 	if [[ -f $SDCARD/boot/armbianEnv.txt ]]; then
 		display_alert "Found armbianEnv.txt" "${SDCARD}/boot/armbianEnv.txt" "debug"
 		if [[ $CRYPTROOT_ENABLE == yes ]]; then
-			echo "rootdev=$rootdevice cryptdevice=UUID=${root_part_uuid}:$ROOT_MAPPER" >> "${SDCARD}/boot/armbianEnv.txt"
+			echo "rootdev=$rootdevice cryptdevice=UUID=${root_part_uuid}:$CRYPTROOT_MAPPER" >> "${SDCARD}/boot/armbianEnv.txt"
 		else
 			echo "rootdev=$rootfs" >> "${SDCARD}/boot/armbianEnv.txt"
 		fi
@@ -389,7 +389,7 @@ function prepare_partitions() {
 		sed -i -e "s/rootfstype \"ext4\"/rootfstype \"$ROOTFS_TYPE\"/" $SDCARD/boot/boot.ini
 		if [[ $CRYPTROOT_ENABLE == yes ]]; then
 			rootpart="UUID=${root_part_uuid}"
-			sed -i 's/^setenv rootdev .*/setenv rootdev "\/dev\/mapper\/'$ROOT_MAPPER' cryptdevice='$rootpart':'$ROOT_MAPPER'"/' $SDCARD/boot/boot.ini
+			sed -i 's/^setenv rootdev .*/setenv rootdev "\/dev\/mapper\/'$CRYPTROOT_MAPPER' cryptdevice='$rootpart':'$CRYPTROOT_MAPPER'"/' $SDCARD/boot/boot.ini
 		else
 			sed -i 's/^setenv rootdev .*/setenv rootdev "'$rootfs'"/' $SDCARD/boot/boot.ini
 		fi
diff --git a/lib/functions/image/rootfs-to-image.sh b/lib/functions/image/rootfs-to-image.sh
index 7585374c9dc0..92dcc6625c34 100644
--- a/lib/functions/image/rootfs-to-image.sh
+++ b/lib/functions/image/rootfs-to-image.sh
@@ -119,7 +119,7 @@ function create_image_from_sdcard_rootfs() {
 	wait_for_disk_sync "before umount MOUNT"
 
 	umount_chroot_recursive "${MOUNT}" "MOUNT"
-	[[ $CRYPTROOT_ENABLE == yes ]] && cryptsetup luksClose "$ROOT_MAPPER"
+	[[ $CRYPTROOT_ENABLE == yes ]] && cryptsetup luksClose "$CRYPTROOT_MAPPER"
 
 	call_extension_method "post_umount_final_image" "config_post_umount_final_image" <<- 'POST_UMOUNT_FINAL_IMAGE'
 		*allow config to hack into the image after the unmount*
diff --git a/lib/functions/rootfs/trap-rootfs.sh b/lib/functions/rootfs/trap-rootfs.sh
index 15911c3501a6..ce8ba64ce19a 100644
--- a/lib/functions/rootfs/trap-rootfs.sh
+++ b/lib/functions/rootfs/trap-rootfs.sh
@@ -63,7 +63,7 @@ function trap_handler_cleanup_rootfs_and_image() {
 	# unmount tmpfs mounted on SDCARD if it exists. #@TODO: move to new tmpfs-utils scheme
 	mountpoint -q "${SDCARD}" && umount "${SDCARD}"
 
-	[[ $CRYPTROOT_ENABLE == yes ]] && cryptsetup luksClose "${ROOT_MAPPER}"
+	[[ $CRYPTROOT_ENABLE == yes ]] && cryptsetup luksClose "${CRYPTROOT_MAPPER}"
 
 	if [[ "${PRESERVE_SDCARD_MOUNT}" == "yes" ]]; then
 		display_alert "Preserving SD card mount" "trap_handler_cleanup_rootfs_and_image" "warn"

From b7f78fec0c63d81619465f2e468e82891530eabc Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Mon, 4 Nov 2024 23:22:04 +0300
Subject: [PATCH 051/107] sunxi-6.11: Switch to v6.11.6 and re-extract patches

---
 config/sources/families/include/sunxi64_common.inc          | 2 +-
 config/sources/families/include/sunxi_common.inc            | 2 +-
 ...-option-add-reset_resume-callback-for-WWAN-devices.patch | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc
index 847ef7f178c3..cca9237d1edc 100644
--- a/config/sources/families/include/sunxi64_common.inc
+++ b/config/sources/families/include/sunxi64_common.inc
@@ -36,7 +36,7 @@ case $BRANCH in
 
 	edge)
 		declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel.
-		declare -g KERNELBRANCH="tag:v6.11.2"
+		declare -g KERNELBRANCH="tag:v6.11.6"
 		;;
 esac
 
diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc
index ff82fc38dae8..b5cc6103c925 100644
--- a/config/sources/families/include/sunxi_common.inc
+++ b/config/sources/families/include/sunxi_common.inc
@@ -37,7 +37,7 @@ case $BRANCH in
 
 	edge)
 		declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel.
-		declare -g KERNELBRANCH="tag:v6.11.2"
+		declare -g KERNELBRANCH="tag:v6.11.6"
 		;;
 esac
 
diff --git a/patch/kernel/archive/sunxi-6.11/patches.megous/usb-serial-option-add-reset_resume-callback-for-WWAN-devices.patch b/patch/kernel/archive/sunxi-6.11/patches.megous/usb-serial-option-add-reset_resume-callback-for-WWAN-devices.patch
index 896be1efff7b..2df937a8c5a6 100644
--- a/patch/kernel/archive/sunxi-6.11/patches.megous/usb-serial-option-add-reset_resume-callback-for-WWAN-devices.patch
+++ b/patch/kernel/archive/sunxi-6.11/patches.megous/usb-serial-option-add-reset_resume-callback-for-WWAN-devices.patch
@@ -1,4 +1,4 @@
-From 5b647b27a9a1727a43c7e616d0afa20b4c247b33 Mon Sep 17 00:00:00 2001
+From 27d4fc73c42a991fe4daf0731eee913491757cd7 Mon Sep 17 00:00:00 2001
 From: Thomas Thorne <Thomas.Thorne@Net2Edge.com>
 Date: Tue, 20 Sep 2022 20:34:57 -0400
 Subject: usb: serial: option: add 'reset_resume' callback for WWAN devices
@@ -17,10 +17,10 @@ However the rest of the patch is not needed/already upstreamed.
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
-index 176f38750ad5..ec784468f05a 100644
+index 55886b64cadd..df641a38f274 100644
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
-@@ -2404,6 +2404,7 @@ static struct usb_serial_driver option_1port_device = {
+@@ -2412,6 +2412,7 @@ static struct usb_serial_driver option_1port_device = {
  #ifdef CONFIG_PM
  	.suspend           = usb_wwan_suspend,
  	.resume            = usb_wwan_resume,

From 8bc1838ba541f575ad920658cb9d6803566ab302 Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Mon, 4 Nov 2024 23:34:33 +0300
Subject: [PATCH 052/107] sunxi-6.11: Fix broken allwinner,sram dependency on
 h616, h618

For devices running on h616, h618 processors, there is a loss
of temperature interface.
This commit corrects this error.

The discussion is here:
https://forum.armbian.com/topic/46871-sv08-cant-find-thermal-zone-on-6112/
---
 ...lwinner-sram-dependency-on-h616-h618.patch | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 patch/kernel/archive/sunxi-6.11/Fix-broken-allwinner-sram-dependency-on-h616-h618.patch

diff --git a/patch/kernel/archive/sunxi-6.11/Fix-broken-allwinner-sram-dependency-on-h616-h618.patch b/patch/kernel/archive/sunxi-6.11/Fix-broken-allwinner-sram-dependency-on-h616-h618.patch
new file mode 100644
index 000000000000..53ec1044d5f7
--- /dev/null
+++ b/patch/kernel/archive/sunxi-6.11/Fix-broken-allwinner-sram-dependency-on-h616-h618.patch
@@ -0,0 +1,53 @@
+From 44a2030f79e43ec5300d94da2dbd5b7053d62fce Mon Sep 17 00:00:00 2001
+From: "Steinar H. Gunderson" <steinar+kernel@gunderson.no>
+Date: Mon, 4 Nov 2024 15:35:38 +0000
+Subject: Fix broken allwinner,sram dependency on h616, h618
+
+On BigTreeTech CB1, the thermal sensor has an allwinner,sram
+property pointing to <&syscon>. However, Armbian has an out-of-tree
+kernel patch that creates dependencies based on allwinner,sram
+properties, which assumes that they point to sram nodes exactly
+two levels below the syscon node (instead of the syscon itself).
+This manifests itself as the thermal sensor refusing to load with
+a nonsensical error message:
+
+  [   23.775976] platform 5070400.thermal-sensor: deferred probe pending: platform: wait for supplier
+
+Note that it does not say _which_ supplier it is waiting for
+(the message ends in a space and then no supplier). The patch
+was unproblematic in the 5.6 megous patch set, where it was
+introduced, and in 6.6, which is current for Armbian, but in
+6.8, the sun8i-thermal driver got mainlined, with this extra
+property compared to the out-of-tree version we used before
+(since it wants to clear a special bit at 0x300000 instead of
+relying on the firmware to do so before kernel boot).
+
+Fix by being a bit more flexible when we walk up the tree,
+so that we always stop at the syscon node.
+
+Tested on a Sovol SV08, which is CB1-based.
+
+Signed-off-by: Steinar H. Gunderson <steinar+kernel@gunderson.no>
+---
+ drivers/of/property.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/of/property.c b/drivers/of/property.c
+index 6fcfcda9d9ad..f00f2b129df8 100644
+--- a/drivers/of/property.c
++++ b/drivers/of/property.c
+@@ -1370,8 +1370,9 @@ static struct device_node *parse_allwinner_sram(struct device_node *np,
+ 		return NULL;
+ 
+ 	sram_node = of_parse_phandle(np, prop_name, 0);
+-	sram_node = of_get_parent(sram_node);
+-	sram_node = of_get_parent(sram_node);
++	while (sram_node && !of_node_is_type(sram_node, "syscon")) {
++		sram_node = of_get_parent(sram_node);
++	}
+ 
+ 	return sram_node;
+ }
+-- 
+2.35.3
+

From 4c59d31272e18be777669f853d32a2086ce8ac00 Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Mon, 4 Nov 2024 10:22:56 +0800
Subject: [PATCH 053/107] add new board armsom-cm5-rpi-cm4-io

---
 config/boards/armsom-cm5-rpi-cm4-io.csc       |  30 +++
 .../armsom-cm5-rpi-cm4-io-rk3576_defconfig    | 223 ++++++++++++++++++
 2 files changed, 253 insertions(+)
 create mode 100644 config/boards/armsom-cm5-rpi-cm4-io.csc
 create mode 100644 patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-cm5-rpi-cm4-io-rk3576_defconfig

diff --git a/config/boards/armsom-cm5-rpi-cm4-io.csc b/config/boards/armsom-cm5-rpi-cm4-io.csc
new file mode 100644
index 000000000000..b7e30db03b59
--- /dev/null
+++ b/config/boards/armsom-cm5-rpi-cm4-io.csc
@@ -0,0 +1,30 @@
+# Rockchip RK3576 SoC octa core 8-64GB SoC GBe eMMC USB3 NvME WIFI
+BOARD_NAME="ArmSoM CM5 CM4 IO"
+BOARDFAMILY="rk35xx"
+BOOTCONFIG="armsom-cm5-rpi-cm4-io-rk3576_defconfig"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3576-armsom-cm5-rpi-cm4-io.dtb"
+BOOT_SCENARIO="spl-blobs"
+IMAGE_PARTITION_TABLE="gpt"
+BOARD_MAINTAINER=""
+
+function post_family_config_branch_vendor__armsom-cm5-rpi-cm4-io_use_vendor_uboot() {
+        display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
+
+	declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
+	declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
+	declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576"
+	declare -g BOOTDIR="u-boot-${BOARD}"
+	declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
+}
+
+function post_family_tweaks__armsom-cm5-rpi-cm4-io_naming_audios() {
+	display_alert "$BOARD" "Renaming armsom-cm5-rpi-cm4-io audios" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+
+	return 0
+}
diff --git a/patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-cm5-rpi-cm4-io-rk3576_defconfig b/patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-cm5-rpi-cm4-io-rk3576_defconfig
new file mode 100644
index 000000000000..d2205afdfb2f
--- /dev/null
+++ b/patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-cm5-rpi-cm4-io-rk3576_defconfig
@@ -0,0 +1,223 @@
+CONFIG_ARM=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SYS_MALLOC_F_LEN=0x80000
+CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh"
+CONFIG_ROCKCHIP_RK3576=y
+CONFIG_ROCKCHIP_FIT_IMAGE=y
+CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_USING_KERNEL_DTB_V2=y
+CONFIG_ROCKCHIP_FIT_IMAGE_PACK=y
+CONFIG_ROCKCHIP_NEW_IDB=y
+CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_TARGET_EVB_RK3576=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_ARMV8_CRYPTO=y
+CONFIG_DEFAULT_DEVICE_TREE="rk3576-armsom-cm5-io"
+CONFIG_DEBUG_UART=y
+CONFIG_FIT=y
+CONFIG_FIT_IMAGE_POST_PROCESS=y
+CONFIG_FIT_HW_CRYPTO=y
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
+CONFIG_SPL_FIT_HW_CRYPTO=y
+# CONFIG_SPL_SYS_DCACHE_OFF is not set
+CONFIG_BOOTDELAY=0
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
+# CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_ANDROID_BOOTLOADER=y
+CONFIG_ANDROID_AVB=y
+CONFIG_ANDROID_BOOT_IMAGE_HASH=y
+CONFIG_BOARD_RNG_SEED=y
+CONFIG_SPL_BOARD_INIT=y
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
+CONFIG_SPL_SEPARATE_BSS=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x1
+CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_UFS_SUPPORT=y
+CONFIG_SPL_ATF=y
+CONFIG_SPL_AB=y
+CONFIG_FASTBOOT_BUF_ADDR=0x40c00800
+CONFIG_FASTBOOT_BUF_SIZE=0x07000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_DTIMG=y
+# CONFIG_CMD_ELF is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_LZMADEC is not set
+# CONFIG_CMD_UNZIP is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_GPT=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_BOOT_ANDROID=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_SF=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_UFS=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_TFTPPUT=y
+CONFIG_CMD_TFTP_BOOTM=y
+CONFIG_CMD_TFTP_FLASH=y
+# CONFIG_CMD_MISC is not set
+CONFIG_CMD_MTD_BLK=y
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_ISO_PARTITION is not set
+CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_SPL_DTB_MINIMUM=y
+CONFIG_OF_LIVE=y
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_U_BOOT_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+# CONFIG_NET_TFTP_VARS is not set
+CONFIG_REGMAP=y
+CONFIG_SPL_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_SPL_SYSCON=y
+# CONFIG_SARADC_ROCKCHIP is not set
+CONFIG_SARADC_ROCKCHIP_V2=y
+CONFIG_CLK=y
+CONFIG_SPL_CLK=y
+CONFIG_CLK_SCMI=y
+CONFIG_DM_CRYPTO=y
+CONFIG_SPL_DM_CRYPTO=y
+CONFIG_ROCKCHIP_CRYPTO_V2=y
+CONFIG_SPL_ROCKCHIP_CRYPTO_V2=y
+CONFIG_DM_RNG=y
+CONFIG_RNG_ROCKCHIP=y
+CONFIG_SCMI_FIRMWARE=y
+CONFIG_GPIO_HOG=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_ROCKCHIP_GPIO_V2=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_I2C_MUX=y
+CONFIG_DM_KEY=y
+CONFIG_RK8XX_PWRKEY=y
+CONFIG_ADC_KEY=y
+CONFIG_MISC=y
+CONFIG_SPL_MISC=y
+CONFIG_MISC_DECOMPRESS=y
+CONFIG_SPL_MISC_DECOMPRESS=y
+CONFIG_ROCKCHIP_HW_DECOMPRESS=y
+CONFIG_SPL_ROCKCHIP_HW_DECOMPRESS=y
+CONFIG_SPL_ROCKCHIP_SECURE_OTP=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_SDMA=y
+CONFIG_MMC_SDHCI_ROCKCHIP=y
+CONFIG_MTD=y
+CONFIG_MTD_BLK=y
+CONFIG_MTD_DEVICE=y
+CONFIG_MTD_SPI_NAND=y
+CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0x1
+CONFIG_SF_DEFAULT_SPEED=50000000
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_FLASH_MTD=y
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=y
+CONFIG_PHY_ROCKCHIP_USBDP=y
+CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
+CONFIG_DM_FUEL_GAUGE=y
+CONFIG_POWER_FG_CW201X=y
+CONFIG_POWER_FG_CW221X=y
+CONFIG_DM_PMIC=y
+CONFIG_PMIC_RK8XX=y
+CONFIG_DM_POWER_DELIVERY=y
+CONFIG_TYPEC_TCPM=y
+CONFIG_TYPEC_TCPCI=y
+CONFIG_TYPEC_HUSB311=y
+CONFIG_TYPEC_FUSB302=y
+CONFIG_REGULATOR_PWM=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_REGULATOR_RK8XX=y
+CONFIG_CHARGER_BQ25700=y
+CONFIG_CHARGER_BQ25890=y
+CONFIG_CHARGER_SGM41542=y
+CONFIG_DM_CHARGE_DISPLAY=y
+CONFIG_CHARGE_ANIMATION=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_RAM=y
+CONFIG_SPL_RAM=y
+CONFIG_TPL_RAM=y
+CONFIG_DM_RESET=y
+CONFIG_SPL_DM_RESET=y
+CONFIG_SPL_RESET_ROCKCHIP=y
+CONFIG_SCSI=y
+CONFIG_DM_SCSI=y
+CONFIG_BAUDRATE=1500000
+CONFIG_DEBUG_UART_BASE=0x2ad40000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_ROCKCHIP_SFC=y
+CONFIG_SYSRESET=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_GENERIC=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x350e
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_UFS=y
+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
+CONFIG_DRM_ROCKCHIP=y
+CONFIG_DRM_ROCKCHIP_DW_HDMI_QP=y
+CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI2=y
+CONFIG_DRM_ROCKCHIP_DW_DP=y
+CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y
+CONFIG_DRM_ROCKCHIP_RGB=y
+CONFIG_DRM_ROCKCHIP_SAMSUNG_MIPI_DCPHY=y
+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX_HDMI=y
+CONFIG_USE_TINY_PRINTF=y
+CONFIG_LIB_RAND=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_RSA=y
+CONFIG_SPL_RSA=y
+CONFIG_RSA_N_SIZE=0x200
+CONFIG_RSA_E_SIZE=0x10
+CONFIG_RSA_C_SIZE=0x20
+CONFIG_XBC=y
+CONFIG_LZ4=y
+CONFIG_SPL_GZIP=y
+CONFIG_ERRNO_STR=y
+# CONFIG_EFI_LOADER is not set
+CONFIG_AVB_LIBAVB=y
+CONFIG_AVB_LIBAVB_AB=y
+CONFIG_AVB_LIBAVB_ATX=y
+CONFIG_AVB_LIBAVB_USER=y
+CONFIG_RK_AVB_LIBAVB_USER=y
+CONFIG_OPTEE_CLIENT=y
+CONFIG_OPTEE_V2=y
+CONFIG_ROCKCHIP_EARLY_DISTRO_DTB=y
+CONFIG_ROCKCHIP_EARLY_DISTRO_DTB_PATH="/boot/dtb/rockchip/rk3576-armsom-cm5-rpi-cm4-io.dtb"

From 48228f1e498fa181484d4803866d894049cfd04a Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Sun, 8 Sep 2024 19:43:55 +0200
Subject: [PATCH 054/107] `Userspace`: Switch armbian-config to new generation.
 It has very small footprint, thus it will be installed by default

---
 .../artifacts/artifact-armbian-config.sh      |  4 +-
 .../packages/armbian-config-deb.sh            | 40 ++++++++++---------
 lib/functions/main/build-packages.sh          |  4 +-
 lib/functions/rootfs/distro-agnostic.sh       |  4 +-
 4 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/lib/functions/artifacts/artifact-armbian-config.sh b/lib/functions/artifacts/artifact-armbian-config.sh
index 979daee13f55..aa5e03a4c2af 100644
--- a/lib/functions/artifacts/artifact-armbian-config.sh
+++ b/lib/functions/artifacts/artifact-armbian-config.sh
@@ -15,8 +15,8 @@ function artifact_armbian-config_prepare_version() {
 	artifact_version="undetermined"        # outer scope
 	artifact_version_reason="undetermined" # outer scope
 
-	local ARMBIAN_CONFIG_SOURCE="${ARMBIAN_CONFIG_SOURCE:-"https://github.com/armbian/config"}"
-	local ARMBIAN_CONFIG_BRANCH="branch:${ARMBIAN_CONFIG_BRANCH:-"master"}"
+	local ARMBIAN_CONFIG_SOURCE="${ARMBIAN_CONFIG_SOURCE:-"https://github.com/armbian/configng"}"
+	local ARMBIAN_CONFIG_BRANCH="branch:${ARMBIAN_CONFIG_BRANCH:-"main"}"
 
 	debug_var ARMBIAN_CONFIG_SOURCE
 	debug_var ARMBIAN_CONFIG_BRANCH
diff --git a/lib/functions/compilation/packages/armbian-config-deb.sh b/lib/functions/compilation/packages/armbian-config-deb.sh
index 0922cbc26b4a..f2713cbf9676 100644
--- a/lib/functions/compilation/packages/armbian-config-deb.sh
+++ b/lib/functions/compilation/packages/armbian-config-deb.sh
@@ -18,22 +18,26 @@ compile_armbian-config() {
 	declare armbian_config_dir="armbian-config"
 	mkdir -p "${tmp_dir}/${armbian_config_dir}"
 
-	local ARMBIAN_CONFIG_GIT_SOURCE="${ARMBIAN_FIRMWARE_GIT_SOURCE:-"https://github.com/armbian/config"}"
-	local ARMBIAN_CONFIG_GIT_BRANCH="${ARMBIAN_FIRMWARE_GIT_BRANCH:-"master"}"
+	local ARMBIAN_CONFIG_GIT_SOURCE="${ARMBIAN_FIRMWARE_GIT_SOURCE:-"https://github.com/armbian/configng"}"
+	local ARMBIAN_CONFIG_GIT_BRANCH="${ARMBIAN_FIRMWARE_GIT_BRANCH:-"main"}"
 
-	fetch_from_repo "https://github.com/armbian/config" "armbian-config" "branch:master"
 	# this is also not getting any updates
-	fetch_from_repo "https://github.com/dylanaraps/neofetch" "neofetch" "tag:7.1.0"
+	fetch_from_repo "$GITHUB_SOURCE/dylanaraps/neofetch" "neofetch" "tag:7.1.0"
+	fetch_from_repo "$GITHUB_SOURCE/armbian/configng" "armbian-config" "branch:main"
+	fetch_from_repo "$GITHUB_SOURCE/complexorganizations/wireguard-manager" "wireguard-manager" "branch:main"
 
 	# Fetch Armbian config from git.
 	declare fetched_revision
 	do_checkout="no" fetch_from_repo "${ARMBIAN_CONFIG_GIT_SOURCE}" "armbian-config-git" "branch:${ARMBIAN_CONFIG_GIT_BRANCH}"
 	declare -r armbian_firmware_git_sha1="${fetched_revision}"
 
+	# Compile Armbian config
+	${SRC}/cache/sources/armbian-config/tools/config-assemble.sh -p
+
 	# @TODO: move this to where it is actually used; not everyone needs to pull this in
 	fetch_from_repo "$GITHUB_SOURCE/complexorganizations/wireguard-manager" "wireguard-manager" "branch:main"
 
-	mkdir -p "${tmp_dir}/${armbian_config_dir}"/{DEBIAN,usr/bin/,usr/sbin/,usr/lib/armbian-config/}
+	mkdir -p "${tmp_dir}/${armbian_config_dir}"/{DEBIAN,bin/,lib/armbian-config/,usr/bin/,/etc/apt/sources.list.d/}
 
 	cd "${tmp_dir}/${armbian_config_dir}" || exit_with_error "can't change directory"
 
@@ -43,31 +47,29 @@ compile_armbian-config() {
 		Version: ${artifact_version}
 		Architecture: all
 		Maintainer: $MAINTAINER <$MAINTAINERMAIL>
-		Depends: bash, iperf3, psmisc, curl, bc, expect, dialog, pv, zip, debconf-utils, unzip, build-essential, html2text, html2text, dirmngr, software-properties-common, debconf, jq
-		Suggests: libpam-google-authenticator, qrencode, network-manager, sunxi-tools
+		Depends: whiptail, jq, sudo, procps, systemd, iproute2
 		Section: utils
 		Priority: optional
-		Description: Armbian configuration utility
+		Description: Armbian configuration utility - The new generation
 	END
 
 	install -m 755 "${SRC}"/cache/sources/neofetch/neofetch "${tmp_dir}/${armbian_config_dir}"/usr/bin/neofetch
 	cd "${tmp_dir}/${armbian_config_dir}"/usr/bin/ || exit_with_error "Failed to cd to ${tmp_dir}/${armbian_config_dir}/usr/bin/"
 	process_patch_file "${SRC}/patch/misc/add-armbian-neofetch.patch" "applying"
 
+	# 3rd party utilities
 	install -m 755 "${SRC}"/cache/sources/wireguard-manager/wireguard-manager.sh "${tmp_dir}/${armbian_config_dir}"/usr/bin/wireguard-manager
-	install -m 755 "${SRC}"/cache/sources/armbian-config/scripts/tv_grab_file "${tmp_dir}/${armbian_config_dir}"/usr/bin/tv_grab_file
-	install -m 755 "${SRC}"/cache/sources/armbian-config/debian-config "${tmp_dir}/${armbian_config_dir}"/usr/sbin/armbian-config
-	install -m 644 "${SRC}"/cache/sources/armbian-config/debian-config-jobs "${tmp_dir}/${armbian_config_dir}"/usr/lib/armbian-config/jobs.sh
-	install -m 644 "${SRC}"/cache/sources/armbian-config/debian-config-submenu "${tmp_dir}/${armbian_config_dir}"/usr/lib/armbian-config/submenu.sh
-	install -m 644 "${SRC}"/cache/sources/armbian-config/debian-config-functions "${tmp_dir}/${armbian_config_dir}"/usr/lib/armbian-config/functions.sh
-	install -m 644 "${SRC}"/cache/sources/armbian-config/debian-config-functions-network "${tmp_dir}/${armbian_config_dir}"/usr/lib/armbian-config/functions-network.sh
-	install -m 755 "${SRC}"/cache/sources/armbian-config/softy "${tmp_dir}/${armbian_config_dir}"/usr/sbin/softy
-	# fallback to replace armbian-config in BSP
-	ln -sf /usr/sbin/armbian-config "${tmp_dir}/${armbian_config_dir}"/usr/bin/armbian-config
-	ln -sf /usr/sbin/softy "${tmp_dir}/${armbian_config_dir}"/usr/bin/softy
 
-	dpkg_deb_build "${tmp_dir}/${armbian_config_dir}" "armbian-config"
+	# Armbian config parts
+	install -m 755 "${SRC}"/cache/sources/armbian-config/bin/armbian-config "${tmp_dir}/${armbian_config_dir}"/bin/armbian-config
+	cp -R "${SRC}"/cache/sources/armbian-config/lib/armbian-config/ "${tmp_dir}/${armbian_config_dir}"/lib/
 
+	# Add development repository to keep rooling release of this tool
+	cat <<- END > ${tmp_dir}/${armbian_config_dir}/etc/apt/sources.list.d/armbian-config.list
+	deb [signed-by=/usr/share/keyrings/armbian.gpg] https://armbian.github.io/configng stable main
+	END
+
+	dpkg_deb_build "${tmp_dir}/${armbian_config_dir}" "armbian-config"
 	done_with_temp_dir "${cleanup_id}" # changes cwd to "${SRC}" and fires the cleanup function early
 
 }
diff --git a/lib/functions/main/build-packages.sh b/lib/functions/main/build-packages.sh
index e00b64f272e8..f3f0a6fde98b 100644
--- a/lib/functions/main/build-packages.sh
+++ b/lib/functions/main/build-packages.sh
@@ -32,9 +32,7 @@ function determine_artifacts_to_build_for_image() {
 	fi
 
 	if [[ "${PACKAGE_LIST_RM}" != *armbian-config* ]]; then
-		if [[ $BUILD_MINIMAL != yes ]]; then
-			artifacts_to_build+=("armbian-config")
-		fi
+		artifacts_to_build+=("armbian-config")
 	fi
 
 	if [[ "${PACKAGE_LIST_RM}" != *armbian-zsh* ]]; then
diff --git a/lib/functions/rootfs/distro-agnostic.sh b/lib/functions/rootfs/distro-agnostic.sh
index 64b17ea36cdd..273b27182ea0 100644
--- a/lib/functions/rootfs/distro-agnostic.sh
+++ b/lib/functions/rootfs/distro-agnostic.sh
@@ -335,9 +335,7 @@ function install_distribution_agnostic() {
 
 	# install armbian-config
 	if [[ "${PACKAGE_LIST_RM}" != *armbian-config* ]]; then
-		if [[ $BUILD_MINIMAL != yes ]]; then
-			install_artifact_deb_chroot "armbian-config"
-		fi
+		install_artifact_deb_chroot "armbian-config"
 	fi
 
 	# install armbian-zsh

From 4d30a7af6960c70f969730e91726bca6a872d59c Mon Sep 17 00:00:00 2001
From: chainsx <chainsx@outlook.com>
Date: Wed, 6 Nov 2024 14:38:36 +0800
Subject: [PATCH 055/107] cyber-aib-rk3588: add edge kernel support

---
 config/boards/cyber-aib-rk3588.csc            |    2 +-
 .../dt/rk3588-cyber-aib.dts                   | 1104 +++++++++++++++++
 2 files changed, 1105 insertions(+), 1 deletion(-)
 create mode 100644 patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-cyber-aib.dts

diff --git a/config/boards/cyber-aib-rk3588.csc b/config/boards/cyber-aib-rk3588.csc
index 54d4b1af9bba..32e609047eac 100644
--- a/config/boards/cyber-aib-rk3588.csc
+++ b/config/boards/cyber-aib-rk3588.csc
@@ -3,7 +3,7 @@ BOARD_NAME="Cyber Aib RK3588"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
 BOOTCONFIG="rk3588-cyber-aib_defconfig"
-KERNEL_TARGET="vendor"
+KERNEL_TARGET="vendor,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-cyber-aib.dtb"
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-cyber-aib.dts b/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-cyber-aib.dts
new file mode 100644
index 000000000000..aedaf6ee204d
--- /dev/null
+++ b/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-cyber-aib.dts
@@ -0,0 +1,1104 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright (c) 2022 Rockchip Electronics Co., Ltd.
+ * Copyright (c) 2024 Cyber RD Group
+ *
+ * Copyright (c) 2024 Tianling Shen <cnsztl@gmail.com>
+ *
+ * Copyright (c) 2024 chainsx <chainsx@outlook.com>
+ */
+
+/dts-v1/;
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/soc/rockchip,vop2.h>
+#include <dt-bindings/usb/pd.h>
+#include "rk3588.dtsi"
+
+/ {
+	model = "Cyber 3588 AIB";
+	compatible = "cyber,cyber3588-aib", "rockchip,rk3588";
+
+	aliases {
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
+	};
+
+	chosen {
+		stdout-path = "serial2:1500000n8";
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&red_led_pin>, <&green_led_pin>, <&blue_led_pin>;
+
+		status_led: led-0 {
+			color = <LED_COLOR_ID_RED>;
+			function = LED_FUNCTION_STATUS;
+			gpios = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>;
+		};
+
+		led-1 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_STATUS;
+			gpios = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
+		};
+
+		led-2 {
+			color = <LED_COLOR_ID_BLUE>;
+			function = LED_FUNCTION_STATUS;
+			gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	fan: pwm-fan {
+		compatible = "pwm-fan";
+		cooling-levels = <0 50 80 120 160 220>;
+		fan-supply = <&vcc5v0_sys>;
+		pwms = <&pwm1 0 10000 0>;
+		#cooling-cells = <2>;
+	};
+
+	rfkill-wlan {
+		compatible = "rfkill-gpio";
+		label = "rfkill-pcie-wlan";
+		radio-type = "wlan";
+		shutdown-gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;
+	};
+
+	rfkill-wwan {
+		compatible = "rfkill-gpio";
+		label = "rfkill-wwan";
+		radio-type = "wwan";
+		pinctrl-names = "default";
+		pinctrl-0 = <&wwan_disable_h>;
+		reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>;
+		shutdown-gpios = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
+	};
+
+	vcc12v_dcin: vcc12v-dcin-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc12v_dcin";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+	};
+
+	vcc5v0_sys: vcc5v0-sys-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc12v_dcin>;
+	};
+
+	/* pi6c pcie clock generator */
+	vcc3v3_pi6c_03: vcc3v3-pi6c-03-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pcie_power_h>;
+		regulator-name = "vcc3v3_pi6c_03";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc5v0_sys>;
+        };
+
+	/* actually fed by vcc5v0_sys, dependent on pi6c clock generator */
+	vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc3v3_pcie2x1l0";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		regulator-always-on;
+		vin-supply = <&vcc3v3_pi6c_03>;
+	};
+
+	vcc3v3_pcie2x1l2: vcc3v3-pcie2x1l2-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc3v3_pcie2x1l2";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		regulator-always-on;
+		vin-supply = <&vcc5v0_sys>;
+	};
+
+	/* actually fed by vcc5v0_sys, dependent on pi6c clock generator */
+	vcc3v3_pcie30: vcc3v3-pcie30-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc3v3_pcie30";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		regulator-always-on;
+		vin-supply = <&vcc3v3_pi6c_03>;
+	};
+
+	vcc3v3_switch: vcc3v3-switch-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&phy_pwr_en>;
+		regulator-name = "vcc3v3_switch";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		regulator-always-on;
+		vin-supply = <&vcc12v_dcin>;
+	};
+
+	vcc3v3_wwan: vcc3v3-wwan-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&wwan_power_h>;
+		regulator-name = "vcc3v3_wwan";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		regulator-always-on;
+		vin-supply = <&vcc3v3_pcie30>;
+	};
+
+	vcc5v0_host: vcc5v0-host-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_host";
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc5v0_sys>;
+	};
+
+	vcc5v0_sata: vcc5v0-sata-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&sata_pwr_en>;
+		regulator-name = "vcc5v0_sata";
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc12v_dcin>;
+	};
+
+	vcc5v0_typec: vcc5v0-typec-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&vcc5v0_otg_en>;
+		regulator-name = "vcc5v0_typec";
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc5v0_sys>;
+	};
+
+	vcc_1v1_nldo_s3: vcc-1v1-nldo-s3 {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_1v1_nldo_s3";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <1100000>;
+		regulator-max-microvolt = <1100000>;
+		vin-supply = <&vcc5v0_sys>;
+	};
+};
+
+&combphy0_ps {
+	status = "okay";
+};
+
+&combphy1_ps {
+	status = "okay";
+};
+
+&combphy2_psu {
+	status = "okay";
+};
+
+&cpu_b0 {
+	cpu-supply = <&vdd_cpu_big0_s0>;
+};
+
+&cpu_b1 {
+	cpu-supply = <&vdd_cpu_big0_s0>;
+};
+
+&cpu_b2 {
+	cpu-supply = <&vdd_cpu_big1_s0>;
+};
+
+&cpu_b3 {
+	cpu-supply = <&vdd_cpu_big1_s0>;
+};
+
+&cpu_l0 {
+	cpu-supply = <&vdd_cpu_lit_s0>;
+};
+
+&cpu_l1 {
+	cpu-supply = <&vdd_cpu_lit_s0>;
+};
+
+&cpu_l2 {
+	cpu-supply = <&vdd_cpu_lit_s0>;
+};
+
+&cpu_l3 {
+	cpu-supply = <&vdd_cpu_lit_s0>;
+};
+
+&gmac1 {
+	clock_in_out = "output";
+	phy-mode = "rgmii-rxid";
+	phy-supply = <&vcc3v3_switch>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&gmac1_miim
+		     &gmac1_tx_bus2
+		     &gmac1_rx_bus2
+		     &gmac1_rgmii_clk
+		     &gmac1_rgmii_bus>;
+	tx_delay = <0x42>;
+	/* RK3588 GMAC is broken currently */
+	status = "disabled";
+
+	fixed-link {
+		speed = <1000>;
+		full-duplex;
+	};
+};
+
+&gpu {
+	mali-supply = <&vdd_gpu_s0>;
+	status = "okay";
+};
+
+&display_subsystem {
+	clocks = <&hdptxphy_hdmi0>;
+	clock-names = "hdmi0_phy_pll";
+};
+
+&hdmi0 {
+	status = "okay";
+};
+
+&hdmi0_in {
+	hdmi0_in_vp0: endpoint {
+		remote-endpoint = <&vp0_out_hdmi0>;
+	};
+};
+
+&hdptxphy_hdmi0 {
+	status = "okay";
+};
+
+&i2c0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c0m2_xfer>;
+	status = "okay";
+
+	vdd_cpu_big0_s0: regulator@42 {
+		compatible = "rockchip,rk8602";
+		reg = <0x42>;
+		fcs,suspend-voltage-selector = <1>;
+		regulator-name = "vdd_cpu_big0_s0";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <550000>;
+		regulator-max-microvolt = <1050000>;
+		regulator-ramp-delay = <2300>;
+		vin-supply = <&vcc5v0_sys>;
+
+		regulator-state-mem {
+			regulator-off-in-suspend;
+		};
+	};
+
+	vdd_cpu_big1_s0: regulator@43 {
+		compatible = "rockchip,rk8603", "rockchip,rk8602";
+		reg = <0x43>;
+		fcs,suspend-voltage-selector = <1>;
+		regulator-name = "vdd_cpu_big1_s0";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <550000>;
+		regulator-max-microvolt = <1050000>;
+		regulator-ramp-delay = <2300>;
+		vin-supply = <&vcc5v0_sys>;
+
+		regulator-state-mem {
+			regulator-off-in-suspend;
+		};
+	};
+};
+
+&i2c1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c1m2_xfer>;
+	status = "okay";
+
+	vdd_npu_s0: regulator@42 {
+		compatible = "rockchip,rk8602";
+		reg = <0x42>;
+		fcs,suspend-voltage-selector = <1>;
+		regulator-name = "vdd_npu_s0";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <550000>;
+		regulator-max-microvolt = <950000>;
+		regulator-ramp-delay = <2300>;
+		vin-supply = <&vcc5v0_sys>;
+
+		regulator-state-mem {
+			regulator-off-in-suspend;
+		};
+	};
+};
+
+&i2c2 {
+	status = "okay";
+};
+
+&i2c6 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c6m0_xfer>;
+	status = "okay";
+
+	usbc0: usb-typec@22 {
+		compatible = "fcs,fusb302";
+		reg = <0x22>;
+		interrupt-parent = <&gpio0>;
+		interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&usbc0_int>;
+		vbus-supply = <&vcc5v0_typec>;
+		status = "okay";
+
+		usb_con: connector {
+			compatible = "usb-c-connector";
+			label = "USB-C";
+			data-role = "dual";
+			op-sink-microwatt = <1000000>;
+			power-role = "dual";
+			sink-pdos =
+				<PDO_FIXED(5000, 1000, PDO_FIXED_USB_COMM)>;
+			source-pdos =
+				<PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
+			try-power-role = "source";
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				port@0 {
+					reg = <0>;
+					usbc0_orien_sw: endpoint {
+						remote-endpoint = <&usbdp_phy0_orientation_switch>;
+					};
+				};
+
+				port@1 {
+					reg = <1>;
+					usbc0_role_sw: endpoint {
+						remote-endpoint = <&dwc3_0_role_switch>;
+					};
+				};
+
+				port@2 {
+					reg = <2>;
+					dp_altmode_mux: endpoint {
+						remote-endpoint = <&usbdp_phy0_dp_altmode_mux>;
+					};
+				};
+			};
+		};
+	};
+};
+
+&i2c7 {
+	status = "okay";
+};
+
+&mdio1 {
+	switch@1d {
+		compatible = "realtek,rtl8365mb";
+		reg = <29>;
+		reset-gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_LOW>;
+
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+				label = "lan2";
+			};
+
+			port@1 {
+				reg = <1>;
+				label = "lan3";
+			};
+
+			port@2 {
+				reg = <2>;
+				label = "lan4";
+			};
+
+			port@3 {
+				reg = <3>;
+				label = "lan5";
+			};
+
+			port@4 {
+				reg = <4>;
+				label = "lan6";
+			};
+
+			port@7 {
+				reg = <7>;
+				ethernet = <&gmac1>;
+				phy-mode = "rgmii";
+
+				fixed-link {
+					speed = <1000>;
+					full-duplex;
+				};
+			};
+		};
+	};
+};
+
+/* M.2 M-Key */
+&pcie2x1l0 {
+	max-link-speed = <3>;
+	phys = <&pcie30phy>;
+	reset-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
+	vpcie3v3-supply = <&vcc3v3_pcie2x1l0>;
+	status = "okay";
+};
+
+/* Right 2.5 GbE port */
+&pcie2x1l1 {
+	max-link-speed = <3>;
+	phys = <&pcie30phy>;
+	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
+	vpcie3v3-supply = <&vcc3v3_pcie30>;
+	status = "okay";
+
+	pcie@0,0 {
+		reg = <0x00300000 0 0 0 0>;
+		#address-cells = <3>;
+		#size-cells = <2>;
+
+		rtl8125_0: pcie@30,0 {
+			compatible = "pci10ec,8125";
+			reg = <0x000000 0 0 0 0>;
+
+			label = "lan1";
+			realtek,led-data = <0x0 0x0 0x200 0x2b>;
+		};
+	};
+};
+
+/* Left 2.5 GbE port */
+&pcie2x1l2 {
+	reset-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
+	vpcie3v3-supply = <&vcc3v3_pcie2x1l2>;
+	status = "okay";
+
+	pcie@0,0 {
+		reg = <0x00400000 0 0 0 0>;
+		#address-cells = <3>;
+		#size-cells = <2>;
+
+		rtl8125_1: pcie@40,0 {
+			compatible = "pci10ec,8125";
+			reg = <0x000000 0 0 0 0>;
+
+			label = "wan";
+			realtek,led-data = <0x0 0x0 0x200 0x2b>;
+		};
+	};
+};
+
+&pcie30phy {
+	data-lanes = <1 3 2 4>;
+	status = "okay";
+};
+
+/* M.2 E-key */
+&pcie3x4 {
+	max-link-speed = <3>;
+	num-lanes = <1>;
+	reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
+	vpcie3v3-supply = <&vcc3v3_pcie30>;
+	status = "okay";
+};
+
+/* M.2 B-key */
+&pcie3x2 {
+	max-link-speed = <3>;
+	num-lanes = <1>;
+	reset-gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;
+	vpcie3v3-supply = <&vcc3v3_wwan>;
+	status = "okay";
+};
+
+&pinctrl {
+	gpio-leds {
+		red_led_pin: red-led-pin {
+			rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		green_led_pin: green-led-pin {
+			rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		blue_led_pin: blue-led-pin {
+			rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	gmac {
+		phy_pwr_en: phy-pwr-en {
+			rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+	pcie {
+		pcie_power_h: pcie-power-h {
+			rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		wwan_power_h: wwan-power-h {
+			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		wwan_disable_h: wwan-disable-h {
+			rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+	};
+
+	sata {
+		sata_pwr_en: sata-pwr-en {
+			rockchip,pins = <4 RK_PC2 RK_FUNC_GPIO &pcfg_output_high>;
+		};
+	};
+
+	usb {
+		usbc0_int: usbc0-int {
+			rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		vcc5v0_otg_en: vcc5v0-otg-en {
+			rockchip,pins = <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+	};
+};
+
+&pwm1 {
+	pinctrl-names = "active";
+	pinctrl-0 = <&pwm1m1_pins>;
+	status = "okay";
+};
+
+&saradc {
+	vref-supply = <&avcc_1v8_s0>;
+	status = "okay";
+};
+
+&sata1 {
+	ahci-supply = <&vcc5v0_sata>;
+	status = "okay";
+};
+
+&sdhci {
+	bus-width = <8>;
+	cap-mmc-highspeed;
+	mmc-hs400-1_8v;
+	mmc-hs400-enhanced-strobe;
+	no-sdio;
+	no-sd;
+	non-removable;
+	status = "okay";
+};
+
+&sdmmc {
+	bus-width = <4>;
+	cap-mmc-highspeed;
+	cap-sd-highspeed;
+	disable-wp;
+	no-sdio;
+	no-mmc;
+	sd-uhs-sdr50;
+	vmmc-supply = <&vcc_3v3_s3>;
+	vqmmc-supply = <&vccio_sd_s0>;
+	status = "okay";
+};
+
+&spi2 {
+	assigned-clocks = <&cru CLK_SPI2>;
+	assigned-clock-rates = <200000000>;
+	num-cs = <1>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>;
+	status = "okay";
+
+	pmic@0 {
+		compatible = "rockchip,rk806";
+		spi-max-frequency = <1000000>;
+		reg = <0x0>;
+
+		interrupt-parent = <&gpio0>;
+		interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>,
+			    <&rk806_dvs2_null>, <&rk806_dvs3_null>;
+
+		system-power-controller;
+
+		vcc1-supply = <&vcc5v0_sys>;
+		vcc2-supply = <&vcc5v0_sys>;
+		vcc3-supply = <&vcc5v0_sys>;
+		vcc4-supply = <&vcc5v0_sys>;
+		vcc5-supply = <&vcc5v0_sys>;
+		vcc6-supply = <&vcc5v0_sys>;
+		vcc7-supply = <&vcc5v0_sys>;
+		vcc8-supply = <&vcc5v0_sys>;
+		vcc9-supply = <&vcc5v0_sys>;
+		vcc10-supply = <&vcc5v0_sys>;
+		vcc11-supply = <&vcc_2v0_pldo_s3>;
+		vcc12-supply = <&vcc5v0_sys>;
+		vcc13-supply = <&vcc_1v1_nldo_s3>;
+		vcc14-supply = <&vcc_1v1_nldo_s3>;
+		vcca-supply = <&vcc5v0_sys>;
+
+		gpio-controller;
+		#gpio-cells = <2>;
+
+		rk806_dvs1_null: dvs1-null-pins {
+			pins = "gpio_pwrctrl1";
+			function = "pin_fun0";
+		};
+
+		rk806_dvs2_null: dvs2-null-pins {
+			pins = "gpio_pwrctrl2";
+			function = "pin_fun0";
+		};
+
+		rk806_dvs3_null: dvs3-null-pins {
+			pins = "gpio_pwrctrl3";
+			function = "pin_fun0";
+		};
+
+		regulators {
+			vdd_gpu_s0: dcdc-reg1 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <550000>;
+				regulator-max-microvolt = <950000>;
+				regulator-ramp-delay = <12500>;
+				regulator-name = "vdd_gpu_s0";
+				regulator-enable-ramp-delay = <400>;
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdd_cpu_lit_s0: dcdc-reg2 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <550000>;
+				regulator-max-microvolt = <950000>;
+				regulator-ramp-delay = <12500>;
+				regulator-name = "vdd_cpu_lit_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdd_log_s0: dcdc-reg3 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <675000>;
+				regulator-max-microvolt = <750000>;
+				regulator-ramp-delay = <12500>;
+				regulator-name = "vdd_log_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+					regulator-suspend-microvolt = <750000>;
+				};
+			};
+
+			vdd_vdenc_s0: dcdc-reg4 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <550000>;
+				regulator-max-microvolt = <950000>;
+				regulator-ramp-delay = <12500>;
+				regulator-name = "vdd_vdenc_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdd_ddr_s0: dcdc-reg5 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <675000>;
+				regulator-max-microvolt = <900000>;
+				regulator-ramp-delay = <12500>;
+				regulator-name = "vdd_ddr_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+					regulator-suspend-microvolt = <850000>;
+				};
+			};
+
+			vdd2_ddr_s3: dcdc-reg6 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-name = "vdd2_ddr_s3";
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+
+			vcc_2v0_pldo_s3: dcdc-reg7 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <2000000>;
+				regulator-max-microvolt = <2000000>;
+				regulator-ramp-delay = <12500>;
+				regulator-name = "vdd_2v0_pldo_s3";
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <2000000>;
+				};
+			};
+
+			vcc_3v3_s3: dcdc-reg8 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc_3v3_s3";
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <3300000>;
+				};
+			};
+
+			vddq_ddr_s0: dcdc-reg9 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-name = "vddq_ddr_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcc_1v8_s3: dcdc-reg10 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc_1v8_s3";
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			avcc_1v8_s0: pldo-reg1 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "avcc_1v8_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcc_1v8_s0: pldo-reg2 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc_1v8_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			avdd_1v2_s0: pldo-reg3 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1200000>;
+				regulator-max-microvolt = <1200000>;
+				regulator-name = "avdd_1v2_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcc_3v3_s0: pldo-reg4 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-ramp-delay = <12500>;
+				regulator-name = "vcc_3v3_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vccio_sd_s0: pldo-reg5 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-ramp-delay = <12500>;
+				regulator-name = "vccio_sd_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			pldo6_s3: pldo-reg6 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "pldo6_s3";
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vdd_0v75_s3: nldo-reg1 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <750000>;
+				regulator-max-microvolt = <750000>;
+				regulator-name = "vdd_0v75_s3";
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <750000>;
+				};
+			};
+
+			vdd_ddr_pll_s0: nldo-reg2 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <850000>;
+				regulator-max-microvolt = <850000>;
+				regulator-name = "vdd_ddr_pll_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+					regulator-suspend-microvolt = <850000>;
+				};
+			};
+
+			avdd_0v75_s0: nldo-reg3 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <750000>;
+				regulator-max-microvolt = <750000>;
+				regulator-name = "avdd_0v75_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdd_0v85_s0: nldo-reg4 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <850000>;
+				regulator-max-microvolt = <850000>;
+				regulator-name = "vdd_0v85_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdd_0v75_s0: nldo-reg5 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <750000>;
+				regulator-max-microvolt = <750000>;
+				regulator-name = "vdd_0v75_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+		};
+	};
+};
+
+&tsadc {
+	status = "okay";
+};
+
+&u2phy0 {
+	status = "okay";
+};
+
+&u2phy0_otg {
+	status = "okay";
+};
+
+&u2phy1 {
+	status = "okay";
+};
+
+&u2phy1_otg {
+	status = "okay";
+};
+
+&u2phy2 {
+	status = "okay";
+};
+
+&u2phy2_host {
+	status = "okay";
+};
+
+&u2phy3 {
+	status = "okay";
+};
+
+&u2phy3_host {
+	status = "okay";
+};
+
+&uart2 {
+	pinctrl-0 = <&uart2m0_xfer>;
+	status = "okay";
+};
+
+&usbdp_phy0 {
+	mode-switch;
+	orientation-switch;
+	sbu1-dc-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>;
+	sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
+	status = "okay";
+
+	port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		usbdp_phy0_orientation_switch: endpoint@0 {
+			reg = <0>;
+			remote-endpoint = <&usbc0_orien_sw>;
+		};
+
+		usbdp_phy0_dp_altmode_mux: endpoint@1 {
+			reg = <1>;
+			remote-endpoint = <&dp_altmode_mux>;
+		};
+	};
+};
+
+&usbdp_phy1 {
+	status = "okay";
+};
+
+&usb_host0_ehci {
+	status = "okay";
+};
+
+&usb_host0_ohci {
+	status = "okay";
+};
+
+&usb_host0_xhci {
+	usb-role-switch;
+	status = "okay";
+
+	port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		dwc3_0_role_switch: endpoint@0 {
+			reg = <0>;
+			remote-endpoint = <&usbc0_role_sw>;
+		};
+	};
+};
+
+&usb_host1_ehci {
+	status = "okay";
+};
+
+&usb_host1_ohci {
+	status = "okay";
+};
+
+&usb_host1_xhci {
+	dr_mode = "host";
+	status = "okay";
+};
+
+&usb_host2_xhci {
+	status = "okay";
+};
+
+&vop_mmu {
+	status = "okay";
+};
+
+&vop {
+	status = "okay";
+};
+
+&vp0 {
+	vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
+		reg = <ROCKCHIP_VOP2_EP_HDMI0>;
+		remote-endpoint = <&hdmi0_in_vp0>;
+	};
+};
\ No newline at end of file

From 0397a2492ddd7f87d3ab0a7875f1ec8346266ae0 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Thu, 7 Nov 2024 08:53:52 +0100
Subject: [PATCH 056/107] MOTD: declutter list of commands in motd. Everything
 starts with armbian-config

---
 packages/bsp/common/etc/update-motd.d/41-commands | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/bsp/common/etc/update-motd.d/41-commands b/packages/bsp/common/etc/update-motd.d/41-commands
index 1ba43c57beb2..b1c4f2f8aef9 100755
--- a/packages/bsp/common/etc/update-motd.d/41-commands
+++ b/packages/bsp/common/etc/update-motd.d/41-commands
@@ -21,9 +21,8 @@ done
 # text, sudo / without, command, condition
 # condition can be fairly complex
 list=(
-    "System config","sudo ","armbian-config","true"
-    "System monitor","","htop","true"
-    "Installer","","armbian-install","! grep -q \"INSTALLED=true\" /etc/armbian-image-release 2> /dev/null && ((($(date +%s) - $(stat -c +%X /etc/armbian-image-release 2> /dev/null)) < 86400))"
+    "Configuration","","armbian-config","true"
+    "Monitoring","","htop","true"
 )
 
 # verify if command exits on the system

From 0afd94a84b9c71506ca0cf4ba6faeb8f9ccbbeef Mon Sep 17 00:00:00 2001
From: Werner <EvilOlaf@users.noreply.github.com>
Date: Sat, 9 Nov 2024 21:02:50 +0100
Subject: [PATCH 057/107] Deprecated `WIREGUARD` once and for all (#7452)

* remove wireguard

* remove wireguard

* remove wireguard

* Update armsom-sige1.csc

* Update hinlink-hnas.csc

* Update hinlink-h28k.csc

* Update hinlink-h66k.csc

* Update mangopi-m28k.csc

* Update hinlink-h68k.csc
---
 config/boards/armsom-sige1.csc             | 1 -
 config/boards/hinlink-h28k.csc             | 1 -
 config/boards/hinlink-h66k.csc             | 1 -
 config/boards/hinlink-h68k.csc             | 1 -
 config/boards/hinlink-hnas.csc             | 1 -
 config/boards/hinlink-ht2.csc              | 1 -
 config/boards/mangopi-m28k.csc             | 1 -
 lib/functions/configuration/main-config.sh | 1 -
 lib/functions/rootfs/distro-agnostic.sh    | 5 -----
 9 files changed, 13 deletions(-)

diff --git a/config/boards/armsom-sige1.csc b/config/boards/armsom-sige1.csc
index a663cedd56fc..5de474efa247 100644
--- a/config/boards/armsom-sige1.csc
+++ b/config/boards/armsom-sige1.csc
@@ -8,5 +8,4 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-armsom-sige1.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
diff --git a/config/boards/hinlink-h28k.csc b/config/boards/hinlink-h28k.csc
index 665c44257f28..24557d42c469 100644
--- a/config/boards/hinlink-h28k.csc
+++ b/config/boards/hinlink-h28k.csc
@@ -8,7 +8,6 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-hinlink-h28k.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
diff --git a/config/boards/hinlink-h66k.csc b/config/boards/hinlink-h66k.csc
index 48e0a11a4968..94ebf1b65f24 100644
--- a/config/boards/hinlink-h66k.csc
+++ b/config/boards/hinlink-h66k.csc
@@ -8,6 +8,5 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-h66k.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="fat"
diff --git a/config/boards/hinlink-h68k.csc b/config/boards/hinlink-h68k.csc
index eeb374c9b833..8c874cc224c8 100644
--- a/config/boards/hinlink-h68k.csc
+++ b/config/boards/hinlink-h68k.csc
@@ -8,6 +8,5 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-h68k.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="fat"
diff --git a/config/boards/hinlink-hnas.csc b/config/boards/hinlink-hnas.csc
index 1d32a61310f8..5daae3e398b7 100644
--- a/config/boards/hinlink-hnas.csc
+++ b/config/boards/hinlink-hnas.csc
@@ -8,6 +8,5 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-hnas.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="fat"
diff --git a/config/boards/hinlink-ht2.csc b/config/boards/hinlink-ht2.csc
index 4d1fada107ba..fa9cd94ee9be 100644
--- a/config/boards/hinlink-ht2.csc
+++ b/config/boards/hinlink-ht2.csc
@@ -8,6 +8,5 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-hinlink-ht2.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="ext4"
diff --git a/config/boards/mangopi-m28k.csc b/config/boards/mangopi-m28k.csc
index 429a1e0f8c1d..8821cf03d93d 100644
--- a/config/boards/mangopi-m28k.csc
+++ b/config/boards/mangopi-m28k.csc
@@ -8,6 +8,5 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-mangopi-m28k.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="ext4"
diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh
index 2833ce4f8d18..eeeef1cc7d10 100644
--- a/lib/functions/configuration/main-config.sh
+++ b/lib/functions/configuration/main-config.sh
@@ -267,7 +267,6 @@ function do_main_configuration() {
 	[[ -z $OFFSET ]] && OFFSET=4 # offset to 1st partition (we use 4MiB boundaries by default)
 	[[ -z $ARCH ]] && ARCH=arm64 # makes little sense to default to anything... # @TODO: remove, but check_config_userspace_release_and_desktop requires it
 	ATF_COMPILE=yes              # @TODO: move to armhf/arm64
-	[[ -z $WIREGUARD ]] && WIREGUARD="yes"
 	[[ -z $EXTRAWIFI ]] && EXTRAWIFI="yes"
 	[[ -z $PLYMOUTH ]] && PLYMOUTH="yes"
 	[[ -z $AUFS ]] && AUFS="yes"
diff --git a/lib/functions/rootfs/distro-agnostic.sh b/lib/functions/rootfs/distro-agnostic.sh
index 273b27182ea0..782c5b155a44 100644
--- a/lib/functions/rootfs/distro-agnostic.sh
+++ b/lib/functions/rootfs/distro-agnostic.sh
@@ -352,11 +352,6 @@ function install_distribution_agnostic() {
 		chroot_sdcard_apt_get_remove --auto-remove plymouth
 	fi
 
-	# install wireguard tools
-	if [[ $WIREGUARD == yes ]]; then
-		install_deb_chroot "wireguard-tools" "remote" # @TODO: move this to some image pkg list in config
-	fi
-
 	# freeze armbian packages
 	if [[ "${BSPFREEZE:-"no"}" == yes ]]; then
 		display_alert "Freezing Armbian packages" "$BOARD" "info"

From fb261bb49b3f4b3f59a6c9f1637ccfb062b76d22 Mon Sep 17 00:00:00 2001
From: Werner <EvilOlaf@users.noreply.github.com>
Date: Sat, 9 Nov 2024 17:01:54 +0100
Subject: [PATCH 058/107] fix `iostat` on `MINIMAL`

`MINIMAL` do not have `iostat` so suppress the error occurring when doing `armbianmonitor -u` on such systems.
---
 packages/bsp/common/usr/bin/armbianmonitor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bsp/common/usr/bin/armbianmonitor b/packages/bsp/common/usr/bin/armbianmonitor
index 94e65d42567b..898637ea6c5f 100755
--- a/packages/bsp/common/usr/bin/armbianmonitor
+++ b/packages/bsp/common/usr/bin/armbianmonitor
@@ -973,7 +973,7 @@ CollectSupportInfo() {
 		cat /etc/resolv.conf
 	)" ||
 		echo -e "\n### resolv.conf does not exist or readable"
-	echo -e "\n### Current sysinfo:\n\n$(iostat -p ALL | grep -v "^loop")\n\n$(vmstat -w)\n\n$(free -h)\n\n$(zramctl 2> /dev/null)\n\n$(uptime)\n\n$(dmesg | tail -n 250)"
+	echo -e "\n### Current sysinfo:\n\n$(command -v iostat >/dev/null 2>&1 && iostat -p ALL | grep -v "^loop")\n\n$(vmstat -w)\n\n$(free -h)\n\n$(zramctl 2> /dev/null)\n\n$(uptime)\n\n$(dmesg | tail -n 250)"
 	echo -e "\n"
 	[[ "$(id -u)" -eq "0" ]] && for sysfsnode in /proc/sys/vm/*; do sysctl $(echo ${sysfsnode} | sed 's|/proc/sys/vm/|vm.|'); done
 	echo -e "\n### interrupts:\n$(cat /proc/interrupts)"

From 266e2c569d642711f7b6edfe11e88679f4267677 Mon Sep 17 00:00:00 2001
From: Martin Schmiedel <Martin.Schmiedel@tq-group.com>
Date: Mon, 4 Nov 2024 10:18:35 +0100
Subject: [PATCH 059/107] tqma-current.config: update and add configs for
 nftables

- enable configs needed for nftables basic rules

Signed-off-by: Martin Schmiedel <Martin.Schmiedel@tq-group.com>
---
 config/kernel/linux-tqma-current.config | 115 +++++++++++++++++++-----
 1 file changed, 93 insertions(+), 22 deletions(-)

diff --git a/config/kernel/linux-tqma-current.config b/config/kernel/linux-tqma-current.config
index d4dec9432d83..f07840b878bf 100644
--- a/config/kernel/linux-tqma-current.config
+++ b/config/kernel/linux-tqma-current.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.5 Kernel Configuration
+# Linux/arm64 6.11.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
 CONFIG_CC_IS_GCC=y
@@ -1043,13 +1043,26 @@ CONFIG_UNIX=y
 CONFIG_AF_UNIX_OOB=y
 # CONFIG_UNIX_DIAG is not set
 # CONFIG_TLS is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
 # CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_INTERFACE is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_AH=m
+CONFIG_XFRM_ESP=m
+CONFIG_XFRM_IPCOMP=m
 # CONFIG_NET_KEY is not set
 # CONFIG_XDP_SOCKETS is not set
 CONFIG_NET_HANDSHAKE=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
@@ -1058,14 +1071,17 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_NET_IPGRE_DEMUX is not set
 CONFIG_NET_IP_TUNNEL=m
 # CONFIG_IP_MROUTE is not set
-# CONFIG_SYN_COOKIES is not set
+CONFIG_SYN_COOKIES=y
 # CONFIG_NET_IPVTI is not set
 # CONFIG_NET_FOU is not set
 # CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+# CONFIG_INET_ESP_OFFLOAD is not set
+# CONFIG_INET_ESPINTCP is not set
+CONFIG_INET_IPCOMP=m
 CONFIG_INET_TABLE_PERTURB_ORDER=16
+CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
@@ -1080,16 +1096,21 @@ CONFIG_IPV6=m
 # CONFIG_IPV6_ROUTER_PREF is not set
 # CONFIG_IPV6_OPTIMISTIC_DAD is not set
 # CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
+CONFIG_INET6_ESP=m
+# CONFIG_INET6_ESP_OFFLOAD is not set
+# CONFIG_INET6_ESPINTCP is not set
+CONFIG_INET6_IPCOMP=m
 # CONFIG_IPV6_MIP6 is not set
 # CONFIG_IPV6_ILA is not set
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
 # CONFIG_IPV6_VTI is not set
 CONFIG_IPV6_SIT=m
 # CONFIG_IPV6_SIT_6RD is not set
 CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
+CONFIG_IPV6_MULTIPLE_TABLES=y
+# CONFIG_IPV6_SUBTREES is not set
 # CONFIG_IPV6_MROUTE is not set
 # CONFIG_IPV6_SEG6_LWTUNNEL is not set
 # CONFIG_IPV6_SEG6_HMAC is not set
@@ -1110,14 +1131,18 @@ CONFIG_BRIDGE_NETFILTER=m
 CONFIG_NETFILTER_INGRESS=y
 CONFIG_NETFILTER_EGRESS=y
 CONFIG_NETFILTER_SKIP_EGRESS=y
+CONFIG_NETFILTER_NETLINK=y
 CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
 CONFIG_NETFILTER_BPF_LINK=y
-# CONFIG_NETFILTER_NETLINK_ACCT is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_OSF is not set
+# CONFIG_NETFILTER_NETLINK_HOOK is not set
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_NETLINK_OSF=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_LOG_SYSLOG=m
+CONFIG_NETFILTER_CONNCOUNT=m
 # CONFIG_NF_CONNTRACK_MARK is not set
 # CONFIG_NF_CONNTRACK_ZONES is not set
 # CONFIG_NF_CONNTRACK_PROCFS is not set
@@ -1140,8 +1165,37 @@ CONFIG_NF_CT_PROTO_UDPLITE=y
 # CONFIG_NF_CONNTRACK_TFTP is not set
 # CONFIG_NF_CT_NETLINK is not set
 CONFIG_NF_NAT=m
+CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NF_NAT_MASQUERADE=y
-# CONFIG_NF_TABLES is not set
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=y
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+# CONFIG_NF_FLOW_TABLE is not set
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XTABLES_COMPAT=y
 
@@ -1158,6 +1212,7 @@ CONFIG_NETFILTER_XT_MARK=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
 # CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_CT is not set
 # CONFIG_NETFILTER_XT_TARGET_DSCP is not set
 # CONFIG_NETFILTER_XT_TARGET_HL is not set
 # CONFIG_NETFILTER_XT_TARGET_HMARK is not set
@@ -1211,6 +1266,7 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=m
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
 # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
 # CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
 # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
@@ -1280,8 +1336,13 @@ CONFIG_IP_VS_MH_TAB_INDEX=12
 #
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_IP_NF_IPTABLES_LEGACY=m
-# CONFIG_NF_SOCKET_IPV4 is not set
-# CONFIG_NF_TPROXY_IPV4 is not set
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+# CONFIG_NFT_DUP_IPV4 is not set
+# CONFIG_NFT_FIB_IPV4 is not set
+CONFIG_NF_TABLES_ARP=y
 # CONFIG_NF_DUP_IPV4 is not set
 # CONFIG_NF_LOG_ARP is not set
 # CONFIG_NF_LOG_IPV4 is not set
@@ -1293,7 +1354,7 @@ CONFIG_IP_NF_IPTABLES=m
 # CONFIG_IP_NF_MATCH_TTL is not set
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
-# CONFIG_IP_NF_TARGET_SYNPROXY is not set
+CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_NAT=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 # CONFIG_IP_NF_TARGET_NETMAP is not set
@@ -1303,15 +1364,21 @@ CONFIG_IP_NF_MANGLE=m
 # CONFIG_IP_NF_TARGET_TTL is not set
 # CONFIG_IP_NF_RAW is not set
 # CONFIG_IP_NF_SECURITY is not set
+CONFIG_NFT_COMPAT_ARP=m
 # CONFIG_IP_NF_ARPFILTER is not set
+# CONFIG_IP_NF_ARP_MANGLE is not set
 # end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
 #
 CONFIG_IP6_NF_IPTABLES_LEGACY=m
-# CONFIG_NF_SOCKET_IPV6 is not set
-# CONFIG_NF_TPROXY_IPV6 is not set
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+# CONFIG_NFT_DUP_IPV6 is not set
+# CONFIG_NFT_FIB_IPV6 is not set
 # CONFIG_NF_DUP_IPV6 is not set
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
@@ -1329,7 +1396,7 @@ CONFIG_IP6_NF_IPTABLES=m
 # CONFIG_IP6_NF_TARGET_HL is not set
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
-# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
 CONFIG_IP6_NF_MANGLE=m
 # CONFIG_IP6_NF_RAW is not set
 # CONFIG_IP6_NF_SECURITY is not set
@@ -1339,6 +1406,9 @@ CONFIG_IP6_NF_TARGET_MASQUERADE=m
 # end of IPv6: Netfilter Configuration
 
 CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_TABLES_BRIDGE=m
+# CONFIG_NFT_BRIDGE_META is not set
+# CONFIG_NFT_BRIDGE_REJECT is not set
 # CONFIG_NF_CONNTRACK_BRIDGE is not set
 # CONFIG_BRIDGE_NF_EBTABLES is not set
 # CONFIG_IP_DCCP is not set
@@ -1562,6 +1632,7 @@ CONFIG_BT_NXPUART=m
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AF_KCM is not set
 # CONFIG_MCTP is not set
+CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
 CONFIG_CFG80211=m
 # CONFIG_NL80211_TESTMODE is not set
@@ -8459,7 +8530,7 @@ CONFIG_CRYPTO_XTS=m
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_GENIV=y
-# CONFIG_CRYPTO_SEQIV is not set
+CONFIG_CRYPTO_SEQIV=m
 CONFIG_CRYPTO_ECHAINIV=y
 # CONFIG_CRYPTO_ESSIV is not set
 # end of AEAD (authenticated encryption with associated data) ciphers
@@ -8686,7 +8757,7 @@ CONFIG_CRC32_SLICEBY8=y
 CONFIG_CRC64=y
 # CONFIG_CRC4 is not set
 CONFIG_CRC7=y
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_CRC8=y
 CONFIG_XXHASH=y
 CONFIG_AUDIT_GENERIC=y

From ed57514e08e2e055440cb69bcaf8e03cda282e2f Mon Sep 17 00:00:00 2001
From: Martin Schmiedel <Martin.Schmiedel@tq-group.com>
Date: Mon, 28 Oct 2024 14:33:26 +0100
Subject: [PATCH 060/107] MBa8MPxL-RAS314: add LVDS devicetree

Signed-off-by: Martin Schmiedel <Martin.Schmiedel@tq-group.com>
---
 ...tree-for-imx8mp-tqma8mpql-mba8mp-ras.patch | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 patch/kernel/archive/imx8m-6.11/0001-Add-lvds-device-tree-for-imx8mp-tqma8mpql-mba8mp-ras.patch

diff --git a/patch/kernel/archive/imx8m-6.11/0001-Add-lvds-device-tree-for-imx8mp-tqma8mpql-mba8mp-ras.patch b/patch/kernel/archive/imx8m-6.11/0001-Add-lvds-device-tree-for-imx8mp-tqma8mpql-mba8mp-ras.patch
new file mode 100644
index 000000000000..e2be14d5f2ae
--- /dev/null
+++ b/patch/kernel/archive/imx8m-6.11/0001-Add-lvds-device-tree-for-imx8mp-tqma8mpql-mba8mp-ras.patch
@@ -0,0 +1,28 @@
+From 5cb95ed2dea1fea9335a9b7a73af7e7f4104fb38 Mon Sep 17 00:00:00 2001
+From: Martin Schmiedel <Martin.Schmiedel@tq-group.com>
+Date: Tue, 5 Nov 2024 10:07:03 +0100
+Subject: [PATCH] Add lvds device tree for imx8mp-tqma8mpql-mba8mp-ras314
+
+Signed-off-by: Martin Schmiedel <Martin.Schmiedel@tq-group.com>
+---
+ arch/arm64/boot/dts/freescale/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
+index f04c22b7d..543386e0d 100644
+--- a/arch/arm64/boot/dts/freescale/Makefile
++++ b/arch/arm64/boot/dts/freescale/Makefile
+@@ -198,8 +198,10 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk-mx8-dlvds-lcd1.dtb
+ 
+ imx8mp-tqma8mpql-mba8mpxl-lvds-dtbs += imx8mp-tqma8mpql-mba8mpxl.dtb imx8mp-tqma8mpql-mba8mpxl-lvds.dtbo
+ imx8mp-tqma8mpql-mba8mpxl-lvds-g133han01-dtbs += imx8mp-tqma8mpql-mba8mpxl.dtb imx8mp-tqma8mpql-mba8mpxl-lvds-g133han01.dtbo
++imx8mp-tqma8mpql-mba8mp-ras314-lvds-dtbs += imx8mp-tqma8mpql-mba8mp-ras314.dtb imx8mp-tqma8mpql-mba8mpxl-lvds.dtbo
+ dtb-$(CONFIG_ARCH_MXC) += imx8mp-tqma8mpql-mba8mpxl-lvds.dtb
+ dtb-$(CONFIG_ARCH_MXC) += imx8mp-tqma8mpql-mba8mpxl-lvds-g133han01.dtb
++dtb-$(CONFIG_ARCH_MXC) += imx8mp-tqma8mpql-mba8mp-ras314-lvds.dtb
+ 
+ dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk.dtb
+ dtb-$(CONFIG_ARCH_MXC) += imx8mq-hummingboard-pulse.dtb
+-- 
+2.43.0
+

From 97638622dc86fd9e081ddd03b3f5a5b251f9ce95 Mon Sep 17 00:00:00 2001
From: Bob Xiang <btbxbob@gmail.com>
Date: Sun, 10 Nov 2024 04:42:24 +0800
Subject: [PATCH 061/107] Added support of core3566 (#7018)

* added core3566
---
 config/boards/core3566.csc                    |   66 +
 config/kernel/linux-rk35xx-vendor.config      |   40 +-
 .../rockchip64-6.10/dt/rk3566-core3566.dts    | 7203 +++++++++++++++++
 .../rockchip64-6.6/dt/rk3566-core3566.dts     | 7203 +++++++++++++++++
 4 files changed, 14503 insertions(+), 9 deletions(-)
 create mode 100644 config/boards/core3566.csc
 create mode 100644 patch/kernel/archive/rockchip64-6.10/dt/rk3566-core3566.dts
 create mode 100644 patch/kernel/archive/rockchip64-6.6/dt/rk3566-core3566.dts

diff --git a/config/boards/core3566.csc b/config/boards/core3566.csc
new file mode 100644
index 000000000000..3e21a7241e8c
--- /dev/null
+++ b/config/boards/core3566.csc
@@ -0,0 +1,66 @@
+# Rockchip RK3566 quad core 4/8GB RAM SoC WIFI/BT eMMC USB2 USB3 NVMe PCIe GbE HDMI SPI
+BOARD_NAME="core3566"
+BOARDFAMILY="rk35xx"
+BOARD_MAINTAINER=""
+BOOTCONFIG="orangepi-3b-rk3566_defconfig"
+BOOT_SOC="rk3566"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3566-core3566.dtb"
+IMAGE_PARTITION_TABLE="gpt"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+MODULES=""
+MODULES_BLACKLIST_LEGACY="bcmdhd"
+
+# Override family config for this board; let's avoid conditionals in family config.
+function post_family_config__core3566_use_mainline_uboot() {
+	display_alert "$BOARD" "mainline (Kwiboo's tree) u-boot overrides" "info"
+
+	BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git"
+	BOOTBRANCH="branch:rk3xxx-2024.04" # specific commit tested is commit:ccef7dfc453bc03c5b5c61fa67d2745b96fa7da6
+	BOOTPATCHDIR="v2024.04-orangepi3b" # empty, patches are already in Kwiboo's branch:rk3xxx-2024.04
+
+	BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
+
+	BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin u-boot.itb idbloader.img idbloader-spi.img"
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd if=${1}/u-boot-rockchip.bin of=${2} bs=32k seek=1 conv=fsync
+	}
+
+	# Smarter/faster/better to-spi writer using flashcp (hopefully with --partition), using the binman-provided 'u-boot-rockchip-spi.bin'
+	function write_uboot_platform_mtd() {
+		declare -a extra_opts_flashcp=("--verbose")
+		if flashcp -h | grep -q -e '--partition'; then
+			echo "Confirmed flashcp supports --partition -- read and write only changed blocks." >&2
+			extra_opts_flashcp+=("--partition")
+		else
+			echo "flashcp does not support --partition, will write full SPI flash blocks." >&2
+		fi
+		flashcp "${extra_opts_flashcp[@]}" "${1}/u-boot-rockchip-spi.bin" /dev/mtd0
+	}
+
+}
+
+function post_family_tweaks_bsp__core3566() {
+	# display_alert "$BOARD" "Installing sprd-bluetooth.service" "info"
+
+	# Bluetooth on core3566 board is handled by a Spreadtrum (sprd) chip and requires
+	# a custom hciattach_opi binary, plus a systemd service to run it at boot time
+	#install -m 755 $SRC/packages/bsp/rk3399/hciattach_opi $destination/usr/bin
+	# cp $SRC/packages/bsp/rk3399/sprd-bluetooth.service $destination/lib/systemd/system/
+
+	return 0
+}
+
+function post_family_tweaks__core3566_enable_services() {
+	# display_alert "$BOARD" "Enabling sprd-bluetooth.service" "info"
+	# chroot_sdcard systemctl enable sprd-bluetooth.service
+	return 0
+}
diff --git a/config/kernel/linux-rk35xx-vendor.config b/config/kernel/linux-rk35xx-vendor.config
index c9691c4d56e5..c496fac4177e 100644
--- a/config/kernel/linux-rk35xx-vendor.config
+++ b/config/kernel/linux-rk35xx-vendor.config
@@ -2,17 +2,15 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 6.1.75 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 13.2.0-23ubuntu4) 13.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=110400
+CONFIG_GCC_VERSION=130200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23800
+CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23800
+CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
@@ -409,6 +407,7 @@ CONFIG_HZ=300
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
+CONFIG_CC_HAVE_SHADOW_CALL_STACK=y
 # CONFIG_PARAVIRT is not set
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 # CONFIG_KEXEC is not set
@@ -662,6 +661,8 @@ CONFIG_HAVE_ARCH_STACKLEAK=y
 CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK=y
+# CONFIG_SHADOW_CALL_STACK is not set
 CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
 CONFIG_LTO_NONE=y
@@ -884,8 +885,23 @@ CONFIG_COREDUMP=y
 #
 # Memory Management options
 #
+CONFIG_ZPOOL=y
 CONFIG_SWAP=y
-# CONFIG_ZSWAP is not set
+CONFIG_ZSWAP=y
+CONFIG_ZSWAP_DEFAULT_ON=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="zstd"
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
+CONFIG_ZBUD=y
+# CONFIG_Z3FOLD is not set
 CONFIG_ZSMALLOC=m
 # CONFIG_ZSMALLOC_STAT is not set
 
@@ -932,6 +948,7 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 # CONFIG_MEMORY_FAILURE is not set
 CONFIG_ARCH_WANTS_THP_SWAP=y
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_FRONTSWAP=y
 CONFIG_CMA=y
 # CONFIG_CMA_INACTIVE is not set
 # CONFIG_CMA_DEBUG is not set
@@ -1446,7 +1463,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
 CONFIG_BPFILTER=y
-CONFIG_BPFILTER_UMH=m
 CONFIG_IP_DCCP=m
 CONFIG_INET_DCCP_DIAG=m
 
@@ -8907,7 +8923,12 @@ CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,apparmor,bpf"
 #
 # Memory initialization
 #
+CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
+CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y
+CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
 CONFIG_INIT_STACK_NONE=y
+# CONFIG_INIT_STACK_ALL_PATTERN is not set
+# CONFIG_INIT_STACK_ALL_ZERO is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
@@ -9069,7 +9090,7 @@ CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_842 is not set
 # CONFIG_CRYPTO_LZ4 is not set
 # CONFIG_CRYPTO_LZ4HC is not set
-CONFIG_CRYPTO_ZSTD=m
+CONFIG_CRYPTO_ZSTD=y
 # end of Compression
 
 #
@@ -9604,6 +9625,7 @@ CONFIG_STRICT_DEVMEM=y
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_LKDTM=y
 # CONFIG_TEST_MIN_HEAP is not set
diff --git a/patch/kernel/archive/rockchip64-6.10/dt/rk3566-core3566.dts b/patch/kernel/archive/rockchip64-6.10/dt/rk3566-core3566.dts
new file mode 100644
index 000000000000..66096f835fa6
--- /dev/null
+++ b/patch/kernel/archive/rockchip64-6.10/dt/rk3566-core3566.dts
@@ -0,0 +1,7203 @@
+/dts-v1/;
+
+/ {
+	#address-cells = <0x02>;
+	model = "luckfox core3566";
+	serial-number = "70724ac80bd71c85";
+	#size-cells = <0x02>;
+	interrupt-parent = <0x01>;
+	compatible = "luckfox,core3566\0rockchip,rk3566";
+
+	video-phy@fe850000 {
+		power-domains = <0x21 0x09>;
+		clock-names = "ref\0pclk_phy\0pclk_host";
+		resets = <0x1f 0x1bb>;
+		clocks = <0x31 0x17 0x1f 0x17a 0x1f 0xe8>;
+		#clock-cells = <0x00>;
+		#phy-cells = <0x00>;
+		compatible = "rockchip,rk3568-video-phy";
+		status = "disabled";
+		reg = <0x00 0xfe850000 0x00 0x10000 0x00 0xfe060000 0x00 0x10000>;
+		phandle = <0x2e>;
+		reset-names = "rst";
+	};
+
+	spi@fe620000 {
+		pinctrl-names = "default\0high_speed";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xca 0xcb 0xcc>;
+		clock-names = "spiclk\0apb_pclk";
+		interrupts = <0x00 0x68 0x04>;
+		clocks = <0x1f 0x154 0x1f 0x153>;
+		#size-cells = <0x00>;
+		dma-names = "tx\0rx";
+		compatible = "rockchip,rk3066-spi";
+		pinctrl-1 = <0xca 0xcb 0xcd>;
+		status = "disabled";
+		reg = <0x00 0xfe620000 0x00 0x1000>;
+		phandle = <0x18d>;
+		dmas = <0x40 0x16 0x40 0x17>;
+	};
+
+	wireless-bluetooth {
+		pinctrl-names = "default\0rts_gpio";
+		pinctrl-0 = <0x10a>;
+		clock-names = "ext_clock";
+		clocks = <0x106 0x01>;
+		BT,wake_gpio = <0x108 0x11 0x00>;
+		BT,reset_gpio = <0x108 0x0f 0x00>;
+		uart_rts_gpios = <0x108 0x0d 0x01>;
+		compatible = "bluetooth-platdata";
+		BT,wake_host_irq = <0x108 0x10 0x00>;
+		pinctrl-1 = <0x10b>;
+		status = "disabled";
+		phandle = <0x2a1>;
+	};
+
+	i2s3-mclkin {
+		clock-output-names = "i2s3_mclkin";
+		#clock-cells = <0x00>;
+		clock-frequency = <0xbb8000>;
+		compatible = "fixed-clock";
+		phandle = <0x12b>;
+	};
+
+	qos@fe158300 {
+		compatible = "syscon";
+		reg = <0x00 0xfe158300 0x00 0x20>;
+		phandle = <0x53>;
+	};
+
+	iommu@fdf80800 {
+		power-domains = <0x21 0x0d>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x5c 0x04>;
+		clocks = <0x1f 0x108 0x1f 0x109>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		status = "okay";
+		interrupt-names = "rkvdec_mmu";
+		reg = <0x00 0xfdf80800 0x00 0x40 0x00 0xfdf80840 0x00 0x40>;
+		phandle = <0x6f>;
+	};
+
+	scmi-shmem@10f000 {
+		compatible = "arm,scmi-shmem";
+		reg = <0x00 0x10f000 0x00 0x100>;
+		phandle = <0x1a>;
+	};
+
+	syscon@fdc20000 {
+		compatible = "rockchip,rk3568-pmugrf\0syscon\0simple-mfd";
+		reg = <0x00 0xfdc20000 0x00 0x10000>;
+		phandle = <0x33>;
+
+		reboot-mode {
+			mode-normal = <0x5242c300>;
+			mode-loader = <0x5242c301>;
+			mode-bootloader = <0x5242c301>;
+			mode-recovery = <0x5242c303>;
+			mode-watchdog = <0x5242c308>;
+			mode-ums = <0x5242c30c>;
+			mode-fastboot = <0x5242c309>;
+			offset = <0x200>;
+			compatible = "syscon-reboot-mode";
+			phandle = <0x13b>;
+			mode-charge = <0x5242c30b>;
+			mode-panic = <0x5242c307>;
+		};
+
+		io-domains {
+			vccio1-supply = <0x2a>;
+			vccio3-supply = <0x2b>;
+			vccio4-supply = <0x2c>;
+			vccio5-supply = <0x2d>;
+			pmuio2-supply = <0x29>;
+			vccio6-supply = <0x2c>;
+			vccio7-supply = <0x2d>;
+			compatible = "rockchip,rk3568-pmu-io-voltage-domain";
+			status = "okay";
+			phandle = <0x13a>;
+		};
+	};
+
+	i2c@fe5c0000 {
+		pinctrl-names = "default";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xc0>;
+		clock-names = "i2c\0pclk";
+		interrupts = <0x00 0x31 0x04>;
+		clocks = <0x1f 0x14c 0x1f 0x14b>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3399-i2c";
+		status = "okay";
+		reg = <0x00 0xfe5c0000 0x00 0x1000>;
+		phandle = <0x186>;
+
+		imx219-2@10 {
+			clock-names = "ext_cam_imx219_clk_two";
+			pwdn-gpios = <0xc2 0x0f 0x01>;
+			clocks = <0xc1>;
+			rockchip,camera-module-name = "Waveshare";
+			rockchip,camera-module-index = <0x01>;
+			compatible = "sony,imx219";
+			rockchip,camera-module-facing = "front";
+			status = "okay";
+			reg = <0x10>;
+			rockchip,camera-module-lens-name = "Picamera";
+			phandle = <0x187>;
+
+			port {
+
+				endpoint {
+					data-lanes = <0x01 0x02>;
+					remote-endpoint = <0xc3>;
+					phandle = <0xf5>;
+				};
+			};
+		};
+	};
+
+	iep@fdef0000 {
+		power-domains = <0x21 0x0a>;
+		iommus = <0x6c>;
+		clock-names = "aclk\0hclk\0sclk";
+		resets = <0x1f 0x127 0x1f 0x128 0x1f 0x129>;
+		interrupts = <0x00 0x38 0x04>;
+		clocks = <0x1f 0xf6 0x1f 0xf7 0x1f 0xf8>;
+		rockchip,srv = <0x68>;
+		rockchip,taskqueue-node = <0x05>;
+		compatible = "rockchip,iep-v2";
+		rockchip,resetgroup-node = <0x05>;
+		status = "okay";
+		reg = <0x00 0xfdef0000 0x00 0x500>;
+		phandle = <0x158>;
+		reset-names = "rst_a\0rst_h\0rst_s";
+	};
+
+	gpu@fde60000 {
+		power-domains = <0x21 0x07>;
+		mali-supply = <0x61>;
+		clock-names = "gpu\0bus";
+		interrupts = <0x00 0x28 0x04 0x00 0x29 0x04 0x00 0x27 0x04>;
+		clocks = <0x02 0x01 0x1f 0x1b>;
+		compatible = "rockchip,rk3568-mali\0arm,mali-bifrost";
+		status = "okay";
+		interrupt-names = "job\0mmu\0gpu";
+		reg = <0x00 0xfde60000 0x00 0x4000>;
+		phandle = <0x1d>;
+		operating-points-v2 = <0x65>;
+		#cooling-cells = <0x02>;
+	};
+
+	spdif@fe460000 {
+		pinctrl-names = "default";
+		pinctrl-0 = <0xb9>;
+		clock-names = "mclk\0hclk";
+		interrupts = <0x00 0x66 0x04>;
+		clocks = <0x1f 0x5f 0x1f 0x5c>;
+		dma-names = "tx";
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-spdif";
+		status = "disabled";
+		reg = <0x00 0xfe460000 0x00 0x1000>;
+		phandle = <0x17c>;
+		dmas = <0xa6 0x01>;
+	};
+
+	qos@fe1a8100 {
+		compatible = "syscon";
+		reg = <0x00 0xfe1a8100 0x00 0x20>;
+		phandle = <0x4d>;
+	};
+
+	syscon@fdc60000 {
+		compatible = "rockchip,rk3568-grf\0syscon\0simple-mfd";
+		reg = <0x00 0xfdc60000 0x00 0x10000>;
+		phandle = <0x32>;
+
+		lvds {
+			phy-names = "phy";
+			compatible = "rockchip,rk3568-lvds";
+			status = "disabled";
+			phys = <0x2e>;
+			phandle = <0x13d>;
+
+			ports {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+
+				port@0 {
+					#address-cells = <0x01>;
+					#size-cells = <0x00>;
+					reg = <0x00>;
+
+					endpoint@1 {
+						remote-endpoint = <0x18>;
+						status = "disabled";
+						reg = <0x01>;
+						phandle = <0x8b>;
+					};
+
+					endpoint@2 {
+						remote-endpoint = <0x2f>;
+						status = "disabled";
+						reg = <0x02>;
+						phandle = <0x8c>;
+					};
+				};
+			};
+		};
+
+		rgb {
+			pinctrl-names = "default";
+			pinctrl-0 = <0x30>;
+			compatible = "rockchip,rk3568-rgb";
+			status = "disabled";
+			phandle = <0x13e>;
+
+			ports {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+
+				port@0 {
+					#address-cells = <0x01>;
+					#size-cells = <0x00>;
+					reg = <0x00>;
+
+					endpoint@2 {
+						remote-endpoint = <0x19>;
+						status = "disabled";
+						reg = <0x02>;
+						phandle = <0x8d>;
+					};
+				};
+			};
+		};
+
+		io-domains {
+			compatible = "rockchip,rk3568-io-voltage-domain";
+			status = "disabled";
+			phandle = <0x13c>;
+		};
+	};
+
+	pinctrl {
+		#address-cells = <0x02>;
+		#size-cells = <0x02>;
+		compatible = "rockchip,rk3568-pinctrl";
+		rockchip,pmu = <0x33>;
+		ranges;
+		rockchip,grf = <0x32>;
+		phandle = <0xf9>;
+
+		eth0 {
+
+			eth0-pins {
+				rockchip,pins = <0x02 0x11 0x02 0xfa>;
+				phandle = <0x1ca>;
+			};
+		};
+
+		i2c3 {
+
+			i2c3m1-xfer {
+				rockchip,pins = <0x03 0x0d 0x04 0xff 0x03 0x0e 0x04 0xff>;
+				phandle = <0xc0>;
+			};
+
+			i2c3m0-xfer {
+				rockchip,pins = <0x01 0x01 0x01 0xff 0x01 0x00 0x01 0xff>;
+				phandle = <0x1e3>;
+			};
+		};
+
+		pwm9 {
+
+			pwm9m1-pins {
+				rockchip,pins = <0x01 0x1e 0x04 0xfa>;
+				phandle = <0x23a>;
+			};
+
+			pwm9m0-pins {
+				rockchip,pins = <0x03 0x0a 0x05 0xfa>;
+				phandle = <0xe5>;
+			};
+		};
+
+		pwm14 {
+
+			pwm14m1-pins {
+				rockchip,pins = <0x04 0x12 0x01 0xfa>;
+				phandle = <0x23f>;
+			};
+
+			pwm14m0-pins {
+				rockchip,pins = <0x03 0x14 0x01 0xfa>;
+				phandle = <0xea>;
+			};
+		};
+
+		npu {
+
+			npu-pins {
+				rockchip,pins = <0x00 0x11 0x02 0xfa>;
+				phandle = <0x21b>;
+			};
+		};
+
+		wireless-bluetooth {
+
+			uart1-gpios {
+				rockchip,pins = <0x02 0x0d 0x00 0xfa>;
+				phandle = <0x10b>;
+			};
+		};
+
+		pcie30x1 {
+
+			pcie30x1m1-pins {
+				rockchip,pins = <0x02 0x1a 0x04 0xfa 0x03 0x01 0x04 0xfa 0x02 0x1b 0x04 0xfa>;
+				phandle = <0x221>;
+			};
+
+			pcie30x1m0-pins {
+				rockchip,pins = <0x00 0x04 0x03 0xfa 0x00 0x13 0x03 0xfa 0x00 0x12 0x03 0xfa>;
+				phandle = <0x220>;
+			};
+
+			pcie30x1-buttonrstn {
+				rockchip,pins = <0x00 0x0b 0x03 0xfa>;
+				phandle = <0x223>;
+			};
+
+			pcie30x1m2-pins {
+				rockchip,pins = <0x01 0x05 0x04 0xfa 0x01 0x02 0x04 0xfa 0x01 0x03 0x04 0xfa>;
+				phandle = <0x222>;
+			};
+		};
+
+		gpio@fdd60000 {
+			gpio-controller;
+			interrupts = <0x00 0x21 0x04>;
+			clocks = <0x31 0x2e 0x31 0x0c>;
+			compatible = "rockchip,gpio-bank";
+			#interrupt-cells = <0x02>;
+			reg = <0x00 0xfdd60000 0x00 0x100>;
+			phandle = <0x36>;
+			#gpio-cells = <0x02>;
+			gpio-ranges = <0xf9 0x00 0x00 0x20>;
+			interrupt-controller;
+		};
+
+		uart8 {
+
+			uart8m0-rtsn {
+				rockchip,pins = <0x02 0x09 0x03 0xfa>;
+				phandle = <0x278>;
+			};
+
+			uart8m0-ctsn {
+				rockchip,pins = <0x02 0x0a 0x03 0xfa>;
+				phandle = <0x277>;
+			};
+
+			uart8m1-xfer {
+				rockchip,pins = <0x03 0x00 0x04 0xfc 0x02 0x1f 0x04 0xfc>;
+				phandle = <0x279>;
+			};
+
+			uart8m0-xfer {
+				rockchip,pins = <0x02 0x16 0x02 0xfc 0x02 0x15 0x03 0xfc>;
+				phandle = <0xde>;
+			};
+		};
+
+		gmac-txc-level2 {
+
+			gmac0-rgmii-clk-level2 {
+				rockchip,pins = <0x02 0x05 0x02 0xfa 0x02 0x08 0x02 0xfd>;
+				phandle = <0x298>;
+			};
+
+			gmac1m1-rgmii-clk-level2 {
+				rockchip,pins = <0x04 0x03 0x03 0xfa 0x04 0x00 0x03 0xfd>;
+				phandle = <0x29a>;
+			};
+
+			gmac1m0-rgmii-clk-level2 {
+				rockchip,pins = <0x03 0x07 0x03 0xfa 0x03 0x06 0x03 0xfd>;
+				phandle = <0x299>;
+			};
+		};
+
+		spi2 {
+
+			spi2m0-cs1 {
+				rockchip,pins = <0x02 0x15 0x04 0xfa>;
+				phandle = <0xcf>;
+			};
+
+			spi2m1-cs1 {
+				rockchip,pins = <0x02 0x1c 0x03 0xfa>;
+				phandle = <0x25b>;
+			};
+
+			spi2m1-pins {
+				rockchip,pins = <0x03 0x00 0x03 0xfa 0x02 0x1f 0x03 0xfa 0x02 0x1e 0x03 0xfa>;
+				phandle = <0x259>;
+			};
+
+			spi2m0-cs0 {
+				rockchip,pins = <0x02 0x14 0x04 0xfa>;
+				phandle = <0xce>;
+			};
+
+			spi2m0-pins {
+				rockchip,pins = <0x02 0x11 0x04 0xfa 0x02 0x12 0x04 0xfa 0x02 0x13 0x04 0xfa>;
+				phandle = <0xd0>;
+			};
+
+			spi2m1-cs0 {
+				rockchip,pins = <0x02 0x1d 0x03 0xfa>;
+				phandle = <0x25a>;
+			};
+		};
+
+		pcfg-pull-up-drv-level-2 {
+			drive-strength = <0x02>;
+			phandle = <0xfb>;
+			bias-pull-up;
+		};
+
+		i2s1 {
+
+			i2s1m0-sdo1 {
+				rockchip,pins = <0x01 0x08 0x01 0xfa>;
+				phandle = <0x1eb>;
+			};
+
+			i2s1m0-lrcktx {
+				rockchip,pins = <0x01 0x05 0x01 0xfa>;
+				phandle = <0xa8>;
+			};
+
+			i2s1m1-sdi1 {
+				rockchip,pins = <0x03 0x1b 0x04 0xfa>;
+				phandle = <0x1f4>;
+			};
+
+			i2s1m1-lrcktx {
+				rockchip,pins = <0x03 0x18 0x04 0xfa>;
+				phandle = <0x1ef>;
+			};
+
+			i2s1m0-lrckrx {
+				rockchip,pins = <0x01 0x06 0x01 0xfa>;
+				phandle = <0x1e6>;
+			};
+
+			i2s1m0-sdi3 {
+				rockchip,pins = <0x01 0x08 0x02 0xfa>;
+				phandle = <0x1ea>;
+			};
+
+			i2s1m2-lrcktx {
+				rockchip,pins = <0x02 0x1a 0x05 0xfa>;
+				phandle = <0x1fc>;
+			};
+
+			i2s1m1-lrckrx {
+				rockchip,pins = <0x04 0x07 0x05 0xfa>;
+				phandle = <0x1ee>;
+			};
+
+			i2s1m0-mclk {
+				rockchip,pins = <0x01 0x02 0x01 0xfa>;
+				phandle = <0x3e>;
+			};
+
+			i2s1m0-sclktx {
+				rockchip,pins = <0x01 0x03 0x01 0xfa>;
+				phandle = <0xa7>;
+			};
+
+			i2s1m2-sdo2 {
+				rockchip,pins = <0x03 0x11 0x05 0xfa>;
+				phandle = <0x206>;
+			};
+
+			i2s1m2-lrckrx {
+				rockchip,pins = <0x03 0x15 0x05 0xfa>;
+				phandle = <0x1fb>;
+			};
+
+			i2s1m0-sdi1 {
+				rockchip,pins = <0x01 0x0a 0x02 0xfa>;
+				phandle = <0x1e8>;
+			};
+
+			i2s1m1-sclktx {
+				rockchip,pins = <0x03 0x17 0x04 0xfa>;
+				phandle = <0x1f2>;
+			};
+
+			i2s1m0-sclkrx {
+				rockchip,pins = <0x01 0x04 0x01 0xfa>;
+				phandle = <0x1e7>;
+			};
+
+			i2s1m2-sclktx {
+				rockchip,pins = <0x02 0x19 0x05 0xfa>;
+				phandle = <0x1ff>;
+			};
+
+			i2s1m2-sdo0 {
+				rockchip,pins = <0x02 0x1f 0x05 0xfa>;
+				phandle = <0x204>;
+			};
+
+			i2s1m1-sclkrx {
+				rockchip,pins = <0x04 0x06 0x05 0xfa>;
+				phandle = <0x1f1>;
+			};
+
+			i2s1m2-sclkrx {
+				rockchip,pins = <0x03 0x13 0x05 0xfa>;
+				phandle = <0x1fe>;
+			};
+
+			i2s1m1-sdo2 {
+				rockchip,pins = <0x04 0x09 0x04 0xfa>;
+				phandle = <0x1f9>;
+			};
+
+			i2s1m2-sdi2 {
+				rockchip,pins = <0x02 0x1d 0x05 0xfa>;
+				phandle = <0x202>;
+			};
+
+			i2s1m1-sdo0 {
+				rockchip,pins = <0x03 0x19 0x04 0xfa>;
+				phandle = <0x1f7>;
+			};
+
+			i2s1m2-sdi0 {
+				rockchip,pins = <0x02 0x1b 0x05 0xfa>;
+				phandle = <0x200>;
+			};
+
+			i2s1m0-sdo2 {
+				rockchip,pins = <0x01 0x09 0x01 0xfa>;
+				phandle = <0x1ec>;
+			};
+
+			i2s1m1-sdi2 {
+				rockchip,pins = <0x03 0x1c 0x04 0xfa>;
+				phandle = <0x1f5>;
+			};
+
+			i2s1m0-sdo0 {
+				rockchip,pins = <0x01 0x07 0x01 0xfa>;
+				phandle = <0xaa>;
+			};
+
+			i2s1m1-sdi0 {
+				rockchip,pins = <0x03 0x1a 0x04 0xfa>;
+				phandle = <0x1f3>;
+			};
+
+			i2s1m2-sdo3 {
+				rockchip,pins = <0x03 0x12 0x05 0xfa>;
+				phandle = <0x207>;
+			};
+
+			i2s1m0-sdi2 {
+				rockchip,pins = <0x01 0x09 0x02 0xfa>;
+				phandle = <0x1e9>;
+			};
+
+			i2s1m2-sdo1 {
+				rockchip,pins = <0x03 0x00 0x05 0xfa>;
+				phandle = <0x205>;
+			};
+
+			i2s1m0-sdi0 {
+				rockchip,pins = <0x01 0x0b 0x01 0xfa>;
+				phandle = <0xa9>;
+			};
+
+			i2s1m1-sdo3 {
+				rockchip,pins = <0x04 0x0d 0x04 0xfa>;
+				phandle = <0x1fa>;
+			};
+
+			i2s1m2-sdi3 {
+				rockchip,pins = <0x02 0x1e 0x05 0xfa>;
+				phandle = <0x203>;
+			};
+
+			i2s1m2-mclk {
+				rockchip,pins = <0x02 0x18 0x05 0xfa>;
+				phandle = <0x1fd>;
+			};
+
+			i2s1m1-sdo1 {
+				rockchip,pins = <0x04 0x08 0x05 0xfa>;
+				phandle = <0x1f8>;
+			};
+
+			i2s1m2-sdi1 {
+				rockchip,pins = <0x02 0x1c 0x05 0xfa>;
+				phandle = <0x201>;
+			};
+
+			i2s1m0-sdo3 {
+				rockchip,pins = <0x01 0x0a 0x01 0xfa>;
+				phandle = <0x1ed>;
+			};
+
+			i2s1m1-sdi3 {
+				rockchip,pins = <0x03 0x1d 0x04 0xfa>;
+				phandle = <0x1f6>;
+			};
+
+			i2s1m1-mclk {
+				rockchip,pins = <0x03 0x16 0x04 0xfa>;
+				phandle = <0x1f0>;
+			};
+		};
+
+		pdm {
+
+			pdmm0-sdi3 {
+				rockchip,pins = <0x01 0x08 0x03 0xfa>;
+				phandle = <0xb8>;
+			};
+
+			pdmm2-clk1 {
+				rockchip,pins = <0x03 0x14 0x05 0xfa>;
+				phandle = <0x22e>;
+			};
+
+			pdmm0-sdi1 {
+				rockchip,pins = <0x01 0x0a 0x03 0xfa>;
+				phandle = <0xb6>;
+			};
+
+			pdmm1-clk {
+				rockchip,pins = <0x03 0x1e 0x05 0xfa>;
+				phandle = <0x228>;
+			};
+
+			pdmm1-clk1 {
+				rockchip,pins = <0x04 0x00 0x04 0xfa>;
+				phandle = <0x229>;
+			};
+
+			pdmm2-sdi2 {
+				rockchip,pins = <0x03 0x0f 0x05 0xfa>;
+				phandle = <0x231>;
+			};
+
+			pdmm0-clk1 {
+				rockchip,pins = <0x01 0x04 0x03 0xfa>;
+				phandle = <0xb4>;
+			};
+
+			pdmm2-sdi0 {
+				rockchip,pins = <0x03 0x0b 0x05 0xfa>;
+				phandle = <0x22f>;
+			};
+
+			pdmm1-sdi2 {
+				rockchip,pins = <0x04 0x02 0x05 0xfa>;
+				phandle = <0x22c>;
+			};
+
+			pdmm1-sdi0 {
+				rockchip,pins = <0x03 0x1f 0x05 0xfa>;
+				phandle = <0x22a>;
+			};
+
+			pdmm0-sdi2 {
+				rockchip,pins = <0x01 0x09 0x03 0xfa>;
+				phandle = <0xb7>;
+			};
+
+			pdmm0-sdi0 {
+				rockchip,pins = <0x01 0x0b 0x02 0xfa>;
+				phandle = <0xb5>;
+			};
+
+			pdmm2-sdi3 {
+				rockchip,pins = <0x03 0x10 0x05 0xfa>;
+				phandle = <0x232>;
+			};
+
+			pdmm2-sdi1 {
+				rockchip,pins = <0x03 0x0c 0x05 0xfa>;
+				phandle = <0x230>;
+			};
+
+			pdmm1-sdi3 {
+				rockchip,pins = <0x04 0x03 0x05 0xfa>;
+				phandle = <0x22d>;
+			};
+
+			pdmm0-clk {
+				rockchip,pins = <0x01 0x06 0x03 0xfa>;
+				phandle = <0xb3>;
+			};
+
+			pdmm1-sdi1 {
+				rockchip,pins = <0x04 0x01 0x04 0xfa>;
+				phandle = <0x22b>;
+			};
+		};
+
+		gpio@fe770000 {
+			gpio-controller;
+			interrupts = <0x00 0x25 0x04>;
+			clocks = <0x1f 0x169 0x1f 0x16a>;
+			compatible = "rockchip,gpio-bank";
+			#interrupt-cells = <0x02>;
+			reg = <0x00 0xfe770000 0x00 0x100>;
+			phandle = <0x3f>;
+			#gpio-cells = <0x02>;
+			gpio-ranges = <0xf9 0x00 0x80 0x20>;
+			interrupt-controller;
+		};
+
+		i2c1 {
+
+			i2c1-xfer {
+				rockchip,pins = <0x00 0x0b 0x01 0xfc 0x00 0x0c 0x01 0xfc>;
+				phandle = <0xbc>;
+			};
+		};
+
+		pwm7 {
+
+			pwm7-pins {
+				rockchip,pins = <0x00 0x16 0x01 0xfa>;
+				phandle = <0xe3>;
+			};
+		};
+
+		gmac0 {
+
+			gmac0-clkinout {
+				rockchip,pins = <0x02 0x12 0x02 0xfa>;
+				phandle = <0x1d1>;
+			};
+
+			gmac0-miim {
+				rockchip,pins = <0x02 0x13 0x02 0xfa 0x02 0x14 0x02 0xfa>;
+				phandle = <0x1d0>;
+			};
+
+			gmac0-tx-bus2 {
+				rockchip,pins = <0x02 0x0b 0x01 0xfd 0x02 0x0c 0x01 0xfd 0x02 0x0d 0x01 0xfa>;
+				phandle = <0x1d4>;
+			};
+
+			gmac0-rgmii-bus {
+				rockchip,pins = <0x02 0x03 0x02 0xfa 0x02 0x04 0x02 0xfa 0x02 0x06 0x02 0xfd 0x02 0x07 0x02 0xfd>;
+				phandle = <0x1d6>;
+			};
+
+			gmac0-rx-er {
+				rockchip,pins = <0x02 0x15 0x02 0xfa>;
+				phandle = <0x1d2>;
+			};
+
+			gmac0-rx-bus2 {
+				rockchip,pins = <0x02 0x0e 0x01 0xfa 0x02 0x0f 0x02 0xfa 0x02 0x10 0x02 0xfa>;
+				phandle = <0x1d3>;
+			};
+
+			gmac0-rgmii-clk {
+				rockchip,pins = <0x02 0x05 0x02 0xfa 0x02 0x08 0x02 0xfe>;
+				phandle = <0x1d5>;
+			};
+		};
+
+		pwm12 {
+
+			pwm12m1-pins {
+				rockchip,pins = <0x04 0x15 0x01 0xfa>;
+				phandle = <0x23d>;
+			};
+
+			pwm12m0-pins {
+				rockchip,pins = <0x03 0x0f 0x02 0xfa>;
+				phandle = <0xe8>;
+			};
+		};
+
+		uart6 {
+
+			uart6m0-ctsn {
+				rockchip,pins = <0x02 0x10 0x03 0xfa>;
+				phandle = <0x270>;
+			};
+
+			uart6m1-xfer {
+				rockchip,pins = <0x01 0x1e 0x03 0xfc 0x01 0x1d 0x03 0xfc>;
+				phandle = <0x272>;
+			};
+
+			uart6m0-xfer {
+				rockchip,pins = <0x02 0x03 0x03 0xfc 0x02 0x04 0x03 0xfc>;
+				phandle = <0xdc>;
+			};
+
+			uart6m0-rtsn {
+				rockchip,pins = <0x02 0x0f 0x03 0xfa>;
+				phandle = <0x271>;
+			};
+		};
+
+		gpu {
+
+			gpu-pins {
+				rockchip,pins = <0x00 0x10 0x02 0xfa 0x00 0x06 0x04 0xfa>;
+				phandle = <0x1e0>;
+			};
+		};
+
+		spi0 {
+
+			spi0m0-cs0 {
+				rockchip,pins = <0x00 0x16 0x02 0xfa>;
+				phandle = <0xc6>;
+			};
+
+			spi0m1-cs0 {
+				rockchip,pins = <0x02 0x1a 0x03 0xfa>;
+				phandle = <0x256>;
+			};
+
+			spi0m1-pins {
+				rockchip,pins = <0x02 0x1b 0x03 0xfa 0x02 0x18 0x03 0xfa 0x02 0x19 0x03 0xfa>;
+				phandle = <0x255>;
+			};
+
+			spi0m0-cs1 {
+				rockchip,pins = <0x00 0x14 0x02 0xfa>;
+				phandle = <0xc7>;
+			};
+
+			spi0m0-pins {
+				rockchip,pins = <0x00 0x0d 0x02 0xfa 0x00 0x15 0x02 0xfa 0x00 0x0e 0x02 0xfa>;
+				phandle = <0xc8>;
+			};
+		};
+
+		fspi {
+
+			fspi-pins {
+				rockchip,pins = <0x01 0x18 0x01 0xfa 0x01 0x1b 0x01 0xfa 0x01 0x19 0x01 0xfa 0x01 0x1a 0x01 0xfa 0x01 0x17 0x02 0xfa 0x01 0x1c 0x01 0xfa>;
+				phandle = <0x1ce>;
+			};
+
+			fspi-cs1 {
+				rockchip,pins = <0x01 0x16 0x02 0xfc>;
+				phandle = <0x1cf>;
+			};
+		};
+
+		clk32k {
+
+			clk32k-out0 {
+				rockchip,pins = <0x00 0x08 0x02 0xfa>;
+				phandle = <0x1e>;
+			};
+
+			clk32k-in {
+				rockchip,pins = <0x00 0x08 0x01 0xfa>;
+				phandle = <0x1bf>;
+			};
+
+			clk32k-out1 {
+				rockchip,pins = <0x02 0x16 0x01 0xfa>;
+				phandle = <0x1c0>;
+			};
+		};
+
+		ebc {
+
+			ebc-pins {
+				rockchip,pins = <0x04 0x10 0x02 0xfa 0x04 0x0b 0x02 0xfa 0x04 0x0c 0x02 0xfa 0x04 0x06 0x02 0xfa 0x04 0x11 0x02 0xfa 0x03 0x16 0x02 0xfa 0x03 0x17 0x02 0xfa 0x03 0x18 0x02 0xfa 0x03 0x19 0x02 0xfa 0x03 0x1a 0x02 0xfa 0x03 0x1b 0x02 0xfa 0x03 0x1c 0x02 0xfa 0x03 0x1d 0x02 0xfa 0x03 0x1e 0x02 0xfa 0x03 0x1f 0x02 0xfa 0x04 0x00 0x02 0xfa 0x04 0x01 0x02 0xfa 0x04 0x02 0x02 0xfa 0x04 0x03 0x02 0xfa 0x04 0x04 0x02 0xfa 0x04 0x05 0x02 0xfa 0x04 0x0e 0x02 0xfa 0x04 0x0f 0x02 0xfa>;
+				phandle = <0x69>;
+			};
+
+			ebc-extern {
+				rockchip,pins = <0x04 0x07 0x02 0xfa 0x04 0x08 0x02 0xfa 0x04 0x09 0x02 0xfa 0x04 0x0d 0x02 0xfa 0x04 0x0a 0x02 0xfa>;
+				phandle = <0x1c2>;
+			};
+		};
+
+		spi2-hs {
+
+			spi2m0-cs1 {
+				rockchip,pins = <0x02 0x15 0x04 0x102>;
+				phandle = <0x289>;
+			};
+
+			spi2m1-cs1 {
+				rockchip,pins = <0x02 0x1c 0x03 0x102>;
+				phandle = <0x28c>;
+			};
+
+			spi2m1-pins {
+				rockchip,pins = <0x03 0x00 0x03 0x102 0x02 0x1f 0x03 0x102 0x02 0x1e 0x03 0x102>;
+				phandle = <0x28a>;
+			};
+
+			spi2m0-cs0 {
+				rockchip,pins = <0x02 0x14 0x04 0x102>;
+				phandle = <0x288>;
+			};
+
+			spi2m0-pins {
+				rockchip,pins = <0x02 0x11 0x04 0x102 0x02 0x12 0x04 0x102 0x02 0x13 0x04 0x102>;
+				phandle = <0xd1>;
+			};
+
+			spi2m1-cs0 {
+				rockchip,pins = <0x02 0x1d 0x03 0x102>;
+				phandle = <0x28b>;
+			};
+		};
+
+		pwm5 {
+
+			pwm5-pins {
+				rockchip,pins = <0x00 0x14 0x01 0xfa>;
+				phandle = <0xe1>;
+			};
+		};
+
+		pcfg-pull-none-drv-level-3 {
+			drive-strength = <0x03>;
+			bias-disable;
+			phandle = <0x103>;
+		};
+
+		isp {
+
+			isp-pins {
+				rockchip,pins = <0x04 0x0c 0x04 0xfa 0x04 0x06 0x01 0xfa 0x04 0x09 0x01 0xfa>;
+				phandle = <0x218>;
+			};
+		};
+
+		pwm10 {
+
+			pwm10m1-pins {
+				rockchip,pins = <0x02 0x01 0x02 0xfa>;
+				phandle = <0x23b>;
+			};
+
+			pwm10m0-pins {
+				rockchip,pins = <0x03 0x0d 0x05 0xfa>;
+				phandle = <0xe6>;
+			};
+		};
+
+		pcfg-pull-down {
+			bias-pull-down;
+			phandle = <0x101>;
+		};
+
+		uart4 {
+
+			uart4m0-ctsn {
+				rockchip,pins = <0x01 0x07 0x02 0xfa>;
+				phandle = <0x26a>;
+			};
+
+			uart4m1-xfer {
+				rockchip,pins = <0x03 0x09 0x04 0xfc 0x03 0x0a 0x04 0xfc>;
+				phandle = <0x26c>;
+			};
+
+			uart4m0-xfer {
+				rockchip,pins = <0x01 0x04 0x02 0xfc 0x01 0x06 0x02 0xfc>;
+				phandle = <0xda>;
+			};
+
+			uart4m0-rtsn {
+				rockchip,pins = <0x01 0x05 0x02 0xfa>;
+				phandle = <0x26b>;
+			};
+		};
+
+		mcu {
+
+			mcu-pins {
+				rockchip,pins = <0x00 0x0c 0x04 0xfa 0x00 0x11 0x04 0xfa 0x00 0x0b 0x04 0xfa 0x00 0x12 0x04 0xfa 0x00 0x13 0x04 0xfa>;
+				phandle = <0x21a>;
+			};
+		};
+
+		pwm3 {
+
+			pwm3-pins {
+				rockchip,pins = <0x00 0x12 0x01 0xfa>;
+				phandle = <0x45>;
+			};
+		};
+
+		pcfg-pull-none-drv-level-1 {
+			drive-strength = <0x01>;
+			bias-disable;
+			phandle = <0xfe>;
+		};
+
+		sata2 {
+
+			sata2-pins {
+				rockchip,pins = <0x04 0x14 0x03 0xfa>;
+				phandle = <0x245>;
+			};
+		};
+
+		gpio@fe740000 {
+			gpio-controller;
+			interrupts = <0x00 0x22 0x04>;
+			clocks = <0x1f 0x163 0x1f 0x164>;
+			compatible = "rockchip,gpio-bank";
+			#interrupt-cells = <0x02>;
+			reg = <0x00 0xfe740000 0x00 0x100>;
+			phandle = <0x9c>;
+			#gpio-cells = <0x02>;
+			gpio-ranges = <0xf9 0x00 0x20 0x20>;
+			interrupt-controller;
+		};
+
+		cam {
+
+			cam-clkout0 {
+				rockchip,pins = <0x04 0x07 0x01 0xfa>;
+				phandle = <0x1b3>;
+			};
+
+			cam-clkout1 {
+				rockchip,pins = <0x04 0x08 0x01 0xfa>;
+				phandle = <0x1b4>;
+			};
+		};
+
+		uart2 {
+
+			uart2m1-xfer {
+				rockchip,pins = <0x01 0x1e 0x02 0xfc 0x01 0x1d 0x02 0xfc>;
+				phandle = <0x266>;
+			};
+
+			uart2m0-xfer {
+				rockchip,pins = <0x00 0x18 0x01 0xfc 0x00 0x19 0x01 0xfc>;
+				phandle = <0xd8>;
+			};
+		};
+
+		lcdc {
+
+			lcdc-ctl {
+				rockchip,pins = <0x03 0x00 0x01 0xfa 0x02 0x18 0x01 0xfa 0x02 0x19 0x01 0xfa 0x02 0x1a 0x01 0xfa 0x02 0x1b 0x01 0xfa 0x02 0x1c 0x01 0xfa 0x02 0x1d 0x01 0xfa 0x02 0x1e 0x01 0xfa 0x02 0x1f 0x01 0xfa 0x03 0x01 0x01 0xfa 0x03 0x02 0x01 0xfa 0x03 0x03 0x01 0xfa 0x03 0x04 0x01 0xfa 0x03 0x05 0x01 0xfa 0x03 0x06 0x01 0xfa 0x03 0x07 0x01 0xfa 0x03 0x08 0x01 0xfa 0x03 0x09 0x01 0xfa 0x03 0x0a 0x01 0xfa 0x03 0x0b 0x01 0xfa 0x03 0x0c 0x01 0xfa 0x03 0x0d 0x01 0xfa 0x03 0x0e 0x01 0xfa 0x03 0x0f 0x01 0xfa 0x03 0x10 0x01 0xfa 0x03 0x13 0x01 0xfa 0x03 0x11 0x01 0xfa 0x03 0x12 0x01 0xfa>;
+				phandle = <0x30>;
+			};
+		};
+
+		cpu {
+
+			cpu-pins {
+				rockchip,pins = <0x00 0x0f 0x02 0xfa>;
+				phandle = <0x1c1>;
+			};
+		};
+
+		gpio-func {
+
+			tsadc-gpio-func {
+				rockchip,pins = <0x00 0x01 0x00 0xfa>;
+				phandle = <0xec>;
+			};
+		};
+
+		sdmmc1 {
+
+			sdmmc1-cmd {
+				rockchip,pins = <0x02 0x07 0x01 0xfb>;
+				phandle = <0xa4>;
+			};
+
+			sdmmc1-clk {
+				rockchip,pins = <0x02 0x08 0x01 0xfb>;
+				phandle = <0xa5>;
+			};
+
+			sdmmc1-bus4 {
+				rockchip,pins = <0x02 0x03 0x01 0xfb 0x02 0x04 0x01 0xfb 0x02 0x05 0x01 0xfb 0x02 0x06 0x01 0xfb>;
+				phandle = <0xa3>;
+			};
+
+			sdmmc1-det {
+				rockchip,pins = <0x02 0x0a 0x01 0xfc>;
+				phandle = <0x247>;
+			};
+
+			sdmmc1-pwren {
+				rockchip,pins = <0x02 0x09 0x01 0xfa>;
+				phandle = <0x248>;
+			};
+		};
+
+		pwm1 {
+
+			pwm1m1-pins {
+				rockchip,pins = <0x00 0x0d 0x04 0xfa>;
+				phandle = <0x237>;
+			};
+
+			pwm1m0-pins {
+				rockchip,pins = <0x00 0x10 0x01 0xfa>;
+				phandle = <0x43>;
+			};
+		};
+
+		sata0 {
+
+			sata0-pins {
+				rockchip,pins = <0x04 0x16 0x03 0xfa>;
+				phandle = <0x243>;
+			};
+		};
+
+		refclk {
+
+			refclk-pins {
+				rockchip,pins = <0x00 0x00 0x01 0xfa>;
+				phandle = <0x241>;
+			};
+		};
+
+		can2 {
+
+			can2m1-pins {
+				rockchip,pins = <0x02 0x09 0x04 0xfa 0x02 0x0a 0x04 0xfa>;
+				phandle = <0x1ba>;
+			};
+
+			can2m0-pins {
+				rockchip,pins = <0x04 0x0c 0x03 0xfa 0x04 0x0d 0x03 0xfa>;
+				phandle = <0x1b9>;
+			};
+		};
+
+		sata {
+
+			sata-pins {
+				rockchip,pins = <0x00 0x04 0x02 0xfa 0x00 0x06 0x01 0xfa 0x00 0x05 0x02 0xfa>;
+				phandle = <0x242>;
+			};
+		};
+
+		audiopwm {
+
+			audiopwm-routn {
+				rockchip,pins = <0x01 0x07 0x04 0xfa>;
+				phandle = <0x1ae>;
+			};
+
+			audiopwm-lout {
+				rockchip,pins = <0x01 0x00 0x04 0xfa>;
+				phandle = <0x1aa>;
+			};
+
+			audiopwm-routp {
+				rockchip,pins = <0x01 0x06 0x04 0xfa>;
+				phandle = <0x1af>;
+			};
+
+			audiopwm-loutn {
+				rockchip,pins = <0x01 0x01 0x06 0xfa>;
+				phandle = <0x1ab>;
+			};
+
+			audiopwm-loutp {
+				rockchip,pins = <0x01 0x00 0x06 0xfa>;
+				phandle = <0x1ac>;
+			};
+
+			audiopwm-rout {
+				rockchip,pins = <0x01 0x01 0x04 0xfa>;
+				phandle = <0x1ad>;
+			};
+		};
+
+		edpdp {
+
+			edpdpm1-pins {
+				rockchip,pins = <0x00 0x12 0x02 0xfa>;
+				phandle = <0x1c4>;
+			};
+
+			edpdpm0-pins {
+				rockchip,pins = <0x04 0x14 0x01 0xfa>;
+				phandle = <0x1c3>;
+			};
+		};
+
+		tsadc {
+
+			tsadc-shutorg {
+				rockchip,pins = <0x00 0x01 0x02 0xfa>;
+				phandle = <0xed>;
+			};
+
+			tsadcm1-shut {
+				rockchip,pins = <0x00 0x02 0x02 0xfa>;
+				phandle = <0x260>;
+			};
+
+			tsadcm0-shut {
+				rockchip,pins = <0x00 0x01 0x01 0xfa>;
+				phandle = <0x25f>;
+			};
+		};
+
+		uart0 {
+
+			uart0-rtsn {
+				rockchip,pins = <0x00 0x14 0x03 0xfa>;
+				phandle = <0x262>;
+			};
+
+			uart0-ctsn {
+				rockchip,pins = <0x00 0x17 0x03 0xfa>;
+				phandle = <0x261>;
+			};
+
+			uart0-xfer {
+				rockchip,pins = <0x00 0x10 0x03 0xfc 0x00 0x11 0x03 0xfc>;
+				phandle = <0x41>;
+			};
+		};
+
+		eth1 {
+
+			eth1m1-pins {
+				rockchip,pins = <0x04 0x0b 0x03 0xfa>;
+				phandle = <0x1cc>;
+			};
+
+			eth1m0-pins {
+				rockchip,pins = <0x03 0x08 0x03 0xfa>;
+				phandle = <0x1cb>;
+			};
+		};
+
+		i2c4 {
+
+			i2c4m1-xfer {
+				rockchip,pins = <0x02 0x0a 0x02 0xff 0x02 0x09 0x02 0xff>;
+				phandle = <0x1e4>;
+			};
+
+			i2c4m0-xfer {
+				rockchip,pins = <0x04 0x0b 0x01 0xff 0x04 0x0a 0x01 0xff>;
+				phandle = <0xc4>;
+			};
+		};
+
+		emmc {
+
+			emmc-clk {
+				rockchip,pins = <0x01 0x15 0x01 0xfb>;
+				phandle = <0x1c7>;
+			};
+
+			emmc-datastrobe {
+				rockchip,pins = <0x01 0x16 0x01 0xfa>;
+				phandle = <0x1c9>;
+			};
+
+			emmc-bus8 {
+				rockchip,pins = <0x01 0x0c 0x01 0xfb 0x01 0x0d 0x01 0xfb 0x01 0x0e 0x01 0xfb 0x01 0x0f 0x01 0xfb 0x01 0x10 0x01 0xfb 0x01 0x11 0x01 0xfb 0x01 0x12 0x01 0xfb 0x01 0x13 0x01 0xfb>;
+				phandle = <0x1c6>;
+			};
+
+			emmc-cmd {
+				rockchip,pins = <0x01 0x14 0x01 0xfb>;
+				phandle = <0x1c8>;
+			};
+
+			emmc-rstnout {
+				rockchip,pins = <0x01 0x17 0x01 0xfa>;
+				phandle = <0x1c5>;
+			};
+		};
+
+		pwm15 {
+
+			pwm15m0-pins {
+				rockchip,pins = <0x03 0x15 0x01 0xfa>;
+				phandle = <0xeb>;
+			};
+
+			pwm15m1-pins {
+				rockchip,pins = <0x04 0x13 0x01 0xfa>;
+				phandle = <0x240>;
+			};
+		};
+
+		spdif {
+
+			spdifm1-tx {
+				rockchip,pins = <0x03 0x15 0x02 0xfa>;
+				phandle = <0x253>;
+			};
+
+			spdifm0-tx {
+				rockchip,pins = <0x01 0x04 0x04 0xfa>;
+				phandle = <0xb9>;
+			};
+
+			spdifm2-tx {
+				rockchip,pins = <0x04 0x14 0x02 0xfa>;
+				phandle = <0x254>;
+			};
+		};
+
+		pcie30x2 {
+
+			pcie30x2m2-pins {
+				rockchip,pins = <0x04 0x12 0x04 0xfa 0x04 0x14 0x04 0xfa 0x04 0x13 0x04 0xfa>;
+				phandle = <0x226>;
+			};
+
+			pcie30x2m1-pins {
+				rockchip,pins = <0x02 0x1c 0x04 0xfa 0x02 0x1e 0x04 0xfa 0x02 0x1d 0x04 0xfa>;
+				phandle = <0x225>;
+			};
+
+			pcie30x2-buttonrstn {
+				rockchip,pins = <0x00 0x08 0x03 0xfa>;
+				phandle = <0x227>;
+			};
+
+			pcie30x2m0-pins {
+				rockchip,pins = <0x00 0x06 0x02 0xfa 0x00 0x16 0x03 0xfa 0x00 0x15 0x03 0xfa>;
+				phandle = <0x224>;
+			};
+		};
+
+		can0 {
+
+			can0m0-pins {
+				rockchip,pins = <0x00 0x0c 0x02 0xfa 0x00 0x0b 0x02 0xfa>;
+				phandle = <0x1b5>;
+			};
+
+			can0m1-pins {
+				rockchip,pins = <0x02 0x02 0x04 0xfa 0x02 0x01 0x04 0xfa>;
+				phandle = <0x1b6>;
+			};
+		};
+
+		uart9 {
+
+			uart9m0-rtsn {
+				rockchip,pins = <0x02 0x13 0x03 0xfa>;
+				phandle = <0x27b>;
+			};
+
+			uart9m2-xfer {
+				rockchip,pins = <0x04 0x05 0x04 0xfc 0x04 0x04 0x04 0xfc>;
+				phandle = <0x27d>;
+			};
+
+			uart9m0-ctsn {
+				rockchip,pins = <0x02 0x14 0x03 0xfa>;
+				phandle = <0x27a>;
+			};
+
+			uart9m1-xfer {
+				rockchip,pins = <0x04 0x16 0x04 0xfc 0x04 0x15 0x04 0xfc>;
+				phandle = <0x27c>;
+			};
+
+			uart9m0-xfer {
+				rockchip,pins = <0x02 0x07 0x03 0xfc 0x02 0x08 0x03 0xfc>;
+				phandle = <0xdf>;
+			};
+		};
+
+		pcfg-pull-up {
+			phandle = <0xfc>;
+			bias-pull-up;
+		};
+
+		spi3 {
+
+			spi3m1-cs0 {
+				rockchip,pins = <0x04 0x16 0x02 0xfa>;
+				phandle = <0x25d>;
+			};
+
+			spi3m0-cs1 {
+				rockchip,pins = <0x04 0x07 0x04 0xfa>;
+				phandle = <0xd3>;
+			};
+
+			spi3m1-cs1 {
+				rockchip,pins = <0x04 0x19 0x02 0xfa>;
+				phandle = <0x25e>;
+			};
+
+			spi3m1-pins {
+				rockchip,pins = <0x04 0x12 0x02 0xfa 0x04 0x15 0x02 0xfa 0x04 0x13 0x02 0xfa>;
+				phandle = <0x25c>;
+			};
+
+			spi3m0-pins {
+				rockchip,pins = <0x04 0x0b 0x04 0xfa 0x04 0x08 0x04 0xfa 0x04 0x0a 0x04 0xfa>;
+				phandle = <0xd4>;
+			};
+
+			spi3m0-cs0 {
+				rockchip,pins = <0x04 0x06 0x04 0xfa>;
+				phandle = <0xd2>;
+			};
+		};
+
+		spi1-hs {
+
+			spi1m0-cs0 {
+				rockchip,pins = <0x02 0x10 0x04 0x102>;
+				phandle = <0x284>;
+			};
+
+			spi1m1-pins {
+				rockchip,pins = <0x03 0x13 0x03 0x102 0x03 0x12 0x03 0x102 0x03 0x11 0x03 0x102>;
+				phandle = <0x286>;
+			};
+
+			spi1m1-cs0 {
+				rockchip,pins = <0x03 0x01 0x03 0x102>;
+				phandle = <0x287>;
+			};
+
+			spi1m0-pins {
+				rockchip,pins = <0x02 0x0d 0x03 0x102 0x02 0x0e 0x03 0x102 0x02 0x0f 0x04 0x102>;
+				phandle = <0xcd>;
+			};
+
+			spi1m0-cs1 {
+				rockchip,pins = <0x02 0x16 0x03 0x102>;
+				phandle = <0x285>;
+			};
+		};
+
+		bt656 {
+
+			bt656m1-pins {
+				rockchip,pins = <0x04 0x0c 0x05 0xfa 0x03 0x16 0x05 0xfa 0x03 0x17 0x05 0xfa 0x03 0x18 0x05 0xfa 0x03 0x19 0x05 0xfa 0x03 0x1a 0x05 0xfa 0x03 0x1b 0x05 0xfa 0x03 0x1c 0x05 0xfa 0x03 0x1d 0x05 0xfa>;
+				phandle = <0x1b1>;
+			};
+
+			bt656m0-pins {
+				rockchip,pins = <0x03 0x00 0x02 0xfa 0x02 0x18 0x02 0xfa 0x02 0x19 0x02 0xfa 0x02 0x1a 0x02 0xfa 0x02 0x1b 0x02 0xfa 0x02 0x1c 0x02 0xfa 0x02 0x1d 0x02 0xfa 0x02 0x1e 0x02 0xfa 0x02 0x1f 0x02 0xfa>;
+				phandle = <0x1b0>;
+			};
+		};
+
+		i2s2 {
+
+			i2s2m1-mclk {
+				rockchip,pins = <0x04 0x0e 0x05 0xfa>;
+				phandle = <0x20d>;
+			};
+
+			i2s2m0-mclk {
+				rockchip,pins = <0x02 0x11 0x01 0xfa>;
+				phandle = <0x209>;
+			};
+
+			i2s2m1-sdo {
+				rockchip,pins = <0x04 0x0b 0x05 0xfa>;
+				phandle = <0x211>;
+			};
+
+			i2s2m0-lrcktx {
+				rockchip,pins = <0x02 0x13 0x01 0xfa>;
+				phandle = <0xac>;
+			};
+
+			i2s2m0-sdi {
+				rockchip,pins = <0x02 0x15 0x01 0xfa>;
+				phandle = <0xad>;
+			};
+
+			i2s2m1-lrcktx {
+				rockchip,pins = <0x04 0x04 0x05 0xfa>;
+				phandle = <0x20c>;
+			};
+
+			i2s2m0-lrckrx {
+				rockchip,pins = <0x02 0x10 0x01 0xfa>;
+				phandle = <0x208>;
+			};
+
+			i2s2m1-lrckrx {
+				rockchip,pins = <0x04 0x05 0x05 0xfa>;
+				phandle = <0x20b>;
+			};
+
+			i2s2m0-sclktx {
+				rockchip,pins = <0x02 0x12 0x01 0xfa>;
+				phandle = <0xab>;
+			};
+
+			i2s2m1-sclktx {
+				rockchip,pins = <0x04 0x0f 0x04 0xfa>;
+				phandle = <0x20f>;
+			};
+
+			i2s2m0-sclkrx {
+				rockchip,pins = <0x02 0x0f 0x01 0xfa>;
+				phandle = <0x20a>;
+			};
+
+			i2s2m1-sclkrx {
+				rockchip,pins = <0x04 0x11 0x05 0xfa>;
+				phandle = <0x20e>;
+			};
+
+			i2s2m1-sdi {
+				rockchip,pins = <0x04 0x0a 0x05 0xfa>;
+				phandle = <0x210>;
+			};
+
+			i2s2m0-sdo {
+				rockchip,pins = <0x02 0x14 0x01 0xfa>;
+				phandle = <0xae>;
+			};
+		};
+
+		i2c2 {
+
+			i2c2m1-xfer {
+				rockchip,pins = <0x04 0x0d 0x01 0xff 0x04 0x0c 0x01 0xff>;
+				phandle = <0x1e2>;
+			};
+
+			i2c2m0-xfer {
+				rockchip,pins = <0x00 0x0d 0x01 0xff 0x00 0x0e 0x01 0xff>;
+				phandle = <0xbf>;
+			};
+		};
+
+		gmac-txd-level3 {
+
+			gmac1m1-rgmii-bus-level3 {
+				rockchip,pins = <0x04 0x01 0x03 0xfa 0x04 0x02 0x03 0xfa 0x03 0x1e 0x03 0x103 0x03 0x1f 0x03 0x103>;
+				phandle = <0x297>;
+			};
+
+			gmac1m1-tx-bus2-level3 {
+				rockchip,pins = <0x04 0x04 0x03 0x103 0x04 0x05 0x03 0x103 0x04 0x06 0x03 0xfa>;
+				phandle = <0x296>;
+			};
+
+			gmac1m0-rgmii-bus-level3 {
+				rockchip,pins = <0x03 0x04 0x03 0xfa 0x03 0x05 0x03 0xfa 0x03 0x02 0x03 0x103 0x03 0x03 0x03 0x103>;
+				phandle = <0x295>;
+			};
+
+			gmac1m0-tx-bus2-level3 {
+				rockchip,pins = <0x03 0x0d 0x03 0x103 0x03 0x0e 0x03 0x103 0x03 0x0f 0x03 0xfa>;
+				phandle = <0x294>;
+			};
+
+			gmac0-tx-bus2-level3 {
+				rockchip,pins = <0x02 0x0b 0x01 0x103 0x02 0x0c 0x01 0x103 0x02 0x0d 0x01 0xfa>;
+				phandle = <0x292>;
+			};
+
+			gmac0-rgmii-bus-level3 {
+				rockchip,pins = <0x02 0x03 0x02 0xfa 0x02 0x04 0x02 0xfa 0x02 0x06 0x02 0x103 0x02 0x07 0x02 0x103>;
+				phandle = <0x293>;
+			};
+		};
+
+		pwm8 {
+
+			pwm8m1-pins {
+				rockchip,pins = <0x01 0x1d 0x04 0xfa>;
+				phandle = <0x239>;
+			};
+
+			pwm8m0-pins {
+				rockchip,pins = <0x03 0x09 0x05 0xfa>;
+				phandle = <0xe4>;
+			};
+		};
+
+		pmic {
+
+			pmic-pins {
+				rockchip,pins = <0x00 0x02 0x01 0xfa>;
+				phandle = <0x233>;
+			};
+
+			soc_slppin_gpio {
+				rockchip,pins = <0x00 0x02 0x00 0x100>;
+				phandle = <0x3a>;
+			};
+
+			soc_slppin_slp {
+				rockchip,pins = <0x00 0x02 0x01 0xfc>;
+				phandle = <0x38>;
+			};
+
+			pmic_int {
+				rockchip,pins = <0x00 0x03 0x00 0xfc>;
+				phandle = <0x37>;
+			};
+
+			soc_slppin_rst {
+				rockchip,pins = <0x00 0x02 0x02 0xfa>;
+				phandle = <0x234>;
+			};
+		};
+
+		jtag {
+
+			jtag-pins {
+				rockchip,pins = <0x01 0x1f 0x02 0xfa 0x02 0x00 0x02 0xfa>;
+				phandle = <0x219>;
+			};
+		};
+
+		gmac1 {
+
+			gmac1m1-clkinout {
+				rockchip,pins = <0x04 0x11 0x03 0xfa>;
+				phandle = <0x1de>;
+			};
+
+			gmac1m1-rx-er {
+				rockchip,pins = <0x04 0x0a 0x03 0xfa>;
+				phandle = <0x1df>;
+			};
+
+			gmac1m1-rgmii-clk {
+				rockchip,pins = <0x04 0x03 0x03 0xfa 0x04 0x00 0x03 0xfe>;
+				phandle = <0x7f>;
+			};
+
+			gmac1m1-miim {
+				rockchip,pins = <0x04 0x0e 0x03 0xfa 0x04 0x0f 0x03 0xfa>;
+				phandle = <0x7c>;
+			};
+
+			gmac1m0-rx-bus2 {
+				rockchip,pins = <0x03 0x09 0x03 0xfa 0x03 0x0a 0x03 0xfa 0x03 0x0b 0x03 0xfa>;
+				phandle = <0x1da>;
+			};
+
+			gmac1m0-rgmii-bus {
+				rockchip,pins = <0x03 0x04 0x03 0xfa 0x03 0x05 0x03 0xfa 0x03 0x02 0x03 0xfd 0x03 0x03 0x03 0xfd>;
+				phandle = <0x1dd>;
+			};
+
+			gmac1m0-miim {
+				rockchip,pins = <0x03 0x14 0x03 0xfa 0x03 0x15 0x03 0xfa>;
+				phandle = <0x1d7>;
+			};
+
+			gmac1m1-tx-bus2 {
+				rockchip,pins = <0x04 0x04 0x03 0xfd 0x04 0x05 0x03 0xfd 0x04 0x06 0x03 0xfa>;
+				phandle = <0x7d>;
+			};
+
+			gmac1m1-rgmii-bus {
+				rockchip,pins = <0x04 0x01 0x03 0xfa 0x04 0x02 0x03 0xfa 0x03 0x1e 0x03 0xfd 0x03 0x1f 0x03 0xfd>;
+				phandle = <0x80>;
+			};
+
+			gmac1m0-rgmii-clk {
+				rockchip,pins = <0x03 0x07 0x03 0xfa 0x03 0x06 0x03 0xfe>;
+				phandle = <0x1dc>;
+			};
+
+			gmac1m0-clkinout {
+				rockchip,pins = <0x03 0x10 0x03 0xfa>;
+				phandle = <0x1d8>;
+			};
+
+			gmac1m0-rx-er {
+				rockchip,pins = <0x03 0x0c 0x03 0xfa>;
+				phandle = <0x1d9>;
+			};
+
+			gmac1m0-tx-bus2 {
+				rockchip,pins = <0x03 0x0d 0x03 0xfd 0x03 0x0e 0x03 0xfd 0x03 0x0f 0x03 0xfa>;
+				phandle = <0x1db>;
+			};
+
+			gmac1m1-rx-bus2 {
+				rockchip,pins = <0x04 0x07 0x03 0xfa 0x04 0x08 0x03 0xfa 0x04 0x09 0x03 0xfa>;
+				phandle = <0x7e>;
+			};
+		};
+
+		pcfg-pull-none {
+			bias-disable;
+			phandle = <0xfa>;
+		};
+
+		pwm13 {
+
+			pwm13m1-pins {
+				rockchip,pins = <0x04 0x16 0x01 0xfa>;
+				phandle = <0x23e>;
+			};
+
+			pwm13m0-pins {
+				rockchip,pins = <0x03 0x10 0x02 0xfa>;
+				phandle = <0xe9>;
+			};
+		};
+
+		acodec {
+
+			acodec-pins {
+				rockchip,pins = <0x01 0x09 0x05 0xfa 0x01 0x01 0x05 0xfa 0x01 0x00 0x05 0xfa 0x01 0x07 0x05 0xfa 0x01 0x08 0x05 0xfa 0x01 0x03 0x05 0xfa 0x01 0x05 0x05 0xfa>;
+				phandle = <0xba>;
+			};
+		};
+
+		gpio@fe750000 {
+			gpio-controller;
+			interrupts = <0x00 0x23 0x04>;
+			clocks = <0x1f 0x165 0x1f 0x166>;
+			compatible = "rockchip,gpio-bank";
+			#interrupt-cells = <0x02>;
+			reg = <0x00 0xfe750000 0x00 0x100>;
+			phandle = <0x108>;
+			#gpio-cells = <0x02>;
+			gpio-ranges = <0xf9 0x00 0x40 0x20>;
+			interrupt-controller;
+		};
+
+		uart7 {
+
+			uart7m2-xfer {
+				rockchip,pins = <0x04 0x03 0x04 0xfc 0x04 0x02 0x04 0xfc>;
+				phandle = <0x276>;
+			};
+
+			uart7m0-ctsn {
+				rockchip,pins = <0x02 0x12 0x03 0xfa>;
+				phandle = <0x273>;
+			};
+
+			uart7m1-xfer {
+				rockchip,pins = <0x03 0x15 0x04 0xfc 0x03 0x14 0x04 0xfc>;
+				phandle = <0x275>;
+			};
+
+			uart7m0-xfer {
+				rockchip,pins = <0x02 0x05 0x03 0xfc 0x02 0x06 0x03 0xfc>;
+				phandle = <0xdd>;
+			};
+
+			uart7m0-rtsn {
+				rockchip,pins = <0x02 0x11 0x03 0xfa>;
+				phandle = <0x274>;
+			};
+		};
+
+		spi1 {
+
+			spi1m0-cs0 {
+				rockchip,pins = <0x02 0x10 0x04 0xfa>;
+				phandle = <0xca>;
+			};
+
+			spi1m1-pins {
+				rockchip,pins = <0x03 0x13 0x03 0xfa 0x03 0x12 0x03 0xfa 0x03 0x11 0x03 0xfa>;
+				phandle = <0x257>;
+			};
+
+			spi1m1-cs0 {
+				rockchip,pins = <0x03 0x01 0x03 0xfa>;
+				phandle = <0x258>;
+			};
+
+			spi1m0-pins {
+				rockchip,pins = <0x02 0x0d 0x03 0xfa 0x02 0x0e 0x03 0xfa 0x02 0x0f 0x04 0xfa>;
+				phandle = <0xcc>;
+			};
+
+			spi1m0-cs1 {
+				rockchip,pins = <0x02 0x16 0x03 0xfa>;
+				phandle = <0xcb>;
+			};
+		};
+
+		pcfg-output-low-pull-down {
+			bias-pull-down;
+			phandle = <0x100>;
+			output-low;
+		};
+
+		sdio-pwrseq {
+
+			wifi-enable-h {
+				rockchip,pins = <0x02 0x09 0x00 0xfa>;
+				phandle = <0x107>;
+			};
+		};
+
+		pcfg-pull-up-drv-level-1 {
+			drive-strength = <0x01>;
+			phandle = <0x102>;
+			bias-pull-up;
+		};
+
+		pcfg-pull-none-smt {
+			bias-disable;
+			input-schmitt-enable;
+			phandle = <0xff>;
+		};
+
+		i2c0 {
+
+			i2c0-xfer {
+				rockchip,pins = <0x00 0x09 0x01 0xff 0x00 0x0a 0x01 0xff>;
+				phandle = <0x34>;
+			};
+		};
+
+		pwm6 {
+
+			pwm6-pins {
+				rockchip,pins = <0x00 0x15 0x01 0xfa>;
+				phandle = <0xe2>;
+			};
+		};
+
+		pwm11 {
+
+			pwm11m1-pins {
+				rockchip,pins = <0x04 0x10 0x03 0xfa>;
+				phandle = <0x23c>;
+			};
+
+			pwm11m0-pins {
+				rockchip,pins = <0x03 0x0e 0x05 0xfa>;
+				phandle = <0xe7>;
+			};
+		};
+
+		bt1120 {
+
+			bt1120-pins {
+				rockchip,pins = <0x03 0x06 0x02 0xfa 0x03 0x01 0x02 0xfa 0x03 0x02 0x02 0xfa 0x03 0x03 0x02 0xfa 0x03 0x04 0x02 0xfa 0x03 0x05 0x02 0xfa 0x03 0x07 0x02 0xfa 0x03 0x08 0x02 0xfa 0x03 0x09 0x02 0xfa 0x03 0x0a 0x02 0xfa 0x03 0x0b 0x02 0xfa 0x03 0x0c 0x02 0xfa 0x03 0x0d 0x02 0xfa 0x03 0x0e 0x02 0xfa 0x03 0x11 0x02 0xfa 0x03 0x12 0x02 0xfa 0x03 0x13 0x02 0xfa>;
+				phandle = <0x1b2>;
+			};
+		};
+
+		uart5 {
+
+			uart5m0-ctsn {
+				rockchip,pins = <0x01 0x1f 0x03 0xfa>;
+				phandle = <0x26d>;
+			};
+
+			uart5m1-xfer {
+				rockchip,pins = <0x03 0x13 0x04 0xfc 0x03 0x12 0x04 0xfc>;
+				phandle = <0x26f>;
+			};
+
+			uart5m0-xfer {
+				rockchip,pins = <0x02 0x01 0x03 0xfc 0x02 0x02 0x03 0xfc>;
+				phandle = <0xdb>;
+			};
+
+			uart5m0-rtsn {
+				rockchip,pins = <0x02 0x00 0x03 0xfa>;
+				phandle = <0x26e>;
+			};
+		};
+
+		flash {
+
+			flash-pins {
+				rockchip,pins = <0x01 0x18 0x02 0xfa 0x01 0x16 0x03 0xfa 0x01 0x1b 0x02 0xfa 0x01 0x1c 0x02 0xfa 0x01 0x0c 0x02 0xfa 0x01 0x0d 0x02 0xfa 0x01 0x0e 0x02 0xfa 0x01 0x0f 0x02 0xfa 0x01 0x10 0x02 0xfa 0x01 0x11 0x02 0xfa 0x01 0x12 0x02 0xfa 0x01 0x13 0x02 0xfa 0x01 0x15 0x02 0xfa 0x01 0x1a 0x02 0xfa 0x01 0x19 0x02 0xfa 0x00 0x07 0x01 0xfa 0x01 0x17 0x03 0xfa 0x01 0x14 0x02 0xfa>;
+				phandle = <0x1cd>;
+			};
+		};
+
+		vop {
+
+			vopm0-pins {
+				rockchip,pins = <0x00 0x13 0x02 0xfa>;
+				phandle = <0x27e>;
+			};
+
+			vopm1-pins {
+				rockchip,pins = <0x03 0x14 0x02 0xfa>;
+				phandle = <0x27f>;
+			};
+		};
+
+		pwm4 {
+
+			pwm4-pins {
+				rockchip,pins = <0x00 0x13 0x01 0xfa>;
+				phandle = <0xe0>;
+			};
+		};
+
+		pcfg-pull-none-drv-level-2 {
+			drive-strength = <0x02>;
+			bias-disable;
+			phandle = <0xfd>;
+		};
+
+		uart3 {
+
+			uart3m0-ctsn {
+				rockchip,pins = <0x01 0x03 0x02 0xfa>;
+				phandle = <0x267>;
+			};
+
+			uart3m1-xfer {
+				rockchip,pins = <0x03 0x10 0x04 0xfc 0x03 0x0f 0x04 0xfc>;
+				phandle = <0x269>;
+			};
+
+			uart3m0-xfer {
+				rockchip,pins = <0x01 0x00 0x02 0xfc 0x01 0x01 0x02 0xfc>;
+				phandle = <0xd9>;
+			};
+
+			uart3m0-rtsn {
+				rockchip,pins = <0x01 0x02 0x02 0xfa>;
+				phandle = <0x268>;
+			};
+		};
+
+		hdmitx {
+
+			hdmitx-scl {
+				rockchip,pins = <0x04 0x17 0x01 0xfa>;
+				phandle = <0x91>;
+			};
+
+			hdmitx-sda {
+				rockchip,pins = <0x04 0x18 0x01 0xfa>;
+				phandle = <0x92>;
+			};
+
+			hdmitxm0-cec {
+				rockchip,pins = <0x04 0x19 0x01 0xfa>;
+				phandle = <0x93>;
+			};
+
+			hdmitxm1-cec {
+				rockchip,pins = <0x00 0x17 0x01 0xfa>;
+				phandle = <0x1e1>;
+			};
+		};
+
+		sdmmc2 {
+
+			sdmmc2m1-clk {
+				rockchip,pins = <0x03 0x06 0x05 0xfb>;
+				phandle = <0x24f>;
+			};
+
+			sdmmc2m0-det {
+				rockchip,pins = <0x03 0x1c 0x03 0xfc>;
+				phandle = <0x24c>;
+			};
+
+			sdmmc2m0-pwren {
+				rockchip,pins = <0x03 0x1d 0x03 0xfa>;
+				phandle = <0x24d>;
+			};
+
+			sdmmc2m1-det {
+				rockchip,pins = <0x03 0x07 0x04 0xfc>;
+				phandle = <0x251>;
+			};
+
+			sdmmc2m0-cmd {
+				rockchip,pins = <0x03 0x1a 0x03 0xfb>;
+				phandle = <0x24b>;
+			};
+
+			sdmmc2m1-pwren {
+				rockchip,pins = <0x03 0x08 0x04 0xfa>;
+				phandle = <0x252>;
+			};
+
+			sdmmc2m1-bus4 {
+				rockchip,pins = <0x03 0x01 0x05 0xfb 0x03 0x02 0x05 0xfb 0x03 0x03 0x05 0xfb 0x03 0x04 0x05 0xfb>;
+				phandle = <0x24e>;
+			};
+
+			sdmmc2m0-clk {
+				rockchip,pins = <0x03 0x1b 0x03 0xfb>;
+				phandle = <0x24a>;
+			};
+
+			sdmmc2m1-cmd {
+				rockchip,pins = <0x03 0x05 0x05 0xfb>;
+				phandle = <0x250>;
+			};
+
+			sdmmc2m0-bus4 {
+				rockchip,pins = <0x03 0x16 0x03 0xfb 0x03 0x17 0x03 0xfb 0x03 0x18 0x03 0xfb 0x03 0x19 0x03 0xfb>;
+				phandle = <0x249>;
+			};
+		};
+
+		gpio@fe760000 {
+			gpio-controller;
+			interrupts = <0x00 0x24 0x04>;
+			clocks = <0x1f 0x167 0x1f 0x168>;
+			compatible = "rockchip,gpio-bank";
+			#interrupt-cells = <0x02>;
+			reg = <0x00 0xfe760000 0x00 0x100>;
+			phandle = <0xc2>;
+			#gpio-cells = <0x02>;
+			gpio-ranges = <0xf9 0x00 0x60 0x20>;
+			interrupt-controller;
+		};
+
+		spi3-hs {
+
+			spi3m1-cs0 {
+				rockchip,pins = <0x04 0x16 0x02 0x102>;
+				phandle = <0x290>;
+			};
+
+			spi3m0-cs1 {
+				rockchip,pins = <0x04 0x07 0x04 0x102>;
+				phandle = <0x28e>;
+			};
+
+			spi3m1-cs1 {
+				rockchip,pins = <0x04 0x19 0x02 0x102>;
+				phandle = <0x291>;
+			};
+
+			spi3m1-pins {
+				rockchip,pins = <0x04 0x12 0x02 0x102 0x04 0x15 0x02 0x102 0x04 0x13 0x02 0x102>;
+				phandle = <0x28f>;
+			};
+
+			spi3m0-pins {
+				rockchip,pins = <0x04 0x0b 0x04 0x102 0x04 0x08 0x04 0x102 0x04 0x0a 0x04 0x102>;
+				phandle = <0xd5>;
+			};
+
+			spi3m0-cs0 {
+				rockchip,pins = <0x04 0x06 0x04 0x102>;
+				phandle = <0x28d>;
+			};
+		};
+
+		pwm2 {
+
+			pwm2m1-pins {
+				rockchip,pins = <0x00 0x0e 0x04 0xfa>;
+				phandle = <0x238>;
+			};
+
+			pwm2m0-pins {
+				rockchip,pins = <0x00 0x11 0x01 0xfa>;
+				phandle = <0x44>;
+			};
+		};
+
+		sata1 {
+
+			sata1-pins {
+				rockchip,pins = <0x04 0x15 0x03 0xfa>;
+				phandle = <0x244>;
+			};
+		};
+
+		spi0-hs {
+
+			spi0m0-cs0 {
+				rockchip,pins = <0x00 0x16 0x02 0x102>;
+				phandle = <0x280>;
+			};
+
+			spi0m1-cs0 {
+				rockchip,pins = <0x02 0x1a 0x03 0x102>;
+				phandle = <0x283>;
+			};
+
+			spi0m1-pins {
+				rockchip,pins = <0x02 0x1b 0x03 0x102 0x02 0x18 0x03 0x102 0x02 0x19 0x03 0x102>;
+				phandle = <0x282>;
+			};
+
+			spi0m0-cs1 {
+				rockchip,pins = <0x00 0x14 0x02 0x102>;
+				phandle = <0x281>;
+			};
+
+			spi0m0-pins {
+				rockchip,pins = <0x00 0x0d 0x02 0x102 0x00 0x15 0x02 0x102 0x00 0x0e 0x02 0x102>;
+				phandle = <0xc9>;
+			};
+		};
+
+		pmu {
+
+			pmu-pins {
+				rockchip,pins = <0x00 0x05 0x04 0xfa 0x00 0x06 0x03 0xfa 0x00 0x14 0x04 0xfa 0x00 0x15 0x04 0xfa 0x00 0x16 0x04 0xfa 0x00 0x17 0x04 0xfa>;
+				phandle = <0x235>;
+			};
+		};
+
+		scr {
+
+			scr-pins {
+				rockchip,pins = <0x01 0x02 0x03 0xfa 0x01 0x07 0x03 0xfc 0x01 0x03 0x03 0xfc 0x01 0x05 0x03 0xfa>;
+				phandle = <0xbb>;
+			};
+		};
+
+		uart1 {
+
+			uart1m0-ctsn {
+				rockchip,pins = <0x02 0x0e 0x02 0xfa>;
+				phandle = <0xd7>;
+			};
+
+			uart1m1-xfer {
+				rockchip,pins = <0x03 0x1f 0x04 0xfc 0x03 0x1e 0x04 0xfc>;
+				phandle = <0x263>;
+			};
+
+			uart1m0-xfer {
+				rockchip,pins = <0x02 0x0b 0x02 0xfc 0x02 0x0c 0x02 0xfc>;
+				phandle = <0xd6>;
+			};
+
+			uart1m1-rtsn {
+				rockchip,pins = <0x04 0x0e 0x04 0xfa>;
+				phandle = <0x265>;
+			};
+
+			uart1m0-rtsn {
+				rockchip,pins = <0x02 0x0d 0x02 0xfa>;
+				phandle = <0x10a>;
+			};
+
+			uart1m1-ctsn {
+				rockchip,pins = <0x04 0x11 0x04 0xfa>;
+				phandle = <0x264>;
+			};
+		};
+
+		i2c5 {
+
+			i2c5m1-xfer {
+				rockchip,pins = <0x04 0x17 0x02 0xff 0x04 0x18 0x02 0xff>;
+				phandle = <0x1e5>;
+			};
+
+			i2c5m0-xfer {
+				rockchip,pins = <0x03 0x0b 0x04 0xff 0x03 0x0c 0x04 0xff>;
+				phandle = <0xc5>;
+			};
+		};
+
+		sdmmc0 {
+
+			sdmmc0-det {
+				rockchip,pins = <0x00 0x04 0x01 0xfc>;
+				phandle = <0xa1>;
+			};
+
+			sdmmc0-pwren {
+				rockchip,pins = <0x00 0x05 0x01 0xfa>;
+				phandle = <0x246>;
+			};
+
+			sdmmc0-bus4 {
+				rockchip,pins = <0x01 0x1d 0x01 0xfb 0x01 0x1e 0x01 0xfb 0x01 0x1f 0x01 0xfb 0x02 0x00 0x01 0xfb>;
+				phandle = <0x9e>;
+			};
+
+			sdmmc0-cmd {
+				rockchip,pins = <0x02 0x01 0x01 0xfb>;
+				phandle = <0xa0>;
+			};
+
+			sdmmc0-clk {
+				rockchip,pins = <0x02 0x02 0x01 0xfb>;
+				phandle = <0x9f>;
+			};
+		};
+
+		pwm0 {
+
+			pwm0m1-pins {
+				rockchip,pins = <0x00 0x17 0x02 0xfa>;
+				phandle = <0x236>;
+			};
+
+			pwm0m0-pins {
+				rockchip,pins = <0x00 0x0f 0x01 0xfa>;
+				phandle = <0x42>;
+			};
+		};
+
+		cif {
+
+			cif-dvp-clk {
+				rockchip,pins = <0x04 0x11 0x01 0xfa 0x04 0x0e 0x01 0xfa 0x04 0x0f 0x01 0xfa>;
+				phandle = <0x1bc>;
+			};
+
+			cif-clk {
+				rockchip,pins = <0x04 0x10 0x01 0xfa>;
+				phandle = <0x1bb>;
+			};
+
+			cif-dvp-bus8 {
+				rockchip,pins = <0x03 0x16 0x01 0xfa 0x03 0x17 0x01 0xfa 0x03 0x18 0x01 0xfa 0x03 0x19 0x01 0xfa 0x03 0x1a 0x01 0xfa 0x03 0x1b 0x01 0xfa 0x03 0x1c 0x01 0xfa 0x03 0x1d 0x01 0xfa>;
+				phandle = <0x1be>;
+			};
+
+			cif-dvp-bus16 {
+				rockchip,pins = <0x03 0x1e 0x01 0xfa 0x03 0x1f 0x01 0xfa 0x04 0x00 0x01 0xfa 0x04 0x01 0x01 0xfa 0x04 0x02 0x01 0xfa 0x04 0x03 0x01 0xfa 0x04 0x04 0x01 0xfa 0x04 0x05 0x01 0xfa>;
+				phandle = <0x1bd>;
+			};
+		};
+
+		can1 {
+
+			can1m1-pins {
+				rockchip,pins = <0x04 0x12 0x03 0xfa 0x04 0x13 0x03 0xfa>;
+				phandle = <0x1b8>;
+			};
+
+			can1m0-pins {
+				rockchip,pins = <0x01 0x00 0x03 0xfa 0x01 0x01 0x03 0xfa>;
+				phandle = <0x1b7>;
+			};
+		};
+
+		pcie20 {
+
+			pcie20-buttonrstn {
+				rockchip,pins = <0x00 0x0c 0x03 0xfa>;
+				phandle = <0x21f>;
+			};
+
+			pcie20m2-pins {
+				rockchip,pins = <0x01 0x08 0x04 0xfa 0x01 0x0a 0x04 0xfa 0x01 0x09 0x04 0xfa>;
+				phandle = <0x21e>;
+			};
+
+			pcie20m1-pins {
+				rockchip,pins = <0x02 0x18 0x04 0xfa 0x03 0x11 0x04 0xfa 0x02 0x19 0x04 0xfa>;
+				phandle = <0x21d>;
+			};
+
+			pcie20m0-pins {
+				rockchip,pins = <0x00 0x05 0x03 0xfa 0x00 0x0e 0x03 0xfa 0x00 0x0d 0x03 0xfa>;
+				phandle = <0x21c>;
+			};
+		};
+
+		wireless-wlan {
+
+			wifi-host-wake-irq {
+				rockchip,pins = <0x02 0x0a 0x00 0x101>;
+				phandle = <0x109>;
+			};
+		};
+
+		i2s3 {
+
+			i2s3m0-lrck {
+				rockchip,pins = <0x03 0x04 0x04 0xfa>;
+				phandle = <0xb0>;
+			};
+
+			i2s3m1-mclk {
+				rockchip,pins = <0x04 0x12 0x05 0xfa>;
+				phandle = <0x214>;
+			};
+
+			i2s3m0-sdo {
+				rockchip,pins = <0x03 0x05 0x04 0xfa>;
+				phandle = <0xb2>;
+			};
+
+			i2s3m0-mclk {
+				rockchip,pins = <0x03 0x02 0x04 0xfa>;
+				phandle = <0x212>;
+			};
+
+			i2s3m1-sdo {
+				rockchip,pins = <0x04 0x15 0x05 0xfa>;
+				phandle = <0x217>;
+			};
+
+			i2s3m0-sdi {
+				rockchip,pins = <0x03 0x06 0x04 0xfa>;
+				phandle = <0xb1>;
+			};
+
+			i2s3m1-sclk {
+				rockchip,pins = <0x04 0x13 0x05 0xfa>;
+				phandle = <0x215>;
+			};
+
+			i2s3m1-sdi {
+				rockchip,pins = <0x04 0x16 0x05 0xfa>;
+				phandle = <0x216>;
+			};
+
+			i2s3m1-lrck {
+				rockchip,pins = <0x04 0x14 0x05 0xfa>;
+				phandle = <0x213>;
+			};
+
+			i2s3m0-sclk {
+				rockchip,pins = <0x03 0x03 0x04 0xfa>;
+				phandle = <0xaf>;
+			};
+		};
+	};
+
+	external-camera-imx219-clock {
+		clock-output-names = "ext_cam_imx219_clk";
+		#clock-cells = <0x00>;
+		clock-frequency = <0x17d7840>;
+		compatible = "fixed-clock";
+		phandle = <0xbd>;
+	};
+
+	timer@fe5f0000 {
+		clock-names = "pclk\0timer";
+		interrupts = <0x00 0x6d 0x04>;
+		clocks = <0x1f 0x16c 0x1f 0x16d>;
+		compatible = "rockchip,rk3568-timer\0rockchip,rk3288-timer";
+		reg = <0x00 0xfe5f0000 0x00 0x1000>;
+		phandle = <0x18a>;
+	};
+
+	qos@fe158280 {
+		compatible = "syscon";
+		reg = <0x00 0xfe158280 0x00 0x20>;
+		phandle = <0x52>;
+	};
+
+	serial@fe6a0000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xdc>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x7a 0x04>;
+		clocks = <0x1f 0x133 0x1f 0x130>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfe6a0000 0x00 0x100>;
+		phandle = <0x195>;
+		dmas = <0x40 0x0c 0x40 0x0d>;
+		reg-shift = <0x02>;
+	};
+
+	qos@fe138100 {
+		compatible = "syscon";
+		reg = <0x00 0xfe138100 0x00 0x20>;
+		phandle = <0x57>;
+	};
+
+	interrupt-controller@fd400000 {
+		#address-cells = <0x02>;
+		interrupts = <0x01 0x09 0x04>;
+		#size-cells = <0x02>;
+		compatible = "arm,gic-v3";
+		ranges;
+		#interrupt-cells = <0x03>;
+		reg = <0x00 0xfd400000 0x00 0x10000 0x00 0xfd460000 0x00 0xc0000>;
+		phandle = <0x01>;
+		interrupt-controller;
+
+		interrupt-controller@fd440000 {
+			msi-controller;
+			compatible = "arm,gic-v3-its";
+			reg = <0x00 0xfd440000 0x00 0x20000>;
+			phandle = <0x9b>;
+			#msi-cells = <0x01>;
+		};
+	};
+
+	i2s@fe430000 {
+		pinctrl-names = "default";
+		rockchip,cru = <0x1f>;
+		pinctrl-0 = <0xaf 0xb0 0xb1 0xb2>;
+		clock-names = "mclk_tx\0mclk_rx\0hclk";
+		resets = <0x1f 0x55 0x1f 0x56>;
+		interrupts = <0x00 0x37 0x04>;
+		clocks = <0x1f 0x53 0x1f 0x57 0x1f 0x3c>;
+		dma-names = "tx\0rx";
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-i2s-tdm";
+		status = "disabled";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe430000 0x00 0x1000>;
+		phandle = <0x179>;
+		dmas = <0xa6 0x06 0xa6 0x07>;
+		reset-names = "tx-m\0rx-m";
+		rockchip,clk-trcm = <0x01>;
+	};
+
+	iommu@fdef0800 {
+		power-domains = <0x21 0x0a>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x38 0x04>;
+		clocks = <0x1f 0xf6 0x1f 0xf7>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		status = "okay";
+		interrupt-names = "iep_mmu";
+		reg = <0x00 0xfdef0800 0x00 0x100>;
+		phandle = <0x6c>;
+	};
+
+	rkscr@fe560000 {
+		pinctrl-names = "default";
+		pinctrl-0 = <0xbb>;
+		clock-names = "g_pclk_sim_card";
+		interrupts = <0x00 0x61 0x04>;
+		clocks = <0x1f 0x114>;
+		compatible = "rockchip-scr";
+		status = "disabled";
+		reg = <0x00 0xfe560000 0x00 0x10000>;
+		phandle = <0x17f>;
+	};
+
+	qos@fe1a8080 {
+		compatible = "syscon";
+		reg = <0x00 0xfe1a8080 0x00 0x20>;
+		phandle = <0x4c>;
+	};
+
+	phy@fe830000 {
+		rockchip,pipe-grf = <0xef>;
+		clock-names = "refclk\0apbclk\0pipe_clk";
+		assigned-clocks = <0x31 0x22>;
+		assigned-clock-rates = <0x5f5e100>;
+		resets = <0x1f 0x1c6 0x1f 0x1c7>;
+		clocks = <0x31 0x22 0x1f 0x17d 0x1f 0x7f>;
+		#phy-cells = <0x01>;
+		compatible = "rockchip,rk3568-naneng-combphy";
+		status = "okay";
+		rockchip,pipe-phy-grf = <0xf0>;
+		reg = <0x00 0xfe830000 0x00 0x100>;
+		phandle = <0x20>;
+		reset-names = "combphy-apb\0combphy";
+	};
+
+	watchdog@fe600000 {
+		clock-names = "tclk\0pclk";
+		interrupts = <0x00 0x95 0x04>;
+		clocks = <0x1f 0x116 0x1f 0x115>;
+		compatible = "snps,dw-wdt";
+		status = "okay";
+		reg = <0x00 0xfe600000 0x00 0x100>;
+		phandle = <0x18b>;
+	};
+
+	rkvenc@fdf40000 {
+		power-domains = <0x21 0x0e>;
+		iommus = <0x6d>;
+		clock-names = "aclk_vcodec\0hclk_vcodec\0clk_core";
+		assigned-clocks = <0x1f 0x103 0x1f 0x105>;
+		rockchip,normal-rates = <0x11b3dc40 0x00 0x11b3dc40>;
+		assigned-clock-rates = <0x11b3dc40 0x11b3dc40>;
+		resets = <0x1f 0x133 0x1f 0x134 0x1f 0x135>;
+		interrupts = <0x00 0x8c 0x04>;
+		clocks = <0x1f 0x103 0x1f 0x104 0x1f 0x105>;
+		node-name = "rkvenc";
+		rockchip,srv = <0x68>;
+		rockchip,taskqueue-node = <0x03>;
+		compatible = "rockchip,rkv-encoder-v1";
+		rockchip,resetgroup-node = <0x03>;
+		status = "okay";
+		interrupt-names = "irq_enc";
+		reg = <0x00 0xfdf40000 0x00 0x400>;
+		phandle = <0x15a>;
+		reset-names = "video_a\0video_h\0video_core";
+		operating-points-v2 = <0x6e>;
+	};
+
+	rk_rga@fdeb0000 {
+		power-domains = <0x21 0x0a>;
+		clock-names = "aclk_rga\0hclk_rga\0clk_rga";
+		interrupts = <0x00 0x5a 0x04>;
+		clocks = <0x1f 0xf3 0x1f 0xf4 0x1f 0xf5>;
+		compatible = "rockchip,rga2";
+		status = "okay";
+		reg = <0x00 0xfdeb0000 0x00 0x1000>;
+		phandle = <0x154>;
+	};
+
+	qos@fe128000 {
+		compatible = "syscon";
+		reg = <0x00 0xfe128000 0x00 0x20>;
+		phandle = <0x47>;
+	};
+
+	dmc {
+		downdifferential = <0x14>;
+		auto-min-freq = <0x4f1a0>;
+		clock-names = "dmc_clk";
+		interrupts = <0x00 0x0a 0x04>;
+		clocks = <0x02 0x03>;
+		upthreshold = <0x28>;
+		center-supply = <0x64>;
+		devfreq-events = <0x97>;
+		compatible = "rockchip,rk3568-dmc";
+		status = "okay";
+		interrupt-names = "complete";
+		phandle = <0x13>;
+		vop-bw-dmc-freq = <0x00 0x1f9 0x4f1a0 0x1fa 0x1869f 0x80e80>;
+		operating-points-v2 = <0x98>;
+		system-status-level = <0x01 0x04 0x08 0x08 0x02 0x01 0x10 0x04 0x10000 0x04 0x1000 0x08 0x4000 0x08 0x2000 0x08 0xc00 0x08>;
+		#cooling-cells = <0x02>;
+		auto-freq-en = <0x01>;
+	};
+
+	tsadc@fe710000 {
+		pinctrl-names = "gpio\0otpout";
+		pinctrl-0 = <0xec>;
+		clock-names = "tsadc\0apb_pclk";
+		rockchip,hw-tshut-polarity = <0x00>;
+		assigned-clocks = <0x1f 0x110 0x1f 0x111>;
+		assigned-clock-rates = <0x1036640 0xaae60>;
+		resets = <0x1f 0x182 0x1f 0x181 0x1f 0x1d7>;
+		interrupts = <0x00 0x73 0x04>;
+		rockchip,hw-tshut-mode = <0x00>;
+		clocks = <0x1f 0x111 0x1f 0x10f>;
+		#thermal-sensor-cells = <0x01>;
+		compatible = "rockchip,rk3568-tsadc";
+		pinctrl-1 = <0xed>;
+		status = "okay";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe710000 0x00 0x100>;
+		phandle = <0x1b>;
+		reset-names = "tsadc\0tsadc-apb\0tsadc-phy";
+		rockchip,hw-tshut-temp = <0x1d4c0>;
+	};
+
+	opp-table2 {
+		rockchip,pvtm-ch = <0x00 0x05>;
+		nvmem-cells = <0x66 0x07 0x08>;
+		compatible = "operating-points-v2";
+		nvmem-cell-names = "leakage\0pvtm\0mbist-vmin";
+		rockchip,pvtm-voltage-sel = <0x00 0x14820 0x00 0x14821 0x16378 0x01 0x16379 0x186a0 0x02>;
+		phandle = <0x65>;
+		mbist-vmin = <0xc96a8 0xdbba0 0xe7ef0>;
+
+		opp-300000000 {
+			opp-microvolt = <0xcf850>;
+			opp-microvolt-L2 = <0xc96a8>;
+			opp-hz = <0x00 0x11e1a300>;
+			opp-microvolt-L0 = <0xcf850>;
+			opp-microvolt-L1 = <0xc96a8>;
+		};
+
+		opp-700000000 {
+			opp-microvolt = <0xe7ef0>;
+			opp-microvolt-L2 = <0xcf850>;
+			opp-hz = <0x00 0x29b92700>;
+			opp-microvolt-L0 = <0xe7ef0>;
+			opp-microvolt-L1 = <0xdbba0>;
+		};
+
+		opp-200000000 {
+			opp-microvolt = <0xcf850>;
+			opp-microvolt-L2 = <0xc96a8>;
+			opp-hz = <0x00 0xbebc200>;
+			opp-microvolt-L0 = <0xcf850>;
+			opp-microvolt-L1 = <0xc96a8>;
+		};
+
+		opp-400000000 {
+			opp-microvolt = <0xcf850>;
+			opp-microvolt-L2 = <0xc96a8>;
+			opp-hz = <0x00 0x17d78400>;
+			opp-microvolt-L0 = <0xcf850>;
+			opp-microvolt-L1 = <0xc96a8>;
+		};
+
+		opp-600000000 {
+			opp-microvolt = <0xd59f8>;
+			opp-microvolt-L2 = <0xc96a8>;
+			opp-hz = <0x00 0x23c34600>;
+			opp-microvolt-L0 = <0xd59f8>;
+			opp-microvolt-L1 = <0xc96a8>;
+		};
+
+		opp-800000000 {
+			opp-microvolt = <0x10c8e0>;
+			opp-microvolt-L2 = <0x100590>;
+			opp-hz = <0x00 0x2faf0800>;
+			opp-microvolt-L0 = <0x10c8e0>;
+			opp-microvolt-L1 = <0x100590>;
+		};
+	};
+
+	external-gmac1-clock {
+		clock-output-names = "gmac1_clkin";
+		#clock-cells = <0x00>;
+		clock-frequency = <0x7735940>;
+		compatible = "fixed-clock";
+		phandle = <0x126>;
+	};
+
+	qos@fe138080 {
+		compatible = "syscon";
+		reg = <0x00 0xfe138080 0x00 0x20>;
+		phandle = <0x56>;
+	};
+
+	serial@fe670000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xd9>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x77 0x04>;
+		clocks = <0x1f 0x127 0x1f 0x124>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfe670000 0x00 0x100>;
+		phandle = <0x192>;
+		dmas = <0x40 0x06 0x40 0x07>;
+		reg-shift = <0x02>;
+	};
+
+	rkcif_dvp_sditf {
+		compatible = "rockchip,rkcif-sditf";
+		status = "disabled";
+		rockchip,cif = <0x73>;
+		phandle = <0x15d>;
+	};
+
+	vdpu@fdea0400 {
+		power-domains = <0x21 0x0b>;
+		iommus = <0x67>;
+		clock-names = "aclk_vcodec\0hclk_vcodec";
+		resets = <0x1f 0x11a 0x1f 0x11b>;
+		interrupts = <0x00 0x8b 0x04>;
+		clocks = <0x1f 0xee 0x1f 0xef>;
+		rockchip,srv = <0x68>;
+		rockchip,taskqueue-node = <0x00>;
+		compatible = "rockchip,vpu-decoder-v2";
+		rockchip,resetgroup-node = <0x00>;
+		status = "okay";
+		interrupt-names = "irq_dec";
+		reg = <0x00 0xfdea0400 0x00 0x400>;
+		phandle = <0x153>;
+		reset-names = "video_a\0video_h";
+	};
+
+	sdhci@fe310000 {
+		rockchip,txclk-tapnum = <0x08>;
+		clock-names = "core\0bus\0axi\0block\0timer";
+		assigned-clocks = <0x1f 0x7b 0x1f 0x7d>;
+		bus-width = <0x08>;
+		non-removable;
+		assigned-clock-rates = <0xbebc200 0x16e3600>;
+		interrupts = <0x00 0x13 0x04>;
+		clocks = <0x1f 0x7c 0x1f 0x7a 0x1f 0x79 0x1f 0x7b 0x1f 0x7d>;
+		compatible = "rockchip,dwcmshc-sdhci\0snps,dwcmshc-sdhci";
+		status = "okay";
+		reg = <0x00 0xfe310000 0x00 0x10000>;
+		phandle = <0x173>;
+		max-frequency = <0xbebc200>;
+		supports-emmc;
+	};
+
+	xpcs-gmac1-clock {
+		clock-output-names = "clk_gmac1_xpcs_mii";
+		#clock-cells = <0x00>;
+		clock-frequency = <0x7735940>;
+		compatible = "fixed-clock";
+		phandle = <0x127>;
+	};
+
+	mcp251x-clk {
+		#clock-cells = <0x00>;
+		clock-frequency = <0xf42400>;
+		compatible = "fixed-clock";
+		phandle = <0x2a4>;
+	};
+
+	syscon@fdca0000 {
+		compatible = "rockchip,rk3568-usb2phy-grf\0syscon";
+		reg = <0x00 0xfdca0000 0x00 0x8000>;
+		phandle = <0xf7>;
+	};
+
+	hdmi-sound {
+		simple-audio-card,name = "rockchip,hdmi";
+		simple-audio-card,format = "i2s";
+		compatible = "simple-audio-card";
+		status = "okay";
+		phandle = <0x2a6>;
+		simple-audio-card,mclk-fs = <0x80>;
+
+		simple-audio-card,cpu {
+			sound-dai = <0x10c>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <0x10d>;
+		};
+	};
+
+	can@fe590000 {
+		clock-names = "baudclk\0apb_pclk";
+		resets = <0x1f 0x159 0x1f 0x158>;
+		interrupts = <0x00 0x03 0x04>;
+		clocks = <0x1f 0x145 0x1f 0x144>;
+		compatible = "rockchip,canfd-1.0";
+		status = "disabled";
+		tx-fifo-depth = <0x01>;
+		rx-fifo-depth = <0x06>;
+		reg = <0x00 0xfe590000 0x00 0x1000>;
+		phandle = <0x182>;
+		reset-names = "can\0can-apb";
+	};
+
+	mailbox@fe780000 {
+		clock-names = "pclk_mailbox";
+		interrupts = <0x00 0xb7 0x04 0x00 0xb8 0x04 0x00 0xb9 0x04 0x00 0xba 0x04>;
+		clocks = <0x1f 0x11b>;
+		#mbox-cells = <0x01>;
+		compatible = "rockchip,rk3568-mailbox\0rockchip,rk3368-mailbox";
+		status = "disabled";
+		reg = <0x00 0xfe780000 0x00 0x1000>;
+		phandle = <0x1a6>;
+	};
+
+	usb2-phy@fe8a0000 {
+		rockchip,usbgrf = <0xf7>;
+		clock-output-names = "usb480m_phy";
+		clock-names = "phyclk";
+		assigned-clocks = <0x1f 0x0b>;
+		assigned-clock-parents = <0x24>;
+		interrupts = <0x00 0x87 0x04>;
+		clocks = <0x31 0x13>;
+		#clock-cells = <0x00>;
+		compatible = "rockchip,rk3568-usb2phy";
+		status = "okay";
+		reg = <0x00 0xfe8a0000 0x00 0x10000>;
+		phandle = <0x24>;
+
+		host-port {
+			#phy-cells = <0x00>;
+			status = "disabled";
+			phandle = <0x25>;
+		};
+
+		otg-port {
+			#phy-cells = <0x00>;
+			status = "okay";
+			phandle = <0x23>;
+		};
+	};
+
+	edp-phy@fdcb0000 {
+		clock-names = "refclk\0pclk";
+		resets = <0x1f 0x1d6>;
+		clocks = <0x31 0x29 0x1f 0x192>;
+		#phy-cells = <0x00>;
+		compatible = "rockchip,rk3568-edp-phy";
+		status = "disabled";
+		reg = <0x00 0xfdcb0000 0x00 0x8000>;
+		phandle = <0x95>;
+		reset-names = "apb";
+	};
+
+	xin32k {
+		pinctrl-names = "default";
+		clock-output-names = "xin32k";
+		pinctrl-0 = <0x1e>;
+		#clock-cells = <0x00>;
+		clock-frequency = <0x8000>;
+		compatible = "fixed-clock";
+		phandle = <0x12e>;
+	};
+
+	sata@fc400000 {
+		power-domains = <0x21 0x0f>;
+		phy-names = "sata-phy";
+		clock-names = "sata\0pmalive\0rxoob";
+		interrupts = <0x00 0x5f 0x04>;
+		clocks = <0x1f 0x9b 0x1f 0x9c 0x1f 0x9d>;
+		compatible = "snps,dwc-ahci";
+		status = "disabled";
+		interrupt-names = "hostc";
+		phys = <0x20 0x01>;
+		reg = <0x00 0xfc400000 0x00 0x1000>;
+		phandle = <0x12f>;
+		ports-implemented = <0x01>;
+	};
+
+	video-phy@fe860000 {
+		power-domains = <0x21 0x09>;
+		clock-names = "ref\0pclk_phy\0pclk_host";
+		resets = <0x1f 0x1bc>;
+		clocks = <0x31 0x19 0x1f 0x17b 0x1f 0xe9>;
+		#clock-cells = <0x00>;
+		#phy-cells = <0x00>;
+		compatible = "rockchip,rk3568-video-phy";
+		status = "disabled";
+		reg = <0x00 0xfe860000 0x00 0x10000 0x00 0xfe070000 0x00 0x10000>;
+		phandle = <0x8f>;
+		reset-names = "rst";
+	};
+
+	ethernet@fe010000 {
+		pinctrl-names = "default";
+		phy-mode = "rgmii";
+		snps,mixed-burst;
+		snps,mtl-rx-config = <0x7a>;
+		snps,reset-active-low;
+		pinctrl-0 = <0x7c 0x7d 0x7e 0x7f 0x80>;
+		clock-names = "stmmaceth\0mac_clk_rx\0mac_clk_tx\0clk_mac_refout\0aclk_mac\0pclk_mac\0clk_mac_speed\0ptp_ref\0pclk_xpcs";
+		assigned-clocks = <0x1f 0x189 0x1f 0x186>;
+		assigned-clock-parents = <0x1f 0x187 0x1f 0xc5>;
+		snps,mtl-tx-config = <0x7b>;
+		local-mac-address = [e6 c6 dc 45 51 9e];
+		assigned-clock-rates = <0x00 0x7735940>;
+		resets = <0x1f 0xec>;
+		interrupts = <0x00 0x20 0x04 0x00 0x1d 0x04>;
+		clocks = <0x1f 0x186 0x1f 0x189 0x1f 0x189 0x1f 0xc7 0x1f 0xc3 0x1f 0xc4 0x1f 0x189 0x1f 0xc8 0x1f 0xac>;
+		clock_in_out = "output";
+		snps,tso;
+		compatible = "rockchip,rk3568-gmac\0snps,dwmac-4.20a";
+		status = "okay";
+		rockchip,grf = <0x32>;
+		interrupt-names = "macirq\0eth_wake_irq";
+		snps,reset-gpio = <0x36 0x16 0x01>;
+		reg = <0x00 0xfe010000 0x00 0x10000>;
+		rx_delay = <0x24>;
+		phandle = <0x161>;
+		phy-handle = <0x81>;
+		reset-names = "stmmaceth";
+		tx_delay = <0x40>;
+		snps,axi-config = <0x79>;
+		snps,reset-delays-us = <0x00 0x4e20 0x186a0>;
+
+		mdio {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+			compatible = "snps,dwmac-mdio";
+			phandle = <0x162>;
+
+			phy@0 {
+				compatible = "ethernet-phy-ieee802.3-c22";
+				reg = <0x00>;
+				phandle = <0x81>;
+			};
+		};
+
+		tx-queues-config {
+			phandle = <0x7b>;
+			snps,tx-queues-to-use = <0x01>;
+
+			queue0 {
+			};
+		};
+
+		stmmac-axi-config {
+			snps,wr_osr_lmt = <0x04>;
+			phandle = <0x79>;
+			snps,blen = <0x00 0x00 0x00 0x00 0x10 0x08 0x04>;
+			snps,rd_osr_lmt = <0x08>;
+		};
+
+		rx-queues-config {
+			snps,rx-queues-to-use = <0x01>;
+			phandle = <0x7a>;
+
+			queue0 {
+			};
+		};
+	};
+
+	rkisp-vir1 {
+		#address-cells = <0x01>;
+		rockchip,hw = <0x76>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rkisp-vir";
+		status = "disabled";
+		phandle = <0x160>;
+
+		port {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+			reg = <0x00>;
+
+			endpoint@0 {
+				remote-endpoint = <0x78>;
+				reg = <0x00>;
+				phandle = <0xf6>;
+			};
+		};
+	};
+
+	display-subsystem {
+		memory-region-names = "drm-logo\0drm-cubic-lut";
+		ports = <0x12>;
+		memory-region = <0x10 0x11>;
+		compatible = "rockchip,display-subsystem";
+		status = "okay";
+		devfreq = <0x13>;
+		phandle = <0x113>;
+
+		route {
+
+			route-hdmi {
+				logo,kernel = "logo_kernel.bmp";
+				cubic_lut,offset = <0x00>;
+				video,vrefresh = <0x3c>;
+				overscan,right_margin = <0x64>;
+				logo,offset = <0x186000>;
+				overscan,bottom_margin = <0x64>;
+				logo,width = <0x28e>;
+				logo,uboot = "logo.bmp";
+				video,crtc_hsync_end = <0x804>;
+				overscan,top_margin = <0x64>;
+				charge_logo,mode = "center";
+				video,hdisplay = <0x780>;
+				connect = <0x17>;
+				video,aspect_ratio = <0x02>;
+				overscan,left_margin = <0x64>;
+				logo,mode = "center";
+				status = "okay";
+				logo,bpp = <0x18>;
+				phandle = <0x117>;
+				video,vdisplay = <0x438>;
+				video,flags = <0x05>;
+				logo,height = <0x10e>;
+				video,crtc_vsync_end = <0x441>;
+				video,clock = <0x24414>;
+				logo,ymirror = <0x00>;
+			};
+
+			route-lvds {
+				logo,kernel = "logo_kernel.bmp";
+				logo,uboot = "logo.bmp";
+				charge_logo,mode = "center";
+				connect = <0x18>;
+				logo,mode = "center";
+				status = "disabled";
+				phandle = <0x118>;
+			};
+
+			route-dsi1 {
+				logo,kernel = "logo_kernel.bmp";
+				logo,uboot = "logo.bmp";
+				charge_logo,mode = "center";
+				connect = <0x15>;
+				logo,mode = "center";
+				status = "disabled";
+				phandle = <0x115>;
+			};
+
+			route-edp {
+				logo,kernel = "logo_kernel.bmp";
+				logo,uboot = "logo.bmp";
+				charge_logo,mode = "center";
+				connect = <0x16>;
+				logo,mode = "center";
+				status = "disabled";
+				phandle = <0x116>;
+			};
+
+			route-rgb {
+				logo,kernel = "logo_kernel.bmp";
+				logo,uboot = "logo.bmp";
+				charge_logo,mode = "center";
+				connect = <0x19>;
+				logo,mode = "center";
+				status = "disabled";
+				phandle = <0x119>;
+			};
+
+			route-dsi0 {
+				logo,kernel = "logo_kernel.bmp";
+				logo,uboot = "logo.bmp";
+				charge_logo,mode = "center";
+				connect = <0x14>;
+				logo,mode = "center";
+				status = "disabled";
+				phandle = <0x114>;
+			};
+		};
+	};
+
+	edp@fe0c0000 {
+		power-domains = <0x21 0x09>;
+		phy-names = "dp";
+		clock-names = "dp\0pclk\0spdif\0hclk";
+		resets = <0x1f 0x113 0x1f 0x112>;
+		interrupts = <0x00 0x12 0x04>;
+		clocks = <0x31 0x29 0x1f 0xea 0x1f 0xeb 0x1f 0xda>;
+		compatible = "rockchip,rk3568-edp";
+		status = "disabled";
+		phys = <0x95>;
+		reg = <0x00 0xfe0c0000 0x00 0x10000>;
+		phandle = <0x16c>;
+		reset-names = "dp\0apb";
+
+		ports {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+
+			port@0 {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x00>;
+				phandle = <0x16d>;
+
+				endpoint@1 {
+					remote-endpoint = <0x96>;
+					status = "disabled";
+					reg = <0x01>;
+					phandle = <0x89>;
+				};
+
+				endpoint@0 {
+					remote-endpoint = <0x16>;
+					status = "disabled";
+					reg = <0x00>;
+					phandle = <0x85>;
+				};
+			};
+		};
+	};
+
+	spi@fe630000 {
+		pinctrl-names = "default\0high_speed";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xce 0xcf 0xd0>;
+		clock-names = "spiclk\0apb_pclk";
+		interrupts = <0x00 0x69 0x04>;
+		clocks = <0x1f 0x156 0x1f 0x155>;
+		#size-cells = <0x00>;
+		dma-names = "tx\0rx";
+		compatible = "rockchip,rk3066-spi";
+		pinctrl-1 = <0xce 0xcf 0xd1>;
+		status = "disabled";
+		reg = <0x00 0xfe630000 0x00 0x1000>;
+		phandle = <0x18e>;
+		dmas = <0x40 0x18 0x40 0x19>;
+	};
+
+	i2c@fe5d0000 {
+		pinctrl-names = "default";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xc4>;
+		clock-names = "i2c\0pclk";
+		interrupts = <0x00 0x32 0x04>;
+		clocks = <0x1f 0x14e 0x1f 0x14d>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3399-i2c";
+		status = "disabled";
+		reg = <0x00 0xfe5d0000 0x00 0x1000>;
+		phandle = <0x188>;
+	};
+
+	clock-controller@fdd00000 {
+		#reset-cells = <0x01>;
+		assigned-clocks = <0x31 0x32>;
+		assigned-clock-parents = <0x31 0x05>;
+		#clock-cells = <0x01>;
+		rockchip,pmugrf = <0x33>;
+		compatible = "rockchip,rk3568-pmucru";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfdd00000 0x00 0x1000>;
+		phandle = <0x31>;
+	};
+
+	arm-pmu {
+		interrupt-affinity = <0x09 0x0a 0x0b 0x0c>;
+		interrupts = <0x00 0xe4 0x04 0x00 0xe5 0x04 0x00 0xe6 0x04 0x00 0xe7 0x04>;
+		compatible = "arm,cortex-a55-pmu\0arm,armv8-pmuv3";
+	};
+
+	rkisp@fdff0000 {
+		power-domains = <0x21 0x08>;
+		iommus = <0x75>;
+		rockchip,iq-feature = <0x3fb 0xf7fe67ff>;
+		clock-names = "aclk_isp\0hclk_isp\0clk_isp";
+		resets = <0x1f 0xfd 0x1f 0xfc>;
+		interrupts = <0x00 0x39 0x04 0x00 0x3a 0x04 0x00 0x3c 0x04>;
+		clocks = <0x1f 0xd2 0x1f 0xd3 0x1f 0xd4>;
+		compatible = "rockchip,rk3568-rkisp";
+		status = "okay";
+		rockchip,grf = <0x32>;
+		interrupt-names = "mipi_irq\0mi_irq\0isp_irq";
+		reg = <0x00 0xfdff0000 0x00 0x10000>;
+		phandle = <0x76>;
+		reset-names = "isp\0isp-h";
+	};
+
+	rkcif_mipi_lvds_sditf {
+		compatible = "rockchip,rkcif-sditf";
+		status = "disabled";
+		rockchip,cif = <0x74>;
+		phandle = <0x15e>;
+	};
+
+	thermal-zones {
+		phandle = <0x121>;
+
+		soc-thermal {
+			polling-delay = <0x3e8>;
+			polling-delay-passive = <0x14>;
+			thermal-sensors = <0x1b 0x00>;
+			sustainable-power = <0x5c3>;
+			phandle = <0x122>;
+
+			trips {
+
+				trip-point-0 {
+					temperature = <0x11170>;
+					hysteresis = <0x7d0>;
+					type = "passive";
+					phandle = <0x123>;
+				};
+
+				trip-point-1 {
+					temperature = <0x14c08>;
+					hysteresis = <0x7d0>;
+					type = "passive";
+					phandle = <0x1c>;
+				};
+
+				soc-crit {
+					temperature = <0x1c138>;
+					hysteresis = <0x7d0>;
+					type = "critical";
+					phandle = <0x124>;
+				};
+			};
+
+			cooling-maps {
+
+				map0 {
+					trip = <0x1c>;
+					cooling-device = <0x09 0xffffffff 0xffffffff>;
+					contribution = <0x400>;
+				};
+
+				map1 {
+					trip = <0x1c>;
+					cooling-device = <0x1d 0xffffffff 0xffffffff>;
+					contribution = <0x400>;
+				};
+			};
+		};
+
+		gpu-thermal {
+			polling-delay = <0x3e8>;
+			polling-delay-passive = <0x14>;
+			thermal-sensors = <0x1b 0x01>;
+			phandle = <0x125>;
+		};
+	};
+
+	cspmu@fd90c000 {
+		compatible = "rockchip,cspmu";
+		reg = <0x00 0xfd90c000 0x00 0x1000 0x00 0xfd90d000 0x00 0x1000 0x00 0xfd90e000 0x00 0x1000 0x00 0xfd90f000 0x00 0x1000>;
+		phandle = <0x29e>;
+	};
+
+	syscon@fdc70000 {
+		compatible = "rockchip,pipe-phy-grf\0syscon";
+		reg = <0x00 0xfdc70000 0x00 0x1000>;
+		phandle = <0x13f>;
+	};
+
+	qos@fe158200 {
+		compatible = "syscon";
+		reg = <0x00 0xfe158200 0x00 0x20>;
+		phandle = <0x51>;
+	};
+
+	i2s@fe400000 {
+		rockchip,cru = <0x1f>;
+		clock-names = "mclk_tx\0mclk_rx\0hclk";
+		resets = <0x1f 0x50 0x1f 0x51>;
+		interrupts = <0x00 0x34 0x04>;
+		clocks = <0x1f 0x3f 0x1f 0x43 0x1f 0x39>;
+		dma-names = "tx";
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-i2s-tdm";
+		rockchip,playback-only;
+		status = "okay";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe400000 0x00 0x1000>;
+		phandle = <0x10c>;
+		dmas = <0xa6 0x00>;
+		reset-names = "tx-m\0rx-m";
+	};
+
+	dmac@fe530000 {
+		clock-names = "apb_pclk";
+		interrupts = <0x00 0x0e 0x04 0x00 0x0d 0x04>;
+		clocks = <0x1f 0x10d>;
+		arm,pl330-periph-burst;
+		compatible = "arm,pl330\0arm,primecell";
+		reg = <0x00 0xfe530000 0x00 0x4000>;
+		phandle = <0x40>;
+		#dma-cells = <0x01>;
+	};
+
+	jpegd@fded0000 {
+		power-domains = <0x21 0x0a>;
+		iommus = <0x6a>;
+		clock-names = "aclk_vcodec\0hclk_vcodec";
+		resets = <0x1f 0x12c 0x1f 0x12d>;
+		interrupts = <0x00 0x3e 0x04>;
+		clocks = <0x1f 0xfb 0x1f 0xfc>;
+		rockchip,srv = <0x68>;
+		rockchip,taskqueue-node = <0x01>;
+		rockchip,disable-auto-freq;
+		compatible = "rockchip,rkv-jpeg-decoder-v1";
+		rockchip,resetgroup-node = <0x01>;
+		status = "okay";
+		reg = <0x00 0xfded0000 0x00 0x400>;
+		phandle = <0x156>;
+		reset-names = "video_a\0video_h";
+	};
+
+	csi2-dphy1 {
+		rockchip,hw = <0xf2>;
+		compatible = "rockchip,rk3568-csi2-dphy";
+		status = "okay";
+		phandle = <0x1a8>;
+
+		ports {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+
+			port@0 {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x00>;
+
+				endpoint@1 {
+					data-lanes = <0x01 0x02>;
+					remote-endpoint = <0xf3>;
+					reg = <0x01>;
+					phandle = <0xbe>;
+				};
+			};
+
+			port@1 {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x01>;
+
+				endpoint@1 {
+					remote-endpoint = <0xf4>;
+					reg = <0x01>;
+					phandle = <0x77>;
+				};
+			};
+		};
+	};
+
+	qos@fe1a8000 {
+		compatible = "syscon";
+		reg = <0x00 0xfe1a8000 0x00 0x20>;
+		phandle = <0x4b>;
+	};
+
+	serial@fe6b0000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xdd>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x7b 0x04>;
+		clocks = <0x1f 0x137 0x1f 0x134>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfe6b0000 0x00 0x100>;
+		phandle = <0x196>;
+		dmas = <0x40 0x0e 0x40 0x0f>;
+		reg-shift = <0x02>;
+	};
+
+	qos@fe148100 {
+		compatible = "syscon";
+		reg = <0x00 0xfe148100 0x00 0x20>;
+		phandle = <0x4a>;
+	};
+
+	npu@fde40000 {
+		power-domains = <0x21 0x06>;
+		iommus = <0x5f>;
+		clock-names = "scmi_clk\0clk\0aclk\0hclk";
+		assigned-clocks = <0x1f 0x23>;
+		rknpu-supply = <0x61>;
+		assigned-clock-rates = <0x23c34600>;
+		resets = <0x1f 0x2b 0x1f 0x2c>;
+		memory-region = <0x60>;
+		interrupts = <0x00 0x97 0x04>;
+		clocks = <0x02 0x02 0x1f 0x23 0x1f 0x28 0x1f 0x29>;
+		compatible = "rockchip,rk3568-rknpu\0rockchip,rknpu";
+		status = "disabled";
+		reg = <0x00 0xfde40000 0x00 0x10000>;
+		phandle = <0x151>;
+		reset-names = "srst_a\0srst_h";
+		operating-points-v2 = <0x5e>;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		phandle = <0x2a2>;
+
+		work {
+			linux,default-trigger = "timer";
+			default-state = "on";
+			phandle = <0x2a3>;
+			gpios = <0x36 0x15 0x00>;
+		};
+	};
+
+	psci {
+		method = "smc";
+		compatible = "arm,psci-1.0";
+	};
+
+	phy@fe840000 {
+		rockchip,pipe-grf = <0xef>;
+		clock-names = "refclk\0apbclk\0pipe_clk";
+		assigned-clocks = <0x31 0x25>;
+		assigned-clock-rates = <0x5f5e100>;
+		resets = <0x1f 0x1c8 0x1f 0x1c9>;
+		clocks = <0x31 0x25 0x1f 0x17e 0x1f 0x7f>;
+		#phy-cells = <0x01>;
+		compatible = "rockchip,rk3568-naneng-combphy";
+		status = "okay";
+		rockchip,pipe-phy-grf = <0xf1>;
+		reg = <0x00 0xfe840000 0x00 0x100>;
+		phandle = <0x22>;
+		reset-names = "combphy-apb\0combphy";
+	};
+
+	usb@fd800000 {
+		phy-names = "usb2-phy";
+		clock-names = "usbhost\0arbiter\0pclk\0utmi";
+		interrupts = <0x00 0x82 0x04>;
+		clocks = <0x1f 0xbd 0x1f 0xbe 0x1f 0xbc 0x26>;
+		compatible = "generic-ehci";
+		status = "disabled";
+		phys = <0x27>;
+		reg = <0x00 0xfd800000 0x00 0x40000>;
+		phandle = <0x135>;
+	};
+
+	xin24m {
+		clock-output-names = "xin24m";
+		#clock-cells = <0x00>;
+		clock-frequency = <0x16e3600>;
+		compatible = "fixed-clock";
+		phandle = <0x12d>;
+	};
+
+	iommu@fdf40f00 {
+		power-domains = <0x21 0x0e>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x8d 0x04 0x00 0x8e 0x04>;
+		clocks = <0x1f 0x103 0x1f 0x104>;
+		rockchip,enable-cmd-retry;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		rockchip,disable-mmu-reset;
+		status = "okay";
+		interrupt-names = "rkvenc_mmu0\0rkvenc_mmu1";
+		reg = <0x00 0xfdf40f00 0x00 0x40 0x00 0xfdf40f40 0x00 0x40>;
+		phandle = <0x6d>;
+	};
+
+	qos@fe158180 {
+		compatible = "syscon";
+		reg = <0x00 0xfe158180 0x00 0x20>;
+		phandle = <0x50>;
+	};
+
+	qos@fe180000 {
+		compatible = "syscon";
+		reg = <0x00 0xfe180000 0x00 0x20>;
+		phandle = <0x46>;
+	};
+
+	usb@fd840000 {
+		phy-names = "usb2-phy";
+		clock-names = "usbhost\0arbiter\0pclk\0utmi";
+		interrupts = <0x00 0x83 0x04>;
+		clocks = <0x1f 0xbd 0x1f 0xbe 0x1f 0xbc 0x26>;
+		compatible = "generic-ohci";
+		status = "disabled";
+		phys = <0x27>;
+		reg = <0x00 0xfd840000 0x00 0x40000>;
+		phandle = <0x136>;
+	};
+
+	hdmi@fe0a0000 {
+		power-domains = <0x21 0x09>;
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0x91 0x92 0x93>;
+		clock-names = "iahb\0isfr\0cec\0ref\0hclk";
+		interrupts = <0x00 0x2d 0x04>;
+		clocks = <0x1f 0xe6 0x1f 0xe7 0x1f 0x193 0x31 0x02 0x1f 0xde>;
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-dw-hdmi";
+		status = "okay";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe0a0000 0x00 0x20000>;
+		phandle = <0x10d>;
+		luckfox,hot-plug-detect-invert;
+
+		ports {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+
+			port {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				phandle = <0x16b>;
+
+				endpoint@1 {
+					remote-endpoint = <0x94>;
+					status = "disabled";
+					reg = <0x01>;
+					phandle = <0x8a>;
+				};
+
+				endpoint@0 {
+					remote-endpoint = <0x17>;
+					status = "okay";
+					reg = <0x00>;
+					phandle = <0x86>;
+				};
+			};
+		};
+	};
+
+	power-management@fdd90000 {
+		compatible = "rockchip,rk3568-pmu\0syscon\0simple-mfd";
+		reg = <0x00 0xfdd90000 0x00 0x1000>;
+		phandle = <0x150>;
+
+		power-controller {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+			#power-domain-cells = <0x01>;
+			compatible = "rockchip,rk3568-power-controller";
+			status = "okay";
+			phandle = <0x21>;
+
+			pd_pipe@15 {
+				clocks = <0x1f 0x7f>;
+				reg = <0x0f>;
+				pm_qos = <0x59 0x5a 0x5b 0x5c 0x5d>;
+			};
+
+			pd_vi@8 {
+				clocks = <0x1f 0xcc 0x1f 0xcd>;
+				reg = <0x08>;
+				pm_qos = <0x48 0x49 0x4a>;
+			};
+
+			pd_rkvenc@14 {
+				clocks = <0x1f 0x102>;
+				reg = <0x0e>;
+				pm_qos = <0x56 0x57 0x58>;
+			};
+
+			pd_rga@10 {
+				clocks = <0x1f 0xf1 0x1f 0xf2>;
+				reg = <0x0a>;
+				pm_qos = <0x4e 0x4f 0x50 0x51 0x52 0x53>;
+			};
+
+			pd_vpu@11 {
+				clocks = <0x1f 0xed>;
+				reg = <0x0b>;
+				pm_qos = <0x54>;
+			};
+
+			pd_gpu@7 {
+				clocks = <0x1f 0x19 0x1f 0x1a>;
+				reg = <0x07>;
+				pm_qos = <0x47>;
+			};
+
+			pd_rkvdec@13 {
+				clocks = <0x1f 0x107>;
+				reg = <0x0d>;
+				pm_qos = <0x55>;
+			};
+
+			pd_vo@9 {
+				clocks = <0x1f 0xda 0x1f 0xdb 0x1f 0xdc>;
+				reg = <0x09>;
+				pm_qos = <0x4b 0x4c 0x4d>;
+			};
+
+			pd_npu@6 {
+				clocks = <0x1f 0x27 0x1f 0x25 0x1f 0x26>;
+				reg = <0x06>;
+				pm_qos = <0x46>;
+			};
+		};
+	};
+
+	vad@fe450000 {
+		rockchip,det-channel = <0x00>;
+		rockchip,audio-src = <0x00>;
+		clock-names = "hclk";
+		reg-names = "vad";
+		interrupts = <0x00 0x89 0x04>;
+		clocks = <0x1f 0x5b>;
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-vad";
+		status = "disabled";
+		rockchip,mode = <0x00>;
+		reg = <0x00 0xfe450000 0x00 0x10000>;
+		phandle = <0x17b>;
+	};
+
+	qos@fe148080 {
+		compatible = "syscon";
+		reg = <0x00 0xfe148080 0x00 0x20>;
+		phandle = <0x49>;
+	};
+
+	vcc-camera-imx219-two {
+		regulator-max-microvolt = <0x325aa0>;
+		regulator-boot-on;
+		gpio = <0x36 0x10 0x00>;
+		regulator-always-on;
+		enable-active-high;
+		regulator-min-microvolt = <0x325aa0>;
+		regulator-name = "vcc_camera_imx219_two";
+		compatible = "regulator-fixed";
+		status = "disabled";
+		phandle = <0x2a8>;
+	};
+
+	serial@fe680000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xda>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x78 0x04>;
+		clocks = <0x1f 0x12b 0x1f 0x128>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfe680000 0x00 0x100>;
+		phandle = <0x193>;
+		dmas = <0x40 0x08 0x40 0x09>;
+		reg-shift = <0x02>;
+	};
+
+	usb@fd880000 {
+		phy-names = "usb2-phy";
+		clock-names = "usbhost\0arbiter\0pclk\0utmi";
+		interrupts = <0x00 0x85 0x04>;
+		clocks = <0x1f 0xbf 0x1f 0xc0 0x1f 0xbc 0x26>;
+		compatible = "generic-ehci";
+		status = "disabled";
+		phys = <0x28>;
+		reg = <0x00 0xfd880000 0x00 0x40000>;
+		phandle = <0x137>;
+	};
+
+	vcc-camera-imx219 {
+		regulator-max-microvolt = <0x325aa0>;
+		regulator-boot-on;
+		gpio = <0x36 0x10 0x00>;
+		regulator-always-on;
+		enable-active-high;
+		regulator-min-microvolt = <0x325aa0>;
+		regulator-name = "vcc_camera_imx219";
+		compatible = "regulator-fixed";
+		status = "disabled";
+		phandle = <0x2a7>;
+	};
+
+	audpwm@fe470000 {
+		clock-names = "clk\0hclk";
+		clocks = <0x1f 0x63 0x1f 0x60>;
+		rockchip,sample-width-bits = <0x0b>;
+		dma-names = "tx";
+		rockchip,interpolat-points = <0x01>;
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-audio-pwm\0rockchip,audio-pwm-v1";
+		status = "disabled";
+		reg = <0x00 0xfe470000 0x00 0x1000>;
+		phandle = <0x17d>;
+		dmas = <0xa6 0x08>;
+	};
+
+	qos@fe190400 {
+		compatible = "syscon";
+		reg = <0x00 0xfe190400 0x00 0x20>;
+		phandle = <0x5d>;
+	};
+
+	saradc@fe720000 {
+		vref-supply = <0xee>;
+		clock-names = "saradc\0apb_pclk";
+		resets = <0x1f 0x180>;
+		interrupts = <0x00 0x5d 0x04>;
+		clocks = <0x1f 0x113 0x1f 0x112>;
+		#io-channel-cells = <0x01>;
+		compatible = "rockchip,rk3568-saradc\0rockchip,rk3399-saradc";
+		status = "okay";
+		reg = <0x00 0xfe720000 0x00 0x100>;
+		phandle = <0x1a5>;
+		reset-names = "saradc-apb";
+	};
+
+	dfi@fe230000 {
+		rockchip,pmugrf = <0x33>;
+		compatible = "rockchip,rk3568-dfi";
+		status = "okay";
+		reg = <0x00 0xfe230000 0x00 0x400>;
+		phandle = <0x97>;
+	};
+
+	external-camera-imx219-clock-two {
+		clock-output-names = "ext_cam_imx219_clk_two";
+		#clock-cells = <0x00>;
+		clock-frequency = <0x17d7840>;
+		compatible = "fixed-clock";
+		phandle = <0xc1>;
+	};
+
+	sc16is752-clk {
+		clock-output-names = "sc16is752_clk";
+		#clock-cells = <0x00>;
+		clock-frequency = <0xe10000>;
+		compatible = "fixed-clock";
+		phandle = <0x2a5>;
+	};
+
+	ddr3-params {
+		dram_dq_drv_odten = <0x22>;
+		reserved = <0x00>;
+		phy_dll_dis_freq = <0x00>;
+		pd_dis_freq = <0x42a>;
+		phy_clk_drv_odtoff = <0x21>;
+		phy_odt_puup_en = <0x01>;
+		dram_odt = <0x78>;
+		standby_idle = <0x00>;
+		dq_map_cs0_dq_l = <0x00>;
+		dram_dq_drv_odtoff = <0x22>;
+		phy_dq_sr_odten = <0x0f>;
+		speed_bin = <0x15>;
+		dq_map_cs1_dq_h = <0x00>;
+		freq_4 = <0x00>;
+		sr_dis_freq = <0x320>;
+		dram_dq_odt_en_freq = <0x14d>;
+		phy_clk_sr_odtoff = <0x00>;
+		freq_2 = <0x210>;
+		phy_clk_drv_odten = <0x21>;
+		phy_dq_drv_odtoff = <0x21>;
+		dq_map_cs0_dq_h = <0x00>;
+		phy_ca_sr_odten = <0x03>;
+		sr_idle = <0x5d>;
+		ssmod_div = <0x00>;
+		freq_0 = <0x420>;
+		phy_clk_sr_odten = <0x00>;
+		phy_odt = <0xa7>;
+		phy_dq_sr_odtoff = <0x0f>;
+		phy_dq_drv_odten = <0x21>;
+		phy_odt_en_freq = <0x14d>;
+		sr_mc_gate_idle = <0x00>;
+		pd_idle = <0x0d>;
+		dram_dll_dis_freq = <0x12c>;
+		ssmod_downspread = <0x00>;
+		phy_odt_pudn_en = <0x01>;
+		freq_5 = <0x00>;
+		ssmod_spread = <0x00>;
+		freq_3 = <0x30c>;
+		phandle = <0x10e>;
+		expanded_version = <0x00>;
+		phy_ca_drv_odtoff = <0x21>;
+		version = <0x100>;
+		dram_ext_temp = <0x00>;
+		phy_ca_sr_odtoff = <0x03>;
+		freq_1 = <0x144>;
+		phy_ca_drv_odten = <0x21>;
+		mode_2t = <0x00>;
+		srpd_lite_idle = <0x00>;
+		byte_map = <0xe4>;
+		dq_map_cs1_dq_l = <0x00>;
+	};
+
+	usb2-phy@fe8b0000 {
+		rockchip,usbgrf = <0xf8>;
+		clock-names = "phyclk";
+		interrupts = <0x00 0x88 0x04>;
+		clocks = <0x31 0x15>;
+		#clock-cells = <0x00>;
+		compatible = "rockchip,rk3568-usb2phy";
+		status = "okay";
+		reg = <0x00 0xfe8b0000 0x00 0x10000>;
+		phandle = <0x26>;
+
+		host-port {
+			#phy-cells = <0x00>;
+			status = "disabled";
+			phandle = <0x28>;
+		};
+
+		otg-port {
+			#phy-cells = <0x00>;
+			status = "disabled";
+			phandle = <0x27>;
+		};
+	};
+
+	lpddr4x-params {
+		dram_dq_drv_odten = <0x28>;
+		reserved = <0x00>;
+		phy_dll_dis_freq = <0x00>;
+		pd_dis_freq = <0x42a>;
+		phy_clk_drv_odtoff = <0x24>;
+		phy_odt_puup_en = <0x00>;
+		dram_odt = <0x50>;
+		standby_idle = <0x00>;
+		dq_map_cs0_dq_l = <0x00>;
+		dram_dq_drv_odtoff = <0x28>;
+		phy_dq_sr_odten = <0x00>;
+		lp4_ca_odt_en_freq = <0x320>;
+		speed_bin = <0x00>;
+		dq_map_cs1_dq_h = <0x00>;
+		freq_4 = <0x00>;
+		sr_dis_freq = <0x320>;
+		dram_dq_odt_en_freq = <0x320>;
+		phy_clk_sr_odtoff = <0x00>;
+		phy_lp4_cs_drv_odten = <0x00>;
+		freq_2 = <0x210>;
+		phy_clk_drv_odten = <0x24>;
+		phy_dq_drv_odtoff = <0x1d>;
+		dq_map_cs0_dq_h = <0x00>;
+		phy_lp4_drv_pulldown_en_odten = <0x00>;
+		lp4_drv_pu_cal_odten = <0x00>;
+		phy_ca_sr_odten = <0x00>;
+		sr_idle = <0x5d>;
+		phy_lp4_drv_pulldown_en_odtoff = <0x00>;
+		ssmod_div = <0x00>;
+		freq_0 = <0x420>;
+		phy_clk_sr_odten = <0x00>;
+		phy_odt = <0x3c>;
+		phy_dq_sr_odtoff = <0x00>;
+		lp4_dq_vref_odten = <0xe4>;
+		lp4_ca_odt = <0x78>;
+		phy_dq_drv_odten = <0x1d>;
+		phy_lp4_dq_vref_odten = <0xa6>;
+		phy_odt_en_freq = <0x320>;
+		sr_mc_gate_idle = <0x00>;
+		pd_idle = <0x0d>;
+		lp4_dq_vref_odtoff = <0x1a4>;
+		dram_dll_dis_freq = <0x00>;
+		ssmod_downspread = <0x00>;
+		phy_odt_pudn_en = <0x00>;
+		freq_5 = <0x00>;
+		ssmod_spread = <0x00>;
+		phy_lp4_dq_vref_odtoff = <0x1a4>;
+		phy_lp4_cs_drv_odtoff = <0x00>;
+		lp4_ca_vref_odtoff = <0x157>;
+		freq_3 = <0x30c>;
+		lp4_drv_pu_cal_odtoff = <0x00>;
+		phandle = <0x112>;
+		expanded_version = <0x00>;
+		phy_ca_drv_odtoff = <0x24>;
+		lp4_odte_ck_en = <0x00>;
+		lp4_odte_cs_en = <0x00>;
+		version = <0x100>;
+		dram_ext_temp = <0x00>;
+		phy_ca_sr_odtoff = <0x00>;
+		freq_1 = <0x144>;
+		lp4_ca_vref_odten = <0x157>;
+		phy_ca_drv_odten = <0x24>;
+		lp4_odtd_ca_en = <0x00>;
+		mode_2t = <0x00>;
+		srpd_lite_idle = <0x00>;
+		byte_map = <0xe4>;
+		dq_map_cs1_dq_l = <0x00>;
+	};
+
+	syscon@fdca8000 {
+		compatible = "rockchip,rk3568-usb2phy-grf\0syscon";
+		reg = <0x00 0xfdca8000 0x00 0x8000>;
+		phandle = <0xf8>;
+	};
+
+	npu-opp-table {
+		nvmem-cells = <0x62 0x07 0x08>;
+		rockchip,low-temp = <0x00>;
+		rockchip,low-temp-adjust-volt = <0x00 0x2bc 0xc350>;
+		compatible = "operating-points-v2";
+		nvmem-cell-names = "leakage\0pvtm\0mbist-vmin";
+		phandle = <0x5e>;
+		rockchip,temp-hysteresis = <0x1388>;
+		mbist-vmin = <0xc96a8 0xdbba0 0xe7ef0>;
+
+		opp-300000000 {
+			opp-microvolt = <0xc96a8 0xc96a8 0xf4240>;
+			opp-hz = <0x00 0x11b3dc40>;
+		};
+
+		opp-700000000 {
+			opp-microvolt = <0xcf850 0xcf850 0xf4240>;
+			opp-hz = <0x00 0x29b92700>;
+		};
+
+		opp-900000000 {
+			opp-microvolt = <0x186a0 0xe1d48 0xf4240>;
+			opp-hz = <0x00 0x35a4e900>;
+		};
+
+		opp-200000000 {
+			opp-microvolt = <0xc96a8 0xc96a8 0xf4240>;
+			opp-hz = <0x00 0xbebc200>;
+		};
+
+		opp-400000000 {
+			opp-microvolt = <0xc96a8 0xc96a8 0xf4240>;
+			opp-hz = <0x00 0x17d78400>;
+		};
+
+		opp-600000000 {
+			opp-microvolt = <0xc96a8 0xc96a8 0xf4240>;
+			opp-hz = <0x00 0x23c34600>;
+		};
+
+		opp-1000000000 {
+			opp-microvolt = <0xf4240 0xf4240 0xf4240>;
+			opp-hz = <0x00 0x3b9aca00>;
+		};
+
+		opp-800000000 {
+			opp-microvolt = <0xd59f8 0xd59f8 0xf4240>;
+			opp-hz = <0x00 0x2faf0800>;
+		};
+	};
+
+	dwmmc@fe2b0000 {
+		supports-sd;
+		fifo-depth = <0x100>;
+		pinctrl-names = "default";
+		ignore-pm-notify;
+		pinctrl-0 = <0x9e 0x9f 0xa0 0xa1>;
+		clock-names = "biu\0ciu\0ciu-drive\0ciu-sample";
+		cap-sd-highspeed;
+		vqmmc-supply = <0x2b>;
+		sd-uhs-sdr25;
+		bus-width = <0x04>;
+		resets = <0x1f 0xd4>;
+		card-detect-delay = <0x320>;
+		interrupts = <0x00 0x62 0x04>;
+		clocks = <0x1f 0xb0 0x1f 0xb1 0x1f 0x18a 0x1f 0x18b>;
+		vmmc-supply = <0x9d>;
+		compatible = "rockchip,rk3568-dw-mshc\0rockchip,rk3288-dw-mshc";
+		status = "okay";
+		disable-wp;
+		reg = <0x00 0xfe2b0000 0x00 0x4000>;
+		phandle = <0x170>;
+		max-frequency = <0x8f0d180>;
+		cap-mmc-highspeed;
+		reset-names = "reset";
+		sd-uhs-sdr50;
+	};
+
+	i2c@fe5a0000 {
+		pinctrl-names = "default";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xbc>;
+		clock-names = "i2c\0pclk";
+		interrupts = <0x00 0x2f 0x04>;
+		clocks = <0x1f 0x148 0x1f 0x147>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3399-i2c";
+		status = "okay";
+		reg = <0x00 0xfe5a0000 0x00 0x1000>;
+		phandle = <0x183>;
+
+		imx219-1@10 {
+			clock-names = "ext_cam_imx219_clk";
+			pwdn-gpios = <0x36 0x12 0x01>;
+			clocks = <0xbd>;
+			rockchip,camera-module-name = "Waveshare";
+			rockchip,camera-module-index = <0x00>;
+			compatible = "sony,imx219";
+			rockchip,camera-module-facing = "front";
+			status = "disabled";
+			reg = <0x10>;
+			rockchip,camera-module-lens-name = "Picamera";
+			phandle = <0x184>;
+
+			port {
+
+				endpoint {
+					data-lanes = <0x01 0x02>;
+					remote-endpoint = <0xbe>;
+					phandle = <0xf3>;
+				};
+			};
+		};
+	};
+
+	codec-digital@fe478000 {
+		pinctrl-names = "default";
+		pinctrl-0 = <0xba>;
+		clock-names = "adc\0dac\0i2c\0pclk";
+		resets = <0x1f 0x5f>;
+		clocks = <0x1f 0x67 0x1f 0x66 0x1f 0x65 0x1f 0x64>;
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-codec-digital\0rockchip,codec-digital-v1";
+		status = "disabled";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe478000 0x00 0x1000>;
+		phandle = <0x17e>;
+		reset-names = "reset";
+	};
+
+	spi@fe640000 {
+		pinctrl-names = "default\0high_speed";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xd2 0xd3 0xd4>;
+		clock-names = "spiclk\0apb_pclk";
+		interrupts = <0x00 0x6a 0x04>;
+		clocks = <0x1f 0x158 0x1f 0x157>;
+		#size-cells = <0x00>;
+		dma-names = "tx\0rx";
+		compatible = "rockchip,rk3066-spi";
+		pinctrl-1 = <0xd2 0xd3 0xd5>;
+		status = "disabled";
+		reg = <0x00 0xfe640000 0x00 0x1000>;
+		phandle = <0x18f>;
+		dmas = <0x40 0x1a 0x40 0x1b>;
+	};
+
+	ddr4-params {
+		dram_dq_drv_odten = <0x22>;
+		reserved = <0x00>;
+		phy_dll_dis_freq = <0x00>;
+		pd_dis_freq = <0x42a>;
+		phy_clk_drv_odtoff = <0x25>;
+		phy_odt_puup_en = <0x01>;
+		dram_odt = <0x78>;
+		standby_idle = <0x00>;
+		dq_map_cs0_dq_l = <0x22777788>;
+		dram_dq_drv_odtoff = <0x22>;
+		phy_dq_sr_odten = <0x0e>;
+		speed_bin = <0x0c>;
+		dq_map_cs1_dq_h = <0xd7888877>;
+		freq_4 = <0x00>;
+		sr_dis_freq = <0x320>;
+		dram_dq_odt_en_freq = <0x1f4>;
+		phy_clk_sr_odtoff = <0x01>;
+		freq_2 = <0x210>;
+		phy_clk_drv_odten = <0x25>;
+		phy_dq_drv_odtoff = <0x25>;
+		dq_map_cs0_dq_h = <0xd7888877>;
+		phy_ca_sr_odten = <0x01>;
+		sr_idle = <0x5d>;
+		ssmod_div = <0x00>;
+		freq_0 = <0x420>;
+		phy_clk_sr_odten = <0x01>;
+		phy_odt = <0x8b>;
+		phy_dq_sr_odtoff = <0x0e>;
+		phy_dq_drv_odten = <0x25>;
+		phy_odt_en_freq = <0x1f4>;
+		sr_mc_gate_idle = <0x00>;
+		pd_idle = <0x0d>;
+		dram_dll_dis_freq = <0x271>;
+		ssmod_downspread = <0x00>;
+		phy_odt_pudn_en = <0x01>;
+		freq_5 = <0x00>;
+		ssmod_spread = <0x00>;
+		freq_3 = <0x30c>;
+		phandle = <0x10f>;
+		expanded_version = <0x00>;
+		phy_ca_drv_odtoff = <0x25>;
+		version = <0x100>;
+		dram_ext_temp = <0x00>;
+		phy_ca_sr_odtoff = <0x01>;
+		freq_1 = <0x144>;
+		phy_ca_drv_odten = <0x25>;
+		mode_2t = <0x00>;
+		srpd_lite_idle = <0x00>;
+		byte_map = <0xe4>;
+		dq_map_cs1_dq_l = <0x22777788>;
+	};
+
+	i2c@fe5e0000 {
+		pinctrl-names = "default";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xc5>;
+		clock-names = "i2c\0pclk";
+		interrupts = <0x00 0x33 0x04>;
+		clocks = <0x1f 0x150 0x1f 0x14f>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3399-i2c";
+		status = "disabled";
+		reg = <0x00 0xfe5e0000 0x00 0x1000>;
+		phandle = <0x189>;
+	};
+
+	dsi@fe060000 {
+		power-domains = <0x21 0x09>;
+		#address-cells = <0x01>;
+		phy-names = "mipi_dphy";
+		clock-names = "pclk\0hclk\0hs_clk";
+		resets = <0x1f 0x110>;
+		interrupts = <0x00 0x44 0x04>;
+		clocks = <0x1f 0xe8 0x1f 0xda 0x2e>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3568-mipi-dsi";
+		status = "disabled";
+		rockchip,grf = <0x32>;
+		phys = <0x2e>;
+		reg = <0x00 0xfe060000 0x00 0x10000>;
+		phandle = <0x167>;
+		reset-names = "apb";
+
+		ports {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+
+			port@0 {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x00>;
+				phandle = <0x168>;
+
+				endpoint@1 {
+					remote-endpoint = <0x8e>;
+					status = "disabled";
+					reg = <0x01>;
+					phandle = <0x87>;
+				};
+
+				endpoint@0 {
+					remote-endpoint = <0x14>;
+					status = "disabled";
+					reg = <0x00>;
+					phandle = <0x83>;
+				};
+			};
+		};
+	};
+
+	iommu@fdff1a00 {
+		power-domains = <0x21 0x08>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x3b 0x04>;
+		clocks = <0x1f 0xd2 0x1f 0xd3>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		rockchip,disable-mmu-reset;
+		status = "okay";
+		interrupt-names = "isp_mmu";
+		reg = <0x00 0xfdff1a00 0x00 0x100>;
+		phandle = <0x75>;
+	};
+
+	qos@fe190380 {
+		compatible = "syscon";
+		reg = <0x00 0xfe190380 0x00 0x20>;
+		phandle = <0x5c>;
+	};
+
+	vcc3v3-sys {
+		regulator-max-microvolt = <0x325aa0>;
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-min-microvolt = <0x325aa0>;
+		regulator-name = "vcc3v3_sys";
+		compatible = "regulator-fixed";
+		phandle = <0x3d>;
+		vin-supply = <0x35>;
+	};
+
+	mipi-csi2@fdfb0000 {
+		clock-names = "pclk_csi2host";
+		reg-names = "csihost_regs";
+		resets = <0x1f 0xff>;
+		interrupts = <0x00 0x08 0x04 0x00 0x09 0x04>;
+		clocks = <0x1f 0xd5>;
+		compatible = "rockchip,rk3568-mipi-csi2";
+		status = "disabled";
+		interrupt-names = "csi-intr1\0csi-intr2";
+		reg = <0x00 0xfdfb0000 0x00 0x10000>;
+		phandle = <0x15c>;
+		reset-names = "srst_csihost_p";
+	};
+
+	rkvdec@fdf80200 {
+		power-domains = <0x21 0x0d>;
+		iommus = <0x6f>;
+		rockchip,advanced-rates = <0x179a7b00 0x00 0x179a7b00 0x179a7b00 0x23c34600>;
+		clock-names = "aclk_vcodec\0hclk_vcodec\0clk_cabac\0clk_core\0clk_hevc_cabac";
+		assigned-clocks = <0x1f 0x108 0x1f 0x10a 0x1f 0x10b 0x1f 0x10c>;
+		rockchip,normal-rates = <0x11b3dc40 0x00 0x11b3dc40 0x11b3dc40 0x23c34600>;
+		assigned-clock-rates = <0x11b3dc40 0x11b3dc40 0x11b3dc40 0x11b3dc40>;
+		resets = <0x1f 0x142 0x1f 0x143 0x1f 0x144 0x1f 0x145 0x1f 0x146>;
+		interrupts = <0x00 0x5b 0x04>;
+		clocks = <0x1f 0x108 0x1f 0x109 0x1f 0x10a 0x1f 0x10b 0x1f 0x10c>;
+		rockchip,rcb-min-width = <0x200>;
+		rockchip,srv = <0x68>;
+		rockchip,taskqueue-node = <0x04>;
+		compatible = "rockchip,rkv-decoder-rk3568\0rockchip,rkv-decoder-v2";
+		rockchip,resetgroup-node = <0x04>;
+		status = "okay";
+		interrupt-names = "irq_dec";
+		rockchip,rcb-iova = <0x10000000 0x10000>;
+		reg = <0x00 0xfdf80200 0x00 0x400>;
+		phandle = <0x15b>;
+		reset-names = "video_a\0video_h\0video_cabac\0video_core\0video_hevc_cabac";
+		rockchip,sram = <0x70>;
+		rockchip,default-max-load = <0x1fe000>;
+	};
+
+	mpp-srv {
+		rockchip,resetgroup-count = <0x06>;
+		rockchip,taskqueue-count = <0x06>;
+		compatible = "rockchip,mpp-service";
+		status = "okay";
+		phandle = <0x68>;
+	};
+
+	syscon@fdc80000 {
+		compatible = "rockchip,pipe-phy-grf\0syscon";
+		reg = <0x00 0xfdc80000 0x00 0x1000>;
+		phandle = <0xf0>;
+	};
+
+	timer {
+		arm,no-tick-in-suspend;
+		interrupts = <0x01 0x0d 0xf04 0x01 0x0e 0xf04 0x01 0x0b 0xf04 0x01 0x0a 0xf04>;
+		compatible = "arm,armv8-timer";
+	};
+
+	rockchip-suspend {
+		rockchip,sleep-debug-en = <0x01>;
+		rockchip,sleep-mode-config = <0x5ec>;
+		compatible = "rockchip,pm-rk3568";
+		status = "okay";
+		rockchip,wakeup-config = <0x10>;
+		phandle = <0x11f>;
+	};
+
+	iommu@fded0480 {
+		power-domains = <0x21 0x0a>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x3d 0x04>;
+		clocks = <0x1f 0xfb 0x1f 0xfc>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		status = "okay";
+		interrupt-names = "jpegd_mmu";
+		reg = <0x00 0xfded0480 0x00 0x40>;
+		phandle = <0x6a>;
+	};
+
+	i2s@fe410000 {
+		pinctrl-names = "default";
+		rockchip,cru = <0x1f>;
+		pinctrl-0 = <0xa7 0xa8 0xa9 0xaa>;
+		clock-names = "mclk_tx\0mclk_rx\0hclk";
+		resets = <0x1f 0x52 0x1f 0x53>;
+		interrupts = <0x00 0x35 0x04>;
+		clocks = <0x1f 0x47 0x1f 0x4b 0x1f 0x3a>;
+		dma-names = "tx\0rx";
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-i2s-tdm";
+		status = "okay";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe410000 0x00 0x1000>;
+		phandle = <0x104>;
+		dmas = <0xa6 0x02 0xa6 0x03>;
+		reset-names = "tx-m\0rx-m";
+		rockchip,clk-trcm = <0x01>;
+	};
+
+	sdio-pwrseq {
+		pinctrl-names = "default";
+		pinctrl-0 = <0x107>;
+		clock-names = "ext_clock";
+		clocks = <0x106 0x01>;
+		reset-gpios = <0x108 0x09 0x01>;
+		compatible = "mmc-pwrseq-simple";
+		post-power-on-delay-ms = <0xc8>;
+		phandle = <0xa2>;
+	};
+
+	bus-npu-opp-table {
+		rockchip,pvtm-ch = <0x00 0x05>;
+		nvmem-cells = <0x07>;
+		opp-shared;
+		compatible = "operating-points-v2";
+		nvmem-cell-names = "pvtm";
+		rockchip,pvtm-voltage-sel = <0x00 0x14050 0x00 0x14051 0x16b48 0x01 0x16b49 0x186a0 0x02>;
+		phandle = <0x63>;
+
+		opp-1200000000 {
+			opp-microvolt = <0xf4240>;
+			opp-microvolt-L2 = <0x00>;
+			opp-hz = <0x00 0x47868c00>;
+			opp-microvolt-L0 = <0xf4240>;
+			opp-microvolt-L1 = <0xf4240>;
+		};
+
+		opp-900000000 {
+			opp-microvolt = <0x00>;
+			opp-hz = <0x00 0x35a4e900>;
+		};
+
+		opp-1000000000 {
+			opp-microvolt = <0xe7ef0>;
+			opp-microvolt-L2 = <0x00>;
+			opp-hz = <0x00 0x3b9aca00>;
+			opp-microvolt-L0 = <0xe7ef0>;
+			opp-microvolt-L1 = <0xe1d48>;
+		};
+	};
+
+	sram@fdcc0000 {
+		#address-cells = <0x01>;
+		#size-cells = <0x01>;
+		compatible = "mmio-sram";
+		ranges = <0x00 0x00 0xfdcc0000 0xb000>;
+		reg = <0x00 0xfdcc0000 0x00 0xb000>;
+		phandle = <0x140>;
+
+		rkvdec-sram@0 {
+			reg = <0x00 0xb000>;
+			phandle = <0x70>;
+		};
+	};
+
+	pwm@fe6e0030 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe3>;
+		clock-names = "pwm\0pclk";
+		interrupts = <0x00 0x53 0x04 0x00 0x57 0x04>;
+		clocks = <0x1f 0x15a 0x1f 0x159>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe6e0030 0x00 0x10>;
+		phandle = <0x19c>;
+	};
+
+	serial@fe6c0000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xde>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x7c 0x04>;
+		clocks = <0x1f 0x13b 0x1f 0x138>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfe6c0000 0x00 0x100>;
+		phandle = <0x197>;
+		dmas = <0x40 0x10 0x40 0x11>;
+		reg-shift = <0x02>;
+	};
+
+	sata@fc800000 {
+		power-domains = <0x21 0x0f>;
+		phy-names = "sata-phy";
+		clock-names = "sata\0pmalive\0rxoob";
+		interrupts = <0x00 0x60 0x04>;
+		clocks = <0x1f 0xa0 0x1f 0xa1 0x1f 0xa2>;
+		compatible = "snps,dwc-ahci";
+		status = "disabled";
+		interrupt-names = "hostc";
+		phys = <0x22 0x01>;
+		reg = <0x00 0xfc800000 0x00 0x1000>;
+		phandle = <0x130>;
+		ports-implemented = <0x01>;
+	};
+
+	usb@fd8c0000 {
+		phy-names = "usb2-phy";
+		clock-names = "usbhost\0arbiter\0pclk\0utmi";
+		interrupts = <0x00 0x86 0x04>;
+		clocks = <0x1f 0xbf 0x1f 0xc0 0x1f 0xbc 0x26>;
+		compatible = "generic-ohci";
+		status = "disabled";
+		phys = <0x28>;
+		reg = <0x00 0xfd8c0000 0x00 0x40000>;
+		phandle = <0x138>;
+	};
+
+	qos@fe158100 {
+		compatible = "syscon";
+		reg = <0x00 0xfe158100 0x00 0x20>;
+		phandle = <0x4f>;
+	};
+
+	testcase-data-2 {
+		#address-cells = <0x01>;
+		#size-cells = <0x01>;
+
+		fairway-1 {
+			#address-cells = <0x01>;
+			#size-cells = <0x01>;
+			compatible = "ot,rides";
+			status = "okay";
+			orientation = <0x7f>;
+			phandle = <0x2c6>;
+
+			ride@200 {
+				#address-cells = <0x01>;
+				hvac-zone-names = "operator\0snack-bar";
+				gondola-capacity = <0x06>;
+				hvac-zones = <0x0c 0x05>;
+				#size-cells = <0x01>;
+				spin-controller = <0x2c5 0x03>;
+				compatible = "ot,ferris-wheel";
+				reg = <0x200 0x100>;
+				hvac-thermostat = <0x1b 0x20>;
+				hvac-provider = <0x2cb>;
+				phandle = <0x2cc>;
+				spin-rph = <0x1e>;
+				gondolas = <0x10>;
+
+				track@20 {
+					reg = <0x20 0x10>;
+					phandle = <0x2ce>;
+				};
+
+				track@10 {
+					reg = <0x10 0x10>;
+					phandle = <0x2cd>;
+				};
+			};
+
+			ride@100 {
+				#address-cells = <0x01>;
+				spin-controller-names = "track_1\0track_2";
+				hvac-zone-names = "operator";
+				hvac-zones = <0x0e>;
+				#size-cells = <0x01>;
+				spin-controller = <0x2c3 0x05 0x2c3 0x07>;
+				queues = <0x02>;
+				compatible = "ot,roller-coaster";
+				reg = <0x100 0x100>;
+				hvac-thermostat = <0x1d>;
+				hvac-provider = <0x2c2>;
+
+				track@40 {
+					reg = <0x40 0x10>;
+					incline-up = <0x2f 0x1f 0x0f>;
+				};
+
+				track@30 {
+					reg = <0x30 0x10>;
+					incline-up = <0x30 0x20 0x10>;
+				};
+			};
+		};
+
+		vending@50000 {
+			compatible = "ot,tickets";
+			status = "disabled";
+			reg = <0x50000 0x1000>;
+			phandle = <0x2c9>;
+		};
+
+		substation@100 {
+			compatible = "ot,big-volts-control";
+			status = "okay";
+			reg = <0x100 0x100>;
+			phandle = <0x2c4>;
+
+			motor-1 {
+				spin = "clockwise";
+				compatible = "ot,ferris-wheel-motor";
+				phandle = <0x2c5>;
+			};
+
+			motor-8 {
+				compatible = "ot,roller-coaster-motor";
+				phandle = <0x2c3>;
+			};
+
+			hvac-medium-1 {
+				compatible = "ot,hvac-medium";
+				heat-range = <0x32 0x4b>;
+				phandle = <0x2c2>;
+				cool-range = <0x3c 0x50>;
+			};
+
+			hvac-large-1 {
+				compatible = "ot,hvac-large";
+				heat-range = <0x28 0x4b>;
+				phandle = <0x2cb>;
+				cool-range = <0x41 0x50>;
+			};
+		};
+
+		lights@30000 {
+			compatible = "ot,work-lights";
+			status = "disabled";
+			reg = <0x30000 0x1000>;
+			phandle = <0x2c7>;
+		};
+
+		lights@40000 {
+			color = "purple\0white\0red\0green";
+			rate = <0x03 0x100>;
+			compatible = "ot,show-lights";
+			status = "okay";
+			reg = <0x40000 0x1000>;
+			phandle = <0x2c8>;
+		};
+	};
+
+	pvtm@fde00000 {
+		#address-cells = <0x01>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3568-core-pvtm";
+		reg = <0x00 0xfde00000 0x00 0x100>;
+
+		pvtm@0 {
+			clock-names = "clk\0pclk";
+			thermal-zone = "soc-thermal";
+			resets = <0x1f 0x1a 0x1f 0x19>;
+			clocks = <0x1f 0x13 0x1f 0x1c2>;
+			reg = <0x00>;
+			reset-names = "rts\0rst-p";
+		};
+	};
+
+	pwm@fe6e0020 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe2>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x15a 0x1f 0x159>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe6e0020 0x00 0x10>;
+		phandle = <0x19b>;
+	};
+
+	cpuinfo {
+		nvmem-cells = <0x0d 0x0e 0x0f>;
+		compatible = "rockchip,cpuinfo";
+		nvmem-cell-names = "id\0cpu-version\0cpu-code";
+	};
+
+	qos@fe150000 {
+		compatible = "syscon";
+		reg = <0x00 0xfe150000 0x00 0x20>;
+		phandle = <0x54>;
+	};
+
+	lpddr3-params {
+		dram_dq_drv_odten = <0x22>;
+		reserved = <0x00>;
+		phy_dll_dis_freq = <0x00>;
+		pd_dis_freq = <0x42a>;
+		phy_clk_drv_odtoff = <0x27>;
+		phy_odt_puup_en = <0x01>;
+		dram_odt = <0x78>;
+		standby_idle = <0x00>;
+		dq_map_cs0_dq_l = <0x00>;
+		dram_dq_drv_odtoff = <0x22>;
+		phy_dq_sr_odten = <0x0f>;
+		speed_bin = <0x00>;
+		dq_map_cs1_dq_h = <0x00>;
+		freq_4 = <0x00>;
+		sr_dis_freq = <0x320>;
+		dram_dq_odt_en_freq = <0x14d>;
+		phy_clk_sr_odtoff = <0x0f>;
+		freq_2 = <0x210>;
+		phy_clk_drv_odten = <0x27>;
+		phy_dq_drv_odtoff = <0x25>;
+		dq_map_cs0_dq_h = <0x00>;
+		phy_ca_sr_odten = <0x01>;
+		sr_idle = <0x5d>;
+		ssmod_div = <0x00>;
+		freq_0 = <0x420>;
+		phy_clk_sr_odten = <0x0f>;
+		phy_odt = <0x94>;
+		phy_dq_sr_odtoff = <0x0f>;
+		phy_dq_drv_odten = <0x25>;
+		phy_odt_en_freq = <0x14d>;
+		sr_mc_gate_idle = <0x00>;
+		pd_idle = <0x0d>;
+		dram_dll_dis_freq = <0x00>;
+		ssmod_downspread = <0x00>;
+		phy_odt_pudn_en = <0x01>;
+		freq_5 = <0x00>;
+		ssmod_spread = <0x00>;
+		freq_3 = <0x30c>;
+		phandle = <0x110>;
+		expanded_version = <0x00>;
+		phy_ca_drv_odtoff = <0x25>;
+		version = <0x100>;
+		dram_ext_temp = <0x00>;
+		phy_ca_sr_odtoff = <0x01>;
+		freq_1 = <0x144>;
+		phy_ca_drv_odten = <0x25>;
+		mode_2t = <0x00>;
+		srpd_lite_idle = <0x00>;
+		byte_map = <0x8d>;
+		dq_map_cs1_dq_l = <0x00>;
+	};
+
+	aliases {
+		i2c3 = "/i2c@fe5c0000";
+		spi2 = "/spi@fe630000";
+		gpio0 = "/pinctrl/gpio@fdd60000";
+		dsi1 = "/dsi@fe070000";
+		serial7 = "/serial@fe6b0000";
+		i2c1 = "/i2c@fe5a0000";
+		mmc3 = "/dwmmc@fe000000";
+		testcase-alias = "/testcase-data";
+		spi0 = "/spi@fe610000";
+		serial5 = "/serial@fe690000";
+		mmc1 = "/dwmmc@fe2b0000";
+		serial3 = "/serial@fe670000";
+		csi2dphy1 = "/csi2-dphy1";
+		serial1 = "/serial@fe650000";
+		gpio3 = "/pinctrl/gpio@fe760000";
+		i2c4 = "/i2c@fe5d0000";
+		ethernet1 = "/ethernet@fe010000";
+		spi3 = "/spi@fe640000";
+		gpio1 = "/pinctrl/gpio@fe740000";
+		serial8 = "/serial@fe6c0000";
+		i2c2 = "/i2c@fe5b0000";
+		spi1 = "/spi@fe620000";
+		dsi0 = "/dsi@fe060000";
+		serial6 = "/serial@fe6a0000";
+		i2c0 = "/i2c@fdd40000";
+		mmc2 = "/dwmmc@fe2c0000";
+		serial4 = "/serial@fe680000";
+		mmc0 = "/sdhci@fe310000";
+		csi2dphy2 = "/csi2-dphy2";
+		serial2 = "/serial@fe660000";
+		gpio4 = "/pinctrl/gpio@fe770000";
+		i2c5 = "/i2c@fe5e0000";
+		csi2dphy0 = "/csi2-dphy0";
+		serial0 = "/serial@fdd50000";
+		gpio2 = "/pinctrl/gpio@fe750000";
+		serial9 = "/serial@fe6d0000";
+	};
+
+	pwm@fe6e0010 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe1>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x15a 0x1f 0x159>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe6e0010 0x00 0x10>;
+		phandle = <0x19a>;
+	};
+
+	qos@fe148000 {
+		compatible = "syscon";
+		reg = <0x00 0xfe148000 0x00 0x20>;
+		phandle = <0x48>;
+	};
+
+	nandc@fe330000 {
+		clock-names = "clk_nandc\0hclk_nandc";
+		nandc_id = <0x00>;
+		interrupts = <0x00 0x46 0x04>;
+		clocks = <0x1f 0x75 0x1f 0x74>;
+		compatible = "rockchip,rk-nandc-v9";
+		status = "disabled";
+		reg = <0x00 0xfe330000 0x00 0x4000>;
+		phandle = <0x174>;
+	};
+
+	firmware {
+
+		optee {
+			method = "smc";
+			compatible = "linaro,optee-tz";
+			phandle = <0x11a>;
+		};
+
+		sdei {
+			method = "smc";
+			compatible = "arm,sdei-1.0";
+			phandle = <0x11c>;
+		};
+
+		scmi {
+			shmem = <0x1a>;
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+			compatible = "arm,scmi-smc";
+			phandle = <0x11b>;
+			arm,smc-id = <0x82000010>;
+
+			protocol@14 {
+				#clock-cells = <0x01>;
+				reg = <0x14>;
+				rockchip,clk-init = "Tfr";
+				phandle = <0x02>;
+			};
+		};
+	};
+
+	serial@fe650000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xd6 0xd7>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x75 0x04>;
+		clocks = <0x1f 0x11f 0x1f 0x11c>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "okay";
+		reg = <0x00 0xfe650000 0x00 0x100>;
+		phandle = <0x190>;
+		dmas = <0x40 0x02 0x40 0x03>;
+		reg-shift = <0x02>;
+	};
+
+	rk809-sound {
+		simple-audio-card,name = "rockchip,rk809-codec";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,widgets = "Microphone\0Mic Jack\0Headphone\0Headphone Jack";
+		simple-audio-card,routing = "MIC_IN\0Mic Jack\0Headphone Jack\0HPOL\0Headphone Jack\0HPOR";
+		compatible = "simple-audio-card";
+		status = "okay";
+		phandle = <0x29f>;
+		simple-audio-card,mclk-fs = <0x100>;
+
+		simple-audio-card,cpu {
+			sound-dai = <0x104>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <0x105>;
+		};
+	};
+
+	qos@fe190000 {
+		compatible = "syscon";
+		reg = <0x00 0xfe190000 0x00 0x20>;
+		phandle = <0x59>;
+	};
+
+	debug@fd904000 {
+		compatible = "rockchip,debug";
+		reg = <0x00 0xfd904000 0x00 0x1000 0x00 0xfd905000 0x00 0x1000 0x00 0xfd906000 0x00 0x1000 0x00 0xfd907000 0x00 0x1000>;
+		phandle = <0x29d>;
+	};
+
+	ebc@fdec0000 {
+		power-domains = <0x21 0x0a>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0x69>;
+		clock-names = "hclk\0dclk";
+		interrupts = <0x00 0x11 0x04>;
+		clocks = <0x1f 0xf9 0x1f 0xfa>;
+		compatible = "rockchip,rk3568-ebc-tcon";
+		status = "disabled";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfdec0000 0x00 0x5000>;
+		phandle = <0x155>;
+	};
+
+	pwm@fe6e0000 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe0>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x15a 0x1f 0x159>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe6e0000 0x00 0x10>;
+		phandle = <0x199>;
+	};
+
+	iommu@fdfe0800 {
+		power-domains = <0x21 0x08>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x92 0x04>;
+		clocks = <0x1f 0xce 0x1f 0xcf>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		rockchip,disable-mmu-reset;
+		status = "okay";
+		interrupt-names = "cif_mmu";
+		reg = <0x00 0xfdfe0800 0x00 0x100>;
+		phandle = <0x71>;
+	};
+
+	mpll {
+		clock-output-names = "mpll";
+		#clock-cells = <0x00>;
+		clock-frequency = <0x2faf0800>;
+		compatible = "fixed-clock";
+		phandle = <0x12c>;
+	};
+
+	usbdrd {
+		#address-cells = <0x02>;
+		clock-names = "ref_clk\0suspend_clk\0bus_clk\0pipe_clk";
+		clocks = <0x1f 0xa6 0x1f 0xa7 0x1f 0xa5 0x1f 0x7f>;
+		#size-cells = <0x02>;
+		compatible = "rockchip,rk3568-dwc3\0rockchip,rk3399-dwc3";
+		ranges;
+		status = "okay";
+		phandle = <0x131>;
+
+		dwc3@fcc00000 {
+			power-domains = <0x21 0x0f>;
+			snps,dis_enblslpm_quirk;
+			phy-names = "usb2-phy";
+			snps,dis-u2-freeclk-exists-quirk;
+			phy_type = "utmi_wide";
+			snps,dis_u2_susphy_quirk;
+			resets = <0x1f 0x94>;
+			interrupts = <0x00 0xa9 0x04>;
+			extcon = <0x24>;
+			snps,usb2-lpm-disable;
+			compatible = "snps,dwc3";
+			snps,dis-del-phy-power-chg-quirk;
+			status = "okay";
+			snps,xhci-trb-ent-quirk;
+			phys = <0x23>;
+			reg = <0x00 0xfcc00000 0x00 0x400000>;
+			phandle = <0x132>;
+			dr_mode = "otg";
+			maximum-speed = "high-speed";
+			reset-names = "usb3-otg";
+			snps,dis-tx-ipgap-linecheck-quirk;
+		};
+	};
+
+	pvtm@fde80000 {
+		#address-cells = <0x01>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3568-gpu-pvtm";
+		reg = <0x00 0xfde80000 0x00 0x100>;
+
+		pvtm@1 {
+			clock-names = "clk\0pclk";
+			thermal-zone = "gpu-thermal";
+			resets = <0x1f 0x24 0x1f 0x23>;
+			clocks = <0x1f 0x1e 0x1f 0x1d>;
+			reg = <0x01>;
+			reset-names = "rts\0rst-p";
+		};
+	};
+
+	lpddr4-params {
+		dram_dq_drv_odten = <0x28>;
+		reserved = <0x00>;
+		phy_dll_dis_freq = <0x00>;
+		pd_dis_freq = <0x42a>;
+		phy_clk_drv_odtoff = <0x26>;
+		phy_odt_puup_en = <0x00>;
+		dram_odt = <0x50>;
+		standby_idle = <0x00>;
+		dq_map_cs0_dq_l = <0x00>;
+		dram_dq_drv_odtoff = <0x28>;
+		phy_dq_sr_odten = <0x00>;
+		lp4_ca_odt_en_freq = <0x320>;
+		speed_bin = <0x00>;
+		dq_map_cs1_dq_h = <0x00>;
+		freq_4 = <0x00>;
+		sr_dis_freq = <0x320>;
+		dram_dq_odt_en_freq = <0x320>;
+		phy_clk_sr_odtoff = <0x0f>;
+		phy_lp4_cs_drv_odten = <0x00>;
+		freq_2 = <0x210>;
+		phy_clk_drv_odten = <0x26>;
+		phy_dq_drv_odtoff = <0x1e>;
+		dq_map_cs0_dq_h = <0x00>;
+		phy_lp4_drv_pulldown_en_odten = <0x00>;
+		lp4_drv_pu_cal_odten = <0x01>;
+		phy_ca_sr_odten = <0x0f>;
+		sr_idle = <0x5d>;
+		phy_lp4_drv_pulldown_en_odtoff = <0x00>;
+		ssmod_div = <0x00>;
+		freq_0 = <0x420>;
+		phy_clk_sr_odten = <0x0f>;
+		phy_odt = <0x3c>;
+		phy_dq_sr_odtoff = <0x00>;
+		lp4_dq_vref_odten = <0x12c>;
+		lp4_ca_odt = <0x78>;
+		phy_dq_drv_odten = <0x1e>;
+		phy_lp4_dq_vref_odten = <0xa6>;
+		phy_odt_en_freq = <0x320>;
+		sr_mc_gate_idle = <0x00>;
+		pd_idle = <0x0d>;
+		lp4_dq_vref_odtoff = <0x1a4>;
+		dram_dll_dis_freq = <0x00>;
+		ssmod_downspread = <0x00>;
+		phy_odt_pudn_en = <0x00>;
+		freq_5 = <0x00>;
+		ssmod_spread = <0x00>;
+		phy_lp4_dq_vref_odtoff = <0x1a4>;
+		phy_lp4_cs_drv_odtoff = <0x00>;
+		lp4_ca_vref_odtoff = <0x1a4>;
+		freq_3 = <0x30c>;
+		lp4_drv_pu_cal_odtoff = <0x01>;
+		phandle = <0x111>;
+		expanded_version = <0x00>;
+		phy_ca_drv_odtoff = <0x26>;
+		lp4_odte_ck_en = <0x01>;
+		lp4_odte_cs_en = <0x01>;
+		version = <0x100>;
+		dram_ext_temp = <0x00>;
+		phy_ca_sr_odtoff = <0x0f>;
+		freq_1 = <0x144>;
+		lp4_ca_vref_odten = <0x17c>;
+		phy_ca_drv_odten = <0x26>;
+		lp4_odtd_ca_en = <0x00>;
+		mode_2t = <0x00>;
+		srpd_lite_idle = <0x00>;
+		byte_map = <0xe4>;
+		dq_map_cs1_dq_l = <0x00>;
+	};
+
+	pwm@fe700030 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xeb>;
+		clock-names = "pwm\0pclk";
+		interrupts = <0x00 0x55 0x04 0x00 0x59 0x04>;
+		clocks = <0x1f 0x160 0x1f 0x15f>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe700030 0x00 0x10>;
+		phandle = <0x1a4>;
+	};
+
+	serial@fe690000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xdb>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x79 0x04>;
+		clocks = <0x1f 0x12f 0x1f 0x12c>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfe690000 0x00 0x100>;
+		phandle = <0x194>;
+		dmas = <0x40 0x0a 0x40 0x0b>;
+		reg-shift = <0x02>;
+	};
+
+	can@fe570000 {
+		clock-names = "baudclk\0apb_pclk";
+		resets = <0x1f 0x155 0x1f 0x154>;
+		interrupts = <0x00 0x01 0x04>;
+		clocks = <0x1f 0x141 0x1f 0x140>;
+		compatible = "rockchip,canfd-1.0";
+		status = "disabled";
+		tx-fifo-depth = <0x01>;
+		rx-fifo-depth = <0x06>;
+		reg = <0x00 0xfe570000 0x00 0x1000>;
+		phandle = <0x180>;
+		reset-names = "can\0can-apb";
+	};
+
+	pcie@fe260000 {
+		power-domains = <0x21 0x0f>;
+		vpcie3v3-supply = <0x3d>;
+		#address-cells = <0x03>;
+		phy-names = "pcie-phy";
+		bus-range = <0x00 0x0f>;
+		clock-names = "aclk_mst\0aclk_slv\0aclk_dbi\0pclk\0aux";
+		reg-names = "pcie-dbi\0pcie-apb";
+		num-ob-windows = <0x02>;
+		resets = <0x1f 0xa1>;
+		interrupts = <0x00 0x4b 0x04 0x00 0x4a 0x04 0x00 0x49 0x04 0x00 0x48 0x04 0x00 0x47 0x04>;
+		clocks = <0x1f 0x81 0x1f 0x82 0x1f 0x83 0x1f 0x84 0x1f 0x85>;
+		interrupt-map = <0x00 0x00 0x00 0x01 0x9a 0x00 0x00 0x00 0x00 0x02 0x9a 0x01 0x00 0x00 0x00 0x03 0x9a 0x02 0x00 0x00 0x00 0x04 0x9a 0x03>;
+		#size-cells = <0x02>;
+		max-link-speed = <0x02>;
+		device_type = "pci";
+		interrupt-map-mask = <0x00 0x00 0x00 0x07>;
+		reset-gpios = <0x9c 0x0a 0x00>;
+		num-lanes = <0x01>;
+		compatible = "rockchip,rk3568-pcie\0snps,dw-pcie";
+		ranges = <0x800 0x00 0x00 0x03 0x00 0x00 0x800000 0x81000000 0x00 0x800000 0x03 0x800000 0x00 0x100000 0x83000000 0x00 0x900000 0x03 0x900000 0x00 0x3f700000>;
+		msi-map = <0x00 0x9b 0x00 0x1000>;
+		#interrupt-cells = <0x01>;
+		status = "okay";
+		interrupt-names = "sys\0pmc\0msg\0legacy\0err";
+		phys = <0x22 0x02>;
+		reg = <0x03 0xc0000000 0x00 0x400000 0x00 0xfe260000 0x00 0x10000>;
+		linux,pci-domain = <0x00>;
+		phandle = <0x16f>;
+		reset-names = "pipe";
+		num-ib-windows = <0x06>;
+
+		legacy-interrupt-controller {
+			#address-cells = <0x00>;
+			interrupts = <0x00 0x48 0x01>;
+			interrupt-parent = <0x01>;
+			#interrupt-cells = <0x01>;
+			phandle = <0x9a>;
+			interrupt-controller;
+		};
+	};
+
+	i2c@fdd40000 {
+		pinctrl-names = "default";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0x34>;
+		clock-names = "i2c\0pclk";
+		interrupts = <0x00 0x2e 0x04>;
+		clocks = <0x31 0x07 0x31 0x2d>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3399-i2c";
+		status = "okay";
+		reg = <0x00 0xfdd40000 0x00 0x1000>;
+		phandle = <0x141>;
+
+		pmic@20 {
+			pinctrl-names = "default\0pmic-sleep\0pmic-power-off\0pmic-reset";
+			pinctrl-2 = <0x3a 0x3b>;
+			rockchip,system-power-controller;
+			clock-output-names = "rk808-clkout1\0rk808-clkout2";
+			pinctrl-0 = <0x37>;
+			wakeup-source;
+			interrupts = <0x03 0x08>;
+			#clock-cells = <0x01>;
+			interrupt-parent = <0x36>;
+			vcc1-supply = <0x3d>;
+			pmic-reset-func = <0x01>;
+			pinctrl-3 = <0x3a 0x3c>;
+			vcc2-supply = <0x3d>;
+			compatible = "rockchip,rk809";
+			vcc3-supply = <0x3d>;
+			pinctrl-1 = <0x38 0x39>;
+			vcc4-supply = <0x3d>;
+			vcc5-supply = <0x3d>;
+			reg = <0x20>;
+			phandle = <0x106>;
+			vcc6-supply = <0x3d>;
+			vcc7-supply = <0x3d>;
+			vcc8-supply = <0x3d>;
+			vcc9-supply = <0x3d>;
+
+			pinctrl_rk8xx {
+				gpio-controller;
+				phandle = <0x142>;
+				#gpio-cells = <0x02>;
+
+				rk817_slppin_pwrdn {
+					function = "pin_fun2";
+					pins = "gpio_slp";
+					phandle = <0x3b>;
+				};
+
+				rk817_slppin_rst {
+					function = "pin_fun3";
+					pins = "gpio_slp";
+					phandle = <0x3c>;
+				};
+
+				rk817_slppin_null {
+					function = "pin_fun0";
+					pins = "gpio_slp";
+					phandle = <0x143>;
+				};
+
+				rk817_slppin_slp {
+					function = "pin_fun1";
+					pins = "gpio_slp";
+					phandle = <0x39>;
+				};
+			};
+
+			pwrkey {
+				status = "okay";
+			};
+
+			regulators {
+
+				DCDC_REG4 {
+					regulator-max-microvolt = <0x149970>;
+					regulator-boot-on;
+					regulator-init-microvolt = <0xdbba0>;
+					regulator-always-on;
+					regulator-min-microvolt = <0x7a120>;
+					regulator-name = "vdd_npu";
+					regulator-ramp-delay = <0x1771>;
+					regulator-initial-mode = <0x02>;
+					phandle = <0x145>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				LDO_REG4 {
+					regulator-max-microvolt = <0x325aa0>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0x325aa0>;
+					regulator-name = "vccio_acodec";
+					phandle = <0x2a>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				DCDC_REG2 {
+					regulator-max-microvolt = <0x149970>;
+					regulator-boot-on;
+					regulator-init-microvolt = <0xdbba0>;
+					regulator-always-on;
+					regulator-min-microvolt = <0x7a120>;
+					regulator-name = "vdd_gpu";
+					regulator-ramp-delay = <0x1771>;
+					regulator-initial-mode = <0x02>;
+					phandle = <0x61>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				LDO_REG2 {
+					regulator-max-microvolt = <0xdbba0>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0xdbba0>;
+					regulator-name = "vdda_0v9";
+					phandle = <0x147>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				LDO_REG9 {
+					regulator-max-microvolt = <0x325aa0>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0x325aa0>;
+					regulator-name = "VCC_GPIO0_17";
+					phandle = <0x14a>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				SWITCH_REG1 {
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-name = "vcc_3v3";
+					phandle = <0x2d>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				LDO_REG7 {
+					regulator-max-microvolt = <0x1b7740>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0x1b7740>;
+					regulator-name = "vcca_1v8";
+					phandle = <0xee>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				DCDC_REG5 {
+					regulator-max-microvolt = <0x1b7740>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0x1b7740>;
+					regulator-name = "vcc_1v8";
+					phandle = <0x2c>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				LDO_REG5 {
+					regulator-max-microvolt = <0x325aa0>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0x1b7740>;
+					regulator-name = "vccio_sd";
+					phandle = <0x2b>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				DCDC_REG3 {
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-name = "vcc_ddr";
+					regulator-initial-mode = <0x02>;
+					phandle = <0x144>;
+
+					regulator-state-mem {
+						regulator-on-in-suspend;
+					};
+				};
+
+				LDO_REG3 {
+					regulator-max-microvolt = <0xdbba0>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0xdbba0>;
+					regulator-name = "vdda0v9_pmu";
+					phandle = <0x148>;
+
+					regulator-state-mem {
+						regulator-suspend-microvolt = <0xdbba0>;
+						regulator-on-in-suspend;
+					};
+				};
+
+				DCDC_REG1 {
+					regulator-max-microvolt = <0x149970>;
+					regulator-boot-on;
+					regulator-init-microvolt = <0xdbba0>;
+					regulator-always-on;
+					regulator-min-microvolt = <0x7a120>;
+					regulator-name = "vdd_logic";
+					regulator-ramp-delay = <0x1771>;
+					regulator-initial-mode = <0x02>;
+					phandle = <0x64>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				LDO_REG1 {
+					regulator-max-microvolt = <0xdbba0>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0xdbba0>;
+					regulator-name = "vdda0v9_image";
+					phandle = <0x146>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				SWITCH_REG2 {
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-name = "vcc3v3_sd";
+					phandle = <0x9d>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				LDO_REG8 {
+					regulator-max-microvolt = <0x1b7740>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0x1b7740>;
+					regulator-name = "vcca1v8_pmu";
+					phandle = <0x149>;
+
+					regulator-state-mem {
+						regulator-suspend-microvolt = <0x1b7740>;
+						regulator-on-in-suspend;
+					};
+				};
+
+				LDO_REG6 {
+					regulator-max-microvolt = <0x325aa0>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0x325aa0>;
+					regulator-name = "vcc3v3_pmu";
+					phandle = <0x29>;
+
+					regulator-state-mem {
+						regulator-suspend-microvolt = <0x325aa0>;
+						regulator-on-in-suspend;
+					};
+				};
+			};
+
+			codec {
+				pinctrl-names = "default";
+				spk-volume = <0x03>;
+				pinctrl-0 = <0x3e>;
+				clock-names = "mclk";
+				assigned-clocks = <0x1f 0x48>;
+				assigned-clock-parents = <0x1f 0x196>;
+				clocks = <0x1f 0x48>;
+				#sound-dai-cells = <0x00>;
+				hp-volume = <0x14>;
+				avrman-spk-con-gpio = <0x36 0x06 0x01>;
+				compatible = "rockchip,rk809-codec\0rockchip,rk817-codec";
+				avrman-hp-det-gpio = <0x3f 0x16 0x01>;
+				status = "okay";
+				phandle = <0x105>;
+			};
+		};
+
+		tcs4525@1c {
+			regulator-max-microvolt = <0x1535b0>;
+			regulator-boot-on;
+			regulator-always-on;
+			regulator-min-microvolt = <0xadf34>;
+			regulator-name = "vdd_cpu";
+			regulator-ramp-delay = <0x8fc>;
+			fcs,suspend-voltage-selector = <0x01>;
+			compatible = "tcs,tcs452x";
+			reg = <0x1c>;
+			phandle = <0x05>;
+			vin-supply = <0x35>;
+			regulator-compatible = "fan53555-reg";
+
+			regulator-state-mem {
+				regulator-off-in-suspend;
+			};
+		};
+	};
+
+	pwm@fdd70030 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0x45>;
+		clock-names = "pwm\0pclk";
+		interrupts = <0x00 0x52 0x04 0x00 0x56 0x04>;
+		clocks = <0x31 0x0d 0x31 0x30>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfdd70030 0x00 0x10>;
+		phandle = <0x14f>;
+	};
+
+	serial@fdd50000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0x41>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x74 0x04>;
+		clocks = <0x31 0x0b 0x31 0x2c>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfdd50000 0x00 0x100>;
+		phandle = <0x14b>;
+		dmas = <0x40 0x00 0x40 0x01>;
+		reg-shift = <0x02>;
+	};
+
+	otp@fe38c000 {
+		#address-cells = <0x01>;
+		clock-names = "usr\0sbpi\0apb\0phy";
+		resets = <0x1f 0x1cf>;
+		clocks = <0x1f 0x73 0x1f 0x72 0x1f 0x71 0x1f 0x181>;
+		#size-cells = <0x01>;
+		compatible = "rockchip,rk3568-otp";
+		reg = <0x00 0xfe38c000 0x00 0x4000>;
+		phandle = <0x177>;
+		reset-names = "otp_phy";
+
+		cpu-leakage@1a {
+			reg = <0x1a 0x01>;
+			phandle = <0x06>;
+		};
+
+		core-pvtm@2a {
+			reg = <0x2a 0x02>;
+			phandle = <0x07>;
+		};
+
+		id@a {
+			reg = <0x0a 0x10>;
+			phandle = <0x0d>;
+		};
+
+		mbist-vmin@9 {
+			bits = <0x00 0x04>;
+			reg = <0x09 0x01>;
+			phandle = <0x08>;
+		};
+
+		npu-leakage@1c {
+			reg = <0x1c 0x01>;
+			phandle = <0x62>;
+		};
+
+		cpu-code@2 {
+			reg = <0x02 0x02>;
+			phandle = <0x0f>;
+		};
+
+		cpu-version@8 {
+			bits = <0x03 0x03>;
+			reg = <0x08 0x01>;
+			phandle = <0x0e>;
+		};
+
+		gpu-leakage@1d {
+			reg = <0x1d 0x01>;
+			phandle = <0x66>;
+		};
+
+		log-leakage@1b {
+			reg = <0x1b 0x01>;
+			phandle = <0x99>;
+		};
+	};
+
+	pwm@fe700020 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xea>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x160 0x1f 0x15f>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe700020 0x00 0x10>;
+		phandle = <0x1a3>;
+	};
+
+	chosen {
+		u-boot,version = "2024.04-armbian-2024.04-S830c-P0000-H264e-V155b-Ba09f-R448a";
+		linux,initrd-end = <0x00 0xece9143a>;
+		bootargs = "root=UUID=db7180e1-951c-44a8-8e47-37b50d1bd411 rootwait rootfstype=ext4 splash=verbose console=ttyS2,1500000 console=tty1 consoleblank=0 loglevel=5 ubootpart=bb1d6ebb-5bca-45ae-aa10-cd228bed5111 usb-storage.quirks=0x2537:0x1066:u,0x2537:0x1068:u   cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory";
+		linux,initrd-start = <0x00 0xebf56000>;
+		phandle = <0x29b>;
+	};
+
+	iommu@fde4b000 {
+		power-domains = <0x21 0x06>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x97 0x04>;
+		clocks = <0x1f 0x28 0x1f 0x29>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		status = "disabled";
+		interrupt-names = "rknpu_mmu";
+		reg = <0x00 0xfde4b000 0x00 0x40>;
+		phandle = <0x5f>;
+	};
+
+	rkcif@fdfe0000 {
+		power-domains = <0x21 0x08>;
+		iommus = <0x71>;
+		clock-names = "aclk_cif\0hclk_cif\0dclk_cif\0iclk_cif_g";
+		reg-names = "cif_regs";
+		assigned-clocks = <0x1f 0xd0>;
+		assigned-clock-rates = <0x11e1a300>;
+		resets = <0x1f 0xf7 0x1f 0xf8 0x1f 0xf9 0x1f 0xfb 0x1f 0xfa>;
+		interrupts = <0x00 0x92 0x04>;
+		clocks = <0x1f 0xce 0x1f 0xcf 0x1f 0xd0 0x1f 0xd1>;
+		compatible = "rockchip,rk3568-cif";
+		status = "okay";
+		rockchip,grf = <0x32>;
+		interrupt-names = "cif-intr";
+		reg = <0x00 0xfdfe0000 0x00 0x8000>;
+		phandle = <0x72>;
+		reset-names = "rst_cif_a\0rst_cif_h\0rst_cif_d\0rst_cif_p\0rst_cif_i";
+	};
+
+	spi@fe610000 {
+		pinctrl-names = "default\0high_speed";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xc6 0xc7 0xc8>;
+		clock-names = "spiclk\0apb_pclk";
+		interrupts = <0x00 0x67 0x04>;
+		clocks = <0x1f 0x152 0x1f 0x151>;
+		#size-cells = <0x00>;
+		dma-names = "tx\0rx";
+		compatible = "rockchip,rk3066-spi";
+		pinctrl-1 = <0xc6 0xc7 0xc9>;
+		status = "disabled";
+		reg = <0x00 0xfe610000 0x00 0x1000>;
+		phandle = <0x18c>;
+		dmas = <0x40 0x14 0x40 0x15>;
+	};
+
+	pwm@fdd70020 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0x44>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x31 0x0d 0x31 0x30>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfdd70020 0x00 0x10>;
+		phandle = <0x14e>;
+	};
+
+	rkvenc-opp-table {
+		rockchip,pvtm-ch = <0x00 0x05>;
+		nvmem-cells = <0x07>;
+		compatible = "operating-points-v2";
+		nvmem-cell-names = "pvtm";
+		rockchip,pvtm-voltage-sel = <0x00 0x14050 0x00 0x14051 0x16b48 0x01 0x16b49 0x186a0 0x02>;
+		phandle = <0x6e>;
+
+		opp-400000000 {
+			opp-microvolt = <0xe7ef0>;
+			opp-microvolt-L2 = <0x00>;
+			opp-hz = <0x00 0x17d78400>;
+			opp-microvolt-L0 = <0xe7ef0>;
+			opp-microvolt-L1 = <0xe1d48>;
+		};
+
+		opp-297000000 {
+			opp-microvolt = <0x00>;
+			opp-hz = <0x00 0x11b3dc40>;
+		};
+	};
+
+	dwmmc@fe2c0000 {
+		fifo-depth = <0x100>;
+		pinctrl-names = "default";
+		supports-sdio;
+		pinctrl-0 = <0xa3 0xa4 0xa5>;
+		clock-names = "biu\0ciu\0ciu-drive\0ciu-sample";
+		cap-sd-highspeed;
+		bus-width = <0x04>;
+		non-removable;
+		resets = <0x1f 0xd6>;
+		cap-sdio-irq;
+		interrupts = <0x00 0x63 0x04>;
+		clocks = <0x1f 0xb2 0x1f 0xb3 0x1f 0x18c 0x1f 0x18d>;
+		keep-power-in-suspend;
+		compatible = "rockchip,rk3568-dw-mshc\0rockchip,rk3288-dw-mshc";
+		status = "okay";
+		disable-wp;
+		mmc-pwrseq = <0xa2>;
+		reg = <0x00 0xfe2c0000 0x00 0x4000>;
+		phandle = <0x171>;
+		sd-uhs-sdr104;
+		max-frequency = <0x8f0d180>;
+		reset-names = "reset";
+	};
+
+	pwm@fe700010 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe9>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x160 0x1f 0x15f>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe700010 0x00 0x10>;
+		phandle = <0x1a2>;
+	};
+
+	i2c@fe5b0000 {
+		pinctrl-names = "default";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xbf>;
+		clock-names = "i2c\0pclk";
+		interrupts = <0x00 0x30 0x04>;
+		clocks = <0x1f 0x14a 0x1f 0x149>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3399-i2c";
+		status = "disabled";
+		reg = <0x00 0xfe5b0000 0x00 0x1000>;
+		phandle = <0x185>;
+	};
+
+	qos@fe190300 {
+		compatible = "syscon";
+		reg = <0x00 0xfe190300 0x00 0x20>;
+		phandle = <0x5b>;
+	};
+
+	pwm@fdd70010 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0x43>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x31 0x0d 0x31 0x30>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfdd70010 0x00 0x10>;
+		phandle = <0x14d>;
+	};
+
+	csi2-dphy2 {
+		rockchip,hw = <0xf2>;
+		compatible = "rockchip,rk3568-csi2-dphy";
+		status = "okay";
+		phandle = <0x1a9>;
+
+		ports {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+
+			port@0 {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x00>;
+
+				endpoint@1 {
+					data-lanes = <0x01 0x02>;
+					remote-endpoint = <0xf5>;
+					reg = <0x01>;
+					phandle = <0xc3>;
+				};
+			};
+
+			port@1 {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x01>;
+
+				endpoint@1 {
+					remote-endpoint = <0xf6>;
+					reg = <0x01>;
+					phandle = <0x78>;
+				};
+			};
+		};
+	};
+
+	pwm@fe700000 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe8>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x160 0x1f 0x15f>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe700000 0x00 0x10>;
+		phandle = <0x1a1>;
+	};
+
+	syscon@fdc50000 {
+		compatible = "rockchip,rk3568-pipegrf\0syscon";
+		reg = <0x00 0xfdc50000 0x00 0x1000>;
+		phandle = <0xef>;
+	};
+
+	fiq-debugger {
+		pinctrl-names = "default";
+		rockchip,irq-mode-enable = <0x01>;
+		rockchip,baudrate = <0x16e360>;
+		pinctrl-0 = <0xd8>;
+		interrupts = <0x00 0xfc 0x08>;
+		rockchip,wake-irq = <0x00>;
+		compatible = "rockchip,fiq-debugger";
+		status = "okay";
+		phandle = <0x29c>;
+		rockchip,serial-id = <0x02>;
+	};
+
+	rkisp-vir0 {
+		#address-cells = <0x01>;
+		rockchip,hw = <0x76>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rkisp-vir";
+		status = "disabled";
+		phandle = <0x15f>;
+
+		port {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+			reg = <0x00>;
+
+			endpoint@0 {
+				remote-endpoint = <0x77>;
+				reg = <0x00>;
+				phandle = <0xf4>;
+			};
+		};
+	};
+
+	dsi@fe070000 {
+		power-domains = <0x21 0x09>;
+		#address-cells = <0x01>;
+		phy-names = "mipi_dphy";
+		clock-names = "pclk\0hclk\0hs_clk";
+		resets = <0x1f 0x111>;
+		interrupts = <0x00 0x45 0x04>;
+		clocks = <0x1f 0xe9 0x1f 0xda 0x8f>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3568-mipi-dsi";
+		status = "disabled";
+		rockchip,grf = <0x32>;
+		phys = <0x8f>;
+		reg = <0x00 0xfe070000 0x00 0x10000>;
+		phandle = <0x169>;
+		reset-names = "apb";
+
+		ports {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+
+			port@0 {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x00>;
+				phandle = <0x16a>;
+
+				endpoint@1 {
+					remote-endpoint = <0x90>;
+					status = "disabled";
+					reg = <0x01>;
+					phandle = <0x88>;
+				};
+
+				endpoint@0 {
+					remote-endpoint = <0x15>;
+					status = "disabled";
+					reg = <0x00>;
+					phandle = <0x84>;
+				};
+			};
+		};
+	};
+
+	clock-controller@fdd20000 {
+		#reset-cells = <0x01>;
+		assigned-clocks = <0x31 0x05 0x1f 0x106 0x1f 0x10b 0x31 0x01 0x31 0x2b 0x1f 0x03 0x1f 0x19b 0x1f 0x09 0x1f 0x19c 0x1f 0x19d 0x1f 0x1a1 0x1f 0x19e 0x1f 0x19f 0x1f 0x1a0 0x1f 0x04 0x1f 0x10d 0x1f 0x10e 0x1f 0x173 0x1f 0x174 0x1f 0x175 0x1f 0x176 0x1f 0xc9 0x1f 0xca 0x1f 0x06 0x1f 0x7e 0x1f 0x7f 0x1f 0x3d 0x1f 0x41 0x1f 0x45 0x1f 0x49 0x1f 0x4d 0x1f 0x4d 0x1f 0x55 0x1f 0x51 0x1f 0x5d 0x1f 0xdd>;
+		assigned-clock-parents = <0x31 0x08 0x1f 0x04 0x1f 0x04>;
+		assigned-clock-rates = <0x8000 0x11e1a300 0x11e1a300 0xbebc200 0x5f5e100 0x3b9aca00 0x1dcd6500 0x13d92d40 0xee6b280 0x7735940 0x5f5e100 0x3b9aca0 0x2faf080 0x17d7840 0x46cf7100 0x8f0d180 0x5f5e100 0x1dcd6500 0x17d78400 0x8f0d180 0x5f5e100 0x11e1a300 0x8f0d180 0x47868c00 0x17d78400 0x5f5e100 0x46cf7100 0x46cf7100 0x46cf7100 0x46cf7100 0x46cf7100 0x46cf7100 0x46cf7100 0x46cf7100 0x46cf7100 0x1dcd6500>;
+		#clock-cells = <0x01>;
+		compatible = "rockchip,rk3568-cru";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfdd20000 0x00 0x1000>;
+		phandle = <0x1f>;
+	};
+
+	pwm@fdd70000 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0x42>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x31 0x0d 0x31 0x30>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfdd70000 0x00 0x10>;
+		phandle = <0x14c>;
+	};
+
+	iommu@fdea0800 {
+		power-domains = <0x21 0x0b>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x8a 0x04>;
+		clocks = <0x1f 0xee 0x1f 0xef>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		status = "okay";
+		interrupt-names = "vdpu_mmu";
+		reg = <0x00 0xfdea0800 0x00 0x40>;
+		phandle = <0x67>;
+	};
+
+	syscon@fda00000 {
+		compatible = "rockchip,rk3568-xpcs\0syscon";
+		status = "disabled";
+		reg = <0x00 0xfda00000 0x00 0x200000>;
+		phandle = <0x139>;
+	};
+
+	syscon@fdc90000 {
+		compatible = "rockchip,pipe-phy-grf\0syscon";
+		reg = <0x00 0xfdc90000 0x00 0x1000>;
+		phandle = <0xf1>;
+	};
+
+	bus-npu {
+		clock-names = "bus";
+		rockchip,busfreq-policy = "clkfreq";
+		clocks = <0x02 0x02>;
+		compatible = "rockchip,rk3568-bus";
+		status = "disabled";
+		bus-supply = <0x64>;
+		phandle = <0x152>;
+		operating-points-v2 = <0x63>;
+		pvtm-supply = <0x05>;
+	};
+
+	i2s1-mclkin-tx {
+		clock-output-names = "i2s1_mclkin_tx";
+		#clock-cells = <0x00>;
+		clock-frequency = <0xbb8000>;
+		compatible = "fixed-clock";
+		phandle = <0x129>;
+	};
+
+	dwmmc@fe000000 {
+		fifo-depth = <0x100>;
+		clock-names = "biu\0ciu\0ciu-drive\0ciu-sample";
+		resets = <0x1f 0xeb>;
+		interrupts = <0x00 0x64 0x04>;
+		clocks = <0x1f 0xc1 0x1f 0xc2 0x1f 0x18e 0x1f 0x18f>;
+		compatible = "rockchip,rk3568-dw-mshc\0rockchip,rk3288-dw-mshc";
+		status = "disabled";
+		reg = <0x00 0xfe000000 0x00 0x4000>;
+		phandle = <0x16e>;
+		max-frequency = <0x8f0d180>;
+		reset-names = "reset";
+	};
+
+	i2s@fe420000 {
+		pinctrl-names = "default";
+		rockchip,cru = <0x1f>;
+		pinctrl-0 = <0xab 0xac 0xad 0xae>;
+		clock-names = "mclk_tx\0mclk_rx\0hclk";
+		interrupts = <0x00 0x36 0x04>;
+		clocks = <0x1f 0x4f 0x1f 0x4f 0x1f 0x3b>;
+		dma-names = "tx\0rx";
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-i2s-tdm";
+		status = "disabled";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe420000 0x00 0x1000>;
+		phandle = <0x178>;
+		dmas = <0xa6 0x04 0xa6 0x05>;
+		rockchip,clk-trcm = <0x01>;
+	};
+
+	dmac@fe550000 {
+		clock-names = "apb_pclk";
+		interrupts = <0x00 0x10 0x04 0x00 0x0f 0x04>;
+		clocks = <0x1f 0x10d>;
+		arm,pl330-periph-burst;
+		compatible = "arm,pl330\0arm,primecell";
+		reg = <0x00 0xfe550000 0x00 0x4000>;
+		phandle = <0xa6>;
+		#dma-cells = <0x01>;
+	};
+
+	qos@fe190280 {
+		compatible = "syscon";
+		reg = <0x00 0xfe190280 0x00 0x20>;
+		phandle = <0x5a>;
+	};
+
+	iommu@fdee0800 {
+		power-domains = <0x21 0x0a>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x3f 0x04>;
+		clocks = <0x1f 0xfd 0x1f 0xfe>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		status = "okay";
+		interrupt-names = "vepu_mmu";
+		reg = <0x00 0xfdee0800 0x00 0x40>;
+		phandle = <0x6b>;
+	};
+
+	cpus {
+		#address-cells = <0x02>;
+		#size-cells = <0x00>;
+
+		cpu@300 {
+			clocks = <0x02 0x00>;
+			cpu-idle-states = <0x04>;
+			device_type = "cpu";
+			compatible = "arm,cortex-a55";
+			reg = <0x00 0x300>;
+			enable-method = "psci";
+			phandle = <0x0c>;
+			operating-points-v2 = <0x03>;
+		};
+
+		idle-states {
+			entry-method = "psci";
+
+			cpu-sleep {
+				entry-latency-us = <0x64>;
+				local-timer-stop;
+				exit-latency-us = <0x78>;
+				arm,psci-suspend-param = <0x10000>;
+				compatible = "arm,idle-state";
+				phandle = <0x04>;
+				min-residency-us = <0x3e8>;
+			};
+		};
+
+		cpu@200 {
+			clocks = <0x02 0x00>;
+			cpu-idle-states = <0x04>;
+			device_type = "cpu";
+			compatible = "arm,cortex-a55";
+			reg = <0x00 0x200>;
+			enable-method = "psci";
+			phandle = <0x0b>;
+			operating-points-v2 = <0x03>;
+		};
+
+		cpu@0 {
+			cpu-supply = <0x05>;
+			clocks = <0x02 0x00>;
+			cpu-idle-states = <0x04>;
+			device_type = "cpu";
+			compatible = "arm,cortex-a55";
+			dynamic-power-coefficient = <0xbb>;
+			reg = <0x00 0x00>;
+			enable-method = "psci";
+			phandle = <0x09>;
+			operating-points-v2 = <0x03>;
+			#cooling-cells = <0x02>;
+
+			power-model {
+				thermal-zone = "soc-thermal";
+				ls = <0xffffdc14 0x18d8 0x00>;
+				compatible = "simple-power-model";
+				ts = <0x1476e 0x3263d 0xffffef34 0x47>;
+				static-coefficient = <0x186a0>;
+				leakage-range = <0x0a 0x28>;
+			};
+		};
+
+		cpu@100 {
+			clocks = <0x02 0x00>;
+			cpu-idle-states = <0x04>;
+			device_type = "cpu";
+			compatible = "arm,cortex-a55";
+			reg = <0x00 0x100>;
+			enable-method = "psci";
+			phandle = <0x0a>;
+			operating-points-v2 = <0x03>;
+		};
+	};
+
+	__symbols__ {
+		cam_clkout1 = "/pinctrl/cam/cam-clkout1";
+		unittest0 = "/testcase-data/overlay-node/test-bus/test-unittest0";
+		i2c3 = "/i2c@fe5c0000";
+		scmi_shmem = "/scmi-shmem@10f000";
+		i2s1m1_sdi1 = "/pinctrl/i2s1/i2s1m1-sdi1";
+		vp1_out_dsi0 = "/vop@fe040000/ports/port@1/endpoint@0";
+		pmic_pins = "/pinctrl/pmic/pmic-pins";
+		pdmm0_sdi3 = "/pinctrl/pdm/pdmm0-sdi3";
+		usb_host1_ohci = "/usb@fd8c0000";
+		pwm9 = "/pwm@fe6f0010";
+		qos_usb3_1 = "/qos@fe190400";
+		gmac0_rgmii_bus = "/pinctrl/gmac0/gmac0-rgmii-bus";
+		pcie30x2m2_pins = "/pinctrl/pcie30x2/pcie30x2m2-pins";
+		i2s2m1_mclk = "/pinctrl/i2s2/i2s2m1-mclk";
+		gmac1m1_rx_er = "/pinctrl/gmac1/gmac1m1-rx-er";
+		vccio_acodec = "/i2c@fdd40000/pmic@20/regulators/LDO_REG4";
+		pdmm2_clk1 = "/pinctrl/pdm/pdmm2-clk1";
+		pwm14 = "/pwm@fe700020";
+		lvds = "/syscon@fdc60000/lvds";
+		video_phy1 = "/video-phy@fe860000";
+		can2m1_pins = "/pinctrl/can2/can2m1-pins";
+		sdmmc2m1_cmd = "/pinctrl/sdmmc2/sdmmc2m1-cmd";
+		optee = "/firmware/optee";
+		gmac1m0_rgmii_clk_level2 = "/pinctrl/gmac-txc-level2/gmac1m0-rgmii-clk-level2";
+		i2s2m1_lrcktx = "/pinctrl/i2s2/i2s2m1-lrcktx";
+		bt656m1_pins = "/pinctrl/bt656/bt656m1-pins";
+		pwm0m1_pins = "/pinctrl/pwm0/pwm0m1-pins";
+		vdpu = "/vdpu@fdea0400";
+		thermal_zones = "/thermal-zones";
+		uart9m0_rtsn = "/pinctrl/uart9/uart9m0-rtsn";
+		i2s2m0_lrckrx = "/pinctrl/i2s2/i2s2m0-lrckrx";
+		bus_npu = "/bus-npu";
+		provider4 = "/testcase-data/phandle-tests/provider4";
+		qos_gpu = "/qos@fe128000";
+		qos_iep = "/qos@fe158100";
+		pcfg_pull_none_drv_level_3 = "/pinctrl/pcfg-pull-none-drv-level-3";
+		vp1 = "/vop@fe040000/ports/port@1";
+		uart1m1_xfer = "/pinctrl/uart1/uart1m1-xfer";
+		i2s1m2_sclkrx = "/pinctrl/i2s1/i2s1m2-sclkrx";
+		uart8 = "/serial@fe6c0000";
+		qos_vop_m1 = "/qos@fe1a8100";
+		edp_in_vp1 = "/edp@fe0c0000/ports/port@0/endpoint@1";
+		ride_200_right = "/testcase-data-2/fairway-1/ride@200/track@20";
+		i2s3m0_lrck = "/pinctrl/i2s3/i2s3m0-lrck";
+		pcfg_pull_none_smt = "/pinctrl/pcfg-pull-none-smt";
+		work_led = "/leds/work";
+		rkvenc_opp_table = "/rkvenc-opp-table";
+		spi0m0_cs0_hs = "/pinctrl/spi0-hs/spi0m0-cs0";
+		vp0_out_hdmi = "/vop@fe040000/ports/port@0/endpoint@3";
+		spi2m1_cs0 = "/pinctrl/spi2/spi2m1-cs0";
+		fspi_cs1 = "/pinctrl/fspi/fspi-cs1";
+		qos_ebc = "/qos@fe158000";
+		csi2_dphy1 = "/csi2-dphy1";
+		spi2 = "/spi@fe630000";
+		gpio0 = "/pinctrl/gpio@fdd60000";
+		saradc = "/saradc@fe720000";
+		i2s1m0_sdi3 = "/pinctrl/i2s1/i2s1m0-sdi3";
+		route_edp = "/display-subsystem/route/route-edp";
+		emmc_rstnout = "/pinctrl/emmc/emmc-rstnout";
+		i2s3m1_mclk = "/pinctrl/i2s3/i2s3m1-mclk";
+		dsi1 = "/dsi@fe070000";
+		usb2phy1 = "/usb2-phy@fe8b0000";
+		pmu_pins = "/pinctrl/pmu/pmu-pins";
+		gmac0_miim = "/pinctrl/gmac0/gmac0-miim";
+		spi3m0_cs0 = "/pinctrl/spi3/spi3m0-cs0";
+		crypto = "/crypto@fe380000";
+		dfi = "/dfi@fe230000";
+		can0m0_pins = "/pinctrl/can0/can0m0-pins";
+		pcfg_pull_up_drv_level_2 = "/pinctrl/pcfg-pull-up-drv-level-2";
+		pinctrl = "/pinctrl";
+		rgmii_phy0 = "/ethernet@fe010000/mdio/phy@0";
+		pwm1m1_pins = "/pinctrl/pwm1/pwm1m1-pins";
+		spi3m0_pins_hs = "/pinctrl/spi3-hs/spi3m0-pins";
+		i2s2m1_lrckrx = "/pinctrl/i2s2/i2s2m1-lrckrx";
+		gmac1m0_rgmii_bus = "/pinctrl/gmac1/gmac1m0-rgmii-bus";
+		pdmm0_clk = "/pinctrl/pdm/pdmm0-clk";
+		qos_isp = "/qos@fe148000";
+		sdei = "/firmware/sdei";
+		pdm = "/pdm@fe440000";
+		sata2_pins = "/pinctrl/sata2/sata2-pins";
+		vdd_logic = "/i2c@fdd40000/pmic@20/regulators/DCDC_REG1";
+		uart2m1_xfer = "/pinctrl/uart2/uart2m1-xfer";
+		jtag_pins = "/pinctrl/jtag/jtag-pins";
+		route_rgb = "/display-subsystem/route/route-rgb";
+		i2c1 = "/i2c@fe5a0000";
+		csi2_dphy_hw = "/csi2-dphy-hw@fe870000";
+		uart3m0_ctsn = "/pinctrl/uart3/uart3m0-ctsn";
+		vopm0_pins = "/pinctrl/vop/vopm0-pins";
+		sdmmc2m0_pwren = "/pinctrl/sdmmc2/sdmmc2m0-pwren";
+		rkvdec_mmu = "/iommu@fdf80800";
+		qos_rkvenc_rd_m0 = "/qos@fe138080";
+		pdmm0_sdi1 = "/pinctrl/pdm/pdmm0-sdi1";
+		cpu_code = "/otp@fe38c000/cpu-code@2";
+		pwm7 = "/pwm@fe6e0030";
+		spi0m1_cs0_hs = "/pinctrl/spi0-hs/spi0m1-cs0";
+		i2s2m0_sclktx = "/pinctrl/i2s2/i2s2m0-sclktx";
+		gpu_leakage = "/otp@fe38c000/gpu-leakage@1d";
+		sdmmc0_pwren = "/pinctrl/sdmmc0/sdmmc0-pwren";
+		sdmmc0_clk = "/pinctrl/sdmmc0/sdmmc0-clk";
+		pwm3_pins = "/pinctrl/pwm3/pwm3-pins";
+		rockchip_system_monitor = "/rockchip-system-monitor";
+		gmac1_clkin = "/external-gmac1-clock";
+		ext_cam_imx219_clk = "/external-camera-imx219-clock";
+		pwm12 = "/pwm@fe700000";
+		emmc_cmd = "/pinctrl/emmc/emmc-cmd";
+		i2s1_8ch = "/i2s@fe410000";
+		mipi_csi2 = "/mipi-csi2@fdfb0000";
+		pcie30x1m1_pins = "/pinctrl/pcie30x1/pcie30x1m1-pins";
+		pcfg_pull_none = "/pinctrl/pcfg-pull-none";
+		i2s1m0_mclk = "/pinctrl/i2s1/i2s1m0-mclk";
+		vdd_npu = "/i2c@fdd40000/pmic@20/regulators/DCDC_REG4";
+		can1m0_pins = "/pinctrl/can1/can1m0-pins";
+		flash_pins = "/pinctrl/flash/flash-pins";
+		provider2 = "/testcase-data/phandle-tests/provider2";
+		clk32k_out0 = "/pinctrl/clk32k/clk32k-out0";
+		pwm2m1_pins = "/pinctrl/pwm2/pwm2m1-pins";
+		i2s1m2_sdo2 = "/pinctrl/i2s1/i2s1m2-sdo2";
+		qos_rga_wr = "/qos@fe158300";
+		unittest101 = "/testcase-data/overlay-node/test-bus/test-unittest101";
+		pcfg_pull_none_drv_level_1 = "/pinctrl/pcfg-pull-none-drv-level-1";
+		combphy2_psq = "/phy@fe840000";
+		gmac1m1_tx_bus2_level3 = "/pinctrl/gmac-txd-level3/gmac1m1-tx-bus2-level3";
+		hdmitxm1_cec = "/pinctrl/hdmitx/hdmitxm1-cec";
+		uart6 = "/serial@fe6a0000";
+		sdhci = "/sdhci@fe310000";
+		target = "/thermal-zones/soc-thermal/trips/trip-point-1";
+		gmac0_rgmii_bus_level3 = "/pinctrl/gmac-txd-level3/gmac0-rgmii-bus-level3";
+		uart3m1_xfer = "/pinctrl/uart3/uart3m1-xfer";
+		spi2m0_cs1_hs = "/pinctrl/spi2-hs/spi2m0-cs1";
+		uart4m0_ctsn = "/pinctrl/uart4/uart4m0-ctsn";
+		vcc_sys = "/vcc-sys";
+		audiopwm_routp = "/pinctrl/audiopwm/audiopwm-routp";
+		i2s2m0_sdo = "/pinctrl/i2s2/i2s2m0-sdo";
+		nandc0 = "/nandc@fe330000";
+		gpu = "/gpu@fde60000";
+		spi0 = "/spi@fe610000";
+		iep = "/iep@fdef0000";
+		i2s2m1_sclktx = "/pinctrl/i2s2/i2s2m1-sclktx";
+		i2s2m0_sclkrx = "/pinctrl/i2s2/i2s2m0-sclkrx";
+		drm_logo = "/reserved-memory/drm-logo@00000000";
+		i2s1m0_sdi1 = "/pinctrl/i2s1/i2s1m0-sdi1";
+		usb_host0_ohci = "/usb@fd840000";
+		unittest7 = "/testcase-data/overlay-node/test-bus/test-unittest7";
+		unittest_test_bus = "/testcase-data/overlay-node/test-bus";
+		cif_dvp_bus16 = "/pinctrl/cif/cif-dvp-bus16";
+		pcie30x2m1_pins = "/pinctrl/pcie30x2/pcie30x2m1-pins";
+		dmc = "/dmc";
+		ebc = "/ebc@fdec0000";
+		i2s2m0_mclk = "/pinctrl/i2s2/i2s2m0-mclk";
+		scmi = "/firmware/scmi";
+		rkisp_mmu = "/iommu@fdff1a00";
+		pdmm1_clk1 = "/pinctrl/pdm/pdmm1-clk1";
+		lvds_in_vp2 = "/syscon@fdc60000/lvds/ports/port@0/endpoint@2";
+		can2m0_pins = "/pinctrl/can2/can2m0-pins";
+		edp_in = "/edp@fe0c0000/ports/port@0";
+		sdmmc1_cmd = "/pinctrl/sdmmc1/sdmmc1-cmd";
+		bt656m0_pins = "/pinctrl/bt656/bt656m0-pins";
+		pwm0m0_pins = "/pinctrl/pwm0/pwm0m0-pins";
+		otp_cpu_version = "/otp@fe38c000/cpu-version@8";
+		audiopwm_lout = "/pinctrl/audiopwm/audiopwm-lout";
+		uart7m2_xfer = "/pinctrl/uart7/uart7m2-xfer";
+		pmugrf = "/syscon@fdc20000";
+		uart4m1_xfer = "/pinctrl/uart4/uart4m1-xfer";
+		i2s2_2ch = "/i2s@fe420000";
+		pwm5 = "/pwm@fe6e0010";
+		spi2m1_cs1_hs = "/pinctrl/spi2-hs/spi2m1-cs1";
+		uart1m0_xfer = "/pinctrl/uart1/uart1m0-xfer";
+		uart5m0_ctsn = "/pinctrl/uart5/uart5m0-ctsn";
+		gmac1m1_miim = "/pinctrl/gmac1/gmac1m1-miim";
+		rk817_slppin_pwrdn = "/i2c@fdd40000/pmic@20/pinctrl_rk8xx/rk817_slppin_pwrdn";
+		i2s2m1_sclkrx = "/pinctrl/i2s2/i2s2m1-sclkrx";
+		pwm10 = "/pwm@fe6f0020";
+		sdmmc2m1_clk = "/pinctrl/sdmmc2/sdmmc2m1-clk";
+		rktimer = "/timer@fe5f0000";
+		rkcif_dvp_sditf = "/rkcif_dvp_sditf";
+		i2s3m0_mclk = "/pinctrl/i2s3/i2s3m0-mclk";
+		provider0 = "/testcase-data/phandle-tests/provider0";
+		route_hdmi = "/display-subsystem/route/route-hdmi";
+		pipe_phy_grf2 = "/syscon@fdc90000";
+		i2s1m2_sdo0 = "/pinctrl/i2s1/i2s1m2-sdo0";
+		dsi0_in_vp1 = "/dsi@fe060000/ports/port@0/endpoint@1";
+		dmc_opp_table = "/dmc-opp-table";
+		uart4 = "/serial@fe680000";
+		pwm1m0_pins = "/pinctrl/pwm1/pwm1m0-pins";
+		vp0_out_dsi1 = "/vop@fe040000/ports/port@0/endpoint@1";
+		spi0m0_cs0 = "/pinctrl/spi0/spi0m0-cs0";
+		pdmm2_sdi2 = "/pinctrl/pdm/pdmm2-sdi2";
+		pcie30x1_buttonrstn = "/pinctrl/pcie30x1/pcie30x1-buttonrstn";
+		u2phy1_host = "/usb2-phy@fe8b0000/host-port";
+		qos_sata2 = "/qos@fe190300";
+		ddr3_params = "/ddr3-params";
+		rkisp_vir1 = "/rkisp-vir1";
+		spi2m0_cs1 = "/pinctrl/spi2/spi2m0-cs1";
+		otp_id = "/otp@fe38c000/id@a";
+		spi2m1_pins_hs = "/pinctrl/spi2-hs/spi2m1-pins";
+		uart5m1_xfer = "/pinctrl/uart5/uart5m1-xfer";
+		sata1_pins = "/pinctrl/sata1/sata1-pins";
+		lpddr4x_params = "/lpddr4x-params";
+		uart2m0_xfer = "/pinctrl/uart2/uart2m0-xfer";
+		uart6m0_ctsn = "/pinctrl/uart6/uart6m0-ctsn";
+		npu_pins = "/pinctrl/npu/npu-pins";
+		vdd_gpu = "/i2c@fdd40000/pmic@20/regulators/DCDC_REG2";
+		xin32k = "/xin32k";
+		unittest5 = "/testcase-data/overlay-node/test-bus/test-unittest5";
+		cpu0_opp_table = "/cpu0-opp-table";
+		eink = "/eink@fdf00000";
+		ride_200 = "/testcase-data-2/fairway-1/ride@200";
+		spi1m0_cs0_hs = "/pinctrl/spi1-hs/spi1m0-cs0";
+		vp1_out_hdmi = "/vop@fe040000/ports/port@1/endpoint@3";
+		i2c2m1_xfer = "/pinctrl/i2c2/i2c2m1-xfer";
+		bus_npu_opp_table = "/bus-npu-opp-table";
+		pcie30x1m0_pins = "/pinctrl/pcie30x1/pcie30x1m0-pins";
+		qos_vicap0 = "/qos@fe148080";
+		qos_vpu = "/qos@fe150000";
+		audiopwm_loutn = "/pinctrl/audiopwm/audiopwm-loutn";
+		vdda0v9_image = "/i2c@fdd40000/pmic@20/regulators/LDO_REG1";
+		qos_pcie2x1 = "/qos@fe190000";
+		spi1m0_pins_hs = "/pinctrl/spi1-hs/spi1m0-pins";
+		power = "/power-management@fdd90000/power-controller";
+		vad = "/vad@fe450000";
+		gmac1m1_rgmii_bus_level3 = "/pinctrl/gmac-txd-level3/gmac1m1-rgmii-bus-level3";
+		dsi1_in_vp1 = "/dsi@fe070000/ports/port@0/endpoint@1";
+		ext_cam_imx219_clk_two = "/external-camera-imx219-clock-two";
+		pwm2m0_pins = "/pinctrl/pwm2/pwm2m0-pins";
+		i2s1m1_sdo2 = "/pinctrl/i2s1/i2s1m1-sdo2";
+		eth0_pins = "/pinctrl/eth0/eth0-pins";
+		pwm3 = "/pwm@fdd70030";
+		ddr4_params = "/ddr4-params";
+		rkcif_mmu = "/iommu@fdfe0800";
+		gmac0_tx_bus2 = "/pinctrl/gmac0/gmac0-tx-bus2";
+		sata2 = "/sata@fc800000";
+		uart9m2_xfer = "/pinctrl/uart9/uart9m2-xfer";
+		i2s1m2_sdi2 = "/pinctrl/i2s1/i2s1m2-sdi2";
+		uart6m1_xfer = "/pinctrl/uart6/uart6m1-xfer";
+		pinctrl_rk8xx = "/i2c@fdd40000/pmic@20/pinctrl_rk8xx";
+		uart3m0_xfer = "/pinctrl/uart3/uart3m0-xfer";
+		uart7m0_ctsn = "/pinctrl/uart7/uart7m0-ctsn";
+		usb2phy0_grf = "/syscon@fdca0000";
+		scmi_clk = "/firmware/scmi/protocol@14";
+		emmc_clk = "/pinctrl/emmc/emmc-clk";
+		imx219_1 = "/i2c@fe5a0000/imx219-1@10";
+		usbdrd30 = "/usbdrd";
+		cru = "/clock-controller@fdd20000";
+		spdifm1_tx = "/pinctrl/spdif/spdifm1-tx";
+		sdmmc2m0_det = "/pinctrl/sdmmc2/sdmmc2m0-det";
+		spi1m1_cs0_hs = "/pinctrl/spi1-hs/spi1m1-cs0";
+		rknpu_mmu = "/iommu@fde4b000";
+		rkcif_mipi_lvds_sditf = "/rkcif_mipi_lvds_sditf";
+		i2c3m1_xfer = "/pinctrl/i2c3/i2c3m1-xfer";
+		pipe_phy_grf0 = "/syscon@fdc70000";
+		pcie30x2m0_pins = "/pinctrl/pcie30x2/pcie30x2m0-pins";
+		cpu3 = "/cpus/cpu@300";
+		gmac1_stmmac_axi_setup = "/ethernet@fe010000/stmmac-axi-config";
+		spi3m1_cs0 = "/pinctrl/spi3/spi3m1-cs0";
+		reboot_mode = "/syscon@fdc20000/reboot-mode";
+		pdmm0_clk1 = "/pinctrl/pdm/pdmm0-clk1";
+		gmac1m0_tx_bus2_level3 = "/pinctrl/gmac-txd-level3/gmac1m0-tx-bus2-level3";
+		uart2 = "/serial@fe660000";
+		rk817_slppin_rst = "/i2c@fdd40000/pmic@20/pinctrl_rk8xx/rk817_slppin_rst";
+		pdmm2_sdi0 = "/pinctrl/pdm/pdmm2-sdi0";
+		mailbox = "/mailbox@fe780000";
+		dmac0 = "/dmac@fe530000";
+		soc_slppin_gpio = "/pinctrl/pmic/soc_slppin_gpio";
+		vp1_out_edp = "/vop@fe040000/ports/port@1/endpoint@2";
+		pdmm1_clk = "/pinctrl/pdm/pdmm1-clk";
+		sdio_pwrseq = "/sdio-pwrseq";
+		jpegd_mmu = "/iommu@fded0480";
+		uart7m1_xfer = "/pinctrl/uart7/uart7m1-xfer";
+		otp = "/otp@fe38c000";
+		uart4m0_xfer = "/pinctrl/uart4/uart4m0-xfer";
+		uart8m0_ctsn = "/pinctrl/uart8/uart8m0-ctsn";
+		gmac1m0_rx_bus2 = "/pinctrl/gmac1/gmac1m0-rx-bus2";
+		edp_phy = "/edp-phy@fdcb0000";
+		unittest3 = "/testcase-data/overlay-node/test-bus/test-unittest3";
+		combphy1_usq = "/phy@fe830000";
+		refclk_pins = "/pinctrl/refclk/refclk-pins";
+		qos_rkvenc_wr_m0 = "/qos@fe138180";
+		gmac1m0_miim = "/pinctrl/gmac1/gmac1m0-miim";
+		core_pvtm = "/otp@fe38c000/core-pvtm@2a";
+		pmu_io_domains = "/syscon@fdc20000/io-domains";
+		route_lvds = "/display-subsystem/route/route-lvds";
+		spi3m0_cs1_hs = "/pinctrl/spi3-hs/spi3m0-cs1";
+		test_intc2 = "/testcase-data/interrupts/intc2";
+		vcc3v3_sd = "/i2c@fdd40000/pmic@20/regulators/SWITCH_REG2";
+		gic = "/interrupt-controller@fd400000";
+		uart0_rtsn = "/pinctrl/uart0/uart0-rtsn";
+		pipegrf = "/syscon@fdc50000";
+		gmac0_rgmii_clk_level2 = "/pinctrl/gmac-txc-level2/gmac0-rgmii-clk-level2";
+		sdmmc1_clk = "/pinctrl/sdmmc1/sdmmc1-clk";
+		unittest_i2c_test_bus = "/testcase-data/overlay-node/test-bus/i2c-test-bus";
+		test_intmap0 = "/testcase-data/interrupts/intmap0";
+		i2c4m1_xfer = "/pinctrl/i2c4/i2c4m1-xfer";
+		hdmi_in_vp1 = "/hdmi@fe0a0000/ports/port/endpoint@1";
+		sdmmc2m1_pwren = "/pinctrl/sdmmc2/sdmmc2m1-pwren";
+		sdmmc1 = "/dwmmc@fe2c0000";
+		ebc_extern = "/pinctrl/ebc/ebc-extern";
+		i2s1m1_sdo0 = "/pinctrl/i2s1/i2s1m1-sdo0";
+		sdmmc1_pwren = "/pinctrl/sdmmc1/sdmmc1-pwren";
+		hvac_1 = "/testcase-data-2/substation@100/hvac-medium-1";
+		leds = "/leds";
+		pwm1 = "/pwm@fdd70010";
+		threshold = "/thermal-zones/soc-thermal/trips/trip-point-0";
+		i2s1m2_sdi0 = "/pinctrl/i2s1/i2s1m2-sdi0";
+		can2 = "/can@fe590000";
+		edp = "/edp@fe0c0000";
+		pdmm1_sdi2 = "/pinctrl/pdm/pdmm1-sdi2";
+		rk809_sound = "/rk809-sound";
+		u2phy0_host = "/usb2-phy@fe8a0000/host-port";
+		uart8m1_xfer = "/pinctrl/uart8/uart8m1-xfer";
+		spin_ctrl_1 = "/testcase-data-2/substation@100/motor-1";
+		sata_pins = "/pinctrl/sata/sata-pins";
+		lpddr3_params = "/lpddr3-params";
+		uart5m0_xfer = "/pinctrl/uart5/uart5m0-xfer";
+		uart9m0_ctsn = "/pinctrl/uart9/uart9m0-ctsn";
+		sata0_pins = "/pinctrl/sata0/sata0-pins";
+		usb_host1_ehci = "/usb@fd880000";
+		xin24m = "/xin24m";
+		vp1_out_lvds = "/vop@fe040000/ports/port@1/endpoint@4";
+		i2s2m1_sdo = "/pinctrl/i2s2/i2s2m1-sdo";
+		mcp251x_clk = "/mcp251x-clk";
+		pcfg_output_low_pull_down = "/pinctrl/pcfg-output-low-pull-down";
+		rk809_codec = "/i2c@fdd40000/pmic@20/codec";
+		csi2dphy1_out = "/csi2-dphy1/ports/port@1/endpoint@1";
+		route_dsi1 = "/display-subsystem/route/route-dsi1";
+		tsadc = "/tsadc@fe710000";
+		eth1m1_pins = "/pinctrl/eth1/eth1m1-pins";
+		mdio1 = "/ethernet@fe010000/mdio";
+		gpio3 = "/pinctrl/gpio@fe760000";
+		spi3m1_cs1_hs = "/pinctrl/spi3-hs/spi3m1-cs1";
+		gpu_opp_table = "/opp-table2";
+		cpu1 = "/cpus/cpu@100";
+		vdpu_mmu = "/iommu@fdea0800";
+		i2c5m1_xfer = "/pinctrl/i2c5/i2c5m1-xfer";
+		rgb = "/syscon@fdc60000/rgb";
+		i2c2m0_xfer = "/pinctrl/i2c2/i2c2m0-xfer";
+		uart0 = "/serial@fdd50000";
+		i2s3m0_sdo = "/pinctrl/i2s3/i2s3m0-sdo";
+		i2s2m0_sdi = "/pinctrl/i2s2/i2s2m0-sdi";
+		pwm8m1_pins = "/pinctrl/pwm8/pwm8m1-pins";
+		dsi1_in = "/dsi@fe070000/ports/port@0";
+		spi0m1_pins = "/pinctrl/spi0/spi0m1-pins";
+		bt1120_pins = "/pinctrl/bt1120/bt1120-pins";
+		rides_1 = "/testcase-data-2/fairway-1";
+		imx219_1_out = "/i2c@fe5a0000/imx219-1@10/port/endpoint";
+		spi0m1_pins_hs = "/pinctrl/spi0-hs/spi0m1-pins";
+		i2s1m0_sdo2 = "/pinctrl/i2s1/i2s1m0-sdo2";
+		u2phy0_otg = "/usb2-phy@fe8a0000/otg-port";
+		edpdpm1_pins = "/pinctrl/edpdp/edpdpm1-pins";
+		qos_hdcp = "/qos@fe1a8000";
+		unittest1 = "/testcase-data/overlay-node/test-bus/test-unittest1";
+		i2c4 = "/i2c@fe5d0000";
+		rk_rga = "/rk_rga@fdeb0000";
+		uart9m1_xfer = "/pinctrl/uart9/uart9m1-xfer";
+		i2s1m1_sdi2 = "/pinctrl/i2s1/i2s1m1-sdi2";
+		sdmmc1_bus4 = "/pinctrl/sdmmc1/sdmmc1-bus4";
+		i2s3_2ch = "/i2s@fe430000";
+		vp1_out_dsi1 = "/vop@fe040000/ports/port@1/endpoint@1";
+		lpddr4_params = "/lpddr4-params";
+		uart6m0_xfer = "/pinctrl/uart6/uart6m0-xfer";
+		vcc3v3_pmu = "/i2c@fdd40000/pmic@20/regulators/LDO_REG6";
+		uart1m1_rtsn = "/pinctrl/uart1/uart1m1-rtsn";
+		test_intc0 = "/testcase-data/interrupts/intc0";
+		vdd_cpu = "/i2c@fdd40000/tcs4525@1c";
+		qos_jpeg_dec = "/qos@fe158180";
+		pwm15 = "/pwm@fe700030";
+		vop_mmu = "/iommu@fe043e00";
+		gmac1m1_tx_bus2 = "/pinctrl/gmac1/gmac1m1-tx-bus2";
+		sdmmc0_det = "/pinctrl/sdmmc0/sdmmc0-det";
+		iep_mmu = "/iommu@fdef0800";
+		i2c3m0_xfer = "/pinctrl/i2c3/i2c3m0-xfer";
+		csi2dphy1_ucam0 = "/csi2-dphy1/ports/port@0/endpoint@1";
+		gmac1m1_rgmii_bus = "/pinctrl/gmac1/gmac1m1-rgmii-bus";
+		spi2m0_cs0_hs = "/pinctrl/spi2-hs/spi2m0-cs0";
+		pwm7_pins = "/pinctrl/pwm7/pwm7-pins";
+		can0 = "/can@fe570000";
+		pwm9m1_pins = "/pinctrl/pwm9/pwm9m1-pins";
+		pdmm1_sdi0 = "/pinctrl/pdm/pdmm1-sdi0";
+		vp2 = "/vop@fe040000/ports/port@2";
+		spi1m1_pins = "/pinctrl/spi1/spi1m1-pins";
+		rng = "/rng@fe388000";
+		uart9 = "/serial@fe6d0000";
+		spi0m1_cs0 = "/pinctrl/spi0/spi0m1-cs0";
+		wifi_enable_h = "/pinctrl/sdio-pwrseq/wifi-enable-h";
+		rkcif = "/rkcif@fdfe0000";
+		gmac0_rgmii_clk = "/pinctrl/gmac0/gmac0-rgmii-clk";
+		rkvdec = "/rkvdec@fdf80200";
+		spi2m1_cs1 = "/pinctrl/spi2/spi2m1-cs1";
+		cpu_leakage = "/otp@fe38c000/cpu-leakage@1a";
+		uart7m0_xfer = "/pinctrl/uart7/uart7m0-xfer";
+		csi2_dphy2 = "/csi2-dphy2";
+		spi3 = "/spi@fe640000";
+		gmac1m1_rgmii_clk_level2 = "/pinctrl/gmac-txc-level2/gmac1m1-rgmii-clk-level2";
+		gpio1 = "/pinctrl/gpio@fe740000";
+		tsadcm1_shut = "/pinctrl/tsadc/tsadcm1-shut";
+		spi1m0_cs0 = "/pinctrl/spi1/spi1m0-cs0";
+		xpcs = "/syscon@fda00000";
+		testcase = "/testcase-data";
+		spi3m0_cs1 = "/pinctrl/spi3/spi3m0-cs1";
+		vdda0v9_pmu = "/i2c@fdd40000/pmic@20/regulators/LDO_REG3";
+		i2c4m0_xfer = "/pinctrl/i2c4/i2c4m0-xfer";
+		its = "/interrupt-controller@fd400000/interrupt-controller@fd440000";
+		wdt = "/watchdog@fe600000";
+		rknpu_reserved = "/reserved-memory/rknpu";
+		cspmu = "/cspmu@fd90c000";
+		usbhost_dwc3 = "/usbhost/dwc3@fd000000";
+		vdda_0v9 = "/i2c@fdd40000/pmic@20/regulators/LDO_REG2";
+		lights_1 = "/testcase-data-2/lights@30000";
+		qos_rga_rd = "/qos@fe158280";
+		spi2m1_cs0_hs = "/pinctrl/spi2-hs/spi2m1-cs0";
+		i2s1m0_sdo0 = "/pinctrl/i2s1/i2s1m0-sdo0";
+		hdmitx_scl = "/pinctrl/hdmitx/hdmitx-scl";
+		hdmitx_sda = "/pinctrl/hdmitx/hdmitx-sda";
+		spi2m1_pins = "/pinctrl/spi2/spi2m1-pins";
+		cam_clkout0 = "/pinctrl/cam/cam-clkout0";
+		i2c2 = "/i2c@fe5b0000";
+		soc_slppin_slp = "/pinctrl/pmic/soc_slppin_slp";
+		i2s1m1_sdi0 = "/pinctrl/i2s1/i2s1m1-sdi0";
+		sram = "/sram@fdcc0000";
+		gmac0_rx_er = "/pinctrl/gmac0/gmac0-rx-er";
+		qos_rkvenc_rd_m1 = "/qos@fe138100";
+		pdmm0_sdi2 = "/pinctrl/pdm/pdmm0-sdi2";
+		pwm8 = "/pwm@fe6f0000";
+		log_leakage = "/otp@fe38c000/log-leakage@1b";
+		gmac0_tx_bus2_level3 = "/pinctrl/gmac-txd-level3/gmac0-tx-bus2-level3";
+		emmc_bus8 = "/pinctrl/emmc/emmc-bus8";
+		qos_usb3_0 = "/qos@fe190380";
+		uart8m0_xfer = "/pinctrl/uart8/uart8m0-xfer";
+		pwm10m1_pins = "/pinctrl/pwm10/pwm10m1-pins";
+		usb_host0_ehci = "/usb@fd800000";
+		gmac1 = "/ethernet@fe010000";
+		usb2phy1_grf = "/syscon@fdca8000";
+		pcie20m2_pins = "/pinctrl/pcie20/pcie20m2-pins";
+		pwm13 = "/pwm@fe700010";
+		video_phy0 = "/video-phy@fe850000";
+		eth1m0_pins = "/pinctrl/eth1/eth1m0-pins";
+		gmac1m0_rgmii_clk = "/pinctrl/gmac1/gmac1m0-rgmii-clk";
+		VCC_GPIO0_17 = "/i2c@fdd40000/pmic@20/regulators/LDO_REG9";
+		cif_dvp_bus8 = "/pinctrl/cif/cif-dvp-bus8";
+		sdmmc2m1_det = "/pinctrl/sdmmc2/sdmmc2m1-det";
+		tsadc_shutorg = "/pinctrl/tsadc/tsadc-shutorg";
+		provider3 = "/testcase-data/phandle-tests/provider3";
+		clk32k_out1 = "/pinctrl/clk32k/clk32k-out1";
+		i2c5m0_xfer = "/pinctrl/i2c5/i2c5m0-xfer";
+		audiopwm_loutp = "/pinctrl/audiopwm/audiopwm-loutp";
+		cif_dvp_clk = "/pinctrl/cif/cif-dvp-clk";
+		i2s1m2_sdo3 = "/pinctrl/i2s1/i2s1m2-sdo3";
+		fspi_pins = "/pinctrl/fspi/fspi-pins";
+		vcc_camera_imx219 = "/vcc-camera-imx219";
+		rknpu = "/npu@fde40000";
+		pcfg_pull_none_drv_level_2 = "/pinctrl/pcfg-pull-none-drv-level-2";
+		vp0 = "/vop@fe040000/ports/port@0";
+		i2c1_xfer = "/pinctrl/i2c1/i2c1-xfer";
+		ebc_pins = "/pinctrl/ebc/ebc-pins";
+		audpwm = "/audpwm@fe470000";
+		uart7 = "/serial@fe6b0000";
+		qos_vop_m0 = "/qos@fe1a8080";
+		edp_in_vp0 = "/edp@fe0c0000/ports/port@0/endpoint@0";
+		pmucru = "/clock-controller@fdd00000";
+		spi3m1_pins = "/pinctrl/spi3/spi3m1-pins";
+		pwm8m0_pins = "/pinctrl/pwm8/pwm8m0-pins";
+		pmic_int = "/pinctrl/pmic/pmic_int";
+		spi0m0_pins = "/pinctrl/spi0/spi0m0-pins";
+		vcc_ddr = "/i2c@fdd40000/pmic@20/regulators/DCDC_REG3";
+		edpdpm0_pins = "/pinctrl/edpdp/edpdpm0-pins";
+		sfc = "/sfc@fe300000";
+		csi2_dphy0 = "/csi2-dphy0";
+		spi1 = "/spi@fe620000";
+		spdif_8ch = "/spdif@fe460000";
+		wireless_bluetooth = "/wireless-bluetooth";
+		isp_pins = "/pinctrl/isp/isp-pins";
+		uart9m0_xfer = "/pinctrl/uart9/uart9m0-xfer";
+		i2s1m0_sdi2 = "/pinctrl/i2s1/i2s1m0-sdi2";
+		sdmmc0_bus4 = "/pinctrl/sdmmc0/sdmmc0-bus4";
+		pwm11m1_pins = "/pinctrl/pwm11/pwm11m1-pins";
+		unittest8 = "/testcase-data/overlay-node/test-bus/test-unittest8";
+		dsi0 = "/dsi@fe060000";
+		usb2phy0 = "/usb2-phy@fe8a0000";
+		uart1m0_rtsn = "/pinctrl/uart1/uart1m0-rtsn";
+		pcfg_pull_up_drv_level_1 = "/pinctrl/pcfg-pull-up-drv-level-1";
+		gmac1_xpcsclk = "/xpcs-gmac1-clock";
+		vp2_out_lvds = "/vop@fe040000/ports/port@2/endpoint@0";
+		reserved_memory = "/reserved-memory";
+		vop_out = "/vop@fe040000/ports";
+		i2s1_mclkin_tx = "/i2s1-mclkin-tx";
+		clk32k_in = "/pinctrl/clk32k/clk32k-in";
+		ride_200_left = "/testcase-data-2/fairway-1/ride@200/track@10";
+		mcu_pins = "/pinctrl/mcu/mcu-pins";
+		i2c0 = "/i2c@fdd40000";
+		pwm6_pins = "/pinctrl/pwm6/pwm6-pins";
+		soc_thermal = "/thermal-zones/soc-thermal";
+		spi3m1_pins_hs = "/pinctrl/spi3-hs/spi3m1-pins";
+		pwm9m0_pins = "/pinctrl/pwm9/pwm9m0-pins";
+		pcie30x2_buttonrstn = "/pinctrl/pcie30x2/pcie30x2-buttonrstn";
+		pdmm0_sdi0 = "/pinctrl/pdm/pdmm0-sdi0";
+		pwm6 = "/pwm@fe6e0020";
+		spi1m0_pins = "/pinctrl/spi1/spi1m0-pins";
+		spdifm0_tx = "/pinctrl/spdif/spdifm0-tx";
+		isp1_in = "/rkisp-vir1/port/endpoint@0";
+		vcca_1v8 = "/i2c@fdd40000/pmic@20/regulators/LDO_REG7";
+		pwm12m1_pins = "/pinctrl/pwm12/pwm12m1-pins";
+		pwm11 = "/pwm@fe6f0030";
+		usbdrd_dwc3 = "/usbdrd/dwc3@fcc00000";
+		pcie20_buttonrstn = "/pinctrl/pcie20/pcie20-buttonrstn";
+		csi2dphy2_out = "/csi2-dphy2/ports/port@1/endpoint@1";
+		io_domains = "/syscon@fdc60000/io-domains";
+		tsadcm0_shut = "/pinctrl/tsadc/tsadcm0-shut";
+		provider1 = "/testcase-data/phandle-tests/provider1";
+		i2s1m2_sdo1 = "/pinctrl/i2s1/i2s1m2-sdo1";
+		spi2m0_pins_hs = "/pinctrl/spi2-hs/spi2m0-pins";
+		unittest100 = "/testcase-data/overlay-node/test-bus/test-unittest100";
+		rockchip_suspend = "/rockchip-suspend";
+		cpu_pins = "/pinctrl/cpu/cpu-pins";
+		i2s1_mclkin_rx = "/i2s1-mclkin-rx";
+		sc16is752_clk = "/sc16is752-clk";
+		i2s3m1_sdo = "/pinctrl/i2s3/i2s3m1-sdo";
+		uart5 = "/serial@fe690000";
+		gmac1m0_clkinout = "/pinctrl/gmac1/gmac1m0-clkinout";
+		fiq_debugger = "/fiq-debugger";
+		spi0m0_cs1 = "/pinctrl/spi0/spi0m0-cs1";
+		pdmm2_sdi3 = "/pinctrl/pdm/pdmm2-sdi3";
+		rgb_in_vp2 = "/syscon@fdc60000/rgb/ports/port@0/endpoint@2";
+		i2s2m1_sdi = "/pinctrl/i2s2/i2s2m1-sdi";
+		vcc_camera_imx219_two = "/vcc-camera-imx219-two";
+		spi2m0_pins = "/pinctrl/spi2/spi2m0-pins";
+		vepu_mmu = "/iommu@fdee0800";
+		imx219_2_out = "/i2c@fe5c0000/imx219-2@10/port/endpoint";
+		gmac1_mtl_rx_setup = "/ethernet@fe010000/rx-queues-config";
+		u2phy1_otg = "/usb2-phy@fe8b0000/otg-port";
+		spi3m0_cs0_hs = "/pinctrl/spi3-hs/spi3m0-cs0";
+		i2s1m0_sdi0 = "/pinctrl/i2s1/i2s1m0-sdi0";
+		unittest6 = "/testcase-data/overlay-node/test-bus/test-unittest6";
+		spi0m0_cs1_hs = "/pinctrl/spi0-hs/spi0m0-cs1";
+		i2s2_mclkin = "/i2s2-mclkin";
+		mpll = "/mpll";
+		pwm13m1_pins = "/pinctrl/pwm13/pwm13m1-pins";
+		i2s3m0_sdi = "/pinctrl/i2s3/i2s3m0-sdi";
+		pwm10m0_pins = "/pinctrl/pwm10/pwm10m0-pins";
+		uart3m0_rtsn = "/pinctrl/uart3/uart3m0-rtsn";
+		vop = "/vop@fe040000";
+		lvds_in_vp1 = "/syscon@fdc60000/lvds/ports/port@0/endpoint@1";
+		pcie20m1_pins = "/pinctrl/pcie20/pcie20m1-pins";
+		vepu = "/vepu@fdee0000";
+		cif_clk = "/pinctrl/cif/cif-clk";
+		sdmmc2m1_bus4 = "/pinctrl/sdmmc2/sdmmc2m1-bus4";
+		rk817_slppin_null = "/i2c@fdd40000/pmic@20/pinctrl_rk8xx/rk817_slppin_null";
+		qos_vicap1 = "/qos@fe148100";
+		sdmmc1_det = "/pinctrl/sdmmc1/sdmmc1-det";
+		dig_acodec = "/codec-digital@fe478000";
+		gmac1m0_rx_er = "/pinctrl/gmac1/gmac1m0-rx-er";
+		i2s1m1_sdo3 = "/pinctrl/i2s1/i2s1m1-sdo3";
+		gmac0_rx_bus2 = "/pinctrl/gmac0/gmac0-rx-bus2";
+		uart0_ctsn = "/pinctrl/uart0/uart0-ctsn";
+		i2c0_xfer = "/pinctrl/i2c0/i2c0-xfer";
+		pwm4 = "/pwm@fe6e0000";
+		vcc3v3_sys = "/vcc3v3-sys";
+		i2s1m2_sdi3 = "/pinctrl/i2s1/i2s1m2-sdi3";
+		spi3m0_pins = "/pinctrl/spi3/spi3m0-pins";
+		i2s3m1_sclk = "/pinctrl/i2s3/i2s3m1-sclk";
+		spi3m1_cs0_hs = "/pinctrl/spi3-hs/spi3m1-cs0";
+		i2s1m0_lrcktx = "/pinctrl/i2s1/i2s1m0-lrcktx";
+		csi2dphy2_ucam0 = "/csi2-dphy2/ports/port@0/endpoint@1";
+		rkisp = "/rkisp@fdff0000";
+		vcca1v8_pmu = "/i2c@fdd40000/pmic@20/regulators/LDO_REG8";
+		chosen = "/chosen";
+		soc_crit = "/thermal-zones/soc-thermal/trips/soc-crit";
+		imx219_2 = "/i2c@fe5c0000/imx219-2@10";
+		mpp_srv = "/mpp-srv";
+		i2s3_mclkin = "/i2s3-mclkin";
+		sdmmc2m0_cmd = "/pinctrl/sdmmc2/sdmmc2m0-cmd";
+		debug = "/debug@fd904000";
+		pwm14m1_pins = "/pinctrl/pwm14/pwm14m1-pins";
+		pwm11m0_pins = "/pinctrl/pwm11/pwm11m0-pins";
+		tsadc_gpio_func = "/pinctrl/gpio-func/tsadc-gpio-func";
+		spi1m1_cs0 = "/pinctrl/spi1/spi1m1-cs0";
+		uart4m0_rtsn = "/pinctrl/uart4/uart4m0-rtsn";
+		vp0_out_edp = "/vop@fe040000/ports/port@0/endpoint@2";
+		pipe_phy_grf1 = "/syscon@fdc80000";
+		pcfg_pull_down = "/pinctrl/pcfg-pull-down";
+		pcie2x1_intc = "/pcie@fe260000/legacy-interrupt-controller";
+		dsi0_in = "/dsi@fe060000/ports/port@0";
+		spi3m1_cs1 = "/pinctrl/spi3/spi3m1-cs1";
+		dsi0_in_vp0 = "/dsi@fe060000/ports/port@0/endpoint@0";
+		uart3 = "/serial@fe670000";
+		pcfg_pull_up = "/pinctrl/pcfg-pull-up";
+		vp0_out_dsi0 = "/vop@fe040000/ports/port@0/endpoint@0";
+		acodec_pins = "/pinctrl/acodec/acodec-pins";
+		pdmm2_sdi1 = "/pinctrl/pdm/pdmm2-sdi1";
+		dmac1 = "/dmac@fe550000";
+		qos_sata1 = "/qos@fe190280";
+		rkisp_vir0 = "/rkisp-vir0";
+		spi2m0_cs0 = "/pinctrl/spi2/spi2m0-cs0";
+		gmac1m0_rgmii_bus_level3 = "/pinctrl/gmac-txd-level3/gmac1m0-rgmii-bus-level3";
+		npu_opp_table = "/npu-opp-table";
+		pwm5_pins = "/pinctrl/pwm5/pwm5-pins";
+		gmac1_mtl_tx_setup = "/ethernet@fe010000/tx-queues-config";
+		i2s1m2_mclk = "/pinctrl/i2s1/i2s1m2-mclk";
+		i2s1m1_lrcktx = "/pinctrl/i2s1/i2s1m1-lrcktx";
+		i2s1m0_lrckrx = "/pinctrl/i2s1/i2s1m0-lrckrx";
+		vccio_sd = "/i2c@fdd40000/pmic@20/regulators/LDO_REG5";
+		vcc_1v8 = "/i2c@fdd40000/pmic@20/regulators/DCDC_REG5";
+		pwm15m1_pins = "/pinctrl/pwm15/pwm15m1-pins";
+		pwm12m0_pins = "/pinctrl/pwm12/pwm12m0-pins";
+		test_intmap1 = "/testcase-data/interrupts/intmap1";
+		uart5m0_rtsn = "/pinctrl/uart5/uart5m0-rtsn";
+		sdmmc2 = "/dwmmc@fe000000";
+		dsi1_in_vp0 = "/dsi@fe070000/ports/port@0/endpoint@0";
+		wifi_host_wake_irq = "/pinctrl/wireless-wlan/wifi-host-wake-irq";
+		i2s1m1_sdo1 = "/pinctrl/i2s1/i2s1m1-sdo1";
+		uart1m1_ctsn = "/pinctrl/uart1/uart1m1-ctsn";
+		hvac_2 = "/testcase-data-2/substation@100/hvac-large-1";
+		pwm2 = "/pwm@fdd70020";
+		audiopwm_routn = "/pinctrl/audiopwm/audiopwm-routn";
+		sata1 = "/sata@fc400000";
+		i2s1m2_sdi1 = "/pinctrl/i2s1/i2s1m2-sdi1";
+		CPU_SLEEP = "/cpus/idle-states/cpu-sleep";
+		spi1m1_pins_hs = "/pinctrl/spi1-hs/spi1m1-pins";
+		pdmm1_sdi3 = "/pinctrl/pdm/pdmm1-sdi3";
+		display_subsystem = "/display-subsystem";
+		spin_ctrl_2 = "/testcase-data-2/substation@100/motor-8";
+		i2s0_8ch = "/i2s@fe400000";
+		pmu = "/power-management@fdd90000";
+		i2s1m2_lrcktx = "/pinctrl/i2s1/i2s1m2-lrcktx";
+		i2s1m1_lrckrx = "/pinctrl/i2s1/i2s1m1-lrckrx";
+		pcie2x1 = "/pcie@fe260000";
+		emmc_datastrobe = "/pinctrl/emmc/emmc-datastrobe";
+		gpio4 = "/pinctrl/gpio@fe770000";
+		scr = "/rkscr@fe560000";
+		pwm13m0_pins = "/pinctrl/pwm13/pwm13m0-pins";
+		cpu2 = "/cpus/cpu@200";
+		uart6m0_rtsn = "/pinctrl/uart6/uart6m0-rtsn";
+		hdmitxm0_cec = "/pinctrl/hdmitx/hdmitxm0-cec";
+		gpu_thermal = "/thermal-zones/gpu-thermal";
+		audiopwm_rout = "/pinctrl/audiopwm/audiopwm-rout";
+		spi0m0_pins_hs = "/pinctrl/spi0-hs/spi0m0-pins";
+		uart1 = "/serial@fe650000";
+		pcie20m0_pins = "/pinctrl/pcie20/pcie20m0-pins";
+		hdmi = "/hdmi@fe0a0000";
+		sdmmc2m0_bus4 = "/pinctrl/sdmmc2/sdmmc2m0-bus4";
+		i2s1m0_sclktx = "/pinctrl/i2s1/i2s1m0-sclktx";
+		gpu_pins = "/pinctrl/gpu/gpu-pins";
+		rk809 = "/i2c@fdd40000/pmic@20";
+		ramoops = "/reserved-memory/ramoops@110000";
+		i2s3m1_lrck = "/pinctrl/i2s3/i2s3m1-lrck";
+		hdmi_in = "/hdmi@fe0a0000/ports/port";
+		rkvdec_sram = "/sram@fdcc0000/rkvdec-sram@0";
+		i2s1m0_sdo3 = "/pinctrl/i2s1/i2s1m0-sdo3";
+		unittest2 = "/testcase-data/overlay-node/test-bus/test-unittest2";
+		soc_slppin_rst = "/pinctrl/pmic/soc_slppin_rst";
+		i2c5 = "/i2c@fe5e0000";
+		qos_rkvdec = "/qos@fe198000";
+		i2s1m1_sdi3 = "/pinctrl/i2s1/i2s1m1-sdi3";
+		gmac1m1_clkinout = "/pinctrl/gmac1/gmac1m1-clkinout";
+		gmac1m0_tx_bus2 = "/pinctrl/gmac1/gmac1m0-tx-bus2";
+		i2s3m0_sclk = "/pinctrl/i2s3/i2s3m0-sclk";
+		uart1_gpios = "/pinctrl/wireless-bluetooth/uart1-gpios";
+		qos_npu = "/qos@fe180000";
+		npu_leakage = "/otp@fe38c000/npu-leakage@1c";
+		grf = "/syscon@fdc60000";
+		retail_1 = "/testcase-data-2/vending@50000";
+		qos_jpeg_enc = "/qos@fe158200";
+		test_intc1 = "/testcase-data/interrupts/intc1";
+		i2s1m2_lrckrx = "/pinctrl/i2s1/i2s1m2-lrckrx";
+		gmac1m1_rx_bus2 = "/pinctrl/gmac1/gmac1m1-rx-bus2";
+		scr_pins = "/pinctrl/scr/scr-pins";
+		can0m1_pins = "/pinctrl/can0/can0m1-pins";
+		hdmi_in_vp0 = "/hdmi@fe0a0000/ports/port/endpoint@0";
+		sdmmc0_cmd = "/pinctrl/sdmmc0/sdmmc0-cmd";
+		pwm14m0_pins = "/pinctrl/pwm14/pwm14m0-pins";
+		usbhost30 = "/usbhost";
+		drm_cubic_lut = "/reserved-memory/drm-cubic-lut@00000000";
+		uart7m0_rtsn = "/pinctrl/uart7/uart7m0-rtsn";
+		sdmmc0 = "/dwmmc@fe2b0000";
+		spi1m0_cs1_hs = "/pinctrl/spi1-hs/spi1m0-cs1";
+		mbist_vmin = "/otp@fe38c000/mbist-vmin@9";
+		i2s1m1_sclktx = "/pinctrl/i2s1/i2s1m1-sclktx";
+		vp2_out_rgb = "/vop@fe040000/ports/port@2/endpoint@1";
+		pwm0 = "/pwm@fdd70000";
+		i2s1m0_sclkrx = "/pinctrl/i2s1/i2s1m0-sclkrx";
+		vopm1_pins = "/pinctrl/vop/vopm1-pins";
+		can1 = "/can@fe580000";
+		hdmi_sound = "/hdmi-sound";
+		pdmm1_sdi1 = "/pinctrl/pdm/pdmm1-sdi1";
+		vcc_3v3 = "/i2c@fdd40000/pmic@20/regulators/SWITCH_REG1";
+		uart0_xfer = "/pinctrl/uart0/uart0-xfer";
+		rkvenc = "/rkvenc@fdf40000";
+		gmac0_clkinout = "/pinctrl/gmac0/gmac0-clkinout";
+		rkcif_dvp = "/rkcif_dvp";
+		wireless_wlan = "/wireless-wlan";
+		rkcif_mipi_lvds = "/rkcif_mipi_lvds";
+		sdmmc2m0_clk = "/pinctrl/sdmmc2/sdmmc2m0-clk";
+		pwm4_pins = "/pinctrl/pwm4/pwm4-pins";
+		route_dsi0 = "/display-subsystem/route/route-dsi0";
+		pcie30x1m2_pins = "/pinctrl/pcie30x1/pcie30x1m2-pins";
+		i2s1m1_mclk = "/pinctrl/i2s1/i2s1m1-mclk";
+		gpio2 = "/pinctrl/gpio@fe750000";
+		spi1m0_cs1 = "/pinctrl/spi1/spi1m0-cs1";
+		rkvenc_mmu = "/iommu@fdf40f00";
+		electric_1 = "/testcase-data-2/substation@100";
+		cpu0 = "/cpus/cpu@0";
+		lcdc_ctl = "/pinctrl/lcdc/lcdc-ctl";
+		can1m1_pins = "/pinctrl/can1/can1m1-pins";
+		spdifm2_tx = "/pinctrl/spdif/spdifm2-tx";
+		i2s3m1_sdi = "/pinctrl/i2s3/i2s3m1-sdi";
+		gmac1m1_rgmii_clk = "/pinctrl/gmac1/gmac1m1-rgmii-clk";
+		pwm15m0_pins = "/pinctrl/pwm15/pwm15m0-pins";
+		i2s2m0_lrcktx = "/pinctrl/i2s2/i2s2m0-lrcktx";
+		rk817_slppin_slp = "/i2c@fdd40000/pmic@20/pinctrl_rk8xx/rk817_slppin_slp";
+		uart8m0_rtsn = "/pinctrl/uart8/uart8m0-rtsn";
+		jpegd = "/jpegd@fded0000";
+		i2s1m2_sclktx = "/pinctrl/i2s1/i2s1m2-sclktx";
+		lights_2 = "/testcase-data-2/lights@40000";
+		i2s1m1_sclkrx = "/pinctrl/i2s1/i2s1m1-sclkrx";
+		isp0_in = "/rkisp-vir0/port/endpoint@0";
+		i2s1m0_sdo1 = "/pinctrl/i2s1/i2s1m0-sdo1";
+		uart1m0_ctsn = "/pinctrl/uart1/uart1m0-ctsn";
+	};
+
+	vepu@fdee0000 {
+		power-domains = <0x21 0x0a>;
+		iommus = <0x6b>;
+		clock-names = "aclk_vcodec\0hclk_vcodec";
+		resets = <0x1f 0x12e 0x1f 0x12f>;
+		interrupts = <0x00 0x40 0x04>;
+		clocks = <0x1f 0xfd 0x1f 0xfe>;
+		rockchip,srv = <0x68>;
+		rockchip,taskqueue-node = <0x02>;
+		rockchip,disable-auto-freq;
+		compatible = "rockchip,vpu-encoder-v2";
+		rockchip,resetgroup-node = <0x02>;
+		status = "okay";
+		reg = <0x00 0xfdee0000 0x00 0x400>;
+		phandle = <0x157>;
+		reset-names = "video_a\0video_h";
+	};
+
+	sfc@fe300000 {
+		clock-names = "clk_sfc\0hclk_sfc";
+		assigned-clocks = <0x1f 0x78>;
+		assigned-clock-rates = <0x5f5e100>;
+		interrupts = <0x00 0x65 0x04>;
+		clocks = <0x1f 0x78 0x1f 0x76>;
+		compatible = "rockchip,sfc";
+		status = "okay";
+		reg = <0x00 0xfe300000 0x00 0x4000>;
+		phandle = <0x172>;
+	};
+
+	pwm@fe6f0030 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe7>;
+		clock-names = "pwm\0pclk";
+		interrupts = <0x00 0x54 0x04 0x00 0x58 0x04>;
+		clocks = <0x1f 0x15d 0x1f 0x15c>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe6f0030 0x00 0x10>;
+		phandle = <0x1a0>;
+	};
+
+	serial@fe6d0000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xdf>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x7d 0x04>;
+		clocks = <0x1f 0x13f 0x1f 0x13c>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfe6d0000 0x00 0x100>;
+		phandle = <0x198>;
+		dmas = <0x40 0x12 0x40 0x13>;
+		reg-shift = <0x02>;
+	};
+
+	reserved-memory {
+		#address-cells = <0x02>;
+		#size-cells = <0x02>;
+		ranges;
+		phandle = <0x11d>;
+
+		rknpu {
+			alignment = <0x00 0x1000>;
+			inactive;
+			compatible = "shared-dma-pool";
+			size = <0x00 0x1000000>;
+			phandle = <0x60>;
+			reusable;
+		};
+
+		drm-logo@00000000 {
+			compatible = "rockchip,drm-logo";
+			reg = <0x00 0xedf00000 0x00 0x20754c>;
+			phandle = <0x10>;
+		};
+
+		ramoops@110000 {
+			record-size = <0x20000>;
+			pmsg-size = <0x50000>;
+			compatible = "ramoops";
+			console-size = <0x80000>;
+			reg = <0x00 0x110000 0x00 0xf0000>;
+			phandle = <0x11e>;
+			ftrace-size = <0x00>;
+		};
+
+		drm-cubic-lut@00000000 {
+			compatible = "rockchip,drm-cubic-lut";
+			reg = <0x00 0xeff00000 0x00 0x8000>;
+			phandle = <0x11>;
+		};
+	};
+
+	iommu@fe043e00 {
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x94 0x04>;
+		clocks = <0x1f 0xdd 0x1f 0xde>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		status = "okay";
+		interrupt-names = "vop_mmu";
+		reg = <0x00 0xfe043e00 0x00 0x100 0x00 0xfe043f00 0x00 0x100>;
+		phandle = <0x82>;
+	};
+
+	qos@fe138180 {
+		compatible = "syscon";
+		reg = <0x00 0xfe138180 0x00 0x20>;
+		phandle = <0x58>;
+	};
+
+	csi2-dphy-hw@fe870000 {
+		clock-names = "pclk";
+		clocks = <0x1f 0x179>;
+		compatible = "rockchip,rk3568-csi2-dphy-hw";
+		status = "okay";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe870000 0x00 0x1000>;
+		phandle = <0xf2>;
+	};
+
+	csi2-dphy0 {
+		rockchip,hw = <0xf2>;
+		compatible = "rockchip,rk3568-csi2-dphy";
+		status = "disabled";
+		phandle = <0x1a7>;
+	};
+
+	rng@fe388000 {
+		clock-names = "clk_trng\0hclk_trng";
+		resets = <0x1f 0x6d>;
+		clocks = <0x1f 0x70 0x1f 0x6f>;
+		compatible = "rockchip,cryptov2-rng";
+		status = "okay";
+		reg = <0x00 0xfe388000 0x00 0x2000>;
+		phandle = <0x176>;
+		reset-names = "reset";
+	};
+
+	i2s1-mclkin-rx {
+		clock-output-names = "i2s1_mclkin_rx";
+		#clock-cells = <0x00>;
+		clock-frequency = <0xbb8000>;
+		compatible = "fixed-clock";
+		phandle = <0x128>;
+	};
+
+	pwm@fe6f0020 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe6>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x15d 0x1f 0x15c>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe6f0020 0x00 0x10>;
+		phandle = <0x19f>;
+	};
+
+	pdm@fe440000 {
+		pinctrl-names = "default";
+		pinctrl-0 = <0xb3 0xb4 0xb5 0xb6 0xb7 0xb8>;
+		clock-names = "pdm_clk\0pdm_hclk";
+		clocks = <0x1f 0x5a 0x1f 0x59>;
+		dma-names = "rx";
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-pdm\0rockchip,pdm";
+		status = "disabled";
+		reg = <0x00 0xfe440000 0x00 0x1000>;
+		phandle = <0x17a>;
+		dmas = <0xa6 0x09>;
+	};
+
+	pwm@fe6f0010 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe5>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x15d 0x1f 0x15c>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe6f0010 0x00 0x10>;
+		phandle = <0x19e>;
+	};
+
+	qos@fe158000 {
+		compatible = "syscon";
+		reg = <0x00 0xfe158000 0x00 0x20>;
+		phandle = <0x4e>;
+	};
+
+	vop@fe040000 {
+		power-domains = <0x21 0x09>;
+		iommus = <0x82>;
+		clock-names = "aclk_vop\0hclk_vop\0dclk_vp0\0dclk_vp1\0dclk_vp2";
+		reg-names = "regs\0gamma_lut";
+		assigned-clocks = <0x1f 0xdf 0x1f 0xe0>;
+		assigned-clock-parents = <0x31 0x02 0x1f 0x05>;
+		interrupts = <0x00 0x94 0x04>;
+		clocks = <0x1f 0xdd 0x1f 0xde 0x1f 0xdf 0x1f 0xe0 0x1f 0xe1>;
+		compatible = "rockchip,rk3568-vop";
+		status = "okay";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe040000 0x00 0x3000 0x00 0xfe044000 0x00 0x1000>;
+		phandle = <0x163>;
+
+		ports {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+			phandle = <0x12>;
+
+			port@0 {
+				rockchip,primary-plane = <0x02>;
+				rockchip,plane-mask = <0x05>;
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x00>;
+				phandle = <0x164>;
+
+				endpoint@3 {
+					remote-endpoint = <0x86>;
+					reg = <0x03>;
+					phandle = <0x17>;
+				};
+
+				endpoint@1 {
+					remote-endpoint = <0x84>;
+					reg = <0x01>;
+					phandle = <0x15>;
+				};
+
+				endpoint@2 {
+					remote-endpoint = <0x85>;
+					reg = <0x02>;
+					phandle = <0x16>;
+				};
+
+				endpoint@0 {
+					remote-endpoint = <0x83>;
+					reg = <0x00>;
+					phandle = <0x14>;
+				};
+			};
+
+			port@1 {
+				rockchip,primary-plane = <0x03>;
+				rockchip,plane-mask = <0x0a>;
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x01>;
+				phandle = <0x165>;
+
+				endpoint@3 {
+					remote-endpoint = <0x8a>;
+					reg = <0x03>;
+					phandle = <0x94>;
+				};
+
+				endpoint@1 {
+					remote-endpoint = <0x88>;
+					reg = <0x01>;
+					phandle = <0x90>;
+				};
+
+				endpoint@4 {
+					remote-endpoint = <0x8b>;
+					reg = <0x04>;
+					phandle = <0x18>;
+				};
+
+				endpoint@2 {
+					remote-endpoint = <0x89>;
+					reg = <0x02>;
+					phandle = <0x96>;
+				};
+
+				endpoint@0 {
+					remote-endpoint = <0x87>;
+					reg = <0x00>;
+					phandle = <0x8e>;
+				};
+			};
+
+			port@2 {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x02>;
+				phandle = <0x166>;
+
+				endpoint@1 {
+					remote-endpoint = <0x8d>;
+					reg = <0x01>;
+					phandle = <0x19>;
+				};
+
+				endpoint@0 {
+					remote-endpoint = <0x8c>;
+					reg = <0x00>;
+					phandle = <0x2f>;
+				};
+			};
+		};
+	};
+
+	serial@fe660000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xd8>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x76 0x04>;
+		clocks = <0x1f 0x123 0x1f 0x120>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfe660000 0x00 0x100>;
+		phandle = <0x191>;
+		dmas = <0x40 0x04 0x40 0x05>;
+		reg-shift = <0x02>;
+	};
+
+	dmc-opp-table {
+		nvmem-cells = <0x99 0x07 0x08>;
+		rockchip,low-temp = <0x00>;
+		rockchip,leakage-voltage-sel = <0x01 0x50 0x00 0x51 0xfe 0x01>;
+		rockchip,low-temp-adjust-volt = <0x00 0x618 0x61a8>;
+		compatible = "operating-points-v2";
+		nvmem-cell-names = "leakage\0pvtm\0mbist-vmin";
+		phandle = <0x98>;
+		rockchip,temp-hysteresis = <0x1388>;
+		mbist-vmin = <0xc96a8 0xdbba0 0xe7ef0>;
+
+		opp-1560000000 {
+			opp-microvolt = <0xdbba0>;
+			opp-hz = <0x00 0x5cfbb600>;
+			opp-microvolt-L0 = <0xdbba0>;
+			opp-microvolt-L1 = <0xcf850>;
+		};
+	};
+
+	rkcif_dvp {
+		rockchip,hw = <0x72>;
+		compatible = "rockchip,rkcif-dvp";
+		status = "disabled";
+		phandle = <0x73>;
+	};
+
+	rkcif_mipi_lvds {
+		rockchip,hw = <0x72>;
+		compatible = "rockchip,rkcif-mipi-lvds";
+		status = "disabled";
+		phandle = <0x74>;
+	};
+
+	eink@fdf00000 {
+		clock-names = "pclk\0hclk";
+		interrupts = <0x00 0xb2 0x04>;
+		clocks = <0x1f 0xff 0x1f 0x100>;
+		compatible = "rockchip,rk3568-eink-tcon";
+		status = "disabled";
+		reg = <0x00 0xfdf00000 0x00 0x74>;
+		phandle = <0x159>;
+	};
+
+	vcc-sys {
+		regulator-max-microvolt = <0x4c4b40>;
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-min-microvolt = <0x4c4b40>;
+		regulator-name = "vcc_sys";
+		compatible = "regulator-fixed";
+		phandle = <0x35>;
+	};
+
+	pwm@fe6f0000 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe4>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x15d 0x1f 0x15c>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe6f0000 0x00 0x10>;
+		phandle = <0x19d>;
+	};
+
+	memory {
+		device_type = "memory";
+		reg = <0x00 0x200000 0x00 0xefe00000 0x01 0xf0000000 0x00 0x10000000>;
+	};
+
+	qos@fe198000 {
+		compatible = "syscon";
+		reg = <0x00 0xfe198000 0x00 0x20>;
+		phandle = <0x55>;
+	};
+
+	cpu0-opp-table {
+		rockchip,pvtm-sample-time = <0x3e8>;
+		rockchip,pvtm-ch = <0x00 0x05>;
+		nvmem-cells = <0x06 0x07 0x08>;
+		rockchip,pvtm-number = <0x0a>;
+		rockchip,low-temp = <0x00>;
+		opp-shared;
+		rockchip,pvtm-freq = <0x639c0>;
+		rockchip,pvtm-ref-temp = <0x28>;
+		rockchip,thermal-zone = "soc-thermal";
+		rockchip,low-temp-adjust-volt = <0x00 0x648 0x124f8>;
+		compatible = "operating-points-v2";
+		nvmem-cell-names = "leakage\0pvtm\0mbist-vmin";
+		rockchip,pvtm-voltage-sel = <0x00 0x14050 0x00 0x14051 0x16b48 0x01 0x16b49 0x186a0 0x02>;
+		phandle = <0x03>;
+		rockchip,pvtm-temp-prop = <0x1a 0x1a>;
+		rockchip,temp-hysteresis = <0x1388>;
+		rockchip,pvtm-error = <0x3e8>;
+		mbist-vmin = <0xc96a8 0xdbba0 0xe7ef0>;
+		rockchip,avs-scale = <0x1a>;
+		rockchip,pvtm-volt = <0xdbba0>;
+
+		opp-1800000000 {
+			opp-microvolt = <0x100590 0x100590 0x100590>;
+			opp-hz = <0x00 0x6b49d200>;
+			clock-latency-ns = <0x61a80>;
+		};
+
+		opp-1608000000 {
+			opp-microvolt = <0xf4240 0xf4240 0xf4240>;
+			opp-hz = <0x00 0x5fd82200>;
+			clock-latency-ns = <0x9c40>;
+		};
+
+		opp-1104000000 {
+			opp-microvolt = <0xc96a8 0xc96a8 0x118c30>;
+			opp-hz = <0x00 0x41cdb400>;
+			clock-latency-ns = <0x9c40>;
+		};
+
+		opp-816000000 {
+			opp-microvolt = <0xc96a8 0xc96a8 0x118c30>;
+			opp-hz = <0x00 0x30a32c00>;
+			opp-suspend;
+			clock-latency-ns = <0x9c40>;
+		};
+
+		opp-600000000 {
+			opp-microvolt = <0xc96a8 0xc96a8 0x118c30>;
+			opp-hz = <0x00 0x23c34600>;
+			clock-latency-ns = <0x9c40>;
+		};
+
+		opp-1416000000 {
+			opp-microvolt = <0xe1d48 0xe1d48 0x118c30>;
+			opp-hz = <0x00 0x54667200>;
+			clock-latency-ns = <0x9c40>;
+		};
+
+		opp-408000000 {
+			opp-microvolt = <0xc96a8 0xc96a8 0x118c30>;
+			opp-hz = <0x00 0x18519600>;
+			clock-latency-ns = <0x9c40>;
+		};
+	};
+
+	i2s2-mclkin {
+		clock-output-names = "i2s2_mclkin";
+		#clock-cells = <0x00>;
+		clock-frequency = <0xbb8000>;
+		compatible = "fixed-clock";
+		phandle = <0x12a>;
+	};
+
+	pvtm@fde90000 {
+		#address-cells = <0x01>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3568-npu-pvtm";
+		reg = <0x00 0xfde90000 0x00 0x100>;
+
+		pvtm@2 {
+			clock-names = "clk\0pclk\0hclk";
+			thermal-zone = "soc-thermal";
+			resets = <0x1f 0x2e 0x1f 0x2d>;
+			clocks = <0x1f 0x2b 0x1f 0x2a 0x1f 0x25>;
+			reg = <0x02>;
+			reset-names = "rts\0rst-p";
+		};
+	};
+
+	wireless-wlan {
+		pinctrl-names = "default";
+		pinctrl-0 = <0x109>;
+		WIFI,host_wake_irq = <0x108 0x0a 0x00>;
+		wifi_chip_type = "ap6256";
+		compatible = "wlan-platdata";
+		status = "disabled";
+		rockchip,grf = <0x32>;
+		phandle = <0x2a0>;
+	};
+
+	rockchip-system-monitor {
+		rockchip,thermal-zone = "soc-thermal";
+		compatible = "rockchip,system-monitor";
+		phandle = <0x120>;
+	};
+
+	usbhost {
+		#address-cells = <0x02>;
+		clock-names = "ref_clk\0suspend_clk\0bus_clk\0pipe_clk";
+		clocks = <0x1f 0xa9 0x1f 0xaa 0x1f 0xa8 0x1f 0x7f>;
+		#size-cells = <0x02>;
+		compatible = "rockchip,rk3568-dwc3\0rockchip,rk3399-dwc3";
+		ranges;
+		status = "okay";
+		phandle = <0x133>;
+
+		dwc3@fd000000 {
+			power-domains = <0x21 0x0f>;
+			snps,dis_enblslpm_quirk;
+			phy-names = "usb2-phy\0usb3-phy";
+			snps,dis-u2-freeclk-exists-quirk;
+			phy_type = "utmi_wide";
+			resets = <0x1f 0x95>;
+			interrupts = <0x00 0xaa 0x04>;
+			compatible = "snps,dwc3";
+			snps,dis-del-phy-power-chg-quirk;
+			status = "okay";
+			snps,xhci-trb-ent-quirk;
+			phys = <0x25 0x20 0x04>;
+			reg = <0x00 0xfd000000 0x00 0x400000>;
+			phandle = <0x134>;
+			dr_mode = "host";
+			reset-names = "usb3-host";
+			snps,dis-tx-ipgap-linecheck-quirk;
+		};
+	};
+
+	crypto@fe380000 {
+		clock-names = "aclk\0hclk\0sclk\0apb_pclk";
+		assigned-clocks = <0x1f 0x6c>;
+		assigned-clock-rates = <0xbebc200>;
+		resets = <0x1f 0x69>;
+		interrupts = <0x00 0x04 0x04>;
+		clocks = <0x1f 0x6a 0x1f 0x6b 0x1f 0x6c 0x1f 0x6d>;
+		compatible = "rockchip,rk3568-crypto";
+		status = "disabled";
+		reg = <0x00 0xfe380000 0x00 0x4000>;
+		phandle = <0x175>;
+		reset-names = "crypto-rst";
+	};
+
+	can@fe580000 {
+		clock-names = "baudclk\0apb_pclk";
+		resets = <0x1f 0x157 0x1f 0x156>;
+		interrupts = <0x00 0x02 0x04>;
+		clocks = <0x1f 0x143 0x1f 0x142>;
+		compatible = "rockchip,canfd-1.0";
+		status = "disabled";
+		tx-fifo-depth = <0x01>;
+		rx-fifo-depth = <0x06>;
+		reg = <0x00 0xfe580000 0x00 0x1000>;
+		phandle = <0x181>;
+		reset-names = "can\0can-apb";
+	};
+};
diff --git a/patch/kernel/archive/rockchip64-6.6/dt/rk3566-core3566.dts b/patch/kernel/archive/rockchip64-6.6/dt/rk3566-core3566.dts
new file mode 100644
index 000000000000..66096f835fa6
--- /dev/null
+++ b/patch/kernel/archive/rockchip64-6.6/dt/rk3566-core3566.dts
@@ -0,0 +1,7203 @@
+/dts-v1/;
+
+/ {
+	#address-cells = <0x02>;
+	model = "luckfox core3566";
+	serial-number = "70724ac80bd71c85";
+	#size-cells = <0x02>;
+	interrupt-parent = <0x01>;
+	compatible = "luckfox,core3566\0rockchip,rk3566";
+
+	video-phy@fe850000 {
+		power-domains = <0x21 0x09>;
+		clock-names = "ref\0pclk_phy\0pclk_host";
+		resets = <0x1f 0x1bb>;
+		clocks = <0x31 0x17 0x1f 0x17a 0x1f 0xe8>;
+		#clock-cells = <0x00>;
+		#phy-cells = <0x00>;
+		compatible = "rockchip,rk3568-video-phy";
+		status = "disabled";
+		reg = <0x00 0xfe850000 0x00 0x10000 0x00 0xfe060000 0x00 0x10000>;
+		phandle = <0x2e>;
+		reset-names = "rst";
+	};
+
+	spi@fe620000 {
+		pinctrl-names = "default\0high_speed";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xca 0xcb 0xcc>;
+		clock-names = "spiclk\0apb_pclk";
+		interrupts = <0x00 0x68 0x04>;
+		clocks = <0x1f 0x154 0x1f 0x153>;
+		#size-cells = <0x00>;
+		dma-names = "tx\0rx";
+		compatible = "rockchip,rk3066-spi";
+		pinctrl-1 = <0xca 0xcb 0xcd>;
+		status = "disabled";
+		reg = <0x00 0xfe620000 0x00 0x1000>;
+		phandle = <0x18d>;
+		dmas = <0x40 0x16 0x40 0x17>;
+	};
+
+	wireless-bluetooth {
+		pinctrl-names = "default\0rts_gpio";
+		pinctrl-0 = <0x10a>;
+		clock-names = "ext_clock";
+		clocks = <0x106 0x01>;
+		BT,wake_gpio = <0x108 0x11 0x00>;
+		BT,reset_gpio = <0x108 0x0f 0x00>;
+		uart_rts_gpios = <0x108 0x0d 0x01>;
+		compatible = "bluetooth-platdata";
+		BT,wake_host_irq = <0x108 0x10 0x00>;
+		pinctrl-1 = <0x10b>;
+		status = "disabled";
+		phandle = <0x2a1>;
+	};
+
+	i2s3-mclkin {
+		clock-output-names = "i2s3_mclkin";
+		#clock-cells = <0x00>;
+		clock-frequency = <0xbb8000>;
+		compatible = "fixed-clock";
+		phandle = <0x12b>;
+	};
+
+	qos@fe158300 {
+		compatible = "syscon";
+		reg = <0x00 0xfe158300 0x00 0x20>;
+		phandle = <0x53>;
+	};
+
+	iommu@fdf80800 {
+		power-domains = <0x21 0x0d>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x5c 0x04>;
+		clocks = <0x1f 0x108 0x1f 0x109>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		status = "okay";
+		interrupt-names = "rkvdec_mmu";
+		reg = <0x00 0xfdf80800 0x00 0x40 0x00 0xfdf80840 0x00 0x40>;
+		phandle = <0x6f>;
+	};
+
+	scmi-shmem@10f000 {
+		compatible = "arm,scmi-shmem";
+		reg = <0x00 0x10f000 0x00 0x100>;
+		phandle = <0x1a>;
+	};
+
+	syscon@fdc20000 {
+		compatible = "rockchip,rk3568-pmugrf\0syscon\0simple-mfd";
+		reg = <0x00 0xfdc20000 0x00 0x10000>;
+		phandle = <0x33>;
+
+		reboot-mode {
+			mode-normal = <0x5242c300>;
+			mode-loader = <0x5242c301>;
+			mode-bootloader = <0x5242c301>;
+			mode-recovery = <0x5242c303>;
+			mode-watchdog = <0x5242c308>;
+			mode-ums = <0x5242c30c>;
+			mode-fastboot = <0x5242c309>;
+			offset = <0x200>;
+			compatible = "syscon-reboot-mode";
+			phandle = <0x13b>;
+			mode-charge = <0x5242c30b>;
+			mode-panic = <0x5242c307>;
+		};
+
+		io-domains {
+			vccio1-supply = <0x2a>;
+			vccio3-supply = <0x2b>;
+			vccio4-supply = <0x2c>;
+			vccio5-supply = <0x2d>;
+			pmuio2-supply = <0x29>;
+			vccio6-supply = <0x2c>;
+			vccio7-supply = <0x2d>;
+			compatible = "rockchip,rk3568-pmu-io-voltage-domain";
+			status = "okay";
+			phandle = <0x13a>;
+		};
+	};
+
+	i2c@fe5c0000 {
+		pinctrl-names = "default";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xc0>;
+		clock-names = "i2c\0pclk";
+		interrupts = <0x00 0x31 0x04>;
+		clocks = <0x1f 0x14c 0x1f 0x14b>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3399-i2c";
+		status = "okay";
+		reg = <0x00 0xfe5c0000 0x00 0x1000>;
+		phandle = <0x186>;
+
+		imx219-2@10 {
+			clock-names = "ext_cam_imx219_clk_two";
+			pwdn-gpios = <0xc2 0x0f 0x01>;
+			clocks = <0xc1>;
+			rockchip,camera-module-name = "Waveshare";
+			rockchip,camera-module-index = <0x01>;
+			compatible = "sony,imx219";
+			rockchip,camera-module-facing = "front";
+			status = "okay";
+			reg = <0x10>;
+			rockchip,camera-module-lens-name = "Picamera";
+			phandle = <0x187>;
+
+			port {
+
+				endpoint {
+					data-lanes = <0x01 0x02>;
+					remote-endpoint = <0xc3>;
+					phandle = <0xf5>;
+				};
+			};
+		};
+	};
+
+	iep@fdef0000 {
+		power-domains = <0x21 0x0a>;
+		iommus = <0x6c>;
+		clock-names = "aclk\0hclk\0sclk";
+		resets = <0x1f 0x127 0x1f 0x128 0x1f 0x129>;
+		interrupts = <0x00 0x38 0x04>;
+		clocks = <0x1f 0xf6 0x1f 0xf7 0x1f 0xf8>;
+		rockchip,srv = <0x68>;
+		rockchip,taskqueue-node = <0x05>;
+		compatible = "rockchip,iep-v2";
+		rockchip,resetgroup-node = <0x05>;
+		status = "okay";
+		reg = <0x00 0xfdef0000 0x00 0x500>;
+		phandle = <0x158>;
+		reset-names = "rst_a\0rst_h\0rst_s";
+	};
+
+	gpu@fde60000 {
+		power-domains = <0x21 0x07>;
+		mali-supply = <0x61>;
+		clock-names = "gpu\0bus";
+		interrupts = <0x00 0x28 0x04 0x00 0x29 0x04 0x00 0x27 0x04>;
+		clocks = <0x02 0x01 0x1f 0x1b>;
+		compatible = "rockchip,rk3568-mali\0arm,mali-bifrost";
+		status = "okay";
+		interrupt-names = "job\0mmu\0gpu";
+		reg = <0x00 0xfde60000 0x00 0x4000>;
+		phandle = <0x1d>;
+		operating-points-v2 = <0x65>;
+		#cooling-cells = <0x02>;
+	};
+
+	spdif@fe460000 {
+		pinctrl-names = "default";
+		pinctrl-0 = <0xb9>;
+		clock-names = "mclk\0hclk";
+		interrupts = <0x00 0x66 0x04>;
+		clocks = <0x1f 0x5f 0x1f 0x5c>;
+		dma-names = "tx";
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-spdif";
+		status = "disabled";
+		reg = <0x00 0xfe460000 0x00 0x1000>;
+		phandle = <0x17c>;
+		dmas = <0xa6 0x01>;
+	};
+
+	qos@fe1a8100 {
+		compatible = "syscon";
+		reg = <0x00 0xfe1a8100 0x00 0x20>;
+		phandle = <0x4d>;
+	};
+
+	syscon@fdc60000 {
+		compatible = "rockchip,rk3568-grf\0syscon\0simple-mfd";
+		reg = <0x00 0xfdc60000 0x00 0x10000>;
+		phandle = <0x32>;
+
+		lvds {
+			phy-names = "phy";
+			compatible = "rockchip,rk3568-lvds";
+			status = "disabled";
+			phys = <0x2e>;
+			phandle = <0x13d>;
+
+			ports {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+
+				port@0 {
+					#address-cells = <0x01>;
+					#size-cells = <0x00>;
+					reg = <0x00>;
+
+					endpoint@1 {
+						remote-endpoint = <0x18>;
+						status = "disabled";
+						reg = <0x01>;
+						phandle = <0x8b>;
+					};
+
+					endpoint@2 {
+						remote-endpoint = <0x2f>;
+						status = "disabled";
+						reg = <0x02>;
+						phandle = <0x8c>;
+					};
+				};
+			};
+		};
+
+		rgb {
+			pinctrl-names = "default";
+			pinctrl-0 = <0x30>;
+			compatible = "rockchip,rk3568-rgb";
+			status = "disabled";
+			phandle = <0x13e>;
+
+			ports {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+
+				port@0 {
+					#address-cells = <0x01>;
+					#size-cells = <0x00>;
+					reg = <0x00>;
+
+					endpoint@2 {
+						remote-endpoint = <0x19>;
+						status = "disabled";
+						reg = <0x02>;
+						phandle = <0x8d>;
+					};
+				};
+			};
+		};
+
+		io-domains {
+			compatible = "rockchip,rk3568-io-voltage-domain";
+			status = "disabled";
+			phandle = <0x13c>;
+		};
+	};
+
+	pinctrl {
+		#address-cells = <0x02>;
+		#size-cells = <0x02>;
+		compatible = "rockchip,rk3568-pinctrl";
+		rockchip,pmu = <0x33>;
+		ranges;
+		rockchip,grf = <0x32>;
+		phandle = <0xf9>;
+
+		eth0 {
+
+			eth0-pins {
+				rockchip,pins = <0x02 0x11 0x02 0xfa>;
+				phandle = <0x1ca>;
+			};
+		};
+
+		i2c3 {
+
+			i2c3m1-xfer {
+				rockchip,pins = <0x03 0x0d 0x04 0xff 0x03 0x0e 0x04 0xff>;
+				phandle = <0xc0>;
+			};
+
+			i2c3m0-xfer {
+				rockchip,pins = <0x01 0x01 0x01 0xff 0x01 0x00 0x01 0xff>;
+				phandle = <0x1e3>;
+			};
+		};
+
+		pwm9 {
+
+			pwm9m1-pins {
+				rockchip,pins = <0x01 0x1e 0x04 0xfa>;
+				phandle = <0x23a>;
+			};
+
+			pwm9m0-pins {
+				rockchip,pins = <0x03 0x0a 0x05 0xfa>;
+				phandle = <0xe5>;
+			};
+		};
+
+		pwm14 {
+
+			pwm14m1-pins {
+				rockchip,pins = <0x04 0x12 0x01 0xfa>;
+				phandle = <0x23f>;
+			};
+
+			pwm14m0-pins {
+				rockchip,pins = <0x03 0x14 0x01 0xfa>;
+				phandle = <0xea>;
+			};
+		};
+
+		npu {
+
+			npu-pins {
+				rockchip,pins = <0x00 0x11 0x02 0xfa>;
+				phandle = <0x21b>;
+			};
+		};
+
+		wireless-bluetooth {
+
+			uart1-gpios {
+				rockchip,pins = <0x02 0x0d 0x00 0xfa>;
+				phandle = <0x10b>;
+			};
+		};
+
+		pcie30x1 {
+
+			pcie30x1m1-pins {
+				rockchip,pins = <0x02 0x1a 0x04 0xfa 0x03 0x01 0x04 0xfa 0x02 0x1b 0x04 0xfa>;
+				phandle = <0x221>;
+			};
+
+			pcie30x1m0-pins {
+				rockchip,pins = <0x00 0x04 0x03 0xfa 0x00 0x13 0x03 0xfa 0x00 0x12 0x03 0xfa>;
+				phandle = <0x220>;
+			};
+
+			pcie30x1-buttonrstn {
+				rockchip,pins = <0x00 0x0b 0x03 0xfa>;
+				phandle = <0x223>;
+			};
+
+			pcie30x1m2-pins {
+				rockchip,pins = <0x01 0x05 0x04 0xfa 0x01 0x02 0x04 0xfa 0x01 0x03 0x04 0xfa>;
+				phandle = <0x222>;
+			};
+		};
+
+		gpio@fdd60000 {
+			gpio-controller;
+			interrupts = <0x00 0x21 0x04>;
+			clocks = <0x31 0x2e 0x31 0x0c>;
+			compatible = "rockchip,gpio-bank";
+			#interrupt-cells = <0x02>;
+			reg = <0x00 0xfdd60000 0x00 0x100>;
+			phandle = <0x36>;
+			#gpio-cells = <0x02>;
+			gpio-ranges = <0xf9 0x00 0x00 0x20>;
+			interrupt-controller;
+		};
+
+		uart8 {
+
+			uart8m0-rtsn {
+				rockchip,pins = <0x02 0x09 0x03 0xfa>;
+				phandle = <0x278>;
+			};
+
+			uart8m0-ctsn {
+				rockchip,pins = <0x02 0x0a 0x03 0xfa>;
+				phandle = <0x277>;
+			};
+
+			uart8m1-xfer {
+				rockchip,pins = <0x03 0x00 0x04 0xfc 0x02 0x1f 0x04 0xfc>;
+				phandle = <0x279>;
+			};
+
+			uart8m0-xfer {
+				rockchip,pins = <0x02 0x16 0x02 0xfc 0x02 0x15 0x03 0xfc>;
+				phandle = <0xde>;
+			};
+		};
+
+		gmac-txc-level2 {
+
+			gmac0-rgmii-clk-level2 {
+				rockchip,pins = <0x02 0x05 0x02 0xfa 0x02 0x08 0x02 0xfd>;
+				phandle = <0x298>;
+			};
+
+			gmac1m1-rgmii-clk-level2 {
+				rockchip,pins = <0x04 0x03 0x03 0xfa 0x04 0x00 0x03 0xfd>;
+				phandle = <0x29a>;
+			};
+
+			gmac1m0-rgmii-clk-level2 {
+				rockchip,pins = <0x03 0x07 0x03 0xfa 0x03 0x06 0x03 0xfd>;
+				phandle = <0x299>;
+			};
+		};
+
+		spi2 {
+
+			spi2m0-cs1 {
+				rockchip,pins = <0x02 0x15 0x04 0xfa>;
+				phandle = <0xcf>;
+			};
+
+			spi2m1-cs1 {
+				rockchip,pins = <0x02 0x1c 0x03 0xfa>;
+				phandle = <0x25b>;
+			};
+
+			spi2m1-pins {
+				rockchip,pins = <0x03 0x00 0x03 0xfa 0x02 0x1f 0x03 0xfa 0x02 0x1e 0x03 0xfa>;
+				phandle = <0x259>;
+			};
+
+			spi2m0-cs0 {
+				rockchip,pins = <0x02 0x14 0x04 0xfa>;
+				phandle = <0xce>;
+			};
+
+			spi2m0-pins {
+				rockchip,pins = <0x02 0x11 0x04 0xfa 0x02 0x12 0x04 0xfa 0x02 0x13 0x04 0xfa>;
+				phandle = <0xd0>;
+			};
+
+			spi2m1-cs0 {
+				rockchip,pins = <0x02 0x1d 0x03 0xfa>;
+				phandle = <0x25a>;
+			};
+		};
+
+		pcfg-pull-up-drv-level-2 {
+			drive-strength = <0x02>;
+			phandle = <0xfb>;
+			bias-pull-up;
+		};
+
+		i2s1 {
+
+			i2s1m0-sdo1 {
+				rockchip,pins = <0x01 0x08 0x01 0xfa>;
+				phandle = <0x1eb>;
+			};
+
+			i2s1m0-lrcktx {
+				rockchip,pins = <0x01 0x05 0x01 0xfa>;
+				phandle = <0xa8>;
+			};
+
+			i2s1m1-sdi1 {
+				rockchip,pins = <0x03 0x1b 0x04 0xfa>;
+				phandle = <0x1f4>;
+			};
+
+			i2s1m1-lrcktx {
+				rockchip,pins = <0x03 0x18 0x04 0xfa>;
+				phandle = <0x1ef>;
+			};
+
+			i2s1m0-lrckrx {
+				rockchip,pins = <0x01 0x06 0x01 0xfa>;
+				phandle = <0x1e6>;
+			};
+
+			i2s1m0-sdi3 {
+				rockchip,pins = <0x01 0x08 0x02 0xfa>;
+				phandle = <0x1ea>;
+			};
+
+			i2s1m2-lrcktx {
+				rockchip,pins = <0x02 0x1a 0x05 0xfa>;
+				phandle = <0x1fc>;
+			};
+
+			i2s1m1-lrckrx {
+				rockchip,pins = <0x04 0x07 0x05 0xfa>;
+				phandle = <0x1ee>;
+			};
+
+			i2s1m0-mclk {
+				rockchip,pins = <0x01 0x02 0x01 0xfa>;
+				phandle = <0x3e>;
+			};
+
+			i2s1m0-sclktx {
+				rockchip,pins = <0x01 0x03 0x01 0xfa>;
+				phandle = <0xa7>;
+			};
+
+			i2s1m2-sdo2 {
+				rockchip,pins = <0x03 0x11 0x05 0xfa>;
+				phandle = <0x206>;
+			};
+
+			i2s1m2-lrckrx {
+				rockchip,pins = <0x03 0x15 0x05 0xfa>;
+				phandle = <0x1fb>;
+			};
+
+			i2s1m0-sdi1 {
+				rockchip,pins = <0x01 0x0a 0x02 0xfa>;
+				phandle = <0x1e8>;
+			};
+
+			i2s1m1-sclktx {
+				rockchip,pins = <0x03 0x17 0x04 0xfa>;
+				phandle = <0x1f2>;
+			};
+
+			i2s1m0-sclkrx {
+				rockchip,pins = <0x01 0x04 0x01 0xfa>;
+				phandle = <0x1e7>;
+			};
+
+			i2s1m2-sclktx {
+				rockchip,pins = <0x02 0x19 0x05 0xfa>;
+				phandle = <0x1ff>;
+			};
+
+			i2s1m2-sdo0 {
+				rockchip,pins = <0x02 0x1f 0x05 0xfa>;
+				phandle = <0x204>;
+			};
+
+			i2s1m1-sclkrx {
+				rockchip,pins = <0x04 0x06 0x05 0xfa>;
+				phandle = <0x1f1>;
+			};
+
+			i2s1m2-sclkrx {
+				rockchip,pins = <0x03 0x13 0x05 0xfa>;
+				phandle = <0x1fe>;
+			};
+
+			i2s1m1-sdo2 {
+				rockchip,pins = <0x04 0x09 0x04 0xfa>;
+				phandle = <0x1f9>;
+			};
+
+			i2s1m2-sdi2 {
+				rockchip,pins = <0x02 0x1d 0x05 0xfa>;
+				phandle = <0x202>;
+			};
+
+			i2s1m1-sdo0 {
+				rockchip,pins = <0x03 0x19 0x04 0xfa>;
+				phandle = <0x1f7>;
+			};
+
+			i2s1m2-sdi0 {
+				rockchip,pins = <0x02 0x1b 0x05 0xfa>;
+				phandle = <0x200>;
+			};
+
+			i2s1m0-sdo2 {
+				rockchip,pins = <0x01 0x09 0x01 0xfa>;
+				phandle = <0x1ec>;
+			};
+
+			i2s1m1-sdi2 {
+				rockchip,pins = <0x03 0x1c 0x04 0xfa>;
+				phandle = <0x1f5>;
+			};
+
+			i2s1m0-sdo0 {
+				rockchip,pins = <0x01 0x07 0x01 0xfa>;
+				phandle = <0xaa>;
+			};
+
+			i2s1m1-sdi0 {
+				rockchip,pins = <0x03 0x1a 0x04 0xfa>;
+				phandle = <0x1f3>;
+			};
+
+			i2s1m2-sdo3 {
+				rockchip,pins = <0x03 0x12 0x05 0xfa>;
+				phandle = <0x207>;
+			};
+
+			i2s1m0-sdi2 {
+				rockchip,pins = <0x01 0x09 0x02 0xfa>;
+				phandle = <0x1e9>;
+			};
+
+			i2s1m2-sdo1 {
+				rockchip,pins = <0x03 0x00 0x05 0xfa>;
+				phandle = <0x205>;
+			};
+
+			i2s1m0-sdi0 {
+				rockchip,pins = <0x01 0x0b 0x01 0xfa>;
+				phandle = <0xa9>;
+			};
+
+			i2s1m1-sdo3 {
+				rockchip,pins = <0x04 0x0d 0x04 0xfa>;
+				phandle = <0x1fa>;
+			};
+
+			i2s1m2-sdi3 {
+				rockchip,pins = <0x02 0x1e 0x05 0xfa>;
+				phandle = <0x203>;
+			};
+
+			i2s1m2-mclk {
+				rockchip,pins = <0x02 0x18 0x05 0xfa>;
+				phandle = <0x1fd>;
+			};
+
+			i2s1m1-sdo1 {
+				rockchip,pins = <0x04 0x08 0x05 0xfa>;
+				phandle = <0x1f8>;
+			};
+
+			i2s1m2-sdi1 {
+				rockchip,pins = <0x02 0x1c 0x05 0xfa>;
+				phandle = <0x201>;
+			};
+
+			i2s1m0-sdo3 {
+				rockchip,pins = <0x01 0x0a 0x01 0xfa>;
+				phandle = <0x1ed>;
+			};
+
+			i2s1m1-sdi3 {
+				rockchip,pins = <0x03 0x1d 0x04 0xfa>;
+				phandle = <0x1f6>;
+			};
+
+			i2s1m1-mclk {
+				rockchip,pins = <0x03 0x16 0x04 0xfa>;
+				phandle = <0x1f0>;
+			};
+		};
+
+		pdm {
+
+			pdmm0-sdi3 {
+				rockchip,pins = <0x01 0x08 0x03 0xfa>;
+				phandle = <0xb8>;
+			};
+
+			pdmm2-clk1 {
+				rockchip,pins = <0x03 0x14 0x05 0xfa>;
+				phandle = <0x22e>;
+			};
+
+			pdmm0-sdi1 {
+				rockchip,pins = <0x01 0x0a 0x03 0xfa>;
+				phandle = <0xb6>;
+			};
+
+			pdmm1-clk {
+				rockchip,pins = <0x03 0x1e 0x05 0xfa>;
+				phandle = <0x228>;
+			};
+
+			pdmm1-clk1 {
+				rockchip,pins = <0x04 0x00 0x04 0xfa>;
+				phandle = <0x229>;
+			};
+
+			pdmm2-sdi2 {
+				rockchip,pins = <0x03 0x0f 0x05 0xfa>;
+				phandle = <0x231>;
+			};
+
+			pdmm0-clk1 {
+				rockchip,pins = <0x01 0x04 0x03 0xfa>;
+				phandle = <0xb4>;
+			};
+
+			pdmm2-sdi0 {
+				rockchip,pins = <0x03 0x0b 0x05 0xfa>;
+				phandle = <0x22f>;
+			};
+
+			pdmm1-sdi2 {
+				rockchip,pins = <0x04 0x02 0x05 0xfa>;
+				phandle = <0x22c>;
+			};
+
+			pdmm1-sdi0 {
+				rockchip,pins = <0x03 0x1f 0x05 0xfa>;
+				phandle = <0x22a>;
+			};
+
+			pdmm0-sdi2 {
+				rockchip,pins = <0x01 0x09 0x03 0xfa>;
+				phandle = <0xb7>;
+			};
+
+			pdmm0-sdi0 {
+				rockchip,pins = <0x01 0x0b 0x02 0xfa>;
+				phandle = <0xb5>;
+			};
+
+			pdmm2-sdi3 {
+				rockchip,pins = <0x03 0x10 0x05 0xfa>;
+				phandle = <0x232>;
+			};
+
+			pdmm2-sdi1 {
+				rockchip,pins = <0x03 0x0c 0x05 0xfa>;
+				phandle = <0x230>;
+			};
+
+			pdmm1-sdi3 {
+				rockchip,pins = <0x04 0x03 0x05 0xfa>;
+				phandle = <0x22d>;
+			};
+
+			pdmm0-clk {
+				rockchip,pins = <0x01 0x06 0x03 0xfa>;
+				phandle = <0xb3>;
+			};
+
+			pdmm1-sdi1 {
+				rockchip,pins = <0x04 0x01 0x04 0xfa>;
+				phandle = <0x22b>;
+			};
+		};
+
+		gpio@fe770000 {
+			gpio-controller;
+			interrupts = <0x00 0x25 0x04>;
+			clocks = <0x1f 0x169 0x1f 0x16a>;
+			compatible = "rockchip,gpio-bank";
+			#interrupt-cells = <0x02>;
+			reg = <0x00 0xfe770000 0x00 0x100>;
+			phandle = <0x3f>;
+			#gpio-cells = <0x02>;
+			gpio-ranges = <0xf9 0x00 0x80 0x20>;
+			interrupt-controller;
+		};
+
+		i2c1 {
+
+			i2c1-xfer {
+				rockchip,pins = <0x00 0x0b 0x01 0xfc 0x00 0x0c 0x01 0xfc>;
+				phandle = <0xbc>;
+			};
+		};
+
+		pwm7 {
+
+			pwm7-pins {
+				rockchip,pins = <0x00 0x16 0x01 0xfa>;
+				phandle = <0xe3>;
+			};
+		};
+
+		gmac0 {
+
+			gmac0-clkinout {
+				rockchip,pins = <0x02 0x12 0x02 0xfa>;
+				phandle = <0x1d1>;
+			};
+
+			gmac0-miim {
+				rockchip,pins = <0x02 0x13 0x02 0xfa 0x02 0x14 0x02 0xfa>;
+				phandle = <0x1d0>;
+			};
+
+			gmac0-tx-bus2 {
+				rockchip,pins = <0x02 0x0b 0x01 0xfd 0x02 0x0c 0x01 0xfd 0x02 0x0d 0x01 0xfa>;
+				phandle = <0x1d4>;
+			};
+
+			gmac0-rgmii-bus {
+				rockchip,pins = <0x02 0x03 0x02 0xfa 0x02 0x04 0x02 0xfa 0x02 0x06 0x02 0xfd 0x02 0x07 0x02 0xfd>;
+				phandle = <0x1d6>;
+			};
+
+			gmac0-rx-er {
+				rockchip,pins = <0x02 0x15 0x02 0xfa>;
+				phandle = <0x1d2>;
+			};
+
+			gmac0-rx-bus2 {
+				rockchip,pins = <0x02 0x0e 0x01 0xfa 0x02 0x0f 0x02 0xfa 0x02 0x10 0x02 0xfa>;
+				phandle = <0x1d3>;
+			};
+
+			gmac0-rgmii-clk {
+				rockchip,pins = <0x02 0x05 0x02 0xfa 0x02 0x08 0x02 0xfe>;
+				phandle = <0x1d5>;
+			};
+		};
+
+		pwm12 {
+
+			pwm12m1-pins {
+				rockchip,pins = <0x04 0x15 0x01 0xfa>;
+				phandle = <0x23d>;
+			};
+
+			pwm12m0-pins {
+				rockchip,pins = <0x03 0x0f 0x02 0xfa>;
+				phandle = <0xe8>;
+			};
+		};
+
+		uart6 {
+
+			uart6m0-ctsn {
+				rockchip,pins = <0x02 0x10 0x03 0xfa>;
+				phandle = <0x270>;
+			};
+
+			uart6m1-xfer {
+				rockchip,pins = <0x01 0x1e 0x03 0xfc 0x01 0x1d 0x03 0xfc>;
+				phandle = <0x272>;
+			};
+
+			uart6m0-xfer {
+				rockchip,pins = <0x02 0x03 0x03 0xfc 0x02 0x04 0x03 0xfc>;
+				phandle = <0xdc>;
+			};
+
+			uart6m0-rtsn {
+				rockchip,pins = <0x02 0x0f 0x03 0xfa>;
+				phandle = <0x271>;
+			};
+		};
+
+		gpu {
+
+			gpu-pins {
+				rockchip,pins = <0x00 0x10 0x02 0xfa 0x00 0x06 0x04 0xfa>;
+				phandle = <0x1e0>;
+			};
+		};
+
+		spi0 {
+
+			spi0m0-cs0 {
+				rockchip,pins = <0x00 0x16 0x02 0xfa>;
+				phandle = <0xc6>;
+			};
+
+			spi0m1-cs0 {
+				rockchip,pins = <0x02 0x1a 0x03 0xfa>;
+				phandle = <0x256>;
+			};
+
+			spi0m1-pins {
+				rockchip,pins = <0x02 0x1b 0x03 0xfa 0x02 0x18 0x03 0xfa 0x02 0x19 0x03 0xfa>;
+				phandle = <0x255>;
+			};
+
+			spi0m0-cs1 {
+				rockchip,pins = <0x00 0x14 0x02 0xfa>;
+				phandle = <0xc7>;
+			};
+
+			spi0m0-pins {
+				rockchip,pins = <0x00 0x0d 0x02 0xfa 0x00 0x15 0x02 0xfa 0x00 0x0e 0x02 0xfa>;
+				phandle = <0xc8>;
+			};
+		};
+
+		fspi {
+
+			fspi-pins {
+				rockchip,pins = <0x01 0x18 0x01 0xfa 0x01 0x1b 0x01 0xfa 0x01 0x19 0x01 0xfa 0x01 0x1a 0x01 0xfa 0x01 0x17 0x02 0xfa 0x01 0x1c 0x01 0xfa>;
+				phandle = <0x1ce>;
+			};
+
+			fspi-cs1 {
+				rockchip,pins = <0x01 0x16 0x02 0xfc>;
+				phandle = <0x1cf>;
+			};
+		};
+
+		clk32k {
+
+			clk32k-out0 {
+				rockchip,pins = <0x00 0x08 0x02 0xfa>;
+				phandle = <0x1e>;
+			};
+
+			clk32k-in {
+				rockchip,pins = <0x00 0x08 0x01 0xfa>;
+				phandle = <0x1bf>;
+			};
+
+			clk32k-out1 {
+				rockchip,pins = <0x02 0x16 0x01 0xfa>;
+				phandle = <0x1c0>;
+			};
+		};
+
+		ebc {
+
+			ebc-pins {
+				rockchip,pins = <0x04 0x10 0x02 0xfa 0x04 0x0b 0x02 0xfa 0x04 0x0c 0x02 0xfa 0x04 0x06 0x02 0xfa 0x04 0x11 0x02 0xfa 0x03 0x16 0x02 0xfa 0x03 0x17 0x02 0xfa 0x03 0x18 0x02 0xfa 0x03 0x19 0x02 0xfa 0x03 0x1a 0x02 0xfa 0x03 0x1b 0x02 0xfa 0x03 0x1c 0x02 0xfa 0x03 0x1d 0x02 0xfa 0x03 0x1e 0x02 0xfa 0x03 0x1f 0x02 0xfa 0x04 0x00 0x02 0xfa 0x04 0x01 0x02 0xfa 0x04 0x02 0x02 0xfa 0x04 0x03 0x02 0xfa 0x04 0x04 0x02 0xfa 0x04 0x05 0x02 0xfa 0x04 0x0e 0x02 0xfa 0x04 0x0f 0x02 0xfa>;
+				phandle = <0x69>;
+			};
+
+			ebc-extern {
+				rockchip,pins = <0x04 0x07 0x02 0xfa 0x04 0x08 0x02 0xfa 0x04 0x09 0x02 0xfa 0x04 0x0d 0x02 0xfa 0x04 0x0a 0x02 0xfa>;
+				phandle = <0x1c2>;
+			};
+		};
+
+		spi2-hs {
+
+			spi2m0-cs1 {
+				rockchip,pins = <0x02 0x15 0x04 0x102>;
+				phandle = <0x289>;
+			};
+
+			spi2m1-cs1 {
+				rockchip,pins = <0x02 0x1c 0x03 0x102>;
+				phandle = <0x28c>;
+			};
+
+			spi2m1-pins {
+				rockchip,pins = <0x03 0x00 0x03 0x102 0x02 0x1f 0x03 0x102 0x02 0x1e 0x03 0x102>;
+				phandle = <0x28a>;
+			};
+
+			spi2m0-cs0 {
+				rockchip,pins = <0x02 0x14 0x04 0x102>;
+				phandle = <0x288>;
+			};
+
+			spi2m0-pins {
+				rockchip,pins = <0x02 0x11 0x04 0x102 0x02 0x12 0x04 0x102 0x02 0x13 0x04 0x102>;
+				phandle = <0xd1>;
+			};
+
+			spi2m1-cs0 {
+				rockchip,pins = <0x02 0x1d 0x03 0x102>;
+				phandle = <0x28b>;
+			};
+		};
+
+		pwm5 {
+
+			pwm5-pins {
+				rockchip,pins = <0x00 0x14 0x01 0xfa>;
+				phandle = <0xe1>;
+			};
+		};
+
+		pcfg-pull-none-drv-level-3 {
+			drive-strength = <0x03>;
+			bias-disable;
+			phandle = <0x103>;
+		};
+
+		isp {
+
+			isp-pins {
+				rockchip,pins = <0x04 0x0c 0x04 0xfa 0x04 0x06 0x01 0xfa 0x04 0x09 0x01 0xfa>;
+				phandle = <0x218>;
+			};
+		};
+
+		pwm10 {
+
+			pwm10m1-pins {
+				rockchip,pins = <0x02 0x01 0x02 0xfa>;
+				phandle = <0x23b>;
+			};
+
+			pwm10m0-pins {
+				rockchip,pins = <0x03 0x0d 0x05 0xfa>;
+				phandle = <0xe6>;
+			};
+		};
+
+		pcfg-pull-down {
+			bias-pull-down;
+			phandle = <0x101>;
+		};
+
+		uart4 {
+
+			uart4m0-ctsn {
+				rockchip,pins = <0x01 0x07 0x02 0xfa>;
+				phandle = <0x26a>;
+			};
+
+			uart4m1-xfer {
+				rockchip,pins = <0x03 0x09 0x04 0xfc 0x03 0x0a 0x04 0xfc>;
+				phandle = <0x26c>;
+			};
+
+			uart4m0-xfer {
+				rockchip,pins = <0x01 0x04 0x02 0xfc 0x01 0x06 0x02 0xfc>;
+				phandle = <0xda>;
+			};
+
+			uart4m0-rtsn {
+				rockchip,pins = <0x01 0x05 0x02 0xfa>;
+				phandle = <0x26b>;
+			};
+		};
+
+		mcu {
+
+			mcu-pins {
+				rockchip,pins = <0x00 0x0c 0x04 0xfa 0x00 0x11 0x04 0xfa 0x00 0x0b 0x04 0xfa 0x00 0x12 0x04 0xfa 0x00 0x13 0x04 0xfa>;
+				phandle = <0x21a>;
+			};
+		};
+
+		pwm3 {
+
+			pwm3-pins {
+				rockchip,pins = <0x00 0x12 0x01 0xfa>;
+				phandle = <0x45>;
+			};
+		};
+
+		pcfg-pull-none-drv-level-1 {
+			drive-strength = <0x01>;
+			bias-disable;
+			phandle = <0xfe>;
+		};
+
+		sata2 {
+
+			sata2-pins {
+				rockchip,pins = <0x04 0x14 0x03 0xfa>;
+				phandle = <0x245>;
+			};
+		};
+
+		gpio@fe740000 {
+			gpio-controller;
+			interrupts = <0x00 0x22 0x04>;
+			clocks = <0x1f 0x163 0x1f 0x164>;
+			compatible = "rockchip,gpio-bank";
+			#interrupt-cells = <0x02>;
+			reg = <0x00 0xfe740000 0x00 0x100>;
+			phandle = <0x9c>;
+			#gpio-cells = <0x02>;
+			gpio-ranges = <0xf9 0x00 0x20 0x20>;
+			interrupt-controller;
+		};
+
+		cam {
+
+			cam-clkout0 {
+				rockchip,pins = <0x04 0x07 0x01 0xfa>;
+				phandle = <0x1b3>;
+			};
+
+			cam-clkout1 {
+				rockchip,pins = <0x04 0x08 0x01 0xfa>;
+				phandle = <0x1b4>;
+			};
+		};
+
+		uart2 {
+
+			uart2m1-xfer {
+				rockchip,pins = <0x01 0x1e 0x02 0xfc 0x01 0x1d 0x02 0xfc>;
+				phandle = <0x266>;
+			};
+
+			uart2m0-xfer {
+				rockchip,pins = <0x00 0x18 0x01 0xfc 0x00 0x19 0x01 0xfc>;
+				phandle = <0xd8>;
+			};
+		};
+
+		lcdc {
+
+			lcdc-ctl {
+				rockchip,pins = <0x03 0x00 0x01 0xfa 0x02 0x18 0x01 0xfa 0x02 0x19 0x01 0xfa 0x02 0x1a 0x01 0xfa 0x02 0x1b 0x01 0xfa 0x02 0x1c 0x01 0xfa 0x02 0x1d 0x01 0xfa 0x02 0x1e 0x01 0xfa 0x02 0x1f 0x01 0xfa 0x03 0x01 0x01 0xfa 0x03 0x02 0x01 0xfa 0x03 0x03 0x01 0xfa 0x03 0x04 0x01 0xfa 0x03 0x05 0x01 0xfa 0x03 0x06 0x01 0xfa 0x03 0x07 0x01 0xfa 0x03 0x08 0x01 0xfa 0x03 0x09 0x01 0xfa 0x03 0x0a 0x01 0xfa 0x03 0x0b 0x01 0xfa 0x03 0x0c 0x01 0xfa 0x03 0x0d 0x01 0xfa 0x03 0x0e 0x01 0xfa 0x03 0x0f 0x01 0xfa 0x03 0x10 0x01 0xfa 0x03 0x13 0x01 0xfa 0x03 0x11 0x01 0xfa 0x03 0x12 0x01 0xfa>;
+				phandle = <0x30>;
+			};
+		};
+
+		cpu {
+
+			cpu-pins {
+				rockchip,pins = <0x00 0x0f 0x02 0xfa>;
+				phandle = <0x1c1>;
+			};
+		};
+
+		gpio-func {
+
+			tsadc-gpio-func {
+				rockchip,pins = <0x00 0x01 0x00 0xfa>;
+				phandle = <0xec>;
+			};
+		};
+
+		sdmmc1 {
+
+			sdmmc1-cmd {
+				rockchip,pins = <0x02 0x07 0x01 0xfb>;
+				phandle = <0xa4>;
+			};
+
+			sdmmc1-clk {
+				rockchip,pins = <0x02 0x08 0x01 0xfb>;
+				phandle = <0xa5>;
+			};
+
+			sdmmc1-bus4 {
+				rockchip,pins = <0x02 0x03 0x01 0xfb 0x02 0x04 0x01 0xfb 0x02 0x05 0x01 0xfb 0x02 0x06 0x01 0xfb>;
+				phandle = <0xa3>;
+			};
+
+			sdmmc1-det {
+				rockchip,pins = <0x02 0x0a 0x01 0xfc>;
+				phandle = <0x247>;
+			};
+
+			sdmmc1-pwren {
+				rockchip,pins = <0x02 0x09 0x01 0xfa>;
+				phandle = <0x248>;
+			};
+		};
+
+		pwm1 {
+
+			pwm1m1-pins {
+				rockchip,pins = <0x00 0x0d 0x04 0xfa>;
+				phandle = <0x237>;
+			};
+
+			pwm1m0-pins {
+				rockchip,pins = <0x00 0x10 0x01 0xfa>;
+				phandle = <0x43>;
+			};
+		};
+
+		sata0 {
+
+			sata0-pins {
+				rockchip,pins = <0x04 0x16 0x03 0xfa>;
+				phandle = <0x243>;
+			};
+		};
+
+		refclk {
+
+			refclk-pins {
+				rockchip,pins = <0x00 0x00 0x01 0xfa>;
+				phandle = <0x241>;
+			};
+		};
+
+		can2 {
+
+			can2m1-pins {
+				rockchip,pins = <0x02 0x09 0x04 0xfa 0x02 0x0a 0x04 0xfa>;
+				phandle = <0x1ba>;
+			};
+
+			can2m0-pins {
+				rockchip,pins = <0x04 0x0c 0x03 0xfa 0x04 0x0d 0x03 0xfa>;
+				phandle = <0x1b9>;
+			};
+		};
+
+		sata {
+
+			sata-pins {
+				rockchip,pins = <0x00 0x04 0x02 0xfa 0x00 0x06 0x01 0xfa 0x00 0x05 0x02 0xfa>;
+				phandle = <0x242>;
+			};
+		};
+
+		audiopwm {
+
+			audiopwm-routn {
+				rockchip,pins = <0x01 0x07 0x04 0xfa>;
+				phandle = <0x1ae>;
+			};
+
+			audiopwm-lout {
+				rockchip,pins = <0x01 0x00 0x04 0xfa>;
+				phandle = <0x1aa>;
+			};
+
+			audiopwm-routp {
+				rockchip,pins = <0x01 0x06 0x04 0xfa>;
+				phandle = <0x1af>;
+			};
+
+			audiopwm-loutn {
+				rockchip,pins = <0x01 0x01 0x06 0xfa>;
+				phandle = <0x1ab>;
+			};
+
+			audiopwm-loutp {
+				rockchip,pins = <0x01 0x00 0x06 0xfa>;
+				phandle = <0x1ac>;
+			};
+
+			audiopwm-rout {
+				rockchip,pins = <0x01 0x01 0x04 0xfa>;
+				phandle = <0x1ad>;
+			};
+		};
+
+		edpdp {
+
+			edpdpm1-pins {
+				rockchip,pins = <0x00 0x12 0x02 0xfa>;
+				phandle = <0x1c4>;
+			};
+
+			edpdpm0-pins {
+				rockchip,pins = <0x04 0x14 0x01 0xfa>;
+				phandle = <0x1c3>;
+			};
+		};
+
+		tsadc {
+
+			tsadc-shutorg {
+				rockchip,pins = <0x00 0x01 0x02 0xfa>;
+				phandle = <0xed>;
+			};
+
+			tsadcm1-shut {
+				rockchip,pins = <0x00 0x02 0x02 0xfa>;
+				phandle = <0x260>;
+			};
+
+			tsadcm0-shut {
+				rockchip,pins = <0x00 0x01 0x01 0xfa>;
+				phandle = <0x25f>;
+			};
+		};
+
+		uart0 {
+
+			uart0-rtsn {
+				rockchip,pins = <0x00 0x14 0x03 0xfa>;
+				phandle = <0x262>;
+			};
+
+			uart0-ctsn {
+				rockchip,pins = <0x00 0x17 0x03 0xfa>;
+				phandle = <0x261>;
+			};
+
+			uart0-xfer {
+				rockchip,pins = <0x00 0x10 0x03 0xfc 0x00 0x11 0x03 0xfc>;
+				phandle = <0x41>;
+			};
+		};
+
+		eth1 {
+
+			eth1m1-pins {
+				rockchip,pins = <0x04 0x0b 0x03 0xfa>;
+				phandle = <0x1cc>;
+			};
+
+			eth1m0-pins {
+				rockchip,pins = <0x03 0x08 0x03 0xfa>;
+				phandle = <0x1cb>;
+			};
+		};
+
+		i2c4 {
+
+			i2c4m1-xfer {
+				rockchip,pins = <0x02 0x0a 0x02 0xff 0x02 0x09 0x02 0xff>;
+				phandle = <0x1e4>;
+			};
+
+			i2c4m0-xfer {
+				rockchip,pins = <0x04 0x0b 0x01 0xff 0x04 0x0a 0x01 0xff>;
+				phandle = <0xc4>;
+			};
+		};
+
+		emmc {
+
+			emmc-clk {
+				rockchip,pins = <0x01 0x15 0x01 0xfb>;
+				phandle = <0x1c7>;
+			};
+
+			emmc-datastrobe {
+				rockchip,pins = <0x01 0x16 0x01 0xfa>;
+				phandle = <0x1c9>;
+			};
+
+			emmc-bus8 {
+				rockchip,pins = <0x01 0x0c 0x01 0xfb 0x01 0x0d 0x01 0xfb 0x01 0x0e 0x01 0xfb 0x01 0x0f 0x01 0xfb 0x01 0x10 0x01 0xfb 0x01 0x11 0x01 0xfb 0x01 0x12 0x01 0xfb 0x01 0x13 0x01 0xfb>;
+				phandle = <0x1c6>;
+			};
+
+			emmc-cmd {
+				rockchip,pins = <0x01 0x14 0x01 0xfb>;
+				phandle = <0x1c8>;
+			};
+
+			emmc-rstnout {
+				rockchip,pins = <0x01 0x17 0x01 0xfa>;
+				phandle = <0x1c5>;
+			};
+		};
+
+		pwm15 {
+
+			pwm15m0-pins {
+				rockchip,pins = <0x03 0x15 0x01 0xfa>;
+				phandle = <0xeb>;
+			};
+
+			pwm15m1-pins {
+				rockchip,pins = <0x04 0x13 0x01 0xfa>;
+				phandle = <0x240>;
+			};
+		};
+
+		spdif {
+
+			spdifm1-tx {
+				rockchip,pins = <0x03 0x15 0x02 0xfa>;
+				phandle = <0x253>;
+			};
+
+			spdifm0-tx {
+				rockchip,pins = <0x01 0x04 0x04 0xfa>;
+				phandle = <0xb9>;
+			};
+
+			spdifm2-tx {
+				rockchip,pins = <0x04 0x14 0x02 0xfa>;
+				phandle = <0x254>;
+			};
+		};
+
+		pcie30x2 {
+
+			pcie30x2m2-pins {
+				rockchip,pins = <0x04 0x12 0x04 0xfa 0x04 0x14 0x04 0xfa 0x04 0x13 0x04 0xfa>;
+				phandle = <0x226>;
+			};
+
+			pcie30x2m1-pins {
+				rockchip,pins = <0x02 0x1c 0x04 0xfa 0x02 0x1e 0x04 0xfa 0x02 0x1d 0x04 0xfa>;
+				phandle = <0x225>;
+			};
+
+			pcie30x2-buttonrstn {
+				rockchip,pins = <0x00 0x08 0x03 0xfa>;
+				phandle = <0x227>;
+			};
+
+			pcie30x2m0-pins {
+				rockchip,pins = <0x00 0x06 0x02 0xfa 0x00 0x16 0x03 0xfa 0x00 0x15 0x03 0xfa>;
+				phandle = <0x224>;
+			};
+		};
+
+		can0 {
+
+			can0m0-pins {
+				rockchip,pins = <0x00 0x0c 0x02 0xfa 0x00 0x0b 0x02 0xfa>;
+				phandle = <0x1b5>;
+			};
+
+			can0m1-pins {
+				rockchip,pins = <0x02 0x02 0x04 0xfa 0x02 0x01 0x04 0xfa>;
+				phandle = <0x1b6>;
+			};
+		};
+
+		uart9 {
+
+			uart9m0-rtsn {
+				rockchip,pins = <0x02 0x13 0x03 0xfa>;
+				phandle = <0x27b>;
+			};
+
+			uart9m2-xfer {
+				rockchip,pins = <0x04 0x05 0x04 0xfc 0x04 0x04 0x04 0xfc>;
+				phandle = <0x27d>;
+			};
+
+			uart9m0-ctsn {
+				rockchip,pins = <0x02 0x14 0x03 0xfa>;
+				phandle = <0x27a>;
+			};
+
+			uart9m1-xfer {
+				rockchip,pins = <0x04 0x16 0x04 0xfc 0x04 0x15 0x04 0xfc>;
+				phandle = <0x27c>;
+			};
+
+			uart9m0-xfer {
+				rockchip,pins = <0x02 0x07 0x03 0xfc 0x02 0x08 0x03 0xfc>;
+				phandle = <0xdf>;
+			};
+		};
+
+		pcfg-pull-up {
+			phandle = <0xfc>;
+			bias-pull-up;
+		};
+
+		spi3 {
+
+			spi3m1-cs0 {
+				rockchip,pins = <0x04 0x16 0x02 0xfa>;
+				phandle = <0x25d>;
+			};
+
+			spi3m0-cs1 {
+				rockchip,pins = <0x04 0x07 0x04 0xfa>;
+				phandle = <0xd3>;
+			};
+
+			spi3m1-cs1 {
+				rockchip,pins = <0x04 0x19 0x02 0xfa>;
+				phandle = <0x25e>;
+			};
+
+			spi3m1-pins {
+				rockchip,pins = <0x04 0x12 0x02 0xfa 0x04 0x15 0x02 0xfa 0x04 0x13 0x02 0xfa>;
+				phandle = <0x25c>;
+			};
+
+			spi3m0-pins {
+				rockchip,pins = <0x04 0x0b 0x04 0xfa 0x04 0x08 0x04 0xfa 0x04 0x0a 0x04 0xfa>;
+				phandle = <0xd4>;
+			};
+
+			spi3m0-cs0 {
+				rockchip,pins = <0x04 0x06 0x04 0xfa>;
+				phandle = <0xd2>;
+			};
+		};
+
+		spi1-hs {
+
+			spi1m0-cs0 {
+				rockchip,pins = <0x02 0x10 0x04 0x102>;
+				phandle = <0x284>;
+			};
+
+			spi1m1-pins {
+				rockchip,pins = <0x03 0x13 0x03 0x102 0x03 0x12 0x03 0x102 0x03 0x11 0x03 0x102>;
+				phandle = <0x286>;
+			};
+
+			spi1m1-cs0 {
+				rockchip,pins = <0x03 0x01 0x03 0x102>;
+				phandle = <0x287>;
+			};
+
+			spi1m0-pins {
+				rockchip,pins = <0x02 0x0d 0x03 0x102 0x02 0x0e 0x03 0x102 0x02 0x0f 0x04 0x102>;
+				phandle = <0xcd>;
+			};
+
+			spi1m0-cs1 {
+				rockchip,pins = <0x02 0x16 0x03 0x102>;
+				phandle = <0x285>;
+			};
+		};
+
+		bt656 {
+
+			bt656m1-pins {
+				rockchip,pins = <0x04 0x0c 0x05 0xfa 0x03 0x16 0x05 0xfa 0x03 0x17 0x05 0xfa 0x03 0x18 0x05 0xfa 0x03 0x19 0x05 0xfa 0x03 0x1a 0x05 0xfa 0x03 0x1b 0x05 0xfa 0x03 0x1c 0x05 0xfa 0x03 0x1d 0x05 0xfa>;
+				phandle = <0x1b1>;
+			};
+
+			bt656m0-pins {
+				rockchip,pins = <0x03 0x00 0x02 0xfa 0x02 0x18 0x02 0xfa 0x02 0x19 0x02 0xfa 0x02 0x1a 0x02 0xfa 0x02 0x1b 0x02 0xfa 0x02 0x1c 0x02 0xfa 0x02 0x1d 0x02 0xfa 0x02 0x1e 0x02 0xfa 0x02 0x1f 0x02 0xfa>;
+				phandle = <0x1b0>;
+			};
+		};
+
+		i2s2 {
+
+			i2s2m1-mclk {
+				rockchip,pins = <0x04 0x0e 0x05 0xfa>;
+				phandle = <0x20d>;
+			};
+
+			i2s2m0-mclk {
+				rockchip,pins = <0x02 0x11 0x01 0xfa>;
+				phandle = <0x209>;
+			};
+
+			i2s2m1-sdo {
+				rockchip,pins = <0x04 0x0b 0x05 0xfa>;
+				phandle = <0x211>;
+			};
+
+			i2s2m0-lrcktx {
+				rockchip,pins = <0x02 0x13 0x01 0xfa>;
+				phandle = <0xac>;
+			};
+
+			i2s2m0-sdi {
+				rockchip,pins = <0x02 0x15 0x01 0xfa>;
+				phandle = <0xad>;
+			};
+
+			i2s2m1-lrcktx {
+				rockchip,pins = <0x04 0x04 0x05 0xfa>;
+				phandle = <0x20c>;
+			};
+
+			i2s2m0-lrckrx {
+				rockchip,pins = <0x02 0x10 0x01 0xfa>;
+				phandle = <0x208>;
+			};
+
+			i2s2m1-lrckrx {
+				rockchip,pins = <0x04 0x05 0x05 0xfa>;
+				phandle = <0x20b>;
+			};
+
+			i2s2m0-sclktx {
+				rockchip,pins = <0x02 0x12 0x01 0xfa>;
+				phandle = <0xab>;
+			};
+
+			i2s2m1-sclktx {
+				rockchip,pins = <0x04 0x0f 0x04 0xfa>;
+				phandle = <0x20f>;
+			};
+
+			i2s2m0-sclkrx {
+				rockchip,pins = <0x02 0x0f 0x01 0xfa>;
+				phandle = <0x20a>;
+			};
+
+			i2s2m1-sclkrx {
+				rockchip,pins = <0x04 0x11 0x05 0xfa>;
+				phandle = <0x20e>;
+			};
+
+			i2s2m1-sdi {
+				rockchip,pins = <0x04 0x0a 0x05 0xfa>;
+				phandle = <0x210>;
+			};
+
+			i2s2m0-sdo {
+				rockchip,pins = <0x02 0x14 0x01 0xfa>;
+				phandle = <0xae>;
+			};
+		};
+
+		i2c2 {
+
+			i2c2m1-xfer {
+				rockchip,pins = <0x04 0x0d 0x01 0xff 0x04 0x0c 0x01 0xff>;
+				phandle = <0x1e2>;
+			};
+
+			i2c2m0-xfer {
+				rockchip,pins = <0x00 0x0d 0x01 0xff 0x00 0x0e 0x01 0xff>;
+				phandle = <0xbf>;
+			};
+		};
+
+		gmac-txd-level3 {
+
+			gmac1m1-rgmii-bus-level3 {
+				rockchip,pins = <0x04 0x01 0x03 0xfa 0x04 0x02 0x03 0xfa 0x03 0x1e 0x03 0x103 0x03 0x1f 0x03 0x103>;
+				phandle = <0x297>;
+			};
+
+			gmac1m1-tx-bus2-level3 {
+				rockchip,pins = <0x04 0x04 0x03 0x103 0x04 0x05 0x03 0x103 0x04 0x06 0x03 0xfa>;
+				phandle = <0x296>;
+			};
+
+			gmac1m0-rgmii-bus-level3 {
+				rockchip,pins = <0x03 0x04 0x03 0xfa 0x03 0x05 0x03 0xfa 0x03 0x02 0x03 0x103 0x03 0x03 0x03 0x103>;
+				phandle = <0x295>;
+			};
+
+			gmac1m0-tx-bus2-level3 {
+				rockchip,pins = <0x03 0x0d 0x03 0x103 0x03 0x0e 0x03 0x103 0x03 0x0f 0x03 0xfa>;
+				phandle = <0x294>;
+			};
+
+			gmac0-tx-bus2-level3 {
+				rockchip,pins = <0x02 0x0b 0x01 0x103 0x02 0x0c 0x01 0x103 0x02 0x0d 0x01 0xfa>;
+				phandle = <0x292>;
+			};
+
+			gmac0-rgmii-bus-level3 {
+				rockchip,pins = <0x02 0x03 0x02 0xfa 0x02 0x04 0x02 0xfa 0x02 0x06 0x02 0x103 0x02 0x07 0x02 0x103>;
+				phandle = <0x293>;
+			};
+		};
+
+		pwm8 {
+
+			pwm8m1-pins {
+				rockchip,pins = <0x01 0x1d 0x04 0xfa>;
+				phandle = <0x239>;
+			};
+
+			pwm8m0-pins {
+				rockchip,pins = <0x03 0x09 0x05 0xfa>;
+				phandle = <0xe4>;
+			};
+		};
+
+		pmic {
+
+			pmic-pins {
+				rockchip,pins = <0x00 0x02 0x01 0xfa>;
+				phandle = <0x233>;
+			};
+
+			soc_slppin_gpio {
+				rockchip,pins = <0x00 0x02 0x00 0x100>;
+				phandle = <0x3a>;
+			};
+
+			soc_slppin_slp {
+				rockchip,pins = <0x00 0x02 0x01 0xfc>;
+				phandle = <0x38>;
+			};
+
+			pmic_int {
+				rockchip,pins = <0x00 0x03 0x00 0xfc>;
+				phandle = <0x37>;
+			};
+
+			soc_slppin_rst {
+				rockchip,pins = <0x00 0x02 0x02 0xfa>;
+				phandle = <0x234>;
+			};
+		};
+
+		jtag {
+
+			jtag-pins {
+				rockchip,pins = <0x01 0x1f 0x02 0xfa 0x02 0x00 0x02 0xfa>;
+				phandle = <0x219>;
+			};
+		};
+
+		gmac1 {
+
+			gmac1m1-clkinout {
+				rockchip,pins = <0x04 0x11 0x03 0xfa>;
+				phandle = <0x1de>;
+			};
+
+			gmac1m1-rx-er {
+				rockchip,pins = <0x04 0x0a 0x03 0xfa>;
+				phandle = <0x1df>;
+			};
+
+			gmac1m1-rgmii-clk {
+				rockchip,pins = <0x04 0x03 0x03 0xfa 0x04 0x00 0x03 0xfe>;
+				phandle = <0x7f>;
+			};
+
+			gmac1m1-miim {
+				rockchip,pins = <0x04 0x0e 0x03 0xfa 0x04 0x0f 0x03 0xfa>;
+				phandle = <0x7c>;
+			};
+
+			gmac1m0-rx-bus2 {
+				rockchip,pins = <0x03 0x09 0x03 0xfa 0x03 0x0a 0x03 0xfa 0x03 0x0b 0x03 0xfa>;
+				phandle = <0x1da>;
+			};
+
+			gmac1m0-rgmii-bus {
+				rockchip,pins = <0x03 0x04 0x03 0xfa 0x03 0x05 0x03 0xfa 0x03 0x02 0x03 0xfd 0x03 0x03 0x03 0xfd>;
+				phandle = <0x1dd>;
+			};
+
+			gmac1m0-miim {
+				rockchip,pins = <0x03 0x14 0x03 0xfa 0x03 0x15 0x03 0xfa>;
+				phandle = <0x1d7>;
+			};
+
+			gmac1m1-tx-bus2 {
+				rockchip,pins = <0x04 0x04 0x03 0xfd 0x04 0x05 0x03 0xfd 0x04 0x06 0x03 0xfa>;
+				phandle = <0x7d>;
+			};
+
+			gmac1m1-rgmii-bus {
+				rockchip,pins = <0x04 0x01 0x03 0xfa 0x04 0x02 0x03 0xfa 0x03 0x1e 0x03 0xfd 0x03 0x1f 0x03 0xfd>;
+				phandle = <0x80>;
+			};
+
+			gmac1m0-rgmii-clk {
+				rockchip,pins = <0x03 0x07 0x03 0xfa 0x03 0x06 0x03 0xfe>;
+				phandle = <0x1dc>;
+			};
+
+			gmac1m0-clkinout {
+				rockchip,pins = <0x03 0x10 0x03 0xfa>;
+				phandle = <0x1d8>;
+			};
+
+			gmac1m0-rx-er {
+				rockchip,pins = <0x03 0x0c 0x03 0xfa>;
+				phandle = <0x1d9>;
+			};
+
+			gmac1m0-tx-bus2 {
+				rockchip,pins = <0x03 0x0d 0x03 0xfd 0x03 0x0e 0x03 0xfd 0x03 0x0f 0x03 0xfa>;
+				phandle = <0x1db>;
+			};
+
+			gmac1m1-rx-bus2 {
+				rockchip,pins = <0x04 0x07 0x03 0xfa 0x04 0x08 0x03 0xfa 0x04 0x09 0x03 0xfa>;
+				phandle = <0x7e>;
+			};
+		};
+
+		pcfg-pull-none {
+			bias-disable;
+			phandle = <0xfa>;
+		};
+
+		pwm13 {
+
+			pwm13m1-pins {
+				rockchip,pins = <0x04 0x16 0x01 0xfa>;
+				phandle = <0x23e>;
+			};
+
+			pwm13m0-pins {
+				rockchip,pins = <0x03 0x10 0x02 0xfa>;
+				phandle = <0xe9>;
+			};
+		};
+
+		acodec {
+
+			acodec-pins {
+				rockchip,pins = <0x01 0x09 0x05 0xfa 0x01 0x01 0x05 0xfa 0x01 0x00 0x05 0xfa 0x01 0x07 0x05 0xfa 0x01 0x08 0x05 0xfa 0x01 0x03 0x05 0xfa 0x01 0x05 0x05 0xfa>;
+				phandle = <0xba>;
+			};
+		};
+
+		gpio@fe750000 {
+			gpio-controller;
+			interrupts = <0x00 0x23 0x04>;
+			clocks = <0x1f 0x165 0x1f 0x166>;
+			compatible = "rockchip,gpio-bank";
+			#interrupt-cells = <0x02>;
+			reg = <0x00 0xfe750000 0x00 0x100>;
+			phandle = <0x108>;
+			#gpio-cells = <0x02>;
+			gpio-ranges = <0xf9 0x00 0x40 0x20>;
+			interrupt-controller;
+		};
+
+		uart7 {
+
+			uart7m2-xfer {
+				rockchip,pins = <0x04 0x03 0x04 0xfc 0x04 0x02 0x04 0xfc>;
+				phandle = <0x276>;
+			};
+
+			uart7m0-ctsn {
+				rockchip,pins = <0x02 0x12 0x03 0xfa>;
+				phandle = <0x273>;
+			};
+
+			uart7m1-xfer {
+				rockchip,pins = <0x03 0x15 0x04 0xfc 0x03 0x14 0x04 0xfc>;
+				phandle = <0x275>;
+			};
+
+			uart7m0-xfer {
+				rockchip,pins = <0x02 0x05 0x03 0xfc 0x02 0x06 0x03 0xfc>;
+				phandle = <0xdd>;
+			};
+
+			uart7m0-rtsn {
+				rockchip,pins = <0x02 0x11 0x03 0xfa>;
+				phandle = <0x274>;
+			};
+		};
+
+		spi1 {
+
+			spi1m0-cs0 {
+				rockchip,pins = <0x02 0x10 0x04 0xfa>;
+				phandle = <0xca>;
+			};
+
+			spi1m1-pins {
+				rockchip,pins = <0x03 0x13 0x03 0xfa 0x03 0x12 0x03 0xfa 0x03 0x11 0x03 0xfa>;
+				phandle = <0x257>;
+			};
+
+			spi1m1-cs0 {
+				rockchip,pins = <0x03 0x01 0x03 0xfa>;
+				phandle = <0x258>;
+			};
+
+			spi1m0-pins {
+				rockchip,pins = <0x02 0x0d 0x03 0xfa 0x02 0x0e 0x03 0xfa 0x02 0x0f 0x04 0xfa>;
+				phandle = <0xcc>;
+			};
+
+			spi1m0-cs1 {
+				rockchip,pins = <0x02 0x16 0x03 0xfa>;
+				phandle = <0xcb>;
+			};
+		};
+
+		pcfg-output-low-pull-down {
+			bias-pull-down;
+			phandle = <0x100>;
+			output-low;
+		};
+
+		sdio-pwrseq {
+
+			wifi-enable-h {
+				rockchip,pins = <0x02 0x09 0x00 0xfa>;
+				phandle = <0x107>;
+			};
+		};
+
+		pcfg-pull-up-drv-level-1 {
+			drive-strength = <0x01>;
+			phandle = <0x102>;
+			bias-pull-up;
+		};
+
+		pcfg-pull-none-smt {
+			bias-disable;
+			input-schmitt-enable;
+			phandle = <0xff>;
+		};
+
+		i2c0 {
+
+			i2c0-xfer {
+				rockchip,pins = <0x00 0x09 0x01 0xff 0x00 0x0a 0x01 0xff>;
+				phandle = <0x34>;
+			};
+		};
+
+		pwm6 {
+
+			pwm6-pins {
+				rockchip,pins = <0x00 0x15 0x01 0xfa>;
+				phandle = <0xe2>;
+			};
+		};
+
+		pwm11 {
+
+			pwm11m1-pins {
+				rockchip,pins = <0x04 0x10 0x03 0xfa>;
+				phandle = <0x23c>;
+			};
+
+			pwm11m0-pins {
+				rockchip,pins = <0x03 0x0e 0x05 0xfa>;
+				phandle = <0xe7>;
+			};
+		};
+
+		bt1120 {
+
+			bt1120-pins {
+				rockchip,pins = <0x03 0x06 0x02 0xfa 0x03 0x01 0x02 0xfa 0x03 0x02 0x02 0xfa 0x03 0x03 0x02 0xfa 0x03 0x04 0x02 0xfa 0x03 0x05 0x02 0xfa 0x03 0x07 0x02 0xfa 0x03 0x08 0x02 0xfa 0x03 0x09 0x02 0xfa 0x03 0x0a 0x02 0xfa 0x03 0x0b 0x02 0xfa 0x03 0x0c 0x02 0xfa 0x03 0x0d 0x02 0xfa 0x03 0x0e 0x02 0xfa 0x03 0x11 0x02 0xfa 0x03 0x12 0x02 0xfa 0x03 0x13 0x02 0xfa>;
+				phandle = <0x1b2>;
+			};
+		};
+
+		uart5 {
+
+			uart5m0-ctsn {
+				rockchip,pins = <0x01 0x1f 0x03 0xfa>;
+				phandle = <0x26d>;
+			};
+
+			uart5m1-xfer {
+				rockchip,pins = <0x03 0x13 0x04 0xfc 0x03 0x12 0x04 0xfc>;
+				phandle = <0x26f>;
+			};
+
+			uart5m0-xfer {
+				rockchip,pins = <0x02 0x01 0x03 0xfc 0x02 0x02 0x03 0xfc>;
+				phandle = <0xdb>;
+			};
+
+			uart5m0-rtsn {
+				rockchip,pins = <0x02 0x00 0x03 0xfa>;
+				phandle = <0x26e>;
+			};
+		};
+
+		flash {
+
+			flash-pins {
+				rockchip,pins = <0x01 0x18 0x02 0xfa 0x01 0x16 0x03 0xfa 0x01 0x1b 0x02 0xfa 0x01 0x1c 0x02 0xfa 0x01 0x0c 0x02 0xfa 0x01 0x0d 0x02 0xfa 0x01 0x0e 0x02 0xfa 0x01 0x0f 0x02 0xfa 0x01 0x10 0x02 0xfa 0x01 0x11 0x02 0xfa 0x01 0x12 0x02 0xfa 0x01 0x13 0x02 0xfa 0x01 0x15 0x02 0xfa 0x01 0x1a 0x02 0xfa 0x01 0x19 0x02 0xfa 0x00 0x07 0x01 0xfa 0x01 0x17 0x03 0xfa 0x01 0x14 0x02 0xfa>;
+				phandle = <0x1cd>;
+			};
+		};
+
+		vop {
+
+			vopm0-pins {
+				rockchip,pins = <0x00 0x13 0x02 0xfa>;
+				phandle = <0x27e>;
+			};
+
+			vopm1-pins {
+				rockchip,pins = <0x03 0x14 0x02 0xfa>;
+				phandle = <0x27f>;
+			};
+		};
+
+		pwm4 {
+
+			pwm4-pins {
+				rockchip,pins = <0x00 0x13 0x01 0xfa>;
+				phandle = <0xe0>;
+			};
+		};
+
+		pcfg-pull-none-drv-level-2 {
+			drive-strength = <0x02>;
+			bias-disable;
+			phandle = <0xfd>;
+		};
+
+		uart3 {
+
+			uart3m0-ctsn {
+				rockchip,pins = <0x01 0x03 0x02 0xfa>;
+				phandle = <0x267>;
+			};
+
+			uart3m1-xfer {
+				rockchip,pins = <0x03 0x10 0x04 0xfc 0x03 0x0f 0x04 0xfc>;
+				phandle = <0x269>;
+			};
+
+			uart3m0-xfer {
+				rockchip,pins = <0x01 0x00 0x02 0xfc 0x01 0x01 0x02 0xfc>;
+				phandle = <0xd9>;
+			};
+
+			uart3m0-rtsn {
+				rockchip,pins = <0x01 0x02 0x02 0xfa>;
+				phandle = <0x268>;
+			};
+		};
+
+		hdmitx {
+
+			hdmitx-scl {
+				rockchip,pins = <0x04 0x17 0x01 0xfa>;
+				phandle = <0x91>;
+			};
+
+			hdmitx-sda {
+				rockchip,pins = <0x04 0x18 0x01 0xfa>;
+				phandle = <0x92>;
+			};
+
+			hdmitxm0-cec {
+				rockchip,pins = <0x04 0x19 0x01 0xfa>;
+				phandle = <0x93>;
+			};
+
+			hdmitxm1-cec {
+				rockchip,pins = <0x00 0x17 0x01 0xfa>;
+				phandle = <0x1e1>;
+			};
+		};
+
+		sdmmc2 {
+
+			sdmmc2m1-clk {
+				rockchip,pins = <0x03 0x06 0x05 0xfb>;
+				phandle = <0x24f>;
+			};
+
+			sdmmc2m0-det {
+				rockchip,pins = <0x03 0x1c 0x03 0xfc>;
+				phandle = <0x24c>;
+			};
+
+			sdmmc2m0-pwren {
+				rockchip,pins = <0x03 0x1d 0x03 0xfa>;
+				phandle = <0x24d>;
+			};
+
+			sdmmc2m1-det {
+				rockchip,pins = <0x03 0x07 0x04 0xfc>;
+				phandle = <0x251>;
+			};
+
+			sdmmc2m0-cmd {
+				rockchip,pins = <0x03 0x1a 0x03 0xfb>;
+				phandle = <0x24b>;
+			};
+
+			sdmmc2m1-pwren {
+				rockchip,pins = <0x03 0x08 0x04 0xfa>;
+				phandle = <0x252>;
+			};
+
+			sdmmc2m1-bus4 {
+				rockchip,pins = <0x03 0x01 0x05 0xfb 0x03 0x02 0x05 0xfb 0x03 0x03 0x05 0xfb 0x03 0x04 0x05 0xfb>;
+				phandle = <0x24e>;
+			};
+
+			sdmmc2m0-clk {
+				rockchip,pins = <0x03 0x1b 0x03 0xfb>;
+				phandle = <0x24a>;
+			};
+
+			sdmmc2m1-cmd {
+				rockchip,pins = <0x03 0x05 0x05 0xfb>;
+				phandle = <0x250>;
+			};
+
+			sdmmc2m0-bus4 {
+				rockchip,pins = <0x03 0x16 0x03 0xfb 0x03 0x17 0x03 0xfb 0x03 0x18 0x03 0xfb 0x03 0x19 0x03 0xfb>;
+				phandle = <0x249>;
+			};
+		};
+
+		gpio@fe760000 {
+			gpio-controller;
+			interrupts = <0x00 0x24 0x04>;
+			clocks = <0x1f 0x167 0x1f 0x168>;
+			compatible = "rockchip,gpio-bank";
+			#interrupt-cells = <0x02>;
+			reg = <0x00 0xfe760000 0x00 0x100>;
+			phandle = <0xc2>;
+			#gpio-cells = <0x02>;
+			gpio-ranges = <0xf9 0x00 0x60 0x20>;
+			interrupt-controller;
+		};
+
+		spi3-hs {
+
+			spi3m1-cs0 {
+				rockchip,pins = <0x04 0x16 0x02 0x102>;
+				phandle = <0x290>;
+			};
+
+			spi3m0-cs1 {
+				rockchip,pins = <0x04 0x07 0x04 0x102>;
+				phandle = <0x28e>;
+			};
+
+			spi3m1-cs1 {
+				rockchip,pins = <0x04 0x19 0x02 0x102>;
+				phandle = <0x291>;
+			};
+
+			spi3m1-pins {
+				rockchip,pins = <0x04 0x12 0x02 0x102 0x04 0x15 0x02 0x102 0x04 0x13 0x02 0x102>;
+				phandle = <0x28f>;
+			};
+
+			spi3m0-pins {
+				rockchip,pins = <0x04 0x0b 0x04 0x102 0x04 0x08 0x04 0x102 0x04 0x0a 0x04 0x102>;
+				phandle = <0xd5>;
+			};
+
+			spi3m0-cs0 {
+				rockchip,pins = <0x04 0x06 0x04 0x102>;
+				phandle = <0x28d>;
+			};
+		};
+
+		pwm2 {
+
+			pwm2m1-pins {
+				rockchip,pins = <0x00 0x0e 0x04 0xfa>;
+				phandle = <0x238>;
+			};
+
+			pwm2m0-pins {
+				rockchip,pins = <0x00 0x11 0x01 0xfa>;
+				phandle = <0x44>;
+			};
+		};
+
+		sata1 {
+
+			sata1-pins {
+				rockchip,pins = <0x04 0x15 0x03 0xfa>;
+				phandle = <0x244>;
+			};
+		};
+
+		spi0-hs {
+
+			spi0m0-cs0 {
+				rockchip,pins = <0x00 0x16 0x02 0x102>;
+				phandle = <0x280>;
+			};
+
+			spi0m1-cs0 {
+				rockchip,pins = <0x02 0x1a 0x03 0x102>;
+				phandle = <0x283>;
+			};
+
+			spi0m1-pins {
+				rockchip,pins = <0x02 0x1b 0x03 0x102 0x02 0x18 0x03 0x102 0x02 0x19 0x03 0x102>;
+				phandle = <0x282>;
+			};
+
+			spi0m0-cs1 {
+				rockchip,pins = <0x00 0x14 0x02 0x102>;
+				phandle = <0x281>;
+			};
+
+			spi0m0-pins {
+				rockchip,pins = <0x00 0x0d 0x02 0x102 0x00 0x15 0x02 0x102 0x00 0x0e 0x02 0x102>;
+				phandle = <0xc9>;
+			};
+		};
+
+		pmu {
+
+			pmu-pins {
+				rockchip,pins = <0x00 0x05 0x04 0xfa 0x00 0x06 0x03 0xfa 0x00 0x14 0x04 0xfa 0x00 0x15 0x04 0xfa 0x00 0x16 0x04 0xfa 0x00 0x17 0x04 0xfa>;
+				phandle = <0x235>;
+			};
+		};
+
+		scr {
+
+			scr-pins {
+				rockchip,pins = <0x01 0x02 0x03 0xfa 0x01 0x07 0x03 0xfc 0x01 0x03 0x03 0xfc 0x01 0x05 0x03 0xfa>;
+				phandle = <0xbb>;
+			};
+		};
+
+		uart1 {
+
+			uart1m0-ctsn {
+				rockchip,pins = <0x02 0x0e 0x02 0xfa>;
+				phandle = <0xd7>;
+			};
+
+			uart1m1-xfer {
+				rockchip,pins = <0x03 0x1f 0x04 0xfc 0x03 0x1e 0x04 0xfc>;
+				phandle = <0x263>;
+			};
+
+			uart1m0-xfer {
+				rockchip,pins = <0x02 0x0b 0x02 0xfc 0x02 0x0c 0x02 0xfc>;
+				phandle = <0xd6>;
+			};
+
+			uart1m1-rtsn {
+				rockchip,pins = <0x04 0x0e 0x04 0xfa>;
+				phandle = <0x265>;
+			};
+
+			uart1m0-rtsn {
+				rockchip,pins = <0x02 0x0d 0x02 0xfa>;
+				phandle = <0x10a>;
+			};
+
+			uart1m1-ctsn {
+				rockchip,pins = <0x04 0x11 0x04 0xfa>;
+				phandle = <0x264>;
+			};
+		};
+
+		i2c5 {
+
+			i2c5m1-xfer {
+				rockchip,pins = <0x04 0x17 0x02 0xff 0x04 0x18 0x02 0xff>;
+				phandle = <0x1e5>;
+			};
+
+			i2c5m0-xfer {
+				rockchip,pins = <0x03 0x0b 0x04 0xff 0x03 0x0c 0x04 0xff>;
+				phandle = <0xc5>;
+			};
+		};
+
+		sdmmc0 {
+
+			sdmmc0-det {
+				rockchip,pins = <0x00 0x04 0x01 0xfc>;
+				phandle = <0xa1>;
+			};
+
+			sdmmc0-pwren {
+				rockchip,pins = <0x00 0x05 0x01 0xfa>;
+				phandle = <0x246>;
+			};
+
+			sdmmc0-bus4 {
+				rockchip,pins = <0x01 0x1d 0x01 0xfb 0x01 0x1e 0x01 0xfb 0x01 0x1f 0x01 0xfb 0x02 0x00 0x01 0xfb>;
+				phandle = <0x9e>;
+			};
+
+			sdmmc0-cmd {
+				rockchip,pins = <0x02 0x01 0x01 0xfb>;
+				phandle = <0xa0>;
+			};
+
+			sdmmc0-clk {
+				rockchip,pins = <0x02 0x02 0x01 0xfb>;
+				phandle = <0x9f>;
+			};
+		};
+
+		pwm0 {
+
+			pwm0m1-pins {
+				rockchip,pins = <0x00 0x17 0x02 0xfa>;
+				phandle = <0x236>;
+			};
+
+			pwm0m0-pins {
+				rockchip,pins = <0x00 0x0f 0x01 0xfa>;
+				phandle = <0x42>;
+			};
+		};
+
+		cif {
+
+			cif-dvp-clk {
+				rockchip,pins = <0x04 0x11 0x01 0xfa 0x04 0x0e 0x01 0xfa 0x04 0x0f 0x01 0xfa>;
+				phandle = <0x1bc>;
+			};
+
+			cif-clk {
+				rockchip,pins = <0x04 0x10 0x01 0xfa>;
+				phandle = <0x1bb>;
+			};
+
+			cif-dvp-bus8 {
+				rockchip,pins = <0x03 0x16 0x01 0xfa 0x03 0x17 0x01 0xfa 0x03 0x18 0x01 0xfa 0x03 0x19 0x01 0xfa 0x03 0x1a 0x01 0xfa 0x03 0x1b 0x01 0xfa 0x03 0x1c 0x01 0xfa 0x03 0x1d 0x01 0xfa>;
+				phandle = <0x1be>;
+			};
+
+			cif-dvp-bus16 {
+				rockchip,pins = <0x03 0x1e 0x01 0xfa 0x03 0x1f 0x01 0xfa 0x04 0x00 0x01 0xfa 0x04 0x01 0x01 0xfa 0x04 0x02 0x01 0xfa 0x04 0x03 0x01 0xfa 0x04 0x04 0x01 0xfa 0x04 0x05 0x01 0xfa>;
+				phandle = <0x1bd>;
+			};
+		};
+
+		can1 {
+
+			can1m1-pins {
+				rockchip,pins = <0x04 0x12 0x03 0xfa 0x04 0x13 0x03 0xfa>;
+				phandle = <0x1b8>;
+			};
+
+			can1m0-pins {
+				rockchip,pins = <0x01 0x00 0x03 0xfa 0x01 0x01 0x03 0xfa>;
+				phandle = <0x1b7>;
+			};
+		};
+
+		pcie20 {
+
+			pcie20-buttonrstn {
+				rockchip,pins = <0x00 0x0c 0x03 0xfa>;
+				phandle = <0x21f>;
+			};
+
+			pcie20m2-pins {
+				rockchip,pins = <0x01 0x08 0x04 0xfa 0x01 0x0a 0x04 0xfa 0x01 0x09 0x04 0xfa>;
+				phandle = <0x21e>;
+			};
+
+			pcie20m1-pins {
+				rockchip,pins = <0x02 0x18 0x04 0xfa 0x03 0x11 0x04 0xfa 0x02 0x19 0x04 0xfa>;
+				phandle = <0x21d>;
+			};
+
+			pcie20m0-pins {
+				rockchip,pins = <0x00 0x05 0x03 0xfa 0x00 0x0e 0x03 0xfa 0x00 0x0d 0x03 0xfa>;
+				phandle = <0x21c>;
+			};
+		};
+
+		wireless-wlan {
+
+			wifi-host-wake-irq {
+				rockchip,pins = <0x02 0x0a 0x00 0x101>;
+				phandle = <0x109>;
+			};
+		};
+
+		i2s3 {
+
+			i2s3m0-lrck {
+				rockchip,pins = <0x03 0x04 0x04 0xfa>;
+				phandle = <0xb0>;
+			};
+
+			i2s3m1-mclk {
+				rockchip,pins = <0x04 0x12 0x05 0xfa>;
+				phandle = <0x214>;
+			};
+
+			i2s3m0-sdo {
+				rockchip,pins = <0x03 0x05 0x04 0xfa>;
+				phandle = <0xb2>;
+			};
+
+			i2s3m0-mclk {
+				rockchip,pins = <0x03 0x02 0x04 0xfa>;
+				phandle = <0x212>;
+			};
+
+			i2s3m1-sdo {
+				rockchip,pins = <0x04 0x15 0x05 0xfa>;
+				phandle = <0x217>;
+			};
+
+			i2s3m0-sdi {
+				rockchip,pins = <0x03 0x06 0x04 0xfa>;
+				phandle = <0xb1>;
+			};
+
+			i2s3m1-sclk {
+				rockchip,pins = <0x04 0x13 0x05 0xfa>;
+				phandle = <0x215>;
+			};
+
+			i2s3m1-sdi {
+				rockchip,pins = <0x04 0x16 0x05 0xfa>;
+				phandle = <0x216>;
+			};
+
+			i2s3m1-lrck {
+				rockchip,pins = <0x04 0x14 0x05 0xfa>;
+				phandle = <0x213>;
+			};
+
+			i2s3m0-sclk {
+				rockchip,pins = <0x03 0x03 0x04 0xfa>;
+				phandle = <0xaf>;
+			};
+		};
+	};
+
+	external-camera-imx219-clock {
+		clock-output-names = "ext_cam_imx219_clk";
+		#clock-cells = <0x00>;
+		clock-frequency = <0x17d7840>;
+		compatible = "fixed-clock";
+		phandle = <0xbd>;
+	};
+
+	timer@fe5f0000 {
+		clock-names = "pclk\0timer";
+		interrupts = <0x00 0x6d 0x04>;
+		clocks = <0x1f 0x16c 0x1f 0x16d>;
+		compatible = "rockchip,rk3568-timer\0rockchip,rk3288-timer";
+		reg = <0x00 0xfe5f0000 0x00 0x1000>;
+		phandle = <0x18a>;
+	};
+
+	qos@fe158280 {
+		compatible = "syscon";
+		reg = <0x00 0xfe158280 0x00 0x20>;
+		phandle = <0x52>;
+	};
+
+	serial@fe6a0000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xdc>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x7a 0x04>;
+		clocks = <0x1f 0x133 0x1f 0x130>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfe6a0000 0x00 0x100>;
+		phandle = <0x195>;
+		dmas = <0x40 0x0c 0x40 0x0d>;
+		reg-shift = <0x02>;
+	};
+
+	qos@fe138100 {
+		compatible = "syscon";
+		reg = <0x00 0xfe138100 0x00 0x20>;
+		phandle = <0x57>;
+	};
+
+	interrupt-controller@fd400000 {
+		#address-cells = <0x02>;
+		interrupts = <0x01 0x09 0x04>;
+		#size-cells = <0x02>;
+		compatible = "arm,gic-v3";
+		ranges;
+		#interrupt-cells = <0x03>;
+		reg = <0x00 0xfd400000 0x00 0x10000 0x00 0xfd460000 0x00 0xc0000>;
+		phandle = <0x01>;
+		interrupt-controller;
+
+		interrupt-controller@fd440000 {
+			msi-controller;
+			compatible = "arm,gic-v3-its";
+			reg = <0x00 0xfd440000 0x00 0x20000>;
+			phandle = <0x9b>;
+			#msi-cells = <0x01>;
+		};
+	};
+
+	i2s@fe430000 {
+		pinctrl-names = "default";
+		rockchip,cru = <0x1f>;
+		pinctrl-0 = <0xaf 0xb0 0xb1 0xb2>;
+		clock-names = "mclk_tx\0mclk_rx\0hclk";
+		resets = <0x1f 0x55 0x1f 0x56>;
+		interrupts = <0x00 0x37 0x04>;
+		clocks = <0x1f 0x53 0x1f 0x57 0x1f 0x3c>;
+		dma-names = "tx\0rx";
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-i2s-tdm";
+		status = "disabled";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe430000 0x00 0x1000>;
+		phandle = <0x179>;
+		dmas = <0xa6 0x06 0xa6 0x07>;
+		reset-names = "tx-m\0rx-m";
+		rockchip,clk-trcm = <0x01>;
+	};
+
+	iommu@fdef0800 {
+		power-domains = <0x21 0x0a>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x38 0x04>;
+		clocks = <0x1f 0xf6 0x1f 0xf7>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		status = "okay";
+		interrupt-names = "iep_mmu";
+		reg = <0x00 0xfdef0800 0x00 0x100>;
+		phandle = <0x6c>;
+	};
+
+	rkscr@fe560000 {
+		pinctrl-names = "default";
+		pinctrl-0 = <0xbb>;
+		clock-names = "g_pclk_sim_card";
+		interrupts = <0x00 0x61 0x04>;
+		clocks = <0x1f 0x114>;
+		compatible = "rockchip-scr";
+		status = "disabled";
+		reg = <0x00 0xfe560000 0x00 0x10000>;
+		phandle = <0x17f>;
+	};
+
+	qos@fe1a8080 {
+		compatible = "syscon";
+		reg = <0x00 0xfe1a8080 0x00 0x20>;
+		phandle = <0x4c>;
+	};
+
+	phy@fe830000 {
+		rockchip,pipe-grf = <0xef>;
+		clock-names = "refclk\0apbclk\0pipe_clk";
+		assigned-clocks = <0x31 0x22>;
+		assigned-clock-rates = <0x5f5e100>;
+		resets = <0x1f 0x1c6 0x1f 0x1c7>;
+		clocks = <0x31 0x22 0x1f 0x17d 0x1f 0x7f>;
+		#phy-cells = <0x01>;
+		compatible = "rockchip,rk3568-naneng-combphy";
+		status = "okay";
+		rockchip,pipe-phy-grf = <0xf0>;
+		reg = <0x00 0xfe830000 0x00 0x100>;
+		phandle = <0x20>;
+		reset-names = "combphy-apb\0combphy";
+	};
+
+	watchdog@fe600000 {
+		clock-names = "tclk\0pclk";
+		interrupts = <0x00 0x95 0x04>;
+		clocks = <0x1f 0x116 0x1f 0x115>;
+		compatible = "snps,dw-wdt";
+		status = "okay";
+		reg = <0x00 0xfe600000 0x00 0x100>;
+		phandle = <0x18b>;
+	};
+
+	rkvenc@fdf40000 {
+		power-domains = <0x21 0x0e>;
+		iommus = <0x6d>;
+		clock-names = "aclk_vcodec\0hclk_vcodec\0clk_core";
+		assigned-clocks = <0x1f 0x103 0x1f 0x105>;
+		rockchip,normal-rates = <0x11b3dc40 0x00 0x11b3dc40>;
+		assigned-clock-rates = <0x11b3dc40 0x11b3dc40>;
+		resets = <0x1f 0x133 0x1f 0x134 0x1f 0x135>;
+		interrupts = <0x00 0x8c 0x04>;
+		clocks = <0x1f 0x103 0x1f 0x104 0x1f 0x105>;
+		node-name = "rkvenc";
+		rockchip,srv = <0x68>;
+		rockchip,taskqueue-node = <0x03>;
+		compatible = "rockchip,rkv-encoder-v1";
+		rockchip,resetgroup-node = <0x03>;
+		status = "okay";
+		interrupt-names = "irq_enc";
+		reg = <0x00 0xfdf40000 0x00 0x400>;
+		phandle = <0x15a>;
+		reset-names = "video_a\0video_h\0video_core";
+		operating-points-v2 = <0x6e>;
+	};
+
+	rk_rga@fdeb0000 {
+		power-domains = <0x21 0x0a>;
+		clock-names = "aclk_rga\0hclk_rga\0clk_rga";
+		interrupts = <0x00 0x5a 0x04>;
+		clocks = <0x1f 0xf3 0x1f 0xf4 0x1f 0xf5>;
+		compatible = "rockchip,rga2";
+		status = "okay";
+		reg = <0x00 0xfdeb0000 0x00 0x1000>;
+		phandle = <0x154>;
+	};
+
+	qos@fe128000 {
+		compatible = "syscon";
+		reg = <0x00 0xfe128000 0x00 0x20>;
+		phandle = <0x47>;
+	};
+
+	dmc {
+		downdifferential = <0x14>;
+		auto-min-freq = <0x4f1a0>;
+		clock-names = "dmc_clk";
+		interrupts = <0x00 0x0a 0x04>;
+		clocks = <0x02 0x03>;
+		upthreshold = <0x28>;
+		center-supply = <0x64>;
+		devfreq-events = <0x97>;
+		compatible = "rockchip,rk3568-dmc";
+		status = "okay";
+		interrupt-names = "complete";
+		phandle = <0x13>;
+		vop-bw-dmc-freq = <0x00 0x1f9 0x4f1a0 0x1fa 0x1869f 0x80e80>;
+		operating-points-v2 = <0x98>;
+		system-status-level = <0x01 0x04 0x08 0x08 0x02 0x01 0x10 0x04 0x10000 0x04 0x1000 0x08 0x4000 0x08 0x2000 0x08 0xc00 0x08>;
+		#cooling-cells = <0x02>;
+		auto-freq-en = <0x01>;
+	};
+
+	tsadc@fe710000 {
+		pinctrl-names = "gpio\0otpout";
+		pinctrl-0 = <0xec>;
+		clock-names = "tsadc\0apb_pclk";
+		rockchip,hw-tshut-polarity = <0x00>;
+		assigned-clocks = <0x1f 0x110 0x1f 0x111>;
+		assigned-clock-rates = <0x1036640 0xaae60>;
+		resets = <0x1f 0x182 0x1f 0x181 0x1f 0x1d7>;
+		interrupts = <0x00 0x73 0x04>;
+		rockchip,hw-tshut-mode = <0x00>;
+		clocks = <0x1f 0x111 0x1f 0x10f>;
+		#thermal-sensor-cells = <0x01>;
+		compatible = "rockchip,rk3568-tsadc";
+		pinctrl-1 = <0xed>;
+		status = "okay";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe710000 0x00 0x100>;
+		phandle = <0x1b>;
+		reset-names = "tsadc\0tsadc-apb\0tsadc-phy";
+		rockchip,hw-tshut-temp = <0x1d4c0>;
+	};
+
+	opp-table2 {
+		rockchip,pvtm-ch = <0x00 0x05>;
+		nvmem-cells = <0x66 0x07 0x08>;
+		compatible = "operating-points-v2";
+		nvmem-cell-names = "leakage\0pvtm\0mbist-vmin";
+		rockchip,pvtm-voltage-sel = <0x00 0x14820 0x00 0x14821 0x16378 0x01 0x16379 0x186a0 0x02>;
+		phandle = <0x65>;
+		mbist-vmin = <0xc96a8 0xdbba0 0xe7ef0>;
+
+		opp-300000000 {
+			opp-microvolt = <0xcf850>;
+			opp-microvolt-L2 = <0xc96a8>;
+			opp-hz = <0x00 0x11e1a300>;
+			opp-microvolt-L0 = <0xcf850>;
+			opp-microvolt-L1 = <0xc96a8>;
+		};
+
+		opp-700000000 {
+			opp-microvolt = <0xe7ef0>;
+			opp-microvolt-L2 = <0xcf850>;
+			opp-hz = <0x00 0x29b92700>;
+			opp-microvolt-L0 = <0xe7ef0>;
+			opp-microvolt-L1 = <0xdbba0>;
+		};
+
+		opp-200000000 {
+			opp-microvolt = <0xcf850>;
+			opp-microvolt-L2 = <0xc96a8>;
+			opp-hz = <0x00 0xbebc200>;
+			opp-microvolt-L0 = <0xcf850>;
+			opp-microvolt-L1 = <0xc96a8>;
+		};
+
+		opp-400000000 {
+			opp-microvolt = <0xcf850>;
+			opp-microvolt-L2 = <0xc96a8>;
+			opp-hz = <0x00 0x17d78400>;
+			opp-microvolt-L0 = <0xcf850>;
+			opp-microvolt-L1 = <0xc96a8>;
+		};
+
+		opp-600000000 {
+			opp-microvolt = <0xd59f8>;
+			opp-microvolt-L2 = <0xc96a8>;
+			opp-hz = <0x00 0x23c34600>;
+			opp-microvolt-L0 = <0xd59f8>;
+			opp-microvolt-L1 = <0xc96a8>;
+		};
+
+		opp-800000000 {
+			opp-microvolt = <0x10c8e0>;
+			opp-microvolt-L2 = <0x100590>;
+			opp-hz = <0x00 0x2faf0800>;
+			opp-microvolt-L0 = <0x10c8e0>;
+			opp-microvolt-L1 = <0x100590>;
+		};
+	};
+
+	external-gmac1-clock {
+		clock-output-names = "gmac1_clkin";
+		#clock-cells = <0x00>;
+		clock-frequency = <0x7735940>;
+		compatible = "fixed-clock";
+		phandle = <0x126>;
+	};
+
+	qos@fe138080 {
+		compatible = "syscon";
+		reg = <0x00 0xfe138080 0x00 0x20>;
+		phandle = <0x56>;
+	};
+
+	serial@fe670000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xd9>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x77 0x04>;
+		clocks = <0x1f 0x127 0x1f 0x124>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfe670000 0x00 0x100>;
+		phandle = <0x192>;
+		dmas = <0x40 0x06 0x40 0x07>;
+		reg-shift = <0x02>;
+	};
+
+	rkcif_dvp_sditf {
+		compatible = "rockchip,rkcif-sditf";
+		status = "disabled";
+		rockchip,cif = <0x73>;
+		phandle = <0x15d>;
+	};
+
+	vdpu@fdea0400 {
+		power-domains = <0x21 0x0b>;
+		iommus = <0x67>;
+		clock-names = "aclk_vcodec\0hclk_vcodec";
+		resets = <0x1f 0x11a 0x1f 0x11b>;
+		interrupts = <0x00 0x8b 0x04>;
+		clocks = <0x1f 0xee 0x1f 0xef>;
+		rockchip,srv = <0x68>;
+		rockchip,taskqueue-node = <0x00>;
+		compatible = "rockchip,vpu-decoder-v2";
+		rockchip,resetgroup-node = <0x00>;
+		status = "okay";
+		interrupt-names = "irq_dec";
+		reg = <0x00 0xfdea0400 0x00 0x400>;
+		phandle = <0x153>;
+		reset-names = "video_a\0video_h";
+	};
+
+	sdhci@fe310000 {
+		rockchip,txclk-tapnum = <0x08>;
+		clock-names = "core\0bus\0axi\0block\0timer";
+		assigned-clocks = <0x1f 0x7b 0x1f 0x7d>;
+		bus-width = <0x08>;
+		non-removable;
+		assigned-clock-rates = <0xbebc200 0x16e3600>;
+		interrupts = <0x00 0x13 0x04>;
+		clocks = <0x1f 0x7c 0x1f 0x7a 0x1f 0x79 0x1f 0x7b 0x1f 0x7d>;
+		compatible = "rockchip,dwcmshc-sdhci\0snps,dwcmshc-sdhci";
+		status = "okay";
+		reg = <0x00 0xfe310000 0x00 0x10000>;
+		phandle = <0x173>;
+		max-frequency = <0xbebc200>;
+		supports-emmc;
+	};
+
+	xpcs-gmac1-clock {
+		clock-output-names = "clk_gmac1_xpcs_mii";
+		#clock-cells = <0x00>;
+		clock-frequency = <0x7735940>;
+		compatible = "fixed-clock";
+		phandle = <0x127>;
+	};
+
+	mcp251x-clk {
+		#clock-cells = <0x00>;
+		clock-frequency = <0xf42400>;
+		compatible = "fixed-clock";
+		phandle = <0x2a4>;
+	};
+
+	syscon@fdca0000 {
+		compatible = "rockchip,rk3568-usb2phy-grf\0syscon";
+		reg = <0x00 0xfdca0000 0x00 0x8000>;
+		phandle = <0xf7>;
+	};
+
+	hdmi-sound {
+		simple-audio-card,name = "rockchip,hdmi";
+		simple-audio-card,format = "i2s";
+		compatible = "simple-audio-card";
+		status = "okay";
+		phandle = <0x2a6>;
+		simple-audio-card,mclk-fs = <0x80>;
+
+		simple-audio-card,cpu {
+			sound-dai = <0x10c>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <0x10d>;
+		};
+	};
+
+	can@fe590000 {
+		clock-names = "baudclk\0apb_pclk";
+		resets = <0x1f 0x159 0x1f 0x158>;
+		interrupts = <0x00 0x03 0x04>;
+		clocks = <0x1f 0x145 0x1f 0x144>;
+		compatible = "rockchip,canfd-1.0";
+		status = "disabled";
+		tx-fifo-depth = <0x01>;
+		rx-fifo-depth = <0x06>;
+		reg = <0x00 0xfe590000 0x00 0x1000>;
+		phandle = <0x182>;
+		reset-names = "can\0can-apb";
+	};
+
+	mailbox@fe780000 {
+		clock-names = "pclk_mailbox";
+		interrupts = <0x00 0xb7 0x04 0x00 0xb8 0x04 0x00 0xb9 0x04 0x00 0xba 0x04>;
+		clocks = <0x1f 0x11b>;
+		#mbox-cells = <0x01>;
+		compatible = "rockchip,rk3568-mailbox\0rockchip,rk3368-mailbox";
+		status = "disabled";
+		reg = <0x00 0xfe780000 0x00 0x1000>;
+		phandle = <0x1a6>;
+	};
+
+	usb2-phy@fe8a0000 {
+		rockchip,usbgrf = <0xf7>;
+		clock-output-names = "usb480m_phy";
+		clock-names = "phyclk";
+		assigned-clocks = <0x1f 0x0b>;
+		assigned-clock-parents = <0x24>;
+		interrupts = <0x00 0x87 0x04>;
+		clocks = <0x31 0x13>;
+		#clock-cells = <0x00>;
+		compatible = "rockchip,rk3568-usb2phy";
+		status = "okay";
+		reg = <0x00 0xfe8a0000 0x00 0x10000>;
+		phandle = <0x24>;
+
+		host-port {
+			#phy-cells = <0x00>;
+			status = "disabled";
+			phandle = <0x25>;
+		};
+
+		otg-port {
+			#phy-cells = <0x00>;
+			status = "okay";
+			phandle = <0x23>;
+		};
+	};
+
+	edp-phy@fdcb0000 {
+		clock-names = "refclk\0pclk";
+		resets = <0x1f 0x1d6>;
+		clocks = <0x31 0x29 0x1f 0x192>;
+		#phy-cells = <0x00>;
+		compatible = "rockchip,rk3568-edp-phy";
+		status = "disabled";
+		reg = <0x00 0xfdcb0000 0x00 0x8000>;
+		phandle = <0x95>;
+		reset-names = "apb";
+	};
+
+	xin32k {
+		pinctrl-names = "default";
+		clock-output-names = "xin32k";
+		pinctrl-0 = <0x1e>;
+		#clock-cells = <0x00>;
+		clock-frequency = <0x8000>;
+		compatible = "fixed-clock";
+		phandle = <0x12e>;
+	};
+
+	sata@fc400000 {
+		power-domains = <0x21 0x0f>;
+		phy-names = "sata-phy";
+		clock-names = "sata\0pmalive\0rxoob";
+		interrupts = <0x00 0x5f 0x04>;
+		clocks = <0x1f 0x9b 0x1f 0x9c 0x1f 0x9d>;
+		compatible = "snps,dwc-ahci";
+		status = "disabled";
+		interrupt-names = "hostc";
+		phys = <0x20 0x01>;
+		reg = <0x00 0xfc400000 0x00 0x1000>;
+		phandle = <0x12f>;
+		ports-implemented = <0x01>;
+	};
+
+	video-phy@fe860000 {
+		power-domains = <0x21 0x09>;
+		clock-names = "ref\0pclk_phy\0pclk_host";
+		resets = <0x1f 0x1bc>;
+		clocks = <0x31 0x19 0x1f 0x17b 0x1f 0xe9>;
+		#clock-cells = <0x00>;
+		#phy-cells = <0x00>;
+		compatible = "rockchip,rk3568-video-phy";
+		status = "disabled";
+		reg = <0x00 0xfe860000 0x00 0x10000 0x00 0xfe070000 0x00 0x10000>;
+		phandle = <0x8f>;
+		reset-names = "rst";
+	};
+
+	ethernet@fe010000 {
+		pinctrl-names = "default";
+		phy-mode = "rgmii";
+		snps,mixed-burst;
+		snps,mtl-rx-config = <0x7a>;
+		snps,reset-active-low;
+		pinctrl-0 = <0x7c 0x7d 0x7e 0x7f 0x80>;
+		clock-names = "stmmaceth\0mac_clk_rx\0mac_clk_tx\0clk_mac_refout\0aclk_mac\0pclk_mac\0clk_mac_speed\0ptp_ref\0pclk_xpcs";
+		assigned-clocks = <0x1f 0x189 0x1f 0x186>;
+		assigned-clock-parents = <0x1f 0x187 0x1f 0xc5>;
+		snps,mtl-tx-config = <0x7b>;
+		local-mac-address = [e6 c6 dc 45 51 9e];
+		assigned-clock-rates = <0x00 0x7735940>;
+		resets = <0x1f 0xec>;
+		interrupts = <0x00 0x20 0x04 0x00 0x1d 0x04>;
+		clocks = <0x1f 0x186 0x1f 0x189 0x1f 0x189 0x1f 0xc7 0x1f 0xc3 0x1f 0xc4 0x1f 0x189 0x1f 0xc8 0x1f 0xac>;
+		clock_in_out = "output";
+		snps,tso;
+		compatible = "rockchip,rk3568-gmac\0snps,dwmac-4.20a";
+		status = "okay";
+		rockchip,grf = <0x32>;
+		interrupt-names = "macirq\0eth_wake_irq";
+		snps,reset-gpio = <0x36 0x16 0x01>;
+		reg = <0x00 0xfe010000 0x00 0x10000>;
+		rx_delay = <0x24>;
+		phandle = <0x161>;
+		phy-handle = <0x81>;
+		reset-names = "stmmaceth";
+		tx_delay = <0x40>;
+		snps,axi-config = <0x79>;
+		snps,reset-delays-us = <0x00 0x4e20 0x186a0>;
+
+		mdio {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+			compatible = "snps,dwmac-mdio";
+			phandle = <0x162>;
+
+			phy@0 {
+				compatible = "ethernet-phy-ieee802.3-c22";
+				reg = <0x00>;
+				phandle = <0x81>;
+			};
+		};
+
+		tx-queues-config {
+			phandle = <0x7b>;
+			snps,tx-queues-to-use = <0x01>;
+
+			queue0 {
+			};
+		};
+
+		stmmac-axi-config {
+			snps,wr_osr_lmt = <0x04>;
+			phandle = <0x79>;
+			snps,blen = <0x00 0x00 0x00 0x00 0x10 0x08 0x04>;
+			snps,rd_osr_lmt = <0x08>;
+		};
+
+		rx-queues-config {
+			snps,rx-queues-to-use = <0x01>;
+			phandle = <0x7a>;
+
+			queue0 {
+			};
+		};
+	};
+
+	rkisp-vir1 {
+		#address-cells = <0x01>;
+		rockchip,hw = <0x76>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rkisp-vir";
+		status = "disabled";
+		phandle = <0x160>;
+
+		port {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+			reg = <0x00>;
+
+			endpoint@0 {
+				remote-endpoint = <0x78>;
+				reg = <0x00>;
+				phandle = <0xf6>;
+			};
+		};
+	};
+
+	display-subsystem {
+		memory-region-names = "drm-logo\0drm-cubic-lut";
+		ports = <0x12>;
+		memory-region = <0x10 0x11>;
+		compatible = "rockchip,display-subsystem";
+		status = "okay";
+		devfreq = <0x13>;
+		phandle = <0x113>;
+
+		route {
+
+			route-hdmi {
+				logo,kernel = "logo_kernel.bmp";
+				cubic_lut,offset = <0x00>;
+				video,vrefresh = <0x3c>;
+				overscan,right_margin = <0x64>;
+				logo,offset = <0x186000>;
+				overscan,bottom_margin = <0x64>;
+				logo,width = <0x28e>;
+				logo,uboot = "logo.bmp";
+				video,crtc_hsync_end = <0x804>;
+				overscan,top_margin = <0x64>;
+				charge_logo,mode = "center";
+				video,hdisplay = <0x780>;
+				connect = <0x17>;
+				video,aspect_ratio = <0x02>;
+				overscan,left_margin = <0x64>;
+				logo,mode = "center";
+				status = "okay";
+				logo,bpp = <0x18>;
+				phandle = <0x117>;
+				video,vdisplay = <0x438>;
+				video,flags = <0x05>;
+				logo,height = <0x10e>;
+				video,crtc_vsync_end = <0x441>;
+				video,clock = <0x24414>;
+				logo,ymirror = <0x00>;
+			};
+
+			route-lvds {
+				logo,kernel = "logo_kernel.bmp";
+				logo,uboot = "logo.bmp";
+				charge_logo,mode = "center";
+				connect = <0x18>;
+				logo,mode = "center";
+				status = "disabled";
+				phandle = <0x118>;
+			};
+
+			route-dsi1 {
+				logo,kernel = "logo_kernel.bmp";
+				logo,uboot = "logo.bmp";
+				charge_logo,mode = "center";
+				connect = <0x15>;
+				logo,mode = "center";
+				status = "disabled";
+				phandle = <0x115>;
+			};
+
+			route-edp {
+				logo,kernel = "logo_kernel.bmp";
+				logo,uboot = "logo.bmp";
+				charge_logo,mode = "center";
+				connect = <0x16>;
+				logo,mode = "center";
+				status = "disabled";
+				phandle = <0x116>;
+			};
+
+			route-rgb {
+				logo,kernel = "logo_kernel.bmp";
+				logo,uboot = "logo.bmp";
+				charge_logo,mode = "center";
+				connect = <0x19>;
+				logo,mode = "center";
+				status = "disabled";
+				phandle = <0x119>;
+			};
+
+			route-dsi0 {
+				logo,kernel = "logo_kernel.bmp";
+				logo,uboot = "logo.bmp";
+				charge_logo,mode = "center";
+				connect = <0x14>;
+				logo,mode = "center";
+				status = "disabled";
+				phandle = <0x114>;
+			};
+		};
+	};
+
+	edp@fe0c0000 {
+		power-domains = <0x21 0x09>;
+		phy-names = "dp";
+		clock-names = "dp\0pclk\0spdif\0hclk";
+		resets = <0x1f 0x113 0x1f 0x112>;
+		interrupts = <0x00 0x12 0x04>;
+		clocks = <0x31 0x29 0x1f 0xea 0x1f 0xeb 0x1f 0xda>;
+		compatible = "rockchip,rk3568-edp";
+		status = "disabled";
+		phys = <0x95>;
+		reg = <0x00 0xfe0c0000 0x00 0x10000>;
+		phandle = <0x16c>;
+		reset-names = "dp\0apb";
+
+		ports {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+
+			port@0 {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x00>;
+				phandle = <0x16d>;
+
+				endpoint@1 {
+					remote-endpoint = <0x96>;
+					status = "disabled";
+					reg = <0x01>;
+					phandle = <0x89>;
+				};
+
+				endpoint@0 {
+					remote-endpoint = <0x16>;
+					status = "disabled";
+					reg = <0x00>;
+					phandle = <0x85>;
+				};
+			};
+		};
+	};
+
+	spi@fe630000 {
+		pinctrl-names = "default\0high_speed";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xce 0xcf 0xd0>;
+		clock-names = "spiclk\0apb_pclk";
+		interrupts = <0x00 0x69 0x04>;
+		clocks = <0x1f 0x156 0x1f 0x155>;
+		#size-cells = <0x00>;
+		dma-names = "tx\0rx";
+		compatible = "rockchip,rk3066-spi";
+		pinctrl-1 = <0xce 0xcf 0xd1>;
+		status = "disabled";
+		reg = <0x00 0xfe630000 0x00 0x1000>;
+		phandle = <0x18e>;
+		dmas = <0x40 0x18 0x40 0x19>;
+	};
+
+	i2c@fe5d0000 {
+		pinctrl-names = "default";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xc4>;
+		clock-names = "i2c\0pclk";
+		interrupts = <0x00 0x32 0x04>;
+		clocks = <0x1f 0x14e 0x1f 0x14d>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3399-i2c";
+		status = "disabled";
+		reg = <0x00 0xfe5d0000 0x00 0x1000>;
+		phandle = <0x188>;
+	};
+
+	clock-controller@fdd00000 {
+		#reset-cells = <0x01>;
+		assigned-clocks = <0x31 0x32>;
+		assigned-clock-parents = <0x31 0x05>;
+		#clock-cells = <0x01>;
+		rockchip,pmugrf = <0x33>;
+		compatible = "rockchip,rk3568-pmucru";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfdd00000 0x00 0x1000>;
+		phandle = <0x31>;
+	};
+
+	arm-pmu {
+		interrupt-affinity = <0x09 0x0a 0x0b 0x0c>;
+		interrupts = <0x00 0xe4 0x04 0x00 0xe5 0x04 0x00 0xe6 0x04 0x00 0xe7 0x04>;
+		compatible = "arm,cortex-a55-pmu\0arm,armv8-pmuv3";
+	};
+
+	rkisp@fdff0000 {
+		power-domains = <0x21 0x08>;
+		iommus = <0x75>;
+		rockchip,iq-feature = <0x3fb 0xf7fe67ff>;
+		clock-names = "aclk_isp\0hclk_isp\0clk_isp";
+		resets = <0x1f 0xfd 0x1f 0xfc>;
+		interrupts = <0x00 0x39 0x04 0x00 0x3a 0x04 0x00 0x3c 0x04>;
+		clocks = <0x1f 0xd2 0x1f 0xd3 0x1f 0xd4>;
+		compatible = "rockchip,rk3568-rkisp";
+		status = "okay";
+		rockchip,grf = <0x32>;
+		interrupt-names = "mipi_irq\0mi_irq\0isp_irq";
+		reg = <0x00 0xfdff0000 0x00 0x10000>;
+		phandle = <0x76>;
+		reset-names = "isp\0isp-h";
+	};
+
+	rkcif_mipi_lvds_sditf {
+		compatible = "rockchip,rkcif-sditf";
+		status = "disabled";
+		rockchip,cif = <0x74>;
+		phandle = <0x15e>;
+	};
+
+	thermal-zones {
+		phandle = <0x121>;
+
+		soc-thermal {
+			polling-delay = <0x3e8>;
+			polling-delay-passive = <0x14>;
+			thermal-sensors = <0x1b 0x00>;
+			sustainable-power = <0x5c3>;
+			phandle = <0x122>;
+
+			trips {
+
+				trip-point-0 {
+					temperature = <0x11170>;
+					hysteresis = <0x7d0>;
+					type = "passive";
+					phandle = <0x123>;
+				};
+
+				trip-point-1 {
+					temperature = <0x14c08>;
+					hysteresis = <0x7d0>;
+					type = "passive";
+					phandle = <0x1c>;
+				};
+
+				soc-crit {
+					temperature = <0x1c138>;
+					hysteresis = <0x7d0>;
+					type = "critical";
+					phandle = <0x124>;
+				};
+			};
+
+			cooling-maps {
+
+				map0 {
+					trip = <0x1c>;
+					cooling-device = <0x09 0xffffffff 0xffffffff>;
+					contribution = <0x400>;
+				};
+
+				map1 {
+					trip = <0x1c>;
+					cooling-device = <0x1d 0xffffffff 0xffffffff>;
+					contribution = <0x400>;
+				};
+			};
+		};
+
+		gpu-thermal {
+			polling-delay = <0x3e8>;
+			polling-delay-passive = <0x14>;
+			thermal-sensors = <0x1b 0x01>;
+			phandle = <0x125>;
+		};
+	};
+
+	cspmu@fd90c000 {
+		compatible = "rockchip,cspmu";
+		reg = <0x00 0xfd90c000 0x00 0x1000 0x00 0xfd90d000 0x00 0x1000 0x00 0xfd90e000 0x00 0x1000 0x00 0xfd90f000 0x00 0x1000>;
+		phandle = <0x29e>;
+	};
+
+	syscon@fdc70000 {
+		compatible = "rockchip,pipe-phy-grf\0syscon";
+		reg = <0x00 0xfdc70000 0x00 0x1000>;
+		phandle = <0x13f>;
+	};
+
+	qos@fe158200 {
+		compatible = "syscon";
+		reg = <0x00 0xfe158200 0x00 0x20>;
+		phandle = <0x51>;
+	};
+
+	i2s@fe400000 {
+		rockchip,cru = <0x1f>;
+		clock-names = "mclk_tx\0mclk_rx\0hclk";
+		resets = <0x1f 0x50 0x1f 0x51>;
+		interrupts = <0x00 0x34 0x04>;
+		clocks = <0x1f 0x3f 0x1f 0x43 0x1f 0x39>;
+		dma-names = "tx";
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-i2s-tdm";
+		rockchip,playback-only;
+		status = "okay";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe400000 0x00 0x1000>;
+		phandle = <0x10c>;
+		dmas = <0xa6 0x00>;
+		reset-names = "tx-m\0rx-m";
+	};
+
+	dmac@fe530000 {
+		clock-names = "apb_pclk";
+		interrupts = <0x00 0x0e 0x04 0x00 0x0d 0x04>;
+		clocks = <0x1f 0x10d>;
+		arm,pl330-periph-burst;
+		compatible = "arm,pl330\0arm,primecell";
+		reg = <0x00 0xfe530000 0x00 0x4000>;
+		phandle = <0x40>;
+		#dma-cells = <0x01>;
+	};
+
+	jpegd@fded0000 {
+		power-domains = <0x21 0x0a>;
+		iommus = <0x6a>;
+		clock-names = "aclk_vcodec\0hclk_vcodec";
+		resets = <0x1f 0x12c 0x1f 0x12d>;
+		interrupts = <0x00 0x3e 0x04>;
+		clocks = <0x1f 0xfb 0x1f 0xfc>;
+		rockchip,srv = <0x68>;
+		rockchip,taskqueue-node = <0x01>;
+		rockchip,disable-auto-freq;
+		compatible = "rockchip,rkv-jpeg-decoder-v1";
+		rockchip,resetgroup-node = <0x01>;
+		status = "okay";
+		reg = <0x00 0xfded0000 0x00 0x400>;
+		phandle = <0x156>;
+		reset-names = "video_a\0video_h";
+	};
+
+	csi2-dphy1 {
+		rockchip,hw = <0xf2>;
+		compatible = "rockchip,rk3568-csi2-dphy";
+		status = "okay";
+		phandle = <0x1a8>;
+
+		ports {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+
+			port@0 {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x00>;
+
+				endpoint@1 {
+					data-lanes = <0x01 0x02>;
+					remote-endpoint = <0xf3>;
+					reg = <0x01>;
+					phandle = <0xbe>;
+				};
+			};
+
+			port@1 {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x01>;
+
+				endpoint@1 {
+					remote-endpoint = <0xf4>;
+					reg = <0x01>;
+					phandle = <0x77>;
+				};
+			};
+		};
+	};
+
+	qos@fe1a8000 {
+		compatible = "syscon";
+		reg = <0x00 0xfe1a8000 0x00 0x20>;
+		phandle = <0x4b>;
+	};
+
+	serial@fe6b0000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xdd>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x7b 0x04>;
+		clocks = <0x1f 0x137 0x1f 0x134>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfe6b0000 0x00 0x100>;
+		phandle = <0x196>;
+		dmas = <0x40 0x0e 0x40 0x0f>;
+		reg-shift = <0x02>;
+	};
+
+	qos@fe148100 {
+		compatible = "syscon";
+		reg = <0x00 0xfe148100 0x00 0x20>;
+		phandle = <0x4a>;
+	};
+
+	npu@fde40000 {
+		power-domains = <0x21 0x06>;
+		iommus = <0x5f>;
+		clock-names = "scmi_clk\0clk\0aclk\0hclk";
+		assigned-clocks = <0x1f 0x23>;
+		rknpu-supply = <0x61>;
+		assigned-clock-rates = <0x23c34600>;
+		resets = <0x1f 0x2b 0x1f 0x2c>;
+		memory-region = <0x60>;
+		interrupts = <0x00 0x97 0x04>;
+		clocks = <0x02 0x02 0x1f 0x23 0x1f 0x28 0x1f 0x29>;
+		compatible = "rockchip,rk3568-rknpu\0rockchip,rknpu";
+		status = "disabled";
+		reg = <0x00 0xfde40000 0x00 0x10000>;
+		phandle = <0x151>;
+		reset-names = "srst_a\0srst_h";
+		operating-points-v2 = <0x5e>;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		phandle = <0x2a2>;
+
+		work {
+			linux,default-trigger = "timer";
+			default-state = "on";
+			phandle = <0x2a3>;
+			gpios = <0x36 0x15 0x00>;
+		};
+	};
+
+	psci {
+		method = "smc";
+		compatible = "arm,psci-1.0";
+	};
+
+	phy@fe840000 {
+		rockchip,pipe-grf = <0xef>;
+		clock-names = "refclk\0apbclk\0pipe_clk";
+		assigned-clocks = <0x31 0x25>;
+		assigned-clock-rates = <0x5f5e100>;
+		resets = <0x1f 0x1c8 0x1f 0x1c9>;
+		clocks = <0x31 0x25 0x1f 0x17e 0x1f 0x7f>;
+		#phy-cells = <0x01>;
+		compatible = "rockchip,rk3568-naneng-combphy";
+		status = "okay";
+		rockchip,pipe-phy-grf = <0xf1>;
+		reg = <0x00 0xfe840000 0x00 0x100>;
+		phandle = <0x22>;
+		reset-names = "combphy-apb\0combphy";
+	};
+
+	usb@fd800000 {
+		phy-names = "usb2-phy";
+		clock-names = "usbhost\0arbiter\0pclk\0utmi";
+		interrupts = <0x00 0x82 0x04>;
+		clocks = <0x1f 0xbd 0x1f 0xbe 0x1f 0xbc 0x26>;
+		compatible = "generic-ehci";
+		status = "disabled";
+		phys = <0x27>;
+		reg = <0x00 0xfd800000 0x00 0x40000>;
+		phandle = <0x135>;
+	};
+
+	xin24m {
+		clock-output-names = "xin24m";
+		#clock-cells = <0x00>;
+		clock-frequency = <0x16e3600>;
+		compatible = "fixed-clock";
+		phandle = <0x12d>;
+	};
+
+	iommu@fdf40f00 {
+		power-domains = <0x21 0x0e>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x8d 0x04 0x00 0x8e 0x04>;
+		clocks = <0x1f 0x103 0x1f 0x104>;
+		rockchip,enable-cmd-retry;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		rockchip,disable-mmu-reset;
+		status = "okay";
+		interrupt-names = "rkvenc_mmu0\0rkvenc_mmu1";
+		reg = <0x00 0xfdf40f00 0x00 0x40 0x00 0xfdf40f40 0x00 0x40>;
+		phandle = <0x6d>;
+	};
+
+	qos@fe158180 {
+		compatible = "syscon";
+		reg = <0x00 0xfe158180 0x00 0x20>;
+		phandle = <0x50>;
+	};
+
+	qos@fe180000 {
+		compatible = "syscon";
+		reg = <0x00 0xfe180000 0x00 0x20>;
+		phandle = <0x46>;
+	};
+
+	usb@fd840000 {
+		phy-names = "usb2-phy";
+		clock-names = "usbhost\0arbiter\0pclk\0utmi";
+		interrupts = <0x00 0x83 0x04>;
+		clocks = <0x1f 0xbd 0x1f 0xbe 0x1f 0xbc 0x26>;
+		compatible = "generic-ohci";
+		status = "disabled";
+		phys = <0x27>;
+		reg = <0x00 0xfd840000 0x00 0x40000>;
+		phandle = <0x136>;
+	};
+
+	hdmi@fe0a0000 {
+		power-domains = <0x21 0x09>;
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0x91 0x92 0x93>;
+		clock-names = "iahb\0isfr\0cec\0ref\0hclk";
+		interrupts = <0x00 0x2d 0x04>;
+		clocks = <0x1f 0xe6 0x1f 0xe7 0x1f 0x193 0x31 0x02 0x1f 0xde>;
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-dw-hdmi";
+		status = "okay";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe0a0000 0x00 0x20000>;
+		phandle = <0x10d>;
+		luckfox,hot-plug-detect-invert;
+
+		ports {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+
+			port {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				phandle = <0x16b>;
+
+				endpoint@1 {
+					remote-endpoint = <0x94>;
+					status = "disabled";
+					reg = <0x01>;
+					phandle = <0x8a>;
+				};
+
+				endpoint@0 {
+					remote-endpoint = <0x17>;
+					status = "okay";
+					reg = <0x00>;
+					phandle = <0x86>;
+				};
+			};
+		};
+	};
+
+	power-management@fdd90000 {
+		compatible = "rockchip,rk3568-pmu\0syscon\0simple-mfd";
+		reg = <0x00 0xfdd90000 0x00 0x1000>;
+		phandle = <0x150>;
+
+		power-controller {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+			#power-domain-cells = <0x01>;
+			compatible = "rockchip,rk3568-power-controller";
+			status = "okay";
+			phandle = <0x21>;
+
+			pd_pipe@15 {
+				clocks = <0x1f 0x7f>;
+				reg = <0x0f>;
+				pm_qos = <0x59 0x5a 0x5b 0x5c 0x5d>;
+			};
+
+			pd_vi@8 {
+				clocks = <0x1f 0xcc 0x1f 0xcd>;
+				reg = <0x08>;
+				pm_qos = <0x48 0x49 0x4a>;
+			};
+
+			pd_rkvenc@14 {
+				clocks = <0x1f 0x102>;
+				reg = <0x0e>;
+				pm_qos = <0x56 0x57 0x58>;
+			};
+
+			pd_rga@10 {
+				clocks = <0x1f 0xf1 0x1f 0xf2>;
+				reg = <0x0a>;
+				pm_qos = <0x4e 0x4f 0x50 0x51 0x52 0x53>;
+			};
+
+			pd_vpu@11 {
+				clocks = <0x1f 0xed>;
+				reg = <0x0b>;
+				pm_qos = <0x54>;
+			};
+
+			pd_gpu@7 {
+				clocks = <0x1f 0x19 0x1f 0x1a>;
+				reg = <0x07>;
+				pm_qos = <0x47>;
+			};
+
+			pd_rkvdec@13 {
+				clocks = <0x1f 0x107>;
+				reg = <0x0d>;
+				pm_qos = <0x55>;
+			};
+
+			pd_vo@9 {
+				clocks = <0x1f 0xda 0x1f 0xdb 0x1f 0xdc>;
+				reg = <0x09>;
+				pm_qos = <0x4b 0x4c 0x4d>;
+			};
+
+			pd_npu@6 {
+				clocks = <0x1f 0x27 0x1f 0x25 0x1f 0x26>;
+				reg = <0x06>;
+				pm_qos = <0x46>;
+			};
+		};
+	};
+
+	vad@fe450000 {
+		rockchip,det-channel = <0x00>;
+		rockchip,audio-src = <0x00>;
+		clock-names = "hclk";
+		reg-names = "vad";
+		interrupts = <0x00 0x89 0x04>;
+		clocks = <0x1f 0x5b>;
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-vad";
+		status = "disabled";
+		rockchip,mode = <0x00>;
+		reg = <0x00 0xfe450000 0x00 0x10000>;
+		phandle = <0x17b>;
+	};
+
+	qos@fe148080 {
+		compatible = "syscon";
+		reg = <0x00 0xfe148080 0x00 0x20>;
+		phandle = <0x49>;
+	};
+
+	vcc-camera-imx219-two {
+		regulator-max-microvolt = <0x325aa0>;
+		regulator-boot-on;
+		gpio = <0x36 0x10 0x00>;
+		regulator-always-on;
+		enable-active-high;
+		regulator-min-microvolt = <0x325aa0>;
+		regulator-name = "vcc_camera_imx219_two";
+		compatible = "regulator-fixed";
+		status = "disabled";
+		phandle = <0x2a8>;
+	};
+
+	serial@fe680000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xda>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x78 0x04>;
+		clocks = <0x1f 0x12b 0x1f 0x128>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfe680000 0x00 0x100>;
+		phandle = <0x193>;
+		dmas = <0x40 0x08 0x40 0x09>;
+		reg-shift = <0x02>;
+	};
+
+	usb@fd880000 {
+		phy-names = "usb2-phy";
+		clock-names = "usbhost\0arbiter\0pclk\0utmi";
+		interrupts = <0x00 0x85 0x04>;
+		clocks = <0x1f 0xbf 0x1f 0xc0 0x1f 0xbc 0x26>;
+		compatible = "generic-ehci";
+		status = "disabled";
+		phys = <0x28>;
+		reg = <0x00 0xfd880000 0x00 0x40000>;
+		phandle = <0x137>;
+	};
+
+	vcc-camera-imx219 {
+		regulator-max-microvolt = <0x325aa0>;
+		regulator-boot-on;
+		gpio = <0x36 0x10 0x00>;
+		regulator-always-on;
+		enable-active-high;
+		regulator-min-microvolt = <0x325aa0>;
+		regulator-name = "vcc_camera_imx219";
+		compatible = "regulator-fixed";
+		status = "disabled";
+		phandle = <0x2a7>;
+	};
+
+	audpwm@fe470000 {
+		clock-names = "clk\0hclk";
+		clocks = <0x1f 0x63 0x1f 0x60>;
+		rockchip,sample-width-bits = <0x0b>;
+		dma-names = "tx";
+		rockchip,interpolat-points = <0x01>;
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-audio-pwm\0rockchip,audio-pwm-v1";
+		status = "disabled";
+		reg = <0x00 0xfe470000 0x00 0x1000>;
+		phandle = <0x17d>;
+		dmas = <0xa6 0x08>;
+	};
+
+	qos@fe190400 {
+		compatible = "syscon";
+		reg = <0x00 0xfe190400 0x00 0x20>;
+		phandle = <0x5d>;
+	};
+
+	saradc@fe720000 {
+		vref-supply = <0xee>;
+		clock-names = "saradc\0apb_pclk";
+		resets = <0x1f 0x180>;
+		interrupts = <0x00 0x5d 0x04>;
+		clocks = <0x1f 0x113 0x1f 0x112>;
+		#io-channel-cells = <0x01>;
+		compatible = "rockchip,rk3568-saradc\0rockchip,rk3399-saradc";
+		status = "okay";
+		reg = <0x00 0xfe720000 0x00 0x100>;
+		phandle = <0x1a5>;
+		reset-names = "saradc-apb";
+	};
+
+	dfi@fe230000 {
+		rockchip,pmugrf = <0x33>;
+		compatible = "rockchip,rk3568-dfi";
+		status = "okay";
+		reg = <0x00 0xfe230000 0x00 0x400>;
+		phandle = <0x97>;
+	};
+
+	external-camera-imx219-clock-two {
+		clock-output-names = "ext_cam_imx219_clk_two";
+		#clock-cells = <0x00>;
+		clock-frequency = <0x17d7840>;
+		compatible = "fixed-clock";
+		phandle = <0xc1>;
+	};
+
+	sc16is752-clk {
+		clock-output-names = "sc16is752_clk";
+		#clock-cells = <0x00>;
+		clock-frequency = <0xe10000>;
+		compatible = "fixed-clock";
+		phandle = <0x2a5>;
+	};
+
+	ddr3-params {
+		dram_dq_drv_odten = <0x22>;
+		reserved = <0x00>;
+		phy_dll_dis_freq = <0x00>;
+		pd_dis_freq = <0x42a>;
+		phy_clk_drv_odtoff = <0x21>;
+		phy_odt_puup_en = <0x01>;
+		dram_odt = <0x78>;
+		standby_idle = <0x00>;
+		dq_map_cs0_dq_l = <0x00>;
+		dram_dq_drv_odtoff = <0x22>;
+		phy_dq_sr_odten = <0x0f>;
+		speed_bin = <0x15>;
+		dq_map_cs1_dq_h = <0x00>;
+		freq_4 = <0x00>;
+		sr_dis_freq = <0x320>;
+		dram_dq_odt_en_freq = <0x14d>;
+		phy_clk_sr_odtoff = <0x00>;
+		freq_2 = <0x210>;
+		phy_clk_drv_odten = <0x21>;
+		phy_dq_drv_odtoff = <0x21>;
+		dq_map_cs0_dq_h = <0x00>;
+		phy_ca_sr_odten = <0x03>;
+		sr_idle = <0x5d>;
+		ssmod_div = <0x00>;
+		freq_0 = <0x420>;
+		phy_clk_sr_odten = <0x00>;
+		phy_odt = <0xa7>;
+		phy_dq_sr_odtoff = <0x0f>;
+		phy_dq_drv_odten = <0x21>;
+		phy_odt_en_freq = <0x14d>;
+		sr_mc_gate_idle = <0x00>;
+		pd_idle = <0x0d>;
+		dram_dll_dis_freq = <0x12c>;
+		ssmod_downspread = <0x00>;
+		phy_odt_pudn_en = <0x01>;
+		freq_5 = <0x00>;
+		ssmod_spread = <0x00>;
+		freq_3 = <0x30c>;
+		phandle = <0x10e>;
+		expanded_version = <0x00>;
+		phy_ca_drv_odtoff = <0x21>;
+		version = <0x100>;
+		dram_ext_temp = <0x00>;
+		phy_ca_sr_odtoff = <0x03>;
+		freq_1 = <0x144>;
+		phy_ca_drv_odten = <0x21>;
+		mode_2t = <0x00>;
+		srpd_lite_idle = <0x00>;
+		byte_map = <0xe4>;
+		dq_map_cs1_dq_l = <0x00>;
+	};
+
+	usb2-phy@fe8b0000 {
+		rockchip,usbgrf = <0xf8>;
+		clock-names = "phyclk";
+		interrupts = <0x00 0x88 0x04>;
+		clocks = <0x31 0x15>;
+		#clock-cells = <0x00>;
+		compatible = "rockchip,rk3568-usb2phy";
+		status = "okay";
+		reg = <0x00 0xfe8b0000 0x00 0x10000>;
+		phandle = <0x26>;
+
+		host-port {
+			#phy-cells = <0x00>;
+			status = "disabled";
+			phandle = <0x28>;
+		};
+
+		otg-port {
+			#phy-cells = <0x00>;
+			status = "disabled";
+			phandle = <0x27>;
+		};
+	};
+
+	lpddr4x-params {
+		dram_dq_drv_odten = <0x28>;
+		reserved = <0x00>;
+		phy_dll_dis_freq = <0x00>;
+		pd_dis_freq = <0x42a>;
+		phy_clk_drv_odtoff = <0x24>;
+		phy_odt_puup_en = <0x00>;
+		dram_odt = <0x50>;
+		standby_idle = <0x00>;
+		dq_map_cs0_dq_l = <0x00>;
+		dram_dq_drv_odtoff = <0x28>;
+		phy_dq_sr_odten = <0x00>;
+		lp4_ca_odt_en_freq = <0x320>;
+		speed_bin = <0x00>;
+		dq_map_cs1_dq_h = <0x00>;
+		freq_4 = <0x00>;
+		sr_dis_freq = <0x320>;
+		dram_dq_odt_en_freq = <0x320>;
+		phy_clk_sr_odtoff = <0x00>;
+		phy_lp4_cs_drv_odten = <0x00>;
+		freq_2 = <0x210>;
+		phy_clk_drv_odten = <0x24>;
+		phy_dq_drv_odtoff = <0x1d>;
+		dq_map_cs0_dq_h = <0x00>;
+		phy_lp4_drv_pulldown_en_odten = <0x00>;
+		lp4_drv_pu_cal_odten = <0x00>;
+		phy_ca_sr_odten = <0x00>;
+		sr_idle = <0x5d>;
+		phy_lp4_drv_pulldown_en_odtoff = <0x00>;
+		ssmod_div = <0x00>;
+		freq_0 = <0x420>;
+		phy_clk_sr_odten = <0x00>;
+		phy_odt = <0x3c>;
+		phy_dq_sr_odtoff = <0x00>;
+		lp4_dq_vref_odten = <0xe4>;
+		lp4_ca_odt = <0x78>;
+		phy_dq_drv_odten = <0x1d>;
+		phy_lp4_dq_vref_odten = <0xa6>;
+		phy_odt_en_freq = <0x320>;
+		sr_mc_gate_idle = <0x00>;
+		pd_idle = <0x0d>;
+		lp4_dq_vref_odtoff = <0x1a4>;
+		dram_dll_dis_freq = <0x00>;
+		ssmod_downspread = <0x00>;
+		phy_odt_pudn_en = <0x00>;
+		freq_5 = <0x00>;
+		ssmod_spread = <0x00>;
+		phy_lp4_dq_vref_odtoff = <0x1a4>;
+		phy_lp4_cs_drv_odtoff = <0x00>;
+		lp4_ca_vref_odtoff = <0x157>;
+		freq_3 = <0x30c>;
+		lp4_drv_pu_cal_odtoff = <0x00>;
+		phandle = <0x112>;
+		expanded_version = <0x00>;
+		phy_ca_drv_odtoff = <0x24>;
+		lp4_odte_ck_en = <0x00>;
+		lp4_odte_cs_en = <0x00>;
+		version = <0x100>;
+		dram_ext_temp = <0x00>;
+		phy_ca_sr_odtoff = <0x00>;
+		freq_1 = <0x144>;
+		lp4_ca_vref_odten = <0x157>;
+		phy_ca_drv_odten = <0x24>;
+		lp4_odtd_ca_en = <0x00>;
+		mode_2t = <0x00>;
+		srpd_lite_idle = <0x00>;
+		byte_map = <0xe4>;
+		dq_map_cs1_dq_l = <0x00>;
+	};
+
+	syscon@fdca8000 {
+		compatible = "rockchip,rk3568-usb2phy-grf\0syscon";
+		reg = <0x00 0xfdca8000 0x00 0x8000>;
+		phandle = <0xf8>;
+	};
+
+	npu-opp-table {
+		nvmem-cells = <0x62 0x07 0x08>;
+		rockchip,low-temp = <0x00>;
+		rockchip,low-temp-adjust-volt = <0x00 0x2bc 0xc350>;
+		compatible = "operating-points-v2";
+		nvmem-cell-names = "leakage\0pvtm\0mbist-vmin";
+		phandle = <0x5e>;
+		rockchip,temp-hysteresis = <0x1388>;
+		mbist-vmin = <0xc96a8 0xdbba0 0xe7ef0>;
+
+		opp-300000000 {
+			opp-microvolt = <0xc96a8 0xc96a8 0xf4240>;
+			opp-hz = <0x00 0x11b3dc40>;
+		};
+
+		opp-700000000 {
+			opp-microvolt = <0xcf850 0xcf850 0xf4240>;
+			opp-hz = <0x00 0x29b92700>;
+		};
+
+		opp-900000000 {
+			opp-microvolt = <0x186a0 0xe1d48 0xf4240>;
+			opp-hz = <0x00 0x35a4e900>;
+		};
+
+		opp-200000000 {
+			opp-microvolt = <0xc96a8 0xc96a8 0xf4240>;
+			opp-hz = <0x00 0xbebc200>;
+		};
+
+		opp-400000000 {
+			opp-microvolt = <0xc96a8 0xc96a8 0xf4240>;
+			opp-hz = <0x00 0x17d78400>;
+		};
+
+		opp-600000000 {
+			opp-microvolt = <0xc96a8 0xc96a8 0xf4240>;
+			opp-hz = <0x00 0x23c34600>;
+		};
+
+		opp-1000000000 {
+			opp-microvolt = <0xf4240 0xf4240 0xf4240>;
+			opp-hz = <0x00 0x3b9aca00>;
+		};
+
+		opp-800000000 {
+			opp-microvolt = <0xd59f8 0xd59f8 0xf4240>;
+			opp-hz = <0x00 0x2faf0800>;
+		};
+	};
+
+	dwmmc@fe2b0000 {
+		supports-sd;
+		fifo-depth = <0x100>;
+		pinctrl-names = "default";
+		ignore-pm-notify;
+		pinctrl-0 = <0x9e 0x9f 0xa0 0xa1>;
+		clock-names = "biu\0ciu\0ciu-drive\0ciu-sample";
+		cap-sd-highspeed;
+		vqmmc-supply = <0x2b>;
+		sd-uhs-sdr25;
+		bus-width = <0x04>;
+		resets = <0x1f 0xd4>;
+		card-detect-delay = <0x320>;
+		interrupts = <0x00 0x62 0x04>;
+		clocks = <0x1f 0xb0 0x1f 0xb1 0x1f 0x18a 0x1f 0x18b>;
+		vmmc-supply = <0x9d>;
+		compatible = "rockchip,rk3568-dw-mshc\0rockchip,rk3288-dw-mshc";
+		status = "okay";
+		disable-wp;
+		reg = <0x00 0xfe2b0000 0x00 0x4000>;
+		phandle = <0x170>;
+		max-frequency = <0x8f0d180>;
+		cap-mmc-highspeed;
+		reset-names = "reset";
+		sd-uhs-sdr50;
+	};
+
+	i2c@fe5a0000 {
+		pinctrl-names = "default";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xbc>;
+		clock-names = "i2c\0pclk";
+		interrupts = <0x00 0x2f 0x04>;
+		clocks = <0x1f 0x148 0x1f 0x147>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3399-i2c";
+		status = "okay";
+		reg = <0x00 0xfe5a0000 0x00 0x1000>;
+		phandle = <0x183>;
+
+		imx219-1@10 {
+			clock-names = "ext_cam_imx219_clk";
+			pwdn-gpios = <0x36 0x12 0x01>;
+			clocks = <0xbd>;
+			rockchip,camera-module-name = "Waveshare";
+			rockchip,camera-module-index = <0x00>;
+			compatible = "sony,imx219";
+			rockchip,camera-module-facing = "front";
+			status = "disabled";
+			reg = <0x10>;
+			rockchip,camera-module-lens-name = "Picamera";
+			phandle = <0x184>;
+
+			port {
+
+				endpoint {
+					data-lanes = <0x01 0x02>;
+					remote-endpoint = <0xbe>;
+					phandle = <0xf3>;
+				};
+			};
+		};
+	};
+
+	codec-digital@fe478000 {
+		pinctrl-names = "default";
+		pinctrl-0 = <0xba>;
+		clock-names = "adc\0dac\0i2c\0pclk";
+		resets = <0x1f 0x5f>;
+		clocks = <0x1f 0x67 0x1f 0x66 0x1f 0x65 0x1f 0x64>;
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-codec-digital\0rockchip,codec-digital-v1";
+		status = "disabled";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe478000 0x00 0x1000>;
+		phandle = <0x17e>;
+		reset-names = "reset";
+	};
+
+	spi@fe640000 {
+		pinctrl-names = "default\0high_speed";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xd2 0xd3 0xd4>;
+		clock-names = "spiclk\0apb_pclk";
+		interrupts = <0x00 0x6a 0x04>;
+		clocks = <0x1f 0x158 0x1f 0x157>;
+		#size-cells = <0x00>;
+		dma-names = "tx\0rx";
+		compatible = "rockchip,rk3066-spi";
+		pinctrl-1 = <0xd2 0xd3 0xd5>;
+		status = "disabled";
+		reg = <0x00 0xfe640000 0x00 0x1000>;
+		phandle = <0x18f>;
+		dmas = <0x40 0x1a 0x40 0x1b>;
+	};
+
+	ddr4-params {
+		dram_dq_drv_odten = <0x22>;
+		reserved = <0x00>;
+		phy_dll_dis_freq = <0x00>;
+		pd_dis_freq = <0x42a>;
+		phy_clk_drv_odtoff = <0x25>;
+		phy_odt_puup_en = <0x01>;
+		dram_odt = <0x78>;
+		standby_idle = <0x00>;
+		dq_map_cs0_dq_l = <0x22777788>;
+		dram_dq_drv_odtoff = <0x22>;
+		phy_dq_sr_odten = <0x0e>;
+		speed_bin = <0x0c>;
+		dq_map_cs1_dq_h = <0xd7888877>;
+		freq_4 = <0x00>;
+		sr_dis_freq = <0x320>;
+		dram_dq_odt_en_freq = <0x1f4>;
+		phy_clk_sr_odtoff = <0x01>;
+		freq_2 = <0x210>;
+		phy_clk_drv_odten = <0x25>;
+		phy_dq_drv_odtoff = <0x25>;
+		dq_map_cs0_dq_h = <0xd7888877>;
+		phy_ca_sr_odten = <0x01>;
+		sr_idle = <0x5d>;
+		ssmod_div = <0x00>;
+		freq_0 = <0x420>;
+		phy_clk_sr_odten = <0x01>;
+		phy_odt = <0x8b>;
+		phy_dq_sr_odtoff = <0x0e>;
+		phy_dq_drv_odten = <0x25>;
+		phy_odt_en_freq = <0x1f4>;
+		sr_mc_gate_idle = <0x00>;
+		pd_idle = <0x0d>;
+		dram_dll_dis_freq = <0x271>;
+		ssmod_downspread = <0x00>;
+		phy_odt_pudn_en = <0x01>;
+		freq_5 = <0x00>;
+		ssmod_spread = <0x00>;
+		freq_3 = <0x30c>;
+		phandle = <0x10f>;
+		expanded_version = <0x00>;
+		phy_ca_drv_odtoff = <0x25>;
+		version = <0x100>;
+		dram_ext_temp = <0x00>;
+		phy_ca_sr_odtoff = <0x01>;
+		freq_1 = <0x144>;
+		phy_ca_drv_odten = <0x25>;
+		mode_2t = <0x00>;
+		srpd_lite_idle = <0x00>;
+		byte_map = <0xe4>;
+		dq_map_cs1_dq_l = <0x22777788>;
+	};
+
+	i2c@fe5e0000 {
+		pinctrl-names = "default";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xc5>;
+		clock-names = "i2c\0pclk";
+		interrupts = <0x00 0x33 0x04>;
+		clocks = <0x1f 0x150 0x1f 0x14f>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3399-i2c";
+		status = "disabled";
+		reg = <0x00 0xfe5e0000 0x00 0x1000>;
+		phandle = <0x189>;
+	};
+
+	dsi@fe060000 {
+		power-domains = <0x21 0x09>;
+		#address-cells = <0x01>;
+		phy-names = "mipi_dphy";
+		clock-names = "pclk\0hclk\0hs_clk";
+		resets = <0x1f 0x110>;
+		interrupts = <0x00 0x44 0x04>;
+		clocks = <0x1f 0xe8 0x1f 0xda 0x2e>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3568-mipi-dsi";
+		status = "disabled";
+		rockchip,grf = <0x32>;
+		phys = <0x2e>;
+		reg = <0x00 0xfe060000 0x00 0x10000>;
+		phandle = <0x167>;
+		reset-names = "apb";
+
+		ports {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+
+			port@0 {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x00>;
+				phandle = <0x168>;
+
+				endpoint@1 {
+					remote-endpoint = <0x8e>;
+					status = "disabled";
+					reg = <0x01>;
+					phandle = <0x87>;
+				};
+
+				endpoint@0 {
+					remote-endpoint = <0x14>;
+					status = "disabled";
+					reg = <0x00>;
+					phandle = <0x83>;
+				};
+			};
+		};
+	};
+
+	iommu@fdff1a00 {
+		power-domains = <0x21 0x08>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x3b 0x04>;
+		clocks = <0x1f 0xd2 0x1f 0xd3>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		rockchip,disable-mmu-reset;
+		status = "okay";
+		interrupt-names = "isp_mmu";
+		reg = <0x00 0xfdff1a00 0x00 0x100>;
+		phandle = <0x75>;
+	};
+
+	qos@fe190380 {
+		compatible = "syscon";
+		reg = <0x00 0xfe190380 0x00 0x20>;
+		phandle = <0x5c>;
+	};
+
+	vcc3v3-sys {
+		regulator-max-microvolt = <0x325aa0>;
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-min-microvolt = <0x325aa0>;
+		regulator-name = "vcc3v3_sys";
+		compatible = "regulator-fixed";
+		phandle = <0x3d>;
+		vin-supply = <0x35>;
+	};
+
+	mipi-csi2@fdfb0000 {
+		clock-names = "pclk_csi2host";
+		reg-names = "csihost_regs";
+		resets = <0x1f 0xff>;
+		interrupts = <0x00 0x08 0x04 0x00 0x09 0x04>;
+		clocks = <0x1f 0xd5>;
+		compatible = "rockchip,rk3568-mipi-csi2";
+		status = "disabled";
+		interrupt-names = "csi-intr1\0csi-intr2";
+		reg = <0x00 0xfdfb0000 0x00 0x10000>;
+		phandle = <0x15c>;
+		reset-names = "srst_csihost_p";
+	};
+
+	rkvdec@fdf80200 {
+		power-domains = <0x21 0x0d>;
+		iommus = <0x6f>;
+		rockchip,advanced-rates = <0x179a7b00 0x00 0x179a7b00 0x179a7b00 0x23c34600>;
+		clock-names = "aclk_vcodec\0hclk_vcodec\0clk_cabac\0clk_core\0clk_hevc_cabac";
+		assigned-clocks = <0x1f 0x108 0x1f 0x10a 0x1f 0x10b 0x1f 0x10c>;
+		rockchip,normal-rates = <0x11b3dc40 0x00 0x11b3dc40 0x11b3dc40 0x23c34600>;
+		assigned-clock-rates = <0x11b3dc40 0x11b3dc40 0x11b3dc40 0x11b3dc40>;
+		resets = <0x1f 0x142 0x1f 0x143 0x1f 0x144 0x1f 0x145 0x1f 0x146>;
+		interrupts = <0x00 0x5b 0x04>;
+		clocks = <0x1f 0x108 0x1f 0x109 0x1f 0x10a 0x1f 0x10b 0x1f 0x10c>;
+		rockchip,rcb-min-width = <0x200>;
+		rockchip,srv = <0x68>;
+		rockchip,taskqueue-node = <0x04>;
+		compatible = "rockchip,rkv-decoder-rk3568\0rockchip,rkv-decoder-v2";
+		rockchip,resetgroup-node = <0x04>;
+		status = "okay";
+		interrupt-names = "irq_dec";
+		rockchip,rcb-iova = <0x10000000 0x10000>;
+		reg = <0x00 0xfdf80200 0x00 0x400>;
+		phandle = <0x15b>;
+		reset-names = "video_a\0video_h\0video_cabac\0video_core\0video_hevc_cabac";
+		rockchip,sram = <0x70>;
+		rockchip,default-max-load = <0x1fe000>;
+	};
+
+	mpp-srv {
+		rockchip,resetgroup-count = <0x06>;
+		rockchip,taskqueue-count = <0x06>;
+		compatible = "rockchip,mpp-service";
+		status = "okay";
+		phandle = <0x68>;
+	};
+
+	syscon@fdc80000 {
+		compatible = "rockchip,pipe-phy-grf\0syscon";
+		reg = <0x00 0xfdc80000 0x00 0x1000>;
+		phandle = <0xf0>;
+	};
+
+	timer {
+		arm,no-tick-in-suspend;
+		interrupts = <0x01 0x0d 0xf04 0x01 0x0e 0xf04 0x01 0x0b 0xf04 0x01 0x0a 0xf04>;
+		compatible = "arm,armv8-timer";
+	};
+
+	rockchip-suspend {
+		rockchip,sleep-debug-en = <0x01>;
+		rockchip,sleep-mode-config = <0x5ec>;
+		compatible = "rockchip,pm-rk3568";
+		status = "okay";
+		rockchip,wakeup-config = <0x10>;
+		phandle = <0x11f>;
+	};
+
+	iommu@fded0480 {
+		power-domains = <0x21 0x0a>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x3d 0x04>;
+		clocks = <0x1f 0xfb 0x1f 0xfc>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		status = "okay";
+		interrupt-names = "jpegd_mmu";
+		reg = <0x00 0xfded0480 0x00 0x40>;
+		phandle = <0x6a>;
+	};
+
+	i2s@fe410000 {
+		pinctrl-names = "default";
+		rockchip,cru = <0x1f>;
+		pinctrl-0 = <0xa7 0xa8 0xa9 0xaa>;
+		clock-names = "mclk_tx\0mclk_rx\0hclk";
+		resets = <0x1f 0x52 0x1f 0x53>;
+		interrupts = <0x00 0x35 0x04>;
+		clocks = <0x1f 0x47 0x1f 0x4b 0x1f 0x3a>;
+		dma-names = "tx\0rx";
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-i2s-tdm";
+		status = "okay";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe410000 0x00 0x1000>;
+		phandle = <0x104>;
+		dmas = <0xa6 0x02 0xa6 0x03>;
+		reset-names = "tx-m\0rx-m";
+		rockchip,clk-trcm = <0x01>;
+	};
+
+	sdio-pwrseq {
+		pinctrl-names = "default";
+		pinctrl-0 = <0x107>;
+		clock-names = "ext_clock";
+		clocks = <0x106 0x01>;
+		reset-gpios = <0x108 0x09 0x01>;
+		compatible = "mmc-pwrseq-simple";
+		post-power-on-delay-ms = <0xc8>;
+		phandle = <0xa2>;
+	};
+
+	bus-npu-opp-table {
+		rockchip,pvtm-ch = <0x00 0x05>;
+		nvmem-cells = <0x07>;
+		opp-shared;
+		compatible = "operating-points-v2";
+		nvmem-cell-names = "pvtm";
+		rockchip,pvtm-voltage-sel = <0x00 0x14050 0x00 0x14051 0x16b48 0x01 0x16b49 0x186a0 0x02>;
+		phandle = <0x63>;
+
+		opp-1200000000 {
+			opp-microvolt = <0xf4240>;
+			opp-microvolt-L2 = <0x00>;
+			opp-hz = <0x00 0x47868c00>;
+			opp-microvolt-L0 = <0xf4240>;
+			opp-microvolt-L1 = <0xf4240>;
+		};
+
+		opp-900000000 {
+			opp-microvolt = <0x00>;
+			opp-hz = <0x00 0x35a4e900>;
+		};
+
+		opp-1000000000 {
+			opp-microvolt = <0xe7ef0>;
+			opp-microvolt-L2 = <0x00>;
+			opp-hz = <0x00 0x3b9aca00>;
+			opp-microvolt-L0 = <0xe7ef0>;
+			opp-microvolt-L1 = <0xe1d48>;
+		};
+	};
+
+	sram@fdcc0000 {
+		#address-cells = <0x01>;
+		#size-cells = <0x01>;
+		compatible = "mmio-sram";
+		ranges = <0x00 0x00 0xfdcc0000 0xb000>;
+		reg = <0x00 0xfdcc0000 0x00 0xb000>;
+		phandle = <0x140>;
+
+		rkvdec-sram@0 {
+			reg = <0x00 0xb000>;
+			phandle = <0x70>;
+		};
+	};
+
+	pwm@fe6e0030 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe3>;
+		clock-names = "pwm\0pclk";
+		interrupts = <0x00 0x53 0x04 0x00 0x57 0x04>;
+		clocks = <0x1f 0x15a 0x1f 0x159>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe6e0030 0x00 0x10>;
+		phandle = <0x19c>;
+	};
+
+	serial@fe6c0000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xde>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x7c 0x04>;
+		clocks = <0x1f 0x13b 0x1f 0x138>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfe6c0000 0x00 0x100>;
+		phandle = <0x197>;
+		dmas = <0x40 0x10 0x40 0x11>;
+		reg-shift = <0x02>;
+	};
+
+	sata@fc800000 {
+		power-domains = <0x21 0x0f>;
+		phy-names = "sata-phy";
+		clock-names = "sata\0pmalive\0rxoob";
+		interrupts = <0x00 0x60 0x04>;
+		clocks = <0x1f 0xa0 0x1f 0xa1 0x1f 0xa2>;
+		compatible = "snps,dwc-ahci";
+		status = "disabled";
+		interrupt-names = "hostc";
+		phys = <0x22 0x01>;
+		reg = <0x00 0xfc800000 0x00 0x1000>;
+		phandle = <0x130>;
+		ports-implemented = <0x01>;
+	};
+
+	usb@fd8c0000 {
+		phy-names = "usb2-phy";
+		clock-names = "usbhost\0arbiter\0pclk\0utmi";
+		interrupts = <0x00 0x86 0x04>;
+		clocks = <0x1f 0xbf 0x1f 0xc0 0x1f 0xbc 0x26>;
+		compatible = "generic-ohci";
+		status = "disabled";
+		phys = <0x28>;
+		reg = <0x00 0xfd8c0000 0x00 0x40000>;
+		phandle = <0x138>;
+	};
+
+	qos@fe158100 {
+		compatible = "syscon";
+		reg = <0x00 0xfe158100 0x00 0x20>;
+		phandle = <0x4f>;
+	};
+
+	testcase-data-2 {
+		#address-cells = <0x01>;
+		#size-cells = <0x01>;
+
+		fairway-1 {
+			#address-cells = <0x01>;
+			#size-cells = <0x01>;
+			compatible = "ot,rides";
+			status = "okay";
+			orientation = <0x7f>;
+			phandle = <0x2c6>;
+
+			ride@200 {
+				#address-cells = <0x01>;
+				hvac-zone-names = "operator\0snack-bar";
+				gondola-capacity = <0x06>;
+				hvac-zones = <0x0c 0x05>;
+				#size-cells = <0x01>;
+				spin-controller = <0x2c5 0x03>;
+				compatible = "ot,ferris-wheel";
+				reg = <0x200 0x100>;
+				hvac-thermostat = <0x1b 0x20>;
+				hvac-provider = <0x2cb>;
+				phandle = <0x2cc>;
+				spin-rph = <0x1e>;
+				gondolas = <0x10>;
+
+				track@20 {
+					reg = <0x20 0x10>;
+					phandle = <0x2ce>;
+				};
+
+				track@10 {
+					reg = <0x10 0x10>;
+					phandle = <0x2cd>;
+				};
+			};
+
+			ride@100 {
+				#address-cells = <0x01>;
+				spin-controller-names = "track_1\0track_2";
+				hvac-zone-names = "operator";
+				hvac-zones = <0x0e>;
+				#size-cells = <0x01>;
+				spin-controller = <0x2c3 0x05 0x2c3 0x07>;
+				queues = <0x02>;
+				compatible = "ot,roller-coaster";
+				reg = <0x100 0x100>;
+				hvac-thermostat = <0x1d>;
+				hvac-provider = <0x2c2>;
+
+				track@40 {
+					reg = <0x40 0x10>;
+					incline-up = <0x2f 0x1f 0x0f>;
+				};
+
+				track@30 {
+					reg = <0x30 0x10>;
+					incline-up = <0x30 0x20 0x10>;
+				};
+			};
+		};
+
+		vending@50000 {
+			compatible = "ot,tickets";
+			status = "disabled";
+			reg = <0x50000 0x1000>;
+			phandle = <0x2c9>;
+		};
+
+		substation@100 {
+			compatible = "ot,big-volts-control";
+			status = "okay";
+			reg = <0x100 0x100>;
+			phandle = <0x2c4>;
+
+			motor-1 {
+				spin = "clockwise";
+				compatible = "ot,ferris-wheel-motor";
+				phandle = <0x2c5>;
+			};
+
+			motor-8 {
+				compatible = "ot,roller-coaster-motor";
+				phandle = <0x2c3>;
+			};
+
+			hvac-medium-1 {
+				compatible = "ot,hvac-medium";
+				heat-range = <0x32 0x4b>;
+				phandle = <0x2c2>;
+				cool-range = <0x3c 0x50>;
+			};
+
+			hvac-large-1 {
+				compatible = "ot,hvac-large";
+				heat-range = <0x28 0x4b>;
+				phandle = <0x2cb>;
+				cool-range = <0x41 0x50>;
+			};
+		};
+
+		lights@30000 {
+			compatible = "ot,work-lights";
+			status = "disabled";
+			reg = <0x30000 0x1000>;
+			phandle = <0x2c7>;
+		};
+
+		lights@40000 {
+			color = "purple\0white\0red\0green";
+			rate = <0x03 0x100>;
+			compatible = "ot,show-lights";
+			status = "okay";
+			reg = <0x40000 0x1000>;
+			phandle = <0x2c8>;
+		};
+	};
+
+	pvtm@fde00000 {
+		#address-cells = <0x01>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3568-core-pvtm";
+		reg = <0x00 0xfde00000 0x00 0x100>;
+
+		pvtm@0 {
+			clock-names = "clk\0pclk";
+			thermal-zone = "soc-thermal";
+			resets = <0x1f 0x1a 0x1f 0x19>;
+			clocks = <0x1f 0x13 0x1f 0x1c2>;
+			reg = <0x00>;
+			reset-names = "rts\0rst-p";
+		};
+	};
+
+	pwm@fe6e0020 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe2>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x15a 0x1f 0x159>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe6e0020 0x00 0x10>;
+		phandle = <0x19b>;
+	};
+
+	cpuinfo {
+		nvmem-cells = <0x0d 0x0e 0x0f>;
+		compatible = "rockchip,cpuinfo";
+		nvmem-cell-names = "id\0cpu-version\0cpu-code";
+	};
+
+	qos@fe150000 {
+		compatible = "syscon";
+		reg = <0x00 0xfe150000 0x00 0x20>;
+		phandle = <0x54>;
+	};
+
+	lpddr3-params {
+		dram_dq_drv_odten = <0x22>;
+		reserved = <0x00>;
+		phy_dll_dis_freq = <0x00>;
+		pd_dis_freq = <0x42a>;
+		phy_clk_drv_odtoff = <0x27>;
+		phy_odt_puup_en = <0x01>;
+		dram_odt = <0x78>;
+		standby_idle = <0x00>;
+		dq_map_cs0_dq_l = <0x00>;
+		dram_dq_drv_odtoff = <0x22>;
+		phy_dq_sr_odten = <0x0f>;
+		speed_bin = <0x00>;
+		dq_map_cs1_dq_h = <0x00>;
+		freq_4 = <0x00>;
+		sr_dis_freq = <0x320>;
+		dram_dq_odt_en_freq = <0x14d>;
+		phy_clk_sr_odtoff = <0x0f>;
+		freq_2 = <0x210>;
+		phy_clk_drv_odten = <0x27>;
+		phy_dq_drv_odtoff = <0x25>;
+		dq_map_cs0_dq_h = <0x00>;
+		phy_ca_sr_odten = <0x01>;
+		sr_idle = <0x5d>;
+		ssmod_div = <0x00>;
+		freq_0 = <0x420>;
+		phy_clk_sr_odten = <0x0f>;
+		phy_odt = <0x94>;
+		phy_dq_sr_odtoff = <0x0f>;
+		phy_dq_drv_odten = <0x25>;
+		phy_odt_en_freq = <0x14d>;
+		sr_mc_gate_idle = <0x00>;
+		pd_idle = <0x0d>;
+		dram_dll_dis_freq = <0x00>;
+		ssmod_downspread = <0x00>;
+		phy_odt_pudn_en = <0x01>;
+		freq_5 = <0x00>;
+		ssmod_spread = <0x00>;
+		freq_3 = <0x30c>;
+		phandle = <0x110>;
+		expanded_version = <0x00>;
+		phy_ca_drv_odtoff = <0x25>;
+		version = <0x100>;
+		dram_ext_temp = <0x00>;
+		phy_ca_sr_odtoff = <0x01>;
+		freq_1 = <0x144>;
+		phy_ca_drv_odten = <0x25>;
+		mode_2t = <0x00>;
+		srpd_lite_idle = <0x00>;
+		byte_map = <0x8d>;
+		dq_map_cs1_dq_l = <0x00>;
+	};
+
+	aliases {
+		i2c3 = "/i2c@fe5c0000";
+		spi2 = "/spi@fe630000";
+		gpio0 = "/pinctrl/gpio@fdd60000";
+		dsi1 = "/dsi@fe070000";
+		serial7 = "/serial@fe6b0000";
+		i2c1 = "/i2c@fe5a0000";
+		mmc3 = "/dwmmc@fe000000";
+		testcase-alias = "/testcase-data";
+		spi0 = "/spi@fe610000";
+		serial5 = "/serial@fe690000";
+		mmc1 = "/dwmmc@fe2b0000";
+		serial3 = "/serial@fe670000";
+		csi2dphy1 = "/csi2-dphy1";
+		serial1 = "/serial@fe650000";
+		gpio3 = "/pinctrl/gpio@fe760000";
+		i2c4 = "/i2c@fe5d0000";
+		ethernet1 = "/ethernet@fe010000";
+		spi3 = "/spi@fe640000";
+		gpio1 = "/pinctrl/gpio@fe740000";
+		serial8 = "/serial@fe6c0000";
+		i2c2 = "/i2c@fe5b0000";
+		spi1 = "/spi@fe620000";
+		dsi0 = "/dsi@fe060000";
+		serial6 = "/serial@fe6a0000";
+		i2c0 = "/i2c@fdd40000";
+		mmc2 = "/dwmmc@fe2c0000";
+		serial4 = "/serial@fe680000";
+		mmc0 = "/sdhci@fe310000";
+		csi2dphy2 = "/csi2-dphy2";
+		serial2 = "/serial@fe660000";
+		gpio4 = "/pinctrl/gpio@fe770000";
+		i2c5 = "/i2c@fe5e0000";
+		csi2dphy0 = "/csi2-dphy0";
+		serial0 = "/serial@fdd50000";
+		gpio2 = "/pinctrl/gpio@fe750000";
+		serial9 = "/serial@fe6d0000";
+	};
+
+	pwm@fe6e0010 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe1>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x15a 0x1f 0x159>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe6e0010 0x00 0x10>;
+		phandle = <0x19a>;
+	};
+
+	qos@fe148000 {
+		compatible = "syscon";
+		reg = <0x00 0xfe148000 0x00 0x20>;
+		phandle = <0x48>;
+	};
+
+	nandc@fe330000 {
+		clock-names = "clk_nandc\0hclk_nandc";
+		nandc_id = <0x00>;
+		interrupts = <0x00 0x46 0x04>;
+		clocks = <0x1f 0x75 0x1f 0x74>;
+		compatible = "rockchip,rk-nandc-v9";
+		status = "disabled";
+		reg = <0x00 0xfe330000 0x00 0x4000>;
+		phandle = <0x174>;
+	};
+
+	firmware {
+
+		optee {
+			method = "smc";
+			compatible = "linaro,optee-tz";
+			phandle = <0x11a>;
+		};
+
+		sdei {
+			method = "smc";
+			compatible = "arm,sdei-1.0";
+			phandle = <0x11c>;
+		};
+
+		scmi {
+			shmem = <0x1a>;
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+			compatible = "arm,scmi-smc";
+			phandle = <0x11b>;
+			arm,smc-id = <0x82000010>;
+
+			protocol@14 {
+				#clock-cells = <0x01>;
+				reg = <0x14>;
+				rockchip,clk-init = "Tfr";
+				phandle = <0x02>;
+			};
+		};
+	};
+
+	serial@fe650000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xd6 0xd7>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x75 0x04>;
+		clocks = <0x1f 0x11f 0x1f 0x11c>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "okay";
+		reg = <0x00 0xfe650000 0x00 0x100>;
+		phandle = <0x190>;
+		dmas = <0x40 0x02 0x40 0x03>;
+		reg-shift = <0x02>;
+	};
+
+	rk809-sound {
+		simple-audio-card,name = "rockchip,rk809-codec";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,widgets = "Microphone\0Mic Jack\0Headphone\0Headphone Jack";
+		simple-audio-card,routing = "MIC_IN\0Mic Jack\0Headphone Jack\0HPOL\0Headphone Jack\0HPOR";
+		compatible = "simple-audio-card";
+		status = "okay";
+		phandle = <0x29f>;
+		simple-audio-card,mclk-fs = <0x100>;
+
+		simple-audio-card,cpu {
+			sound-dai = <0x104>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <0x105>;
+		};
+	};
+
+	qos@fe190000 {
+		compatible = "syscon";
+		reg = <0x00 0xfe190000 0x00 0x20>;
+		phandle = <0x59>;
+	};
+
+	debug@fd904000 {
+		compatible = "rockchip,debug";
+		reg = <0x00 0xfd904000 0x00 0x1000 0x00 0xfd905000 0x00 0x1000 0x00 0xfd906000 0x00 0x1000 0x00 0xfd907000 0x00 0x1000>;
+		phandle = <0x29d>;
+	};
+
+	ebc@fdec0000 {
+		power-domains = <0x21 0x0a>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0x69>;
+		clock-names = "hclk\0dclk";
+		interrupts = <0x00 0x11 0x04>;
+		clocks = <0x1f 0xf9 0x1f 0xfa>;
+		compatible = "rockchip,rk3568-ebc-tcon";
+		status = "disabled";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfdec0000 0x00 0x5000>;
+		phandle = <0x155>;
+	};
+
+	pwm@fe6e0000 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe0>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x15a 0x1f 0x159>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe6e0000 0x00 0x10>;
+		phandle = <0x199>;
+	};
+
+	iommu@fdfe0800 {
+		power-domains = <0x21 0x08>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x92 0x04>;
+		clocks = <0x1f 0xce 0x1f 0xcf>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		rockchip,disable-mmu-reset;
+		status = "okay";
+		interrupt-names = "cif_mmu";
+		reg = <0x00 0xfdfe0800 0x00 0x100>;
+		phandle = <0x71>;
+	};
+
+	mpll {
+		clock-output-names = "mpll";
+		#clock-cells = <0x00>;
+		clock-frequency = <0x2faf0800>;
+		compatible = "fixed-clock";
+		phandle = <0x12c>;
+	};
+
+	usbdrd {
+		#address-cells = <0x02>;
+		clock-names = "ref_clk\0suspend_clk\0bus_clk\0pipe_clk";
+		clocks = <0x1f 0xa6 0x1f 0xa7 0x1f 0xa5 0x1f 0x7f>;
+		#size-cells = <0x02>;
+		compatible = "rockchip,rk3568-dwc3\0rockchip,rk3399-dwc3";
+		ranges;
+		status = "okay";
+		phandle = <0x131>;
+
+		dwc3@fcc00000 {
+			power-domains = <0x21 0x0f>;
+			snps,dis_enblslpm_quirk;
+			phy-names = "usb2-phy";
+			snps,dis-u2-freeclk-exists-quirk;
+			phy_type = "utmi_wide";
+			snps,dis_u2_susphy_quirk;
+			resets = <0x1f 0x94>;
+			interrupts = <0x00 0xa9 0x04>;
+			extcon = <0x24>;
+			snps,usb2-lpm-disable;
+			compatible = "snps,dwc3";
+			snps,dis-del-phy-power-chg-quirk;
+			status = "okay";
+			snps,xhci-trb-ent-quirk;
+			phys = <0x23>;
+			reg = <0x00 0xfcc00000 0x00 0x400000>;
+			phandle = <0x132>;
+			dr_mode = "otg";
+			maximum-speed = "high-speed";
+			reset-names = "usb3-otg";
+			snps,dis-tx-ipgap-linecheck-quirk;
+		};
+	};
+
+	pvtm@fde80000 {
+		#address-cells = <0x01>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3568-gpu-pvtm";
+		reg = <0x00 0xfde80000 0x00 0x100>;
+
+		pvtm@1 {
+			clock-names = "clk\0pclk";
+			thermal-zone = "gpu-thermal";
+			resets = <0x1f 0x24 0x1f 0x23>;
+			clocks = <0x1f 0x1e 0x1f 0x1d>;
+			reg = <0x01>;
+			reset-names = "rts\0rst-p";
+		};
+	};
+
+	lpddr4-params {
+		dram_dq_drv_odten = <0x28>;
+		reserved = <0x00>;
+		phy_dll_dis_freq = <0x00>;
+		pd_dis_freq = <0x42a>;
+		phy_clk_drv_odtoff = <0x26>;
+		phy_odt_puup_en = <0x00>;
+		dram_odt = <0x50>;
+		standby_idle = <0x00>;
+		dq_map_cs0_dq_l = <0x00>;
+		dram_dq_drv_odtoff = <0x28>;
+		phy_dq_sr_odten = <0x00>;
+		lp4_ca_odt_en_freq = <0x320>;
+		speed_bin = <0x00>;
+		dq_map_cs1_dq_h = <0x00>;
+		freq_4 = <0x00>;
+		sr_dis_freq = <0x320>;
+		dram_dq_odt_en_freq = <0x320>;
+		phy_clk_sr_odtoff = <0x0f>;
+		phy_lp4_cs_drv_odten = <0x00>;
+		freq_2 = <0x210>;
+		phy_clk_drv_odten = <0x26>;
+		phy_dq_drv_odtoff = <0x1e>;
+		dq_map_cs0_dq_h = <0x00>;
+		phy_lp4_drv_pulldown_en_odten = <0x00>;
+		lp4_drv_pu_cal_odten = <0x01>;
+		phy_ca_sr_odten = <0x0f>;
+		sr_idle = <0x5d>;
+		phy_lp4_drv_pulldown_en_odtoff = <0x00>;
+		ssmod_div = <0x00>;
+		freq_0 = <0x420>;
+		phy_clk_sr_odten = <0x0f>;
+		phy_odt = <0x3c>;
+		phy_dq_sr_odtoff = <0x00>;
+		lp4_dq_vref_odten = <0x12c>;
+		lp4_ca_odt = <0x78>;
+		phy_dq_drv_odten = <0x1e>;
+		phy_lp4_dq_vref_odten = <0xa6>;
+		phy_odt_en_freq = <0x320>;
+		sr_mc_gate_idle = <0x00>;
+		pd_idle = <0x0d>;
+		lp4_dq_vref_odtoff = <0x1a4>;
+		dram_dll_dis_freq = <0x00>;
+		ssmod_downspread = <0x00>;
+		phy_odt_pudn_en = <0x00>;
+		freq_5 = <0x00>;
+		ssmod_spread = <0x00>;
+		phy_lp4_dq_vref_odtoff = <0x1a4>;
+		phy_lp4_cs_drv_odtoff = <0x00>;
+		lp4_ca_vref_odtoff = <0x1a4>;
+		freq_3 = <0x30c>;
+		lp4_drv_pu_cal_odtoff = <0x01>;
+		phandle = <0x111>;
+		expanded_version = <0x00>;
+		phy_ca_drv_odtoff = <0x26>;
+		lp4_odte_ck_en = <0x01>;
+		lp4_odte_cs_en = <0x01>;
+		version = <0x100>;
+		dram_ext_temp = <0x00>;
+		phy_ca_sr_odtoff = <0x0f>;
+		freq_1 = <0x144>;
+		lp4_ca_vref_odten = <0x17c>;
+		phy_ca_drv_odten = <0x26>;
+		lp4_odtd_ca_en = <0x00>;
+		mode_2t = <0x00>;
+		srpd_lite_idle = <0x00>;
+		byte_map = <0xe4>;
+		dq_map_cs1_dq_l = <0x00>;
+	};
+
+	pwm@fe700030 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xeb>;
+		clock-names = "pwm\0pclk";
+		interrupts = <0x00 0x55 0x04 0x00 0x59 0x04>;
+		clocks = <0x1f 0x160 0x1f 0x15f>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe700030 0x00 0x10>;
+		phandle = <0x1a4>;
+	};
+
+	serial@fe690000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xdb>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x79 0x04>;
+		clocks = <0x1f 0x12f 0x1f 0x12c>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfe690000 0x00 0x100>;
+		phandle = <0x194>;
+		dmas = <0x40 0x0a 0x40 0x0b>;
+		reg-shift = <0x02>;
+	};
+
+	can@fe570000 {
+		clock-names = "baudclk\0apb_pclk";
+		resets = <0x1f 0x155 0x1f 0x154>;
+		interrupts = <0x00 0x01 0x04>;
+		clocks = <0x1f 0x141 0x1f 0x140>;
+		compatible = "rockchip,canfd-1.0";
+		status = "disabled";
+		tx-fifo-depth = <0x01>;
+		rx-fifo-depth = <0x06>;
+		reg = <0x00 0xfe570000 0x00 0x1000>;
+		phandle = <0x180>;
+		reset-names = "can\0can-apb";
+	};
+
+	pcie@fe260000 {
+		power-domains = <0x21 0x0f>;
+		vpcie3v3-supply = <0x3d>;
+		#address-cells = <0x03>;
+		phy-names = "pcie-phy";
+		bus-range = <0x00 0x0f>;
+		clock-names = "aclk_mst\0aclk_slv\0aclk_dbi\0pclk\0aux";
+		reg-names = "pcie-dbi\0pcie-apb";
+		num-ob-windows = <0x02>;
+		resets = <0x1f 0xa1>;
+		interrupts = <0x00 0x4b 0x04 0x00 0x4a 0x04 0x00 0x49 0x04 0x00 0x48 0x04 0x00 0x47 0x04>;
+		clocks = <0x1f 0x81 0x1f 0x82 0x1f 0x83 0x1f 0x84 0x1f 0x85>;
+		interrupt-map = <0x00 0x00 0x00 0x01 0x9a 0x00 0x00 0x00 0x00 0x02 0x9a 0x01 0x00 0x00 0x00 0x03 0x9a 0x02 0x00 0x00 0x00 0x04 0x9a 0x03>;
+		#size-cells = <0x02>;
+		max-link-speed = <0x02>;
+		device_type = "pci";
+		interrupt-map-mask = <0x00 0x00 0x00 0x07>;
+		reset-gpios = <0x9c 0x0a 0x00>;
+		num-lanes = <0x01>;
+		compatible = "rockchip,rk3568-pcie\0snps,dw-pcie";
+		ranges = <0x800 0x00 0x00 0x03 0x00 0x00 0x800000 0x81000000 0x00 0x800000 0x03 0x800000 0x00 0x100000 0x83000000 0x00 0x900000 0x03 0x900000 0x00 0x3f700000>;
+		msi-map = <0x00 0x9b 0x00 0x1000>;
+		#interrupt-cells = <0x01>;
+		status = "okay";
+		interrupt-names = "sys\0pmc\0msg\0legacy\0err";
+		phys = <0x22 0x02>;
+		reg = <0x03 0xc0000000 0x00 0x400000 0x00 0xfe260000 0x00 0x10000>;
+		linux,pci-domain = <0x00>;
+		phandle = <0x16f>;
+		reset-names = "pipe";
+		num-ib-windows = <0x06>;
+
+		legacy-interrupt-controller {
+			#address-cells = <0x00>;
+			interrupts = <0x00 0x48 0x01>;
+			interrupt-parent = <0x01>;
+			#interrupt-cells = <0x01>;
+			phandle = <0x9a>;
+			interrupt-controller;
+		};
+	};
+
+	i2c@fdd40000 {
+		pinctrl-names = "default";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0x34>;
+		clock-names = "i2c\0pclk";
+		interrupts = <0x00 0x2e 0x04>;
+		clocks = <0x31 0x07 0x31 0x2d>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3399-i2c";
+		status = "okay";
+		reg = <0x00 0xfdd40000 0x00 0x1000>;
+		phandle = <0x141>;
+
+		pmic@20 {
+			pinctrl-names = "default\0pmic-sleep\0pmic-power-off\0pmic-reset";
+			pinctrl-2 = <0x3a 0x3b>;
+			rockchip,system-power-controller;
+			clock-output-names = "rk808-clkout1\0rk808-clkout2";
+			pinctrl-0 = <0x37>;
+			wakeup-source;
+			interrupts = <0x03 0x08>;
+			#clock-cells = <0x01>;
+			interrupt-parent = <0x36>;
+			vcc1-supply = <0x3d>;
+			pmic-reset-func = <0x01>;
+			pinctrl-3 = <0x3a 0x3c>;
+			vcc2-supply = <0x3d>;
+			compatible = "rockchip,rk809";
+			vcc3-supply = <0x3d>;
+			pinctrl-1 = <0x38 0x39>;
+			vcc4-supply = <0x3d>;
+			vcc5-supply = <0x3d>;
+			reg = <0x20>;
+			phandle = <0x106>;
+			vcc6-supply = <0x3d>;
+			vcc7-supply = <0x3d>;
+			vcc8-supply = <0x3d>;
+			vcc9-supply = <0x3d>;
+
+			pinctrl_rk8xx {
+				gpio-controller;
+				phandle = <0x142>;
+				#gpio-cells = <0x02>;
+
+				rk817_slppin_pwrdn {
+					function = "pin_fun2";
+					pins = "gpio_slp";
+					phandle = <0x3b>;
+				};
+
+				rk817_slppin_rst {
+					function = "pin_fun3";
+					pins = "gpio_slp";
+					phandle = <0x3c>;
+				};
+
+				rk817_slppin_null {
+					function = "pin_fun0";
+					pins = "gpio_slp";
+					phandle = <0x143>;
+				};
+
+				rk817_slppin_slp {
+					function = "pin_fun1";
+					pins = "gpio_slp";
+					phandle = <0x39>;
+				};
+			};
+
+			pwrkey {
+				status = "okay";
+			};
+
+			regulators {
+
+				DCDC_REG4 {
+					regulator-max-microvolt = <0x149970>;
+					regulator-boot-on;
+					regulator-init-microvolt = <0xdbba0>;
+					regulator-always-on;
+					regulator-min-microvolt = <0x7a120>;
+					regulator-name = "vdd_npu";
+					regulator-ramp-delay = <0x1771>;
+					regulator-initial-mode = <0x02>;
+					phandle = <0x145>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				LDO_REG4 {
+					regulator-max-microvolt = <0x325aa0>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0x325aa0>;
+					regulator-name = "vccio_acodec";
+					phandle = <0x2a>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				DCDC_REG2 {
+					regulator-max-microvolt = <0x149970>;
+					regulator-boot-on;
+					regulator-init-microvolt = <0xdbba0>;
+					regulator-always-on;
+					regulator-min-microvolt = <0x7a120>;
+					regulator-name = "vdd_gpu";
+					regulator-ramp-delay = <0x1771>;
+					regulator-initial-mode = <0x02>;
+					phandle = <0x61>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				LDO_REG2 {
+					regulator-max-microvolt = <0xdbba0>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0xdbba0>;
+					regulator-name = "vdda_0v9";
+					phandle = <0x147>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				LDO_REG9 {
+					regulator-max-microvolt = <0x325aa0>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0x325aa0>;
+					regulator-name = "VCC_GPIO0_17";
+					phandle = <0x14a>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				SWITCH_REG1 {
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-name = "vcc_3v3";
+					phandle = <0x2d>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				LDO_REG7 {
+					regulator-max-microvolt = <0x1b7740>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0x1b7740>;
+					regulator-name = "vcca_1v8";
+					phandle = <0xee>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				DCDC_REG5 {
+					regulator-max-microvolt = <0x1b7740>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0x1b7740>;
+					regulator-name = "vcc_1v8";
+					phandle = <0x2c>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				LDO_REG5 {
+					regulator-max-microvolt = <0x325aa0>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0x1b7740>;
+					regulator-name = "vccio_sd";
+					phandle = <0x2b>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				DCDC_REG3 {
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-name = "vcc_ddr";
+					regulator-initial-mode = <0x02>;
+					phandle = <0x144>;
+
+					regulator-state-mem {
+						regulator-on-in-suspend;
+					};
+				};
+
+				LDO_REG3 {
+					regulator-max-microvolt = <0xdbba0>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0xdbba0>;
+					regulator-name = "vdda0v9_pmu";
+					phandle = <0x148>;
+
+					regulator-state-mem {
+						regulator-suspend-microvolt = <0xdbba0>;
+						regulator-on-in-suspend;
+					};
+				};
+
+				DCDC_REG1 {
+					regulator-max-microvolt = <0x149970>;
+					regulator-boot-on;
+					regulator-init-microvolt = <0xdbba0>;
+					regulator-always-on;
+					regulator-min-microvolt = <0x7a120>;
+					regulator-name = "vdd_logic";
+					regulator-ramp-delay = <0x1771>;
+					regulator-initial-mode = <0x02>;
+					phandle = <0x64>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				LDO_REG1 {
+					regulator-max-microvolt = <0xdbba0>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0xdbba0>;
+					regulator-name = "vdda0v9_image";
+					phandle = <0x146>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				SWITCH_REG2 {
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-name = "vcc3v3_sd";
+					phandle = <0x9d>;
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				LDO_REG8 {
+					regulator-max-microvolt = <0x1b7740>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0x1b7740>;
+					regulator-name = "vcca1v8_pmu";
+					phandle = <0x149>;
+
+					regulator-state-mem {
+						regulator-suspend-microvolt = <0x1b7740>;
+						regulator-on-in-suspend;
+					};
+				};
+
+				LDO_REG6 {
+					regulator-max-microvolt = <0x325aa0>;
+					regulator-boot-on;
+					regulator-always-on;
+					regulator-min-microvolt = <0x325aa0>;
+					regulator-name = "vcc3v3_pmu";
+					phandle = <0x29>;
+
+					regulator-state-mem {
+						regulator-suspend-microvolt = <0x325aa0>;
+						regulator-on-in-suspend;
+					};
+				};
+			};
+
+			codec {
+				pinctrl-names = "default";
+				spk-volume = <0x03>;
+				pinctrl-0 = <0x3e>;
+				clock-names = "mclk";
+				assigned-clocks = <0x1f 0x48>;
+				assigned-clock-parents = <0x1f 0x196>;
+				clocks = <0x1f 0x48>;
+				#sound-dai-cells = <0x00>;
+				hp-volume = <0x14>;
+				avrman-spk-con-gpio = <0x36 0x06 0x01>;
+				compatible = "rockchip,rk809-codec\0rockchip,rk817-codec";
+				avrman-hp-det-gpio = <0x3f 0x16 0x01>;
+				status = "okay";
+				phandle = <0x105>;
+			};
+		};
+
+		tcs4525@1c {
+			regulator-max-microvolt = <0x1535b0>;
+			regulator-boot-on;
+			regulator-always-on;
+			regulator-min-microvolt = <0xadf34>;
+			regulator-name = "vdd_cpu";
+			regulator-ramp-delay = <0x8fc>;
+			fcs,suspend-voltage-selector = <0x01>;
+			compatible = "tcs,tcs452x";
+			reg = <0x1c>;
+			phandle = <0x05>;
+			vin-supply = <0x35>;
+			regulator-compatible = "fan53555-reg";
+
+			regulator-state-mem {
+				regulator-off-in-suspend;
+			};
+		};
+	};
+
+	pwm@fdd70030 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0x45>;
+		clock-names = "pwm\0pclk";
+		interrupts = <0x00 0x52 0x04 0x00 0x56 0x04>;
+		clocks = <0x31 0x0d 0x31 0x30>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfdd70030 0x00 0x10>;
+		phandle = <0x14f>;
+	};
+
+	serial@fdd50000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0x41>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x74 0x04>;
+		clocks = <0x31 0x0b 0x31 0x2c>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfdd50000 0x00 0x100>;
+		phandle = <0x14b>;
+		dmas = <0x40 0x00 0x40 0x01>;
+		reg-shift = <0x02>;
+	};
+
+	otp@fe38c000 {
+		#address-cells = <0x01>;
+		clock-names = "usr\0sbpi\0apb\0phy";
+		resets = <0x1f 0x1cf>;
+		clocks = <0x1f 0x73 0x1f 0x72 0x1f 0x71 0x1f 0x181>;
+		#size-cells = <0x01>;
+		compatible = "rockchip,rk3568-otp";
+		reg = <0x00 0xfe38c000 0x00 0x4000>;
+		phandle = <0x177>;
+		reset-names = "otp_phy";
+
+		cpu-leakage@1a {
+			reg = <0x1a 0x01>;
+			phandle = <0x06>;
+		};
+
+		core-pvtm@2a {
+			reg = <0x2a 0x02>;
+			phandle = <0x07>;
+		};
+
+		id@a {
+			reg = <0x0a 0x10>;
+			phandle = <0x0d>;
+		};
+
+		mbist-vmin@9 {
+			bits = <0x00 0x04>;
+			reg = <0x09 0x01>;
+			phandle = <0x08>;
+		};
+
+		npu-leakage@1c {
+			reg = <0x1c 0x01>;
+			phandle = <0x62>;
+		};
+
+		cpu-code@2 {
+			reg = <0x02 0x02>;
+			phandle = <0x0f>;
+		};
+
+		cpu-version@8 {
+			bits = <0x03 0x03>;
+			reg = <0x08 0x01>;
+			phandle = <0x0e>;
+		};
+
+		gpu-leakage@1d {
+			reg = <0x1d 0x01>;
+			phandle = <0x66>;
+		};
+
+		log-leakage@1b {
+			reg = <0x1b 0x01>;
+			phandle = <0x99>;
+		};
+	};
+
+	pwm@fe700020 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xea>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x160 0x1f 0x15f>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe700020 0x00 0x10>;
+		phandle = <0x1a3>;
+	};
+
+	chosen {
+		u-boot,version = "2024.04-armbian-2024.04-S830c-P0000-H264e-V155b-Ba09f-R448a";
+		linux,initrd-end = <0x00 0xece9143a>;
+		bootargs = "root=UUID=db7180e1-951c-44a8-8e47-37b50d1bd411 rootwait rootfstype=ext4 splash=verbose console=ttyS2,1500000 console=tty1 consoleblank=0 loglevel=5 ubootpart=bb1d6ebb-5bca-45ae-aa10-cd228bed5111 usb-storage.quirks=0x2537:0x1066:u,0x2537:0x1068:u   cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory";
+		linux,initrd-start = <0x00 0xebf56000>;
+		phandle = <0x29b>;
+	};
+
+	iommu@fde4b000 {
+		power-domains = <0x21 0x06>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x97 0x04>;
+		clocks = <0x1f 0x28 0x1f 0x29>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		status = "disabled";
+		interrupt-names = "rknpu_mmu";
+		reg = <0x00 0xfde4b000 0x00 0x40>;
+		phandle = <0x5f>;
+	};
+
+	rkcif@fdfe0000 {
+		power-domains = <0x21 0x08>;
+		iommus = <0x71>;
+		clock-names = "aclk_cif\0hclk_cif\0dclk_cif\0iclk_cif_g";
+		reg-names = "cif_regs";
+		assigned-clocks = <0x1f 0xd0>;
+		assigned-clock-rates = <0x11e1a300>;
+		resets = <0x1f 0xf7 0x1f 0xf8 0x1f 0xf9 0x1f 0xfb 0x1f 0xfa>;
+		interrupts = <0x00 0x92 0x04>;
+		clocks = <0x1f 0xce 0x1f 0xcf 0x1f 0xd0 0x1f 0xd1>;
+		compatible = "rockchip,rk3568-cif";
+		status = "okay";
+		rockchip,grf = <0x32>;
+		interrupt-names = "cif-intr";
+		reg = <0x00 0xfdfe0000 0x00 0x8000>;
+		phandle = <0x72>;
+		reset-names = "rst_cif_a\0rst_cif_h\0rst_cif_d\0rst_cif_p\0rst_cif_i";
+	};
+
+	spi@fe610000 {
+		pinctrl-names = "default\0high_speed";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xc6 0xc7 0xc8>;
+		clock-names = "spiclk\0apb_pclk";
+		interrupts = <0x00 0x67 0x04>;
+		clocks = <0x1f 0x152 0x1f 0x151>;
+		#size-cells = <0x00>;
+		dma-names = "tx\0rx";
+		compatible = "rockchip,rk3066-spi";
+		pinctrl-1 = <0xc6 0xc7 0xc9>;
+		status = "disabled";
+		reg = <0x00 0xfe610000 0x00 0x1000>;
+		phandle = <0x18c>;
+		dmas = <0x40 0x14 0x40 0x15>;
+	};
+
+	pwm@fdd70020 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0x44>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x31 0x0d 0x31 0x30>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfdd70020 0x00 0x10>;
+		phandle = <0x14e>;
+	};
+
+	rkvenc-opp-table {
+		rockchip,pvtm-ch = <0x00 0x05>;
+		nvmem-cells = <0x07>;
+		compatible = "operating-points-v2";
+		nvmem-cell-names = "pvtm";
+		rockchip,pvtm-voltage-sel = <0x00 0x14050 0x00 0x14051 0x16b48 0x01 0x16b49 0x186a0 0x02>;
+		phandle = <0x6e>;
+
+		opp-400000000 {
+			opp-microvolt = <0xe7ef0>;
+			opp-microvolt-L2 = <0x00>;
+			opp-hz = <0x00 0x17d78400>;
+			opp-microvolt-L0 = <0xe7ef0>;
+			opp-microvolt-L1 = <0xe1d48>;
+		};
+
+		opp-297000000 {
+			opp-microvolt = <0x00>;
+			opp-hz = <0x00 0x11b3dc40>;
+		};
+	};
+
+	dwmmc@fe2c0000 {
+		fifo-depth = <0x100>;
+		pinctrl-names = "default";
+		supports-sdio;
+		pinctrl-0 = <0xa3 0xa4 0xa5>;
+		clock-names = "biu\0ciu\0ciu-drive\0ciu-sample";
+		cap-sd-highspeed;
+		bus-width = <0x04>;
+		non-removable;
+		resets = <0x1f 0xd6>;
+		cap-sdio-irq;
+		interrupts = <0x00 0x63 0x04>;
+		clocks = <0x1f 0xb2 0x1f 0xb3 0x1f 0x18c 0x1f 0x18d>;
+		keep-power-in-suspend;
+		compatible = "rockchip,rk3568-dw-mshc\0rockchip,rk3288-dw-mshc";
+		status = "okay";
+		disable-wp;
+		mmc-pwrseq = <0xa2>;
+		reg = <0x00 0xfe2c0000 0x00 0x4000>;
+		phandle = <0x171>;
+		sd-uhs-sdr104;
+		max-frequency = <0x8f0d180>;
+		reset-names = "reset";
+	};
+
+	pwm@fe700010 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe9>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x160 0x1f 0x15f>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe700010 0x00 0x10>;
+		phandle = <0x1a2>;
+	};
+
+	i2c@fe5b0000 {
+		pinctrl-names = "default";
+		#address-cells = <0x01>;
+		pinctrl-0 = <0xbf>;
+		clock-names = "i2c\0pclk";
+		interrupts = <0x00 0x30 0x04>;
+		clocks = <0x1f 0x14a 0x1f 0x149>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3399-i2c";
+		status = "disabled";
+		reg = <0x00 0xfe5b0000 0x00 0x1000>;
+		phandle = <0x185>;
+	};
+
+	qos@fe190300 {
+		compatible = "syscon";
+		reg = <0x00 0xfe190300 0x00 0x20>;
+		phandle = <0x5b>;
+	};
+
+	pwm@fdd70010 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0x43>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x31 0x0d 0x31 0x30>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfdd70010 0x00 0x10>;
+		phandle = <0x14d>;
+	};
+
+	csi2-dphy2 {
+		rockchip,hw = <0xf2>;
+		compatible = "rockchip,rk3568-csi2-dphy";
+		status = "okay";
+		phandle = <0x1a9>;
+
+		ports {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+
+			port@0 {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x00>;
+
+				endpoint@1 {
+					data-lanes = <0x01 0x02>;
+					remote-endpoint = <0xf5>;
+					reg = <0x01>;
+					phandle = <0xc3>;
+				};
+			};
+
+			port@1 {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x01>;
+
+				endpoint@1 {
+					remote-endpoint = <0xf6>;
+					reg = <0x01>;
+					phandle = <0x78>;
+				};
+			};
+		};
+	};
+
+	pwm@fe700000 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe8>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x160 0x1f 0x15f>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe700000 0x00 0x10>;
+		phandle = <0x1a1>;
+	};
+
+	syscon@fdc50000 {
+		compatible = "rockchip,rk3568-pipegrf\0syscon";
+		reg = <0x00 0xfdc50000 0x00 0x1000>;
+		phandle = <0xef>;
+	};
+
+	fiq-debugger {
+		pinctrl-names = "default";
+		rockchip,irq-mode-enable = <0x01>;
+		rockchip,baudrate = <0x16e360>;
+		pinctrl-0 = <0xd8>;
+		interrupts = <0x00 0xfc 0x08>;
+		rockchip,wake-irq = <0x00>;
+		compatible = "rockchip,fiq-debugger";
+		status = "okay";
+		phandle = <0x29c>;
+		rockchip,serial-id = <0x02>;
+	};
+
+	rkisp-vir0 {
+		#address-cells = <0x01>;
+		rockchip,hw = <0x76>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rkisp-vir";
+		status = "disabled";
+		phandle = <0x15f>;
+
+		port {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+			reg = <0x00>;
+
+			endpoint@0 {
+				remote-endpoint = <0x77>;
+				reg = <0x00>;
+				phandle = <0xf4>;
+			};
+		};
+	};
+
+	dsi@fe070000 {
+		power-domains = <0x21 0x09>;
+		#address-cells = <0x01>;
+		phy-names = "mipi_dphy";
+		clock-names = "pclk\0hclk\0hs_clk";
+		resets = <0x1f 0x111>;
+		interrupts = <0x00 0x45 0x04>;
+		clocks = <0x1f 0xe9 0x1f 0xda 0x8f>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3568-mipi-dsi";
+		status = "disabled";
+		rockchip,grf = <0x32>;
+		phys = <0x8f>;
+		reg = <0x00 0xfe070000 0x00 0x10000>;
+		phandle = <0x169>;
+		reset-names = "apb";
+
+		ports {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+
+			port@0 {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x00>;
+				phandle = <0x16a>;
+
+				endpoint@1 {
+					remote-endpoint = <0x90>;
+					status = "disabled";
+					reg = <0x01>;
+					phandle = <0x88>;
+				};
+
+				endpoint@0 {
+					remote-endpoint = <0x15>;
+					status = "disabled";
+					reg = <0x00>;
+					phandle = <0x84>;
+				};
+			};
+		};
+	};
+
+	clock-controller@fdd20000 {
+		#reset-cells = <0x01>;
+		assigned-clocks = <0x31 0x05 0x1f 0x106 0x1f 0x10b 0x31 0x01 0x31 0x2b 0x1f 0x03 0x1f 0x19b 0x1f 0x09 0x1f 0x19c 0x1f 0x19d 0x1f 0x1a1 0x1f 0x19e 0x1f 0x19f 0x1f 0x1a0 0x1f 0x04 0x1f 0x10d 0x1f 0x10e 0x1f 0x173 0x1f 0x174 0x1f 0x175 0x1f 0x176 0x1f 0xc9 0x1f 0xca 0x1f 0x06 0x1f 0x7e 0x1f 0x7f 0x1f 0x3d 0x1f 0x41 0x1f 0x45 0x1f 0x49 0x1f 0x4d 0x1f 0x4d 0x1f 0x55 0x1f 0x51 0x1f 0x5d 0x1f 0xdd>;
+		assigned-clock-parents = <0x31 0x08 0x1f 0x04 0x1f 0x04>;
+		assigned-clock-rates = <0x8000 0x11e1a300 0x11e1a300 0xbebc200 0x5f5e100 0x3b9aca00 0x1dcd6500 0x13d92d40 0xee6b280 0x7735940 0x5f5e100 0x3b9aca0 0x2faf080 0x17d7840 0x46cf7100 0x8f0d180 0x5f5e100 0x1dcd6500 0x17d78400 0x8f0d180 0x5f5e100 0x11e1a300 0x8f0d180 0x47868c00 0x17d78400 0x5f5e100 0x46cf7100 0x46cf7100 0x46cf7100 0x46cf7100 0x46cf7100 0x46cf7100 0x46cf7100 0x46cf7100 0x46cf7100 0x1dcd6500>;
+		#clock-cells = <0x01>;
+		compatible = "rockchip,rk3568-cru";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfdd20000 0x00 0x1000>;
+		phandle = <0x1f>;
+	};
+
+	pwm@fdd70000 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0x42>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x31 0x0d 0x31 0x30>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfdd70000 0x00 0x10>;
+		phandle = <0x14c>;
+	};
+
+	iommu@fdea0800 {
+		power-domains = <0x21 0x0b>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x8a 0x04>;
+		clocks = <0x1f 0xee 0x1f 0xef>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		status = "okay";
+		interrupt-names = "vdpu_mmu";
+		reg = <0x00 0xfdea0800 0x00 0x40>;
+		phandle = <0x67>;
+	};
+
+	syscon@fda00000 {
+		compatible = "rockchip,rk3568-xpcs\0syscon";
+		status = "disabled";
+		reg = <0x00 0xfda00000 0x00 0x200000>;
+		phandle = <0x139>;
+	};
+
+	syscon@fdc90000 {
+		compatible = "rockchip,pipe-phy-grf\0syscon";
+		reg = <0x00 0xfdc90000 0x00 0x1000>;
+		phandle = <0xf1>;
+	};
+
+	bus-npu {
+		clock-names = "bus";
+		rockchip,busfreq-policy = "clkfreq";
+		clocks = <0x02 0x02>;
+		compatible = "rockchip,rk3568-bus";
+		status = "disabled";
+		bus-supply = <0x64>;
+		phandle = <0x152>;
+		operating-points-v2 = <0x63>;
+		pvtm-supply = <0x05>;
+	};
+
+	i2s1-mclkin-tx {
+		clock-output-names = "i2s1_mclkin_tx";
+		#clock-cells = <0x00>;
+		clock-frequency = <0xbb8000>;
+		compatible = "fixed-clock";
+		phandle = <0x129>;
+	};
+
+	dwmmc@fe000000 {
+		fifo-depth = <0x100>;
+		clock-names = "biu\0ciu\0ciu-drive\0ciu-sample";
+		resets = <0x1f 0xeb>;
+		interrupts = <0x00 0x64 0x04>;
+		clocks = <0x1f 0xc1 0x1f 0xc2 0x1f 0x18e 0x1f 0x18f>;
+		compatible = "rockchip,rk3568-dw-mshc\0rockchip,rk3288-dw-mshc";
+		status = "disabled";
+		reg = <0x00 0xfe000000 0x00 0x4000>;
+		phandle = <0x16e>;
+		max-frequency = <0x8f0d180>;
+		reset-names = "reset";
+	};
+
+	i2s@fe420000 {
+		pinctrl-names = "default";
+		rockchip,cru = <0x1f>;
+		pinctrl-0 = <0xab 0xac 0xad 0xae>;
+		clock-names = "mclk_tx\0mclk_rx\0hclk";
+		interrupts = <0x00 0x36 0x04>;
+		clocks = <0x1f 0x4f 0x1f 0x4f 0x1f 0x3b>;
+		dma-names = "tx\0rx";
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-i2s-tdm";
+		status = "disabled";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe420000 0x00 0x1000>;
+		phandle = <0x178>;
+		dmas = <0xa6 0x04 0xa6 0x05>;
+		rockchip,clk-trcm = <0x01>;
+	};
+
+	dmac@fe550000 {
+		clock-names = "apb_pclk";
+		interrupts = <0x00 0x10 0x04 0x00 0x0f 0x04>;
+		clocks = <0x1f 0x10d>;
+		arm,pl330-periph-burst;
+		compatible = "arm,pl330\0arm,primecell";
+		reg = <0x00 0xfe550000 0x00 0x4000>;
+		phandle = <0xa6>;
+		#dma-cells = <0x01>;
+	};
+
+	qos@fe190280 {
+		compatible = "syscon";
+		reg = <0x00 0xfe190280 0x00 0x20>;
+		phandle = <0x5a>;
+	};
+
+	iommu@fdee0800 {
+		power-domains = <0x21 0x0a>;
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x3f 0x04>;
+		clocks = <0x1f 0xfd 0x1f 0xfe>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		status = "okay";
+		interrupt-names = "vepu_mmu";
+		reg = <0x00 0xfdee0800 0x00 0x40>;
+		phandle = <0x6b>;
+	};
+
+	cpus {
+		#address-cells = <0x02>;
+		#size-cells = <0x00>;
+
+		cpu@300 {
+			clocks = <0x02 0x00>;
+			cpu-idle-states = <0x04>;
+			device_type = "cpu";
+			compatible = "arm,cortex-a55";
+			reg = <0x00 0x300>;
+			enable-method = "psci";
+			phandle = <0x0c>;
+			operating-points-v2 = <0x03>;
+		};
+
+		idle-states {
+			entry-method = "psci";
+
+			cpu-sleep {
+				entry-latency-us = <0x64>;
+				local-timer-stop;
+				exit-latency-us = <0x78>;
+				arm,psci-suspend-param = <0x10000>;
+				compatible = "arm,idle-state";
+				phandle = <0x04>;
+				min-residency-us = <0x3e8>;
+			};
+		};
+
+		cpu@200 {
+			clocks = <0x02 0x00>;
+			cpu-idle-states = <0x04>;
+			device_type = "cpu";
+			compatible = "arm,cortex-a55";
+			reg = <0x00 0x200>;
+			enable-method = "psci";
+			phandle = <0x0b>;
+			operating-points-v2 = <0x03>;
+		};
+
+		cpu@0 {
+			cpu-supply = <0x05>;
+			clocks = <0x02 0x00>;
+			cpu-idle-states = <0x04>;
+			device_type = "cpu";
+			compatible = "arm,cortex-a55";
+			dynamic-power-coefficient = <0xbb>;
+			reg = <0x00 0x00>;
+			enable-method = "psci";
+			phandle = <0x09>;
+			operating-points-v2 = <0x03>;
+			#cooling-cells = <0x02>;
+
+			power-model {
+				thermal-zone = "soc-thermal";
+				ls = <0xffffdc14 0x18d8 0x00>;
+				compatible = "simple-power-model";
+				ts = <0x1476e 0x3263d 0xffffef34 0x47>;
+				static-coefficient = <0x186a0>;
+				leakage-range = <0x0a 0x28>;
+			};
+		};
+
+		cpu@100 {
+			clocks = <0x02 0x00>;
+			cpu-idle-states = <0x04>;
+			device_type = "cpu";
+			compatible = "arm,cortex-a55";
+			reg = <0x00 0x100>;
+			enable-method = "psci";
+			phandle = <0x0a>;
+			operating-points-v2 = <0x03>;
+		};
+	};
+
+	__symbols__ {
+		cam_clkout1 = "/pinctrl/cam/cam-clkout1";
+		unittest0 = "/testcase-data/overlay-node/test-bus/test-unittest0";
+		i2c3 = "/i2c@fe5c0000";
+		scmi_shmem = "/scmi-shmem@10f000";
+		i2s1m1_sdi1 = "/pinctrl/i2s1/i2s1m1-sdi1";
+		vp1_out_dsi0 = "/vop@fe040000/ports/port@1/endpoint@0";
+		pmic_pins = "/pinctrl/pmic/pmic-pins";
+		pdmm0_sdi3 = "/pinctrl/pdm/pdmm0-sdi3";
+		usb_host1_ohci = "/usb@fd8c0000";
+		pwm9 = "/pwm@fe6f0010";
+		qos_usb3_1 = "/qos@fe190400";
+		gmac0_rgmii_bus = "/pinctrl/gmac0/gmac0-rgmii-bus";
+		pcie30x2m2_pins = "/pinctrl/pcie30x2/pcie30x2m2-pins";
+		i2s2m1_mclk = "/pinctrl/i2s2/i2s2m1-mclk";
+		gmac1m1_rx_er = "/pinctrl/gmac1/gmac1m1-rx-er";
+		vccio_acodec = "/i2c@fdd40000/pmic@20/regulators/LDO_REG4";
+		pdmm2_clk1 = "/pinctrl/pdm/pdmm2-clk1";
+		pwm14 = "/pwm@fe700020";
+		lvds = "/syscon@fdc60000/lvds";
+		video_phy1 = "/video-phy@fe860000";
+		can2m1_pins = "/pinctrl/can2/can2m1-pins";
+		sdmmc2m1_cmd = "/pinctrl/sdmmc2/sdmmc2m1-cmd";
+		optee = "/firmware/optee";
+		gmac1m0_rgmii_clk_level2 = "/pinctrl/gmac-txc-level2/gmac1m0-rgmii-clk-level2";
+		i2s2m1_lrcktx = "/pinctrl/i2s2/i2s2m1-lrcktx";
+		bt656m1_pins = "/pinctrl/bt656/bt656m1-pins";
+		pwm0m1_pins = "/pinctrl/pwm0/pwm0m1-pins";
+		vdpu = "/vdpu@fdea0400";
+		thermal_zones = "/thermal-zones";
+		uart9m0_rtsn = "/pinctrl/uart9/uart9m0-rtsn";
+		i2s2m0_lrckrx = "/pinctrl/i2s2/i2s2m0-lrckrx";
+		bus_npu = "/bus-npu";
+		provider4 = "/testcase-data/phandle-tests/provider4";
+		qos_gpu = "/qos@fe128000";
+		qos_iep = "/qos@fe158100";
+		pcfg_pull_none_drv_level_3 = "/pinctrl/pcfg-pull-none-drv-level-3";
+		vp1 = "/vop@fe040000/ports/port@1";
+		uart1m1_xfer = "/pinctrl/uart1/uart1m1-xfer";
+		i2s1m2_sclkrx = "/pinctrl/i2s1/i2s1m2-sclkrx";
+		uart8 = "/serial@fe6c0000";
+		qos_vop_m1 = "/qos@fe1a8100";
+		edp_in_vp1 = "/edp@fe0c0000/ports/port@0/endpoint@1";
+		ride_200_right = "/testcase-data-2/fairway-1/ride@200/track@20";
+		i2s3m0_lrck = "/pinctrl/i2s3/i2s3m0-lrck";
+		pcfg_pull_none_smt = "/pinctrl/pcfg-pull-none-smt";
+		work_led = "/leds/work";
+		rkvenc_opp_table = "/rkvenc-opp-table";
+		spi0m0_cs0_hs = "/pinctrl/spi0-hs/spi0m0-cs0";
+		vp0_out_hdmi = "/vop@fe040000/ports/port@0/endpoint@3";
+		spi2m1_cs0 = "/pinctrl/spi2/spi2m1-cs0";
+		fspi_cs1 = "/pinctrl/fspi/fspi-cs1";
+		qos_ebc = "/qos@fe158000";
+		csi2_dphy1 = "/csi2-dphy1";
+		spi2 = "/spi@fe630000";
+		gpio0 = "/pinctrl/gpio@fdd60000";
+		saradc = "/saradc@fe720000";
+		i2s1m0_sdi3 = "/pinctrl/i2s1/i2s1m0-sdi3";
+		route_edp = "/display-subsystem/route/route-edp";
+		emmc_rstnout = "/pinctrl/emmc/emmc-rstnout";
+		i2s3m1_mclk = "/pinctrl/i2s3/i2s3m1-mclk";
+		dsi1 = "/dsi@fe070000";
+		usb2phy1 = "/usb2-phy@fe8b0000";
+		pmu_pins = "/pinctrl/pmu/pmu-pins";
+		gmac0_miim = "/pinctrl/gmac0/gmac0-miim";
+		spi3m0_cs0 = "/pinctrl/spi3/spi3m0-cs0";
+		crypto = "/crypto@fe380000";
+		dfi = "/dfi@fe230000";
+		can0m0_pins = "/pinctrl/can0/can0m0-pins";
+		pcfg_pull_up_drv_level_2 = "/pinctrl/pcfg-pull-up-drv-level-2";
+		pinctrl = "/pinctrl";
+		rgmii_phy0 = "/ethernet@fe010000/mdio/phy@0";
+		pwm1m1_pins = "/pinctrl/pwm1/pwm1m1-pins";
+		spi3m0_pins_hs = "/pinctrl/spi3-hs/spi3m0-pins";
+		i2s2m1_lrckrx = "/pinctrl/i2s2/i2s2m1-lrckrx";
+		gmac1m0_rgmii_bus = "/pinctrl/gmac1/gmac1m0-rgmii-bus";
+		pdmm0_clk = "/pinctrl/pdm/pdmm0-clk";
+		qos_isp = "/qos@fe148000";
+		sdei = "/firmware/sdei";
+		pdm = "/pdm@fe440000";
+		sata2_pins = "/pinctrl/sata2/sata2-pins";
+		vdd_logic = "/i2c@fdd40000/pmic@20/regulators/DCDC_REG1";
+		uart2m1_xfer = "/pinctrl/uart2/uart2m1-xfer";
+		jtag_pins = "/pinctrl/jtag/jtag-pins";
+		route_rgb = "/display-subsystem/route/route-rgb";
+		i2c1 = "/i2c@fe5a0000";
+		csi2_dphy_hw = "/csi2-dphy-hw@fe870000";
+		uart3m0_ctsn = "/pinctrl/uart3/uart3m0-ctsn";
+		vopm0_pins = "/pinctrl/vop/vopm0-pins";
+		sdmmc2m0_pwren = "/pinctrl/sdmmc2/sdmmc2m0-pwren";
+		rkvdec_mmu = "/iommu@fdf80800";
+		qos_rkvenc_rd_m0 = "/qos@fe138080";
+		pdmm0_sdi1 = "/pinctrl/pdm/pdmm0-sdi1";
+		cpu_code = "/otp@fe38c000/cpu-code@2";
+		pwm7 = "/pwm@fe6e0030";
+		spi0m1_cs0_hs = "/pinctrl/spi0-hs/spi0m1-cs0";
+		i2s2m0_sclktx = "/pinctrl/i2s2/i2s2m0-sclktx";
+		gpu_leakage = "/otp@fe38c000/gpu-leakage@1d";
+		sdmmc0_pwren = "/pinctrl/sdmmc0/sdmmc0-pwren";
+		sdmmc0_clk = "/pinctrl/sdmmc0/sdmmc0-clk";
+		pwm3_pins = "/pinctrl/pwm3/pwm3-pins";
+		rockchip_system_monitor = "/rockchip-system-monitor";
+		gmac1_clkin = "/external-gmac1-clock";
+		ext_cam_imx219_clk = "/external-camera-imx219-clock";
+		pwm12 = "/pwm@fe700000";
+		emmc_cmd = "/pinctrl/emmc/emmc-cmd";
+		i2s1_8ch = "/i2s@fe410000";
+		mipi_csi2 = "/mipi-csi2@fdfb0000";
+		pcie30x1m1_pins = "/pinctrl/pcie30x1/pcie30x1m1-pins";
+		pcfg_pull_none = "/pinctrl/pcfg-pull-none";
+		i2s1m0_mclk = "/pinctrl/i2s1/i2s1m0-mclk";
+		vdd_npu = "/i2c@fdd40000/pmic@20/regulators/DCDC_REG4";
+		can1m0_pins = "/pinctrl/can1/can1m0-pins";
+		flash_pins = "/pinctrl/flash/flash-pins";
+		provider2 = "/testcase-data/phandle-tests/provider2";
+		clk32k_out0 = "/pinctrl/clk32k/clk32k-out0";
+		pwm2m1_pins = "/pinctrl/pwm2/pwm2m1-pins";
+		i2s1m2_sdo2 = "/pinctrl/i2s1/i2s1m2-sdo2";
+		qos_rga_wr = "/qos@fe158300";
+		unittest101 = "/testcase-data/overlay-node/test-bus/test-unittest101";
+		pcfg_pull_none_drv_level_1 = "/pinctrl/pcfg-pull-none-drv-level-1";
+		combphy2_psq = "/phy@fe840000";
+		gmac1m1_tx_bus2_level3 = "/pinctrl/gmac-txd-level3/gmac1m1-tx-bus2-level3";
+		hdmitxm1_cec = "/pinctrl/hdmitx/hdmitxm1-cec";
+		uart6 = "/serial@fe6a0000";
+		sdhci = "/sdhci@fe310000";
+		target = "/thermal-zones/soc-thermal/trips/trip-point-1";
+		gmac0_rgmii_bus_level3 = "/pinctrl/gmac-txd-level3/gmac0-rgmii-bus-level3";
+		uart3m1_xfer = "/pinctrl/uart3/uart3m1-xfer";
+		spi2m0_cs1_hs = "/pinctrl/spi2-hs/spi2m0-cs1";
+		uart4m0_ctsn = "/pinctrl/uart4/uart4m0-ctsn";
+		vcc_sys = "/vcc-sys";
+		audiopwm_routp = "/pinctrl/audiopwm/audiopwm-routp";
+		i2s2m0_sdo = "/pinctrl/i2s2/i2s2m0-sdo";
+		nandc0 = "/nandc@fe330000";
+		gpu = "/gpu@fde60000";
+		spi0 = "/spi@fe610000";
+		iep = "/iep@fdef0000";
+		i2s2m1_sclktx = "/pinctrl/i2s2/i2s2m1-sclktx";
+		i2s2m0_sclkrx = "/pinctrl/i2s2/i2s2m0-sclkrx";
+		drm_logo = "/reserved-memory/drm-logo@00000000";
+		i2s1m0_sdi1 = "/pinctrl/i2s1/i2s1m0-sdi1";
+		usb_host0_ohci = "/usb@fd840000";
+		unittest7 = "/testcase-data/overlay-node/test-bus/test-unittest7";
+		unittest_test_bus = "/testcase-data/overlay-node/test-bus";
+		cif_dvp_bus16 = "/pinctrl/cif/cif-dvp-bus16";
+		pcie30x2m1_pins = "/pinctrl/pcie30x2/pcie30x2m1-pins";
+		dmc = "/dmc";
+		ebc = "/ebc@fdec0000";
+		i2s2m0_mclk = "/pinctrl/i2s2/i2s2m0-mclk";
+		scmi = "/firmware/scmi";
+		rkisp_mmu = "/iommu@fdff1a00";
+		pdmm1_clk1 = "/pinctrl/pdm/pdmm1-clk1";
+		lvds_in_vp2 = "/syscon@fdc60000/lvds/ports/port@0/endpoint@2";
+		can2m0_pins = "/pinctrl/can2/can2m0-pins";
+		edp_in = "/edp@fe0c0000/ports/port@0";
+		sdmmc1_cmd = "/pinctrl/sdmmc1/sdmmc1-cmd";
+		bt656m0_pins = "/pinctrl/bt656/bt656m0-pins";
+		pwm0m0_pins = "/pinctrl/pwm0/pwm0m0-pins";
+		otp_cpu_version = "/otp@fe38c000/cpu-version@8";
+		audiopwm_lout = "/pinctrl/audiopwm/audiopwm-lout";
+		uart7m2_xfer = "/pinctrl/uart7/uart7m2-xfer";
+		pmugrf = "/syscon@fdc20000";
+		uart4m1_xfer = "/pinctrl/uart4/uart4m1-xfer";
+		i2s2_2ch = "/i2s@fe420000";
+		pwm5 = "/pwm@fe6e0010";
+		spi2m1_cs1_hs = "/pinctrl/spi2-hs/spi2m1-cs1";
+		uart1m0_xfer = "/pinctrl/uart1/uart1m0-xfer";
+		uart5m0_ctsn = "/pinctrl/uart5/uart5m0-ctsn";
+		gmac1m1_miim = "/pinctrl/gmac1/gmac1m1-miim";
+		rk817_slppin_pwrdn = "/i2c@fdd40000/pmic@20/pinctrl_rk8xx/rk817_slppin_pwrdn";
+		i2s2m1_sclkrx = "/pinctrl/i2s2/i2s2m1-sclkrx";
+		pwm10 = "/pwm@fe6f0020";
+		sdmmc2m1_clk = "/pinctrl/sdmmc2/sdmmc2m1-clk";
+		rktimer = "/timer@fe5f0000";
+		rkcif_dvp_sditf = "/rkcif_dvp_sditf";
+		i2s3m0_mclk = "/pinctrl/i2s3/i2s3m0-mclk";
+		provider0 = "/testcase-data/phandle-tests/provider0";
+		route_hdmi = "/display-subsystem/route/route-hdmi";
+		pipe_phy_grf2 = "/syscon@fdc90000";
+		i2s1m2_sdo0 = "/pinctrl/i2s1/i2s1m2-sdo0";
+		dsi0_in_vp1 = "/dsi@fe060000/ports/port@0/endpoint@1";
+		dmc_opp_table = "/dmc-opp-table";
+		uart4 = "/serial@fe680000";
+		pwm1m0_pins = "/pinctrl/pwm1/pwm1m0-pins";
+		vp0_out_dsi1 = "/vop@fe040000/ports/port@0/endpoint@1";
+		spi0m0_cs0 = "/pinctrl/spi0/spi0m0-cs0";
+		pdmm2_sdi2 = "/pinctrl/pdm/pdmm2-sdi2";
+		pcie30x1_buttonrstn = "/pinctrl/pcie30x1/pcie30x1-buttonrstn";
+		u2phy1_host = "/usb2-phy@fe8b0000/host-port";
+		qos_sata2 = "/qos@fe190300";
+		ddr3_params = "/ddr3-params";
+		rkisp_vir1 = "/rkisp-vir1";
+		spi2m0_cs1 = "/pinctrl/spi2/spi2m0-cs1";
+		otp_id = "/otp@fe38c000/id@a";
+		spi2m1_pins_hs = "/pinctrl/spi2-hs/spi2m1-pins";
+		uart5m1_xfer = "/pinctrl/uart5/uart5m1-xfer";
+		sata1_pins = "/pinctrl/sata1/sata1-pins";
+		lpddr4x_params = "/lpddr4x-params";
+		uart2m0_xfer = "/pinctrl/uart2/uart2m0-xfer";
+		uart6m0_ctsn = "/pinctrl/uart6/uart6m0-ctsn";
+		npu_pins = "/pinctrl/npu/npu-pins";
+		vdd_gpu = "/i2c@fdd40000/pmic@20/regulators/DCDC_REG2";
+		xin32k = "/xin32k";
+		unittest5 = "/testcase-data/overlay-node/test-bus/test-unittest5";
+		cpu0_opp_table = "/cpu0-opp-table";
+		eink = "/eink@fdf00000";
+		ride_200 = "/testcase-data-2/fairway-1/ride@200";
+		spi1m0_cs0_hs = "/pinctrl/spi1-hs/spi1m0-cs0";
+		vp1_out_hdmi = "/vop@fe040000/ports/port@1/endpoint@3";
+		i2c2m1_xfer = "/pinctrl/i2c2/i2c2m1-xfer";
+		bus_npu_opp_table = "/bus-npu-opp-table";
+		pcie30x1m0_pins = "/pinctrl/pcie30x1/pcie30x1m0-pins";
+		qos_vicap0 = "/qos@fe148080";
+		qos_vpu = "/qos@fe150000";
+		audiopwm_loutn = "/pinctrl/audiopwm/audiopwm-loutn";
+		vdda0v9_image = "/i2c@fdd40000/pmic@20/regulators/LDO_REG1";
+		qos_pcie2x1 = "/qos@fe190000";
+		spi1m0_pins_hs = "/pinctrl/spi1-hs/spi1m0-pins";
+		power = "/power-management@fdd90000/power-controller";
+		vad = "/vad@fe450000";
+		gmac1m1_rgmii_bus_level3 = "/pinctrl/gmac-txd-level3/gmac1m1-rgmii-bus-level3";
+		dsi1_in_vp1 = "/dsi@fe070000/ports/port@0/endpoint@1";
+		ext_cam_imx219_clk_two = "/external-camera-imx219-clock-two";
+		pwm2m0_pins = "/pinctrl/pwm2/pwm2m0-pins";
+		i2s1m1_sdo2 = "/pinctrl/i2s1/i2s1m1-sdo2";
+		eth0_pins = "/pinctrl/eth0/eth0-pins";
+		pwm3 = "/pwm@fdd70030";
+		ddr4_params = "/ddr4-params";
+		rkcif_mmu = "/iommu@fdfe0800";
+		gmac0_tx_bus2 = "/pinctrl/gmac0/gmac0-tx-bus2";
+		sata2 = "/sata@fc800000";
+		uart9m2_xfer = "/pinctrl/uart9/uart9m2-xfer";
+		i2s1m2_sdi2 = "/pinctrl/i2s1/i2s1m2-sdi2";
+		uart6m1_xfer = "/pinctrl/uart6/uart6m1-xfer";
+		pinctrl_rk8xx = "/i2c@fdd40000/pmic@20/pinctrl_rk8xx";
+		uart3m0_xfer = "/pinctrl/uart3/uart3m0-xfer";
+		uart7m0_ctsn = "/pinctrl/uart7/uart7m0-ctsn";
+		usb2phy0_grf = "/syscon@fdca0000";
+		scmi_clk = "/firmware/scmi/protocol@14";
+		emmc_clk = "/pinctrl/emmc/emmc-clk";
+		imx219_1 = "/i2c@fe5a0000/imx219-1@10";
+		usbdrd30 = "/usbdrd";
+		cru = "/clock-controller@fdd20000";
+		spdifm1_tx = "/pinctrl/spdif/spdifm1-tx";
+		sdmmc2m0_det = "/pinctrl/sdmmc2/sdmmc2m0-det";
+		spi1m1_cs0_hs = "/pinctrl/spi1-hs/spi1m1-cs0";
+		rknpu_mmu = "/iommu@fde4b000";
+		rkcif_mipi_lvds_sditf = "/rkcif_mipi_lvds_sditf";
+		i2c3m1_xfer = "/pinctrl/i2c3/i2c3m1-xfer";
+		pipe_phy_grf0 = "/syscon@fdc70000";
+		pcie30x2m0_pins = "/pinctrl/pcie30x2/pcie30x2m0-pins";
+		cpu3 = "/cpus/cpu@300";
+		gmac1_stmmac_axi_setup = "/ethernet@fe010000/stmmac-axi-config";
+		spi3m1_cs0 = "/pinctrl/spi3/spi3m1-cs0";
+		reboot_mode = "/syscon@fdc20000/reboot-mode";
+		pdmm0_clk1 = "/pinctrl/pdm/pdmm0-clk1";
+		gmac1m0_tx_bus2_level3 = "/pinctrl/gmac-txd-level3/gmac1m0-tx-bus2-level3";
+		uart2 = "/serial@fe660000";
+		rk817_slppin_rst = "/i2c@fdd40000/pmic@20/pinctrl_rk8xx/rk817_slppin_rst";
+		pdmm2_sdi0 = "/pinctrl/pdm/pdmm2-sdi0";
+		mailbox = "/mailbox@fe780000";
+		dmac0 = "/dmac@fe530000";
+		soc_slppin_gpio = "/pinctrl/pmic/soc_slppin_gpio";
+		vp1_out_edp = "/vop@fe040000/ports/port@1/endpoint@2";
+		pdmm1_clk = "/pinctrl/pdm/pdmm1-clk";
+		sdio_pwrseq = "/sdio-pwrseq";
+		jpegd_mmu = "/iommu@fded0480";
+		uart7m1_xfer = "/pinctrl/uart7/uart7m1-xfer";
+		otp = "/otp@fe38c000";
+		uart4m0_xfer = "/pinctrl/uart4/uart4m0-xfer";
+		uart8m0_ctsn = "/pinctrl/uart8/uart8m0-ctsn";
+		gmac1m0_rx_bus2 = "/pinctrl/gmac1/gmac1m0-rx-bus2";
+		edp_phy = "/edp-phy@fdcb0000";
+		unittest3 = "/testcase-data/overlay-node/test-bus/test-unittest3";
+		combphy1_usq = "/phy@fe830000";
+		refclk_pins = "/pinctrl/refclk/refclk-pins";
+		qos_rkvenc_wr_m0 = "/qos@fe138180";
+		gmac1m0_miim = "/pinctrl/gmac1/gmac1m0-miim";
+		core_pvtm = "/otp@fe38c000/core-pvtm@2a";
+		pmu_io_domains = "/syscon@fdc20000/io-domains";
+		route_lvds = "/display-subsystem/route/route-lvds";
+		spi3m0_cs1_hs = "/pinctrl/spi3-hs/spi3m0-cs1";
+		test_intc2 = "/testcase-data/interrupts/intc2";
+		vcc3v3_sd = "/i2c@fdd40000/pmic@20/regulators/SWITCH_REG2";
+		gic = "/interrupt-controller@fd400000";
+		uart0_rtsn = "/pinctrl/uart0/uart0-rtsn";
+		pipegrf = "/syscon@fdc50000";
+		gmac0_rgmii_clk_level2 = "/pinctrl/gmac-txc-level2/gmac0-rgmii-clk-level2";
+		sdmmc1_clk = "/pinctrl/sdmmc1/sdmmc1-clk";
+		unittest_i2c_test_bus = "/testcase-data/overlay-node/test-bus/i2c-test-bus";
+		test_intmap0 = "/testcase-data/interrupts/intmap0";
+		i2c4m1_xfer = "/pinctrl/i2c4/i2c4m1-xfer";
+		hdmi_in_vp1 = "/hdmi@fe0a0000/ports/port/endpoint@1";
+		sdmmc2m1_pwren = "/pinctrl/sdmmc2/sdmmc2m1-pwren";
+		sdmmc1 = "/dwmmc@fe2c0000";
+		ebc_extern = "/pinctrl/ebc/ebc-extern";
+		i2s1m1_sdo0 = "/pinctrl/i2s1/i2s1m1-sdo0";
+		sdmmc1_pwren = "/pinctrl/sdmmc1/sdmmc1-pwren";
+		hvac_1 = "/testcase-data-2/substation@100/hvac-medium-1";
+		leds = "/leds";
+		pwm1 = "/pwm@fdd70010";
+		threshold = "/thermal-zones/soc-thermal/trips/trip-point-0";
+		i2s1m2_sdi0 = "/pinctrl/i2s1/i2s1m2-sdi0";
+		can2 = "/can@fe590000";
+		edp = "/edp@fe0c0000";
+		pdmm1_sdi2 = "/pinctrl/pdm/pdmm1-sdi2";
+		rk809_sound = "/rk809-sound";
+		u2phy0_host = "/usb2-phy@fe8a0000/host-port";
+		uart8m1_xfer = "/pinctrl/uart8/uart8m1-xfer";
+		spin_ctrl_1 = "/testcase-data-2/substation@100/motor-1";
+		sata_pins = "/pinctrl/sata/sata-pins";
+		lpddr3_params = "/lpddr3-params";
+		uart5m0_xfer = "/pinctrl/uart5/uart5m0-xfer";
+		uart9m0_ctsn = "/pinctrl/uart9/uart9m0-ctsn";
+		sata0_pins = "/pinctrl/sata0/sata0-pins";
+		usb_host1_ehci = "/usb@fd880000";
+		xin24m = "/xin24m";
+		vp1_out_lvds = "/vop@fe040000/ports/port@1/endpoint@4";
+		i2s2m1_sdo = "/pinctrl/i2s2/i2s2m1-sdo";
+		mcp251x_clk = "/mcp251x-clk";
+		pcfg_output_low_pull_down = "/pinctrl/pcfg-output-low-pull-down";
+		rk809_codec = "/i2c@fdd40000/pmic@20/codec";
+		csi2dphy1_out = "/csi2-dphy1/ports/port@1/endpoint@1";
+		route_dsi1 = "/display-subsystem/route/route-dsi1";
+		tsadc = "/tsadc@fe710000";
+		eth1m1_pins = "/pinctrl/eth1/eth1m1-pins";
+		mdio1 = "/ethernet@fe010000/mdio";
+		gpio3 = "/pinctrl/gpio@fe760000";
+		spi3m1_cs1_hs = "/pinctrl/spi3-hs/spi3m1-cs1";
+		gpu_opp_table = "/opp-table2";
+		cpu1 = "/cpus/cpu@100";
+		vdpu_mmu = "/iommu@fdea0800";
+		i2c5m1_xfer = "/pinctrl/i2c5/i2c5m1-xfer";
+		rgb = "/syscon@fdc60000/rgb";
+		i2c2m0_xfer = "/pinctrl/i2c2/i2c2m0-xfer";
+		uart0 = "/serial@fdd50000";
+		i2s3m0_sdo = "/pinctrl/i2s3/i2s3m0-sdo";
+		i2s2m0_sdi = "/pinctrl/i2s2/i2s2m0-sdi";
+		pwm8m1_pins = "/pinctrl/pwm8/pwm8m1-pins";
+		dsi1_in = "/dsi@fe070000/ports/port@0";
+		spi0m1_pins = "/pinctrl/spi0/spi0m1-pins";
+		bt1120_pins = "/pinctrl/bt1120/bt1120-pins";
+		rides_1 = "/testcase-data-2/fairway-1";
+		imx219_1_out = "/i2c@fe5a0000/imx219-1@10/port/endpoint";
+		spi0m1_pins_hs = "/pinctrl/spi0-hs/spi0m1-pins";
+		i2s1m0_sdo2 = "/pinctrl/i2s1/i2s1m0-sdo2";
+		u2phy0_otg = "/usb2-phy@fe8a0000/otg-port";
+		edpdpm1_pins = "/pinctrl/edpdp/edpdpm1-pins";
+		qos_hdcp = "/qos@fe1a8000";
+		unittest1 = "/testcase-data/overlay-node/test-bus/test-unittest1";
+		i2c4 = "/i2c@fe5d0000";
+		rk_rga = "/rk_rga@fdeb0000";
+		uart9m1_xfer = "/pinctrl/uart9/uart9m1-xfer";
+		i2s1m1_sdi2 = "/pinctrl/i2s1/i2s1m1-sdi2";
+		sdmmc1_bus4 = "/pinctrl/sdmmc1/sdmmc1-bus4";
+		i2s3_2ch = "/i2s@fe430000";
+		vp1_out_dsi1 = "/vop@fe040000/ports/port@1/endpoint@1";
+		lpddr4_params = "/lpddr4-params";
+		uart6m0_xfer = "/pinctrl/uart6/uart6m0-xfer";
+		vcc3v3_pmu = "/i2c@fdd40000/pmic@20/regulators/LDO_REG6";
+		uart1m1_rtsn = "/pinctrl/uart1/uart1m1-rtsn";
+		test_intc0 = "/testcase-data/interrupts/intc0";
+		vdd_cpu = "/i2c@fdd40000/tcs4525@1c";
+		qos_jpeg_dec = "/qos@fe158180";
+		pwm15 = "/pwm@fe700030";
+		vop_mmu = "/iommu@fe043e00";
+		gmac1m1_tx_bus2 = "/pinctrl/gmac1/gmac1m1-tx-bus2";
+		sdmmc0_det = "/pinctrl/sdmmc0/sdmmc0-det";
+		iep_mmu = "/iommu@fdef0800";
+		i2c3m0_xfer = "/pinctrl/i2c3/i2c3m0-xfer";
+		csi2dphy1_ucam0 = "/csi2-dphy1/ports/port@0/endpoint@1";
+		gmac1m1_rgmii_bus = "/pinctrl/gmac1/gmac1m1-rgmii-bus";
+		spi2m0_cs0_hs = "/pinctrl/spi2-hs/spi2m0-cs0";
+		pwm7_pins = "/pinctrl/pwm7/pwm7-pins";
+		can0 = "/can@fe570000";
+		pwm9m1_pins = "/pinctrl/pwm9/pwm9m1-pins";
+		pdmm1_sdi0 = "/pinctrl/pdm/pdmm1-sdi0";
+		vp2 = "/vop@fe040000/ports/port@2";
+		spi1m1_pins = "/pinctrl/spi1/spi1m1-pins";
+		rng = "/rng@fe388000";
+		uart9 = "/serial@fe6d0000";
+		spi0m1_cs0 = "/pinctrl/spi0/spi0m1-cs0";
+		wifi_enable_h = "/pinctrl/sdio-pwrseq/wifi-enable-h";
+		rkcif = "/rkcif@fdfe0000";
+		gmac0_rgmii_clk = "/pinctrl/gmac0/gmac0-rgmii-clk";
+		rkvdec = "/rkvdec@fdf80200";
+		spi2m1_cs1 = "/pinctrl/spi2/spi2m1-cs1";
+		cpu_leakage = "/otp@fe38c000/cpu-leakage@1a";
+		uart7m0_xfer = "/pinctrl/uart7/uart7m0-xfer";
+		csi2_dphy2 = "/csi2-dphy2";
+		spi3 = "/spi@fe640000";
+		gmac1m1_rgmii_clk_level2 = "/pinctrl/gmac-txc-level2/gmac1m1-rgmii-clk-level2";
+		gpio1 = "/pinctrl/gpio@fe740000";
+		tsadcm1_shut = "/pinctrl/tsadc/tsadcm1-shut";
+		spi1m0_cs0 = "/pinctrl/spi1/spi1m0-cs0";
+		xpcs = "/syscon@fda00000";
+		testcase = "/testcase-data";
+		spi3m0_cs1 = "/pinctrl/spi3/spi3m0-cs1";
+		vdda0v9_pmu = "/i2c@fdd40000/pmic@20/regulators/LDO_REG3";
+		i2c4m0_xfer = "/pinctrl/i2c4/i2c4m0-xfer";
+		its = "/interrupt-controller@fd400000/interrupt-controller@fd440000";
+		wdt = "/watchdog@fe600000";
+		rknpu_reserved = "/reserved-memory/rknpu";
+		cspmu = "/cspmu@fd90c000";
+		usbhost_dwc3 = "/usbhost/dwc3@fd000000";
+		vdda_0v9 = "/i2c@fdd40000/pmic@20/regulators/LDO_REG2";
+		lights_1 = "/testcase-data-2/lights@30000";
+		qos_rga_rd = "/qos@fe158280";
+		spi2m1_cs0_hs = "/pinctrl/spi2-hs/spi2m1-cs0";
+		i2s1m0_sdo0 = "/pinctrl/i2s1/i2s1m0-sdo0";
+		hdmitx_scl = "/pinctrl/hdmitx/hdmitx-scl";
+		hdmitx_sda = "/pinctrl/hdmitx/hdmitx-sda";
+		spi2m1_pins = "/pinctrl/spi2/spi2m1-pins";
+		cam_clkout0 = "/pinctrl/cam/cam-clkout0";
+		i2c2 = "/i2c@fe5b0000";
+		soc_slppin_slp = "/pinctrl/pmic/soc_slppin_slp";
+		i2s1m1_sdi0 = "/pinctrl/i2s1/i2s1m1-sdi0";
+		sram = "/sram@fdcc0000";
+		gmac0_rx_er = "/pinctrl/gmac0/gmac0-rx-er";
+		qos_rkvenc_rd_m1 = "/qos@fe138100";
+		pdmm0_sdi2 = "/pinctrl/pdm/pdmm0-sdi2";
+		pwm8 = "/pwm@fe6f0000";
+		log_leakage = "/otp@fe38c000/log-leakage@1b";
+		gmac0_tx_bus2_level3 = "/pinctrl/gmac-txd-level3/gmac0-tx-bus2-level3";
+		emmc_bus8 = "/pinctrl/emmc/emmc-bus8";
+		qos_usb3_0 = "/qos@fe190380";
+		uart8m0_xfer = "/pinctrl/uart8/uart8m0-xfer";
+		pwm10m1_pins = "/pinctrl/pwm10/pwm10m1-pins";
+		usb_host0_ehci = "/usb@fd800000";
+		gmac1 = "/ethernet@fe010000";
+		usb2phy1_grf = "/syscon@fdca8000";
+		pcie20m2_pins = "/pinctrl/pcie20/pcie20m2-pins";
+		pwm13 = "/pwm@fe700010";
+		video_phy0 = "/video-phy@fe850000";
+		eth1m0_pins = "/pinctrl/eth1/eth1m0-pins";
+		gmac1m0_rgmii_clk = "/pinctrl/gmac1/gmac1m0-rgmii-clk";
+		VCC_GPIO0_17 = "/i2c@fdd40000/pmic@20/regulators/LDO_REG9";
+		cif_dvp_bus8 = "/pinctrl/cif/cif-dvp-bus8";
+		sdmmc2m1_det = "/pinctrl/sdmmc2/sdmmc2m1-det";
+		tsadc_shutorg = "/pinctrl/tsadc/tsadc-shutorg";
+		provider3 = "/testcase-data/phandle-tests/provider3";
+		clk32k_out1 = "/pinctrl/clk32k/clk32k-out1";
+		i2c5m0_xfer = "/pinctrl/i2c5/i2c5m0-xfer";
+		audiopwm_loutp = "/pinctrl/audiopwm/audiopwm-loutp";
+		cif_dvp_clk = "/pinctrl/cif/cif-dvp-clk";
+		i2s1m2_sdo3 = "/pinctrl/i2s1/i2s1m2-sdo3";
+		fspi_pins = "/pinctrl/fspi/fspi-pins";
+		vcc_camera_imx219 = "/vcc-camera-imx219";
+		rknpu = "/npu@fde40000";
+		pcfg_pull_none_drv_level_2 = "/pinctrl/pcfg-pull-none-drv-level-2";
+		vp0 = "/vop@fe040000/ports/port@0";
+		i2c1_xfer = "/pinctrl/i2c1/i2c1-xfer";
+		ebc_pins = "/pinctrl/ebc/ebc-pins";
+		audpwm = "/audpwm@fe470000";
+		uart7 = "/serial@fe6b0000";
+		qos_vop_m0 = "/qos@fe1a8080";
+		edp_in_vp0 = "/edp@fe0c0000/ports/port@0/endpoint@0";
+		pmucru = "/clock-controller@fdd00000";
+		spi3m1_pins = "/pinctrl/spi3/spi3m1-pins";
+		pwm8m0_pins = "/pinctrl/pwm8/pwm8m0-pins";
+		pmic_int = "/pinctrl/pmic/pmic_int";
+		spi0m0_pins = "/pinctrl/spi0/spi0m0-pins";
+		vcc_ddr = "/i2c@fdd40000/pmic@20/regulators/DCDC_REG3";
+		edpdpm0_pins = "/pinctrl/edpdp/edpdpm0-pins";
+		sfc = "/sfc@fe300000";
+		csi2_dphy0 = "/csi2-dphy0";
+		spi1 = "/spi@fe620000";
+		spdif_8ch = "/spdif@fe460000";
+		wireless_bluetooth = "/wireless-bluetooth";
+		isp_pins = "/pinctrl/isp/isp-pins";
+		uart9m0_xfer = "/pinctrl/uart9/uart9m0-xfer";
+		i2s1m0_sdi2 = "/pinctrl/i2s1/i2s1m0-sdi2";
+		sdmmc0_bus4 = "/pinctrl/sdmmc0/sdmmc0-bus4";
+		pwm11m1_pins = "/pinctrl/pwm11/pwm11m1-pins";
+		unittest8 = "/testcase-data/overlay-node/test-bus/test-unittest8";
+		dsi0 = "/dsi@fe060000";
+		usb2phy0 = "/usb2-phy@fe8a0000";
+		uart1m0_rtsn = "/pinctrl/uart1/uart1m0-rtsn";
+		pcfg_pull_up_drv_level_1 = "/pinctrl/pcfg-pull-up-drv-level-1";
+		gmac1_xpcsclk = "/xpcs-gmac1-clock";
+		vp2_out_lvds = "/vop@fe040000/ports/port@2/endpoint@0";
+		reserved_memory = "/reserved-memory";
+		vop_out = "/vop@fe040000/ports";
+		i2s1_mclkin_tx = "/i2s1-mclkin-tx";
+		clk32k_in = "/pinctrl/clk32k/clk32k-in";
+		ride_200_left = "/testcase-data-2/fairway-1/ride@200/track@10";
+		mcu_pins = "/pinctrl/mcu/mcu-pins";
+		i2c0 = "/i2c@fdd40000";
+		pwm6_pins = "/pinctrl/pwm6/pwm6-pins";
+		soc_thermal = "/thermal-zones/soc-thermal";
+		spi3m1_pins_hs = "/pinctrl/spi3-hs/spi3m1-pins";
+		pwm9m0_pins = "/pinctrl/pwm9/pwm9m0-pins";
+		pcie30x2_buttonrstn = "/pinctrl/pcie30x2/pcie30x2-buttonrstn";
+		pdmm0_sdi0 = "/pinctrl/pdm/pdmm0-sdi0";
+		pwm6 = "/pwm@fe6e0020";
+		spi1m0_pins = "/pinctrl/spi1/spi1m0-pins";
+		spdifm0_tx = "/pinctrl/spdif/spdifm0-tx";
+		isp1_in = "/rkisp-vir1/port/endpoint@0";
+		vcca_1v8 = "/i2c@fdd40000/pmic@20/regulators/LDO_REG7";
+		pwm12m1_pins = "/pinctrl/pwm12/pwm12m1-pins";
+		pwm11 = "/pwm@fe6f0030";
+		usbdrd_dwc3 = "/usbdrd/dwc3@fcc00000";
+		pcie20_buttonrstn = "/pinctrl/pcie20/pcie20-buttonrstn";
+		csi2dphy2_out = "/csi2-dphy2/ports/port@1/endpoint@1";
+		io_domains = "/syscon@fdc60000/io-domains";
+		tsadcm0_shut = "/pinctrl/tsadc/tsadcm0-shut";
+		provider1 = "/testcase-data/phandle-tests/provider1";
+		i2s1m2_sdo1 = "/pinctrl/i2s1/i2s1m2-sdo1";
+		spi2m0_pins_hs = "/pinctrl/spi2-hs/spi2m0-pins";
+		unittest100 = "/testcase-data/overlay-node/test-bus/test-unittest100";
+		rockchip_suspend = "/rockchip-suspend";
+		cpu_pins = "/pinctrl/cpu/cpu-pins";
+		i2s1_mclkin_rx = "/i2s1-mclkin-rx";
+		sc16is752_clk = "/sc16is752-clk";
+		i2s3m1_sdo = "/pinctrl/i2s3/i2s3m1-sdo";
+		uart5 = "/serial@fe690000";
+		gmac1m0_clkinout = "/pinctrl/gmac1/gmac1m0-clkinout";
+		fiq_debugger = "/fiq-debugger";
+		spi0m0_cs1 = "/pinctrl/spi0/spi0m0-cs1";
+		pdmm2_sdi3 = "/pinctrl/pdm/pdmm2-sdi3";
+		rgb_in_vp2 = "/syscon@fdc60000/rgb/ports/port@0/endpoint@2";
+		i2s2m1_sdi = "/pinctrl/i2s2/i2s2m1-sdi";
+		vcc_camera_imx219_two = "/vcc-camera-imx219-two";
+		spi2m0_pins = "/pinctrl/spi2/spi2m0-pins";
+		vepu_mmu = "/iommu@fdee0800";
+		imx219_2_out = "/i2c@fe5c0000/imx219-2@10/port/endpoint";
+		gmac1_mtl_rx_setup = "/ethernet@fe010000/rx-queues-config";
+		u2phy1_otg = "/usb2-phy@fe8b0000/otg-port";
+		spi3m0_cs0_hs = "/pinctrl/spi3-hs/spi3m0-cs0";
+		i2s1m0_sdi0 = "/pinctrl/i2s1/i2s1m0-sdi0";
+		unittest6 = "/testcase-data/overlay-node/test-bus/test-unittest6";
+		spi0m0_cs1_hs = "/pinctrl/spi0-hs/spi0m0-cs1";
+		i2s2_mclkin = "/i2s2-mclkin";
+		mpll = "/mpll";
+		pwm13m1_pins = "/pinctrl/pwm13/pwm13m1-pins";
+		i2s3m0_sdi = "/pinctrl/i2s3/i2s3m0-sdi";
+		pwm10m0_pins = "/pinctrl/pwm10/pwm10m0-pins";
+		uart3m0_rtsn = "/pinctrl/uart3/uart3m0-rtsn";
+		vop = "/vop@fe040000";
+		lvds_in_vp1 = "/syscon@fdc60000/lvds/ports/port@0/endpoint@1";
+		pcie20m1_pins = "/pinctrl/pcie20/pcie20m1-pins";
+		vepu = "/vepu@fdee0000";
+		cif_clk = "/pinctrl/cif/cif-clk";
+		sdmmc2m1_bus4 = "/pinctrl/sdmmc2/sdmmc2m1-bus4";
+		rk817_slppin_null = "/i2c@fdd40000/pmic@20/pinctrl_rk8xx/rk817_slppin_null";
+		qos_vicap1 = "/qos@fe148100";
+		sdmmc1_det = "/pinctrl/sdmmc1/sdmmc1-det";
+		dig_acodec = "/codec-digital@fe478000";
+		gmac1m0_rx_er = "/pinctrl/gmac1/gmac1m0-rx-er";
+		i2s1m1_sdo3 = "/pinctrl/i2s1/i2s1m1-sdo3";
+		gmac0_rx_bus2 = "/pinctrl/gmac0/gmac0-rx-bus2";
+		uart0_ctsn = "/pinctrl/uart0/uart0-ctsn";
+		i2c0_xfer = "/pinctrl/i2c0/i2c0-xfer";
+		pwm4 = "/pwm@fe6e0000";
+		vcc3v3_sys = "/vcc3v3-sys";
+		i2s1m2_sdi3 = "/pinctrl/i2s1/i2s1m2-sdi3";
+		spi3m0_pins = "/pinctrl/spi3/spi3m0-pins";
+		i2s3m1_sclk = "/pinctrl/i2s3/i2s3m1-sclk";
+		spi3m1_cs0_hs = "/pinctrl/spi3-hs/spi3m1-cs0";
+		i2s1m0_lrcktx = "/pinctrl/i2s1/i2s1m0-lrcktx";
+		csi2dphy2_ucam0 = "/csi2-dphy2/ports/port@0/endpoint@1";
+		rkisp = "/rkisp@fdff0000";
+		vcca1v8_pmu = "/i2c@fdd40000/pmic@20/regulators/LDO_REG8";
+		chosen = "/chosen";
+		soc_crit = "/thermal-zones/soc-thermal/trips/soc-crit";
+		imx219_2 = "/i2c@fe5c0000/imx219-2@10";
+		mpp_srv = "/mpp-srv";
+		i2s3_mclkin = "/i2s3-mclkin";
+		sdmmc2m0_cmd = "/pinctrl/sdmmc2/sdmmc2m0-cmd";
+		debug = "/debug@fd904000";
+		pwm14m1_pins = "/pinctrl/pwm14/pwm14m1-pins";
+		pwm11m0_pins = "/pinctrl/pwm11/pwm11m0-pins";
+		tsadc_gpio_func = "/pinctrl/gpio-func/tsadc-gpio-func";
+		spi1m1_cs0 = "/pinctrl/spi1/spi1m1-cs0";
+		uart4m0_rtsn = "/pinctrl/uart4/uart4m0-rtsn";
+		vp0_out_edp = "/vop@fe040000/ports/port@0/endpoint@2";
+		pipe_phy_grf1 = "/syscon@fdc80000";
+		pcfg_pull_down = "/pinctrl/pcfg-pull-down";
+		pcie2x1_intc = "/pcie@fe260000/legacy-interrupt-controller";
+		dsi0_in = "/dsi@fe060000/ports/port@0";
+		spi3m1_cs1 = "/pinctrl/spi3/spi3m1-cs1";
+		dsi0_in_vp0 = "/dsi@fe060000/ports/port@0/endpoint@0";
+		uart3 = "/serial@fe670000";
+		pcfg_pull_up = "/pinctrl/pcfg-pull-up";
+		vp0_out_dsi0 = "/vop@fe040000/ports/port@0/endpoint@0";
+		acodec_pins = "/pinctrl/acodec/acodec-pins";
+		pdmm2_sdi1 = "/pinctrl/pdm/pdmm2-sdi1";
+		dmac1 = "/dmac@fe550000";
+		qos_sata1 = "/qos@fe190280";
+		rkisp_vir0 = "/rkisp-vir0";
+		spi2m0_cs0 = "/pinctrl/spi2/spi2m0-cs0";
+		gmac1m0_rgmii_bus_level3 = "/pinctrl/gmac-txd-level3/gmac1m0-rgmii-bus-level3";
+		npu_opp_table = "/npu-opp-table";
+		pwm5_pins = "/pinctrl/pwm5/pwm5-pins";
+		gmac1_mtl_tx_setup = "/ethernet@fe010000/tx-queues-config";
+		i2s1m2_mclk = "/pinctrl/i2s1/i2s1m2-mclk";
+		i2s1m1_lrcktx = "/pinctrl/i2s1/i2s1m1-lrcktx";
+		i2s1m0_lrckrx = "/pinctrl/i2s1/i2s1m0-lrckrx";
+		vccio_sd = "/i2c@fdd40000/pmic@20/regulators/LDO_REG5";
+		vcc_1v8 = "/i2c@fdd40000/pmic@20/regulators/DCDC_REG5";
+		pwm15m1_pins = "/pinctrl/pwm15/pwm15m1-pins";
+		pwm12m0_pins = "/pinctrl/pwm12/pwm12m0-pins";
+		test_intmap1 = "/testcase-data/interrupts/intmap1";
+		uart5m0_rtsn = "/pinctrl/uart5/uart5m0-rtsn";
+		sdmmc2 = "/dwmmc@fe000000";
+		dsi1_in_vp0 = "/dsi@fe070000/ports/port@0/endpoint@0";
+		wifi_host_wake_irq = "/pinctrl/wireless-wlan/wifi-host-wake-irq";
+		i2s1m1_sdo1 = "/pinctrl/i2s1/i2s1m1-sdo1";
+		uart1m1_ctsn = "/pinctrl/uart1/uart1m1-ctsn";
+		hvac_2 = "/testcase-data-2/substation@100/hvac-large-1";
+		pwm2 = "/pwm@fdd70020";
+		audiopwm_routn = "/pinctrl/audiopwm/audiopwm-routn";
+		sata1 = "/sata@fc400000";
+		i2s1m2_sdi1 = "/pinctrl/i2s1/i2s1m2-sdi1";
+		CPU_SLEEP = "/cpus/idle-states/cpu-sleep";
+		spi1m1_pins_hs = "/pinctrl/spi1-hs/spi1m1-pins";
+		pdmm1_sdi3 = "/pinctrl/pdm/pdmm1-sdi3";
+		display_subsystem = "/display-subsystem";
+		spin_ctrl_2 = "/testcase-data-2/substation@100/motor-8";
+		i2s0_8ch = "/i2s@fe400000";
+		pmu = "/power-management@fdd90000";
+		i2s1m2_lrcktx = "/pinctrl/i2s1/i2s1m2-lrcktx";
+		i2s1m1_lrckrx = "/pinctrl/i2s1/i2s1m1-lrckrx";
+		pcie2x1 = "/pcie@fe260000";
+		emmc_datastrobe = "/pinctrl/emmc/emmc-datastrobe";
+		gpio4 = "/pinctrl/gpio@fe770000";
+		scr = "/rkscr@fe560000";
+		pwm13m0_pins = "/pinctrl/pwm13/pwm13m0-pins";
+		cpu2 = "/cpus/cpu@200";
+		uart6m0_rtsn = "/pinctrl/uart6/uart6m0-rtsn";
+		hdmitxm0_cec = "/pinctrl/hdmitx/hdmitxm0-cec";
+		gpu_thermal = "/thermal-zones/gpu-thermal";
+		audiopwm_rout = "/pinctrl/audiopwm/audiopwm-rout";
+		spi0m0_pins_hs = "/pinctrl/spi0-hs/spi0m0-pins";
+		uart1 = "/serial@fe650000";
+		pcie20m0_pins = "/pinctrl/pcie20/pcie20m0-pins";
+		hdmi = "/hdmi@fe0a0000";
+		sdmmc2m0_bus4 = "/pinctrl/sdmmc2/sdmmc2m0-bus4";
+		i2s1m0_sclktx = "/pinctrl/i2s1/i2s1m0-sclktx";
+		gpu_pins = "/pinctrl/gpu/gpu-pins";
+		rk809 = "/i2c@fdd40000/pmic@20";
+		ramoops = "/reserved-memory/ramoops@110000";
+		i2s3m1_lrck = "/pinctrl/i2s3/i2s3m1-lrck";
+		hdmi_in = "/hdmi@fe0a0000/ports/port";
+		rkvdec_sram = "/sram@fdcc0000/rkvdec-sram@0";
+		i2s1m0_sdo3 = "/pinctrl/i2s1/i2s1m0-sdo3";
+		unittest2 = "/testcase-data/overlay-node/test-bus/test-unittest2";
+		soc_slppin_rst = "/pinctrl/pmic/soc_slppin_rst";
+		i2c5 = "/i2c@fe5e0000";
+		qos_rkvdec = "/qos@fe198000";
+		i2s1m1_sdi3 = "/pinctrl/i2s1/i2s1m1-sdi3";
+		gmac1m1_clkinout = "/pinctrl/gmac1/gmac1m1-clkinout";
+		gmac1m0_tx_bus2 = "/pinctrl/gmac1/gmac1m0-tx-bus2";
+		i2s3m0_sclk = "/pinctrl/i2s3/i2s3m0-sclk";
+		uart1_gpios = "/pinctrl/wireless-bluetooth/uart1-gpios";
+		qos_npu = "/qos@fe180000";
+		npu_leakage = "/otp@fe38c000/npu-leakage@1c";
+		grf = "/syscon@fdc60000";
+		retail_1 = "/testcase-data-2/vending@50000";
+		qos_jpeg_enc = "/qos@fe158200";
+		test_intc1 = "/testcase-data/interrupts/intc1";
+		i2s1m2_lrckrx = "/pinctrl/i2s1/i2s1m2-lrckrx";
+		gmac1m1_rx_bus2 = "/pinctrl/gmac1/gmac1m1-rx-bus2";
+		scr_pins = "/pinctrl/scr/scr-pins";
+		can0m1_pins = "/pinctrl/can0/can0m1-pins";
+		hdmi_in_vp0 = "/hdmi@fe0a0000/ports/port/endpoint@0";
+		sdmmc0_cmd = "/pinctrl/sdmmc0/sdmmc0-cmd";
+		pwm14m0_pins = "/pinctrl/pwm14/pwm14m0-pins";
+		usbhost30 = "/usbhost";
+		drm_cubic_lut = "/reserved-memory/drm-cubic-lut@00000000";
+		uart7m0_rtsn = "/pinctrl/uart7/uart7m0-rtsn";
+		sdmmc0 = "/dwmmc@fe2b0000";
+		spi1m0_cs1_hs = "/pinctrl/spi1-hs/spi1m0-cs1";
+		mbist_vmin = "/otp@fe38c000/mbist-vmin@9";
+		i2s1m1_sclktx = "/pinctrl/i2s1/i2s1m1-sclktx";
+		vp2_out_rgb = "/vop@fe040000/ports/port@2/endpoint@1";
+		pwm0 = "/pwm@fdd70000";
+		i2s1m0_sclkrx = "/pinctrl/i2s1/i2s1m0-sclkrx";
+		vopm1_pins = "/pinctrl/vop/vopm1-pins";
+		can1 = "/can@fe580000";
+		hdmi_sound = "/hdmi-sound";
+		pdmm1_sdi1 = "/pinctrl/pdm/pdmm1-sdi1";
+		vcc_3v3 = "/i2c@fdd40000/pmic@20/regulators/SWITCH_REG1";
+		uart0_xfer = "/pinctrl/uart0/uart0-xfer";
+		rkvenc = "/rkvenc@fdf40000";
+		gmac0_clkinout = "/pinctrl/gmac0/gmac0-clkinout";
+		rkcif_dvp = "/rkcif_dvp";
+		wireless_wlan = "/wireless-wlan";
+		rkcif_mipi_lvds = "/rkcif_mipi_lvds";
+		sdmmc2m0_clk = "/pinctrl/sdmmc2/sdmmc2m0-clk";
+		pwm4_pins = "/pinctrl/pwm4/pwm4-pins";
+		route_dsi0 = "/display-subsystem/route/route-dsi0";
+		pcie30x1m2_pins = "/pinctrl/pcie30x1/pcie30x1m2-pins";
+		i2s1m1_mclk = "/pinctrl/i2s1/i2s1m1-mclk";
+		gpio2 = "/pinctrl/gpio@fe750000";
+		spi1m0_cs1 = "/pinctrl/spi1/spi1m0-cs1";
+		rkvenc_mmu = "/iommu@fdf40f00";
+		electric_1 = "/testcase-data-2/substation@100";
+		cpu0 = "/cpus/cpu@0";
+		lcdc_ctl = "/pinctrl/lcdc/lcdc-ctl";
+		can1m1_pins = "/pinctrl/can1/can1m1-pins";
+		spdifm2_tx = "/pinctrl/spdif/spdifm2-tx";
+		i2s3m1_sdi = "/pinctrl/i2s3/i2s3m1-sdi";
+		gmac1m1_rgmii_clk = "/pinctrl/gmac1/gmac1m1-rgmii-clk";
+		pwm15m0_pins = "/pinctrl/pwm15/pwm15m0-pins";
+		i2s2m0_lrcktx = "/pinctrl/i2s2/i2s2m0-lrcktx";
+		rk817_slppin_slp = "/i2c@fdd40000/pmic@20/pinctrl_rk8xx/rk817_slppin_slp";
+		uart8m0_rtsn = "/pinctrl/uart8/uart8m0-rtsn";
+		jpegd = "/jpegd@fded0000";
+		i2s1m2_sclktx = "/pinctrl/i2s1/i2s1m2-sclktx";
+		lights_2 = "/testcase-data-2/lights@40000";
+		i2s1m1_sclkrx = "/pinctrl/i2s1/i2s1m1-sclkrx";
+		isp0_in = "/rkisp-vir0/port/endpoint@0";
+		i2s1m0_sdo1 = "/pinctrl/i2s1/i2s1m0-sdo1";
+		uart1m0_ctsn = "/pinctrl/uart1/uart1m0-ctsn";
+	};
+
+	vepu@fdee0000 {
+		power-domains = <0x21 0x0a>;
+		iommus = <0x6b>;
+		clock-names = "aclk_vcodec\0hclk_vcodec";
+		resets = <0x1f 0x12e 0x1f 0x12f>;
+		interrupts = <0x00 0x40 0x04>;
+		clocks = <0x1f 0xfd 0x1f 0xfe>;
+		rockchip,srv = <0x68>;
+		rockchip,taskqueue-node = <0x02>;
+		rockchip,disable-auto-freq;
+		compatible = "rockchip,vpu-encoder-v2";
+		rockchip,resetgroup-node = <0x02>;
+		status = "okay";
+		reg = <0x00 0xfdee0000 0x00 0x400>;
+		phandle = <0x157>;
+		reset-names = "video_a\0video_h";
+	};
+
+	sfc@fe300000 {
+		clock-names = "clk_sfc\0hclk_sfc";
+		assigned-clocks = <0x1f 0x78>;
+		assigned-clock-rates = <0x5f5e100>;
+		interrupts = <0x00 0x65 0x04>;
+		clocks = <0x1f 0x78 0x1f 0x76>;
+		compatible = "rockchip,sfc";
+		status = "okay";
+		reg = <0x00 0xfe300000 0x00 0x4000>;
+		phandle = <0x172>;
+	};
+
+	pwm@fe6f0030 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe7>;
+		clock-names = "pwm\0pclk";
+		interrupts = <0x00 0x54 0x04 0x00 0x58 0x04>;
+		clocks = <0x1f 0x15d 0x1f 0x15c>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe6f0030 0x00 0x10>;
+		phandle = <0x1a0>;
+	};
+
+	serial@fe6d0000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xdf>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x7d 0x04>;
+		clocks = <0x1f 0x13f 0x1f 0x13c>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfe6d0000 0x00 0x100>;
+		phandle = <0x198>;
+		dmas = <0x40 0x12 0x40 0x13>;
+		reg-shift = <0x02>;
+	};
+
+	reserved-memory {
+		#address-cells = <0x02>;
+		#size-cells = <0x02>;
+		ranges;
+		phandle = <0x11d>;
+
+		rknpu {
+			alignment = <0x00 0x1000>;
+			inactive;
+			compatible = "shared-dma-pool";
+			size = <0x00 0x1000000>;
+			phandle = <0x60>;
+			reusable;
+		};
+
+		drm-logo@00000000 {
+			compatible = "rockchip,drm-logo";
+			reg = <0x00 0xedf00000 0x00 0x20754c>;
+			phandle = <0x10>;
+		};
+
+		ramoops@110000 {
+			record-size = <0x20000>;
+			pmsg-size = <0x50000>;
+			compatible = "ramoops";
+			console-size = <0x80000>;
+			reg = <0x00 0x110000 0x00 0xf0000>;
+			phandle = <0x11e>;
+			ftrace-size = <0x00>;
+		};
+
+		drm-cubic-lut@00000000 {
+			compatible = "rockchip,drm-cubic-lut";
+			reg = <0x00 0xeff00000 0x00 0x8000>;
+			phandle = <0x11>;
+		};
+	};
+
+	iommu@fe043e00 {
+		clock-names = "aclk\0iface";
+		interrupts = <0x00 0x94 0x04>;
+		clocks = <0x1f 0xdd 0x1f 0xde>;
+		#iommu-cells = <0x00>;
+		compatible = "rockchip,iommu-v2";
+		status = "okay";
+		interrupt-names = "vop_mmu";
+		reg = <0x00 0xfe043e00 0x00 0x100 0x00 0xfe043f00 0x00 0x100>;
+		phandle = <0x82>;
+	};
+
+	qos@fe138180 {
+		compatible = "syscon";
+		reg = <0x00 0xfe138180 0x00 0x20>;
+		phandle = <0x58>;
+	};
+
+	csi2-dphy-hw@fe870000 {
+		clock-names = "pclk";
+		clocks = <0x1f 0x179>;
+		compatible = "rockchip,rk3568-csi2-dphy-hw";
+		status = "okay";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe870000 0x00 0x1000>;
+		phandle = <0xf2>;
+	};
+
+	csi2-dphy0 {
+		rockchip,hw = <0xf2>;
+		compatible = "rockchip,rk3568-csi2-dphy";
+		status = "disabled";
+		phandle = <0x1a7>;
+	};
+
+	rng@fe388000 {
+		clock-names = "clk_trng\0hclk_trng";
+		resets = <0x1f 0x6d>;
+		clocks = <0x1f 0x70 0x1f 0x6f>;
+		compatible = "rockchip,cryptov2-rng";
+		status = "okay";
+		reg = <0x00 0xfe388000 0x00 0x2000>;
+		phandle = <0x176>;
+		reset-names = "reset";
+	};
+
+	i2s1-mclkin-rx {
+		clock-output-names = "i2s1_mclkin_rx";
+		#clock-cells = <0x00>;
+		clock-frequency = <0xbb8000>;
+		compatible = "fixed-clock";
+		phandle = <0x128>;
+	};
+
+	pwm@fe6f0020 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe6>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x15d 0x1f 0x15c>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe6f0020 0x00 0x10>;
+		phandle = <0x19f>;
+	};
+
+	pdm@fe440000 {
+		pinctrl-names = "default";
+		pinctrl-0 = <0xb3 0xb4 0xb5 0xb6 0xb7 0xb8>;
+		clock-names = "pdm_clk\0pdm_hclk";
+		clocks = <0x1f 0x5a 0x1f 0x59>;
+		dma-names = "rx";
+		#sound-dai-cells = <0x00>;
+		compatible = "rockchip,rk3568-pdm\0rockchip,pdm";
+		status = "disabled";
+		reg = <0x00 0xfe440000 0x00 0x1000>;
+		phandle = <0x17a>;
+		dmas = <0xa6 0x09>;
+	};
+
+	pwm@fe6f0010 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe5>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x15d 0x1f 0x15c>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe6f0010 0x00 0x10>;
+		phandle = <0x19e>;
+	};
+
+	qos@fe158000 {
+		compatible = "syscon";
+		reg = <0x00 0xfe158000 0x00 0x20>;
+		phandle = <0x4e>;
+	};
+
+	vop@fe040000 {
+		power-domains = <0x21 0x09>;
+		iommus = <0x82>;
+		clock-names = "aclk_vop\0hclk_vop\0dclk_vp0\0dclk_vp1\0dclk_vp2";
+		reg-names = "regs\0gamma_lut";
+		assigned-clocks = <0x1f 0xdf 0x1f 0xe0>;
+		assigned-clock-parents = <0x31 0x02 0x1f 0x05>;
+		interrupts = <0x00 0x94 0x04>;
+		clocks = <0x1f 0xdd 0x1f 0xde 0x1f 0xdf 0x1f 0xe0 0x1f 0xe1>;
+		compatible = "rockchip,rk3568-vop";
+		status = "okay";
+		rockchip,grf = <0x32>;
+		reg = <0x00 0xfe040000 0x00 0x3000 0x00 0xfe044000 0x00 0x1000>;
+		phandle = <0x163>;
+
+		ports {
+			#address-cells = <0x01>;
+			#size-cells = <0x00>;
+			phandle = <0x12>;
+
+			port@0 {
+				rockchip,primary-plane = <0x02>;
+				rockchip,plane-mask = <0x05>;
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x00>;
+				phandle = <0x164>;
+
+				endpoint@3 {
+					remote-endpoint = <0x86>;
+					reg = <0x03>;
+					phandle = <0x17>;
+				};
+
+				endpoint@1 {
+					remote-endpoint = <0x84>;
+					reg = <0x01>;
+					phandle = <0x15>;
+				};
+
+				endpoint@2 {
+					remote-endpoint = <0x85>;
+					reg = <0x02>;
+					phandle = <0x16>;
+				};
+
+				endpoint@0 {
+					remote-endpoint = <0x83>;
+					reg = <0x00>;
+					phandle = <0x14>;
+				};
+			};
+
+			port@1 {
+				rockchip,primary-plane = <0x03>;
+				rockchip,plane-mask = <0x0a>;
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x01>;
+				phandle = <0x165>;
+
+				endpoint@3 {
+					remote-endpoint = <0x8a>;
+					reg = <0x03>;
+					phandle = <0x94>;
+				};
+
+				endpoint@1 {
+					remote-endpoint = <0x88>;
+					reg = <0x01>;
+					phandle = <0x90>;
+				};
+
+				endpoint@4 {
+					remote-endpoint = <0x8b>;
+					reg = <0x04>;
+					phandle = <0x18>;
+				};
+
+				endpoint@2 {
+					remote-endpoint = <0x89>;
+					reg = <0x02>;
+					phandle = <0x96>;
+				};
+
+				endpoint@0 {
+					remote-endpoint = <0x87>;
+					reg = <0x00>;
+					phandle = <0x8e>;
+				};
+			};
+
+			port@2 {
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				reg = <0x02>;
+				phandle = <0x166>;
+
+				endpoint@1 {
+					remote-endpoint = <0x8d>;
+					reg = <0x01>;
+					phandle = <0x19>;
+				};
+
+				endpoint@0 {
+					remote-endpoint = <0x8c>;
+					reg = <0x00>;
+					phandle = <0x2f>;
+				};
+			};
+		};
+	};
+
+	serial@fe660000 {
+		reg-io-width = <0x04>;
+		pinctrl-names = "default";
+		pinctrl-0 = <0xd8>;
+		clock-names = "baudclk\0apb_pclk";
+		interrupts = <0x00 0x76 0x04>;
+		clocks = <0x1f 0x123 0x1f 0x120>;
+		compatible = "rockchip,rk3568-uart\0snps,dw-apb-uart";
+		status = "disabled";
+		reg = <0x00 0xfe660000 0x00 0x100>;
+		phandle = <0x191>;
+		dmas = <0x40 0x04 0x40 0x05>;
+		reg-shift = <0x02>;
+	};
+
+	dmc-opp-table {
+		nvmem-cells = <0x99 0x07 0x08>;
+		rockchip,low-temp = <0x00>;
+		rockchip,leakage-voltage-sel = <0x01 0x50 0x00 0x51 0xfe 0x01>;
+		rockchip,low-temp-adjust-volt = <0x00 0x618 0x61a8>;
+		compatible = "operating-points-v2";
+		nvmem-cell-names = "leakage\0pvtm\0mbist-vmin";
+		phandle = <0x98>;
+		rockchip,temp-hysteresis = <0x1388>;
+		mbist-vmin = <0xc96a8 0xdbba0 0xe7ef0>;
+
+		opp-1560000000 {
+			opp-microvolt = <0xdbba0>;
+			opp-hz = <0x00 0x5cfbb600>;
+			opp-microvolt-L0 = <0xdbba0>;
+			opp-microvolt-L1 = <0xcf850>;
+		};
+	};
+
+	rkcif_dvp {
+		rockchip,hw = <0x72>;
+		compatible = "rockchip,rkcif-dvp";
+		status = "disabled";
+		phandle = <0x73>;
+	};
+
+	rkcif_mipi_lvds {
+		rockchip,hw = <0x72>;
+		compatible = "rockchip,rkcif-mipi-lvds";
+		status = "disabled";
+		phandle = <0x74>;
+	};
+
+	eink@fdf00000 {
+		clock-names = "pclk\0hclk";
+		interrupts = <0x00 0xb2 0x04>;
+		clocks = <0x1f 0xff 0x1f 0x100>;
+		compatible = "rockchip,rk3568-eink-tcon";
+		status = "disabled";
+		reg = <0x00 0xfdf00000 0x00 0x74>;
+		phandle = <0x159>;
+	};
+
+	vcc-sys {
+		regulator-max-microvolt = <0x4c4b40>;
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-min-microvolt = <0x4c4b40>;
+		regulator-name = "vcc_sys";
+		compatible = "regulator-fixed";
+		phandle = <0x35>;
+	};
+
+	pwm@fe6f0000 {
+		pinctrl-names = "active";
+		pinctrl-0 = <0xe4>;
+		clock-names = "pwm\0pclk";
+		clocks = <0x1f 0x15d 0x1f 0x15c>;
+		#pwm-cells = <0x03>;
+		compatible = "rockchip,rk3568-pwm\0rockchip,rk3328-pwm";
+		status = "disabled";
+		reg = <0x00 0xfe6f0000 0x00 0x10>;
+		phandle = <0x19d>;
+	};
+
+	memory {
+		device_type = "memory";
+		reg = <0x00 0x200000 0x00 0xefe00000 0x01 0xf0000000 0x00 0x10000000>;
+	};
+
+	qos@fe198000 {
+		compatible = "syscon";
+		reg = <0x00 0xfe198000 0x00 0x20>;
+		phandle = <0x55>;
+	};
+
+	cpu0-opp-table {
+		rockchip,pvtm-sample-time = <0x3e8>;
+		rockchip,pvtm-ch = <0x00 0x05>;
+		nvmem-cells = <0x06 0x07 0x08>;
+		rockchip,pvtm-number = <0x0a>;
+		rockchip,low-temp = <0x00>;
+		opp-shared;
+		rockchip,pvtm-freq = <0x639c0>;
+		rockchip,pvtm-ref-temp = <0x28>;
+		rockchip,thermal-zone = "soc-thermal";
+		rockchip,low-temp-adjust-volt = <0x00 0x648 0x124f8>;
+		compatible = "operating-points-v2";
+		nvmem-cell-names = "leakage\0pvtm\0mbist-vmin";
+		rockchip,pvtm-voltage-sel = <0x00 0x14050 0x00 0x14051 0x16b48 0x01 0x16b49 0x186a0 0x02>;
+		phandle = <0x03>;
+		rockchip,pvtm-temp-prop = <0x1a 0x1a>;
+		rockchip,temp-hysteresis = <0x1388>;
+		rockchip,pvtm-error = <0x3e8>;
+		mbist-vmin = <0xc96a8 0xdbba0 0xe7ef0>;
+		rockchip,avs-scale = <0x1a>;
+		rockchip,pvtm-volt = <0xdbba0>;
+
+		opp-1800000000 {
+			opp-microvolt = <0x100590 0x100590 0x100590>;
+			opp-hz = <0x00 0x6b49d200>;
+			clock-latency-ns = <0x61a80>;
+		};
+
+		opp-1608000000 {
+			opp-microvolt = <0xf4240 0xf4240 0xf4240>;
+			opp-hz = <0x00 0x5fd82200>;
+			clock-latency-ns = <0x9c40>;
+		};
+
+		opp-1104000000 {
+			opp-microvolt = <0xc96a8 0xc96a8 0x118c30>;
+			opp-hz = <0x00 0x41cdb400>;
+			clock-latency-ns = <0x9c40>;
+		};
+
+		opp-816000000 {
+			opp-microvolt = <0xc96a8 0xc96a8 0x118c30>;
+			opp-hz = <0x00 0x30a32c00>;
+			opp-suspend;
+			clock-latency-ns = <0x9c40>;
+		};
+
+		opp-600000000 {
+			opp-microvolt = <0xc96a8 0xc96a8 0x118c30>;
+			opp-hz = <0x00 0x23c34600>;
+			clock-latency-ns = <0x9c40>;
+		};
+
+		opp-1416000000 {
+			opp-microvolt = <0xe1d48 0xe1d48 0x118c30>;
+			opp-hz = <0x00 0x54667200>;
+			clock-latency-ns = <0x9c40>;
+		};
+
+		opp-408000000 {
+			opp-microvolt = <0xc96a8 0xc96a8 0x118c30>;
+			opp-hz = <0x00 0x18519600>;
+			clock-latency-ns = <0x9c40>;
+		};
+	};
+
+	i2s2-mclkin {
+		clock-output-names = "i2s2_mclkin";
+		#clock-cells = <0x00>;
+		clock-frequency = <0xbb8000>;
+		compatible = "fixed-clock";
+		phandle = <0x12a>;
+	};
+
+	pvtm@fde90000 {
+		#address-cells = <0x01>;
+		#size-cells = <0x00>;
+		compatible = "rockchip,rk3568-npu-pvtm";
+		reg = <0x00 0xfde90000 0x00 0x100>;
+
+		pvtm@2 {
+			clock-names = "clk\0pclk\0hclk";
+			thermal-zone = "soc-thermal";
+			resets = <0x1f 0x2e 0x1f 0x2d>;
+			clocks = <0x1f 0x2b 0x1f 0x2a 0x1f 0x25>;
+			reg = <0x02>;
+			reset-names = "rts\0rst-p";
+		};
+	};
+
+	wireless-wlan {
+		pinctrl-names = "default";
+		pinctrl-0 = <0x109>;
+		WIFI,host_wake_irq = <0x108 0x0a 0x00>;
+		wifi_chip_type = "ap6256";
+		compatible = "wlan-platdata";
+		status = "disabled";
+		rockchip,grf = <0x32>;
+		phandle = <0x2a0>;
+	};
+
+	rockchip-system-monitor {
+		rockchip,thermal-zone = "soc-thermal";
+		compatible = "rockchip,system-monitor";
+		phandle = <0x120>;
+	};
+
+	usbhost {
+		#address-cells = <0x02>;
+		clock-names = "ref_clk\0suspend_clk\0bus_clk\0pipe_clk";
+		clocks = <0x1f 0xa9 0x1f 0xaa 0x1f 0xa8 0x1f 0x7f>;
+		#size-cells = <0x02>;
+		compatible = "rockchip,rk3568-dwc3\0rockchip,rk3399-dwc3";
+		ranges;
+		status = "okay";
+		phandle = <0x133>;
+
+		dwc3@fd000000 {
+			power-domains = <0x21 0x0f>;
+			snps,dis_enblslpm_quirk;
+			phy-names = "usb2-phy\0usb3-phy";
+			snps,dis-u2-freeclk-exists-quirk;
+			phy_type = "utmi_wide";
+			resets = <0x1f 0x95>;
+			interrupts = <0x00 0xaa 0x04>;
+			compatible = "snps,dwc3";
+			snps,dis-del-phy-power-chg-quirk;
+			status = "okay";
+			snps,xhci-trb-ent-quirk;
+			phys = <0x25 0x20 0x04>;
+			reg = <0x00 0xfd000000 0x00 0x400000>;
+			phandle = <0x134>;
+			dr_mode = "host";
+			reset-names = "usb3-host";
+			snps,dis-tx-ipgap-linecheck-quirk;
+		};
+	};
+
+	crypto@fe380000 {
+		clock-names = "aclk\0hclk\0sclk\0apb_pclk";
+		assigned-clocks = <0x1f 0x6c>;
+		assigned-clock-rates = <0xbebc200>;
+		resets = <0x1f 0x69>;
+		interrupts = <0x00 0x04 0x04>;
+		clocks = <0x1f 0x6a 0x1f 0x6b 0x1f 0x6c 0x1f 0x6d>;
+		compatible = "rockchip,rk3568-crypto";
+		status = "disabled";
+		reg = <0x00 0xfe380000 0x00 0x4000>;
+		phandle = <0x175>;
+		reset-names = "crypto-rst";
+	};
+
+	can@fe580000 {
+		clock-names = "baudclk\0apb_pclk";
+		resets = <0x1f 0x157 0x1f 0x156>;
+		interrupts = <0x00 0x02 0x04>;
+		clocks = <0x1f 0x143 0x1f 0x142>;
+		compatible = "rockchip,canfd-1.0";
+		status = "disabled";
+		tx-fifo-depth = <0x01>;
+		rx-fifo-depth = <0x06>;
+		reg = <0x00 0xfe580000 0x00 0x1000>;
+		phandle = <0x181>;
+		reset-names = "can\0can-apb";
+	};
+};

From 02a4741126330751034a1c0f3e5c5f27ffd85db6 Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Wed, 6 Nov 2024 20:06:25 +0800
Subject: [PATCH 062/107] rockchip64-edge: bump to 6.12

---
 .../families/include/rockchip64_common.inc    |   2 +-
 .../rk3308-0002-iodomains.patch               | 159 ------------------
 .../rk3328-dtsi-mmc-reset-properties.patch    |  43 -----
 .../rk3328-dtsi-sdmmc-ext-node.patch          |  37 ----
 .../0000.patching_config.yaml                 |   6 +-
 .../0001-tools-disable-sched_ext_clean.patch  |  25 +++
 .../add-board-fine3399-dts.patch              |   3 +-
 .../add-board-helios64.patch                  |   0
 .../board-firefly-rk3399-dts.patch            |   0
 ...rd-helios64-dts-fix-stability-issues.patch |   0
 .../board-helios64-remove-pcie-ep-gpios.patch |   0
 .../board-nanopc-t4-add-typec-dp.patch        |   0
 ...board-nanopi-m4v2-dts-add-sound-card.patch |   0
 .../board-nanopi-r2c-plus.patch               |   0
 .../board-nanopi-r2s.patch                    |  14 +-
 .../board-nanopi-r4s-pwmfan.patch             |   0
 .../board-orangepi-r1-plus.patch              |   0
 .../board-orangepi-rk3399-pcie.patch          |   0
 ...orangepi3b-add-uwe5622-wifi-bt-nodes.patch |   0
 .../board-pbp-add-dp-alt-mode.patch           |   0
 .../board-radxa-e25-sdmmc0-fix.patch          |   0
 .../board-radxa-e25-usb3-and-emmc-fix.patch   |   0
 .../board-rk3328-roc-cc-dts-enable-dmc.patch  |   0
 .../board-rk3328-roc-cc-dts-ram-profile.patch |   0
 .../board-rk3328-roc-pc-dts-ram-profile.patch |   0
 .../board-rk3328-roc-pc.patch                 |   0
 .../board-rock3a-0001-emmc-sfc.patch          |   0
 .../board-rock3a-0002-usb3.patch              |   0
 .../board-rock3a-0003-add-gpio-names.patch    |   0
 .../board-rock64-mail-supply.patch            |   0
 .../board-rockpi3-enable-dmc.patch            |   0
 .../board-rockpi4-0003-arm64-dts-pcie.patch   |   0
 ...s-rockchip-fix-gmac-PHY-attach-error.patch |   0
 ...oard-rockpis-0001-arm64-dts.patch.disabled |   0
 ...s-rk3308-Add-gmac-node-at-dtsi-level.patch |   0
 ...ip-add-cpu-s-thermal-config-for-rk33.patch |   0
 ...ockchip-add-tsadc-support-for-rk3308.patch |   0
 ...chip-add-i2s_8ch-for-rk3308.patch.disabled |   0
 ...12-arm64-dts-rk3308-Add-rk-timer-rtc.patch |   0
 ...K3308-internal-codec-driver.patch.disabled |   0
 ...nc-rk3308_codec-to-BSP-tree.patch.disabled |   0
 ...-Add-acodec-node-for-rk3308.patch.disabled |   0
 ...-replace-codec-to-component.patch.disabled |   0
 ...s-rk3308-add-reserved-memory-ramoops.patch |   0
 ...ckpro64-0001-Add-pcie-bus-scan-delay.patch |   0
 ...d-rockpro64-change-rx_delay-for-gmac.patch |   0
 .../board-rockpro64-fix-emmc.patch            |   0
 ...board-rockpro64-fix-spi1-flash-speed.patch |   0
 .../board-rockpro64-work-led-heartbeat.patch  |   0
 .../board-rocks0-0001-deviceTree.patch        |   0
 .../board-station-p2.patch                    |   0
 .../drv-spi-spidev-remove-warnings.patch      |   0
 .../dt/rk3308-sakurapi-rk3308b.dts            |   0
 .../dt/rk3318-box.dts                         |   0
 .../dt/rk3328-heltec.dts                      |   0
 .../dt/rk3328-nanopi-neo3-rev02.dts           |   0
 .../dt/rk3328-nanopi-r2-rev00.dts             |   0
 .../dt/rk3328-nanopi-r2-rev06.dts             |   0
 .../dt/rk3328-nanopi-r2-rev20.dts             |   0
 .../dt/rk3328-z28pro.dts                      |   0
 .../dt/rk3399-nanopi-m4v2.dts                 |   0
 .../dt/rk3399-nanopi-r4se.dts                 |   0
 .../dt/rk3399-orangepi-4-lts.dts              |   1 -
 .../dt/rk3399-orangepi-4.dts                  |   1 -
 .../dt/rk3399-rock-pi-4.dts                   |   0
 .../dt/rk3399-tinker-2.dts                    |   2 +-
 .../dt/rk3399-xiaobao-nas.dts                 |   1 -
 .../dt/rk3566-firefly-roc-pc.dts              |   0
 .../dt/rk3566-h96-tvbox.dts                   |   0
 .../dt/rk3566-jp-tvbox.dts                    |   0
 .../dt/rk3566-panther-x2.dts                  |   0
 .../dt/rk3566-radxa-zero-3.dtsi               |   0
 .../dt/rk3568-hinlink-h66k.dts                |   0
 .../dt/rk3568-hinlink-h68k.dts                |   0
 .../dt/rk3568-mixtile-edge2.dts               |   0
 .../general-add-miniDP-dt-doc.patch           |   0
 .../general-add-miniDP-virtual-extcon.patch   |   0
 ...eral-add-overlay-compilation-support.patch |  41 +++--
 .../general-add-overlay-configfs.patch        |   0
 .../general-add-panel-simple-dsi.patch        |   0
 .../general-add-pll-hdmi-timings.patch        |   0
 .../general-add-xtx-spi-nor-chips.patch       |   0
 .../general-cryptov1-trng.patch               |   0
 .../general-disable-mtu-validation.patch      |   0
 .../general-driver-tm16xx-led-driver.patch    |   0
 .../general-fix-es8316-kernel-panic.patch     |   0
 .../general-fix-inno-usb2-phy-init.patch      |   0
 ...fix-mmc-signal-voltage-before-reboot.patch |   0
 .../general-hdmi-clock-fixes.patch            |   0
 ..._DMA_block_memory_allocation_to_2048.patch |   0
 .../general-legacy-rockchip-hwrng.patch       |   0
 .../general-legacy-rockchip-hwrng_5.10.patch  |   0
 ...l-possibility-of-disabling-rk808-rtc.patch |   0
 .../general-rk3328-dtsi-trb-ent-quirk.patch   |   0
 ...08-configurable-switch-voltage-steps.patch |   0
 .../general-rockchip-overlays.patch           |   0
 .../general-rt5651-add-mclk.patch             |   0
 .../general-v4l2-iep-driver.patch             |   8 +-
 .../general-v4l2-rkvdec-00-fixes.patch        |   0
 .../general-v4l2-rkvdec-01-vp9.patch          |   0
 .../general-v4l2-rkvdec-02-hevc.patch         |   0
 ...eneral-workaround-broadcom-bt-serdev.patch |   0
 .../kernel-6.8-tools-cgroup-makefile.patch    |   0
 .../media-0001-Add-rkvdec2-Support-v3.patch   |   0
 ...Initialize-h264-frame_mbs_only_flag-.patch |   0
 ...edia-0003-rk3568-disable-hantro-h264.patch |   2 +-
 ...-r8152-add-LED-configuration-from-OF.patch |   0
 .../overlay/Makefile                          |   0
 .../overlay/README.rockchip-overlays          |   0
 .../overlay/rk3308-b@1.3ghz.dtso              |   0
 .../overlay/rk3308-bs.dtso                    |   0
 .../overlay/rk3308-bs@1.3ghz.dtso             |   0
 .../overlay/rk3308-emmc.dtso                  |   0
 .../overlay/rk3308-s0-ext-antenna.dtso        |   0
 .../overlay/rk3308-sdio@10mhz.dtso            |   0
 .../overlay/rk3308-sdio@4mhz.dtso             |   0
 .../overlay/rockchip-fixup.scr-cmd            |   0
 .../overlay/rockchip-rk3318-box-cpu-hs.dtso   |   0
 .../overlay/rockchip-rk3318-box-emmc-ddr.dtso |   0
 .../rockchip-rk3318-box-emmc-hs200.dtso       |   0
 .../rockchip-rk3318-box-led-conf1.dtso        |   0
 .../rockchip-rk3318-box-led-conf2.dtso        |   0
 .../rockchip-rk3318-box-led-conf3.dtso        |   0
 .../rockchip-rk3318-box-led-conf4.dtso        |   0
 .../rockchip-rk3318-box-led-conf5.dtso        |   0
 .../rockchip-rk3318-box-wlan-ap6330.dtso      |   0
 .../rockchip-rk3318-box-wlan-ap6334.dtso      |   0
 .../overlay/rockchip-rk3318-box-wlan-ext.dtso |   0
 .../overlay/rockchip-rk3328-i2c0.dtso         |   0
 .../overlay/rockchip-rk3328-i2s1-pcm5102.dtso |   0
 .../overlay/rockchip-rk3328-opp-1.4ghz.dtso   |   0
 .../overlay/rockchip-rk3328-opp-1.5ghz.dtso   |   0
 .../overlay/rockchip-rk3328-spi-spidev.dtso   |   0
 .../overlay/rockchip-rk3328-uart1.dtso        |   0
 .../overlay/rockchip-rk3399-dwc3-0-host.dtso  |   0
 .../overlay/rockchip-rk3399-i2c7.dtso         |   0
 .../overlay/rockchip-rk3399-i2c8.dtso         |   0
 .../overlay/rockchip-rk3399-opp-2ghz.dtso     |   0
 .../overlay/rockchip-rk3399-pcie-gen2.dtso    |   0
 .../rockchip-rk3399-spi-jedec-nor.dtso        |   0
 .../overlay/rockchip-rk3399-spi-spidev.dtso   |   0
 .../overlay/rockchip-rk3399-uart4.dtso        |   0
 .../overlay/rockchip-rk3399-w1-gpio.dtso      |   0
 .../overlay/rockchip-rk3566-sata2.dtso        |   0
 .../overlay/rockchip-rk3568-hk-i2c0.dtso      |   0
 .../overlay/rockchip-rk3568-hk-i2c1.dtso      |   0
 .../overlay/rockchip-rk3568-hk-pwm1.dtso      |   0
 .../overlay/rockchip-rk3568-hk-pwm2.dtso      |   0
 .../overlay/rockchip-rk3568-hk-pwm9.dtso      |   0
 .../rockchip-rk3568-hk-spi-spidev.dtso        |   0
 .../rockchip-rk3568-hk-uart0-rts_cts.dtso     |   0
 .../overlay/rockchip-rk3568-hk-uart0.dtso     |   0
 .../overlay/rockchip-rk3568-hk-uart1.dtso     |   0
 .../rockchip-rk3568-nanopi-r5c-leds.dtso      |   0
 .../rockchip-rk3568-nanopi-r5s-leds.dtso      |   0
 ...rockchip-rk3568-rock-3a-disable-uart2.dtso |   0
 .../rockchip-rockpi4cplus-usb-host.dtso       |   0
 .../overlay/rockchip-rockpro64-lcd.dtso       |   0
 .../regulator-add-fan53200-driver.patch       |   0
 .../rk3308-0001-pinctrl-slew-mux.patch        |   0
 ...3308-0003-pinctrl-io-voltage-domains.patch |  11 +-
 .../rk3308-add-missing-i2s-controllers.patch  |   0
 .../rk3328-add-dmc-driver.patch               |   0
 .../rk3328-add-rga-node.patch                 |   0
 .../rk3328-dtsi-mali-opp-table.patch          |   0
 .../rk3328-dtsi-spdif.patch                   |   0
 .../rk3328-dtsi-usb3-reset-properties.patch   |   0
 .../rk3328-gpu-cooling-target.patch           |   0
 .../rk3328-roc-cc-add-missing-nodes.patch     |   0
 .../rk3399-add-sclk-i2sout-src-clock.patch    |   0
 .../rk3399-dmc-polling-rate.patch             |   0
 ...k3399-enable-dwc3-xhci-usb-trb-quirk.patch |   8 +-
 .../rk3399-fix-pci-phy.patch                  |   0
 .../rk3399-fix-usb-phy.patch                  |   0
 ...plement-rockchip-PCIe-bus-scan-delay.patch |   0
 .../rk3399-sd-drive-level-8ma.patch           |   8 +-
 .../rk3399-sd-pwr-pinctrl.patch               |   8 +-
 .../rk3399-unlock-temperature.patch           |   8 +-
 .../rk356x-add-rkvdec2-support.patch          |   0
 .../rk35xx-montjoie-crypto-v2-rk35xx.patch    |   2 +-
 .../wifi-4003-add-bcm43342-chip.patch         |   0
 .../wifi-4003-ssv-6051-driver.patch           |   0
 182 files changed, 77 insertions(+), 313 deletions(-)
 delete mode 100644 patch/kernel/archive/rockchip64-6.11/rk3308-0002-iodomains.patch
 delete mode 100644 patch/kernel/archive/rockchip64-6.11/rk3328-dtsi-mmc-reset-properties.patch
 delete mode 100644 patch/kernel/archive/rockchip64-6.11/rk3328-dtsi-sdmmc-ext-node.patch
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/0000.patching_config.yaml (96%)
 create mode 100644 patch/kernel/archive/rockchip64-6.12/0001-tools-disable-sched_ext_clean.patch
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/add-board-fine3399-dts.patch (99%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/add-board-helios64.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-firefly-rk3399-dts.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-helios64-dts-fix-stability-issues.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-helios64-remove-pcie-ep-gpios.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-nanopc-t4-add-typec-dp.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-nanopi-m4v2-dts-add-sound-card.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-nanopi-r2c-plus.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-nanopi-r2s.patch (97%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-nanopi-r4s-pwmfan.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-orangepi-r1-plus.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-orangepi-rk3399-pcie.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-pbp-add-dp-alt-mode.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-radxa-e25-sdmmc0-fix.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-radxa-e25-usb3-and-emmc-fix.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rk3328-roc-cc-dts-enable-dmc.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rk3328-roc-cc-dts-ram-profile.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rk3328-roc-pc-dts-ram-profile.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rk3328-roc-pc.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rock3a-0001-emmc-sfc.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rock3a-0002-usb3.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rock3a-0003-add-gpio-names.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rock64-mail-supply.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpi3-enable-dmc.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpi4-0003-arm64-dts-pcie.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpie-0001-arm64-dts-rockchip-fix-gmac-PHY-attach-error.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpis-0001-arm64-dts.patch.disabled (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpis-0005-arm64-dts-rk3308-Add-gmac-node-at-dtsi-level.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch.disabled (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch.disabled (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpis-0019-Sync-rk3308_codec-to-BSP-tree.patch.disabled (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpis-0020-arm64-dts-rockchip-Add-acodec-node-for-rk3308.patch.disabled (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpis-0022-ASoC-rk3308_codec-replace-codec-to-component.patch.disabled (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpro64-change-rx_delay-for-gmac.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpro64-fix-emmc.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpro64-fix-spi1-flash-speed.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rockpro64-work-led-heartbeat.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-rocks0-0001-deviceTree.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/board-station-p2.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/drv-spi-spidev-remove-warnings.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3308-sakurapi-rk3308b.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3318-box.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3328-heltec.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3328-nanopi-neo3-rev02.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3328-nanopi-r2-rev00.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3328-nanopi-r2-rev06.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3328-nanopi-r2-rev20.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3328-z28pro.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3399-nanopi-m4v2.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3399-nanopi-r4se.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3399-orangepi-4-lts.dts (99%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3399-orangepi-4.dts (99%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3399-rock-pi-4.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3399-tinker-2.dts (99%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3399-xiaobao-nas.dts (99%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3566-firefly-roc-pc.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3566-h96-tvbox.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3566-jp-tvbox.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3566-panther-x2.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3566-radxa-zero-3.dtsi (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3568-hinlink-h66k.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3568-hinlink-h68k.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/dt/rk3568-mixtile-edge2.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-add-miniDP-dt-doc.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-add-miniDP-virtual-extcon.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-add-overlay-compilation-support.patch (65%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-add-overlay-configfs.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-add-panel-simple-dsi.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-add-pll-hdmi-timings.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-add-xtx-spi-nor-chips.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-cryptov1-trng.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-disable-mtu-validation.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-driver-tm16xx-led-driver.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-fix-es8316-kernel-panic.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-fix-inno-usb2-phy-init.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-fix-mmc-signal-voltage-before-reboot.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-hdmi-clock-fixes.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-increasing_DMA_block_memory_allocation_to_2048.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-legacy-rockchip-hwrng.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-legacy-rockchip-hwrng_5.10.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-possibility-of-disabling-rk808-rtc.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-rk3328-dtsi-trb-ent-quirk.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-rk808-configurable-switch-voltage-steps.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-rockchip-overlays.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-rt5651-add-mclk.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-v4l2-iep-driver.patch (99%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-v4l2-rkvdec-00-fixes.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-v4l2-rkvdec-01-vp9.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-v4l2-rkvdec-02-hevc.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/general-workaround-broadcom-bt-serdev.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/kernel-6.8-tools-cgroup-makefile.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/media-0001-Add-rkvdec2-Support-v3.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/media-0002-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/media-0003-rk3568-disable-hantro-h264.patch (98%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/net-usb-r8152-add-LED-configuration-from-OF.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/Makefile (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/README.rockchip-overlays (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rk3308-b@1.3ghz.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rk3308-bs.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rk3308-bs@1.3ghz.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rk3308-emmc.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rk3308-s0-ext-antenna.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rk3308-sdio@10mhz.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rk3308-sdio@4mhz.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-fixup.scr-cmd (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3318-box-cpu-hs.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3318-box-emmc-ddr.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3318-box-emmc-hs200.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3318-box-led-conf1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3318-box-led-conf2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3318-box-led-conf3.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3318-box-led-conf4.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3318-box-led-conf5.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3318-box-wlan-ap6330.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3318-box-wlan-ap6334.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3318-box-wlan-ext.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3328-i2c0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3328-i2s1-pcm5102.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3328-opp-1.4ghz.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3328-opp-1.5ghz.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3328-spi-spidev.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3328-uart1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3399-dwc3-0-host.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3399-i2c7.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3399-i2c8.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3399-opp-2ghz.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3399-pcie-gen2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3399-spi-jedec-nor.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3399-spi-spidev.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3399-uart4.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3399-w1-gpio.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3566-sata2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3568-hk-i2c0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3568-hk-i2c1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3568-hk-pwm1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3568-hk-pwm2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3568-hk-pwm9.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3568-hk-spi-spidev.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3568-hk-uart0-rts_cts.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3568-hk-uart0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3568-hk-uart1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3568-nanopi-r5c-leds.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3568-nanopi-r5s-leds.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rockpi4cplus-usb-host.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/overlay/rockchip-rockpro64-lcd.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/regulator-add-fan53200-driver.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3308-0001-pinctrl-slew-mux.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3308-0003-pinctrl-io-voltage-domains.patch (95%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3308-add-missing-i2s-controllers.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3328-add-dmc-driver.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3328-add-rga-node.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3328-dtsi-mali-opp-table.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3328-dtsi-spdif.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3328-dtsi-usb3-reset-properties.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3328-gpu-cooling-target.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3328-roc-cc-add-missing-nodes.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3399-add-sclk-i2sout-src-clock.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3399-dmc-polling-rate.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch (96%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3399-fix-pci-phy.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3399-fix-usb-phy.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3399-sd-drive-level-8ma.patch (97%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3399-sd-pwr-pinctrl.patch (65%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk3399-unlock-temperature.patch (96%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk356x-add-rkvdec2-support.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/rk35xx-montjoie-crypto-v2-rk35xx.patch (99%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/wifi-4003-add-bcm43342-chip.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.11 => rockchip64-6.12}/wifi-4003-ssv-6051-driver.patch (100%)

diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc
index 9382a30d332e..39e355ab8298 100644
--- a/config/sources/families/include/rockchip64_common.inc
+++ b/config/sources/families/include/rockchip64_common.inc
@@ -33,7 +33,7 @@ case $BRANCH in
 		;;
 
 	edge)
-		declare -g KERNEL_MAJOR_MINOR="6.11"
+		declare -g KERNEL_MAJOR_MINOR="6.12"
 		declare -g LINUXFAMILY=rockchip64
 		declare -g LINUXCONFIG='linux-rockchip64-'$BRANCH
 		;;
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3308-0002-iodomains.patch b/patch/kernel/archive/rockchip64-6.11/rk3308-0002-iodomains.patch
deleted file mode 100644
index 4700fbd988b3..000000000000
--- a/patch/kernel/archive/rockchip64-6.11/rk3308-0002-iodomains.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: brentr <brent@mbari.org>
-Date: Thu, 13 Oct 2022 18:34:43 +0200
-Subject: [ARCHEOLOGY] Rockpis wifi fixes (#4008)
-
-> X-Git-Archeology: > recovered message: > * RockPI-S board has no video I/O
-> X-Git-Archeology: > recovered message: > * udev rule to fix MAC address of iface based on UUID
-> X-Git-Archeology: > recovered message: > Deals with WiFi chip lacking any EEPROM to store its unique Ethernet MAC address
-> X-Git-Archeology: > recovered message: > Generic mechanism -- could be utilized for other boards having similar issues
-> X-Git-Archeology: > recovered message: > * Handy Device Tree overlays for the RockPI S
-> X-Git-Archeology: > recovered message: > Use armbian-add-overlay to install these
-> X-Git-Archeology: > recovered message: > Reduce CPU voltage for the RK3308 B-S
-> X-Git-Archeology: > recovered message: > Option to overclock RK3308 B-S to 1.3Ghz
-> X-Git-Archeology: > recovered message: > Increase SDIO clock rate from 1Mhz to 10Mhz
-> X-Git-Archeology: > recovered message: > This increases WiFi throughput from 300K bytes/s to 2.4M bytes/s
-> X-Git-Archeology: > recovered message: > * corrected comment
-> X-Git-Archeology: > recovered message: > * No longer repeat standard opp's in this dts
-> X-Git-Archeology: > recovered message: > Require that the standard bs dts already be installed
-> X-Git-Archeology: > recovered message: > * User README for adding RockPI-S board variant specific dts overlays
-> X-Git-Archeology: > recovered message: > * "enabled" --> "okay"
-> X-Git-Archeology: > recovered message: > * added mention of sdnand.dts, fixed typo
-> X-Git-Archeology: > recovered message: > * added p2p0 to interfaces whose MAC address should be "fixed"
-> X-Git-Archeology: > recovered message: > * RK3308 CPU serial number in nvmem replaces UUID for derivation of fixed MAC addr
-> X-Git-Archeology: > recovered message: > Restored use of install utility
-> X-Git-Archeology: > recovered message: > * Use RK3308 specific CPU serial number
-> X-Git-Archeology: > recovered message: > rather than rootfs UUID
-> X-Git-Archeology: > recovered message: > * remove generic fixMACaddress
-> X-Git-Archeology: > recovered message: > * Install fixMACaddr file-by-file via install utility
-> X-Git-Archeology: > recovered message: > * Drive SDIO bus signals faster
-> X-Git-Archeology: > recovered message: > setting RK3308_SOC_CON0_VCCIO3 reduces signal rise/fall times to WiFi SDIO chip
-> X-Git-Archeology: > recovered message: > from 30ns to 5ns.
-> X-Git-Archeology: > recovered message: > This odd fix forward ported from legacy kernel.
-> X-Git-Archeology: > recovered message: > Allows Rock Pi-S WiFi to operate at full speed.
-> X-Git-Archeology: > recovered message: > * Set RK3308 I/O voltage domains before SDIO initializes
-> X-Git-Archeology: > recovered message: > This patch moves responibility form the io-domain to the pinctrl driver because
-> X-Git-Archeology: > recovered message: > the io-domain driver is probed after the SDIO devices are discovered.
-> X-Git-Archeology: > recovered message: > This was causing multiple SDIO I/O failures during boot.
-> X-Git-Archeology: > recovered message: > A new pinctrl property is added:
-> X-Git-Archeology: > recovered message: > io-1v8-domains
-> X-Git-Archeology: > recovered message: > is a u32 interpreted as a bit mask where each set bit corresponds to
-> X-Git-Archeology: > recovered message: > a 1.8V I/O domain (as opposed to the default of 3.3V for I/O)
-> X-Git-Archeology: > recovered message: > The mask is writted to the RK3308_SOC_CON0 GRF register
-> X-Git-Archeology: > recovered message: > (once) when the pinctrl driver starts
-> X-Git-Archeology: > recovered message: > The default mask is 0x10 where only I/O domain 4 runs at 1.8V
-> X-Git-Archeology: > recovered message: > This is necessary for the RockPI-S to run the SDIO clock at high (50Mhz) speed
-> X-Git-Archeology: > recovered message: > * align whitespace
-> X-Git-Archeology: > recovered message: > * factored rk3308bs overlays out up sdio speedup patch
-> X-Git-Archeology: > recovered message: > * factored dts for RK3308 iodomains and pinctrl patches out of speedup patch
-> X-Git-Archeology: > recovered message: > * remains of sdio speedup patch merely add iodomains support for rk3308
-> X-Git-Archeology: > recovered message: > * factored rockpis dts modification out from rk3308 io voltage domains
-> X-Git-Archeology: > recovered message: > replaced rk3308 support from iodomains with
-> X-Git-Archeology: > recovered message: > new io-voltage-domains property added to pinctrl
-> X-Git-Archeology: > recovered message: > io-voltage-domains specific to rk3308 for now, others SOCs may be added later.
-> X-Git-Archeology: > recovered message: > * add sequence numbering to names of rk3308 patches
-> X-Git-Archeology: > recovered message: > * corrected tab alignment
-> X-Git-Archeology: - Revision d3a3afe3850861ceaeb44f3631251c764a28cd43: https://github.com/armbian/build/commit/d3a3afe3850861ceaeb44f3631251c764a28cd43
-> X-Git-Archeology:   Date: Thu, 13 Oct 2022 18:34:43 +0200
-> X-Git-Archeology:   From: brentr <brent@mbari.org>
-> X-Git-Archeology:   Subject: Rockpis wifi fixes (#4008)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision 6765f734cc4a22aeaa9f99a3ad28c8c322de26f6: https://github.com/armbian/build/commit/6765f734cc4a22aeaa9f99a3ad28c8c322de26f6
-> X-Git-Archeology:   Date: Tue, 25 Oct 2022 11:26:51 +0200
-> X-Git-Archeology:   From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
-> X-Git-Archeology:   Subject: Bump rockchip64 edge to 6.0.y (#4337)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision 92f1a22d76b987afa7ba555d5b509adc51d689e7: https://github.com/armbian/build/commit/92f1a22d76b987afa7ba555d5b509adc51d689e7
-> X-Git-Archeology:   Date: Fri, 16 Dec 2022 13:38:13 +0100
-> X-Git-Archeology:   From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
-> X-Git-Archeology:   Subject: Re-add rockchip64 6.0 patches (#4575)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision 34ae84fac5d0b66a1ab2d1e51534b7beb13ef245: https://github.com/armbian/build/commit/34ae84fac5d0b66a1ab2d1e51534b7beb13ef245
-> X-Git-Archeology:   Date: Fri, 05 May 2023 14:22:00 +0200
-> X-Git-Archeology:   From: amazingfate <liujianfeng1994@gmail.com>
-> X-Git-Archeology:   Subject: bump rockchip64 edge to v6.3
-> X-Git-Archeology:
----
- drivers/soc/rockchip/io-domain.c | 45 ++++++++++
- 1 file changed, 45 insertions(+)
-
-diff --git a/drivers/soc/rockchip/io-domain.c b/drivers/soc/rockchip/io-domain.c
-index 111111111111..222222222222 100644
---- a/drivers/soc/rockchip/io-domain.c
-+++ b/drivers/soc/rockchip/io-domain.c
-@@ -39,6 +39,10 @@
- #define RK3288_SOC_CON2_FLASH0		BIT(7)
- #define RK3288_SOC_FLASH_SUPPLY_NUM	2
- 
-+#define RK3308_SOC_CON0			0x300
-+#define RK3308_SOC_CON0_VCCIO3		BIT(8)
-+#define RK3308_SOC_VCCIO3_SUPPLY_NUM	3
-+
- #define RK3328_SOC_CON4			0x410
- #define RK3328_SOC_CON4_VCCIO2		BIT(7)
- #define RK3328_SOC_VCCIO2_SUPPLY_NUM	1
-@@ -229,6 +233,30 @@ static void rk3288_iodomain_init(struct rockchip_iodomain *iod)
- 		dev_warn(iod->dev, "couldn't update flash0 ctrl\n");
- }
- 
-+static void rk3308_iodomain_init(struct rockchip_iodomain *iod)
-+{
-+	int ret;
-+	u32 val;
-+
-+	/* if no vccio3 supply we should leave things alone */
-+	if (!iod->supplies[RK3308_SOC_VCCIO3_SUPPLY_NUM].reg)
-+		return;
-+
-+	/*
-+	 * vccio3 iodomain voltage should be determined by GPIO4 input state
-+	 * RockPI-S uses this to drive the SDIO interface at 50Mhz
-+	 * (otherwise SDIO clock will be limited to 10Mhz)
-+	 *
-+	 * Note that setting vccio4 [rather than vccio3] is observed to reduce
-+	 * the rise time of SDIO-clk from 30ns to 5ns.
-+	 * The CON0_VCCIO3 control bit appears to influence vccio4.
-+	 */
-+	val = RK3308_SOC_CON0_VCCIO3 | (RK3308_SOC_CON0_VCCIO3 << 16);
-+	ret = regmap_write(iod->grf, RK3308_SOC_CON0, val);
-+	if (ret < 0)
-+		dev_warn(iod->dev, "couldn't update vccio3 vsel ctrl\n");
-+}
-+
- static void rk3328_iodomain_init(struct rockchip_iodomain *iod)
- {
- 	int ret;
-@@ -376,6 +404,19 @@ static const struct rockchip_iodomain_soc_data soc_data_rk3288 = {
- 	.init = rk3288_iodomain_init,
- };
- 
-+static const struct rockchip_iodomain_soc_data soc_data_rk3308 = {
-+	.grf_offset = 0x300,
-+	.supply_names = {
-+		"vccio0",
-+		"vccio1",
-+		"vccio2",
-+		"vccio3",
-+		"vccio4",
-+		"vccio5",
-+	},
-+	.init = rk3308_iodomain_init,
-+};
-+
- static const struct rockchip_iodomain_soc_data soc_data_rk3328 = {
- 	.grf_offset = 0x410,
- 	.supply_names = {
-@@ -528,6 +569,10 @@ static const struct of_device_id rockchip_iodomain_match[] = {
- 		.compatible = "rockchip,rk3288-io-voltage-domain",
- 		.data = &soc_data_rk3288
- 	},
-+	{
-+		.compatible = "rockchip,rk3308-io-voltage-domain",
-+		.data = &soc_data_rk3308
-+	},
- 	{
- 		.compatible = "rockchip,rk3328-io-voltage-domain",
- 		.data = &soc_data_rk3328
--- 
-Armbian
-
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3328-dtsi-mmc-reset-properties.patch b/patch/kernel/archive/rockchip64-6.11/rk3328-dtsi-mmc-reset-properties.patch
deleted file mode 100644
index f05361c2966c..000000000000
--- a/patch/kernel/archive/rockchip64-6.11/rk3328-dtsi-mmc-reset-properties.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Paolo Sabatino <paolo.sabatino@gmail.com>
-Date: Sat, 25 Sep 2021 13:35:13 +0000
-Subject: mmc reset properties
-
----
- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -1035,6 +1035,8 @@ sdmmc: mmc@ff500000 {
- 		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
- 			 <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
- 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
-+		resets = <&cru SRST_MMC0>;
-+		reset-names = "reset";
- 		fifo-depth = <0x100>;
- 		max-frequency = <150000000>;
- 		status = "disabled";
-@@ -1047,6 +1049,8 @@ sdio: mmc@ff510000 {
- 		clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
- 			 <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
- 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
-+		resets = <&cru SRST_SDIO>;
-+		reset-names = "reset";
- 		fifo-depth = <0x100>;
- 		max-frequency = <150000000>;
- 		status = "disabled";
-@@ -1059,6 +1063,8 @@ emmc: mmc@ff520000 {
- 		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
- 			 <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
- 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
-+		resets = <&cru SRST_EMMC>;
-+		reset-names = "reset";
- 		fifo-depth = <0x100>;
- 		max-frequency = <150000000>;
- 		status = "disabled";
--- 
-Armbian
-
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3328-dtsi-sdmmc-ext-node.patch b/patch/kernel/archive/rockchip64-6.11/rk3328-dtsi-sdmmc-ext-node.patch
deleted file mode 100644
index 549c9e590a96..000000000000
--- a/patch/kernel/archive/rockchip64-6.11/rk3328-dtsi-sdmmc-ext-node.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Paolo Sabatino <paolo.sabatino@gmail.com>
-Date: Sat, 25 Sep 2021 13:36:20 +0000
-Subject: sdmmc-ext node
-
----
- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 14 ++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -1070,6 +1070,20 @@ emmc: mmc@ff520000 {
- 		status = "disabled";
- 	};
- 
-+	sdmmc_ext: dwmmc@ff5f0000 {
-+		compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";
-+		reg = <0x0 0xff5f0000 0x0 0x4000>;
-+		interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
-+		clocks = <&cru HCLK_SDMMC_EXT>, <&cru SCLK_SDMMC_EXT>,
-+			 <&cru SCLK_SDMMC_EXT_DRV>, <&cru SCLK_SDMMC_EXT_SAMPLE>;
-+		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
-+		fifo-depth = <0x100>;
-+		max-frequency = <150000000>;
-+		resets = <&cru SRST_SDMMCEXT>;
-+		reset-names = "reset";
-+		status = "disabled";
-+	};
-+
- 	gmac2io: ethernet@ff540000 {
- 		compatible = "rockchip,rk3328-gmac";
- 		reg = <0x0 0xff540000 0x0 0x10000>;
--- 
-Armbian
-
diff --git a/patch/kernel/archive/rockchip64-6.11/0000.patching_config.yaml b/patch/kernel/archive/rockchip64-6.12/0000.patching_config.yaml
similarity index 96%
rename from patch/kernel/archive/rockchip64-6.11/0000.patching_config.yaml
rename to patch/kernel/archive/rockchip64-6.12/0000.patching_config.yaml
index 2bb9982256db..6c6598beaa2a 100644
--- a/patch/kernel/archive/rockchip64-6.11/0000.patching_config.yaml
+++ b/patch/kernel/archive/rockchip64-6.12/0000.patching_config.yaml
@@ -1,11 +1,11 @@
 config: # This is file 'patch/kernel/archive/rockchip64-6.8/0000.patching_config.yaml'
 
   # Just some info stuff; not used by the patching scripts
-  name: rockchip64-6.11
+  name: rockchip64-6.12
   kind: kernel
   type: mainline # or: vendor
-  branch: linux-6.11.y
-  last-known-good-tag: v6.11
+  branch: linux-6.12.y
+  last-known-good-tag: v6.12
   maintainers:
     - { github: rpardini, name: Ricardo Pardini, email: ricardo@pardini.net, armbian-forum: rpardini }
     - { github: paolosabatino, name: Paolo Sabatino, email: paolo.sabatino@gmail.com, armbian-forum: jock }
diff --git a/patch/kernel/archive/rockchip64-6.12/0001-tools-disable-sched_ext_clean.patch b/patch/kernel/archive/rockchip64-6.12/0001-tools-disable-sched_ext_clean.patch
new file mode 100644
index 000000000000..76015629920e
--- /dev/null
+++ b/patch/kernel/archive/rockchip64-6.12/0001-tools-disable-sched_ext_clean.patch
@@ -0,0 +1,25 @@
+From eb044a5c32274d48f0b62ab111213e930942b503 Mon Sep 17 00:00:00 2001
+From: amazingfate <liujianfeng1994@gmail.com>
+Date: Wed, 6 Nov 2024 19:57:53 +0800
+Subject: [PATCH] tools: disable sched_ext_clean
+
+---
+ tools/Makefile | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/tools/Makefile b/tools/Makefile
+index 278d24723..d84b76dbe 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -220,7 +220,6 @@ clean: acpi_clean counter_clean cpupower_clean hv_clean firewire_clean \
+ 		mm_clean bpf_clean iio_clean x86_energy_perf_policy_clean tmon_clean \
+ 		freefall_clean build_clean libbpf_clean libsubcmd_clean \
+ 		gpio_clean objtool_clean leds_clean wmi_clean pci_clean firmware_clean debugging_clean \
+-		intel-speed-select_clean tracing_clean thermal_clean thermometer_clean thermal-engine_clean \
+-		sched_ext_clean
++		intel-speed-select_clean tracing_clean thermal_clean thermometer_clean thermal-engine_clean
+ 
+ .PHONY: FORCE
+-- 
+2.43.0
+
diff --git a/patch/kernel/archive/rockchip64-6.11/add-board-fine3399-dts.patch b/patch/kernel/archive/rockchip64-6.12/add-board-fine3399-dts.patch
similarity index 99%
rename from patch/kernel/archive/rockchip64-6.11/add-board-fine3399-dts.patch
rename to patch/kernel/archive/rockchip64-6.12/add-board-fine3399-dts.patch
index aa05cc2aad74..c6dcea2a37c0 100644
--- a/patch/kernel/archive/rockchip64-6.11/add-board-fine3399-dts.patch
+++ b/patch/kernel/archive/rockchip64-6.12/add-board-fine3399-dts.patch
@@ -16,7 +16,7 @@ new file mode 100644
 index 000000000000..111111111111
 --- /dev/null
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-fine3399.dts
-@@ -0,0 +1,871 @@
+@@ -0,0 +1,870 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +
 +/dts-v1/;
@@ -24,7 +24,6 @@ index 000000000000..111111111111
 +#include <dt-bindings/pwm/pwm.h>
 +#include <dt-bindings/input/input.h>
 +#include "rk3399.dtsi"
-+#include "rk3399-opp.dtsi"
 +
 +
 +/ {
diff --git a/patch/kernel/archive/rockchip64-6.11/add-board-helios64.patch b/patch/kernel/archive/rockchip64-6.12/add-board-helios64.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/add-board-helios64.patch
rename to patch/kernel/archive/rockchip64-6.12/add-board-helios64.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-firefly-rk3399-dts.patch b/patch/kernel/archive/rockchip64-6.12/board-firefly-rk3399-dts.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-firefly-rk3399-dts.patch
rename to patch/kernel/archive/rockchip64-6.12/board-firefly-rk3399-dts.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-helios64-dts-fix-stability-issues.patch b/patch/kernel/archive/rockchip64-6.12/board-helios64-dts-fix-stability-issues.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-helios64-dts-fix-stability-issues.patch
rename to patch/kernel/archive/rockchip64-6.12/board-helios64-dts-fix-stability-issues.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-helios64-remove-pcie-ep-gpios.patch b/patch/kernel/archive/rockchip64-6.12/board-helios64-remove-pcie-ep-gpios.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-helios64-remove-pcie-ep-gpios.patch
rename to patch/kernel/archive/rockchip64-6.12/board-helios64-remove-pcie-ep-gpios.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-nanopc-t4-add-typec-dp.patch b/patch/kernel/archive/rockchip64-6.12/board-nanopc-t4-add-typec-dp.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-nanopc-t4-add-typec-dp.patch
rename to patch/kernel/archive/rockchip64-6.12/board-nanopc-t4-add-typec-dp.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-nanopi-m4v2-dts-add-sound-card.patch b/patch/kernel/archive/rockchip64-6.12/board-nanopi-m4v2-dts-add-sound-card.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-nanopi-m4v2-dts-add-sound-card.patch
rename to patch/kernel/archive/rockchip64-6.12/board-nanopi-m4v2-dts-add-sound-card.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-nanopi-r2c-plus.patch b/patch/kernel/archive/rockchip64-6.12/board-nanopi-r2c-plus.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-nanopi-r2c-plus.patch
rename to patch/kernel/archive/rockchip64-6.12/board-nanopi-r2c-plus.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-nanopi-r2s.patch b/patch/kernel/archive/rockchip64-6.12/board-nanopi-r2s.patch
similarity index 97%
rename from patch/kernel/archive/rockchip64-6.11/board-nanopi-r2s.patch
rename to patch/kernel/archive/rockchip64-6.12/board-nanopi-r2s.patch
index be57a4e711c9..8912e6abb683 100644
--- a/patch/kernel/archive/rockchip64-6.11/board-nanopi-r2s.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-nanopi-r2s.patch
@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm64/boo
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
-@@ -1,119 +1,167 @@
+@@ -1,119 +1,155 @@
  // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  /*
 - * Copyright (c) 2020 David Bauer <mail@david-bauer.net>
@@ -133,18 +133,6 @@ index 111111111111..222222222222 100644
 +		 * - PDN (power down when low)
 +		 */
 +		reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_LOW>;
-+	};
-+
-+	sdmmc_ext: dwmmc@ff5f0000 {
-+		compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";
-+		reg = <0x0 0xff5f0000 0x0 0x4000>;
-+		clock-freq-min-max = <400000 150000000>;
-+		clocks = <&cru HCLK_SDMMC_EXT>, <&cru SCLK_SDMMC_EXT>,
-+			 <&cru SCLK_SDMMC_EXT_DRV>, <&cru SCLK_SDMMC_EXT_SAMPLE>;
-+		clock-names = "biu", "ciu", "ciu-drv", "ciu-sample";
-+		fifo-depth = <0x100>;
-+		interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
-+		status = "disabled";
  	};
  
  	vcc_sd: sdmmc-regulator {
diff --git a/patch/kernel/archive/rockchip64-6.11/board-nanopi-r4s-pwmfan.patch b/patch/kernel/archive/rockchip64-6.12/board-nanopi-r4s-pwmfan.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-nanopi-r4s-pwmfan.patch
rename to patch/kernel/archive/rockchip64-6.12/board-nanopi-r4s-pwmfan.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-orangepi-r1-plus.patch b/patch/kernel/archive/rockchip64-6.12/board-orangepi-r1-plus.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-orangepi-r1-plus.patch
rename to patch/kernel/archive/rockchip64-6.12/board-orangepi-r1-plus.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-orangepi-rk3399-pcie.patch b/patch/kernel/archive/rockchip64-6.12/board-orangepi-rk3399-pcie.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-orangepi-rk3399-pcie.patch
rename to patch/kernel/archive/rockchip64-6.12/board-orangepi-rk3399-pcie.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch b/patch/kernel/archive/rockchip64-6.12/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch
rename to patch/kernel/archive/rockchip64-6.12/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-pbp-add-dp-alt-mode.patch b/patch/kernel/archive/rockchip64-6.12/board-pbp-add-dp-alt-mode.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-pbp-add-dp-alt-mode.patch
rename to patch/kernel/archive/rockchip64-6.12/board-pbp-add-dp-alt-mode.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-radxa-e25-sdmmc0-fix.patch b/patch/kernel/archive/rockchip64-6.12/board-radxa-e25-sdmmc0-fix.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-radxa-e25-sdmmc0-fix.patch
rename to patch/kernel/archive/rockchip64-6.12/board-radxa-e25-sdmmc0-fix.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-radxa-e25-usb3-and-emmc-fix.patch b/patch/kernel/archive/rockchip64-6.12/board-radxa-e25-usb3-and-emmc-fix.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-radxa-e25-usb3-and-emmc-fix.patch
rename to patch/kernel/archive/rockchip64-6.12/board-radxa-e25-usb3-and-emmc-fix.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rk3328-roc-cc-dts-enable-dmc.patch b/patch/kernel/archive/rockchip64-6.12/board-rk3328-roc-cc-dts-enable-dmc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rk3328-roc-cc-dts-enable-dmc.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rk3328-roc-cc-dts-enable-dmc.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rk3328-roc-cc-dts-ram-profile.patch b/patch/kernel/archive/rockchip64-6.12/board-rk3328-roc-cc-dts-ram-profile.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rk3328-roc-cc-dts-ram-profile.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rk3328-roc-cc-dts-ram-profile.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rk3328-roc-pc-dts-ram-profile.patch b/patch/kernel/archive/rockchip64-6.12/board-rk3328-roc-pc-dts-ram-profile.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rk3328-roc-pc-dts-ram-profile.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rk3328-roc-pc-dts-ram-profile.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rk3328-roc-pc.patch b/patch/kernel/archive/rockchip64-6.12/board-rk3328-roc-pc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rk3328-roc-pc.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rk3328-roc-pc.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rock3a-0001-emmc-sfc.patch b/patch/kernel/archive/rockchip64-6.12/board-rock3a-0001-emmc-sfc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rock3a-0001-emmc-sfc.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rock3a-0001-emmc-sfc.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rock3a-0002-usb3.patch b/patch/kernel/archive/rockchip64-6.12/board-rock3a-0002-usb3.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rock3a-0002-usb3.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rock3a-0002-usb3.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rock3a-0003-add-gpio-names.patch b/patch/kernel/archive/rockchip64-6.12/board-rock3a-0003-add-gpio-names.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rock3a-0003-add-gpio-names.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rock3a-0003-add-gpio-names.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rock64-mail-supply.patch b/patch/kernel/archive/rockchip64-6.12/board-rock64-mail-supply.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rock64-mail-supply.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rock64-mail-supply.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpi3-enable-dmc.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpi3-enable-dmc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpi3-enable-dmc.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rockpi3-enable-dmc.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpi4-0003-arm64-dts-pcie.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpi4-0003-arm64-dts-pcie.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpi4-0003-arm64-dts-pcie.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rockpi4-0003-arm64-dts-pcie.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpie-0001-arm64-dts-rockchip-fix-gmac-PHY-attach-error.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpie-0001-arm64-dts-rockchip-fix-gmac-PHY-attach-error.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpie-0001-arm64-dts-rockchip-fix-gmac-PHY-attach-error.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rockpie-0001-arm64-dts-rockchip-fix-gmac-PHY-attach-error.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpis-0001-arm64-dts.patch.disabled b/patch/kernel/archive/rockchip64-6.12/board-rockpis-0001-arm64-dts.patch.disabled
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpis-0001-arm64-dts.patch.disabled
rename to patch/kernel/archive/rockchip64-6.12/board-rockpis-0001-arm64-dts.patch.disabled
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpis-0005-arm64-dts-rk3308-Add-gmac-node-at-dtsi-level.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpis-0005-arm64-dts-rk3308-Add-gmac-node-at-dtsi-level.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpis-0005-arm64-dts-rk3308-Add-gmac-node-at-dtsi-level.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rockpis-0005-arm64-dts-rk3308-Add-gmac-node-at-dtsi-level.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch.disabled b/patch/kernel/archive/rockchip64-6.12/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch.disabled
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch.disabled
rename to patch/kernel/archive/rockchip64-6.12/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch.disabled
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch.disabled b/patch/kernel/archive/rockchip64-6.12/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch.disabled
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch.disabled
rename to patch/kernel/archive/rockchip64-6.12/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch.disabled
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpis-0019-Sync-rk3308_codec-to-BSP-tree.patch.disabled b/patch/kernel/archive/rockchip64-6.12/board-rockpis-0019-Sync-rk3308_codec-to-BSP-tree.patch.disabled
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpis-0019-Sync-rk3308_codec-to-BSP-tree.patch.disabled
rename to patch/kernel/archive/rockchip64-6.12/board-rockpis-0019-Sync-rk3308_codec-to-BSP-tree.patch.disabled
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpis-0020-arm64-dts-rockchip-Add-acodec-node-for-rk3308.patch.disabled b/patch/kernel/archive/rockchip64-6.12/board-rockpis-0020-arm64-dts-rockchip-Add-acodec-node-for-rk3308.patch.disabled
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpis-0020-arm64-dts-rockchip-Add-acodec-node-for-rk3308.patch.disabled
rename to patch/kernel/archive/rockchip64-6.12/board-rockpis-0020-arm64-dts-rockchip-Add-acodec-node-for-rk3308.patch.disabled
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpis-0022-ASoC-rk3308_codec-replace-codec-to-component.patch.disabled b/patch/kernel/archive/rockchip64-6.12/board-rockpis-0022-ASoC-rk3308_codec-replace-codec-to-component.patch.disabled
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpis-0022-ASoC-rk3308_codec-replace-codec-to-component.patch.disabled
rename to patch/kernel/archive/rockchip64-6.12/board-rockpis-0022-ASoC-rk3308_codec-replace-codec-to-component.patch.disabled
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpro64-change-rx_delay-for-gmac.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpro64-change-rx_delay-for-gmac.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpro64-change-rx_delay-for-gmac.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rockpro64-change-rx_delay-for-gmac.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpro64-fix-emmc.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpro64-fix-emmc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpro64-fix-emmc.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rockpro64-fix-emmc.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpro64-fix-spi1-flash-speed.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpro64-fix-spi1-flash-speed.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpro64-fix-spi1-flash-speed.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rockpro64-fix-spi1-flash-speed.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rockpro64-work-led-heartbeat.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpro64-work-led-heartbeat.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rockpro64-work-led-heartbeat.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rockpro64-work-led-heartbeat.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-rocks0-0001-deviceTree.patch b/patch/kernel/archive/rockchip64-6.12/board-rocks0-0001-deviceTree.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-rocks0-0001-deviceTree.patch
rename to patch/kernel/archive/rockchip64-6.12/board-rocks0-0001-deviceTree.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/board-station-p2.patch b/patch/kernel/archive/rockchip64-6.12/board-station-p2.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/board-station-p2.patch
rename to patch/kernel/archive/rockchip64-6.12/board-station-p2.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/drv-spi-spidev-remove-warnings.patch b/patch/kernel/archive/rockchip64-6.12/drv-spi-spidev-remove-warnings.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/drv-spi-spidev-remove-warnings.patch
rename to patch/kernel/archive/rockchip64-6.12/drv-spi-spidev-remove-warnings.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3308-sakurapi-rk3308b.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3308-sakurapi-rk3308b.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3308-sakurapi-rk3308b.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3308-sakurapi-rk3308b.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3318-box.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3318-box.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3318-box.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3318-box.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3328-heltec.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3328-heltec.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3328-heltec.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3328-heltec.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3328-nanopi-neo3-rev02.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3328-nanopi-neo3-rev02.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3328-nanopi-neo3-rev02.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3328-nanopi-neo3-rev02.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3328-nanopi-r2-rev00.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3328-nanopi-r2-rev00.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3328-nanopi-r2-rev00.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3328-nanopi-r2-rev00.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3328-nanopi-r2-rev06.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3328-nanopi-r2-rev06.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3328-nanopi-r2-rev06.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3328-nanopi-r2-rev06.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3328-nanopi-r2-rev20.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3328-nanopi-r2-rev20.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3328-nanopi-r2-rev20.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3328-nanopi-r2-rev20.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3328-z28pro.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3328-z28pro.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3328-z28pro.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3328-z28pro.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3399-nanopi-m4v2.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3399-nanopi-m4v2.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3399-nanopi-m4v2.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3399-nanopi-m4v2.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3399-nanopi-r4se.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3399-nanopi-r4se.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3399-nanopi-r4se.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3399-nanopi-r4se.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3399-orangepi-4-lts.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3399-orangepi-4-lts.dts
similarity index 99%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3399-orangepi-4-lts.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3399-orangepi-4-lts.dts
index 2f0baf9fd43b..d6ed638845b3 100644
--- a/patch/kernel/archive/rockchip64-6.11/dt/rk3399-orangepi-4-lts.dts
+++ b/patch/kernel/archive/rockchip64-6.12/dt/rk3399-orangepi-4-lts.dts
@@ -13,7 +13,6 @@
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/usb/pd.h>
 #include "rk3399.dtsi"
-#include "rk3399-opp.dtsi"
 
 / {
 	model = "OrangePi 4 LTS";
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3399-orangepi-4.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3399-orangepi-4.dts
similarity index 99%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3399-orangepi-4.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3399-orangepi-4.dts
index 976d3f9964f3..bfd9a1bf80d4 100644
--- a/patch/kernel/archive/rockchip64-6.11/dt/rk3399-orangepi-4.dts
+++ b/patch/kernel/archive/rockchip64-6.12/dt/rk3399-orangepi-4.dts
@@ -12,7 +12,6 @@
 #include <dt-bindings/usb/pd.h>
 //#include <dt-bindings/leds/common.h>
 #include "rk3399.dtsi"
-#include "rk3399-opp.dtsi"
 
 / {
 	model = "OrangePi 4";
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3399-rock-pi-4.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3399-rock-pi-4.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3399-rock-pi-4.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3399-rock-pi-4.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3399-tinker-2.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3399-tinker-2.dts
similarity index 99%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3399-tinker-2.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3399-tinker-2.dts
index 0f4b28ae0118..8cbe3850558e 100644
--- a/patch/kernel/archive/rockchip64-6.11/dt/rk3399-tinker-2.dts
+++ b/patch/kernel/archive/rockchip64-6.12/dt/rk3399-tinker-2.dts
@@ -8,7 +8,7 @@
 #include <dt-bindings/pwm/pwm.h>
 #include <dt-bindings/usb/pd.h>
 #include "rk3399.dtsi"
-#include "rk3399-op1-opp.dtsi"
+#include "rk3399-op1.dtsi"
 
 / {
 	model = "Asus Tinker Board 2/2S";
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3399-xiaobao-nas.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3399-xiaobao-nas.dts
similarity index 99%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3399-xiaobao-nas.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3399-xiaobao-nas.dts
index 16f12e573472..c46160026e97 100644
--- a/patch/kernel/archive/rockchip64-6.11/dt/rk3399-xiaobao-nas.dts
+++ b/patch/kernel/archive/rockchip64-6.12/dt/rk3399-xiaobao-nas.dts
@@ -5,7 +5,6 @@
 #include <dt-bindings/pwm/pwm.h>
 #include <dt-bindings/usb/pd.h>
 #include "rk3399.dtsi"
-#include "rk3399-opp.dtsi"
 
 / {
 	model = "Codinge Xiaobao NAS";
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3566-firefly-roc-pc.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3566-firefly-roc-pc.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3566-firefly-roc-pc.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3566-firefly-roc-pc.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3566-h96-tvbox.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3566-h96-tvbox.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3566-h96-tvbox.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3566-h96-tvbox.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3566-jp-tvbox.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3566-jp-tvbox.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3566-jp-tvbox.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3566-jp-tvbox.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3566-panther-x2.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3566-panther-x2.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3566-panther-x2.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3566-panther-x2.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3566-radxa-zero-3.dtsi b/patch/kernel/archive/rockchip64-6.12/dt/rk3566-radxa-zero-3.dtsi
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3566-radxa-zero-3.dtsi
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3566-radxa-zero-3.dtsi
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3568-hinlink-h66k.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3568-hinlink-h66k.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3568-hinlink-h66k.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3568-hinlink-h66k.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3568-hinlink-h68k.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3568-hinlink-h68k.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3568-hinlink-h68k.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3568-hinlink-h68k.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3568-mixtile-edge2.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3568-mixtile-edge2.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/dt/rk3568-mixtile-edge2.dts
rename to patch/kernel/archive/rockchip64-6.12/dt/rk3568-mixtile-edge2.dts
diff --git a/patch/kernel/archive/rockchip64-6.11/general-add-miniDP-dt-doc.patch b/patch/kernel/archive/rockchip64-6.12/general-add-miniDP-dt-doc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-add-miniDP-dt-doc.patch
rename to patch/kernel/archive/rockchip64-6.12/general-add-miniDP-dt-doc.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-add-miniDP-virtual-extcon.patch b/patch/kernel/archive/rockchip64-6.12/general-add-miniDP-virtual-extcon.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-add-miniDP-virtual-extcon.patch
rename to patch/kernel/archive/rockchip64-6.12/general-add-miniDP-virtual-extcon.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-add-overlay-compilation-support.patch b/patch/kernel/archive/rockchip64-6.12/general-add-overlay-compilation-support.patch
similarity index 65%
rename from patch/kernel/archive/rockchip64-6.11/general-add-overlay-compilation-support.patch
rename to patch/kernel/archive/rockchip64-6.12/general-add-overlay-compilation-support.patch
index 161a1939729e..267fd37eb3de 100644
--- a/patch/kernel/archive/rockchip64-6.11/general-add-overlay-compilation-support.patch
+++ b/patch/kernel/archive/rockchip64-6.12/general-add-overlay-compilation-support.patch
@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <paolo.sabatino@gmail.com>
-Date: Sat, 20 Jul 2024 13:58:49 +0200
+Date: Wed, 2 Oct 2024 19:30:34 +0300
 Subject: compile .scr and install overlays in right path
 
 ---
  scripts/Makefile.dtbinst | 13 +++++++++-
- scripts/Makefile.lib     |  8 +++++-
+ scripts/Makefile.dtbs    |  8 +++++-
  2 files changed, 19 insertions(+), 2 deletions(-)
 
 diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
@@ -32,36 +32,35 @@ index 111111111111..222222222222 100644
  
  endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
  
-diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
+diff --git a/scripts/Makefile.dtbs b/scripts/Makefile.dtbs
 index 111111111111..222222222222 100644
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -394,18 +394,24 @@ quiet_cmd_wrap_S_dtb = WRAP    $@
- 		echo '.balign STRUCT_ALIGNMENT';					\
- 	} > $@
+--- a/scripts/Makefile.dtbs
++++ b/scripts/Makefile.dtbs
+@@ -122,17 +122,23 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
+ quiet_cmd_dtc = DTC $(quiet_dtb_check_tag) $@
+       cmd_dtc = \
+ 	$(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
+-	$(DTC) -o $@ -b 0 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) \
++	$(DTC) -@ -o $@ -b 0 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) \
+ 	       $(DTC_FLAGS) -d $(depfile).dtc.tmp $(dtc-tmp) ; \
+ 	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) \
+ 	$(cmd_dtb_check)
  
 +quiet_cmd_scr = MKIMAGE $@
 +cmd_scr = mkimage -C none -A $(ARCH) -T script -d $< $@
 +
- $(obj)/%.dtb.S: $(obj)/%.dtb FORCE
- 	$(call if_changed,wrap_S_dtb)
+ $(obj)/%.dtb: $(obj)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
+ 	$(call if_changed_dep,dtc)
  
- $(obj)/%.dtbo.S: $(obj)/%.dtbo FORCE
- 	$(call if_changed,wrap_S_dtb)
+ $(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE
+ 	$(call if_changed_dep,dtc)
  
 +$(obj)/%.scr: $(src)/%.scr-cmd FORCE
 +	$(call if_changed,scr)
 +
- quiet_dtb_check_tag = $(if $(dtb-check-enabled),[C],   )
- cmd_dtb_check = $(if $(dtb-check-enabled),; $(DT_CHECKER) $(DT_CHECKER_FLAGS) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ || true)
+ # targets
+ # ---------------------------------------------------------------------------
  
- quiet_cmd_dtc = DTC $(quiet_dtb_check_tag) $@
- cmd_dtc = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
--	$(DTC) -o $@ -b 0 \
-+	$(DTC) -@ -o $@ -b 0 \
- 		$(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \
- 		-d $(depfile).dtc.tmp $(dtc-tmp) ; \
- 	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) \
 -- 
 Armbian
 
diff --git a/patch/kernel/archive/rockchip64-6.11/general-add-overlay-configfs.patch b/patch/kernel/archive/rockchip64-6.12/general-add-overlay-configfs.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-add-overlay-configfs.patch
rename to patch/kernel/archive/rockchip64-6.12/general-add-overlay-configfs.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-add-panel-simple-dsi.patch b/patch/kernel/archive/rockchip64-6.12/general-add-panel-simple-dsi.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-add-panel-simple-dsi.patch
rename to patch/kernel/archive/rockchip64-6.12/general-add-panel-simple-dsi.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-add-pll-hdmi-timings.patch b/patch/kernel/archive/rockchip64-6.12/general-add-pll-hdmi-timings.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-add-pll-hdmi-timings.patch
rename to patch/kernel/archive/rockchip64-6.12/general-add-pll-hdmi-timings.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-add-xtx-spi-nor-chips.patch b/patch/kernel/archive/rockchip64-6.12/general-add-xtx-spi-nor-chips.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-add-xtx-spi-nor-chips.patch
rename to patch/kernel/archive/rockchip64-6.12/general-add-xtx-spi-nor-chips.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-cryptov1-trng.patch b/patch/kernel/archive/rockchip64-6.12/general-cryptov1-trng.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-cryptov1-trng.patch
rename to patch/kernel/archive/rockchip64-6.12/general-cryptov1-trng.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-disable-mtu-validation.patch b/patch/kernel/archive/rockchip64-6.12/general-disable-mtu-validation.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-disable-mtu-validation.patch
rename to patch/kernel/archive/rockchip64-6.12/general-disable-mtu-validation.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-driver-tm16xx-led-driver.patch b/patch/kernel/archive/rockchip64-6.12/general-driver-tm16xx-led-driver.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-driver-tm16xx-led-driver.patch
rename to patch/kernel/archive/rockchip64-6.12/general-driver-tm16xx-led-driver.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-fix-es8316-kernel-panic.patch b/patch/kernel/archive/rockchip64-6.12/general-fix-es8316-kernel-panic.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-fix-es8316-kernel-panic.patch
rename to patch/kernel/archive/rockchip64-6.12/general-fix-es8316-kernel-panic.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-fix-inno-usb2-phy-init.patch b/patch/kernel/archive/rockchip64-6.12/general-fix-inno-usb2-phy-init.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-fix-inno-usb2-phy-init.patch
rename to patch/kernel/archive/rockchip64-6.12/general-fix-inno-usb2-phy-init.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-fix-mmc-signal-voltage-before-reboot.patch b/patch/kernel/archive/rockchip64-6.12/general-fix-mmc-signal-voltage-before-reboot.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-fix-mmc-signal-voltage-before-reboot.patch
rename to patch/kernel/archive/rockchip64-6.12/general-fix-mmc-signal-voltage-before-reboot.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-hdmi-clock-fixes.patch b/patch/kernel/archive/rockchip64-6.12/general-hdmi-clock-fixes.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-hdmi-clock-fixes.patch
rename to patch/kernel/archive/rockchip64-6.12/general-hdmi-clock-fixes.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-increasing_DMA_block_memory_allocation_to_2048.patch b/patch/kernel/archive/rockchip64-6.12/general-increasing_DMA_block_memory_allocation_to_2048.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-increasing_DMA_block_memory_allocation_to_2048.patch
rename to patch/kernel/archive/rockchip64-6.12/general-increasing_DMA_block_memory_allocation_to_2048.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-legacy-rockchip-hwrng.patch b/patch/kernel/archive/rockchip64-6.12/general-legacy-rockchip-hwrng.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-legacy-rockchip-hwrng.patch
rename to patch/kernel/archive/rockchip64-6.12/general-legacy-rockchip-hwrng.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-legacy-rockchip-hwrng_5.10.patch b/patch/kernel/archive/rockchip64-6.12/general-legacy-rockchip-hwrng_5.10.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-legacy-rockchip-hwrng_5.10.patch
rename to patch/kernel/archive/rockchip64-6.12/general-legacy-rockchip-hwrng_5.10.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-possibility-of-disabling-rk808-rtc.patch b/patch/kernel/archive/rockchip64-6.12/general-possibility-of-disabling-rk808-rtc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-possibility-of-disabling-rk808-rtc.patch
rename to patch/kernel/archive/rockchip64-6.12/general-possibility-of-disabling-rk808-rtc.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-rk3328-dtsi-trb-ent-quirk.patch b/patch/kernel/archive/rockchip64-6.12/general-rk3328-dtsi-trb-ent-quirk.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-rk3328-dtsi-trb-ent-quirk.patch
rename to patch/kernel/archive/rockchip64-6.12/general-rk3328-dtsi-trb-ent-quirk.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-rk808-configurable-switch-voltage-steps.patch b/patch/kernel/archive/rockchip64-6.12/general-rk808-configurable-switch-voltage-steps.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-rk808-configurable-switch-voltage-steps.patch
rename to patch/kernel/archive/rockchip64-6.12/general-rk808-configurable-switch-voltage-steps.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-rockchip-overlays.patch b/patch/kernel/archive/rockchip64-6.12/general-rockchip-overlays.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-rockchip-overlays.patch
rename to patch/kernel/archive/rockchip64-6.12/general-rockchip-overlays.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-rt5651-add-mclk.patch b/patch/kernel/archive/rockchip64-6.12/general-rt5651-add-mclk.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-rt5651-add-mclk.patch
rename to patch/kernel/archive/rockchip64-6.12/general-rt5651-add-mclk.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-v4l2-iep-driver.patch b/patch/kernel/archive/rockchip64-6.12/general-v4l2-iep-driver.patch
similarity index 99%
rename from patch/kernel/archive/rockchip64-6.11/general-v4l2-iep-driver.patch
rename to patch/kernel/archive/rockchip64-6.12/general-v4l2-iep-driver.patch
index 199ebb4cdb63..4baba4293b11 100644
--- a/patch/kernel/archive/rockchip64-6.11/general-v4l2-iep-driver.patch
+++ b/patch/kernel/archive/rockchip64-6.12/general-v4l2-iep-driver.patch
@@ -62,7 +62,7 @@ Subject: Rockchip IEP driver
  Documentation/devicetree/bindings/media/rockchip-iep.yaml |   73 +
  arch/arm/boot/dts/rockchip/rk3288.dtsi                    |   13 +-
  arch/arm64/boot/dts/rockchip/rk3328.dtsi                  |   22 +
- arch/arm64/boot/dts/rockchip/rk3399.dtsi                  |   13 +
+ arch/arm64/boot/dts/rockchip/rk3399-base.dtsi             |   13 +
  drivers/media/platform/rockchip/Kconfig                   |    1 +
  drivers/media/platform/rockchip/Makefile                  |    1 +
  drivers/media/platform/rockchip/iep/Kconfig               |   13 +
@@ -215,10 +215,10 @@ index 111111111111..222222222222 100644
  	hdmi: hdmi@ff3c0000 {
  		compatible = "rockchip,rk3328-dw-hdmi";
  		reg = <0x0 0xff3c0000 0x0 0x20000>;
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
 index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+--- a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
 @@ -1475,12 +1475,25 @@ vdec_mmu: iommu@ff660480 {
  		#iommu-cells = <0>;
  	};
diff --git a/patch/kernel/archive/rockchip64-6.11/general-v4l2-rkvdec-00-fixes.patch b/patch/kernel/archive/rockchip64-6.12/general-v4l2-rkvdec-00-fixes.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-v4l2-rkvdec-00-fixes.patch
rename to patch/kernel/archive/rockchip64-6.12/general-v4l2-rkvdec-00-fixes.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-v4l2-rkvdec-01-vp9.patch b/patch/kernel/archive/rockchip64-6.12/general-v4l2-rkvdec-01-vp9.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-v4l2-rkvdec-01-vp9.patch
rename to patch/kernel/archive/rockchip64-6.12/general-v4l2-rkvdec-01-vp9.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-v4l2-rkvdec-02-hevc.patch b/patch/kernel/archive/rockchip64-6.12/general-v4l2-rkvdec-02-hevc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-v4l2-rkvdec-02-hevc.patch
rename to patch/kernel/archive/rockchip64-6.12/general-v4l2-rkvdec-02-hevc.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/general-workaround-broadcom-bt-serdev.patch b/patch/kernel/archive/rockchip64-6.12/general-workaround-broadcom-bt-serdev.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/general-workaround-broadcom-bt-serdev.patch
rename to patch/kernel/archive/rockchip64-6.12/general-workaround-broadcom-bt-serdev.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/kernel-6.8-tools-cgroup-makefile.patch b/patch/kernel/archive/rockchip64-6.12/kernel-6.8-tools-cgroup-makefile.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/kernel-6.8-tools-cgroup-makefile.patch
rename to patch/kernel/archive/rockchip64-6.12/kernel-6.8-tools-cgroup-makefile.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/media-0001-Add-rkvdec2-Support-v3.patch b/patch/kernel/archive/rockchip64-6.12/media-0001-Add-rkvdec2-Support-v3.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/media-0001-Add-rkvdec2-Support-v3.patch
rename to patch/kernel/archive/rockchip64-6.12/media-0001-Add-rkvdec2-Support-v3.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/media-0002-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch b/patch/kernel/archive/rockchip64-6.12/media-0002-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/media-0002-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch
rename to patch/kernel/archive/rockchip64-6.12/media-0002-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/media-0003-rk3568-disable-hantro-h264.patch b/patch/kernel/archive/rockchip64-6.12/media-0003-rk3568-disable-hantro-h264.patch
similarity index 98%
rename from patch/kernel/archive/rockchip64-6.11/media-0003-rk3568-disable-hantro-h264.patch
rename to patch/kernel/archive/rockchip64-6.12/media-0003-rk3568-disable-hantro-h264.patch
index 0cf26595564b..099c58bc6cd7 100644
--- a/patch/kernel/archive/rockchip64-6.11/media-0003-rk3568-disable-hantro-h264.patch
+++ b/patch/kernel/archive/rockchip64-6.12/media-0003-rk3568-disable-hantro-h264.patch
@@ -24,9 +24,9 @@ index 111111111111..222222222222 100644
  	{ .compatible = "rockchip,rk3399-vpu", .data = &rk3399_vpu_variant, },
  	{ .compatible = "rockchip,rk3568-vepu", .data = &rk3568_vepu_variant, },
 -	{ .compatible = "rockchip,rk3568-vpu", .data = &rk3568_vpu_variant, },
+ 	{ .compatible = "rockchip,rk3588-vepu121", .data = &rk3568_vepu_variant, },
  	{ .compatible = "rockchip,rk3588-av1-vpu", .data = &rk3588_vpu981_variant, },
  #endif
- #ifdef CONFIG_VIDEO_HANTRO_IMX8M
 diff --git a/drivers/media/platform/verisilicon/hantro_hw.h b/drivers/media/platform/verisilicon/hantro_hw.h
 index 111111111111..222222222222 100644
 --- a/drivers/media/platform/verisilicon/hantro_hw.h
diff --git a/patch/kernel/archive/rockchip64-6.11/net-usb-r8152-add-LED-configuration-from-OF.patch b/patch/kernel/archive/rockchip64-6.12/net-usb-r8152-add-LED-configuration-from-OF.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/net-usb-r8152-add-LED-configuration-from-OF.patch
rename to patch/kernel/archive/rockchip64-6.12/net-usb-r8152-add-LED-configuration-from-OF.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/Makefile b/patch/kernel/archive/rockchip64-6.12/overlay/Makefile
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/Makefile
rename to patch/kernel/archive/rockchip64-6.12/overlay/Makefile
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/README.rockchip-overlays b/patch/kernel/archive/rockchip64-6.12/overlay/README.rockchip-overlays
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/README.rockchip-overlays
rename to patch/kernel/archive/rockchip64-6.12/overlay/README.rockchip-overlays
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rk3308-b@1.3ghz.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-b@1.3ghz.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rk3308-b@1.3ghz.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rk3308-b@1.3ghz.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rk3308-bs.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-bs.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rk3308-bs.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rk3308-bs.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rk3308-bs@1.3ghz.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-bs@1.3ghz.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rk3308-bs@1.3ghz.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rk3308-bs@1.3ghz.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rk3308-emmc.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-emmc.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rk3308-emmc.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rk3308-emmc.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rk3308-s0-ext-antenna.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-s0-ext-antenna.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rk3308-s0-ext-antenna.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rk3308-s0-ext-antenna.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rk3308-sdio@10mhz.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-sdio@10mhz.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rk3308-sdio@10mhz.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rk3308-sdio@10mhz.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rk3308-sdio@4mhz.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-sdio@4mhz.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rk3308-sdio@4mhz.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rk3308-sdio@4mhz.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-fixup.scr-cmd b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-fixup.scr-cmd
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-fixup.scr-cmd
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-fixup.scr-cmd
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-cpu-hs.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-cpu-hs.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-cpu-hs.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-cpu-hs.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-emmc-ddr.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-emmc-ddr.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-emmc-ddr.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-emmc-ddr.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-emmc-hs200.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-emmc-hs200.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-emmc-hs200.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-emmc-hs200.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-led-conf1.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-led-conf1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-led-conf1.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-led-conf1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-led-conf2.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-led-conf2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-led-conf2.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-led-conf2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-led-conf3.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-led-conf3.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-led-conf3.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-led-conf3.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-led-conf4.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-led-conf4.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-led-conf4.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-led-conf4.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-led-conf5.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-led-conf5.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-led-conf5.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-led-conf5.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-wlan-ap6330.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-wlan-ap6330.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-wlan-ap6330.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-wlan-ap6330.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-wlan-ap6334.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-wlan-ap6334.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-wlan-ap6334.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-wlan-ap6334.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-wlan-ext.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-wlan-ext.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3318-box-wlan-ext.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3318-box-wlan-ext.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3328-i2c0.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3328-i2c0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3328-i2c0.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3328-i2c0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3328-i2s1-pcm5102.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3328-i2s1-pcm5102.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3328-i2s1-pcm5102.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3328-i2s1-pcm5102.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3328-opp-1.4ghz.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3328-opp-1.4ghz.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3328-opp-1.4ghz.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3328-opp-1.4ghz.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3328-opp-1.5ghz.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3328-opp-1.5ghz.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3328-opp-1.5ghz.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3328-opp-1.5ghz.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3328-spi-spidev.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3328-spi-spidev.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3328-spi-spidev.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3328-spi-spidev.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3328-uart1.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3328-uart1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3328-uart1.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3328-uart1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-dwc3-0-host.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-dwc3-0-host.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-dwc3-0-host.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-dwc3-0-host.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-i2c7.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-i2c7.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-i2c7.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-i2c7.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-i2c8.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-i2c8.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-i2c8.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-i2c8.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-opp-2ghz.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-opp-2ghz.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-opp-2ghz.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-opp-2ghz.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-pcie-gen2.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-pcie-gen2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-pcie-gen2.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-pcie-gen2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-spi-jedec-nor.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-spi-jedec-nor.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-spi-jedec-nor.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-spi-jedec-nor.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-spi-spidev.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-spi-spidev.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-spi-spidev.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-spi-spidev.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-uart4.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-uart4.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-uart4.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-uart4.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-w1-gpio.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-w1-gpio.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3399-w1-gpio.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3399-w1-gpio.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3566-sata2.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3566-sata2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3566-sata2.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3566-sata2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-i2c0.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-i2c0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-i2c0.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-i2c0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-i2c1.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-i2c1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-i2c1.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-i2c1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-pwm1.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-pwm1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-pwm1.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-pwm1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-pwm2.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-pwm2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-pwm2.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-pwm2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-pwm9.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-pwm9.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-pwm9.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-pwm9.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-spi-spidev.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-spi-spidev.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-spi-spidev.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-spi-spidev.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-uart0-rts_cts.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-uart0-rts_cts.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-uart0-rts_cts.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-uart0-rts_cts.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-uart0.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-uart0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-uart0.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-uart0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-uart1.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-uart1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-hk-uart1.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-hk-uart1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-nanopi-r5c-leds.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-nanopi-r5c-leds.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-nanopi-r5c-leds.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-nanopi-r5c-leds.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-nanopi-r5s-leds.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-nanopi-r5s-leds.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-nanopi-r5s-leds.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-nanopi-r5s-leds.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rockpi4cplus-usb-host.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rockpi4cplus-usb-host.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rockpi4cplus-usb-host.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rockpi4cplus-usb-host.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rockpro64-lcd.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rockpro64-lcd.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/overlay/rockchip-rockpro64-lcd.dtso
rename to patch/kernel/archive/rockchip64-6.12/overlay/rockchip-rockpro64-lcd.dtso
diff --git a/patch/kernel/archive/rockchip64-6.11/regulator-add-fan53200-driver.patch b/patch/kernel/archive/rockchip64-6.12/regulator-add-fan53200-driver.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/regulator-add-fan53200-driver.patch
rename to patch/kernel/archive/rockchip64-6.12/regulator-add-fan53200-driver.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3308-0001-pinctrl-slew-mux.patch b/patch/kernel/archive/rockchip64-6.12/rk3308-0001-pinctrl-slew-mux.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/rk3308-0001-pinctrl-slew-mux.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3308-0001-pinctrl-slew-mux.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3308-0003-pinctrl-io-voltage-domains.patch b/patch/kernel/archive/rockchip64-6.12/rk3308-0003-pinctrl-io-voltage-domains.patch
similarity index 95%
rename from patch/kernel/archive/rockchip64-6.11/rk3308-0003-pinctrl-io-voltage-domains.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3308-0003-pinctrl-io-voltage-domains.patch
index 4ff16af6fe95..1072368f55a1 100644
--- a/patch/kernel/archive/rockchip64-6.11/rk3308-0003-pinctrl-io-voltage-domains.patch
+++ b/patch/kernel/archive/rockchip64-6.12/rk3308-0003-pinctrl-io-voltage-domains.patch
@@ -135,7 +135,7 @@ index 111111111111..222222222222 100644
  #define RK3328_SOC_CON4			0x410
  #define RK3328_SOC_CON4_VCCIO2		BIT(7)
  #define RK3328_SOC_VCCIO2_SUPPLY_NUM	1
-@@ -233,30 +229,6 @@ static void rk3288_iodomain_init(struct rockchip_iodomain *iod)
+@@ -233,25 +229,6 @@ static void rk3288_iodomain_init(struct rockchip_iodomain *iod)
  		dev_warn(iod->dev, "couldn't update flash0 ctrl\n");
  }
  
@@ -149,13 +149,8 @@ index 111111111111..222222222222 100644
 -		return;
 -
 -	/*
--	 * vccio3 iodomain voltage should be determined by GPIO4 input state
--	 * RockPI-S uses this to drive the SDIO interface at 50Mhz
--	 * (otherwise SDIO clock will be limited to 10Mhz)
--	 *
--	 * Note that setting vccio4 [rather than vccio3] is observed to reduce
--	 * the rise time of SDIO-clk from 30ns to 5ns.
--	 * The CON0_VCCIO3 control bit appears to influence vccio4.
+-	 * set vccio3 iodomain to also use this framework
+-	 * instead of a special gpio.
 -	 */
 -	val = RK3308_SOC_CON0_VCCIO3 | (RK3308_SOC_CON0_VCCIO3 << 16);
 -	ret = regmap_write(iod->grf, RK3308_SOC_CON0, val);
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3308-add-missing-i2s-controllers.patch b/patch/kernel/archive/rockchip64-6.12/rk3308-add-missing-i2s-controllers.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/rk3308-add-missing-i2s-controllers.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3308-add-missing-i2s-controllers.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3328-add-dmc-driver.patch b/patch/kernel/archive/rockchip64-6.12/rk3328-add-dmc-driver.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/rk3328-add-dmc-driver.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3328-add-dmc-driver.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3328-add-rga-node.patch b/patch/kernel/archive/rockchip64-6.12/rk3328-add-rga-node.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/rk3328-add-rga-node.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3328-add-rga-node.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3328-dtsi-mali-opp-table.patch b/patch/kernel/archive/rockchip64-6.12/rk3328-dtsi-mali-opp-table.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/rk3328-dtsi-mali-opp-table.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3328-dtsi-mali-opp-table.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3328-dtsi-spdif.patch b/patch/kernel/archive/rockchip64-6.12/rk3328-dtsi-spdif.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/rk3328-dtsi-spdif.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3328-dtsi-spdif.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3328-dtsi-usb3-reset-properties.patch b/patch/kernel/archive/rockchip64-6.12/rk3328-dtsi-usb3-reset-properties.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/rk3328-dtsi-usb3-reset-properties.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3328-dtsi-usb3-reset-properties.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3328-gpu-cooling-target.patch b/patch/kernel/archive/rockchip64-6.12/rk3328-gpu-cooling-target.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/rk3328-gpu-cooling-target.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3328-gpu-cooling-target.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3328-roc-cc-add-missing-nodes.patch b/patch/kernel/archive/rockchip64-6.12/rk3328-roc-cc-add-missing-nodes.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/rk3328-roc-cc-add-missing-nodes.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3328-roc-cc-add-missing-nodes.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3399-add-sclk-i2sout-src-clock.patch b/patch/kernel/archive/rockchip64-6.12/rk3399-add-sclk-i2sout-src-clock.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/rk3399-add-sclk-i2sout-src-clock.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3399-add-sclk-i2sout-src-clock.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3399-dmc-polling-rate.patch b/patch/kernel/archive/rockchip64-6.12/rk3399-dmc-polling-rate.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/rk3399-dmc-polling-rate.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3399-dmc-polling-rate.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch b/patch/kernel/archive/rockchip64-6.12/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch
similarity index 96%
rename from patch/kernel/archive/rockchip64-6.11/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch
index 01cba086dd25..23161709fb18 100644
--- a/patch/kernel/archive/rockchip64-6.11/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch
+++ b/patch/kernel/archive/rockchip64-6.12/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch
@@ -91,13 +91,13 @@ Subject: [ARCHEOLOGY] Fix 2.5G Ethernet on Helios64 Mainline kernel (#2567)
 > X-Git-Archeology:   Subject: bump rockchip64 edge to v6.3
 > X-Git-Archeology:
 ---
- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 ++
+ arch/arm64/boot/dts/rockchip/rk3399-base.dtsi | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
 index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+--- a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
 @@ -558,6 +558,7 @@ usbdrd_dwc3_0: usb@fe800000 {
  			snps,dis_u2_susphy_quirk;
  			snps,dis-del-phy-power-chg-quirk;
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3399-fix-pci-phy.patch b/patch/kernel/archive/rockchip64-6.12/rk3399-fix-pci-phy.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/rk3399-fix-pci-phy.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3399-fix-pci-phy.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3399-fix-usb-phy.patch b/patch/kernel/archive/rockchip64-6.12/rk3399-fix-usb-phy.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/rk3399-fix-usb-phy.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3399-fix-usb-phy.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch b/patch/kernel/archive/rockchip64-6.12/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3399-sd-drive-level-8ma.patch b/patch/kernel/archive/rockchip64-6.12/rk3399-sd-drive-level-8ma.patch
similarity index 97%
rename from patch/kernel/archive/rockchip64-6.11/rk3399-sd-drive-level-8ma.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3399-sd-drive-level-8ma.patch
index e6eef3ab91db..4f2a66e2325c 100644
--- a/patch/kernel/archive/rockchip64-6.11/rk3399-sd-drive-level-8ma.patch
+++ b/patch/kernel/archive/rockchip64-6.12/rk3399-sd-drive-level-8ma.patch
@@ -105,13 +105,13 @@ Subject: [ARCHEOLOGY] add better strength on SDCard and put back previous
 > X-Git-Archeology:   Subject: bump rockchip64 edge to v6.3
 > X-Git-Archeology:
 ---
- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 16 +++++-----
+ arch/arm64/boot/dts/rockchip/rk3399-base.dtsi | 16 +++++-----
  1 file changed, 8 insertions(+), 8 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
 index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+--- a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
 @@ -2662,25 +2662,25 @@ sdio0_int: sdio0-int {
  		sdmmc {
  			sdmmc_bus1: sdmmc-bus1 {
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3399-sd-pwr-pinctrl.patch b/patch/kernel/archive/rockchip64-6.12/rk3399-sd-pwr-pinctrl.patch
similarity index 65%
rename from patch/kernel/archive/rockchip64-6.11/rk3399-sd-pwr-pinctrl.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3399-sd-pwr-pinctrl.patch
index 107257953172..55a8f2d61ce3 100644
--- a/patch/kernel/archive/rockchip64-6.11/rk3399-sd-pwr-pinctrl.patch
+++ b/patch/kernel/archive/rockchip64-6.12/rk3399-sd-pwr-pinctrl.patch
@@ -4,13 +4,13 @@ Date: Sun, 21 May 2023 13:14:26 +0200
 Subject: rk3399: add sd power pin to pinctrl node
 
 ---
- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 5 +++++
+ arch/arm64/boot/dts/rockchip/rk3399-base.dtsi | 5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
 index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+--- a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
 @@ -2657,6 +2657,11 @@ sdio0_int: sdio0-int {
  				rockchip,pins =
  					<0 RK_PA4 1 &pcfg_pull_up>;
diff --git a/patch/kernel/archive/rockchip64-6.11/rk3399-unlock-temperature.patch b/patch/kernel/archive/rockchip64-6.12/rk3399-unlock-temperature.patch
similarity index 96%
rename from patch/kernel/archive/rockchip64-6.11/rk3399-unlock-temperature.patch
rename to patch/kernel/archive/rockchip64-6.12/rk3399-unlock-temperature.patch
index 9e9a5e9d7104..989d2b7cffe3 100644
--- a/patch/kernel/archive/rockchip64-6.11/rk3399-unlock-temperature.patch
+++ b/patch/kernel/archive/rockchip64-6.12/rk3399-unlock-temperature.patch
@@ -94,13 +94,13 @@ Subject: [ARCHEOLOGY] Increase performance with rk3399-dev
 > X-Git-Archeology:   Subject: bump rockchip64 edge to v6.3
 > X-Git-Archeology:
 ---
- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 +++---
+ arch/arm64/boot/dts/rockchip/rk3399-base.dtsi | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
 index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+--- a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
 @@ -928,17 +928,17 @@ cpu_thermal: cpu-thermal {
  
  			trips {
diff --git a/patch/kernel/archive/rockchip64-6.11/rk356x-add-rkvdec2-support.patch b/patch/kernel/archive/rockchip64-6.12/rk356x-add-rkvdec2-support.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/rk356x-add-rkvdec2-support.patch
rename to patch/kernel/archive/rockchip64-6.12/rk356x-add-rkvdec2-support.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/rk35xx-montjoie-crypto-v2-rk35xx.patch b/patch/kernel/archive/rockchip64-6.12/rk35xx-montjoie-crypto-v2-rk35xx.patch
similarity index 99%
rename from patch/kernel/archive/rockchip64-6.11/rk35xx-montjoie-crypto-v2-rk35xx.patch
rename to patch/kernel/archive/rockchip64-6.12/rk35xx-montjoie-crypto-v2-rk35xx.patch
index e53c210e7973..962762116b8f 100644
--- a/patch/kernel/archive/rockchip64-6.11/rk35xx-montjoie-crypto-v2-rk35xx.patch
+++ b/patch/kernel/archive/rockchip64-6.12/rk35xx-montjoie-crypto-v2-rk35xx.patch
@@ -1403,7 +1403,7 @@ index 000000000000..111111111111
 + *
 + * Copyright (c) 2022-2023 Corentin Labbe <clabbe@baylibre.com>
 + */
-+#include <asm/unaligned.h>
++#include <linux/unaligned.h>
 +#include <linux/iopoll.h>
 +#include "rk2_crypto.h"
 +
diff --git a/patch/kernel/archive/rockchip64-6.11/wifi-4003-add-bcm43342-chip.patch b/patch/kernel/archive/rockchip64-6.12/wifi-4003-add-bcm43342-chip.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/wifi-4003-add-bcm43342-chip.patch
rename to patch/kernel/archive/rockchip64-6.12/wifi-4003-add-bcm43342-chip.patch
diff --git a/patch/kernel/archive/rockchip64-6.11/wifi-4003-ssv-6051-driver.patch b/patch/kernel/archive/rockchip64-6.12/wifi-4003-ssv-6051-driver.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.11/wifi-4003-ssv-6051-driver.patch
rename to patch/kernel/archive/rockchip64-6.12/wifi-4003-ssv-6051-driver.patch

From 139230cae0c6e01e81a1c113b78a0c28d7029dc7 Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Thu, 7 Nov 2024 09:53:02 +0800
Subject: [PATCH 063/107] rockchip64-6.12: remove downstream rockchip hwrng
 driver

---
 .../general-legacy-rockchip-hwrng.patch       | 436 ---------------
 .../general-legacy-rockchip-hwrng_5.10.patch  | 523 ------------------
 2 files changed, 959 deletions(-)
 delete mode 100644 patch/kernel/archive/rockchip64-6.12/general-legacy-rockchip-hwrng.patch
 delete mode 100644 patch/kernel/archive/rockchip64-6.12/general-legacy-rockchip-hwrng_5.10.patch

diff --git a/patch/kernel/archive/rockchip64-6.12/general-legacy-rockchip-hwrng.patch b/patch/kernel/archive/rockchip64-6.12/general-legacy-rockchip-hwrng.patch
deleted file mode 100644
index fb8ead66001b..000000000000
--- a/patch/kernel/archive/rockchip64-6.12/general-legacy-rockchip-hwrng.patch
+++ /dev/null
@@ -1,436 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: brentr <brent@mbari.org>
-Date: Sat, 15 Oct 2022 10:46:04 +0200
-Subject: [ARCHEOLOGY] Restored Hardware Random Number Generator from legacy
- (4.4) kernel (#4286)
-
-> X-Git-Archeology: > recovered message: > so boot no longer starves for entropy, delaying for up to 15 seconds
-> X-Git-Archeology: > recovered message: > Advances kernel to v5.19.15
-> X-Git-Archeology: - Revision f6f3f1b8b034bf7c1f069e831fc42a46940d2239: https://github.com/armbian/build/commit/f6f3f1b8b034bf7c1f069e831fc42a46940d2239
-> X-Git-Archeology:   Date: Sat, 15 Oct 2022 10:46:04 +0200
-> X-Git-Archeology:   From: brentr <brent@mbari.org>
-> X-Git-Archeology:   Subject: Restored Hardware Random Number Generator from legacy (4.4) kernel (#4286)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision 6765f734cc4a22aeaa9f99a3ad28c8c322de26f6: https://github.com/armbian/build/commit/6765f734cc4a22aeaa9f99a3ad28c8c322de26f6
-> X-Git-Archeology:   Date: Tue, 25 Oct 2022 11:26:51 +0200
-> X-Git-Archeology:   From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
-> X-Git-Archeology:   Subject: Bump rockchip64 edge to 6.0.y (#4337)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision 92f1a22d76b987afa7ba555d5b509adc51d689e7: https://github.com/armbian/build/commit/92f1a22d76b987afa7ba555d5b509adc51d689e7
-> X-Git-Archeology:   Date: Fri, 16 Dec 2022 13:38:13 +0100
-> X-Git-Archeology:   From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
-> X-Git-Archeology:   Subject: Re-add rockchip64 6.0 patches (#4575)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision 34ae84fac5d0b66a1ab2d1e51534b7beb13ef245: https://github.com/armbian/build/commit/34ae84fac5d0b66a1ab2d1e51534b7beb13ef245
-> X-Git-Archeology:   Date: Fri, 05 May 2023 14:22:00 +0200
-> X-Git-Archeology:   From: amazingfate <liujianfeng1994@gmail.com>
-> X-Git-Archeology:   Subject: bump rockchip64 edge to v6.3
-> X-Git-Archeology:
----
- arch/arm64/boot/dts/rockchip/rk3308.dtsi |  15 +
- drivers/char/hw_random/Kconfig           |  13 +
- drivers/char/hw_random/Makefile          |   1 +
- drivers/char/hw_random/rockchip-rng.c    | 330 ++++++++++
- 4 files changed, 359 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-@@ -660,6 +660,21 @@ logic_thermal: logic-thermal {
- 		};
- 	};
- 
-+	rng: rng@ff2f0000 {
-+		compatible = "rockchip,cryptov2-rng";
-+		reg = <0x0 0xff2f0000 0x0 0x4000>;
-+		clocks = <&cru SCLK_CRYPTO>, <&cru SCLK_CRYPTO_APK>,
-+			<&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>;
-+		clock-names = "clk_crypto", "clk_crypto_apk",
-+				"aclk_crypto", "hclk_crypto";
-+		assigned-clocks = <&cru SCLK_CRYPTO>, <&cru SCLK_CRYPTO_APK>,
-+					<&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>;
-+		assigned-clock-rates = <150000000>, <150000000>,
-+					<200000000>, <100000000>;
-+		resets = <&cru SRST_CRYPTO>;
-+		reset-names = "reset";
-+	};
-+
- 	tsadc: tsadc@ff1f0000 {
- 		compatible = "rockchip,rk3308-tsadc";
- 		reg = <0x0 0xff1f0000 0x0 0x100>;
-diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
-index 111111111111..222222222222 100644
---- a/drivers/char/hw_random/Kconfig
-+++ b/drivers/char/hw_random/Kconfig
-@@ -383,6 +383,19 @@ config HW_RANDOM_STM32
- 
- 	  If unsure, say N.
- 
-+config HW_RANDOM_ROCKCHIP
-+	tristate "Rockchip Random Number Generator support"
-+	depends on ARCH_ROCKCHIP
-+	default HW_RANDOM
-+	help
-+	  This driver provides kernel-side support for the Random Number
-+	  Generator hardware found on Rockchip cpus.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called rockchip-rng.
-+
-+	  If unsure, say Y.
-+
- config HW_RANDOM_PIC32
- 	tristate "Microchip PIC32 Random Number Generator support"
- 	depends on MACH_PIC32 || COMPILE_TEST
-diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile
-index 111111111111..222222222222 100644
---- a/drivers/char/hw_random/Makefile
-+++ b/drivers/char/hw_random/Makefile
-@@ -35,6 +35,7 @@ obj-$(CONFIG_HW_RANDOM_IPROC_RNG200) += iproc-rng200.o
- obj-$(CONFIG_HW_RANDOM_ST) += st-rng.o
- obj-$(CONFIG_HW_RANDOM_XGENE) += xgene-rng.o
- obj-$(CONFIG_HW_RANDOM_STM32) += stm32-rng.o
-+obj-$(CONFIG_HW_RANDOM_ROCKCHIP) += rockchip-rng.o
- obj-$(CONFIG_HW_RANDOM_PIC32) += pic32-rng.o
- obj-$(CONFIG_HW_RANDOM_MESON) += meson-rng.o
- obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o
-diff --git a/drivers/char/hw_random/rockchip-rng.c b/drivers/char/hw_random/rockchip-rng.c
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/drivers/char/hw_random/rockchip-rng.c
-@@ -0,0 +1,330 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * rockchip-rng.c Random Number Generator driver for the Rockchip
-+ *
-+ * Copyright (c) 2018, Fuzhou Rockchip Electronics Co., Ltd.
-+ * Author: Lin Jinhan <troy.lin@rock-chips.com>
-+ *
-+ */
-+#include <linux/clk.h>
-+#include <linux/hw_random.h>
-+#include <linux/iopoll.h>
-+#include <linux/module.h>
-+#include <linux/mod_devicetable.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+#include <linux/pm_runtime.h>
-+
-+#define _SBF(s, v)	((v) << (s))
-+#define HIWORD_UPDATE(val, mask, shift) \
-+			((val) << (shift) | (mask) << ((shift) + 16))
-+
-+#define ROCKCHIP_AUTOSUSPEND_DELAY		100
-+#define ROCKCHIP_POLL_PERIOD_US			100
-+#define ROCKCHIP_POLL_TIMEOUT_US		10000
-+#define RK_MAX_RNG_BYTE				(32)
-+
-+#define CRYPTO_V1_CTRL				0x0008
-+#define CRYPTO_V1_RNG_START			BIT(8)
-+#define CRYPTO_V1_RNG_FLUSH			BIT(9)
-+#define CRYPTO_V1_TRNG_CTRL			0x0200
-+#define CRYPTO_V1_OSC_ENABLE			BIT(16)
-+#define CRYPTO_V1_TRNG_SAMPLE_PERIOD(x)		(x)
-+#define CRYPTO_V1_TRNG_DOUT_0			0x0204
-+
-+#define CRYPTO_V2_RNG_CTL			0x0400
-+#define CRYPTO_V2_RNG_64_BIT_LEN		_SBF(4, 0x00)
-+#define CRYPTO_V2_RNG_128_BIT_LEN		_SBF(4, 0x01)
-+#define CRYPTO_V2_RNG_192_BIT_LEN		_SBF(4, 0x02)
-+#define CRYPTO_V2_RNG_256_BIT_LEN		_SBF(4, 0x03)
-+#define CRYPTO_V2_RNG_FATESY_SOC_RING		_SBF(2, 0x00)
-+#define CRYPTO_V2_RNG_SLOWER_SOC_RING_0		_SBF(2, 0x01)
-+#define CRYPTO_V2_RNG_SLOWER_SOC_RING_1		_SBF(2, 0x02)
-+#define CRYPTO_V2_RNG_SLOWEST_SOC_RING		_SBF(2, 0x03)
-+#define CRYPTO_V2_RNG_ENABLE			BIT(1)
-+#define CRYPTO_V2_RNG_START			BIT(0)
-+#define CRYPTO_V2_RNG_SAMPLE_CNT		0x0404
-+#define CRYPTO_V2_RNG_DOUT_0			0x0410
-+
-+struct rk_rng_soc_data {
-+	const char * const *clks;
-+	int clks_num;
-+	int (*rk_rng_read)(struct hwrng *rng, void *buf, size_t max, bool wait);
-+};
-+
-+struct rk_rng {
-+	struct device		*dev;
-+	struct hwrng		rng;
-+	void __iomem		*mem;
-+	struct rk_rng_soc_data	*soc_data;
-+	u32			clk_num;
-+	struct clk_bulk_data	*clk_bulks;
-+};
-+
-+static const char * const rk_rng_v1_clks[] = {
-+	"hclk_crypto",
-+	"clk_crypto",
-+};
-+
-+static const char * const rk_rng_v2_clks[] = {
-+	"hclk_crypto",
-+	"aclk_crypto",
-+	"clk_crypto",
-+	"clk_crypto_apk",
-+};
-+
-+static void rk_rng_writel(struct rk_rng *rng, u32 val, u32 offset)
-+{
-+	__raw_writel(val, rng->mem + offset);
-+}
-+
-+static u32 rk_rng_readl(struct rk_rng *rng, u32 offset)
-+{
-+	return __raw_readl(rng->mem + offset);
-+}
-+
-+static int rk_rng_init(struct hwrng *rng)
-+{
-+	int ret;
-+	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
-+
-+	ret = clk_bulk_prepare_enable(rk_rng->clk_num, rk_rng->clk_bulks);
-+	if (ret < 0) {
-+		dev_err(rk_rng->dev, "failed to enable clks %d\n", ret);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static void rk_rng_cleanup(struct hwrng *rng)
-+{
-+	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
-+
-+	clk_bulk_disable_unprepare(rk_rng->clk_num, rk_rng->clk_bulks);
-+}
-+
-+static void rk_rng_read_regs(struct rk_rng *rng, u32 offset, void *buf,
-+			     size_t size)
-+{
-+	u32 i, sample;
-+
-+	for (i = 0; i < size; i += 4) {
-+		sample = rk_rng_readl(rng, offset + i);
-+		memcpy(buf + i, &sample, sizeof(sample));
-+	}
-+}
-+
-+static int rk_rng_v1_read(struct hwrng *rng, void *buf, size_t max, bool wait)
-+{
-+	int ret = 0;
-+	u32 reg_ctrl = 0;
-+	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
-+
-+	ret = pm_runtime_get_sync(rk_rng->dev);
-+	if (ret < 0) {
-+		pm_runtime_put_noidle(rk_rng->dev);
-+		return ret;
-+	}
-+
-+	/* enable osc_ring to get entropy, sample period is set as 100 */
-+	reg_ctrl = CRYPTO_V1_OSC_ENABLE | CRYPTO_V1_TRNG_SAMPLE_PERIOD(100);
-+	rk_rng_writel(rk_rng, reg_ctrl, CRYPTO_V1_TRNG_CTRL);
-+
-+	reg_ctrl = HIWORD_UPDATE(CRYPTO_V1_RNG_START, CRYPTO_V1_RNG_START, 0);
-+
-+	rk_rng_writel(rk_rng, reg_ctrl, CRYPTO_V1_CTRL);
-+
-+	ret = readl_poll_timeout(rk_rng->mem + CRYPTO_V1_CTRL, reg_ctrl,
-+				 !(reg_ctrl & CRYPTO_V1_RNG_START),
-+				 ROCKCHIP_POLL_PERIOD_US,
-+				 ROCKCHIP_POLL_TIMEOUT_US);
-+	if (ret < 0)
-+		goto out;
-+
-+	ret = min_t(size_t, max, RK_MAX_RNG_BYTE);
-+
-+	rk_rng_read_regs(rk_rng, CRYPTO_V1_TRNG_DOUT_0, buf, ret);
-+
-+out:
-+	/* close TRNG */
-+	rk_rng_writel(rk_rng, HIWORD_UPDATE(0, CRYPTO_V1_RNG_START, 0),
-+		      CRYPTO_V1_CTRL);
-+
-+	pm_runtime_mark_last_busy(rk_rng->dev);
-+	pm_runtime_put_sync_autosuspend(rk_rng->dev);
-+
-+	return ret;
-+}
-+
-+static int rk_rng_v2_read(struct hwrng *rng, void *buf, size_t max, bool wait)
-+{
-+	int ret = 0;
-+	u32 reg_ctrl = 0;
-+	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
-+
-+	ret = pm_runtime_get_sync(rk_rng->dev);
-+	if (ret < 0) {
-+		pm_runtime_put_noidle(rk_rng->dev);
-+		return ret;
-+	}
-+
-+	/* enable osc_ring to get entropy, sample period is set as 100 */
-+	rk_rng_writel(rk_rng, 100, CRYPTO_V2_RNG_SAMPLE_CNT);
-+
-+	reg_ctrl |= CRYPTO_V2_RNG_256_BIT_LEN;
-+	reg_ctrl |= CRYPTO_V2_RNG_SLOWER_SOC_RING_0;
-+	reg_ctrl |= CRYPTO_V2_RNG_ENABLE;
-+	reg_ctrl |= CRYPTO_V2_RNG_START;
-+
-+	rk_rng_writel(rk_rng, HIWORD_UPDATE(reg_ctrl, 0xffff, 0),
-+			CRYPTO_V2_RNG_CTL);
-+
-+	ret = readl_poll_timeout(rk_rng->mem + CRYPTO_V2_RNG_CTL, reg_ctrl,
-+				 !(reg_ctrl & CRYPTO_V2_RNG_START),
-+				 ROCKCHIP_POLL_PERIOD_US,
-+				 ROCKCHIP_POLL_TIMEOUT_US);
-+	if (ret < 0)
-+		goto out;
-+
-+	ret = min_t(size_t, max, RK_MAX_RNG_BYTE);
-+
-+	rk_rng_read_regs(rk_rng, CRYPTO_V2_RNG_DOUT_0, buf, ret);
-+
-+out:
-+	/* close TRNG */
-+	rk_rng_writel(rk_rng, HIWORD_UPDATE(0, 0xffff, 0), CRYPTO_V2_RNG_CTL);
-+
-+	pm_runtime_mark_last_busy(rk_rng->dev);
-+	pm_runtime_put_sync_autosuspend(rk_rng->dev);
-+
-+	return ret;
-+}
-+
-+static const struct rk_rng_soc_data rk_rng_v1_soc_data = {
-+	.clks_num = ARRAY_SIZE(rk_rng_v1_clks),
-+	.clks = rk_rng_v1_clks,
-+	.rk_rng_read = rk_rng_v1_read,
-+};
-+
-+static const struct rk_rng_soc_data rk_rng_v2_soc_data = {
-+	.clks_num = ARRAY_SIZE(rk_rng_v2_clks),
-+	.clks = rk_rng_v2_clks,
-+	.rk_rng_read = rk_rng_v2_read,
-+};
-+
-+static const struct of_device_id rk_rng_dt_match[] = {
-+	{
-+		.compatible = "rockchip,cryptov1-rng",
-+		.data = (void *)&rk_rng_v1_soc_data,
-+	},
-+	{
-+		.compatible = "rockchip,cryptov2-rng",
-+		.data = (void *)&rk_rng_v2_soc_data,
-+	},
-+	{ },
-+};
-+
-+MODULE_DEVICE_TABLE(of, rk_rng_dt_match);
-+
-+static int rk_rng_probe(struct platform_device *pdev)
-+{
-+	int i;
-+	int ret;
-+	struct rk_rng *rk_rng;
-+	struct device_node *np = pdev->dev.of_node;
-+	const struct of_device_id *match;
-+
-+	rk_rng = devm_kzalloc(&pdev->dev, sizeof(struct rk_rng), GFP_KERNEL);
-+	if (!rk_rng)
-+		return -ENOMEM;
-+
-+	match = of_match_node(rk_rng_dt_match, np);
-+	rk_rng->soc_data = (struct rk_rng_soc_data *)match->data;
-+
-+	rk_rng->dev = &pdev->dev;
-+	rk_rng->rng.name    = "rockchip";
-+#ifndef CONFIG_PM
-+	rk_rng->rng.init    = rk_rng_init;
-+	rk_rng->rng.cleanup = rk_rng_cleanup,
-+#endif
-+	rk_rng->rng.read    = rk_rng->soc_data->rk_rng_read;
-+	rk_rng->rng.quality = 1024;
-+
-+	rk_rng->clk_bulks =
-+		devm_kzalloc(&pdev->dev, sizeof(*rk_rng->clk_bulks) *
-+			     rk_rng->soc_data->clks_num, GFP_KERNEL);
-+
-+	rk_rng->clk_num = rk_rng->soc_data->clks_num;
-+
-+	for (i = 0; i < rk_rng->soc_data->clks_num; i++)
-+		rk_rng->clk_bulks[i].id = rk_rng->soc_data->clks[i];
-+
-+	rk_rng->mem = devm_of_iomap(&pdev->dev, pdev->dev.of_node, 0, NULL);
-+	if (IS_ERR(rk_rng->mem))
-+		return PTR_ERR(rk_rng->mem);
-+
-+	ret = devm_clk_bulk_get(&pdev->dev, rk_rng->clk_num,
-+				rk_rng->clk_bulks);
-+	if (ret) {
-+		dev_err(&pdev->dev, "failed to get clks property\n");
-+		return ret;
-+	}
-+
-+	platform_set_drvdata(pdev, rk_rng);
-+
-+	pm_runtime_set_autosuspend_delay(&pdev->dev,
-+					ROCKCHIP_AUTOSUSPEND_DELAY);
-+	pm_runtime_use_autosuspend(&pdev->dev);
-+	pm_runtime_enable(&pdev->dev);
-+
-+	ret = devm_hwrng_register(&pdev->dev, &rk_rng->rng);
-+	if (ret) {
-+		pm_runtime_dont_use_autosuspend(&pdev->dev);
-+		pm_runtime_disable(&pdev->dev);
-+	}
-+
-+	return ret;
-+}
-+
-+#ifdef CONFIG_PM
-+static int rk_rng_runtime_suspend(struct device *dev)
-+{
-+	struct rk_rng *rk_rng = dev_get_drvdata(dev);
-+
-+	rk_rng_cleanup(&rk_rng->rng);
-+
-+	return 0;
-+}
-+
-+static int rk_rng_runtime_resume(struct device *dev)
-+{
-+	struct rk_rng *rk_rng = dev_get_drvdata(dev);
-+
-+	return rk_rng_init(&rk_rng->rng);
-+}
-+
-+static const struct dev_pm_ops rk_rng_pm_ops = {
-+	SET_RUNTIME_PM_OPS(rk_rng_runtime_suspend,
-+				rk_rng_runtime_resume, NULL)
-+	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
-+				pm_runtime_force_resume)
-+};
-+#endif
-+
-+static struct platform_driver rk_rng_driver = {
-+	.driver	= {
-+		.name	= "rockchip-rng",
-+#ifdef CONFIG_PM
-+		.pm	= &rk_rng_pm_ops,
-+#endif
-+		.of_match_table = rk_rng_dt_match,
-+	},
-+	.probe	= rk_rng_probe,
-+};
-+
-+module_platform_driver(rk_rng_driver);
-+
-+MODULE_DESCRIPTION("ROCKCHIP H/W Random Number Generator driver");
-+MODULE_AUTHOR("Lin Jinhan <troy.lin@rock-chips.com>");
-+MODULE_LICENSE("GPL v2");
--- 
-Armbian
-
diff --git a/patch/kernel/archive/rockchip64-6.12/general-legacy-rockchip-hwrng_5.10.patch b/patch/kernel/archive/rockchip64-6.12/general-legacy-rockchip-hwrng_5.10.patch
deleted file mode 100644
index ebd23d5fddaf..000000000000
--- a/patch/kernel/archive/rockchip64-6.12/general-legacy-rockchip-hwrng_5.10.patch
+++ /dev/null
@@ -1,523 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: brentr <brent@mbari.org>
-Date: Fri, 25 Nov 2022 18:02:13 +0100
-Subject: [ARCHEOLOGY] Updated v4.4 HW RND driver with that from v5.10 kernel
- (#4485)
-
-> X-Git-Archeology: - Revision d8fd01bc54d666efc1145920ad5538b050a7ef2c: https://github.com/armbian/build/commit/d8fd01bc54d666efc1145920ad5538b050a7ef2c
-> X-Git-Archeology:   Date: Fri, 25 Nov 2022 18:02:13 +0100
-> X-Git-Archeology:   From: brentr <brent@mbari.org>
-> X-Git-Archeology:   Subject: Updated v4.4 HW RND driver with that from v5.10 kernel (#4485)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision 92f1a22d76b987afa7ba555d5b509adc51d689e7: https://github.com/armbian/build/commit/92f1a22d76b987afa7ba555d5b509adc51d689e7
-> X-Git-Archeology:   Date: Fri, 16 Dec 2022 13:38:13 +0100
-> X-Git-Archeology:   From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
-> X-Git-Archeology:   Subject: Re-add rockchip64 6.0 patches (#4575)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision 34ae84fac5d0b66a1ab2d1e51534b7beb13ef245: https://github.com/armbian/build/commit/34ae84fac5d0b66a1ab2d1e51534b7beb13ef245
-> X-Git-Archeology:   Date: Fri, 05 May 2023 14:22:00 +0200
-> X-Git-Archeology:   From: amazingfate <liujianfeng1994@gmail.com>
-> X-Git-Archeology:   Subject: bump rockchip64 edge to v6.3
-> X-Git-Archeology:
----
- drivers/char/hw_random/rockchip-rng.c | 328 +++++++---
- 1 file changed, 249 insertions(+), 79 deletions(-)
-
-diff --git a/drivers/char/hw_random/rockchip-rng.c b/drivers/char/hw_random/rockchip-rng.c
-index 111111111111..222222222222 100644
---- a/drivers/char/hw_random/rockchip-rng.c
-+++ b/drivers/char/hw_random/rockchip-rng.c
-@@ -21,18 +21,24 @@
- 
- #define ROCKCHIP_AUTOSUSPEND_DELAY		100
- #define ROCKCHIP_POLL_PERIOD_US			100
--#define ROCKCHIP_POLL_TIMEOUT_US		10000
-+#define ROCKCHIP_POLL_TIMEOUT_US		50000
- #define RK_MAX_RNG_BYTE				(32)
- 
-+/* start of CRYPTO V1 register define */
- #define CRYPTO_V1_CTRL				0x0008
- #define CRYPTO_V1_RNG_START			BIT(8)
- #define CRYPTO_V1_RNG_FLUSH			BIT(9)
-+
- #define CRYPTO_V1_TRNG_CTRL			0x0200
- #define CRYPTO_V1_OSC_ENABLE			BIT(16)
- #define CRYPTO_V1_TRNG_SAMPLE_PERIOD(x)		(x)
-+
- #define CRYPTO_V1_TRNG_DOUT_0			0x0204
-+/* end of CRYPTO V1 register define */
- 
--#define CRYPTO_V2_RNG_CTL			0x0400
-+/* start of CRYPTO V2 register define */
-+#define CRYPTO_V2_RNG_DEFAULT_OFFSET		0x0400
-+#define CRYPTO_V2_RNG_CTL			0x0
- #define CRYPTO_V2_RNG_64_BIT_LEN		_SBF(4, 0x00)
- #define CRYPTO_V2_RNG_128_BIT_LEN		_SBF(4, 0x01)
- #define CRYPTO_V2_RNG_192_BIT_LEN		_SBF(4, 0x02)
-@@ -43,12 +49,48 @@
- #define CRYPTO_V2_RNG_SLOWEST_SOC_RING		_SBF(2, 0x03)
- #define CRYPTO_V2_RNG_ENABLE			BIT(1)
- #define CRYPTO_V2_RNG_START			BIT(0)
--#define CRYPTO_V2_RNG_SAMPLE_CNT		0x0404
--#define CRYPTO_V2_RNG_DOUT_0			0x0410
-+#define CRYPTO_V2_RNG_SAMPLE_CNT		0x0004
-+#define CRYPTO_V2_RNG_DOUT_0			0x0010
-+/* end of CRYPTO V2 register define */
-+
-+/* start of TRNG_V1 register define */
-+/* TRNG is no longer subordinate to the Crypto module */
-+#define TRNG_V1_CTRL				0x0000
-+#define TRNG_V1_CTRL_NOP			_SBF(0, 0x00)
-+#define TRNG_V1_CTRL_RAND			_SBF(0, 0x01)
-+#define TRNG_V1_CTRL_SEED			_SBF(0, 0x02)
-+
-+#define TRNG_V1_STAT				0x0004
-+#define TRNG_V1_STAT_SEEDED			BIT(9)
-+#define TRNG_V1_STAT_GENERATING			BIT(30)
-+#define TRNG_V1_STAT_RESEEDING			BIT(31)
-+
-+#define TRNG_V1_MODE				0x0008
-+#define TRNG_V1_MODE_128_BIT			_SBF(3, 0x00)
-+#define TRNG_V1_MODE_256_BIT			_SBF(3, 0x01)
-+
-+#define TRNG_V1_IE				0x0010
-+#define TRNG_V1_IE_GLBL_EN			BIT(31)
-+#define TRNG_V1_IE_SEED_DONE_EN			BIT(1)
-+#define TRNG_V1_IE_RAND_RDY_EN			BIT(0)
-+
-+#define TRNG_V1_ISTAT				0x0014
-+#define TRNG_V1_ISTAT_RAND_RDY			BIT(0)
-+
-+/* RAND0 ~ RAND7 */
-+#define TRNG_V1_RAND0				0x0020
-+#define TRNG_V1_RAND7				0x003C
-+
-+#define TRNG_V1_AUTO_RQSTS			0x0060
-+
-+#define TRNG_V1_VERSION				0x00F0
-+#define TRNG_v1_VERSION_CODE			0x46bc
-+/* end of TRNG_V1 register define */
- 
- struct rk_rng_soc_data {
--	const char * const *clks;
--	int clks_num;
-+	u32 default_offset;
-+
-+	int (*rk_rng_init)(struct hwrng *rng);
- 	int (*rk_rng_read)(struct hwrng *rng, void *buf, size_t max, bool wait);
- };
- 
-@@ -57,22 +99,10 @@ struct rk_rng {
- 	struct hwrng		rng;
- 	void __iomem		*mem;
- 	struct rk_rng_soc_data	*soc_data;
--	u32			clk_num;
-+	int			clk_num;
- 	struct clk_bulk_data	*clk_bulks;
- };
- 
--static const char * const rk_rng_v1_clks[] = {
--	"hclk_crypto",
--	"clk_crypto",
--};
--
--static const char * const rk_rng_v2_clks[] = {
--	"hclk_crypto",
--	"aclk_crypto",
--	"clk_crypto",
--	"clk_crypto_apk",
--};
--
- static void rk_rng_writel(struct rk_rng *rng, u32 val, u32 offset)
- {
- 	__raw_writel(val, rng->mem + offset);
-@@ -88,6 +118,8 @@ static int rk_rng_init(struct hwrng *rng)
- 	int ret;
- 	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
- 
-+	dev_dbg(rk_rng->dev, "clk_bulk_prepare_enable.\n");
-+
- 	ret = clk_bulk_prepare_enable(rk_rng->clk_num, rk_rng->clk_bulks);
- 	if (ret < 0) {
- 		dev_err(rk_rng->dev, "failed to enable clks %d\n", ret);
-@@ -101,32 +133,57 @@ static void rk_rng_cleanup(struct hwrng *rng)
- {
- 	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
- 
-+	dev_dbg(rk_rng->dev, "clk_bulk_disable_unprepare.\n");
- 	clk_bulk_disable_unprepare(rk_rng->clk_num, rk_rng->clk_bulks);
- }
- 
-+static int rk_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)
-+{
-+	int ret;
-+	int read_len = 0;
-+	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
-+
-+	if (!rk_rng->soc_data->rk_rng_read)
-+		return -EFAULT;
-+
-+	ret = pm_runtime_get_sync(rk_rng->dev);
-+	if (ret < 0) {
-+		pm_runtime_put_noidle(rk_rng->dev);
-+		return ret;
-+	}
-+
-+	ret = 0;
-+	while (max > ret) {
-+		read_len = rk_rng->soc_data->rk_rng_read(rng, buf + ret,
-+							 max - ret, wait);
-+		if (read_len < 0) {
-+			ret = read_len;
-+			break;
-+		}
-+		ret += read_len;
-+	}
-+
-+	pm_runtime_mark_last_busy(rk_rng->dev);
-+	pm_runtime_put_sync_autosuspend(rk_rng->dev);
-+
-+	return ret;
-+}
-+
- static void rk_rng_read_regs(struct rk_rng *rng, u32 offset, void *buf,
- 			     size_t size)
- {
--	u32 i, sample;
-+	u32 i;
- 
--	for (i = 0; i < size; i += 4) {
--		sample = rk_rng_readl(rng, offset + i);
--		memcpy(buf + i, &sample, sizeof(sample));
--	}
-+	for (i = 0; i < size; i += 4)
-+		*(u32 *)(buf + i) = be32_to_cpu(rk_rng_readl(rng, offset + i));
- }
- 
--static int rk_rng_v1_read(struct hwrng *rng, void *buf, size_t max, bool wait)
-+static int rk_crypto_v1_read(struct hwrng *rng, void *buf, size_t max, bool wait)
- {
- 	int ret = 0;
- 	u32 reg_ctrl = 0;
- 	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
- 
--	ret = pm_runtime_get_sync(rk_rng->dev);
--	if (ret < 0) {
--		pm_runtime_put_noidle(rk_rng->dev);
--		return ret;
--	}
--
- 	/* enable osc_ring to get entropy, sample period is set as 100 */
- 	reg_ctrl = CRYPTO_V1_OSC_ENABLE | CRYPTO_V1_TRNG_SAMPLE_PERIOD(100);
- 	rk_rng_writel(rk_rng, reg_ctrl, CRYPTO_V1_TRNG_CTRL);
-@@ -135,10 +192,12 @@ static int rk_rng_v1_read(struct hwrng *rng, void *buf, size_t max, bool wait)
- 
- 	rk_rng_writel(rk_rng, reg_ctrl, CRYPTO_V1_CTRL);
- 
--	ret = readl_poll_timeout(rk_rng->mem + CRYPTO_V1_CTRL, reg_ctrl,
--				 !(reg_ctrl & CRYPTO_V1_RNG_START),
--				 ROCKCHIP_POLL_PERIOD_US,
--				 ROCKCHIP_POLL_TIMEOUT_US);
-+	ret = read_poll_timeout(rk_rng_readl, reg_ctrl,
-+				!(reg_ctrl & CRYPTO_V1_RNG_START),
-+				ROCKCHIP_POLL_PERIOD_US,
-+				ROCKCHIP_POLL_TIMEOUT_US, false,
-+				rk_rng, CRYPTO_V1_CTRL);
-+
- 	if (ret < 0)
- 		goto out;
- 
-@@ -151,24 +210,15 @@ static int rk_rng_v1_read(struct hwrng *rng, void *buf, size_t max, bool wait)
- 	rk_rng_writel(rk_rng, HIWORD_UPDATE(0, CRYPTO_V1_RNG_START, 0),
- 		      CRYPTO_V1_CTRL);
- 
--	pm_runtime_mark_last_busy(rk_rng->dev);
--	pm_runtime_put_sync_autosuspend(rk_rng->dev);
--
- 	return ret;
- }
- 
--static int rk_rng_v2_read(struct hwrng *rng, void *buf, size_t max, bool wait)
-+static int rk_crypto_v2_read(struct hwrng *rng, void *buf, size_t max, bool wait)
- {
- 	int ret = 0;
- 	u32 reg_ctrl = 0;
- 	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
- 
--	ret = pm_runtime_get_sync(rk_rng->dev);
--	if (ret < 0) {
--		pm_runtime_put_noidle(rk_rng->dev);
--		return ret;
--	}
--
- 	/* enable osc_ring to get entropy, sample period is set as 100 */
- 	rk_rng_writel(rk_rng, 100, CRYPTO_V2_RNG_SAMPLE_CNT);
- 
-@@ -178,12 +228,13 @@ static int rk_rng_v2_read(struct hwrng *rng, void *buf, size_t max, bool wait)
- 	reg_ctrl |= CRYPTO_V2_RNG_START;
- 
- 	rk_rng_writel(rk_rng, HIWORD_UPDATE(reg_ctrl, 0xffff, 0),
--			CRYPTO_V2_RNG_CTL);
-+		      CRYPTO_V2_RNG_CTL);
- 
--	ret = readl_poll_timeout(rk_rng->mem + CRYPTO_V2_RNG_CTL, reg_ctrl,
--				 !(reg_ctrl & CRYPTO_V2_RNG_START),
--				 ROCKCHIP_POLL_PERIOD_US,
--				 ROCKCHIP_POLL_TIMEOUT_US);
-+	ret = read_poll_timeout(rk_rng_readl, reg_ctrl,
-+				!(reg_ctrl & CRYPTO_V2_RNG_START),
-+				ROCKCHIP_POLL_PERIOD_US,
-+				ROCKCHIP_POLL_TIMEOUT_US, false,
-+				rk_rng, CRYPTO_V2_RNG_CTL);
- 	if (ret < 0)
- 		goto out;
- 
-@@ -195,32 +246,141 @@ static int rk_rng_v2_read(struct hwrng *rng, void *buf, size_t max, bool wait)
- 	/* close TRNG */
- 	rk_rng_writel(rk_rng, HIWORD_UPDATE(0, 0xffff, 0), CRYPTO_V2_RNG_CTL);
- 
-+	return ret;
-+}
-+
-+static int rk_trng_v1_init(struct hwrng *rng)
-+{
-+	int ret;
-+	uint32_t auto_reseed_cnt = 1000;
-+	uint32_t reg_ctrl, status, version;
-+	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
-+
-+	ret = pm_runtime_get_sync(rk_rng->dev);
-+	if (ret < 0) {
-+		pm_runtime_put_noidle(rk_rng->dev);
-+		return ret;
-+	}
-+
-+	version = rk_rng_readl(rk_rng, TRNG_V1_VERSION);
-+	if (version != TRNG_v1_VERSION_CODE) {
-+		dev_err(rk_rng->dev,
-+			"wrong trng version, expected = %08x, actual = %08x\n",
-+			TRNG_V1_VERSION, version);
-+		ret = -EFAULT;
-+		goto exit;
-+	}
-+
-+	status = rk_rng_readl(rk_rng, TRNG_V1_STAT);
-+
-+	/* TRNG should wait RAND_RDY triggered if it is busy or not seeded */
-+	if (!(status & TRNG_V1_STAT_SEEDED) ||
-+	    (status & TRNG_V1_STAT_GENERATING) ||
-+	    (status & TRNG_V1_STAT_RESEEDING)) {
-+		uint32_t mask = TRNG_V1_STAT_SEEDED |
-+				TRNG_V1_STAT_GENERATING |
-+				TRNG_V1_STAT_RESEEDING;
-+
-+		udelay(10);
-+
-+		/* wait for GENERATING and RESEEDING flag to clear */
-+		read_poll_timeout(rk_rng_readl, reg_ctrl,
-+				  (reg_ctrl & mask) == TRNG_V1_STAT_SEEDED,
-+				  ROCKCHIP_POLL_PERIOD_US,
-+				  ROCKCHIP_POLL_TIMEOUT_US, false,
-+				  rk_rng, TRNG_V1_STAT);
-+	}
-+
-+	/* clear ISTAT flag because trng may auto reseeding when power on */
-+	reg_ctrl = rk_rng_readl(rk_rng, TRNG_V1_ISTAT);
-+	rk_rng_writel(rk_rng, reg_ctrl, TRNG_V1_ISTAT);
-+
-+	/* auto reseed after (auto_reseed_cnt * 16) byte rand generate */
-+	rk_rng_writel(rk_rng, auto_reseed_cnt, TRNG_V1_AUTO_RQSTS);
-+
-+	ret = 0;
-+exit:
- 	pm_runtime_mark_last_busy(rk_rng->dev);
- 	pm_runtime_put_sync_autosuspend(rk_rng->dev);
- 
- 	return ret;
- }
- 
--static const struct rk_rng_soc_data rk_rng_v1_soc_data = {
--	.clks_num = ARRAY_SIZE(rk_rng_v1_clks),
--	.clks = rk_rng_v1_clks,
--	.rk_rng_read = rk_rng_v1_read,
-+static int rk_trng_v1_read(struct hwrng *rng, void *buf, size_t max, bool wait)
-+{
-+	int ret = 0;
-+	u32 reg_ctrl = 0;
-+	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
-+
-+	/* clear ISTAT anyway */
-+	reg_ctrl = rk_rng_readl(rk_rng, TRNG_V1_ISTAT);
-+	rk_rng_writel(rk_rng, reg_ctrl, TRNG_V1_ISTAT);
-+
-+	/* generate 256bit random */
-+	rk_rng_writel(rk_rng, TRNG_V1_MODE_256_BIT, TRNG_V1_MODE);
-+	rk_rng_writel(rk_rng, TRNG_V1_CTRL_RAND, TRNG_V1_CTRL);
-+
-+	/*
-+	 * Generate2 56 bit random data will cost 1024 clock cycles.
-+	 * Estimated at 150M RNG module frequency, it takes 6.7 microseconds.
-+	 */
-+	udelay(10);
-+	reg_ctrl = rk_rng_readl(rk_rng, TRNG_V1_ISTAT);
-+	if (!(reg_ctrl & TRNG_V1_ISTAT_RAND_RDY)) {
-+		/* wait RAND_RDY triggered */
-+		ret = read_poll_timeout(rk_rng_readl, reg_ctrl,
-+					(reg_ctrl & TRNG_V1_ISTAT_RAND_RDY),
-+					ROCKCHIP_POLL_PERIOD_US,
-+					ROCKCHIP_POLL_TIMEOUT_US, false,
-+					rk_rng, TRNG_V1_ISTAT);
-+		if (ret < 0)
-+			goto out;
-+	}
-+
-+	ret = min_t(size_t, max, RK_MAX_RNG_BYTE);
-+
-+	rk_rng_read_regs(rk_rng, TRNG_V1_RAND0, buf, ret);
-+
-+	/* clear all status flag */
-+	rk_rng_writel(rk_rng, reg_ctrl, TRNG_V1_ISTAT);
-+out:
-+	/* close TRNG */
-+	rk_rng_writel(rk_rng, TRNG_V1_CTRL_NOP, TRNG_V1_CTRL);
-+
-+	return ret;
-+}
-+
-+static const struct rk_rng_soc_data rk_crypto_v1_soc_data = {
-+	.default_offset = 0,
-+
-+	.rk_rng_read = rk_crypto_v1_read,
- };
- 
--static const struct rk_rng_soc_data rk_rng_v2_soc_data = {
--	.clks_num = ARRAY_SIZE(rk_rng_v2_clks),
--	.clks = rk_rng_v2_clks,
--	.rk_rng_read = rk_rng_v2_read,
-+static const struct rk_rng_soc_data rk_crypto_v2_soc_data = {
-+	.default_offset = CRYPTO_V2_RNG_DEFAULT_OFFSET,
-+
-+	.rk_rng_read = rk_crypto_v2_read,
-+};
-+
-+static const struct rk_rng_soc_data rk_trng_v1_soc_data = {
-+	.default_offset = 0,
-+
-+	.rk_rng_init = rk_trng_v1_init,
-+	.rk_rng_read = rk_trng_v1_read,
- };
- 
- static const struct of_device_id rk_rng_dt_match[] = {
- 	{
- 		.compatible = "rockchip,cryptov1-rng",
--		.data = (void *)&rk_rng_v1_soc_data,
-+		.data = (void *)&rk_crypto_v1_soc_data,
- 	},
- 	{
- 		.compatible = "rockchip,cryptov2-rng",
--		.data = (void *)&rk_rng_v2_soc_data,
-+		.data = (void *)&rk_crypto_v2_soc_data,
-+	},
-+	{
-+		.compatible = "rockchip,trngv1",
-+		.data = (void *)&rk_trng_v1_soc_data,
- 	},
- 	{ },
- };
-@@ -229,12 +389,13 @@ MODULE_DEVICE_TABLE(of, rk_rng_dt_match);
- 
- static int rk_rng_probe(struct platform_device *pdev)
- {
--	int i;
- 	int ret;
- 	struct rk_rng *rk_rng;
- 	struct device_node *np = pdev->dev.of_node;
- 	const struct of_device_id *match;
-+	resource_size_t map_size;
- 
-+	dev_dbg(&pdev->dev, "probing...\n");
- 	rk_rng = devm_kzalloc(&pdev->dev, sizeof(struct rk_rng), GFP_KERNEL);
- 	if (!rk_rng)
- 		return -ENOMEM;
-@@ -248,33 +409,37 @@ static int rk_rng_probe(struct platform_device *pdev)
- 	rk_rng->rng.init    = rk_rng_init;
- 	rk_rng->rng.cleanup = rk_rng_cleanup,
- #endif
--	rk_rng->rng.read    = rk_rng->soc_data->rk_rng_read;
--	rk_rng->rng.quality = 1024;
--
--	rk_rng->clk_bulks =
--		devm_kzalloc(&pdev->dev, sizeof(*rk_rng->clk_bulks) *
--			     rk_rng->soc_data->clks_num, GFP_KERNEL);
-+	rk_rng->rng.read    = rk_rng_read;
-+	rk_rng->rng.quality = 999;
- 
--	rk_rng->clk_num = rk_rng->soc_data->clks_num;
--
--	for (i = 0; i < rk_rng->soc_data->clks_num; i++)
--		rk_rng->clk_bulks[i].id = rk_rng->soc_data->clks[i];
--
--	rk_rng->mem = devm_of_iomap(&pdev->dev, pdev->dev.of_node, 0, NULL);
-+	rk_rng->mem = devm_of_iomap(&pdev->dev, pdev->dev.of_node, 0, &map_size);
- 	if (IS_ERR(rk_rng->mem))
- 		return PTR_ERR(rk_rng->mem);
- 
--	ret = devm_clk_bulk_get(&pdev->dev, rk_rng->clk_num,
--				rk_rng->clk_bulks);
--	if (ret) {
-+	/* compatible with crypto v2 module */
-+	/*
-+	 * With old dtsi configurations, the RNG base was equal to the crypto
-+	 * base, so both drivers could not be enabled at the same time.
-+	 * RNG base = CRYPTO base + RNG offset
-+	 * (Since RK356X, RNG module is no longer belongs to CRYPTO module)
-+	 *
-+	 * With new dtsi configurations, CRYPTO regs is divided into two parts
-+	 * |---cipher---|---rng---|---pka---|, and RNG base is real RNG base.
-+	 * RNG driver and CRYPTO driver could be enabled at the same time.
-+	 */
-+	if (map_size > rk_rng->soc_data->default_offset)
-+		rk_rng->mem += rk_rng->soc_data->default_offset;
-+
-+	rk_rng->clk_num = devm_clk_bulk_get_all(&pdev->dev, &rk_rng->clk_bulks);
-+	if (rk_rng->clk_num < 0) {
- 		dev_err(&pdev->dev, "failed to get clks property\n");
--		return ret;
-+		return -ENODEV;
- 	}
- 
- 	platform_set_drvdata(pdev, rk_rng);
- 
- 	pm_runtime_set_autosuspend_delay(&pdev->dev,
--					ROCKCHIP_AUTOSUSPEND_DELAY);
-+					 ROCKCHIP_AUTOSUSPEND_DELAY);
- 	pm_runtime_use_autosuspend(&pdev->dev);
- 	pm_runtime_enable(&pdev->dev);
- 
-@@ -284,6 +449,10 @@ static int rk_rng_probe(struct platform_device *pdev)
- 		pm_runtime_disable(&pdev->dev);
- 	}
- 
-+	/* for some platform need hardware operation when probe */
-+	if (rk_rng->soc_data->rk_rng_init)
-+		ret = rk_rng->soc_data->rk_rng_init(&rk_rng->rng);
-+
- 	return ret;
- }
- 
-@@ -306,10 +475,11 @@ static int rk_rng_runtime_resume(struct device *dev)
- 
- static const struct dev_pm_ops rk_rng_pm_ops = {
- 	SET_RUNTIME_PM_OPS(rk_rng_runtime_suspend,
--				rk_rng_runtime_resume, NULL)
-+			   rk_rng_runtime_resume, NULL)
- 	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
- 				pm_runtime_force_resume)
- };
-+
- #endif
- 
- static struct platform_driver rk_rng_driver = {
--- 
-Armbian
-

From 8db8e198e32f8069af97426ca6986ff9d7bf9801 Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Thu, 7 Nov 2024 15:29:13 +0800
Subject: [PATCH 064/107] rockchip-rk3588-6.11: update rkvdec2 patch symlink

---
 .../0027-RK3588-Add-rkvdec2-Support-v3.patch                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0027-RK3588-Add-rkvdec2-Support-v3.patch b/patch/kernel/archive/rockchip-rk3588-6.11/0027-RK3588-Add-rkvdec2-Support-v3.patch
index 23f230de04ea..10a283585f9a 120000
--- a/patch/kernel/archive/rockchip-rk3588-6.11/0027-RK3588-Add-rkvdec2-Support-v3.patch
+++ b/patch/kernel/archive/rockchip-rk3588-6.11/0027-RK3588-Add-rkvdec2-Support-v3.patch
@@ -1 +1 @@
-../rockchip64-6.11/media-0001-Add-rkvdec2-Support-v3.patch
\ No newline at end of file
+../rockchip64-6.12/media-0001-Add-rkvdec2-Support-v3.patch
\ No newline at end of file

From 0de18016710178ecce853d345631742219e6eabd Mon Sep 17 00:00:00 2001
From: igorpecovnik <6281704+igorpecovnik@users.noreply.github.com>
Date: Sun, 10 Nov 2024 14:06:08 +0000
Subject: [PATCH 065/107] `Automatic` board configs status synchronise

---
 .github/CODEOWNERS                | 2 +-
 config/boards/orangepi5-plus.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e8964fa6719c..b795786eee08 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -95,7 +95,7 @@ config/boards/onecloud.conf		@hzyitc
 config/boards/oneplus-kebab.conf		@amazingfate
 config/boards/orangepi4-lts.conf		@paolosabatino
 config/boards/orangepi4.csc		@paolosabatino
-config/boards/orangepi5-plus.conf		@alexl83 @efectn
+config/boards/orangepi5-plus.conf		@alexl83
 config/boards/orangepi5.conf		@efectn
 config/boards/orangepione.conf		@StephenGraf
 config/boards/orangepipc.csc		@lbmendes
diff --git a/config/boards/orangepi5-plus.conf b/config/boards/orangepi5-plus.conf
index 803c594126c6..1bc59f6f929f 100644
--- a/config/boards/orangepi5-plus.conf
+++ b/config/boards/orangepi5-plus.conf
@@ -1,7 +1,7 @@
 # Rockchip RK3588 octa core 4/8/16GB RAM SoC SPI NVMe 2x USB2 2x USB3 1x USB-C 2x 2.5GbE 3x HDMI
 BOARD_NAME="Orange Pi 5 Plus"
 BOARDFAMILY="rockchip-rk3588"
-BOARD_MAINTAINER="alexl83 efectn"
+BOARD_MAINTAINER="alexl83"
 BOOTCONFIG="orangepi-5-plus-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
 KERNEL_TARGET="edge,current,vendor"

From 5a6c1ae938bc54fdccc810e9abd0ddf59be4d840 Mon Sep 17 00:00:00 2001
From: Viacheslav Bocharov <adeep@lexina.in>
Date: Thu, 18 Jul 2024 15:41:30 +0300
Subject: [PATCH 066/107] JetHome: JetHub D2 (j200) fix edge kernel dts

Signed-off-by: Viacheslav Bocharov <adeep@lexina.in>
---
 .../meson64-6.11/dt/meson-sm1-jethome-jethub-j200-spinor.dts  | 4 ++++
 .../archive/meson64-6.11/dt/meson-sm1-jethome-jethub-j200.dts | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/patch/kernel/archive/meson64-6.11/dt/meson-sm1-jethome-jethub-j200-spinor.dts b/patch/kernel/archive/meson64-6.11/dt/meson-sm1-jethome-jethub-j200-spinor.dts
index a9e4749f8395..b4d2542cddc2 100644
--- a/patch/kernel/archive/meson64-6.11/dt/meson-sm1-jethome-jethub-j200-spinor.dts
+++ b/patch/kernel/archive/meson64-6.11/dt/meson-sm1-jethome-jethub-j200-spinor.dts
@@ -1,4 +1,8 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2024 JetHome
+ * Author: Viacheslav Bocharov <adeep@lexina.in>
+ */
 
 /dts-v1/;
 
diff --git a/patch/kernel/archive/meson64-6.11/dt/meson-sm1-jethome-jethub-j200.dts b/patch/kernel/archive/meson64-6.11/dt/meson-sm1-jethome-jethub-j200.dts
index d5c761aa0a65..181e4a221ba2 100644
--- a/patch/kernel/archive/meson64-6.11/dt/meson-sm1-jethome-jethub-j200.dts
+++ b/patch/kernel/archive/meson64-6.11/dt/meson-sm1-jethome-jethub-j200.dts
@@ -462,6 +462,7 @@
 	status = "disabled";
 	pinctrl-0 = <&nor_pins>;
 	pinctrl-names = "default";
+	clock-frequency = <400000>;
 
 	flash: nor-flash@0 {
 		compatible = "sst,w25q256", "jedec,spi-nor";
@@ -500,6 +501,7 @@
 	status = "okay";
 	pinctrl-0 = <&uart_b_pins>;
 	pinctrl-names = "default";
+	clock-frequency = <400000>;
 };
 
 

From f1c43e04681c1abe6501a0d357a9bf5535bbbe22 Mon Sep 17 00:00:00 2001
From: Viacheslav Bocharov <adeep@lexina.in>
Date: Fri, 9 Aug 2024 10:36:39 +0300
Subject: [PATCH 067/107] JetHome: JetHub D2 (j200) add current kernel dts

Signed-off-by: Viacheslav Bocharov <adeep@lexina.in>
---
 .../meson-sm1-jethome-jethub-j200-spinor.dts  |  15 +
 .../dt/meson-sm1-jethome-jethub-j200.dts      | 707 ++++++++++++++++++
 2 files changed, 722 insertions(+)
 create mode 100644 patch/kernel/archive/meson64-6.6/dt/meson-sm1-jethome-jethub-j200-spinor.dts
 create mode 100644 patch/kernel/archive/meson64-6.6/dt/meson-sm1-jethome-jethub-j200.dts

diff --git a/patch/kernel/archive/meson64-6.6/dt/meson-sm1-jethome-jethub-j200-spinor.dts b/patch/kernel/archive/meson64-6.6/dt/meson-sm1-jethome-jethub-j200-spinor.dts
new file mode 100644
index 000000000000..b4d2542cddc2
--- /dev/null
+++ b/patch/kernel/archive/meson64-6.6/dt/meson-sm1-jethome-jethub-j200-spinor.dts
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2024 JetHome
+ * Author: Viacheslav Bocharov <adeep@lexina.in>
+ */
+
+/dts-v1/;
+
+#include "meson-sm1-jethome-jethub-j200.dts"
+
+/ {
+	model = "JetHub D2 with SPI NOR flash";
+};
+
+#include "meson-g12-enable-spinor.dtsi"
diff --git a/patch/kernel/archive/meson64-6.6/dt/meson-sm1-jethome-jethub-j200.dts b/patch/kernel/archive/meson64-6.6/dt/meson-sm1-jethome-jethub-j200.dts
new file mode 100644
index 000000000000..181e4a221ba2
--- /dev/null
+++ b/patch/kernel/archive/meson64-6.6/dt/meson-sm1-jethome-jethub-j200.dts
@@ -0,0 +1,707 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2024 JetHome
+ * Author: Viacheslav Bocharov <adeep@lexina.in>
+ */
+
+/dts-v1/;
+
+#include "meson-sm1.dtsi"
+
+#include <dt-bindings/gpio/meson-g12a-gpio.h>
+#include <dt-bindings/leds/common.h>
+#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
+
+
+/ {
+
+	compatible = "jethome,jethub-j200", "amlogic,sm1";
+	model = "JetHome JetHub D2";
+
+	aliases {
+		serial0 = &uart_AO;
+		ethernet0 = &ethmac;
+		rtc0 = &rtc;
+		rtc1 = &vrtc;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	memory@0 {
+		device_type = "memory";
+		reg = <0x0 0x0 0x0 0x40000000>;
+	};
+
+	emmc_pwrseq: emmc-pwrseq {
+		compatible = "mmc-pwrseq-emmc";
+		reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
+	};
+
+	tflash_vdd: regulator-tflash_vdd {
+		compatible = "regulator-fixed";
+
+		regulator-name = "TFLASH_VDD";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+
+		gpio = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>;
+		enable-active-high;
+		regulator-always-on;
+	};
+
+	tf_io: gpio-regulator-tf_io {
+		compatible = "regulator-gpio";
+
+		regulator-name = "TF_IO";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc_5v>;
+
+		enable-gpios = <&gpio_ao GPIOE_2 GPIO_OPEN_DRAIN>;
+		enable-active-high;
+		regulator-always-on;
+
+		gpios = <&gpio_ao GPIOAO_6 GPIO_OPEN_SOURCE>;
+		gpios-states = <0>;
+
+		states = <3300000 0>,
+			 <1800000 1>;
+	};
+
+	flash_1v8: regulator-flash_1v8 {
+		compatible = "regulator-fixed";
+		regulator-name = "FLASH_1V8";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		vin-supply = <&vcc_3v3>;
+		regulator-always-on;
+	};
+
+	main_12v: regulator-main_12v {
+		compatible = "regulator-fixed";
+		regulator-name = "12V";
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+		regulator-always-on;
+	};
+
+	vcc_5v: regulator-vcc_5v {
+		compatible = "regulator-fixed";
+		regulator-name = "5V";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-always-on;
+		vin-supply = <&main_12v>;
+		gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
+		enable-active-high;
+	};
+
+	vcc_1v8: regulator-vcc_1v8 {
+		compatible = "regulator-fixed";
+		regulator-name = "VCC_1V8";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		vin-supply = <&vcc_3v3>;
+		regulator-always-on;
+	};
+
+	vcc_3v3: regulator-vcc_3v3 {
+		compatible = "regulator-fixed";
+		regulator-name = "VCC_3V3";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vddao_3v3>;
+		regulator-always-on;
+	};
+
+	vddcpu: regulator-vddcpu {
+		/*
+		 * MP8756GD Regulator.
+		 */
+		compatible = "pwm-regulator";
+
+		regulator-name = "VDDCPU";
+		regulator-min-microvolt = <721000>;
+		regulator-max-microvolt = <1022000>;
+
+		pwm-supply = <&main_12v>;
+
+		pwms = <&pwm_AO_cd 1 1250 0>;
+		pwm-dutycycle-range = <100 0>;
+
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
+	usb_pwr_en: regulator-usb_pwr_en {
+		compatible = "regulator-fixed";
+		regulator-name = "USB_PWR_EN";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc_5v>;
+
+		/* Connected to the internal USB-Hub */
+		gpio = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+	};
+
+	vddao_1v8: regulator-vddao_1v8 {
+		compatible = "regulator-fixed";
+		regulator-name = "VDDAO_1V8";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		vin-supply = <&vddao_3v3>;
+		regulator-always-on;
+	};
+
+	vddao_3v3: regulator-vddao_3v3 {
+		compatible = "regulator-fixed";
+		regulator-name = "VDDAO_3V3";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&main_12v>;
+		regulator-always-on;
+	};
+
+	hdmi-connector {
+		compatible = "hdmi-connector";
+		type = "a";
+
+		port {
+			hdmi_connector_in: endpoint {
+				remote-endpoint = <&hdmi_tx_tmds_out>;
+			};
+		};
+	};
+
+	sound {
+		compatible = "amlogic,axg-sound-card";
+		audio-aux-devs = <&tdmout_b>;
+		audio-routing = "TDM_B Playback", "TDMOUT_B OUT";
+
+		assigned-clocks = <&clkc CLKID_MPLL2>,
+				  <&clkc CLKID_MPLL0>,
+				  <&clkc CLKID_MPLL1>;
+		assigned-clock-parents = <0>, <0>, <0>;
+		assigned-clock-rates = <294912000>,
+				       <270950400>,
+				       <393216000>;
+
+		/* 8ch hdmi interface */
+		dai-link-0 {
+			sound-dai = <&tdmif_b>;
+			dai-format = "i2s";
+			dai-tdm-slot-tx-mask-0 = <1 1>;
+			dai-tdm-slot-tx-mask-1 = <1 1>;
+			dai-tdm-slot-tx-mask-2 = <1 1>;
+			dai-tdm-slot-tx-mask-3 = <1 1>;
+			mclk-fs = <256>;
+
+			codec {
+				sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
+			};
+		};
+
+		/* hdmi glue */
+		dai-link-1 {
+			sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
+
+			codec {
+				sound-dai = <&hdmi_tx>;
+			};
+		};
+	};
+
+	meson64-reboot {
+		compatible = "meson64,reboot";
+		sys_reset = <0x84000009>;
+		sys_poweroff = <0x84000008>;
+
+		sd-vqen = <&gpio GPIOE_2 GPIO_ACTIVE_HIGH>;
+		sd-vqsw = <&gpio_ao GPIOAO_6 GPIO_ACTIVE_HIGH>;
+		sd-vmmc = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led-green {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_STATUS;
+			gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "heartbeat";
+			panic-indicator;
+		};
+
+		led-red {
+			color = <LED_COLOR_ID_RED>;
+			function = LED_FUNCTION_POWER;
+			gpios = <&gpio GPIOH_5 GPIO_ACTIVE_LOW>;
+			default-state = "off";
+		};
+
+	};
+
+	sound {
+		model = "JETHUB-D2";
+	};
+
+};
+
+&arb {
+	status = "okay";
+};
+
+&cec_AO {
+	pinctrl-0 = <&cec_ao_a_h_pins>;
+	pinctrl-names = "default";
+	status = "disabled";
+	hdmi-phandle = <&hdmi_tx>;
+};
+
+&cecb_AO {
+	pinctrl-0 = <&cec_ao_b_h_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+	hdmi-phandle = <&hdmi_tx>;
+};
+
+&clkc_audio {
+	status = "okay";
+};
+
+&cpu0 {
+	cpu-supply = <&vddcpu>;
+	operating-points-v2 = <&cpu_opp_table>;
+	clocks = <&clkc CLKID_CPU_CLK>;
+	clock-latency = <50000>;
+};
+
+&cpu1 {
+	cpu-supply = <&vddcpu>;
+	operating-points-v2 = <&cpu_opp_table>;
+	clocks = <&clkc CLKID_CPU1_CLK>;
+	clock-latency = <50000>;
+};
+
+&cpu2 {
+	cpu-supply = <&vddcpu>;
+	operating-points-v2 = <&cpu_opp_table>;
+	clocks = <&clkc CLKID_CPU2_CLK>;
+	clock-latency = <50000>;
+};
+
+&cpu3 {
+	cpu-supply = <&vddcpu>;
+	operating-points-v2 = <&cpu_opp_table>;
+	clocks = <&clkc CLKID_CPU3_CLK>;
+	clock-latency = <50000>;
+};
+
+&ext_mdio {
+	external_phy: ethernet-phy@0 {
+		/* Realtek RTL8211F (0x001cc916) */
+		reg = <0>;
+		max-speed = <1000>;
+
+		reset-assert-us = <10000>;
+		reset-deassert-us = <80000>;
+		reset-gpios = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
+
+		interrupt-parent = <&gpio_intc>;
+		/* MAC_INTR on GPIOZ_14 */
+		interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
+	};
+};
+
+&ethmac {
+	pinctrl-0 = <&eth_pins>, <&eth_rgmii_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+	phy-mode = "rgmii";
+	phy-handle = <&external_phy>;
+	amlogic,tx-delay-ns = <2>;
+};
+
+&gpio {
+	gpio-line-names =
+		/* GPIOZ */
+		"", "", "", "", "", "", "", "",
+		"", "", "", "", "", "", "", "",
+		/* GPIOH */
+		"HDMITX_SDA", /* GPIOH_0 */
+		"HDMITX_SCL", /* GPIOH_1 */
+		"HDMITX_HPD_IN", /* GPIOH_2 */
+		"AO_CEC_A", /* GPIOH_3 */
+		"HUB_RESET", /* GPIOH_4 */
+		"LED_RED", /* GPIOH_5 */
+		"I2C_SDA_MODULES", /* GPIOH_6 */
+		"I2C_SCL_MODULES", /* GPIOH_7 */
+		"5V_EN", /* GPIOH_8 */
+		/* BOOT */
+		"", "", "", "", "", "", "", "",
+		"", "", "", "", "", "", "", "",
+		/* GPIOC */
+		"", "", "", "", "", "", "", "",
+		/* GPIOA */
+		"", "", "", "", "", "", "", "",
+		"", "", "", "", "", "",
+		"I2C_SDA_SYSBUS", /* GPIOA_14 */
+		"I2C_SCL_SYSBUS", /* GPIOA_15 */
+		/* GPIOX */
+		"", "", "", "", "", "", /* GPIOX_0 - GPIOX_5 */
+		"RS485_TX", /* GPIOX_6 */
+		"RS485_RX", /* GPIOX_7 */
+		"", "", "", "", "", "", /* GPIOX_8 - GPIOX_13 */
+		"", "", "", /* GPIOX_14 - GPIOX_16 */
+		"I2C_SDA_LCDBUS",  /* GPIOX_17 */
+		"I2C_SCL_LCDBUS",  /* GPIOX_18 */
+		""; /* GPIOX_19 */
+	/*
+	 * WARNING: The USB Hub needs a reset signal to be turned low in
+	 * order to be detected by the USB Controller. This signal should
+	 * be handled by a USB specific power sequence to reset the Hub
+	 * when the USB bus is powered down.
+	 */
+	usb-hub-hog {
+		gpio-hog;
+		gpios = <GPIOH_4 GPIO_ACTIVE_LOW>;
+		output-low;
+		line-name = "usb-hub-reset";
+	};
+
+};
+
+&gpio_ao {
+	gpio-line-names =
+		/* GPIOAO */
+		"CONSOLE_TX",  /* GPIOAO_0 */
+		"CONSOLE_RX",  /* GPIOAO_1 */
+		"USB_OTG_PWR_EN", /* GPIOAO_2 */
+		"TFLASH_VDD_EN",  /* GPIOAO_3 */
+		"MCU_RESET", /* GPIOAO_4 */
+		"POWER_GOOD", /* GPIOAO_5 */
+		"TF_3V3N_1V8_EN",  /* GPIOAO_6 */
+		"GPIO_EXPANDER_INT", /* GPIOAO_7 */
+		"MCU_UART_TX", /* GPIOAO_8 */
+		"MCU_UART_RX", /* GPIOAO_9 */
+		"BUTTON_USR", /* GPIOAO_10 */
+		"LED_GREEN", /* GPIOAO_11 */
+		/* GPIOE */
+		"VDDEE_PWM", "VDDCPU_PWM", "TF_PWR_EN";
+};
+
+&hdmi_tx {
+	status = "okay";
+	pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;
+	pinctrl-names = "default";
+	hdmi-supply = <&vcc_5v>;
+};
+
+&hdmi_tx_tmds_port {
+	hdmi_tx_tmds_out: endpoint {
+		remote-endpoint = <&hdmi_connector_in>;
+	};
+};
+
+&pwm_AO_cd {
+	pinctrl-0 = <&pwm_ao_d_e_pins>;
+	pinctrl-names = "default";
+	clocks = <&xtal>;
+	clock-names = "clkin1";
+	status = "okay";
+};
+
+&saradc {
+	status = "okay";
+};
+
+/* SD card */
+&sd_emmc_b {
+	status = "okay";
+	pinctrl-0 = <&sdcard_c_pins>;
+	pinctrl-1 = <&sdcard_clk_gate_c_pins>;
+	pinctrl-names = "default", "clk-gate";
+
+	bus-width = <4>;
+	cap-sd-highspeed;
+	max-frequency = <200000000>;
+	sd-uhs-sdr12;
+	sd-uhs-sdr25;
+	sd-uhs-sdr50;
+	sd-uhs-sdr104;
+	disable-wp;
+
+	cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>;
+	vmmc-supply = <&tflash_vdd>;
+	vqmmc-supply = <&tf_io>;
+};
+
+/* eMMC */
+&sd_emmc_c {
+	status = "okay";
+	pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>;
+	pinctrl-1 = <&emmc_clk_gate_pins>;
+	pinctrl-names = "default", "clk-gate";
+
+	bus-width = <8>;
+	cap-mmc-highspeed;
+	mmc-ddr-1_8v;
+	mmc-hs200-1_8v;
+	max-frequency = <200000000>;
+	disable-wp;
+
+	mmc-pwrseq = <&emmc_pwrseq>;
+	vmmc-supply = <&vcc_3v3>;
+	vqmmc-supply = <&flash_1v8>;
+};
+
+&spifc {
+	status = "disabled";
+	pinctrl-0 = <&nor_pins>;
+	pinctrl-names = "default";
+	clock-frequency = <400000>;
+
+	flash: nor-flash@0 {
+		compatible = "sst,w25q256", "jedec,spi-nor";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		reg = <0>;
+		spi-max-frequency = <30000000>;
+	};
+};
+
+&tdmif_b {
+	status = "okay";
+};
+
+&tdmout_b {
+	status = "okay";
+};
+
+&tohdmitx {
+	status = "okay";
+};
+
+&uart_AO {
+	status = "okay";
+	pinctrl-0 = <&uart_ao_a_pins>;
+	pinctrl-names = "default";
+};
+
+&uart_AO_B {
+	status = "okay";
+	pinctrl-0 = <&uart_ao_b_8_9_pins>;
+	pinctrl-names = "default";
+};
+
+&uart_B {
+	status = "okay";
+	pinctrl-0 = <&uart_b_pins>;
+	pinctrl-names = "default";
+	clock-frequency = <400000>;
+};
+
+
+&usb {
+	status = "okay";
+	vbus-supply = <&usb_pwr_en>;
+};
+
+&usb2_phy0 {
+	phy-supply = <&vcc_5v>;
+};
+
+
+/* I2C for modules */
+&i2c1 {
+	status = "okay";
+	pinctrl-0 = <&i2c1_sda_h6_pins>, <&i2c1_sck_h7_pins>;
+	pinctrl-names = "default";
+	clock-frequency = <400000>;
+
+	/* GPIO expander */
+	u9: gpio@22 {
+		compatible = "nxp,pca9535";
+		reg = <0x22>;
+		gpio-controller;
+		#gpio-cells = <2>;
+		interrupt-controller;
+		#interrupt-cells = <2>;
+		interrupt-parent = <&gpio_intc>;
+		interrupts = <IRQID_GPIOAO_7 IRQ_TYPE_LEVEL_LOW>;
+
+		gpio-line-names =
+			"RELAY_1", "RELAY_2",
+			"", "",
+			"UXM1_RESET", "UXM1_BOOT",
+			"UXM2_RESET", "UXM2_BOOT",
+			"DIN_1", "DIN_2", "DIN_3",
+			"","","","","";
+	};
+
+	/* 1-wire */
+	w1: onewire@18 {
+		compatible = "maxim,ds2482";
+		reg = <0x18>;
+	};
+
+};
+
+
+/* I2C for lcd/etc */
+&i2c2 {
+	status = "okay";
+	pinctrl-0 = <&i2c2_sda_x_pins>, <&i2c2_sck_x_pins>;
+	pinctrl-names = "default";
+	clock-frequency = <400000>;
+};
+
+/* I2C_EE_M3: I2C for CPU board */
+&i2c3 {
+	status = "okay";
+	pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
+	pinctrl-names = "default";
+	clock-frequency = <400000>;
+
+	/* I2C for rtc */
+	rtc: rtc@51 {
+		status = "okay";
+		compatible = "nxp,pcf8563";
+		reg = <0x51>;
+		wakeup-source;
+	};
+
+	/* FRAM on base board */
+	fram: eeprom@52 {
+		compatible = "atmel,24c64";
+		reg = <0x52>;
+		pagesize = <0x20>;
+		label = "fram";
+		address-width = <0x10>;
+		vcc-supply = <&vddao_3v3>;
+	};
+
+	/* EEPROM on CPU board */
+	eepromc: eeprom@54 {
+		compatible = "atmel,24c64";
+		reg = <0x54>;
+		pagesize = <0x20>;
+		label = "eepromc";
+		address-width = <0x10>;
+		vcc-supply = <&vddao_3v3>;
+	};
+
+	/* EEPROM on base board */
+	eeprompd: eeprom@56 {
+		compatible = "atmel,24c64";
+		reg = <0x56>;
+		pagesize = <0x20>;
+		label = "eeprompd";
+		address-width = <0x10>;
+		vcc-supply = <&vddao_3v3>;
+	};
+
+	/* EEPROM on power module */
+	eeprompm: eeprom@57 {
+		compatible = "atmel,24c64";
+		reg = <0x57>;
+		pagesize = <0x20>;
+		label = "eeprompm";
+		address-width = <0x10>;
+		vcc-supply = <&vddao_3v3>;
+	};
+
+	/* temperature sensors */
+	temp1: tmp102@48 {
+		compatible = "ti,tmp102";
+		reg = <0x48>;
+	};
+
+	temp2: tmp102@49 {
+		compatible = "ti,tmp102";
+		reg = <0x49>;
+	};
+
+};
+
+&efuse {
+	eth_mac: eth-mac@0 {
+		reg = <0x0 0x6>;
+	};
+
+	bt_mac: bt-mac@6 {
+		reg = <0x6 0x6>;
+	};
+
+	wifi_mac: wifi-mac@c {
+		reg = <0xc 0x6>;
+	};
+
+	bid: bid@12 {
+		reg = <0x12 0x20>;
+	};
+
+	sn: sn@32 {
+		reg = <0x32 0x20>;
+	};
+};
+
+&cpu_thermal {
+	trips {
+		cpu_passive: cpu-passive {
+			temperature = <70000>; /* millicelsius */
+			hysteresis = <2000>; /* millicelsius */
+			type = "passive";
+		};
+
+		cpu_hot: cpu-hot {
+			temperature = <85000>; /* millicelsius */
+			hysteresis = <2000>; /* millicelsius */
+			type = "hot";
+		};
+
+		cpu_critical: cpu-critical {
+			temperature = <90000>; /* millicelsius */
+			hysteresis = <2000>; /* millicelsius */
+			type = "critical";
+		};
+	};
+
+	cooling-maps {
+		map0 {
+			trip = <&cpu_passive>;
+			cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+		};
+
+		map1 {
+			trip = <&cpu_hot>;
+			cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+		};
+	};
+};
+
+&ddr_thermal {
+	trips {
+		ddr_passive: ddr-passive {
+			temperature = <70000>; /* millicelsius */
+			hysteresis = <2000>; /* millicelsius */
+			type = "passive";
+		};
+
+		ddr_critical: ddr-critical {
+			temperature = <85000>; /* millicelsius */
+			hysteresis = <2000>; /* millicelsius */
+			type = "critical";
+		};
+	};
+
+};

From 2eb2b48342d14dcf278ba44e642c689152a7492a Mon Sep 17 00:00:00 2001
From: igorpecovnik <6281704+igorpecovnik@users.noreply.github.com>
Date: Mon, 11 Nov 2024 15:58:35 +0000
Subject: [PATCH 068/107] `Automatic` board configs status synchronise

---
 .github/CODEOWNERS                                    | 7 ++++---
 config/boards/{rock-5b-plus.csc => rock-5b-plus.conf} | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)
 rename config/boards/{rock-5b-plus.csc => rock-5b-plus.conf} (98%)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b795786eee08..3e0354d5e944 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -123,6 +123,7 @@ config/boards/rk3328-heltec.csc		@sicXnull
 config/boards/rock-3a.conf		@ZazaBR @amazingfate @catalinii @vamzii
 config/boards/rock-5-itx.conf		@amazingfate @prahal
 config/boards/rock-5a.conf		@amazingfate
+config/boards/rock-5b-plus.csc		@HeyMeco
 config/boards/rock-5b.conf		@amazingfate @linhz0hz
 config/boards/rock-5c.conf		@schwar3kat
 config/boards/rock-s0.conf		@brentr
@@ -163,7 +164,7 @@ config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @
 config/kernel/linux-mvebu-*.config		@Heisath
 config/kernel/linux-odroidxu4-*.config		@joekhoobyar
 config/kernel/linux-phytium-embedded-*.config		@chainsx
-config/kernel/linux-rk35xx-*.config		@ColorfulRhino @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+config/kernel/linux-rk35xx-*.config		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 config/kernel/linux-rockchip-*.config		@paolosabatino
 config/kernel/linux-rockchip-rk3588-*.config		@ColorfulRhino @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @lanefu @linhz0hz @rpardini @schwar3kat
 config/kernel/linux-rockchip64-*.config		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
@@ -187,7 +188,7 @@ patch/kernel/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw @clee
 patch/kernel/mvebu-*/		@Heisath
 patch/kernel/odroidxu4-*/		@joekhoobyar
 patch/kernel/phytium-embedded-*/		@chainsx
-patch/kernel/rk35xx-vendor-*/		@ColorfulRhino @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+patch/kernel/rk35xx-vendor-*/		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 patch/kernel/rockchip-*/		@paolosabatino
 patch/kernel/rockchip-rk3588-*/		@ColorfulRhino @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @lanefu @linhz0hz @rpardini @schwar3kat
 patch/kernel/rockchip64-*/		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
@@ -205,7 +206,7 @@ sources/families/meson64.conf		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw
 sources/families/mvebu.conf		@Heisath
 sources/families/odroidxu4.conf		@joekhoobyar
 sources/families/phytium-embedded.conf		@chainsx
-sources/families/rk35xx.conf		@ColorfulRhino @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+sources/families/rk35xx.conf		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 sources/families/rockchip-rk3588.conf		@ColorfulRhino @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @lanefu @linhz0hz @rpardini @schwar3kat
 sources/families/rockchip.conf		@paolosabatino
 sources/families/rockchip64.conf		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
diff --git a/config/boards/rock-5b-plus.csc b/config/boards/rock-5b-plus.conf
similarity index 98%
rename from config/boards/rock-5b-plus.csc
rename to config/boards/rock-5b-plus.conf
index 4c25410447d7..84901b360204 100644
--- a/config/boards/rock-5b-plus.csc
+++ b/config/boards/rock-5b-plus.conf
@@ -1,7 +1,7 @@
 # Rockchip RK3588 SoC octa core 4-16GB SoC 2.5GBe eMMC USB3 NvME
 BOARD_NAME="Rock 5B Plus"
 BOARDFAMILY="rockchip-rk3588"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="HeyMeco"
 BOOTCONFIG="rock-5b-plus-rk3588_defconfig"
 KERNEL_TARGET="vendor"
 FULL_DESKTOP="yes"

From 379c573d060d87564924b80f9ada8c52e7df9c25 Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Mon, 14 Oct 2024 12:20:56 +0200
Subject: [PATCH 069/107] kernel: mainline: Bump v6.12-rc2 to v6.12-rc3

---
 config/sources/mainline-kernel.conf.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/sources/mainline-kernel.conf.sh b/config/sources/mainline-kernel.conf.sh
index 1892e2b7f8ac..43e24c8b0f20 100644
--- a/config/sources/mainline-kernel.conf.sh
+++ b/config/sources/mainline-kernel.conf.sh
@@ -8,7 +8,7 @@
 function mainline_kernel_decide_version__upstream_release_candidate_number() {
 	[[ -n "${KERNELBRANCH}" ]] && return 0           # if already set, don't touch it; that way other hooks can run in any order
 	if [[ "${KERNEL_MAJOR_MINOR}" == "6.12" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
-		declare -g KERNELBRANCH="tag:v6.12-rc2"
+		declare -g KERNELBRANCH="tag:v6.12-rc3"
 		display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info"
 	fi
 }

From 006b61647889ddb9195480f4a39bf51456401183 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Sat, 26 Oct 2024 10:08:48 +0200
Subject: [PATCH 070/107] kernel: mainline: Bump v6.12-rc3 to v6.12-rc4

---
 config/sources/mainline-kernel.conf.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/sources/mainline-kernel.conf.sh b/config/sources/mainline-kernel.conf.sh
index 43e24c8b0f20..9cbcd3b83a90 100644
--- a/config/sources/mainline-kernel.conf.sh
+++ b/config/sources/mainline-kernel.conf.sh
@@ -8,7 +8,7 @@
 function mainline_kernel_decide_version__upstream_release_candidate_number() {
 	[[ -n "${KERNELBRANCH}" ]] && return 0           # if already set, don't touch it; that way other hooks can run in any order
 	if [[ "${KERNEL_MAJOR_MINOR}" == "6.12" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
-		declare -g KERNELBRANCH="tag:v6.12-rc3"
+		declare -g KERNELBRANCH="tag:v6.12-rc4"
 		display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info"
 	fi
 }

From e82f3c8d74f68ce04475398c57eab4c029b83769 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Tue, 12 Nov 2024 00:12:08 +0100
Subject: [PATCH 071/107] kernel: mainline: Bump v6.12-rc4 to v6.12-rc7

---
 config/sources/mainline-kernel.conf.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/sources/mainline-kernel.conf.sh b/config/sources/mainline-kernel.conf.sh
index 9cbcd3b83a90..b956e8fe4ea4 100644
--- a/config/sources/mainline-kernel.conf.sh
+++ b/config/sources/mainline-kernel.conf.sh
@@ -8,7 +8,7 @@
 function mainline_kernel_decide_version__upstream_release_candidate_number() {
 	[[ -n "${KERNELBRANCH}" ]] && return 0           # if already set, don't touch it; that way other hooks can run in any order
 	if [[ "${KERNEL_MAJOR_MINOR}" == "6.12" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
-		declare -g KERNELBRANCH="tag:v6.12-rc4"
+		declare -g KERNELBRANCH="tag:v6.12-rc7"
 		display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info"
 	fi
 }

From a5e610a72c5f74ab8d360e78c23a8c8214577329 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Tue, 12 Nov 2024 09:06:12 +0100
Subject: [PATCH 072/107] Readme.md: fix broken linux to documentation due to
 structural changes

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 683cd3352e31..0a4c93cddccc 100644
--- a/README.md
+++ b/README.md
@@ -82,9 +82,11 @@ Generated image will be uploaded to your repository release. Note: GitHub upload
 
 ## More information:
 
-- [Building Armbian](https://docs.armbian.com/Developer-Guide_Build-Preparation/) (how to start, how to automate)
-- [Build options](https://docs.armbian.com/Developer-Guide_Build-Options/) (all build options)
+- [Building Armbian](https://docs.armbian.com/Developer-Guide_Build-Preparation/) (how to start)
+- [Build commands](https://docs.armbian.com/Developer-Guide_Build-Commands/)
+- [Build switches](https://docs.armbian.com/Developer-Guide_Build-Switches/)
 - [User configuration](https://docs.armbian.com/Developer-Guide_User-Configurations/) (how to add packages, patches, and override sources config)
+- [System config](https://docs.armbian.com/User-Guide_Armbian-Config/) menu driven utility to setup OS and HW features
 
 ## Download prebuilt images releases
 

From 3ccb1c4e6ba5d15200ed5ef490db5b5cb6f47a43 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Tue, 12 Nov 2024 09:07:43 +0100
Subject: [PATCH 073/107] Readme.me: start recommending most recent stable
 branch

---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0a4c93cddccc..7198cedecda8 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@
 - Superuser rights (configured sudo or root access).
 - Make sure your system is up-to-date! Outdated Docker binaries, for example, can cause trouble.
 
-For stable branch use `--branch=v24.08`
+For stable branch use `--branch=v24.11`
 
 ```bash
 apt-get -y install git
@@ -83,10 +83,9 @@ Generated image will be uploaded to your repository release. Note: GitHub upload
 ## More information:
 
 - [Building Armbian](https://docs.armbian.com/Developer-Guide_Build-Preparation/) (how to start)
-- [Build commands](https://docs.armbian.com/Developer-Guide_Build-Commands/)
-- [Build switches](https://docs.armbian.com/Developer-Guide_Build-Switches/)
+- [Build commands](https://docs.armbian.com/Developer-Guide_Build-Commands/) and [switches](https://docs.armbian.com/Developer-Guide_Build-Switches/) (build options)
 - [User configuration](https://docs.armbian.com/Developer-Guide_User-Configurations/) (how to add packages, patches, and override sources config)
-- [System config](https://docs.armbian.com/User-Guide_Armbian-Config/) menu driven utility to setup OS and HW features
+- [System config](https://docs.armbian.com/User-Guide_Armbian-Config/) (menu driven utility to setup OS and HW features)
 
 ## Download prebuilt images releases
 

From f407636f6160d885f09a976198a37277a56f1828 Mon Sep 17 00:00:00 2001
From: igorpecovnik <6281704+igorpecovnik@users.noreply.github.com>
Date: Tue, 12 Nov 2024 10:07:20 +0000
Subject: [PATCH 074/107] `Automatic` board configs status synchronise

---
 .github/CODEOWNERS              | 8 ++++----
 config/boards/rock-5b-plus.conf | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3e0354d5e944..0f193453860c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -123,7 +123,7 @@ config/boards/rk3328-heltec.csc		@sicXnull
 config/boards/rock-3a.conf		@ZazaBR @amazingfate @catalinii @vamzii
 config/boards/rock-5-itx.conf		@amazingfate @prahal
 config/boards/rock-5a.conf		@amazingfate
-config/boards/rock-5b-plus.csc		@HeyMeco
+config/boards/rock-5b-plus.conf		@HeyMeco @fridtjof
 config/boards/rock-5b.conf		@amazingfate @linhz0hz
 config/boards/rock-5c.conf		@schwar3kat
 config/boards/rock-s0.conf		@brentr
@@ -164,7 +164,7 @@ config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @
 config/kernel/linux-mvebu-*.config		@Heisath
 config/kernel/linux-odroidxu4-*.config		@joekhoobyar
 config/kernel/linux-phytium-embedded-*.config		@chainsx
-config/kernel/linux-rk35xx-*.config		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+config/kernel/linux-rk35xx-*.config		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 config/kernel/linux-rockchip-*.config		@paolosabatino
 config/kernel/linux-rockchip-rk3588-*.config		@ColorfulRhino @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @lanefu @linhz0hz @rpardini @schwar3kat
 config/kernel/linux-rockchip64-*.config		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
@@ -188,7 +188,7 @@ patch/kernel/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw @clee
 patch/kernel/mvebu-*/		@Heisath
 patch/kernel/odroidxu4-*/		@joekhoobyar
 patch/kernel/phytium-embedded-*/		@chainsx
-patch/kernel/rk35xx-vendor-*/		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+patch/kernel/rk35xx-vendor-*/		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 patch/kernel/rockchip-*/		@paolosabatino
 patch/kernel/rockchip-rk3588-*/		@ColorfulRhino @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @lanefu @linhz0hz @rpardini @schwar3kat
 patch/kernel/rockchip64-*/		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
@@ -206,7 +206,7 @@ sources/families/meson64.conf		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw
 sources/families/mvebu.conf		@Heisath
 sources/families/odroidxu4.conf		@joekhoobyar
 sources/families/phytium-embedded.conf		@chainsx
-sources/families/rk35xx.conf		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+sources/families/rk35xx.conf		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 sources/families/rockchip-rk3588.conf		@ColorfulRhino @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @lanefu @linhz0hz @rpardini @schwar3kat
 sources/families/rockchip.conf		@paolosabatino
 sources/families/rockchip64.conf		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
diff --git a/config/boards/rock-5b-plus.conf b/config/boards/rock-5b-plus.conf
index 84901b360204..3ceb8b9b6367 100644
--- a/config/boards/rock-5b-plus.conf
+++ b/config/boards/rock-5b-plus.conf
@@ -1,7 +1,7 @@
 # Rockchip RK3588 SoC octa core 4-16GB SoC 2.5GBe eMMC USB3 NvME
 BOARD_NAME="Rock 5B Plus"
 BOARDFAMILY="rockchip-rk3588"
-BOARD_MAINTAINER="HeyMeco"
+BOARD_MAINTAINER="HeyMeco fridtjof"
 BOOTCONFIG="rock-5b-plus-rk3588_defconfig"
 KERNEL_TARGET="vendor"
 FULL_DESKTOP="yes"

From 977478e38088625496fd5550b8b348a5321cb71a Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Thu, 7 Nov 2024 18:47:17 +0100
Subject: [PATCH 075/107] enable hs200 mode for rockpi-s

---
 ...0-arm64-dts-rk3308-enable-hs200-mode.patch | 24 +++++++++++++++++++
 ...0-arm64-dts-rk3308-enable-hs200-mode.patch | 24 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 patch/kernel/archive/rockchip64-6.12/board-rockpis-0030-arm64-dts-rk3308-enable-hs200-mode.patch
 create mode 100644 patch/kernel/archive/rockchip64-6.6/board-rockpis-0030-arm64-dts-rk3308-enable-hs200-mode.patch

diff --git a/patch/kernel/archive/rockchip64-6.12/board-rockpis-0030-arm64-dts-rk3308-enable-hs200-mode.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpis-0030-arm64-dts-rk3308-enable-hs200-mode.patch
new file mode 100644
index 000000000000..1c8fc96034cc
--- /dev/null
+++ b/patch/kernel/archive/rockchip64-6.12/board-rockpis-0030-arm64-dts-rk3308-enable-hs200-mode.patch
@@ -0,0 +1,24 @@
+From 395bc247144869b1a78c40872d38049f56ebfaf9 Mon Sep 17 00:00:00 2001
+From: Paolo Sabatino <paolo.sabatino@gmail.com>
+Date: Thu, 7 Nov 2024 18:37:34 +0100
+Subject: [PATCH] rockpi-s emmc support hs200 mode, enable it
+
+---
+ arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
+index 5ca0cc19f92c..d189eceb6fb2 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
+@@ -139,6 +139,7 @@ &emmc {
+ 	non-removable;
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>;
++	mmc-hs200-1_8v;
+ 	vmmc-supply = <&vcc_io>;
+ 	status = "okay";
+ };
+-- 
+2.43.0
+
diff --git a/patch/kernel/archive/rockchip64-6.6/board-rockpis-0030-arm64-dts-rk3308-enable-hs200-mode.patch b/patch/kernel/archive/rockchip64-6.6/board-rockpis-0030-arm64-dts-rk3308-enable-hs200-mode.patch
new file mode 100644
index 000000000000..1c8fc96034cc
--- /dev/null
+++ b/patch/kernel/archive/rockchip64-6.6/board-rockpis-0030-arm64-dts-rk3308-enable-hs200-mode.patch
@@ -0,0 +1,24 @@
+From 395bc247144869b1a78c40872d38049f56ebfaf9 Mon Sep 17 00:00:00 2001
+From: Paolo Sabatino <paolo.sabatino@gmail.com>
+Date: Thu, 7 Nov 2024 18:37:34 +0100
+Subject: [PATCH] rockpi-s emmc support hs200 mode, enable it
+
+---
+ arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
+index 5ca0cc19f92c..d189eceb6fb2 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
+@@ -139,6 +139,7 @@ &emmc {
+ 	non-removable;
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>;
++	mmc-hs200-1_8v;
+ 	vmmc-supply = <&vcc_io>;
+ 	status = "okay";
+ };
+-- 
+2.43.0
+

From 9b68c85c6c7c84f591f83f163ec58dcc32a78021 Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Mon, 11 Nov 2024 21:48:40 +0100
Subject: [PATCH 076/107] set CMA to 16M for Rock Pi S

---
 config/boards/rockpi-s.conf | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/config/boards/rockpi-s.conf b/config/boards/rockpi-s.conf
index e564d018b95c..12917c32aba1 100644
--- a/config/boards/rockpi-s.conf
+++ b/config/boards/rockpi-s.conf
@@ -66,7 +66,16 @@ function post_family_config___uboot_config() {
 		rules=etc/udev/rules.d
 
 		install -m 755 $bsp/lib/udev/fixEtherAddr $destination/lib/udev &&
-			install -m 644 $bsp/$rules/05-fixMACaddress.rules $destination/$rules
+		install -m 644 $bsp/$rules/05-fixMACaddress.rules $destination/$rules
 	}
 
 }
+
+function pre_install_kernel_debs__enforce_cma() {
+	# Set CMA to 16 megabytes, to provide more usable RAM since Rock Pi S
+	# has usually a small amount of DRAM (512MB)
+	display_alert "$BOARD" "set CMA size to 16MB due to small DRAM size"
+	run_host_command_logged echo "extraargs=cma=16M" ">>" "${SDCARD}"/boot/armbianEnv.txt
+
+        return 0
+}

From 37d9200e6abcbf56a395c7156c71d43400813283 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Mon, 11 Nov 2024 23:17:04 +0100
Subject: [PATCH 077/107] hack: trixie has lost its software-properties-common
 package so get rid of it for all Debian releases

- https://tracker.debian.org/news/1579223/software-properties-removed-from-testing/
- that provides add-apt-repository, but we don't use that on Debian, hopefully
- move also cpufrequtils hack (which requires release) to specific function after userspace checks and when DISTRIBUTION is set
- `software-properties-gtk` if of course also gone, so remove that for desktop's sake
---
 lib/functions/configuration/main-config.sh |  2 --
 lib/functions/main/config-prepare.sh       | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh
index eeeef1cc7d10..0d83fa707ab9 100644
--- a/lib/functions/configuration/main-config.sh
+++ b/lib/functions/configuration/main-config.sh
@@ -343,8 +343,6 @@ function do_main_configuration() {
 	declare -g -r PACKAGE_LIST_FAMILY="${PACKAGE_LIST_FAMILY}"
 	declare -g -r PACKAGE_LIST_FAMILY_REMOVE="${PACKAGE_LIST_FAMILY_REMOVE}"
 
-	if [[ $RELEASE == trixie || $ARCH == riscv64 ]]; then remove_packages "cpufrequtils"; fi # this will remove from rootfs as well
-
 	display_alert "Done with do_main_configuration" "do_main_configuration" "debug"
 }
 
diff --git a/lib/functions/main/config-prepare.sh b/lib/functions/main/config-prepare.sh
index a58b850c29ce..05573d493561 100644
--- a/lib/functions/main/config-prepare.sh
+++ b/lib/functions/main/config-prepare.sh
@@ -300,6 +300,9 @@ function config_post_main() {
 	# Do some sanity checks for userspace stuff, if RELEASE/DESKTOP_ENVIRONMENT is set.
 	check_config_userspace_release_and_desktop
 
+	# late Userspace / package list fixes; RELEASE and DISTRIBUTION must be set.
+	fix_userspace_packages_release_and_distro
+
 	track_general_config_variables "before calling extension_finish_config"
 	display_alert "Extensions: finish configuration" "extension_finish_config" "debug"
 	call_extension_method "extension_finish_config" <<- 'EXTENSION_FINISH_CONFIG'
@@ -380,6 +383,19 @@ function check_config_userspace_release_and_desktop() {
 	return 0
 }
 
+function fix_userspace_packages_release_and_distro() {
+	display_alert "fix_userspace_packages_release_and_distro" "For distro '${DISTRIBUTION}' release '${RELEASE}'" "debug"
+
+	# Some old hack from the past, not sure if it's still needed. Originally from https://github.com/armbian/build/pull/5881
+	if [[ $RELEASE == trixie || $ARCH == riscv64 ]]; then remove_packages "cpufrequtils"; fi # this will remove from rootfs as well
+
+	# Debian: no need for this package in the rootfs, as it provides add-apt-repository which is not used on our Debian builds
+	if [[ "${DISTRIBUTION}" == "Debian" ]]; then
+		display_alert "Not-installing software-properties-common" "For distro '${DISTRIBUTION}' release '${RELEASE}'" "warn"
+		remove_packages "software-properties-common" "software-properties-gtk" "software-properties-common"
+	fi
+}
+
 # Some utility functions
 function branch2dir() {
 	[[ "${1}" == "head" ]] && echo "HEAD" || echo "${1##*:}"

From f4f017e6737af9e0c71c1cc5b19cf9c960f46609 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Nov 2024 18:47:35 +0000
Subject: [PATCH 078/107] build(deps): bump dtschema from 2024.9 to 2024.11

Bumps [dtschema](https://github.com/devicetree-org/dt-schema) from 2024.9 to 2024.11.
- [Release notes](https://github.com/devicetree-org/dt-schema/releases)
- [Commits](https://github.com/devicetree-org/dt-schema/compare/v2024.09...v2024.11)

---
updated-dependencies:
- dependency-name: dtschema
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index e20c368470a1..4a7b233e0613 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,5 +15,5 @@ PyYAML == 6.0.2        # for parsing/writing YAML
 oras == 0.1.30         # for OCI stuff in mapper-oci-update
 Jinja2 == 3.1.4        # for templating
 rich == 13.9.4         # for rich text formatting
-dtschema == 2024.9     # for checking dts files and dt bindings
+dtschema == 2024.11     # for checking dts files and dt bindings
 yamllint == 1.35.1     # for checking dts files and dt bindings

From 1779ebb474276d69f4e01f6aebbcad895ea773b6 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Sun, 20 Oct 2024 10:10:35 +0200
Subject: [PATCH 079/107] thinkpad-x13s: bump to jhovold's
 wip/sc8280xp-6.12-rc3

- this is down to 35 patches, from hundreds back in the day. Considering merging this with default arm64 uefi kernel
---
 config/boards/thinkpad-x13s.wip | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/boards/thinkpad-x13s.wip b/config/boards/thinkpad-x13s.wip
index 4b049be0f9e3..5b4dc8cdc4bb 100644
--- a/config/boards/thinkpad-x13s.wip
+++ b/config/boards/thinkpad-x13s.wip
@@ -28,9 +28,9 @@ enable_extension "grub-with-dtb" # important, puts the whole DTB handling in pla
 # Use the full firmware, complete linux-firmware plus Armbian's
 declare -g BOARD_FIRMWARE_INSTALL="-full"
 
-function post_family_config_branch_sc8280xp__jhovolds_69y_kernel() {
+function post_family_config_branch_sc8280xp__jhovolds_wip_kernel() {
 	declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
-	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.12-rc2' # @TODO: this is down to 35 patches, from hundreds back in the day. Considering merging this with default arm64 uefi kernel
+	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.12-rc3' # @TODO: this is down to 35 patches, from hundreds back in the day. Considering merging this with default arm64 uefi kernel
 	declare -g KERNELSOURCE='https://github.com/jhovold/linux.git'
 	declare -g LINUXCONFIG="linux-${ARCH}-${BRANCH}" # for this board: linux-arm64-sc8280xp
 	display_alert "Set up jhovold's kernel ${KERNELBRANCH} for" "${BOARD}" "info"

From 45a1a09e9f232fcf13c3e2abdeb4206c14ebfc2d Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Sat, 26 Oct 2024 10:12:44 +0200
Subject: [PATCH 080/107] thinkpad-x13s: bump to jhovold's
 wip/sc8280xp-6.12-rc4

- this is down to 27 patches, from hundreds back in the day. Considering merging this with default arm64 uefi kernel
---
 config/boards/thinkpad-x13s.wip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/boards/thinkpad-x13s.wip b/config/boards/thinkpad-x13s.wip
index 5b4dc8cdc4bb..1d7e9d99f082 100644
--- a/config/boards/thinkpad-x13s.wip
+++ b/config/boards/thinkpad-x13s.wip
@@ -30,7 +30,7 @@ declare -g BOARD_FIRMWARE_INSTALL="-full"
 
 function post_family_config_branch_sc8280xp__jhovolds_wip_kernel() {
 	declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
-	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.12-rc3' # @TODO: this is down to 35 patches, from hundreds back in the day. Considering merging this with default arm64 uefi kernel
+	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.12-rc4' # @TODO: this is down to 27 patches, from hundreds back in the day. Considering merging this with default arm64 uefi kernel
 	declare -g KERNELSOURCE='https://github.com/jhovold/linux.git'
 	declare -g LINUXCONFIG="linux-${ARCH}-${BRANCH}" # for this board: linux-arm64-sc8280xp
 	display_alert "Set up jhovold's kernel ${KERNELBRANCH} for" "${BOARD}" "info"

From ec6615605983c56cf4b11fa50d765e71fca45de4 Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Sun, 10 Nov 2024 14:23:53 +0800
Subject: [PATCH 081/107] rockchip-rk3588: bump current and edge to 6.12

---
 config/kernel/linux-rockchip-rk3588-current.config        | 1 +
 ...3588-6.11.config => linux-rockchip-rk3588-edge.config} | 0
 config/sources/families/rockchip-rk3588.conf              | 8 ++++----
 .../0000.patching_config.yaml                             | 0
 .../0001-general-add-overlay-support.patch                | 0
 .../0010-fix-clk-divisions.patch                          | 0
 .../0011-irqchip-fix-its-timeout-issue.patch              | 0
 .../0024-RK3588-Add-Crypto-Support.patch                  | 0
 .../0025-RK3588-Add-HW-RNG-Support.patch                  | 0
 .../0026-RK3588-Add-VPU121-H.264-Decoder-Support.patch    | 0
 .../0027-RK3588-Add-rkvdec2-Support-v3.patch              | 0
 ...a-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch | 0
 .../0029-arm64-dts-rockchip-rk3588-add-RGA2-node.patch    | 0
 .../0113-add-synopsys-designware-hdmi-rx-controller.patch | 0
 ...phy-phy-rockchip-samsung-hdptx-Enable-runtime-PM.patch | 0
 ...hy-phy-rockchip-samsung-hdptx-Add-clock-provider.patch | 0
 ...-phy-rockchip-samsung-hdptx-Add-FRL-EARC-support.patch | 0
 ...drm-rockchip-vop2-Improve-display-modes-handling.patch | 0
 ...opsys-Add-initial-support-for-DW-HDMI-Controller.patch | 0
 ...rm64-dts-rockchip-Add-HDMI0-bridge-CLK-to-rk3588.patch | 0
 .../0170-drm-rockchip-vop2-add-clocks-reset-support.patch | 0
 .../0801-wireless-add-bcm43752.patch                      | 0
 .../0802-wireless-add-clk-property.patch                  | 0
 ...4-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch | 0
 .../1012-arm64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch | 0
 ...dts-rockchip-Make-use-of-HDMI0-PHY-PLL-on-rock5b.patch | 0
 .../1020-Add-HDMI-and-VOP2-to-Rock-5A.patch               | 0
 .../1021-arch-arm64-dts-enable-gpu-node-for-rock-5a.patch | 0
 ...-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch | 0
 ...4-dts-rockchip-add-PCIe-for-M.2-E-Key-to-rock-5a.patch | 0
 ...64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch | 0
 ...4-dts-rockchip-Add-ap6275p-wireless-support-to-A.patch | 0
 .../1040-board-khadas-edge2-add-nodes.patch               | 0
 .../1041-board-khadas-edge2-mcu.patch                     | 0
 ...051-arm64-dts-rockchip-nanopct6-lts-and-fixes-v6.patch | 0
 ...1060-arm64-dts-rockchip-Split-pcie30x1m1-pinctrl.patch | 0
 .../1060-board-cm3588-nas-Add-HDMI-support.patch          | 0
 ...4-dts-rockchip-Add-PCIe-3.0-pinctrl-to-Turing-RK.patch | 0
 ...arm64-dts-rockchip-Enable-GPU-node-on-Turing-RK1.patch | 0
 ...4-dts-rockchip-Enable-automatic-fan-control-on-t.patch | 0
 ...4-dts-rockchip-Add-missing-hym8563-clock-frequen.patch | 0
 .../dt/rk3588-bananapi-m7.dts                             | 0
 .../dt/rk3588-cyber-aib.dts                               | 0
 .../dt/rk3588-hinlink-h88k.dts                            | 0
 .../dt/rk3588-mixtile-blade3.dts                          | 0
 .../dt/rk3588-nanopc-cm3588-nas.dts                       | 0
 .../dt/rk3588s-nanopi-r6c.dts                             | 0
 .../dt/rk3588s-nanopi-r6s.dts                             | 0
 .../dt/rk3588s-orangepi-5.dts                             | 0
 .../dt/rk3588s-orangepi-5b.dts                            | 0
 .../dt/rk3588s-rock-5c.dts                                | 0
 .../dt/rk3588s-youyeetoo-r1.dts                           | 0
 .../overlay/Makefile                                      | 0
 .../overlay/rockchip-rk3588-fanctrl.dtso                  | 0
 .../overlay/rockchip-rk3588-hdmirx.dtso                   | 0
 .../overlay/rockchip-rk3588-i2c8-m2.dtso                  | 0
 .../overlay/rockchip-rk3588-pwm0-m0.dtso                  | 0
 .../overlay/rockchip-rk3588-pwm0-m1.dtso                  | 0
 .../overlay/rockchip-rk3588-pwm0-m2.dtso                  | 0
 .../overlay/rockchip-rk3588-pwm1-m0.dtso                  | 0
 .../overlay/rockchip-rk3588-pwm1-m1.dtso                  | 0
 .../overlay/rockchip-rk3588-pwm1-m2.dtso                  | 0
 .../overlay/rockchip-rk3588-pwm10-m0.dtso                 | 0
 .../overlay/rockchip-rk3588-pwm11-m0.dtso                 | 0
 .../overlay/rockchip-rk3588-pwm11-m1.dtso                 | 0
 .../overlay/rockchip-rk3588-pwm12-m0.dtso                 | 0
 .../overlay/rockchip-rk3588-pwm13-m0.dtso                 | 0
 .../overlay/rockchip-rk3588-pwm13-m2.dtso                 | 0
 .../overlay/rockchip-rk3588-pwm14-m0.dtso                 | 0
 .../overlay/rockchip-rk3588-pwm14-m1.dtso                 | 0
 .../overlay/rockchip-rk3588-pwm14-m2.dtso                 | 0
 .../overlay/rockchip-rk3588-pwm15-m0.dtso                 | 0
 .../overlay/rockchip-rk3588-pwm15-m1.dtso                 | 0
 .../overlay/rockchip-rk3588-pwm15-m2.dtso                 | 0
 .../overlay/rockchip-rk3588-pwm15-m3.dtso                 | 0
 .../overlay/rockchip-rk3588-pwm2-m1.dtso                  | 0
 .../overlay/rockchip-rk3588-pwm3-m0.dtso                  | 0
 .../overlay/rockchip-rk3588-pwm3-m1.dtso                  | 0
 .../overlay/rockchip-rk3588-pwm3-m2.dtso                  | 0
 .../overlay/rockchip-rk3588-pwm3-m3.dtso                  | 0
 .../overlay/rockchip-rk3588-pwm5-m2.dtso                  | 0
 .../overlay/rockchip-rk3588-pwm6-m0.dtso                  | 0
 .../overlay/rockchip-rk3588-pwm6-m2.dtso                  | 0
 .../overlay/rockchip-rk3588-pwm7-m0.dtso                  | 0
 .../overlay/rockchip-rk3588-pwm7-m3.dtso                  | 0
 .../overlay/rockchip-rk3588-pwm8-m0.dtso                  | 0
 .../overlay/rockchip-rk3588-rkvenc-overlay.dtso           | 0
 .../overlay/rockchip-rk3588-sata1.dtso                    | 0
 .../overlay/rockchip-rk3588-sata2.dtso                    | 0
 .../overlay/rockchip-rk3588-uart1-m1.dtso                 | 0
 .../overlay/rockchip-rk3588-uart3-m1.dtso                 | 0
 .../overlay/rockchip-rk3588-uart4-m2.dtso                 | 0
 .../overlay/rockchip-rk3588-uart6-m1.dtso                 | 0
 .../overlay/rockchip-rk3588-uart7-m2.dtso                 | 0
 .../overlay/rockchip-rk3588-uart8-m1.dtso                 | 0
 95 files changed, 5 insertions(+), 4 deletions(-)
 create mode 120000 config/kernel/linux-rockchip-rk3588-current.config
 rename config/kernel/{linux-rockchip-rk3588-6.11.config => linux-rockchip-rk3588-edge.config} (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0000.patching_config.yaml (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0001-general-add-overlay-support.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0010-fix-clk-divisions.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0011-irqchip-fix-its-timeout-issue.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0024-RK3588-Add-Crypto-Support.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0025-RK3588-Add-HW-RNG-Support.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0026-RK3588-Add-VPU121-H.264-Decoder-Support.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0027-RK3588-Add-rkvdec2-Support-v3.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0028-media-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0029-arm64-dts-rockchip-rk3588-add-RGA2-node.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0113-add-synopsys-designware-hdmi-rx-controller.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0130-phy-phy-rockchip-samsung-hdptx-Enable-runtime-PM.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0131-phy-phy-rockchip-samsung-hdptx-Add-clock-provider.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0132-phy-phy-rockchip-samsung-hdptx-Add-FRL-EARC-support.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0133-drm-rockchip-vop2-Improve-display-modes-handling.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0134-drm-bridge-synopsys-Add-initial-support-for-DW-HDMI-Controller.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0135-arm64-dts-rockchip-Add-HDMI0-bridge-CLK-to-rk3588.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0170-drm-rockchip-vop2-add-clocks-reset-support.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0801-wireless-add-bcm43752.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/0802-wireless-add-clk-property.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1012-arm64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1014-arm64-dts-rockchip-Make-use-of-HDMI0-PHY-PLL-on-rock5b.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1020-Add-HDMI-and-VOP2-to-Rock-5A.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1021-arch-arm64-dts-enable-gpu-node-for-rock-5a.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1021-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1023-arm64-dts-rockchip-add-PCIe-for-M.2-E-Key-to-rock-5a.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1032-arm64-dts-rockchip-Add-ap6275p-wireless-support-to-A.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1040-board-khadas-edge2-add-nodes.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1041-board-khadas-edge2-mcu.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1051-arm64-dts-rockchip-nanopct6-lts-and-fixes-v6.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1060-arm64-dts-rockchip-Split-pcie30x1m1-pinctrl.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1060-board-cm3588-nas-Add-HDMI-support.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1061-arm64-dts-rockchip-Add-PCIe-3.0-pinctrl-to-Turing-RK.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1062-arm64-dts-rockchip-Enable-GPU-node-on-Turing-RK1.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1063-arm64-dts-rockchip-Enable-automatic-fan-control-on-t.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/1064-arm64-dts-rockchip-Add-missing-hym8563-clock-frequen.patch (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/dt/rk3588-bananapi-m7.dts (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/dt/rk3588-cyber-aib.dts (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/dt/rk3588-hinlink-h88k.dts (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/dt/rk3588-mixtile-blade3.dts (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/dt/rk3588-nanopc-cm3588-nas.dts (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/dt/rk3588s-nanopi-r6c.dts (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/dt/rk3588s-nanopi-r6s.dts (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/dt/rk3588s-orangepi-5.dts (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/dt/rk3588s-orangepi-5b.dts (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/dt/rk3588s-rock-5c.dts (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/dt/rk3588s-youyeetoo-r1.dts (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/Makefile (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-fanctrl.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-hdmirx.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-i2c8-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm0-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm0-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm0-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm1-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm1-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm1-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm10-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm11-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm11-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm12-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm13-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm13-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm14-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm14-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm14-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm15-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm15-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm15-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm15-m3.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm2-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm3-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm3-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm3-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm3-m3.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm5-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm6-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm6-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm7-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm7-m3.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-pwm8-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-rkvenc-overlay.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-sata1.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-sata2.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-uart1-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-uart3-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-uart4-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-uart6-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-uart7-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip-rk3588-6.11 => rockchip-rk3588-6.12}/overlay/rockchip-rk3588-uart8-m1.dtso (100%)

diff --git a/config/kernel/linux-rockchip-rk3588-current.config b/config/kernel/linux-rockchip-rk3588-current.config
new file mode 120000
index 000000000000..6b7bb90ce8d3
--- /dev/null
+++ b/config/kernel/linux-rockchip-rk3588-current.config
@@ -0,0 +1 @@
+linux-rockchip-rk3588-edge.config
\ No newline at end of file
diff --git a/config/kernel/linux-rockchip-rk3588-6.11.config b/config/kernel/linux-rockchip-rk3588-edge.config
similarity index 100%
rename from config/kernel/linux-rockchip-rk3588-6.11.config
rename to config/kernel/linux-rockchip-rk3588-edge.config
diff --git a/config/sources/families/rockchip-rk3588.conf b/config/sources/families/rockchip-rk3588.conf
index 9d77b14fa318..28a030d2a86c 100644
--- a/config/sources/families/rockchip-rk3588.conf
+++ b/config/sources/families/rockchip-rk3588.conf
@@ -42,16 +42,16 @@ case $BRANCH in
 	current)
 		# Branch based on a stable kernel release (will stay on the next LTS kernel release once released, 6.12? LTS)
 		LINUXFAMILY=rockchip-rk3588
-		KERNEL_MAJOR_MINOR="6.11"                                  # Major and minor versions of this kernel.
-		LINUXCONFIG="linux-rockchip-rk3588-${KERNEL_MAJOR_MINOR}" # Attention: not -${BRANCH} (edge/current/legacy), but -${KERNEL_MAJOR_MINOR} thus 6.6 / 6.12 etc
+		KERNEL_MAJOR_MINOR="6.12"                                  # Major and minor versions of this kernel.
+		LINUXCONFIG="linux-rockchip-rk3588-${BRANCH}"
 		# No need to set KERNELPATCHDIR, since default is: KERNELPATCHDIR='archive/rockchip-rk3588-${KERNEL_MAJOR_MINOR}'
 		;;
 
 	edge)
 		# Branch based on the latest kernel release including RC releases, to benefit from the latest RK3588 mainline advancements. Might be unstable!
 		LINUXFAMILY=rockchip-rk3588
-		KERNEL_MAJOR_MINOR="6.11"                                 # Major and minor versions of this kernel.
-		LINUXCONFIG="linux-rockchip-rk3588-${KERNEL_MAJOR_MINOR}" # Attention: not -${BRANCH} (edge/current/legacy), but -${KERNEL_MAJOR_MINOR} thus 6.8 / 6.10 etc
+		KERNEL_MAJOR_MINOR="6.12"                                 # Major and minor versions of this kernel.
+		LINUXCONFIG="linux-rockchip-rk3588-${BRANCH}"
 		# No need to set KERNELPATCHDIR, since default is: KERNELPATCHDIR='archive/rockchip-rk3588-${KERNEL_MAJOR_MINOR}'
 		;;
 
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0000.patching_config.yaml b/patch/kernel/archive/rockchip-rk3588-6.12/0000.patching_config.yaml
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0000.patching_config.yaml
rename to patch/kernel/archive/rockchip-rk3588-6.12/0000.patching_config.yaml
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0001-general-add-overlay-support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0001-general-add-overlay-support.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0001-general-add-overlay-support.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0001-general-add-overlay-support.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0010-fix-clk-divisions.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0010-fix-clk-divisions.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0010-fix-clk-divisions.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0010-fix-clk-divisions.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0011-irqchip-fix-its-timeout-issue.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0011-irqchip-fix-its-timeout-issue.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0011-irqchip-fix-its-timeout-issue.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0011-irqchip-fix-its-timeout-issue.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0024-RK3588-Add-Crypto-Support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0024-RK3588-Add-Crypto-Support.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0024-RK3588-Add-Crypto-Support.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0024-RK3588-Add-Crypto-Support.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0025-RK3588-Add-HW-RNG-Support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0025-RK3588-Add-HW-RNG-Support.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0025-RK3588-Add-HW-RNG-Support.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0025-RK3588-Add-HW-RNG-Support.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0026-RK3588-Add-VPU121-H.264-Decoder-Support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0026-RK3588-Add-VPU121-H.264-Decoder-Support.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0026-RK3588-Add-VPU121-H.264-Decoder-Support.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0026-RK3588-Add-VPU121-H.264-Decoder-Support.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0027-RK3588-Add-rkvdec2-Support-v3.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0027-RK3588-Add-rkvdec2-Support-v3.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0027-RK3588-Add-rkvdec2-Support-v3.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0027-RK3588-Add-rkvdec2-Support-v3.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0028-media-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0028-media-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0028-media-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0028-media-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0029-arm64-dts-rockchip-rk3588-add-RGA2-node.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0029-arm64-dts-rockchip-rk3588-add-RGA2-node.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0029-arm64-dts-rockchip-rk3588-add-RGA2-node.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0029-arm64-dts-rockchip-rk3588-add-RGA2-node.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0113-add-synopsys-designware-hdmi-rx-controller.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0113-add-synopsys-designware-hdmi-rx-controller.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0113-add-synopsys-designware-hdmi-rx-controller.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0113-add-synopsys-designware-hdmi-rx-controller.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0130-phy-phy-rockchip-samsung-hdptx-Enable-runtime-PM.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0130-phy-phy-rockchip-samsung-hdptx-Enable-runtime-PM.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0130-phy-phy-rockchip-samsung-hdptx-Enable-runtime-PM.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0130-phy-phy-rockchip-samsung-hdptx-Enable-runtime-PM.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0131-phy-phy-rockchip-samsung-hdptx-Add-clock-provider.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0131-phy-phy-rockchip-samsung-hdptx-Add-clock-provider.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0131-phy-phy-rockchip-samsung-hdptx-Add-clock-provider.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0131-phy-phy-rockchip-samsung-hdptx-Add-clock-provider.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0132-phy-phy-rockchip-samsung-hdptx-Add-FRL-EARC-support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0132-phy-phy-rockchip-samsung-hdptx-Add-FRL-EARC-support.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0132-phy-phy-rockchip-samsung-hdptx-Add-FRL-EARC-support.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0132-phy-phy-rockchip-samsung-hdptx-Add-FRL-EARC-support.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0133-drm-rockchip-vop2-Improve-display-modes-handling.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0133-drm-rockchip-vop2-Improve-display-modes-handling.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0133-drm-rockchip-vop2-Improve-display-modes-handling.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0133-drm-rockchip-vop2-Improve-display-modes-handling.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0134-drm-bridge-synopsys-Add-initial-support-for-DW-HDMI-Controller.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0134-drm-bridge-synopsys-Add-initial-support-for-DW-HDMI-Controller.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0134-drm-bridge-synopsys-Add-initial-support-for-DW-HDMI-Controller.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0134-drm-bridge-synopsys-Add-initial-support-for-DW-HDMI-Controller.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0135-arm64-dts-rockchip-Add-HDMI0-bridge-CLK-to-rk3588.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0135-arm64-dts-rockchip-Add-HDMI0-bridge-CLK-to-rk3588.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0135-arm64-dts-rockchip-Add-HDMI0-bridge-CLK-to-rk3588.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0135-arm64-dts-rockchip-Add-HDMI0-bridge-CLK-to-rk3588.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0170-drm-rockchip-vop2-add-clocks-reset-support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0170-drm-rockchip-vop2-add-clocks-reset-support.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0170-drm-rockchip-vop2-add-clocks-reset-support.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0170-drm-rockchip-vop2-add-clocks-reset-support.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0801-wireless-add-bcm43752.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0801-wireless-add-bcm43752.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0801-wireless-add-bcm43752.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0801-wireless-add-bcm43752.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0802-wireless-add-clk-property.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0802-wireless-add-clk-property.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/0802-wireless-add-clk-property.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/0802-wireless-add-clk-property.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1012-arm64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1012-arm64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1012-arm64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1012-arm64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1014-arm64-dts-rockchip-Make-use-of-HDMI0-PHY-PLL-on-rock5b.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1014-arm64-dts-rockchip-Make-use-of-HDMI0-PHY-PLL-on-rock5b.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1014-arm64-dts-rockchip-Make-use-of-HDMI0-PHY-PLL-on-rock5b.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1014-arm64-dts-rockchip-Make-use-of-HDMI0-PHY-PLL-on-rock5b.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1020-Add-HDMI-and-VOP2-to-Rock-5A.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1020-Add-HDMI-and-VOP2-to-Rock-5A.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1020-Add-HDMI-and-VOP2-to-Rock-5A.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1020-Add-HDMI-and-VOP2-to-Rock-5A.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1021-arch-arm64-dts-enable-gpu-node-for-rock-5a.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1021-arch-arm64-dts-enable-gpu-node-for-rock-5a.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1021-arch-arm64-dts-enable-gpu-node-for-rock-5a.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1021-arch-arm64-dts-enable-gpu-node-for-rock-5a.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1021-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1021-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1021-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1021-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1023-arm64-dts-rockchip-add-PCIe-for-M.2-E-Key-to-rock-5a.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1023-arm64-dts-rockchip-add-PCIe-for-M.2-E-Key-to-rock-5a.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1023-arm64-dts-rockchip-add-PCIe-for-M.2-E-Key-to-rock-5a.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1023-arm64-dts-rockchip-add-PCIe-for-M.2-E-Key-to-rock-5a.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1032-arm64-dts-rockchip-Add-ap6275p-wireless-support-to-A.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1032-arm64-dts-rockchip-Add-ap6275p-wireless-support-to-A.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1032-arm64-dts-rockchip-Add-ap6275p-wireless-support-to-A.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1032-arm64-dts-rockchip-Add-ap6275p-wireless-support-to-A.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1040-board-khadas-edge2-add-nodes.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1040-board-khadas-edge2-add-nodes.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1040-board-khadas-edge2-add-nodes.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1040-board-khadas-edge2-add-nodes.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1041-board-khadas-edge2-mcu.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1041-board-khadas-edge2-mcu.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1041-board-khadas-edge2-mcu.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1041-board-khadas-edge2-mcu.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1051-arm64-dts-rockchip-nanopct6-lts-and-fixes-v6.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1051-arm64-dts-rockchip-nanopct6-lts-and-fixes-v6.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1051-arm64-dts-rockchip-nanopct6-lts-and-fixes-v6.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1051-arm64-dts-rockchip-nanopct6-lts-and-fixes-v6.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1060-arm64-dts-rockchip-Split-pcie30x1m1-pinctrl.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1060-arm64-dts-rockchip-Split-pcie30x1m1-pinctrl.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1060-arm64-dts-rockchip-Split-pcie30x1m1-pinctrl.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1060-arm64-dts-rockchip-Split-pcie30x1m1-pinctrl.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1060-board-cm3588-nas-Add-HDMI-support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1060-board-cm3588-nas-Add-HDMI-support.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1060-board-cm3588-nas-Add-HDMI-support.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1060-board-cm3588-nas-Add-HDMI-support.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1061-arm64-dts-rockchip-Add-PCIe-3.0-pinctrl-to-Turing-RK.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1061-arm64-dts-rockchip-Add-PCIe-3.0-pinctrl-to-Turing-RK.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1061-arm64-dts-rockchip-Add-PCIe-3.0-pinctrl-to-Turing-RK.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1061-arm64-dts-rockchip-Add-PCIe-3.0-pinctrl-to-Turing-RK.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1062-arm64-dts-rockchip-Enable-GPU-node-on-Turing-RK1.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1062-arm64-dts-rockchip-Enable-GPU-node-on-Turing-RK1.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1062-arm64-dts-rockchip-Enable-GPU-node-on-Turing-RK1.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1062-arm64-dts-rockchip-Enable-GPU-node-on-Turing-RK1.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1063-arm64-dts-rockchip-Enable-automatic-fan-control-on-t.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1063-arm64-dts-rockchip-Enable-automatic-fan-control-on-t.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1063-arm64-dts-rockchip-Enable-automatic-fan-control-on-t.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1063-arm64-dts-rockchip-Enable-automatic-fan-control-on-t.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1064-arm64-dts-rockchip-Add-missing-hym8563-clock-frequen.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1064-arm64-dts-rockchip-Add-missing-hym8563-clock-frequen.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/1064-arm64-dts-rockchip-Add-missing-hym8563-clock-frequen.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1064-arm64-dts-rockchip-Add-missing-hym8563-clock-frequen.patch
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-bananapi-m7.dts b/patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588-bananapi-m7.dts
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-bananapi-m7.dts
rename to patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588-bananapi-m7.dts
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-cyber-aib.dts b/patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588-cyber-aib.dts
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-cyber-aib.dts
rename to patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588-cyber-aib.dts
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-hinlink-h88k.dts b/patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588-hinlink-h88k.dts
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-hinlink-h88k.dts
rename to patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588-hinlink-h88k.dts
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-mixtile-blade3.dts b/patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588-mixtile-blade3.dts
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-mixtile-blade3.dts
rename to patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588-mixtile-blade3.dts
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-nanopc-cm3588-nas.dts b/patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588-nanopc-cm3588-nas.dts
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588-nanopc-cm3588-nas.dts
rename to patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588-nanopc-cm3588-nas.dts
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588s-nanopi-r6c.dts b/patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588s-nanopi-r6c.dts
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588s-nanopi-r6c.dts
rename to patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588s-nanopi-r6c.dts
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588s-nanopi-r6s.dts b/patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588s-nanopi-r6s.dts
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588s-nanopi-r6s.dts
rename to patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588s-nanopi-r6s.dts
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588s-orangepi-5.dts b/patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588s-orangepi-5.dts
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588s-orangepi-5.dts
rename to patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588s-orangepi-5.dts
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588s-orangepi-5b.dts b/patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588s-orangepi-5b.dts
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588s-orangepi-5b.dts
rename to patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588s-orangepi-5b.dts
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588s-rock-5c.dts b/patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588s-rock-5c.dts
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588s-rock-5c.dts
rename to patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588s-rock-5c.dts
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588s-youyeetoo-r1.dts b/patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588s-youyeetoo-r1.dts
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/dt/rk3588s-youyeetoo-r1.dts
rename to patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588s-youyeetoo-r1.dts
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/Makefile b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/Makefile
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/Makefile
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/Makefile
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-fanctrl.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-fanctrl.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-fanctrl.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-fanctrl.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-hdmirx.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-hdmirx.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-hdmirx.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-hdmirx.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-i2c8-m2.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-i2c8-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-i2c8-m2.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-i2c8-m2.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm0-m0.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm0-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm0-m0.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm0-m0.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm0-m1.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm0-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm0-m1.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm0-m1.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm0-m2.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm0-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm0-m2.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm0-m2.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm1-m0.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm1-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm1-m0.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm1-m0.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm1-m1.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm1-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm1-m1.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm1-m1.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm1-m2.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm1-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm1-m2.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm1-m2.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm10-m0.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm10-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm10-m0.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm10-m0.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm11-m0.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm11-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm11-m0.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm11-m0.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm11-m1.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm11-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm11-m1.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm11-m1.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm12-m0.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm12-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm12-m0.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm12-m0.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm13-m0.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm13-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm13-m0.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm13-m0.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm13-m2.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm13-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm13-m2.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm13-m2.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm14-m0.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm14-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm14-m0.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm14-m0.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm14-m1.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm14-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm14-m1.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm14-m1.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm14-m2.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm14-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm14-m2.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm14-m2.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm15-m0.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm15-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm15-m0.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm15-m0.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm15-m1.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm15-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm15-m1.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm15-m1.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm15-m2.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm15-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm15-m2.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm15-m2.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm15-m3.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm15-m3.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm15-m3.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm15-m3.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm2-m1.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm2-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm2-m1.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm2-m1.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm3-m0.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm3-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm3-m0.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm3-m0.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm3-m1.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm3-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm3-m1.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm3-m1.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm3-m2.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm3-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm3-m2.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm3-m2.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm3-m3.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm3-m3.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm3-m3.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm3-m3.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm5-m2.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm5-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm5-m2.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm5-m2.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm6-m0.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm6-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm6-m0.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm6-m0.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm6-m2.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm6-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm6-m2.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm6-m2.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm7-m0.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm7-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm7-m0.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm7-m0.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm7-m3.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm7-m3.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm7-m3.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm7-m3.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm8-m0.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm8-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-pwm8-m0.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-pwm8-m0.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-rkvenc-overlay.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-rkvenc-overlay.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-rkvenc-overlay.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-rkvenc-overlay.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-sata1.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-sata1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-sata1.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-sata1.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-sata2.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-sata2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-sata2.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-sata2.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-uart1-m1.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-uart1-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-uart1-m1.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-uart1-m1.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-uart3-m1.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-uart3-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-uart3-m1.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-uart3-m1.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-uart4-m2.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-uart4-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-uart4-m2.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-uart4-m2.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-uart6-m1.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-uart6-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-uart6-m1.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-uart6-m1.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-uart7-m2.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-uart7-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-uart7-m2.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-uart7-m2.dtso
diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-uart8-m1.dtso b/patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-uart8-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.11/overlay/rockchip-rk3588-uart8-m1.dtso
rename to patch/kernel/archive/rockchip-rk3588-6.12/overlay/rockchip-rk3588-uart8-m1.dtso

From be8176a3ad90bb2a55adce8d061b1703261ff3f2 Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Sun, 10 Nov 2024 19:08:23 +0800
Subject: [PATCH 082/107] rockchip-rk3588-6.12: drop patches which cannot get
 applied

---
 .../0025-RK3588-Add-HW-RNG-Support.patch      |  663 -----
 ...588-Add-VPU121-H.264-Decoder-Support.patch |  395 ---
 ...64-dts-rockchip-rk3588-add-RGA2-node.patch |   34 -
 ...chip-samsung-hdptx-Enable-runtime-PM.patch |   91 -
 ...hip-samsung-hdptx-Add-clock-provider.patch |  323 --
 ...itial-support-for-DW-HDMI-Controller.patch | 2603 -----------------
 ...ip-add-PCIe-for-M.2-E-Key-to-rock-5a.patch |   39 -
 ...s-rockchip-nanopct6-lts-and-fixes-v6.patch | 2540 ----------------
 8 files changed, 6688 deletions(-)
 delete mode 100644 patch/kernel/archive/rockchip-rk3588-6.12/0025-RK3588-Add-HW-RNG-Support.patch
 delete mode 100644 patch/kernel/archive/rockchip-rk3588-6.12/0026-RK3588-Add-VPU121-H.264-Decoder-Support.patch
 delete mode 100644 patch/kernel/archive/rockchip-rk3588-6.12/0029-arm64-dts-rockchip-rk3588-add-RGA2-node.patch
 delete mode 100644 patch/kernel/archive/rockchip-rk3588-6.12/0130-phy-phy-rockchip-samsung-hdptx-Enable-runtime-PM.patch
 delete mode 100644 patch/kernel/archive/rockchip-rk3588-6.12/0131-phy-phy-rockchip-samsung-hdptx-Add-clock-provider.patch
 delete mode 100644 patch/kernel/archive/rockchip-rk3588-6.12/0134-drm-bridge-synopsys-Add-initial-support-for-DW-HDMI-Controller.patch
 delete mode 100644 patch/kernel/archive/rockchip-rk3588-6.12/1023-arm64-dts-rockchip-add-PCIe-for-M.2-E-Key-to-rock-5a.patch
 delete mode 100644 patch/kernel/archive/rockchip-rk3588-6.12/1051-arm64-dts-rockchip-nanopct6-lts-and-fixes-v6.patch

diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0025-RK3588-Add-HW-RNG-Support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0025-RK3588-Add-HW-RNG-Support.patch
deleted file mode 100644
index ef9b7791121b..000000000000
--- a/patch/kernel/archive/rockchip-rk3588-6.12/0025-RK3588-Add-HW-RNG-Support.patch
+++ /dev/null
@@ -1,663 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Muhammed Efe Cetin <efectn@protonmail.com>
-Date: Thu, 16 Nov 2023 17:49:42 +0300
-Subject: hwrng: rockchip: Add support for Rockchip HW RNG
-
----
- drivers/char/hw_random/Kconfig        |  13 +
- drivers/char/hw_random/Makefile       |   1 +
- drivers/char/hw_random/rockchip-rng.c | 574 ++++++++++
- 3 files changed, 588 insertions(+)
-
-diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
-index 111111111111..222222222222 100644
---- a/drivers/char/hw_random/Kconfig
-+++ b/drivers/char/hw_random/Kconfig
-@@ -538,6 +538,19 @@ config HW_RANDOM_XIPHERA
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called xiphera-trng.
- 
-+config HW_RANDOM_ROCKCHIP
-+	tristate "Rockchip Random Number Generator support"
-+	depends on ARCH_ROCKCHIP
-+	default HW_RANDOM
-+	help
-+	  This driver provides kernel-side support for the Random Number
-+	  Generator hardware found on Rockchip cpus.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called rockchip-rng.
-+
-+	  If unsure, say Y.
-+
- config HW_RANDOM_ARM_SMCCC_TRNG
- 	tristate "Arm SMCCC TRNG firmware interface support"
- 	depends on HAVE_ARM_SMCCC_DISCOVERY
-diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile
-index 111111111111..222222222222 100644
---- a/drivers/char/hw_random/Makefile
-+++ b/drivers/char/hw_random/Makefile
-@@ -35,6 +35,7 @@ obj-$(CONFIG_HW_RANDOM_IPROC_RNG200) += iproc-rng200.o
- obj-$(CONFIG_HW_RANDOM_ST) += st-rng.o
- obj-$(CONFIG_HW_RANDOM_XGENE) += xgene-rng.o
- obj-$(CONFIG_HW_RANDOM_STM32) += stm32-rng.o
-+obj-$(CONFIG_HW_RANDOM_ROCKCHIP) += rockchip-rng.o
- obj-$(CONFIG_HW_RANDOM_PIC32) += pic32-rng.o
- obj-$(CONFIG_HW_RANDOM_MESON) += meson-rng.o
- obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o
-diff --git a/drivers/char/hw_random/rockchip-rng.c b/drivers/char/hw_random/rockchip-rng.c
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/drivers/char/hw_random/rockchip-rng.c
-@@ -0,0 +1,574 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * rockchip-rng.c Random Number Generator driver for the Rockchip
-+ *
-+ * Copyright (c) 2018, Fuzhou Rockchip Electronics Co., Ltd.
-+ * Author: Lin Jinhan <troy.lin@rock-chips.com>
-+ *
-+ */
-+#include <linux/clk.h>
-+#include <linux/hw_random.h>
-+#include <linux/iopoll.h>
-+#include <linux/module.h>
-+#include <linux/mod_devicetable.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+#include <linux/pm_runtime.h>
-+
-+#define _SBF(s, v)	((v) << (s))
-+#define HIWORD_UPDATE(val, mask, shift) \
-+			((val) << (shift) | (mask) << ((shift) + 16))
-+
-+#define ROCKCHIP_AUTOSUSPEND_DELAY		100
-+#define ROCKCHIP_POLL_PERIOD_US			100
-+#define ROCKCHIP_POLL_TIMEOUT_US		50000
-+#define RK_MAX_RNG_BYTE				(32)
-+
-+/* start of CRYPTO V1 register define */
-+#define CRYPTO_V1_CTRL				0x0008
-+#define CRYPTO_V1_RNG_START			BIT(8)
-+#define CRYPTO_V1_RNG_FLUSH			BIT(9)
-+
-+#define CRYPTO_V1_TRNG_CTRL			0x0200
-+#define CRYPTO_V1_OSC_ENABLE			BIT(16)
-+#define CRYPTO_V1_TRNG_SAMPLE_PERIOD(x)		(x)
-+
-+#define CRYPTO_V1_TRNG_DOUT_0			0x0204
-+/* end of CRYPTO V1 register define */
-+
-+/* start of CRYPTO V2 register define */
-+#define CRYPTO_V2_RNG_DEFAULT_OFFSET		0x0400
-+#define CRYPTO_V2_RNG_CTL			0x0
-+#define CRYPTO_V2_RNG_64_BIT_LEN		_SBF(4, 0x00)
-+#define CRYPTO_V2_RNG_128_BIT_LEN		_SBF(4, 0x01)
-+#define CRYPTO_V2_RNG_192_BIT_LEN		_SBF(4, 0x02)
-+#define CRYPTO_V2_RNG_256_BIT_LEN		_SBF(4, 0x03)
-+#define CRYPTO_V2_RNG_FATESY_SOC_RING		_SBF(2, 0x00)
-+#define CRYPTO_V2_RNG_SLOWER_SOC_RING_0		_SBF(2, 0x01)
-+#define CRYPTO_V2_RNG_SLOWER_SOC_RING_1		_SBF(2, 0x02)
-+#define CRYPTO_V2_RNG_SLOWEST_SOC_RING		_SBF(2, 0x03)
-+#define CRYPTO_V2_RNG_ENABLE			BIT(1)
-+#define CRYPTO_V2_RNG_START			BIT(0)
-+#define CRYPTO_V2_RNG_SAMPLE_CNT		0x0004
-+#define CRYPTO_V2_RNG_DOUT_0			0x0010
-+/* end of CRYPTO V2 register define */
-+
-+/* start of TRNG_V1 register define */
-+/* TRNG is no longer subordinate to the Crypto module */
-+#define TRNG_V1_CTRL				0x0000
-+#define TRNG_V1_CTRL_NOP			_SBF(0, 0x00)
-+#define TRNG_V1_CTRL_RAND			_SBF(0, 0x01)
-+#define TRNG_V1_CTRL_SEED			_SBF(0, 0x02)
-+
-+#define TRNG_V1_STAT				0x0004
-+#define TRNG_V1_STAT_SEEDED			BIT(9)
-+#define TRNG_V1_STAT_GENERATING			BIT(30)
-+#define TRNG_V1_STAT_RESEEDING			BIT(31)
-+
-+#define TRNG_V1_MODE				0x0008
-+#define TRNG_V1_MODE_128_BIT			_SBF(3, 0x00)
-+#define TRNG_V1_MODE_256_BIT			_SBF(3, 0x01)
-+
-+#define TRNG_V1_IE				0x0010
-+#define TRNG_V1_IE_GLBL_EN			BIT(31)
-+#define TRNG_V1_IE_SEED_DONE_EN			BIT(1)
-+#define TRNG_V1_IE_RAND_RDY_EN			BIT(0)
-+
-+#define TRNG_V1_ISTAT				0x0014
-+#define TRNG_V1_ISTAT_RAND_RDY			BIT(0)
-+
-+/* RAND0 ~ RAND7 */
-+#define TRNG_V1_RAND0				0x0020
-+#define TRNG_V1_RAND7				0x003C
-+
-+#define TRNG_V1_AUTO_RQSTS			0x0060
-+
-+#define TRNG_V1_VERSION				0x00F0
-+#define TRNG_v1_VERSION_CODE			0x46bc
-+/* end of TRNG_V1 register define */
-+
-+/* start of RKRNG register define */
-+#define RKRNG_CTRL				0x0010
-+#define RKRNG_CTRL_INST_REQ			BIT(0)
-+#define RKRNG_CTRL_RESEED_REQ			BIT(1)
-+#define RKRNG_CTRL_TEST_REQ			BIT(2)
-+#define RKRNG_CTRL_SW_DRNG_REQ			BIT(3)
-+#define RKRNG_CTRL_SW_TRNG_REQ			BIT(4)
-+
-+#define RKRNG_STATE				0x0014
-+#define RKRNG_STATE_INST_ACK			BIT(0)
-+#define RKRNG_STATE_RESEED_ACK			BIT(1)
-+#define RKRNG_STATE_TEST_ACK			BIT(2)
-+#define RKRNG_STATE_SW_DRNG_ACK			BIT(3)
-+#define RKRNG_STATE_SW_TRNG_ACK			BIT(4)
-+
-+/* DRNG_DATA_0 ~ DNG_DATA_7 */
-+#define RKRNG_DRNG_DATA_0			0x0070
-+#define RKRNG_DRNG_DATA_7			0x008C
-+
-+/* end of RKRNG register define */
-+
-+struct rk_rng_soc_data {
-+	u32 default_offset;
-+
-+	int (*rk_rng_init)(struct hwrng *rng);
-+	int (*rk_rng_read)(struct hwrng *rng, void *buf, size_t max, bool wait);
-+};
-+
-+struct rk_rng {
-+	struct device		*dev;
-+	struct hwrng		rng;
-+	void __iomem		*mem;
-+	struct rk_rng_soc_data	*soc_data;
-+	int			clk_num;
-+	struct clk_bulk_data	*clk_bulks;
-+};
-+
-+static void rk_rng_writel(struct rk_rng *rng, u32 val, u32 offset)
-+{
-+	__raw_writel(val, rng->mem + offset);
-+}
-+
-+static u32 rk_rng_readl(struct rk_rng *rng, u32 offset)
-+{
-+	return __raw_readl(rng->mem + offset);
-+}
-+
-+static int rk_rng_init(struct hwrng *rng)
-+{
-+	int ret;
-+	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
-+
-+	dev_dbg(rk_rng->dev, "clk_bulk_prepare_enable.\n");
-+
-+	ret = clk_bulk_prepare_enable(rk_rng->clk_num, rk_rng->clk_bulks);
-+	if (ret < 0) {
-+		dev_err(rk_rng->dev, "failed to enable clks %d\n", ret);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static void rk_rng_cleanup(struct hwrng *rng)
-+{
-+	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
-+
-+	dev_dbg(rk_rng->dev, "clk_bulk_disable_unprepare.\n");
-+	clk_bulk_disable_unprepare(rk_rng->clk_num, rk_rng->clk_bulks);
-+}
-+
-+static int rk_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)
-+{
-+	int ret;
-+	int read_len = 0;
-+	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
-+
-+	if (!rk_rng->soc_data->rk_rng_read)
-+		return -EFAULT;
-+
-+	ret = pm_runtime_get_sync(rk_rng->dev);
-+	if (ret < 0) {
-+		pm_runtime_put_noidle(rk_rng->dev);
-+		return ret;
-+	}
-+
-+	ret = 0;
-+	while (max > ret) {
-+		read_len = rk_rng->soc_data->rk_rng_read(rng, buf + ret,
-+							 max - ret, wait);
-+		if (read_len < 0) {
-+			ret = read_len;
-+			break;
-+		}
-+		ret += read_len;
-+	}
-+
-+	pm_runtime_mark_last_busy(rk_rng->dev);
-+	pm_runtime_put_sync_autosuspend(rk_rng->dev);
-+
-+	return ret;
-+}
-+
-+static void rk_rng_read_regs(struct rk_rng *rng, u32 offset, void *buf,
-+			     size_t size)
-+{
-+	u32 i;
-+
-+	for (i = 0; i < size; i += 4)
-+		*(u32 *)(buf + i) = be32_to_cpu(rk_rng_readl(rng, offset + i));
-+}
-+
-+static int crypto_v1_read(struct hwrng *rng, void *buf, size_t max, bool wait)
-+{
-+	int ret = 0;
-+	u32 reg_ctrl = 0;
-+	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
-+
-+	/* enable osc_ring to get entropy, sample period is set as 100 */
-+	reg_ctrl = CRYPTO_V1_OSC_ENABLE | CRYPTO_V1_TRNG_SAMPLE_PERIOD(100);
-+	rk_rng_writel(rk_rng, reg_ctrl, CRYPTO_V1_TRNG_CTRL);
-+
-+	reg_ctrl = HIWORD_UPDATE(CRYPTO_V1_RNG_START, CRYPTO_V1_RNG_START, 0);
-+
-+	rk_rng_writel(rk_rng, reg_ctrl, CRYPTO_V1_CTRL);
-+
-+	ret = read_poll_timeout(rk_rng_readl, reg_ctrl,
-+				!(reg_ctrl & CRYPTO_V1_RNG_START),
-+				ROCKCHIP_POLL_PERIOD_US,
-+				ROCKCHIP_POLL_TIMEOUT_US, false,
-+				rk_rng, CRYPTO_V1_CTRL);
-+
-+	if (ret < 0)
-+		goto out;
-+
-+	ret = min_t(size_t, max, RK_MAX_RNG_BYTE);
-+
-+	rk_rng_read_regs(rk_rng, CRYPTO_V1_TRNG_DOUT_0, buf, ret);
-+
-+out:
-+	/* close TRNG */
-+	rk_rng_writel(rk_rng, HIWORD_UPDATE(0, CRYPTO_V1_RNG_START, 0),
-+		      CRYPTO_V1_CTRL);
-+
-+	return ret;
-+}
-+
-+static int crypto_v2_read(struct hwrng *rng, void *buf, size_t max, bool wait)
-+{
-+	int ret = 0;
-+	u32 reg_ctrl = 0;
-+	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
-+
-+	/* enable osc_ring to get entropy, sample period is set as 100 */
-+	rk_rng_writel(rk_rng, 100, CRYPTO_V2_RNG_SAMPLE_CNT);
-+
-+	reg_ctrl |= CRYPTO_V2_RNG_256_BIT_LEN;
-+	reg_ctrl |= CRYPTO_V2_RNG_SLOWER_SOC_RING_0;
-+	reg_ctrl |= CRYPTO_V2_RNG_ENABLE;
-+	reg_ctrl |= CRYPTO_V2_RNG_START;
-+
-+	rk_rng_writel(rk_rng, HIWORD_UPDATE(reg_ctrl, 0xffff, 0),
-+		      CRYPTO_V2_RNG_CTL);
-+
-+	ret = read_poll_timeout(rk_rng_readl, reg_ctrl,
-+				!(reg_ctrl & CRYPTO_V2_RNG_START),
-+				ROCKCHIP_POLL_PERIOD_US,
-+				ROCKCHIP_POLL_TIMEOUT_US, false,
-+				rk_rng, CRYPTO_V2_RNG_CTL);
-+	if (ret < 0)
-+		goto out;
-+
-+	ret = min_t(size_t, max, RK_MAX_RNG_BYTE);
-+
-+	rk_rng_read_regs(rk_rng, CRYPTO_V2_RNG_DOUT_0, buf, ret);
-+
-+out:
-+	/* close TRNG */
-+	rk_rng_writel(rk_rng, HIWORD_UPDATE(0, 0xffff, 0), CRYPTO_V2_RNG_CTL);
-+
-+	return ret;
-+}
-+
-+static int trng_v1_init(struct hwrng *rng)
-+{
-+	int ret;
-+	uint32_t auto_reseed_cnt = 1000;
-+	uint32_t reg_ctrl, status, version;
-+	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
-+
-+	version = rk_rng_readl(rk_rng, TRNG_V1_VERSION);
-+	if (version != TRNG_v1_VERSION_CODE) {
-+		dev_err(rk_rng->dev,
-+			"wrong trng version, expected = %08x, actual = %08x\n",
-+			TRNG_V1_VERSION, version);
-+		ret = -EFAULT;
-+		goto exit;
-+	}
-+
-+	status = rk_rng_readl(rk_rng, TRNG_V1_STAT);
-+
-+	/* TRNG should wait RAND_RDY triggered if it is busy or not seeded */
-+	if (!(status & TRNG_V1_STAT_SEEDED) ||
-+	    (status & TRNG_V1_STAT_GENERATING) ||
-+	    (status & TRNG_V1_STAT_RESEEDING)) {
-+		uint32_t mask = TRNG_V1_STAT_SEEDED |
-+				TRNG_V1_STAT_GENERATING |
-+				TRNG_V1_STAT_RESEEDING;
-+
-+		udelay(10);
-+
-+		/* wait for GENERATING and RESEEDING flag to clear */
-+		read_poll_timeout(rk_rng_readl, reg_ctrl,
-+				  (reg_ctrl & mask) == TRNG_V1_STAT_SEEDED,
-+				  ROCKCHIP_POLL_PERIOD_US,
-+				  ROCKCHIP_POLL_TIMEOUT_US, false,
-+				  rk_rng, TRNG_V1_STAT);
-+	}
-+
-+	/* clear ISTAT flag because trng may auto reseeding when power on */
-+	reg_ctrl = rk_rng_readl(rk_rng, TRNG_V1_ISTAT);
-+	rk_rng_writel(rk_rng, reg_ctrl, TRNG_V1_ISTAT);
-+
-+	/* auto reseed after (auto_reseed_cnt * 16) byte rand generate */
-+	rk_rng_writel(rk_rng, auto_reseed_cnt, TRNG_V1_AUTO_RQSTS);
-+
-+	ret = 0;
-+exit:
-+
-+	return ret;
-+}
-+
-+static int trng_v1_read(struct hwrng *rng, void *buf, size_t max, bool wait)
-+{
-+	int ret = 0;
-+	u32 reg_ctrl = 0;
-+	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
-+
-+	/* clear ISTAT anyway */
-+	reg_ctrl = rk_rng_readl(rk_rng, TRNG_V1_ISTAT);
-+	rk_rng_writel(rk_rng, reg_ctrl, TRNG_V1_ISTAT);
-+
-+	/* generate 256bit random */
-+	rk_rng_writel(rk_rng, TRNG_V1_MODE_256_BIT, TRNG_V1_MODE);
-+	rk_rng_writel(rk_rng, TRNG_V1_CTRL_RAND, TRNG_V1_CTRL);
-+
-+	/*
-+	 * Generate2 56 bit random data will cost 1024 clock cycles.
-+	 * Estimated at 150M RNG module frequency, it takes 6.7 microseconds.
-+	 */
-+	udelay(10);
-+	reg_ctrl = rk_rng_readl(rk_rng, TRNG_V1_ISTAT);
-+	if (!(reg_ctrl & TRNG_V1_ISTAT_RAND_RDY)) {
-+		/* wait RAND_RDY triggered */
-+		ret = read_poll_timeout(rk_rng_readl, reg_ctrl,
-+					(reg_ctrl & TRNG_V1_ISTAT_RAND_RDY),
-+					ROCKCHIP_POLL_PERIOD_US,
-+					ROCKCHIP_POLL_TIMEOUT_US, false,
-+					rk_rng, TRNG_V1_ISTAT);
-+		if (ret < 0)
-+			goto out;
-+	}
-+
-+	ret = min_t(size_t, max, RK_MAX_RNG_BYTE);
-+
-+	rk_rng_read_regs(rk_rng, TRNG_V1_RAND0, buf, ret);
-+
-+	/* clear all status flag */
-+	rk_rng_writel(rk_rng, reg_ctrl, TRNG_V1_ISTAT);
-+out:
-+	/* close TRNG */
-+	rk_rng_writel(rk_rng, TRNG_V1_CTRL_NOP, TRNG_V1_CTRL);
-+
-+	return ret;
-+}
-+
-+static int rkrng_init(struct hwrng *rng)
-+{
-+	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
-+	u32 reg = 0;
-+
-+	rk_rng_writel(rk_rng, HIWORD_UPDATE(0, 0xffff, 0), RKRNG_CTRL);
-+
-+	reg = rk_rng_readl(rk_rng, RKRNG_STATE);
-+	rk_rng_writel(rk_rng, reg, RKRNG_STATE);
-+
-+	return 0;
-+}
-+
-+static int rkrng_read(struct hwrng *rng, void *buf, size_t max, bool wait)
-+{
-+	struct rk_rng *rk_rng = container_of(rng, struct rk_rng, rng);
-+	u32 reg_ctrl = 0;
-+	int ret;
-+
-+	reg_ctrl = RKRNG_CTRL_SW_DRNG_REQ;
-+
-+	rk_rng_writel(rk_rng, HIWORD_UPDATE(reg_ctrl, 0xffff, 0), RKRNG_CTRL);
-+
-+	ret = readl_poll_timeout(rk_rng->mem + RKRNG_STATE, reg_ctrl,
-+				 (reg_ctrl & RKRNG_STATE_SW_DRNG_ACK),
-+				 ROCKCHIP_POLL_PERIOD_US,
-+				 ROCKCHIP_POLL_TIMEOUT_US);
-+
-+	if (ret)
-+		goto exit;
-+
-+	rk_rng_writel(rk_rng, reg_ctrl, RKRNG_STATE);
-+
-+	ret = min_t(size_t, max, RK_MAX_RNG_BYTE);
-+
-+	rk_rng_read_regs(rk_rng, RKRNG_DRNG_DATA_0, buf, ret);
-+
-+exit:
-+	/* close TRNG */
-+	rk_rng_writel(rk_rng, HIWORD_UPDATE(0, 0xffff, 0), RKRNG_CTRL);
-+
-+	return ret;
-+}
-+
-+static const struct rk_rng_soc_data crypto_v1_soc_data = {
-+	.default_offset = 0,
-+
-+	.rk_rng_read = crypto_v1_read,
-+};
-+
-+static const struct rk_rng_soc_data crypto_v2_soc_data = {
-+	.default_offset = CRYPTO_V2_RNG_DEFAULT_OFFSET,
-+
-+	.rk_rng_read = crypto_v2_read,
-+};
-+
-+static const struct rk_rng_soc_data trng_v1_soc_data = {
-+	.default_offset = 0,
-+
-+	.rk_rng_init = trng_v1_init,
-+	.rk_rng_read = trng_v1_read,
-+};
-+
-+static const struct rk_rng_soc_data rkrng_soc_data = {
-+	.default_offset = 0,
-+
-+	.rk_rng_init = rkrng_init,
-+	.rk_rng_read = rkrng_read,
-+};
-+
-+static const struct of_device_id rk_rng_dt_match[] = {
-+	{
-+		.compatible = "rockchip,cryptov1-rng",
-+		.data = (void *)&crypto_v1_soc_data,
-+	},
-+	{
-+		.compatible = "rockchip,cryptov2-rng",
-+		.data = (void *)&crypto_v2_soc_data,
-+	},
-+	{
-+		.compatible = "rockchip,trngv1",
-+		.data = (void *)&trng_v1_soc_data,
-+	},
-+		{
-+		.compatible = "rockchip,rkrng",
-+		.data = (void *)&rkrng_soc_data,
-+	},
-+	{ },
-+};
-+
-+MODULE_DEVICE_TABLE(of, rk_rng_dt_match);
-+
-+static int rk_rng_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+	struct rk_rng *rk_rng;
-+	struct device_node *np = pdev->dev.of_node;
-+	const struct of_device_id *match;
-+	resource_size_t map_size;
-+
-+	dev_dbg(&pdev->dev, "probing...\n");
-+	rk_rng = devm_kzalloc(&pdev->dev, sizeof(struct rk_rng), GFP_KERNEL);
-+	if (!rk_rng)
-+		return -ENOMEM;
-+
-+	match = of_match_node(rk_rng_dt_match, np);
-+	rk_rng->soc_data = (struct rk_rng_soc_data *)match->data;
-+
-+	rk_rng->dev = &pdev->dev;
-+	rk_rng->rng.name    = "rockchip";
-+#ifndef CONFIG_PM
-+	rk_rng->rng.init    = rk_rng_init;
-+	rk_rng->rng.cleanup = rk_rng_cleanup,
-+#endif
-+	rk_rng->rng.read    = rk_rng_read;
-+	rk_rng->rng.quality = 999;
-+
-+	rk_rng->mem = devm_of_iomap(&pdev->dev, pdev->dev.of_node, 0, &map_size);
-+	if (IS_ERR(rk_rng->mem))
-+		return PTR_ERR(rk_rng->mem);
-+
-+	/* compatible with crypto v2 module */
-+	/*
-+	 * With old dtsi configurations, the RNG base was equal to the crypto
-+	 * base, so both drivers could not be enabled at the same time.
-+	 * RNG base = CRYPTO base + RNG offset
-+	 * (Since RK356X, RNG module is no longer belongs to CRYPTO module)
-+	 *
-+	 * With new dtsi configurations, CRYPTO regs is divided into two parts
-+	 * |---cipher---|---rng---|---pka---|, and RNG base is real RNG base.
-+	 * RNG driver and CRYPTO driver could be enabled at the same time.
-+	 */
-+	if (map_size > rk_rng->soc_data->default_offset)
-+		rk_rng->mem += rk_rng->soc_data->default_offset;
-+
-+	rk_rng->clk_num = devm_clk_bulk_get_all(&pdev->dev, &rk_rng->clk_bulks);
-+	if (rk_rng->clk_num < 0) {
-+		dev_err(&pdev->dev, "failed to get clks property\n");
-+		return -ENODEV;
-+	}
-+
-+	platform_set_drvdata(pdev, rk_rng);
-+
-+	pm_runtime_set_autosuspend_delay(&pdev->dev,
-+					 ROCKCHIP_AUTOSUSPEND_DELAY);
-+	pm_runtime_use_autosuspend(&pdev->dev);
-+	pm_runtime_enable(&pdev->dev);
-+
-+	ret = devm_hwrng_register(&pdev->dev, &rk_rng->rng);
-+	if (ret) {
-+		pm_runtime_dont_use_autosuspend(&pdev->dev);
-+		pm_runtime_disable(&pdev->dev);
-+	}
-+
-+	/* for some platform need hardware operation when probe */
-+	if (rk_rng->soc_data->rk_rng_init) {
-+		pm_runtime_get_sync(rk_rng->dev);
-+
-+		ret = rk_rng->soc_data->rk_rng_init(&rk_rng->rng);
-+
-+		pm_runtime_mark_last_busy(rk_rng->dev);
-+		pm_runtime_put_sync_autosuspend(rk_rng->dev);
-+	}
-+
-+	return ret;
-+}
-+
-+#ifdef CONFIG_PM
-+static int rk_rng_runtime_suspend(struct device *dev)
-+{
-+	struct rk_rng *rk_rng = dev_get_drvdata(dev);
-+
-+	rk_rng_cleanup(&rk_rng->rng);
-+
-+	return 0;
-+}
-+
-+static int rk_rng_runtime_resume(struct device *dev)
-+{
-+	struct rk_rng *rk_rng = dev_get_drvdata(dev);
-+
-+	return rk_rng_init(&rk_rng->rng);
-+}
-+
-+static const struct dev_pm_ops rk_rng_pm_ops = {
-+	SET_RUNTIME_PM_OPS(rk_rng_runtime_suspend,
-+			   rk_rng_runtime_resume, NULL)
-+	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
-+				pm_runtime_force_resume)
-+};
-+
-+#endif
-+
-+static struct platform_driver rk_rng_driver = {
-+	.driver	= {
-+		.name	= "rockchip-rng",
-+#ifdef CONFIG_PM
-+		.pm	= &rk_rng_pm_ops,
-+#endif
-+		.of_match_table = rk_rng_dt_match,
-+	},
-+	.probe	= rk_rng_probe,
-+};
-+
-+module_platform_driver(rk_rng_driver);
-+
-+MODULE_DESCRIPTION("ROCKCHIP H/W Random Number Generator driver");
-+MODULE_AUTHOR("Lin Jinhan <troy.lin@rock-chips.com>");
-+MODULE_LICENSE("GPL v2");
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Muhammed Efe Cetin <efectn@protonmail.com>
-Date: Fri, 2 Aug 2024 00:10:39 +0300
-Subject: arm64: dts: rockchip: rk3588: enable RNG node
-
----
- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-@@ -1774,6 +1774,16 @@ crypto: crypto@fe370000 {
- 		reset-names = "core";
- 	};
- 
-+	rng: rng@fe378000 {
-+		compatible = "rockchip,trngv1";
-+		reg = <0x0 0xfe378000 0x0 0x200>;
-+		interrupts = <GIC_SPI 400 IRQ_TYPE_LEVEL_HIGH 0>;
-+		clocks = <&scmi_clk SCMI_HCLK_SECURE_NS>;
-+		clock-names = "hclk_trng";
-+		resets = <&scmi_reset SRST_H_TRNG_NS>;
-+		reset-names = "reset";
-+	};
-+
- 	i2s0_8ch: i2s@fe470000 {
- 		compatible = "rockchip,rk3588-i2s-tdm";
- 		reg = <0x0 0xfe470000 0x0 0x1000>;
--- 
-Armbian
-
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0026-RK3588-Add-VPU121-H.264-Decoder-Support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0026-RK3588-Add-VPU121-H.264-Decoder-Support.patch
deleted file mode 100644
index 35298c4c4663..000000000000
--- a/patch/kernel/archive/rockchip-rk3588-6.12/0026-RK3588-Add-VPU121-H.264-Decoder-Support.patch
+++ /dev/null
@@ -1,395 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
-Date: Thu, 18 Apr 2024 16:15:05 +0200
-Subject: media: dt-bindings: rk3568-vepu: Add RK3588 VEPU121
-
-This encoder-only device is present four times on this SoC, and should
-support everything the rk3568 vepu supports (so JPEG, H.264 and VP8
-encoding). No fallback compatible has been added, since the operating
-systems might already support RK3568 VEPU and want to avoid registering
-four of them separately considering they can be used as a cluster.
-
-Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
-Acked-by: Conor Dooley <conor.dooley@microchip.com>
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
----
- Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml b/Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml
-index 111111111111..222222222222 100644
---- a/Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml
-+++ b/Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml
-@@ -17,6 +17,7 @@ properties:
-   compatible:
-     enum:
-       - rockchip,rk3568-vepu
-+      - rockchip,rk3588-vepu121
- 
-   reg:
-     maxItems: 1
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jianfeng Liu <liujianfeng1994@gmail.com>
-Date: Tue, 30 Apr 2024 10:40:01 +0800
-Subject: media: dt-bindings: rockchip-vpu: Add RK3588 VPU121
-
-RK3588 has four Hantro H1 VEPUs (encoder-only) modules and one combined
-Hantro H1/G1 VPU (decoder and encoder). These are not described as
-separate IP, since they are sharing an internal cache. This adds the
-RK3588 specific compatible string for the combined VPU, which seems to
-be identical to the version found in the RK3568.
-
-Signed-off-by: Jianfeng Liu <liujianfeng1994@gmail.com>
-Acked-by: Conor Dooley <conor.dooley@microchip.com>
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
----
- Documentation/devicetree/bindings/media/rockchip-vpu.yaml | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/Documentation/devicetree/bindings/media/rockchip-vpu.yaml b/Documentation/devicetree/bindings/media/rockchip-vpu.yaml
-index 111111111111..222222222222 100644
---- a/Documentation/devicetree/bindings/media/rockchip-vpu.yaml
-+++ b/Documentation/devicetree/bindings/media/rockchip-vpu.yaml
-@@ -31,6 +31,9 @@ properties:
-       - items:
-           - const: rockchip,rk3228-vpu
-           - const: rockchip,rk3399-vpu
-+      - items:
-+          - const: rockchip,rk3588-vpu121
-+          - const: rockchip,rk3568-vpu
- 
-   reg:
-     maxItems: 1
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sebastian Reichel <sebastian.reichel@collabora.com>
-Date: Thu, 13 Jun 2024 14:29:55 +0200
-Subject: media: hantro: Disable multicore support
-
-Avoid exposing equal Hantro video codecs to userspace. Equal video
-codecs allow scheduling work between the cores. For that kernel support
-is required, which does not yet exist. Until that is implemented avoid
-exposing each core separately to userspace so that multicore can be
-added in the future without breaking userspace ABI.
-
-This was written with Rockchip RK3588 in mind (which has 4 Hantro H1
-cores), but applies to all SoCs.
-
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
----
- drivers/media/platform/verisilicon/hantro_drv.c | 47 ++++++++++
- 1 file changed, 47 insertions(+)
-
-diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
-index 111111111111..222222222222 100644
---- a/drivers/media/platform/verisilicon/hantro_drv.c
-+++ b/drivers/media/platform/verisilicon/hantro_drv.c
-@@ -992,6 +992,49 @@ static const struct media_device_ops hantro_m2m_media_ops = {
- 	.req_queue = v4l2_m2m_request_queue,
- };
- 
-+/*
-+ * Some SoCs, like RK3588 have multiple identical Hantro cores, but the
-+ * kernel is currently missing support for multi-core handling. Exposing
-+ * separate devices for each core to userspace is bad, since that does
-+ * not allow scheduling tasks properly (and creates ABI). With this workaround
-+ * the driver will only probe for the first core and early exit for the other
-+ * cores. Once the driver gains multi-core support, the same technique
-+ * for detecting the main core can be used to cluster all cores together.
-+ */
-+static int hantro_disable_multicore(struct hantro_dev *vpu)
-+{
-+	struct device_node *node = NULL;
-+	const char *compatible;
-+	bool is_main_core;
-+	int ret;
-+
-+	/* Intentionally ignores the fallback strings */
-+	ret = of_property_read_string(vpu->dev->of_node, "compatible", &compatible);
-+	if (ret)
-+		return ret;
-+
-+	/* The first compatible and available node found is considered the main core */
-+	do {
-+		node = of_find_compatible_node(node, NULL, compatible);
-+		if (of_device_is_available(node))
-+			break;
-+	} while (node);
-+
-+	if (!node)
-+		return -EINVAL;
-+
-+	is_main_core = (vpu->dev->of_node == node);
-+
-+	of_node_put(node);
-+
-+	if (!is_main_core) {
-+		dev_info(vpu->dev, "missing multi-core support, ignoring this instance\n");
-+		return -ENODEV;
-+	}
-+
-+	return 0;
-+}
-+
- static int hantro_probe(struct platform_device *pdev)
- {
- 	const struct of_device_id *match;
-@@ -1011,6 +1054,10 @@ static int hantro_probe(struct platform_device *pdev)
- 	match = of_match_node(of_hantro_match, pdev->dev.of_node);
- 	vpu->variant = match->data;
- 
-+	ret = hantro_disable_multicore(vpu);
-+	if (ret)
-+		return ret;
-+
- 	/*
- 	 * Support for nxp,imx8mq-vpu is kept for backwards compatibility
- 	 * but it's deprecated. Please update your DTS file to use
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sebastian Reichel <sebastian.reichel@collabora.com>
-Date: Thu, 13 Jun 2024 14:48:43 +0200
-Subject: media: hantro: Add RK3588 VEPU121
-
-RK3588 handling is exactly the same as RK3568. This is not
-handled using fallback compatibles to avoid exposing multiple
-video devices on kernels not having the multicore disable
-patch.
-
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
----
- drivers/media/platform/verisilicon/hantro_drv.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
-index 111111111111..222222222222 100644
---- a/drivers/media/platform/verisilicon/hantro_drv.c
-+++ b/drivers/media/platform/verisilicon/hantro_drv.c
-@@ -722,6 +722,7 @@ static const struct of_device_id of_hantro_match[] = {
- 	{ .compatible = "rockchip,rk3399-vpu", .data = &rk3399_vpu_variant, },
- 	{ .compatible = "rockchip,rk3568-vepu", .data = &rk3568_vepu_variant, },
- 	{ .compatible = "rockchip,rk3568-vpu", .data = &rk3568_vpu_variant, },
-+	{ .compatible = "rockchip,rk3588-vepu121", .data = &rk3568_vepu_variant, },
- 	{ .compatible = "rockchip,rk3588-av1-vpu", .data = &rk3588_vpu981_variant, },
- #endif
- #ifdef CONFIG_VIDEO_HANTRO_IMX8M
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
-Date: Wed, 5 Jun 2024 15:28:33 +0200
-Subject: arm64: dts: rockchip: Add VEPU121 to RK3588
-
-RK3588 has 4 Hantro G1 encoder-only cores. They are all independent IP,
-but can be used as a cluster (i.e. sharing work between the cores).
-These cores are called VEPU121 in the TRM. The TRM describes one more
-VEPU121, but that is combined with a Hantro H1. That one will be handled
-using the VPU binding instead.
-
-Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
----
- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 80 ++++++++++
- 1 file changed, 80 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-@@ -1122,6 +1122,86 @@ power-domain@RK3588_PD_SDMMC {
- 		};
- 	};
- 
-+	vepu121_0: video-codec@fdba0000 {
-+		compatible = "rockchip,rk3588-vepu121";
-+		reg = <0x0 0xfdba0000 0x0 0x800>;
-+		interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH 0>;
-+		clocks = <&cru ACLK_JPEG_ENCODER0>, <&cru HCLK_JPEG_ENCODER0>;
-+		clock-names = "aclk", "hclk";
-+		iommus = <&vepu121_0_mmu>;
-+		power-domains = <&power RK3588_PD_VDPU>;
-+	};
-+
-+	vepu121_0_mmu: iommu@fdba0800 {
-+		compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu";
-+		reg = <0x0 0xfdba0800 0x0 0x40>;
-+		interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH 0>;
-+		clocks = <&cru ACLK_JPEG_ENCODER0>, <&cru HCLK_JPEG_ENCODER0>;
-+		clock-names = "aclk", "iface";
-+		power-domains = <&power RK3588_PD_VDPU>;
-+		#iommu-cells = <0>;
-+	};
-+
-+	vepu121_1: video-codec@fdba4000 {
-+		compatible = "rockchip,rk3588-vepu121";
-+		reg = <0x0 0xfdba4000 0x0 0x800>;
-+		interrupts = <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH 0>;
-+		clocks = <&cru ACLK_JPEG_ENCODER1>, <&cru HCLK_JPEG_ENCODER1>;
-+		clock-names = "aclk", "hclk";
-+		iommus = <&vepu121_1_mmu>;
-+		power-domains = <&power RK3588_PD_VDPU>;
-+	};
-+
-+	vepu121_1_mmu: iommu@fdba4800 {
-+		compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu";
-+		reg = <0x0 0xfdba4800 0x0 0x40>;
-+		interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH 0>;
-+		clocks = <&cru ACLK_JPEG_ENCODER1>, <&cru HCLK_JPEG_ENCODER1>;
-+		clock-names = "aclk", "iface";
-+		power-domains = <&power RK3588_PD_VDPU>;
-+		#iommu-cells = <0>;
-+	};
-+
-+	vepu121_2: video-codec@fdba8000 {
-+		compatible = "rockchip,rk3588-vepu121";
-+		reg = <0x0 0xfdba8000 0x0 0x800>;
-+		interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH 0>;
-+		clocks = <&cru ACLK_JPEG_ENCODER2>, <&cru HCLK_JPEG_ENCODER2>;
-+		clock-names = "aclk", "hclk";
-+		iommus = <&vepu121_2_mmu>;
-+		power-domains = <&power RK3588_PD_VDPU>;
-+	};
-+
-+	vepu121_2_mmu: iommu@fdba8800 {
-+		compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu";
-+		reg = <0x0 0xfdba8800 0x0 0x40>;
-+		interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH 0>;
-+		clocks = <&cru ACLK_JPEG_ENCODER2>, <&cru HCLK_JPEG_ENCODER2>;
-+		clock-names = "aclk", "iface";
-+		power-domains = <&power RK3588_PD_VDPU>;
-+		#iommu-cells = <0>;
-+	};
-+
-+	vepu121_3: video-codec@fdbac000 {
-+		compatible = "rockchip,rk3588-vepu121";
-+		reg = <0x0 0xfdbac000 0x0 0x800>;
-+		interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH 0>;
-+		clocks = <&cru ACLK_JPEG_ENCODER3>, <&cru HCLK_JPEG_ENCODER3>;
-+		clock-names = "aclk", "hclk";
-+		iommus = <&vepu121_3_mmu>;
-+		power-domains = <&power RK3588_PD_VDPU>;
-+	};
-+
-+	vepu121_3_mmu: iommu@fdbac800 {
-+		compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu";
-+		reg = <0x0 0xfdbac800 0x0 0x40>;
-+		interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH 0>;
-+		clocks = <&cru ACLK_JPEG_ENCODER3>, <&cru HCLK_JPEG_ENCODER3>;
-+		clock-names = "aclk", "iface";
-+		power-domains = <&power RK3588_PD_VDPU>;
-+		#iommu-cells = <0>;
-+	};
-+
- 	av1d: video-codec@fdc70000 {
- 		compatible = "rockchip,rk3588-av1-vpu";
- 		reg = <0x0 0xfdc70000 0x0 0x800>;
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jianfeng Liu <liujianfeng1994@gmail.com>
-Date: Tue, 30 Apr 2024 10:40:02 +0800
-Subject: arm64: dts: rockchip: Add VPU121 support for RK3588
-
-Enable Hantro G1 video decoder in RK3588's devicetree.
-
-Tested with FFmpeg v4l2_request code taken from [1]
-with MPEG2, H.264 and VP8 samples.
-
-[1] https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/multimedia/ffmpeg/patches/v4l2-request/ffmpeg-001-v4l2-request.patch
-
-Signed-off-by: Jianfeng Liu <liujianfeng1994@gmail.com>
-Tested-by: Hugh Cole-Baker <sigmaris@gmail.com>
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
----
- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 21 ++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-@@ -1122,6 +1122,27 @@ power-domain@RK3588_PD_SDMMC {
- 		};
- 	};
- 
-+	vpu121: video-codec@fdb50000 {
-+		compatible = "rockchip,rk3588-vpu121", "rockchip,rk3568-vpu";
-+		reg = <0x0 0xfdb50000 0x0 0x800>;
-+		interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
-+		interrupt-names = "vdpu";
-+		clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
-+		clock-names = "aclk", "hclk";
-+		iommus = <&vpu121_mmu>;
-+		power-domains = <&power RK3588_PD_VDPU>;
-+	};
-+
-+	vpu121_mmu: iommu@fdb50800 {
-+		compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu";
-+		reg = <0x0 0xfdb50800 0x0 0x40>;
-+		interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;
-+		clock-names = "aclk", "iface";
-+		clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
-+		power-domains = <&power RK3588_PD_VDPU>;
-+		#iommu-cells = <0>;
-+	};
-+
- 	vepu121_0: video-codec@fdba0000 {
- 		compatible = "rockchip,rk3588-vepu121";
- 		reg = <0x0 0xfdba0000 0x0 0x800>;
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Muhammed Efe Cetin <efectn@protonmail.com>
-Date: Mon, 29 Jul 2024 23:21:19 +0300
-Subject: arm64: dts: rockchip: rk3588: disable H264 decoding on Hantro decoder
-
----
- Documentation/devicetree/bindings/media/rockchip-vpu.yaml | 2 +-
- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi             | 7 ++++---
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/Documentation/devicetree/bindings/media/rockchip-vpu.yaml b/Documentation/devicetree/bindings/media/rockchip-vpu.yaml
-index 111111111111..222222222222 100644
---- a/Documentation/devicetree/bindings/media/rockchip-vpu.yaml
-+++ b/Documentation/devicetree/bindings/media/rockchip-vpu.yaml
-@@ -33,7 +33,7 @@ properties:
-           - const: rockchip,rk3399-vpu
-       - items:
-           - const: rockchip,rk3588-vpu121
--          - const: rockchip,rk3568-vpu
-+          - const: rockchip,rk3399-vpu
- 
-   reg:
-     maxItems: 1
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-@@ -1123,10 +1123,11 @@ power-domain@RK3588_PD_SDMMC {
- 	};
- 
- 	vpu121: video-codec@fdb50000 {
--		compatible = "rockchip,rk3588-vpu121", "rockchip,rk3568-vpu";
-+		compatible = "rockchip,rk3588-vpu121", "rockchip,rk3399-vpu";
- 		reg = <0x0 0xfdb50000 0x0 0x800>;
--		interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
--		interrupt-names = "vdpu";
-+		interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH 0>,
-+			     <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
-+		interrupt-names = "vepu", "vdpu";
- 		clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
- 		clock-names = "aclk", "hclk";
- 		iommus = <&vpu121_mmu>;
--- 
-Armbian
-
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0029-arm64-dts-rockchip-rk3588-add-RGA2-node.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0029-arm64-dts-rockchip-rk3588-add-RGA2-node.patch
deleted file mode 100644
index abb8d1683714..000000000000
--- a/patch/kernel/archive/rockchip-rk3588-6.12/0029-arm64-dts-rockchip-rk3588-add-RGA2-node.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Muhammed Efe Cetin <efectn@protonmail.com>
-Date: Mon, 13 May 2024 20:29:49 +0300
-Subject: arm64: dts: rockchip: rk3588: add VDPU and RGA2 nodes
-
----
- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 11 ++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-@@ -566,6 +566,17 @@ mmu600_php: iommu@fcb00000 {
- 		status = "disabled";
- 	};
- 
-+	rga: rga@fdb80000 {
-+		compatible = "rockchip,rk3568-rga", "rockchip,rk3288-rga";
-+		reg = <0x0 0xfdb80000 0x0 0x1000>;
-+		interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH 0>;
-+		clocks = <&cru ACLK_RGA2>, <&cru HCLK_RGA2>, <&cru CLK_RGA2_CORE>;
-+		clock-names = "aclk", "hclk", "sclk";
-+		resets = <&cru SRST_RGA2_CORE>, <&cru SRST_A_RGA2>, <&cru SRST_H_RGA2>;
-+		reset-names = "core", "axi", "ahb";
-+		power-domains = <&power RK3588_PD_VDPU>;
-+	};
-+
- 	pmu1grf: syscon@fd58a000 {
- 		compatible = "rockchip,rk3588-pmugrf", "syscon", "simple-mfd";
- 		reg = <0x0 0xfd58a000 0x0 0x10000>;
--- 
-Armbian
-
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0130-phy-phy-rockchip-samsung-hdptx-Enable-runtime-PM.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0130-phy-phy-rockchip-samsung-hdptx-Enable-runtime-PM.patch
deleted file mode 100644
index 387f39d1df6b..000000000000
--- a/patch/kernel/archive/rockchip-rk3588-6.12/0130-phy-phy-rockchip-samsung-hdptx-Enable-runtime-PM.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
-Date: Tue, 11 Jun 2024 02:28:26 +0300
-Subject: phy: phy-rockchip-samsung-hdptx: Enable runtime PM at PHY core level
-
-When a new PHY is created via [devm_]phy_create(), the runtime PM for it
-is not enabled unless the parent device (which creates the PHY) has its
-own runtime PM already enabled.
-
-Move the call to devm_pm_runtime_enable() before devm_phy_create() to
-enable runtime PM at PHY core level.
-
-With this change the ->power_on() and ->power_off() callbacks do not
-require explicit runtime PM management anymore, since the PHY core
-handles that via phy_pm_runtime_{get,put}_sync() when phy_power_on() and
-phy_power_off() are invoked.
-
-Hence drop the now unnecessary calls to pm_runtime_resume_and_get() and
-pm_runtime_put() helpers.
-
-Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
----
- drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 24 +++-------
- 1 file changed, 6 insertions(+), 18 deletions(-)
-
-diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
-index 111111111111..222222222222 100644
---- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
-+++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
-@@ -860,7 +860,7 @@ static int rk_hdptx_ropll_tmds_mode_config(struct rk_hdptx_phy *hdptx,
- static int rk_hdptx_phy_power_on(struct phy *phy)
- {
- 	struct rk_hdptx_phy *hdptx = phy_get_drvdata(phy);
--	int ret, bus_width = phy_get_bus_width(hdptx->phy);
-+	int bus_width = phy_get_bus_width(hdptx->phy);
- 	/*
- 	 * FIXME: Temporary workaround to pass pixel_clk_rate
- 	 * from the HDMI bridge driver until phy_configure_opts_hdmi
-@@ -871,17 +871,7 @@ static int rk_hdptx_phy_power_on(struct phy *phy)
- 	dev_dbg(hdptx->dev, "%s bus_width=%x rate=%u\n",
- 		__func__, bus_width, rate);
- 
--	ret = pm_runtime_resume_and_get(hdptx->dev);
--	if (ret) {
--		dev_err(hdptx->dev, "Failed to resume phy: %d\n", ret);
--		return ret;
--	}
--
--	ret = rk_hdptx_ropll_tmds_mode_config(hdptx, rate);
--	if (ret)
--		pm_runtime_put(hdptx->dev);
--
--	return ret;
-+	return rk_hdptx_ropll_tmds_mode_config(hdptx, rate);
- }
- 
- static int rk_hdptx_phy_power_off(struct phy *phy)
-@@ -894,8 +884,6 @@ static int rk_hdptx_phy_power_off(struct phy *phy)
- 	if (ret == 0 && (val & HDPTX_O_PLL_LOCK_DONE))
- 		rk_hdptx_phy_disable(hdptx);
- 
--	pm_runtime_put(hdptx->dev);
--
- 	return ret;
- }
- 
-@@ -977,6 +965,10 @@ static int rk_hdptx_phy_probe(struct platform_device *pdev)
- 		return dev_err_probe(dev, PTR_ERR(hdptx->grf),
- 				     "Could not get GRF syscon\n");
- 
-+	ret = devm_pm_runtime_enable(dev);
-+	if (ret)
-+		return dev_err_probe(dev, ret, "Failed to enable runtime PM\n");
-+
- 	hdptx->phy = devm_phy_create(dev, NULL, &rk_hdptx_phy_ops);
- 	if (IS_ERR(hdptx->phy))
- 		return dev_err_probe(dev, PTR_ERR(hdptx->phy),
-@@ -986,10 +978,6 @@ static int rk_hdptx_phy_probe(struct platform_device *pdev)
- 	phy_set_drvdata(hdptx->phy, hdptx);
- 	phy_set_bus_width(hdptx->phy, 8);
- 
--	ret = devm_pm_runtime_enable(dev);
--	if (ret)
--		return dev_err_probe(dev, ret, "Failed to enable runtime PM\n");
--
- 	phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
- 	if (IS_ERR(phy_provider))
- 		return dev_err_probe(dev, PTR_ERR(phy_provider),
--- 
-Armbian
-
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0131-phy-phy-rockchip-samsung-hdptx-Add-clock-provider.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0131-phy-phy-rockchip-samsung-hdptx-Add-clock-provider.patch
deleted file mode 100644
index 721cf796ee3d..000000000000
--- a/patch/kernel/archive/rockchip-rk3588-6.12/0131-phy-phy-rockchip-samsung-hdptx-Add-clock-provider.patch
+++ /dev/null
@@ -1,323 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
-Date: Mon, 19 Feb 2024 21:53:24 +0200
-Subject: dt-bindings: phy: rockchip,rk3588-hdptx-phy: Add #clock-cells
-
-The HDMI PHY can be used as a clock provider on RK3588 SoC, hence add
-the necessary '#clock-cells' property.
-
-Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
----
- Documentation/devicetree/bindings/phy/rockchip,rk3588-hdptx-phy.yaml | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/Documentation/devicetree/bindings/phy/rockchip,rk3588-hdptx-phy.yaml b/Documentation/devicetree/bindings/phy/rockchip,rk3588-hdptx-phy.yaml
-index 111111111111..222222222222 100644
---- a/Documentation/devicetree/bindings/phy/rockchip,rk3588-hdptx-phy.yaml
-+++ b/Documentation/devicetree/bindings/phy/rockchip,rk3588-hdptx-phy.yaml
-@@ -27,6 +27,9 @@ properties:
-       - const: ref
-       - const: apb
- 
-+  "#clock-cells":
-+    const: 0
-+
-   "#phy-cells":
-     const: 0
- 
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
-Date: Tue, 16 Jan 2024 19:27:40 +0200
-Subject: phy: phy-rockchip-samsung-hdptx: Add clock provider support
-
-The HDMI PHY PLL can be used as an alternative dclk source to RK3588 SoC
-CRU. It provides more accurate clock rates required by VOP2 to improve
-existing support for display modes handling, which is known to be
-problematic when dealing with non-integer refresh rates, among others.
-
-It is worth noting this only works for HDMI 2.0 or below, e.g. cannot be
-used to support HDMI 2.1 4K@120Hz mode.
-
-Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
----
- drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 195 ++++++++--
- 1 file changed, 173 insertions(+), 22 deletions(-)
-
-diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
-index 111111111111..222222222222 100644
---- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
-+++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
-@@ -8,6 +8,7 @@
-  */
- #include <linux/bitfield.h>
- #include <linux/clk.h>
-+#include <linux/clk-provider.h>
- #include <linux/delay.h>
- #include <linux/mfd/syscon.h>
- #include <linux/module.h>
-@@ -191,6 +192,8 @@
- #define LN3_TX_SER_RATE_SEL_HBR2	BIT(3)
- #define LN3_TX_SER_RATE_SEL_HBR3	BIT(2)
- 
-+#define HDMI20_MAX_RATE			600000000
-+
- struct lcpll_config {
- 	u32 bit_rate;
- 	u8 lcvco_mode_en;
-@@ -273,6 +276,12 @@ struct rk_hdptx_phy {
- 	struct clk_bulk_data *clks;
- 	int nr_clks;
- 	struct reset_control_bulk_data rsts[RST_MAX];
-+
-+	/* clk provider */
-+	struct clk_hw hw;
-+	unsigned long rate;
-+
-+	atomic_t usage_count;
- };
- 
- static const struct ropll_config ropll_tmds_cfg[] = {
-@@ -760,6 +769,8 @@ static int rk_hdptx_ropll_tmds_cmn_config(struct rk_hdptx_phy *hdptx,
- 	struct ropll_config rc = {0};
- 	int i;
- 
-+	hdptx->rate = rate * 100;
-+
- 	for (i = 0; i < ARRAY_SIZE(ropll_tmds_cfg); i++)
- 		if (rate == ropll_tmds_cfg[i].bit_rate) {
- 			cfg = &ropll_tmds_cfg[i];
-@@ -823,19 +834,6 @@ static int rk_hdptx_ropll_tmds_cmn_config(struct rk_hdptx_phy *hdptx,
- static int rk_hdptx_ropll_tmds_mode_config(struct rk_hdptx_phy *hdptx,
- 					   unsigned int rate)
- {
--	u32 val;
--	int ret;
--
--	ret = regmap_read(hdptx->grf, GRF_HDPTX_STATUS, &val);
--	if (ret)
--		return ret;
--
--	if (!(val & HDPTX_O_PLL_LOCK_DONE)) {
--		ret = rk_hdptx_ropll_tmds_cmn_config(hdptx, rate);
--		if (ret)
--			return ret;
--	}
--
- 	rk_hdptx_multi_reg_write(hdptx, rk_hdtpx_common_sb_init_seq);
- 
- 	regmap_write(hdptx->regmap, LNTOP_REG(0200), 0x06);
-@@ -857,10 +855,68 @@ static int rk_hdptx_ropll_tmds_mode_config(struct rk_hdptx_phy *hdptx,
- 	return rk_hdptx_post_enable_lane(hdptx);
- }
- 
-+static int rk_hdptx_phy_consumer_get(struct rk_hdptx_phy *hdptx,
-+				     unsigned int rate)
-+{
-+	u32 status;
-+	int ret;
-+
-+	if (atomic_inc_return(&hdptx->usage_count) > 1)
-+		return 0;
-+
-+	ret = regmap_read(hdptx->grf, GRF_HDPTX_STATUS, &status);
-+	if (ret)
-+		goto dec_usage;
-+
-+	if (status & HDPTX_O_PLL_LOCK_DONE)
-+		dev_warn(hdptx->dev, "PLL locked by unknown consumer!\n");
-+
-+	if (rate) {
-+		ret = rk_hdptx_ropll_tmds_cmn_config(hdptx, rate);
-+		if (ret)
-+			goto dec_usage;
-+	}
-+
-+	return 0;
-+
-+dec_usage:
-+	atomic_dec(&hdptx->usage_count);
-+	return ret;
-+}
-+
-+static int rk_hdptx_phy_consumer_put(struct rk_hdptx_phy *hdptx, bool force)
-+{
-+	u32 status;
-+	int ret;
-+
-+	ret = atomic_dec_return(&hdptx->usage_count);
-+	if (ret > 0)
-+		return 0;
-+
-+	if (ret < 0) {
-+		dev_warn(hdptx->dev, "Usage count underflow!\n");
-+		ret = -EINVAL;
-+	} else {
-+		ret = regmap_read(hdptx->grf, GRF_HDPTX_STATUS, &status);
-+		if (!ret) {
-+			if (status & HDPTX_O_PLL_LOCK_DONE)
-+				rk_hdptx_phy_disable(hdptx);
-+			return 0;
-+		} else if (force) {
-+			return 0;
-+		}
-+	}
-+
-+	atomic_inc(&hdptx->usage_count);
-+	return ret;
-+}
-+
- static int rk_hdptx_phy_power_on(struct phy *phy)
- {
- 	struct rk_hdptx_phy *hdptx = phy_get_drvdata(phy);
- 	int bus_width = phy_get_bus_width(hdptx->phy);
-+	int ret;
-+
- 	/*
- 	 * FIXME: Temporary workaround to pass pixel_clk_rate
- 	 * from the HDMI bridge driver until phy_configure_opts_hdmi
-@@ -871,20 +927,22 @@ static int rk_hdptx_phy_power_on(struct phy *phy)
- 	dev_dbg(hdptx->dev, "%s bus_width=%x rate=%u\n",
- 		__func__, bus_width, rate);
- 
--	return rk_hdptx_ropll_tmds_mode_config(hdptx, rate);
-+	ret = rk_hdptx_phy_consumer_get(hdptx, rate);
-+	if (ret)
-+		return ret;
-+
-+	ret = rk_hdptx_ropll_tmds_mode_config(hdptx, rate);
-+	if (ret)
-+		rk_hdptx_phy_consumer_put(hdptx, true);
-+
-+	return ret;
- }
- 
- static int rk_hdptx_phy_power_off(struct phy *phy)
- {
- 	struct rk_hdptx_phy *hdptx = phy_get_drvdata(phy);
--	u32 val;
--	int ret;
- 
--	ret = regmap_read(hdptx->grf, GRF_HDPTX_STATUS, &val);
--	if (ret == 0 && (val & HDPTX_O_PLL_LOCK_DONE))
--		rk_hdptx_phy_disable(hdptx);
--
--	return ret;
-+	return rk_hdptx_phy_consumer_put(hdptx, false);
- }
- 
- static const struct phy_ops rk_hdptx_phy_ops = {
-@@ -893,6 +951,99 @@ static const struct phy_ops rk_hdptx_phy_ops = {
- 	.owner	   = THIS_MODULE,
- };
- 
-+static struct rk_hdptx_phy *to_rk_hdptx_phy(struct clk_hw *hw)
-+{
-+	return container_of(hw, struct rk_hdptx_phy, hw);
-+}
-+
-+static int rk_hdptx_phy_clk_prepare(struct clk_hw *hw)
-+{
-+	struct rk_hdptx_phy *hdptx = to_rk_hdptx_phy(hw);
-+
-+	return rk_hdptx_phy_consumer_get(hdptx, hdptx->rate / 100);
-+}
-+
-+static void rk_hdptx_phy_clk_unprepare(struct clk_hw *hw)
-+{
-+	struct rk_hdptx_phy *hdptx = to_rk_hdptx_phy(hw);
-+
-+	rk_hdptx_phy_consumer_put(hdptx, true);
-+}
-+
-+static unsigned long rk_hdptx_phy_clk_recalc_rate(struct clk_hw *hw,
-+						  unsigned long parent_rate)
-+{
-+	struct rk_hdptx_phy *hdptx = to_rk_hdptx_phy(hw);
-+
-+	return hdptx->rate;
-+}
-+
-+static long rk_hdptx_phy_clk_round_rate(struct clk_hw *hw, unsigned long rate,
-+					unsigned long *parent_rate)
-+{
-+	u32 bit_rate = rate / 100;
-+	int i;
-+
-+	if (rate > HDMI20_MAX_RATE)
-+		return rate;
-+
-+	for (i = 0; i < ARRAY_SIZE(ropll_tmds_cfg); i++)
-+		if (bit_rate == ropll_tmds_cfg[i].bit_rate)
-+			break;
-+
-+	if (i == ARRAY_SIZE(ropll_tmds_cfg) &&
-+	    !rk_hdptx_phy_clk_pll_calc(bit_rate, NULL))
-+		return -EINVAL;
-+
-+	return rate;
-+}
-+
-+static int rk_hdptx_phy_clk_set_rate(struct clk_hw *hw, unsigned long rate,
-+				     unsigned long parent_rate)
-+{
-+	struct rk_hdptx_phy *hdptx = to_rk_hdptx_phy(hw);
-+
-+	return rk_hdptx_ropll_tmds_cmn_config(hdptx, rate / 100);
-+}
-+
-+static const struct clk_ops hdptx_phy_clk_ops = {
-+	.prepare = rk_hdptx_phy_clk_prepare,
-+	.unprepare = rk_hdptx_phy_clk_unprepare,
-+	.recalc_rate = rk_hdptx_phy_clk_recalc_rate,
-+	.round_rate = rk_hdptx_phy_clk_round_rate,
-+	.set_rate = rk_hdptx_phy_clk_set_rate,
-+};
-+
-+static int rk_hdptx_phy_clk_register(struct rk_hdptx_phy *hdptx)
-+{
-+	struct device *dev = hdptx->dev;
-+	const char *name, *pname;
-+	struct clk *refclk;
-+	int ret, id;
-+
-+	refclk = devm_clk_get(dev, "ref");
-+	if (IS_ERR(refclk))
-+		return dev_err_probe(dev, PTR_ERR(refclk),
-+				     "Failed to get ref clock\n");
-+
-+	id = of_alias_get_id(dev->of_node, "hdptxphy");
-+	name = id > 0 ? "clk_hdmiphy_pixel1" : "clk_hdmiphy_pixel0";
-+	pname = __clk_get_name(refclk);
-+
-+	hdptx->hw.init = CLK_HW_INIT(name, pname, &hdptx_phy_clk_ops,
-+				     CLK_GET_RATE_NOCACHE);
-+
-+	ret = devm_clk_hw_register(dev, &hdptx->hw);
-+	if (ret)
-+		return dev_err_probe(dev, ret, "Failed to register clock\n");
-+
-+	ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, &hdptx->hw);
-+	if (ret)
-+		return dev_err_probe(dev, ret,
-+				     "Failed to register clk provider\n");
-+	return 0;
-+}
-+
- static int rk_hdptx_phy_runtime_suspend(struct device *dev)
- {
- 	struct rk_hdptx_phy *hdptx = dev_get_drvdata(dev);
-@@ -987,7 +1138,7 @@ static int rk_hdptx_phy_probe(struct platform_device *pdev)
- 	reset_control_deassert(hdptx->rsts[RST_CMN].rstc);
- 	reset_control_deassert(hdptx->rsts[RST_INIT].rstc);
- 
--	return 0;
-+	return rk_hdptx_phy_clk_register(hdptx);
- }
- 
- static const struct dev_pm_ops rk_hdptx_phy_pm_ops = {
--- 
-Armbian
-
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0134-drm-bridge-synopsys-Add-initial-support-for-DW-HDMI-Controller.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0134-drm-bridge-synopsys-Add-initial-support-for-DW-HDMI-Controller.patch
deleted file mode 100644
index 35f16d8ba3c8..000000000000
--- a/patch/kernel/archive/rockchip-rk3588-6.12/0134-drm-bridge-synopsys-Add-initial-support-for-DW-HDMI-Controller.patch
+++ /dev/null
@@ -1,2603 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
-Date: Fri, 26 Jul 2024 02:54:52 +0300
-Subject: dt-bindings: display: bridge: Add schema for Synopsys DW HDMI QP TX
- IP
-
-Add dt-binding schema containing the common properties for the Synopsys
-DesignWare HDMI QP TX controller.
-
-Note this is not a full dt-binding specification, but is meant to be
-referenced by platform-specific bindings for this IP core.
-
-Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
----
- Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi-qp.yaml | 66 ++++++++++
- 1 file changed, 66 insertions(+)
-
-diff --git a/Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi-qp.yaml b/Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi-qp.yaml
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi-qp.yaml
-@@ -0,0 +1,66 @@
-+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/display/bridge/synopsys,dw-hdmi-qp.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Common Properties for Synopsys DesignWare HDMI QP TX Controller IP
-+
-+maintainers:
-+  - Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
-+
-+description: |
-+  This document defines device tree properties for the Synopsys DesignWare
-+  HDMI 2.1 Quad-Pixel (QP) TX controller IP core.
-+  It doesn't constitute a device tree binding specification by itself, but
-+  is meant to be referenced by platform-specific device tree bindings.
-+
-+  When referenced from platform device tree bindings, the properties defined
-+  in this document are defined as follows. The platform device tree bindings
-+  are responsible for defining whether each property is required or optional.
-+
-+properties:
-+  reg:
-+    maxItems: 1
-+
-+  clocks:
-+    minItems: 4
-+    maxItems: 6
-+    items:
-+      - description: Peripheral/APB bus clock
-+      - description: EARC RX biphase clock
-+      - description: Reference clock
-+      - description: Audio interface clock
-+    additionalItems: true
-+
-+  clock-names:
-+    minItems: 4
-+    maxItems: 6
-+    items:
-+      - const: pclk
-+      - const: earc
-+      - const: ref
-+      - const: aud
-+    additionalItems: true
-+
-+  interrupts:
-+    minItems: 4
-+    maxItems: 5
-+    items:
-+      - description: AVP Unit interrupt
-+      - description: CEC interrupt
-+      - description: eARC RX interrupt
-+      - description: Main Unit interrupt
-+    additionalItems: true
-+
-+  interrupt-names:
-+    minItems: 4
-+    maxItems: 5
-+    items:
-+      - const: avp
-+      - const: cec
-+      - const: earc
-+      - const: main
-+    additionalItems: true
-+
-+additionalProperties: true
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
-Date: Mon, 20 May 2024 14:49:50 +0300
-Subject: drm/bridge: synopsys: Add DW HDMI QP TX Controller driver
-
-The Synopsys DesignWare HDMI 2.1 Quad-Pixel (QP) TX Controller supports
-the following features, among others:
-
-* Fixed Rate Link (FRL)
-* Display Stream Compression (DSC)
-* 4K@120Hz and 8K@60Hz video modes
-* Variable Refresh Rate (VRR) including Quick Media Switching (QMS), aka
-  Cinema VRR
-* Fast Vactive (FVA), aka Quick Frame Transport (QFT)
-* SCDC I2C DDC access
-* TMDS Scrambler enabling 2160p@60Hz with RGB/YCbCr4:4:4
-* YCbCr4:2:0 enabling 2160p@60Hz at lower HDMI link speeds
-* Multi-stream audio
-* Enhanced Audio Return Channel (EARC)
-
-Add driver to enable basic support, i.e. RGB output up to 4K@60Hz,
-without audio, CEC or any HDMI 2.1 specific features.
-
-Co-developed-by: Algea Cao <algea.cao@rock-chips.com>
-Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
-Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
----
- drivers/gpu/drm/bridge/synopsys/Kconfig      |   8 +
- drivers/gpu/drm/bridge/synopsys/Makefile     |   2 +
- drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 748 +++++++++
- drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h | 834 ++++++++++
- include/drm/bridge/dw_hdmi_qp.h              |  37 +
- 5 files changed, 1629 insertions(+)
-
-diff --git a/drivers/gpu/drm/bridge/synopsys/Kconfig b/drivers/gpu/drm/bridge/synopsys/Kconfig
-index 111111111111..222222222222 100644
---- a/drivers/gpu/drm/bridge/synopsys/Kconfig
-+++ b/drivers/gpu/drm/bridge/synopsys/Kconfig
-@@ -46,6 +46,14 @@ config DRM_DW_HDMI_CEC
- 	  Support the CE interface which is part of the Synopsys
- 	  Designware HDMI block.
- 
-+config DRM_DW_HDMI_QP
-+	tristate
-+	select DRM_DISPLAY_HDMI_HELPER
-+	select DRM_DISPLAY_HDMI_STATE_HELPER
-+	select DRM_DISPLAY_HELPER
-+	select DRM_KMS_HELPER
-+	select REGMAP_MMIO
-+
- config DRM_DW_MIPI_DSI
- 	tristate
- 	select DRM_KMS_HELPER
-diff --git a/drivers/gpu/drm/bridge/synopsys/Makefile b/drivers/gpu/drm/bridge/synopsys/Makefile
-index 111111111111..222222222222 100644
---- a/drivers/gpu/drm/bridge/synopsys/Makefile
-+++ b/drivers/gpu/drm/bridge/synopsys/Makefile
-@@ -5,4 +5,6 @@ obj-$(CONFIG_DRM_DW_HDMI_GP_AUDIO) += dw-hdmi-gp-audio.o
- obj-$(CONFIG_DRM_DW_HDMI_I2S_AUDIO) += dw-hdmi-i2s-audio.o
- obj-$(CONFIG_DRM_DW_HDMI_CEC) += dw-hdmi-cec.o
- 
-+obj-$(CONFIG_DRM_DW_HDMI_QP) += dw-hdmi-qp.o
-+
- obj-$(CONFIG_DRM_DW_MIPI_DSI) += dw-mipi-dsi.o
-diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
-@@ -0,0 +1,748 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * Copyright (c) 2021-2022 Rockchip Electronics Co., Ltd.
-+ * Copyright (c) 2024 Collabora Ltd.
-+ *
-+ * Author: Algea Cao <algea.cao@rock-chips.com>
-+ * Author: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
-+ */
-+#include <linux/clk.h>
-+#include <linux/completion.h>
-+#include <linux/hdmi.h>
-+#include <linux/i2c.h>
-+#include <linux/irq.h>
-+#include <linux/module.h>
-+#include <linux/mutex.h>
-+#include <linux/of.h>
-+
-+#include <drm/bridge/dw_hdmi_qp.h>
-+#include <drm/display/drm_hdmi_state_helper.h>
-+#include <drm/display/drm_scdc_helper.h>
-+
-+#include <drm/drm_atomic.h>
-+#include <drm/drm_atomic_helper.h>
-+#include <drm/drm_bridge.h>
-+#include <drm/drm_connector.h>
-+#include <drm/drm_edid.h>
-+
-+#include <sound/hdmi-codec.h>
-+
-+#include "dw-hdmi-qp.h"
-+
-+#define DDC_CI_ADDR		0x37
-+#define DDC_SEGMENT_ADDR	0x30
-+
-+#define SCDC_MIN_SOURCE_VERSION	0x1
-+
-+#define HDMI14_MAX_TMDSCLK	340000000
-+
-+struct dw_hdmi_qp_i2c {
-+	struct i2c_adapter	adap;
-+
-+	struct mutex		lock;	/* used to serialize data transfers */
-+	struct completion	cmp;
-+	u8			stat;
-+
-+	u8			slave_reg;
-+	bool			is_regaddr;
-+	bool			is_segment;
-+};
-+
-+struct dw_hdmi_qp {
-+	struct drm_bridge bridge;
-+
-+	struct device *dev;
-+	struct dw_hdmi_qp_i2c *i2c;
-+
-+	struct {
-+		const struct dw_hdmi_qp_phy_ops *ops;
-+		void *data;
-+	} phy;
-+
-+	struct clk *ref_clk;
-+
-+	struct drm_connector *curr_conn;
-+	unsigned long long pix_clock;
-+
-+	struct regmap *regm;
-+};
-+
-+/* Filter out invalid setups to avoid configuring SCDC and scrambling */
-+static bool dw_hdmi_qp_support_scdc(struct dw_hdmi_qp *hdmi,
-+				    const struct drm_display_info *display)
-+{
-+	/* Disable if no DDC bus */
-+	if (!hdmi->bridge.ddc)
-+		return false;
-+
-+	/* Disable if SCDC is not supported, or if an HF-VSDB block is absent */
-+	if (!display->hdmi.scdc.supported ||
-+	    !display->hdmi.scdc.scrambling.supported)
-+		return false;
-+
-+	/*
-+	 * Disable if display only support low TMDS rates and scrambling
-+	 * for low rates is not supported either
-+	 */
-+	if (!display->hdmi.scdc.scrambling.low_rates &&
-+	    display->max_tmds_clock <= 340000)
-+		return false;
-+
-+	return true;
-+}
-+
-+int dw_hdmi_qp_set_refclk_rate(struct dw_hdmi_qp *hdmi, unsigned long rate)
-+{
-+	return clk_set_rate(hdmi->ref_clk, rate);
-+}
-+EXPORT_SYMBOL_GPL(dw_hdmi_qp_set_refclk_rate);
-+
-+/*
-+ * HDMI2.0 Specifies the following procedure for High TMDS Bit Rates:
-+ * - The Source shall suspend transmission of the TMDS clock and data
-+ *
-+ * - The Source shall write to the TMDS_Bit_Clock_Ratio bit to change it
-+ *   from a 0 to a 1 or from a 1 to a 0
-+ *
-+ * - The Source shall allow a minimum of 1 ms and a maximum of 100 ms from
-+ *   the time the TMDS_Bit_Clock_Ratio bit is written until resuming
-+ *   transmission of TMDS clock and data
-+ *
-+ * To respect the 100ms max delay, the dw_hdmi_qp_set_high_tmds_clock_ratio()
-+ * helper should be called right before enabling the TMDS Clock and Data in
-+ * the PHY configuration callback.
-+ */
-+void dw_hdmi_qp_set_high_tmds_clock_ratio(struct dw_hdmi_qp *hdmi,
-+					  const struct drm_display_info *display)
-+{
-+	bool set;
-+
-+	if (hdmi->curr_conn && dw_hdmi_qp_support_scdc(hdmi, display)) {
-+		set = (hdmi->pix_clock > HDMI14_MAX_TMDSCLK);
-+		drm_scdc_set_high_tmds_clock_ratio(hdmi->curr_conn, set);
-+	}
-+}
-+EXPORT_SYMBOL_GPL(dw_hdmi_qp_set_high_tmds_clock_ratio);
-+
-+static void dw_hdmi_qp_write(struct dw_hdmi_qp *hdmi, unsigned int val,
-+			     int offset)
-+{
-+	regmap_write(hdmi->regm, offset, val);
-+}
-+
-+static unsigned int dw_hdmi_qp_read(struct dw_hdmi_qp *hdmi, int offset)
-+{
-+	unsigned int val = 0;
-+
-+	regmap_read(hdmi->regm, offset, &val);
-+
-+	return val;
-+}
-+
-+static void dw_hdmi_qp_mod(struct dw_hdmi_qp *hdmi, unsigned int data,
-+			   unsigned int mask, unsigned int reg)
-+{
-+	regmap_update_bits(hdmi->regm, reg, mask, data);
-+}
-+
-+static int dw_hdmi_qp_i2c_read(struct dw_hdmi_qp *hdmi,
-+			       unsigned char *buf, unsigned int length)
-+{
-+	struct dw_hdmi_qp_i2c *i2c = hdmi->i2c;
-+	int stat;
-+
-+	if (!i2c->is_regaddr) {
-+		dev_dbg(hdmi->dev, "set read register address to 0\n");
-+		i2c->slave_reg = 0x00;
-+		i2c->is_regaddr = true;
-+	}
-+
-+	while (length--) {
-+		reinit_completion(&i2c->cmp);
-+
-+		dw_hdmi_qp_mod(hdmi, i2c->slave_reg++ << 12, I2CM_ADDR,
-+			       I2CM_INTERFACE_CONTROL0);
-+
-+		if (i2c->is_segment)
-+			dw_hdmi_qp_mod(hdmi, I2CM_EXT_READ, I2CM_WR_MASK,
-+				       I2CM_INTERFACE_CONTROL0);
-+		else
-+			dw_hdmi_qp_mod(hdmi, I2CM_FM_READ, I2CM_WR_MASK,
-+				       I2CM_INTERFACE_CONTROL0);
-+
-+		stat = wait_for_completion_timeout(&i2c->cmp, HZ / 10);
-+		if (!stat) {
-+			dev_err(hdmi->dev, "i2c read timed out\n");
-+			dw_hdmi_qp_write(hdmi, 0x01, I2CM_CONTROL0);
-+			return -EAGAIN;
-+		}
-+
-+		/* Check for error condition on the bus */
-+		if (i2c->stat & I2CM_NACK_RCVD_IRQ) {
-+			dev_err(hdmi->dev, "i2c read error\n");
-+			dw_hdmi_qp_write(hdmi, 0x01, I2CM_CONTROL0);
-+			return -EIO;
-+		}
-+
-+		*buf++ = dw_hdmi_qp_read(hdmi, I2CM_INTERFACE_RDDATA_0_3) & 0xff;
-+		dw_hdmi_qp_mod(hdmi, 0, I2CM_WR_MASK, I2CM_INTERFACE_CONTROL0);
-+	}
-+
-+	i2c->is_segment = false;
-+
-+	return 0;
-+}
-+
-+static int dw_hdmi_qp_i2c_write(struct dw_hdmi_qp *hdmi,
-+				unsigned char *buf, unsigned int length)
-+{
-+	struct dw_hdmi_qp_i2c *i2c = hdmi->i2c;
-+	int stat;
-+
-+	if (!i2c->is_regaddr) {
-+		/* Use the first write byte as register address */
-+		i2c->slave_reg = buf[0];
-+		length--;
-+		buf++;
-+		i2c->is_regaddr = true;
-+	}
-+
-+	while (length--) {
-+		reinit_completion(&i2c->cmp);
-+
-+		dw_hdmi_qp_write(hdmi, *buf++, I2CM_INTERFACE_WRDATA_0_3);
-+		dw_hdmi_qp_mod(hdmi, i2c->slave_reg++ << 12, I2CM_ADDR,
-+			       I2CM_INTERFACE_CONTROL0);
-+		dw_hdmi_qp_mod(hdmi, I2CM_FM_WRITE, I2CM_WR_MASK,
-+			       I2CM_INTERFACE_CONTROL0);
-+
-+		stat = wait_for_completion_timeout(&i2c->cmp, HZ / 10);
-+		if (!stat) {
-+			dev_err(hdmi->dev, "i2c write time out!\n");
-+			dw_hdmi_qp_write(hdmi, 0x01, I2CM_CONTROL0);
-+			return -EAGAIN;
-+		}
-+
-+		/* Check for error condition on the bus */
-+		if (i2c->stat & I2CM_NACK_RCVD_IRQ) {
-+			dev_err(hdmi->dev, "i2c write nack!\n");
-+			dw_hdmi_qp_write(hdmi, 0x01, I2CM_CONTROL0);
-+			return -EIO;
-+		}
-+
-+		dw_hdmi_qp_mod(hdmi, 0, I2CM_WR_MASK, I2CM_INTERFACE_CONTROL0);
-+	}
-+
-+	return 0;
-+}
-+
-+static int dw_hdmi_qp_i2c_xfer(struct i2c_adapter *adap,
-+			       struct i2c_msg *msgs, int num)
-+{
-+	struct dw_hdmi_qp *hdmi = i2c_get_adapdata(adap);
-+	struct dw_hdmi_qp_i2c *i2c = hdmi->i2c;
-+	u8 addr = msgs[0].addr;
-+	int i, ret = 0;
-+
-+	if (addr == DDC_CI_ADDR)
-+		/*
-+		 * The internal I2C controller does not support the multi-byte
-+		 * read and write operations needed for DDC/CI.
-+		 * FIXME: Blacklist the DDC/CI address until we filter out
-+		 * unsupported I2C operations.
-+		 */
-+		return -EOPNOTSUPP;
-+
-+	for (i = 0; i < num; i++) {
-+		if (msgs[i].len == 0) {
-+			dev_err(hdmi->dev,
-+				"unsupported transfer %d/%d, no data\n",
-+				i + 1, num);
-+			return -EOPNOTSUPP;
-+		}
-+	}
-+
-+	mutex_lock(&i2c->lock);
-+
-+	/* Unmute DONE and ERROR interrupts */
-+	dw_hdmi_qp_mod(hdmi, I2CM_NACK_RCVD_MASK_N | I2CM_OP_DONE_MASK_N,
-+		       I2CM_NACK_RCVD_MASK_N | I2CM_OP_DONE_MASK_N,
-+		       MAINUNIT_1_INT_MASK_N);
-+
-+	/* Set slave device address taken from the first I2C message */
-+	if (addr == DDC_SEGMENT_ADDR && msgs[0].len == 1)
-+		addr = DDC_ADDR;
-+
-+	dw_hdmi_qp_mod(hdmi, addr << 5, I2CM_SLVADDR, I2CM_INTERFACE_CONTROL0);
-+
-+	/* Set slave device register address on transfer */
-+	i2c->is_regaddr = false;
-+
-+	/* Set segment pointer for I2C extended read mode operation */
-+	i2c->is_segment = false;
-+
-+	for (i = 0; i < num; i++) {
-+		if (msgs[i].addr == DDC_SEGMENT_ADDR && msgs[i].len == 1) {
-+			i2c->is_segment = true;
-+			dw_hdmi_qp_mod(hdmi, DDC_SEGMENT_ADDR, I2CM_SEG_ADDR,
-+				       I2CM_INTERFACE_CONTROL1);
-+			dw_hdmi_qp_mod(hdmi, *msgs[i].buf << 7, I2CM_SEG_PTR,
-+				       I2CM_INTERFACE_CONTROL1);
-+		} else {
-+			if (msgs[i].flags & I2C_M_RD)
-+				ret = dw_hdmi_qp_i2c_read(hdmi, msgs[i].buf,
-+							  msgs[i].len);
-+			else
-+				ret = dw_hdmi_qp_i2c_write(hdmi, msgs[i].buf,
-+							   msgs[i].len);
-+		}
-+		if (ret < 0)
-+			break;
-+	}
-+
-+	if (!ret)
-+		ret = num;
-+
-+	/* Mute DONE and ERROR interrupts */
-+	dw_hdmi_qp_mod(hdmi, 0, I2CM_OP_DONE_MASK_N | I2CM_NACK_RCVD_MASK_N,
-+		       MAINUNIT_1_INT_MASK_N);
-+
-+	mutex_unlock(&i2c->lock);
-+
-+	return ret;
-+}
-+
-+static u32 dw_hdmi_qp_i2c_func(struct i2c_adapter *adapter)
-+{
-+	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
-+}
-+
-+static const struct i2c_algorithm dw_hdmi_qp_algorithm = {
-+	.master_xfer	= dw_hdmi_qp_i2c_xfer,
-+	.functionality	= dw_hdmi_qp_i2c_func,
-+};
-+
-+static struct i2c_adapter *dw_hdmi_qp_i2c_adapter(struct dw_hdmi_qp *hdmi)
-+{
-+	struct dw_hdmi_qp_i2c *i2c;
-+	struct i2c_adapter *adap;
-+	int ret;
-+
-+	i2c = devm_kzalloc(hdmi->dev, sizeof(*i2c), GFP_KERNEL);
-+	if (!i2c)
-+		return ERR_PTR(-ENOMEM);
-+
-+	mutex_init(&i2c->lock);
-+	init_completion(&i2c->cmp);
-+
-+	adap = &i2c->adap;
-+	adap->owner = THIS_MODULE;
-+	adap->dev.parent = hdmi->dev;
-+	adap->algo = &dw_hdmi_qp_algorithm;
-+	strscpy(adap->name, "DesignWare HDMI QP", sizeof(adap->name));
-+
-+	i2c_set_adapdata(adap, hdmi);
-+
-+	ret = devm_i2c_add_adapter(hdmi->dev, adap);
-+	if (ret) {
-+		dev_warn(hdmi->dev, "cannot add %s I2C adapter\n", adap->name);
-+		devm_kfree(hdmi->dev, i2c);
-+		return ERR_PTR(ret);
-+	}
-+
-+	hdmi->i2c = i2c;
-+	dev_info(hdmi->dev, "registered %s I2C bus driver\n", adap->name);
-+
-+	return adap;
-+}
-+
-+static int dw_hdmi_qp_config_avi_infoframe(struct dw_hdmi_qp *hdmi,
-+					   const u8 *buffer, size_t len)
-+{
-+	u32 val, i, j;
-+
-+	if (len != HDMI_INFOFRAME_SIZE(AVI)) {
-+		dev_err(hdmi->dev, "failed to configure avi infoframe\n");
-+		return -EINVAL;
-+	}
-+
-+	/*
-+	 * DW HDMI QP IP uses a different byte format from standard AVI info
-+	 * frames, though generally the bits are in the correct bytes.
-+	 */
-+	val = buffer[1] << 8 | buffer[2] << 16;
-+	dw_hdmi_qp_write(hdmi, val, PKT_AVI_CONTENTS0);
-+
-+	for (i = 0; i < 4; i++) {
-+		for (j = 0; j < 4; j++) {
-+			if (i * 4 + j >= 14)
-+				break;
-+			if (!j)
-+				val = buffer[i * 4 + j + 3];
-+			val |= buffer[i * 4 + j + 3] << (8 * j);
-+		}
-+
-+		dw_hdmi_qp_write(hdmi, val, PKT_AVI_CONTENTS1 + i * 4);
-+	}
-+
-+	dw_hdmi_qp_mod(hdmi, 0, PKTSCHED_AVI_FIELDRATE, PKTSCHED_PKT_CONFIG1);
-+
-+	dw_hdmi_qp_mod(hdmi, PKTSCHED_AVI_TX_EN | PKTSCHED_GCP_TX_EN,
-+		       PKTSCHED_AVI_TX_EN | PKTSCHED_GCP_TX_EN, PKTSCHED_PKT_EN);
-+
-+	return 0;
-+}
-+
-+static int dw_hdmi_qp_config_drm_infoframe(struct dw_hdmi_qp *hdmi,
-+					   const u8 *buffer, size_t len)
-+{
-+	u32 val, i;
-+
-+	if (len != HDMI_INFOFRAME_SIZE(DRM)) {
-+		dev_err(hdmi->dev, "failed to configure drm infoframe\n");
-+		return -EINVAL;
-+	}
-+
-+	dw_hdmi_qp_mod(hdmi, 0, PKTSCHED_DRMI_TX_EN, PKTSCHED_PKT_EN);
-+
-+	val = buffer[1] << 8 | buffer[2] << 16;
-+	dw_hdmi_qp_write(hdmi, val, PKT_DRMI_CONTENTS0);
-+
-+	for (i = 0; i <= buffer[2]; i++) {
-+		if (i % 4 == 0)
-+			val = buffer[3 + i];
-+		val |= buffer[3 + i] << ((i % 4) * 8);
-+
-+		if ((i % 4 == 3) || i == buffer[2])
-+			dw_hdmi_qp_write(hdmi, val,
-+					 PKT_DRMI_CONTENTS1 + ((i / 4) * 4));
-+	}
-+
-+	dw_hdmi_qp_mod(hdmi, 0, PKTSCHED_DRMI_FIELDRATE, PKTSCHED_PKT_CONFIG1);
-+	dw_hdmi_qp_mod(hdmi, PKTSCHED_DRMI_TX_EN, PKTSCHED_DRMI_TX_EN,
-+		       PKTSCHED_PKT_EN);
-+
-+	return 0;
-+}
-+
-+static void dw_hdmi_qp_setup(struct dw_hdmi_qp *hdmi,
-+			     struct drm_connector *connector)
-+{
-+	bool scramb;
-+	u8 ver;
-+
-+	if (!connector->display_info.is_hdmi) {
-+		dev_dbg(hdmi->dev, "%s DVI mode\n", __func__);
-+
-+		dw_hdmi_qp_mod(hdmi, HDCP2_BYPASS, HDCP2_BYPASS,
-+			       HDCP2LOGIC_CONFIG0);
-+		dw_hdmi_qp_mod(hdmi, OPMODE_DVI, OPMODE_DVI, LINK_CONFIG0);
-+
-+		return;
-+	}
-+
-+	dev_dbg(hdmi->dev, "%s HDMI mode\n", __func__);
-+
-+	dw_hdmi_qp_mod(hdmi, 0, OPMODE_DVI, LINK_CONFIG0);
-+	dw_hdmi_qp_mod(hdmi, HDCP2_BYPASS, HDCP2_BYPASS, HDCP2LOGIC_CONFIG0);
-+
-+	scramb = (hdmi->pix_clock > HDMI14_MAX_TMDSCLK);
-+
-+	if (dw_hdmi_qp_support_scdc(hdmi, &connector->display_info)) {
-+		if (scramb) {
-+			drm_scdc_readb(hdmi->bridge.ddc, SCDC_SINK_VERSION, &ver);
-+			drm_scdc_writeb(hdmi->bridge.ddc, SCDC_SOURCE_VERSION,
-+					min_t(u8, ver, SCDC_MIN_SOURCE_VERSION));
-+		}
-+
-+		drm_scdc_set_high_tmds_clock_ratio(connector, scramb);
-+		drm_scdc_set_scrambling(connector, scramb);
-+	}
-+
-+	dw_hdmi_qp_write(hdmi, scramb, SCRAMB_CONFIG0);
-+}
-+
-+static int dw_hdmi_qp_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)
-+{
-+	struct dw_hdmi_qp *hdmi = bridge->driver_private;
-+	int ret;
-+
-+	ret = drm_atomic_helper_connector_hdmi_check(conn_state->connector,
-+						     conn_state->state);
-+	if (ret)
-+		dev_dbg(hdmi->dev, "%s failed: %d\n", __func__, ret);
-+
-+	return ret;
-+}
-+
-+static void dw_hdmi_qp_bridge_atomic_enable(struct drm_bridge *bridge,
-+					    struct drm_bridge_state *old_state)
-+{
-+	struct dw_hdmi_qp *hdmi = bridge->driver_private;
-+	struct drm_atomic_state *state = old_state->base.state;
-+	struct drm_connector *connector;
-+	struct drm_connector_state *conn_state;
-+
-+	connector = drm_atomic_get_new_connector_for_encoder(state,
-+							     bridge->encoder);
-+	conn_state = drm_atomic_get_new_connector_state(state, connector);
-+
-+	hdmi->pix_clock = conn_state->hdmi.tmds_char_rate;
-+	hdmi->curr_conn = connector;
-+
-+	hdmi->phy.ops->init(hdmi, hdmi->phy.data, &connector->display_info);
-+
-+	dw_hdmi_qp_setup(hdmi, connector);
-+
-+	drm_atomic_helper_connector_hdmi_update_infoframes(connector, state);
-+}
-+
-+static void dw_hdmi_qp_bridge_atomic_disable(struct drm_bridge *bridge,
-+					     struct drm_bridge_state *old_state)
-+{
-+	struct dw_hdmi_qp *hdmi = bridge->driver_private;
-+
-+	hdmi->curr_conn = NULL;
-+	hdmi->phy.ops->disable(hdmi, hdmi->phy.data);
-+}
-+
-+static enum drm_connector_status
-+dw_hdmi_qp_bridge_detect(struct drm_bridge *bridge)
-+{
-+	struct dw_hdmi_qp *hdmi = bridge->driver_private;
-+
-+	return hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data);
-+}
-+
-+static const struct drm_edid *
-+dw_hdmi_qp_bridge_edid_read(struct drm_bridge *bridge,
-+			    struct drm_connector *connector)
-+{
-+	struct dw_hdmi_qp *hdmi = bridge->driver_private;
-+	const struct drm_edid *drm_edid;
-+
-+	if (!bridge->ddc)
-+		return NULL;
-+
-+	drm_edid = drm_edid_read_ddc(connector, bridge->ddc);
-+	if (!drm_edid)
-+		dev_dbg(hdmi->dev, "failed to get edid\n");
-+
-+	return drm_edid;
-+}
-+
-+static int dw_hdmi_qp_bridge_clear_infoframe(struct drm_bridge *bridge,
-+					     enum hdmi_infoframe_type type)
-+{
-+	struct dw_hdmi_qp *hdmi = bridge->driver_private;
-+
-+	switch (type) {
-+	case HDMI_INFOFRAME_TYPE_AVI:
-+		dw_hdmi_qp_mod(hdmi, 0, PKTSCHED_AVI_TX_EN | PKTSCHED_GCP_TX_EN,
-+			       PKTSCHED_PKT_EN);
-+		break;
-+
-+	case HDMI_INFOFRAME_TYPE_DRM:
-+		dw_hdmi_qp_mod(hdmi, 0, PKTSCHED_DRMI_TX_EN, PKTSCHED_PKT_EN);
-+		break;
-+
-+	default:
-+		dev_dbg(hdmi->dev, "Unsupported infoframe type %x\n", type);
-+	}
-+
-+	return 0;
-+}
-+
-+static int dw_hdmi_qp_bridge_write_infoframe(struct drm_bridge *bridge,
-+					     enum hdmi_infoframe_type type,
-+					     const u8 *buffer, size_t len)
-+{
-+	struct dw_hdmi_qp *hdmi = bridge->driver_private;
-+
-+	dw_hdmi_qp_bridge_clear_infoframe(bridge, type);
-+
-+	switch (type) {
-+	case HDMI_INFOFRAME_TYPE_AVI:
-+		return dw_hdmi_qp_config_avi_infoframe(hdmi, buffer, len);
-+
-+	case HDMI_INFOFRAME_TYPE_DRM:
-+		return dw_hdmi_qp_config_drm_infoframe(hdmi, buffer, len);
-+
-+	default:
-+		dev_dbg(hdmi->dev, "Unsupported infoframe type %x\n", type);
-+		return 0;
-+	}
-+}
-+
-+static const struct drm_bridge_funcs dw_hdmi_qp_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,
-+	.atomic_check = dw_hdmi_qp_bridge_atomic_check,
-+	.atomic_enable = dw_hdmi_qp_bridge_atomic_enable,
-+	.atomic_disable = dw_hdmi_qp_bridge_atomic_disable,
-+	.detect = dw_hdmi_qp_bridge_detect,
-+	.edid_read = dw_hdmi_qp_bridge_edid_read,
-+	.hdmi_clear_infoframe = dw_hdmi_qp_bridge_clear_infoframe,
-+	.hdmi_write_infoframe = dw_hdmi_qp_bridge_write_infoframe,
-+};
-+
-+static irqreturn_t dw_hdmi_qp_main_hardirq(int irq, void *dev_id)
-+{
-+	struct dw_hdmi_qp *hdmi = dev_id;
-+	struct dw_hdmi_qp_i2c *i2c = hdmi->i2c;
-+	u32 stat;
-+
-+	stat = dw_hdmi_qp_read(hdmi, MAINUNIT_1_INT_STATUS);
-+
-+	i2c->stat = stat & (I2CM_OP_DONE_IRQ | I2CM_READ_REQUEST_IRQ |
-+			    I2CM_NACK_RCVD_IRQ);
-+
-+	if (i2c->stat) {
-+		dw_hdmi_qp_write(hdmi, i2c->stat, MAINUNIT_1_INT_CLEAR);
-+		complete(&i2c->cmp);
-+	}
-+
-+	if (stat)
-+		return IRQ_HANDLED;
-+
-+	return IRQ_NONE;
-+}
-+
-+static const struct regmap_config dw_hdmi_qp_regmap_config = {
-+	.reg_bits	= 32,
-+	.val_bits	= 32,
-+	.reg_stride	= 4,
-+	.max_register	= EARCRX_1_INT_FORCE,
-+};
-+
-+static void dw_hdmi_qp_init_hw(struct dw_hdmi_qp *hdmi)
-+{
-+	dw_hdmi_qp_write(hdmi, 0, MAINUNIT_0_INT_MASK_N);
-+	dw_hdmi_qp_write(hdmi, 0, MAINUNIT_1_INT_MASK_N);
-+	dw_hdmi_qp_write(hdmi, 428571429, TIMER_BASE_CONFIG0);
-+
-+	/* Software reset */
-+	dw_hdmi_qp_write(hdmi, 0x01, I2CM_CONTROL0);
-+
-+	dw_hdmi_qp_write(hdmi, 0x085c085c, I2CM_FM_SCL_CONFIG0);
-+
-+	dw_hdmi_qp_mod(hdmi, 0, I2CM_FM_EN, I2CM_INTERFACE_CONTROL0);
-+
-+	/* Clear DONE and ERROR interrupts */
-+	dw_hdmi_qp_write(hdmi, I2CM_OP_DONE_CLEAR | I2CM_NACK_RCVD_CLEAR,
-+			 MAINUNIT_1_INT_CLEAR);
-+
-+	if (hdmi->phy.ops->setup_hpd)
-+		hdmi->phy.ops->setup_hpd(hdmi, hdmi->phy.data);
-+}
-+
-+struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev,
-+				   struct drm_encoder *encoder,
-+				   const struct dw_hdmi_qp_plat_data *plat_data)
-+{
-+	static const char * const clk_names[] = {
-+		"pclk", "earc", "aud", "ref" /* keep "ref" last */
-+	};
-+	struct device *dev = &pdev->dev;
-+	struct dw_hdmi_qp *hdmi;
-+	void __iomem *regs;
-+	struct clk *clk;
-+	int irq, ret, i;
-+
-+	if (!plat_data->phy_ops || !plat_data->phy_ops->init ||
-+	    !plat_data->phy_ops->disable || !plat_data->phy_ops->read_hpd) {
-+		dev_err(dev, "Missing platform PHY ops\n");
-+		return ERR_PTR(-ENODEV);
-+	}
-+
-+	hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL);
-+	if (!hdmi)
-+		return ERR_PTR(-ENOMEM);
-+
-+	hdmi->dev = dev;
-+
-+	regs = devm_platform_ioremap_resource(pdev, 0);
-+	if (IS_ERR(regs))
-+		return regs;
-+
-+	hdmi->regm = devm_regmap_init_mmio(dev, regs, &dw_hdmi_qp_regmap_config);
-+	if (IS_ERR(hdmi->regm)) {
-+		dev_err(dev, "Failed to configure regmap\n");
-+		return ERR_CAST(hdmi->regm);
-+	}
-+
-+	for (i = 0; i < ARRAY_SIZE(clk_names); i++) {
-+		clk = devm_clk_get_enabled(hdmi->dev, clk_names[i]);
-+
-+		if (IS_ERR(clk)) {
-+			if (PTR_ERR(clk) != -EPROBE_DEFER)
-+				dev_err(dev, "Failed to get %s clock\n",
-+					clk_names[i]);
-+			return ERR_CAST(clk);
-+		}
-+	}
-+	hdmi->ref_clk = clk;
-+
-+	hdmi->phy.ops = plat_data->phy_ops;
-+	hdmi->phy.data = plat_data->phy_data;
-+
-+	dw_hdmi_qp_init_hw(hdmi);
-+
-+	irq = platform_get_irq_byname(pdev, "main");
-+	if (irq < 0)
-+		return ERR_PTR(irq);
-+
-+	ret = devm_request_threaded_irq(dev, irq,
-+					dw_hdmi_qp_main_hardirq, NULL,
-+					IRQF_SHARED, dev_name(dev), hdmi);
-+	if (ret)
-+		return ERR_PTR(ret);
-+
-+	hdmi->bridge.driver_private = hdmi;
-+	hdmi->bridge.funcs = &dw_hdmi_qp_bridge_funcs;
-+	hdmi->bridge.ops = DRM_BRIDGE_OP_DETECT |
-+			   DRM_BRIDGE_OP_EDID |
-+			   DRM_BRIDGE_OP_HDMI |
-+			   DRM_BRIDGE_OP_HPD;
-+	hdmi->bridge.of_node = pdev->dev.of_node;
-+	hdmi->bridge.type = DRM_MODE_CONNECTOR_HDMIA;
-+	hdmi->bridge.vendor = "Synopsys";
-+	hdmi->bridge.product = "DW HDMI QP TX";
-+
-+	hdmi->bridge.ddc = dw_hdmi_qp_i2c_adapter(hdmi);
-+	if (IS_ERR(hdmi->bridge.ddc))
-+		hdmi->bridge.ddc = NULL;
-+
-+	ret = devm_drm_bridge_add(dev, &hdmi->bridge);
-+	if (ret)
-+		return ERR_PTR(ret);
-+
-+	ret = drm_bridge_attach(encoder, &hdmi->bridge, NULL,
-+				DRM_BRIDGE_ATTACH_NO_CONNECTOR);
-+	if (ret)
-+		return ERR_PTR(ret);
-+
-+	return hdmi;
-+}
-+EXPORT_SYMBOL_GPL(dw_hdmi_qp_bind);
-+
-+void dw_hdmi_qp_unbind(struct dw_hdmi_qp *hdmi)
-+{
-+}
-+EXPORT_SYMBOL_GPL(dw_hdmi_qp_unbind);
-+
-+void dw_hdmi_qp_resume(struct device *dev, struct dw_hdmi_qp *hdmi)
-+{
-+	dw_hdmi_qp_init_hw(hdmi);
-+}
-+EXPORT_SYMBOL_GPL(dw_hdmi_qp_resume);
-+
-+MODULE_AUTHOR("Algea Cao <algea.cao@rock-chips.com>");
-+MODULE_AUTHOR("Cristian Ciocaltea <cristian.ciocaltea@collabora.com>");
-+MODULE_DESCRIPTION("DW HDMI QP transmitter driver");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:dw-hdmi-qp");
-diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h
-@@ -0,0 +1,834 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Copyright (C) Rockchip Electronics Co.Ltd
-+ * Author:
-+ *      Algea Cao <algea.cao@rock-chips.com>
-+ */
-+#ifndef __DW_HDMI_QP_H__
-+#define __DW_HDMI_QP_H__
-+
-+#include <linux/bits.h>
-+
-+/* Main Unit Registers */
-+#define CORE_ID						0x0
-+#define VER_NUMBER					0x4
-+#define VER_TYPE					0x8
-+#define CONFIG_REG					0xc
-+#define CONFIG_CEC					BIT(28)
-+#define CONFIG_AUD_UD					BIT(23)
-+#define CORE_TIMESTAMP_HHMM				0x14
-+#define CORE_TIMESTAMP_MMDD				0x18
-+#define CORE_TIMESTAMP_YYYY				0x1c
-+/* Reset Manager Registers */
-+#define GLOBAL_SWRESET_REQUEST				0x40
-+#define EARCRX_CMDC_SWINIT_P				BIT(27)
-+#define AVP_DATAPATH_PACKET_AUDIO_SWINIT_P		BIT(10)
-+#define GLOBAL_SWDISABLE				0x44
-+#define CEC_SWDISABLE					BIT(17)
-+#define AVP_DATAPATH_PACKET_AUDIO_SWDISABLE		BIT(10)
-+#define AVP_DATAPATH_VIDEO_SWDISABLE			BIT(6)
-+#define RESET_MANAGER_CONFIG0				0x48
-+#define RESET_MANAGER_STATUS0				0x50
-+#define RESET_MANAGER_STATUS1				0x54
-+#define RESET_MANAGER_STATUS2				0x58
-+/* Timer Base Registers */
-+#define TIMER_BASE_CONFIG0				0x80
-+#define TIMER_BASE_STATUS0				0x84
-+/* CMU Registers */
-+#define CMU_CONFIG0					0xa0
-+#define CMU_CONFIG1					0xa4
-+#define CMU_CONFIG2					0xa8
-+#define CMU_CONFIG3					0xac
-+#define CMU_STATUS					0xb0
-+#define DISPLAY_CLK_MONITOR				0x3f
-+#define DISPLAY_CLK_LOCKED				0X15
-+#define EARC_BPCLK_OFF					BIT(9)
-+#define AUDCLK_OFF					BIT(7)
-+#define LINKQPCLK_OFF					BIT(5)
-+#define VIDQPCLK_OFF					BIT(3)
-+#define IPI_CLK_OFF					BIT(1)
-+#define CMU_IPI_CLK_FREQ				0xb4
-+#define CMU_VIDQPCLK_FREQ				0xb8
-+#define CMU_LINKQPCLK_FREQ				0xbc
-+#define CMU_AUDQPCLK_FREQ				0xc0
-+#define CMU_EARC_BPCLK_FREQ				0xc4
-+/* I2CM Registers */
-+#define I2CM_SM_SCL_CONFIG0				0xe0
-+#define I2CM_FM_SCL_CONFIG0				0xe4
-+#define I2CM_CONFIG0					0xe8
-+#define I2CM_CONTROL0					0xec
-+#define I2CM_STATUS0					0xf0
-+#define I2CM_INTERFACE_CONTROL0				0xf4
-+#define I2CM_ADDR					0xff000
-+#define I2CM_SLVADDR					0xfe0
-+#define I2CM_WR_MASK					0x1e
-+#define I2CM_EXT_READ					BIT(4)
-+#define I2CM_SHORT_READ					BIT(3)
-+#define I2CM_FM_READ					BIT(2)
-+#define I2CM_FM_WRITE					BIT(1)
-+#define I2CM_FM_EN					BIT(0)
-+#define I2CM_INTERFACE_CONTROL1				0xf8
-+#define I2CM_SEG_PTR					0x7f80
-+#define I2CM_SEG_ADDR					0x7f
-+#define I2CM_INTERFACE_WRDATA_0_3			0xfc
-+#define I2CM_INTERFACE_WRDATA_4_7			0x100
-+#define I2CM_INTERFACE_WRDATA_8_11			0x104
-+#define I2CM_INTERFACE_WRDATA_12_15			0x108
-+#define I2CM_INTERFACE_RDDATA_0_3			0x10c
-+#define I2CM_INTERFACE_RDDATA_4_7			0x110
-+#define I2CM_INTERFACE_RDDATA_8_11			0x114
-+#define I2CM_INTERFACE_RDDATA_12_15			0x118
-+/* SCDC Registers */
-+#define SCDC_CONFIG0					0x140
-+#define SCDC_I2C_FM_EN					BIT(12)
-+#define SCDC_UPD_FLAGS_AUTO_CLR				BIT(6)
-+#define SCDC_UPD_FLAGS_POLL_EN				BIT(4)
-+#define SCDC_CONTROL0					0x148
-+#define SCDC_STATUS0					0x150
-+#define STATUS_UPDATE					BIT(0)
-+#define FRL_START					BIT(4)
-+#define FLT_UPDATE					BIT(5)
-+/* FLT Registers */
-+#define FLT_CONFIG0					0x160
-+#define FLT_CONFIG1					0x164
-+#define FLT_CONFIG2					0x168
-+#define FLT_CONTROL0					0x170
-+/*  Main Unit 2 Registers */
-+#define MAINUNIT_STATUS0				0x180
-+/* Video Interface Registers */
-+#define VIDEO_INTERFACE_CONFIG0				0x800
-+#define VIDEO_INTERFACE_CONFIG1				0x804
-+#define VIDEO_INTERFACE_CONFIG2				0x808
-+#define VIDEO_INTERFACE_CONTROL0			0x80c
-+#define VIDEO_INTERFACE_STATUS0				0x814
-+/* Video Packing Registers */
-+#define VIDEO_PACKING_CONFIG0				0x81c
-+/* Audio Interface Registers */
-+#define AUDIO_INTERFACE_CONFIG0				0x820
-+#define AUD_IF_SEL_MSK					0x3
-+#define AUD_IF_SPDIF					0x2
-+#define AUD_IF_I2S					0x1
-+#define AUD_IF_PAI					0x0
-+#define AUD_FIFO_INIT_ON_OVF_MSK			BIT(2)
-+#define AUD_FIFO_INIT_ON_OVF_EN				BIT(2)
-+#define I2S_LINES_EN_MSK				GENMASK(7, 4)
-+#define I2S_LINES_EN(x)					BIT((x) + 4)
-+#define I2S_BPCUV_RCV_MSK				BIT(12)
-+#define I2S_BPCUV_RCV_EN				BIT(12)
-+#define I2S_BPCUV_RCV_DIS				0
-+#define SPDIF_LINES_EN					GENMASK(19, 16)
-+#define AUD_FORMAT_MSK					GENMASK(26, 24)
-+#define AUD_3DOBA					(0x7 << 24)
-+#define AUD_3DASP					(0x6 << 24)
-+#define AUD_MSOBA					(0x5 << 24)
-+#define AUD_MSASP					(0x4 << 24)
-+#define AUD_HBR						(0x3 << 24)
-+#define AUD_DST						(0x2 << 24)
-+#define AUD_OBA						(0x1 << 24)
-+#define AUD_ASP						(0x0 << 24)
-+#define AUDIO_INTERFACE_CONFIG1				0x824
-+#define AUDIO_INTERFACE_CONTROL0			0x82c
-+#define AUDIO_FIFO_CLR_P				BIT(0)
-+#define AUDIO_INTERFACE_STATUS0				0x834
-+/* Frame Composer Registers */
-+#define FRAME_COMPOSER_CONFIG0				0x840
-+#define FRAME_COMPOSER_CONFIG1				0x844
-+#define FRAME_COMPOSER_CONFIG2				0x848
-+#define FRAME_COMPOSER_CONFIG3				0x84c
-+#define FRAME_COMPOSER_CONFIG4				0x850
-+#define FRAME_COMPOSER_CONFIG5				0x854
-+#define FRAME_COMPOSER_CONFIG6				0x858
-+#define FRAME_COMPOSER_CONFIG7				0x85c
-+#define FRAME_COMPOSER_CONFIG8				0x860
-+#define FRAME_COMPOSER_CONFIG9				0x864
-+#define FRAME_COMPOSER_CONTROL0				0x86c
-+/* Video Monitor Registers */
-+#define VIDEO_MONITOR_CONFIG0				0x880
-+#define VIDEO_MONITOR_STATUS0				0x884
-+#define VIDEO_MONITOR_STATUS1				0x888
-+#define VIDEO_MONITOR_STATUS2				0x88c
-+#define VIDEO_MONITOR_STATUS3				0x890
-+#define VIDEO_MONITOR_STATUS4				0x894
-+#define VIDEO_MONITOR_STATUS5				0x898
-+#define VIDEO_MONITOR_STATUS6				0x89c
-+/* HDCP2 Logic Registers */
-+#define HDCP2LOGIC_CONFIG0				0x8e0
-+#define HDCP2_BYPASS					BIT(0)
-+#define HDCP2LOGIC_ESM_GPIO_IN				0x8e4
-+#define HDCP2LOGIC_ESM_GPIO_OUT				0x8e8
-+/* HDCP14 Registers */
-+#define HDCP14_CONFIG0					0x900
-+#define HDCP14_CONFIG1					0x904
-+#define HDCP14_CONFIG2					0x908
-+#define HDCP14_CONFIG3					0x90c
-+#define HDCP14_KEY_SEED					0x914
-+#define HDCP14_KEY_H					0x918
-+#define HDCP14_KEY_L					0x91c
-+#define HDCP14_KEY_STATUS				0x920
-+#define HDCP14_AKSV_H					0x924
-+#define HDCP14_AKSV_L					0x928
-+#define HDCP14_AN_H					0x92c
-+#define HDCP14_AN_L					0x930
-+#define HDCP14_STATUS0					0x934
-+#define HDCP14_STATUS1					0x938
-+/* Scrambler Registers */
-+#define SCRAMB_CONFIG0					0x960
-+/* Video Configuration Registers */
-+#define LINK_CONFIG0					0x968
-+#define OPMODE_FRL_4LANES				BIT(8)
-+#define OPMODE_DVI					BIT(4)
-+#define OPMODE_FRL					BIT(0)
-+/* TMDS FIFO Registers */
-+#define TMDS_FIFO_CONFIG0				0x970
-+#define TMDS_FIFO_CONTROL0				0x974
-+/* FRL RSFEC Registers */
-+#define FRL_RSFEC_CONFIG0				0xa20
-+#define FRL_RSFEC_STATUS0				0xa30
-+/* FRL Packetizer Registers */
-+#define FRL_PKTZ_CONFIG0				0xa40
-+#define FRL_PKTZ_CONTROL0				0xa44
-+#define FRL_PKTZ_CONTROL1				0xa50
-+#define FRL_PKTZ_STATUS1				0xa54
-+/* Packet Scheduler Registers */
-+#define PKTSCHED_CONFIG0				0xa80
-+#define PKTSCHED_PRQUEUE0_CONFIG0			0xa84
-+#define PKTSCHED_PRQUEUE1_CONFIG0			0xa88
-+#define PKTSCHED_PRQUEUE2_CONFIG0			0xa8c
-+#define PKTSCHED_PRQUEUE2_CONFIG1			0xa90
-+#define PKTSCHED_PRQUEUE2_CONFIG2			0xa94
-+#define PKTSCHED_PKT_CONFIG0				0xa98
-+#define PKTSCHED_PKT_CONFIG1				0xa9c
-+#define PKTSCHED_DRMI_FIELDRATE				BIT(13)
-+#define PKTSCHED_AVI_FIELDRATE				BIT(12)
-+#define PKTSCHED_PKT_CONFIG2				0xaa0
-+#define PKTSCHED_PKT_CONFIG3				0xaa4
-+#define PKTSCHED_PKT_EN					0xaa8
-+#define PKTSCHED_DRMI_TX_EN				BIT(17)
-+#define PKTSCHED_AUDI_TX_EN				BIT(15)
-+#define PKTSCHED_AVI_TX_EN				BIT(13)
-+#define PKTSCHED_EMP_CVTEM_TX_EN			BIT(10)
-+#define PKTSCHED_AMD_TX_EN				BIT(8)
-+#define PKTSCHED_GCP_TX_EN				BIT(3)
-+#define PKTSCHED_AUDS_TX_EN				BIT(2)
-+#define PKTSCHED_ACR_TX_EN				BIT(1)
-+#define PKTSCHED_NULL_TX_EN				BIT(0)
-+#define PKTSCHED_PKT_CONTROL0				0xaac
-+#define PKTSCHED_PKT_SEND				0xab0
-+#define PKTSCHED_PKT_STATUS0				0xab4
-+#define PKTSCHED_PKT_STATUS1				0xab8
-+#define PKT_NULL_CONTENTS0				0xb00
-+#define PKT_NULL_CONTENTS1				0xb04
-+#define PKT_NULL_CONTENTS2				0xb08
-+#define PKT_NULL_CONTENTS3				0xb0c
-+#define PKT_NULL_CONTENTS4				0xb10
-+#define PKT_NULL_CONTENTS5				0xb14
-+#define PKT_NULL_CONTENTS6				0xb18
-+#define PKT_NULL_CONTENTS7				0xb1c
-+#define PKT_ACP_CONTENTS0				0xb20
-+#define PKT_ACP_CONTENTS1				0xb24
-+#define PKT_ACP_CONTENTS2				0xb28
-+#define PKT_ACP_CONTENTS3				0xb2c
-+#define PKT_ACP_CONTENTS4				0xb30
-+#define PKT_ACP_CONTENTS5				0xb34
-+#define PKT_ACP_CONTENTS6				0xb38
-+#define PKT_ACP_CONTENTS7				0xb3c
-+#define PKT_ISRC1_CONTENTS0				0xb40
-+#define PKT_ISRC1_CONTENTS1				0xb44
-+#define PKT_ISRC1_CONTENTS2				0xb48
-+#define PKT_ISRC1_CONTENTS3				0xb4c
-+#define PKT_ISRC1_CONTENTS4				0xb50
-+#define PKT_ISRC1_CONTENTS5				0xb54
-+#define PKT_ISRC1_CONTENTS6				0xb58
-+#define PKT_ISRC1_CONTENTS7				0xb5c
-+#define PKT_ISRC2_CONTENTS0				0xb60
-+#define PKT_ISRC2_CONTENTS1				0xb64
-+#define PKT_ISRC2_CONTENTS2				0xb68
-+#define PKT_ISRC2_CONTENTS3				0xb6c
-+#define PKT_ISRC2_CONTENTS4				0xb70
-+#define PKT_ISRC2_CONTENTS5				0xb74
-+#define PKT_ISRC2_CONTENTS6				0xb78
-+#define PKT_ISRC2_CONTENTS7				0xb7c
-+#define PKT_GMD_CONTENTS0				0xb80
-+#define PKT_GMD_CONTENTS1				0xb84
-+#define PKT_GMD_CONTENTS2				0xb88
-+#define PKT_GMD_CONTENTS3				0xb8c
-+#define PKT_GMD_CONTENTS4				0xb90
-+#define PKT_GMD_CONTENTS5				0xb94
-+#define PKT_GMD_CONTENTS6				0xb98
-+#define PKT_GMD_CONTENTS7				0xb9c
-+#define PKT_AMD_CONTENTS0				0xba0
-+#define PKT_AMD_CONTENTS1				0xba4
-+#define PKT_AMD_CONTENTS2				0xba8
-+#define PKT_AMD_CONTENTS3				0xbac
-+#define PKT_AMD_CONTENTS4				0xbb0
-+#define PKT_AMD_CONTENTS5				0xbb4
-+#define PKT_AMD_CONTENTS6				0xbb8
-+#define PKT_AMD_CONTENTS7				0xbbc
-+#define PKT_VSI_CONTENTS0				0xbc0
-+#define PKT_VSI_CONTENTS1				0xbc4
-+#define PKT_VSI_CONTENTS2				0xbc8
-+#define PKT_VSI_CONTENTS3				0xbcc
-+#define PKT_VSI_CONTENTS4				0xbd0
-+#define PKT_VSI_CONTENTS5				0xbd4
-+#define PKT_VSI_CONTENTS6				0xbd8
-+#define PKT_VSI_CONTENTS7				0xbdc
-+#define PKT_AVI_CONTENTS0				0xbe0
-+#define HDMI_FC_AVICONF0_ACTIVE_FMT_INFO_PRESENT	BIT(4)
-+#define HDMI_FC_AVICONF0_BAR_DATA_VERT_BAR		0x04
-+#define HDMI_FC_AVICONF0_BAR_DATA_HORIZ_BAR		0x08
-+#define HDMI_FC_AVICONF2_IT_CONTENT_VALID		0x80
-+#define PKT_AVI_CONTENTS1				0xbe4
-+#define PKT_AVI_CONTENTS2				0xbe8
-+#define PKT_AVI_CONTENTS3				0xbec
-+#define PKT_AVI_CONTENTS4				0xbf0
-+#define PKT_AVI_CONTENTS5				0xbf4
-+#define PKT_AVI_CONTENTS6				0xbf8
-+#define PKT_AVI_CONTENTS7				0xbfc
-+#define PKT_SPDI_CONTENTS0				0xc00
-+#define PKT_SPDI_CONTENTS1				0xc04
-+#define PKT_SPDI_CONTENTS2				0xc08
-+#define PKT_SPDI_CONTENTS3				0xc0c
-+#define PKT_SPDI_CONTENTS4				0xc10
-+#define PKT_SPDI_CONTENTS5				0xc14
-+#define PKT_SPDI_CONTENTS6				0xc18
-+#define PKT_SPDI_CONTENTS7				0xc1c
-+#define PKT_AUDI_CONTENTS0				0xc20
-+#define PKT_AUDI_CONTENTS1				0xc24
-+#define PKT_AUDI_CONTENTS2				0xc28
-+#define PKT_AUDI_CONTENTS3				0xc2c
-+#define PKT_AUDI_CONTENTS4				0xc30
-+#define PKT_AUDI_CONTENTS5				0xc34
-+#define PKT_AUDI_CONTENTS6				0xc38
-+#define PKT_AUDI_CONTENTS7				0xc3c
-+#define PKT_NVI_CONTENTS0				0xc40
-+#define PKT_NVI_CONTENTS1				0xc44
-+#define PKT_NVI_CONTENTS2				0xc48
-+#define PKT_NVI_CONTENTS3				0xc4c
-+#define PKT_NVI_CONTENTS4				0xc50
-+#define PKT_NVI_CONTENTS5				0xc54
-+#define PKT_NVI_CONTENTS6				0xc58
-+#define PKT_NVI_CONTENTS7				0xc5c
-+#define PKT_DRMI_CONTENTS0				0xc60
-+#define PKT_DRMI_CONTENTS1				0xc64
-+#define PKT_DRMI_CONTENTS2				0xc68
-+#define PKT_DRMI_CONTENTS3				0xc6c
-+#define PKT_DRMI_CONTENTS4				0xc70
-+#define PKT_DRMI_CONTENTS5				0xc74
-+#define PKT_DRMI_CONTENTS6				0xc78
-+#define PKT_DRMI_CONTENTS7				0xc7c
-+#define PKT_GHDMI1_CONTENTS0				0xc80
-+#define PKT_GHDMI1_CONTENTS1				0xc84
-+#define PKT_GHDMI1_CONTENTS2				0xc88
-+#define PKT_GHDMI1_CONTENTS3				0xc8c
-+#define PKT_GHDMI1_CONTENTS4				0xc90
-+#define PKT_GHDMI1_CONTENTS5				0xc94
-+#define PKT_GHDMI1_CONTENTS6				0xc98
-+#define PKT_GHDMI1_CONTENTS7				0xc9c
-+#define PKT_GHDMI2_CONTENTS0				0xca0
-+#define PKT_GHDMI2_CONTENTS1				0xca4
-+#define PKT_GHDMI2_CONTENTS2				0xca8
-+#define PKT_GHDMI2_CONTENTS3				0xcac
-+#define PKT_GHDMI2_CONTENTS4				0xcb0
-+#define PKT_GHDMI2_CONTENTS5				0xcb4
-+#define PKT_GHDMI2_CONTENTS6				0xcb8
-+#define PKT_GHDMI2_CONTENTS7				0xcbc
-+/* EMP Packetizer Registers */
-+#define PKT_EMP_CONFIG0					0xce0
-+#define PKT_EMP_CONTROL0				0xcec
-+#define PKT_EMP_CONTROL1				0xcf0
-+#define PKT_EMP_CONTROL2				0xcf4
-+#define PKT_EMP_VTEM_CONTENTS0				0xd00
-+#define PKT_EMP_VTEM_CONTENTS1				0xd04
-+#define PKT_EMP_VTEM_CONTENTS2				0xd08
-+#define PKT_EMP_VTEM_CONTENTS3				0xd0c
-+#define PKT_EMP_VTEM_CONTENTS4				0xd10
-+#define PKT_EMP_VTEM_CONTENTS5				0xd14
-+#define PKT_EMP_VTEM_CONTENTS6				0xd18
-+#define PKT_EMP_VTEM_CONTENTS7				0xd1c
-+#define PKT0_EMP_CVTEM_CONTENTS0			0xd20
-+#define PKT0_EMP_CVTEM_CONTENTS1			0xd24
-+#define PKT0_EMP_CVTEM_CONTENTS2			0xd28
-+#define PKT0_EMP_CVTEM_CONTENTS3			0xd2c
-+#define PKT0_EMP_CVTEM_CONTENTS4			0xd30
-+#define PKT0_EMP_CVTEM_CONTENTS5			0xd34
-+#define PKT0_EMP_CVTEM_CONTENTS6			0xd38
-+#define PKT0_EMP_CVTEM_CONTENTS7			0xd3c
-+#define PKT1_EMP_CVTEM_CONTENTS0			0xd40
-+#define PKT1_EMP_CVTEM_CONTENTS1			0xd44
-+#define PKT1_EMP_CVTEM_CONTENTS2			0xd48
-+#define PKT1_EMP_CVTEM_CONTENTS3			0xd4c
-+#define PKT1_EMP_CVTEM_CONTENTS4			0xd50
-+#define PKT1_EMP_CVTEM_CONTENTS5			0xd54
-+#define PKT1_EMP_CVTEM_CONTENTS6			0xd58
-+#define PKT1_EMP_CVTEM_CONTENTS7			0xd5c
-+#define PKT2_EMP_CVTEM_CONTENTS0			0xd60
-+#define PKT2_EMP_CVTEM_CONTENTS1			0xd64
-+#define PKT2_EMP_CVTEM_CONTENTS2			0xd68
-+#define PKT2_EMP_CVTEM_CONTENTS3			0xd6c
-+#define PKT2_EMP_CVTEM_CONTENTS4			0xd70
-+#define PKT2_EMP_CVTEM_CONTENTS5			0xd74
-+#define PKT2_EMP_CVTEM_CONTENTS6			0xd78
-+#define PKT2_EMP_CVTEM_CONTENTS7			0xd7c
-+#define PKT3_EMP_CVTEM_CONTENTS0			0xd80
-+#define PKT3_EMP_CVTEM_CONTENTS1			0xd84
-+#define PKT3_EMP_CVTEM_CONTENTS2			0xd88
-+#define PKT3_EMP_CVTEM_CONTENTS3			0xd8c
-+#define PKT3_EMP_CVTEM_CONTENTS4			0xd90
-+#define PKT3_EMP_CVTEM_CONTENTS5			0xd94
-+#define PKT3_EMP_CVTEM_CONTENTS6			0xd98
-+#define PKT3_EMP_CVTEM_CONTENTS7			0xd9c
-+#define PKT4_EMP_CVTEM_CONTENTS0			0xda0
-+#define PKT4_EMP_CVTEM_CONTENTS1			0xda4
-+#define PKT4_EMP_CVTEM_CONTENTS2			0xda8
-+#define PKT4_EMP_CVTEM_CONTENTS3			0xdac
-+#define PKT4_EMP_CVTEM_CONTENTS4			0xdb0
-+#define PKT4_EMP_CVTEM_CONTENTS5			0xdb4
-+#define PKT4_EMP_CVTEM_CONTENTS6			0xdb8
-+#define PKT4_EMP_CVTEM_CONTENTS7			0xdbc
-+#define PKT5_EMP_CVTEM_CONTENTS0			0xdc0
-+#define PKT5_EMP_CVTEM_CONTENTS1			0xdc4
-+#define PKT5_EMP_CVTEM_CONTENTS2			0xdc8
-+#define PKT5_EMP_CVTEM_CONTENTS3			0xdcc
-+#define PKT5_EMP_CVTEM_CONTENTS4			0xdd0
-+#define PKT5_EMP_CVTEM_CONTENTS5			0xdd4
-+#define PKT5_EMP_CVTEM_CONTENTS6			0xdd8
-+#define PKT5_EMP_CVTEM_CONTENTS7			0xddc
-+/* Audio Packetizer Registers */
-+#define AUDPKT_CONTROL0					0xe20
-+#define AUDPKT_PBIT_FORCE_EN_MASK			BIT(12)
-+#define AUDPKT_PBIT_FORCE_EN				BIT(12)
-+#define AUDPKT_CHSTATUS_OVR_EN_MASK			BIT(0)
-+#define AUDPKT_CHSTATUS_OVR_EN				BIT(0)
-+#define AUDPKT_CONTROL1					0xe24
-+#define AUDPKT_ACR_CONTROL0				0xe40
-+#define AUDPKT_ACR_N_VALUE				0xfffff
-+#define AUDPKT_ACR_CONTROL1				0xe44
-+#define AUDPKT_ACR_CTS_OVR_VAL_MSK			GENMASK(23, 4)
-+#define AUDPKT_ACR_CTS_OVR_VAL(x)			((x) << 4)
-+#define AUDPKT_ACR_CTS_OVR_EN_MSK			BIT(1)
-+#define AUDPKT_ACR_CTS_OVR_EN				BIT(1)
-+#define AUDPKT_ACR_STATUS0				0xe4c
-+#define AUDPKT_CHSTATUS_OVR0				0xe60
-+#define AUDPKT_CHSTATUS_OVR1				0xe64
-+/* IEC60958 Byte 3: Sampleing frenuency Bits 24 to 27 */
-+#define AUDPKT_CHSTATUS_SR_MASK				GENMASK(3, 0)
-+#define AUDPKT_CHSTATUS_SR_22050			0x4
-+#define AUDPKT_CHSTATUS_SR_24000			0x6
-+#define AUDPKT_CHSTATUS_SR_32000			0x3
-+#define AUDPKT_CHSTATUS_SR_44100			0x0
-+#define AUDPKT_CHSTATUS_SR_48000			0x2
-+#define AUDPKT_CHSTATUS_SR_88200			0x8
-+#define AUDPKT_CHSTATUS_SR_96000			0xa
-+#define AUDPKT_CHSTATUS_SR_176400			0xc
-+#define AUDPKT_CHSTATUS_SR_192000			0xe
-+#define AUDPKT_CHSTATUS_SR_768000			0x9
-+#define AUDPKT_CHSTATUS_SR_NOT_INDICATED		0x1
-+/* IEC60958 Byte 4: Original Sampleing frenuency Bits 36 to 39 */
-+#define AUDPKT_CHSTATUS_0SR_MASK			GENMASK(15, 12)
-+#define AUDPKT_CHSTATUS_OSR_8000			0x6
-+#define AUDPKT_CHSTATUS_OSR_11025			0xa
-+#define AUDPKT_CHSTATUS_OSR_12000			0x2
-+#define AUDPKT_CHSTATUS_OSR_16000			0x8
-+#define AUDPKT_CHSTATUS_OSR_22050			0xb
-+#define AUDPKT_CHSTATUS_OSR_24000			0x9
-+#define AUDPKT_CHSTATUS_OSR_32000			0xc
-+#define AUDPKT_CHSTATUS_OSR_44100			0xf
-+#define AUDPKT_CHSTATUS_OSR_48000			0xd
-+#define AUDPKT_CHSTATUS_OSR_88200			0x7
-+#define AUDPKT_CHSTATUS_OSR_96000			0x5
-+#define AUDPKT_CHSTATUS_OSR_176400			0x3
-+#define AUDPKT_CHSTATUS_OSR_192000			0x1
-+#define AUDPKT_CHSTATUS_OSR_NOT_INDICATED		0x0
-+#define AUDPKT_CHSTATUS_OVR2				0xe68
-+#define AUDPKT_CHSTATUS_OVR3				0xe6c
-+#define AUDPKT_CHSTATUS_OVR4				0xe70
-+#define AUDPKT_CHSTATUS_OVR5				0xe74
-+#define AUDPKT_CHSTATUS_OVR6				0xe78
-+#define AUDPKT_CHSTATUS_OVR7				0xe7c
-+#define AUDPKT_CHSTATUS_OVR8				0xe80
-+#define AUDPKT_CHSTATUS_OVR9				0xe84
-+#define AUDPKT_CHSTATUS_OVR10				0xe88
-+#define AUDPKT_CHSTATUS_OVR11				0xe8c
-+#define AUDPKT_CHSTATUS_OVR12				0xe90
-+#define AUDPKT_CHSTATUS_OVR13				0xe94
-+#define AUDPKT_CHSTATUS_OVR14				0xe98
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC0			0xea0
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC1			0xea4
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC2			0xea8
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC3			0xeac
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC4			0xeb0
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC5			0xeb4
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC6			0xeb8
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC7			0xebc
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC8			0xec0
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC9			0xec4
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC10		0xec8
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC11		0xecc
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC12		0xed0
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC13		0xed4
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC14		0xed8
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC15		0xedc
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC16		0xee0
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC17		0xee4
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC18		0xee8
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC19		0xeec
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC20		0xef0
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC21		0xef4
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC22		0xef8
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC23		0xefc
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC24		0xf00
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC25		0xf04
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC26		0xf08
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC27		0xf0c
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC28		0xf10
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC29		0xf14
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC30		0xf18
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC31		0xf1c
-+#define AUDPKT_USRDATA_OVR_MSG_GENERIC32		0xf20
-+#define AUDPKT_VBIT_OVR0				0xf24
-+/* CEC Registers */
-+#define CEC_TX_CONTROL					0x1000
-+#define CEC_STATUS					0x1004
-+#define CEC_CONFIG					0x1008
-+#define CEC_ADDR					0x100c
-+#define CEC_TX_COUNT					0x1020
-+#define CEC_TX_DATA3_0					0x1024
-+#define CEC_TX_DATA7_4					0x1028
-+#define CEC_TX_DATA11_8					0x102c
-+#define CEC_TX_DATA15_12				0x1030
-+#define CEC_RX_COUNT_STATUS				0x1040
-+#define CEC_RX_DATA3_0					0x1044
-+#define CEC_RX_DATA7_4					0x1048
-+#define CEC_RX_DATA11_8					0x104c
-+#define CEC_RX_DATA15_12				0x1050
-+#define CEC_LOCK_CONTROL				0x1054
-+#define CEC_RXQUAL_BITTIME_CONFIG			0x1060
-+#define CEC_RX_BITTIME_CONFIG				0x1064
-+#define CEC_TX_BITTIME_CONFIG				0x1068
-+/* eARC RX CMDC Registers */
-+#define EARCRX_CMDC_CONFIG0				0x1800
-+#define EARCRX_XACTREAD_STOP_CFG			BIT(26)
-+#define EARCRX_XACTREAD_RETRY_CFG			BIT(25)
-+#define EARCRX_CMDC_DSCVR_EARCVALID0_TO_DISC1		BIT(24)
-+#define EARCRX_CMDC_XACT_RESTART_EN			BIT(18)
-+#define EARCRX_CMDC_CONFIG1				0x1804
-+#define EARCRX_CMDC_CONTROL				0x1808
-+#define EARCRX_CMDC_HEARTBEAT_LOSS_EN			BIT(4)
-+#define EARCRX_CMDC_DISCOVERY_EN			BIT(3)
-+#define EARCRX_CONNECTOR_HPD				BIT(1)
-+#define EARCRX_CMDC_WHITELIST0_CONFIG			0x180c
-+#define EARCRX_CMDC_WHITELIST1_CONFIG			0x1810
-+#define EARCRX_CMDC_WHITELIST2_CONFIG			0x1814
-+#define EARCRX_CMDC_WHITELIST3_CONFIG			0x1818
-+#define EARCRX_CMDC_STATUS				0x181c
-+#define EARCRX_CMDC_XACT_INFO				0x1820
-+#define EARCRX_CMDC_XACT_ACTION				0x1824
-+#define EARCRX_CMDC_HEARTBEAT_RXSTAT_SE			0x1828
-+#define EARCRX_CMDC_HEARTBEAT_STATUS			0x182c
-+#define EARCRX_CMDC_XACT_WR0				0x1840
-+#define EARCRX_CMDC_XACT_WR1				0x1844
-+#define EARCRX_CMDC_XACT_WR2				0x1848
-+#define EARCRX_CMDC_XACT_WR3				0x184c
-+#define EARCRX_CMDC_XACT_WR4				0x1850
-+#define EARCRX_CMDC_XACT_WR5				0x1854
-+#define EARCRX_CMDC_XACT_WR6				0x1858
-+#define EARCRX_CMDC_XACT_WR7				0x185c
-+#define EARCRX_CMDC_XACT_WR8				0x1860
-+#define EARCRX_CMDC_XACT_WR9				0x1864
-+#define EARCRX_CMDC_XACT_WR10				0x1868
-+#define EARCRX_CMDC_XACT_WR11				0x186c
-+#define EARCRX_CMDC_XACT_WR12				0x1870
-+#define EARCRX_CMDC_XACT_WR13				0x1874
-+#define EARCRX_CMDC_XACT_WR14				0x1878
-+#define EARCRX_CMDC_XACT_WR15				0x187c
-+#define EARCRX_CMDC_XACT_WR16				0x1880
-+#define EARCRX_CMDC_XACT_WR17				0x1884
-+#define EARCRX_CMDC_XACT_WR18				0x1888
-+#define EARCRX_CMDC_XACT_WR19				0x188c
-+#define EARCRX_CMDC_XACT_WR20				0x1890
-+#define EARCRX_CMDC_XACT_WR21				0x1894
-+#define EARCRX_CMDC_XACT_WR22				0x1898
-+#define EARCRX_CMDC_XACT_WR23				0x189c
-+#define EARCRX_CMDC_XACT_WR24				0x18a0
-+#define EARCRX_CMDC_XACT_WR25				0x18a4
-+#define EARCRX_CMDC_XACT_WR26				0x18a8
-+#define EARCRX_CMDC_XACT_WR27				0x18ac
-+#define EARCRX_CMDC_XACT_WR28				0x18b0
-+#define EARCRX_CMDC_XACT_WR29				0x18b4
-+#define EARCRX_CMDC_XACT_WR30				0x18b8
-+#define EARCRX_CMDC_XACT_WR31				0x18bc
-+#define EARCRX_CMDC_XACT_WR32				0x18c0
-+#define EARCRX_CMDC_XACT_WR33				0x18c4
-+#define EARCRX_CMDC_XACT_WR34				0x18c8
-+#define EARCRX_CMDC_XACT_WR35				0x18cc
-+#define EARCRX_CMDC_XACT_WR36				0x18d0
-+#define EARCRX_CMDC_XACT_WR37				0x18d4
-+#define EARCRX_CMDC_XACT_WR38				0x18d8
-+#define EARCRX_CMDC_XACT_WR39				0x18dc
-+#define EARCRX_CMDC_XACT_WR40				0x18e0
-+#define EARCRX_CMDC_XACT_WR41				0x18e4
-+#define EARCRX_CMDC_XACT_WR42				0x18e8
-+#define EARCRX_CMDC_XACT_WR43				0x18ec
-+#define EARCRX_CMDC_XACT_WR44				0x18f0
-+#define EARCRX_CMDC_XACT_WR45				0x18f4
-+#define EARCRX_CMDC_XACT_WR46				0x18f8
-+#define EARCRX_CMDC_XACT_WR47				0x18fc
-+#define EARCRX_CMDC_XACT_WR48				0x1900
-+#define EARCRX_CMDC_XACT_WR49				0x1904
-+#define EARCRX_CMDC_XACT_WR50				0x1908
-+#define EARCRX_CMDC_XACT_WR51				0x190c
-+#define EARCRX_CMDC_XACT_WR52				0x1910
-+#define EARCRX_CMDC_XACT_WR53				0x1914
-+#define EARCRX_CMDC_XACT_WR54				0x1918
-+#define EARCRX_CMDC_XACT_WR55				0x191c
-+#define EARCRX_CMDC_XACT_WR56				0x1920
-+#define EARCRX_CMDC_XACT_WR57				0x1924
-+#define EARCRX_CMDC_XACT_WR58				0x1928
-+#define EARCRX_CMDC_XACT_WR59				0x192c
-+#define EARCRX_CMDC_XACT_WR60				0x1930
-+#define EARCRX_CMDC_XACT_WR61				0x1934
-+#define EARCRX_CMDC_XACT_WR62				0x1938
-+#define EARCRX_CMDC_XACT_WR63				0x193c
-+#define EARCRX_CMDC_XACT_WR64				0x1940
-+#define EARCRX_CMDC_XACT_RD0				0x1960
-+#define EARCRX_CMDC_XACT_RD1				0x1964
-+#define EARCRX_CMDC_XACT_RD2				0x1968
-+#define EARCRX_CMDC_XACT_RD3				0x196c
-+#define EARCRX_CMDC_XACT_RD4				0x1970
-+#define EARCRX_CMDC_XACT_RD5				0x1974
-+#define EARCRX_CMDC_XACT_RD6				0x1978
-+#define EARCRX_CMDC_XACT_RD7				0x197c
-+#define EARCRX_CMDC_XACT_RD8				0x1980
-+#define EARCRX_CMDC_XACT_RD9				0x1984
-+#define EARCRX_CMDC_XACT_RD10				0x1988
-+#define EARCRX_CMDC_XACT_RD11				0x198c
-+#define EARCRX_CMDC_XACT_RD12				0x1990
-+#define EARCRX_CMDC_XACT_RD13				0x1994
-+#define EARCRX_CMDC_XACT_RD14				0x1998
-+#define EARCRX_CMDC_XACT_RD15				0x199c
-+#define EARCRX_CMDC_XACT_RD16				0x19a0
-+#define EARCRX_CMDC_XACT_RD17				0x19a4
-+#define EARCRX_CMDC_XACT_RD18				0x19a8
-+#define EARCRX_CMDC_XACT_RD19				0x19ac
-+#define EARCRX_CMDC_XACT_RD20				0x19b0
-+#define EARCRX_CMDC_XACT_RD21				0x19b4
-+#define EARCRX_CMDC_XACT_RD22				0x19b8
-+#define EARCRX_CMDC_XACT_RD23				0x19bc
-+#define EARCRX_CMDC_XACT_RD24				0x19c0
-+#define EARCRX_CMDC_XACT_RD25				0x19c4
-+#define EARCRX_CMDC_XACT_RD26				0x19c8
-+#define EARCRX_CMDC_XACT_RD27				0x19cc
-+#define EARCRX_CMDC_XACT_RD28				0x19d0
-+#define EARCRX_CMDC_XACT_RD29				0x19d4
-+#define EARCRX_CMDC_XACT_RD30				0x19d8
-+#define EARCRX_CMDC_XACT_RD31				0x19dc
-+#define EARCRX_CMDC_XACT_RD32				0x19e0
-+#define EARCRX_CMDC_XACT_RD33				0x19e4
-+#define EARCRX_CMDC_XACT_RD34				0x19e8
-+#define EARCRX_CMDC_XACT_RD35				0x19ec
-+#define EARCRX_CMDC_XACT_RD36				0x19f0
-+#define EARCRX_CMDC_XACT_RD37				0x19f4
-+#define EARCRX_CMDC_XACT_RD38				0x19f8
-+#define EARCRX_CMDC_XACT_RD39				0x19fc
-+#define EARCRX_CMDC_XACT_RD40				0x1a00
-+#define EARCRX_CMDC_XACT_RD41				0x1a04
-+#define EARCRX_CMDC_XACT_RD42				0x1a08
-+#define EARCRX_CMDC_XACT_RD43				0x1a0c
-+#define EARCRX_CMDC_XACT_RD44				0x1a10
-+#define EARCRX_CMDC_XACT_RD45				0x1a14
-+#define EARCRX_CMDC_XACT_RD46				0x1a18
-+#define EARCRX_CMDC_XACT_RD47				0x1a1c
-+#define EARCRX_CMDC_XACT_RD48				0x1a20
-+#define EARCRX_CMDC_XACT_RD49				0x1a24
-+#define EARCRX_CMDC_XACT_RD50				0x1a28
-+#define EARCRX_CMDC_XACT_RD51				0x1a2c
-+#define EARCRX_CMDC_XACT_RD52				0x1a30
-+#define EARCRX_CMDC_XACT_RD53				0x1a34
-+#define EARCRX_CMDC_XACT_RD54				0x1a38
-+#define EARCRX_CMDC_XACT_RD55				0x1a3c
-+#define EARCRX_CMDC_XACT_RD56				0x1a40
-+#define EARCRX_CMDC_XACT_RD57				0x1a44
-+#define EARCRX_CMDC_XACT_RD58				0x1a48
-+#define EARCRX_CMDC_XACT_RD59				0x1a4c
-+#define EARCRX_CMDC_XACT_RD60				0x1a50
-+#define EARCRX_CMDC_XACT_RD61				0x1a54
-+#define EARCRX_CMDC_XACT_RD62				0x1a58
-+#define EARCRX_CMDC_XACT_RD63				0x1a5c
-+#define EARCRX_CMDC_XACT_RD64				0x1a60
-+#define EARCRX_CMDC_SYNC_CONFIG				0x1b00
-+/* eARC RX DMAC Registers */
-+#define EARCRX_DMAC_PHY_CONTROL				0x1c00
-+#define EARCRX_DMAC_CONFIG				0x1c08
-+#define EARCRX_DMAC_CONTROL0				0x1c0c
-+#define EARCRX_DMAC_AUDIO_EN				BIT(1)
-+#define EARCRX_DMAC_EN					BIT(0)
-+#define EARCRX_DMAC_CONTROL1				0x1c10
-+#define EARCRX_DMAC_STATUS				0x1c14
-+#define EARCRX_DMAC_CHSTATUS0				0x1c18
-+#define EARCRX_DMAC_CHSTATUS1				0x1c1c
-+#define EARCRX_DMAC_CHSTATUS2				0x1c20
-+#define EARCRX_DMAC_CHSTATUS3				0x1c24
-+#define EARCRX_DMAC_CHSTATUS4				0x1c28
-+#define EARCRX_DMAC_CHSTATUS5				0x1c2c
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC0		0x1c30
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC1		0x1c34
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC2		0x1c38
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC3		0x1c3c
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC4		0x1c40
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC5		0x1c44
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC6		0x1c48
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC7		0x1c4c
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC8		0x1c50
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC9		0x1c54
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC10		0x1c58
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC11		0x1c5c
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT0		0x1c60
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT1		0x1c64
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT2		0x1c68
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT3		0x1c6c
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT4		0x1c70
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT5		0x1c74
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT6		0x1c78
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT7		0x1c7c
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT8		0x1c80
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT9		0x1c84
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT10	0x1c88
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT11	0x1c8c
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT0		0x1c90
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT1		0x1c94
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT2		0x1c98
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT3		0x1c9c
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT4		0x1ca0
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT5		0x1ca4
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT6		0x1ca8
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT7		0x1cac
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT8		0x1cb0
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT9		0x1cb4
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT10	0x1cb8
-+#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT11	0x1cbc
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC0		0x1cc0
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC1		0x1cc4
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC2		0x1cc8
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC3		0x1ccc
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC4		0x1cd0
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC5		0x1cd4
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC6		0x1cd8
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC7		0x1cdc
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC8		0x1ce0
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC9		0x1ce4
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC10		0x1ce8
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC11		0x1cec
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC12		0x1cf0
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC13		0x1cf4
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC14		0x1cf8
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC15		0x1cfc
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC16		0x1d00
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC17		0x1d04
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC18		0x1d08
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC19		0x1d0c
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC20		0x1d10
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC21		0x1d14
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC22		0x1d18
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC23		0x1d1c
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC24		0x1d20
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC25		0x1d24
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC26		0x1d28
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC27		0x1d2c
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC28		0x1d30
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC29		0x1d34
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC30		0x1d38
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC31		0x1d3c
-+#define EARCRX_DMAC_USRDATA_MSG_GENERIC32		0x1d40
-+#define EARCRX_DMAC_CHSTATUS_STREAMER0			0x1d44
-+#define EARCRX_DMAC_CHSTATUS_STREAMER1			0x1d48
-+#define EARCRX_DMAC_CHSTATUS_STREAMER2			0x1d4c
-+#define EARCRX_DMAC_CHSTATUS_STREAMER3			0x1d50
-+#define EARCRX_DMAC_CHSTATUS_STREAMER4			0x1d54
-+#define EARCRX_DMAC_CHSTATUS_STREAMER5			0x1d58
-+#define EARCRX_DMAC_CHSTATUS_STREAMER6			0x1d5c
-+#define EARCRX_DMAC_CHSTATUS_STREAMER7			0x1d60
-+#define EARCRX_DMAC_CHSTATUS_STREAMER8			0x1d64
-+#define EARCRX_DMAC_CHSTATUS_STREAMER9			0x1d68
-+#define EARCRX_DMAC_CHSTATUS_STREAMER10			0x1d6c
-+#define EARCRX_DMAC_CHSTATUS_STREAMER11			0x1d70
-+#define EARCRX_DMAC_CHSTATUS_STREAMER12			0x1d74
-+#define EARCRX_DMAC_CHSTATUS_STREAMER13			0x1d78
-+#define EARCRX_DMAC_CHSTATUS_STREAMER14			0x1d7c
-+#define EARCRX_DMAC_USRDATA_STREAMER0			0x1d80
-+/* Main Unit Interrupt Registers */
-+#define MAIN_INTVEC_INDEX				0x3000
-+#define MAINUNIT_0_INT_STATUS				0x3010
-+#define MAINUNIT_0_INT_MASK_N				0x3014
-+#define MAINUNIT_0_INT_CLEAR				0x3018
-+#define MAINUNIT_0_INT_FORCE				0x301c
-+#define MAINUNIT_1_INT_STATUS				0x3020
-+#define FLT_EXIT_TO_LTSL_IRQ				BIT(22)
-+#define FLT_EXIT_TO_LTS4_IRQ				BIT(21)
-+#define FLT_EXIT_TO_LTSP_IRQ				BIT(20)
-+#define SCDC_NACK_RCVD_IRQ				BIT(12)
-+#define SCDC_RR_REPLY_STOP_IRQ				BIT(11)
-+#define SCDC_UPD_FLAGS_CLR_IRQ				BIT(10)
-+#define SCDC_UPD_FLAGS_CHG_IRQ				BIT(9)
-+#define SCDC_UPD_FLAGS_RD_IRQ				BIT(8)
-+#define I2CM_NACK_RCVD_IRQ				BIT(2)
-+#define I2CM_READ_REQUEST_IRQ				BIT(1)
-+#define I2CM_OP_DONE_IRQ				BIT(0)
-+#define MAINUNIT_1_INT_MASK_N				0x3024
-+#define I2CM_NACK_RCVD_MASK_N				BIT(2)
-+#define I2CM_READ_REQUEST_MASK_N			BIT(1)
-+#define I2CM_OP_DONE_MASK_N				BIT(0)
-+#define MAINUNIT_1_INT_CLEAR				0x3028
-+#define I2CM_NACK_RCVD_CLEAR				BIT(2)
-+#define I2CM_READ_REQUEST_CLEAR				BIT(1)
-+#define I2CM_OP_DONE_CLEAR				BIT(0)
-+#define MAINUNIT_1_INT_FORCE				0x302c
-+/* AVPUNIT Interrupt Registers */
-+#define AVP_INTVEC_INDEX				0x3800
-+#define AVP_0_INT_STATUS				0x3810
-+#define AVP_0_INT_MASK_N				0x3814
-+#define AVP_0_INT_CLEAR					0x3818
-+#define AVP_0_INT_FORCE					0x381c
-+#define AVP_1_INT_STATUS				0x3820
-+#define AVP_1_INT_MASK_N				0x3824
-+#define HDCP14_AUTH_CHG_MASK_N				BIT(6)
-+#define AVP_1_INT_CLEAR					0x3828
-+#define AVP_1_INT_FORCE					0x382c
-+#define AVP_2_INT_STATUS				0x3830
-+#define AVP_2_INT_MASK_N				0x3834
-+#define AVP_2_INT_CLEAR					0x3838
-+#define AVP_2_INT_FORCE					0x383c
-+#define AVP_3_INT_STATUS				0x3840
-+#define AVP_3_INT_MASK_N				0x3844
-+#define AVP_3_INT_CLEAR					0x3848
-+#define AVP_3_INT_FORCE					0x384c
-+#define AVP_4_INT_STATUS				0x3850
-+#define AVP_4_INT_MASK_N				0x3854
-+#define AVP_4_INT_CLEAR					0x3858
-+#define AVP_4_INT_FORCE					0x385c
-+#define AVP_5_INT_STATUS				0x3860
-+#define AVP_5_INT_MASK_N				0x3864
-+#define AVP_5_INT_CLEAR					0x3868
-+#define AVP_5_INT_FORCE					0x386c
-+#define AVP_6_INT_STATUS				0x3870
-+#define AVP_6_INT_MASK_N				0x3874
-+#define AVP_6_INT_CLEAR					0x3878
-+#define AVP_6_INT_FORCE					0x387c
-+/* CEC Interrupt Registers */
-+#define CEC_INT_STATUS					0x4000
-+#define CEC_INT_MASK_N					0x4004
-+#define CEC_INT_CLEAR					0x4008
-+#define CEC_INT_FORCE					0x400c
-+/* eARC RX Interrupt Registers  */
-+#define EARCRX_INTVEC_INDEX				0x4800
-+#define EARCRX_0_INT_STATUS				0x4810
-+#define EARCRX_CMDC_DISCOVERY_TIMEOUT_IRQ		BIT(9)
-+#define EARCRX_CMDC_DISCOVERY_DONE_IRQ			BIT(8)
-+#define EARCRX_0_INT_MASK_N				0x4814
-+#define EARCRX_0_INT_CLEAR				0x4818
-+#define EARCRX_0_INT_FORCE				0x481c
-+#define EARCRX_1_INT_STATUS				0x4820
-+#define EARCRX_1_INT_MASK_N				0x4824
-+#define EARCRX_1_INT_CLEAR				0x4828
-+#define EARCRX_1_INT_FORCE				0x482c
-+
-+#endif /* __DW_HDMI_QP_H__ */
-diff --git a/include/drm/bridge/dw_hdmi_qp.h b/include/drm/bridge/dw_hdmi_qp.h
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/include/drm/bridge/dw_hdmi_qp.h
-@@ -0,0 +1,37 @@
-+/* SPDX-License-Identifier: GPL-2.0-or-later */
-+/*
-+ * Copyright (c) 2021-2022 Rockchip Electronics Co., Ltd.
-+ * Copyright (c) 2024 Collabora Ltd.
-+ */
-+
-+#ifndef __DW_HDMI_QP__
-+#define __DW_HDMI_QP__
-+
-+struct device;
-+struct drm_display_info;
-+struct drm_encoder;
-+struct dw_hdmi_qp;
-+struct platform_device;
-+
-+struct dw_hdmi_qp_phy_ops {
-+	int (*init)(struct dw_hdmi_qp *hdmi, void *data,
-+		    const struct drm_display_info *display);
-+	void (*disable)(struct dw_hdmi_qp *hdmi, void *data);
-+	enum drm_connector_status (*read_hpd)(struct dw_hdmi_qp *hdmi, void *data);
-+	void (*setup_hpd)(struct dw_hdmi_qp *hdmi, void *data);
-+};
-+
-+struct dw_hdmi_qp_plat_data {
-+	const struct dw_hdmi_qp_phy_ops *phy_ops;
-+	void *phy_data;
-+};
-+
-+int dw_hdmi_qp_set_refclk_rate(struct dw_hdmi_qp *hdmi, unsigned long rate);
-+void dw_hdmi_qp_set_high_tmds_clock_ratio(struct dw_hdmi_qp *hdmi,
-+					  const struct drm_display_info *display);
-+void dw_hdmi_qp_unbind(struct dw_hdmi_qp *hdmi);
-+struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev,
-+				   struct drm_encoder *encoder,
-+				   const struct dw_hdmi_qp_plat_data *plat_data);
-+void dw_hdmi_qp_resume(struct device *dev, struct dw_hdmi_qp *hdmi);
-+#endif /* __DW_HDMI_QP__ */
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
-Date: Fri, 26 Jul 2024 03:07:04 +0300
-Subject: dt-bindings: display: rockchip: Add schema for RK3588 HDMI TX
- Controller
-
-Rockchip RK3588 SoC integrates the Synopsys DesignWare HDMI 2.1
-Quad-Pixel (QP) TX controller IP.
-
-Since this is a new IP block, quite different from those used in the
-previous generations of Rockchip SoCs, add a dedicated binding file.
-
-Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
----
- Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi-qp.yaml | 188 ++++++++++
- 1 file changed, 188 insertions(+)
-
-diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi-qp.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi-qp.yaml
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi-qp.yaml
-@@ -0,0 +1,188 @@
-+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/display/rockchip/rockchip,dw-hdmi-qp.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Rockchip DW HDMI QP TX Encoder
-+
-+maintainers:
-+  - Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
-+
-+description:
-+  Rockchip RK3588 SoC integrates the Synopsys DesignWare HDMI QP TX controller
-+  IP and a HDMI/eDP TX Combo PHY based on a Samsung IP block.
-+
-+allOf:
-+  - $ref: ../bridge/synopsys,dw-hdmi-qp.yaml#
-+  - $ref: /schemas/sound/dai-common.yaml#
-+
-+properties:
-+  compatible:
-+    enum:
-+      - rockchip,rk3588-dw-hdmi-qp
-+
-+  clocks:
-+    minItems: 4
-+    items:
-+      - {}
-+      - {}
-+      - {}
-+      - {}
-+      # The next clocks are optional, but shall be specified in this
-+      # order when present.
-+      - description: TMDS/FRL link clock
-+      - description: Video datapath clock
-+
-+  clock-names:
-+    minItems: 4
-+    items:
-+      - {}
-+      - {}
-+      - {}
-+      - {}
-+      - enum: [hdp, hclk_vo1]
-+      - const: hclk_vo1
-+
-+  interrupts:
-+    items:
-+      - {}
-+      - {}
-+      - {}
-+      - {}
-+      - description: HPD interrupt
-+
-+  interrupt-names:
-+    items:
-+      - {}
-+      - {}
-+      - {}
-+      - {}
-+      - const: hpd
-+
-+  phys:
-+    maxItems: 1
-+    description: The HDMI/eDP PHY.
-+
-+  phy-names:
-+    const: hdmi
-+
-+  ports:
-+    $ref: /schemas/graph.yaml#/properties/ports
-+
-+    properties:
-+      port@0:
-+        $ref: /schemas/graph.yaml#/properties/port
-+        description:
-+          Port node with one endpoint connected to a vop node.
-+
-+      port@1:
-+        $ref: /schemas/graph.yaml#/properties/port
-+        description:
-+          Port node with one endpoint connected to a hdmi-connector node.
-+
-+    required:
-+      - port@0
-+      - port@1
-+
-+  power-domains:
-+    maxItems: 1
-+
-+  resets:
-+    minItems: 2
-+    maxItems: 2
-+
-+  reset-names:
-+    items:
-+      - const: ref
-+      - const: hdp
-+
-+  "#sound-dai-cells":
-+    const: 0
-+
-+  rockchip,grf:
-+    $ref: /schemas/types.yaml#/definitions/phandle
-+    description:
-+      Most HDMI QP related data is accessed through SYS GRF regs.
-+
-+  rockchip,vo1_grf:
-+    $ref: /schemas/types.yaml#/definitions/phandle
-+    description:
-+      Additional HDMI QP related data is accessed through VO1 GRF regs.
-+
-+required:
-+  - compatible
-+  - reg
-+  - clocks
-+  - clock-names
-+  - interrupts
-+  - interrupt-names
-+  - phys
-+  - phy-names
-+  - ports
-+  - resets
-+  - reset-names
-+  - rockchip,grf
-+  - rockchip,vo1_grf
-+
-+unevaluatedProperties: false
-+
-+examples:
-+  - |
-+    #include <dt-bindings/clock/rockchip,rk3588-cru.h>
-+    #include <dt-bindings/interrupt-controller/arm-gic.h>
-+    #include <dt-bindings/interrupt-controller/irq.h>
-+    #include <dt-bindings/power/rk3588-power.h>
-+    #include <dt-bindings/reset/rockchip,rk3588-cru.h>
-+
-+    soc {
-+      #address-cells = <2>;
-+      #size-cells = <2>;
-+
-+      hdmi@fde80000 {
-+        compatible = "rockchip,rk3588-dw-hdmi-qp";
-+        reg = <0x0 0xfde80000 0x0 0x20000>;
-+        clocks = <&cru PCLK_HDMITX0>,
-+                 <&cru CLK_HDMITX0_EARC>,
-+                 <&cru CLK_HDMITX0_REF>,
-+                 <&cru MCLK_I2S5_8CH_TX>,
-+                 <&cru CLK_HDMIHDP0>,
-+                 <&cru HCLK_VO1>;
-+        clock-names = "pclk", "earc", "ref", "aud", "hdp", "hclk_vo1";
-+        interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH 0>,
-+                     <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH 0>,
-+                     <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH 0>,
-+                     <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH 0>,
-+                     <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH 0>;
-+        interrupt-names = "avp", "cec", "earc", "main", "hpd";
-+        phys = <&hdptxphy_hdmi0>;
-+        phy-names = "hdmi";
-+        power-domains = <&power RK3588_PD_VO1>;
-+        resets = <&cru SRST_HDMITX0_REF>, <&cru SRST_HDMIHDP0>;
-+        reset-names = "ref", "hdp";
-+        rockchip,grf = <&sys_grf>;
-+        rockchip,vo1_grf = <&vo1_grf>;
-+        #sound-dai-cells = <0>;
-+
-+        ports {
-+          #address-cells = <1>;
-+          #size-cells = <0>;
-+
-+          port@0 {
-+            reg = <0>;
-+
-+            hdmi0_in_vp0: endpoint {
-+                remote-endpoint = <&vp0_out_hdmi0>;
-+            };
-+          };
-+
-+          port@1 {
-+            reg = <1>;
-+
-+            hdmi0_out_con0: endpoint {
-+                remote-endpoint = <&hdmi_con0_in>;
-+            };
-+          };
-+        };
-+      };
-+    };
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
-Date: Wed, 17 Jul 2024 03:34:36 +0300
-Subject: drm/rockchip: Explicitly include bits header
-
-Driver makes use of the BIT() macro, but relies on the bits header being
-implicitly included.
-
-Explicitly pull the header in to avoid potential build failures in some
-configurations.
-
-While at it, reorder include directives alphabetically.
-
-Fixes: 8c8546546f25 ("drm/rockchip: move output interface related definition to rockchip_drm_drv.h")
-Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
----
- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
-index 111111111111..222222222222 100644
---- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
-+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
-@@ -12,9 +12,10 @@
- #include <drm/drm_atomic_helper.h>
- #include <drm/drm_gem.h>
- 
-+#include <linux/bits.h>
-+#include <linux/component.h>
- #include <linux/i2c.h>
- #include <linux/module.h>
--#include <linux/component.h>
- 
- #define ROCKCHIP_MAX_FB_BUFFER	3
- #define ROCKCHIP_MAX_CONNECTOR	2
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
-Date: Sat, 6 Jul 2024 03:22:35 +0300
-Subject: drm/rockchip: Add basic RK3588 HDMI output support
-
-The RK3588 SoC family integrates the newer Synopsys DesignWare HDMI 2.1
-Quad-Pixel (QP) TX controller IP and a HDMI/eDP TX Combo PHY based on a
-Samsung IP block.
-
-Add just the basic support for now, i.e. RGB output up to 4K@60Hz,
-without audio, CEC or any of the HDMI 2.1 specific features.
-
-Co-developed-by: Algea Cao <algea.cao@rock-chips.com>
-Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
-Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
----
- drivers/gpu/drm/rockchip/Kconfig               |   8 +
- drivers/gpu/drm/rockchip/Makefile              |   1 +
- drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 430 ++++++++++
- drivers/gpu/drm/rockchip/rockchip_drm_drv.c    |   2 +
- drivers/gpu/drm/rockchip/rockchip_drm_drv.h    |   1 +
- 5 files changed, 442 insertions(+)
-
-diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
-index 111111111111..222222222222 100644
---- a/drivers/gpu/drm/rockchip/Kconfig
-+++ b/drivers/gpu/drm/rockchip/Kconfig
-@@ -8,6 +8,7 @@ config DRM_ROCKCHIP
- 	select VIDEOMODE_HELPERS
- 	select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP
- 	select DRM_DW_HDMI if ROCKCHIP_DW_HDMI
-+	select DRM_DW_HDMI_QP if ROCKCHIP_DW_HDMI_QP
- 	select DRM_DW_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI
- 	select GENERIC_PHY if ROCKCHIP_DW_MIPI_DSI
- 	select GENERIC_PHY_MIPI_DPHY if ROCKCHIP_DW_MIPI_DSI
-@@ -63,6 +64,13 @@ config ROCKCHIP_DW_HDMI
- 	  enable HDMI on RK3288 or RK3399 based SoC, you should select
- 	  this option.
- 
-+config ROCKCHIP_DW_HDMI_QP
-+	bool "Rockchip specific extensions for Synopsys DW HDMI QP"
-+	help
-+	  This selects support for Rockchip SoC specific extensions
-+	  for the Synopsys DesignWare HDMI QP driver. If you want to
-+	  enable HDMI on RK3588 based SoC, you should select this option.
-+
- config ROCKCHIP_DW_MIPI_DSI
- 	bool "Rockchip specific extensions for Synopsys DW MIPI DSI"
- 	select GENERIC_PHY_MIPI_DPHY
-diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
-index 111111111111..222222222222 100644
---- a/drivers/gpu/drm/rockchip/Makefile
-+++ b/drivers/gpu/drm/rockchip/Makefile
-@@ -11,6 +11,7 @@ rockchipdrm-$(CONFIG_ROCKCHIP_VOP) += rockchip_drm_vop.o rockchip_vop_reg.o
- rockchipdrm-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o
- rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o
- rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
-+rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI_QP) += dw_hdmi_qp-rockchip.o
- rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi-rockchip.o
- rockchipdrm-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o
- rockchipdrm-$(CONFIG_ROCKCHIP_LVDS) += rockchip_lvds.o
-diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
-@@ -0,0 +1,430 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * Copyright (c) 2021-2022 Rockchip Electronics Co., Ltd.
-+ * Copyright (c) 2024 Collabora Ltd.
-+ *
-+ * Author: Algea Cao <algea.cao@rock-chips.com>
-+ * Author: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/mfd/syscon.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/phy/phy.h>
-+#include <linux/regmap.h>
-+
-+#include <drm/bridge/dw_hdmi_qp.h>
-+#include <drm/drm_bridge_connector.h>
-+#include <drm/drm_of.h>
-+#include <drm/drm_probe_helper.h>
-+#include <drm/drm_simple_kms_helper.h>
-+
-+#include "rockchip_drm_drv.h"
-+
-+#define RK3588_GRF_SOC_CON2		0x0308
-+#define RK3588_HDMI0_HPD_INT_MSK	BIT(13)
-+#define RK3588_HDMI0_HPD_INT_CLR	BIT(12)
-+#define RK3588_GRF_SOC_CON7		0x031c
-+#define RK3588_SET_HPD_PATH_MASK	GENMASK(13, 12)
-+#define RK3588_GRF_SOC_STATUS1		0x0384
-+#define RK3588_HDMI0_LEVEL_INT		BIT(16)
-+#define RK3588_GRF_VO1_CON3		0x000c
-+#define RK3588_SCLIN_MASK		BIT(9)
-+#define RK3588_SDAIN_MASK		BIT(10)
-+#define RK3588_MODE_MASK		BIT(11)
-+#define RK3588_I2S_SEL_MASK		BIT(13)
-+#define RK3588_GRF_VO1_CON9		0x0024
-+#define RK3588_HDMI0_GRANT_SEL		BIT(10)
-+
-+#define HIWORD_UPDATE(val, mask)	((val) | (mask) << 16)
-+
-+struct rockchip_hdmi_qp {
-+	struct device *dev;
-+	struct regmap *regmap;
-+	struct regmap *vo1_regmap;
-+	struct rockchip_encoder encoder;
-+	struct dw_hdmi_qp *hdmi;
-+	struct phy *phy;
-+	struct gpio_desc *enable_gpio;
-+	struct delayed_work hpd_work;
-+};
-+
-+static struct rockchip_hdmi_qp *to_rockchip_hdmi_qp(struct drm_encoder *encoder)
-+{
-+	struct rockchip_encoder *rkencoder = to_rockchip_encoder(encoder);
-+
-+	return container_of(rkencoder, struct rockchip_hdmi_qp, encoder);
-+}
-+
-+static void
-+dw_hdmi_qp_rockchip_encoder_mode_set(struct drm_encoder *encoder,
-+				     struct drm_display_mode *mode,
-+				     struct drm_display_mode *adj_mode)
-+{
-+	struct rockchip_hdmi_qp *hdmi = to_rockchip_hdmi_qp(encoder);
-+
-+	dw_hdmi_qp_set_refclk_rate(hdmi->hdmi, adj_mode->clock * 1000);
-+}
-+
-+static void dw_hdmi_qp_rockchip_encoder_enable(struct drm_encoder *encoder)
-+{
-+	struct rockchip_hdmi_qp *hdmi = to_rockchip_hdmi_qp(encoder);
-+	struct drm_crtc *crtc = encoder->crtc;
-+	int rate;
-+
-+	/* Unconditionally switch to TMDS as FRL is not yet supported */
-+	gpiod_set_value(hdmi->enable_gpio, 1);
-+
-+	if (crtc && crtc->state) {
-+		dw_hdmi_qp_set_refclk_rate(hdmi->hdmi,
-+					   crtc->state->adjusted_mode.crtc_clock * 1000);
-+		/*
-+		 * FIXME: Temporary workaround to pass pixel clock rate
-+		 * to the PHY driver until phy_configure_opts_hdmi
-+		 * becomes available in the PHY API. See also the related
-+		 * comment in rk_hdptx_phy_power_on() from
-+		 * drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
-+		 */
-+		rate = crtc->state->mode.clock * 10;
-+		phy_set_bus_width(hdmi->phy, rate);
-+		drm_dbg(hdmi, "%s set bus_width=%u\n", __func__, rate);
-+	}
-+}
-+
-+static int
-+dw_hdmi_qp_rockchip_encoder_atomic_check(struct drm_encoder *encoder,
-+					 struct drm_crtc_state *crtc_state,
-+					 struct drm_connector_state *conn_state)
-+{
-+	struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc_state);
-+
-+	s->output_mode = ROCKCHIP_OUT_MODE_AAAA;
-+	s->output_type = DRM_MODE_CONNECTOR_HDMIA;
-+
-+	return 0;
-+}
-+
-+static const struct
-+drm_encoder_helper_funcs dw_hdmi_qp_rockchip_encoder_helper_funcs = {
-+	.mode_set	= dw_hdmi_qp_rockchip_encoder_mode_set,
-+	.enable		= dw_hdmi_qp_rockchip_encoder_enable,
-+	.atomic_check	= dw_hdmi_qp_rockchip_encoder_atomic_check,
-+};
-+
-+static int dw_hdmi_qp_rk3588_phy_init(struct dw_hdmi_qp *dw_hdmi, void *data,
-+				      const struct drm_display_info *display)
-+{
-+	struct rockchip_hdmi_qp *hdmi = (struct rockchip_hdmi_qp *)data;
-+
-+	dw_hdmi_qp_set_high_tmds_clock_ratio(dw_hdmi, display);
-+
-+	return phy_power_on(hdmi->phy);
-+}
-+
-+static void dw_hdmi_qp_rk3588_phy_disable(struct dw_hdmi_qp *dw_hdmi,
-+					  void *data)
-+{
-+	struct rockchip_hdmi_qp *hdmi = (struct rockchip_hdmi_qp *)data;
-+
-+	phy_power_off(hdmi->phy);
-+}
-+
-+static enum drm_connector_status
-+dw_hdmi_qp_rk3588_read_hpd(struct dw_hdmi_qp *dw_hdmi, void *data)
-+{
-+	struct rockchip_hdmi_qp *hdmi = (struct rockchip_hdmi_qp *)data;
-+	u32 val;
-+
-+	regmap_read(hdmi->regmap, RK3588_GRF_SOC_STATUS1, &val);
-+
-+	return val & RK3588_HDMI0_LEVEL_INT ?
-+		connector_status_connected : connector_status_disconnected;
-+}
-+
-+static void dw_hdmi_qp_rk3588_setup_hpd(struct dw_hdmi_qp *dw_hdmi, void *data)
-+{
-+	struct rockchip_hdmi_qp *hdmi = (struct rockchip_hdmi_qp *)data;
-+
-+	regmap_write(hdmi->regmap,
-+		     RK3588_GRF_SOC_CON2,
-+		     HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_CLR,
-+				   RK3588_HDMI0_HPD_INT_CLR |
-+				   RK3588_HDMI0_HPD_INT_MSK));
-+}
-+
-+static const struct dw_hdmi_qp_phy_ops rk3588_hdmi_phy_ops = {
-+	.init		= dw_hdmi_qp_rk3588_phy_init,
-+	.disable	= dw_hdmi_qp_rk3588_phy_disable,
-+	.read_hpd	= dw_hdmi_qp_rk3588_read_hpd,
-+	.setup_hpd	= dw_hdmi_qp_rk3588_setup_hpd,
-+};
-+
-+static void dw_hdmi_qp_rk3588_hpd_work(struct work_struct *work)
-+{
-+	struct rockchip_hdmi_qp *hdmi = container_of(work,
-+						     struct rockchip_hdmi_qp,
-+						     hpd_work.work);
-+	struct drm_device *drm = hdmi->encoder.encoder.dev;
-+	bool changed;
-+
-+	if (drm) {
-+		changed = drm_helper_hpd_irq_event(drm);
-+		if (changed)
-+			drm_dbg(hdmi, "connector status changed\n");
-+	}
-+}
-+
-+static irqreturn_t dw_hdmi_qp_rk3588_hardirq(int irq, void *dev_id)
-+{
-+	struct rockchip_hdmi_qp *hdmi = dev_id;
-+	u32 intr_stat, val;
-+
-+	regmap_read(hdmi->regmap, RK3588_GRF_SOC_STATUS1, &intr_stat);
-+
-+	if (intr_stat) {
-+		val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_MSK,
-+				    RK3588_HDMI0_HPD_INT_MSK);
-+		regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON2, val);
-+		return IRQ_WAKE_THREAD;
-+	}
-+
-+	return IRQ_NONE;
-+}
-+
-+static irqreturn_t dw_hdmi_qp_rk3588_irq(int irq, void *dev_id)
-+{
-+	struct rockchip_hdmi_qp *hdmi = dev_id;
-+	u32 intr_stat, val;
-+	int debounce_ms;
-+
-+	regmap_read(hdmi->regmap, RK3588_GRF_SOC_STATUS1, &intr_stat);
-+	if (!intr_stat)
-+		return IRQ_NONE;
-+
-+	val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_CLR,
-+			    RK3588_HDMI0_HPD_INT_CLR);
-+	regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON2, val);
-+
-+	debounce_ms = intr_stat & RK3588_HDMI0_LEVEL_INT ? 150 : 20;
-+	mod_delayed_work(system_wq, &hdmi->hpd_work,
-+			 msecs_to_jiffies(debounce_ms));
-+
-+	val |= HIWORD_UPDATE(0, RK3588_HDMI0_HPD_INT_MSK);
-+	regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON2, val);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static const struct of_device_id dw_hdmi_qp_rockchip_dt_ids[] = {
-+	{ .compatible = "rockchip,rk3588-dw-hdmi-qp",
-+	  .data = &rk3588_hdmi_phy_ops },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, dw_hdmi_qp_rockchip_dt_ids);
-+
-+static int dw_hdmi_qp_rockchip_bind(struct device *dev, struct device *master,
-+				    void *data)
-+{
-+	static const char * const clk_names[] = { "hdp", "hclk_vo1" };
-+	struct platform_device *pdev = to_platform_device(dev);
-+	struct dw_hdmi_qp_plat_data plat_data;
-+	struct drm_device *drm = data;
-+	struct drm_connector *connector;
-+	struct drm_encoder *encoder;
-+	struct rockchip_hdmi_qp *hdmi;
-+	struct clk *clk;
-+	int ret, irq, i;
-+	u32 val;
-+
-+	if (!pdev->dev.of_node)
-+		return -ENODEV;
-+
-+	hdmi = devm_kzalloc(&pdev->dev, sizeof(*hdmi), GFP_KERNEL);
-+	if (!hdmi)
-+		return -ENOMEM;
-+
-+	plat_data.phy_ops = of_device_get_match_data(dev);
-+	if (!plat_data.phy_ops)
-+		return -ENODEV;
-+
-+	plat_data.phy_data = hdmi;
-+	hdmi->dev = &pdev->dev;
-+
-+	encoder = &hdmi->encoder.encoder;
-+	encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node);
-+
-+	rockchip_drm_encoder_set_crtc_endpoint_id(&hdmi->encoder,
-+						  dev->of_node, 0, 0);
-+	/*
-+	 * If we failed to find the CRTC(s) which this encoder is
-+	 * supposed to be connected to, it's because the CRTC has
-+	 * not been registered yet.  Defer probing, and hope that
-+	 * the required CRTC is added later.
-+	 */
-+	if (encoder->possible_crtcs == 0)
-+		return -EPROBE_DEFER;
-+
-+	hdmi->regmap = syscon_regmap_lookup_by_phandle(dev->of_node,
-+						       "rockchip,grf");
-+	if (IS_ERR(hdmi->regmap)) {
-+		drm_err(hdmi, "Unable to get rockchip,grf\n");
-+		return PTR_ERR(hdmi->regmap);
-+	}
-+
-+	hdmi->vo1_regmap = syscon_regmap_lookup_by_phandle(dev->of_node,
-+							   "rockchip,vo1_grf");
-+	if (IS_ERR(hdmi->vo1_regmap)) {
-+		drm_err(hdmi, "Unable to get rockchip,vo1_grf\n");
-+		return PTR_ERR(hdmi->vo1_regmap);
-+	}
-+
-+	for (i = 0; i < ARRAY_SIZE(clk_names); i++) {
-+		clk = devm_clk_get_optional_enabled(hdmi->dev, clk_names[i]);
-+
-+		if (IS_ERR(clk)) {
-+			ret = PTR_ERR(clk);
-+			if (ret != -EPROBE_DEFER)
-+				drm_err(hdmi, "Failed to get %s clock: %d\n",
-+					clk_names[i], ret);
-+			return ret;
-+		}
-+	}
-+
-+	hdmi->enable_gpio = devm_gpiod_get_optional(hdmi->dev, "enable",
-+						    GPIOD_OUT_HIGH);
-+	if (IS_ERR(hdmi->enable_gpio)) {
-+		ret = PTR_ERR(hdmi->enable_gpio);
-+		drm_err(hdmi, "Failed to request enable GPIO: %d\n", ret);
-+		return ret;
-+	}
-+
-+	hdmi->phy = devm_phy_get(dev, "hdmi");
-+	if (IS_ERR(hdmi->phy)) {
-+		ret = PTR_ERR(hdmi->phy);
-+		if (ret != -EPROBE_DEFER)
-+			drm_err(hdmi, "failed to get phy: %d\n", ret);
-+		return ret;
-+	}
-+
-+	val = HIWORD_UPDATE(RK3588_SCLIN_MASK, RK3588_SCLIN_MASK) |
-+	      HIWORD_UPDATE(RK3588_SDAIN_MASK, RK3588_SDAIN_MASK) |
-+	      HIWORD_UPDATE(RK3588_MODE_MASK, RK3588_MODE_MASK) |
-+	      HIWORD_UPDATE(RK3588_I2S_SEL_MASK, RK3588_I2S_SEL_MASK);
-+	regmap_write(hdmi->vo1_regmap, RK3588_GRF_VO1_CON3, val);
-+
-+	val = HIWORD_UPDATE(RK3588_SET_HPD_PATH_MASK,
-+			    RK3588_SET_HPD_PATH_MASK);
-+	regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON7, val);
-+
-+	val = HIWORD_UPDATE(RK3588_HDMI0_GRANT_SEL,
-+			    RK3588_HDMI0_GRANT_SEL);
-+	regmap_write(hdmi->vo1_regmap, RK3588_GRF_VO1_CON9, val);
-+
-+	val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_MSK, RK3588_HDMI0_HPD_INT_MSK);
-+	regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON2, val);
-+
-+	INIT_DELAYED_WORK(&hdmi->hpd_work, dw_hdmi_qp_rk3588_hpd_work);
-+
-+	irq = platform_get_irq_byname(pdev, "hpd");
-+	if (irq < 0)
-+		return irq;
-+
-+	ret = devm_request_threaded_irq(hdmi->dev, irq,
-+					dw_hdmi_qp_rk3588_hardirq,
-+					dw_hdmi_qp_rk3588_irq,
-+					IRQF_SHARED, "dw-hdmi-qp-hpd",
-+					hdmi);
-+	if (ret)
-+		return ret;
-+
-+	drm_encoder_helper_add(encoder, &dw_hdmi_qp_rockchip_encoder_helper_funcs);
-+	drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);
-+
-+	platform_set_drvdata(pdev, hdmi);
-+
-+	hdmi->hdmi = dw_hdmi_qp_bind(pdev, encoder, &plat_data);
-+	if (IS_ERR(hdmi->hdmi)) {
-+		ret = PTR_ERR(hdmi->hdmi);
-+		drm_encoder_cleanup(encoder);
-+		return ret;
-+	}
-+
-+	connector = drm_bridge_connector_init(drm, encoder);
-+	if (IS_ERR(connector)) {
-+		ret = PTR_ERR(connector);
-+		drm_err(hdmi, "failed to init bridge connector: %d\n", ret);
-+		return ret;
-+	}
-+
-+	return drm_connector_attach_encoder(connector, encoder);
-+}
-+
-+static void dw_hdmi_qp_rockchip_unbind(struct device *dev,
-+				       struct device *master,
-+				       void *data)
-+{
-+	struct rockchip_hdmi_qp *hdmi = dev_get_drvdata(dev);
-+
-+	cancel_delayed_work_sync(&hdmi->hpd_work);
-+	dw_hdmi_qp_unbind(hdmi->hdmi);
-+
-+	drm_encoder_cleanup(&hdmi->encoder.encoder);
-+}
-+
-+static const struct component_ops dw_hdmi_qp_rockchip_ops = {
-+	.bind	= dw_hdmi_qp_rockchip_bind,
-+	.unbind	= dw_hdmi_qp_rockchip_unbind,
-+};
-+
-+static int dw_hdmi_qp_rockchip_probe(struct platform_device *pdev)
-+{
-+	return component_add(&pdev->dev, &dw_hdmi_qp_rockchip_ops);
-+}
-+
-+static void dw_hdmi_qp_rockchip_remove(struct platform_device *pdev)
-+{
-+	component_del(&pdev->dev, &dw_hdmi_qp_rockchip_ops);
-+}
-+
-+static int __maybe_unused dw_hdmi_qp_rockchip_resume(struct device *dev)
-+{
-+	struct rockchip_hdmi_qp *hdmi = dev_get_drvdata(dev);
-+	u32 val;
-+
-+	val = HIWORD_UPDATE(RK3588_SCLIN_MASK, RK3588_SCLIN_MASK) |
-+	      HIWORD_UPDATE(RK3588_SDAIN_MASK, RK3588_SDAIN_MASK) |
-+	      HIWORD_UPDATE(RK3588_MODE_MASK, RK3588_MODE_MASK) |
-+	      HIWORD_UPDATE(RK3588_I2S_SEL_MASK, RK3588_I2S_SEL_MASK);
-+	regmap_write(hdmi->vo1_regmap, RK3588_GRF_VO1_CON3, val);
-+
-+	val = HIWORD_UPDATE(RK3588_SET_HPD_PATH_MASK,
-+			    RK3588_SET_HPD_PATH_MASK);
-+	regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON7, val);
-+
-+	val = HIWORD_UPDATE(RK3588_HDMI0_GRANT_SEL,
-+			    RK3588_HDMI0_GRANT_SEL);
-+	regmap_write(hdmi->vo1_regmap, RK3588_GRF_VO1_CON9, val);
-+
-+	dw_hdmi_qp_resume(dev, hdmi->hdmi);
-+
-+	if (hdmi->encoder.encoder.dev)
-+		drm_helper_hpd_irq_event(hdmi->encoder.encoder.dev);
-+
-+	return 0;
-+}
-+
-+static const struct dev_pm_ops dw_hdmi_qp_rockchip_pm = {
-+	SET_SYSTEM_SLEEP_PM_OPS(NULL, dw_hdmi_qp_rockchip_resume)
-+};
-+
-+struct platform_driver dw_hdmi_qp_rockchip_pltfm_driver = {
-+	.probe  = dw_hdmi_qp_rockchip_probe,
-+	.remove_new = dw_hdmi_qp_rockchip_remove,
-+	.driver = {
-+		.name = "dwhdmiqp-rockchip",
-+		.pm = &dw_hdmi_qp_rockchip_pm,
-+		.of_match_table = dw_hdmi_qp_rockchip_dt_ids,
-+	},
-+};
-diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
-index 111111111111..222222222222 100644
---- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
-+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
-@@ -507,6 +507,8 @@ static int __init rockchip_drm_init(void)
- 	ADD_ROCKCHIP_SUB_DRIVER(cdn_dp_driver, CONFIG_ROCKCHIP_CDN_DP);
- 	ADD_ROCKCHIP_SUB_DRIVER(dw_hdmi_rockchip_pltfm_driver,
- 				CONFIG_ROCKCHIP_DW_HDMI);
-+	ADD_ROCKCHIP_SUB_DRIVER(dw_hdmi_qp_rockchip_pltfm_driver,
-+				CONFIG_ROCKCHIP_DW_HDMI_QP);
- 	ADD_ROCKCHIP_SUB_DRIVER(dw_mipi_dsi_rockchip_driver,
- 				CONFIG_ROCKCHIP_DW_MIPI_DSI);
- 	ADD_ROCKCHIP_SUB_DRIVER(inno_hdmi_driver, CONFIG_ROCKCHIP_INNO_HDMI);
-diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
-index 111111111111..222222222222 100644
---- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
-+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
-@@ -88,6 +88,7 @@ int rockchip_drm_encoder_set_crtc_endpoint_id(struct rockchip_encoder *rencoder,
- int rockchip_drm_endpoint_is_subdriver(struct device_node *ep);
- extern struct platform_driver cdn_dp_driver;
- extern struct platform_driver dw_hdmi_rockchip_pltfm_driver;
-+extern struct platform_driver dw_hdmi_qp_rockchip_pltfm_driver;
- extern struct platform_driver dw_mipi_dsi_rockchip_driver;
- extern struct platform_driver inno_hdmi_driver;
- extern struct platform_driver rockchip_dp_driver;
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
-Date: Thu, 11 Jul 2024 14:48:43 +0300
-Subject: arm64: defconfig: Enable Rockchip extensions for Synopsys DW HDMI QP
-
-Enable Rockchip specific extensions for the Synopsys DesignWare HDMI QP
-driver.
-
-This is needed for the HDMI output support on RK3588 SoC based boards.
-
-Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
----
- arch/arm64/configs/defconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
-index 111111111111..222222222222 100644
---- a/arch/arm64/configs/defconfig
-+++ b/arch/arm64/configs/defconfig
-@@ -865,6 +865,7 @@ CONFIG_ROCKCHIP_VOP2=y
- CONFIG_ROCKCHIP_ANALOGIX_DP=y
- CONFIG_ROCKCHIP_CDN_DP=y
- CONFIG_ROCKCHIP_DW_HDMI=y
-+CONFIG_ROCKCHIP_DW_HDMI_QP=y
- CONFIG_ROCKCHIP_DW_MIPI_DSI=y
- CONFIG_ROCKCHIP_INNO_HDMI=y
- CONFIG_ROCKCHIP_LVDS=y
--- 
-Armbian
-
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/1023-arm64-dts-rockchip-add-PCIe-for-M.2-E-Key-to-rock-5a.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1023-arm64-dts-rockchip-add-PCIe-for-M.2-E-Key-to-rock-5a.patch
deleted file mode 100644
index bd33b5976c41..000000000000
--- a/patch/kernel/archive/rockchip-rk3588-6.12/1023-arm64-dts-rockchip-add-PCIe-for-M.2-E-Key-to-rock-5a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: amazingfate <liujianfeng1994@gmail.com>
-Date: Thu, 28 Mar 2024 16:07:18 +0800
-Subject: arm64: dts: rockchip: add PCIe for M.2 E-Key to rock-5a
-
----
- arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
-@@ -115,6 +115,10 @@ vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
- 	};
- };
- 
-+&combphy0_ps {
-+	status = "okay";
-+};
-+
- &combphy2_psu {
- 	status = "okay";
- };
-@@ -299,6 +303,11 @@ rgmii_phy1: ethernet-phy@1 {
- 	};
- };
- 
-+&pcie2x1l2 {
-+	status = "okay";
-+	reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>;
-+};
-+
- &pinctrl {
- 	leds {
- 		io_led: io-led {
--- 
-Armbian
-
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/1051-arm64-dts-rockchip-nanopct6-lts-and-fixes-v6.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1051-arm64-dts-rockchip-nanopct6-lts-and-fixes-v6.patch
deleted file mode 100644
index eb1dce1ab39e..000000000000
--- a/patch/kernel/archive/rockchip-rk3588-6.12/1051-arm64-dts-rockchip-nanopct6-lts-and-fixes-v6.patch
+++ /dev/null
@@ -1,2540 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-Date: Thu, 29 Aug 2024 14:26:53 +0200
-Subject: arm64: dts: rockchip: prepare NanoPC-T6 for LTS board
-
-FriendlyELEC introduced a second version of NanoPC-T6 SBC.
-
-Create common include file and make NanoPC-T6 use it. Following
-patches will add LTS version.
-
-Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
----
- arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts  | 932 +--------
- arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 945 ++++++++++
- 2 files changed, 947 insertions(+), 930 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
-@@ -2,944 +2,16 @@
- /*
-  * Copyright (c) 2021 Rockchip Electronics Co., Ltd.
-  * Copyright (c) 2023 Thomas McKahan
-+ * Copyright (c) 2024 Linaro Ltd.
-  *
-  */
- 
- /dts-v1/;
- 
--#include <dt-bindings/gpio/gpio.h>
--#include <dt-bindings/pinctrl/rockchip.h>
--#include <dt-bindings/usb/pd.h>
--#include "rk3588.dtsi"
-+#include "rk3588-nanopc-t6.dtsi"
- 
- / {
- 	model = "FriendlyElec NanoPC-T6";
- 	compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588";
- 
--	aliases {
--		mmc0 = &sdhci;
--		mmc1 = &sdmmc;
--	};
--
--	chosen {
--		stdout-path = "serial2:1500000n8";
--	};
--
--	leds {
--		compatible = "gpio-leds";
--
--		sys_led: led-0 {
--			gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
--			label = "system-led";
--			linux,default-trigger = "heartbeat";
--			pinctrl-names = "default";
--			pinctrl-0 = <&sys_led_pin>;
--		};
--
--		usr_led: led-1 {
--			gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
--			label = "user-led";
--			pinctrl-names = "default";
--			pinctrl-0 = <&usr_led_pin>;
--		};
--	};
--
--	sound {
--		compatible = "simple-audio-card";
--		pinctrl-names = "default";
--		pinctrl-0 = <&hp_det>;
--
--		simple-audio-card,name = "realtek,rt5616-codec";
--		simple-audio-card,format = "i2s";
--		simple-audio-card,mclk-fs = <256>;
--
--		simple-audio-card,hp-det-gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_LOW>;
--		simple-audio-card,hp-pin-name = "Headphones";
--
--		simple-audio-card,widgets =
--			"Headphone", "Headphones",
--			"Microphone", "Microphone Jack";
--		simple-audio-card,routing =
--			"Headphones", "HPOL",
--			"Headphones", "HPOR",
--			"MIC1", "Microphone Jack",
--			"Microphone Jack", "micbias1";
--
--		simple-audio-card,cpu {
--			sound-dai = <&i2s0_8ch>;
--		};
--		simple-audio-card,codec {
--			sound-dai = <&rt5616>;
--		};
--	};
--
--	vcc12v_dcin: vcc12v-dcin-regulator {
--		compatible = "regulator-fixed";
--		regulator-name = "vcc12v_dcin";
--		regulator-always-on;
--		regulator-boot-on;
--		regulator-min-microvolt = <12000000>;
--		regulator-max-microvolt = <12000000>;
--	};
--
--	/* vcc5v0_sys powers peripherals */
--	vcc5v0_sys: vcc5v0-sys-regulator {
--		compatible = "regulator-fixed";
--		regulator-name = "vcc5v0_sys";
--		regulator-always-on;
--		regulator-boot-on;
--		regulator-min-microvolt = <5000000>;
--		regulator-max-microvolt = <5000000>;
--		vin-supply = <&vcc12v_dcin>;
--	};
--
--	/* vcc4v0_sys powers the RK806, RK860's */
--	vcc4v0_sys: vcc4v0-sys-regulator {
--		compatible = "regulator-fixed";
--		regulator-name = "vcc4v0_sys";
--		regulator-always-on;
--		regulator-boot-on;
--		regulator-min-microvolt = <4000000>;
--		regulator-max-microvolt = <4000000>;
--		vin-supply = <&vcc12v_dcin>;
--	};
--
--	vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
--		compatible = "regulator-fixed";
--		regulator-name = "vcc-1v1-nldo-s3";
--		regulator-always-on;
--		regulator-boot-on;
--		regulator-min-microvolt = <1100000>;
--		regulator-max-microvolt = <1100000>;
--		vin-supply = <&vcc4v0_sys>;
--	};
--
--	vcc_3v3_pcie20: vcc3v3-pcie20-regulator {
--		compatible = "regulator-fixed";
--		regulator-name = "vcc_3v3_pcie20";
--		regulator-always-on;
--		regulator-boot-on;
--		regulator-min-microvolt = <3300000>;
--		regulator-max-microvolt = <3300000>;
--		vin-supply = <&vcc_3v3_s3>;
--	};
--
--	vbus5v0_typec: vbus5v0-typec-regulator {
--		compatible = "regulator-fixed";
--		enable-active-high;
--		gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
--		pinctrl-names = "default";
--		pinctrl-0 = <&typec5v_pwren>;
--		regulator-name = "vbus5v0_typec";
--		regulator-min-microvolt = <5000000>;
--		regulator-max-microvolt = <5000000>;
--		vin-supply = <&vcc5v0_sys>;
--	};
--
--	vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {
--		compatible = "regulator-fixed";
--		enable-active-high;
--		gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;
--		pinctrl-names = "default";
--		pinctrl-0 = <&pcie_m2_1_pwren>;
--		regulator-name = "vcc3v3_pcie2x1l0";
--		regulator-min-microvolt = <3300000>;
--		regulator-max-microvolt = <3300000>;
--		vin-supply = <&vcc5v0_sys>;
--	};
--
--	vcc3v3_pcie30: vcc3v3-pcie30-regulator {
--		compatible = "regulator-fixed";
--		enable-active-high;
--		gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>;
--		pinctrl-names = "default";
--		pinctrl-0 = <&pcie_m2_0_pwren>;
--		regulator-name = "vcc3v3_pcie30";
--		regulator-min-microvolt = <3300000>;
--		regulator-max-microvolt = <3300000>;
--		vin-supply = <&vcc5v0_sys>;
--	};
--
--	vcc3v3_sd_s0: vcc3v3-sd-s0-regulator {
--		compatible = "regulator-fixed";
--		enable-active-low;
--		gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>;
--		regulator-boot-on;
--		regulator-max-microvolt = <3300000>;
--		regulator-min-microvolt = <3300000>;
--		regulator-name = "vcc3v3_sd_s0";
--		vin-supply = <&vcc_3v3_s3>;
--	};
--
--	vdd_4g_3v3: vdd-4g-3v3-regulator {
--		compatible = "regulator-fixed";
--		enable-active-high;
--		gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;
--		pinctrl-names = "default";
--		pinctrl-0 = <&pin_4g_lte_pwren>;
--		regulator-name = "vdd_4g_3v3";
--		regulator-min-microvolt = <3300000>;
--		regulator-max-microvolt = <3300000>;
--		vin-supply = <&vcc5v0_sys>;
--	};
--};
--
--&combphy0_ps {
--	status = "okay";
--};
--
--&combphy1_ps {
--	status = "okay";
--};
--
--&combphy2_psu {
--	status = "okay";
--};
--
--&cpu_l0 {
--	cpu-supply = <&vdd_cpu_lit_s0>;
--};
--
--&cpu_l1 {
--	cpu-supply = <&vdd_cpu_lit_s0>;
--};
--
--&cpu_l2 {
--	cpu-supply = <&vdd_cpu_lit_s0>;
--};
--
--&cpu_l3 {
--	cpu-supply = <&vdd_cpu_lit_s0>;
--};
--
--&cpu_b0 {
--	cpu-supply = <&vdd_cpu_big0_s0>;
--};
--
--&cpu_b1 {
--	cpu-supply = <&vdd_cpu_big0_s0>;
--};
--
--&cpu_b2 {
--	cpu-supply = <&vdd_cpu_big1_s0>;
--};
--
--&cpu_b3 {
--	cpu-supply = <&vdd_cpu_big1_s0>;
--};
--
--&gpio0 {
--	gpio-line-names = /* GPIO0 A0-A7 */
--			  "", "", "", "",
--			  "", "", "", "",
--			  /* GPIO0 B0-B7 */
--			  "", "", "", "",
--			  "", "", "", "",
--			  /* GPIO0 C0-C7 */
--			  "", "", "", "",
--			  "HEADER_10", "HEADER_08", "HEADER_32", "",
--			  /* GPIO0 D0-D7 */
--			  "", "", "", "",
--			  "", "", "", "";
--};
--
--&gpio1 {
--	gpio-line-names = /* GPIO1 A0-A7 */
--			  "HEADER_27", "HEADER_28", "", "",
--			  "", "", "", "HEADER_15",
--			  /* GPIO1 B0-B7 */
--			  "HEADER_26", "HEADER_21", "HEADER_19", "HEADER_23",
--			  "HEADER_24", "HEADER_22", "", "",
--			  /* GPIO1 C0-C7 */
--			  "", "", "", "",
--			  "", "", "", "",
--			  /* GPIO1 D0-D7 */
--			  "", "", "", "",
--			  "", "", "HEADER_05", "HEADER_03";
--};
--
--&gpio2 {
--	gpio-line-names = /* GPIO2 A0-A7 */
--			  "", "", "", "",
--			  "", "", "", "",
--			  /* GPIO2 B0-B7 */
--			  "", "", "", "",
--			  "", "", "", "",
--			  /* GPIO2 C0-C7 */
--			  "", "CSI1_11", "CSI1_12", "",
--			  "", "", "", "",
--			  /* GPIO2 D0-D7 */
--			  "", "", "", "",
--			  "", "", "", "";
--};
--
--&gpio3 {
--	gpio-line-names = /* GPIO3 A0-A7 */
--			  "HEADER_35", "HEADER_38", "HEADER_40", "HEADER_36",
--			  "HEADER_37", "", "DSI0_12", "",
--			  /* GPIO3 B0-B7 */
--			  "HEADER_33", "DSI0_10", "HEADER_07", "HEADER_16",
--			  "HEADER_18", "HEADER_29", "HEADER_31", "HEADER_12",
--			  /* GPIO3 C0-C7 */
--			  "DSI0_08", "DSI0_14", "HEADER_11", "HEADER_13",
--			  "", "", "", "",
--			  /* GPIO3 D0-D7 */
--			  "", "", "", "",
--			  "", "DSI1_10", "", "";
--};
--
--&gpio4 {
--	gpio-line-names = /* GPIO4 A0-A7 */
--			  "DSI1_08", "DSI1_14", "", "DSI1_12",
--			  "", "", "", "",
--			  /* GPIO4 B0-B7 */
--			  "", "", "", "",
--			  "", "", "", "",
--			  /* GPIO4 C0-C7 */
--			  "", "", "", "",
--			  "CSI0_11", "CSI0_12", "", "",
--			  /* GPIO4 D0-D7 */
--			  "", "", "", "",
--			  "", "", "", "";
--};
--
--&i2c0 {
--	pinctrl-names = "default";
--	pinctrl-0 = <&i2c0m2_xfer>;
--	status = "okay";
--
--	vdd_cpu_big0_s0: regulator@42 {
--		compatible = "rockchip,rk8602";
--		reg = <0x42>;
--		fcs,suspend-voltage-selector = <1>;
--		regulator-name = "vdd_cpu_big0_s0";
--		regulator-always-on;
--		regulator-boot-on;
--		regulator-min-microvolt = <550000>;
--		regulator-max-microvolt = <1050000>;
--		regulator-ramp-delay = <2300>;
--		vin-supply = <&vcc4v0_sys>;
--
--		regulator-state-mem {
--			regulator-off-in-suspend;
--		};
--	};
--
--	vdd_cpu_big1_s0: regulator@43 {
--		compatible = "rockchip,rk8603", "rockchip,rk8602";
--		reg = <0x43>;
--		fcs,suspend-voltage-selector = <1>;
--		regulator-name = "vdd_cpu_big1_s0";
--		regulator-always-on;
--		regulator-boot-on;
--		regulator-min-microvolt = <550000>;
--		regulator-max-microvolt = <1050000>;
--		regulator-ramp-delay = <2300>;
--		vin-supply = <&vcc4v0_sys>;
--
--		regulator-state-mem {
--			regulator-off-in-suspend;
--		};
--	};
--};
--
--&i2c2 {
--	status = "okay";
--
--	vdd_npu_s0: regulator@42 {
--		compatible = "rockchip,rk8602";
--		reg = <0x42>;
--		rockchip,suspend-voltage-selector = <1>;
--		regulator-name = "vdd_npu_s0";
--		regulator-always-on;
--		regulator-boot-on;
--		regulator-min-microvolt = <550000>;
--		regulator-max-microvolt = <950000>;
--		regulator-ramp-delay = <2300>;
--		vin-supply = <&vcc4v0_sys>;
--
--		regulator-state-mem {
--			regulator-off-in-suspend;
--		};
--	};
--};
--
--&i2c6 {
--	clock-frequency = <200000>;
--	status = "okay";
--
--	fusb302: typec-portc@22 {
--		compatible = "fcs,fusb302";
--		reg = <0x22>;
--		interrupt-parent = <&gpio0>;
--		interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>;
--		pinctrl-0 = <&usbc0_int>;
--		pinctrl-names = "default";
--		vbus-supply = <&vbus5v0_typec>;
--
--		connector {
--			compatible = "usb-c-connector";
--			data-role = "dual";
--			label = "USB-C";
--			power-role = "dual";
--			try-power-role = "sink";
--			source-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)>;
--			sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
--			op-sink-microwatt = <1000000>;
--		};
--	};
--
--	hym8563: rtc@51 {
--		compatible = "haoyu,hym8563";
--		reg = <0x51>;
--		#clock-cells = <0>;
--		clock-output-names = "hym8563";
--		pinctrl-names = "default";
--		pinctrl-0 = <&hym8563_int>;
--		interrupt-parent = <&gpio0>;
--		interrupts = <RK_PB0 IRQ_TYPE_LEVEL_LOW>;
--		wakeup-source;
--	};
--};
--
--&i2c7 {
--	clock-frequency = <200000>;
--	status = "okay";
--
--	rt5616: codec@1b {
--		compatible = "realtek,rt5616";
--		reg = <0x1b>;
--		clocks = <&cru I2S0_8CH_MCLKOUT>;
--		clock-names = "mclk";
--		#sound-dai-cells = <0>;
--		assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;
--		assigned-clock-rates = <12288000>;
--
--		port {
--			rt5616_p0_0: endpoint {
--				remote-endpoint = <&i2s0_8ch_p0_0>;
--			};
--		};
--	};
--
--	/* connected with MIPI-CSI1 */
--};
--
--&i2c8 {
--	pinctrl-0 = <&i2c8m2_xfer>;
--};
--
--&i2s0_8ch {
--	pinctrl-names = "default";
--	pinctrl-0 = <&i2s0_lrck
--		     &i2s0_mclk
--		     &i2s0_sclk
--		     &i2s0_sdi0
--		     &i2s0_sdo0>;
--	status = "okay";
--
--	i2s0_8ch_p0: port {
--		i2s0_8ch_p0_0: endpoint {
--			dai-format = "i2s";
--			mclk-fs = <256>;
--			remote-endpoint = <&rt5616_p0_0>;
--		};
--	};
--};
--
--&pcie2x1l0 {
--	reset-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
--	vpcie3v3-supply = <&vcc_3v3_pcie20>;
--	pinctrl-names = "default";
--	pinctrl-0 = <&pcie2_0_rst>;
--	status = "okay";
--};
--
--&pcie2x1l1 {
--	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
--	vpcie3v3-supply = <&vcc3v3_pcie2x1l0>;
--	pinctrl-names = "default";
--	pinctrl-0 = <&pcie2_1_rst>;
--	status = "okay";
--};
--
--&pcie2x1l2 {
--	reset-gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>;
--	vpcie3v3-supply = <&vcc_3v3_pcie20>;
--	pinctrl-names = "default";
--	pinctrl-0 = <&pcie2_2_rst>;
--	status = "okay";
--};
--
--&pcie30phy {
--	status = "okay";
--};
--
--&pcie3x4 {
--	reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
--	vpcie3v3-supply = <&vcc3v3_pcie30>;
--	status = "okay";
--};
--
--&pinctrl {
--	gpio-leds {
--		sys_led_pin: sys-led-pin {
--			rockchip,pins = <2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
--		};
--
--		usr_led_pin: usr-led-pin {
--			rockchip,pins = <2 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;
--		};
--	};
--
--	headphone {
--		hp_det: hp-det {
--			rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
--		};
--	};
--
--	hym8563 {
--		hym8563_int: hym8563-int {
--			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
--		};
--	};
--
--	pcie {
--		pcie2_0_rst: pcie2-0-rst {
--			rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
--		};
--
--		pcie2_1_rst: pcie2-1-rst {
--			rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
--		};
--
--		pcie2_2_rst: pcie2-2-rst {
--			rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
--		};
--
--		pcie_m2_0_pwren: pcie-m20-pwren {
--			rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
--		};
--
--		pcie_m2_1_pwren: pcie-m21-pwren {
--			rockchip,pins = <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
--		};
--	};
--
--	usb {
--		pin_4g_lte_pwren: 4g-lte-pwren {
--			rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
--		};
--
--		typec5v_pwren: typec5v-pwren {
--			rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
--		};
--
--		usbc0_int: usbc0-int {
--			rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;
--		};
--	};
--};
--
--&pwm1 {
--	pinctrl-0 = <&pwm1m1_pins>;
--	status = "okay";
--};
--
--&saradc {
--	vref-supply = <&avcc_1v8_s0>;
--	status = "okay";
--};
--
--&sdhci {
--	bus-width = <8>;
--	no-sdio;
--	no-sd;
--	non-removable;
--	max-frequency = <200000000>;
--	mmc-hs400-1_8v;
--	mmc-hs400-enhanced-strobe;
--	status = "okay";
--};
--
--&sdmmc {
--	bus-width = <4>;
--	cap-mmc-highspeed;
--	cap-sd-highspeed;
--	cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
--	disable-wp;
--	no-mmc;
--	no-sdio;
--	sd-uhs-sdr104;
--	vmmc-supply = <&vcc3v3_sd_s0>;
--	vqmmc-supply = <&vccio_sd_s0>;
--	status = "okay";
--};
--
--&spi2 {
--	status = "okay";
--	assigned-clocks = <&cru CLK_SPI2>;
--	assigned-clock-rates = <200000000>;
--	pinctrl-names = "default";
--	pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>;
--	num-cs = <1>;
--
--	pmic@0 {
--		compatible = "rockchip,rk806";
--		spi-max-frequency = <1000000>;
--		reg = <0x0>;
--
--		interrupt-parent = <&gpio0>;
--		interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
--
--		pinctrl-names = "default";
--		pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>,
--			    <&rk806_dvs2_null>, <&rk806_dvs3_null>;
--
--		system-power-controller;
--
--		vcc1-supply = <&vcc4v0_sys>;
--		vcc2-supply = <&vcc4v0_sys>;
--		vcc3-supply = <&vcc4v0_sys>;
--		vcc4-supply = <&vcc4v0_sys>;
--		vcc5-supply = <&vcc4v0_sys>;
--		vcc6-supply = <&vcc4v0_sys>;
--		vcc7-supply = <&vcc4v0_sys>;
--		vcc8-supply = <&vcc4v0_sys>;
--		vcc9-supply = <&vcc4v0_sys>;
--		vcc10-supply = <&vcc4v0_sys>;
--		vcc11-supply = <&vcc_2v0_pldo_s3>;
--		vcc12-supply = <&vcc4v0_sys>;
--		vcc13-supply = <&vcc_1v1_nldo_s3>;
--		vcc14-supply = <&vcc_1v1_nldo_s3>;
--		vcca-supply = <&vcc4v0_sys>;
--
--		gpio-controller;
--		#gpio-cells = <2>;
--
--		rk806_dvs1_null: dvs1-null-pins {
--			pins = "gpio_pwrctrl1";
--			function = "pin_fun0";
--		};
--
--		rk806_dvs2_null: dvs2-null-pins {
--			pins = "gpio_pwrctrl2";
--			function = "pin_fun0";
--		};
--
--		rk806_dvs3_null: dvs3-null-pins {
--			pins = "gpio_pwrctrl3";
--			function = "pin_fun0";
--		};
--
--		regulators {
--			vdd_gpu_s0: vdd_gpu_mem_s0: dcdc-reg1 {
--				regulator-boot-on;
--				regulator-min-microvolt = <550000>;
--				regulator-max-microvolt = <950000>;
--				regulator-ramp-delay = <12500>;
--				regulator-name = "vdd_gpu_s0";
--				regulator-enable-ramp-delay = <400>;
--
--				regulator-state-mem {
--					regulator-off-in-suspend;
--				};
--			};
--
--			vdd_cpu_lit_s0: vdd_cpu_lit_mem_s0: dcdc-reg2 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <550000>;
--				regulator-max-microvolt = <950000>;
--				regulator-ramp-delay = <12500>;
--				regulator-name = "vdd_cpu_lit_s0";
--
--				regulator-state-mem {
--					regulator-off-in-suspend;
--				};
--			};
--
--			vdd_log_s0: dcdc-reg3 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <675000>;
--				regulator-max-microvolt = <750000>;
--				regulator-ramp-delay = <12500>;
--				regulator-name = "vdd_log_s0";
--
--				regulator-state-mem {
--					regulator-off-in-suspend;
--					regulator-suspend-microvolt = <750000>;
--				};
--			};
--
--			vdd_vdenc_s0: vdd_vdenc_mem_s0: dcdc-reg4 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <550000>;
--				regulator-max-microvolt = <950000>;
--				regulator-init-microvolt = <750000>;
--				regulator-ramp-delay = <12500>;
--				regulator-name = "vdd_vdenc_s0";
--
--				regulator-state-mem {
--					regulator-off-in-suspend;
--				};
--			};
--
--			vdd_ddr_s0: dcdc-reg5 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <675000>;
--				regulator-max-microvolt = <900000>;
--				regulator-ramp-delay = <12500>;
--				regulator-name = "vdd_ddr_s0";
--
--				regulator-state-mem {
--					regulator-off-in-suspend;
--					regulator-suspend-microvolt = <850000>;
--				};
--			};
--
--			vdd2_ddr_s3: dcdc-reg6 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-name = "vdd2_ddr_s3";
--
--				regulator-state-mem {
--					regulator-on-in-suspend;
--				};
--			};
--
--			vcc_2v0_pldo_s3: dcdc-reg7 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <2000000>;
--				regulator-max-microvolt = <2000000>;
--				regulator-ramp-delay = <12500>;
--				regulator-name = "vdd_2v0_pldo_s3";
--
--				regulator-state-mem {
--					regulator-on-in-suspend;
--					regulator-suspend-microvolt = <2000000>;
--				};
--			};
--
--			vcc_3v3_s3: dcdc-reg8 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <3300000>;
--				regulator-max-microvolt = <3300000>;
--				regulator-name = "vcc_3v3_s3";
--
--				regulator-state-mem {
--					regulator-on-in-suspend;
--					regulator-suspend-microvolt = <3300000>;
--				};
--			};
--
--			vddq_ddr_s0: dcdc-reg9 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-name = "vddq_ddr_s0";
--
--				regulator-state-mem {
--					regulator-off-in-suspend;
--				};
--			};
--
--			vcc_1v8_s3: dcdc-reg10 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <1800000>;
--				regulator-max-microvolt = <1800000>;
--				regulator-name = "vcc_1v8_s3";
--
--				regulator-state-mem {
--					regulator-on-in-suspend;
--					regulator-suspend-microvolt = <1800000>;
--				};
--			};
--
--			avcc_1v8_s0: pldo-reg1 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <1800000>;
--				regulator-max-microvolt = <1800000>;
--				regulator-name = "avcc_1v8_s0";
--
--				regulator-state-mem {
--					regulator-off-in-suspend;
--				};
--			};
--
--			vcc_1v8_s0: pldo-reg2 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <1800000>;
--				regulator-max-microvolt = <1800000>;
--				regulator-name = "vcc_1v8_s0";
--
--				regulator-state-mem {
--					regulator-off-in-suspend;
--					regulator-suspend-microvolt = <1800000>;
--				};
--			};
--
--			avdd_1v2_s0: pldo-reg3 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <1200000>;
--				regulator-max-microvolt = <1200000>;
--				regulator-name = "avdd_1v2_s0";
--
--				regulator-state-mem {
--					regulator-off-in-suspend;
--				};
--			};
--
--			vcc_3v3_s0: pldo-reg4 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <3300000>;
--				regulator-max-microvolt = <3300000>;
--				regulator-ramp-delay = <12500>;
--				regulator-name = "vcc_3v3_s0";
--
--				regulator-state-mem {
--					regulator-off-in-suspend;
--				};
--			};
--
--			vccio_sd_s0: pldo-reg5 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <1800000>;
--				regulator-max-microvolt = <3300000>;
--				regulator-ramp-delay = <12500>;
--				regulator-name = "vccio_sd_s0";
--
--				regulator-state-mem {
--					regulator-off-in-suspend;
--				};
--			};
--
--			pldo6_s3: pldo-reg6 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <1800000>;
--				regulator-max-microvolt = <1800000>;
--				regulator-name = "pldo6_s3";
--
--				regulator-state-mem {
--					regulator-on-in-suspend;
--					regulator-suspend-microvolt = <1800000>;
--				};
--			};
--
--			vdd_0v75_s3: nldo-reg1 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <750000>;
--				regulator-max-microvolt = <750000>;
--				regulator-name = "vdd_0v75_s3";
--
--				regulator-state-mem {
--					regulator-on-in-suspend;
--					regulator-suspend-microvolt = <750000>;
--				};
--			};
--
--			vdd_ddr_pll_s0: nldo-reg2 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <850000>;
--				regulator-max-microvolt = <850000>;
--				regulator-name = "vdd_ddr_pll_s0";
--
--				regulator-state-mem {
--					regulator-off-in-suspend;
--					regulator-suspend-microvolt = <850000>;
--				};
--			};
--
--			avdd_0v75_s0: nldo-reg3 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <750000>;
--				regulator-max-microvolt = <750000>;
--				regulator-name = "avdd_0v75_s0";
--
--				regulator-state-mem {
--					regulator-off-in-suspend;
--				};
--			};
--
--			vdd_0v85_s0: nldo-reg4 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <850000>;
--				regulator-max-microvolt = <850000>;
--				regulator-name = "vdd_0v85_s0";
--
--				regulator-state-mem {
--					regulator-off-in-suspend;
--				};
--			};
--
--			vdd_0v75_s0: nldo-reg5 {
--				regulator-always-on;
--				regulator-boot-on;
--				regulator-min-microvolt = <750000>;
--				regulator-max-microvolt = <750000>;
--				regulator-name = "vdd_0v75_s0";
--
--				regulator-state-mem {
--					regulator-off-in-suspend;
--				};
--			};
--		};
--	};
--};
--
--&tsadc {
--	status = "okay";
--};
--
--&uart2 {
--	pinctrl-0 = <&uart2m0_xfer>;
--	status = "okay";
--};
--
--&u2phy2_host {
--	phy-supply = <&vdd_4g_3v3>;
--	status = "okay";
--};
--
--&u2phy3_host {
--	status = "okay";
--};
--
--&u2phy2 {
--	status = "okay";
--};
--
--&u2phy3 {
--	status = "okay";
--};
--
--&usb_host0_ehci {
--	status = "okay";
--};
--
--&usb_host0_ohci {
--	status = "okay";
--};
--
--&usb_host1_ehci {
--	status = "okay";
--};
--
--&usb_host1_ohci {
--	status = "okay";
- };
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-@@ -0,0 +1,945 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+/*
-+ * Copyright (c) 2021 Rockchip Electronics Co., Ltd.
-+ * Copyright (c) 2023 Thomas McKahan
-+ *
-+ */
-+
-+/dts-v1/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/pinctrl/rockchip.h>
-+#include <dt-bindings/usb/pd.h>
-+#include "rk3588.dtsi"
-+
-+/ {
-+	model = "FriendlyElec NanoPC-T6";
-+	compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588";
-+
-+	aliases {
-+		mmc0 = &sdhci;
-+		mmc1 = &sdmmc;
-+	};
-+
-+	chosen {
-+		stdout-path = "serial2:1500000n8";
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		sys_led: led-0 {
-+			gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
-+			label = "system-led";
-+			linux,default-trigger = "heartbeat";
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sys_led_pin>;
-+		};
-+
-+		usr_led: led-1 {
-+			gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
-+			label = "user-led";
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&usr_led_pin>;
-+		};
-+	};
-+
-+	sound {
-+		compatible = "simple-audio-card";
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&hp_det>;
-+
-+		simple-audio-card,name = "realtek,rt5616-codec";
-+		simple-audio-card,format = "i2s";
-+		simple-audio-card,mclk-fs = <256>;
-+
-+		simple-audio-card,hp-det-gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_LOW>;
-+		simple-audio-card,hp-pin-name = "Headphones";
-+
-+		simple-audio-card,widgets =
-+			"Headphone", "Headphones",
-+			"Microphone", "Microphone Jack";
-+		simple-audio-card,routing =
-+			"Headphones", "HPOL",
-+			"Headphones", "HPOR",
-+			"MIC1", "Microphone Jack",
-+			"Microphone Jack", "micbias1";
-+
-+		simple-audio-card,cpu {
-+			sound-dai = <&i2s0_8ch>;
-+		};
-+		simple-audio-card,codec {
-+			sound-dai = <&rt5616>;
-+		};
-+	};
-+
-+	vcc12v_dcin: vcc12v-dcin-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc12v_dcin";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <12000000>;
-+		regulator-max-microvolt = <12000000>;
-+	};
-+
-+	/* vcc5v0_sys powers peripherals */
-+	vcc5v0_sys: vcc5v0-sys-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc5v0_sys";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		vin-supply = <&vcc12v_dcin>;
-+	};
-+
-+	/* vcc4v0_sys powers the RK806, RK860's */
-+	vcc4v0_sys: vcc4v0-sys-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc4v0_sys";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <4000000>;
-+		regulator-max-microvolt = <4000000>;
-+		vin-supply = <&vcc12v_dcin>;
-+	};
-+
-+	vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc-1v1-nldo-s3";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <1100000>;
-+		regulator-max-microvolt = <1100000>;
-+		vin-supply = <&vcc4v0_sys>;
-+	};
-+
-+	vcc_3v3_pcie20: vcc3v3-pcie20-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc_3v3_pcie20";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		vin-supply = <&vcc_3v3_s3>;
-+	};
-+
-+	vbus5v0_typec: vbus5v0-typec-regulator {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&typec5v_pwren>;
-+		regulator-name = "vbus5v0_typec";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
-+	vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pcie_m2_1_pwren>;
-+		regulator-name = "vcc3v3_pcie2x1l0";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
-+	vcc3v3_pcie30: vcc3v3-pcie30-regulator {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pcie_m2_0_pwren>;
-+		regulator-name = "vcc3v3_pcie30";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
-+	vcc3v3_sd_s0: vcc3v3-sd-s0-regulator {
-+		compatible = "regulator-fixed";
-+		enable-active-low;
-+		gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>;
-+		regulator-boot-on;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-min-microvolt = <3300000>;
-+		regulator-name = "vcc3v3_sd_s0";
-+		vin-supply = <&vcc_3v3_s3>;
-+	};
-+
-+	vdd_4g_3v3: vdd-4g-3v3-regulator {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pin_4g_lte_pwren>;
-+		regulator-name = "vdd_4g_3v3";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+};
-+
-+&combphy0_ps {
-+	status = "okay";
-+};
-+
-+&combphy1_ps {
-+	status = "okay";
-+};
-+
-+&combphy2_psu {
-+	status = "okay";
-+};
-+
-+&cpu_l0 {
-+	cpu-supply = <&vdd_cpu_lit_s0>;
-+};
-+
-+&cpu_l1 {
-+	cpu-supply = <&vdd_cpu_lit_s0>;
-+};
-+
-+&cpu_l2 {
-+	cpu-supply = <&vdd_cpu_lit_s0>;
-+};
-+
-+&cpu_l3 {
-+	cpu-supply = <&vdd_cpu_lit_s0>;
-+};
-+
-+&cpu_b0 {
-+	cpu-supply = <&vdd_cpu_big0_s0>;
-+};
-+
-+&cpu_b1 {
-+	cpu-supply = <&vdd_cpu_big0_s0>;
-+};
-+
-+&cpu_b2 {
-+	cpu-supply = <&vdd_cpu_big1_s0>;
-+};
-+
-+&cpu_b3 {
-+	cpu-supply = <&vdd_cpu_big1_s0>;
-+};
-+
-+&gpio0 {
-+	gpio-line-names = /* GPIO0 A0-A7 */
-+			  "", "", "", "",
-+			  "", "", "", "",
-+			  /* GPIO0 B0-B7 */
-+			  "", "", "", "",
-+			  "", "", "", "",
-+			  /* GPIO0 C0-C7 */
-+			  "", "", "", "",
-+			  "HEADER_10", "HEADER_08", "HEADER_32", "",
-+			  /* GPIO0 D0-D7 */
-+			  "", "", "", "",
-+			  "", "", "", "";
-+};
-+
-+&gpio1 {
-+	gpio-line-names = /* GPIO1 A0-A7 */
-+			  "HEADER_27", "HEADER_28", "", "",
-+			  "", "", "", "HEADER_15",
-+			  /* GPIO1 B0-B7 */
-+			  "HEADER_26", "HEADER_21", "HEADER_19", "HEADER_23",
-+			  "HEADER_24", "HEADER_22", "", "",
-+			  /* GPIO1 C0-C7 */
-+			  "", "", "", "",
-+			  "", "", "", "",
-+			  /* GPIO1 D0-D7 */
-+			  "", "", "", "",
-+			  "", "", "HEADER_05", "HEADER_03";
-+};
-+
-+&gpio2 {
-+	gpio-line-names = /* GPIO2 A0-A7 */
-+			  "", "", "", "",
-+			  "", "", "", "",
-+			  /* GPIO2 B0-B7 */
-+			  "", "", "", "",
-+			  "", "", "", "",
-+			  /* GPIO2 C0-C7 */
-+			  "", "CSI1_11", "CSI1_12", "",
-+			  "", "", "", "",
-+			  /* GPIO2 D0-D7 */
-+			  "", "", "", "",
-+			  "", "", "", "";
-+};
-+
-+&gpio3 {
-+	gpio-line-names = /* GPIO3 A0-A7 */
-+			  "HEADER_35", "HEADER_38", "HEADER_40", "HEADER_36",
-+			  "HEADER_37", "", "DSI0_12", "",
-+			  /* GPIO3 B0-B7 */
-+			  "HEADER_33", "DSI0_10", "HEADER_07", "HEADER_16",
-+			  "HEADER_18", "HEADER_29", "HEADER_31", "HEADER_12",
-+			  /* GPIO3 C0-C7 */
-+			  "DSI0_08", "DSI0_14", "HEADER_11", "HEADER_13",
-+			  "", "", "", "",
-+			  /* GPIO3 D0-D7 */
-+			  "", "", "", "",
-+			  "", "DSI1_10", "", "";
-+};
-+
-+&gpio4 {
-+	gpio-line-names = /* GPIO4 A0-A7 */
-+			  "DSI1_08", "DSI1_14", "", "DSI1_12",
-+			  "", "", "", "",
-+			  /* GPIO4 B0-B7 */
-+			  "", "", "", "",
-+			  "", "", "", "",
-+			  /* GPIO4 C0-C7 */
-+			  "", "", "", "",
-+			  "CSI0_11", "CSI0_12", "", "",
-+			  /* GPIO4 D0-D7 */
-+			  "", "", "", "",
-+			  "", "", "", "";
-+};
-+
-+&i2c0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c0m2_xfer>;
-+	status = "okay";
-+
-+	vdd_cpu_big0_s0: regulator@42 {
-+		compatible = "rockchip,rk8602";
-+		reg = <0x42>;
-+		fcs,suspend-voltage-selector = <1>;
-+		regulator-name = "vdd_cpu_big0_s0";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <550000>;
-+		regulator-max-microvolt = <1050000>;
-+		regulator-ramp-delay = <2300>;
-+		vin-supply = <&vcc4v0_sys>;
-+
-+		regulator-state-mem {
-+			regulator-off-in-suspend;
-+		};
-+	};
-+
-+	vdd_cpu_big1_s0: regulator@43 {
-+		compatible = "rockchip,rk8603", "rockchip,rk8602";
-+		reg = <0x43>;
-+		fcs,suspend-voltage-selector = <1>;
-+		regulator-name = "vdd_cpu_big1_s0";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <550000>;
-+		regulator-max-microvolt = <1050000>;
-+		regulator-ramp-delay = <2300>;
-+		vin-supply = <&vcc4v0_sys>;
-+
-+		regulator-state-mem {
-+			regulator-off-in-suspend;
-+		};
-+	};
-+};
-+
-+&i2c2 {
-+	status = "okay";
-+
-+	vdd_npu_s0: regulator@42 {
-+		compatible = "rockchip,rk8602";
-+		reg = <0x42>;
-+		rockchip,suspend-voltage-selector = <1>;
-+		regulator-name = "vdd_npu_s0";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <550000>;
-+		regulator-max-microvolt = <950000>;
-+		regulator-ramp-delay = <2300>;
-+		vin-supply = <&vcc4v0_sys>;
-+
-+		regulator-state-mem {
-+			regulator-off-in-suspend;
-+		};
-+	};
-+};
-+
-+&i2c6 {
-+	clock-frequency = <200000>;
-+	status = "okay";
-+
-+	fusb302: typec-portc@22 {
-+		compatible = "fcs,fusb302";
-+		reg = <0x22>;
-+		interrupt-parent = <&gpio0>;
-+		interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>;
-+		pinctrl-0 = <&usbc0_int>;
-+		pinctrl-names = "default";
-+		vbus-supply = <&vbus5v0_typec>;
-+
-+		connector {
-+			compatible = "usb-c-connector";
-+			data-role = "dual";
-+			label = "USB-C";
-+			power-role = "dual";
-+			try-power-role = "sink";
-+			source-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)>;
-+			sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
-+			op-sink-microwatt = <1000000>;
-+		};
-+	};
-+
-+	hym8563: rtc@51 {
-+		compatible = "haoyu,hym8563";
-+		reg = <0x51>;
-+		#clock-cells = <0>;
-+		clock-output-names = "hym8563";
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&hym8563_int>;
-+		interrupt-parent = <&gpio0>;
-+		interrupts = <RK_PB0 IRQ_TYPE_LEVEL_LOW>;
-+		wakeup-source;
-+	};
-+};
-+
-+&i2c7 {
-+	clock-frequency = <200000>;
-+	status = "okay";
-+
-+	rt5616: codec@1b {
-+		compatible = "realtek,rt5616";
-+		reg = <0x1b>;
-+		clocks = <&cru I2S0_8CH_MCLKOUT>;
-+		clock-names = "mclk";
-+		#sound-dai-cells = <0>;
-+		assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;
-+		assigned-clock-rates = <12288000>;
-+
-+		port {
-+			rt5616_p0_0: endpoint {
-+				remote-endpoint = <&i2s0_8ch_p0_0>;
-+			};
-+		};
-+	};
-+
-+	/* connected with MIPI-CSI1 */
-+};
-+
-+&i2c8 {
-+	pinctrl-0 = <&i2c8m2_xfer>;
-+};
-+
-+&i2s0_8ch {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s0_lrck
-+		     &i2s0_mclk
-+		     &i2s0_sclk
-+		     &i2s0_sdi0
-+		     &i2s0_sdo0>;
-+	status = "okay";
-+
-+	i2s0_8ch_p0: port {
-+		i2s0_8ch_p0_0: endpoint {
-+			dai-format = "i2s";
-+			mclk-fs = <256>;
-+			remote-endpoint = <&rt5616_p0_0>;
-+		};
-+	};
-+};
-+
-+&pcie2x1l0 {
-+	reset-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
-+	vpcie3v3-supply = <&vcc_3v3_pcie20>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pcie2_0_rst>;
-+	status = "okay";
-+};
-+
-+&pcie2x1l1 {
-+	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
-+	vpcie3v3-supply = <&vcc3v3_pcie2x1l0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pcie2_1_rst>;
-+	status = "okay";
-+};
-+
-+&pcie2x1l2 {
-+	reset-gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>;
-+	vpcie3v3-supply = <&vcc_3v3_pcie20>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pcie2_2_rst>;
-+	status = "okay";
-+};
-+
-+&pcie30phy {
-+	status = "okay";
-+};
-+
-+&pcie3x4 {
-+	reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
-+	vpcie3v3-supply = <&vcc3v3_pcie30>;
-+	status = "okay";
-+};
-+
-+&pinctrl {
-+	gpio-leds {
-+		sys_led_pin: sys-led-pin {
-+			rockchip,pins = <2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		usr_led_pin: usr-led-pin {
-+			rockchip,pins = <2 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	headphone {
-+		hp_det: hp-det {
-+			rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	hym8563 {
-+		hym8563_int: hym8563-int {
-+			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+	};
-+
-+	pcie {
-+		pcie2_0_rst: pcie2-0-rst {
-+			rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		pcie2_1_rst: pcie2-1-rst {
-+			rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		pcie2_2_rst: pcie2-2-rst {
-+			rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		pcie_m2_0_pwren: pcie-m20-pwren {
-+			rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		pcie_m2_1_pwren: pcie-m21-pwren {
-+			rockchip,pins = <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	usb {
-+		pin_4g_lte_pwren: 4g-lte-pwren {
-+			rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		typec5v_pwren: typec5v-pwren {
-+			rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		usbc0_int: usbc0-int {
-+			rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+	};
-+};
-+
-+&pwm1 {
-+	pinctrl-0 = <&pwm1m1_pins>;
-+	status = "okay";
-+};
-+
-+&saradc {
-+	vref-supply = <&avcc_1v8_s0>;
-+	status = "okay";
-+};
-+
-+&sdhci {
-+	bus-width = <8>;
-+	no-sdio;
-+	no-sd;
-+	non-removable;
-+	max-frequency = <200000000>;
-+	mmc-hs400-1_8v;
-+	mmc-hs400-enhanced-strobe;
-+	status = "okay";
-+};
-+
-+&sdmmc {
-+	bus-width = <4>;
-+	cap-mmc-highspeed;
-+	cap-sd-highspeed;
-+	cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
-+	disable-wp;
-+	no-mmc;
-+	no-sdio;
-+	sd-uhs-sdr104;
-+	vmmc-supply = <&vcc3v3_sd_s0>;
-+	vqmmc-supply = <&vccio_sd_s0>;
-+	status = "okay";
-+};
-+
-+&spi2 {
-+	status = "okay";
-+	assigned-clocks = <&cru CLK_SPI2>;
-+	assigned-clock-rates = <200000000>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>;
-+	num-cs = <1>;
-+
-+	pmic@0 {
-+		compatible = "rockchip,rk806";
-+		spi-max-frequency = <1000000>;
-+		reg = <0x0>;
-+
-+		interrupt-parent = <&gpio0>;
-+		interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
-+
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>,
-+			    <&rk806_dvs2_null>, <&rk806_dvs3_null>;
-+
-+		system-power-controller;
-+
-+		vcc1-supply = <&vcc4v0_sys>;
-+		vcc2-supply = <&vcc4v0_sys>;
-+		vcc3-supply = <&vcc4v0_sys>;
-+		vcc4-supply = <&vcc4v0_sys>;
-+		vcc5-supply = <&vcc4v0_sys>;
-+		vcc6-supply = <&vcc4v0_sys>;
-+		vcc7-supply = <&vcc4v0_sys>;
-+		vcc8-supply = <&vcc4v0_sys>;
-+		vcc9-supply = <&vcc4v0_sys>;
-+		vcc10-supply = <&vcc4v0_sys>;
-+		vcc11-supply = <&vcc_2v0_pldo_s3>;
-+		vcc12-supply = <&vcc4v0_sys>;
-+		vcc13-supply = <&vcc_1v1_nldo_s3>;
-+		vcc14-supply = <&vcc_1v1_nldo_s3>;
-+		vcca-supply = <&vcc4v0_sys>;
-+
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+
-+		rk806_dvs1_null: dvs1-null-pins {
-+			pins = "gpio_pwrctrl1";
-+			function = "pin_fun0";
-+		};
-+
-+		rk806_dvs2_null: dvs2-null-pins {
-+			pins = "gpio_pwrctrl2";
-+			function = "pin_fun0";
-+		};
-+
-+		rk806_dvs3_null: dvs3-null-pins {
-+			pins = "gpio_pwrctrl3";
-+			function = "pin_fun0";
-+		};
-+
-+		regulators {
-+			vdd_gpu_s0: vdd_gpu_mem_s0: dcdc-reg1 {
-+				regulator-boot-on;
-+				regulator-min-microvolt = <550000>;
-+				regulator-max-microvolt = <950000>;
-+				regulator-ramp-delay = <12500>;
-+				regulator-name = "vdd_gpu_s0";
-+				regulator-enable-ramp-delay = <400>;
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdd_cpu_lit_s0: vdd_cpu_lit_mem_s0: dcdc-reg2 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <550000>;
-+				regulator-max-microvolt = <950000>;
-+				regulator-ramp-delay = <12500>;
-+				regulator-name = "vdd_cpu_lit_s0";
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdd_log_s0: dcdc-reg3 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <675000>;
-+				regulator-max-microvolt = <750000>;
-+				regulator-ramp-delay = <12500>;
-+				regulator-name = "vdd_log_s0";
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+					regulator-suspend-microvolt = <750000>;
-+				};
-+			};
-+
-+			vdd_vdenc_s0: vdd_vdenc_mem_s0: dcdc-reg4 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <550000>;
-+				regulator-max-microvolt = <950000>;
-+				regulator-init-microvolt = <750000>;
-+				regulator-ramp-delay = <12500>;
-+				regulator-name = "vdd_vdenc_s0";
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdd_ddr_s0: dcdc-reg5 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <675000>;
-+				regulator-max-microvolt = <900000>;
-+				regulator-ramp-delay = <12500>;
-+				regulator-name = "vdd_ddr_s0";
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+					regulator-suspend-microvolt = <850000>;
-+				};
-+			};
-+
-+			vdd2_ddr_s3: dcdc-reg6 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-name = "vdd2_ddr_s3";
-+
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+				};
-+			};
-+
-+			vcc_2v0_pldo_s3: dcdc-reg7 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <2000000>;
-+				regulator-max-microvolt = <2000000>;
-+				regulator-ramp-delay = <12500>;
-+				regulator-name = "vdd_2v0_pldo_s3";
-+
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <2000000>;
-+				};
-+			};
-+
-+			vcc_3v3_s3: dcdc-reg8 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vcc_3v3_s3";
-+
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <3300000>;
-+				};
-+			};
-+
-+			vddq_ddr_s0: dcdc-reg9 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-name = "vddq_ddr_s0";
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc_1v8_s3: dcdc-reg10 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcc_1v8_s3";
-+
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <1800000>;
-+				};
-+			};
-+
-+			avcc_1v8_s0: pldo-reg1 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "avcc_1v8_s0";
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc_1v8_s0: pldo-reg2 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcc_1v8_s0";
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+					regulator-suspend-microvolt = <1800000>;
-+				};
-+			};
-+
-+			avdd_1v2_s0: pldo-reg3 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1200000>;
-+				regulator-max-microvolt = <1200000>;
-+				regulator-name = "avdd_1v2_s0";
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc_3v3_s0: pldo-reg4 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-ramp-delay = <12500>;
-+				regulator-name = "vcc_3v3_s0";
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vccio_sd_s0: pldo-reg5 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-ramp-delay = <12500>;
-+				regulator-name = "vccio_sd_s0";
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			pldo6_s3: pldo-reg6 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "pldo6_s3";
-+
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <1800000>;
-+				};
-+			};
-+
-+			vdd_0v75_s3: nldo-reg1 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <750000>;
-+				regulator-max-microvolt = <750000>;
-+				regulator-name = "vdd_0v75_s3";
-+
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <750000>;
-+				};
-+			};
-+
-+			vdd_ddr_pll_s0: nldo-reg2 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <850000>;
-+				regulator-max-microvolt = <850000>;
-+				regulator-name = "vdd_ddr_pll_s0";
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+					regulator-suspend-microvolt = <850000>;
-+				};
-+			};
-+
-+			avdd_0v75_s0: nldo-reg3 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <750000>;
-+				regulator-max-microvolt = <750000>;
-+				regulator-name = "avdd_0v75_s0";
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdd_0v85_s0: nldo-reg4 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <850000>;
-+				regulator-max-microvolt = <850000>;
-+				regulator-name = "vdd_0v85_s0";
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdd_0v75_s0: nldo-reg5 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <750000>;
-+				regulator-max-microvolt = <750000>;
-+				regulator-name = "vdd_0v75_s0";
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+		};
-+	};
-+};
-+
-+&tsadc {
-+	status = "okay";
-+};
-+
-+&uart2 {
-+	pinctrl-0 = <&uart2m0_xfer>;
-+	status = "okay";
-+};
-+
-+&u2phy2_host {
-+	phy-supply = <&vdd_4g_3v3>;
-+	status = "okay";
-+};
-+
-+&u2phy3_host {
-+	status = "okay";
-+};
-+
-+&u2phy2 {
-+	status = "okay";
-+};
-+
-+&u2phy3 {
-+	status = "okay";
-+};
-+
-+&usb_host0_ehci {
-+	status = "okay";
-+};
-+
-+&usb_host0_ohci {
-+	status = "okay";
-+};
-+
-+&usb_host1_ehci {
-+	status = "okay";
-+};
-+
-+&usb_host1_ohci {
-+	status = "okay";
-+};
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-Date: Thu, 29 Aug 2024 14:26:54 +0200
-Subject: arm64: dts: rockchip: move NanoPC-T6 parts to DTS
-
-MiniPCIe slot is present only in first version of NanoPC-T6 (2301).
-
-Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
----
- arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts  | 24 ++++++++++
- arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 17 -------
- 2 files changed, 24 insertions(+), 17 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
-@@ -14,4 +14,28 @@ / {
- 	model = "FriendlyElec NanoPC-T6";
- 	compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588";
- 
-+	vdd_4g_3v3: vdd-4g-3v3-regulator {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pin_4g_lte_pwren>;
-+		regulator-name = "vdd_4g_3v3";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+};
-+
-+&pinctrl {
-+	usb {
-+		pin_4g_lte_pwren: 4g-lte-pwren {
-+			rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+};
-+
-+&u2phy2_host {
-+	phy-supply = <&vdd_4g_3v3>;
-+	status = "okay";
- };
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-@@ -170,18 +170,6 @@ vcc3v3_sd_s0: vcc3v3-sd-s0-regulator {
- 		regulator-name = "vcc3v3_sd_s0";
- 		vin-supply = <&vcc_3v3_s3>;
- 	};
--
--	vdd_4g_3v3: vdd-4g-3v3-regulator {
--		compatible = "regulator-fixed";
--		enable-active-high;
--		gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;
--		pinctrl-names = "default";
--		pinctrl-0 = <&pin_4g_lte_pwren>;
--		regulator-name = "vdd_4g_3v3";
--		regulator-min-microvolt = <3300000>;
--		regulator-max-microvolt = <3300000>;
--		vin-supply = <&vcc5v0_sys>;
--	};
- };
- 
- &combphy0_ps {
-@@ -527,10 +515,6 @@ pcie_m2_1_pwren: pcie-m21-pwren {
- 	};
- 
- 	usb {
--		pin_4g_lte_pwren: 4g-lte-pwren {
--			rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
--		};
--
- 		typec5v_pwren: typec5v-pwren {
- 			rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
- 		};
-@@ -912,7 +896,6 @@ &uart2 {
- };
- 
- &u2phy2_host {
--	phy-supply = <&vdd_4g_3v3>;
- 	status = "okay";
- };
- 
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-Date: Thu, 29 Aug 2024 14:26:55 +0200
-Subject: arm64: dts: rockchip: add NanoPC-T6 LTS
-
-In the LTS (2310) version the miniPCIe slot got removed and USB 2.0
-setup has changed. There are two external accessible ports and two ports
-on the internal header.
-
-There is an on-board USB hub which provides:
-- one external connector (bottom one)
-- two internal ports on pin header
-- one port for m.2 E connector
-
-The top USB 2.0 connector comes directly from the SoC.
-
-Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
----
- arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts | 61 ++++++++++
- 1 file changed, 61 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
-new file mode 100644
-index 000000000000..111111111111
---- /dev/null
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
-@@ -0,0 +1,61 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+/*
-+ * Copyright (c) 2021 Rockchip Electronics Co., Ltd.
-+ * Copyright (c) 2023 Thomas McKahan
-+ * Copyright (c) 2024 Linaro Ltd.
-+ *
-+ */
-+
-+/dts-v1/;
-+
-+#include "rk3588-nanopc-t6.dtsi"
-+
-+/ {
-+	model = "FriendlyElec NanoPC-T6 LTS";
-+	compatible = "friendlyarm,nanopc-t6-lts", "rockchip,rk3588";
-+
-+	/* provide power for on-board USB 2.0 hub */
-+	vcc5v0_usb20_host: vcc5v0-usb20-host-regulator {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
-+		pinctrl-0 = <&usb20_host_pwren>;
-+		pinctrl-names = "default";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-max-microvolt = <5000000>;
-+		regulator-min-microvolt = <5000000>;
-+		regulator-name = "vcc5v0_usb20_host";
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+};
-+
-+&pinctrl {
-+	usb {
-+		usb20_host_pwren: usb20-host-pwren {
-+			rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+};
-+
-+&u2phy1 {
-+	status = "okay";
-+};
-+
-+&u2phy1_otg {
-+	status = "okay";
-+};
-+
-+&u2phy2_host {
-+	phy-supply = <&vcc5v0_usb20_host>;
-+	status = "okay";
-+};
-+
-+&usbdp_phy1 {
-+	status = "okay";
-+};
-+
-+&usb_host1_xhci {
-+	dr_mode = "host";
-+	status = "okay";
-+};
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-Date: Thu, 29 Aug 2024 14:26:56 +0200
-Subject: arm64: dts: rockchip: add SPI flash on NanoPC-T6
-
-FriendlyELEC NanoPC-T6 has optional SPI flash chip on-board.
-It is populated with 32MB one on LTS version.
-
-Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-Reviewed-by: Jonas Karlman <jonas@kwiboo.se>
----
- arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 15 ++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-@@ -560,6 +560,21 @@ &sdmmc {
- 	status = "okay";
- };
- 
-+/* optional on non-LTS, populated on LTS version */
-+&sfc {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&fspim1_pins>;
-+	status = "okay";
-+
-+	flash@0 {
-+		compatible = "jedec,spi-nor";
-+		reg = <0>;
-+		spi-max-frequency = <104000000>;
-+		spi-rx-bus-width = <4>;
-+		spi-tx-bus-width = <1>;
-+	};
-+};
-+
- &spi2 {
- 	status = "okay";
- 	assigned-clocks = <&cru CLK_SPI2>;
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-Date: Thu, 29 Aug 2024 14:26:57 +0200
-Subject: arm64: dts: rockchip: add IR-receiver to NanoPC-T6
-
-FriendlyELEC NanoPC-T6 has IR receiver connected to PWM3_IR_M0 line
-which ends as GPIO0_D4.
-
-Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
----
- arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 15 +++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-@@ -25,6 +25,13 @@ chosen {
- 		stdout-path = "serial2:1500000n8";
- 	};
- 
-+	ir-receiver {
-+		compatible = "gpio-ir-receiver";
-+		gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_LOW>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&ir_receiver_pin>;
-+	};
-+
- 	leds {
- 		compatible = "gpio-leds";
- 
-@@ -228,7 +235,7 @@ &gpio0 {
- 			  "HEADER_10", "HEADER_08", "HEADER_32", "",
- 			  /* GPIO0 D0-D7 */
- 			  "", "", "", "",
--			  "", "", "", "";
-+			  "IR receiver [PWM3_IR_M0]", "", "", "";
- };
- 
- &gpio1 {
-@@ -492,6 +499,12 @@ hym8563_int: hym8563-int {
- 		};
- 	};
- 
-+	ir-receiver {
-+		ir_receiver_pin: ir-receiver-pin {
-+			rockchip,pins = <0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
- 	pcie {
- 		pcie2_0_rst: pcie2-0-rst {
- 			rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-Date: Thu, 29 Aug 2024 14:26:58 +0200
-Subject: arm64: dts: rockchip: enable GPU on NanoPC-T6
-
-Enable the Mali GPU on FriendlyELEC NanoPC-T6
-
-Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
----
- arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-@@ -298,6 +298,11 @@ &gpio4 {
- 			  "", "", "", "";
- };
- 
-+&gpu {
-+	mali-supply = <&vdd_gpu_s0>;
-+	status = "okay";
-+};
-+
- &i2c0 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&i2c0m2_xfer>;
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-Date: Thu, 29 Aug 2024 14:26:59 +0200
-Subject: arm64: dts: rockchip: enable USB-C on NanoPC-T6
-
-Enable the USB-C port on FriendlyELEC NanoPC-T6.
-
-Works one way so far but still better than before.
-
-Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
----
- arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 76 +++++++++-
- 1 file changed, 72 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-@@ -137,6 +137,8 @@ vbus5v0_typec: vbus5v0-typec-regulator {
- 		gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
- 		pinctrl-names = "default";
- 		pinctrl-0 = <&typec5v_pwren>;
-+		regulator-always-on;
-+		regulator-boot-on;
- 		regulator-name = "vbus5v0_typec";
- 		regulator-min-microvolt = <5000000>;
- 		regulator-max-microvolt = <5000000>;
-@@ -381,11 +383,34 @@ connector {
- 			compatible = "usb-c-connector";
- 			data-role = "dual";
- 			label = "USB-C";
--			power-role = "dual";
--			try-power-role = "sink";
-+			power-role = "source";
- 			source-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)>;
--			sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
--			op-sink-microwatt = <1000000>;
-+
-+			ports {
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+
-+				port@0 {
-+					reg = <0>;
-+					usbc0_hs: endpoint {
-+						remote-endpoint = <&usb_host0_xhci_drd_sw>;
-+					};
-+				};
-+
-+				port@1 {
-+					reg = <1>;
-+					usbc0_ss: endpoint {
-+						remote-endpoint = <&usbdp_phy0_typec_ss>;
-+					};
-+				};
-+
-+				port@2 {
-+					reg = <2>;
-+					usbc0_sbu: endpoint {
-+						remote-endpoint = <&usbdp_phy0_typec_sbu>;
-+					};
-+				};
-+			};
- 		};
- 	};
- 
-@@ -928,6 +953,14 @@ &uart2 {
- 	status = "okay";
- };
- 
-+&u2phy0 {
-+	status = "okay";
-+};
-+
-+&u2phy0_otg {
-+	status = "okay";
-+};
-+
- &u2phy2_host {
- 	status = "okay";
- };
-@@ -944,6 +977,29 @@ &u2phy3 {
- 	status = "okay";
- };
- 
-+&usbdp_phy0 {
-+	mode-switch;
-+	orientation-switch;
-+	sbu1-dc-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>;
-+	sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
-+	status = "okay";
-+
-+	port {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		usbdp_phy0_typec_ss: endpoint@0 {
-+			reg = <0>;
-+			remote-endpoint = <&usbc0_ss>;
-+		};
-+
-+		usbdp_phy0_typec_sbu: endpoint@1 {
-+			reg = <1>;
-+			remote-endpoint = <&usbc0_sbu>;
-+		};
-+	};
-+};
-+
- &usb_host0_ehci {
- 	status = "okay";
- };
-@@ -952,6 +1008,18 @@ &usb_host0_ohci {
- 	status = "okay";
- };
- 
-+&usb_host0_xhci {
-+	dr_mode = "host";
-+	status = "okay";
-+	usb-role-switch;
-+
-+	port {
-+		usb_host0_xhci_drd_sw: endpoint {
-+			remote-endpoint = <&usbc0_hs>;
-+		};
-+	};
-+};
-+
- &usb_host1_ehci {
- 	status = "okay";
- };
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-Date: Thu, 29 Aug 2024 14:27:00 +0200
-Subject: arm64: dts: rockchip: add Mask Rom key on NanoPC-T6
-
-Mask Rom key is connected to SARADC and can be read from OS.
-
-Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
----
- arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 15 ++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-@@ -8,6 +8,7 @@
- /dts-v1/;
- 
- #include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
- #include <dt-bindings/pinctrl/rockchip.h>
- #include <dt-bindings/usb/pd.h>
- #include "rk3588.dtsi"
-@@ -21,6 +22,20 @@ aliases {
- 		mmc1 = &sdmmc;
- 	};
- 
-+	adc-keys-0 {
-+		compatible = "adc-keys";
-+		io-channels = <&saradc 0>;
-+		io-channel-names = "buttons";
-+		keyup-threshold-microvolt = <1800000>;
-+		poll-interval = <100>;
-+
-+		button-maskrom {
-+			label = "Mask Rom";
-+			linux,code = <KEY_SETUP>;
-+			press-threshold-microvolt = <2000>;
-+		};
-+	};
-+
- 	chosen {
- 		stdout-path = "serial2:1500000n8";
- 	};
--- 
-Armbian
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SuperKali <hello@superkali.me>
-Date: Mon, 21 Oct 2024 13:21:03 +0000
-Subject: Add Missing parameters for USB3.0 and FAN
-
-Signed-off-by: SuperKali <hello@superkali.me>
----
- arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts |  4 -
- arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi    | 58 ++++++++++
- 2 files changed, 58 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
-@@ -42,10 +42,6 @@ &u2phy1 {
- 	status = "okay";
- };
- 
--&u2phy1_otg {
--	status = "okay";
--};
--
- &u2phy2_host {
- 	phy-supply = <&vcc5v0_usb20_host>;
- 	status = "okay";
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-@@ -66,6 +66,15 @@ usr_led: led-1 {
- 		};
- 	};
- 
-+	/* FAN */
-+	fan0: pwm-fan {
-+		compatible = "pwm-fan";
-+		#cooling-cells = <2>;
-+		cooling-levels = <100 160 190 200 215 235 255>;
-+		pwms = <&pwm1 0 50000 0>;
-+        	fan-supply = <&vcc5v0_sys>;
-+	};
-+
- 	sound {
- 		compatible = "simple-audio-card";
- 		pinctrl-names = "default";
-@@ -172,6 +181,18 @@ vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {
- 		vin-supply = <&vcc5v0_sys>;
- 	};
- 
-+	vcc5v0_host_30: vcc5v0-host-30 {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&vcc5v0_host30_en>;
-+		regulator-name = "vcc5v0_host_30";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
- 	vcc3v3_pcie30: vcc3v3-pcie30-regulator {
- 		compatible = "regulator-fixed";
- 		enable-active-high;
-@@ -487,6 +508,34 @@ i2s0_8ch_p0_0: endpoint {
- 	};
- };
- 
-+&package_thermal {
-+	polling-delay = <1000>;
-+
-+	trips {
-+		package_fan0: package-fan0 {
-+			temperature = <55000>;
-+			hysteresis = <2000>;
-+			type = "active";
-+		};
-+		package_fan1: package-fan1 {
-+			temperature = <65000>;
-+			hysteresis = <2000>;
-+			type = "active";
-+		};
-+	};
-+
-+	cooling-maps {
-+		map1 {
-+			trip = <&package_fan0>;
-+			cooling-device = <&fan0 THERMAL_NO_LIMIT 1>;
-+		};
-+		map2 {
-+			trip = <&package_fan1>;
-+			cooling-device = <&fan0 2 THERMAL_NO_LIMIT>;
-+		};
-+	};
-+};
-+
- &pcie2x1l0 {
- 	reset-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
- 	vpcie3v3-supply = <&vcc_3v3_pcie20>;
-@@ -577,6 +626,10 @@ typec5v_pwren: typec5v-pwren {
- 			rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
- 		};
- 
-+		vcc5v0_host30_en: vcc5v0-host30-en {
-+			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
- 		usbc0_int: usbc0-int {
- 			rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;
- 		};
-@@ -976,6 +1029,11 @@ &u2phy0_otg {
- 	status = "okay";
- };
- 
-+&u2phy1_otg {
-+	phy-supply = <&vcc5v0_host_30>;
-+	status = "okay";
-+};
-+
- &u2phy2_host {
- 	status = "okay";
- };
--- 
-Armbian
-

From 2539d9eacff7fba87edc0056f81af6c8d9b39152 Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Mon, 14 Oct 2024 01:04:08 +0200
Subject: [PATCH 083/107] rk3588: edge: Adapt kernel patches for 6.12

- 0001-general-add-overlay-support
- 0024-RK3588-Add-Crypto-Support (asm/unaligned.h moved to linux/unaligned.h)
- 0025-RK3588-Add-HW-RNG-Support (rename driver file to avoid conflict with new 6.12 driver)
---
 .../0001-general-add-overlay-support.patch    | 32 ++++++++-----------
 .../0024-RK3588-Add-Crypto-Support.patch      |  2 +-
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0001-general-add-overlay-support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0001-general-add-overlay-support.patch
index dffc72914d3f..718a294699b8 100644
--- a/patch/kernel/archive/rockchip-rk3588-6.12/0001-general-add-overlay-support.patch
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/0001-general-add-overlay-support.patch
@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <paolo.sabatino@gmail.com>
-Date: Sun, 2 Jun 2024 21:53:01 +0200
+Date: Wed, 2 Oct 2024 19:30:34 +0300
 Subject: compile .scr and install overlays in right path
 
 ---
  scripts/Makefile.dtbinst | 13 +++++++++-
- scripts/Makefile.lib     |  8 +++++-
+ scripts/Makefile.dtbs    |  8 +++++-
  2 files changed, 19 insertions(+), 2 deletions(-)
 
 diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
@@ -32,22 +32,19 @@ index 111111111111..222222222222 100644
  
  endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
  
-diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
+diff --git a/scripts/Makefile.dtbs b/scripts/Makefile.dtbs
 index 111111111111..222222222222 100644
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -405,7 +405,7 @@ cmd_dtb_check = $(if $(dtb-check-enabled),; $(DT_CHECKER) $(DT_CHECKER_FLAGS) -u
- 
+--- a/scripts/Makefile.dtbs
++++ b/scripts/Makefile.dtbs
+@@ -120,17 +120,23 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
  quiet_cmd_dtc = DTC $(quiet_dtb_check_tag) $@
- cmd_dtc = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
--	$(DTC) -o $@ -b 0 \
-+	$(DTC) -@ -o $@ -b 0 \
- 		$(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \
- 		-d $(depfile).dtc.tmp $(dtc-tmp) ; \
+       cmd_dtc = \
+ 	$(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
+-	$(DTC) -o $@ -b 0 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) \
++	$(DTC) -@ -o $@ -b 0 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) \
+ 	       $(DTC_FLAGS) -d $(depfile).dtc.tmp $(dtc-tmp) ; \
  	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) \
-@@ -430,12 +430,18 @@ DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING_DIR)/processed-schema.json
- dtb-check-enabled = $(if $(filter %.dtb, $@),y)
- endif
+ 	$(cmd_dtb_check)
  
 +quiet_cmd_scr = MKIMAGE $@
 +cmd_scr = mkimage -C none -A $(ARCH) -T script -d $< $@
@@ -61,9 +58,8 @@ index 111111111111..222222222222 100644
 +$(obj)/%.scr: $(src)/%.scr-cmd FORCE
 +	$(call if_changed,scr)
 +
- dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
+ # targets
+ # ---------------------------------------------------------------------------
  
- # Bzip2
 -- 
 Armbian
-
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0024-RK3588-Add-Crypto-Support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0024-RK3588-Add-Crypto-Support.patch
index 636d11ec130f..6eaffb8d7b10 100644
--- a/patch/kernel/archive/rockchip-rk3588-6.12/0024-RK3588-Add-Crypto-Support.patch
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/0024-RK3588-Add-Crypto-Support.patch
@@ -1397,7 +1397,7 @@ index 000000000000..111111111111
 + *
 + * Copyright (c) 2022-2023 Corentin Labbe <clabbe@baylibre.com>
 + */
-+#include <asm/unaligned.h>
++#include <linux/unaligned.h>
 +#include <linux/iopoll.h>
 +#include "rk2_crypto.h"
 +

From 7d0726f8ceeae8801d9e4da4d6e0df0e4d2460b1 Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Mon, 14 Oct 2024 01:27:35 +0200
Subject: [PATCH 084/107] rk3588: edge: Rename OPi 5 patch to prevent duplicate
 number

---
 ...=> 1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename patch/kernel/archive/rockchip-rk3588-6.12/{1021-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch => 1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch} (100%)

diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/1021-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch
similarity index 100%
rename from patch/kernel/archive/rockchip-rk3588-6.12/1021-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch
rename to patch/kernel/archive/rockchip-rk3588-6.12/1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch

From 67ce16a83e3592c08707783224eb540a9b4d95b6 Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Mon, 14 Oct 2024 12:26:32 +0200
Subject: [PATCH 085/107] rk3588: edge: Rewrite kernel config against v6.12-rc3

---
 .../kernel/linux-rockchip-rk3588-edge.config  | 157 ++++++++++++++----
 1 file changed, 125 insertions(+), 32 deletions(-)

diff --git a/config/kernel/linux-rockchip-rk3588-edge.config b/config/kernel/linux-rockchip-rk3588-edge.config
index 12f66dbeb400..b08debd78df3 100644
--- a/config/kernel/linux-rockchip-rk3588-edge.config
+++ b/config/kernel/linux-rockchip-rk3588-edge.config
@@ -1,16 +1,17 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.0 Kernel Configuration
+# Linux/arm64 6.12.0-rc3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 13.2.0-23ubuntu4) 13.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=110400
+CONFIG_GCC_VERSION=130200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23800
+CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23800
+CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
+CONFIG_RUSTC_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_GCC_ASM_GOTO_OUTPUT_BROKEN=y
@@ -108,6 +109,7 @@ CONFIG_PREEMPT_BUILD=y
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
+# CONFIG_PREEMPT_RT is not set
 CONFIG_PREEMPT_COUNT=y
 CONFIG_PREEMPTION=y
 # CONFIG_PREEMPT_DYNAMIC is not set
@@ -181,6 +183,7 @@ CONFIG_MEMCG=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
+CONFIG_GROUP_SCHED_WEIGHT=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
@@ -190,6 +193,7 @@ CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
+# CONFIG_CPUSETS_V1 is not set
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
@@ -286,6 +290,7 @@ CONFIG_KEXEC_FILE=y
 # end of General setup
 
 CONFIG_ARM64=y
+CONFIG_RUSTC_SUPPORTS_ARM64=y
 CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
@@ -441,6 +446,7 @@ CONFIG_HZ=300
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
+CONFIG_CC_HAVE_SHADOW_CALL_STACK=y
 CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_ARCH_SUPPORTS_KEXEC=y
@@ -524,6 +530,13 @@ CONFIG_ARM64_MTE=y
 CONFIG_ARM64_EPAN=y
 # end of ARMv8.7 architectural features
 
+#
+# ARMv8.9 architectural features
+#
+CONFIG_ARM64_POE=y
+CONFIG_ARCH_PKEY_BITS=3
+# end of ARMv8.9 architectural features
+
 CONFIG_ARM64_SVE=y
 CONFIG_ARM64_SME=y
 CONFIG_ARM64_PSEUDO_NMI=y
@@ -709,7 +722,9 @@ CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
 # CONFIG_NVHE_EL2_DEBUG is not set
+# CONFIG_PTDUMP_STAGE2_DEBUGFS is not set
 CONFIG_CPU_MITIGATIONS=y
+CONFIG_ARCH_HAS_DMA_OPS=y
 
 #
 # General architecture-dependent options
@@ -771,6 +786,8 @@ CONFIG_HAVE_ARCH_STACKLEAK=y
 CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK=y
+# CONFIG_SHADOW_CALL_STACK is not set
 CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
 CONFIG_LTO_NONE=y
@@ -805,6 +822,7 @@ CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
 CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_ARCH_SUPPORTS_RT=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
 CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
@@ -819,6 +837,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 CONFIG_HAVE_PREEMPT_DYNAMIC=y
 CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
@@ -851,10 +870,7 @@ CONFIG_MODVERSIONS=y
 CONFIG_ASM_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_MODULE_SIG is not set
-CONFIG_MODULE_COMPRESS_NONE=y
-# CONFIG_MODULE_COMPRESS_GZIP is not set
-# CONFIG_MODULE_COMPRESS_XZ is not set
-# CONFIG_MODULE_COMPRESS_ZSTD is not set
+# CONFIG_MODULE_COMPRESS is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 # CONFIG_TRIM_UNUSED_KSYMS is not set
@@ -970,12 +986,12 @@ CONFIG_ZSWAP_DEFAULT_ON=y
 CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y
 CONFIG_ZSWAP_COMPRESSOR_DEFAULT="zstd"
 # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set
-CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD=y
+CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED=y
 # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
 CONFIG_ZSWAP_ZPOOL_DEFAULT="z3fold"
 CONFIG_ZBUD=y
+CONFIG_Z3FOLD_DEPRECATED=y
 CONFIG_Z3FOLD=y
-CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -1002,14 +1018,16 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_GUP_FAST=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
+CONFIG_NUMA_KEEP_MEMINFO=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 # CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SPLIT_PTE_PTLOCKS=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_SPLIT_PMD_PTLOCKS=y
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
@@ -1035,6 +1053,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 CONFIG_THP_SWAP=y
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
+CONFIG_ARCH_SUPPORTS_HUGE_PFNMAP=y
+CONFIG_ARCH_SUPPORTS_PMD_PFNMAP=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
@@ -1055,7 +1075,9 @@ CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA32=y
 CONFIG_GET_FREE_REGION=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
-CONFIG_ARCH_USES_PG_ARCH_X=y
+CONFIG_ARCH_HAS_PKEYS=y
+CONFIG_ARCH_USES_PG_ARCH_2=y
+CONFIG_ARCH_USES_PG_ARCH_3=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_PERCPU_STATS=y
 # CONFIG_GUP_TEST is not set
@@ -1075,6 +1097,8 @@ CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
 CONFIG_IOMMU_MM_DATA=y
 CONFIG_EXECMEM=y
+CONFIG_NUMA_MEMBLKS=y
+# CONFIG_NUMA_EMU is not set
 
 #
 # Data Access Monitoring
@@ -1091,6 +1115,7 @@ CONFIG_NET_XGRESS=y
 CONFIG_NET_REDIRECT=y
 CONFIG_SKB_DECRYPTED=y
 CONFIG_SKB_EXTENSIONS=y
+CONFIG_NET_DEVMEM=y
 
 #
 # Networking options
@@ -1905,6 +1930,7 @@ CONFIG_BT_HCIUART_RTL=y
 CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIUART_AG6XX=y
 CONFIG_BT_HCIUART_MRVL=y
+# CONFIG_BT_HCIUART_AML is not set
 CONFIG_BT_HCIBCM203X=m
 # CONFIG_BT_HCIBCM4377 is not set
 CONFIG_BT_HCIBPA10X=m
@@ -1974,6 +2000,7 @@ CONFIG_NET_9P=m
 CONFIG_NET_9P_FD=m
 CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_9P_XEN=m
+# CONFIG_NET_9P_USBG is not set
 # CONFIG_NET_9P_DEBUG is not set
 CONFIG_CAIF=m
 # CONFIG_CAIF_DEBUG is not set
@@ -2077,6 +2104,7 @@ CONFIG_PCI_ATS=y
 CONFIG_PCI_DOE=y
 CONFIG_PCI_ECAM=y
 CONFIG_PCI_IOV=y
+# CONFIG_PCI_NPEM is not set
 CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCI_LABEL=y
@@ -2267,16 +2295,30 @@ CONFIG_CONNECTOR=m
 #
 CONFIG_ARM_SCMI_PROTOCOL=y
 # CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set
+# CONFIG_ARM_SCMI_DEBUG_COUNTERS is not set
+
+#
+# SCMI Transport Drivers
+#
 CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
 CONFIG_ARM_SCMI_HAVE_SHMEM=y
 CONFIG_ARM_SCMI_HAVE_MSG=y
 CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y
-CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y
 CONFIG_ARM_SCMI_TRANSPORT_SMC=y
 # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set
+CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y
 CONFIG_ARM_SCMI_TRANSPORT_VIRTIO=y
 CONFIG_ARM_SCMI_TRANSPORT_VIRTIO_VERSION1_COMPLIANCE=y
 # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO_ATOMIC_ENABLE is not set
+# end of SCMI Transport Drivers
+
+#
+# ARM SCMI NXP i.MX Vendor Protocols
+#
+# CONFIG_IMX_SCMI_BBM_EXT is not set
+# CONFIG_IMX_SCMI_MISC_EXT is not set
+# end of ARM SCMI NXP i.MX Vendor Protocols
+
 CONFIG_ARM_SCMI_POWER_CONTROL=m
 # end of ARM System Control and Management Interface Protocol
 
@@ -2516,6 +2558,7 @@ CONFIG_OF_IRQ=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
+# CONFIG_OF_OVERLAY_KUNIT_TEST is not set
 CONFIG_OF_NUMA=y
 # CONFIG_PARPORT is not set
 CONFIG_PNP=y
@@ -2530,12 +2573,15 @@ CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_CDROM=y
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 CONFIG_ZRAM=m
+# CONFIG_ZRAM_BACKEND_LZ4 is not set
+# CONFIG_ZRAM_BACKEND_LZ4HC is not set
+# CONFIG_ZRAM_BACKEND_ZSTD is not set
+# CONFIG_ZRAM_BACKEND_DEFLATE is not set
+# CONFIG_ZRAM_BACKEND_842 is not set
+CONFIG_ZRAM_BACKEND_FORCE_LZO=y
+CONFIG_ZRAM_BACKEND_LZO=y
 CONFIG_ZRAM_DEF_COMP_LZORLE=y
-# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
-# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
 # CONFIG_ZRAM_DEF_COMP_LZO is not set
-# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
-# CONFIG_ZRAM_DEF_COMP_842 is not set
 CONFIG_ZRAM_DEF_COMP="lzo-rle"
 CONFIG_ZRAM_WRITEBACK=y
 # CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set
@@ -2561,7 +2607,7 @@ CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
 #
 # NVME Support
 #
-CONFIG_NVME_KEYRING=m
+CONFIG_NVME_KEYRING=y
 CONFIG_NVME_AUTH=y
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
@@ -2592,6 +2638,7 @@ CONFIG_AD525X_DPOT_I2C=m
 CONFIG_AD525X_DPOT_SPI=m
 # CONFIG_DUMMY_IRQ is not set
 CONFIG_PHANTOM=m
+# CONFIG_RPMB is not set
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 # CONFIG_ICS932S401 is not set
@@ -3243,6 +3290,7 @@ CONFIG_MLX5_CORE_EN_DCB=y
 # CONFIG_MLX5_EN_IPSEC is not set
 # CONFIG_MLX5_EN_TLS is not set
 CONFIG_MLX5_SW_STEERING=y
+CONFIG_MLX5_HW_STEERING=y
 # CONFIG_MLX5_SF is not set
 # CONFIG_MLX5_DPLL is not set
 # CONFIG_MLXSW_CORE is not set
@@ -3259,6 +3307,7 @@ CONFIG_ENC28J60=m
 CONFIG_ENC28J60_WRITEVERIFY=y
 # CONFIG_ENCX24J600 is not set
 # CONFIG_LAN743X is not set
+# CONFIG_LAN865X is not set
 # CONFIG_LAN966X_SWITCH is not set
 # CONFIG_VCAP is not set
 CONFIG_NET_VENDOR_MICROSEMI=y
@@ -3283,6 +3332,7 @@ CONFIG_NET_VENDOR_NVIDIA=y
 CONFIG_FORCEDETH=m
 CONFIG_NET_VENDOR_OKI=y
 CONFIG_ETHOC=m
+# CONFIG_OA_TC6 is not set
 CONFIG_NET_VENDOR_PACKET_ENGINES=y
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
@@ -3312,6 +3362,7 @@ CONFIG_8139TOO_8129=y
 CONFIG_8139_OLD_RX_RESET=y
 CONFIG_R8169=m
 CONFIG_R8169_LEDS=y
+# CONFIG_RTASE is not set
 CONFIG_NET_VENDOR_RENESAS=y
 CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_ROCKER=m
@@ -3473,6 +3524,7 @@ CONFIG_CAN_M_CAN_PCI=m
 CONFIG_CAN_M_CAN_PLATFORM=m
 CONFIG_CAN_M_CAN_TCAN4X5X=m
 CONFIG_CAN_PEAK_PCIEFD=m
+# CONFIG_CAN_ROCKCHIP_CANFD is not set
 CONFIG_CAN_SJA1000=m
 CONFIG_CAN_EMS_PCI=m
 CONFIG_CAN_F81601=m
@@ -3897,6 +3949,7 @@ CONFIG_RTW89_8852C=m
 CONFIG_RTW89_8851BE=m
 CONFIG_RTW89_8852AE=m
 CONFIG_RTW89_8852BE=m
+# CONFIG_RTW89_8852BTE is not set
 CONFIG_RTW89_8852CE=m
 # CONFIG_RTW89_8922AE is not set
 # CONFIG_RTW89_DEBUGMSG is not set
@@ -4027,7 +4080,6 @@ CONFIG_KEYBOARD_GPIO_POLLED=m
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_LM8333 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
 # CONFIG_KEYBOARD_MPR121 is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
@@ -4127,9 +4179,6 @@ CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
 CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
-CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
-CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
 # CONFIG_TOUCHSCREEN_CYTTSP5 is not set
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
@@ -4154,7 +4203,6 @@ CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
 CONFIG_TOUCHSCREEN_WACOM_I2C=m
 CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
 CONFIG_TOUCHSCREEN_MMS114=m
 CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
 CONFIG_TOUCHSCREEN_MSG2638=m
@@ -4439,7 +4487,6 @@ CONFIG_XILLYUSB=m
 CONFIG_I2C=y
 CONFIG_ACPI_I2C_OPREGION=y
 CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
 
@@ -4456,6 +4503,7 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_MUX_MLXCPLD=m
+# CONFIG_I2C_MUX_MULE is not set
 # end of Multiplexer I2C Chip support
 
 CONFIG_I2C_HELPER_AUTO=y
@@ -5130,6 +5178,7 @@ CONFIG_THERMAL=y
 # CONFIG_THERMAL_NETLINK is not set
 CONFIG_THERMAL_STATISTICS=y
 # CONFIG_THERMAL_DEBUGFS is not set
+# CONFIG_THERMAL_CORE_TESTING is not set
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
@@ -5224,6 +5273,7 @@ CONFIG_BCMA_DEBUG=y
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
+# CONFIG_MFD_ADP5585 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_AS3711 is not set
 # CONFIG_MFD_SMPRO is not set
@@ -5493,6 +5543,7 @@ CONFIG_MEDIA_CEC_SUPPORT=y
 CONFIG_CEC_CH7322=m
 CONFIG_CEC_CROS_EC=m
 CONFIG_CEC_GPIO=m
+# CONFIG_USB_EXTRON_DA_HD_4K_PLUS_CEC is not set
 CONFIG_USB_PULSE8_CEC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # end of CEC support
@@ -5849,7 +5900,6 @@ CONFIG_VIDEO_CADENCE_CSI2TX=m
 #
 # Chips&Media media platform drivers
 #
-# CONFIG_VIDEO_E5010_JPEG_ENC is not set
 
 #
 # Intel media platform drivers
@@ -5887,7 +5937,6 @@ CONFIG_VIDEO_CAFE_CCIC=m
 #
 # Raspberry Pi media platform drivers
 #
-# CONFIG_VIDEO_RASPBERRYPI_PISP_BE is not set
 
 #
 # Renesas media platform drivers
@@ -5922,6 +5971,7 @@ CONFIG_HDMIRX_LOAD_DEFAULT_EDID=y
 # Verisilicon media platform drivers
 #
 CONFIG_VIDEO_HANTRO=m
+# CONFIG_VIDEO_HANTRO_HEVC_RFC is not set
 CONFIG_VIDEO_HANTRO_ROCKCHIP=y
 
 #
@@ -6440,6 +6490,7 @@ CONFIG_DRM_MIPI_DSI=y
 CONFIG_DRM_KUNIT_TEST_HELPERS=m
 CONFIG_DRM_KUNIT_TEST=m
 CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_PANIC is not set
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set
 CONFIG_DRM_FBDEV_EMULATION=y
@@ -6495,7 +6546,6 @@ CONFIG_ROCKCHIP_VOP2=y
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
-CONFIG_ROCKCHIP_DW_HDMI_QP=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
@@ -6521,6 +6571,7 @@ CONFIG_DRM_PANEL_ARM_VERSATILE=m
 CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
 # CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
+# CONFIG_DRM_PANEL_BOE_TV101WUM_LL2 is not set
 # CONFIG_DRM_PANEL_EBBG_FT8719 is not set
 CONFIG_DRM_PANEL_ELIDA_KD35T133=m
 CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
@@ -6666,7 +6717,6 @@ CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 # CONFIG_DRM_DW_HDMI_GP_AUDIO is not set
 CONFIG_DRM_DW_HDMI_CEC=m
-CONFIG_DRM_DW_HDMI_QP=m
 CONFIG_DRM_DW_MIPI_DSI=m
 # end of Display Interface Bridges
 
@@ -6854,10 +6904,10 @@ CONFIG_SND_MAX_CARDS=32
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_PROC_FS=y
 CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
 CONFIG_SND_CTL_FAST_LOOKUP=y
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_CTL_INPUT_VALIDATION=y
+# CONFIG_SND_UTIMER is not set
 CONFIG_SND_VMASTER=y
 CONFIG_SND_CTL_LED=m
 CONFIG_SND_SEQUENCER=m
@@ -7357,6 +7407,7 @@ CONFIG_SND_SOC_WSA883X=m
 CONFIG_SND_SOC_ZL38060=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MT6351=m
+# CONFIG_SND_SOC_MT6357 is not set
 CONFIG_SND_SOC_MT6358=m
 CONFIG_SND_SOC_MT6660=m
 CONFIG_SND_SOC_NAU8315=m
@@ -7429,6 +7480,7 @@ CONFIG_HID_GLORIOUS=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
 CONFIG_HID_VIVALDI_COMMON=m
+# CONFIG_HID_GOODIX_SPI is not set
 CONFIG_HID_GOOGLE_HAMMER=m
 # CONFIG_HID_GOOGLE_STADIA_FF is not set
 CONFIG_HID_VIVALDI=m
@@ -8200,6 +8252,7 @@ CONFIG_RTC_DRV_RK808=m
 # CONFIG_RTC_DRV_RV3028 is not set
 # CONFIG_RTC_DRV_RV3032 is not set
 # CONFIG_RTC_DRV_RV8803 is not set
+# CONFIG_RTC_DRV_SD2405AL is not set
 # CONFIG_RTC_DRV_SD3078 is not set
 
 #
@@ -8289,6 +8342,7 @@ CONFIG_PLX_DMA=m
 # CONFIG_XILINX_XDMA is not set
 # CONFIG_XILINX_ZYNQMP_DMA is not set
 # CONFIG_XILINX_ZYNQMP_DPDMA is not set
+# CONFIG_AMD_QDMA is not set
 CONFIG_QCOM_HIDMA_MGMT=y
 CONFIG_QCOM_HIDMA=y
 CONFIG_DW_DMAC_CORE=m
@@ -8360,6 +8414,7 @@ CONFIG_IRQ_BYPASS_MANAGER=y
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VMGENID=y
 CONFIG_NITRO_ENCLAVES=m
+# CONFIG_ARM_PKVM_GUEST is not set
 CONFIG_VIRTIO_ANCHOR=y
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_PCI_LIB=y
@@ -8420,6 +8475,7 @@ CONFIG_XEN_GRANT_DEV_ALLOC=y
 CONFIG_SWIOTLB_XEN=y
 CONFIG_XEN_PCI_STUB=y
 CONFIG_XEN_PCIDEV_STUB=m
+# CONFIG_XEN_PCIDEV_BACKEND is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 # CONFIG_XEN_PVCALLS_BACKEND is not set
 CONFIG_XEN_SCSI_BACKEND=m
@@ -8532,7 +8588,6 @@ CONFIG_FB_TFT_UC1611=m
 CONFIG_FB_TFT_UC1701=m
 CONFIG_FB_TFT_UPD161704=m
 # CONFIG_MOST_COMPONENTS is not set
-# CONFIG_KS7010 is not set
 # CONFIG_XIL_AXIS_FIFO is not set
 CONFIG_FIELDBUS_DEV=m
 CONFIG_HMS_ANYBUSS_BUS=m
@@ -8613,10 +8668,12 @@ CONFIG_CLK_RK3328=y
 CONFIG_CLK_RK3368=y
 CONFIG_CLK_RK3399=y
 CONFIG_CLK_RK3568=y
+CONFIG_CLK_RK3576=y
 CONFIG_CLK_RK3588=y
 # CONFIG_XILINX_VCU is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 # CONFIG_CLK_KUNIT_TEST is not set
+# CONFIG_CLK_FIXED_RATE_KUNIT_TEST is not set
 # CONFIG_CLK_GATE_KUNIT_TEST is not set
 # CONFIG_CLK_FD_KUNIT_TEST is not set
 # CONFIG_HWSPINLOCK is not set
@@ -8679,6 +8736,7 @@ CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_ARM_SMMU_V3=y
 CONFIG_ARM_SMMU_V3_SVA=y
 # CONFIG_ARM_SMMU_V3_KUNIT_TEST is not set
+# CONFIG_TEGRA241_CMDQV is not set
 CONFIG_VIRTIO_IOMMU=m
 
 #
@@ -8825,6 +8883,7 @@ CONFIG_EXTCON=y
 CONFIG_EXTCON_ADC_JACK=m
 # CONFIG_EXTCON_FSA9480 is not set
 CONFIG_EXTCON_GPIO=y
+# CONFIG_EXTCON_LC824206XA is not set
 # CONFIG_EXTCON_MAX3355 is not set
 CONFIG_EXTCON_PTN5150=m
 # CONFIG_EXTCON_RT8973A is not set
@@ -8869,6 +8928,8 @@ CONFIG_ADXL367_I2C=m
 CONFIG_ADXL372=m
 CONFIG_ADXL372_SPI=m
 CONFIG_ADXL372_I2C=m
+# CONFIG_ADXL380_SPI is not set
+# CONFIG_ADXL380_I2C is not set
 CONFIG_BMA180=m
 CONFIG_BMA220=m
 CONFIG_BMA400=m
@@ -8921,7 +8982,9 @@ CONFIG_STK8BA50=m
 # Analog to digital converters
 #
 CONFIG_AD_SIGMA_DELTA=m
+# CONFIG_AD4000 is not set
 # CONFIG_AD4130 is not set
+# CONFIG_AD4695 is not set
 CONFIG_AD7091R=m
 CONFIG_AD7091R5=m
 # CONFIG_AD7091R8 is not set
@@ -8974,6 +9037,7 @@ CONFIG_MCP3422=m
 CONFIG_MCP3911=m
 # CONFIG_MEDIATEK_MT6370_ADC is not set
 # CONFIG_NAU7802 is not set
+# CONFIG_PAC1921 is not set
 # CONFIG_PAC1934 is not set
 # CONFIG_QCOM_SPMI_IADC is not set
 # CONFIG_QCOM_SPMI_VADC is not set
@@ -9119,6 +9183,7 @@ CONFIG_AD5770R=m
 # CONFIG_DS4424 is not set
 CONFIG_LTC1660=m
 # CONFIG_LTC2632 is not set
+# CONFIG_LTC2664 is not set
 # CONFIG_M62332 is not set
 # CONFIG_MAX517 is not set
 # CONFIG_MAX5522 is not set
@@ -9215,6 +9280,7 @@ CONFIG_MAX30102=m
 #
 CONFIG_AM2315=m
 CONFIG_DHT11=m
+# CONFIG_ENS210 is not set
 CONFIG_HDC100X=m
 # CONFIG_HDC2010 is not set
 # CONFIG_HDC3020 is not set
@@ -9269,6 +9335,7 @@ CONFIG_APDS9300=m
 # CONFIG_APDS9306 is not set
 CONFIG_APDS9960=m
 # CONFIG_AS73211 is not set
+# CONFIG_BH1745 is not set
 CONFIG_BH1750=m
 CONFIG_BH1780=m
 CONFIG_CM32181=m
@@ -9424,6 +9491,7 @@ CONFIG_MPL3115=m
 # CONFIG_MPRLS0025PA is not set
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
+# CONFIG_SDP500 is not set
 # CONFIG_IIO_ST_PRESS is not set
 # CONFIG_T5403 is not set
 # CONFIG_HP206C is not set
@@ -9440,6 +9508,7 @@ CONFIG_MPL3115=m
 # Proximity and distance sensors
 #
 CONFIG_CROS_EC_MKBP_PROXIMITY=m
+# CONFIG_HX9023S is not set
 # CONFIG_IRSD200 is not set
 CONFIG_ISL29501=m
 # CONFIG_LIDAR_LITE_V2 is not set
@@ -9454,6 +9523,7 @@ CONFIG_PING=m
 # CONFIG_SRF08 is not set
 # CONFIG_VCNL3020 is not set
 CONFIG_VL53L0X_I2C=m
+# CONFIG_AW96103 is not set
 # end of Proximity and distance sensors
 
 #
@@ -9580,6 +9650,7 @@ CONFIG_ARM_CCI400_PMU=y
 CONFIG_ARM_CCI5xx_PMU=y
 CONFIG_ARM_CCN=y
 # CONFIG_ARM_CMN is not set
+# CONFIG_ARM_NI is not set
 CONFIG_ARM_PMU=y
 CONFIG_ARM_PMU_ACPI=y
 CONFIG_ARM_SMMU_V3_PMU=m
@@ -9623,6 +9694,7 @@ CONFIG_NVMEM_LAYOUTS=y
 #
 # CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
 # CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
+CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=m
 # end of Layout Types
 
 CONFIG_NVMEM_RMEM=m
@@ -9771,6 +9843,7 @@ CONFIG_BCACHEFS_POSIX_ACL=y
 # CONFIG_BCACHEFS_LOCK_TIME_STATS is not set
 # CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set
 CONFIG_BCACHEFS_SIX_OPTIMISTIC_SPIN=y
+# CONFIG_BCACHEFS_PATH_TRACEPOINTS is not set
 # CONFIG_MEAN_AND_VARIANCE_UNIT_TEST is not set
 CONFIG_ZONEFS_FS=m
 CONFIG_FS_POSIX_ACL=y
@@ -9866,6 +9939,7 @@ CONFIG_TMPFS_XATTR=y
 CONFIG_ARCH_SUPPORTS_HUGETLBFS=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
+CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_EFIVAR_FS=y
@@ -9962,6 +10036,7 @@ CONFIG_EROFS_FS=m
 CONFIG_EROFS_FS_XATTR=y
 CONFIG_EROFS_FS_POSIX_ACL=y
 CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_BACKED_BY_FILE=y
 # CONFIG_EROFS_FS_ZIP is not set
 # CONFIG_EROFS_FS_ONDEMAND is not set
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -10001,6 +10076,7 @@ CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
+# CONFIG_NFS_LOCALIO is not set
 CONFIG_NFS_V4_2_SSC_HELPER=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
@@ -10028,6 +10104,7 @@ CONFIG_CIFS_DEBUG=y
 CONFIG_CIFS_DFS_UPCALL=y
 # CONFIG_CIFS_SWN_UPCALL is not set
 CONFIG_CIFS_FSCACHE=y
+# CONFIG_CIFS_COMPRESSION is not set
 CONFIG_SMB_SERVER=m
 CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
 CONFIG_SMB_SERVER_KERBEROS5=y
@@ -10114,6 +10191,9 @@ CONFIG_ENCRYPTED_KEYS=y
 # CONFIG_USER_DECRYPTED_DATA is not set
 CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_PROC_MEM_ALWAYS_FORCE=y
+# CONFIG_PROC_MEM_FORCE_PTRACE is not set
+# CONFIG_PROC_MEM_NO_FORCE is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
@@ -10154,6 +10234,7 @@ CONFIG_SECURITY_YAMA=y
 CONFIG_SECURITY_SAFESETID=y
 # CONFIG_SECURITY_LOCKDOWN_LSM is not set
 # CONFIG_SECURITY_LANDLOCK is not set
+# CONFIG_SECURITY_IPE is not set
 CONFIG_INTEGRITY=y
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
@@ -10206,7 +10287,12 @@ CONFIG_LSM="lockdown,yama,integrity,apparmor"
 #
 # Memory initialization
 #
+CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
+CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y
+CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
 CONFIG_INIT_STACK_NONE=y
+# CONFIG_INIT_STACK_ALL_PATTERN is not set
+# CONFIG_INIT_STACK_ALL_ZERO is not set
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
@@ -10581,7 +10667,9 @@ CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_ARM64=y
 CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_RISCV=y
 CONFIG_XZ_DEC_MICROLZMA=y
 CONFIG_XZ_DEC_BCJ=y
 CONFIG_XZ_DEC_TEST=m
@@ -10611,7 +10699,7 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
-CONFIG_DMA_OPS=y
+CONFIG_DMA_OPS_HELPERS=y
 CONFIG_NEED_SG_DMA_FLAGS=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEED_DMA_MAP_STATE=y
@@ -10662,6 +10750,7 @@ CONFIG_UCS2_STRING=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_VDSO_GETRANDOM=y
 CONFIG_FONT_SUPPORT=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
@@ -10967,6 +11056,7 @@ CONFIG_FUNCTION_ERROR_INJECTION=y
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_DHRY is not set
 # CONFIG_LKDTM is not set
@@ -10975,6 +11065,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_TEST_MIN_HEAP=m
 # CONFIG_TEST_SORT is not set
 CONFIG_TEST_DIV64=m
+# CONFIG_TEST_MULDIV64 is not set
 # CONFIG_TEST_IOV_ITER is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
@@ -11042,3 +11133,5 @@ CONFIG_MEMTEST=y
 #
 # end of Rust hacking
 # end of Kernel hacking
+
+# CONFIG_INT_POW_TEST is not set

From 870eacd2fa35ea797c6d32d7da76e60e56231a5d Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Mon, 14 Oct 2024 12:28:50 +0200
Subject: [PATCH 086/107] rk3588: edge: Enable newly added
 `CONFIG_RTW89_8852BT`

---
 config/kernel/linux-rockchip-rk3588-edge.config | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/kernel/linux-rockchip-rk3588-edge.config b/config/kernel/linux-rockchip-rk3588-edge.config
index b08debd78df3..d045d226b905 100644
--- a/config/kernel/linux-rockchip-rk3588-edge.config
+++ b/config/kernel/linux-rockchip-rk3588-edge.config
@@ -3945,11 +3945,12 @@ CONFIG_RTW89_8851B=m
 CONFIG_RTW89_8852A=m
 CONFIG_RTW89_8852B_COMMON=m
 CONFIG_RTW89_8852B=m
+CONFIG_RTW89_8852BT=m
 CONFIG_RTW89_8852C=m
 CONFIG_RTW89_8851BE=m
 CONFIG_RTW89_8852AE=m
 CONFIG_RTW89_8852BE=m
-# CONFIG_RTW89_8852BTE is not set
+CONFIG_RTW89_8852BTE=m
 CONFIG_RTW89_8852CE=m
 # CONFIG_RTW89_8922AE is not set
 # CONFIG_RTW89_DEBUGMSG is not set

From 43629768b7aa67aa80dbfc36fe49ed1750f9f443 Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Fri, 18 Oct 2024 14:01:35 +0200
Subject: [PATCH 087/107] rk3588: edge: Add new v10 patch for basic HDMI out
 support

Source: https://lore.kernel.org/all/20241016-b4-rk3588-bridge-upstream-v10-0-87ef92a6d14e@collabora.com/^

-----------------------------

**Quote from source:**

Subject: [PATCH v10 0/3] Add initial support for the Rockchip RK3588 HDMI TX Controller
Date: Wed, 16 Oct 2024 23:06:50 +0300

The Rockchip RK3588 SoC family integrates the Synopsys DesignWare HDMI
2.1 Quad-Pixel (QP) TX controller, which is a new IP block, quite
different from those used in the previous generations of Rockchip SoCs.

The controller supports the following features, among others:

* Fixed Rate Link (FRL)
* Display Stream Compression (DSC)
* 4K@120Hz and 8K@60Hz video modes
* Variable Refresh Rate (VRR) including Quick Media Switching (QMS)
* Fast Vactive (FVA)
* SCDC I2C DDC access
* Multi-stream audio
* Enhanced Audio Return Channel (EARC)

This is the last component that needs to be supported in order to enable
the HDMI output functionality on the RK3588 based SBCs, such as the
RADXA Rock 5B.  The other components are the Video Output Processor
(VOP2) and the Samsung IP based HDMI/eDP TX Combo PHY, for which basic
support has been already made available via [1] and [2], respectively.

Please note this is a reworked version of the original series, which
relied on a commonized dw-hdmi approach.  Since the general consensus
was to handle it as an entirely new IP, I dropped all patches related to
the old dw-hdmi and Rockchip glue code - a few of them might still make
sense as general improvements and will be submitted separately.

It's worth mentioning the HDMI output support is currently limited to
RGB output up to 4K@60Hz, without audio, CEC or any of the HDMI 2.1
specific features.  Moreover, the VOP2 driver is not able to properly
handle all display modes supported by the connected screens, e.g. it
doesn't cope with non-integer refresh rates.

A possible workaround consists of enabling the display controller to
make use of the clock provided by the HDMI PHY PLL.  This is still work
in progress and will be submitted later, as well as the required DTS
updates.

To facilitate testing and experimentation, all HDMI output related
patches, including those part of this series, are available at [3].

So far I could only verify this on the RADXA Rock 5B board.

Thanks,
Cristian

[1]: 5a028e8f062f ("drm/rockchip: vop2: Add support for rk3588")
[2]: 553be2830c5f ("phy: rockchip: Add Samsung HDMI/eDP Combo PHY driver")
[3]: https://gitlab.collabora.com/hardware-enablement/rockchip-3588/linux/-/commits/rk3588-hdmi-bridge-v6.12-rc2
[4]: https://lore.kernel.org/lkml/20240801-dw-hdmi-qp-tx-v1-0-148f542de5fd@collabora.com/

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
---
 ...DMI-QP-TX-Controller-support-library.patch | 1601 +++++++++++++++++
 ...schema-for-RK3588-HDMI-TX-Controller.patch |  215 +++
 ...Add-basic-RK3588-HDMI-output-support.patch |  522 ++++++
 3 files changed, 2338 insertions(+)
 create mode 100644 patch/kernel/archive/rockchip-rk3588-6.12/0140-drm-bridge-synopsys-Add-DW-HDMI-QP-TX-Controller-support-library.patch
 create mode 100644 patch/kernel/archive/rockchip-rk3588-6.12/0141-dt-bindings-display-rockchip-Add-schema-for-RK3588-HDMI-TX-Controller.patch
 create mode 100644 patch/kernel/archive/rockchip-rk3588-6.12/0142-drm-rockchip-Add-basic-RK3588-HDMI-output-support.patch

diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0140-drm-bridge-synopsys-Add-DW-HDMI-QP-TX-Controller-support-library.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0140-drm-bridge-synopsys-Add-DW-HDMI-QP-TX-Controller-support-library.patch
new file mode 100644
index 000000000000..2378873eb40d
--- /dev/null
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/0140-drm-bridge-synopsys-Add-DW-HDMI-QP-TX-Controller-support-library.patch
@@ -0,0 +1,1601 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
+Date: Wed, 16 Oct 2024 23:06:51 +0300
+Subject: drm/bridge: synopsys: Add DW HDMI QP TX Controller support library
+
+The Synopsys DesignWare HDMI 2.1 Quad-Pixel (QP) TX Controller IP
+supports the following features, among others:
+
+* Fixed Rate Link (FRL)
+* Display Stream Compression (DSC)
+* 4K@120Hz and 8K@60Hz video modes
+* Variable Refresh Rate (VRR) including Quick Media Switching (QMS), aka
+  Cinema VRR
+* Fast Vactive (FVA), aka Quick Frame Transport (QFT)
+* SCDC I2C DDC access
+* TMDS Scrambler enabling 2160p@60Hz with RGB/YCbCr4:4:4
+* YCbCr4:2:0 enabling 2160p@60Hz at lower HDMI link speeds
+* Multi-stream audio
+* Enhanced Audio Return Channel (EARC)
+
+Add library containing common helpers to enable basic support, i.e. RGB
+output up to 4K@30Hz, without audio, CEC or any HDMI 2.1 specific
+features.
+
+Co-developed-by: Algea Cao <algea.cao@rock-chips.com>
+Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
+Tested-by: Heiko Stuebner <heiko@sntech.de>
+Reviewed-by: Maxime Ripard <mripard@kernel.org>
+Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
+---
+ drivers/gpu/drm/bridge/synopsys/Kconfig      |   8 +
+ drivers/gpu/drm/bridge/synopsys/Makefile     |   2 +
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 647 +++++++
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h | 834 ++++++++++
+ include/drm/bridge/dw_hdmi_qp.h              |  32 +
+ 5 files changed, 1523 insertions(+)
+
+diff --git a/drivers/gpu/drm/bridge/synopsys/Kconfig b/drivers/gpu/drm/bridge/synopsys/Kconfig
+index 111111111111..222222222222 100644
+--- a/drivers/gpu/drm/bridge/synopsys/Kconfig
++++ b/drivers/gpu/drm/bridge/synopsys/Kconfig
+@@ -46,6 +46,14 @@ config DRM_DW_HDMI_CEC
+ 	  Support the CE interface which is part of the Synopsys
+ 	  Designware HDMI block.
+ 
++config DRM_DW_HDMI_QP
++	tristate
++	select DRM_DISPLAY_HDMI_HELPER
++	select DRM_DISPLAY_HDMI_STATE_HELPER
++	select DRM_DISPLAY_HELPER
++	select DRM_KMS_HELPER
++	select REGMAP_MMIO
++
+ config DRM_DW_MIPI_DSI
+ 	tristate
+ 	select DRM_KMS_HELPER
+diff --git a/drivers/gpu/drm/bridge/synopsys/Makefile b/drivers/gpu/drm/bridge/synopsys/Makefile
+index 111111111111..222222222222 100644
+--- a/drivers/gpu/drm/bridge/synopsys/Makefile
++++ b/drivers/gpu/drm/bridge/synopsys/Makefile
+@@ -5,4 +5,6 @@ obj-$(CONFIG_DRM_DW_HDMI_GP_AUDIO) += dw-hdmi-gp-audio.o
+ obj-$(CONFIG_DRM_DW_HDMI_I2S_AUDIO) += dw-hdmi-i2s-audio.o
+ obj-$(CONFIG_DRM_DW_HDMI_CEC) += dw-hdmi-cec.o
+ 
++obj-$(CONFIG_DRM_DW_HDMI_QP) += dw-hdmi-qp.o
++
+ obj-$(CONFIG_DRM_DW_MIPI_DSI) += dw-mipi-dsi.o
+diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
+new file mode 100644
+index 000000000000..111111111111
+--- /dev/null
++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
+@@ -0,0 +1,647 @@
++// SPDX-License-Identifier: GPL-2.0-or-later
++/*
++ * Copyright (c) 2021-2022 Rockchip Electronics Co., Ltd.
++ * Copyright (c) 2024 Collabora Ltd.
++ *
++ * Author: Algea Cao <algea.cao@rock-chips.com>
++ * Author: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
++ */
++#include <linux/completion.h>
++#include <linux/hdmi.h>
++#include <linux/i2c.h>
++#include <linux/irq.h>
++#include <linux/module.h>
++#include <linux/mutex.h>
++#include <linux/of.h>
++#include <linux/workqueue.h>
++
++#include <drm/bridge/dw_hdmi_qp.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_bridge.h>
++#include <drm/drm_connector.h>
++#include <drm/drm_edid.h>
++#include <drm/drm_modes.h>
++
++#include <sound/hdmi-codec.h>
++
++#include "dw-hdmi-qp.h"
++
++#define DDC_CI_ADDR		0x37
++#define DDC_SEGMENT_ADDR	0x30
++
++#define HDMI14_MAX_TMDSCLK	340000000
++
++#define SCRAMB_POLL_DELAY_MS	3000
++
++struct dw_hdmi_qp_i2c {
++	struct i2c_adapter	adap;
++
++	struct mutex		lock;	/* used to serialize data transfers */
++	struct completion	cmp;
++	u8			stat;
++
++	u8			slave_reg;
++	bool			is_regaddr;
++	bool			is_segment;
++};
++
++struct dw_hdmi_qp {
++	struct drm_bridge bridge;
++
++	struct device *dev;
++	struct dw_hdmi_qp_i2c *i2c;
++
++	struct {
++		const struct dw_hdmi_qp_phy_ops *ops;
++		void *data;
++	} phy;
++
++	struct regmap *regm;
++};
++
++static void dw_hdmi_qp_write(struct dw_hdmi_qp *hdmi, unsigned int val,
++			     int offset)
++{
++	regmap_write(hdmi->regm, offset, val);
++}
++
++static unsigned int dw_hdmi_qp_read(struct dw_hdmi_qp *hdmi, int offset)
++{
++	unsigned int val = 0;
++
++	regmap_read(hdmi->regm, offset, &val);
++
++	return val;
++}
++
++static void dw_hdmi_qp_mod(struct dw_hdmi_qp *hdmi, unsigned int data,
++			   unsigned int mask, unsigned int reg)
++{
++	regmap_update_bits(hdmi->regm, reg, mask, data);
++}
++
++static int dw_hdmi_qp_i2c_read(struct dw_hdmi_qp *hdmi,
++			       unsigned char *buf, unsigned int length)
++{
++	struct dw_hdmi_qp_i2c *i2c = hdmi->i2c;
++	int stat;
++
++	if (!i2c->is_regaddr) {
++		dev_dbg(hdmi->dev, "set read register address to 0\n");
++		i2c->slave_reg = 0x00;
++		i2c->is_regaddr = true;
++	}
++
++	while (length--) {
++		reinit_completion(&i2c->cmp);
++
++		dw_hdmi_qp_mod(hdmi, i2c->slave_reg++ << 12, I2CM_ADDR,
++			       I2CM_INTERFACE_CONTROL0);
++
++		if (i2c->is_segment)
++			dw_hdmi_qp_mod(hdmi, I2CM_EXT_READ, I2CM_WR_MASK,
++				       I2CM_INTERFACE_CONTROL0);
++		else
++			dw_hdmi_qp_mod(hdmi, I2CM_FM_READ, I2CM_WR_MASK,
++				       I2CM_INTERFACE_CONTROL0);
++
++		stat = wait_for_completion_timeout(&i2c->cmp, HZ / 10);
++		if (!stat) {
++			dev_err(hdmi->dev, "i2c read timed out\n");
++			dw_hdmi_qp_write(hdmi, 0x01, I2CM_CONTROL0);
++			return -EAGAIN;
++		}
++
++		/* Check for error condition on the bus */
++		if (i2c->stat & I2CM_NACK_RCVD_IRQ) {
++			dev_err(hdmi->dev, "i2c read error\n");
++			dw_hdmi_qp_write(hdmi, 0x01, I2CM_CONTROL0);
++			return -EIO;
++		}
++
++		*buf++ = dw_hdmi_qp_read(hdmi, I2CM_INTERFACE_RDDATA_0_3) & 0xff;
++		dw_hdmi_qp_mod(hdmi, 0, I2CM_WR_MASK, I2CM_INTERFACE_CONTROL0);
++	}
++
++	i2c->is_segment = false;
++
++	return 0;
++}
++
++static int dw_hdmi_qp_i2c_write(struct dw_hdmi_qp *hdmi,
++				unsigned char *buf, unsigned int length)
++{
++	struct dw_hdmi_qp_i2c *i2c = hdmi->i2c;
++	int stat;
++
++	if (!i2c->is_regaddr) {
++		/* Use the first write byte as register address */
++		i2c->slave_reg = buf[0];
++		length--;
++		buf++;
++		i2c->is_regaddr = true;
++	}
++
++	while (length--) {
++		reinit_completion(&i2c->cmp);
++
++		dw_hdmi_qp_write(hdmi, *buf++, I2CM_INTERFACE_WRDATA_0_3);
++		dw_hdmi_qp_mod(hdmi, i2c->slave_reg++ << 12, I2CM_ADDR,
++			       I2CM_INTERFACE_CONTROL0);
++		dw_hdmi_qp_mod(hdmi, I2CM_FM_WRITE, I2CM_WR_MASK,
++			       I2CM_INTERFACE_CONTROL0);
++
++		stat = wait_for_completion_timeout(&i2c->cmp, HZ / 10);
++		if (!stat) {
++			dev_err(hdmi->dev, "i2c write time out!\n");
++			dw_hdmi_qp_write(hdmi, 0x01, I2CM_CONTROL0);
++			return -EAGAIN;
++		}
++
++		/* Check for error condition on the bus */
++		if (i2c->stat & I2CM_NACK_RCVD_IRQ) {
++			dev_err(hdmi->dev, "i2c write nack!\n");
++			dw_hdmi_qp_write(hdmi, 0x01, I2CM_CONTROL0);
++			return -EIO;
++		}
++
++		dw_hdmi_qp_mod(hdmi, 0, I2CM_WR_MASK, I2CM_INTERFACE_CONTROL0);
++	}
++
++	return 0;
++}
++
++static int dw_hdmi_qp_i2c_xfer(struct i2c_adapter *adap,
++			       struct i2c_msg *msgs, int num)
++{
++	struct dw_hdmi_qp *hdmi = i2c_get_adapdata(adap);
++	struct dw_hdmi_qp_i2c *i2c = hdmi->i2c;
++	u8 addr = msgs[0].addr;
++	int i, ret = 0;
++
++	if (addr == DDC_CI_ADDR)
++		/*
++		 * The internal I2C controller does not support the multi-byte
++		 * read and write operations needed for DDC/CI.
++		 * FIXME: Blacklist the DDC/CI address until we filter out
++		 * unsupported I2C operations.
++		 */
++		return -EOPNOTSUPP;
++
++	for (i = 0; i < num; i++) {
++		if (msgs[i].len == 0) {
++			dev_err(hdmi->dev,
++				"unsupported transfer %d/%d, no data\n",
++				i + 1, num);
++			return -EOPNOTSUPP;
++		}
++	}
++
++	guard(mutex)(&i2c->lock);
++
++	/* Unmute DONE and ERROR interrupts */
++	dw_hdmi_qp_mod(hdmi, I2CM_NACK_RCVD_MASK_N | I2CM_OP_DONE_MASK_N,
++		       I2CM_NACK_RCVD_MASK_N | I2CM_OP_DONE_MASK_N,
++		       MAINUNIT_1_INT_MASK_N);
++
++	/* Set slave device address taken from the first I2C message */
++	if (addr == DDC_SEGMENT_ADDR && msgs[0].len == 1)
++		addr = DDC_ADDR;
++
++	dw_hdmi_qp_mod(hdmi, addr << 5, I2CM_SLVADDR, I2CM_INTERFACE_CONTROL0);
++
++	/* Set slave device register address on transfer */
++	i2c->is_regaddr = false;
++
++	/* Set segment pointer for I2C extended read mode operation */
++	i2c->is_segment = false;
++
++	for (i = 0; i < num; i++) {
++		if (msgs[i].addr == DDC_SEGMENT_ADDR && msgs[i].len == 1) {
++			i2c->is_segment = true;
++			dw_hdmi_qp_mod(hdmi, DDC_SEGMENT_ADDR, I2CM_SEG_ADDR,
++				       I2CM_INTERFACE_CONTROL1);
++			dw_hdmi_qp_mod(hdmi, *msgs[i].buf << 7, I2CM_SEG_PTR,
++				       I2CM_INTERFACE_CONTROL1);
++		} else {
++			if (msgs[i].flags & I2C_M_RD)
++				ret = dw_hdmi_qp_i2c_read(hdmi, msgs[i].buf,
++							  msgs[i].len);
++			else
++				ret = dw_hdmi_qp_i2c_write(hdmi, msgs[i].buf,
++							   msgs[i].len);
++		}
++		if (ret < 0)
++			break;
++	}
++
++	if (!ret)
++		ret = num;
++
++	/* Mute DONE and ERROR interrupts */
++	dw_hdmi_qp_mod(hdmi, 0, I2CM_OP_DONE_MASK_N | I2CM_NACK_RCVD_MASK_N,
++		       MAINUNIT_1_INT_MASK_N);
++
++	return ret;
++}
++
++static u32 dw_hdmi_qp_i2c_func(struct i2c_adapter *adapter)
++{
++	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
++}
++
++static const struct i2c_algorithm dw_hdmi_qp_algorithm = {
++	.master_xfer	= dw_hdmi_qp_i2c_xfer,
++	.functionality	= dw_hdmi_qp_i2c_func,
++};
++
++static struct i2c_adapter *dw_hdmi_qp_i2c_adapter(struct dw_hdmi_qp *hdmi)
++{
++	struct dw_hdmi_qp_i2c *i2c;
++	struct i2c_adapter *adap;
++	int ret;
++
++	i2c = devm_kzalloc(hdmi->dev, sizeof(*i2c), GFP_KERNEL);
++	if (!i2c)
++		return ERR_PTR(-ENOMEM);
++
++	mutex_init(&i2c->lock);
++	init_completion(&i2c->cmp);
++
++	adap = &i2c->adap;
++	adap->owner = THIS_MODULE;
++	adap->dev.parent = hdmi->dev;
++	adap->algo = &dw_hdmi_qp_algorithm;
++	strscpy(adap->name, "DesignWare HDMI QP", sizeof(adap->name));
++
++	i2c_set_adapdata(adap, hdmi);
++
++	ret = devm_i2c_add_adapter(hdmi->dev, adap);
++	if (ret) {
++		dev_warn(hdmi->dev, "cannot add %s I2C adapter\n", adap->name);
++		devm_kfree(hdmi->dev, i2c);
++		return ERR_PTR(ret);
++	}
++
++	hdmi->i2c = i2c;
++	dev_info(hdmi->dev, "registered %s I2C bus driver\n", adap->name);
++
++	return adap;
++}
++
++static int dw_hdmi_qp_config_avi_infoframe(struct dw_hdmi_qp *hdmi,
++					   const u8 *buffer, size_t len)
++{
++	u32 val, i, j;
++
++	if (len != HDMI_INFOFRAME_SIZE(AVI)) {
++		dev_err(hdmi->dev, "failed to configure avi infoframe\n");
++		return -EINVAL;
++	}
++
++	/*
++	 * DW HDMI QP IP uses a different byte format from standard AVI info
++	 * frames, though generally the bits are in the correct bytes.
++	 */
++	val = buffer[1] << 8 | buffer[2] << 16;
++	dw_hdmi_qp_write(hdmi, val, PKT_AVI_CONTENTS0);
++
++	for (i = 0; i < 4; i++) {
++		for (j = 0; j < 4; j++) {
++			if (i * 4 + j >= 14)
++				break;
++			if (!j)
++				val = buffer[i * 4 + j + 3];
++			val |= buffer[i * 4 + j + 3] << (8 * j);
++		}
++
++		dw_hdmi_qp_write(hdmi, val, PKT_AVI_CONTENTS1 + i * 4);
++	}
++
++	dw_hdmi_qp_mod(hdmi, 0, PKTSCHED_AVI_FIELDRATE, PKTSCHED_PKT_CONFIG1);
++
++	dw_hdmi_qp_mod(hdmi, PKTSCHED_AVI_TX_EN | PKTSCHED_GCP_TX_EN,
++		       PKTSCHED_AVI_TX_EN | PKTSCHED_GCP_TX_EN, PKTSCHED_PKT_EN);
++
++	return 0;
++}
++
++static int dw_hdmi_qp_config_drm_infoframe(struct dw_hdmi_qp *hdmi,
++					   const u8 *buffer, size_t len)
++{
++	u32 val, i;
++
++	if (len != HDMI_INFOFRAME_SIZE(DRM)) {
++		dev_err(hdmi->dev, "failed to configure drm infoframe\n");
++		return -EINVAL;
++	}
++
++	dw_hdmi_qp_mod(hdmi, 0, PKTSCHED_DRMI_TX_EN, PKTSCHED_PKT_EN);
++
++	val = buffer[1] << 8 | buffer[2] << 16;
++	dw_hdmi_qp_write(hdmi, val, PKT_DRMI_CONTENTS0);
++
++	for (i = 0; i <= buffer[2]; i++) {
++		if (i % 4 == 0)
++			val = buffer[3 + i];
++		val |= buffer[3 + i] << ((i % 4) * 8);
++
++		if ((i % 4 == 3) || i == buffer[2])
++			dw_hdmi_qp_write(hdmi, val,
++					 PKT_DRMI_CONTENTS1 + ((i / 4) * 4));
++	}
++
++	dw_hdmi_qp_mod(hdmi, 0, PKTSCHED_DRMI_FIELDRATE, PKTSCHED_PKT_CONFIG1);
++	dw_hdmi_qp_mod(hdmi, PKTSCHED_DRMI_TX_EN, PKTSCHED_DRMI_TX_EN,
++		       PKTSCHED_PKT_EN);
++
++	return 0;
++}
++
++static int dw_hdmi_qp_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)
++{
++	struct dw_hdmi_qp *hdmi = bridge->driver_private;
++	int ret;
++
++	ret = drm_atomic_helper_connector_hdmi_check(conn_state->connector,
++						     conn_state->state);
++	if (ret)
++		dev_dbg(hdmi->dev, "%s failed: %d\n", __func__, ret);
++
++	return ret;
++}
++
++static void dw_hdmi_qp_bridge_atomic_enable(struct drm_bridge *bridge,
++					    struct drm_bridge_state *old_state)
++{
++	struct dw_hdmi_qp *hdmi = bridge->driver_private;
++	struct drm_atomic_state *state = old_state->base.state;
++	struct drm_connector_state *conn_state;
++	struct drm_connector *connector;
++	unsigned int op_mode;
++
++	connector = drm_atomic_get_new_connector_for_encoder(state, bridge->encoder);
++	if (WARN_ON(!connector))
++		return;
++
++	conn_state = drm_atomic_get_new_connector_state(state, connector);
++	if (WARN_ON(!conn_state))
++		return;
++
++	if (connector->display_info.is_hdmi) {
++		dev_dbg(hdmi->dev, "%s mode=HDMI rate=%llu\n",
++			__func__, conn_state->hdmi.tmds_char_rate);
++		op_mode = 0;
++	} else {
++		dev_dbg(hdmi->dev, "%s mode=DVI\n", __func__);
++		op_mode = OPMODE_DVI;
++	}
++
++	hdmi->phy.ops->init(hdmi, hdmi->phy.data);
++
++	dw_hdmi_qp_mod(hdmi, HDCP2_BYPASS, HDCP2_BYPASS, HDCP2LOGIC_CONFIG0);
++	dw_hdmi_qp_mod(hdmi, op_mode, OPMODE_DVI, LINK_CONFIG0);
++
++	drm_atomic_helper_connector_hdmi_update_infoframes(connector, state);
++}
++
++static void dw_hdmi_qp_bridge_atomic_disable(struct drm_bridge *bridge,
++					     struct drm_bridge_state *old_state)
++{
++	struct dw_hdmi_qp *hdmi = bridge->driver_private;
++
++	hdmi->phy.ops->disable(hdmi, hdmi->phy.data);
++}
++
++static enum drm_connector_status
++dw_hdmi_qp_bridge_detect(struct drm_bridge *bridge)
++{
++	struct dw_hdmi_qp *hdmi = bridge->driver_private;
++
++	return hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data);
++}
++
++static const struct drm_edid *
++dw_hdmi_qp_bridge_edid_read(struct drm_bridge *bridge,
++			    struct drm_connector *connector)
++{
++	struct dw_hdmi_qp *hdmi = bridge->driver_private;
++	const struct drm_edid *drm_edid;
++
++	drm_edid = drm_edid_read_ddc(connector, bridge->ddc);
++	if (!drm_edid)
++		dev_dbg(hdmi->dev, "failed to get edid\n");
++
++	return drm_edid;
++}
++
++static enum drm_mode_status
++dw_hdmi_qp_bridge_mode_valid(struct drm_bridge *bridge,
++			     const struct drm_display_info *info,
++			     const struct drm_display_mode *mode)
++{
++	struct dw_hdmi_qp *hdmi = bridge->driver_private;
++	unsigned long long rate;
++
++	rate = drm_hdmi_compute_mode_clock(mode, 8, HDMI_COLORSPACE_RGB);
++	if (rate > HDMI14_MAX_TMDSCLK) {
++		dev_dbg(hdmi->dev, "Unsupported mode clock: %d\n", mode->clock);
++		return MODE_CLOCK_HIGH;
++	}
++
++	return MODE_OK;
++}
++
++static int dw_hdmi_qp_bridge_clear_infoframe(struct drm_bridge *bridge,
++					     enum hdmi_infoframe_type type)
++{
++	struct dw_hdmi_qp *hdmi = bridge->driver_private;
++
++	switch (type) {
++	case HDMI_INFOFRAME_TYPE_AVI:
++		dw_hdmi_qp_mod(hdmi, 0, PKTSCHED_AVI_TX_EN | PKTSCHED_GCP_TX_EN,
++			       PKTSCHED_PKT_EN);
++		break;
++
++	case HDMI_INFOFRAME_TYPE_DRM:
++		dw_hdmi_qp_mod(hdmi, 0, PKTSCHED_DRMI_TX_EN, PKTSCHED_PKT_EN);
++		break;
++
++	default:
++		dev_dbg(hdmi->dev, "Unsupported infoframe type %x\n", type);
++	}
++
++	return 0;
++}
++
++static int dw_hdmi_qp_bridge_write_infoframe(struct drm_bridge *bridge,
++					     enum hdmi_infoframe_type type,
++					     const u8 *buffer, size_t len)
++{
++	struct dw_hdmi_qp *hdmi = bridge->driver_private;
++
++	dw_hdmi_qp_bridge_clear_infoframe(bridge, type);
++
++	switch (type) {
++	case HDMI_INFOFRAME_TYPE_AVI:
++		return dw_hdmi_qp_config_avi_infoframe(hdmi, buffer, len);
++
++	case HDMI_INFOFRAME_TYPE_DRM:
++		return dw_hdmi_qp_config_drm_infoframe(hdmi, buffer, len);
++
++	default:
++		dev_dbg(hdmi->dev, "Unsupported infoframe type %x\n", type);
++		return 0;
++	}
++}
++
++static const struct drm_bridge_funcs dw_hdmi_qp_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,
++	.atomic_check = dw_hdmi_qp_bridge_atomic_check,
++	.atomic_enable = dw_hdmi_qp_bridge_atomic_enable,
++	.atomic_disable = dw_hdmi_qp_bridge_atomic_disable,
++	.detect = dw_hdmi_qp_bridge_detect,
++	.edid_read = dw_hdmi_qp_bridge_edid_read,
++	.mode_valid = dw_hdmi_qp_bridge_mode_valid,
++	.hdmi_clear_infoframe = dw_hdmi_qp_bridge_clear_infoframe,
++	.hdmi_write_infoframe = dw_hdmi_qp_bridge_write_infoframe,
++};
++
++static irqreturn_t dw_hdmi_qp_main_hardirq(int irq, void *dev_id)
++{
++	struct dw_hdmi_qp *hdmi = dev_id;
++	struct dw_hdmi_qp_i2c *i2c = hdmi->i2c;
++	u32 stat;
++
++	stat = dw_hdmi_qp_read(hdmi, MAINUNIT_1_INT_STATUS);
++
++	i2c->stat = stat & (I2CM_OP_DONE_IRQ | I2CM_READ_REQUEST_IRQ |
++			    I2CM_NACK_RCVD_IRQ);
++
++	if (i2c->stat) {
++		dw_hdmi_qp_write(hdmi, i2c->stat, MAINUNIT_1_INT_CLEAR);
++		complete(&i2c->cmp);
++	}
++
++	if (stat)
++		return IRQ_HANDLED;
++
++	return IRQ_NONE;
++}
++
++static const struct regmap_config dw_hdmi_qp_regmap_config = {
++	.reg_bits	= 32,
++	.val_bits	= 32,
++	.reg_stride	= 4,
++	.max_register	= EARCRX_1_INT_FORCE,
++};
++
++static void dw_hdmi_qp_init_hw(struct dw_hdmi_qp *hdmi)
++{
++	dw_hdmi_qp_write(hdmi, 0, MAINUNIT_0_INT_MASK_N);
++	dw_hdmi_qp_write(hdmi, 0, MAINUNIT_1_INT_MASK_N);
++	dw_hdmi_qp_write(hdmi, 428571429, TIMER_BASE_CONFIG0);
++
++	/* Software reset */
++	dw_hdmi_qp_write(hdmi, 0x01, I2CM_CONTROL0);
++
++	dw_hdmi_qp_write(hdmi, 0x085c085c, I2CM_FM_SCL_CONFIG0);
++
++	dw_hdmi_qp_mod(hdmi, 0, I2CM_FM_EN, I2CM_INTERFACE_CONTROL0);
++
++	/* Clear DONE and ERROR interrupts */
++	dw_hdmi_qp_write(hdmi, I2CM_OP_DONE_CLEAR | I2CM_NACK_RCVD_CLEAR,
++			 MAINUNIT_1_INT_CLEAR);
++
++	if (hdmi->phy.ops->setup_hpd)
++		hdmi->phy.ops->setup_hpd(hdmi, hdmi->phy.data);
++}
++
++struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev,
++				   struct drm_encoder *encoder,
++				   const struct dw_hdmi_qp_plat_data *plat_data)
++{
++	struct device *dev = &pdev->dev;
++	struct dw_hdmi_qp *hdmi;
++	void __iomem *regs;
++	int ret;
++
++	if (!plat_data->phy_ops || !plat_data->phy_ops->init ||
++	    !plat_data->phy_ops->disable || !plat_data->phy_ops->read_hpd) {
++		dev_err(dev, "Missing platform PHY ops\n");
++		return ERR_PTR(-ENODEV);
++	}
++
++	hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL);
++	if (!hdmi)
++		return ERR_PTR(-ENOMEM);
++
++	hdmi->dev = dev;
++
++	regs = devm_platform_ioremap_resource(pdev, 0);
++	if (IS_ERR(regs))
++		return ERR_CAST(regs);
++
++	hdmi->regm = devm_regmap_init_mmio(dev, regs, &dw_hdmi_qp_regmap_config);
++	if (IS_ERR(hdmi->regm)) {
++		dev_err(dev, "Failed to configure regmap\n");
++		return ERR_CAST(hdmi->regm);
++	}
++
++	hdmi->phy.ops = plat_data->phy_ops;
++	hdmi->phy.data = plat_data->phy_data;
++
++	dw_hdmi_qp_init_hw(hdmi);
++
++	ret = devm_request_threaded_irq(dev, plat_data->main_irq,
++					dw_hdmi_qp_main_hardirq, NULL,
++					IRQF_SHARED, dev_name(dev), hdmi);
++	if (ret)
++		return ERR_PTR(ret);
++
++	hdmi->bridge.driver_private = hdmi;
++	hdmi->bridge.funcs = &dw_hdmi_qp_bridge_funcs;
++	hdmi->bridge.ops = DRM_BRIDGE_OP_DETECT |
++			   DRM_BRIDGE_OP_EDID |
++			   DRM_BRIDGE_OP_HDMI |
++			   DRM_BRIDGE_OP_HPD;
++	hdmi->bridge.of_node = pdev->dev.of_node;
++	hdmi->bridge.type = DRM_MODE_CONNECTOR_HDMIA;
++	hdmi->bridge.vendor = "Synopsys";
++	hdmi->bridge.product = "DW HDMI QP TX";
++
++	hdmi->bridge.ddc = dw_hdmi_qp_i2c_adapter(hdmi);
++	if (IS_ERR(hdmi->bridge.ddc))
++		return ERR_CAST(hdmi->bridge.ddc);
++
++	ret = devm_drm_bridge_add(dev, &hdmi->bridge);
++	if (ret)
++		return ERR_PTR(ret);
++
++	ret = drm_bridge_attach(encoder, &hdmi->bridge, NULL,
++				DRM_BRIDGE_ATTACH_NO_CONNECTOR);
++	if (ret)
++		return ERR_PTR(ret);
++
++	return hdmi;
++}
++EXPORT_SYMBOL_GPL(dw_hdmi_qp_bind);
++
++void dw_hdmi_qp_resume(struct device *dev, struct dw_hdmi_qp *hdmi)
++{
++	dw_hdmi_qp_init_hw(hdmi);
++}
++EXPORT_SYMBOL_GPL(dw_hdmi_qp_resume);
++
++MODULE_AUTHOR("Algea Cao <algea.cao@rock-chips.com>");
++MODULE_AUTHOR("Cristian Ciocaltea <cristian.ciocaltea@collabora.com>");
++MODULE_DESCRIPTION("DW HDMI QP transmitter library");
++MODULE_LICENSE("GPL");
+diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h
+new file mode 100644
+index 000000000000..111111111111
+--- /dev/null
++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h
+@@ -0,0 +1,834 @@
++/* SPDX-License-Identifier: GPL-2.0 */
++/*
++ * Copyright (C) Rockchip Electronics Co.Ltd
++ * Author:
++ *      Algea Cao <algea.cao@rock-chips.com>
++ */
++#ifndef __DW_HDMI_QP_H__
++#define __DW_HDMI_QP_H__
++
++#include <linux/bits.h>
++
++/* Main Unit Registers */
++#define CORE_ID						0x0
++#define VER_NUMBER					0x4
++#define VER_TYPE					0x8
++#define CONFIG_REG					0xc
++#define CONFIG_CEC					BIT(28)
++#define CONFIG_AUD_UD					BIT(23)
++#define CORE_TIMESTAMP_HHMM				0x14
++#define CORE_TIMESTAMP_MMDD				0x18
++#define CORE_TIMESTAMP_YYYY				0x1c
++/* Reset Manager Registers */
++#define GLOBAL_SWRESET_REQUEST				0x40
++#define EARCRX_CMDC_SWINIT_P				BIT(27)
++#define AVP_DATAPATH_PACKET_AUDIO_SWINIT_P		BIT(10)
++#define GLOBAL_SWDISABLE				0x44
++#define CEC_SWDISABLE					BIT(17)
++#define AVP_DATAPATH_PACKET_AUDIO_SWDISABLE		BIT(10)
++#define AVP_DATAPATH_VIDEO_SWDISABLE			BIT(6)
++#define RESET_MANAGER_CONFIG0				0x48
++#define RESET_MANAGER_STATUS0				0x50
++#define RESET_MANAGER_STATUS1				0x54
++#define RESET_MANAGER_STATUS2				0x58
++/* Timer Base Registers */
++#define TIMER_BASE_CONFIG0				0x80
++#define TIMER_BASE_STATUS0				0x84
++/* CMU Registers */
++#define CMU_CONFIG0					0xa0
++#define CMU_CONFIG1					0xa4
++#define CMU_CONFIG2					0xa8
++#define CMU_CONFIG3					0xac
++#define CMU_STATUS					0xb0
++#define DISPLAY_CLK_MONITOR				0x3f
++#define DISPLAY_CLK_LOCKED				0X15
++#define EARC_BPCLK_OFF					BIT(9)
++#define AUDCLK_OFF					BIT(7)
++#define LINKQPCLK_OFF					BIT(5)
++#define VIDQPCLK_OFF					BIT(3)
++#define IPI_CLK_OFF					BIT(1)
++#define CMU_IPI_CLK_FREQ				0xb4
++#define CMU_VIDQPCLK_FREQ				0xb8
++#define CMU_LINKQPCLK_FREQ				0xbc
++#define CMU_AUDQPCLK_FREQ				0xc0
++#define CMU_EARC_BPCLK_FREQ				0xc4
++/* I2CM Registers */
++#define I2CM_SM_SCL_CONFIG0				0xe0
++#define I2CM_FM_SCL_CONFIG0				0xe4
++#define I2CM_CONFIG0					0xe8
++#define I2CM_CONTROL0					0xec
++#define I2CM_STATUS0					0xf0
++#define I2CM_INTERFACE_CONTROL0				0xf4
++#define I2CM_ADDR					0xff000
++#define I2CM_SLVADDR					0xfe0
++#define I2CM_WR_MASK					0x1e
++#define I2CM_EXT_READ					BIT(4)
++#define I2CM_SHORT_READ					BIT(3)
++#define I2CM_FM_READ					BIT(2)
++#define I2CM_FM_WRITE					BIT(1)
++#define I2CM_FM_EN					BIT(0)
++#define I2CM_INTERFACE_CONTROL1				0xf8
++#define I2CM_SEG_PTR					0x7f80
++#define I2CM_SEG_ADDR					0x7f
++#define I2CM_INTERFACE_WRDATA_0_3			0xfc
++#define I2CM_INTERFACE_WRDATA_4_7			0x100
++#define I2CM_INTERFACE_WRDATA_8_11			0x104
++#define I2CM_INTERFACE_WRDATA_12_15			0x108
++#define I2CM_INTERFACE_RDDATA_0_3			0x10c
++#define I2CM_INTERFACE_RDDATA_4_7			0x110
++#define I2CM_INTERFACE_RDDATA_8_11			0x114
++#define I2CM_INTERFACE_RDDATA_12_15			0x118
++/* SCDC Registers */
++#define SCDC_CONFIG0					0x140
++#define SCDC_I2C_FM_EN					BIT(12)
++#define SCDC_UPD_FLAGS_AUTO_CLR				BIT(6)
++#define SCDC_UPD_FLAGS_POLL_EN				BIT(4)
++#define SCDC_CONTROL0					0x148
++#define SCDC_STATUS0					0x150
++#define STATUS_UPDATE					BIT(0)
++#define FRL_START					BIT(4)
++#define FLT_UPDATE					BIT(5)
++/* FLT Registers */
++#define FLT_CONFIG0					0x160
++#define FLT_CONFIG1					0x164
++#define FLT_CONFIG2					0x168
++#define FLT_CONTROL0					0x170
++/*  Main Unit 2 Registers */
++#define MAINUNIT_STATUS0				0x180
++/* Video Interface Registers */
++#define VIDEO_INTERFACE_CONFIG0				0x800
++#define VIDEO_INTERFACE_CONFIG1				0x804
++#define VIDEO_INTERFACE_CONFIG2				0x808
++#define VIDEO_INTERFACE_CONTROL0			0x80c
++#define VIDEO_INTERFACE_STATUS0				0x814
++/* Video Packing Registers */
++#define VIDEO_PACKING_CONFIG0				0x81c
++/* Audio Interface Registers */
++#define AUDIO_INTERFACE_CONFIG0				0x820
++#define AUD_IF_SEL_MSK					0x3
++#define AUD_IF_SPDIF					0x2
++#define AUD_IF_I2S					0x1
++#define AUD_IF_PAI					0x0
++#define AUD_FIFO_INIT_ON_OVF_MSK			BIT(2)
++#define AUD_FIFO_INIT_ON_OVF_EN				BIT(2)
++#define I2S_LINES_EN_MSK				GENMASK(7, 4)
++#define I2S_LINES_EN(x)					BIT((x) + 4)
++#define I2S_BPCUV_RCV_MSK				BIT(12)
++#define I2S_BPCUV_RCV_EN				BIT(12)
++#define I2S_BPCUV_RCV_DIS				0
++#define SPDIF_LINES_EN					GENMASK(19, 16)
++#define AUD_FORMAT_MSK					GENMASK(26, 24)
++#define AUD_3DOBA					(0x7 << 24)
++#define AUD_3DASP					(0x6 << 24)
++#define AUD_MSOBA					(0x5 << 24)
++#define AUD_MSASP					(0x4 << 24)
++#define AUD_HBR						(0x3 << 24)
++#define AUD_DST						(0x2 << 24)
++#define AUD_OBA						(0x1 << 24)
++#define AUD_ASP						(0x0 << 24)
++#define AUDIO_INTERFACE_CONFIG1				0x824
++#define AUDIO_INTERFACE_CONTROL0			0x82c
++#define AUDIO_FIFO_CLR_P				BIT(0)
++#define AUDIO_INTERFACE_STATUS0				0x834
++/* Frame Composer Registers */
++#define FRAME_COMPOSER_CONFIG0				0x840
++#define FRAME_COMPOSER_CONFIG1				0x844
++#define FRAME_COMPOSER_CONFIG2				0x848
++#define FRAME_COMPOSER_CONFIG3				0x84c
++#define FRAME_COMPOSER_CONFIG4				0x850
++#define FRAME_COMPOSER_CONFIG5				0x854
++#define FRAME_COMPOSER_CONFIG6				0x858
++#define FRAME_COMPOSER_CONFIG7				0x85c
++#define FRAME_COMPOSER_CONFIG8				0x860
++#define FRAME_COMPOSER_CONFIG9				0x864
++#define FRAME_COMPOSER_CONTROL0				0x86c
++/* Video Monitor Registers */
++#define VIDEO_MONITOR_CONFIG0				0x880
++#define VIDEO_MONITOR_STATUS0				0x884
++#define VIDEO_MONITOR_STATUS1				0x888
++#define VIDEO_MONITOR_STATUS2				0x88c
++#define VIDEO_MONITOR_STATUS3				0x890
++#define VIDEO_MONITOR_STATUS4				0x894
++#define VIDEO_MONITOR_STATUS5				0x898
++#define VIDEO_MONITOR_STATUS6				0x89c
++/* HDCP2 Logic Registers */
++#define HDCP2LOGIC_CONFIG0				0x8e0
++#define HDCP2_BYPASS					BIT(0)
++#define HDCP2LOGIC_ESM_GPIO_IN				0x8e4
++#define HDCP2LOGIC_ESM_GPIO_OUT				0x8e8
++/* HDCP14 Registers */
++#define HDCP14_CONFIG0					0x900
++#define HDCP14_CONFIG1					0x904
++#define HDCP14_CONFIG2					0x908
++#define HDCP14_CONFIG3					0x90c
++#define HDCP14_KEY_SEED					0x914
++#define HDCP14_KEY_H					0x918
++#define HDCP14_KEY_L					0x91c
++#define HDCP14_KEY_STATUS				0x920
++#define HDCP14_AKSV_H					0x924
++#define HDCP14_AKSV_L					0x928
++#define HDCP14_AN_H					0x92c
++#define HDCP14_AN_L					0x930
++#define HDCP14_STATUS0					0x934
++#define HDCP14_STATUS1					0x938
++/* Scrambler Registers */
++#define SCRAMB_CONFIG0					0x960
++/* Video Configuration Registers */
++#define LINK_CONFIG0					0x968
++#define OPMODE_FRL_4LANES				BIT(8)
++#define OPMODE_DVI					BIT(4)
++#define OPMODE_FRL					BIT(0)
++/* TMDS FIFO Registers */
++#define TMDS_FIFO_CONFIG0				0x970
++#define TMDS_FIFO_CONTROL0				0x974
++/* FRL RSFEC Registers */
++#define FRL_RSFEC_CONFIG0				0xa20
++#define FRL_RSFEC_STATUS0				0xa30
++/* FRL Packetizer Registers */
++#define FRL_PKTZ_CONFIG0				0xa40
++#define FRL_PKTZ_CONTROL0				0xa44
++#define FRL_PKTZ_CONTROL1				0xa50
++#define FRL_PKTZ_STATUS1				0xa54
++/* Packet Scheduler Registers */
++#define PKTSCHED_CONFIG0				0xa80
++#define PKTSCHED_PRQUEUE0_CONFIG0			0xa84
++#define PKTSCHED_PRQUEUE1_CONFIG0			0xa88
++#define PKTSCHED_PRQUEUE2_CONFIG0			0xa8c
++#define PKTSCHED_PRQUEUE2_CONFIG1			0xa90
++#define PKTSCHED_PRQUEUE2_CONFIG2			0xa94
++#define PKTSCHED_PKT_CONFIG0				0xa98
++#define PKTSCHED_PKT_CONFIG1				0xa9c
++#define PKTSCHED_DRMI_FIELDRATE				BIT(13)
++#define PKTSCHED_AVI_FIELDRATE				BIT(12)
++#define PKTSCHED_PKT_CONFIG2				0xaa0
++#define PKTSCHED_PKT_CONFIG3				0xaa4
++#define PKTSCHED_PKT_EN					0xaa8
++#define PKTSCHED_DRMI_TX_EN				BIT(17)
++#define PKTSCHED_AUDI_TX_EN				BIT(15)
++#define PKTSCHED_AVI_TX_EN				BIT(13)
++#define PKTSCHED_EMP_CVTEM_TX_EN			BIT(10)
++#define PKTSCHED_AMD_TX_EN				BIT(8)
++#define PKTSCHED_GCP_TX_EN				BIT(3)
++#define PKTSCHED_AUDS_TX_EN				BIT(2)
++#define PKTSCHED_ACR_TX_EN				BIT(1)
++#define PKTSCHED_NULL_TX_EN				BIT(0)
++#define PKTSCHED_PKT_CONTROL0				0xaac
++#define PKTSCHED_PKT_SEND				0xab0
++#define PKTSCHED_PKT_STATUS0				0xab4
++#define PKTSCHED_PKT_STATUS1				0xab8
++#define PKT_NULL_CONTENTS0				0xb00
++#define PKT_NULL_CONTENTS1				0xb04
++#define PKT_NULL_CONTENTS2				0xb08
++#define PKT_NULL_CONTENTS3				0xb0c
++#define PKT_NULL_CONTENTS4				0xb10
++#define PKT_NULL_CONTENTS5				0xb14
++#define PKT_NULL_CONTENTS6				0xb18
++#define PKT_NULL_CONTENTS7				0xb1c
++#define PKT_ACP_CONTENTS0				0xb20
++#define PKT_ACP_CONTENTS1				0xb24
++#define PKT_ACP_CONTENTS2				0xb28
++#define PKT_ACP_CONTENTS3				0xb2c
++#define PKT_ACP_CONTENTS4				0xb30
++#define PKT_ACP_CONTENTS5				0xb34
++#define PKT_ACP_CONTENTS6				0xb38
++#define PKT_ACP_CONTENTS7				0xb3c
++#define PKT_ISRC1_CONTENTS0				0xb40
++#define PKT_ISRC1_CONTENTS1				0xb44
++#define PKT_ISRC1_CONTENTS2				0xb48
++#define PKT_ISRC1_CONTENTS3				0xb4c
++#define PKT_ISRC1_CONTENTS4				0xb50
++#define PKT_ISRC1_CONTENTS5				0xb54
++#define PKT_ISRC1_CONTENTS6				0xb58
++#define PKT_ISRC1_CONTENTS7				0xb5c
++#define PKT_ISRC2_CONTENTS0				0xb60
++#define PKT_ISRC2_CONTENTS1				0xb64
++#define PKT_ISRC2_CONTENTS2				0xb68
++#define PKT_ISRC2_CONTENTS3				0xb6c
++#define PKT_ISRC2_CONTENTS4				0xb70
++#define PKT_ISRC2_CONTENTS5				0xb74
++#define PKT_ISRC2_CONTENTS6				0xb78
++#define PKT_ISRC2_CONTENTS7				0xb7c
++#define PKT_GMD_CONTENTS0				0xb80
++#define PKT_GMD_CONTENTS1				0xb84
++#define PKT_GMD_CONTENTS2				0xb88
++#define PKT_GMD_CONTENTS3				0xb8c
++#define PKT_GMD_CONTENTS4				0xb90
++#define PKT_GMD_CONTENTS5				0xb94
++#define PKT_GMD_CONTENTS6				0xb98
++#define PKT_GMD_CONTENTS7				0xb9c
++#define PKT_AMD_CONTENTS0				0xba0
++#define PKT_AMD_CONTENTS1				0xba4
++#define PKT_AMD_CONTENTS2				0xba8
++#define PKT_AMD_CONTENTS3				0xbac
++#define PKT_AMD_CONTENTS4				0xbb0
++#define PKT_AMD_CONTENTS5				0xbb4
++#define PKT_AMD_CONTENTS6				0xbb8
++#define PKT_AMD_CONTENTS7				0xbbc
++#define PKT_VSI_CONTENTS0				0xbc0
++#define PKT_VSI_CONTENTS1				0xbc4
++#define PKT_VSI_CONTENTS2				0xbc8
++#define PKT_VSI_CONTENTS3				0xbcc
++#define PKT_VSI_CONTENTS4				0xbd0
++#define PKT_VSI_CONTENTS5				0xbd4
++#define PKT_VSI_CONTENTS6				0xbd8
++#define PKT_VSI_CONTENTS7				0xbdc
++#define PKT_AVI_CONTENTS0				0xbe0
++#define HDMI_FC_AVICONF0_ACTIVE_FMT_INFO_PRESENT	BIT(4)
++#define HDMI_FC_AVICONF0_BAR_DATA_VERT_BAR		0x04
++#define HDMI_FC_AVICONF0_BAR_DATA_HORIZ_BAR		0x08
++#define HDMI_FC_AVICONF2_IT_CONTENT_VALID		0x80
++#define PKT_AVI_CONTENTS1				0xbe4
++#define PKT_AVI_CONTENTS2				0xbe8
++#define PKT_AVI_CONTENTS3				0xbec
++#define PKT_AVI_CONTENTS4				0xbf0
++#define PKT_AVI_CONTENTS5				0xbf4
++#define PKT_AVI_CONTENTS6				0xbf8
++#define PKT_AVI_CONTENTS7				0xbfc
++#define PKT_SPDI_CONTENTS0				0xc00
++#define PKT_SPDI_CONTENTS1				0xc04
++#define PKT_SPDI_CONTENTS2				0xc08
++#define PKT_SPDI_CONTENTS3				0xc0c
++#define PKT_SPDI_CONTENTS4				0xc10
++#define PKT_SPDI_CONTENTS5				0xc14
++#define PKT_SPDI_CONTENTS6				0xc18
++#define PKT_SPDI_CONTENTS7				0xc1c
++#define PKT_AUDI_CONTENTS0				0xc20
++#define PKT_AUDI_CONTENTS1				0xc24
++#define PKT_AUDI_CONTENTS2				0xc28
++#define PKT_AUDI_CONTENTS3				0xc2c
++#define PKT_AUDI_CONTENTS4				0xc30
++#define PKT_AUDI_CONTENTS5				0xc34
++#define PKT_AUDI_CONTENTS6				0xc38
++#define PKT_AUDI_CONTENTS7				0xc3c
++#define PKT_NVI_CONTENTS0				0xc40
++#define PKT_NVI_CONTENTS1				0xc44
++#define PKT_NVI_CONTENTS2				0xc48
++#define PKT_NVI_CONTENTS3				0xc4c
++#define PKT_NVI_CONTENTS4				0xc50
++#define PKT_NVI_CONTENTS5				0xc54
++#define PKT_NVI_CONTENTS6				0xc58
++#define PKT_NVI_CONTENTS7				0xc5c
++#define PKT_DRMI_CONTENTS0				0xc60
++#define PKT_DRMI_CONTENTS1				0xc64
++#define PKT_DRMI_CONTENTS2				0xc68
++#define PKT_DRMI_CONTENTS3				0xc6c
++#define PKT_DRMI_CONTENTS4				0xc70
++#define PKT_DRMI_CONTENTS5				0xc74
++#define PKT_DRMI_CONTENTS6				0xc78
++#define PKT_DRMI_CONTENTS7				0xc7c
++#define PKT_GHDMI1_CONTENTS0				0xc80
++#define PKT_GHDMI1_CONTENTS1				0xc84
++#define PKT_GHDMI1_CONTENTS2				0xc88
++#define PKT_GHDMI1_CONTENTS3				0xc8c
++#define PKT_GHDMI1_CONTENTS4				0xc90
++#define PKT_GHDMI1_CONTENTS5				0xc94
++#define PKT_GHDMI1_CONTENTS6				0xc98
++#define PKT_GHDMI1_CONTENTS7				0xc9c
++#define PKT_GHDMI2_CONTENTS0				0xca0
++#define PKT_GHDMI2_CONTENTS1				0xca4
++#define PKT_GHDMI2_CONTENTS2				0xca8
++#define PKT_GHDMI2_CONTENTS3				0xcac
++#define PKT_GHDMI2_CONTENTS4				0xcb0
++#define PKT_GHDMI2_CONTENTS5				0xcb4
++#define PKT_GHDMI2_CONTENTS6				0xcb8
++#define PKT_GHDMI2_CONTENTS7				0xcbc
++/* EMP Packetizer Registers */
++#define PKT_EMP_CONFIG0					0xce0
++#define PKT_EMP_CONTROL0				0xcec
++#define PKT_EMP_CONTROL1				0xcf0
++#define PKT_EMP_CONTROL2				0xcf4
++#define PKT_EMP_VTEM_CONTENTS0				0xd00
++#define PKT_EMP_VTEM_CONTENTS1				0xd04
++#define PKT_EMP_VTEM_CONTENTS2				0xd08
++#define PKT_EMP_VTEM_CONTENTS3				0xd0c
++#define PKT_EMP_VTEM_CONTENTS4				0xd10
++#define PKT_EMP_VTEM_CONTENTS5				0xd14
++#define PKT_EMP_VTEM_CONTENTS6				0xd18
++#define PKT_EMP_VTEM_CONTENTS7				0xd1c
++#define PKT0_EMP_CVTEM_CONTENTS0			0xd20
++#define PKT0_EMP_CVTEM_CONTENTS1			0xd24
++#define PKT0_EMP_CVTEM_CONTENTS2			0xd28
++#define PKT0_EMP_CVTEM_CONTENTS3			0xd2c
++#define PKT0_EMP_CVTEM_CONTENTS4			0xd30
++#define PKT0_EMP_CVTEM_CONTENTS5			0xd34
++#define PKT0_EMP_CVTEM_CONTENTS6			0xd38
++#define PKT0_EMP_CVTEM_CONTENTS7			0xd3c
++#define PKT1_EMP_CVTEM_CONTENTS0			0xd40
++#define PKT1_EMP_CVTEM_CONTENTS1			0xd44
++#define PKT1_EMP_CVTEM_CONTENTS2			0xd48
++#define PKT1_EMP_CVTEM_CONTENTS3			0xd4c
++#define PKT1_EMP_CVTEM_CONTENTS4			0xd50
++#define PKT1_EMP_CVTEM_CONTENTS5			0xd54
++#define PKT1_EMP_CVTEM_CONTENTS6			0xd58
++#define PKT1_EMP_CVTEM_CONTENTS7			0xd5c
++#define PKT2_EMP_CVTEM_CONTENTS0			0xd60
++#define PKT2_EMP_CVTEM_CONTENTS1			0xd64
++#define PKT2_EMP_CVTEM_CONTENTS2			0xd68
++#define PKT2_EMP_CVTEM_CONTENTS3			0xd6c
++#define PKT2_EMP_CVTEM_CONTENTS4			0xd70
++#define PKT2_EMP_CVTEM_CONTENTS5			0xd74
++#define PKT2_EMP_CVTEM_CONTENTS6			0xd78
++#define PKT2_EMP_CVTEM_CONTENTS7			0xd7c
++#define PKT3_EMP_CVTEM_CONTENTS0			0xd80
++#define PKT3_EMP_CVTEM_CONTENTS1			0xd84
++#define PKT3_EMP_CVTEM_CONTENTS2			0xd88
++#define PKT3_EMP_CVTEM_CONTENTS3			0xd8c
++#define PKT3_EMP_CVTEM_CONTENTS4			0xd90
++#define PKT3_EMP_CVTEM_CONTENTS5			0xd94
++#define PKT3_EMP_CVTEM_CONTENTS6			0xd98
++#define PKT3_EMP_CVTEM_CONTENTS7			0xd9c
++#define PKT4_EMP_CVTEM_CONTENTS0			0xda0
++#define PKT4_EMP_CVTEM_CONTENTS1			0xda4
++#define PKT4_EMP_CVTEM_CONTENTS2			0xda8
++#define PKT4_EMP_CVTEM_CONTENTS3			0xdac
++#define PKT4_EMP_CVTEM_CONTENTS4			0xdb0
++#define PKT4_EMP_CVTEM_CONTENTS5			0xdb4
++#define PKT4_EMP_CVTEM_CONTENTS6			0xdb8
++#define PKT4_EMP_CVTEM_CONTENTS7			0xdbc
++#define PKT5_EMP_CVTEM_CONTENTS0			0xdc0
++#define PKT5_EMP_CVTEM_CONTENTS1			0xdc4
++#define PKT5_EMP_CVTEM_CONTENTS2			0xdc8
++#define PKT5_EMP_CVTEM_CONTENTS3			0xdcc
++#define PKT5_EMP_CVTEM_CONTENTS4			0xdd0
++#define PKT5_EMP_CVTEM_CONTENTS5			0xdd4
++#define PKT5_EMP_CVTEM_CONTENTS6			0xdd8
++#define PKT5_EMP_CVTEM_CONTENTS7			0xddc
++/* Audio Packetizer Registers */
++#define AUDPKT_CONTROL0					0xe20
++#define AUDPKT_PBIT_FORCE_EN_MASK			BIT(12)
++#define AUDPKT_PBIT_FORCE_EN				BIT(12)
++#define AUDPKT_CHSTATUS_OVR_EN_MASK			BIT(0)
++#define AUDPKT_CHSTATUS_OVR_EN				BIT(0)
++#define AUDPKT_CONTROL1					0xe24
++#define AUDPKT_ACR_CONTROL0				0xe40
++#define AUDPKT_ACR_N_VALUE				0xfffff
++#define AUDPKT_ACR_CONTROL1				0xe44
++#define AUDPKT_ACR_CTS_OVR_VAL_MSK			GENMASK(23, 4)
++#define AUDPKT_ACR_CTS_OVR_VAL(x)			((x) << 4)
++#define AUDPKT_ACR_CTS_OVR_EN_MSK			BIT(1)
++#define AUDPKT_ACR_CTS_OVR_EN				BIT(1)
++#define AUDPKT_ACR_STATUS0				0xe4c
++#define AUDPKT_CHSTATUS_OVR0				0xe60
++#define AUDPKT_CHSTATUS_OVR1				0xe64
++/* IEC60958 Byte 3: Sampleing frenuency Bits 24 to 27 */
++#define AUDPKT_CHSTATUS_SR_MASK				GENMASK(3, 0)
++#define AUDPKT_CHSTATUS_SR_22050			0x4
++#define AUDPKT_CHSTATUS_SR_24000			0x6
++#define AUDPKT_CHSTATUS_SR_32000			0x3
++#define AUDPKT_CHSTATUS_SR_44100			0x0
++#define AUDPKT_CHSTATUS_SR_48000			0x2
++#define AUDPKT_CHSTATUS_SR_88200			0x8
++#define AUDPKT_CHSTATUS_SR_96000			0xa
++#define AUDPKT_CHSTATUS_SR_176400			0xc
++#define AUDPKT_CHSTATUS_SR_192000			0xe
++#define AUDPKT_CHSTATUS_SR_768000			0x9
++#define AUDPKT_CHSTATUS_SR_NOT_INDICATED		0x1
++/* IEC60958 Byte 4: Original Sampleing frenuency Bits 36 to 39 */
++#define AUDPKT_CHSTATUS_0SR_MASK			GENMASK(15, 12)
++#define AUDPKT_CHSTATUS_OSR_8000			0x6
++#define AUDPKT_CHSTATUS_OSR_11025			0xa
++#define AUDPKT_CHSTATUS_OSR_12000			0x2
++#define AUDPKT_CHSTATUS_OSR_16000			0x8
++#define AUDPKT_CHSTATUS_OSR_22050			0xb
++#define AUDPKT_CHSTATUS_OSR_24000			0x9
++#define AUDPKT_CHSTATUS_OSR_32000			0xc
++#define AUDPKT_CHSTATUS_OSR_44100			0xf
++#define AUDPKT_CHSTATUS_OSR_48000			0xd
++#define AUDPKT_CHSTATUS_OSR_88200			0x7
++#define AUDPKT_CHSTATUS_OSR_96000			0x5
++#define AUDPKT_CHSTATUS_OSR_176400			0x3
++#define AUDPKT_CHSTATUS_OSR_192000			0x1
++#define AUDPKT_CHSTATUS_OSR_NOT_INDICATED		0x0
++#define AUDPKT_CHSTATUS_OVR2				0xe68
++#define AUDPKT_CHSTATUS_OVR3				0xe6c
++#define AUDPKT_CHSTATUS_OVR4				0xe70
++#define AUDPKT_CHSTATUS_OVR5				0xe74
++#define AUDPKT_CHSTATUS_OVR6				0xe78
++#define AUDPKT_CHSTATUS_OVR7				0xe7c
++#define AUDPKT_CHSTATUS_OVR8				0xe80
++#define AUDPKT_CHSTATUS_OVR9				0xe84
++#define AUDPKT_CHSTATUS_OVR10				0xe88
++#define AUDPKT_CHSTATUS_OVR11				0xe8c
++#define AUDPKT_CHSTATUS_OVR12				0xe90
++#define AUDPKT_CHSTATUS_OVR13				0xe94
++#define AUDPKT_CHSTATUS_OVR14				0xe98
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC0			0xea0
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC1			0xea4
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC2			0xea8
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC3			0xeac
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC4			0xeb0
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC5			0xeb4
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC6			0xeb8
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC7			0xebc
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC8			0xec0
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC9			0xec4
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC10		0xec8
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC11		0xecc
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC12		0xed0
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC13		0xed4
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC14		0xed8
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC15		0xedc
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC16		0xee0
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC17		0xee4
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC18		0xee8
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC19		0xeec
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC20		0xef0
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC21		0xef4
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC22		0xef8
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC23		0xefc
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC24		0xf00
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC25		0xf04
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC26		0xf08
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC27		0xf0c
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC28		0xf10
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC29		0xf14
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC30		0xf18
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC31		0xf1c
++#define AUDPKT_USRDATA_OVR_MSG_GENERIC32		0xf20
++#define AUDPKT_VBIT_OVR0				0xf24
++/* CEC Registers */
++#define CEC_TX_CONTROL					0x1000
++#define CEC_STATUS					0x1004
++#define CEC_CONFIG					0x1008
++#define CEC_ADDR					0x100c
++#define CEC_TX_COUNT					0x1020
++#define CEC_TX_DATA3_0					0x1024
++#define CEC_TX_DATA7_4					0x1028
++#define CEC_TX_DATA11_8					0x102c
++#define CEC_TX_DATA15_12				0x1030
++#define CEC_RX_COUNT_STATUS				0x1040
++#define CEC_RX_DATA3_0					0x1044
++#define CEC_RX_DATA7_4					0x1048
++#define CEC_RX_DATA11_8					0x104c
++#define CEC_RX_DATA15_12				0x1050
++#define CEC_LOCK_CONTROL				0x1054
++#define CEC_RXQUAL_BITTIME_CONFIG			0x1060
++#define CEC_RX_BITTIME_CONFIG				0x1064
++#define CEC_TX_BITTIME_CONFIG				0x1068
++/* eARC RX CMDC Registers */
++#define EARCRX_CMDC_CONFIG0				0x1800
++#define EARCRX_XACTREAD_STOP_CFG			BIT(26)
++#define EARCRX_XACTREAD_RETRY_CFG			BIT(25)
++#define EARCRX_CMDC_DSCVR_EARCVALID0_TO_DISC1		BIT(24)
++#define EARCRX_CMDC_XACT_RESTART_EN			BIT(18)
++#define EARCRX_CMDC_CONFIG1				0x1804
++#define EARCRX_CMDC_CONTROL				0x1808
++#define EARCRX_CMDC_HEARTBEAT_LOSS_EN			BIT(4)
++#define EARCRX_CMDC_DISCOVERY_EN			BIT(3)
++#define EARCRX_CONNECTOR_HPD				BIT(1)
++#define EARCRX_CMDC_WHITELIST0_CONFIG			0x180c
++#define EARCRX_CMDC_WHITELIST1_CONFIG			0x1810
++#define EARCRX_CMDC_WHITELIST2_CONFIG			0x1814
++#define EARCRX_CMDC_WHITELIST3_CONFIG			0x1818
++#define EARCRX_CMDC_STATUS				0x181c
++#define EARCRX_CMDC_XACT_INFO				0x1820
++#define EARCRX_CMDC_XACT_ACTION				0x1824
++#define EARCRX_CMDC_HEARTBEAT_RXSTAT_SE			0x1828
++#define EARCRX_CMDC_HEARTBEAT_STATUS			0x182c
++#define EARCRX_CMDC_XACT_WR0				0x1840
++#define EARCRX_CMDC_XACT_WR1				0x1844
++#define EARCRX_CMDC_XACT_WR2				0x1848
++#define EARCRX_CMDC_XACT_WR3				0x184c
++#define EARCRX_CMDC_XACT_WR4				0x1850
++#define EARCRX_CMDC_XACT_WR5				0x1854
++#define EARCRX_CMDC_XACT_WR6				0x1858
++#define EARCRX_CMDC_XACT_WR7				0x185c
++#define EARCRX_CMDC_XACT_WR8				0x1860
++#define EARCRX_CMDC_XACT_WR9				0x1864
++#define EARCRX_CMDC_XACT_WR10				0x1868
++#define EARCRX_CMDC_XACT_WR11				0x186c
++#define EARCRX_CMDC_XACT_WR12				0x1870
++#define EARCRX_CMDC_XACT_WR13				0x1874
++#define EARCRX_CMDC_XACT_WR14				0x1878
++#define EARCRX_CMDC_XACT_WR15				0x187c
++#define EARCRX_CMDC_XACT_WR16				0x1880
++#define EARCRX_CMDC_XACT_WR17				0x1884
++#define EARCRX_CMDC_XACT_WR18				0x1888
++#define EARCRX_CMDC_XACT_WR19				0x188c
++#define EARCRX_CMDC_XACT_WR20				0x1890
++#define EARCRX_CMDC_XACT_WR21				0x1894
++#define EARCRX_CMDC_XACT_WR22				0x1898
++#define EARCRX_CMDC_XACT_WR23				0x189c
++#define EARCRX_CMDC_XACT_WR24				0x18a0
++#define EARCRX_CMDC_XACT_WR25				0x18a4
++#define EARCRX_CMDC_XACT_WR26				0x18a8
++#define EARCRX_CMDC_XACT_WR27				0x18ac
++#define EARCRX_CMDC_XACT_WR28				0x18b0
++#define EARCRX_CMDC_XACT_WR29				0x18b4
++#define EARCRX_CMDC_XACT_WR30				0x18b8
++#define EARCRX_CMDC_XACT_WR31				0x18bc
++#define EARCRX_CMDC_XACT_WR32				0x18c0
++#define EARCRX_CMDC_XACT_WR33				0x18c4
++#define EARCRX_CMDC_XACT_WR34				0x18c8
++#define EARCRX_CMDC_XACT_WR35				0x18cc
++#define EARCRX_CMDC_XACT_WR36				0x18d0
++#define EARCRX_CMDC_XACT_WR37				0x18d4
++#define EARCRX_CMDC_XACT_WR38				0x18d8
++#define EARCRX_CMDC_XACT_WR39				0x18dc
++#define EARCRX_CMDC_XACT_WR40				0x18e0
++#define EARCRX_CMDC_XACT_WR41				0x18e4
++#define EARCRX_CMDC_XACT_WR42				0x18e8
++#define EARCRX_CMDC_XACT_WR43				0x18ec
++#define EARCRX_CMDC_XACT_WR44				0x18f0
++#define EARCRX_CMDC_XACT_WR45				0x18f4
++#define EARCRX_CMDC_XACT_WR46				0x18f8
++#define EARCRX_CMDC_XACT_WR47				0x18fc
++#define EARCRX_CMDC_XACT_WR48				0x1900
++#define EARCRX_CMDC_XACT_WR49				0x1904
++#define EARCRX_CMDC_XACT_WR50				0x1908
++#define EARCRX_CMDC_XACT_WR51				0x190c
++#define EARCRX_CMDC_XACT_WR52				0x1910
++#define EARCRX_CMDC_XACT_WR53				0x1914
++#define EARCRX_CMDC_XACT_WR54				0x1918
++#define EARCRX_CMDC_XACT_WR55				0x191c
++#define EARCRX_CMDC_XACT_WR56				0x1920
++#define EARCRX_CMDC_XACT_WR57				0x1924
++#define EARCRX_CMDC_XACT_WR58				0x1928
++#define EARCRX_CMDC_XACT_WR59				0x192c
++#define EARCRX_CMDC_XACT_WR60				0x1930
++#define EARCRX_CMDC_XACT_WR61				0x1934
++#define EARCRX_CMDC_XACT_WR62				0x1938
++#define EARCRX_CMDC_XACT_WR63				0x193c
++#define EARCRX_CMDC_XACT_WR64				0x1940
++#define EARCRX_CMDC_XACT_RD0				0x1960
++#define EARCRX_CMDC_XACT_RD1				0x1964
++#define EARCRX_CMDC_XACT_RD2				0x1968
++#define EARCRX_CMDC_XACT_RD3				0x196c
++#define EARCRX_CMDC_XACT_RD4				0x1970
++#define EARCRX_CMDC_XACT_RD5				0x1974
++#define EARCRX_CMDC_XACT_RD6				0x1978
++#define EARCRX_CMDC_XACT_RD7				0x197c
++#define EARCRX_CMDC_XACT_RD8				0x1980
++#define EARCRX_CMDC_XACT_RD9				0x1984
++#define EARCRX_CMDC_XACT_RD10				0x1988
++#define EARCRX_CMDC_XACT_RD11				0x198c
++#define EARCRX_CMDC_XACT_RD12				0x1990
++#define EARCRX_CMDC_XACT_RD13				0x1994
++#define EARCRX_CMDC_XACT_RD14				0x1998
++#define EARCRX_CMDC_XACT_RD15				0x199c
++#define EARCRX_CMDC_XACT_RD16				0x19a0
++#define EARCRX_CMDC_XACT_RD17				0x19a4
++#define EARCRX_CMDC_XACT_RD18				0x19a8
++#define EARCRX_CMDC_XACT_RD19				0x19ac
++#define EARCRX_CMDC_XACT_RD20				0x19b0
++#define EARCRX_CMDC_XACT_RD21				0x19b4
++#define EARCRX_CMDC_XACT_RD22				0x19b8
++#define EARCRX_CMDC_XACT_RD23				0x19bc
++#define EARCRX_CMDC_XACT_RD24				0x19c0
++#define EARCRX_CMDC_XACT_RD25				0x19c4
++#define EARCRX_CMDC_XACT_RD26				0x19c8
++#define EARCRX_CMDC_XACT_RD27				0x19cc
++#define EARCRX_CMDC_XACT_RD28				0x19d0
++#define EARCRX_CMDC_XACT_RD29				0x19d4
++#define EARCRX_CMDC_XACT_RD30				0x19d8
++#define EARCRX_CMDC_XACT_RD31				0x19dc
++#define EARCRX_CMDC_XACT_RD32				0x19e0
++#define EARCRX_CMDC_XACT_RD33				0x19e4
++#define EARCRX_CMDC_XACT_RD34				0x19e8
++#define EARCRX_CMDC_XACT_RD35				0x19ec
++#define EARCRX_CMDC_XACT_RD36				0x19f0
++#define EARCRX_CMDC_XACT_RD37				0x19f4
++#define EARCRX_CMDC_XACT_RD38				0x19f8
++#define EARCRX_CMDC_XACT_RD39				0x19fc
++#define EARCRX_CMDC_XACT_RD40				0x1a00
++#define EARCRX_CMDC_XACT_RD41				0x1a04
++#define EARCRX_CMDC_XACT_RD42				0x1a08
++#define EARCRX_CMDC_XACT_RD43				0x1a0c
++#define EARCRX_CMDC_XACT_RD44				0x1a10
++#define EARCRX_CMDC_XACT_RD45				0x1a14
++#define EARCRX_CMDC_XACT_RD46				0x1a18
++#define EARCRX_CMDC_XACT_RD47				0x1a1c
++#define EARCRX_CMDC_XACT_RD48				0x1a20
++#define EARCRX_CMDC_XACT_RD49				0x1a24
++#define EARCRX_CMDC_XACT_RD50				0x1a28
++#define EARCRX_CMDC_XACT_RD51				0x1a2c
++#define EARCRX_CMDC_XACT_RD52				0x1a30
++#define EARCRX_CMDC_XACT_RD53				0x1a34
++#define EARCRX_CMDC_XACT_RD54				0x1a38
++#define EARCRX_CMDC_XACT_RD55				0x1a3c
++#define EARCRX_CMDC_XACT_RD56				0x1a40
++#define EARCRX_CMDC_XACT_RD57				0x1a44
++#define EARCRX_CMDC_XACT_RD58				0x1a48
++#define EARCRX_CMDC_XACT_RD59				0x1a4c
++#define EARCRX_CMDC_XACT_RD60				0x1a50
++#define EARCRX_CMDC_XACT_RD61				0x1a54
++#define EARCRX_CMDC_XACT_RD62				0x1a58
++#define EARCRX_CMDC_XACT_RD63				0x1a5c
++#define EARCRX_CMDC_XACT_RD64				0x1a60
++#define EARCRX_CMDC_SYNC_CONFIG				0x1b00
++/* eARC RX DMAC Registers */
++#define EARCRX_DMAC_PHY_CONTROL				0x1c00
++#define EARCRX_DMAC_CONFIG				0x1c08
++#define EARCRX_DMAC_CONTROL0				0x1c0c
++#define EARCRX_DMAC_AUDIO_EN				BIT(1)
++#define EARCRX_DMAC_EN					BIT(0)
++#define EARCRX_DMAC_CONTROL1				0x1c10
++#define EARCRX_DMAC_STATUS				0x1c14
++#define EARCRX_DMAC_CHSTATUS0				0x1c18
++#define EARCRX_DMAC_CHSTATUS1				0x1c1c
++#define EARCRX_DMAC_CHSTATUS2				0x1c20
++#define EARCRX_DMAC_CHSTATUS3				0x1c24
++#define EARCRX_DMAC_CHSTATUS4				0x1c28
++#define EARCRX_DMAC_CHSTATUS5				0x1c2c
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC0		0x1c30
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC1		0x1c34
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC2		0x1c38
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC3		0x1c3c
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC4		0x1c40
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC5		0x1c44
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC6		0x1c48
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC7		0x1c4c
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC8		0x1c50
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC9		0x1c54
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC10		0x1c58
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_AC11		0x1c5c
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT0		0x1c60
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT1		0x1c64
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT2		0x1c68
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT3		0x1c6c
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT4		0x1c70
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT5		0x1c74
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT6		0x1c78
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT7		0x1c7c
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT8		0x1c80
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT9		0x1c84
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT10	0x1c88
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC1_PKT11	0x1c8c
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT0		0x1c90
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT1		0x1c94
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT2		0x1c98
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT3		0x1c9c
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT4		0x1ca0
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT5		0x1ca4
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT6		0x1ca8
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT7		0x1cac
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT8		0x1cb0
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT9		0x1cb4
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT10	0x1cb8
++#define EARCRX_DMAC_USRDATA_MSG_HDMI_ISRC2_PKT11	0x1cbc
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC0		0x1cc0
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC1		0x1cc4
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC2		0x1cc8
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC3		0x1ccc
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC4		0x1cd0
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC5		0x1cd4
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC6		0x1cd8
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC7		0x1cdc
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC8		0x1ce0
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC9		0x1ce4
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC10		0x1ce8
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC11		0x1cec
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC12		0x1cf0
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC13		0x1cf4
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC14		0x1cf8
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC15		0x1cfc
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC16		0x1d00
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC17		0x1d04
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC18		0x1d08
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC19		0x1d0c
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC20		0x1d10
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC21		0x1d14
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC22		0x1d18
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC23		0x1d1c
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC24		0x1d20
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC25		0x1d24
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC26		0x1d28
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC27		0x1d2c
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC28		0x1d30
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC29		0x1d34
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC30		0x1d38
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC31		0x1d3c
++#define EARCRX_DMAC_USRDATA_MSG_GENERIC32		0x1d40
++#define EARCRX_DMAC_CHSTATUS_STREAMER0			0x1d44
++#define EARCRX_DMAC_CHSTATUS_STREAMER1			0x1d48
++#define EARCRX_DMAC_CHSTATUS_STREAMER2			0x1d4c
++#define EARCRX_DMAC_CHSTATUS_STREAMER3			0x1d50
++#define EARCRX_DMAC_CHSTATUS_STREAMER4			0x1d54
++#define EARCRX_DMAC_CHSTATUS_STREAMER5			0x1d58
++#define EARCRX_DMAC_CHSTATUS_STREAMER6			0x1d5c
++#define EARCRX_DMAC_CHSTATUS_STREAMER7			0x1d60
++#define EARCRX_DMAC_CHSTATUS_STREAMER8			0x1d64
++#define EARCRX_DMAC_CHSTATUS_STREAMER9			0x1d68
++#define EARCRX_DMAC_CHSTATUS_STREAMER10			0x1d6c
++#define EARCRX_DMAC_CHSTATUS_STREAMER11			0x1d70
++#define EARCRX_DMAC_CHSTATUS_STREAMER12			0x1d74
++#define EARCRX_DMAC_CHSTATUS_STREAMER13			0x1d78
++#define EARCRX_DMAC_CHSTATUS_STREAMER14			0x1d7c
++#define EARCRX_DMAC_USRDATA_STREAMER0			0x1d80
++/* Main Unit Interrupt Registers */
++#define MAIN_INTVEC_INDEX				0x3000
++#define MAINUNIT_0_INT_STATUS				0x3010
++#define MAINUNIT_0_INT_MASK_N				0x3014
++#define MAINUNIT_0_INT_CLEAR				0x3018
++#define MAINUNIT_0_INT_FORCE				0x301c
++#define MAINUNIT_1_INT_STATUS				0x3020
++#define FLT_EXIT_TO_LTSL_IRQ				BIT(22)
++#define FLT_EXIT_TO_LTS4_IRQ				BIT(21)
++#define FLT_EXIT_TO_LTSP_IRQ				BIT(20)
++#define SCDC_NACK_RCVD_IRQ				BIT(12)
++#define SCDC_RR_REPLY_STOP_IRQ				BIT(11)
++#define SCDC_UPD_FLAGS_CLR_IRQ				BIT(10)
++#define SCDC_UPD_FLAGS_CHG_IRQ				BIT(9)
++#define SCDC_UPD_FLAGS_RD_IRQ				BIT(8)
++#define I2CM_NACK_RCVD_IRQ				BIT(2)
++#define I2CM_READ_REQUEST_IRQ				BIT(1)
++#define I2CM_OP_DONE_IRQ				BIT(0)
++#define MAINUNIT_1_INT_MASK_N				0x3024
++#define I2CM_NACK_RCVD_MASK_N				BIT(2)
++#define I2CM_READ_REQUEST_MASK_N			BIT(1)
++#define I2CM_OP_DONE_MASK_N				BIT(0)
++#define MAINUNIT_1_INT_CLEAR				0x3028
++#define I2CM_NACK_RCVD_CLEAR				BIT(2)
++#define I2CM_READ_REQUEST_CLEAR				BIT(1)
++#define I2CM_OP_DONE_CLEAR				BIT(0)
++#define MAINUNIT_1_INT_FORCE				0x302c
++/* AVPUNIT Interrupt Registers */
++#define AVP_INTVEC_INDEX				0x3800
++#define AVP_0_INT_STATUS				0x3810
++#define AVP_0_INT_MASK_N				0x3814
++#define AVP_0_INT_CLEAR					0x3818
++#define AVP_0_INT_FORCE					0x381c
++#define AVP_1_INT_STATUS				0x3820
++#define AVP_1_INT_MASK_N				0x3824
++#define HDCP14_AUTH_CHG_MASK_N				BIT(6)
++#define AVP_1_INT_CLEAR					0x3828
++#define AVP_1_INT_FORCE					0x382c
++#define AVP_2_INT_STATUS				0x3830
++#define AVP_2_INT_MASK_N				0x3834
++#define AVP_2_INT_CLEAR					0x3838
++#define AVP_2_INT_FORCE					0x383c
++#define AVP_3_INT_STATUS				0x3840
++#define AVP_3_INT_MASK_N				0x3844
++#define AVP_3_INT_CLEAR					0x3848
++#define AVP_3_INT_FORCE					0x384c
++#define AVP_4_INT_STATUS				0x3850
++#define AVP_4_INT_MASK_N				0x3854
++#define AVP_4_INT_CLEAR					0x3858
++#define AVP_4_INT_FORCE					0x385c
++#define AVP_5_INT_STATUS				0x3860
++#define AVP_5_INT_MASK_N				0x3864
++#define AVP_5_INT_CLEAR					0x3868
++#define AVP_5_INT_FORCE					0x386c
++#define AVP_6_INT_STATUS				0x3870
++#define AVP_6_INT_MASK_N				0x3874
++#define AVP_6_INT_CLEAR					0x3878
++#define AVP_6_INT_FORCE					0x387c
++/* CEC Interrupt Registers */
++#define CEC_INT_STATUS					0x4000
++#define CEC_INT_MASK_N					0x4004
++#define CEC_INT_CLEAR					0x4008
++#define CEC_INT_FORCE					0x400c
++/* eARC RX Interrupt Registers  */
++#define EARCRX_INTVEC_INDEX				0x4800
++#define EARCRX_0_INT_STATUS				0x4810
++#define EARCRX_CMDC_DISCOVERY_TIMEOUT_IRQ		BIT(9)
++#define EARCRX_CMDC_DISCOVERY_DONE_IRQ			BIT(8)
++#define EARCRX_0_INT_MASK_N				0x4814
++#define EARCRX_0_INT_CLEAR				0x4818
++#define EARCRX_0_INT_FORCE				0x481c
++#define EARCRX_1_INT_STATUS				0x4820
++#define EARCRX_1_INT_MASK_N				0x4824
++#define EARCRX_1_INT_CLEAR				0x4828
++#define EARCRX_1_INT_FORCE				0x482c
++
++#endif /* __DW_HDMI_QP_H__ */
+diff --git a/include/drm/bridge/dw_hdmi_qp.h b/include/drm/bridge/dw_hdmi_qp.h
+new file mode 100644
+index 000000000000..111111111111
+--- /dev/null
++++ b/include/drm/bridge/dw_hdmi_qp.h
+@@ -0,0 +1,32 @@
++/* SPDX-License-Identifier: GPL-2.0-or-later */
++/*
++ * Copyright (c) 2021-2022 Rockchip Electronics Co., Ltd.
++ * Copyright (c) 2024 Collabora Ltd.
++ */
++
++#ifndef __DW_HDMI_QP__
++#define __DW_HDMI_QP__
++
++struct device;
++struct drm_encoder;
++struct dw_hdmi_qp;
++struct platform_device;
++
++struct dw_hdmi_qp_phy_ops {
++	int (*init)(struct dw_hdmi_qp *hdmi, void *data);
++	void (*disable)(struct dw_hdmi_qp *hdmi, void *data);
++	enum drm_connector_status (*read_hpd)(struct dw_hdmi_qp *hdmi, void *data);
++	void (*setup_hpd)(struct dw_hdmi_qp *hdmi, void *data);
++};
++
++struct dw_hdmi_qp_plat_data {
++	const struct dw_hdmi_qp_phy_ops *phy_ops;
++	void *phy_data;
++	int main_irq;
++};
++
++struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev,
++				   struct drm_encoder *encoder,
++				   const struct dw_hdmi_qp_plat_data *plat_data);
++void dw_hdmi_qp_resume(struct device *dev, struct dw_hdmi_qp *hdmi);
++#endif /* __DW_HDMI_QP__ */
+-- 
+Armbian
+
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0141-dt-bindings-display-rockchip-Add-schema-for-RK3588-HDMI-TX-Controller.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0141-dt-bindings-display-rockchip-Add-schema-for-RK3588-HDMI-TX-Controller.patch
new file mode 100644
index 000000000000..fc63c8139f94
--- /dev/null
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/0141-dt-bindings-display-rockchip-Add-schema-for-RK3588-HDMI-TX-Controller.patch
@@ -0,0 +1,215 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
+Date: Wed, 16 Oct 2024 23:06:52 +0300
+Subject: dt-bindings: display: rockchip: Add schema for RK3588 HDMI TX
+ Controller
+
+Rockchip RK3588 SoC integrates the Synopsys DesignWare HDMI 2.1
+Quad-Pixel (QP) TX controller IP.
+
+Since this is a new IP block, quite different from those used in the
+previous generations of Rockchip SoCs, add a dedicated binding file.
+
+Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
+---
+ Documentation/devicetree/bindings/display/rockchip/rockchip,rk3588-dw-hdmi-qp.yaml | 188 ++++++++++
+ 1 file changed, 188 insertions(+)
+
+diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip,rk3588-dw-hdmi-qp.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip,rk3588-dw-hdmi-qp.yaml
+new file mode 100644
+index 000000000000..111111111111
+--- /dev/null
++++ b/Documentation/devicetree/bindings/display/rockchip/rockchip,rk3588-dw-hdmi-qp.yaml
+@@ -0,0 +1,188 @@
++# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/display/rockchip/rockchip,rk3588-dw-hdmi-qp.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: Rockchip DW HDMI QP TX Encoder
++
++maintainers:
++  - Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
++
++description: |
++  Rockchip RK3588 SoC integrates the Synopsys DesignWare HDMI QP TX controller
++  IP and a HDMI/eDP TX Combo PHY based on a Samsung IP block, providing the
++  following features, among others:
++
++  * Fixed Rate Link (FRL)
++  * Display Stream Compression (DSC)
++  * 4K@120Hz and 8K@60Hz video modes
++  * Variable Refresh Rate (VRR) including Quick Media Switching (QMS)
++  * Fast Vactive (FVA)
++  * SCDC I2C DDC access
++  * Multi-stream audio
++  * Enhanced Audio Return Channel (EARC)
++
++allOf:
++  - $ref: /schemas/sound/dai-common.yaml#
++
++properties:
++  compatible:
++    enum:
++      - rockchip,rk3588-dw-hdmi-qp
++
++  reg:
++    maxItems: 1
++
++  clocks:
++    items:
++      - description: Peripheral/APB bus clock
++      - description: EARC RX biphase clock
++      - description: Reference clock
++      - description: Audio interface clock
++      - description: TMDS/FRL link clock
++      - description: Video datapath clock
++
++  clock-names:
++    items:
++      - const: pclk
++      - const: earc
++      - const: ref
++      - const: aud
++      - const: hdp
++      - const: hclk_vo1
++
++  interrupts:
++    items:
++      - description: AVP Unit interrupt
++      - description: CEC interrupt
++      - description: eARC RX interrupt
++      - description: Main Unit interrupt
++      - description: HPD interrupt
++
++  interrupt-names:
++    items:
++      - const: avp
++      - const: cec
++      - const: earc
++      - const: main
++      - const: hpd
++
++  phys:
++    maxItems: 1
++    description: The HDMI/eDP PHY
++
++  ports:
++    $ref: /schemas/graph.yaml#/properties/ports
++
++    properties:
++      port@0:
++        $ref: /schemas/graph.yaml#/properties/port
++        description: Video port for RGB/YUV input.
++
++      port@1:
++        $ref: /schemas/graph.yaml#/properties/port
++        description: Video port for HDMI/eDP output.
++
++    required:
++      - port@0
++      - port@1
++
++  power-domains:
++    maxItems: 1
++
++  resets:
++    maxItems: 2
++
++  reset-names:
++    items:
++      - const: ref
++      - const: hdp
++
++  "#sound-dai-cells":
++    const: 0
++
++  rockchip,grf:
++    $ref: /schemas/types.yaml#/definitions/phandle
++    description:
++      Some HDMI QP related data is accessed through SYS GRF regs.
++
++  rockchip,vo-grf:
++    $ref: /schemas/types.yaml#/definitions/phandle
++    description:
++      Additional HDMI QP related data is accessed through VO GRF regs.
++
++required:
++  - compatible
++  - reg
++  - clocks
++  - clock-names
++  - interrupts
++  - interrupt-names
++  - phys
++  - ports
++  - resets
++  - reset-names
++  - rockchip,grf
++  - rockchip,vo-grf
++
++unevaluatedProperties: false
++
++examples:
++  - |
++    #include <dt-bindings/clock/rockchip,rk3588-cru.h>
++    #include <dt-bindings/interrupt-controller/arm-gic.h>
++    #include <dt-bindings/interrupt-controller/irq.h>
++    #include <dt-bindings/power/rk3588-power.h>
++    #include <dt-bindings/reset/rockchip,rk3588-cru.h>
++
++    soc {
++      #address-cells = <2>;
++      #size-cells = <2>;
++
++      hdmi@fde80000 {
++        compatible = "rockchip,rk3588-dw-hdmi-qp";
++        reg = <0x0 0xfde80000 0x0 0x20000>;
++        clocks = <&cru PCLK_HDMITX0>,
++                 <&cru CLK_HDMITX0_EARC>,
++                 <&cru CLK_HDMITX0_REF>,
++                 <&cru MCLK_I2S5_8CH_TX>,
++                 <&cru CLK_HDMIHDP0>,
++                 <&cru HCLK_VO1>;
++        clock-names = "pclk", "earc", "ref", "aud", "hdp", "hclk_vo1";
++        interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH 0>,
++                     <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH 0>,
++                     <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH 0>,
++                     <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH 0>,
++                     <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH 0>;
++        interrupt-names = "avp", "cec", "earc", "main", "hpd";
++        phys = <&hdptxphy_hdmi0>;
++        power-domains = <&power RK3588_PD_VO1>;
++        resets = <&cru SRST_HDMITX0_REF>, <&cru SRST_HDMIHDP0>;
++        reset-names = "ref", "hdp";
++        rockchip,grf = <&sys_grf>;
++        rockchip,vo-grf = <&vo1_grf>;
++        #sound-dai-cells = <0>;
++
++        ports {
++          #address-cells = <1>;
++          #size-cells = <0>;
++
++          port@0 {
++            reg = <0>;
++
++            hdmi0_in_vp0: endpoint {
++              remote-endpoint = <&vp0_out_hdmi0>;
++            };
++          };
++
++          port@1 {
++            reg = <1>;
++
++            hdmi0_out_con0: endpoint {
++              remote-endpoint = <&hdmi_con0_in>;
++            };
++          };
++        };
++      };
++    };
+-- 
+Armbian
+
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0142-drm-rockchip-Add-basic-RK3588-HDMI-output-support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0142-drm-rockchip-Add-basic-RK3588-HDMI-output-support.patch
new file mode 100644
index 000000000000..aebdf92e6d70
--- /dev/null
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/0142-drm-rockchip-Add-basic-RK3588-HDMI-output-support.patch
@@ -0,0 +1,522 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
+Date: Wed, 16 Oct 2024 23:06:53 +0300
+Subject: drm/rockchip: Add basic RK3588 HDMI output support
+
+The RK3588 SoC family integrates the newer Synopsys DesignWare HDMI 2.1
+Quad-Pixel (QP) TX controller IP and a HDMI/eDP TX Combo PHY based on a
+Samsung IP block.
+
+Add just the basic support for now, i.e. RGB output up to 4K@60Hz,
+without audio, CEC or any of the HDMI 2.1 specific features.
+
+Co-developed-by: Algea Cao <algea.cao@rock-chips.com>
+Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
+Tested-by: Heiko Stuebner <heiko@sntech.de>
+Reviewed-by: Maxime Ripard <mripard@kernel.org>
+Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
+---
+ drivers/gpu/drm/rockchip/Kconfig               |   9 +
+ drivers/gpu/drm/rockchip/Makefile              |   1 +
+ drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 424 ++++++++++
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c    |   2 +
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.h    |   1 +
+ 5 files changed, 437 insertions(+)
+
+diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
+index 111111111111..222222222222 100644
+--- a/drivers/gpu/drm/rockchip/Kconfig
++++ b/drivers/gpu/drm/rockchip/Kconfig
+@@ -8,6 +8,7 @@ config DRM_ROCKCHIP
+ 	select VIDEOMODE_HELPERS
+ 	select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP
+ 	select DRM_DW_HDMI if ROCKCHIP_DW_HDMI
++	select DRM_DW_HDMI_QP if ROCKCHIP_DW_HDMI_QP
+ 	select DRM_DW_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI
+ 	select GENERIC_PHY if ROCKCHIP_DW_MIPI_DSI
+ 	select GENERIC_PHY_MIPI_DPHY if ROCKCHIP_DW_MIPI_DSI
+@@ -63,6 +64,14 @@ config ROCKCHIP_DW_HDMI
+ 	  enable HDMI on RK3288 or RK3399 based SoC, you should select
+ 	  this option.
+ 
++config ROCKCHIP_DW_HDMI_QP
++	bool "Rockchip specific extensions for Synopsys DW HDMI QP"
++	select DRM_BRIDGE_CONNECTOR
++	help
++	  This selects support for Rockchip SoC specific extensions
++	  for the Synopsys DesignWare HDMI QP driver. If you want to
++	  enable HDMI on RK3588 based SoC, you should select this option.
++
+ config ROCKCHIP_DW_MIPI_DSI
+ 	bool "Rockchip specific extensions for Synopsys DW MIPI DSI"
+ 	select GENERIC_PHY_MIPI_DPHY
+diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
+index 111111111111..222222222222 100644
+--- a/drivers/gpu/drm/rockchip/Makefile
++++ b/drivers/gpu/drm/rockchip/Makefile
+@@ -11,6 +11,7 @@ rockchipdrm-$(CONFIG_ROCKCHIP_VOP) += rockchip_drm_vop.o rockchip_vop_reg.o
+ rockchipdrm-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o
+ rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o
+ rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
++rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI_QP) += dw_hdmi_qp-rockchip.o
+ rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi-rockchip.o
+ rockchipdrm-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o
+ rockchipdrm-$(CONFIG_ROCKCHIP_LVDS) += rockchip_lvds.o
+diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
+new file mode 100644
+index 000000000000..111111111111
+--- /dev/null
++++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
+@@ -0,0 +1,424 @@
++// SPDX-License-Identifier: GPL-2.0-or-later
++/*
++ * Copyright (c) 2021-2022 Rockchip Electronics Co., Ltd.
++ * Copyright (c) 2024 Collabora Ltd.
++ *
++ * Author: Algea Cao <algea.cao@rock-chips.com>
++ * Author: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
++ */
++
++#include <linux/clk.h>
++#include <linux/gpio/consumer.h>
++#include <linux/mfd/syscon.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/phy/phy.h>
++#include <linux/regmap.h>
++#include <linux/workqueue.h>
++
++#include <drm/bridge/dw_hdmi_qp.h>
++#include <drm/display/drm_hdmi_helper.h>
++#include <drm/drm_bridge_connector.h>
++#include <drm/drm_of.h>
++#include <drm/drm_probe_helper.h>
++#include <drm/drm_simple_kms_helper.h>
++
++#include "rockchip_drm_drv.h"
++
++#define RK3588_GRF_SOC_CON2		0x0308
++#define RK3588_HDMI0_HPD_INT_MSK	BIT(13)
++#define RK3588_HDMI0_HPD_INT_CLR	BIT(12)
++#define RK3588_GRF_SOC_CON7		0x031c
++#define RK3588_SET_HPD_PATH_MASK	GENMASK(13, 12)
++#define RK3588_GRF_SOC_STATUS1		0x0384
++#define RK3588_HDMI0_LEVEL_INT		BIT(16)
++#define RK3588_GRF_VO1_CON3		0x000c
++#define RK3588_SCLIN_MASK		BIT(9)
++#define RK3588_SDAIN_MASK		BIT(10)
++#define RK3588_MODE_MASK		BIT(11)
++#define RK3588_I2S_SEL_MASK		BIT(13)
++#define RK3588_GRF_VO1_CON9		0x0024
++#define RK3588_HDMI0_GRANT_SEL		BIT(10)
++
++#define HIWORD_UPDATE(val, mask)	((val) | (mask) << 16)
++#define HOTPLUG_DEBOUNCE_MS		150
++
++struct rockchip_hdmi_qp {
++	struct device *dev;
++	struct regmap *regmap;
++	struct regmap *vo_regmap;
++	struct rockchip_encoder encoder;
++	struct clk *ref_clk;
++	struct dw_hdmi_qp *hdmi;
++	struct phy *phy;
++	struct gpio_desc *enable_gpio;
++	struct delayed_work hpd_work;
++};
++
++static struct rockchip_hdmi_qp *to_rockchip_hdmi_qp(struct drm_encoder *encoder)
++{
++	struct rockchip_encoder *rkencoder = to_rockchip_encoder(encoder);
++
++	return container_of(rkencoder, struct rockchip_hdmi_qp, encoder);
++}
++
++static void dw_hdmi_qp_rockchip_encoder_enable(struct drm_encoder *encoder)
++{
++	struct rockchip_hdmi_qp *hdmi = to_rockchip_hdmi_qp(encoder);
++	struct drm_crtc *crtc = encoder->crtc;
++	unsigned long long rate;
++
++	/* Unconditionally switch to TMDS as FRL is not yet supported */
++	gpiod_set_value(hdmi->enable_gpio, 1);
++
++	if (crtc && crtc->state) {
++		rate = drm_hdmi_compute_mode_clock(&crtc->state->adjusted_mode,
++						   8, HDMI_COLORSPACE_RGB);
++		clk_set_rate(hdmi->ref_clk, rate);
++		/*
++		 * FIXME: Temporary workaround to pass pixel clock rate
++		 * to the PHY driver until phy_configure_opts_hdmi
++		 * becomes available in the PHY API. See also the related
++		 * comment in rk_hdptx_phy_power_on() from
++		 * drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
++		 */
++		phy_set_bus_width(hdmi->phy, rate / 100);
++	}
++}
++
++static int
++dw_hdmi_qp_rockchip_encoder_atomic_check(struct drm_encoder *encoder,
++					 struct drm_crtc_state *crtc_state,
++					 struct drm_connector_state *conn_state)
++{
++	struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc_state);
++
++	s->output_mode = ROCKCHIP_OUT_MODE_AAAA;
++	s->output_type = DRM_MODE_CONNECTOR_HDMIA;
++
++	return 0;
++}
++
++static const struct
++drm_encoder_helper_funcs dw_hdmi_qp_rockchip_encoder_helper_funcs = {
++	.enable		= dw_hdmi_qp_rockchip_encoder_enable,
++	.atomic_check	= dw_hdmi_qp_rockchip_encoder_atomic_check,
++};
++
++static int dw_hdmi_qp_rk3588_phy_init(struct dw_hdmi_qp *dw_hdmi, void *data)
++{
++	struct rockchip_hdmi_qp *hdmi = (struct rockchip_hdmi_qp *)data;
++
++	return phy_power_on(hdmi->phy);
++}
++
++static void dw_hdmi_qp_rk3588_phy_disable(struct dw_hdmi_qp *dw_hdmi,
++					  void *data)
++{
++	struct rockchip_hdmi_qp *hdmi = (struct rockchip_hdmi_qp *)data;
++
++	phy_power_off(hdmi->phy);
++}
++
++static enum drm_connector_status
++dw_hdmi_qp_rk3588_read_hpd(struct dw_hdmi_qp *dw_hdmi, void *data)
++{
++	struct rockchip_hdmi_qp *hdmi = (struct rockchip_hdmi_qp *)data;
++	u32 val;
++
++	regmap_read(hdmi->regmap, RK3588_GRF_SOC_STATUS1, &val);
++
++	return val & RK3588_HDMI0_LEVEL_INT ?
++		connector_status_connected : connector_status_disconnected;
++}
++
++static void dw_hdmi_qp_rk3588_setup_hpd(struct dw_hdmi_qp *dw_hdmi, void *data)
++{
++	struct rockchip_hdmi_qp *hdmi = (struct rockchip_hdmi_qp *)data;
++
++	regmap_write(hdmi->regmap,
++		     RK3588_GRF_SOC_CON2,
++		     HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_CLR,
++				   RK3588_HDMI0_HPD_INT_CLR |
++				   RK3588_HDMI0_HPD_INT_MSK));
++}
++
++static const struct dw_hdmi_qp_phy_ops rk3588_hdmi_phy_ops = {
++	.init		= dw_hdmi_qp_rk3588_phy_init,
++	.disable	= dw_hdmi_qp_rk3588_phy_disable,
++	.read_hpd	= dw_hdmi_qp_rk3588_read_hpd,
++	.setup_hpd	= dw_hdmi_qp_rk3588_setup_hpd,
++};
++
++static void dw_hdmi_qp_rk3588_hpd_work(struct work_struct *work)
++{
++	struct rockchip_hdmi_qp *hdmi = container_of(work,
++						     struct rockchip_hdmi_qp,
++						     hpd_work.work);
++	struct drm_device *drm = hdmi->encoder.encoder.dev;
++	bool changed;
++
++	if (drm) {
++		changed = drm_helper_hpd_irq_event(drm);
++		if (changed)
++			drm_dbg(hdmi, "connector status changed\n");
++	}
++}
++
++static irqreturn_t dw_hdmi_qp_rk3588_hardirq(int irq, void *dev_id)
++{
++	struct rockchip_hdmi_qp *hdmi = dev_id;
++	u32 intr_stat, val;
++
++	regmap_read(hdmi->regmap, RK3588_GRF_SOC_STATUS1, &intr_stat);
++
++	if (intr_stat) {
++		val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_MSK,
++				    RK3588_HDMI0_HPD_INT_MSK);
++		regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON2, val);
++		return IRQ_WAKE_THREAD;
++	}
++
++	return IRQ_NONE;
++}
++
++static irqreturn_t dw_hdmi_qp_rk3588_irq(int irq, void *dev_id)
++{
++	struct rockchip_hdmi_qp *hdmi = dev_id;
++	u32 intr_stat, val;
++
++	regmap_read(hdmi->regmap, RK3588_GRF_SOC_STATUS1, &intr_stat);
++	if (!intr_stat)
++		return IRQ_NONE;
++
++	val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_CLR,
++			    RK3588_HDMI0_HPD_INT_CLR);
++	regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON2, val);
++
++	mod_delayed_work(system_wq, &hdmi->hpd_work,
++			 msecs_to_jiffies(HOTPLUG_DEBOUNCE_MS));
++
++	val |= HIWORD_UPDATE(0, RK3588_HDMI0_HPD_INT_MSK);
++	regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON2, val);
++
++	return IRQ_HANDLED;
++}
++
++static const struct of_device_id dw_hdmi_qp_rockchip_dt_ids[] = {
++	{ .compatible = "rockchip,rk3588-dw-hdmi-qp",
++	  .data = &rk3588_hdmi_phy_ops },
++	{},
++};
++MODULE_DEVICE_TABLE(of, dw_hdmi_qp_rockchip_dt_ids);
++
++static int dw_hdmi_qp_rockchip_bind(struct device *dev, struct device *master,
++				    void *data)
++{
++	static const char * const clk_names[] = {
++		"pclk", "earc", "aud", "hdp", "hclk_vo1",
++		"ref" /* keep "ref" last */
++	};
++	struct platform_device *pdev = to_platform_device(dev);
++	struct dw_hdmi_qp_plat_data plat_data;
++	struct drm_device *drm = data;
++	struct drm_connector *connector;
++	struct drm_encoder *encoder;
++	struct rockchip_hdmi_qp *hdmi;
++	struct clk *clk;
++	int ret, irq, i;
++	u32 val;
++
++	if (!pdev->dev.of_node)
++		return -ENODEV;
++
++	hdmi = devm_kzalloc(&pdev->dev, sizeof(*hdmi), GFP_KERNEL);
++	if (!hdmi)
++		return -ENOMEM;
++
++	plat_data.phy_ops = of_device_get_match_data(dev);
++	if (!plat_data.phy_ops)
++		return -ENODEV;
++
++	plat_data.phy_data = hdmi;
++	hdmi->dev = &pdev->dev;
++
++	encoder = &hdmi->encoder.encoder;
++	encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node);
++
++	rockchip_drm_encoder_set_crtc_endpoint_id(&hdmi->encoder,
++						  dev->of_node, 0, 0);
++	/*
++	 * If we failed to find the CRTC(s) which this encoder is
++	 * supposed to be connected to, it's because the CRTC has
++	 * not been registered yet.  Defer probing, and hope that
++	 * the required CRTC is added later.
++	 */
++	if (encoder->possible_crtcs == 0)
++		return -EPROBE_DEFER;
++
++	hdmi->regmap = syscon_regmap_lookup_by_phandle(dev->of_node,
++						       "rockchip,grf");
++	if (IS_ERR(hdmi->regmap)) {
++		drm_err(hdmi, "Unable to get rockchip,grf\n");
++		return PTR_ERR(hdmi->regmap);
++	}
++
++	hdmi->vo_regmap = syscon_regmap_lookup_by_phandle(dev->of_node,
++							  "rockchip,vo-grf");
++	if (IS_ERR(hdmi->vo_regmap)) {
++		drm_err(hdmi, "Unable to get rockchip,vo-grf\n");
++		return PTR_ERR(hdmi->vo_regmap);
++	}
++
++	for (i = 0; i < ARRAY_SIZE(clk_names); i++) {
++		clk = devm_clk_get_enabled(hdmi->dev, clk_names[i]);
++
++		if (IS_ERR(clk)) {
++			ret = PTR_ERR(clk);
++			if (ret != -EPROBE_DEFER)
++				drm_err(hdmi, "Failed to get %s clock: %d\n",
++					clk_names[i], ret);
++			return ret;
++		}
++	}
++	hdmi->ref_clk = clk;
++
++	hdmi->enable_gpio = devm_gpiod_get_optional(hdmi->dev, "enable",
++						    GPIOD_OUT_HIGH);
++	if (IS_ERR(hdmi->enable_gpio)) {
++		ret = PTR_ERR(hdmi->enable_gpio);
++		drm_err(hdmi, "Failed to request enable GPIO: %d\n", ret);
++		return ret;
++	}
++
++	hdmi->phy = devm_of_phy_get_by_index(dev, dev->of_node, 0);
++	if (IS_ERR(hdmi->phy)) {
++		ret = PTR_ERR(hdmi->phy);
++		if (ret != -EPROBE_DEFER)
++			drm_err(hdmi, "failed to get phy: %d\n", ret);
++		return ret;
++	}
++
++	val = HIWORD_UPDATE(RK3588_SCLIN_MASK, RK3588_SCLIN_MASK) |
++	      HIWORD_UPDATE(RK3588_SDAIN_MASK, RK3588_SDAIN_MASK) |
++	      HIWORD_UPDATE(RK3588_MODE_MASK, RK3588_MODE_MASK) |
++	      HIWORD_UPDATE(RK3588_I2S_SEL_MASK, RK3588_I2S_SEL_MASK);
++	regmap_write(hdmi->vo_regmap, RK3588_GRF_VO1_CON3, val);
++
++	val = HIWORD_UPDATE(RK3588_SET_HPD_PATH_MASK,
++			    RK3588_SET_HPD_PATH_MASK);
++	regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON7, val);
++
++	val = HIWORD_UPDATE(RK3588_HDMI0_GRANT_SEL,
++			    RK3588_HDMI0_GRANT_SEL);
++	regmap_write(hdmi->vo_regmap, RK3588_GRF_VO1_CON9, val);
++
++	val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_MSK, RK3588_HDMI0_HPD_INT_MSK);
++	regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON2, val);
++
++	INIT_DELAYED_WORK(&hdmi->hpd_work, dw_hdmi_qp_rk3588_hpd_work);
++
++	plat_data.main_irq = platform_get_irq_byname(pdev, "main");
++	if (plat_data.main_irq < 0)
++		return plat_data.main_irq;
++
++	irq = platform_get_irq_byname(pdev, "hpd");
++	if (irq < 0)
++		return irq;
++
++	ret = devm_request_threaded_irq(hdmi->dev, irq,
++					dw_hdmi_qp_rk3588_hardirq,
++					dw_hdmi_qp_rk3588_irq,
++					IRQF_SHARED, "dw-hdmi-qp-hpd",
++					hdmi);
++	if (ret)
++		return ret;
++
++	drm_encoder_helper_add(encoder, &dw_hdmi_qp_rockchip_encoder_helper_funcs);
++	drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);
++
++	platform_set_drvdata(pdev, hdmi);
++
++	hdmi->hdmi = dw_hdmi_qp_bind(pdev, encoder, &plat_data);
++	if (IS_ERR(hdmi->hdmi)) {
++		ret = PTR_ERR(hdmi->hdmi);
++		drm_encoder_cleanup(encoder);
++		return ret;
++	}
++
++	connector = drm_bridge_connector_init(drm, encoder);
++	if (IS_ERR(connector)) {
++		ret = PTR_ERR(connector);
++		drm_err(hdmi, "failed to init bridge connector: %d\n", ret);
++		return ret;
++	}
++
++	return drm_connector_attach_encoder(connector, encoder);
++}
++
++static void dw_hdmi_qp_rockchip_unbind(struct device *dev,
++				       struct device *master,
++				       void *data)
++{
++	struct rockchip_hdmi_qp *hdmi = dev_get_drvdata(dev);
++
++	cancel_delayed_work_sync(&hdmi->hpd_work);
++
++	drm_encoder_cleanup(&hdmi->encoder.encoder);
++}
++
++static const struct component_ops dw_hdmi_qp_rockchip_ops = {
++	.bind	= dw_hdmi_qp_rockchip_bind,
++	.unbind	= dw_hdmi_qp_rockchip_unbind,
++};
++
++static int dw_hdmi_qp_rockchip_probe(struct platform_device *pdev)
++{
++	return component_add(&pdev->dev, &dw_hdmi_qp_rockchip_ops);
++}
++
++static void dw_hdmi_qp_rockchip_remove(struct platform_device *pdev)
++{
++	component_del(&pdev->dev, &dw_hdmi_qp_rockchip_ops);
++}
++
++static int __maybe_unused dw_hdmi_qp_rockchip_resume(struct device *dev)
++{
++	struct rockchip_hdmi_qp *hdmi = dev_get_drvdata(dev);
++	u32 val;
++
++	val = HIWORD_UPDATE(RK3588_SCLIN_MASK, RK3588_SCLIN_MASK) |
++	      HIWORD_UPDATE(RK3588_SDAIN_MASK, RK3588_SDAIN_MASK) |
++	      HIWORD_UPDATE(RK3588_MODE_MASK, RK3588_MODE_MASK) |
++	      HIWORD_UPDATE(RK3588_I2S_SEL_MASK, RK3588_I2S_SEL_MASK);
++	regmap_write(hdmi->vo_regmap, RK3588_GRF_VO1_CON3, val);
++
++	val = HIWORD_UPDATE(RK3588_SET_HPD_PATH_MASK,
++			    RK3588_SET_HPD_PATH_MASK);
++	regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON7, val);
++
++	val = HIWORD_UPDATE(RK3588_HDMI0_GRANT_SEL,
++			    RK3588_HDMI0_GRANT_SEL);
++	regmap_write(hdmi->vo_regmap, RK3588_GRF_VO1_CON9, val);
++
++	dw_hdmi_qp_resume(dev, hdmi->hdmi);
++
++	if (hdmi->encoder.encoder.dev)
++		drm_helper_hpd_irq_event(hdmi->encoder.encoder.dev);
++
++	return 0;
++}
++
++static const struct dev_pm_ops dw_hdmi_qp_rockchip_pm = {
++	SET_SYSTEM_SLEEP_PM_OPS(NULL, dw_hdmi_qp_rockchip_resume)
++};
++
++struct platform_driver dw_hdmi_qp_rockchip_pltfm_driver = {
++	.probe = dw_hdmi_qp_rockchip_probe,
++	.remove = dw_hdmi_qp_rockchip_remove,
++	.driver = {
++		.name = "dwhdmiqp-rockchip",
++		.pm = &dw_hdmi_qp_rockchip_pm,
++		.of_match_table = dw_hdmi_qp_rockchip_dt_ids,
++	},
++};
+diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+index 111111111111..222222222222 100644
+--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
++++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+@@ -507,6 +507,8 @@ static int __init rockchip_drm_init(void)
+ 	ADD_ROCKCHIP_SUB_DRIVER(cdn_dp_driver, CONFIG_ROCKCHIP_CDN_DP);
+ 	ADD_ROCKCHIP_SUB_DRIVER(dw_hdmi_rockchip_pltfm_driver,
+ 				CONFIG_ROCKCHIP_DW_HDMI);
++	ADD_ROCKCHIP_SUB_DRIVER(dw_hdmi_qp_rockchip_pltfm_driver,
++				CONFIG_ROCKCHIP_DW_HDMI_QP);
+ 	ADD_ROCKCHIP_SUB_DRIVER(dw_mipi_dsi_rockchip_driver,
+ 				CONFIG_ROCKCHIP_DW_MIPI_DSI);
+ 	ADD_ROCKCHIP_SUB_DRIVER(inno_hdmi_driver, CONFIG_ROCKCHIP_INNO_HDMI);
+diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
+index 111111111111..222222222222 100644
+--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
++++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
+@@ -88,6 +88,7 @@ int rockchip_drm_encoder_set_crtc_endpoint_id(struct rockchip_encoder *rencoder,
+ int rockchip_drm_endpoint_is_subdriver(struct device_node *ep);
+ extern struct platform_driver cdn_dp_driver;
+ extern struct platform_driver dw_hdmi_rockchip_pltfm_driver;
++extern struct platform_driver dw_hdmi_qp_rockchip_pltfm_driver;
+ extern struct platform_driver dw_mipi_dsi_rockchip_driver;
+ extern struct platform_driver inno_hdmi_driver;
+ extern struct platform_driver rockchip_dp_driver;
+-- 
+Armbian
+

From e28a3ec888210871f6c9a3349ea49279396ef96a Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Fri, 18 Oct 2024 14:02:27 +0200
Subject: [PATCH 088/107] rk3588: edge: Enable new HDMI output driver in kernel
 config

`CONFIG_ROCKCHIP_DW_HDMI_QP`
---
 config/kernel/linux-rockchip-rk3588-edge.config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/kernel/linux-rockchip-rk3588-edge.config b/config/kernel/linux-rockchip-rk3588-edge.config
index d045d226b905..c9b5b23d5fe7 100644
--- a/config/kernel/linux-rockchip-rk3588-edge.config
+++ b/config/kernel/linux-rockchip-rk3588-edge.config
@@ -6547,6 +6547,7 @@ CONFIG_ROCKCHIP_VOP2=y
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
+CONFIG_ROCKCHIP_DW_HDMI_QP=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
@@ -6718,6 +6719,7 @@ CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 # CONFIG_DRM_DW_HDMI_GP_AUDIO is not set
 CONFIG_DRM_DW_HDMI_CEC=m
+CONFIG_DRM_DW_HDMI_QP=m
 CONFIG_DRM_DW_MIPI_DSI=m
 # end of Display Interface Bridges
 

From 864a48057855472d458666f731188ee67e95bae2 Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Mon, 21 Oct 2024 16:14:47 +0200
Subject: [PATCH 089/107] board: nanopc-t6: Add USB3 power supply and pwm fan
 to DTS

Co-authored-by: SuperKali <hello@superkali.me>
---
 ...nopc-t6-Add-USB3-psu-and-fan-support.patch | 126 ++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 patch/kernel/archive/rockchip-rk3588-6.12/1051-board-nanopc-t6-Add-USB3-psu-and-fan-support.patch

diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/1051-board-nanopc-t6-Add-USB3-psu-and-fan-support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1051-board-nanopc-t6-Add-USB3-psu-and-fan-support.patch
new file mode 100644
index 000000000000..7993d3079b5d
--- /dev/null
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/1051-board-nanopc-t6-Add-USB3-psu-and-fan-support.patch
@@ -0,0 +1,126 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: SuperKali <hello@superkali.me>
+Date: Mon, 21 Oct 2024 13:21:03 +0000
+Subject: Add Missing parameters for USB3.0 and FAN
+
+Signed-off-by: SuperKali <hello@superkali.me>
+---
+ arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts |  4 -
+ arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi    | 58 ++++++++++
+ 2 files changed, 58 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
+index 111111111111..222222222222 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
+@@ -42,10 +42,6 @@ &u2phy1 {
+ 	status = "okay";
+ };
+ 
+-&u2phy1_otg {
+-	status = "okay";
+-};
+-
+ &u2phy2_host {
+ 	phy-supply = <&vcc5v0_usb20_host>;
+ };
+diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+index 111111111111..222222222222 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+@@ -66,6 +66,15 @@ usr_led: led-1 {
+ 		};
+ 	};
+ 
++	/* FAN */
++	fan0: pwm-fan {
++		compatible = "pwm-fan";
++		#cooling-cells = <2>;
++		cooling-levels = <100 160 190 200 215 235 255>;
++		pwms = <&pwm1 0 50000 0>;
++        	fan-supply = <&vcc5v0_sys>;
++	};
++
+ 	sound {
+ 		compatible = "simple-audio-card";
+ 		pinctrl-names = "default";
+@@ -171,6 +180,18 @@ vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {
+ 		vin-supply = <&vcc5v0_sys>;
+ 	};
+ 
++	vcc5v0_host_30: vcc5v0-host-30 {
++		compatible = "regulator-fixed";
++		enable-active-high;
++		gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
++		pinctrl-names = "default";
++		pinctrl-0 = <&vcc5v0_host30_en>;
++		regulator-name = "vcc5v0_host_30";
++		regulator-min-microvolt = <5000000>;
++		regulator-max-microvolt = <5000000>;
++		vin-supply = <&vcc5v0_sys>;
++	};
++
+ 	vcc3v3_pcie30: vcc3v3-pcie30-regulator {
+ 		compatible = "regulator-fixed";
+ 		enable-active-high;
+@@ -485,6 +506,34 @@ i2s0_8ch_p0_0: endpoint {
+ 	};
+ };
+ 
++&package_thermal {
++	polling-delay = <1000>;
++
++	trips {
++		package_fan0: package-fan0 {
++			temperature = <55000>;
++			hysteresis = <2000>;
++			type = "active";
++		};
++		package_fan1: package-fan1 {
++			temperature = <65000>;
++			hysteresis = <2000>;
++			type = "active";
++		};
++	};
++
++	cooling-maps {
++		map1 {
++			trip = <&package_fan0>;
++			cooling-device = <&fan0 THERMAL_NO_LIMIT 1>;
++		};
++		map2 {
++			trip = <&package_fan1>;
++			cooling-device = <&fan0 2 THERMAL_NO_LIMIT>;
++		};
++	};
++};
++
+ &pcie2x1l0 {
+ 	reset-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
+ 	vpcie3v3-supply = <&vcc_3v3_pcie20>;
+@@ -575,6 +624,10 @@ typec5v_pwren: typec5v-pwren {
+ 			rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
+ 		};
+ 
++		vcc5v0_host30_en: vcc5v0-host30-en {
++			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
++		};
++
+ 		usbc0_int: usbc0-int {
+ 			rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;
+ 		};
+@@ -973,6 +1026,11 @@ &u2phy0_otg {
+ 	status = "okay";
+ };
+ 
++&u2phy1_otg {
++	phy-supply = <&vcc5v0_host_30>;
++	status = "okay";
++};
++
+ &u2phy2_host {
+ 	status = "okay";
+ };
+-- 
+Armbian
+

From 73cfd3793838fbd253bd32905a1e56333f4a3d95 Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Sun, 10 Nov 2024 23:49:02 +0800
Subject: [PATCH 090/107] rockchip-rk3588-6.12: add patch from rockchip64 to
 disable tools/shed_ext clean

---
 .../0002-tools-disable-sched_ext_clean.patch                     | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 patch/kernel/archive/rockchip-rk3588-6.12/0002-tools-disable-sched_ext_clean.patch

diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0002-tools-disable-sched_ext_clean.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0002-tools-disable-sched_ext_clean.patch
new file mode 120000
index 000000000000..0d64596d7763
--- /dev/null
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/0002-tools-disable-sched_ext_clean.patch
@@ -0,0 +1 @@
+../rockchip64-6.12/0001-tools-disable-sched_ext_clean.patch
\ No newline at end of file

From d956048b37067d13b72abc1c1660cd6959cb9816 Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Mon, 11 Nov 2024 11:09:03 +0800
Subject: [PATCH 091/107] rockchip-rk3588-6.12: update HDMI0 bridge patch

---
 ...ockchip-Add-HDMI0-bridge-CLK-to-rk3588.patch | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0135-arm64-dts-rockchip-Add-HDMI0-bridge-CLK-to-rk3588.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0135-arm64-dts-rockchip-Add-HDMI0-bridge-CLK-to-rk3588.patch
index 4707239f4ad3..c9ad628a1000 100644
--- a/patch/kernel/archive/rockchip-rk3588-6.12/0135-arm64-dts-rockchip-Add-HDMI0-bridge-CLK-to-rk3588.patch
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/0135-arm64-dts-rockchip-Add-HDMI0-bridge-CLK-to-rk3588.patch
@@ -1,20 +1,20 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
-Date: Mon, 15 Jan 2024 22:47:41 +0200
-Subject: arm64: dts: rockchip: Add HDMI0 bridge to rk3588
+Date: Sat, 19 Oct 2024 13:12:10 +0300
+Subject: arm64: dts: rockchip: Add HDMI0 node to rk3588
 
-Add DT node for the HDMI0 bridge found on RK3588 SoC.
+Add support for the HDMI0 output port found on RK3588 SoC.
 
 Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
 ---
- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 42 ++++++++++
- 1 file changed, 42 insertions(+)
+ arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 41 +++++++++++++++++++
+ 1 file changed, 41 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-index 111111111111..222222222222 100644
+index d97d84b88..bef584795 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-@@ -1405,6 +1405,48 @@ i2s9_8ch: i2s@fddfc000 {
+@@ -1366,6 +1366,47 @@ i2s9_8ch: i2s@fddfc000 {
  		status = "disabled";
  	};
  
@@ -35,7 +35,6 @@ index 111111111111..222222222222 100644
 +			     <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH 0>;
 +		interrupt-names = "avp", "cec", "earc", "main", "hpd";
 +		phys = <&hdptxphy_hdmi0>;
-+		phy-names = "hdmi";
 +		pinctrl-names = "default";
 +		pinctrl-0 = <&hdmim0_tx0_cec &hdmim0_tx0_hpd
 +			     &hdmim0_tx0_scl &hdmim0_tx0_sda>;
@@ -43,7 +42,7 @@ index 111111111111..222222222222 100644
 +		resets = <&cru SRST_HDMITX0_REF>, <&cru SRST_HDMIHDP0>;
 +		reset-names = "ref", "hdp";
 +		rockchip,grf = <&sys_grf>;
-+		rockchip,vo1_grf = <&vo1_grf>;
++		rockchip,vo-grf = <&vo1_grf>;
 +		status = "disabled";
 +
 +		ports {

From 96fbd4a6175b223a96dab225f575d2adb7697d34 Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Mon, 11 Nov 2024 11:39:55 +0800
Subject: [PATCH 092/107] rockchip-rk3588-6.12: add HDMI support to nanopc t6

---
 ...052-board-nanopc-t6-Add-HDMI-support.patch | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 patch/kernel/archive/rockchip-rk3588-6.12/1052-board-nanopc-t6-Add-HDMI-support.patch

diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/1052-board-nanopc-t6-Add-HDMI-support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1052-board-nanopc-t6-Add-HDMI-support.patch
new file mode 100644
index 000000000000..5530a6bcded4
--- /dev/null
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/1052-board-nanopc-t6-Add-HDMI-support.patch
@@ -0,0 +1,91 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: SuperKali <hello@superkali.me>
+Date: Sun, 10 Nov 2024 16:13:28 +0000
+Subject: Add missing nodes HDMI & VOP for NanoPC T6 & LTS
+
+Signed-off-by: SuperKali <hello@superkali.me>
+---
+ arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 36 ++++++++++
+ 1 file changed, 36 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+index ac537e3b9c35..f35dc55423d2 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+@@ -9,10 +9,11 @@
+ 
+ #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/input/input.h>
+ #include <dt-bindings/pinctrl/rockchip.h>
+ #include <dt-bindings/usb/pd.h>
++#include <dt-bindings/soc/rockchip,vop2.h>
+ #include "rk3588.dtsi"
+ 
+ / {
+ 	model = "FriendlyElec NanoPC-T6";
+ 	compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588";
+@@ -257,10 +258,15 @@ &cpu_b2 {
+ 
+ &cpu_b3 {
+ 	cpu-supply = <&vdd_cpu_big1_s0>;
+ };
+ 
++&display_subsystem {
++	clocks = <&hdptxphy_hdmi0>;
++	clock-names = "hdmi0_phy_pll";
++};
++
+ &gpio0 {
+ 	gpio-line-names = /* GPIO0 A0-A7 */
+ 			  "", "", "", "",
+ 			  "", "", "", "",
+ 			  /* GPIO0 B0-B7 */
+@@ -337,10 +343,25 @@ &gpio4 {
+ &gpu {
+ 	mali-supply = <&vdd_gpu_s0>;
+ 	status = "okay";
+ };
+ 
++&hdmi0 {
++	status = "okay";
++};
++
++&hdmi0_in {
++	hdmi0_in_vp0: endpoint {
++		remote-endpoint = <&vp0_out_hdmi0>;
++	};
++};
++
++&hdptxphy_hdmi0 {
++	status = "okay";
++};
++
++
+ &i2c0 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&i2c0m2_xfer>;
+ 	status = "okay";
+ 
+@@ -1095,5 +1116,20 @@ &usb_host1_ehci {
+ };
+ 
+ &usb_host1_ohci {
+ 	status = "okay";
+ };
++
++&vop {
++	status = "okay";
++};
++
++&vop_mmu {
++	status = "okay";
++};
++
++&vp0 {
++	vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
++		reg = <ROCKCHIP_VOP2_EP_HDMI0>;
++		remote-endpoint = <&hdmi0_in_vp0>;
++	};
++};
+-- 
+Armbian

From eec2c2bf5aaa7d9228df7d80509ac82454fbe3cc Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Mon, 11 Nov 2024 12:48:04 +0100
Subject: [PATCH 093/107] fix crash dump on eager led setting

---
 .../general-driver-tm16xx-led-driver.patch                | 8 ++++----
 .../rockchip64-6.6/general-driver-tm16xx-led-driver.patch | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/patch/kernel/archive/rockchip64-6.12/general-driver-tm16xx-led-driver.patch b/patch/kernel/archive/rockchip64-6.12/general-driver-tm16xx-led-driver.patch
index 9a2b5d41f7de..dc42841a45df 100644
--- a/patch/kernel/archive/rockchip64-6.12/general-driver-tm16xx-led-driver.patch
+++ b/patch/kernel/archive/rockchip64-6.12/general-driver-tm16xx-led-driver.patch
@@ -987,6 +987,10 @@ index 000000000000..111111111111
 +		return ret;
 +	}
 +
++	mutex_init(&display->lock);
++	INIT_WORK(&display->flush_brightness, tm16xx_display_flush_brightness);
++	INIT_WORK(&display->flush_display, tm16xx_display_flush_data);
++
 +	display->main_led.name = TM16XX_DEVICE_NAME;
 +	display->main_led.brightness = display->controller->max_brightness;
 +	display->main_led.max_brightness = display->controller->max_brightness;
@@ -1036,10 +1040,6 @@ index 000000000000..111111111111
 +		i++;
 +	}
 +
-+	mutex_init(&display->lock);
-+	INIT_WORK(&display->flush_brightness, tm16xx_display_flush_brightness);
-+	INIT_WORK(&display->flush_display, tm16xx_display_flush_data);
-+
 +	ret = tm16xx_display_init(display);
 +	if (ret < 0) {
 +		dev_err(display->dev, "Failed to initialize display: %d\n", ret);
diff --git a/patch/kernel/archive/rockchip64-6.6/general-driver-tm16xx-led-driver.patch b/patch/kernel/archive/rockchip64-6.6/general-driver-tm16xx-led-driver.patch
index e009ad77ce23..2220db3a942e 100644
--- a/patch/kernel/archive/rockchip64-6.6/general-driver-tm16xx-led-driver.patch
+++ b/patch/kernel/archive/rockchip64-6.6/general-driver-tm16xx-led-driver.patch
@@ -988,6 +988,10 @@ index 000000000000..d938b0166e74
 +		return ret;
 +	}
 +
++	mutex_init(&display->lock);
++	INIT_WORK(&display->flush_brightness, tm16xx_display_flush_brightness);
++	INIT_WORK(&display->flush_display, tm16xx_display_flush_data);
++
 +	display->main_led.name = TM16XX_DEVICE_NAME;
 +	display->main_led.brightness = display->controller->max_brightness;
 +	display->main_led.max_brightness = display->controller->max_brightness;
@@ -1037,10 +1041,6 @@ index 000000000000..d938b0166e74
 +		i++;
 +	}
 +
-+	mutex_init(&display->lock);
-+	INIT_WORK(&display->flush_brightness, tm16xx_display_flush_brightness);
-+	INIT_WORK(&display->flush_display, tm16xx_display_flush_data);
-+
 +	ret = tm16xx_display_init(display);
 +	if (ret < 0) {
 +		dev_err(display->dev, "Failed to initialize display: %d\n", ret);

From abe77c314a8aab9cd0d8b95ab7ca3d4ef97eaec5 Mon Sep 17 00:00:00 2001
From: jomadeto <jomadeto@gmail.com>
Date: Tue, 12 Nov 2024 12:40:41 +0100
Subject: [PATCH 094/107] Add TV Box Magicsee C400 Plus Linux support

---
 .../meson64-6.11/dt/meson-gxm-c400-plus.dts   | 66 +++++++++++++++++++
 .../meson64-6.6/dt/meson-gxm-c400-plus.dts    | 66 +++++++++++++++++++
 2 files changed, 132 insertions(+)
 create mode 100644 patch/kernel/archive/meson64-6.11/dt/meson-gxm-c400-plus.dts
 create mode 100644 patch/kernel/archive/meson64-6.6/dt/meson-gxm-c400-plus.dts

diff --git a/patch/kernel/archive/meson64-6.11/dt/meson-gxm-c400-plus.dts b/patch/kernel/archive/meson64-6.11/dt/meson-gxm-c400-plus.dts
new file mode 100644
index 000000000000..714c6fef3ff9
--- /dev/null
+++ b/patch/kernel/archive/meson64-6.11/dt/meson-gxm-c400-plus.dts
@@ -0,0 +1,66 @@
+/dts-v1/;
+
+#include "meson-gxm.dtsi"
+#include "meson-gx-p23x-q20x.dtsi"
+
+/ {
+	compatible = "magicsee,c400-plus", "amlogic,s912", "amlogic,meson-gxm";
+	model = "Magicsee C400 Plus";
+};
+
+/* Q201 has only internal PHY port */
+&ethmac {
+	phy-mode = "rmii";
+	phy-handle = <&internal_phy>;
+};
+
+&sd_emmc_a {
+	brcmf: wifi@1 {
+		reg = <1>;
+		compatible = "brcm,bcm4329-fmac";
+	};
+};
+
+&uart_A {
+	status = "okay";
+	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
+	pinctrl-names = "default";
+	uart-has-rtscts;
+
+	bluetooth {
+		compatible = "qcom,qca9377-bt";
+		enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
+		max-speed = <2000000>;
+		clocks = <&wifi32k>;
+		clock-names = "lpo";
+	};
+};
+
+/* Wireless SDIO Module */
+&sd_emmc_a {
+	status = "okay";
+	pinctrl-0 = <&sdio_pins>;
+	pinctrl-1 = <&sdio_clk_gate_pins>;
+	pinctrl-names = "default", "clk-gate";
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	bus-width = <4>;
+	cap-sd-highspeed;
+	sd-uhs-sdr12;
+	sd-uhs-sdr25;
+	sd-uhs-sdr50;
+	sd-uhs-sdr104;
+	max-frequency = <50000000>;
+
+	non-removable;
+	disable-wp;
+
+	/* WiFi firmware requires power to be kept while in suspend */
+	keep-power-in-suspend;
+
+	mmc-pwrseq = <&sdio_pwrseq>;
+
+	vmmc-supply = <&vddao_3v3>;
+	vqmmc-supply = <&vddio_boot>;
+};
\ No newline at end of file
diff --git a/patch/kernel/archive/meson64-6.6/dt/meson-gxm-c400-plus.dts b/patch/kernel/archive/meson64-6.6/dt/meson-gxm-c400-plus.dts
new file mode 100644
index 000000000000..714c6fef3ff9
--- /dev/null
+++ b/patch/kernel/archive/meson64-6.6/dt/meson-gxm-c400-plus.dts
@@ -0,0 +1,66 @@
+/dts-v1/;
+
+#include "meson-gxm.dtsi"
+#include "meson-gx-p23x-q20x.dtsi"
+
+/ {
+	compatible = "magicsee,c400-plus", "amlogic,s912", "amlogic,meson-gxm";
+	model = "Magicsee C400 Plus";
+};
+
+/* Q201 has only internal PHY port */
+&ethmac {
+	phy-mode = "rmii";
+	phy-handle = <&internal_phy>;
+};
+
+&sd_emmc_a {
+	brcmf: wifi@1 {
+		reg = <1>;
+		compatible = "brcm,bcm4329-fmac";
+	};
+};
+
+&uart_A {
+	status = "okay";
+	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
+	pinctrl-names = "default";
+	uart-has-rtscts;
+
+	bluetooth {
+		compatible = "qcom,qca9377-bt";
+		enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
+		max-speed = <2000000>;
+		clocks = <&wifi32k>;
+		clock-names = "lpo";
+	};
+};
+
+/* Wireless SDIO Module */
+&sd_emmc_a {
+	status = "okay";
+	pinctrl-0 = <&sdio_pins>;
+	pinctrl-1 = <&sdio_clk_gate_pins>;
+	pinctrl-names = "default", "clk-gate";
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	bus-width = <4>;
+	cap-sd-highspeed;
+	sd-uhs-sdr12;
+	sd-uhs-sdr25;
+	sd-uhs-sdr50;
+	sd-uhs-sdr104;
+	max-frequency = <50000000>;
+
+	non-removable;
+	disable-wp;
+
+	/* WiFi firmware requires power to be kept while in suspend */
+	keep-power-in-suspend;
+
+	mmc-pwrseq = <&sdio_pwrseq>;
+
+	vmmc-supply = <&vddao_3v3>;
+	vqmmc-supply = <&vddio_boot>;
+};
\ No newline at end of file

From 05afe5df3aa306a44918891d1303e0080605bb7d Mon Sep 17 00:00:00 2001
From: Aaron Dewes <aaron@nirvati.org>
Date: Tue, 12 Nov 2024 20:40:57 +0100
Subject: [PATCH 095/107] Add support for Radxa CM5 on RPi CM4 IO

---
 config/boards/rock-5-cm-rpi-cm4-io.csc | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 config/boards/rock-5-cm-rpi-cm4-io.csc

diff --git a/config/boards/rock-5-cm-rpi-cm4-io.csc b/config/boards/rock-5-cm-rpi-cm4-io.csc
new file mode 100644
index 000000000000..84d26d6a3728
--- /dev/null
+++ b/config/boards/rock-5-cm-rpi-cm4-io.csc
@@ -0,0 +1,14 @@
+# Rockchip RK3588S octa core 4/8/16GB RAM SoC NVMe USB3 USB-C GbE
+BOARD_NAME="Radxa CM5 on RPi CM4 IO"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER=""
+BOOTCONFIG="radxa-cm5-rpi-cm4-io-rk3588s_defconfig"
+BOOT_SOC="rk3588"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588s-radxa-cm5-rpi-cm4-io.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"

From 6d8b84502967bc4701afbf93acc5a6ecaaa7f627 Mon Sep 17 00:00:00 2001
From: SuperKali <hello@superkali.me>
Date: Thu, 14 Nov 2024 08:03:56 +0100
Subject: [PATCH 096/107] Add missing node for youyeetoo r1 on current kernel 
 (#7472)

---
 .../archive/rockchip-rk3588-6.12/dt/rk3588s-youyeetoo-r1.dts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588s-youyeetoo-r1.dts b/patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588s-youyeetoo-r1.dts
index 1446aa021cb9..08ffb7ad570d 100644
--- a/patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588s-youyeetoo-r1.dts
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/dt/rk3588s-youyeetoo-r1.dts
@@ -226,6 +226,11 @@
 	mem-supply = <&vdd_cpu_lit_mem_s0>;
 };
 
+&display_subsystem {
+	clocks = <&hdptxphy_hdmi0>;
+	clock-names = "hdmi0_phy_pll";
+};
+
 &gpu {
 	mali-supply = <&vdd_gpu_s0>;
 	status = "okay";

From 378c64a7628fd22325296b8d9e235c202fef89da Mon Sep 17 00:00:00 2001
From: SuperKali <hello@superkali.me>
Date: Thu, 14 Nov 2024 17:59:50 +0100
Subject: [PATCH 097/107] Move support of nanopc t6 & lts from edge to current
 (#7476)

---
 config/boards/nanopct6-lts.conf | 3 +--
 config/boards/nanopct6.conf     | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/config/boards/nanopct6-lts.conf b/config/boards/nanopct6-lts.conf
index b216d281ec51..cc74190105bd 100644
--- a/config/boards/nanopct6-lts.conf
+++ b/config/boards/nanopct6-lts.conf
@@ -5,5 +5,4 @@ BOARD_NAME="NanoPC T6 LTS"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="SuperKali Tonymac32"
 BOOT_FDT_FILE="rockchip/rk3588-nanopc-t6-lts.dtb" # As opposed to "rockchip/rk3588-nanopc-t6.dtb" for the non-LTS version
-KERNEL_TARGET="edge,current,vendor"
-KERNEL_TEST_TARGET="vendor,current"
+KERNEL_TARGET="current,vendor"
diff --git a/config/boards/nanopct6.conf b/config/boards/nanopct6.conf
index c0d013213a02..aa1cf02bacfa 100644
--- a/config/boards/nanopct6.conf
+++ b/config/boards/nanopct6.conf
@@ -4,8 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="SuperKali Tonymac32"
 BOOTCONFIG="nanopc_t6_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
-KERNEL_TEST_TARGET="vendor,current"
+KERNEL_TARGET="current,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-nanopc-t6.dtb"
@@ -29,7 +28,7 @@ function post_family_tweaks__nanopct6_naming_audios() {
 }
 
 # Mainline u-boot
-function post_family_config_branch_edge__nanopct6_use_mainline_uboot() {
+function post_family_config_branch_current__nanopct6_use_mainline_uboot() {
 	display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"
 
 	declare -g BOOTCONFIG="nanopc-t6-rk3588_defconfig"

From 6c26eee18d7bfb6b83d69df784e76d9866896853 Mon Sep 17 00:00:00 2001
From: SuperKali <hello@superkali.me>
Date: Thu, 14 Nov 2024 18:00:12 +0100
Subject: [PATCH 098/107] Remove edge kernel on youyeetoo r1 (#7475)

---
 config/boards/youyeetoo-r1-v3.csc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/boards/youyeetoo-r1-v3.csc b/config/boards/youyeetoo-r1-v3.csc
index 3b4cdfe754ef..47a522b9cafc 100644
--- a/config/boards/youyeetoo-r1-v3.csc
+++ b/config/boards/youyeetoo-r1-v3.csc
@@ -4,8 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="SuperKali"
 BOOTCONFIG="generic-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
-KERNEL_TEST_TARGET="vendor,current"
+KERNEL_TARGET="current,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"

From 01d7f7db0dc3ded6c4200b4ee055f5705fafb3e3 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Thu, 14 Nov 2024 19:45:37 +0100
Subject: [PATCH 099/107] Change development repository domain name to
 github.armbian.com

---
 lib/functions/compilation/packages/armbian-config-deb.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/functions/compilation/packages/armbian-config-deb.sh b/lib/functions/compilation/packages/armbian-config-deb.sh
index f2713cbf9676..f712640f244d 100644
--- a/lib/functions/compilation/packages/armbian-config-deb.sh
+++ b/lib/functions/compilation/packages/armbian-config-deb.sh
@@ -66,7 +66,7 @@ compile_armbian-config() {
 
 	# Add development repository to keep rooling release of this tool
 	cat <<- END > ${tmp_dir}/${armbian_config_dir}/etc/apt/sources.list.d/armbian-config.list
-	deb [signed-by=/usr/share/keyrings/armbian.gpg] https://armbian.github.io/configng stable main
+	deb [signed-by=/usr/share/keyrings/armbian.gpg] https://github.armbian.com/configng stable main
 	END
 
 	dpkg_deb_build "${tmp_dir}/${armbian_config_dir}" "armbian-config"

From 2e1545d298b036a91161dfad57a745ee4794eb4f Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Mon, 11 Nov 2024 10:56:35 +0300
Subject: [PATCH 100/107] sunxi-6.6: Switch to v6.6.60

---
 config/sources/families/include/sunxi64_common.inc | 2 +-
 config/sources/families/include/sunxi_common.inc   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc
index cca9237d1edc..63c2f556433b 100644
--- a/config/sources/families/include/sunxi64_common.inc
+++ b/config/sources/families/include/sunxi64_common.inc
@@ -31,7 +31,7 @@ case $BRANCH in
 
 	current)
 		declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
-		declare -g KERNELBRANCH="tag:v6.6.54"
+		declare -g KERNELBRANCH="tag:v6.6.60"
 		;;
 
 	edge)
diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc
index b5cc6103c925..90dec4723c12 100644
--- a/config/sources/families/include/sunxi_common.inc
+++ b/config/sources/families/include/sunxi_common.inc
@@ -32,7 +32,7 @@ case $BRANCH in
 
 	current)
 		declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
-		declare -g KERNELBRANCH="tag:v6.6.54"
+		declare -g KERNELBRANCH="tag:v6.6.60"
 		;;
 
 	edge)

From e76837f79e64333818f033479bea6739253d512f Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Mon, 11 Nov 2024 22:01:48 +0300
Subject: [PATCH 101/107] sunxi-6.11: Fix dtb install

---
 patch/kernel/archive/sunxi-6.11/fix-dtb.patch | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 patch/kernel/archive/sunxi-6.11/fix-dtb.patch

diff --git a/patch/kernel/archive/sunxi-6.11/fix-dtb.patch b/patch/kernel/archive/sunxi-6.11/fix-dtb.patch
new file mode 100644
index 000000000000..618a88bf1f1d
--- /dev/null
+++ b/patch/kernel/archive/sunxi-6.11/fix-dtb.patch
@@ -0,0 +1,41 @@
+diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
+index 0b674435f63a..a18d02be8866 100644
+--- a/scripts/Makefile.dtbinst
++++ b/scripts/Makefile.dtbinst
+@@ -22,15 +22,10 @@ quiet_cmd_dtb_install = INSTALL $@
+ $(dst)/%: $(obj)/%
+ 	$(call cmd,dtb_install)
+ 
+-$(dst)/%.scr: $(obj)/%.scr
+-	$(call cmd,dtb_install)
+-
+-$(dst)/README.%-overlays: $(obj)/README.%-overlays
+-	$(call cmd,dtb_install)
+-
+ dtbs := $(patsubst $(obj)/%,%,$(call read-file, $(obj)/dtbs-list))
+-script-files	:= $(addprefix $(dst)/, $(scr-y))
+-readme-files	:= $(addprefix $(dst)/, $(dtbotxt-y))
++subdirs := $(sort $(dir $(filter %.dtbo, $(dtbs))))
++dtbs += $(patsubst $(obj)/%,%,$(if $(subdirs), $(shell cd $(srctree)/$(obj) && find $(subdirs) -name '*.scr')))
++dtbs += $(patsubst $(obj)/%,%,$(if $(subdirs), $(shell cd $(srctree)/$(obj) && find $(subdirs) -name 'README.*-overlays')))
+ 
+ ifdef CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
+ 
+@@ -41,11 +36,15 @@ endef
+ 
+ $(foreach d, $(sort $(dir $(dtbs))), $(eval $(call gen_install_rules,$(d))))
+ 
+-dtbs := $(notdir $(dtbs))
++# Armbian uses subdirectories such as <allwinner/overlays>.
++#dtbs := $(notdir $(dtbs))
+ 
+ endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
+ 
+-__dtbs_install: $(addprefix $(dst)/, $(dtbs)) $(script-files) $(readme-files)
++__dtbs_install: $(addprefix $(dst)/, $(dtbs))
++	@$(Q)$(kecho) "DT INST: $(dst)"
++	@$(Q)$(kecho) "DT INST: $(dtbs)"
++	@$(Q)$(kecho) "DT INST: $(subdirs)"
+ 	@:
+ 
+ .PHONY: $(PHONY)

From 42505d6e9c94b4c9c115071c4bff09b302af21a5 Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Tue, 12 Nov 2024 19:00:52 +0300
Subject: [PATCH 102/107] sunxi-6.11: reexport megous patches

---
 ...ec-tcpm-Fix-PD-devices-capabilities-registration.patch | 6 +++---
 .../patches.megous/usb-typec-tcpm-Improve-logs.patch      | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/patch/kernel/archive/sunxi-6.11/patches.megous/usb-typec-tcpm-Fix-PD-devices-capabilities-registration.patch b/patch/kernel/archive/sunxi-6.11/patches.megous/usb-typec-tcpm-Fix-PD-devices-capabilities-registration.patch
index 3669353a28c1..71fc51622435 100644
--- a/patch/kernel/archive/sunxi-6.11/patches.megous/usb-typec-tcpm-Fix-PD-devices-capabilities-registration.patch
+++ b/patch/kernel/archive/sunxi-6.11/patches.megous/usb-typec-tcpm-Fix-PD-devices-capabilities-registration.patch
@@ -1,4 +1,4 @@
-From 52613579065ac98cfe11cef2c742427f8ccaaf08 Mon Sep 17 00:00:00 2001
+From daadc0b5ef9a7011cd508348bb345f7f522bef15 Mon Sep 17 00:00:00 2001
 From: Ondrej Jirman <megi@xff.cz>
 Date: Sat, 18 Feb 2023 00:38:44 +0100
 Subject: usb: typec: tcpm: Fix PD devices/capabilities registration
@@ -15,7 +15,7 @@ Signed-off-by: Ondrej Jirman <megi@xff.cz>
  1 file changed, 29 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
-index 092ecba722ca..7ee27a667654 100644
+index bfaecd04b56d..52e611be9e09 100644
 --- a/drivers/usb/typec/tcpm/tcpm.c
 +++ b/drivers/usb/typec/tcpm/tcpm.c
 @@ -3009,15 +3009,22 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
@@ -72,7 +72,7 @@ index 092ecba722ca..7ee27a667654 100644
  	cap = usb_power_delivery_register_capabilities(port->partner_pd, &caps);
  	if (IS_ERR(cap))
  		return PTR_ERR(cap);
-@@ -7015,10 +7029,17 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
+@@ -7019,10 +7033,17 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
  		port->pds[i] = usb_power_delivery_register(port->dev, &desc);
  		if (IS_ERR(port->pds[i])) {
  			ret = PTR_ERR(port->pds[i]);
diff --git a/patch/kernel/archive/sunxi-6.11/patches.megous/usb-typec-tcpm-Improve-logs.patch b/patch/kernel/archive/sunxi-6.11/patches.megous/usb-typec-tcpm-Improve-logs.patch
index af366c3a07a3..90509ce20262 100644
--- a/patch/kernel/archive/sunxi-6.11/patches.megous/usb-typec-tcpm-Improve-logs.patch
+++ b/patch/kernel/archive/sunxi-6.11/patches.megous/usb-typec-tcpm-Improve-logs.patch
@@ -1,4 +1,4 @@
-From f6e5248fee93056e182d5ab412fb5c2a40fac738 Mon Sep 17 00:00:00 2001
+From 523f0d3e0865d8ee4e15a965f65f82978702123b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
 Date: Tue, 23 Nov 2021 17:58:05 +0100
 Subject: usb: typec: tcpm: Improve logs
@@ -11,7 +11,7 @@ Signed-off-by: Ondrej Jirman <megi@xff.cz>
  1 file changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
-index 7ee27a667654..081ab8d09963 100644
+index 52e611be9e09..319b39991e3a 100644
 --- a/drivers/usb/typec/tcpm/tcpm.c
 +++ b/drivers/usb/typec/tcpm/tcpm.c
 @@ -958,10 +958,13 @@ static int tcpm_pd_transmit(struct tcpm_port *port,
@@ -41,7 +41,7 @@ index 7ee27a667654..081ab8d09963 100644
  
  	event = kzalloc(sizeof(*event), GFP_ATOMIC);
  	if (!event)
-@@ -5962,7 +5969,7 @@ static void _tcpm_cc_change(struct tcpm_port *port, enum typec_cc_status cc1,
+@@ -5966,7 +5973,7 @@ static void _tcpm_cc_change(struct tcpm_port *port, enum typec_cc_status cc1,
  
  static void _tcpm_pd_vbus_on(struct tcpm_port *port)
  {
@@ -50,7 +50,7 @@ index 7ee27a667654..081ab8d09963 100644
  	port->vbus_present = true;
  	/*
  	 * When vbus_present is true i.e. Voltage at VBUS is greater than VSAFE5V implicitly
-@@ -6052,7 +6059,7 @@ static void _tcpm_pd_vbus_on(struct tcpm_port *port)
+@@ -6056,7 +6063,7 @@ static void _tcpm_pd_vbus_on(struct tcpm_port *port)
  
  static void _tcpm_pd_vbus_off(struct tcpm_port *port)
  {

From 81cd9951472c261e843023bfc31de51805f56acb Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Tue, 12 Nov 2024 19:41:37 +0300
Subject: [PATCH 103/107] sunxi-6.11: Fix the installation of overlay files in
 the subdir

Merge two patch files and delete the debugging code.
---
 patch/kernel/archive/sunxi-6.11/fix-dtb.patch | 41 -------------------
 ...ipts-add-overlay-compilation-support.patch | 40 +++++++++---------
 2 files changed, 19 insertions(+), 62 deletions(-)
 delete mode 100644 patch/kernel/archive/sunxi-6.11/fix-dtb.patch

diff --git a/patch/kernel/archive/sunxi-6.11/fix-dtb.patch b/patch/kernel/archive/sunxi-6.11/fix-dtb.patch
deleted file mode 100644
index 618a88bf1f1d..000000000000
--- a/patch/kernel/archive/sunxi-6.11/fix-dtb.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
-index 0b674435f63a..a18d02be8866 100644
---- a/scripts/Makefile.dtbinst
-+++ b/scripts/Makefile.dtbinst
-@@ -22,15 +22,10 @@ quiet_cmd_dtb_install = INSTALL $@
- $(dst)/%: $(obj)/%
- 	$(call cmd,dtb_install)
- 
--$(dst)/%.scr: $(obj)/%.scr
--	$(call cmd,dtb_install)
--
--$(dst)/README.%-overlays: $(obj)/README.%-overlays
--	$(call cmd,dtb_install)
--
- dtbs := $(patsubst $(obj)/%,%,$(call read-file, $(obj)/dtbs-list))
--script-files	:= $(addprefix $(dst)/, $(scr-y))
--readme-files	:= $(addprefix $(dst)/, $(dtbotxt-y))
-+subdirs := $(sort $(dir $(filter %.dtbo, $(dtbs))))
-+dtbs += $(patsubst $(obj)/%,%,$(if $(subdirs), $(shell cd $(srctree)/$(obj) && find $(subdirs) -name '*.scr')))
-+dtbs += $(patsubst $(obj)/%,%,$(if $(subdirs), $(shell cd $(srctree)/$(obj) && find $(subdirs) -name 'README.*-overlays')))
- 
- ifdef CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
- 
-@@ -41,11 +36,15 @@ endef
- 
- $(foreach d, $(sort $(dir $(dtbs))), $(eval $(call gen_install_rules,$(d))))
- 
--dtbs := $(notdir $(dtbs))
-+# Armbian uses subdirectories such as <allwinner/overlays>.
-+#dtbs := $(notdir $(dtbs))
- 
- endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
- 
--__dtbs_install: $(addprefix $(dst)/, $(dtbs)) $(script-files) $(readme-files)
-+__dtbs_install: $(addprefix $(dst)/, $(dtbs))
-+	@$(Q)$(kecho) "DT INST: $(dst)"
-+	@$(Q)$(kecho) "DT INST: $(dtbs)"
-+	@$(Q)$(kecho) "DT INST: $(subdirs)"
- 	@:
- 
- .PHONY: $(PHONY)
diff --git a/patch/kernel/archive/sunxi-6.11/patches.armbian/scripts-add-overlay-compilation-support.patch b/patch/kernel/archive/sunxi-6.11/patches.armbian/scripts-add-overlay-compilation-support.patch
index e23e48694344..720968860742 100644
--- a/patch/kernel/archive/sunxi-6.11/patches.armbian/scripts-add-overlay-compilation-support.patch
+++ b/patch/kernel/archive/sunxi-6.11/patches.armbian/scripts-add-overlay-compilation-support.patch
@@ -1,16 +1,16 @@
-From 957db0e834df1fbb8b32a0fa5620c5375c56f390 Mon Sep 17 00:00:00 2001
+From 0184e44b9caf2fa96cc058f0bb34fd5ca4ca4498 Mon Sep 17 00:00:00 2001
 From: The-going <48602507+The-going@users.noreply.github.com>
 Date: Tue, 1 Feb 2022 21:04:08 +0300
 Subject: scripts: add overlay compilation support
 
 ---
  .gitignore               |  1 +
- scripts/Makefile.dtbinst | 10 +++++++++-
+ scripts/Makefile.dtbinst |  9 ++++++++-
  scripts/Makefile.lib     | 12 +++++++++++-
- 3 files changed, 21 insertions(+), 2 deletions(-)
+ 3 files changed, 20 insertions(+), 2 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
-index 7902adf4f7f1..167871780657 100644
+index 58fdbb35e2f1..0d683e66d33b 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -42,6 +42,7 @@
@@ -22,34 +22,32 @@ index 7902adf4f7f1..167871780657 100644
  *.so.dbg
  *.su
 diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
-index 9d920419a62c..0b674435f63a 100644
+index 9d920419a62c..b66af344040d 100644
 --- a/scripts/Makefile.dtbinst
 +++ b/scripts/Makefile.dtbinst
-@@ -22,7 +22,15 @@ quiet_cmd_dtb_install = INSTALL $@
- $(dst)/%: $(obj)/%
+@@ -23,6 +23,11 @@ $(dst)/%: $(obj)/%
  	$(call cmd,dtb_install)
  
-+$(dst)/%.scr: $(obj)/%.scr
-+	$(call cmd,dtb_install)
-+
-+$(dst)/README.%-overlays: $(obj)/README.%-overlays
-+	$(call cmd,dtb_install)
-+
  dtbs := $(patsubst $(obj)/%,%,$(call read-file, $(obj)/dtbs-list))
-+script-files	:= $(addprefix $(dst)/, $(scr-y))
-+readme-files	:= $(addprefix $(dst)/, $(dtbotxt-y))
++vendor := $(sort $(dir $(filter %.dtb, $(dtbs))))
++subdir := $(sort $(dir $(filter %.dtbo, $(dtbs))))
++
++dtbs += $(patsubst $(obj)/%,%,$(if $(subdir), $(shell cd $(srctree)/$(obj) && find $(subdir) -name '*.scr')))
++dtbs += $(patsubst $(obj)/%,%,$(if $(subdir), $(shell cd $(srctree)/$(obj) && find $(subdir) -name 'README.*-overlays')))
  
  ifdef CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
  
-@@ -37,7 +45,7 @@ dtbs := $(notdir $(dtbs))
+@@ -33,7 +38,9 @@ endef
  
- endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
+ $(foreach d, $(sort $(dir $(dtbs))), $(eval $(call gen_install_rules,$(d))))
+ 
+-dtbs := $(notdir $(dtbs))
++# Armbian uses subdirectories <overlay> but not <allwinner/overlay>.
++# delete the vendor's directory
++dtbs := $(patsubst $(vendor)%,%,$(dtbs))
  
--__dtbs_install: $(addprefix $(dst)/, $(dtbs))
-+__dtbs_install: $(addprefix $(dst)/, $(dtbs)) $(script-files) $(readme-files)
- 	@:
+ endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
  
- .PHONY: $(PHONY)
 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
 index 207325eaf1d1..870cfa0ea443 100644
 --- a/scripts/Makefile.lib

From 781400e0e851ef5ffd3a38e13881f62af16599a9 Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Thu, 14 Nov 2024 11:28:49 +0300
Subject: [PATCH 104/107] sunxi-6.11: Switch to v6.11.7

---
 config/sources/families/include/sunxi64_common.inc | 2 +-
 config/sources/families/include/sunxi_common.inc   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc
index 63c2f556433b..e845ea323c99 100644
--- a/config/sources/families/include/sunxi64_common.inc
+++ b/config/sources/families/include/sunxi64_common.inc
@@ -36,7 +36,7 @@ case $BRANCH in
 
 	edge)
 		declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel.
-		declare -g KERNELBRANCH="tag:v6.11.6"
+		declare -g KERNELBRANCH="tag:v6.11.7"
 		;;
 esac
 
diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc
index 90dec4723c12..623750c2daf2 100644
--- a/config/sources/families/include/sunxi_common.inc
+++ b/config/sources/families/include/sunxi_common.inc
@@ -37,7 +37,7 @@ case $BRANCH in
 
 	edge)
 		declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel.
-		declare -g KERNELBRANCH="tag:v6.11.6"
+		declare -g KERNELBRANCH="tag:v6.11.7"
 		;;
 esac
 

From 0decdd5329e70e870ddab528baa6ee551326fcfe Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Thu, 14 Nov 2024 21:53:03 +0100
Subject: [PATCH 105/107] Rockchip armhf: remove parts of code from the patch
 which has been upstreamed

---
 .../general-rockchip-various-fixes.patch      | 73 -------------------
 .../general-rockchip-various-fixes.patch      | 73 -------------------
 2 files changed, 146 deletions(-)

diff --git a/patch/kernel/archive/rockchip-6.11/patches.armbian/general-rockchip-various-fixes.patch b/patch/kernel/archive/rockchip-6.11/patches.armbian/general-rockchip-various-fixes.patch
index 206f44442540..1a0d56418bcd 100644
--- a/patch/kernel/archive/rockchip-6.11/patches.armbian/general-rockchip-various-fixes.patch
+++ b/patch/kernel/archive/rockchip-6.11/patches.armbian/general-rockchip-various-fixes.patch
@@ -462,79 +462,6 @@ diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/ema
 index 67b8113a2..40332a976 100644
 --- a/drivers/net/ethernet/arc/emac_main.c
 +++ b/drivers/net/ethernet/arc/emac_main.c
-@@ -140,7 +140,7 @@ static void arc_emac_tx_clean(struct net_device *ndev)
- 			stats->tx_bytes += skb->len;
- 		}
- 
--		dma_unmap_single(&ndev->dev, dma_unmap_addr(tx_buff, addr),
-+		dma_unmap_single(ndev->dev.parent, dma_unmap_addr(tx_buff, addr),
- 				 dma_unmap_len(tx_buff, len), DMA_TO_DEVICE);
- 
- 		/* return the sk_buff to system */
-@@ -223,9 +223,9 @@ static int arc_emac_rx(struct net_device *ndev, int budget)
- 			continue;
- 		}
- 
--		addr = dma_map_single(&ndev->dev, (void *)skb->data,
-+		addr = dma_map_single(ndev->dev.parent, (void *)skb->data,
- 				      EMAC_BUFFER_SIZE, DMA_FROM_DEVICE);
--		if (dma_mapping_error(&ndev->dev, addr)) {
-+		if (dma_mapping_error(ndev->dev.parent, addr)) {
- 			if (net_ratelimit())
- 				netdev_err(ndev, "cannot map dma buffer\n");
- 			dev_kfree_skb(skb);
-@@ -237,7 +237,7 @@ static int arc_emac_rx(struct net_device *ndev, int budget)
- 		}
- 
- 		/* unmap previosly mapped skb */
--		dma_unmap_single(&ndev->dev, dma_unmap_addr(rx_buff, addr),
-+		dma_unmap_single(ndev->dev.parent, dma_unmap_addr(rx_buff, addr),
- 				 dma_unmap_len(rx_buff, len), DMA_FROM_DEVICE);
- 
- 		pktlen = info & LEN_MASK;
-@@ -445,9 +445,9 @@ static int arc_emac_open(struct net_device *ndev)
- 		if (unlikely(!rx_buff->skb))
- 			return -ENOMEM;
- 
--		addr = dma_map_single(&ndev->dev, (void *)rx_buff->skb->data,
-+		addr = dma_map_single(ndev->dev.parent, (void *)rx_buff->skb->data,
- 				      EMAC_BUFFER_SIZE, DMA_FROM_DEVICE);
--		if (dma_mapping_error(&ndev->dev, addr)) {
-+		if (dma_mapping_error(ndev->dev.parent, addr)) {
- 			netdev_err(ndev, "cannot dma map\n");
- 			dev_kfree_skb(rx_buff->skb);
- 			return -ENOMEM;
-@@ -555,7 +555,7 @@ static void arc_free_tx_queue(struct net_device *ndev)
- 		struct buffer_state *tx_buff = &priv->tx_buff[i];
- 
- 		if (tx_buff->skb) {
--			dma_unmap_single(&ndev->dev,
-+			dma_unmap_single(ndev->dev.parent,
- 					 dma_unmap_addr(tx_buff, addr),
- 					 dma_unmap_len(tx_buff, len),
- 					 DMA_TO_DEVICE);
-@@ -586,7 +586,7 @@ static void arc_free_rx_queue(struct net_device *ndev)
- 		struct buffer_state *rx_buff = &priv->rx_buff[i];
- 
- 		if (rx_buff->skb) {
--			dma_unmap_single(&ndev->dev,
-+			dma_unmap_single(ndev->dev.parent,
- 					 dma_unmap_addr(rx_buff, addr),
- 					 dma_unmap_len(rx_buff, len),
- 					 DMA_FROM_DEVICE);
-@@ -692,10 +692,10 @@ static netdev_tx_t arc_emac_tx(struct sk_buff *skb, struct net_device *ndev)
- 		return NETDEV_TX_BUSY;
- 	}
- 
--	addr = dma_map_single(&ndev->dev, (void *)skb->data, len,
-+	addr = dma_map_single(ndev->dev.parent, (void *)skb->data, len,
- 			      DMA_TO_DEVICE);
- 
--	if (unlikely(dma_mapping_error(&ndev->dev, addr))) {
-+	if (unlikely(dma_mapping_error(ndev->dev.parent, addr))) {
- 		stats->tx_dropped++;
- 		stats->tx_errors++;
- 		dev_kfree_skb_any(skb);
 @@ -850,6 +850,62 @@ static const struct net_device_ops arc_emac_netdev_ops = {
  #endif
  };
diff --git a/patch/kernel/archive/rockchip-6.6/patches.armbian/general-rockchip-various-fixes.patch b/patch/kernel/archive/rockchip-6.6/patches.armbian/general-rockchip-various-fixes.patch
index 58552ddf57a3..7b442be36046 100644
--- a/patch/kernel/archive/rockchip-6.6/patches.armbian/general-rockchip-various-fixes.patch
+++ b/patch/kernel/archive/rockchip-6.6/patches.armbian/general-rockchip-various-fixes.patch
@@ -462,79 +462,6 @@ diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/ema
 index 67b8113a2..40332a976 100644
 --- a/drivers/net/ethernet/arc/emac_main.c
 +++ b/drivers/net/ethernet/arc/emac_main.c
-@@ -140,7 +140,7 @@ static void arc_emac_tx_clean(struct net_device *ndev)
- 			stats->tx_bytes += skb->len;
- 		}
- 
--		dma_unmap_single(&ndev->dev, dma_unmap_addr(tx_buff, addr),
-+		dma_unmap_single(ndev->dev.parent, dma_unmap_addr(tx_buff, addr),
- 				 dma_unmap_len(tx_buff, len), DMA_TO_DEVICE);
- 
- 		/* return the sk_buff to system */
-@@ -223,9 +223,9 @@ static int arc_emac_rx(struct net_device *ndev, int budget)
- 			continue;
- 		}
- 
--		addr = dma_map_single(&ndev->dev, (void *)skb->data,
-+		addr = dma_map_single(ndev->dev.parent, (void *)skb->data,
- 				      EMAC_BUFFER_SIZE, DMA_FROM_DEVICE);
--		if (dma_mapping_error(&ndev->dev, addr)) {
-+		if (dma_mapping_error(ndev->dev.parent, addr)) {
- 			if (net_ratelimit())
- 				netdev_err(ndev, "cannot map dma buffer\n");
- 			dev_kfree_skb(skb);
-@@ -237,7 +237,7 @@ static int arc_emac_rx(struct net_device *ndev, int budget)
- 		}
- 
- 		/* unmap previosly mapped skb */
--		dma_unmap_single(&ndev->dev, dma_unmap_addr(rx_buff, addr),
-+		dma_unmap_single(ndev->dev.parent, dma_unmap_addr(rx_buff, addr),
- 				 dma_unmap_len(rx_buff, len), DMA_FROM_DEVICE);
- 
- 		pktlen = info & LEN_MASK;
-@@ -445,9 +445,9 @@ static int arc_emac_open(struct net_device *ndev)
- 		if (unlikely(!rx_buff->skb))
- 			return -ENOMEM;
- 
--		addr = dma_map_single(&ndev->dev, (void *)rx_buff->skb->data,
-+		addr = dma_map_single(ndev->dev.parent, (void *)rx_buff->skb->data,
- 				      EMAC_BUFFER_SIZE, DMA_FROM_DEVICE);
--		if (dma_mapping_error(&ndev->dev, addr)) {
-+		if (dma_mapping_error(ndev->dev.parent, addr)) {
- 			netdev_err(ndev, "cannot dma map\n");
- 			dev_kfree_skb(rx_buff->skb);
- 			return -ENOMEM;
-@@ -555,7 +555,7 @@ static void arc_free_tx_queue(struct net_device *ndev)
- 		struct buffer_state *tx_buff = &priv->tx_buff[i];
- 
- 		if (tx_buff->skb) {
--			dma_unmap_single(&ndev->dev,
-+			dma_unmap_single(ndev->dev.parent,
- 					 dma_unmap_addr(tx_buff, addr),
- 					 dma_unmap_len(tx_buff, len),
- 					 DMA_TO_DEVICE);
-@@ -586,7 +586,7 @@ static void arc_free_rx_queue(struct net_device *ndev)
- 		struct buffer_state *rx_buff = &priv->rx_buff[i];
- 
- 		if (rx_buff->skb) {
--			dma_unmap_single(&ndev->dev,
-+			dma_unmap_single(ndev->dev.parent,
- 					 dma_unmap_addr(rx_buff, addr),
- 					 dma_unmap_len(rx_buff, len),
- 					 DMA_FROM_DEVICE);
-@@ -692,10 +692,10 @@ static netdev_tx_t arc_emac_tx(struct sk_buff *skb, struct net_device *ndev)
- 		return NETDEV_TX_BUSY;
- 	}
- 
--	addr = dma_map_single(&ndev->dev, (void *)skb->data, len,
-+	addr = dma_map_single(ndev->dev.parent, (void *)skb->data, len,
- 			      DMA_TO_DEVICE);
- 
--	if (unlikely(dma_mapping_error(&ndev->dev, addr))) {
-+	if (unlikely(dma_mapping_error(ndev->dev.parent, addr))) {
- 		stats->tx_dropped++;
- 		stats->tx_errors++;
- 		dev_kfree_skb_any(skb);
 @@ -850,6 +850,62 @@ static const struct net_device_ops arc_emac_netdev_ops = {
  #endif
  };

From db651d68b800a10126d08114fb503c958295040c Mon Sep 17 00:00:00 2001
From: Paolo <paolo.sabatino@gmail.com>
Date: Fri, 15 Nov 2024 07:19:47 +0100
Subject: [PATCH 106/107] rockchip: remove patch breaking HDMI 7" displays on
 Tinkerboard (#7479)

* rockchip: remove mainlined patch

* rockchip: remove fracmux limit patch
---
 patch/kernel/archive/rockchip-6.11/series.conf | 2 +-
 patch/kernel/archive/rockchip-6.6/series.conf  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/patch/kernel/archive/rockchip-6.11/series.conf b/patch/kernel/archive/rockchip-6.11/series.conf
index 530f1fbbb0cf..f75d733bbebe 100644
--- a/patch/kernel/archive/rockchip-6.11/series.conf
+++ b/patch/kernel/archive/rockchip-6.11/series.conf
@@ -10,7 +10,7 @@
 # Series from patches.armbian/
 	patches.armbian/bt-broadcom-serdev-workaround.patch
 	patches.armbian/clk-rk322x-composite-mmc-clk.patch
-	patches.armbian/clk-rockchip-max-frac-divider.patch
+	-patches.armbian/clk-rockchip-max-frac-divider.patch
 	patches.armbian/driver-rk322x-audio-codec.patch
 	patches.armbian/driver-rk3288-gpiomem.patch
 	patches.armbian/driver-tinkerboard-alc4040-codec.patch
diff --git a/patch/kernel/archive/rockchip-6.6/series.conf b/patch/kernel/archive/rockchip-6.6/series.conf
index 13e491c12efd..b318baf310e5 100644
--- a/patch/kernel/archive/rockchip-6.6/series.conf
+++ b/patch/kernel/archive/rockchip-6.6/series.conf
@@ -11,7 +11,7 @@
 # Series from patches.armbian/
 	patches.armbian/bt-broadcom-serdev-workaround.patch
 	patches.armbian/clk-rk322x-composite-mmc-clk.patch
-	patches.armbian/clk-rockchip-max-frac-divider.patch
+	-patches.armbian/clk-rockchip-max-frac-divider.patch
 	patches.armbian/driver-rk322x-audio-codec.patch
 	patches.armbian/driver-rk3288-gpiomem.patch
 	patches.armbian/driver-tinkerboard-alc4040-codec.patch

From a70b864611a0472621ddb544a47e97609cd6080e Mon Sep 17 00:00:00 2001
From: Igor <igor@armbian.com>
Date: Fri, 15 Nov 2024 08:09:33 +0100
Subject: [PATCH 107/107] fxblox-rk1: update vendor version (#7480)

Co-authored-by: mahdichi <mahdichi@gmail.com>
---
 config/boards/fxblox-rk1.csc | 47 ++----------------------------------
 1 file changed, 2 insertions(+), 45 deletions(-)

diff --git a/config/boards/fxblox-rk1.csc b/config/boards/fxblox-rk1.csc
index 25ae7ac75d8d..8bcf6532abec 100644
--- a/config/boards/fxblox-rk1.csc
+++ b/config/boards/fxblox-rk1.csc
@@ -5,6 +5,7 @@ BOARD_MAINTAINER="mahdichi"
 BOOTCONFIG="fxblox-rk1-rk3588_defconfig"
 BOOT_SOC="rk3588"
 KERNEL_TARGET="vendor"
+KERNEL_TEST_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-fxblox-rk1.dtb"
@@ -12,48 +13,4 @@ BOOT_SCENARIO="spl-blobs"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
-
-# @TODO: consider removing those, as the defaults in rockchip64_common have been bumped up
-DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin'
-BL31_BLOB='rk35/rk3588_bl31_v1.38.elf'
-
-function post_family_tweaks__fxblox-rk1_naming_audios() {
-	display_alert "$BOARD" "Renaming fxblox rk1 audios" "info"
-
-	mkdir -p $SDCARD/etc/udev/rules.d/
-	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
-	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp1-sound", ENV{SOUND_DESCRIPTION}="DP1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
-	return 0
-}
-
-function post_family_config_branch_legacy__fxblox-rk1_uboot_add_sata_target() {
-	display_alert "$BOARD" "Configuring ($BOARD) standard and sata uboot target map" "info"
-
-	UBOOT_TARGET_MAP="
-	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb rkspi_loader.img
-	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG spl/u-boot-spl.bin u-boot.dtb u-boot.itb;; rkspi_loader_sata.img
-	"
-}
-
-function post_uboot_custom_postprocess__create_sata_spi_image() {
-	display_alert "$BOARD" "Create rkspi_loader_sata.img" "info"
-
-	dd if=/dev/zero of=rkspi_loader_sata.img bs=1M count=0 seek=16
-	/sbin/parted -s rkspi_loader_sata.img mklabel gpt
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart idbloader 64 7167
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart vnvm 7168 7679
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart reserved_space 7680 8063
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart reserved1 8064 8127
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart uboot_env 8128 8191
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart reserved2 8192 16383
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart uboot 16384 32734
-	dd if=idbloader.img of=rkspi_loader_sata.img seek=64 conv=notrunc
-	dd if=u-boot.itb of=rkspi_loader_sata.img seek=16384 conv=notrunc
-}
-
-# Override family config for this board; let's avoid conditionals in family config.
-function post_family_config__fxblox-rk1_use_vendor_uboot() {
-	BOOTSOURCE='https://github.com/functionland/u-boot.git'
-	BOOTBRANCH='branch:next-dev'
-	BOOTPATCHDIR="legacy"
-}
+declare -g UEFI_EDK2_BOARD_ID="fxblox-rk1" # This _only_ used for uefi-edk2-rk3588 extension