From 451fc0189f4038dd99d10d556dd54229a114adb3 Mon Sep 17 00:00:00 2001 From: lean Date: Tue, 30 Aug 2022 16:25:01 +0800 Subject: [PATCH] x86: load HuC firmware by default for Intel gen9+ --- config/Config-images.in | 4 ++-- target/linux/x86/Makefile | 2 +- .../linux/x86/patches-5.15/992-enable-intel-guc.patch | 11 +++++++++++ .../linux/x86/patches-5.19/992-enable-intel-guc.patch | 11 +++++++++++ 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 target/linux/x86/patches-5.15/992-enable-intel-guc.patch create mode 100644 target/linux/x86/patches-5.19/992-enable-intel-guc.patch diff --git a/config/Config-images.in b/config/Config-images.in index fa219ca44..06a7dc0f3 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -287,7 +287,7 @@ menu "Target Images" config TARGET_IMAGES_GZIP bool "GZip images" depends on TARGET_ROOTFS_EXT4FS || TARGET_x86 || TARGET_armvirt || TARGET_malta - default n + default y comment "Image Options" @@ -304,7 +304,7 @@ menu "Target Images" config TARGET_ROOTFS_PARTSIZE int "Root filesystem partition size (in MB)" depends on USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS || TARGET_omap || TARGET_sunxi || TARGET_uml - default 160 + default 480 help Select the root filesystem partition size. diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 44a864b01..7a8d7576c 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs kmod-button-hotplug kmod-usb-hid kmod-mmc kmod-sdhci usbutils pciutils \ kmod-alx kmod-e1000e kmod-igb kmod-igc kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-via-velocity kmod-vmxnet3 kmod-i40e kmod-i40evf kmod-r8125 kmod-8139cp kmod-8139too kmod-fs-f2fs cfdisk \ -htop lm-sensors autocore-x86 automount autosamba luci-app-adbyby-plus luci-app-ipsec-vpnd luci-proto-bonding \ +htop lm-sensors iperf3 autocore-x86 automount autosamba luci-app-adbyby-plus luci-app-ipsec-vpnd luci-proto-bonding luci-app-diskman \ luci-app-unblockmusic luci-app-zerotier luci-app-xlnetacc ddns-scripts_aliyun ddns-scripts_dnspod ca-bundle luci-app-wireguard luci-app-ttyd \ kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-codec-via kmod-sound-via82xx kmod-sound-hda-intel kmod-sound-hda-codec-hdmi kmod-sound-i8x0 kmod-usb-audio \ kmod-usb-net kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8150 kmod-usb-net-rtl8152-vendor kmod-mlx4-core kmod-mlx5-core kmod-drm-i915 kmod-i915-gvt diff --git a/target/linux/x86/patches-5.15/992-enable-intel-guc.patch b/target/linux/x86/patches-5.15/992-enable-intel-guc.patch new file mode 100644 index 000000000..1b6df88e5 --- /dev/null +++ b/target/linux/x86/patches-5.15/992-enable-intel-guc.patch @@ -0,0 +1,11 @@ +--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c ++++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c +@@ -26,7 +26,7 @@ static void uc_expand_default_options(st + return; + + /* Don't enable GuC/HuC on pre-Gen12 */ +- if (GRAPHICS_VER(i915) < 12) { ++ if (GRAPHICS_VER(i915) < 9) { + i915->params.enable_guc = 0; + return; + } diff --git a/target/linux/x86/patches-5.19/992-enable-intel-guc.patch b/target/linux/x86/patches-5.19/992-enable-intel-guc.patch new file mode 100644 index 000000000..1b6df88e5 --- /dev/null +++ b/target/linux/x86/patches-5.19/992-enable-intel-guc.patch @@ -0,0 +1,11 @@ +--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c ++++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c +@@ -26,7 +26,7 @@ static void uc_expand_default_options(st + return; + + /* Don't enable GuC/HuC on pre-Gen12 */ +- if (GRAPHICS_VER(i915) < 12) { ++ if (GRAPHICS_VER(i915) < 9) { + i915->params.enable_guc = 0; + return; + }