[PATCH net-next v6 0/10] r8152: refactor and extend RTL8157/8159 support

From: Chih Kai Hsu

Date: Thu Oct 08 2026 - 04:19:20 EST


RTL8157 and RTL8159 have different init, enable, up/down, hw_phy_cfg,
and PHY access sequences from RTL8156. This series splits the shared
callbacks into per-chip variants and adds the missing RTL8157/RTL8159
functionality: dedicated unload and change_mtu callbacks, TGPHY register
access via phy_read/phy_write pointers in struct rtl_ops, flow control
patch support through rtl_fc_pause_pkt_en(), and UPS support via
r8157_ups_en().

v6:
- Patch #1: make it a pure split of r8156_init() per chip, plus the
wait_autoload_done() helper, with no functional change. The new
init writes it used to carry move to patch #2. Also convert
r8152b_init() to wait_autoload_done().

- Patch #2 (new): add the new init writes for RTL8156B/8157/8159,
taken out of patch #1.

- Patch #3:
- Fix the "Needed %d retries" warning in __rtl_get_pkg_det() to
trigger only when a retry was actually needed (i != 1).
- Reword the commit message.

- Patch #6:
- r8159_hw_phy_cfg() ends with rtl_eee_enable(tp, tp->eee_en) so
that the configured state is applied in both directions.
- Reword the commit message.

- Patch #8:
- A TGPHY busy timeout no longer sets RTL8152_INACCESSIBLE.
wait_tgphy_cmd_ready() logs and returns the poll error, as the
ADV command channel does, and returns -ENODEV only if the device
is already marked inaccessible.
- Drop the RTL8152_INACCESSIBLE exceptions from the LAN_ON
WARN_ON_ONCE() checks in hw_phy_cfg, which are no longer needed.
- Narrow the commit message to what the patch does and list what is
left to a follow-up series: the remaining callers, the MII library
callbacks, and the recovery from a TGPHY timeout.

- Patch #9:
- Explain the symptom, that RTL8157/RTL8159 could keep sending pause
frames indefinitely, and add Fixes tags for RTL8156, RTL8157 and
RTL8159.
- Keep the FC patch in r8156b_init() split from the AUTO_SPEEDUP
clearing, and call rtl_fc_pause_pkt_en() right before it.

- Patch #10: note in the commit message that a backup-restore timeout
in r8157_ups_en() follows what r8159_init() does for the same wait
(mark the device inaccessible and log, without queuing a reset), and
that recovery is left to a follow-up series.

v5:
- Patch #1: in r8157_init()/r8159_init(), call
r8156b_wait_loading_flash() before wait_autoload_done(). Document
in the commit message that the "Bulk In End" bit is cleared in
r8157_init(), and drop the claim about the FC-timer block.

- Patch #2: accept the package read only if the full word was returned,
warn when a retry was needed, and print an unknown package as
0x%04x. Say "firmware" instead of "PHY tuning" in the commit
message.

- Patch #3: make it a pure split with no functional change. Its
register fixes move to the new patch #4.

- Patch #4 (new): fix up and down register settings for
RTL8156/8156B/8157/8159.

- Patch #5: document the new RTL8159 PHY tuning parameters in the
commit message.

- Patch #6: add Fixes tags.

- Patch #7:
- A TGPHY busy timeout now sets RTL8152_INACCESSIBLE and returns
-ENODEV.
- sram_write() returns the data-write result.
- The PHY firmware version checks, the BMCR reset poll,
rtl8152_set_speed(), the pause parameters and the PHY patch
handshake handle PHY access failures.
- SIOCGMIIREG returns 0 with val_out set on success, or the error.
- Commit message rewritten.

- Patch #8: drop the "no link" case, since the caller checks the link.
An unknown speed now disarms the pause limit. Commit message
rewritten.

- Patch #9: wait for the backup-restore flag with a timeout in
r8157_ups_en(). Rename USB_FW_USE_VER to USB_FW_USB_VER.

v4:
- Patch #1: make wait_autoload_done() bail out immediately on
RTL8152_INACCESSIBLE instead of waiting out the full 10 second
timeout.
- Patch #6: propagate PHY access failures instead of ignoring them.
ocp_reg_read()/ocp_reg_write() and every helper built on top of them
(sram_read/write, sram2_read/write, the ocp_reg_*_bits and MDIO bit
helpers) now return int and stop silently operating on stale data
when a TGPHY access times out.

v3:
Rebase on top of latest net-next to resolve merge conflicts.

v2:
- For patch #1, use read_poll_timeout() to replace the manual
for-loop polling.
- For patch #2 and #3, rewrite the commit message.

Chih Kai Hsu (10):
r8152: split r8156_init per chip and factor out wait_autoload_done
r8152: add new init writes for RTL8156B/8157/8159
r8152: split RTL_VER_17 into QFN68 and QFN100 package variants
r8152: split rtl8156_enable/up/down into per-chip-family functions
r8152: fix up and down register settings for RTL8156/8156B/8157/8159
r8152: split r8157_hw_phy_cfg into RTL8157 and RTL8159 variants
r8152: add rtl8157_unload and rtl8157_change_mtu
r8152: add TGPHY register access for RTL8157 and RTL8159
r8152: extract rtl_fc_pause_pkt_en() and apply it to RTL8156/8157/8159
r8152: enable UPS for RTL8157 and RTL8159 QFN68

drivers/net/usb/r8152.c | 1869 ++++++++++++++++++++++++++++++---------
1 file changed, 1437 insertions(+), 432 deletions(-)

--
2.34.1