Remove handling of Docker key.json

The deprecated-key-path option is no longer handled, but it doesn't cause problems because the key is explicitly ignored. It was completely removed in Docker 19.03.0 [1]. As such, the option and the pre-start script to fix the corrupted key.json can be removed now, as it has no effect, only printing confusing message when Docker service fails to start. [1] 98fc09128b
Linux: Update kernel to 6.12.54 (#4358 )
2025-10-27 04:28:32 +00:00 · 2025-10-24 15:01:04 +02:00 · 2025-10-23 15:19:32 +02:00 · 2025-10-15 22:23:13 +02:00 · 2025-10-14 18:08:05 +02:00 · 2025-10-13 19:45:14 +02:00
50 changed files with 159 additions and 250 deletions
--- a/.github/workflows/artifacts-index.yaml
+++ b/.github/workflows/artifacts-index.yaml
@@ -39,12 +39,12 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
      - name: Checkout source
-        uses: actions/checkout@v5
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false

      - name: Setup Python version ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}

--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -55,7 +55,7 @@ jobs:
      self_signed_cert: ${{ steps.generate_signing_key.outputs.self_signed_cert }}
    steps:
      - name: Checkout source
-        uses: actions/checkout@v5
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false

@@ -147,7 +147,7 @@ jobs:
          fi

      - name: Create build matrix
-        uses: actions/github-script@v7
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
        id: generate_matrix
        with:
          script: |
@@ -177,15 +177,15 @@ jobs:
            }

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.11.1
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
      - name: Log in to the GitHub container registry
-        uses: docker/login-action@v3.5.0
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
        with:
            registry: ghcr.io
            username: ${{ github.repository_owner }}
            password: ${{ secrets.GITHUB_TOKEN }}
      - name: Build and Push
-        uses: docker/build-push-action@v6.18.0
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
        id: build_haos_builder
        with:
          context: .
@@ -207,7 +207,7 @@ jobs:
          echo "self_signed_cert=true" >> $GITHUB_OUTPUT

      - name: Create signing key
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        if: steps.generate_signing_key.outcome == 'success'
        with:
          name: signing-key
@@ -227,14 +227,14 @@ jobs:

    steps:
      - name: Checkout source
-        uses: actions/checkout@v5
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          submodules: true
          persist-credentials: false

      - name: Setup Python version ${{ env.PYTHON_VERSION }}
        if: ${{ github.event_name != 'release' }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}

@@ -260,7 +260,7 @@ jobs:

      - name: Get self-signed certificate from the prepare job
        if: ${{ needs.prepare.outputs.self_signed_cert == 'true' }}
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
        with:
          name: signing-key

@@ -281,7 +281,7 @@ jobs:
          df -h

      - name: "Restore cache: object files"
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: /mnt/cache/cc
          key: haos-cc-${{ matrix.board.id }}
@@ -329,7 +329,7 @@ jobs:

      - name: Upload release assets
        if: ${{ github.event_name == 'release' }}
-        uses: shogo82148/actions-upload-release-asset@v1
+        uses: shogo82148/actions-upload-release-asset@59cbc563d11314e48122193f8fe5cdda62ea6cf9 # v1.9.1
        with:
          upload_url: ${{ github.event.release.upload_url }}
          asset_path: output/images/haos_*
@@ -344,7 +344,7 @@ jobs:

      - name: "Save cache: object files"
        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: /mnt/cache/cc
          key: haos-cc-${{ matrix.board.id }}-${{ github.run_id }}
@@ -378,7 +378,7 @@ jobs:
          done

      - name: Upload OS image artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id != 'ova' }}
        with:
          name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.img.xz
@@ -386,7 +386,7 @@ jobs:
            output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.img.xz

      - name: Upload RAUC bundle artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' }}
        with:
          name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.raucb
@@ -394,7 +394,7 @@ jobs:
            output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.raucb

      - name: Upload Open Virtualization Format (OVA) artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'ova' }}
        with:
          name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.ova
@@ -402,7 +402,7 @@ jobs:
            output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.ova

      - name: Upload QEMU disk image artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        # Create artifact for ova every time - it's used by the called tests workflow
        if: ${{ matrix.board.id == 'ova' || (github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'generic-aarch64') }}
        with:
@@ -411,7 +411,7 @@ jobs:
            output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.qcow2.xz

      - name: Upload VMware Virtual Machine Disk (VMDK) artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && (matrix.board.id == 'generic-aarch64' || matrix.board.id == 'ova') }}
        with:
          name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vmdk.zip
@@ -419,7 +419,7 @@ jobs:
            output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vmdk.zip

      - name: Upload VirtualBox Virtual Disk Image (VDI) artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'ova' }}
        with:
          name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vdi.zip
@@ -427,7 +427,7 @@ jobs:
            output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vdi.zip

      - name: Upload Virtual Hard Disk v2 (VHDX) artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'ova' }}
        with:
          name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vhdx.zip
@@ -466,7 +466,7 @@ jobs:

    steps:
    - name: Checkout source
-      uses: actions/checkout@v5
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      with:
        persist-credentials: false

--- a/.github/workflows/label-actions.yml
+++ b/.github/workflows/label-actions.yml
@@ -14,4 +14,4 @@ jobs:
  action:
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/label-actions@v4.0.1
+      - uses: dessant/label-actions@102faf474a544be75fbaf4df54e73d3c515a0e65 # v4.0.1
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -14,7 +14,7 @@ jobs:
    if: github.repository_owner == 'home-assistant'
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/lock-threads@v5.0.1
+      - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5.0.1
        with:
          github-token: ${{ github.token }}
          issue-inactive-days: "30"
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -15,17 +15,17 @@ jobs:
          python3-flake8

    - name: Check out code
-      uses: actions/checkout@v5
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      with:
        submodules: true

    - name: Check Dockerfile
-      uses: brpaz/hadolint-action@v1.5.0
+      uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
      with:
        dockerfile: Dockerfile

    - name: Check shell scripts
-      uses: ludeeus/action-shellcheck@2.0.0
+      uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 # 2.0.0
      with:
        ignore_paths: buildroot

--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -13,6 +13,6 @@ jobs:
      pull-requests: read  # for release-drafter/release-drafter to read PR content and labels
    runs-on: ubuntu-latest
    steps:
-      - uses: release-drafter/release-drafter@v6
+      - uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -19,7 +19,7 @@ jobs:
      # - No PRs marked as no-stale or pinned
      # - No issues marked as no-stale, help-wanted or pinned
      - name: 90 days stale issues & PRs policy
