From 66caacf398bfad1f527611d192ee6fc350e45d78 Mon Sep 17 00:00:00 2001 From: Algernon Date: Tue, 28 Nov 2023 11:06:45 +0800 Subject: [PATCH] release 4.19.90-2311.5.0 --- SOURCE | 2 +- kernel.spec | 21 +++++++++- ...si-Add-driver-for-HiSilicon-PCIe-PMU.patch | 40 +++++++++++++------ ...-Add-value-profile-support-for-kerne.patch | 23 ++++++----- 4 files changed, 59 insertions(+), 27 deletions(-) diff --git a/SOURCE b/SOURCE index a10464a..13ee12f 100644 --- a/SOURCE +++ b/SOURCE @@ -1 +1 @@ -4.19.90-2311.3.0 +4.19.90-2311.5.0 diff --git a/kernel.spec b/kernel.spec index 9615857..0ddbd93 100644 --- a/kernel.spec +++ b/kernel.spec @@ -12,7 +12,7 @@ %global KernelVer %{version}-%{release}.%{_target_cpu} -%global hulkrelease 2311.4.0 +%global hulkrelease 2311.5.0 %define with_patch 1 @@ -32,7 +32,7 @@ Name: kernel Version: 4.19.90 -Release: %{hulkrelease}.0251 +Release: %{hulkrelease}.0252 Summary: Linux Kernel License: GPLv2 URL: http://www.kernel.org/ @@ -850,6 +850,23 @@ fi %changelog +* Tue Nov 28 2023 Li Xiaodong - 4.19.90-2311.5.0.0252 +- !3000 [openEuler-1.0-LTS] add Phytium drivers CONFIG +- arm64: config: add config for Phytium drivers +- !2908 mm/migrate.c: fix potential indeterminate pte entry in migrate_vma_insert_page() +- !2869 mm, memory_hotplug: update pcp lists everytime onlining a memory block +- !2805 sched/fair: Refill bandwidth before scaling +- !2804 signal: Properly set TRACE_SIGNAL_LOSE_INFO in __send_signal +- !2960 Add script to check & update openeuler_defconfig +- config: update openeuler_defconfig for arm64 +- config: update openeuler_defconfig for x86 +- kconfig: Add script to check & update openeuler_defconfig +- kbuild: ensure full rebuild when the compiler is updated +- mm/migrate.c: fix potential indeterminate pte entry in migrate_vma_insert_page() +- mm, memory_hotplug: update pcp lists everytime onlining a memory block +- sched/fair: Refill bandwidth before scaling +- signal: Properly set TRACE_SIGNAL_LOSE_INFO in __send_signal + * Sat Nov 25 2023 Zhou Kaiqi - 4.19.90-2311.4.0.0251 - Revert "genirq: Increase the number of IRQ descriptors" diff --git a/patches/0070-drivers-perf-hisi-Add-driver-for-HiSilicon-PCIe-PMU.patch b/patches/0070-drivers-perf-hisi-Add-driver-for-HiSilicon-PCIe-PMU.patch index bc6eaf8..7b2c21c 100644 --- a/patches/0070-drivers-perf-hisi-Add-driver-for-HiSilicon-PCIe-PMU.patch +++ b/patches/0070-drivers-perf-hisi-Add-driver-for-HiSilicon-PCIe-PMU.patch @@ -1,4 +1,4 @@ -From 67e9f6f7130ec835cb534be5bf37b3b18af3eec5 Mon Sep 17 00:00:00 2001 +From e98cf35d17750cf47499bdb6c315cb92e78374ee Mon Sep 17 00:00:00 2001 From: Qi Liu Date: Tue, 9 Aug 2022 23:06:41 +0800 Subject: [PATCH 29/55] drivers/perf: hisi: Add driver for HiSilicon PCIe PMU @@ -57,16 +57,16 @@ First, change the judgementation priority of event type to the first. Second, move the event->cpu assginment to the last. --- MAINTAINERS | 5 +- - arch/arm64/configs/openeuler_defconfig | 3 +- + arch/arm64/configs/openeuler_defconfig | 4 +- drivers/perf/hisilicon/Kconfig | 9 + drivers/perf/hisilicon/Makefile | 2 + drivers/perf/hisilicon/hisi_pcie_pmu.c | 951 +++++++++++++++++++++++++ include/linux/cpuhotplug.h | 3 + - 6 files changed, 971 insertions(+), 2 deletions(-) + 6 files changed, 972 insertions(+), 2 deletions(-) create mode 100644 drivers/perf/hisilicon/hisi_pcie_pmu.c diff --git a/MAINTAINERS b/MAINTAINERS -index f8ea3138d341..b4f1e5147b72 100644 +index b13d5fc74242..55733353eded 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6660,8 +6660,11 @@ F: Documentation/devicetree/bindings/net/hisilicon*.txt @@ -83,23 +83,37 @@ index f8ea3138d341..b4f1e5147b72 100644 F: Documentation/perf/hisi-pmu.rst diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig -index b4d263c1f95b..6a7497f2df95 100644 +index a7fcc2a5fe75..a9184c606898 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig -@@ -5103,11 +5103,12 @@ CONFIG_ARM_PMU=y - CONFIG_ARM_PMU_ACPI=y - CONFIG_ARM_SMMU_V3_PMU=y - # CONFIG_ARM_DSU_PMU is not set --CONFIG_HISI_PMU=m - CONFIG_QCOM_L2_PMU=y - CONFIG_QCOM_L3_PMU=y +@@ -5788,6 +5788,7 @@ CONFIG_QCOM_L3_PMU=y CONFIG_XGENE_PMU=y CONFIG_ARM_SPE_PMU=y -+CONFIG_HISI_PMU=m + CONFIG_HISI_PMU=m +CONFIG_HISI_PCIE_PMU=m CONFIG_RAS=y # +@@ -5813,10 +5814,10 @@ CONFIG_NVMEM=y + # + # CONFIG_STM is not set + # CONFIG_INTEL_TH is not set ++CONFIG_HISI_PTT=m + # CONFIG_FPGA is not set + # CONFIG_FSI is not set + CONFIG_TEE=m +-CONFIG_HISI_PTT=m + + # + # TEE drivers +@@ -6491,6 +6492,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y + CONFIG_ARCH_WANT_FRAME_POINTERS=y + CONFIG_FRAME_POINTER=y + # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set ++# CONFIG_PGO_KERNEL is not set + CONFIG_MAGIC_SYSRQ=y + CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 + CONFIG_MAGIC_SYSRQ_SERIAL=y diff --git a/drivers/perf/hisilicon/Kconfig b/drivers/perf/hisilicon/Kconfig index c5d1b7019fff..5546218b5598 100644 --- a/drivers/perf/hisilicon/Kconfig diff --git a/patches/0756-crypto-hisilicon-Add-value-profile-support-for-kerne.patch b/patches/0756-crypto-hisilicon-Add-value-profile-support-for-kerne.patch index 7b02994..abab7f2 100644 --- a/patches/0756-crypto-hisilicon-Add-value-profile-support-for-kerne.patch +++ b/patches/0756-crypto-hisilicon-Add-value-profile-support-for-kerne.patch @@ -1,4 +1,4 @@ -From 826a9c1864dd9b6042a401eefd84df627b6d3ec9 Mon Sep 17 00:00:00 2001 +From ad1c1daee62ed4622e2b9ba02e8dbd66c7558ed8 Mon Sep 17 00:00:00 2001 From: lauyarn Date: Thu, 23 Nov 2023 10:06:11 +0800 Subject: [PATCH] crypto: hisilicon - Add value profile support for kernel. @@ -18,20 +18,19 @@ Signed-off-by: lauyarn 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig -index b04256636d4b..4253a546d7eb 100644 +index 1309fc61a1c5..b72ec96d833a 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig -@@ -5141,7 +5141,8 @@ CONFIG_TEE=m - # - # CONFIG_OPTEE is not set - # CONFIG_SIOX is not set +@@ -2091,7 +2091,7 @@ CONFIG_ALTERA_STAPL=m + # CONFIG_ECHO is not set + # CONFIG_MISC_RTSX_PCI is not set + # CONFIG_MISC_RTSX_USB is not set -# CONFIG_UACCE is not set +CONFIG_UACCE=m -+CONFIG_CRYPTO_DEV_HISI_QM=m - # CONFIG_SLIMBUS is not set - + # -@@ -5639,11 +5640,11 @@ CONFIG_CHELSIO_IPSEC_INLINE=y + # SCSI device support +@@ -6332,11 +6332,12 @@ CONFIG_CHELSIO_IPSEC_INLINE=y # CONFIG_CRYPTO_DEV_CHELSIO_TLS is not set CONFIG_CRYPTO_DEV_VIRTIO=m # CONFIG_CRYPTO_DEV_CCREE is not set @@ -41,6 +40,7 @@ index b04256636d4b..4253a546d7eb 100644 -# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set -# CONFIG_CRYPTO_DEV_HISI_RDE is not set +CONFIG_CRYPTO_DEV_HISI_SEC=m ++CONFIG_CRYPTO_DEV_HISI_QM=m +CONFIG_CRYPTO_DEV_HISI_ZIP=m +CONFIG_CRYPTO_DEV_HISI_HPRE=m +CONFIG_CRYPTO_DEV_HISI_SEC2=m @@ -48,5 +48,6 @@ index b04256636d4b..4253a546d7eb 100644 CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y CONFIG_X509_CERTIFICATE_PARSER=y --- +-- 2.27.0 +