From 6c074309a1fd2be9452463aed2532d47ea12a650 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 22 Jan 2021 23:00:35 +0100 Subject: [PATCH 01/12] linux (RPi): update to 5.10.9-02dbfea Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index ffe18a5554..13f07b89c3 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -22,8 +22,8 @@ case "${LINUX}" in PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; raspberrypi) - PKG_VERSION="3f9ab74a54cf02e4810027f71e897ce48303ebc7" # 5.10.9 - PKG_SHA256="01ddf05e7a24c6fcf01c1471430e8602de15d0d9ba8f36e307f1e028ce3618a0" + PKG_VERSION="02dbfea28f442dc5442adcdf801c1e4e9422b2b2" # 5.10.9 + PKG_SHA256="84539a956d28f66bd45a4c8e2354d66e06cf788a85353726f815ff60c8d05a7c" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From fccb16ea2ad5814b85445f0a406d9aa799943aa1 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 22 Jan 2021 23:01:56 +0100 Subject: [PATCH 02/12] linux (RPi): config options for 5.10.9-02dbfea Enable NVMEM_RMEM=m on RPi4 Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 1 + projects/RPi/devices/RPi2/linux/linux.arm.conf | 1 + projects/RPi/devices/RPi4/linux/linux.arm.conf | 1 + 3 files changed, 3 insertions(+) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index b6ac8fe69b..43448cd876 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -4694,6 +4694,7 @@ CONFIG_RPI_AXIPERF=m # CONFIG_DAX is not set CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y +# CONFIG_NVMEM_RMEM is not set # # HW tracing support diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 5f125d8c08..006e0e464c 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -4839,6 +4839,7 @@ CONFIG_RPI_AXIPERF=m # CONFIG_DAX is not set CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y +# CONFIG_NVMEM_RMEM is not set # # HW tracing support diff --git a/projects/RPi/devices/RPi4/linux/linux.arm.conf b/projects/RPi/devices/RPi4/linux/linux.arm.conf index a3eef89e0f..288744737a 100644 --- a/projects/RPi/devices/RPi4/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi4/linux/linux.arm.conf @@ -5437,6 +5437,7 @@ CONFIG_RAS=y # CONFIG_DAX is not set CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y +CONFIG_NVMEM_RMEM=m # # HW tracing support From 48e1c5b7e9abad69b94be7d2395113e0b648b164 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 24 Jan 2021 12:09:32 +0100 Subject: [PATCH 03/12] linux (RPi): enable ARM_MODULE_PLTS ARM_MODULE_PLTS defaults to "y" since kernel 4.18 and is also enabled in RPi kernels. Disabling that option causes module load failures with "relocation 28 out of range" when lots of stuff is built into the kernel, eg when enabling KASAN or other code instrumentation. Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 2 +- projects/RPi/devices/RPi2/linux/linux.arm.conf | 2 +- projects/RPi/devices/RPi4/linux/linux.arm.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 43448cd876..c93ad55885 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -365,7 +365,7 @@ CONFIG_HAVE_ARCH_PFN_VALID=y # CONFIG_CPU_SW_DOMAIN_PAN is not set CONFIG_HW_PERF_EVENTS=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -# CONFIG_ARM_MODULE_PLTS is not set +CONFIG_ARM_MODULE_PLTS=y CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_ALIGNMENT_TRAP=y CONFIG_UACCESS_WITH_MEMCPY=y diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 006e0e464c..2177fd1b2e 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -465,7 +465,7 @@ CONFIG_HAVE_ARCH_PFN_VALID=y # CONFIG_CPU_SW_DOMAIN_PAN is not set CONFIG_HW_PERF_EVENTS=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -# CONFIG_ARM_MODULE_PLTS is not set +CONFIG_ARM_MODULE_PLTS=y CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_ALIGNMENT_TRAP=y CONFIG_UACCESS_WITH_MEMCPY=y diff --git a/projects/RPi/devices/RPi4/linux/linux.arm.conf b/projects/RPi/devices/RPi4/linux/linux.arm.conf index 288744737a..04a933be34 100644 --- a/projects/RPi/devices/RPi4/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi4/linux/linux.arm.conf @@ -469,7 +469,7 @@ CONFIG_HW_PERF_EVENTS=y CONFIG_SYS_SUPPORTS_HUGETLBFS=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -# CONFIG_ARM_MODULE_PLTS is not set +CONFIG_ARM_MODULE_PLTS=y CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_ALIGNMENT_TRAP=y CONFIG_UACCESS_WITH_MEMCPY=y From a9e05d7bc88c91695c6725b7c142b110ddf6a5a7 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 25 Jan 2021 12:23:34 +0100 Subject: [PATCH 04/12] rpi-eeprom: update to 3ae6694 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 1c972d76c2..0e842cc30a 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="7cb9d4162f330c5ca578376b1a3d5e748843e81c" -PKG_SHA256="896e13ec43d1e264601f2c5cbe13a1e3cefdbddf2ec9dc0bcf833e2a714258a2" +PKG_VERSION="3ae6694fbbea25a689ae279cb08ca3cb0e5253d2" +PKG_SHA256="7200b42fe784f54f598b1c841945a2cc637f3f6d6af73a3cda7bcc38b2b15cd6" PKG_ARCH="arm" PKG_LICENSE="BSD-3/custom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" From d6be57e1c633f24d8209a35f0ab06d5e19bfaae0 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 26 Jan 2021 09:25:02 +0100 Subject: [PATCH 05/12] RPi: update to firmware 5bafb30 Signed-off-by: Matthias Reichl --- packages/graphics/bcm2835-driver/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 1195e93e91..e1b59d4800 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="051e5e1be85fa7119aebf20adf8e61b9fe37c459" -PKG_SHA256="5818db4fd2e2e01eb520783da0db21965e8f6b542c34eeed393292edc3016228" +PKG_VERSION="5bafb302877a08885a526fe081738548dd698ab8" +PKG_SHA256="7fcc150cbb68ffe3ba8e683d12349fde5a573809f36704bee91ed90bd8fc7ded" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 305ad65cff..89e9b1171e 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="051e5e1be85fa7119aebf20adf8e61b9fe37c459" -PKG_SHA256="602eca16dbe7aeef4a80d134c63634bda7ae651d24c48f3a130847a96f0af383" +PKG_VERSION="5bafb302877a08885a526fe081738548dd698ab8" +PKG_SHA256="3962320ea371344d68106429dd0b998b9e15f6b22a2552e10c8f41daf2b5532c" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" From e45aef1d87ac0c04eafc894daa5b781747ed6c66 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 26 Jan 2021 09:26:27 +0100 Subject: [PATCH 06/12] linux (RPi): update to 5.10.10-9007908 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 13f07b89c3..3ba52c101e 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -22,8 +22,8 @@ case "${LINUX}" in PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; raspberrypi) - PKG_VERSION="02dbfea28f442dc5442adcdf801c1e4e9422b2b2" # 5.10.9 - PKG_SHA256="84539a956d28f66bd45a4c8e2354d66e06cf788a85353726f815ff60c8d05a7c" + PKG_VERSION="900790847a10954e7dcaeb4fe86d37ba0d7e73a2" # 5.10.10 + PKG_SHA256="5e7956b503d6deaf270ad78aff83f70dd0fc4366ccc4fe6c4fac3926fe747e9a" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From 38fe7d52f07bb2389c216c00f89bccb86b44ebbd Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 27 Jan 2021 19:35:21 +0100 Subject: [PATCH 07/12] rpi-eeprom: update to b9c255d 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 0e842cc30a..a2313c15da 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="3ae6694fbbea25a689ae279cb08ca3cb0e5253d2" -PKG_SHA256="7200b42fe784f54f598b1c841945a2cc637f3f6d6af73a3cda7bcc38b2b15cd6" +PKG_VERSION="b9c255df582b2c33a9af58d1973e83b3e8998f8f" +PKG_SHA256="04beaf3a5ef86641a04bcd0c3f92a81d7cd5057ae2b756c026bc4a9a6fc193d5" PKG_ARCH="arm" PKG_LICENSE="BSD-3/custom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" From 0f7d02180b5045366026c68e75da7e9ecedd9cf9 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 27 Jan 2021 21:22:11 +0100 Subject: [PATCH 08/12] linux (RPi): update to 5.10.11-c5f51df Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 3ba52c101e..8ac622d193 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -22,8 +22,8 @@ case "${LINUX}" in PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; raspberrypi) - PKG_VERSION="900790847a10954e7dcaeb4fe86d37ba0d7e73a2" # 5.10.10 - PKG_SHA256="5e7956b503d6deaf270ad78aff83f70dd0fc4366ccc4fe6c4fac3926fe747e9a" + PKG_VERSION="c5f51df7d0c457c330d0daecba491f61b979f048" # 5.10.11 + PKG_SHA256="1e3aac28dcea5f509b582171a0d4584ef6a6927e38295cc4aeeac5018f0361e7" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From 8db92a52d215b65391758738b0152a6b15ee161d Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 27 Jan 2021 21:26:28 +0100 Subject: [PATCH 09/12] linux (RPi): config options for 5.10.11-c5f51df Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 3 ++- projects/RPi/devices/RPi2/linux/linux.arm.conf | 2 +- projects/RPi/devices/RPi4/linux/linux.arm.conf | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index c93ad55885..7e8a459cd6 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.10.9 Kernel Configuration +# Linux/arm 5.10.11 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0" CONFIG_CC_IS_GCC=y @@ -2159,6 +2159,7 @@ CONFIG_GPIO_BCM_VIRT=y # CONFIG_GPIO_MB86S7X is not set # CONFIG_GPIO_MPC8XXX is not set # CONFIG_GPIO_PL061 is not set +# CONFIG_GPIO_SIFIVE is not set # CONFIG_GPIO_XILINX is not set # CONFIG_GPIO_ZEVIO is not set # CONFIG_GPIO_AMD_FCH is not set diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 2177fd1b2e..d299197305 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.10.9 Kernel Configuration +# Linux/arm 5.10.11 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0" CONFIG_CC_IS_GCC=y diff --git a/projects/RPi/devices/RPi4/linux/linux.arm.conf b/projects/RPi/devices/RPi4/linux/linux.arm.conf index 04a933be34..86ee6fc91f 100644 --- a/projects/RPi/devices/RPi4/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi4/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.10.9 Kernel Configuration +# Linux/arm 5.10.11 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0" CONFIG_CC_IS_GCC=y From 45fd49e60febfc8b38f5c26844a4def0ecaa9878 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 28 Jan 2021 13:46:42 +0100 Subject: [PATCH 10/12] RPi: update to firmware 3523a70 Signed-off-by: Matthias Reichl --- packages/graphics/bcm2835-driver/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index e1b59d4800..16c3133fc5 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="5bafb302877a08885a526fe081738548dd698ab8" -PKG_SHA256="7fcc150cbb68ffe3ba8e683d12349fde5a573809f36704bee91ed90bd8fc7ded" +PKG_VERSION="3523a7035fa9630799070091c077c610fafcc070" +PKG_SHA256="46ba1a175824530613d6e6137a5341bd8ea5fb43ccf2cce1c0439f0313a95059" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 89e9b1171e..193a1714ad 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="5bafb302877a08885a526fe081738548dd698ab8" -PKG_SHA256="3962320ea371344d68106429dd0b998b9e15f6b22a2552e10c8f41daf2b5532c" +PKG_VERSION="3523a7035fa9630799070091c077c610fafcc070" +PKG_SHA256="e702acc4161f26e0813d2d2e238a7f1a4a5103b4eeb75ea7fca7f94d8931dea6" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" From 46f1311811311959a627b0cfa10a4e5be3e47c53 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 30 Jan 2021 10:41:40 +0100 Subject: [PATCH 11/12] linux (RPi): update to 5.10.11-c922608 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 8ac622d193..a8dddf20a6 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -22,8 +22,8 @@ case "${LINUX}" in PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; raspberrypi) - PKG_VERSION="c5f51df7d0c457c330d0daecba491f61b979f048" # 5.10.11 - PKG_SHA256="1e3aac28dcea5f509b582171a0d4584ef6a6927e38295cc4aeeac5018f0361e7" + PKG_VERSION="c9226080e513181ffb3909a905e9c23b8a6e8f62" # 5.10.11 + PKG_SHA256="c641c1b11b0560863acce8269d23f093866ff97b1813f8eda3fa3abf33beec4e" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From a05b83c640a33d97fbe667bc5a3f9e6cf3e51e34 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 5 Feb 2021 13:00:55 +0100 Subject: [PATCH 12/12] linux (RPi): update to 5.10.13-431ac1d IR timeout fix patch dropped, the fixes are now in stable kernel. Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 +- .../linux-001-fix-ir-timeout.patch | 74 ------------------- 2 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 packages/linux/patches/raspberrypi/linux-001-fix-ir-timeout.patch diff --git a/packages/linux/package.mk b/packages/linux/package.mk index a8dddf20a6..0f50bb5f28 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -22,8 +22,8 @@ case "${LINUX}" in PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; raspberrypi) - PKG_VERSION="c9226080e513181ffb3909a905e9c23b8a6e8f62" # 5.10.11 - PKG_SHA256="c641c1b11b0560863acce8269d23f093866ff97b1813f8eda3fa3abf33beec4e" + PKG_VERSION="431ac1d21b5e842c5a564bc0bab31d7dc11611f5" # 5.10.13 + PKG_SHA256="f2b8a1e70f1031bc81d4e120d127d9c63e669033b5ee1589a33efd358e7fe4e3" 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-fix-ir-timeout.patch b/packages/linux/patches/raspberrypi/linux-001-fix-ir-timeout.patch deleted file mode 100644 index fced386d78..0000000000 --- a/packages/linux/patches/raspberrypi/linux-001-fix-ir-timeout.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 1f363deec843ed4e75aa11e466f91e9224376c04 Mon Sep 17 00:00:00 2001 -From: Matthias Reichl -Date: Tue, 5 Jan 2021 09:57:29 +0100 -Subject: [PATCH] media: rc: fix timeout handling after switch to microsecond - durations - -Commit 528222d853f92 ("media: rc: harmonize infrared durations to -microseconds") missed to switch some timeout calculations from -nanoseconds to microseconds. This resulted in spurious key_up+key_down -events at the last scancode if the rc device uses a long timeout -(eg 100ms on nuvoton-cir) as the device timeout wasn't properly -accounted for in the keyup timeout calculation. - -Fix this by applying the proper conversion functions. - -Fixes: 528222d853f92 ("media: rc: harmonize infrared durations to microseconds") -Signed-off-by: Matthias Reichl ---- - drivers/media/rc/ir-mce_kbd-decoder.c | 2 +- - drivers/media/rc/rc-main.c | 4 ++-- - drivers/media/rc/serial_ir.c | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/media/rc/ir-mce_kbd-decoder.c b/drivers/media/rc/ir-mce_kbd-decoder.c -index be8f2756a444..1524dc0fc566 100644 ---- a/drivers/media/rc/ir-mce_kbd-decoder.c -+++ b/drivers/media/rc/ir-mce_kbd-decoder.c -@@ -320,7 +320,7 @@ static int ir_mce_kbd_decode(struct rc_dev *dev, struct ir_raw_event ev) - data->body); - spin_lock(&data->keylock); - if (scancode) { -- delay = nsecs_to_jiffies(dev->timeout) + -+ delay = usecs_to_jiffies(dev->timeout) + - msecs_to_jiffies(100); - mod_timer(&data->rx_timeout, jiffies + delay); - } else { -diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c -index 29d4d01896ff..1fd62c1dac76 100644 ---- a/drivers/media/rc/rc-main.c -+++ b/drivers/media/rc/rc-main.c -@@ -737,7 +737,7 @@ static unsigned int repeat_period(int protocol) - void rc_repeat(struct rc_dev *dev) - { - unsigned long flags; -- unsigned int timeout = nsecs_to_jiffies(dev->timeout) + -+ unsigned int timeout = usecs_to_jiffies(dev->timeout) + - msecs_to_jiffies(repeat_period(dev->last_protocol)); - struct lirc_scancode sc = { - .scancode = dev->last_scancode, .rc_proto = dev->last_protocol, -@@ -855,7 +855,7 @@ void rc_keydown(struct rc_dev *dev, enum rc_proto protocol, u64 scancode, - ir_do_keydown(dev, protocol, scancode, keycode, toggle); - - if (dev->keypressed) { -- dev->keyup_jiffies = jiffies + nsecs_to_jiffies(dev->timeout) + -+ dev->keyup_jiffies = jiffies + usecs_to_jiffies(dev->timeout) + - msecs_to_jiffies(repeat_period(protocol)); - mod_timer(&dev->timer_keyup, dev->keyup_jiffies); - } -diff --git a/drivers/media/rc/serial_ir.c b/drivers/media/rc/serial_ir.c -index 8cc28c92d05d..96ae0294ac10 100644 ---- a/drivers/media/rc/serial_ir.c -+++ b/drivers/media/rc/serial_ir.c -@@ -385,7 +385,7 @@ static irqreturn_t serial_ir_irq_handler(int i, void *blah) - } while (!(sinp(UART_IIR) & UART_IIR_NO_INT)); /* still pending ? */ - - mod_timer(&serial_ir.timeout_timer, -- jiffies + nsecs_to_jiffies(serial_ir.rcdev->timeout)); -+ jiffies + usecs_to_jiffies(serial_ir.rcdev->timeout)); - - ir_raw_event_handle(serial_ir.rcdev); - --- -2.20.1 -