[Deepin-Kernel-SIG] [linux 6.18-y] [Deepin] Sync our patches and enable configs from v6.6-v6.18#1502
Conversation
(cherry picked from commit 9c7f81209b8dca342ab39d8f22363a940ff920e2) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
We want to include the Debian version in the utsname::version string instead of a full timestamp string. However, we still need to provide a standard timestamp string for gen_initramfs_list.sh to make the kernel image reproducible. Make mkcompile_h use $KBUILD_BUILD_VERSION_TIMESTAMP in preference to $KBUILD_BUILD_TIMESTAMP. (cherry picked from commit 8d4351f548daa5761760fb11d014a14b3aa5190e) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
We met many platform relate issue, add the log to help tracking aspm bug. Signed-off-by: Wentao Guan <guanwentao@uniontech.com> Link: deepin-community#616 (cherry picked from commit 7b1a62a1e0c6697ad6d1eff117c6ba7ca439dd29) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
A touchscreen cannot work in matebook 14(FLMH model), failed in i2c_hid_get_report, it return -EAGAIN but retry in i2c-core is failed, it use i2c-desginware-pcidrv. usleep(400, 500) not okay, usleep(4000, 5000) is okay. Signed-off-by: Wentao Guan <guanwentao@uniontech.com> Link: deepin-community#611 (cherry picked from commit a9cd2c37212fc5e4707c1c6a90e9593faf0806d9) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: bugfix Edit LSM, add landlock to CONFIG_LSM. Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 04babd0) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: feature Tested in Lenovo KaiTian X1 G1d/LXKT-ZXEP-X1, BIOS W0NKT11A 05/28/2024, KX-6000G NoteBook. Tested-by: Wentao Guan <guanwentao@uniontech.com> Signed-off-by: Wentao Guan <guanwentao@uniontech.com> (cherry picked from commit 7ad267b) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: other make deepin_x86_desktop_defconfig & make savedefconfig to fresh it. Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: feature Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: feature Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: feature Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: feature Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: feature Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: feature Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: feature Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: feature Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: feature Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: feature Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: feature Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
mainline inclusion category: feature Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: feature Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: feature Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: feature Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: feature Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Reviewer's GuideAdds retry-with-backoff handling for transient I2C HID get_report failures, adds a debug log in the MT7921 PCI probe for ASPM state, adjusts the kernel build timestamp selection logic, and updates Deepin desktop defconfigs and perf build configuration for the 6.18 kernel sync. Flow diagram for kernel build-timestamp selection logicflowchart TD
A[Kbuild start] --> B{KBUILD_BUILD_VERSION_TIMESTAMP set?}
B -- yes --> C[build-timestamp = KBUILD_BUILD_VERSION_TIMESTAMP]
B -- no --> D{KBUILD_BUILD_TIMESTAMP set?}
D -- yes --> E[build-timestamp = KBUILD_BUILD_TIMESTAMP]
D -- no --> F[build-timestamp = build-timestamp-auto]
C --> G[use build-timestamp in UTS_VERSION]
E --> G
F --> G
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
|
[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 |
There was a problem hiding this comment.
Hey - I've left some high level feedback:
- In
i2c_hid_get_report, the retry loop declares the loop variable inside theforinitializer, which is not idiomatic in kernel C (and may not compile with older configs); declare the iterator variable before the loop instead. - The new retry logic in
i2c_hid_get_reportdoes not handle the case where all retries still return-EAGAIN(the function falls through as if the transfer succeeded); consider returning the last error or logging and bailing out after the final attempt. - The
mt7921_pci_probelogging usespr_infowithout device context and may be too noisy for normal operation; consider usingdev_dbg/dev_infowithpdev->devand possibly gating it behind a debug or verbose flag.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- In `i2c_hid_get_report`, the retry loop declares the loop variable inside the `for` initializer, which is not idiomatic in kernel C (and may not compile with older configs); declare the iterator variable before the loop instead.
- The new retry logic in `i2c_hid_get_report` does not handle the case where all retries still return `-EAGAIN` (the function falls through as if the transfer succeeded); consider returning the last error or logging and bailing out after the final attempt.
- The `mt7921_pci_probe` logging uses `pr_info` without device context and may be too noisy for normal operation; consider using `dev_dbg`/`dev_info` with `pdev->dev` and possibly gating it behind a debug or verbose flag.Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
| CONFIG_EFI=y | ||
| CONFIG_EFI_STUB=y | ||
| CONFIG_EFI_MIXED=y | ||
| CONFIG_HYGON_CSV=y |
There was a problem hiding this comment.
| CONFIG_VIRT_DRIVERS=y | ||
| CONFIG_VBOXGUEST=m | ||
| CONFIG_NITRO_ENCLAVES=m | ||
| CONFIG_CSV_GUEST=m |
There was a problem hiding this comment.
| CONFIG_XIAOMI_WMI=m | ||
| CONFIG_REDMI_WMI=m | ||
| CONFIG_GIGABYTE_WMI=m | ||
| CONFIG_YOGABOOK=m |
There was a problem hiding this comment.
| CONFIG_CRYPTO_SEQIV=y | ||
| CONFIG_CRYPTO_MD4=m | ||
| CONFIG_CRYPTO_RMD160=m | ||
| CONFIG_CRYPTO_SM3_GENERIC=m |
There was a problem hiding this comment.
?
Selected by [m]: x
x - HYGON_GM
| CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m | ||
| CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m | ||
| CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64=m | ||
| CONFIG_CRYPTO_SM4_ZHAOXIN_GMI=m |
Summary by Sourcery
Improve HID report retrieval robustness, add diagnostic logging for Mediatek mt7921 PCI power management, and adjust kernel build timestamp configuration.
Enhancements:
Build: