Skip to content

Conversation

@opsiff
Copy link
Member

@opsiff opsiff commented Dec 26, 2025

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.

Summary by Sourcery

Bug Fixes:

  • Re-enable USB networking configuration options that were unintentionally disabled in the 6.12 kernel, restoring expected USB network device support.

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>
@sourcery-ai
Copy link

sourcery-ai bot commented Dec 26, 2025

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Restores previously enabled USB network driver configuration options in deepin_x86_desktop_defconfig for the 6.12 kernel to match the 6.6 configuration and fix missing usb_net functionality.

File-Level Changes

Change Details Files
Re-enable USB networking-related Kconfig options that were unintentionally disabled in the 6.12 deepin_x86_desktop_defconfig.
  • Set the relevant CONFIG_USB_NET_* symbols back to y or m to restore USB network driver support that existed in 6.6.
  • Align usb_net-related configuration with the prior 6.6 kernel baseline to satisfy default dependencies.
  • Ensure the desktop x86 defconfig builds with the required USB network drivers enabled by default.
arch/x86/configs/deepin_x86_desktop_defconfig

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@deepin-ci-robot
Copy link

deepin pr auto review

这是一个 Linux 内核配置文件的 diff,主要增加了对 USB 网络设备的支持。让我从多个角度进行分析:

  1. 语法逻辑:
  • 配置项的格式都是正确的,遵循了内核配置文件的规范
  • 所有新增的配置项都是有效的内核配置选项
  • 使用了正确的配置语法(CONFIG_XXX=m/y)
  1. 代码质量:
  • 配置项分组合理,将相关的 USB 网络设备配置放在一起
  • 保持了原有配置的缩进和格式
  • 配置项的添加是有序的,没有重复配置
  1. 性能影响:
  • 大部分配置使用=m(模块)而不是=y(直接编译进内核),这是好的做法,可以减少内核镜像大小
  • 这些配置主要影响系统启动时间和内存占用,但影响较小
  • 建议评估是否所有这些 USB 网络设备都是必需的,可以移除不常用的设备驱动来优化性能
  1. 安全性考虑:
  • 增加的 USB 网络设备驱动可能会增加攻击面
  • 建议确保这些驱动都是经过安全验证的
  • 考虑是否需要限制某些 USB 网络设备的自动加载

改进建议:

  1. 可以将配置项按功能进一步细分,比如 CDC 设备、以太网适配器等

  2. 建议添加配置项的注释,说明每个配置的具体用途

  3. 考虑是否所有配置都需要,移除不必要的配置

  4. 对于关键设备,可以考虑使用=y而不是=m,确保这些驱动总是可用

  5. 建议进行安全性评估,特别是对于自动加载的 USB 设备驱动

  6. 其他建议:

  • 可以考虑将一些常用的 USB 网络设备驱动编译进内核(y),而不是作为模块(m)
  • 建议添加配置文档,说明这些配置的具体应用场景
  • 可以考虑添加一些安全相关的配置,如 USB 设备访问控制

总的来说,这个配置修改是合理的,但还有优化的空间。主要关注点应该是性能优化和安全性考虑。

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@Avenger-285714
Copy link
Member

/approve

Please merge only after the CI pipeline checks have passed.

Copy link

Copilot AI left a 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 PR restores USB network device driver configurations that were enabled in kernel 6.6 but disabled in kernel 6.12 due to dependency changes. The change re-enables 26 USB network driver configuration options to maintain compatibility and support for various USB network devices.

Key changes:

  • Re-enables 26 USB network driver configuration options that were previously disabled
  • Restores support for various USB network adapters including CDC EEM, Huawei CDC NCM, DM9601, Smsc, and QMI WWAN drivers

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines +1582 to +1585
CONFIG_USB_ALI_M5632=y
CONFIG_USB_AN2720=y
CONFIG_USB_EPSON2888=y
CONFIG_USB_KC2190=y
Copy link

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These four USB network driver configurations are set to '=y' (built-in) while the parent CONFIG_USB_USBNET is set to '=m' (module). This creates a configuration inconsistency where child drivers cannot be built-in when their parent is a module. These should be changed to '=m' to match the parent configuration and the pattern used by all other USB network drivers in this section.

Suggested change
CONFIG_USB_ALI_M5632=y
CONFIG_USB_AN2720=y
CONFIG_USB_EPSON2888=y
CONFIG_USB_KC2190=y
CONFIG_USB_ALI_M5632=m
CONFIG_USB_AN2720=m
CONFIG_USB_EPSON2888=m
CONFIG_USB_KC2190=m

Copilot uses AI. Check for mistakes.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?
config USB_ALI_M5632
bool "ALi M5632 based 'USB 2.0 Data Link' cables"
depends on USB_NET_CDC_SUBSET
select USB_NET_CDC_SUBSET_ENABLE
help
Choose this option if you're using a host-to-host cable
based on this design, which supports USB 2.0 high speed.

config USB_AN2720
bool "AnchorChips 2720 based cables (Xircom PGUNET, ...)"
depends on USB_NET_CDC_SUBSET
select USB_NET_CDC_SUBSET_ENABLE
help
Choose this option if you're using a host-to-host cable
based on this design. Note that AnchorChips is now a
Cypress brand.
config USB_EPSON2888
bool "Epson 2888 based firmware (DEVELOPMENT)"
depends on USB_NET_CDC_SUBSET
select USB_NET_CDC_SUBSET_ENABLE
help
Choose this option to support the usb networking links used
by some sample firmware from Epson.

config USB_KC2190
bool "KT Technology KC2190 based cables (InstaNet)"
depends on USB_NET_CDC_SUBSET
select USB_NET_CDC_SUBSET_ENABLE
help
Choose this option if you're using a host-to-host cable
with one of these chips.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't worry — hallucinations just dress up as beauty :-)

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Avenger-285714, Cryolitia, dongert, lanlanxiyiji

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@lanlanxiyiji lanlanxiyiji merged commit 912c0ea into deepin-community:linux-6.12.y Dec 26, 2025
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants