Projects
home:xmzzz:branches:openEuler:24.03
kernel
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 28
View file
_service:tar_scm:haoc-kernel.spec
Changed
@@ -16,16 +16,49 @@ %define modsign_cmd %{SOURCE10} -%global Arch $(echo %{_host_cpu} | sed -e s/i.86/x86/ -e s/x86_64/x86/ -e s/aarch64.*/arm64/ -e s/riscv.*/riscv/) +%if 0%{?openEuler_sign_rsa} +# Use the open-source signature when the EBS permission is insufficient. +# Now only the admin user in EBS can send the signature request. But the +# user triggering the acces control build task and the personal build +# task is non-admin. Inorder to avoid build failures caused by failed +# signing, use the open-source signature. +# The flag_openEuler_has_sign_perm used in the rpm execution phase +# The openEuler_has_sign_perm used in the rpm execution phase + +%define openEuler_check_EBS_perm openEuler_has_sign_perm=0 \ +echo "" >> test_openEuler_sign.ko \ +sh /usr/lib/rpm/brp-ebs-sign --module test_openEuler_sign.ko || \ + $? -ne 2 && openEuler_has_sign_perm=1 \ +%global flag_openEuler_has_sign_perm $openEuler_has_sign_perm \ +rm -f test_openEuler_sign.ko test_openEuler_sign.ko.sig +%endif + +%global Arch $(echo %{_host_cpu} | sed -e s/i.86/x86/ -e s/x86_64/x86/ -e s/aarch64.*/arm64/ -e s/riscv.*/riscv/ -e s/powerpc64le/powerpc/ -e s/loongarch64/loongarch/) %global KernelVer %{version}-%{release}.%{_target_cpu} %global debuginfodir /usr/lib/debug %global upstream_version 6.6 %global upstream_sublevel 0 -%global devel_release 12 +%global devel_release 27 %global maintenance_release .0.0 -%global pkg_release .9 +%global pkg_release .32 + +%global openeuler_lts 1 +%global openeuler_major 2403 +%global openeuler_minor 0 + +# +# Support input parameter to overwrite the preceding version numbers. +# + +%bcond_with openeuler_version + +%if %{with openeuler_version} +%global openeuler_lts %{?_openeuler_lts} %{?!_openeuler_lts: 0} +%global openeuler_major %{?_openeuler_major} %{?!_openeuler_major: 0} +%global openeuler_minor %{?_openeuler_minor} %{?!_openeuler_minor: 0} +%endif %define with_debuginfo 1 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -64,10 +97,11 @@ Source10: sign-modules Source11: x509.genkey Source12: extra_certificates -# openEuler RPM PGP certificates: -# 1. openeuler <openeuler@compass-ci.com> -Source13: RPM-GPG-KEY-openEuler-compass-ci -Source14: process_pgp_certs.sh + +%if 0%{?openEuler_sign_rsa} +Source15: openeuler_kernel_cert.cer +Source16: sign-modules-openeuler +%endif %if 0%{?with_kabichk} Source18: check-kabi @@ -87,6 +121,7 @@ Source9998: patches.tar.bz2 %endif +Patch0001: 0001-riscv-kernel.patch Patch0002: 0002-cpupower-clang-compile-support.patch Patch0003: 0003-x86_energy_perf_policy-clang-compile-support.patch Patch0004: 0004-turbostat-clang-compile-support.patch @@ -117,10 +152,6 @@ BuildRequires: numactl-devel python3-devel glibc-static python3-docutils BuildRequires: perl-generators perl(Carp) libunwind-devel gtk2-devel libbabeltrace-devel java-1.8.0-openjdk java-1.8.0-openjdk-devel perl-devel -%if 0%{?openEuler_sign_rsa} -BuildRequires: sign-openEuler -%endif - AutoReq: no AutoProv: yes @@ -135,12 +166,15 @@ Requires: dracut >= 001-7 grubby >= 8.28-2 initscripts >= 8.11.1-1 linux-firmware >= 20100806-2 module-init-tools >= 3.16-2 -ExclusiveArch: noarch aarch64 i686 x86_64 riscv64 +ExclusiveArch: noarch aarch64 i686 x86_64 riscv64 ppc64le loongarch64 ExclusiveOS: Linux %if %{with_perf} BuildRequires: flex xz-devel libzstd-devel BuildRequires: java-devel +%ifarch aarch64 +BuildRequires: OpenCSD +%endif %endif BuildRequires: dwarves @@ -285,7 +319,6 @@ %endif %prep - %setup -q -n kernel-%{version} -c %if 0%{?with_patch} @@ -295,12 +328,6 @@ mv kernel linux-%{KernelVer} cd linux-%{KernelVer} -# process PGP certs -cp %{SOURCE13} . -cp %{SOURCE14} . -sh %{SOURCE14} -cp pubring.gpg certs - %if 0%{?with_patch} cp %{SOURCE9000} . cp %{SOURCE9001} . @@ -329,14 +356,20 @@ Applypatches series.conf %{_builddir}/kernel-%{version}/linux-%{KernelVer} %endif +# haoc-kernel patch +%patch0005 -p1 + +# riscv-kernel patch +%ifarch riscv64 +%patch0001 -p1 +%endif + %if "%toolchain" == "clang" %patch0002 -p1 %patch0003 -p1 %patch0004 -p1 %endif -%patch0005 -p1 - find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null find . -name .gitignore -exec rm -f {} \; >/dev/null @@ -356,6 +389,10 @@ cd linux-%{KernelVer} perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}.%{_target_cpu}/" Makefile +perl -p -i -e "s/^OPENEULER_LTS.*/OPENEULER_LTS = %{openeuler_lts}/" Makefile.oever +perl -p -i -e "s/^OPENEULER_MAJOR.*/OPENEULER_MAJOR = %{openeuler_major}/" Makefile.oever +perl -p -i -e "s/^OPENEULER_MINOR.*/OPENEULER_MINOR = %{openeuler_minor}/" Makefile.oever +perl -p -i -e "s/^OPENEULER_RELEASE.*/OPENEULER_RELEASE = \"%{release}\"/" Makefile.oever ## make linux make mrproper %{_smp_mflags} @@ -386,7 +423,21 @@ %global make %{__make} %{?clang_make_opts} HOSTCFLAGS="%{?build_cflags}" HOSTLDFLAGS="%{?build_ldflags}" +%ifarch loongarch64 + +%if 0%{with_signmodules} +echo "CONFIG_MODULE_SIG=y" >>arch/loongarch/configs/loongson3_defconfig +%endif + +%if 0%{with_debuginfo} +echo "CONFIG_DEBUG_INFO=y" >>arch/loongarch/configs/loongson3_defconfig +%endif + +make ARCH=%{Arch} loongson3_defconfig + +%else %{make} ARCH=%{Arch} openeuler_defconfig +%endif %if %{with clang_lto} scripts/config -e LTO_CLANG_FULL @@ -394,6 +445,17 @@ sed -i 's/CONFIG_LTO_NONE=y/# CONFIG_LTO_NONE is not set/' .config %endif +%if 0%{?openEuler_sign_rsa} + %{openEuler_check_EBS_perm} + if $openEuler_has_sign_perm -eq 1 ; then + cp %{SOURCE15} ./certs/openeuler-cert.pem + # close kernel native signature + sed -i 's/CONFIG_MODULE_SIG_KEY=.*$/CONFIG_MODULE_SIG_KEY=""/g' .config + sed -i 's/CONFIG_SYSTEM_TRUSTED_KEYS=.*$/CONFIG_SYSTEM_TRUSTED_KEYS="certs\/openeuler-cert.pem"/g' .config + sed -i 's/CONFIG_MODULE_SIG_ALL=y$/CONFIG_MODULE_SIG_ALL=n/g' .config + fi +%endif + TargetImage=$(basename $(make -s image_name)) %{make} ARCH=%{Arch} $TargetImage %{?_smp_mflags}
View file
_service:tar_scm:kernel-rt.spec
Changed
@@ -40,10 +40,10 @@ %global upstream_version 6.6 %global upstream_sublevel 0 -%global devel_release 26 +%global devel_release 27 %global maintenance_release .0.0 -%global pkg_release .2 -%global rt_release .rt20 +%global pkg_release .4 +%global rt_release .rt30 %define with_debuginfo 1 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -1057,6 +1057,12 @@ %endif %changelog +* Tue May 21 2024 zhangyu <zhangyu4@kylinos.cn> - 6.6.0-27.0.0.4 +- update kernel-rt version to 6.6.0-27.0.0.3 + +* Fir May 17 2024 zhangyu <zhangyu4@kylinos.cn> - 6.6.0-26.0.0.3 +- update kernel-rt version to 6.6.0-26.0.0.3 + * Wed May 15 2024 zhangyu <zhangyu4@kylinos.cn> - 6.6.0-26.0.0.2 - update kernel-rt version to 6.6.0-26.0.0.2 * Mon May 10 2024 zhangyu <zhangyu4@kylinos.cn> - 6.6.0-25.0.0.1
View file
_service:tar_scm:raspberrypi-kernel-rt.spec
Added
@@ -0,0 +1,2892 @@ +%global Arch $(echo %{_host_cpu} | sed -e s/i.86/x86/ -e s/x86_64/x86/ -e s/aarch64.*/arm64/) + +%global KernelVer %{version}-%{release}.raspi.%{_target_cpu} + +%global hulkrelease 26.0.0 + +%global debug_package %{nil} + +Name: raspberrypi-kernel-rt +Version: 6.6.0 +Release: %{hulkrelease}.rt.1 +Summary: Linux Kernel +License: GPLv2 +URL: http://www.kernel.org/ +Source0: kernel.tar.gz +Patch0000: 0000-raspberrypi-kernel.patch +Patch0001: 0001-raspberrypi-kernel-RT.patch +Patch0002: 0002-modify-bcm2711_defconfig-for-rt-rpi-kernel.patch + +BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, tar +BuildRequires: bzip2, xz, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk +BuildRequires: gcc >= 3.4.2, binutils >= 2.12 +BuildRequires: hostname, net-tools, bc +BuildRequires: xmlto, asciidoc +BuildRequires: openssl-devel +BuildRequires: hmaccalc +BuildRequires: ncurses-devel +BuildRequires: elfutils-libelf-devel +BuildRequires: rpm >= 4.14.2 +BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel perl(ExtUtils::Embed) bison +BuildRequires: audit-libs-devel +BuildRequires: pciutils-devel gettext +BuildRequires: rpm-build, elfutils +BuildRequires: numactl-devel python3-devel glibc-static python3-docutils +BuildRequires: perl-generators perl(Carp) libunwind-devel gtk2-devel libbabeltrace-devel java-1.8.0-openjdk +AutoReq: no +AutoProv: yes + +Provides: raspberrypi-kernel-rt-aarch64 = %{version}-%{release} + +ExclusiveArch: aarch64 +ExclusiveOS: Linux + +%description +The Linux Kernel preempt-rt image for RaspberryPi. + +%package devel +Summary: Development package for building kernel modules to match the %{KernelVer} raspberrypi-kernel-rt +AutoReqProv: no +Provides: raspberrypi-kernel-rt-devel-uname-r = %{KernelVer} +Provides: raspberrypi-kernel-rt-devel-%{_target_cpu} = %{version}-%{release} +Requires: perl findutils + +%description devel +This package provides raspberrypi kernel-rt headers and makefiles sufficient to build modules +against the %{KernelVer} raspberrypi-kernel-rt package. + +%prep +%setup -q -n kernel-%{version} -c +mv kernel linux-%{version} +cp -a linux-%{version} linux-%{KernelVer} + +cd linux-%{KernelVer} +%patch0000 -p1 +%patch0001 -p1 +%patch0002 -p1 + +find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null +find . -name .gitignore -exec rm -f {} \; >/dev/null + +%build +cd linux-%{KernelVer} + +perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}.raspi.%{_target_cpu}/" Makefile + +make ARCH=%{Arch} %{?_smp_mflags} bcm2711_defconfig + +make ARCH=%{Arch} %{?_smp_mflags} KERNELRELEASE=%{KernelVer} + +%install +cd linux-%{KernelVer} + +## install linux + +make ARCH=%{Arch} INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=%{KernelVer} +rm -rf $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/source $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build + +mkdir -p $RPM_BUILD_ROOT/boot +TargetImage=$(make -s image_name) +TargetImage=${TargetImage%.*} +install -m 755 $TargetImage $RPM_BUILD_ROOT/boot/vmlinuz-%{KernelVer} +install -m 644 .config $RPM_BUILD_ROOT/boot/config-%{KernelVer} +install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-%{KernelVer} + +mkdir -p $RPM_BUILD_ROOT/boot/dtb-%{KernelVer}/overlays +install -m 644 $(find arch/%{Arch}/boot/dts/broadcom/ -name "*.dtb") $RPM_BUILD_ROOT/boot/dtb-%{KernelVer}/ +install -m 644 $(find arch/%{Arch}/boot/dts/overlays/ -name "*.dtbo") $RPM_BUILD_ROOT/boot/dtb-%{KernelVer}/overlays/ +if ls arch/%{Arch}/boot/dts/overlays/*.dtb > /dev/null 2>&1; then + install -m 644 $(find arch/%{Arch}/boot/dts/overlays/ -name "*.dtb") $RPM_BUILD_ROOT/boot/dtb-%{KernelVer}/overlays/ +fi +install -m 644 arch/%{Arch}/boot/dts/overlays/README $RPM_BUILD_ROOT/boot/dtb-%{KernelVer}/overlays/ + +mkdir -p $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build + +############ to do collect devel file ######### +# 1. Makefile And Kconfig, .config sysmbol +# 2. scrpits dir +# 3. .h file +find -type f \( -name "Makefile*" -o -name "Kconfig*" \) -exec cp --parents {} $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build \; +for f in Module.symvers System.map Module.markers .config;do + test -f $f || continue + cp $f $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build +done + +cp -a scripts $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build +if -d arch/%{Arch}/scripts ; then + cp -a arch/%{Arch}/scripts $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/arch/%{_arch} || : +fi +if -f arch/%{Arch}/*lds ; then + cp -a arch/%{Arch}/*lds $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/arch/%{_arch}/ || : +fi +find $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/scripts/ -name "*.o" -exec rm -rf {} \; + +if -d arch/%{Arch}/include ; then + cp -a --parents arch/%{Arch}/include $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/ +fi +cp -a include $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/include + +if -f arch/%{Arch}/kernel/module.lds ; then + cp -a --parents arch/%{Arch}/kernel/module.lds $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/ +fi + +# module.lds is moved to scripts by commit 596b0474d3d9 in linux 5.10. +if -f scripts/module.lds ; then + cp -a --parents scripts/module.lds $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/ +fi + +%ifarch aarch64 + cp -a --parents arch/arm/include/asm $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/ +%endif + +# copy objtool for raspberrypi-kernel-devel (needed for building external modules) +if grep -q CONFIG_STACK_VALIDATION=y .config; then + mkdir -p $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/tools/objtool + cp -a tools/objtool/objtool $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/tools/objtool +fi + +# Make sure the Makefile and version.h have a matching timestamp so that +# external modules can be built +touch -r $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/Makefile $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/include/generated/uapi/linux/version.h +touch -r $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/.config $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/include/generated/autoconf.h +# for make prepare +if ! -f $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/include/config/auto.conf ;then + cp .config $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/include/config/auto.conf +fi + +mkdir -p %{buildroot}/usr/src/kernels +mv $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build $RPM_BUILD_ROOT/usr/src/kernels/%{KernelVer} + +find $RPM_BUILD_ROOT/usr/src/kernels/%{KernelVer} -name ".*.cmd" -exec rm -f {} \; + +pushd $RPM_BUILD_ROOT/lib/modules/%{KernelVer} +ln -sf /usr/src/kernels/%{KernelVer} build +ln -sf build source +popd + +%postun +version_old=0 +if "$1" == "0" ; then + echo "warning: something may go wrong when starting this device next time after uninstalling raspberrypi-kernel-rt." +else + version_tmp=0 + name_len=`echo -n %{name}-|wc -c` + for item in `rpm -qa %{name} 2>/dev/null` + do + cur_version=${item:name_len} + cpu_version=${cur_version##*.} + if "$cpu_version" == "%{_target_cpu}" ; then + cur_version=${cur_version%.*} + cur_version=$cur_version.raspi.$cpu_version + if "$cur_version" != "%{KernelVer}" && "$cur_version" > "$version_tmp" ; then + version_tmp=$cur_version + fi + fi + done + if "$version_tmp" < "%{KernelVer}" ; then + version_old=$version_tmp + fi +fi +if "$version_old" != "0" ; then + if -f /boot/vmlinuz-$version_old && -d /boot/dtb-$version_old && -d /lib/modules/$version_old ; then + ls /boot/dtb-$version_old/overlays/*.dtbo > /dev/null 2>&1 + if "$?" == "0" ; then + ls /boot/dtb-$version_old/*.dtb > /dev/null 2>&1 + if "$?" == "0" ; then + rm -rf /boot/*.dtb /boot/overlays /boot/kernel8.img + mkdir /boot/overlays + install -m 755 /boot/vmlinuz-$version_old /boot/kernel8.img + for file in `ls /boot/dtb-$version_old/*.dtb 2>/dev/null`
View file
_service:tar_scm:0001-raspberrypi-kernel-RT.patch
Added
@@ -0,0 +1,15673 @@ +From a8b87098c93aa630d286de4af9637a247d55a370 Mon Sep 17 00:00:00 2001 +From: zhangyu <zhangyu4@kylinos.cn> +Date: Fri, 17 May 2024 15:06:01 +0800 +Subject: PATCH rpi-rt + +--- + arch/arm/Kconfig | 6 +- + arch/arm/mm/fault.c | 6 + + arch/arm/vfp/vfpmodule.c | 74 +- + arch/arm64/Kconfig | 1 + + arch/powerpc/Kconfig | 2 + + arch/powerpc/include/asm/stackprotector.h | 7 +- + arch/powerpc/kernel/traps.c | 7 +- + arch/powerpc/kvm/Kconfig | 1 + + arch/powerpc/platforms/pseries/Kconfig | 1 + + arch/powerpc/platforms/pseries/iommu.c | 31 +- + arch/riscv/Kconfig | 2 + + arch/riscv/include/asm/cpufeature.h | 2 - + arch/riscv/include/asm/thread_info.h | 2 + + arch/riscv/kernel/cpufeature.c | 90 +- + arch/riscv/kernel/smpboot.c | 1 - + arch/x86/Kconfig | 2 + + arch/x86/include/asm/thread_info.h | 6 +- + drivers/acpi/processor_idle.c | 2 +- + drivers/block/zram/zram_drv.c | 37 + + drivers/block/zram/zram_drv.h | 3 + + .../gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 53 +- + .../drm/amd/display/dc/dcn20/dcn20_resource.c | 10 +- + .../drm/amd/display/dc/dcn21/dcn21_resource.c | 10 +- + .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 23 +- + .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.h | 10 +- + drivers/gpu/drm/i915/Kconfig | 1 - + drivers/gpu/drm/i915/display/intel_crtc.c | 15 +- + drivers/gpu/drm/i915/display/intel_vblank.c | 6 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 5 +- + .../drm/i915/gt/intel_execlists_submission.c | 17 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 12 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 +- + drivers/gpu/drm/i915/i915_request.c | 2 - + drivers/gpu/drm/i915/i915_trace.h | 6 +- + drivers/gpu/drm/i915/i915_utils.h | 2 +- + drivers/tty/serial/21285.c | 8 +- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 6 +- + drivers/tty/serial/8250/8250_bcm7271.c | 28 +- + drivers/tty/serial/8250/8250_core.c | 54 +- + drivers/tty/serial/8250/8250_dma.c | 8 +- + drivers/tty/serial/8250/8250_dw.c | 8 +- + drivers/tty/serial/8250/8250_exar.c | 4 +- + drivers/tty/serial/8250/8250_fsl.c | 6 +- + drivers/tty/serial/8250/8250_mtk.c | 8 +- + drivers/tty/serial/8250/8250_omap.c | 52 +- + drivers/tty/serial/8250/8250_pci1xxxx.c | 8 +- + drivers/tty/serial/8250/8250_port.c | 259 ++- + drivers/tty/serial/altera_jtaguart.c | 28 +- + drivers/tty/serial/altera_uart.c | 20 +- + drivers/tty/serial/amba-pl010.c | 20 +- + drivers/tty/serial/amba-pl011.c | 78 +- + drivers/tty/serial/apbuart.c | 8 +- + drivers/tty/serial/ar933x_uart.c | 26 +- + drivers/tty/serial/arc_uart.c | 16 +- + drivers/tty/serial/atmel_serial.c | 24 +- + drivers/tty/serial/bcm63xx_uart.c | 22 +- + drivers/tty/serial/cpm_uart.c | 8 +- + drivers/tty/serial/digicolor-usart.c | 18 +- + drivers/tty/serial/dz.c | 32 +- + drivers/tty/serial/fsl_linflexuart.c | 26 +- + drivers/tty/serial/fsl_lpuart.c | 88 +- + drivers/tty/serial/icom.c | 26 +- + drivers/tty/serial/imx.c | 84 +- + drivers/tty/serial/ip22zilog.c | 36 +- + drivers/tty/serial/jsm/jsm_neo.c | 4 +- + drivers/tty/serial/jsm/jsm_tty.c | 16 +- + drivers/tty/serial/liteuart.c | 20 +- + drivers/tty/serial/lpc32xx_hs.c | 26 +- + drivers/tty/serial/ma35d1_serial.c | 22 +- + drivers/tty/serial/mcf.c | 20 +- + drivers/tty/serial/men_z135_uart.c | 8 +- + drivers/tty/serial/meson_uart.c | 30 +- + drivers/tty/serial/milbeaut_usio.c | 16 +- + drivers/tty/serial/mpc52xx_uart.c | 12 +- + drivers/tty/serial/mps2-uart.c | 16 +- + drivers/tty/serial/msm_serial.c | 38 +- + drivers/tty/serial/mvebu-uart.c | 18 +- + drivers/tty/serial/omap-serial.c | 44 +- + drivers/tty/serial/owl-uart.c | 26 +- + drivers/tty/serial/pch_uart.c | 10 +- + drivers/tty/serial/pic32_uart.c | 20 +- + drivers/tty/serial/pmac_zilog.c | 52 +- + drivers/tty/serial/pxa.c | 30 +- + drivers/tty/serial/qcom_geni_serial.c | 8 +- + drivers/tty/serial/rda-uart.c | 34 +- + drivers/tty/serial/rp2.c | 20 +- + drivers/tty/serial/sa1100.c | 20 +- + drivers/tty/serial/samsung_tty.c | 50 +- + drivers/tty/serial/sb1250-duart.c | 12 +- + drivers/tty/serial/sc16is7xx.c | 5 + + drivers/tty/serial/serial-tegra.c | 32 +- + drivers/tty/serial/serial_core.c | 92 +- + drivers/tty/serial/serial_mctrl_gpio.c | 4 +- + drivers/tty/serial/serial_port.c | 4 +- + drivers/tty/serial/serial_txx9.c | 26 +- + drivers/tty/serial/sh-sci.c | 68 +- + drivers/tty/serial/sifive.c | 16 +- + drivers/tty/serial/sprd_serial.c | 30 +- + drivers/tty/serial/st-asc.c | 18 +- + drivers/tty/serial/stm32-usart.c | 38 +- + drivers/tty/serial/sunhv.c | 28 +- + drivers/tty/serial/sunplus-uart.c | 26 +- + drivers/tty/serial/sunsab.c | 34 +- + drivers/tty/serial/sunsu.c | 46 +- + drivers/tty/serial/sunzilog.c | 42 +- + drivers/tty/serial/timbuart.c | 8 +- + drivers/tty/serial/uartlite.c | 18 +- + drivers/tty/serial/ucc_uart.c | 4 +- + drivers/tty/serial/vt8500_serial.c | 8 +- + drivers/tty/serial/xilinx_uartps.c | 56 +- + drivers/tty/tty_io.c | 11 +- + fs/proc/consoles.c | 14 +- + include/linux/bottom_half.h | 2 + + include/linux/console.h | 150 ++ + include/linux/entry-common.h | 2 +- + include/linux/entry-kvm.h | 2 +- + include/linux/interrupt.h | 29 + + include/linux/netdevice.h | 4 + + include/linux/printk.h | 30 +- + include/linux/sched.h | 16 +- + include/linux/sched/idle.h | 8 +- + include/linux/sched/rt.h | 4 + + include/linux/serial_8250.h | 6 + + include/linux/serial_core.h | 43 +- + include/linux/thread_info.h | 24 + + include/linux/trace_events.h | 8 +- + kernel/Kconfig.preempt | 17 +- + kernel/entry/common.c | 4 +- + kernel/entry/kvm.c | 2 +- + kernel/futex/pi.c | 87 +- + kernel/futex/requeue.c | 6 +- + kernel/ksysfs.c | 12 + + kernel/locking/lockdep.c | 5 + + kernel/locking/rtmutex.c | 37 +- + kernel/locking/rwbase_rt.c | 8 + + kernel/locking/rwsem.c | 8 +- + kernel/locking/spinlock_rt.c | 6 + + kernel/locking/ww_rt_mutex.c | 2 +- + kernel/panic.c | 9 + + kernel/printk/Makefile | 2 +- + kernel/printk/internal.h | 121 ++ + kernel/printk/nbcon.c | 1664 +++++++++++++++++ + kernel/printk/printk.c | 750 ++++++-- + kernel/printk/printk_ringbuffer.c | 360 +++- + kernel/printk/printk_ringbuffer.h | 54 +- + kernel/printk/printk_safe.c | 12 + + kernel/rcu/rcutorture.c | 6 + + kernel/rcu/tree_stall.h | 5 + + kernel/sched/core.c | 127 +- + kernel/sched/debug.c | 19 + + kernel/sched/fair.c | 49 +- + kernel/sched/features.h | 2 +- + kernel/sched/idle.c | 3 +- + kernel/sched/rt.c | 5 +- + kernel/sched/sched.h | 1 + + kernel/signal.c | 30 +- + kernel/softirq.c | 95 +- + kernel/time/hrtimer.c | 4 +- + kernel/time/tick-sched.c | 2 +- + kernel/time/timer.c | 11 +- + kernel/trace/trace.c | 2 + + kernel/trace/trace_output.c | 16 +- + net/core/dev.c | 39 +- + net/core/skbuff.c | 7 +- + 164 files changed, 5041 insertions(+), 1542 deletions(-) + create mode 100644 kernel/printk/nbcon.c + +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index 2483ce304..52707a682 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -34,6 +34,7 @@ config ARM + select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT if CPU_V7 + select ARCH_SUPPORTS_ATOMIC_RMW + select ARCH_SUPPORTS_HUGETLBFS if ARM_LPAE ++ select ARCH_SUPPORTS_RT if HAVE_POSIX_CPU_TIMERS_TASK_WORK + select ARCH_USE_BUILTIN_BSWAP + select ARCH_USE_CMPXCHG_LOCKREF + select ARCH_USE_MEMTEST +@@ -73,7 +74,7 @@ config ARM + select HAS_IOPORT + select HAVE_ARCH_AUDITSYSCALL if AEABI && !OABI_COMPAT + select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6 +- select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU ++ select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU && !PREEMPT_RT + select HAVE_ARCH_KFENCE if MMU && !XIP_KERNEL + select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU + select HAVE_ARCH_KASAN if MMU && !XIP_KERNEL +@@ -96,7 +97,7 @@ config ARM + select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE + select HAVE_EFFICIENT_UNALIGNED_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && MMU + select HAVE_EXIT_THREAD +- select HAVE_FAST_GUP if ARM_LPAE
View file
_service:tar_scm:0001-riscv-kernel.patch
Changed
@@ -1,6 +1,6 @@ -From 43e792d485b18a195921ba3fca106cbdf9059a72 Mon Sep 17 00:00:00 2001 +From 70706e9fba0cc87e88f6ec2b8db4f58c44e582f5 Mon Sep 17 00:00:00 2001 From: Mingzheng Xing <xingmingzheng@iscas.ac.cn> -Date: Mon, 20 May 2024 03:56:10 +0800 +Date: Fri, 24 May 2024 14:47:38 +0800 Subject: PATCH riscv kernel Signed-off-by: Mingzheng Xing <xingmingzheng@iscas.ac.cn> @@ -52,7 +52,7 @@ .../boot/dts/thead/th1520-milkv-meles.dts | 441 +++++++ arch/riscv/boot/dts/thead/th1520.dtsi | 573 +++++++- arch/riscv/configs/defconfig | 3 + - arch/riscv/configs/openeuler_defconfig | 226 +++- + arch/riscv/configs/openeuler_defconfig | 265 +++- arch/riscv/errata/thead/errata.c | 69 +- arch/riscv/include/asm/barrier.h | 22 + arch/riscv/include/asm/errata_list.h | 50 +- @@ -216,7 +216,7 @@ .../riscv/thead/c900-legacy/firmware.json | 68 + .../riscv/thead/c900-legacy/instruction.json | 72 ++ .../riscv/thead/c900-legacy/microarch.json | 80 ++ - 211 files changed, 29925 insertions(+), 491 deletions(-) + 211 files changed, 29954 insertions(+), 501 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/thead,dwmac.yaml create mode 100644 Documentation/devicetree/bindings/pinctrl/thead,th1520-pinctrl.yaml create mode 100644 Documentation/devicetree/bindings/pwm/thead,th1520-pwm.yaml @@ -9930,7 +9930,7 @@ CONFIG_VIRTIO_BALLOON=y CONFIG_VIRTIO_INPUT=y diff --git a/arch/riscv/configs/openeuler_defconfig b/arch/riscv/configs/openeuler_defconfig -index 026582613f2c..0d80d67c7447 100644 +index 026582613f2c..a948aadd1d6f 100644 --- a/arch/riscv/configs/openeuler_defconfig +++ b/arch/riscv/configs/openeuler_defconfig @@ -2,6 +2,7 @@ @@ -9967,7 +9967,7 @@ CONFIG_ARCH_STARFIVE=y CONFIG_SOC_STARFIVE=y # CONFIG_ARCH_SUNXI is not set -@@ -343,6 +347,7 @@ CONFIG_SMP=y +@@ -343,17 +347,19 @@ CONFIG_SMP=y CONFIG_NR_CPUS=512 CONFIG_HOTPLUG_CPU=y CONFIG_TUNE_GENERIC=y @@ -9975,19 +9975,23 @@ CONFIG_NUMA=y CONFIG_NODES_SHIFT=7 CONFIG_RISCV_ALTERNATIVE=y -@@ -351,9 +356,8 @@ CONFIG_RISCV_ISA_C=y - CONFIG_RISCV_ISA_SVNAPOT=y + CONFIG_RISCV_ALTERNATIVE_EARLY=y + CONFIG_RISCV_ISA_C=y +-CONFIG_RISCV_ISA_SVNAPOT=y ++# CONFIG_RISCV_ISA_SVNAPOT is not set CONFIG_RISCV_ISA_SVPBMT=y CONFIG_TOOLCHAIN_HAS_V=y -CONFIG_RISCV_ISA_V=y -CONFIG_RISCV_ISA_V_DEFAULT_ENABLE=y -CONFIG_RISCV_ISA_ZICBOM=y +# CONFIG_RISCV_ISA_V is not set ++CONFIG_TOOLCHAIN_HAS_ZBB=y ++CONFIG_RISCV_ISA_ZBB=y +# CONFIG_RISCV_ISA_ZICBOM is not set CONFIG_RISCV_ISA_ZICBOZ=y CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE=y CONFIG_TOOLCHAIN_NEEDS_EXPLICIT_ZICSR_ZIFENCEI=y -@@ -471,6 +475,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y +@@ -471,6 +477,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y # CONFIG_CPUFREQ_DT=y CONFIG_CPUFREQ_DT_PLATDEV=y @@ -9995,7 +9999,7 @@ # end of CPU Frequency scaling # end of CPU Power Management -@@ -488,6 +493,19 @@ CONFIG_VIRTUALIZATION=y +@@ -488,6 +495,19 @@ CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_ARCH_SUPPORTS_ACPI=y # CONFIG_ACPI is not set @@ -10015,7 +10019,7 @@ # # General architecture-dependent options -@@ -576,7 +594,6 @@ CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y +@@ -576,7 +596,6 @@ CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y @@ -10023,7 +10027,19 @@ # # GCOV-based kernel profiling -@@ -768,8 +785,9 @@ CONFIG_SPARSEMEM_MANUAL=y +@@ -753,9 +772,9 @@ CONFIG_ZSMALLOC_CHAIN_SIZE=8 + # CONFIG_SLAB_DEPRECATED is not set + CONFIG_SLUB=y + # CONFIG_SLUB_TINY is not set +-CONFIG_SLAB_MERGE_DEFAULT=y ++# CONFIG_SLAB_MERGE_DEFAULT is not set + CONFIG_SLAB_FREELIST_RANDOM=y +-# CONFIG_SLAB_FREELIST_HARDENED is not set ++CONFIG_SLAB_FREELIST_HARDENED=y + # CONFIG_SLUB_STATS is not set + CONFIG_SLUB_CPU_PARTIAL=y + # CONFIG_RANDOM_KMALLOC_CACHES is not set +@@ -768,8 +787,9 @@ CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSEMEM=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y @@ -10034,7 +10050,7 @@ CONFIG_MEMORY_ISOLATION=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_SPLIT_PTLOCK_CPUS=4 -@@ -785,6 +803,7 @@ CONFIG_ARCH_ENABLE_THP_MIGRATION=y +@@ -785,13 +805,15 @@ CONFIG_ARCH_ENABLE_THP_MIGRATION=y CONFIG_CONTIG_ALLOC=y CONFIG_PCP_BATCH_SCALE_MAX=5 CONFIG_PHYS_ADDR_T_64BIT=y @@ -10042,7 +10058,23 @@ CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -@@ -813,6 +832,7 @@ CONFIG_VM_EVENT_COUNTERS=y ++CONFIG_ARCH_WANT_GENERAL_HUGETLB=y + CONFIG_ARCH_WANTS_THP_SWAP=y + CONFIG_TRANSPARENT_HUGEPAGE=y +-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y +-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set ++# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set ++CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y + CONFIG_THP_SWAP=y + # CONFIG_READ_ONLY_THP_FOR_FS is not set + CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +@@ -808,19 +830,19 @@ CONFIG_IDLE_PAGE_TRACKING=y + CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y + CONFIG_ZONE_DMA32=y + CONFIG_HMM_MIRROR=y ++CONFIG_GET_FREE_REGION=y + CONFIG_VM_EVENT_COUNTERS=y + # CONFIG_PERCPU_STATS is not set # CONFIG_GUP_TEST is not set # CONFIG_DMAPOOL_TEST is not set CONFIG_ARCH_HAS_PTE_SPECIAL=y @@ -10050,7 +10082,32 @@ CONFIG_MEMFD_CREATE=y CONFIG_SECRETMEM=y # CONFIG_ANON_VMA_NAME is not set -@@ -1635,6 +1655,7 @@ CONFIG_PCIE_CADENCE_EP=y + CONFIG_USERFAULTFD=y + CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y +-CONFIG_LRU_GEN=y +-CONFIG_LRU_GEN_ENABLED=y +-# CONFIG_LRU_GEN_STATS is not set ++# CONFIG_LRU_GEN is not set + CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y + CONFIG_PER_VMA_LOCK=y + CONFIG_LOCK_MM_AND_FIND_VMA=y +@@ -1585,6 +1607,7 @@ CONFIG_PCIEPORTBUS=y + CONFIG_HOTPLUG_PCI_PCIE=y + CONFIG_PCIEAER=y + CONFIG_PCIEAER_INJECT=m ++CONFIG_PCIEAER_CXL=y + CONFIG_PCIE_ECRC=y + CONFIG_PCIEASPM=y + CONFIG_PCIEASPM_DEFAULT=y +@@ -1601,6 +1624,7 @@ CONFIG_PCI_QUIRKS=y + CONFIG_PCI_STUB=y + # CONFIG_PCI_PF_STUB is not set + CONFIG_PCI_ATS=y ++CONFIG_PCI_DOE=y + CONFIG_PCI_ECAM=y + CONFIG_PCI_IOV=y + CONFIG_PCI_PRI=y +@@ -1635,6 +1659,7 @@ CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_PLAT=y CONFIG_PCIE_CADENCE_PLAT_HOST=y CONFIG_PCIE_CADENCE_PLAT_EP=y @@ -10058,7 +10115,40 @@ CONFIG_PCI_J721E=y CONFIG_PCI_J721E_HOST=y # CONFIG_PCI_J721E_EP is not set -@@ -1709,7 +1730,7 @@ CONFIG_WANT_DEV_COREDUMP=y +@@ -1674,7 +1699,16 @@ CONFIG_PCI_ENDPOINT_CONFIGFS=y + # CONFIG_PCI_SW_SWITCHTEC is not set + # end of PCI switch controller drivers + +-# CONFIG_CXL_BUS is not set ++CONFIG_CXL_BUS=y ++CONFIG_CXL_PCI=y ++# CONFIG_CXL_MEM_RAW_COMMANDS is not set ++CONFIG_CXL_PMEM=m ++CONFIG_CXL_MEM=y ++CONFIG_CXL_PORT=y ++CONFIG_CXL_SUSPEND=y ++CONFIG_CXL_REGION=y ++# CONFIG_CXL_REGION_INVALIDATION_TEST is not set ++CONFIG_CXL_PMU=y + # CONFIG_PCCARD is not set
View file
_service:tar_scm:0002-modify-bcm2711_defconfig-for-rt-rpi-kernel.patch
Added
@@ -0,0 +1,33 @@ +From aaf0e5b79782b0928ffd7b0feec770f1961daf4d Mon Sep 17 00:00:00 2001 +From: zhangyu <zhangyu4@kylinos.cn> +Date: Wed, 15 May 2024 11:38:14 +0800 +Subject: PATCH rt2 + +--- + arch/arm64/configs/bcm2711_defconfig | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig +index 6ac8c83f6..140cc175d 100644 +--- a/arch/arm64/configs/bcm2711_defconfig ++++ b/arch/arm64/configs/bcm2711_defconfig +@@ -8,6 +8,7 @@ CONFIG_HIGH_RES_TIMERS=y + CONFIG_BPF_SYSCALL=y + CONFIG_BPF_JIT=y + CONFIG_PREEMPT=y ++CONFIG_PREEMPT_RT=y/ + CONFIG_BSD_PROCESS_ACCT=y + CONFIG_BSD_PROCESS_ACCT_V3=y + CONFIG_TASKSTATS=y +@@ -62,7 +63,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y + CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y + CONFIG_CPUFREQ_DT=y + CONFIG_ARM_RASPBERRYPI_CPUFREQ=y +-CONFIG_VIRTUALIZATION=y ++#CONFIG_VIRTUALIZATION is not set + CONFIG_KVM=y + CONFIG_JUMP_LABEL=y + CONFIG_MODULES=y +-- +2.41.0 +
View file
_service:tar_scm:0005-haoc-kernel.patch
Changed
@@ -1,70 +1,111 @@ -From 5e3439b082bd2c50d5d99776cc09875b58c6986f Mon Sep 17 00:00:00 2001 +From 099672494b5fbd626031f313bbdbc42d1eb3f02d Mon Sep 17 00:00:00 2001 From: liuzh <liuzhh@zgclab.edu.cn> -Date: Wed, 20 Mar 2024 10:54:11 +0800 +Date: Wed, 22 May 2024 16:36:55 +0800 Subject: PATCH Squashed commit of the following: -commit ec1ca7489f99f8ae78f59846bbde576ba8c1d17d +commit 909ad06b3bf629d9af4e143347c1d1ef8a3a5808 +Author: liuzh <liuzhh@zgclab.edu.cn> +Date: Wed May 22 16:23:13 2024 +0800 + + fix mte_sync_tags() parameters after rebase to 6.6.0-27.0.0. + +commit 1cbf51371b0539a45f816419b2da82cf36162b4a +Author: ljl <ljl2013@163.com> +Date: Mon Mar 25 08:01:32 2024 +0000 + + IEE SI: Removed redundant codes. + +commit 0178bfc79ad1769a36f4165348a671d2182cff55 +Author: zhangsy <zhangshiyang17@mails.ucas.ac.cn> +Date: Mon Mar 25 11:01:11 2024 +0800 + + Fix bugs on qemu when opening CONFIG_CREDP. + +commit 8e714f6e8f2ace5a6fc900b4bce6b03c83c41870 +Author: ljl <ljl2013@163.com> +Date: Thu Mar 21 04:44:26 2024 +0000 + + IEE SI: Remove PAN operations as BTLB BUG is already fixed. + +commit 7b5fc74cb99e377d3bc59da81612cd6f3dd8a4d8 +Author: ljl <lvjinglin2013@163.com> +Date: Wed Mar 20 18:31:47 2024 +0800 + + IEE SI: Migration of iee rwx gate. + +commit aad2c7e89c9c4ad8ff0fb3ee53cd1b974144a283 Author: liuzh <liuzhh@zgclab.edu.cn> Date: Mon Mar 18 15:32:43 2024 +0800 modify slub.c set_track_prepare() -commit b0a92d4bdf6e5b70566d40a9eaca212c25a861be +commit 7452bac06ec09bf8321dfdbfb8b6a429d2cd8637 +Author: zhangsy <zhangshiyang17@mails.ucas.ac.cn> +Date: Thu Mar 21 11:26:19 2024 +0800 + + Set pgd of lm Privileged. + +commit 33934cfc3eed798a3a687bf86c6bd92697e68ba9 +Author: zhangsy <zhangshiyang17@mails.ucas.ac.cn> +Date: Tue Mar 19 17:14:32 2024 +0800 + + Delete some redundant code and put trans_pgd into IEE. + +commit 2bfe9008a72f8b8ac237bc7a5f99f9d40e84c247 Author: zhangshiyang17@mails.ucas.ac.cn <zhangshiyang17@mails.ucas.ac.cn> Date: Mon Mar 18 11:47:50 2024 +0000 Fix bugs on physical when opening CONFIG_IEE and CONFIG_PTP. -commit 70bd0cd14fadd8de90c24f7d068ce0c178926978 +commit dafa2df600757511ce3e8f178e05e28adabdf39b Author: zhangsy <zhangshiyang17@mails.ucas.ac.cn> Date: Mon Mar 18 10:40:42 2024 +0800 Fix bugs on qemu when opening CONFIG_IEE and CONFIG_PTP. -commit c2354a983b6815d92fe9186c4633029701a0c961 +commit 9231a9f6b34c62090b5f202c9c64a52bfdac7a73 Author: zhangsy <zhangshiyang17@mails.ucas.ac.cn> Date: Thu Mar 14 16:34:53 2024 +0800 Fix compiling bugs of CONFIG_PTP. -commit 0705cba2c67808b11fe921683bdf03035059cb71 +commit 6469df3bcce32896c2cb297d3cd7ead82c33f35d Author: zhangsy <zhangshiyang17@mails.ucas.ac.cn> Date: Thu Mar 14 11:10:00 2024 +0800 Fix bugs on qemu when opening CONFIG_IEE and CONFIG_INTERRUPTABLE. -commit 51cb50831e41ed95736a62a29dfc3c0a4a6fa912 +commit 5f1773dada622a3514c9ed6aa72dd50e918f2664 Author: zhangsy <zhangshiyang17@mails.ucas.ac.cn> Date: Wed Mar 13 17:31:39 2024 +0800 Fix bugs on qemu when opening CONFIG_IEE. -commit 911534e59d6d1aa89255021f6740cd68b3284149 +commit 73f433a093fa84cffa5e11e86bed6f17c9b30a39 Author: liuzh <liuzhh@zgclab.edu.cn> Date: Tue Mar 12 15:32:29 2024 +0800 fix the map of IEE_SI_TEXT. -commit 5ec57031b813c9283059dc3236295ad45db97ad6 +commit 9b92deb4b2338093d9b04f4b81f162855b31c983 Author: liuzh <liuzhh@zgclab.edu.cn> Date: Sun Mar 10 16:11:13 2024 +0800 modified to be able to compile. can start the kernel with qemu and successfully reach `start_kernel()`. -commit 8d808438b6335c47da6d60d2903125eeb4b4cb41 +commit e892ec4790d72e9433b48b0221e7e6dc4c361dd9 Author: liuzh <liuzhh@zgclab.edu.cn> Date: Thu Mar 7 14:27:45 2024 +0800 fix some conflicts -commit e0349b6ad5963f985b36a726ba63ff91ac68874d +commit fdec7e39345e81e867e01258487f88801b790b02 Author: liuzh <liuzhh@zgclab.edu.cn> Date: Wed Mar 6 12:31:11 2024 +0800 - rebase to 6.6.0-12.0.0 for update. + migrate openeuler-commit code. (need some fix before compiling) --- - .gitignore | 4 + Makefile | 3 +- arch/arm64/Kconfig | 18 + arch/arm64/include/asm/assembler.h | 67 + @@ -73,52 +114,55 @@ arch/arm64/include/asm/fixmap.h | 3 + arch/arm64/include/asm/hw_breakpoint.h | 12 + arch/arm64/include/asm/iee-access.h | 36 + - arch/arm64/include/asm/iee-cred.h | 145 ++ - arch/arm64/include/asm/iee-def.h | 73 + - arch/arm64/include/asm/iee-si.h | 69 + + arch/arm64/include/asm/iee-cred.h | 150 ++ + arch/arm64/include/asm/iee-def.h | 74 + + arch/arm64/include/asm/iee-si.h | 64 + arch/arm64/include/asm/iee-slab.h | 23 + arch/arm64/include/asm/iee-token.h | 40 + arch/arm64/include/asm/iee.h | 10 + arch/arm64/include/asm/kernel-pgtable.h | 21 + - arch/arm64/include/asm/koi.h | 335 ++++ + arch/arm64/include/asm/koi.h | 335 +++++ arch/arm64/include/asm/memory.h | 24 + - arch/arm64/include/asm/mmu_context.h | 12 + + arch/arm64/include/asm/mmu_context.h | 20 + arch/arm64/include/asm/pgalloc.h | 4 + - arch/arm64/include/asm/pgtable-hwdef.h | 4 + - arch/arm64/include/asm/pgtable.h | 313 +++- - arch/arm64/include/asm/sysreg.h | 56 + + arch/arm64/include/asm/pgtable-hwdef.h | 11 + + arch/arm64/include/asm/pgtable.h | 304 +++- + arch/arm64/include/asm/pointer_auth.h | 5 + + arch/arm64/include/asm/sysreg.h | 58 + arch/arm64/include/asm/tlb.h | 9 + arch/arm64/include/asm/tlbflush.h | 58 +- arch/arm64/kernel/Makefile | 2 + arch/arm64/kernel/armv8_deprecated.c | 16 + arch/arm64/kernel/asm-offsets.c | 11 + arch/arm64/kernel/cpu_errata.c | 12 + - arch/arm64/kernel/cpufeature.c | 18 + + arch/arm64/kernel/cpufeature.c | 79 + arch/arm64/kernel/debug-monitors.c | 4 + arch/arm64/kernel/entry-common.c | 4 + - arch/arm64/kernel/entry.S | 656 +++++++ - arch/arm64/kernel/head.S | 52 + - arch/arm64/kernel/hibernate.c | 8 + - arch/arm64/kernel/hw_breakpoint.c | 99 + + arch/arm64/kernel/entry.S | 611 ++++++++ + arch/arm64/kernel/fpsimd.c | 4 + + arch/arm64/kernel/head.S | 56 + + arch/arm64/kernel/hibernate.c | 14 + + arch/arm64/kernel/hw_breakpoint.c | 99 ++ arch/arm64/kernel/iee/Makefile | 1 + - arch/arm64/kernel/iee/iee-func.c | 189 ++ - arch/arm64/kernel/iee/iee-gate.S | 231 +++ - arch/arm64/kernel/iee/iee.c | 1359 ++++++++++++++ + arch/arm64/kernel/iee/iee-func.c | 187 +++ + arch/arm64/kernel/iee/iee-gate.S | 174 +++ + arch/arm64/kernel/iee/iee.c | 1360 +++++++++++++++++ arch/arm64/kernel/koi/Makefile | 1 + - arch/arm64/kernel/koi/koi.c | 1327 ++++++++++++++ + arch/arm64/kernel/koi/koi.c | 1327 +++++++++++++++++ arch/arm64/kernel/mte.c | 5 + - arch/arm64/kernel/process.c | 13 + + arch/arm64/kernel/process.c | 19 +- arch/arm64/kernel/proton-pack.c | 8 + - arch/arm64/kernel/setup.c | 35 + - arch/arm64/kernel/traps.c | 25 + - arch/arm64/kernel/vmlinux.lds.S | 70 + - arch/arm64/mm/context.c | 92 +- - arch/arm64/mm/fault.c | 4 + + arch/arm64/kernel/setup.c | 33 + + arch/arm64/kernel/traps.c | 26 + + arch/arm64/kernel/vmlinux.lds.S | 61 + + arch/arm64/mm/context.c | 91 +- + arch/arm64/mm/fault.c | 9 + arch/arm64/mm/fixmap.c | 74 +- arch/arm64/mm/init.c | 34 + - arch/arm64/mm/mmu.c | 2224 ++++++++++++++++++++--- + arch/arm64/mm/mmu.c | 1780 +++++++++++++++++++----
View file
_service:tar_scm:patch-6.6.0-6.0.0-rt20.patch
Changed
@@ -1,10 +1,10 @@ -From 6a8046066e4d49bf1ab1b8d80616cb60d021fa65 Mon Sep 17 00:00:00 2001 +From a8b87098c93aa630d286de4af9637a247d55a370 Mon Sep 17 00:00:00 2001 From: zhangyu <zhangyu4@kylinos.cn> -Date: Fri, 10 May 2024 12:14:44 +0800 -Subject: PATCH 1/2 rt +Date: Fri, 17 May 2024 15:06:01 +0800 +Subject: PATCH rpi-rt --- - arch/arm/Kconfig | 4 +- + arch/arm/Kconfig | 6 +- arch/arm/mm/fault.c | 6 + arch/arm/vfp/vfpmodule.c | 74 +- arch/arm64/Kconfig | 1 + @@ -17,7 +17,7 @@ arch/riscv/Kconfig | 2 + arch/riscv/include/asm/cpufeature.h | 2 - arch/riscv/include/asm/thread_info.h | 2 + - arch/riscv/kernel/cpufeature.c | 84 +- + arch/riscv/kernel/cpufeature.c | 90 +- arch/riscv/kernel/smpboot.c | 1 - arch/x86/Kconfig | 2 + arch/x86/include/asm/thread_info.h | 6 +- @@ -93,6 +93,7 @@ drivers/tty/serial/sa1100.c | 20 +- drivers/tty/serial/samsung_tty.c | 50 +- drivers/tty/serial/sb1250-duart.c | 12 +- + drivers/tty/serial/sc16is7xx.c | 5 + drivers/tty/serial/serial-tegra.c | 32 +- drivers/tty/serial/serial_core.c | 92 +- drivers/tty/serial/serial_mctrl_gpio.c | 4 +- @@ -116,18 +117,17 @@ drivers/tty/tty_io.c | 11 +- fs/proc/consoles.c | 14 +- include/linux/bottom_half.h | 2 + - include/linux/console.h | 152 ++ + include/linux/console.h | 150 ++ include/linux/entry-common.h | 2 +- include/linux/entry-kvm.h | 2 +- include/linux/interrupt.h | 29 + include/linux/netdevice.h | 4 + - include/linux/preempt.h | 10 +- include/linux/printk.h | 30 +- include/linux/sched.h | 16 +- include/linux/sched/idle.h | 8 +- include/linux/sched/rt.h | 4 + include/linux/serial_8250.h | 6 + - include/linux/serial_core.h | 44 +- + include/linux/serial_core.h | 43 +- include/linux/thread_info.h | 24 + include/linux/trace_events.h | 8 +- kernel/Kconfig.preempt | 17 +- @@ -146,7 +146,7 @@ kernel/printk/Makefile | 2 +- kernel/printk/internal.h | 121 ++ kernel/printk/nbcon.c | 1664 +++++++++++++++++ - kernel/printk/printk.c | 751 ++++++-- + kernel/printk/printk.c | 750 ++++++-- kernel/printk/printk_ringbuffer.c | 360 +++- kernel/printk/printk_ringbuffer.h | 54 +- kernel/printk/printk_safe.c | 12 + @@ -154,8 +154,8 @@ kernel/rcu/tree_stall.h | 5 + kernel/sched/core.c | 127 +- kernel/sched/debug.c | 19 + - kernel/sched/fair.c | 46 +- - kernel/sched/features.h | 1 + + kernel/sched/fair.c | 49 +- + kernel/sched/features.h | 2 +- kernel/sched/idle.c | 3 +- kernel/sched/rt.c | 5 +- kernel/sched/sched.h | 1 + @@ -168,11 +168,11 @@ kernel/trace/trace_output.c | 16 +- net/core/dev.c | 39 +- net/core/skbuff.c | 7 +- - 164 files changed, 5044 insertions(+), 1536 deletions(-) + 164 files changed, 5041 insertions(+), 1542 deletions(-) create mode 100644 kernel/printk/nbcon.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 2483ce304..107ceeb96 100644 +index 2483ce304..52707a682 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -34,6 +34,7 @@ config ARM @@ -192,6 +192,15 @@ select HAVE_ARCH_KFENCE if MMU && !XIP_KERNEL select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU select HAVE_ARCH_KASAN if MMU && !XIP_KERNEL +@@ -96,7 +97,7 @@ config ARM + select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE + select HAVE_EFFICIENT_UNALIGNED_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && MMU + select HAVE_EXIT_THREAD +- select HAVE_FAST_GUP if ARM_LPAE ++ select HAVE_FAST_GUP if ARM_LPAE && !(PREEMPT_RT && HIGHPTE) + select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL + select HAVE_FUNCTION_ERROR_INJECTION + select HAVE_FUNCTION_GRAPH_TRACER @@ -118,6 +119,7 @@ config ARM select HAVE_PERF_EVENTS select HAVE_PERF_REGS @@ -225,7 +234,7 @@ return 0; } diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c -index 7e8773a2d..9fde36fcb 100644 +index a1ff693e4..adcc34042 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -55,6 +55,34 @@ extern unsigned int VFP_arch_feroceon __alias(VFP_arch); @@ -263,7 +272,7 @@ /* * Is 'thread's most up to date state stored in this CPUs hardware? * Must be called from non-preemptible context. -@@ -240,7 +268,7 @@ static void vfp_panic(char *reason, u32 inst) +@@ -243,7 +271,7 @@ static void vfp_panic(char *reason, u32 inst) /* * Process bitmask of exception conditions. */ @@ -272,7 +281,7 @@ { int si_code = 0; -@@ -248,8 +276,7 @@ static void vfp_raise_exceptions(u32 exceptions, u32 inst, u32 fpscr, struct pt_ +@@ -251,8 +279,7 @@ static void vfp_raise_exceptions(u32 exceptions, u32 inst, u32 fpscr, struct pt_ if (exceptions == VFP_EXCEPTION_ERROR) { vfp_panic("unhandled bounce", inst); @@ -282,7 +291,7 @@ } /* -@@ -277,8 +304,7 @@ static void vfp_raise_exceptions(u32 exceptions, u32 inst, u32 fpscr, struct pt_ +@@ -280,8 +307,7 @@ static void vfp_raise_exceptions(u32 exceptions, u32 inst, u32 fpscr, struct pt_ RAISE(FPSCR_OFC, FPSCR_OFE, FPE_FLTOVF); RAISE(FPSCR_IOC, FPSCR_IOE, FPE_FLTINV); @@ -292,7 +301,7 @@ } /* -@@ -324,6 +350,8 @@ static u32 vfp_emulate_instruction(u32 inst, u32 fpscr, struct pt_regs *regs) +@@ -327,6 +353,8 @@ static u32 vfp_emulate_instruction(u32 inst, u32 fpscr, struct pt_regs *regs) static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) { u32 fpscr, orig_fpscr, fpsid, exceptions; @@ -301,7 +310,7 @@ pr_debug("VFP: bounce: trigger %08x fpexc %08x\n", trigger, fpexc); -@@ -369,8 +397,8 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) +@@ -372,8 +400,8 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) * unallocated VFP instruction but with FPSCR.IXE set and not * on VFP subarch 1. */ @@ -312,7 +321,7 @@ } /* -@@ -394,14 +422,14 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) +@@ -397,14 +425,14 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) */ exceptions = vfp_emulate_instruction(trigger, fpscr, regs); if (exceptions) @@ -329,7 +338,7 @@ /* * The barrier() here prevents fpinst2 being read -@@ -413,7 +441,13 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) +@@ -416,7 +444,13 @@ static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) emulate: exceptions = vfp_emulate_instruction(trigger, orig_fpscr, regs); if (exceptions) @@ -344,7 +353,7 @@ } static void vfp_enable(void *unused) -@@ -512,11 +546,9 @@ static inline void vfp_pm_init(void) { } +@@ -518,11 +552,9 @@ static inline void vfp_pm_init(void) { } */ void vfp_sync_hwstate(struct thread_info *thread) { @@ -358,7 +367,7 @@ u32 fpexc = fmrx(FPEXC); /* -@@ -527,8 +559,7 @@ void vfp_sync_hwstate(struct thread_info *thread) +@@ -534,8 +566,7 @@ void vfp_sync_hwstate(struct thread_info *thread) fmxr(FPEXC, fpexc); } @@ -368,7 +377,7 @@ } /* Ensure that the thread reloads the hardware VFP state on the next use. */ -@@ -683,7 +714,7 @@ static int vfp_support_entry(struct pt_regs *regs, u32 trigger) +@@ -695,7 +726,7 @@ static int vfp_support_entry(struct pt_regs *regs, u32 trigger) if (!user_mode(regs))
View file
_service:tar_scm:patch-6.6.0-6.0.0-rt20.patch-openeuler_defconfig.patch
Changed
@@ -1,6 +1,6 @@ -From 1d6979669dd8efc8ff55c6a8aa45b2c6c389aab2 Mon Sep 17 00:00:00 2001 +From cb6750f16a7d1d5074b0f7c46270014dd348a958 Mon Sep 17 00:00:00 2001 From: zhangyu <zhangyu4@kylinos.cn> -Date: Wed, 15 May 2024 09:06:43 +0800 +Date: Tue, 21 May 2024 14:50:20 +0800 Subject: PATCH rt2 --- @@ -9,7 +9,7 @@ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig -index 4932a6be9..24873c5be 100644 +index 3b8d78f94..6c7e6f2f9 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -97,7 +97,7 @@ CONFIG_PREEMPT_NONE=y @@ -21,15 +21,15 @@ # # CPU/Task time and stats accounting # -@@ -754,7 +754,7 @@ CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y +@@ -755,7 +755,7 @@ CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y CONFIG_KVM_XFER_TO_GUEST_WORK=y CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y CONFIG_KVM_HISI_VIRT=y -CONFIG_VIRTUALIZATION=y +#CONFIG_VIRTUALIZATION is not set CONFIG_KVM=y + CONFIG_CVM_HOST=y # CONFIG_NVHE_EL2_DEBUG is not set - CONFIG_KVM_ARM_MULTI_LPI_TRANSLATE_CACHE=y diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 9b5df8585..ece62e3df 100644 --- a/arch/x86/configs/openeuler_defconfig
View file
_service
Changed
@@ -2,7 +2,7 @@ <service name="tar_scm"> <param name="scm">git</param> <param name="url">git@gitee.com:xingmz/src-kernel.git</param> - <param name="revision">rebase-6.6.0-27.0.0</param> + <param name="revision">rebase-0523</param> <param name="submodules">disable</param> <param name="history-depth">1</param> <param name="exclude">*</param>
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2