From 19e1d2ae5ebf5921e58894eac29c8a5e8e9beb56 Mon Sep 17 00:00:00 2001 From: graysky Date: Tue, 26 Jan 2021 07:14:54 -0500 Subject: [PATCH] core/linux-raspberrypi to 5.10.10-2 Sync up options from core/linux-raspberrypi4 config Preemption model to desktop Disable multi-core and SMT schedulers, see: https://github.com/raspberrypi/linux/issues/1221 Add bcm2711 thermal support Add CEC support, RAS, PCIE stuff, NVME stuff, Samsung net, I2C_HID, RAS, crypto Adiantum --- core/linux-raspberrypi/PKGBUILD | 4 +-- core/linux-raspberrypi/config | 59 +++++++++++++++++++-------------- 2 files changed, 36 insertions(+), 27 deletions(-) diff --git a/core/linux-raspberrypi/PKGBUILD b/core/linux-raspberrypi/PKGBUILD index 00ee6bc5d..539426fe4 100644 --- a/core/linux-raspberrypi/PKGBUILD +++ b/core/linux-raspberrypi/PKGBUILD @@ -11,7 +11,7 @@ _srcname=linux-${_commit} _kernelname=${pkgbase#linux} _desc="Raspberry Pi" pkgver=5.10.10 -pkgrel=1 +pkgrel=2 arch=('armv6h' 'armv7h') url="http://www.kernel.org/" license=('GPL2') @@ -27,7 +27,7 @@ source=("https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz" md5sums=('07072d35903171dbd14cc56abb84d805' '9669d916a5929a2eedbd64477f83d99e' 'ae9fa2a98aca88cb8d38e76110aa77e1' - '86d3cd54382363859ebf6cf808b3d24d' + 'ed8041f962681b9ba95493db900e2224' '86d4a35722b5410e3b29fc92dae15d4b' 'ce6c81ad1ad1f8b333fd6077d47abdaf' '69e1db90d78f691dc446fe2ab94727eb') diff --git a/core/linux-raspberrypi/config b/core/linux-raspberrypi/config index 62c0580a5..e7c564e68 100644 --- a/core/linux-raspberrypi/config +++ b/core/linux-raspberrypi/config @@ -86,10 +86,8 @@ CONFIG_HIGH_RES_TIMERS=y # end of Timers subsystem # CONFIG_PREEMPT_NONE is not set -# CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREEMPT=y -CONFIG_PREEMPT_COUNT=y -CONFIG_PREEMPTION=y +CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT is not set # # CPU/Task time and stats accounting @@ -113,12 +111,10 @@ CONFIG_CPU_ISOLATION=y # RCU Subsystem # CONFIG_TREE_RCU=y -CONFIG_PREEMPT_RCU=y # CONFIG_RCU_EXPERT is not set CONFIG_SRCU=y CONFIG_TREE_SRCU=y CONFIG_TASKS_RCU_GENERIC=y -CONFIG_TASKS_RCU=y CONFIG_TASKS_TRACE_RCU=y CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_NEED_SEGCBLIST=y @@ -458,8 +454,8 @@ CONFIG_HAVE_SMP=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y CONFIG_ARM_CPU_TOPOLOGY=y -CONFIG_SCHED_MC=y -CONFIG_SCHED_SMT=y +# CONFIG_SCHED_MC is not set +# CONFIG_SCHED_SMT is not set CONFIG_HAVE_ARM_ARCH_TIMER=y # CONFIG_MCPM is not set # CONFIG_BIG_LITTLE is not set @@ -778,7 +774,11 @@ CONFIG_BFQ_GROUP_IOSCHED=y CONFIG_PADATA=y CONFIG_ASN1=y -CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +CONFIG_INLINE_READ_UNLOCK=y +CONFIG_INLINE_READ_UNLOCK_IRQ=y +CONFIG_INLINE_WRITE_UNLOCK=y +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_RWSEM_SPIN_ON_OWNER=y @@ -1770,13 +1770,15 @@ CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PCI_DOMAINS_GENERIC=y CONFIG_PCI_SYSCALL=y -# CONFIG_PCIEPORTBUS is not set -CONFIG_PCIEASPM=y -CONFIG_PCIEASPM_DEFAULT=y -# CONFIG_PCIEASPM_POWERSAVE is not set -# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set -# CONFIG_PCIEASPM_PERFORMANCE is not set +CONFIG_PCIEPORTBUS=y +CONFIG_PCIEAER=y +# CONFIG_PCIEAER_INJECT is not set +# CONFIG_PCIE_ECRC is not set +# CONFIG_PCIEASPM is not set +CONFIG_PCIE_PME=y +# CONFIG_PCIE_DPC is not set # CONFIG_PCIE_PTM is not set +# CONFIG_PCIE_BW is not set CONFIG_PCI_MSI=y CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_QUIRKS=y @@ -2058,8 +2060,12 @@ CONFIG_ATA_OVER_ETH=m # # NVME Support # -# CONFIG_BLK_DEV_NVME is not set +CONFIG_NVME_CORE=m +CONFIG_BLK_DEV_NVME=m +# CONFIG_NVME_MULTIPATH is not set +# CONFIG_NVME_HWMON is not set # CONFIG_NVME_FC is not set +# CONFIG_NVME_TCP is not set # CONFIG_NVME_TARGET is not set # end of NVME Support @@ -2470,7 +2476,8 @@ CONFIG_NET_VENDOR_REALTEK=y # CONFIG_R8169 is not set CONFIG_NET_VENDOR_RENESAS=y CONFIG_NET_VENDOR_ROCKER=y -# CONFIG_NET_VENDOR_SAMSUNG is not set +CONFIG_NET_VENDOR_SAMSUNG=y +# CONFIG_SXGBE_ETH is not set CONFIG_NET_VENDOR_SEEQ=y CONFIG_NET_VENDOR_SOLARFLARE=y # CONFIG_SFC is not set @@ -3836,7 +3843,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y # # Broadcom thermal drivers # -# CONFIG_BCM2711_THERMAL is not set +CONFIG_BCM2711_THERMAL=y CONFIG_BCM2835_THERMAL=y # end of Broadcom thermal drivers @@ -4128,7 +4135,10 @@ CONFIG_RC_XBOX_DVD=m # CONFIG_IR_TOY is not set CONFIG_CEC_CORE=m # CONFIG_MEDIA_CEC_RC is not set -# CONFIG_MEDIA_CEC_SUPPORT is not set +CONFIG_MEDIA_CEC_SUPPORT=y +CONFIG_CEC_CH7322=m +CONFIG_USB_PULSE8_CEC=m +CONFIG_USB_RAINSHADOW_CEC=m CONFIG_MEDIA_SUPPORT=m # CONFIG_MEDIA_SUPPORT_FILTER is not set # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set @@ -5638,7 +5648,7 @@ CONFIG_USB_HIDDEV=y # # I2C HID support # -# CONFIG_I2C_HID is not set +CONFIG_I2C_HID=m # end of I2C HID support # end of HID support @@ -6088,6 +6098,7 @@ CONFIG_LEDS_TRIGGER_ACTPWR=y # CONFIG_INFINIBAND is not set CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y +# CONFIG_EDAC is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y # CONFIG_RTC_HCTOSYS is not set @@ -7136,7 +7147,7 @@ CONFIG_ARM_PMU=y # CONFIG_RPI_AXIPERF is not set # end of Performance monitor support -# CONFIG_RAS is not set +CONFIG_RAS=y # CONFIG_USB4 is not set # @@ -7148,7 +7159,7 @@ CONFIG_ARM_PMU=y CONFIG_DAX=y CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y -# CONFIG_NVMEM_RMEM is not set +CONFIG_NVMEM_RMEM=m # # HW tracing support @@ -7619,7 +7630,7 @@ CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_XTS=y # CONFIG_CRYPTO_KEYWRAP is not set CONFIG_CRYPTO_NHPOLY1305=m -# CONFIG_CRYPTO_ADIANTUM is not set +CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ESSIV=y # @@ -7978,7 +7989,6 @@ CONFIG_SCHEDSTATS=y # end of Scheduler Debugging # CONFIG_DEBUG_TIMEKEEPING is not set -CONFIG_DEBUG_PREEMPT=y # # Lock Debugging (spinlocks, mutexes, etc...) @@ -8049,7 +8059,6 @@ CONFIG_FTRACE=y # CONFIG_FUNCTION_TRACER is not set # CONFIG_STACK_TRACER is not set # CONFIG_IRQSOFF_TRACER is not set -# CONFIG_PREEMPT_TRACER is not set # CONFIG_SCHED_TRACER is not set # CONFIG_HWLAT_TRACER is not set # CONFIG_ENABLE_DEFAULT_TRACERS is not set