PROBLEM: Raxda Rock 5 ITX shared SATA broken by "phy: rockchip: naneng-combphy: fix phy reset"

[Arthur Fabre]

Hello,

I have a Raxda Rock 5 ITX, with a device-tree overlay to enable
the shared SATA port:

// ROCK 5 ITX M.2 E-Key Sata
/dts-v1/;
/plugin/;

/ {
	fragment at 0 {
		target = <&pcie2x1l0>;

		__overlay__ {
			status = "disabled";
		};
	};

	fragment at 1 {
		target = <&sata1>;

		__overlay__ {
			status = "okay";
		};
	};
};

This worked fine, with the kernel normally logging:

[    0.754425] ata1: SATA max UDMA/133 abar m8192 at 0xf1282000 port 0xf1282100 irq 70 lpm-pol 0
[    1.692424] ata1: SATA link up 6.0 Gbps (SStatus 133 SControl 300)

However this stopped working after a kernel update:

[    2.687755] ata1: SATA max UDMA/133 mmio [mem 0xfe220000-0xfe220fff] port 0x100 irq 79 lpm-pol 0
[    4.893204] ata1: SATA link down (SStatus 1 SControl 300)
[    7.111503] ata1: SATA link down (SStatus 1 SControl 300)
[    7.111993] ata1: limiting SATA link speed to 1.5 Gbps

I've reliably bisected it to commit:
fbcbffbac994 "phy: rockchip: naneng-combphy: fix phy reset".

Unfortunately coming up with a patch is out of my depth.
Happy to test any suggestions.

If it matters I'm using the EDK2 UEFI firmware v1.1:
https://github.com/edk2-porting/edk2-rk3588

Thank you,

Arthur