linux-purism-librem5: re-enable lazy RCU and fix RS9116 firmware mode (MR 5252)

See 91adc26f51 and
ddf56b5169.

Fixes 863760c6ba
[ci:skip-build]: already built successfully in CI
This commit is contained in:
Stefan Hansson 2024-07-16 10:54:54 +02:00 committed by Pablo Correa Gómez
parent 96fc8c97c5
commit 7bcaabdb1a
No known key found for this signature in database
GPG key ID: 7A342565FF635F79
2 changed files with 16 additions and 8 deletions

View file

@ -4,7 +4,7 @@
# Contributor: Clayton Craft <clayton@craftyguy.net> # Contributor: Clayton Craft <clayton@craftyguy.net>
pkgname=linux-purism-librem5 pkgname=linux-purism-librem5
pkgver=6.6.32 pkgver=6.6.32
pkgrel=1 pkgrel=2
# NOTE: Don't forget to rebase the config! See prepare() for instructions. # NOTE: Don't forget to rebase the config! See prepare() for instructions.
_purismrel=2 _purismrel=2
# <kernel ver>.<purism kernel release> # <kernel ver>.<purism kernel release>
@ -90,5 +90,5 @@ package() {
sha512sums=" sha512sums="
42242ccc182fe8ca73207e4c5ce824ba9f9b194e068fb49a280777e3dbd7326a446a098aecc7ebbf28cf4cb3d9c3f62837d9f718623652dfa50e7cc1bc807773 linux-purism-librem5-6.6.32pureos2.tar.gz 42242ccc182fe8ca73207e4c5ce824ba9f9b194e068fb49a280777e3dbd7326a446a098aecc7ebbf28cf4cb3d9c3f62837d9f718623652dfa50e7cc1bc807773 linux-purism-librem5-6.6.32pureos2.tar.gz
a6890ef18909fb74e6cfa1d2c74f8de874cb87f920a4328747f63d8ccf5d66966edea9d4a189aae8d84f4f7a9ecccf2a0fcef2c6bc0dba21062b9e9b46155971 config-purism-librem5.aarch64 ca153f579ca276c5d1ba8d4db53e6117ef0e199f9a85b42056d528326e820b574b8f5ca39a169f65fba5437de0216307f934a12d6d2e3b58ce15605910095c74 config-purism-librem5.aarch64
" "

View file

@ -134,14 +134,25 @@ CONFIG_CPU_ISOLATION=y
# #
CONFIG_TREE_RCU=y CONFIG_TREE_RCU=y
CONFIG_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y
# CONFIG_RCU_EXPERT is not set CONFIG_RCU_EXPERT=y
CONFIG_TREE_SRCU=y CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU_GENERIC=y CONFIG_TASKS_RCU_GENERIC=y
# CONFIG_FORCE_TASKS_RCU is not set
CONFIG_TASKS_RCU=y CONFIG_TASKS_RCU=y
# CONFIG_FORCE_TASKS_RUDE_RCU is not set
CONFIG_TASKS_RUDE_RCU=y CONFIG_TASKS_RUDE_RCU=y
# CONFIG_FORCE_TASKS_TRACE_RCU is not set
CONFIG_TASKS_TRACE_RCU=y CONFIG_TASKS_TRACE_RCU=y
CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_RCU_NEED_SEGCBLIST=y
CONFIG_RCU_FANOUT=64
CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_BOOST is not set
CONFIG_RCU_NOCB_CPU=y
# CONFIG_RCU_NOCB_CPU_DEFAULT_ALL is not set
# CONFIG_TASKS_TRACE_RCU_READ_MB is not set
CONFIG_RCU_LAZY=y
# CONFIG_RCU_DOUBLE_CHECK_CB_TIME is not set
# end of RCU Subsystem # end of RCU Subsystem
CONFIG_IKCONFIG=y CONFIG_IKCONFIG=y
@ -1972,6 +1983,7 @@ CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
CONFIG_ZRAM=m CONFIG_ZRAM=m
CONFIG_ZRAM_DEF_COMP_LZORLE=y CONFIG_ZRAM_DEF_COMP_LZORLE=y
# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
# CONFIG_ZRAM_DEF_COMP_LZO is not set # CONFIG_ZRAM_DEF_COMP_LZO is not set
CONFIG_ZRAM_DEF_COMP="lzo-rle" CONFIG_ZRAM_DEF_COMP="lzo-rle"
CONFIG_ZRAM_WRITEBACK=y CONFIG_ZRAM_WRITEBACK=y
@ -2564,9 +2576,7 @@ CONFIG_REDPINE_COEX_MODE=y
# CONFIG_REDPINE_P2P is not set # CONFIG_REDPINE_P2P is not set
# CONFIG_CARACALLA_BOARD is not set # CONFIG_CARACALLA_BOARD is not set
# CONFIG_REDPINE_ZIGB is not set # CONFIG_REDPINE_ZIGB is not set
CONFIG_RS9116_FLASH_MODE=y # CONFIG_RS9116_FLASH_MODE is not set
CONFIG_RS9116_PURISM=y
# CONFIG_REDPINE_LOAD_FW_FROM_FLASH_ONLY is not set
CONFIG_WLAN_VENDOR_SILABS=y CONFIG_WLAN_VENDOR_SILABS=y
# CONFIG_WFX is not set # CONFIG_WFX is not set
# CONFIG_WLAN_VENDOR_ST is not set # CONFIG_WLAN_VENDOR_ST is not set
@ -7289,7 +7299,6 @@ CONFIG_SECURITYFS=y
CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set # CONFIG_SECURITY_NETWORK_XFRM is not set
CONFIG_SECURITY_PATH=y CONFIG_SECURITY_PATH=y
CONFIG_LSM_MMAP_MIN_ADDR=32768
CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY=y
CONFIG_FORTIFY_SOURCE=y CONFIG_FORTIFY_SOURCE=y
# CONFIG_STATIC_USERMODEHELPER is not set # CONFIG_STATIC_USERMODEHELPER is not set
@ -7309,7 +7318,6 @@ CONFIG_SECURITY_APPARMOR_PARANOID_LOAD=y
# CONFIG_SECURITY_LOCKDOWN_LSM is not set # CONFIG_SECURITY_LOCKDOWN_LSM is not set
# CONFIG_SECURITY_LANDLOCK is not set # CONFIG_SECURITY_LANDLOCK is not set
# CONFIG_INTEGRITY is not set # CONFIG_INTEGRITY is not set
# CONFIG_DEFAULT_SECURITY_SELINUX is not set
# CONFIG_DEFAULT_SECURITY_APPARMOR is not set # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,bpf" CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,bpf"