Skip to content

[pull] kernel-6.12 from LiBwrt:kernel-6.12#14

Open
pull[bot] wants to merge 338 commits intoopenwrt-fork:kernel-6.12from
LiBwrt:kernel-6.12
Open

[pull] kernel-6.12 from LiBwrt:kernel-6.12#14
pull[bot] wants to merge 338 commits intoopenwrt-fork:kernel-6.12from
LiBwrt:kernel-6.12

Conversation

@pull
Copy link

@pull pull bot commented Mar 27, 2025

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Mar 27, 2025
namiltd and others added 8 commits March 31, 2025 07:01
For kernel 6.12 the fb package uses video-common.ko instead of fbdev.ko.
The patch switches these files depending on the kernel version.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Update target x86 config for kernel 6.12.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
The x86 now supports 6.12 kernel as testing.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Include appropriate headers for kernel 6.12

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Update dependencies for kernel 6.12

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
This patch fixes a critical kernel panic observed on two separate x86/64
machines that is triggered when starting nfsd on the 6.12 series of kernels.

See: https://bugzilla.kernel.org/show_bug.cgi?id=219911#c1

Build system: x86/64
Build-tested: x86/64
Run-tested: x86/64

Signed-off-by: John Audia <therealgraysky@proton.me>
Fix compilation warning treated as an error:
 make: *** [/__w/openwrt/openwrt/openwrt/include/toplevel.mk:233: target/compile] Error 1
====== Make errors from logs/target/linux/compile.txt ======
  678 | #define memcpy(p, q, s)  __fortify_memcpy_chk(p, q, s,                  \
      |                          ^~~~~~~~~~~~~~~~~~~~
./include/linux/bitmap.h:259:17: note: in expansion of macro 'memcpy'
  259 |                 memcpy(dst, src, len);
      |                 ^~~~~~
kernel/padata.c: In function '__padata_set_cpumasks':
kernel/padata.c:735:48: note: source object 'pcpumask' of size [0, 64]
  735 |                                  cpumask_var_t pcpumask,
      |                                  ~~~~~~~~~~~~~~^~~~~~~~

Link: https://web.git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=239d87327dcd361b0098038995f8908f3296864f
Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
ZqinKing and others added 19 commits March 31, 2025 06:37
This reverts commit 7aa3dfd.
As the kernel is now fixed with openwrt/openwrt@ecd609f

Signed-off-by: Marius Durbaca <mariusd84@gmail.com>
Link: openwrt/openwrt#18380
Signed-off-by: Robert Marko <robimarko@gmail.com>
This new version fixes some memory leak and NULL pointer issues.

Upstreamed patches:
[1] 010-api_update.patch
[2] 201-wifi-ath10k-add-LED-and-GPIO-controlling-support-for.patch

The new 003 patch was introduced to fix the build error on old LTS
kernel. The patch 004 was used to fix the issue of IPQ4019 radio
not being able to start.

Tested on QCA9882 and IPQ4019.

[1] torvalds/linux@bca8bc0
[2] torvalds/linux@8e1debd

Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: openwrt/openwrt#18368
Signed-off-by: Robert Marko <robimarko@gmail.com>
Users feel anxious about some ath10k driver logs. After further
investigation, in fact these logs are harmless. Only developers
need to care about them in order to optimize some parameters.
Let's just silence them to reduce these similar user reports.

Closes: openwrt/openwrt#13148
Closes: openwrt/openwrt#14422
Closes: openwrt/openwrt#15959
Closes: openwrt/openwrt#15997
Closes: openwrt/openwrt#16896
Closes: openwrt/openwrt#18046
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: openwrt/openwrt#18368
Signed-off-by: Robert Marko <robimarko@gmail.com>
After booting, a "transmit queue 0 timed out" warning followed by a
register dump was observed. The dump indicates that mtk_hw_init() does
not initialize the EEECR during probe. This occurs because the
netdev is allocated in mtk_add_mac(), which is called after
mtk_hw_init(). Consequently, the EEECR register remains uninitialized
until a reset is triggered, causing mtk_hw_init() to run again with a
valid netdev, at which point the register is finally set.

To address this, instead of modifying the probe sequence, latch the Tx
LPI enable state and timer value, and move the EEECR register
initialization to mtk_mac_link_up() to ensure proper setup when the
interface comes up.

Additionally, the splat reveals that LPI functionality is controlled by
the MAC_MCR_EEE bits in the MCR register. Update mtk_set_eee() to
modify these bits accordingly.

Fixes: d8315d5 ("kernel: backport Mediatek SoC EEE support")
Fixes: edddbaf ("kernel: Mediatek: set default EEE Tx LPI timer")
Signed-off-by: Qingfang Deng <dqfext@gmail.com>
Although ath10k pre-calibration data and board description file
have similar data structures, they are completely different things.
Therefore, let's remove these incorrect and confusing links.

Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: openwrt/openwrt#18069
Signed-off-by: Robert Marko <robimarko@gmail.com>
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.85

