-
Notifications
You must be signed in to change notification settings - Fork 108
[Deepin-Kernel-SIG] [linux 6.18-y] [Deepin] Sync x86 and other config from branch linux-6.12.y #1477
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Deepin-Kernel-SIG] [linux 6.18-y] [Deepin] Sync x86 and other config from branch linux-6.12.y #1477
Conversation
deepin inclusion category: feature Support AUX clocks. Link: https://lwn.net/Articles/1021759/ Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Link:https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git/commit/?h=vfs-6.15.sysv&id=448fa70158f9b348e71869cfe4a31988e07b20b2 Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit f0ec658) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
enable USB_NET_RNDIS_HOST for android phone usbnet share (cherry picked from commit 021ef49) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Also refresh defconfig against the current tree. Signed-off-by: root <jeffbai@aosc.io> (cherry picked from commit 775a1884d2e770f2b5e8171ea2fb2472a8ea2d54) (cherry picked from commit c0c0e41) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
FQ Controlled Delay packet scheduling algorithm is widely used and no reason to use default pfifo-fast in our user environmet, and pfifo_fast does not prevent bufferbloat issues. With CONFIG_NET_SCH_DEFAULT users can change the default value via /proc/sys/net/core/default_qdisc Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1436945 https://bugs.launchpad.net/ubuntu/+bug/2003027 Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit cf7d846) Conflicts: arch/mips/configs/deepin_loongson3_desktop_defconfig arch/s390/configs/deepin_s390x_z13_defconfig (cherry picked from commit 0a77f8c) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Signed-off-by: Liu Yi <lhdjply@126.com> (cherry picked from commit dfdcf82) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
… drivers These config are planed to enable, but missed days ago. enable now to support IDE disks and other IDE devices. Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 74462be) (cherry picked from commit d254f92) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
…RCPU The config was missed, and it impacted the livecd installer speed in some device. enable it now. Link:deepin-community#44 Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 2238331) (cherry picked from commit 4090306) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
support xen virt. Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 9486b82) Conflicts: arch/x86/configs/deepin_x86_desktop_defconfig (cherry picked from commit d85094b) Signed-off-by: Wentao Guan <guanwentao@uniontech.com> Conflicts: arch/x86/configs/deepin_x86_desktop_defconfig
Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 8a02ca7) Signed-off-by: Wentao Guan <guanwentao@uniontech.com> Conflicts: arch/x86/configs/deepin_x86_desktop_defconfig
Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 3d6f6fa) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Link:https://discourse.nixos.org/t/system-wont-boot-path-efi-stub/29212/30 Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit c766571ec3a250ccbd614fcea50337c96f432579) (cherry picked from commit fc4450c) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
loongarch has already use hz=1000,set x86 and arm64. Link: deepin-community#628 Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 64978f6) Signed-off-by: Wentao Guan <guanwentao@uniontech.com> Conflicts: arch/x86/configs/deepin_x86_desktop_defconfig
Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 38d5fe6) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
select I2C_DESIGNWARE_CORE=m will causes I2C_DESIGNWARE_PLATFORM=m, and will causes INTEL_SOC_PMIC=y cannot be select. Fix it, Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit c45e785) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Link: https://bbs.deepin.org.cn/post/289237 Fixes: 775a1884d2e7 ("x86: configs: enable BT_INTEL_PCIE") (cherry picked from commit 9edae1e) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
commit e13fc4a ("deepin: config: enable RTW89_8852BTE config") enable it in branch linux-6.6.y, so enable it in branch linux-6.12.y Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit e018dd8) Signed-off-by: Wentao Guan <guanwentao@uniontech.com> Conflicts: arch/x86/configs/deepin_x86_desktop_defconfig
Users will be happly if we enable the feature. Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit c4ecdcd) Signed-off-by: Wentao Guan <guanwentao@uniontech.com> Conflicts: arch/arm64/configs/deepin_arm64_desktop_defconfig
We assume our users no use libc4 or earlier, so disable it. Link: https://cateee.net/lkddb/web-lkddb/USELIB.html Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit aa50abb) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 614b058) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
…nd codec drivers Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 7168c90) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: debug pm_debug is very useful for debugging suspend issues such as wakeup, and it has a dynamic debug output, used with kernel debug cmdline with: "no_console_suspend pm_debug_messages" to enable it. PM_ADVANCED_DEBUG is useful for debug device runtime powersaving: /sys/devices/.../power/runtime_usage,runtime_active_kids,runtime_enabled,async. Also clean useless config, CONFIG_PM_STD_PARTITION, which set by system runtime. Fixes: 00d6d38 ("arch: arm64: loongarch: x86: clean up release-bound kernel configs (deepin-community#335)") Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 6e621bb) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: feature our LoongArch has enable the config, many distro has enable it, just enable in x86 and arm64 now. (cherry picked from commit 025af43) Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit cbd2dac) Signed-off-by: Wentao Guan <guanwentao@uniontech.com> Conflicts: arch/x86/configs/deepin_x86_desktop_defconfig
…DC_MBIM deepin inclusion category: feature It has been enabled in 6.6, so enable USB_NET_CDC_MBIM and WDM now. Log: diff .config .config.old 4019c4019 < # CONFIG_USB_NET_CDC_MBIM is not set --- > CONFIG_USB_NET_CDC_MBIM=m 8919c8919 < # CONFIG_USB_WDM is not set --- > CONFIG_USB_WDM=m Reported-by: lihe <lihe@uniontech.com> Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 8247bb7) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
(cherry picked from commit 7a3ce1e) Signed-off-by: Wentao Guan <guanwentao@uniontech.com> Conflicts: arch/x86/configs/deepin_x86_desktop_defconfig
deepin inclusion category: bugfix Enable these usb_net configs which enabled in our 6.6 kernel but disabled in 6.12 for dependency by default. Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 912c0ea) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Reviewer's guide (collapsed on small PRs)Reviewer's GuideSynchronizes Deepin desktop defconfig settings for arm64, loongarch, and x86 in the 6.18-y branch with those from the linux-6.12.y branch, aligning architecture-specific kernel configuration options. File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull request overview
This pull request syncs Deepin desktop kernel defconfig files across three architectures (x86, arm64, and loongarch) from the linux-6.12.y branch to linux-6.18.y. The changes primarily enable additional hardware drivers, update configuration options to reflect new kernel features, and make the configurations more consistent across architectures.
Changes:
- Enable numerous new hardware drivers (CAN bus, PHY drivers, panel/bridge drivers, audio codecs)
- Add support for new kernel features (SCHED_CLASS_EXT, MEMCG_V1, NTSYNC, module compression)
- Enable additional debug options (PM_DEBUG, ACPI_DEBUG) and remove explicit disabling of SLUB_DEBUG and SCHED_DEBUG
- Remove some deprecated or superseded configuration options
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| arch/x86/configs/deepin_x86_desktop_defconfig | Major update adding ~800+ lines of new driver configs, particularly for DRM panels/bridges, CAN bus, networking, and audio codecs. Contains unresolved merge conflict marker. |
| arch/loongarch/configs/deepin_loongarch_desktop_defconfig | Smaller update adding RTW88/RTW89 WiFi driver variants, module compression, and removing deprecated CONFIG_USELIB and CONFIG_SYSV_FS |
| arch/arm64/configs/deepin_arm64_desktop_defconfig | Similar to loongarch, adds WiFi driver support, module compression, and removes CONFIG_PM_STD_PARTITION |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
deepin inclusion category: feature Tested on DMI: MECHREVO YAOSHI Series/YAOSHI Series-X6AR55xY, BIOS N.1.18MRO24 08/06/2025 case: Intel Ultra 2 i2c touchpad support Log: [ 4.671551] ntfs3: Warning: Activated 64 bits per cluster. Windows does not support this [ 4.671552] ntfs3: Read-only LZX/Xpress compression included [ 4.676241] nvidia 0000:02:00.0: vgaarb: VGA decodes changed: olddecodes=io+mem,decodes=none:owns=none [ 4.686034] intel-hid INTC10CB:00: failed to enable HID power button [ 4.689088] NVRM: loading NVIDIA UNIX Open Kernel Module for x86_64 580.119.02 Release Build (dvs-builder@U22-I3-B15-03-5) Mon Dec 8 07:51:55 UTC 2025 [ 4.698028] input: HDA NVidia HDMI/DP,pcm=3 as /devices/pci0000:00/0000:00:06.3/0000:02:00.1/sound/card0/input17 [ 4.728742] nvidia-modeset: Loading NVIDIA UNIX Open Kernel Mode Setting Driver for x86_64 580.119.02 Release Build (dvs-builder@U22-I3-B15-03-5) Mon Dec 8 07:38:31 UTC 2025 [ 4.729475] snd_hda_codec_realtek hdaudioC1D0: autoconfig for ALC274: line_outs=1 (0x17/0x0/0x0/0x0/0x0) type:speaker [ 4.729478] snd_hda_codec_realtek hdaudioC1D0: speaker_outs=0 (0x0/0x0/0x0/0x0/0x0) [ 4.729479] snd_hda_codec_realtek hdaudioC1D0: hp_outs=1 (0x21/0x0/0x0/0x0/0x0) [ 4.729480] snd_hda_codec_realtek hdaudioC1D0: mono: mono_out=0x0 [ 4.729481] snd_hda_codec_realtek hdaudioC1D0: inputs: [ 4.729482] snd_hda_codec_realtek hdaudioC1D0: Internal Mic=0x12 [ 4.729483] snd_hda_codec_realtek hdaudioC1D0: Headset Mic=0x19 [ 4.730400] RPC: Registered named UNIX socket transport module. [ 4.730403] RPC: Registered udp transport module. [ 4.730404] RPC: Registered tcp transport module. [ 4.730404] RPC: Registered tcp-with-tls transport module. [ 4.730405] RPC: Registered tcp NFSv4.1 backchannel transport module. [ 4.734010] [drm] [nvidia-drm] [GPU ID 0x00000200] Loading driver [ 4.734149] [drm] Initialized nvidia-drm 0.0.0 for 0000:02:00.0 on minor 1 [ 4.734181] input: HDA NVidia HDMI/DP,pcm=7 as /devices/pci0000:00/0000:00:06.3/0000:02:00.1/sound/card0/input18 [ 4.734187] usbcore: registered new interface driver btusb [ 4.734214] input: HDA NVidia HDMI/DP,pcm=8 as /devices/pci0000:00/0000:00:06.3/0000:02:00.1/sound/card0/input19 [ 4.734244] input: HDA NVidia HDMI/DP,pcm=9 as /devices/pci0000:00/0000:00:06.3/0000:02:00.1/sound/card0/input20 [ 4.735791] Bluetooth: hci0: Device revision is 0 [ 4.735793] Bluetooth: hci0: Secure boot is enabled [ 4.735794] Bluetooth: hci0: OTP lock is enabled [ 4.735795] Bluetooth: hci0: API lock is enabled [ 4.735796] Bluetooth: hci0: Debug lock is disabled [ 4.735796] Bluetooth: hci0: Minimum firmware build 1 week 10 2014 [ 4.735798] Bluetooth: hci0: Bootloader timestamp 2019.40 buildtype 1 build 38 [ 4.735986] Bluetooth: hci0: DSM reset method type: 0x00 [ 4.738584] Bluetooth: hci0: Found device firmware: intel/ibt-1040-0041.sfi [ 4.738591] Bluetooth: hci0: Boot Address: 0x100800 [ 4.738592] Bluetooth: hci0: Firmware Version: 200-48.24 [ 4.755172] input: UNIW0001:00 093A:0255 Mouse as /devices/pci0000:80/0000:80:15.3/i2c_designware.3/i2c-4/i2c-UNIW0001:00/0018:093A:0255.0001/input/input21 [ 4.755254] input: UNIW0001:00 093A:0255 Touchpad as /devices/pci0000:80/0000:80:15.3/i2c_designware.3/i2c-4/i2c-UNIW0001:00/0018:093A:0255.0001/input/input22 [ 4.755303] hid-multitouch 0018:093A:0255.0001: input,hidraw0: I2C HID v1.00 Mouse [UNIW0001:00 093A:0255] on i2c-UNIW0001:00 Reported-by: zhangpeng <zhangpenga@uniontech.com> Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 2321ad2) Signed-off-by: Wentao Guan <guanwentao@uniontech.com> Conflicts: arch/x86/configs/deepin_x86_desktop_defconfig
deepin inclusion category: feature Support module compress, and compress kernel modules to zstd format. Will help to less kernel module size which lays in user disk XXXMB. It will decrease /lib/modules/xxx/kernel/../*.ko to *.ko.zst ~70%, but increase image.deb ~70%. Log: before: image.deb 94MB du -sh /lib/modules/xxx 520MB after: image.deb 158MB du -sh /lib/modules/xxx 167MB The point is that disksize cost is more expensive than network. PS: do it in our 6.6 kernel need backport some KBUILDS commits, or will bring debuginfo to image.deb not image-dbg.deb... Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 8f0cc6b) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
bug details: https://lore.kernel.org/all/83061493-78ab-4bc6-b893-957453494ab2@hust.edu.cn/ by the way, netdevsim is not switched on in upstream by default, it's already 'n' for loong, arm and riscv in this repository Signed-off-by: xulang <xulang@uniontech.com> (cherry picked from commit 0d8a9aa) Signed-off-by: Wentao Guan <guanwentao@uniontech.com> Conflicts: arch/x86/configs/deepin_x86_desktop_defconfig
deepin inclusion category: feature enable landlock for our x86 config, it has been enabled in our riscv, arm64 and loongarch config, enable it in x86, and it will be used in pacman. Link: https://bbs.deepin.org.cn/post/295333 Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 3646e67) Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 89e96f3) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
…OUGH to default deepin inclusion category: other Removed CONFIG_IOMMU_DEFAULT_PASSTHROUGH=y from defconfig to enforce strict DMA isolation by default. This change aligns ARM64 desktop kernel configuration with other arch. The config also affect cix in link [1]. Note that may bring some affect in some phytium FT2000 or Kunpeng 920 device. Link: deepin-community#1335 Fixes: 7821b9fb89ca ("add deepin-community#880 config") Fixes: ce41a38 ("arm64: Add deepin_arm64_desktop_defconfig") Reported-by: Dylan.Wu" <Dylan.Wu@cixtech.com> Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 071876b) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
a286ce6 to
b9c52c4
Compare
deepin inclusion category: feature Enable it for Intel WiFi 7 device list here: /* FM RF */ IWL_DEV_INFO(iwl_rf_fm, iwl_be201_name, RF_TYPE(FM)), IWL_DEV_INFO(iwl_rf_fm, iwl_be401_name, RF_TYPE(FM), CDB), IWL_DEV_INFO(iwl_rf_fm, iwl_be200_name, RF_TYPE(FM), DEVICE(0x272B), DISCRETE), IWL_DEV_INFO(iwl_rf_fm_160mhz, iwl_be202_name, RF_TYPE(FM), BW_LIMITED), /* Killer CRFs */ IWL_DEV_INFO(iwl_rf_fm, iwl_killer_be1750s_name, SUBDEV(0x1771)), IWL_DEV_INFO(iwl_rf_fm, iwl_killer_be1750i_name, SUBDEV(0x1772)), IWL_DEV_INFO(iwl_rf_fm, iwl_killer_be1790s_name, SUBDEV(0x1791)), IWL_DEV_INFO(iwl_rf_fm, iwl_killer_be1790i_name, SUBDEV(0x1792)), /* Killer discrete */ IWL_DEV_INFO(iwl_rf_fm, iwl_killer_be1750w_name, DEVICE(0x272B), SUBDEV(0x1773)), IWL_DEV_INFO(iwl_rf_fm, iwl_killer_be1750x_name, DEVICE(0x272B), SUBDEV(0x1774)), /* WH RF */ IWL_DEV_INFO(iwl_rf_wh, iwl_be211_name, RF_TYPE(WH)), IWL_DEV_INFO(iwl_rf_wh_160mhz, iwl_be213_name, RF_TYPE(WH), BW_LIMITED), /* PE RF */ IWL_DEV_INFO(iwl_rf_pe, iwl_bn201_name, RF_TYPE(PE)), IWL_DEV_INFO(iwl_rf_pe, iwl_be223_name, RF_TYPE(PE), SUBDEV(0x0524)), IWL_DEV_INFO(iwl_rf_pe, iwl_be221_name, RF_TYPE(PE), SUBDEV(0x0324)), /* Killer */ IWL_DEV_INFO(iwl_rf_wh, iwl_killer_be1775s_name, SUBDEV(0x1776)), IWL_DEV_INFO(iwl_rf_wh, iwl_killer_be1775i_name, SUBDEV(0x1775)), IWL_DEV_INFO(iwl_rf_pe, iwl_killer_bn1850w2_name, SUBDEV(0x1851)), IWL_DEV_INFO(iwl_rf_pe, iwl_killer_bn1850i_name, SUBDEV(0x1852)), Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: dongert The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Summary by Sourcery
Sync Deepin desktop defconfig files for arm64, loongarch, and x86 architectures with settings from the linux-6.12.y branch.