-        uses: actions/stale@v9.1.0
+        uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          days-before-stale: 90
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -32,7 +32,7 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
      - name: Checkout source
-        uses: actions/checkout@v5
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false

@@ -42,7 +42,7 @@ jobs:
          sudo apt install -y qemu-system-x86 ovmf

      - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          python-version: 3.12

@@ -57,7 +57,7 @@ jobs:

      - name: Get OS image artifact
        if: ${{ inputs.use-artifact }}
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
        with:
          name: haos_ova-${{ inputs.version }}.qcow2.xz

@@ -77,7 +77,7 @@ jobs:
          ./tests/run_tests.sh --durations=0 --durations-min=5.0

      - name: Archive logs
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        if: always()
        with:
          name: logs
@@ -85,7 +85,7 @@ jobs:
            tests/lg_logs/**

      - name: Archive JUnit reports
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        if: always()
        with:
          name: junit_reports
@@ -93,7 +93,7 @@ jobs:
            tests/junit_reports/*.xml

      - name: Publish test report
-        uses: mikepenz/action-junit-report@v5
+        uses: mikepenz/action-junit-report@5b7ee5a21e8674b695313d769f3cbdfd5d4d53a4 # v6.0.0
        if: always()
        with:
          report_paths: 'tests/junit_reports/*.xml'
--- a/Documentation/kernel.md
+++ b/Documentation/kernel.md
@@ -3,22 +3,22 @@

 | Board | Version |
 |-------|---------|
-| Open Virtual Appliance | 6.12.43 |
-| Raspberry Pi | 6.12.34 |
-| Raspberry Pi 0-W | 6.12.34 |
-| Raspberry Pi 2 | 6.12.34 |
-| Raspberry Pi 3 | 6.12.34 |
-| Raspberry Pi 4 | 6.12.34 |
-| Raspberry Pi 5 | 6.12.34 |
-| Home Assistant Yellow | 6.12.34 |
-| Home Assistant Green | 6.12.43 |
-| Tinker Board | 6.12.43 |
-| ODROID-C2 | 6.12.43 |
-| ODROID-C4 | 6.12.43 |
-| ODROID-M1 | 6.12.43 |
-| ODROID-M1S | 6.12.43 |
-| ODROID-N2 | 6.12.43 |
-| ODROID-XU4 | 6.12.43 |
-| Generic aarch64 | 6.12.43 |
-| Generic x86-64 | 6.12.43 |
-| Khadas VIM3 | 6.12.43 |
+| Open Virtual Appliance | 6.12.54 |
+| Raspberry Pi | 6.12.47 |
+| Raspberry Pi 0-W | 6.12.47 |
+| Raspberry Pi 2 | 6.12.47 |
+| Raspberry Pi 3 | 6.12.47 |
+| Raspberry Pi 4 | 6.12.47 |
+| Raspberry Pi 5 | 6.12.47 |
+| Home Assistant Yellow | 6.12.47 |
+| Home Assistant Green | 6.12.54 |
+| Tinker Board | 6.12.54 |
+| ODROID-C2 | 6.12.54 |
+| ODROID-C4 | 6.12.54 |
+| ODROID-M1 | 6.12.54 |
+| ODROID-M1S | 6.12.54 |
+| ODROID-N2 | 6.12.54 |
+| ODROID-XU4 | 6.12.54 |
+| Generic aarch64 | 6.12.54 |
+| Generic x86-64 | 6.12.54 |
+| Khadas VIM3 | 6.12.54 |
--- a/12
+++ b/12
@@ -16,6 +16,12 @@ endif

 ################################################################################

+SILENT := $(findstring s,$(word 1, $(MAKEFLAGS)))
+
+define print
+	$(if $(SILENT),,$(info $1))
+endef
+
 COLOR_STEP := $(shell tput smso 2>/dev/null)
 COLOR_WARN := $(shell (tput setab 3; tput setaf 0) 2>/dev/null)
 TERM_RESET := $(shell tput sgr0 2>/dev/null)
@@ -28,7 +34,7 @@ TERM_RESET := $(shell tput sgr0 2>/dev/null)

 # fallback target when target undefined here is given
 .DEFAULT:
-	@echo "$(COLOR_STEP)=== Falling back to Buildroot target '$@' ===$(TERM_RESET)"
+	$(call print,$(COLOR_STEP)=== Falling back to Buildroot target '$@' ===$(TERM_RESET))
 	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) "$@"

 # default target when no target is given - must be first in Makefile
@@ -42,11 +48,11 @@ $(TARGETS_CONFIG): %-config:
 		echo ""; \
 		bash -c 'read -t 10 -p "Waiting 10s, press enter to continue or Ctrl-C to abort..."' || true; \
 	fi
-	@echo "$(COLOR_STEP)=== Using $*_defconfig ===$(TERM_RESET)"
+	$(call print,$(COLOR_STEP)=== Using $*_defconfig ===$(TERM_RESET))
 	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) "$*_defconfig"

 $(TARGETS): %: %-config
-	@echo "$(COLOR_STEP)=== Building $@ ===$(TERM_RESET)"
+	$(call print,$(COLOR_STEP)=== Building $@ ===$(TERM_RESET))
 	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL)

 buildroot-help:
--- a/README.md
+++ b/README.md
@@ -16,14 +16,10 @@ Home Assistant Operating System uses Docker as its container engine. By default

 ## Supported hardware

- Nabu Casa
- Raspberry Pi
- Hardkernel ODROID
- Asus Tinker Board
- Generic x86-64 (e.g. Intel NUC)
- Virtual appliances
+The list of supported hardware is defined by [ADR-0015](https://github.com/home-assistant/architecture/blob/master/adr/0015-home-assistant-os.md).
+Every new hardware addition must meet at least requirements defined in [ADR-0017](https://github.com/home-assistant/architecture/blob/master/adr/0017-hardware-screening-os.md) and pass through an architecture design proposal.

-See the full list and specific models [here](./Documentation/boards/README.md)
+For documentation explaining details of the individual supported boards, see [Board support](https://developers.home-assistant.io/docs/operating-system/boards/overview) section of the Home Assistant Developer Docs.

 ## Getting Started

--- a/2
+++ b/2
--- a/buildroot-external/board/asus/tinker/patches/linux/0009-Revert-can-ti_hecc-fix-Woverflow-compiler-warning.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0009-Revert-can-ti_hecc-fix-Woverflow-compiler-warning.patch
@@ -1,32 +0,0 @@
-From 1ce3a9bcf0b0b69e62411879113d83452c1b859e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
-Date: Thu, 28 Aug 2025 10:34:56 +0200
-Subject: [PATCH] Revert "can: ti_hecc: fix -Woverflow compiler warning"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit 1da38b70d90f8529c060dd380d0c18e6d9595463.
-
-There is no BIT_U32 in 6.12.y, the patch was incorrectly applied to 6.12
-series.
-
-Link: https://lore.kernel.org/stable/63e25fdb-095a-40eb-b341-75781e71ea95@roeck-us.net/
-Signed-off-by: Jan Čermák <sairon@sairon.cz>
---
- drivers/net/can/ti_hecc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
-index e6d6661a908ab..644e8b8eb91e7 100644
--- a/drivers/net/can/ti_hecc.c
-+++ b/drivers/net/can/ti_hecc.c
-@@ -383,7 +383,7 @@ static void ti_hecc_start(struct net_device *ndev)
- 	 * overflows instead of the hardware silently dropping the
- 	 * messages.
- 	 */
-	mbx_mask = ~BIT_U32(HECC_RX_LAST_MBOX);
-+	mbx_mask = ~BIT(HECC_RX_LAST_MBOX);
- 	hecc_write(priv, HECC_CANOPC, mbx_mask);
- 
- 	/* Enable interrupts */
--- a/buildroot-external/board/pc/generic-x86-64/kernel.config
+++ b/buildroot-external/board/pc/generic-x86-64/kernel.config
@@ -10,6 +10,7 @@ CONFIG_INTEL_IDLE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y

 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_SCSI_HPSA=y
