From ee7d9cff629778e16d1a34abc04ea3d6524d56bb Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Tue, 7 Jun 2022 14:29:20 +0800 Subject: [PATCH] Revert "kernel: bump 5.15 to 5.15.44 (#9457)" This reverts commit 91b3516, fixes: #9483 --- package/kernel/linux/modules/crypto.mk | 27 +++++++++++ package/kernel/linux/modules/netsupport.mk | 1 + package/kernel/linux/modules/video.mk | 34 ++++++------- package/kernel/linux/modules/virt.mk | 55 +++++++--------------- 4 files changed, 63 insertions(+), 54 deletions(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index ecbae0eef..26a568fd3 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -446,6 +446,33 @@ endef $(eval $(call KernelPackage,crypto-kpp)) +define KernelPackage/crypto-lib-blake2s + TITLE:=BLAKE2s hash function library + KCONFIG:=CONFIG_CRYPTO_LIB_BLAKE2S + HIDDEN:=1 + FILES:= \ + $(LINUX_DIR)/lib/crypto/libblake2s.ko@lt5.9 \ + $(LINUX_DIR)/lib/crypto/libblake2s-generic.ko@lt5.9 + $(call AddDepends/crypto,+PACKAGE_kmod-crypto-hash:kmod-crypto-hash) +endef + +define KernelPackage/crypto-lib-blake2s/config + imply PACKAGE_kmod-crypto-hash +endef + +define KernelPackage/crypto-lib-blake2s/x86/64 + KCONFIG+=CONFIG_CRYPTO_BLAKE2S_X86 + FILES+=$(LINUX_DIR)/arch/x86/crypto/blake2s-x86_64.ko@lt5.9 +endef + +define KernelPackage/crypto-lib-blake2s/arm + KCONFIG+=CONFIG_CRYPTO_BLAKE2S_ARM + FILES+=$(LINUX_DIR)/arch/arm/crypto/blake2s-arm.ko@lt5.9 +endef + +$(eval $(call KernelPackage,crypto-lib-blake2s)) + + define KernelPackage/crypto-lib-chacha20 TITLE:=ChaCha library interface KCONFIG:=CONFIG_CRYPTO_LIB_CHACHA diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 97873a0bc..c02be04ed 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -1290,6 +1290,7 @@ define KernelPackage/wireguard SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=WireGuard secure network tunnel DEPENDS:= \ + +kmod-crypto-lib-blake2s \ +kmod-crypto-lib-chacha20poly1305 \ +kmod-crypto-lib-curve25519 \ +kmod-udptunnel4 \ diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index 55434e809..fcf50f009 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -1075,23 +1075,23 @@ define KernelPackage/drm-i915 SUBMENU:=$(VIDEO_MENU) TITLE:=Intel GPU drm support DEPENDS:=@TARGET_x86 +kmod-drm-ttm +kmod-drm-kms-helper +i915-firmware - KCONFIG:= \ - CONFIG_INTEL_GTT=y \ - CONFIG_DRM_I915=m \ - CONFIG_DRM_I915_CAPTURE_ERROR=y \ - CONFIG_DRM_I915_COMPRESS_ERROR=y \ - CONFIG_DRM_I915_USERPTR=y \ - CONFIG_DRM_I915_GVT=y \ - CONFIG_DRM_I915_WERROR=n \ - CONFIG_DRM_I915_DEBUG=n \ - CONFIG_DRM_I915_DEBUG_MMIO=n \ - CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS=n \ - CONFIG_DRM_I915_SW_FENCE_CHECK_DAG=n \ - CONFIG_DRM_I915_DEBUG_GUC=n \ - CONFIG_DRM_I915_SELFTEST=n \ - CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS=n \ - CONFIG_DRM_I915_DEBUG_VBLANK_EVADE=n \ - CONFIG_DRM_I915_DEBUG_RUNTIME_PM=n + KCONFIG:= \ + CONFIG_INTEL_GTT \ + CONFIG_DRM_I915 \ + CONFIG_DRM_I915_CAPTURE_ERROR \ + CONFIG_DRM_I915_COMPRESS_ERROR \ + CONFIG_DRM_I915_DEBUG=n \ + CONFIG_DRM_I915_DEBUG_GUC=n \ + CONFIG_DRM_I915_DEBUG_MMIO=n \ + CONFIG_DRM_I915_DEBUG_RUNTIME_PM=n \ + CONFIG_DRM_I915_DEBUG_VBLANK_EVADE=n \ + CONFIG_DRM_I915_GVT=y \ + CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS=n \ + CONFIG_DRM_I915_SELFTEST=n \ + CONFIG_DRM_I915_SW_FENCE_CHECK_DAG=n \ + CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS=n \ + CONFIG_DRM_I915_USERPTR=y \ + CONFIG_DRM_I915_WERROR=n FILES:=$(LINUX_DIR)/drivers/gpu/drm/i915/i915.ko AUTOLOAD:=$(call AutoProbe,i915) endef diff --git a/package/kernel/linux/modules/virt.mk b/package/kernel/linux/modules/virt.mk index 75edeeb7f..0cf7b63c3 100644 --- a/package/kernel/linux/modules/virt.mk +++ b/package/kernel/linux/modules/virt.mk @@ -20,9 +20,9 @@ define KernelPackage/kvm-x86 TITLE:=Kernel-based Virtual Machine (KVM) support DEPENDS:=@TARGET_x86_generic||TARGET_x86_64 +kmod-irqbypass KCONFIG:=\ - CONFIG_KVM \ - CONFIG_KVM_MMU_AUDIT=n \ - CONFIG_VIRTUALIZATION=y + CONFIG_KVM \ + CONFIG_KVM_MMU_AUDIT=n \ + CONFIG_VIRTUALIZATION=y FILES:= $(LINUX_DIR)/arch/$(LINUX_KARCH)/kvm/kvm.ko AUTOLOAD:=$(call AutoProbe,kvm.ko) endef @@ -78,17 +78,17 @@ define KernelPackage/vfio-mdev TITLE:=VFIO driver support to to virtualize devices DEPENDS:=@TARGET_x86_64 KCONFIG:= \ - CONFIG_IOMMU_API=y \ - CONFIG_MMU=y \ - CONFIG_VFIO=y \ - CONFIG_VFIO_NOIOMMU=y \ - CONFIG_VFIO_PCI=y \ - CONFIG_VFIO_PCI_IGD=y \ - CONFIG_VFIO_MDEV \ - CONFIG_VFIO_MDEV_DEVICE - FILES:= \ - $(LINUX_DIR)/drivers/vfio/mdev/mdev.ko \ - $(LINUX_DIR)/drivers/vfio/mdev/vfio_mdev.ko@lt5.10 + CONFIG_IOMMU_API=y \ + CONFIG_MMU=y \ + CONFIG_VFIO=y \ + CONFIG_VFIO_MDEV \ + CONFIG_VFIO_MDEV_DEVICE \ + CONFIG_VFIO_NOIOMMU=y \ + CONFIG_VFIO_PCI=y \ + CONFIG_VFIO_PCI_IGD=y + FILES:= \ + $(LINUX_DIR)/drivers/vfio/mdev/mdev.ko \ + $(LINUX_DIR)/drivers/vfio/mdev/vfio_mdev.ko@lt5.10 AUTOLOAD:=$(call AutoProbe,mdev vfio_mdev) endef @@ -102,34 +102,15 @@ define KernelPackage/i915-gvt SUBMENU:=Virtualization TITLE:=Enable KVM/VFIO support for Intel GVT-g DEPENDS:=@TARGET_x86_64 +kmod-kvm-intel +kmod-drm-i915 +kmod-vfio-mdev - KCONFIG:= \ - CONFIG_DRM_I915_GVT_KVMGT=m + KCONFIG:= CONFIG_DRM_I915_GVT_KVMGT FILES:=$(LINUX_DIR)/drivers/gpu/drm/i915/gvt/kvmgt.ko AUTOLOAD:=$(call AutoProbe,kvmgt) endef define KernelPackage/i915-gvt/description - Intel GVT-g is a technology that provides mediated device - passthrough for Intel GPUs (Broadwell and newer). It can - be used to virtualize the GPU for multiple guest virtual - machines, effectively providing near-native graphics performance - in the virtual machine and still letting your host use the - virtualized GPU normally. - - Choose this option if you want to enable Intel GVT-g graphics - virtualization technology host support with integrated graphics. - With GVT-g, it's possible to have one integrated graphics - device shared by multiple VMs under different hypervisors. - - Note that at least one hypervisor like Xen or KVM is required for - this driver to work, and it only supports newer device from - Broadwell+. For further information and setup guide, you can - visit: http://01.org/igvt-g. - - Now it's just a stub to support the modifications of i915 for - GVT device model. It requires at least one MPT modules for Xen/KVM - and other components of GVT device model to work. Use it under - you own risk. + Enable Intel GVT-g graphics virtualization technology host support with + integrated graphics. With GVT-g, it's possible to have one integrated + graphics device shared by multiple VMs under KVM. endef $(eval $(call KernelPackage,i915-gvt))