Skip to content

Commit e2ded08

Browse files
Josua-SRgregkh
authored andcommitted
arm64: dts: marvell: cn9132-clearfog: fix multi-lane pci x2 and x4 ports
commit 794a066 upstream. The mvebu-comphy driver does not currently know how to pass correct lane-count to ATF while configuring the serdes lanes. This causes the system to hard reset during reconfiguration, if a pci card is present and has established a link during bootloader. Remove the comphy handles from the respective pci nodes to avoid runtime reconfiguration, relying solely on bootloader configuration - while avoiding the hard reset. When bootloader has configured the lanes correctly, the pci ports are functional under Linux. This issue may be addressed in the comphy driver at a future point. Fixes: e9ff907 ("arm64: dts: add description for solidrun cn9132 cex7 module and clearfog board") Cc: stable@vger.kernel.org Signed-off-by: Josua Mayer <josua@solid-run.com> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 562a134 commit e2ded08

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

arch/arm64/boot/dts/marvell/cn9132-clearfog.dts

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,13 @@
413413
/* SRDS #0,#1,#2,#3 - PCIe */
414414
&cp0_pcie0 {
415415
num-lanes = <4>;
416-
phys = <&cp0_comphy0 0>, <&cp0_comphy1 0>, <&cp0_comphy2 0>, <&cp0_comphy3 0>;
416+
/*
417+
* The mvebu-comphy driver does not currently know how to pass correct
418+
* lane-count to ATF while configuring the serdes lanes.
419+
* Rely on bootloader configuration only.
420+
*
421+
* phys = <&cp0_comphy0 0>, <&cp0_comphy1 0>, <&cp0_comphy2 0>, <&cp0_comphy3 0>;
422+
*/
417423
status = "okay";
418424
};
419425

@@ -475,7 +481,13 @@
475481
/* SRDS #0,#1 - PCIe */
476482
&cp1_pcie0 {
477483
num-lanes = <2>;
478-
phys = <&cp1_comphy0 0>, <&cp1_comphy1 0>;
484+
/*
485+
* The mvebu-comphy driver does not currently know how to pass correct
486+
* lane-count to ATF while configuring the serdes lanes.
487+
* Rely on bootloader configuration only.
488+
*
489+
* phys = <&cp1_comphy0 0>, <&cp1_comphy1 0>;
490+
*/
479491
status = "okay";
480492
};
481493

0 commit comments

Comments
 (0)