Removed upstreamed:
        bcm27xx/patches-6.6/950-1498-dts-bcm2711-PL011-UARTs-are-actually-r1p5.patch[1]
        bcm27xx/patches-6.6/950-1551-drm-v3d-Don-t-run-jobs-that-have-errors-flagged-in-i.patch[2]

Manually rebased:
        bcm27xx/patches-6.6/950-1512-dts-bcm2711-Don-t-mark-timer-regs-unconfigured.patch

All other patches automatically rebased.

1. https://web.git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.85&id=61820187b3ef5a15aed7ef49ed1fcc13398b449c
2. https://web.git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.85&id=7cd375d46afcce906cfcddf5aec6b318199d1f16

Build system: x86/64
Build-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64
Run-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64

Signed-off-by: John Audia <therealgraysky@proton.me>
Link: openwrt/openwrt#18379
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Specification:
SoC: MediaTek MT7628AN
RAM: 128M DDR2, ESMT M14D128168A (2Y)
Flash: 32M, cFeon EN25QH256A (Dual Boot on OEM, concatenated on OpenWrt,
SPI)
Switch: MediaTek MT7628AN, 3 ports 100 Mbps
WiFi: MediaTek MT7628AN 2.4 GHz 802.11n
USB: 1 port USB 2.0
GPIO: 1 button (Wi-Fi & Reset on OEM, Reset on OpenWrt), 3 LEDs (Power,
Internet, Wi-Fi), USB port power controls

Disassembly:
There are 2 screws at the bottom near the LEDs hidden by rubber mounts.
After removing the screws, pry the gray plastic part around (it is secured
with latches) and remove it.

UART Interface:
The UART interface can be connected to the 5 pin located between LAN
ports and the WAN one.
Pins (from the second LAN port to the WAN one): VCC, TX, RX, NC, GND
Settings: 115200, 8N1

Flashing via TFTP:
1. Connect your PC and router to the first LAN port, configure PC
interface using IP 192.168.1.2, mask 255.255.255.0
2. Serve the firmware image (for OpenWrt it is *-squashfs-factory.bin)
renamed to KN-1221_recovery.bin via TFTP
3. Power up the router while pressing Wi-Fi button
4. Release Wi-Fi button when Power LED starts blinking

To revert back to OEM firmware:
The return to the OEM firmware is carried out by using the methods
described above with the help of the appropriate firmware image found on
osvault.keenetic.net.

When using OEM bootloader, the firmware image size cannot exceed the size
of one OEM «Firmware_x» partition or Kernel + rootFS size.

Signed-off-by: Ivan Davydov <lotigara@lotigara.ru>
Link: openwrt/openwrt#18164
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This restores sysupgrade support

Since OpenWrt 23.05, the firmware selector no longer provides sysupgrade
images for RE450 V1 & V2 and RE355 v1 due to image size constraints
(~5.7MB limit), making the generic build unusable.

This commit moves RE450 V1 & V2 to the tiny target, enabling:
- Smaller image builds within the flash size limit.
- Restored sysupgrade support via the firmware selector.
- A secure-by-default wireless setup while allowing full management via UCI.
- Officially supported images, reducing the need for custom (potentially insecure) builds.

This ensures users can install a functional OpenWrt build without compromising security defaults.

Signed-off-by: Ivan Diaz <diaz.it@icloud.com>
[Squashed the commits together and just copied the target definition
from the generic subtarget.]
Link: openwrt/openwrt#18126
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
The generic target configuration activates the
CONFIG_LEDS_CLASS_MULTICOLOR option. Do not deactivate it for the stm32
target.

Signed-off-by: jonathan brophy <professor_jonny@hotmail.com>
Link: openwrt/openwrt#17277
[Reword commit message]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This reverts commit 1375a7b.

This version does not activate the CONFIG_LEDS_CLASS_MULTICOLOR option,
this option is controlled by the generic target configuration.

Signed-off-by: jonathan brophy <professor_jonny@hotmail.com>
Link: openwrt/openwrt#17277
[Reword commit message]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
ipq60xx: fixed ipq6018-mr7500 dts
Backport two commits to resolve issues with ath1kk causing it to fail
driver registration on iommuless systems with DRAM outside of 32bit
addressing such as a 4GiB imx8mm:

