staging/stintel/target, branch master

realtek: vlan: protect the entire VLAN MSTI update

2026-09-19T15:58:33Z

rtldsa_vlan_msti_set() holds reg_mutex only while replacing the MST slot. The VLAN table read and write remain unprotected, allowing concurrent updates to overwrite VLAN data or leave the VLAN FID inconsistent with MST slot bookkeeping. Use scoped_guard() to hold reg_mutex across the VLAN table read, MST slot replacement and VLAN table write. This also releases the mutex automatically if the slot replacement fails. Assisted-by: ChatGPT (OpenAI GPT-6 Astra) Link: https://github.com/openwrt/openwrt/pull/25258 Signed-off-by: Markus Stockhausen

realtek: vlan: fix RTL931x VLAN interface and tunnel IDs

2026-09-19T15:58:33Z

The RTL931x VLAN entry stores L3_INTF_ID in bits 61:52, corresponding to bits 29:20 of the third table word. The writer currently shifts the mask before applying it to if_id because shifts take precedence over bitwise AND. As a result, valid 10-bit interface IDs are written as zero. Mask the ID before shifting it into place, using an unsigned operand. L2_TNL_LST_IDX occupies bits 30:18 of the last word, with its valid bit at bit 31. The reader shifts the word without masking the result, so a valid entry includes the valid bit as bit 13 of the decoded index. Mask the decoded index to 13 bits while retaining the existing -1 sentinel for entries whose valid bit is clear. Assisted-by: ChatGPT (OpenAI GPT-6 Astra) Link: https://github.com/openwrt/openwrt/pull/25258 Signed-off-by: Markus Stockhausen

realtek: vlan: preserve valid untagged VLAN memberships

2026-09-19T15:58:33Z

rtldsa_vlan_add() clears the entire untagged port mask if any untagged bit lies outside the current member mask. This also clears untagged settings for existing member ports. Adding or updating one port can therefore change the egress tagging of unrelated ports in the VLAN. Intersect the untagged mask with the member mask instead. This retains untagged settings for existing members while keeping the driver's existing policy of removing non-member bits before updating the requested port. This does not impose a new hardware requirement: the Longan SDK handles member and untagged masks separately and does not enforce this subset relationship in its VLAN port setter. Assisted-by: ChatGPT (OpenAI GPT-6 Astra) Link: https://github.com/openwrt/openwrt/pull/25258 Signed-off-by: Markus Stockhausen

realtek: vlan: fix RTL839x VLAN hash key decoding

2026-09-19T15:58:33Z

rtl839x_vlan_tables_read() reads the multicast and unicast hash key selectors from bits 2 and 3 of the last VLAN table word. The Cypress SDK table definition places these fields at bits 33 and 34 of the 96-bit entry, corresponding to bits 1 and 2 of the middle word. Read both selectors from the correct word and bit positions, matching rtl839x_vlan_set_tagged(). This prevents subsequent read-modify-write updates from replacing the configured hash key selectors with values read from unrelated bits. Assisted-by: ChatGPT (OpenAI GPT-6 Astra) Link: https://github.com/openwrt/openwrt/pull/25258 Signed-off-by: Markus Stockhausen

realtek: vlan: remove unrelated VLAN 1 rewrite on VLAN add

2026-09-19T15:58:33Z

rtldsa_vlan_prepare() ignores the requested port and VLAN. It reads VLANs 0 and 1 for debug output, then rewrites VLAN 1 from the decoded fields before rtldsa_vlan_add() acquires reg_mutex. It performs no validation and always returns success. This rewrite can change VLAN 1 even when adding a different VLAN. On RTL930x, the SDK table definition places VLAN_GROUP_MASK in bits 23:16 of the VLAN entry. rtl930x_vlan_tables_read() does not decode this field, and rtl930x_vlan_set_tagged() clears it when rebuilding the entry. Thus, adding a port to another VLAN can clear a nonzero group mask in VLAN 1. Remove the helper, its call and the unused error variable. The VID checks and the locked read-modify-write of the requested VLAN remain in rtldsa_vlan_add(), including when the requested VID is 1. Preserving the RTL930x group mask during updates to the requested VLAN is a separate issue and is not addressed here. Assisted-by: ChatGPT (OpenAI GPT-6 Astra) Link: https://github.com/openwrt/openwrt/pull/25258 Signed-off-by: Markus Stockhausen

mpc85xx: remove last 6.12 patch

2026-09-19T09:38:12Z

It seems this remained because of a mistake when merging. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/25262 Signed-off-by: Robert Marko

realtek: phy: fix RTL8218E XSGMII initialization

2026-09-18T20:31:21Z

Commit c8c187f0f08a ("realtek: add support for RTL8218E") added the PHY identifier and reused the generic RTL821x callbacks. This is enough when the bootloader has already configured the package, but it leaves the MAC-side SerDes uninitialized without that setup. As a result, the XSGMII link is not established after a cold boot and/or without any pre-established PHY setup. Add package-level initialization on the base PHY address and gate it on the strapped XSGMII mode. Apply the minimal required subset of the vendor configuration, reset the active SerDes block, and force XSGMII mode by disabling SerDes autonegotiation. QSGMII remains unsupported. This completes RTL8218E support without relying on bootloader PHY setup while avoiding the large, mostly unnecessary vendor register table. This minimal sequence has been established through various testing iterations on two devices. Fixes: c8c187f0f08a ("realtek: add support for RTL8218E") Assisted-by: ChatGPT (OpenAI GPT-5.6 Sol) Link: https://github.com/openwrt/openwrt/pull/25255 Signed-off-by: Jonas Jelonek

realtek: dsa: move L2 code into dedicated module

2026-09-18T20:15:00Z

Move the family-specific L2 implementations from rtl838x.c, rtl839x.c, rtl930x.c and rtl931x.c into a new l2.c module. This collects the FDB entry encoding, hashing, CAM access, learning, flooding, multicast port masks and ageing operations in one place. Declare the operations in l2.h and add l2.o to the driver Makefile. No functional changes intended. Assisted-by: ChatGPT (OpenAI GPT-5.6 Sol) Link: https://github.com/openwrt/openwrt/pull/25250 Signed-off-by: Markus Stockhausen

uml: remove obsolete 6.12 kernel config and patches

2026-09-18T16:25:41Z

With 6.12 no longer selectable for UML drop the ballast. Signed-off-by: Christian Lamparter

uml: switch target to 6.18 kernel

2026-09-18T16:24:28Z

Makes 6.18 the default kernel. Signed-off-by: Christian Lamparter