diff --git a/0005-haoc-kernel.patch b/0005-haoc-kernel.patch index a002269d4b42ea1b88b43e2ed8583eacc0a2bfed..adaccd5d20ea9c6896a884c3376c97050d409f0a 100644 --- a/0005-haoc-kernel.patch +++ b/0005-haoc-kernel.patch @@ -1,12 +1,12 @@ -From 864df92273b90f69ebda21138aff2ffbeba2a602 Mon Sep 17 00:00:00 2001 +From 609d96438a540bf7737bce82e60e9e2e962d1ec7 Mon Sep 17 00:00:00 2001 From: Liu Zhehui -Date: Wed, 12 Mar 2025 10:17:23 +0000 -Subject: [PATCH] HAOC patch for SIP, PTRP, PTP +Date: Fri, 14 Mar 2025 03:55:04 +0000 +Subject: [PATCH] Update HAOC for 6.6.0-72.4.0 --- .../admin-guide/kernel-parameters.txt | 7 - arch/arm64/Kconfig | 28 - - arch/arm64/configs/openeuler_defconfig | 117 +- + arch/arm64/configs/openeuler_defconfig | 20 +- arch/arm64/include/asm/efi.h | 18 +- arch/arm64/include/asm/fixmap.h | 4 + arch/arm64/include/asm/haoc/haoc-bitmap.h | 78 + @@ -87,7 +87,7 @@ Subject: [PATCH] HAOC patch for SIP, PTRP, PTP arch/x86/Kconfig | 17 + arch/x86/boot/compressed/ident_map_64.c | 34 + arch/x86/boot/compressed/pgtable_64.c | 4 + - arch/x86/configs/openeuler_defconfig | 27 +- + arch/x86/configs/openeuler_defconfig | 3 +- arch/x86/include/asm/desc.h | 15 + arch/x86/include/asm/haoc/haoc-def.h | 33 +- arch/x86/include/asm/haoc/haoc.h | 32 +- @@ -186,7 +186,7 @@ Subject: [PATCH] HAOC patch for SIP, PTRP, PTP tools/trio/bpf/rio_tracker_mod/Makefile | 9 - tools/trio/bpf/rio_tracker_mod/rio_tracker.c | 370 ---- tools/trio/scripts/trace_parser.py | 287 --- - 182 files changed, 8652 insertions(+), 5209 deletions(-) + 182 files changed, 8595 insertions(+), 5145 deletions(-) create mode 100644 arch/arm64/include/asm/haoc/haoc-bitmap.h create mode 100644 arch/arm64/include/asm/haoc/iee-cred.h create mode 100644 arch/arm64/include/asm/haoc/iee-fixmap.h @@ -293,56 +293,10 @@ index 6f72be31061b..fd8277dd363c 100644 source "drivers/cpuidle/Kconfig" diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig -index 79b3616e0ec3..fc6053a500db 100644 +index 04c4b92e7377..d1b50e6c1f1d 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig -@@ -2,7 +2,6 @@ - # Automatically generated file; DO NOT EDIT. - # Linux/arm64 6.6.0 Kernel Configuration - # --CONFIG_GCC_ASM_GOTO_OUTPUT_BROKEN=y - CONFIG_IRQ_WORK=y - CONFIG_BUILDTIME_TABLE_SORT=y - CONFIG_THREAD_INFO_IN_TASK=y -@@ -179,6 +178,7 @@ CONFIG_FAIR_GROUP_SCHED=y - CONFIG_CFS_BANDWIDTH=y - CONFIG_RT_GROUP_SCHED=y - CONFIG_QOS_SCHED_DYNAMIC_AFFINITY=y -+# CONFIG_SCHED_MM_CID is not set - CONFIG_QOS_SCHED_SMART_GRID=y - CONFIG_CGROUP_PIDS=y - CONFIG_CGROUP_RDMA=y -@@ -249,14 +249,14 @@ CONFIG_SHMEM=y - CONFIG_AIO=y - CONFIG_IO_URING=y - CONFIG_ADVISE_SYSCALLS=y -+CONFIG_KABI_COMPAT=y -+CONFIG_KABI_RESERVE=y -+CONFIG_KABI_SIZE_ALIGN_CHECKS=y - CONFIG_MEMBARRIER=y - CONFIG_KALLSYMS=y - # CONFIG_KALLSYMS_SELFTEST is not set - CONFIG_KALLSYMS_ALL=y - CONFIG_KALLSYMS_BASE_RELATIVE=y --CONFIG_KABI_COMPAT=y --CONFIG_KABI_RESERVE=y --CONFIG_KABI_SIZE_ALIGN_CHECKS=y - CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y - CONFIG_KCMP=y - CONFIG_RSEQ=y -@@ -565,10 +565,10 @@ CONFIG_ARM64_EPAN=y - # ARMv8.8 architectural features - # - CONFIG_ARM64_NMI=y --CONFIG_ARM64_HAFT=y - # end of ARMv8.8 architectural features - - CONFIG_ARM64_SVE=y -+CONFIG_ARM64_SME=y - CONFIG_ARM64_PSEUDO_NMI=y - # CONFIG_ARM64_DEBUG_PRIORITY_MASKING is not set - CONFIG_IPI_AS_NMI=y -@@ -632,11 +632,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y +@@ -632,12 +632,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_CPUIDLE_HALTPOLL=y # end of Power management options @@ -350,41 +304,12 @@ index 79b3616e0ec3..fc6053a500db 100644 -# TLB options -# -# CONFIG_ARM64_TLBI_IPI is not set +-# end of TLB options - # # CPU Power Management # -@@ -648,14 +643,12 @@ CONFIG_CPU_IDLE=y - # CONFIG_CPU_IDLE_GOV_LADDER is not set - CONFIG_CPU_IDLE_GOV_MENU=y - CONFIG_CPU_IDLE_GOV_TEO=y --CONFIG_CPU_IDLE_GOV_HALTPOLL=y - - # - # ARM CPU Idle Drivers - # - # CONFIG_ARM_PSCI_CPUIDLE is not set - # end of ARM CPU Idle Drivers -- - CONFIG_HALTPOLL_CPUIDLE=y - # end of CPU Idle - -@@ -686,7 +679,6 @@ CONFIG_CPU_FREQ_GOV_SEEP=m - # CONFIG_CPUFREQ_DT is not set - # CONFIG_CPUFREQ_DT_PLATDEV is not set - CONFIG_ACPI_CPPC_CPUFREQ=m --CONFIG_CPPC_CPUFREQ_SYSFS_INTERFACE=y - CONFIG_ACPI_CPPC_CPUFREQ_FIE=y - CONFIG_ARM_SCPI_CPUFREQ=m - # CONFIG_ARM_QCOM_CPUFREQ_HW is not set -@@ -772,18 +764,13 @@ CONFIG_KVM_HISI_VIRT=y - CONFIG_VIRTUALIZATION=y - CONFIG_KVM=y - CONFIG_HISI_VIRTCCA_HOST=y -+CONFIG_HISI_VIRTCCA_CODA=y - # CONFIG_NVHE_EL2_DEBUG is not set - CONFIG_KVM_ARM_MULTI_LPI_TRANSLATE_CACHE=y - CONFIG_ARCH_VCPU_STAT=y +@@ -777,12 +771,6 @@ CONFIG_ARCH_VCPU_STAT=y CONFIG_VIRT_VTIMER_IRQ_BYPASS=y CONFIG_CPU_MITIGATIONS=y @@ -397,40 +322,7 @@ index 79b3616e0ec3..fc6053a500db 100644 # # General architecture-dependent options # -@@ -897,7 +884,6 @@ CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y - CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y - CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y - CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y --CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y - - # - # GCOV-based kernel profiling -@@ -906,12 +892,6 @@ CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y - CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y - # end of GCOV-based kernel profiling - --# --# Profile Guided Optimization (PGO) --# --CONFIG_ARCH_SUPPORTS_PGO_CLANG=y --# end of Profile Guided Optimization (PGO) -- - CONFIG_HAVE_GCC_PLUGINS=y - CONFIG_FUNCTION_ALIGNMENT_4B=y - CONFIG_FUNCTION_ALIGNMENT_8B=y -@@ -1190,7 +1170,6 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y - # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set - CONFIG_THP_SWAP=y - CONFIG_READ_ONLY_THP_FOR_FS=y --CONFIG_PGTABLE_HAS_HUGE_LEAVES=y - CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y - CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y - CONFIG_USE_PERCPU_NUMA_NODE_ID=y -@@ -1229,10 +1208,10 @@ CONFIG_USERSWAP=y - CONFIG_LRU_GEN=y - # CONFIG_LRU_GEN_ENABLED is not set - # CONFIG_LRU_GEN_STATS is not set -+CONFIG_ARM64_HAFT=y +@@ -1224,7 +1212,6 @@ CONFIG_ARM64_HAFT=y CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y @@ -438,201 +330,24 @@ index 79b3616e0ec3..fc6053a500db 100644 CONFIG_IOMMU_MM_DATA=y # CONFIG_ASCEND_FEATURES is not set CONFIG_PAGE_CACHE_LIMIT=y -@@ -1264,6 +1243,7 @@ CONFIG_NET_EGRESS=y - CONFIG_NET_XGRESS=y - CONFIG_NET_REDIRECT=y - CONFIG_SKB_EXTENSIONS=y -+# CONFIG_ETH_CAQM is not set - +@@ -2125,15 +2112,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # - # Networking options -@@ -1997,7 +1977,6 @@ CONFIG_FAILOVER=m - CONFIG_ETHTOOL_NETLINK=y - CONFIG_NETACC_BPF=y - CONFIG_NETACC_TERRACE=y --# CONFIG_ETH_CAQM is not set - - # - # Device Drivers -@@ -3129,8 +3108,6 @@ CONFIG_NET_VENDOR_BZWX=y - CONFIG_NCE=m - CONFIG_NE6X=m - CONFIG_NE6XVF=m --CONFIG_NET_VENDOR_NEBULA_MATRIX=y --CONFIG_NBL_CORE=m - # CONFIG_FDDI is not set - # CONFIG_HIPPI is not set - # CONFIG_NET_SB1000 is not set -@@ -3141,6 +3118,8 @@ CONFIG_SWPHY=y - CONFIG_PHYLIB_LEDS=y - CONFIG_FIXED_PHY=y - CONFIG_SFP=m -+CONFIG_NET_VENDOR_NEBULA_MATRIX=y -+CONFIG_NBL_CORE=m - + # Firmware loader # - # MII PHY device drivers -@@ -3175,7 +3154,7 @@ CONFIG_MICREL_PHY=m - CONFIG_MICROCHIP_PHY=m - # CONFIG_MICROCHIP_T1_PHY is not set - # CONFIG_MICROSEMI_PHY is not set --CONFIG_MOTORCOMM_PHY=m -+# CONFIG_MOTORCOMM_PHY is not set - CONFIG_NATIONAL_PHY=m - # CONFIG_NXP_CBTX_PHY is not set - # CONFIG_NXP_C45_TJA11XX_PHY is not set -@@ -3464,7 +3443,7 @@ CONFIG_INPUT=y - CONFIG_INPUT_LEDS=y - CONFIG_INPUT_FF_MEMLESS=y - CONFIG_INPUT_SPARSEKMAP=m --CONFIG_INPUT_MATRIXKMAP=m -+# CONFIG_INPUT_MATRIXKMAP is not set - CONFIG_INPUT_VIVALDIFMAP=y - - # -@@ -3485,33 +3464,33 @@ CONFIG_INPUT_KEYBOARD=y - # CONFIG_KEYBOARD_ADP5588 is not set - # CONFIG_KEYBOARD_ADP5589 is not set - CONFIG_KEYBOARD_ATKBD=y --CONFIG_KEYBOARD_QT1050=m --CONFIG_KEYBOARD_QT1070=m --CONFIG_KEYBOARD_QT2160=m --CONFIG_KEYBOARD_DLINK_DIR685=m --CONFIG_KEYBOARD_LKKBD=m --CONFIG_KEYBOARD_GPIO=m --CONFIG_KEYBOARD_GPIO_POLLED=m --CONFIG_KEYBOARD_TCA6416=m --CONFIG_KEYBOARD_TCA8418=m --CONFIG_KEYBOARD_MATRIX=m --CONFIG_KEYBOARD_LM8323=m --CONFIG_KEYBOARD_LM8333=m --CONFIG_KEYBOARD_MAX7359=m --CONFIG_KEYBOARD_MCS=m --CONFIG_KEYBOARD_MPR121=m --CONFIG_KEYBOARD_NEWTON=m --CONFIG_KEYBOARD_OPENCORES=m --CONFIG_KEYBOARD_PINEPHONE=m --CONFIG_KEYBOARD_SAMSUNG=m --CONFIG_KEYBOARD_STOWAWAY=m --CONFIG_KEYBOARD_SUNKBD=m --CONFIG_KEYBOARD_OMAP4=m --CONFIG_KEYBOARD_TM2_TOUCHKEY=m --CONFIG_KEYBOARD_XTKBD=m --CONFIG_KEYBOARD_CAP11XX=m --CONFIG_KEYBOARD_BCM=m --CONFIG_KEYBOARD_CYPRESS_SF=m -+# CONFIG_KEYBOARD_QT1050 is not set -+# CONFIG_KEYBOARD_QT1070 is not set -+# CONFIG_KEYBOARD_QT2160 is not set -+# CONFIG_KEYBOARD_DLINK_DIR685 is not set -+# CONFIG_KEYBOARD_LKKBD is not set -+# CONFIG_KEYBOARD_GPIO is not set -+# CONFIG_KEYBOARD_GPIO_POLLED is not set -+# CONFIG_KEYBOARD_TCA6416 is not set -+# CONFIG_KEYBOARD_TCA8418 is not set -+# CONFIG_KEYBOARD_MATRIX is not set -+# CONFIG_KEYBOARD_LM8323 is not set -+# CONFIG_KEYBOARD_LM8333 is not set -+# CONFIG_KEYBOARD_MAX7359 is not set -+# CONFIG_KEYBOARD_MCS is not set -+# CONFIG_KEYBOARD_MPR121 is not set -+# CONFIG_KEYBOARD_NEWTON is not set -+# CONFIG_KEYBOARD_OPENCORES is not set -+# CONFIG_KEYBOARD_PINEPHONE is not set -+# CONFIG_KEYBOARD_SAMSUNG is not set -+# CONFIG_KEYBOARD_STOWAWAY is not set -+# CONFIG_KEYBOARD_SUNKBD is not set -+# CONFIG_KEYBOARD_OMAP4 is not set -+# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set -+# CONFIG_KEYBOARD_XTKBD is not set -+# CONFIG_KEYBOARD_CAP11XX is not set -+# CONFIG_KEYBOARD_BCM is not set -+# CONFIG_KEYBOARD_CYPRESS_SF is not set - CONFIG_INPUT_MOUSE=y - CONFIG_MOUSE_PS2=y - CONFIG_MOUSE_PS2_ALPS=y -@@ -3568,7 +3547,6 @@ CONFIG_INPUT_UINPUT=m - # CONFIG_INPUT_IQS626A is not set - # CONFIG_INPUT_IQS7222 is not set - # CONFIG_INPUT_CMA3000 is not set --# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set - # CONFIG_INPUT_DRV260X_HAPTICS is not set - # CONFIG_INPUT_DRV2665_HAPTICS is not set - # CONFIG_INPUT_DRV2667_HAPTICS is not set -@@ -5335,7 +5313,6 @@ CONFIG_DVB_SP2=m - # Graphics support - # - CONFIG_APERTURE_HELPERS=y --CONFIG_SCREEN_INFO=y - CONFIG_VIDEO_CMDLINE=y - CONFIG_VIDEO_NOMODESET=y - CONFIG_AUXDISPLAY=y -@@ -5596,7 +5573,6 @@ CONFIG_FB_SYS_IMAGEBLIT=y - # CONFIG_FB_FOREIGN_ENDIAN is not set - CONFIG_FB_SYS_FOPS=y - CONFIG_FB_DEFERRED_IO=y --CONFIG_FB_IOMEM_FOPS=y - CONFIG_FB_IOMEM_HELPERS=y - CONFIG_FB_SYSMEM_HELPERS=y - CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y -@@ -6226,8 +6202,8 @@ CONFIG_INFINIBAND_USER_MEM=y - CONFIG_INFINIBAND_ON_DEMAND_PAGING=y - CONFIG_INFINIBAND_ADDR_TRANS=y - CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y --CONFIG_INFINIBAND_PEER_MEMORY=y - CONFIG_INFINIBAND_VIRT_DMA=y -+CONFIG_INFINIBAND_PEER_MEMORY=y - CONFIG_INFINIBAND_BNXT_RE=m - CONFIG_INFINIBAND_CXGB4=m - # CONFIG_INFINIBAND_EFA is not set -@@ -6465,6 +6441,7 @@ CONFIG_VFIO_PCI_INTX=y - CONFIG_VFIO_PCI=m - # CONFIG_MLX5_VFIO_PCI is not set - CONFIG_HISI_ACC_VFIO_PCI=m -+# CONFIG_QAT_VFIO_PCI is not set - # end of VFIO support for PCI devices - - # -@@ -6619,7 +6596,6 @@ CONFIG_XGENE_SLIMPRO_MBOX=m - # CONFIG_QCOM_IPCC is not set - CONFIG_IOMMU_IOVA=y - CONFIG_IOMMU_API=y --CONFIG_IOMMUFD_DRIVER=y - CONFIG_IOMMU_SUPPORT=y - - # -@@ -6640,7 +6616,6 @@ CONFIG_OF_IOMMU=y - CONFIG_IOMMU_DMA=y - CONFIG_IOMMU_SVA=y - CONFIG_IOMMU_IOPF=y --CONFIG_IOMMUFD_DRIVER_CORE=y - CONFIG_IOMMUFD=m - CONFIG_ARM_SMMU=y - # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set -@@ -6879,13 +6854,13 @@ CONFIG_ARM_PMU=y - CONFIG_ARM_PMU_ACPI=y - CONFIG_ARM_SMMU_V3_PMU=m - CONFIG_ARM_PMUV3=y -+CONFIG_ARM64_BRBE=y - # CONFIG_ARM_DSU_PMU is not set - CONFIG_QCOM_L2_PMU=y - CONFIG_QCOM_L3_PMU=y - CONFIG_THUNDERX2_PMU=m - CONFIG_XGENE_PMU=y - CONFIG_ARM_SPE_PMU=m --CONFIG_ARM64_BRBE=y - # CONFIG_ARM_DMC620_PMU is not set - # CONFIG_MARVELL_CN10K_TAD_PMU is not set - # CONFIG_ALIBABA_UNCORE_DRW_PMU is not set -@@ -6979,7 +6954,6 @@ CONFIG_CPU_INSPECTOR_ATF=m - - CONFIG_ROH=m - CONFIG_ROH_HNS=m --CONFIG_HISI_VIRTCCA_CODA=y - # end of Device Drivers - - # -@@ -7196,7 +7170,6 @@ CONFIG_EROFS_FS_POSIX_ACL=y +-CONFIG_FW_LOADER_COMPRESS=y +-CONFIG_FW_LOADER_COMPRESS_XZ=y +-CONFIG_FW_LOADER_COMPRESS_ZSTD=y + CONFIG_FW_LOADER=y + CONFIG_FW_LOADER_DEBUG=y + CONFIG_FW_LOADER_PAGED_BUF=y + CONFIG_FW_LOADER_SYSFS=y + CONFIG_EXTRA_FIRMWARE="" + # CONFIG_FW_LOADER_USER_HELPER is not set ++# CONFIG_FW_LOADER_COMPRESS is not set + CONFIG_FW_CACHE=y + CONFIG_FW_UPLOAD=y + # end of Firmware loader +@@ -7185,7 +7170,6 @@ CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y # CONFIG_EROFS_FS_ZIP is not set CONFIG_EROFS_FS_ONDEMAND=y @@ -640,47 +355,13 @@ index 79b3616e0ec3..fc6053a500db 100644 CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m CONFIG_NFS_V2=m -@@ -7456,6 +7429,8 @@ CONFIG_LIST_HARDENED=y - - CONFIG_RANDSTRUCT_NONE=y - # end of Kernel hardening options -+ -+# CONFIG_SECURITY_BOOT_INIT is not set - # end of Security options - - CONFIG_XOR_BLOCKS=m -@@ -7476,7 +7451,6 @@ CONFIG_CRYPTO_ALGAPI=y - CONFIG_CRYPTO_ALGAPI2=y - CONFIG_CRYPTO_AEAD=y - CONFIG_CRYPTO_AEAD2=y --CONFIG_CRYPTO_SIG=y - CONFIG_CRYPTO_SIG2=y - CONFIG_CRYPTO_SKCIPHER=y - CONFIG_CRYPTO_SKCIPHER2=y -@@ -7866,6 +7840,7 @@ CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y - CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y - CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y - CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y -+CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y - CONFIG_SWIOTLB=y - # CONFIG_SWIOTLB_DYNAMIC is not set - CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y -@@ -7889,6 +7864,7 @@ CONFIG_CMA_ALIGNMENT=8 - CONFIG_DMA_MAP_BENCHMARK=y - CONFIG_SGL_ALLOC=y - CONFIG_CHECK_SIGNATURE=y -+# CONFIG_FORCE_NR_CPUS is not set - CONFIG_CPU_RMAP=y - CONFIG_DQL=y - CONFIG_GLOB=y -@@ -7965,6 +7941,7 @@ CONFIG_DEBUG_INFO_BTF=y - CONFIG_PAHOLE_HAS_SPLIT_BTF=y - CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y - # CONFIG_DEBUG_INFO_BTF_MODULES is not set -+# CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set - # CONFIG_GDB_SCRIPTS is not set - CONFIG_FRAME_WARN=2048 - CONFIG_STRIP_ASM_SYMS=y +@@ -8255,4 +8239,4 @@ CONFIG_ARCH_USE_MEMTEST=y + # end of Rust hacking + # end of Kernel hacking + +-CONFIG_KWORKER_NUMA_AFFINITY=y ++CONFIG_KWORKER_NUMA_AFFINITY=y +\ No newline at end of file diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h index 7bb99c958455..bcd5622aa096 100644 --- a/arch/arm64/include/asm/efi.h @@ -9635,10 +9316,10 @@ index 7939eb6e6ce9..671867644355 100644 /* Restore trampoline memory */ memcpy(trampoline_32bit, trampoline_save, TRAMPOLINE_32BIT_SIZE); diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig -index 8eaa021779e1..adfaef0cb10c 100644 +index b86de4b7dbe8..f381e0a79f07 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig -@@ -3400,7 +3400,7 @@ CONFIG_MWIFIEX=m +@@ -3401,7 +3401,7 @@ CONFIG_MWIFIEX=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_USB=m @@ -9647,47 +9328,7 @@ index 8eaa021779e1..adfaef0cb10c 100644 CONFIG_WLAN_VENDOR_MEDIATEK=y CONFIG_MT7601U=m CONFIG_MT76_CORE=m -@@ -3410,19 +3410,19 @@ CONFIG_MT76x02_LIB=m - CONFIG_MT76x02_USB=m - CONFIG_MT76x0_COMMON=m - CONFIG_MT76x0U=m --CONFIG_MT76x0E=m -+# CONFIG_MT76x0E is not set - CONFIG_MT76x2_COMMON=m --CONFIG_MT76x2E=m -+# CONFIG_MT76x2E is not set - CONFIG_MT76x2U=m --CONFIG_MT7603E=m --CONFIG_MT7615E=m --CONFIG_MT7663U=m --CONFIG_MT7663S=m --CONFIG_MT7915E=m --CONFIG_MT7921E=m --CONFIG_MT7921S=m --CONFIG_MT7921U=m --CONFIG_MT7996E=m -+# CONFIG_MT7603E is not set -+# CONFIG_MT7615E is not set -+# CONFIG_MT7663U is not set -+# CONFIG_MT7663S is not set -+# CONFIG_MT7915E is not set -+# CONFIG_MT7921E is not set -+# CONFIG_MT7921S is not set -+# CONFIG_MT7921U is not set -+# CONFIG_MT7996E is not set - CONFIG_WLAN_VENDOR_MICROCHIP=y - # CONFIG_WILC1000_SDIO is not set - # CONFIG_WILC1000_SPI is not set -@@ -6489,7 +6489,7 @@ CONFIG_USB_HIDDEV=y - # end of USB HID support - - CONFIG_I2C_HID=m --CONFIG_I2C_HID_ACPI=m -+# CONFIG_I2C_HID_ACPI is not set - # CONFIG_I2C_HID_OF is not set - - # -@@ -8349,7 +8349,6 @@ CONFIG_EROFS_FS_POSIX_ACL=y +@@ -8393,7 +8393,6 @@ CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y # CONFIG_EROFS_FS_ZIP is not set CONFIG_EROFS_FS_ONDEMAND=y diff --git a/haoc-kernel.spec b/haoc-kernel.spec index cb21a36aa831f66f7118352aceaf8c0a4c489d64..bebd89af49d182909028d184013be03d4770506a 100644 --- a/haoc-kernel.spec +++ b/haoc-kernel.spec @@ -42,7 +42,7 @@ rm -f test_openEuler_sign.ko test_openEuler_sign.ko.sig %global upstream_sublevel 0 %global devel_release 72 %global maintenance_release .4.0 -%global pkg_release .48 +%global pkg_release .49 %global openeuler_lts 1 %global openeuler_major 2503 @@ -1088,6 +1088,9 @@ fi %endif %changelog +* Fri Mar 14 2025 Liu Zhehui - 6.6.0-72.4.0.49 +- Fix some build error in ARM64. + * Thu Mar 12 2025 Liu Zhehui - 6.6.0-72.4.0.48 - Update HAOC for 6.6.0-72.4.0, add support for PTP,SIP,PTRP