commit 1bcd20981834 ("wifi: ath11k: Fix DMA buffer allocation
to resolve SWIOTLB issues")
commit eeadc6baf8b3 ("wifi: ath11k: Use dma_alloc_noncoherent
for rx_tid buffer allocation")

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Link: openwrt/openwrt#17751
Signed-off-by: Robert Marko <robimarko@gmail.com>
Currently, network ports using PHYs get a link, but there is no traffic.
Make it work again by moving the MAC config to phylink_mac_link_up.

A similiar change has been previously applied for RTL83xx in commit
cd958d9 ("realtek: 6.6: refactor mac config and link up for
RTL83xx").

Fixes: openwrt/openwrt#17010
Signed-off-by: Jan Hoffmann <jan@3e8.eu>
Tested-by: Christoph Krapp <achterin@gmail.com>
Link: openwrt/openwrt#18268
Signed-off-by: Sander Vanheule <sander@svanheule.net>
Changelogs:
https://github.com/tukaani-project/xz/releases/tag/v5.8.0

Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: openwrt/openwrt#18367
Signed-off-by: Nick Hainke <vincent@systemli.org>
namiltd and others added 28 commits April 16, 2025 15:47
Add Common Intel Ethernet library (libeth) and Intel Ethernet library (libie).
Add CONFIG_ICE_HWMON setting.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Add missing depends kmod-phylink.

Package kmod-lan743x is missing dependencies for the following libraries:
phylink.ko

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Disabled due to removal from kernel 6.12.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Add snd hda scodec component module

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Update KCONFIG and FILES for kernel 6.12 compatibility

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Updated for compatibility with kernels 6.6 and 6.12.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
This is an automatically generated commit.

When doing `git bisect`, consider `git bisect --skip`.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
This is an automatically generated commit which aids following Kernel patch
history, as git will see the move and copy as a rename thus defeating the
purpose.

For the original discussion see:
https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Manually rebuilding patches:
 - 103-pcengines_apu6_platform.patch

Signed-off-by: John Audia <therealgraysky@proton.me>
For kernel 6.12 the fb package uses video-common.ko instead of fbdev.ko.
The patch switches these files depending on the kernel version.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Add missing depends kmod-fb.

Package kmod-backlight is missing dependencies for the following libraries:
fb.ko

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
For kernel 6.12 the fb-sys-fops module setting has been renamed
from CONFIG_FB_SYS_FOPS to CONFIG_FB_SYSMEM_FOPS.
This patch sets the KCONFIG value depending on the kernel version.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Add missing depends kmod-drm-kms-helper.

Package kmod-drm-ttm-helper is missing dependencies for the following libraries:
drm_kms_helper.ko
fb_sys_fops.ko
syscopyarea.ko
sysfillrect.ko
sysimgblt.ko

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Update target x86 config for kernel 6.12.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
The x86 now supports 6.12 kernel as testing.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
In kernel 6.12 asm/unaligned.h was moved to linux/unaligned.h[1]
The patch points to the appropriate header depending on the kernel version.

1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=5f60d5f6bbc12e782fac78110b0ee62698f3b576

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Add missing depends kmod-i2c-core.

Package kmod-hwmon-core is missing dependencies for the following libraries:
i2c-core.ko

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Add missing depends kmod-regmap-core.

Package kmod-hwmon-lm92 is missing dependencies for the following libraries:
regmap-core.ko

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Add missing depends kmod-regmap-core.

Package kmod-hwmon-sch5627 is missing dependencies for the following libraries:
regmap-core.ko

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Fix compilation warning treated as an error:
./include/linux/fortify-string.h:114:33: error: '__builtin_memcpy' reading between 65 and 536870904 bytes from a region of size 64 [-Werror=stringop-overread]
  114 | #define __underlying_memcpy     __builtin_memcpy
      |                                 ^
./include/linux/fortify-string.h:633:9: note: in expansion of macro '__underlying_memcpy'
  633 |         __underlying_##op(p, q, __fortify_size);                        \
      |         ^~~~~~~~~~~~~
./include/linux/fortify-string.h:678:26: note: in expansion of macro '__fortify_memcpy_chk'
  678 | #define memcpy(p, q, s)  __fortify_memcpy_chk(p, q, s,                  \
      |                          ^~~~~~~~~~~~~~~~~~~~
./include/linux/bitmap.h:259:17: note: in expansion of macro 'memcpy'
  259 |                 memcpy(dst, src, len);
      |                 ^~~~~~
kernel/padata.c: In function '__padata_set_cpumasks':
kernel/padata.c:735:48: note: source object 'pcpumask' of size [0, 64]
  735 |                                  cpumask_var_t pcpumask,
      |                                  ~~~~~~~~~~~~~~^~~~~~~~

Link: https://web.git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=239d87327dcd361b0098038995f8908f3296864f
Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
These get dynamically set, not relevant for targets.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
@breeze303 breeze303 deleted the branch openwrt-fork:kernel-6.12 June 21, 2025 12:54
@breeze303 breeze303 deleted the kernel-6.12 branch June 21, 2025 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

⤵️ pull merge-conflict Resolve conflicts manually

Projects

None yet

Development

Successfully merging this pull request may close these issues.