diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 72e6497aa0d..ad5ac27edd8 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="45c6ee3cd7f36a2376b691affbc02dfc689b8056" -PKG_SHA256="92997a35cbb3199bc7c08280e1e2ba956861a68b1781638748e73f745b72f90a" +PKG_VERSION="91e955e3786a807f4af8ae7e4a4bbf9ec470b843" +PKG_SHA256="97fb09cc0dcf2597ea7f7a47037ec8b84346faf62949abae7bea19693f30fbd0" 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 68d052f0f34..b17be702c29 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -38,14 +38,14 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; raspberrypi) - PKG_VERSION="83bf476e16c7494084431b6f7fd953c096535f5e" # 4.19 - PKG_SHA256="4cf553c5f99fec48c6143b59ca5f8f83f3ae36d0113a39954c7e8499d07b42f2" + PKG_VERSION="44e14b21ac57b47246b903b73fa9b9f2d78ff81e" # 4.19.4 + PKG_SHA256="4cd3aa5167470dacfe1f6e0bcbf09f4461bcb8db1db06b3405c8fcfc0678218a" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="4.19" - PKG_SHA256="0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" + PKG_VERSION="4.19.4" + PKG_SHA256="a38f5606bba1f5611c798541f6c3d43267b8599d9e3167471d4b662e33ff47aa" PKG_URL="https://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_PATCH_DIRS="default" ;; diff --git a/packages/linux/patches/default/linux-999-r8169-fix-broken-Wake-on-LAN-from-S5-poweroff.patch b/packages/linux/patches/default/linux-999-r8169-fix-broken-Wake-on-LAN-from-S5-poweroff.patch deleted file mode 100644 index e5dd07e01c6..00000000000 --- a/packages/linux/patches/default/linux-999-r8169-fix-broken-Wake-on-LAN-from-S5-poweroff.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f02436d19bfd25e249184f4eff557ae96eed47ab Mon Sep 17 00:00:00 2001 -From: Heiner Kallweit -Date: Thu, 25 Oct 2018 18:40:19 +0200 -Subject: [PATCH] r8169: fix broken Wake-on-LAN from S5 (poweroff) - -It was reported that WoL from S5 is broken (WoL from S3 works) and the -analysis showed that during system shutdown the network interface was -brought down already when the actual kernel shutdown started. -Therefore netif_running() returned false and as a consequence the PHY -was suspended. Obviously WoL wasn't working then. -To fix this the original patch needs to be effectively reverted. -A side effect is that when normally bringing down the interface and -WoL is enabled the PHY will remain powered on (like it was before the -original patch). - -Fixes: fe87bef01f9b ("r8169: don't check WoL when powering down PHY and interface is down") -Reported-by: Neil MacLeod -Signed-off-by: Heiner Kallweit ---- - drivers/net/ethernet/realtek/r8169.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c -index 2c35009..4930e03 100644 ---- a/drivers/net/ethernet/realtek/r8169.c -+++ b/drivers/net/ethernet/realtek/r8169.c -@@ -4175,10 +4175,15 @@ static void rtl_wol_suspend_quirk(struct rtl8169_private *tp) - - static bool rtl_wol_pll_power_down(struct rtl8169_private *tp) - { -- if (!netif_running(tp->dev) || !__rtl8169_get_wol(tp)) -+ struct phy_device *phydev; -+ -+ if (!__rtl8169_get_wol(tp)) - return false; - -- phy_speed_down(tp->dev->phydev, false); -+ /* phydev may not be attached to netdevice */ -+ phydev = mdiobus_get_phy(tp->mii_bus, 0); -+ -+ phy_speed_down(phydev, false); - rtl_wol_suspend_quirk(tp); - - return true; --- -2.14.1 - diff --git a/packages/linux/patches/default/linux-999-revert-dvb-t680ci-commit.patch b/packages/linux/patches/default/linux-999-revert-dvb-t680ci-commit.patch deleted file mode 100644 index 41793d7173f..00000000000 --- a/packages/linux/patches/default/linux-999-revert-dvb-t680ci-commit.patch +++ /dev/null @@ -1,60 +0,0 @@ -From c24b2ad9c085685c2cace7733c22dbc80a95de27 Mon Sep 17 00:00:00 2001 -From: MilhouseVH -Date: Thu, 16 Aug 2018 21:24:14 +0100 -Subject: [PATCH] Revert "media: dvbsky: use just one mutex for serializing - device R/W ops" - -This reverts commit 7d95fb746c4eece67308f1642a666ea1ebdbd2cc. ---- - drivers/media/usb/dvb-usb-v2/dvbsky.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c -index 1aa88d9..e28bd88 100644 ---- a/drivers/media/usb/dvb-usb-v2/dvbsky.c -+++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c -@@ -31,6 +31,7 @@ MODULE_PARM_DESC(disable_rc, "Disable inbuilt IR receiver."); - DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); - - struct dvbsky_state { -+ struct mutex stream_mutex; - u8 ibuf[DVBSKY_BUF_LEN]; - u8 obuf[DVBSKY_BUF_LEN]; - u8 last_lock; -@@ -67,17 +68,18 @@ static int dvbsky_usb_generic_rw(struct dvb_usb_device *d, - - static int dvbsky_stream_ctrl(struct dvb_usb_device *d, u8 onoff) - { -+ struct dvbsky_state *state = d_to_priv(d); - int ret; -- static u8 obuf_pre[3] = { 0x37, 0, 0 }; -- static u8 obuf_post[3] = { 0x36, 3, 0 }; -+ u8 obuf_pre[3] = { 0x37, 0, 0 }; -+ u8 obuf_post[3] = { 0x36, 3, 0 }; - -- mutex_lock(&d->usb_mutex); -- ret = dvb_usbv2_generic_rw_locked(d, obuf_pre, 3, NULL, 0); -+ mutex_lock(&state->stream_mutex); -+ ret = dvbsky_usb_generic_rw(d, obuf_pre, 3, NULL, 0); - if (!ret && onoff) { - msleep(20); -- ret = dvb_usbv2_generic_rw_locked(d, obuf_post, 3, NULL, 0); -+ ret = dvbsky_usb_generic_rw(d, obuf_post, 3, NULL, 0); - } -- mutex_unlock(&d->usb_mutex); -+ mutex_unlock(&state->stream_mutex); - return ret; - } - -@@ -606,6 +608,8 @@ static int dvbsky_init(struct dvb_usb_device *d) - if (ret) - return ret; - */ -+ mutex_init(&state->stream_mutex); -+ - state->last_lock = 0; - - return 0; --- -2.14.1 - diff --git a/packages/linux/patches/raspberrypi/linux-999-revert-dvb-t680ci-commit.patch b/packages/linux/patches/raspberrypi/linux-999-revert-dvb-t680ci-commit.patch deleted file mode 100644 index 41793d7173f..00000000000 --- a/packages/linux/patches/raspberrypi/linux-999-revert-dvb-t680ci-commit.patch +++ /dev/null @@ -1,60 +0,0 @@ -From c24b2ad9c085685c2cace7733c22dbc80a95de27 Mon Sep 17 00:00:00 2001 -From: MilhouseVH -Date: Thu, 16 Aug 2018 21:24:14 +0100 -Subject: [PATCH] Revert "media: dvbsky: use just one mutex for serializing - device R/W ops" - -This reverts commit 7d95fb746c4eece67308f1642a666ea1ebdbd2cc. ---- - drivers/media/usb/dvb-usb-v2/dvbsky.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c -index 1aa88d9..e28bd88 100644 ---- a/drivers/media/usb/dvb-usb-v2/dvbsky.c -+++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c -@@ -31,6 +31,7 @@ MODULE_PARM_DESC(disable_rc, "Disable inbuilt IR receiver."); - DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); - - struct dvbsky_state { -+ struct mutex stream_mutex; - u8 ibuf[DVBSKY_BUF_LEN]; - u8 obuf[DVBSKY_BUF_LEN]; - u8 last_lock; -@@ -67,17 +68,18 @@ static int dvbsky_usb_generic_rw(struct dvb_usb_device *d, - - static int dvbsky_stream_ctrl(struct dvb_usb_device *d, u8 onoff) - { -+ struct dvbsky_state *state = d_to_priv(d); - int ret; -- static u8 obuf_pre[3] = { 0x37, 0, 0 }; -- static u8 obuf_post[3] = { 0x36, 3, 0 }; -+ u8 obuf_pre[3] = { 0x37, 0, 0 }; -+ u8 obuf_post[3] = { 0x36, 3, 0 }; - -- mutex_lock(&d->usb_mutex); -- ret = dvb_usbv2_generic_rw_locked(d, obuf_pre, 3, NULL, 0); -+ mutex_lock(&state->stream_mutex); -+ ret = dvbsky_usb_generic_rw(d, obuf_pre, 3, NULL, 0); - if (!ret && onoff) { - msleep(20); -- ret = dvb_usbv2_generic_rw_locked(d, obuf_post, 3, NULL, 0); -+ ret = dvbsky_usb_generic_rw(d, obuf_post, 3, NULL, 0); - } -- mutex_unlock(&d->usb_mutex); -+ mutex_unlock(&state->stream_mutex); - return ret; - } - -@@ -606,6 +608,8 @@ static int dvbsky_init(struct dvb_usb_device *d) - if (ret) - return ret; - */ -+ mutex_init(&state->stream_mutex); -+ - state->last_lock = 0; - - return 0; --- -2.14.1 - diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 8cc909a7381..ba22c222e3d 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="45c6ee3cd7f36a2376b691affbc02dfc689b8056" -PKG_SHA256="246f4f4e5f89a1ca029ebacae2fad783ceb6649b2e6434dcd4d62b0c6823576a" +PKG_VERSION="91e955e3786a807f4af8ae7e4a4bbf9ec470b843" +PKG_SHA256="35d7e5b485b248fa9e2ff627bd7ccb0cb12089297cb544d2bfd35e4b691abc01" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index ff171466065..1e65e033472 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.19.0-rc4 Kernel Configuration +# Linux/x86_64 4.19.2 Kernel Configuration # # @@ -5292,7 +5292,6 @@ CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_SERPENT_AVX_X86_64 is not set # CONFIG_CRYPTO_SERPENT_AVX2_X86_64 is not set # CONFIG_CRYPTO_SM4 is not set -# CONFIG_CRYPTO_SPECK is not set # CONFIG_CRYPTO_TEA is not set # CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_TWOFISH_X86_64 is not set diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index d18b9d6eaa2..8573cb15b6e 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 4.19.0 Kernel Configuration +# Linux/arm 4.19.2 Kernel Configuration # # @@ -3326,6 +3326,7 @@ CONFIG_HID_ASUS=y CONFIG_HID_AUREAL=y CONFIG_HID_BELKIN=y # CONFIG_HID_BETOP_FF is not set +CONFIG_HID_BIGBEN_FF=m CONFIG_HID_CHERRY=y CONFIG_HID_CHICONY=y # CONFIG_HID_CORSAIR is not set @@ -4423,7 +4424,6 @@ CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_SEED is not set # CONFIG_CRYPTO_SERPENT is not set # CONFIG_CRYPTO_SM4 is not set -# CONFIG_CRYPTO_SPECK is not set # CONFIG_CRYPTO_TEA is not set # CONFIG_CRYPTO_TWOFISH is not set diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index d664772c723..33d8b8119fd 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 4.19.0 Kernel Configuration +# Linux/arm 4.19.2 Kernel Configuration # # @@ -555,7 +555,6 @@ CONFIG_CRYPTO_AES_ARM_BS=m # CONFIG_CRYPTO_GHASH_ARM_CE is not set CONFIG_CRYPTO_CRC32_ARM_CE=y # CONFIG_CRYPTO_CHACHA20_NEON is not set -# CONFIG_CRYPTO_SPECK_NEON is not set # CONFIG_VIRTUALIZATION is not set # @@ -3442,6 +3441,7 @@ CONFIG_HID_ASUS=y CONFIG_HID_AUREAL=y CONFIG_HID_BELKIN=y # CONFIG_HID_BETOP_FF is not set +CONFIG_HID_BIGBEN_FF=m CONFIG_HID_CHERRY=y CONFIG_HID_CHICONY=y # CONFIG_HID_CORSAIR is not set @@ -4546,7 +4546,6 @@ CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_SEED is not set # CONFIG_CRYPTO_SERPENT is not set # CONFIG_CRYPTO_SM4 is not set -# CONFIG_CRYPTO_SPECK is not set # CONFIG_CRYPTO_TEA is not set # CONFIG_CRYPTO_TWOFISH is not set