@@ -45,6 +46,7 @@ CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PCI=y
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
+CONFIG_X86_X2APIC=y
 CONFIG_X86_INTEL_LPSS=y

 CONFIG_MISC_RTSX_PCI=m
--- a/buildroot-external/board/pc/ova/kernel.config
+++ b/buildroot-external/board/pc/ova/kernel.config
@@ -97,6 +97,7 @@ CONFIG_MMC_BLOCK=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PCI=y
+CONFIG_X86_X2APIC=y
 CONFIG_X86_INTEL_LPSS=y

 CONFIG_DRM=y
@@ -116,6 +117,7 @@ CONFIG_PCI_HYPERV=m
 CONFIG_PCI_HYPERV_INTERFACE=m
 CONFIG_FB_HYPERV=y

+CONFIG_CHELSIO_T4VF=m
 CONFIG_IGBVF=m
 CONFIG_IXGBEVF=m
 CONFIG_I40EVF=m
--- a/buildroot-external/board/raspberrypi/patches/linux/0004-usb-dwc2-masquerade-split-interrupt-transfers.patch
+++ b/buildroot-external/board/raspberrypi/patches/linux/0004-usb-dwc2-masquerade-split-interrupt-transfers.patch
@@ -1,64 +0,0 @@
-From c5191902ddf76f99a21b2c36c19a82bb04966e1f Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Tue, 24 Jun 2025 13:41:32 +0100
-Subject: [PATCH] usb: dwc2: masquerade split-interrupt transfers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Masquerading Interrupt split transfers as Control puts the transfer into
-the non-periodic handler in the hub. This stops the hub dropping
-complete-split data in the microframe after a CSPLIT should have
-arrived, improving resilience to host IRQ latency. Devices are none
-the wiser - the handshake tokens are the same.
-
-Originally devised by Hans Petter Selasky @ FreeBSD.
-
-(v2: dwc2 needs an un-masquerade prior to channel interrupt handling)
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-(cherry picked from commit 5329a41ef5655b559fb5274123ce13a0287db878)
-Upstream: https://github.com/raspberrypi/linux/pull/6936
-Signed-off-by: Jan Čermák <sairon@sairon.cz>
---
- drivers/usb/dwc2/hcd.c      | 12 ++++++++++++
- drivers/usb/dwc2/hcd_intr.c |  3 +++
- 2 files changed, 15 insertions(+)
-
-diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
-index 04cebb7b3cedd..23b1dde7a07dd 100644
--- a/drivers/usb/dwc2/hcd.c
-+++ b/drivers/usb/dwc2/hcd.c
-@@ -676,6 +676,18 @@ static void dwc2_hc_init(struct dwc2_hsotg *hsotg, struct dwc2_host_chan *chan)
- 		hcchar |= HCCHAR_EPDIR;
- 	if (chan->speed == USB_SPEED_LOW)
- 		hcchar |= HCCHAR_LSPDDEV;
-+
-+	/*
-+	 * Masquerading Interrupt split transfers as Control puts the transfer
-+	 * into the non-periodic handler in the hub. This stops the hub
-+	 * dropping complete-split data in the microframe after a CSPLIT
-+	 * should have arrived, improving resilience to host IRQ latency.
-+	 * Devices are none the wiser - the handshake tokens are the same.
-+	 * The fakery is undone in dwc2_hc_n_intr().
-+	 */
-+	if (chan->do_split && chan->ep_type == USB_ENDPOINT_XFER_INT)
-+		chan->ep_type = USB_ENDPOINT_XFER_CONTROL;
-+
- 	hcchar |= chan->ep_type << HCCHAR_EPTYPE_SHIFT & HCCHAR_EPTYPE_MASK;
- 	hcchar |= chan->max_packet << HCCHAR_MPS_SHIFT & HCCHAR_MPS_MASK;
- 	dwc2_writel(hsotg, hcchar, HCCHAR(hc_num));
-diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
-index 5c7538d498dd1..60622ef76b6be 100644
--- a/drivers/usb/dwc2/hcd_intr.c
-+++ b/drivers/usb/dwc2/hcd_intr.c
-@@ -2048,6 +2048,9 @@ static void dwc2_hc_n_intr(struct dwc2_hsotg *hsotg, int chnum)
- 
- 	chan->hcint = hcintraw;
- 
-+	/* Un-masquerade the transfer type */
-+	if (chan->do_split)
-+		chan->ep_type = chan->qh->ep_type;
- 	/*
- 	 * If the channel was halted due to a dequeue, the qtd list might
- 	 * be empty or at least the first entry will not be the active qtd.
--- a/buildroot-external/board/raspberrypi/patches/linux/0005-Fixup-usb-dwc2-limit-maximum-packet-size-for-split-I.patch
+++ b/buildroot-external/board/raspberrypi/patches/linux/0005-Fixup-usb-dwc2-limit-maximum-packet-size-for-split-I.patch
@@ -1,33 +0,0 @@
-From 31aede5422f40ed2f42b7238016c140f7dc1a3fe Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Fri, 4 Jul 2025 14:15:19 +0100
-Subject: [PATCH] Fixup! usb: dwc2: limit "maximum packet size" for split-IN
- transfers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Control Setup phase transfers needs an 8 byte maxpacket override, or
-drivers doing a GET with a small buffer as a split transaction would
-cause broken transfers.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-(cherry picked from commit 3829e1b98f3d2750b8b38abfdb4a142a0d8e4590)
-Upstream: https://github.com/raspberrypi/linux/pull/6936
-Signed-off-by: Jan Čermák <sairon@sairon.cz>
---
- drivers/usb/dwc2/hcd.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
-index 23b1dde7a07dd..12242649f5650 100644
--- a/drivers/usb/dwc2/hcd.c
-+++ b/drivers/usb/dwc2/hcd.c
-@@ -2350,6 +2350,7 @@ static void dwc2_hc_init_xfer(struct dwc2_hsotg *hsotg,
- 			else
- 				chan->xfer_buf = urb->setup_packet;
- 			chan->xfer_len = 8;
-+			chan->max_packet = 8;
- 			break;
- 
- 		case DWC2_CONTROL_DATA:
--- a/buildroot-external/configs/generic_aarch64_defconfig
+++ b/buildroot-external/configs/generic_aarch64_defconfig
@@ -18,7 +18,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64 $(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.43"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.54"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
--- a/buildroot-external/configs/generic_x86_64_defconfig
+++ b/buildroot-external/configs/generic_x86_64_defconfig
@@ -18,7 +18,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.43"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.54"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
--- a/buildroot-external/configs/green_defconfig
+++ b/buildroot-external/configs/green_defconfig
@@ -18,7 +18,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/nabucasa/green $(BR2_EXTERNAL_HASSOS_PATH)/board/nabucasa/green/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.43"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.54"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/kernel-arm64-rockchip.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/nabucasa/green/kernel.config"
--- a/buildroot-external/configs/khadas_vim3_defconfig
+++ b/buildroot-external/configs/khadas_vim3_defconfig
@@ -18,7 +18,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/vim3 $(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/vim3/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.43"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.54"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/kernel-vim.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config"
--- a/buildroot-external/configs/odroid_c2_defconfig
+++ b/buildroot-external/configs/odroid_c2_defconfig
@@ -18,7 +18,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.43"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.54"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config"
--- a/buildroot-external/configs/odroid_c4_defconfig
+++ b/buildroot-external/configs/odroid_c4_defconfig
@@ -18,7 +18,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.43"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.54"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config"
--- a/buildroot-external/configs/odroid_m1_defconfig
+++ b/buildroot-external/configs/odroid_m1_defconfig
@@ -18,7 +18,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-m1 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-m1/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.43"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.54"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/kernel-arm64-rockchip.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-m1/kernel.config"
--- a/buildroot-external/configs/odroid_m1s_defconfig
+++ b/buildroot-external/configs/odroid_m1s_defconfig
@@ -18,7 +18,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-m1s $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-m1s/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.43"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.54"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/kernel-arm64-rockchip.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-m1s/kernel.config"
--- a/buildroot-external/configs/odroid_n2_defconfig
+++ b/buildroot-external/configs/odroid_n2_defconfig
@@ -18,7 +18,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.43"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.54"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/kernel.config"
--- a/buildroot-external/configs/odroid_xu4_defconfig
+++ b/buildroot-external/configs/odroid_xu4_defconfig
@@ -19,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.43"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.54"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
--- a/buildroot-external/configs/ova_defconfig
+++ b/buildroot-external/configs/ova_defconfig
@@ -18,7 +18,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.43"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.54"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
--- a/buildroot-external/configs/rpi2_defconfig
+++ b/buildroot-external/configs/rpi2_defconfig
@@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250702.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250916.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-armv7.config"
 BR2_LINUX_KERNEL_LZ4=y
--- a/buildroot-external/configs/rpi3_64_defconfig
+++ b/buildroot-external/configs/rpi3_64_defconfig
@@ -19,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250702.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250916.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
--- a/buildroot-external/configs/rpi3_defconfig
+++ b/buildroot-external/configs/rpi3_defconfig
@@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250702.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250916.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-armv7.config"
 BR2_LINUX_KERNEL_LZ4=y
--- a/buildroot-external/configs/rpi4_64_defconfig
+++ b/buildroot-external/configs/rpi4_64_defconfig
@@ -19,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250702.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250916.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
--- a/buildroot-external/configs/rpi4_defconfig
+++ b/buildroot-external/configs/rpi4_defconfig
@@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250702.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250916.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel-armv7.config"
 BR2_LINUX_KERNEL_LZ4=y
--- a/buildroot-external/configs/rpi5_64_defconfig
+++ b/buildroot-external/configs/rpi5_64_defconfig
@@ -19,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi5-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi5-64/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250702.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250916.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2712"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
--- a/buildroot-external/configs/tinker_defconfig
+++ b/buildroot-external/configs/tinker_defconfig
@@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.43"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.54"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/kernel.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config"
--- a/buildroot-external/configs/yellow_defconfig
+++ b/buildroot-external/configs/yellow_defconfig
@@ -19,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/yellow $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250702.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/stable_20250916.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-pci.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.12.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
--- a/buildroot-external/kernel/v6.12.y/device-support-pci.config
+++ b/buildroot-external/kernel/v6.12.y/device-support-pci.config
@@ -39,6 +39,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y

 # PCI sound drivers
 CONFIG_SND_PCI=y
+CONFIG_SND_CTXFI=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDA_CODEC_REALTEK=m
--- a/buildroot-external/kernel/v6.12.y/hassos.config
+++ b/buildroot-external/kernel/v6.12.y/hassos.config
@@ -12,6 +12,8 @@ CONFIG_PREEMPT=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_DEBUG_PREEMPT is not set

+CONFIG_PSI=y
+
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y

@@ -203,6 +205,7 @@ CONFIG_WIREGUARD=m
 CONFIG_HID=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=y
+CONFIG_HID_MULTITOUCH=m

 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
--- a/buildroot-external/meta
+++ b/buildroot-external/meta
@@ -1,8 +1,8 @@
-VERSION_MAJOR="16"
-VERSION_MINOR="2"
-VERSION_SUFFIX="rc1"
+VERSION_MAJOR="17"
+VERSION_MINOR="0"
+VERSION_SUFFIX="dev0"

 HASSOS_NAME="Home Assistant OS"
 HASSOS_ID="haos"

-DEPLOYMENT="staging"
+DEPLOYMENT="development"
--- a/buildroot-external/package/hassio/create-data-partition.sh
+++ b/buildroot-external/package/hassio/create-data-partition.sh
@@ -4,6 +4,7 @@ set -e
 build_dir=$1
 dst_dir=$2
 channel=$3
+docker_version=$4

 data_img="${dst_dir}/data.ext4"

@@ -17,13 +18,12 @@ mkdir -p "${build_dir}/data/"
 sudo mount -o loop,discard "${data_img}" "${build_dir}/data/"

 # Use official Docker in Docker images
-# Ideally we use the same version as Buildroot is using in case the
-# overlayfs2 storage format changes
+# We use the same version as Buildroot is using to ensure best compatibility
 container=$(docker run --privileged -e DOCKER_TLS_CERTDIR="" \
 	-v "${build_dir}/data/":/data \
 	-v "${build_dir}/data/docker/":/var/lib/docker \
 	-v "${build_dir}":/build \
-	-d docker:28.0-dind --storage-driver overlay2)
+	-d "docker:${docker_version}-dind" --storage-driver overlay2)

 docker exec "${container}" sh /build/dind-import-containers.sh "${channel}"

--- a/buildroot-external/package/hassio/hassio.mk
+++ b/buildroot-external/package/hassio/hassio.mk
@@ -37,7 +37,7 @@ endef
 HASSIO_INSTALL_IMAGES = YES

 define HASSIO_INSTALL_IMAGES_CMDS
-	$(BR2_EXTERNAL_HASSOS_PATH)/package/hassio/create-data-partition.sh "$(@D)" "$(BINARIES_DIR)" "$(HASSIO_VERSION_CHANNEL)"
+	$(BR2_EXTERNAL_HASSOS_PATH)/package/hassio/create-data-partition.sh "$(@D)" "$(BINARIES_DIR)" "$(HASSIO_VERSION_CHANNEL)" "$(DOCKER_ENGINE_VERSION)"
 endef

 $(eval $(generic-package))
--- a/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.hash
+++ b/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.hash
@@ -1,2 +1,2 @@
 sha256  b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1  LICENSE
-sha256  035bb930c317a6944dbee14db60dea68d65e15fe5f51253e3080f9f016b89fd7  rpi-rf-mod-0ee62f7a87d26e990fb0e03b00befb505a7e44fd.tar.gz
+sha256  961b7e38dfe6450cd70b677d3cc8c1aabb00639f58e3ce7379c94053fdb19117  rpi-rf-mod-e1404d6b2400589a1956d7429ad16227c8db6771.tar.gz
--- a/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk
+++ b/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk
@@ -10,12 +10,12 @@
 # https://codeload.github.com/jens-maus/RaspberryMatic/tar.gz/COMMIT
 #
 # Copyright (c) 2018-2023 Jens Maus <mail@jens-maus.de>
-# https://github.com/jens-maus/RaspberryMatic/tree/master/buildroot-external/package/rpi-rf-mod
+# https://github.com/OpenCCU/OpenCCU/tree/master/buildroot-external/package/rpi-rf-mod
 #
 ################################################################################

-RPI_RF_MOD_VERSION = 0ee62f7a87d26e990fb0e03b00befb505a7e44fd
-RPI_RF_MOD_SITE = $(call github,jens-maus,RaspberryMatic,$(RPI_RF_MOD_VERSION))
+RPI_RF_MOD_VERSION = e1404d6b2400589a1956d7429ad16227c8db6771
+RPI_RF_MOD_SITE = $(call github,OpenCCU,OpenCCU,$(RPI_RF_MOD_VERSION))
 RPI_RF_MOD_LICENSE = Apache-2.0
 RPI_RF_MOD_LICENSE_FILES = LICENSE
 RPI_RF_MOD_DEPENDENCIES = host-dtc
--- a/buildroot-external/rootfs-overlay/etc/docker/daemon.json
+++ b/buildroot-external/rootfs-overlay/etc/docker/daemon.json
@@ -5,6 +5,5 @@
        "tag": "{{.Name}}"
    },
    "data-root": "/mnt/data/docker",
-    "deprecated-key-path": "/mnt/overlay/etc/docker/key.json",
    "bip": "172.30.232.1/23"
 }
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/docker.service.d/failure.conf
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/docker.service.d/failure.conf
@@ -3,4 +3,3 @@ FailureAction=reboot

 [Service]
 ExecStartPre=/usr/libexec/docker-disk-check
-ExecStopPost=/usr/libexec/docker-failure
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/ha-cli@.service
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/ha-cli@.service
@@ -15,6 +15,9 @@ Before=getty.target
 Conflicts=rescue.service
 Before=rescue.service

+# Same value as RestartMaxDelaySec to avoid marking the service as failed
+StartLimitIntervalSec=3s
+
 [Service]
 # the VT is cleared by TTYVTDisallocate
 # The '-o' option value tells agetty to replace 'login' arguments with an
@@ -23,7 +26,9 @@ Before=rescue.service
 ExecStart=/usr/sbin/hassos-cli
 Type=idle
 Restart=always
-RestartSec=0
+RestartSec=100ms
+RestartMaxDelaySec=3s
+RestartSteps=3
 UtmpIdentifier=%I
 TTYPath=/dev/%I
 TTYReset=yes
--- a/buildroot-external/rootfs-overlay/usr/libexec/docker-failure
+++ b/buildroot-external/rootfs-overlay/usr/libexec/docker-failure
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-if [ "$SERVICE_RESULT" = "exit-code" ] && [ "$EXIT_STATUS" = "1" ]; then
-    echo "Docker exited with exit status 1, this might be caused by corrupted key.json."
-    size=$(stat -c %s "/mnt/overlay/etc/docker/key.json")
-    echo "key.json: ${size} bytes"
-    if ! jq -e < "/mnt/overlay/etc/docker/key.json" > /dev/null || [ "${size}" -eq 0 ]; then
-        echo "key.json appears to be corrupted, it is not parsable. Removing it."
-        rm -f "/mnt/overlay/etc/docker/key.json"
-    fi
-fi
--- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli
+++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli
@@ -3,15 +3,40 @@
 # Run logging cli
 # ==============================================================================

-echo "Waiting for the Home Assistant CLI to be ready..."
+run_shell() { exec /bin/ash -l; }
+interrupt() { echo " cancelled"; systemctl reset-failed "ha-cli@*"; run_shell; }
+emergency_shell() {
+    printf "\n\n[WARNING] Home Assistant CLI is not starting or was interrupted.\n"
+    echo ""
+    echo "This happens when start of all services takes longer than expected, or because"
+    echo "of slow internet connection. Emergency console has been started, you can use"
+    echo "for example the following commands for troubleshooting:"
+    echo ""
+    echo " * 'docker ps -a' - e.g. to check if 'hassio_supervisor' container is running"
+    echo " * 'journalctl -e' - to investigate latest system logs"
+    echo " * 'exit' or Ctrl+D - to exit the emergency console and retry HA CLI startup"
+    echo ""
+    run_shell
+}
+
+trap interrupt INT
+
+printf "Waiting for the Home Assistant CLI to be ready..."

 i=0
 while [ ! "$(docker ps -q -f name=hassio_cli)" ]; do
    sleep 1
+
+    if [ $((i % 4)) = 0 ]; then
+        printf "\010\010\010   \010\010\010"
+    else
+        printf "."
+    fi
+
    i=$((i+1))
-    if [ $i = 60 ]; then
-        echo "[WARN] Home Assistant CLI not starting! Jumping into emergency console..."
-        exec /bin/ash -l
+
+    if [ $i = 180 ]; then
+        emergency_shell
    fi
 done

@@ -22,16 +47,20 @@ docker container exec \
 case $? in
  10)
    # Jump to root login shell (login command)
-    exec /bin/ash -l
+    run_shell
+    ;;
+  130)
+    # 130 is CLI termination with Ctrl+C (SIGINT)
+    printf "\nHome Assistant CLI has been interrupted.\n"
+    systemctl reset-failed "ha-cli@*"
    ;;
  143)
    # 143 graceful termination (SIGTERM). Most likely a proper shutdown.
    # Just sleep for a while until actual systemd shutdown gets invoked.
-    echo ""
-    echo "Home Assistant CLI has been terminated."
+    printf "\nHome Assistant CLI has been terminated.\n"
    sleep 30
    ;;
  *)
-    echo "HA CLI failed with error code: $?"
+    printf "\nHA CLI failed with error code: %s\n" "$?"
    ;;
 esac
--- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor
+++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor
@@ -11,6 +11,7 @@ set -e
 # Init supervisor
 SUPERVISOR_DATA=/mnt/data/supervisor
 SUPERVISOR_STARTUP_MARKER="/run/supervisor/startup-marker"
+SUPERVISOR_CIDFILE="${SUPERVISOR_DATA}/hassio_supervisor.cid"
 SUPERVISOR_STARTSCRIPT_VERSION="/mnt/data/.hassos-supervisor-version"
 SUPERVISOR_IMAGE="ghcr.io/home-assistant/${SUPERVISOR_ARCH}-hassio-supervisor"

@@ -58,8 +59,8 @@ if [ -z "${SUPERVISOR_IMAGE_ID}" ]; then
        docker tag "${SUPERVISOR_IMAGE}:${SUPERVISOR_VERSION}" "${SUPERVISOR_IMAGE}:latest"
    else
        # Pull failed, updater info might be corrupted or the release might have
-	# been removed from the container registry, delete the updater info
-	# to start from scratch on next try.
+        # been removed from the container registry, delete the updater info
+        # to start from scratch on next try.
        echo "[ERROR] Supervisor download failed."
        rm -f "${SUPERVISOR_DATA}/updater.json"
        exit 1
@@ -87,12 +88,18 @@ fi

 # If Supervisor container is missing, create it
 if [ -z "${SUPERVISOR_CONTAINER_ID}" ]; then
+    # We need to remove the CID file here, Docker will refuse to start if the
+    # file is present. Single instance is ensured by other code paths.
+    [ -f "${SUPERVISOR_CIDFILE}" ] && rm -f "${SUPERVISOR_CIDFILE}"
+
    echo "[INFO] Creating a new Supervisor container..."
    # shellcheck disable=SC2086
    docker container create \
        --name hassio_supervisor \
        --privileged --security-opt apparmor="hassio-supervisor" \
        --oom-score-adj=-300 \
+        --cidfile "${SUPERVISOR_CIDFILE}" \
+        --mount type=bind,src="${SUPERVISOR_CIDFILE}",dst=/run/cid,readonly \
        -v /run/docker.sock:/run/docker.sock:rw \
        -v /run/containerd/containerd.sock:/run/containerd/containerd.sock:rw \
        -v /run/systemd/journal/socket:/run/systemd/journal/socket:rw \
--- a/buildroot-external/scripts/post-build.sh
+++ b/buildroot-external/scripts/post-build.sh
@@ -27,7 +27,7 @@ setup_localtime
    echo "VERSION_ID=$(hassos_version)"
    echo "PRETTY_NAME=\"${HASSOS_NAME} $(hassos_version)\""
    echo "CPE_NAME=cpe:2.3:o:home-assistant:${HASSOS_ID}:$(hassos_version):*:${DEPLOYMENT}:*:*:*:${BOARD_ID}:*"
-    echo "HOME_URL=https://hass.io/"
+    echo "HOME_URL=https://www.home-assistant.io/"
    echo "VARIANT=\"${HASSOS_NAME} ${BOARD_NAME}\""
    echo "VARIANT_ID=${BOARD_ID}"
    echo "SUPERVISOR_MACHINE=${SUPERVISOR_MACHINE}"
Author	SHA1	Message	Date
Jan Čermák	80309bc93b	Remove handling of Docker key.json The deprecated-key-path option is no longer handled, but it doesn't cause problems because the key is explicitly ignored. It was completely removed in Docker 19.03.0 [1]. As such, the option and the pre-start script to fix the corrupted key.json can be removed now, as it has no effect, only printing confusing message when Docker service fails to start. [1] `98fc09128b`	2025-10-24 15:01:04 +02:00
Jan Čermák	d372a6df4b	Linux: Update kernel to 6.12.54 (#4358 ) * https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.54	2025-10-23 15:19:32 +02:00
Jan Čermák	34f8e3c1c7	Linux: Update kernel to 6.12.53 (#4356 ) * https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.53	2025-10-15 22:23:13 +02:00
Jan Čermák	7de24914bd	Bump OS to development version 17.0.dev0	2025-10-14 18:08:05 +02:00
Jan Čermák	58de585863	Linux: Update kernel to 6.12.52 (#4353 ) * https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.52	2025-10-13 19:45:14 +02:00
dependabot[bot]	dc52562b9d	Bump mikepenz/action-junit-report from 5.6.2 to 6.0.0 (#4352 ) Bumps [mikepenz/action-junit-report](https://github.com/mikepenz/action-junit-report) from 5.6.2 to 6.0.0. - [Release notes](https://github.com/mikepenz/action-junit-report/releases) - [Commits](`3585e9575d...5b7ee5a21e`) --- updated-dependencies: - dependency-name: mikepenz/action-junit-report dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-10-13 18:06:37 +02:00
Jan Čermák	1e24b8e351	Bump buildroot to 2024.02.7 (#4351 ) * buildroot 7ce414454b...02f1553a34 (1): > Merge tag '2025.02.7' into 2025.02.x-haos	2025-10-13 15:38:09 +02:00
Jan Čermák	daa6a7c868	Use matching version of DinD daemon when creating hassio data partition (#4344 ) Use the version used in the docker-engine package to ensure it stays in sync. Although we haven't seen any issues related to the fact it was sometimes mismatching, reduce the burden of needing it to be synced manually.	2025-10-10 10:50:25 +02:00
Jan Čermák	2e48a0a586	Enable x2APIC controller support on x86 and OVA (#4342 ) This might be required for some modern Intel processors (Meteor Lake and newer) which fail to boot Linux kernel without x2APIC controller when some features (e.g. VT-d or x2APIC itself) are enabled in the BIOS. Enable it also for OVA, as it can be emulated in virtual machines, even when the host CPU does not support it. Fixes #4337, fixes #4144, fixes #4345	2025-10-10 10:50:17 +02:00
Jens Maus	7005edee05	Bump rpi-rf-mod dt overlay to latest version (1.13.3) (#4349 )	2025-10-10 10:16:00 +02:00
Stefan Agner	92cb987426	Enable powersave CPU frequency governor (#4346 ) The CPUfreq governor "powersave" sets the CPU statically to the lowest frequency within the borders of scaling_min_freq and scaling_max_freq. This can be useful if a particular power budget should not ever be crossed. Can be set using `cpufreq.default_governor=powersave`. Note that this obviously affects performance.	2025-10-09 14:04:26 +02:00
Jan Čermák	f9f6c9f045	Linux: Update kernel to 6.12.51 (#4343 ) * https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.51	2025-10-08 09:52:28 +02:00
dependabot[bot]	58c40751a3	Bump actions/stale from 10.0.0 to 10.1.0 (#4338 ) Bumps [actions/stale](https://github.com/actions/stale) from 10.0.0 to 10.1.0. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](`3a9db7e6a4...5f858e3efb`) --- updated-dependencies: - dependency-name: actions/stale dependency-version: 10.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-10-07 10:19:10 +02:00
Jan Čermák	3e771eb222	Add driver for Creative Sound Blastr X-Fi PCI cards (#4331 ) Add snd-ctxfi driver as module to generic PCI device support fragment. Fixes #4141	2025-10-03 19:32:57 +02:00
Jan Čermák	4a76a65cd8	Use original hadolint action instead of outdated fork (#4332 )	2025-10-02 19:23:16 +02:00
Jan Čermák	1c90d4bd4b	Linux: Update kernel to 6.12.50 (#4330 ) * https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.50	2025-10-02 16:07:28 +02:00
Jan Čermák	bde19002df	Improve UX of HA CLI wrapper and emergency console (#4326 ) * Improve UX of HA CLI wrapper and emergency console For many users, the emergency console gives feeling that the system is completely broken. However, there are various cases when the system just takes just a bit longer to start up and the emergency message is shown, while it finishes a proper startup shortly after. This change tries to improve the UX in several ways: * The limit before a forced emergency console startup is changed to 3 minutes * Waiting can be interrupted with Ctrl+C (reset counter is cleared then) * Some hints what to check have been added before starting the shell * Also, because if the HA CLI failed for 5 times in a row in quick succession, the CLI startup was then not retried anymore and user may have been left with a black screen, the restart limits timeouts have been adjusted only to back off and never mark the unit as failed Closes #4273 * Use /bin/sh and printf to silence linter errors	2025-10-01 18:23:28 +02:00
Jan Čermák	95b1d22215	RaspberryPi: Update kernel to 6.12.47 - stable_20250916 (#4327 ) * RaspberryPi: Update kernel to 6.12.47 - stable_20250916 * Remove patches merged in 6.12.47 * Update Buildroot rpi-firmware package for 6.12.47 * buildroot 9acb31819a...7ce414454b (1): > package/rpi-firmware: update to ba22330 (for stable_20250916)	2025-10-01 17:46:17 +02:00
Jan Čermák	cb66fa808f	Fix build failure caused by RaspberryMatic project renaming (#4324 ) RaspberryMatic was renamed to OpenCCU in https://github.com/OpenCCU/OpenCCU/pull/3162. This caused change of the name of the directory in the source tarball, causing build failure when the archive wasn't cached.	2025-09-30 12:40:32 +02:00
Jan Čermák	fb52fc9a76	Update "Supported hardware" section of the readme (#4321 ) Remove the list of boards and refer to the ADRs and developer documentation instead. Fixes #4316	2025-09-30 12:38:17 +02:00
dependabot[bot]	342f93138d	Bump docker/login-action from 3.5.0 to 3.6.0 (#4322 ) Bumps [docker/login-action](https://github.com/docker/login-action) from 3.5.0 to 3.6.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](`184bdaa072...5e57cd1181`) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: 3.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-09-30 12:31:24 +02:00
dependabot[bot]	435714c01d	Bump actions/cache from 4.2.4 to 4.3.0 (#4323 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-09-30 11:20:43 +02:00
Jan Čermák	c70b528ac7	Linux: Update kernel to 6.12.49 (#4320 ) * https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.48 * https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.49	2025-09-29 15:40:31 +02:00
Servesh Muralidharan	510395fe4e	Support Chelsio T4/T5/T6 VF in SRIOV mode (#4281 ) This change supports in kernel drivers for Chelsio T4, T5 & T6 adapters with PCI-E SR-IOV Virtual Functions.	2025-09-17 11:01:18 +02:00
Jan Čermák	c95fd97df6	Linux: Update kernel to 6.12.47 (#4307 ) * https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.47	2025-09-15 16:10:49 +02:00
Simon Lamon	ef45889956	Pin SHA for all Github Actions (#4305 )	2025-09-15 11:39:47 +02:00
puterboy	e15d99bc2b	Enable HID multitouch support in kernel (#4298 ) Needed to allow multi-touch gestures on touchscreens for the addon HAOSKiosk.	2025-09-12 17:40:40 +02:00
Jan Čermák	dc0da1b7bc	Update HOME_URL in os-release metadata (#4299 ) The URL in os-release still pointed to hass.io domain which is currently defunct. Point to the Home Assistant's main homepage instead. Fixes #4295	2025-09-12 17:34:36 +02:00
Jan Čermák	2951f969bb	Bump Buildroot to 2025.02.6 (#4297 ) * buildroot 49cc269143...9acb31819a (1): > Merge tag '2025.02.6' into 2025.02.x-haos	2025-09-11 14:06:08 +02:00
Jan Čermák	0e09f22bd0	Implement better support for --silent flag in top-level Makefile (#4292 ) The extra information printed when using the top-level makefile can clutter the output when it needs to be further processed, e.g. when running `make show-info \| jq`. Make it respect the --silent flag (which also suppresses messages about changing directories which would break parsing as well).	2025-09-11 14:05:57 +02:00
Jan Čermák	3c321a8387	Linux: Update kernel to 6.12.46 (#4293 ) * https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.46	2025-09-11 11:22:12 +02:00
Jan Čermák	0e3fd2c021	Start Supervisor container with its cidfile mounted to /run/cid (#4276 ) Use the --cidfile Docker CLI argument when starting the container and bind-mount the generated file containing full ID of the container to the container itself. Using --mount instead of --volume is needed, as --volume is racy and creates empty directory volume at the destination path instead. This is prerequisite for home-assistant/supervisor#6006 but can come handy for other cases too.	2025-09-09 20:16:11 +02:00
Jan Čermák	9a1e0015d8	Linux: Update kernel to 6.12.45 (#4287 ) * https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.45	2025-09-08 18:05:30 +02:00
Andrej Friesen	3dcf6bd9ee	Enable Pressure Stall Information PSI (#4279 ) Enable Pressure Stall Information PSI for more accurate detection of resource shortages. The psi feature identifies and quantifies the disruptions caused by CPU, memory or IO resource shortages and the time impact it has on complex workloads or even entire systems. - https://facebookmicrosites.github.io/psi/docs/overview - https://www.kernel.org/doc/html/latest/accounting/psi.html	2025-09-08 17:36:20 +02:00
dependabot[bot]	837baa288c	Bump actions/github-script from 7 to 8 (#4285 ) Bumps [actions/github-script](https://github.com/actions/github-script) from 7 to 8. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v7...v8) --- updated-dependencies: - dependency-name: actions/github-script dependency-version: '8' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-09-08 16:39:07 +02:00
dependabot[bot]	36b9606172	Bump actions/setup-python from 5 to 6 (#4284 ) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5 to 6. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/setup-python dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-09-08 16:39:00 +02:00
dependabot[bot]	8bd52361b9	Bump actions/stale from 9.1.0 to 10.0.0 (#4283 ) Bumps [actions/stale](https://github.com/actions/stale) from 9.1.0 to 10.0.0. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v9.1.0...v10.0.0) --- updated-dependencies: - dependency-name: actions/stale dependency-version: 10.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-09-08 16:38:53 +02:00
Jan Čermák	39ff0117ba	Merge branch 'main' into dev	2025-09-08 16:04:04 +02:00
Jan Čermák	d60618a55f	Bump OS to release version 16.2	2025-09-08 11:34:12 +02:00
Jan Čermák	8f22412cf8	Revert "Revert kernel patch breaking 6.12.43 build for Tinker (#4257 )" (#4277 ) This reverts commit `194b9146f4`. Stable commit eb0abacdd3fce5a19fffc1c8bd0be6ffffeb59d8 in v6.12.44 does the same.	2025-09-03 10:58:18 +02:00
Jan Čermák	700ff773ab	Linux: Update kernel to 6.12.44 (#4268 ) * https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.44	2025-09-01 18:21:45 +02:00
Jan Čermák	a258295568	Bump OS to pre-release version 16.2.rc2	2025-09-01 18:17:51 +02:00
Jan Čermák	71be6037d1	Fix broken outgoing connections caused by upstream kernel regression (#4267 ) Upstream commit [1] caused regression in IPv4 routing which can cause some routes becoming broadcast even though they should be routed as unicast, e.g.: # ip route get 1.1.1.1 broadcast 1.1.1.1 via 192.168.122.1 dev enp0s3 src 192.168.122.204 uid 0 cache <local,brd> It's not entirely clear yet why it happens but this behavior seems to be triggered for instance when the SSDP integration sends the broadcast packet on HA startup. While this behavior is not described in the regression report [1], the commit cherry-picked from Linux master fixes the problems for us as well. Patches moved to version-specific folder, as this one shouldn't be applied on Raspberry Pi targets. [1] https://lore.kernel.org/all/20250710142714.12986-1-oscmaes92@gmail.com/ [2] https://lore.kernel.org/stable/20250822165231.4353-4-bacs@librecast.net/ Fixes #4265 (cherry picked from commit `78bda4bd10`)	2025-09-01 18:17:36 +02:00
Jan Čermák	78bda4bd10	Fix broken outgoing connections caused by upstream kernel regression (#4267 ) Upstream commit [1] caused regression in IPv4 routing which can cause some routes becoming broadcast even though they should be routed as unicast, e.g.: # ip route get 1.1.1.1 broadcast 1.1.1.1 via 192.168.122.1 dev enp0s3 src 192.168.122.204 uid 0 cache <local,brd> It's not entirely clear yet why it happens but this behavior seems to be triggered for instance when the SSDP integration sends the broadcast packet on HA startup. While this behavior is not described in the regression report [1], the commit cherry-picked from Linux master fixes the problems for us as well. Patches moved to version-specific folder, as this one shouldn't be applied on Raspberry Pi targets. [1] https://lore.kernel.org/all/20250710142714.12986-1-oscmaes92@gmail.com/ [2] https://lore.kernel.org/stable/20250822165231.4353-4-bacs@librecast.net/ Fixes #4265	2025-09-01 18:16:11 +02:00
Jan Čermák	44108a5493	Bump OS to development version 16.3.dev0	2025-08-28 16:53:58 +02:00