From 77e4c9ec8bff4febcc21edcf86fef2b8ad418a31 Mon Sep 17 00:00:00 2001 From: Jeevaka Prabu Badrappan Date: Wed, 7 Aug 2024 12:54:56 +0530 Subject: [PATCH] Update host kernel config, scripts and diff patches for v6.1.92 rebase Tests done: - Host kernel build - Ubuntu boot with generated kernel Tracked-On: OAM-123153 Signed-off-by: Jeevaka Prabu Badrappan --- ...01-Resolving-the-conflict-in-drivers.patch | 30 ----- ...rm-i915-display-Fix-phys_base-in-MTL.patch | 29 ---- host/kernel/lts2022-chromium/build_weekly.sh | 3 +- host/kernel/lts2022-chromium/x86_64_defconfig | 127 ++++++++++-------- 4 files changed, 70 insertions(+), 119 deletions(-) delete mode 100644 host/kernel/lts2022-chromium/0001-Resolving-the-conflict-in-drivers.patch delete mode 100644 host/kernel/lts2022-chromium/0002-Revert-FIXUP-drm-i915-display-Fix-phys_base-in-MTL.patch diff --git a/host/kernel/lts2022-chromium/0001-Resolving-the-conflict-in-drivers.patch b/host/kernel/lts2022-chromium/0001-Resolving-the-conflict-in-drivers.patch deleted file mode 100644 index 73bdfc6723..0000000000 --- a/host/kernel/lts2022-chromium/0001-Resolving-the-conflict-in-drivers.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b06291160d34cdd901df802728984b66e4a42799 Mon Sep 17 00:00:00 2001 -From: Manvi Bajaj -Date: Wed, 27 Mar 2024 14:39:24 +0530 -Subject: [PATCH] Resolving the conflict in drivers. - -This patch resolves the conflict present in video drivers for proper -functionality. - -Tracked-On: -Signed-off-by: Manvi Bajaj ---- - drivers/video/fbdev/hyperv_fb.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c -index 01f762214dc2..5d937bb1df6f 100644 ---- a/drivers/video/fbdev/hyperv_fb.c -+++ b/drivers/video/fbdev/hyperv_fb.c -@@ -1073,7 +1073,7 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info) - info->screen_size = dio_fb_size; - - getmem_done: -- aperture_remove_conflicting_devices(base, size, KBUILD_MODNAME); -+ aperture_remove_conflicting_devices(base, size, false, KBUILD_MODNAME); - - if (gen2vm) { - /* framebuffer is reallocated, clear screen_info to avoid misuse from kexec */ --- -2.17.1 - diff --git a/host/kernel/lts2022-chromium/0002-Revert-FIXUP-drm-i915-display-Fix-phys_base-in-MTL.patch b/host/kernel/lts2022-chromium/0002-Revert-FIXUP-drm-i915-display-Fix-phys_base-in-MTL.patch deleted file mode 100644 index e8f4efff71..0000000000 --- a/host/kernel/lts2022-chromium/0002-Revert-FIXUP-drm-i915-display-Fix-phys_base-in-MTL.patch +++ /dev/null @@ -1,29 +0,0 @@ -From babb86eb7b14c170b70ce8e4605268497a1c6806 Mon Sep 17 00:00:00 2001 -From: sgnanase -Date: Tue, 2 Apr 2024 22:00:10 +0530 -Subject: [PATCH] Revert "FIXUP: drm/i915/display: Fix phys_base in MTL" - -This reverts commit fa0cbf244c0aeaf7f509f5f0b3d57572dda446b5. ---- - drivers/gpu/drm/i915/display/intel_plane_initial.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c -index 55851fba914a..736072a8b2b0 100644 ---- a/drivers/gpu/drm/i915/display/intel_plane_initial.c -+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c -@@ -89,10 +89,7 @@ initial_plane_vma(struct drm_i915_private *i915, - "Using phys_base=%pa, based on initial plane programming\n", - &phys_base); - } else { -- if (IS_METEORLAKE_P(i915)) -- phys_base = 0; -- else -- phys_base = base; -+ phys_base = base; - mem = i915->mm.stolen_region; - } - --- -2.17.1 - diff --git a/host/kernel/lts2022-chromium/build_weekly.sh b/host/kernel/lts2022-chromium/build_weekly.sh index 31d9054390..4671ca4077 100755 --- a/host/kernel/lts2022-chromium/build_weekly.sh +++ b/host/kernel/lts2022-chromium/build_weekly.sh @@ -23,12 +23,11 @@ cd host_kernel git clone https://github.com/projectceladon/vendor-intel-utils.git cd vendor-intel-utils -git checkout b29ac676304fe6d9df26e45ac7a6f197ae8f68e2 cd ../ git clone https://github.com/projectceladon/linux-intel-lts2022-chromium.git cd linux-intel-lts2022-chromium -git checkout 3ac5aa048639a40e29d2c773c5451afdc661c47f +git checkout 2fe084abc93d0fe7dff4fc7680d6b89ec613c8be cp ../vendor-intel-utils/host/kernel/lts2022-chromium/x86_64_defconfig .config patch_list=`find ../vendor-intel-utils/host/kernel/lts2022-chromium -iname "*.patch" | sort -u` diff --git a/host/kernel/lts2022-chromium/x86_64_defconfig b/host/kernel/lts2022-chromium/x86_64_defconfig index a7020af2e1..9525b2028c 100644 --- a/host/kernel/lts2022-chromium/x86_64_defconfig +++ b/host/kernel/lts2022-chromium/x86_64_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.1.61 Kernel Configuration +# Linux/x86_64 6.1.92 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 9.4.0-1ubuntu1~18.04) 9.4.0" CONFIG_CC_IS_GCC=y @@ -45,7 +45,6 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_ZSTD is not set CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_HOSTNAME="(none)" -# CONFIG_DISK_BASED_SWAP is not set CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_SYSVIPC_COMPAT=y @@ -118,6 +117,7 @@ CONFIG_BPF_JIT=y CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_BPF_JIT_DEFAULT_ON=y CONFIG_BPF_UNPRIV_DEFAULT_OFF=y +# CONFIG_BPF_DYNPTR is not set CONFIG_USERMODE_DRIVER=y # CONFIG_BPF_PRELOAD is not set # CONFIG_BPF_LSM is not set @@ -185,7 +185,7 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" -CONFIG_GCC11_NO_ARRAY_BOUNDS=y +CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y @@ -362,6 +362,7 @@ CONFIG_XEN_PVH=y CONFIG_XEN_DOM0=y CONFIG_XEN_PV_MSR_SAFE=y CONFIG_KVM_GUEST=y +# CONFIG_PARAVIRT_SCHED is not set CONFIG_ARCH_CPUIDLE_HALTPOLL=y CONFIG_PVH=y # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set @@ -439,7 +440,6 @@ CONFIG_X86_DIRECT_GBPAGES=y # CONFIG_X86_CPA_STATISTICS is not set CONFIG_X86_MEM_ENCRYPT=y CONFIG_AMD_MEM_ENCRYPT=y -# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set CONFIG_NUMA=y CONFIG_AMD_NUMA=y CONFIG_X86_64_ACPI_NUMA=y @@ -470,6 +470,7 @@ CONFIG_X86_INTEL_TSX_MODE_OFF=y # CONFIG_X86_SGX is not set CONFIG_EFI=y CONFIG_EFI_STUB=y +CONFIG_EFI_HANDOVER_PROTOCOL=y CONFIG_EFI_MIXED=y # CONFIG_HZ_100 is not set CONFIG_HZ_250=y @@ -505,7 +506,7 @@ CONFIG_LIVEPATCH=y # end of Processor type and features CONFIG_CC_HAS_RETURN_THUNK=y -CONFIG_SPECULATION_MITIGATIONS=y +CONFIG_CPU_MITIGATIONS=y CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_RETPOLINE=y CONFIG_RETHUNK=y @@ -514,6 +515,8 @@ CONFIG_CPU_IBPB_ENTRY=y CONFIG_CPU_IBRS_ENTRY=y CONFIG_CPU_SRSO=y # CONFIG_GDS_FORCE_MITIGATION is not set +CONFIG_MITIGATION_RFDS=y +CONFIG_MITIGATION_SPECTRE_BHI=y CONFIG_ARCH_HAS_ADD_PAGES=y CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y @@ -527,6 +530,9 @@ CONFIG_SUSPEND_FREEZER=y CONFIG_HIBERNATE_CALLBACKS=y CONFIG_HIBERNATION=y CONFIG_HIBERNATION_SNAPSHOT_DEV=y +CONFIG_HIBERNATION_COMP_LZO=y +# CONFIG_HIBERNATION_COMP_LZ4 is not set +CONFIG_HIBERNATION_DEF_COMP="lzo" CONFIG_PM_STD_PARTITION="" CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y @@ -718,9 +724,11 @@ CONFIG_KVM_AMD=m CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_XEN is not set CONFIG_KVM_EXTERNAL_WRITE_TRACKING=y +# CONFIG_PARAVIRT_SCHED_KVM is not set CONFIG_AS_AVX512=y CONFIG_AS_SHA1_NI=y CONFIG_AS_SHA256_NI=y +CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y # # General architecture-dependent options @@ -1099,6 +1107,7 @@ CONFIG_ARCH_WANTS_THP_SWAP=y CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +# CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set CONFIG_THP_SWAP=y # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y @@ -1143,7 +1152,6 @@ CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y CONFIG_PTE_MARKER=y CONFIG_PTE_MARKER_UFFD_WP=y # CONFIG_LRU_GEN is not set -# CONFIG_LOW_MEM_NOTIFY is not set CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y @@ -1756,10 +1764,8 @@ CONFIG_NET_SCHED=y # # Queueing/Scheduling # -CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m CONFIG_NET_SCH_PRIO=m CONFIG_NET_SCH_MULTIQ=m CONFIG_NET_SCH_RED=m @@ -1771,7 +1777,6 @@ CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_ETF=m # CONFIG_NET_SCH_TAPRIO is not set CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_DRR=m CONFIG_NET_SCH_MQPRIO=m @@ -2565,6 +2570,7 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y # CONFIG_ZRAM_DEF_COMP_842 is not set CONFIG_ZRAM_DEF_COMP="lzo-rle" CONFIG_ZRAM_WRITEBACK=y +CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y CONFIG_ZRAM_MEMORY_TRACKING=y # CONFIG_ZRAM_MULTI_COMP is not set CONFIG_BLK_DEV_LOOP=y @@ -3278,9 +3284,6 @@ CONFIG_ICE_SWITCHDEV=y CONFIG_ICE_HWTS=y CONFIG_FM10K=m CONFIG_IGC=y -CONFIG_NET_VENDOR_WANGXUN=y -# CONFIG_NGBE is not set -# CONFIG_TXGBE is not set CONFIG_JME=m CONFIG_NET_VENDOR_ADI=y # CONFIG_ADIN1110 is not set @@ -3431,7 +3434,6 @@ CONFIG_STMMAC_ETH=m CONFIG_STMMAC_PLATFORM=m CONFIG_DWMAC_GENERIC=m CONFIG_DWMAC_INTEL=m -# CONFIG_DWMAC_LOONGSON is not set # CONFIG_STMMAC_PCI is not set CONFIG_NET_VENDOR_SUN=y CONFIG_HAPPYMEAL=m @@ -3452,6 +3454,9 @@ CONFIG_NET_VENDOR_VIA=y CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_WANGXUN=y +# CONFIG_NGBE is not set +# CONFIG_TXGBE is not set CONFIG_NET_VENDOR_WIZNET=y CONFIG_WIZNET_W5100=m CONFIG_WIZNET_W5300=m @@ -4212,7 +4217,6 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_EDT_FT5X06=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m CONFIG_TOUCHSCREEN_UCB1400=m CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_WDT87XX_I2C=m @@ -5504,7 +5508,6 @@ CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SKY81452=m CONFIG_MFD_SYSCON=y -CONFIG_MFD_TI_AM335X_TSCADC=m CONFIG_MFD_LP3943=m CONFIG_MFD_LP8788=y CONFIG_MFD_TI_LMU=m @@ -6574,6 +6577,27 @@ CONFIG_DVB_DUMMY_FE=m CONFIG_APERTURE_HELPERS=y CONFIG_VIDEO_CMDLINE=y CONFIG_VIDEO_NOMODESET=y +CONFIG_AUXDISPLAY=y +CONFIG_CHARLCD=m +CONFIG_LINEDISP=m +CONFIG_HD44780_COMMON=m +CONFIG_HD44780=m +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_IMG_ASCII_LCD=m +# CONFIG_HT16K33 is not set +# CONFIG_LCD2S is not set +CONFIG_PARPORT_PANEL=m +CONFIG_PANEL_PARPORT=0 +CONFIG_PANEL_PROFILE=5 +# CONFIG_PANEL_CHANGE_MESSAGE is not set +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set +CONFIG_CHARLCD_BL_FLASH=y +CONFIG_PANEL=m CONFIG_AGP=y CONFIG_AGP_AMD64=y CONFIG_AGP_INTEL=y @@ -6683,6 +6707,7 @@ CONFIG_DRM_PANEL_BRIDGE=y # CONFIG_DRM_ANALOGIX_ANX78XX is not set # end of Display Interface Bridges +# CONFIG_DRM_LOONGSON is not set # CONFIG_DRM_ETNAVIV is not set # CONFIG_DRM_BOCHS is not set # CONFIG_DRM_CIRRUS_QEMU is not set @@ -6715,28 +6740,9 @@ CONFIG_DRM_PRIVACY_SCREEN=y # # Frame buffer Devices # -CONFIG_FB_NOTIFY=y CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_DDC=m -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_SYS_FILLRECT=m -CONFIG_FB_SYS_COPYAREA=m -CONFIG_FB_SYS_IMAGEBLIT=m -# CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=m -CONFIG_FB_DEFERRED_IO=y CONFIG_FB_HECUBA=m CONFIG_FB_SVGALIB=m -CONFIG_FB_BACKLIGHT=m -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y - -# -# Frame buffer hardware drivers -# CONFIG_FB_CIRRUS=m CONFIG_FB_PM2=m CONFIG_FB_PM2_FIFO_DISCONNECT=y @@ -6822,6 +6828,26 @@ CONFIG_FB_HYPERV=m CONFIG_FB_SIMPLE=y # CONFIG_FB_SSD1307 is not set CONFIG_FB_SM712=m +CONFIG_FB_CORE=y +CONFIG_FB_NOTIFY=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_DEVICE=y +CONFIG_FB_DDC=m +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +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_HELPERS=y +CONFIG_FB_SYSMEM_HELPERS=y +CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y +CONFIG_FB_BACKLIGHT=m +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y # end of Frame buffer Devices # @@ -8511,27 +8537,6 @@ CONFIG_UDMABUF=y # end of DMABUF options CONFIG_DCA=m -CONFIG_AUXDISPLAY=y -CONFIG_CHARLCD=m -CONFIG_LINEDISP=m -CONFIG_HD44780_COMMON=m -CONFIG_HD44780=m -CONFIG_KS0108=m -CONFIG_KS0108_PORT=0x378 -CONFIG_KS0108_DELAY=2 -CONFIG_CFAG12864B=m -CONFIG_CFAG12864B_RATE=20 -CONFIG_IMG_ASCII_LCD=m -# CONFIG_HT16K33 is not set -# CONFIG_LCD2S is not set -CONFIG_PARPORT_PANEL=m -CONFIG_PANEL_PARPORT=0 -CONFIG_PANEL_PROFILE=5 -# CONFIG_PANEL_CHANGE_MESSAGE is not set -# CONFIG_CHARLCD_BL_OFF is not set -# CONFIG_CHARLCD_BL_ON is not set -CONFIG_CHARLCD_BL_FLASH=y -CONFIG_PANEL=m CONFIG_UIO=m CONFIG_UIO_CIF=m CONFIG_UIO_PDRV_GENIRQ=m @@ -9092,6 +9097,7 @@ CONFIG_INTEL_IOMMU_SVM=y # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_PERF_EVENTS=y CONFIG_IRQ_REMAP=y CONFIG_HYPERV_IOMMU=y # CONFIG_VIRTIO_IOMMU is not set @@ -9350,7 +9356,6 @@ CONFIG_TI_ADS7950=m # CONFIG_TI_ADS8688 is not set # CONFIG_TI_ADS124S08 is not set # CONFIG_TI_ADS131E08 is not set -CONFIG_TI_AM335X_ADC=m CONFIG_TI_TLC4541=m # CONFIG_TI_TSC2046 is not set CONFIG_TWL4030_MADC=m @@ -10259,7 +10264,7 @@ CONFIG_NFS_DEBUG=y CONFIG_NFS_DISABLE_UDP_SUPPORT=y # CONFIG_NFS_V4_2_READ_PLUS is not set CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y +# CONFIG_NFSD_V2 is not set CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NFSD_PNFS=y @@ -10481,6 +10486,13 @@ CONFIG_INIT_STACK_NONE=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # end of Memory initialization +# +# Hardening of kernel data structures +# +# CONFIG_LIST_HARDENED is not set +# CONFIG_BUG_ON_DATA_CORRUPTION is not set +# end of Hardening of kernel data structures + CONFIG_RANDSTRUCT_NONE=y # end of Kernel hardening options @@ -11138,7 +11150,6 @@ CONFIG_STACKTRACE=y # CONFIG_DEBUG_PLIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set -# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_DEBUG_MAPLE_TREE is not set # end of Debug kernel data structures