From a0590028d64db1367ba80ae4cec57c7ae5ac0c1e Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 7 Jan 2025 12:00:55 +0100 Subject: [PATCH 1/4] rpi-eeprom: update to 888e374 Signed-off-by: Matthias Reichl --- packages/tools/rpi-eeprom/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/rpi-eeprom/package.mk b/packages/tools/rpi-eeprom/package.mk index 006b97f9961..412ec8e3e14 100644 --- a/packages/tools/rpi-eeprom/package.mk +++ b/packages/tools/rpi-eeprom/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rpi-eeprom" -PKG_VERSION="f02f0eaf4e681a618fad55e5cc09d4306a82ac47" -PKG_SHA256="ebeb826dfeb30ebebab290988a1623ab22b099da47e985dd0180a270a714de39" +PKG_VERSION="888e374d47947d7d32b00ebc4f8d4b4f85320fa7" +PKG_SHA256="171eb73d52dda2df7ce5184fd7cbe71ad7dfe491d14e0c40d5162066002a05af" PKG_LICENSE="BSD-3/custom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" PKG_URL="https://github.com/raspberrypi/rpi-eeprom/archive/${PKG_VERSION}.tar.gz" From 371179ed43f18d0e9ee5c72941cbaceb1c33f15f Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 7 Jan 2025 21:40:54 +0100 Subject: [PATCH 2/4] rpi-eeprom: update to edf686c Signed-off-by: Matthias Reichl --- packages/tools/rpi-eeprom/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/rpi-eeprom/package.mk b/packages/tools/rpi-eeprom/package.mk index 412ec8e3e14..8883f1a963e 100644 --- a/packages/tools/rpi-eeprom/package.mk +++ b/packages/tools/rpi-eeprom/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rpi-eeprom" -PKG_VERSION="888e374d47947d7d32b00ebc4f8d4b4f85320fa7" -PKG_SHA256="171eb73d52dda2df7ce5184fd7cbe71ad7dfe491d14e0c40d5162066002a05af" +PKG_VERSION="edf686cd51b9ffe225001b6597b3e96aa63cdef9" +PKG_SHA256="e4f6b7af3653260fa04246020f6937159f88c9a98a4444eec89693a5b68080f0" PKG_LICENSE="BSD-3/custom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" PKG_URL="https://github.com/raspberrypi/rpi-eeprom/archive/${PKG_VERSION}.tar.gz" From 4f14ea1d6cd28a248eec0fa2af5ef5c4bb44698f Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 9 Jan 2025 15:24:07 +0100 Subject: [PATCH 3/4] rpi-eeprom: update to 54d9c33 Signed-off-by: Matthias Reichl --- packages/tools/rpi-eeprom/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/rpi-eeprom/package.mk b/packages/tools/rpi-eeprom/package.mk index 8883f1a963e..44cae8665c8 100644 --- a/packages/tools/rpi-eeprom/package.mk +++ b/packages/tools/rpi-eeprom/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rpi-eeprom" -PKG_VERSION="edf686cd51b9ffe225001b6597b3e96aa63cdef9" -PKG_SHA256="e4f6b7af3653260fa04246020f6937159f88c9a98a4444eec89693a5b68080f0" +PKG_VERSION="54d9c333a9d39941b4fc881275f433821c7b5cde" +PKG_SHA256="4424884c26bea47fe307b2de0087b1d7026da8f66d7ca20beb6e988da02670b1" PKG_LICENSE="BSD-3/custom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" PKG_URL="https://github.com/raspberrypi/rpi-eeprom/archive/${PKG_VERSION}.tar.gz" From f18bb345cdbb051fdccb61548111623b7253df56 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 10 Jan 2025 19:12:45 +0100 Subject: [PATCH 4/4] linux (RPi): update to 6.6.70-dfff383 Drop the local SD CQ-disable patch as the RPi kernel now switched to a safer whitelist approach to enable SQ only for known good cards. Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 +- ...12-re-enable-SD-slot-CQE-by-default-.patch | 47 ------------------- 2 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 packages/linux/patches/raspberrypi/linux-001-Revert-DTS-bcm2712-re-enable-SD-slot-CQE-by-default-.patch diff --git a/packages/linux/package.mk b/packages/linux/package.mk index e52b4786bb4..d76710c7684 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="de92e4b5ffe3b30e0e4156b3424e90ddb95a50ff" # 6.6.69 - PKG_SHA256="dbf2b31944c430f1fb6c91b3b3eb657ca37c374cc00fdc185cbc911a9c71b64b" + PKG_VERSION="dfff38316c1284c30c68d02cc424bad0562cf253" # 6.6.70 + PKG_SHA256="daf3f79ac5da3b8a3257ef1f8dec0234f713ef66f8f2365bd4fb83e6e503d356" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; diff --git a/packages/linux/patches/raspberrypi/linux-001-Revert-DTS-bcm2712-re-enable-SD-slot-CQE-by-default-.patch b/packages/linux/patches/raspberrypi/linux-001-Revert-DTS-bcm2712-re-enable-SD-slot-CQE-by-default-.patch deleted file mode 100644 index 3bc56be2b2f..00000000000 --- a/packages/linux/patches/raspberrypi/linux-001-Revert-DTS-bcm2712-re-enable-SD-slot-CQE-by-default-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From be6a324c450c40a2c2c9461fcd8258ec07338d0a Mon Sep 17 00:00:00 2001 -From: Matthias Reichl -Date: Wed, 13 Nov 2024 00:14:13 +0100 -Subject: [PATCH 1/3] Revert "DTS: bcm2712; re-enable SD slot CQE by default on - Pi 5" - -This reverts commit 48a15bc46004025776880a091d47a22e03449acc. - -CQE still seems to experimental and cause issues with some cards -so keep it disabled by default for now. ---- - arch/arm/boot/dts/overlays/README | 6 +++--- - arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 1 - - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 5c6344eb6f98..af1d82cffd47 100644 ---- a/arch/arm/boot/dts/overlays/README -+++ b/arch/arm/boot/dts/overlays/README -@@ -378,9 +378,9 @@ Params: - non-lite SKU of CM4). - (default "on") - -- sd_cqe Set to "off" to disable Command Queueing if you -- have an incompatible Class A2 SD card -- (Pi 5 only, default "on") -+ sd_cqe Use to enable Command Queueing on the SD -+ interface for faster Class A2 card performance -+ (Pi 5 only, default "off") - - sd_overclock Clock (in MHz) to use when the MMC framework - requests 50MHz -diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts -index a63ee4b678a1..56d416e82dd5 100644 ---- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts -+++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts -@@ -365,7 +365,6 @@ &sdio1 { - sd-uhs-sdr50; - sd-uhs-ddr50; - sd-uhs-sdr104; -- supports-cqe; - cd-gpios = <&gio_aon 5 GPIO_ACTIVE_LOW>; - //no-1-8-v; - status = "okay"; --- -2.39.5 -