diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 16c3133fc5..43e4691cd4 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="3523a7035fa9630799070091c077c610fafcc070" -PKG_SHA256="46ba1a175824530613d6e6137a5341bd8ea5fb43ccf2cce1c0439f0313a95059" +PKG_VERSION="ba6259246c702b04ea56ff1034325e476d460ae8" +PKG_SHA256="4b7a887674e56f9811abf457a677ec045f3e88fabd048ee31bb32bc68255d152" 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 553b46cad8..13a63e9948 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="431ac1d21b5e842c5a564bc0bab31d7dc11611f5" # 5.10.13 - PKG_SHA256="f2b8a1e70f1031bc81d4e120d127d9c63e669033b5ee1589a33efd358e7fe4e3" + PKG_VERSION="14e997de54579db1db04d6504be8f700e34461da" # 5.10.16 + PKG_SHA256="a5cde2becf720ad505bbe361168514fed25f2883a989d62e473adbc23733029b" 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-011-vc4-Avoid-full-hdmi-audio-fifo-writes.patch b/packages/linux/patches/raspberrypi/linux-011-vc4-Avoid-full-hdmi-audio-fifo-writes.patch new file mode 100644 index 0000000000..c407892597 --- /dev/null +++ b/packages/linux/patches/raspberrypi/linux-011-vc4-Avoid-full-hdmi-audio-fifo-writes.patch @@ -0,0 +1,30 @@ +From 6ddb85813f7a61637a54f76a76ccb95ade8a50de Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Sun, 24 Jan 2021 15:44:10 +0000 +Subject: [PATCH] vc4: Avoid full hdmi audio fifo writes + +We are getting occasional VC4_HD_MAI_CTL_ERRORF in HDMI_MAI_CTL which seem to correspond with +audio dropouts. Reduce the threshold where we deassert DREQ to avoid the fifo overfilling +--- + drivers/gpu/drm/vc4/vc4_hdmi.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c +index 64b1567998861..3b85158fbbaa8 100644 +--- a/drivers/gpu/drm/vc4/vc4_hdmi.c ++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c +@@ -1562,10 +1562,10 @@ static int vc4_hdmi_audio_prepare(struct snd_pcm_substream *substream, + + /* Set the MAI threshold */ + HDMI_WRITE(HDMI_MAI_THR, +- VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICHIGH) | +- VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICLOW) | +- VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_DREQHIGH) | +- VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_DREQLOW)); ++ VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_PANICHIGH) | ++ VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_PANICLOW) | ++ VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_DREQHIGH) | ++ VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_DREQLOW)); + + HDMI_WRITE(HDMI_MAI_CONFIG, + VC4_HDMI_MAI_CONFIG_BIT_REVERSE | diff --git a/packages/linux/patches/raspberrypi/linux-012-increase-hdmi-dma-axi-priority.patch b/packages/linux/patches/raspberrypi/linux-012-increase-hdmi-dma-axi-priority.patch new file mode 100644 index 0000000000..197673b1c5 --- /dev/null +++ b/packages/linux/patches/raspberrypi/linux-012-increase-hdmi-dma-axi-priority.patch @@ -0,0 +1,21 @@ +diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi +index 8053ef54acc8..6bcfcc5b1ac5 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi.dtsi ++++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi +@@ -179,7 +179,7 @@ &pixelvalve4 { + }; + + &hdmi0 { +- dmas = <&dma (10|(1<<27)|(1<<24)|(0<<16)|(15<<20))>; ++ dmas = <&dma (10|(1<<27)|(1<<24)|(15<<16)|(15<<20))>; + status = "disabled"; + }; + +@@ -188,7 +188,7 @@ &ddc0 { + }; + + &hdmi1 { +- dmas = <&dma (17|(1<<27)|(1<<24)|(0<<16)|(15<<20))>; ++ dmas = <&dma (17|(1<<27)|(1<<24)|(15<<16)|(15<<20))>; + status = "disabled"; + }; diff --git a/packages/sysutils/pciutils/package.mk b/packages/sysutils/pciutils/package.mk index 256003008b..9ae7b6db3b 100644 --- a/packages/sysutils/pciutils/package.mk +++ b/packages/sysutils/pciutils/package.mk @@ -5,7 +5,6 @@ PKG_NAME="pciutils" PKG_VERSION="3.7.0" PKG_SHA256="9d40b97be8b6a2cdf96aead5a61881d1f7e4e0da9544a9bac4fba1ae9dcd40eb" -PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="http://mj.ucw.cz/pciutils.shtml" PKG_URL="http://www.kernel.org/pub/software/utils/pciutils/${PKG_NAME}-${PKG_VERSION}.tar.xz" @@ -26,9 +25,7 @@ makeinstall_target() { make ${PKG_MAKE_OPTS} DESTDIR=${SYSROOT_PREFIX} install make ${PKG_MAKE_OPTS} DESTDIR=${SYSROOT_PREFIX} install-lib make ${PKG_MAKE_OPTS} DESTDIR=${INSTALL} install-lib - if [ "${TARGET_ARCH}" = x86_64 ]; then - make ${PKG_MAKE_OPTS} DESTDIR=${INSTALL} install - fi + make ${PKG_MAKE_OPTS} DESTDIR=${INSTALL} install } post_makeinstall_target() { diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 193a1714ad..555b4c0aa0 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="3523a7035fa9630799070091c077c610fafcc070" -PKG_SHA256="e702acc4161f26e0813d2d2e238a7f1a4a5103b4eeb75ea7fca7f94d8931dea6" +PKG_VERSION="ba6259246c702b04ea56ff1034325e476d460ae8" +PKG_SHA256="44fc5b364518cf41bdffc02bf159a8685641e2eaac2d220244ae39c19bbde120" PKG_ARCH="arm" 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 a2313c15da..b5122dfb8d 100644 --- a/packages/tools/rpi-eeprom/package.mk +++ b/packages/tools/rpi-eeprom/package.mk @@ -2,13 +2,13 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rpi-eeprom" -PKG_VERSION="b9c255df582b2c33a9af58d1973e83b3e8998f8f" -PKG_SHA256="04beaf3a5ef86641a04bcd0c3f92a81d7cd5057ae2b756c026bc4a9a6fc193d5" +PKG_VERSION="3129546271da09dde04da5c9715db909b8e1e417" +PKG_SHA256="8ae34dd286d777484e670284883c91831ca8bdd15cc90a069009fdf1016de40b" PKG_ARCH="arm" 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" -PKG_DEPENDS_TARGET="flashrom" +PKG_DEPENDS_TARGET="pciutils" PKG_LONGDESC="rpi-eeprom: firmware, config and scripts to update RPi4 SPI bootloader" PKG_TOOLCHAIN="manual" @@ -45,7 +45,6 @@ makeinstall_target() { cp -PRv ${PKG_DIR}/source/rpi-eeprom-update ${INSTALL}/usr/bin cp -PRv ${PKG_BUILD}/rpi-eeprom-update ${INSTALL}/usr/bin/.rpi-eeprom-update.real cp -PRv ${PKG_BUILD}/rpi-eeprom-config ${INSTALL}/usr/bin - cp -PRv ${PKG_BUILD}/firmware/vl805 ${INSTALL}/usr/bin mkdir -p ${INSTALL}/etc/default cp -PRv ${PKG_DIR}/config/* ${INSTALL}/etc/default diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 7e8a459cd6..556ef05ae6 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.11 Kernel Configuration +# Linux/arm 5.10.13 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0" CONFIG_CC_IS_GCC=y @@ -52,6 +52,7 @@ CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_SHOW_LEVEL=y CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_CHIP=y CONFIG_IRQ_DOMAIN=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_IRQ_FORCED_THREADING=y @@ -4647,6 +4648,7 @@ CONFIG_PWM_BCM2835=m # CONFIG_IRQCHIP=y # CONFIG_AL_FIC is not set +CONFIG_BRCMSTB_L2_IRQ=y # end of IRQ chip support # CONFIG_IPACK_BUS is not set diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index d299197305..17548d226e 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.11 Kernel Configuration +# Linux/arm 5.10.13 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0" CONFIG_CC_IS_GCC=y @@ -52,6 +52,7 @@ CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_SHOW_LEVEL=y CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_CHIP=y CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_GENERIC_IRQ_IPI=y @@ -4789,6 +4790,7 @@ CONFIG_IRQCHIP=y CONFIG_ARM_GIC=y CONFIG_ARM_GIC_MAX_NR=1 # CONFIG_AL_FIC is not set +CONFIG_BRCMSTB_L2_IRQ=y # end of IRQ chip support # CONFIG_IPACK_BUS is not set diff --git a/projects/RPi/devices/RPi4/linux/linux.arm.conf b/projects/RPi/devices/RPi4/linux/linux.arm.conf index 86ee6fc91f..e3357db0a7 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.11 Kernel Configuration +# Linux/arm 5.10.13 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0" CONFIG_CC_IS_GCC=y @@ -52,6 +52,7 @@ CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_SHOW_LEVEL=y CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_CHIP=y CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_GENERIC_IRQ_IPI=y @@ -5384,6 +5385,7 @@ CONFIG_IRQCHIP=y CONFIG_ARM_GIC=y CONFIG_ARM_GIC_MAX_NR=1 # CONFIG_AL_FIC is not set +CONFIG_BRCMSTB_L2_IRQ=y # end of IRQ chip support # CONFIG_IPACK_BUS is not set