[PATCH v2] phy: rockchip: naneng-combphy: fix RK3588 SATA pipe_con1 register offset

Shawn Lin shawn.lin at rock-chips.com
Sun Nov 15 18:31:23 PST 2026


在 2026/11/15 星期日 23:48, Ricardo Pardini via B4 Relay 写道:
> From: Yifeng Zhao <yifeng.zhao at rock-chips.com>
> 
> On RK3588, the sata2 PHY speed is selected by sata2_phy_spdmode in
> PHP_GRF_PHP_CON1[1:0] (offset 0x0004), with sata2_phy_rx_err in bit 2.
> rk3588_combphy_grfcfgs has pipe_con1_for_sata at offset 0x0000 though,
> so the value 0x2 (6.0 Gb/s, rx_err cleared) ends up in PHP_GRF_PHP_CON0
> and CON1 is never written.
> 
> This leaves sata2 at its 1.5 Gb/s reset value, so the link only trains
> at 1.5 Gb/s, even with a 6 Gb/s capable disk and no SControl speed
> limit. sata0 and sata1 are not affected: their speed fields are in
> PHP_GRF_PHP_CON0 and are set by pipe_con0_for_sata.
> 
> The misplaced write also lands in PHP_GRF_PHP_CON0[2:0], which are the
> PCIe link reset grant bits, and turns on the one for pcie3x2 whenever a
> combphy is put in SATA mode. No effect from that is known, but this
> stops it too.
> 
> The register layout is described in the RK3588 TRM V1.0 Part1, section
> 6.17 "PHP_GRF Register Description".
> 
> Tested with an mSATA SSD on sata2 (combphy2_psu). Before:
> 
>    ata2: SATA link up 1.5 Gbps (SStatus 113 SControl 300)
>    Timing O_DIRECT disk reads: 374 MB in 3.01 seconds = 124.45 MB/sec
> 
> After:
> 
>    ata2: SATA link up 6.0 Gbps (SStatus 133 SControl 300)
>    Timing O_DIRECT disk reads: 1266 MB in 3.00 seconds = 421.78 MB/sec
> 

Reviewed-by: Shawn Lin <shawn.lin at rock-chips.com>



More information about the Linux-rockchip mailing list