diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index c82175e5f7..c3c3b7e95e 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="231daece7cbf9282736efa7d254b3e4859f8e73b" -PKG_SHA256="7118e689bca498073420e4f2fa1fe391c95a36d246794e6ea9fc6ab0c66a0edb" +PKG_VERSION="274d0c8ac0ec0850193618dce55c005832f918ea" +PKG_SHA256="e823e1ecf1a7a338ac70e5b8fe288a344f898d6361e9f6c99b708ac8b8ee4314" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 3fd49481bc..9c98b82d45 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="b0272c695e99a8dcc3a01298db56361333f1fdcf" # 5.10.95 - PKG_SHA256="e545db3c1064318c76477436589d3d36041389bae254bcf050022807b0822086" + PKG_VERSION="427c6bd8835e197693e9b4aedbe45c2c3c84cdce" # 5.10.110 + PKG_SHA256="0b80f1f3b57874af08c0e3c7d3edc2287639c0705f99fde705055fc303317432" 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-test-delay-cec_phys_addr_invalidate.patch b/packages/linux/patches/raspberrypi/linux-001-test-delay-cec_phys_addr_invalidate.patch deleted file mode 100644 index 3abacb3ac5..0000000000 --- a/packages/linux/patches/raspberrypi/linux-001-test-delay-cec_phys_addr_invalidate.patch +++ /dev/null @@ -1,87 +0,0 @@ -From b5c047738ca72ac345820a4573b576a466584234 Mon Sep 17 00:00:00 2001 -From: Dom Cobley -Date: Thu, 20 Jan 2022 18:09:18 +0000 -Subject: [PATCH] drm/vc4:hdmi: Delay cec_phys_addr_invalidate - -Wait briefly before generating the cec_phys_addr_invalidate, -and skip it if it's immediately followed by a valid one. - -This avoids the confusion of TV generating a powered up event -and libcec generating an active source message which swicthes -everything back on after a power off. - -See: -https://forum.libreelec.tv/thread/24783-tv-avr-turns-back-on-right-after-turning-them-off -Signed-off-by: Dom Cobley ---- - drivers/gpu/drm/vc4/vc4_hdmi.c | 16 +++++++++++++++- - drivers/gpu/drm/vc4/vc4_hdmi.h | 1 + - 2 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index d71cd43785053..7f68faedba669 100644 ---- a/drivers/gpu/drm/vc4/vc4_hdmi.c -+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -224,6 +224,8 @@ static void vc4_hdmi_cec_update_clk_div(struct vc4_hdmi *vc4_hdmi) {} - - static void vc4_hdmi_enable_scrambling(struct drm_encoder *encoder); - -+#define CEC_POLLING_DELAY_MS 1000 -+ - static enum drm_connector_status - vc4_hdmi_connector_detect(struct drm_connector *connector, bool force) - { -@@ -250,6 +252,8 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force) - struct edid *edid = drm_get_edid(connector, vc4_hdmi->ddc); - - if (edid) { -+ if (delayed_work_pending(&vc4_hdmi->cec_work)) -+ cancel_delayed_work_sync(&vc4_hdmi->cec_work); - cec_s_phys_addr_from_edid(vc4_hdmi->cec_adap, edid); - vc4_hdmi->encoder.hdmi_monitor = drm_detect_hdmi_monitor(edid); - kfree(edid); -@@ -266,7 +270,8 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force) - - vc4_hdmi->encoder.hdmi_monitor = false; - -- cec_phys_addr_invalidate(vc4_hdmi->cec_adap); -+ queue_delayed_work(system_wq, &vc4_hdmi->cec_work, -+ msecs_to_jiffies(CEC_POLLING_DELAY_MS)); - - out: - pm_runtime_put(&vc4_hdmi->pdev->dev); -@@ -751,6 +756,14 @@ static void vc4_hdmi_scrambling_wq(struct work_struct *work) - msecs_to_jiffies(SCRAMBLING_POLLING_DELAY_MS)); - } - -+static void vc4_hdmi_cec_wq(struct work_struct *work) -+{ -+ struct vc4_hdmi *vc4_hdmi = container_of(to_delayed_work(work), -+ struct vc4_hdmi, -+ cec_work); -+ cec_phys_addr_invalidate(vc4_hdmi->cec_adap); -+} -+ - static void vc4_hdmi_encoder_post_crtc_disable(struct drm_encoder *encoder, - struct drm_atomic_state *state) - { -@@ -2956,6 +2969,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) - mutex_init(&vc4_hdmi->mutex); - spin_lock_init(&vc4_hdmi->hw_lock); - INIT_DELAYED_WORK(&vc4_hdmi->scrambling_work, vc4_hdmi_scrambling_wq); -+ INIT_DELAYED_WORK(&vc4_hdmi->cec_work, vc4_hdmi_cec_wq); - - dev_set_drvdata(dev, vc4_hdmi); - encoder = &vc4_hdmi->encoder.base.base; -diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 3dd0d2a53a445..2125633f72e3d 100644 ---- a/drivers/gpu/drm/vc4/vc4_hdmi.h -+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h -@@ -141,6 +141,7 @@ struct vc4_hdmi { - struct drm_connector connector; - - struct delayed_work scrambling_work; -+ struct delayed_work cec_work; - - struct i2c_adapter *ddc; - void __iomem *hdmicore_regs; diff --git a/packages/linux/patches/raspberrypi/linux-999.03-fix-dirty-pipe.patch b/packages/linux/patches/raspberrypi/linux-999.03-fix-dirty-pipe.patch deleted file mode 100644 index 5317144f10..0000000000 --- a/packages/linux/patches/raspberrypi/linux-999.03-fix-dirty-pipe.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9d2231c5d74e13b2a0546fee6737ee4446017903 Mon Sep 17 00:00:00 2001 -From: Max Kellermann -Date: Mon, 21 Feb 2022 11:03:13 +0100 -Subject: [PATCH] lib/iov_iter: initialize "flags" in new pipe_buffer - -The functions copy_page_to_iter_pipe() and push_pipe() can both -allocate a new pipe_buffer, but the "flags" member initializer is -missing. - -Fixes: 241699cd72a8 ("new iov_iter flavour: pipe-backed") -To: Alexander Viro -To: linux-fsdevel@vger.kernel.org -To: linux-kernel@vger.kernel.org -Cc: stable@vger.kernel.org -Signed-off-by: Max Kellermann -Signed-off-by: Al Viro ---- - lib/iov_iter.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/iov_iter.c b/lib/iov_iter.c -index b0e0acdf96c15e..6dd5330f7a9957 100644 ---- a/lib/iov_iter.c -+++ b/lib/iov_iter.c -@@ -414,6 +414,7 @@ static size_t copy_page_to_iter_pipe(struct page *page, size_t offset, size_t by - return 0; - - buf->ops = &page_cache_pipe_buf_ops; -+ buf->flags = 0; - get_page(page); - buf->page = page; - buf->offset = offset; -@@ -577,6 +578,7 @@ static size_t push_pipe(struct iov_iter *i, size_t size, - break; - - buf->ops = &default_pipe_buf_ops; -+ buf->flags = 0; - buf->page = page; - buf->offset = 0; - buf->len = min_t(ssize_t, left, PAGE_SIZE); diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 4b2b4547b3..e676427b8a 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="231daece7cbf9282736efa7d254b3e4859f8e73b" -PKG_SHA256="1ddca33cd5f81b3fa0cc74ac6f253e67a5f0915a707cac81e19a4c520543d7a0" +PKG_VERSION="274d0c8ac0ec0850193618dce55c005832f918ea" +PKG_SHA256="24d60e6ac978b9a25dfe80064837b39282ba3987f2c66fa4a8cc2222efb31736" PKG_ARCH="arm aarch64" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" diff --git a/packages/tools/rpi-eeprom/package.mk b/packages/tools/rpi-eeprom/package.mk index 20c1a0a1c9..cbc4c81cc1 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="e866f258d97a06f8b6ca8253b9e0e831494e5c86" -PKG_SHA256="3638a7e22ecb338c5cfeed3dafd7744255eaecce2dd00197c2585f89d03db2a7" +PKG_VERSION="1c758a0904630da2ea905118bdf34fe2d8a6bb5e" +PKG_SHA256="ab4e20ef187f1583265c0face1d7d1597df2dc5d0fef697b459794924542388a" PKG_ARCH="arm" PKG_LICENSE="BSD-3/custom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 97db28205b..0b8f8b88bb 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.90 Kernel Configuration +# Linux/arm 5.10.110 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.1-6) 10.2.1 20210110" CONFIG_CC_IS_GCC=y @@ -3565,6 +3565,7 @@ CONFIG_HDMI=y # CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 43c3347a6b..eabea4e6e7 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.90 Kernel Configuration +# Linux/arm 5.10.110 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.1-6) 10.2.1 20210110" CONFIG_CC_IS_GCC=y @@ -394,6 +394,7 @@ CONFIG_SWP_EMULATE=y # CONFIG_CPU_BPREDICT_DISABLE is not set CONFIG_CPU_SPECTRE=y CONFIG_HARDEN_BRANCH_PREDICTOR=y +CONFIG_HARDEN_BRANCH_HISTORY=y CONFIG_KUSER_HELPERS=y CONFIG_VDSO=y CONFIG_MIGHT_HAVE_CACHE_L2X0=y @@ -1336,6 +1337,7 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y CONFIG_REGMAP_SPI=y @@ -3702,6 +3704,7 @@ CONFIG_HDMI=y # CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf index 08adef87e6..20243101da 100644 --- a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf +++ b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.90 Kernel Configuration +# Linux/arm64 5.10.110 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.1-6) 10.2.1 20210110" CONFIG_CC_IS_GCC=y @@ -392,6 +392,7 @@ CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y # CONFIG_XEN is not set CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y CONFIG_RODATA_FULL_DEFAULT_ENABLED=y # CONFIG_ARM64_SW_TTBR0_PAN is not set CONFIG_ARM64_TAGGED_ADDR_ABI=y @@ -2563,7 +2564,6 @@ CONFIG_HW_RANDOM=y # CONFIG_HW_RANDOM_BA431 is not set CONFIG_HW_RANDOM_BCM2835=y CONFIG_HW_RANDOM_IPROC_RNG200=y -CONFIG_HW_RANDOM_CAVIUM=y # CONFIG_HW_RANDOM_CCTRNG is not set # CONFIG_HW_RANDOM_XIPHERA is not set # CONFIG_APPLICOM is not set @@ -4259,6 +4259,7 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set