Skip to content

Commit 36e5d83

Browse files
P33Mpopcornmix
authored andcommitted
DT: bcm2711/bcm2712: use upstream property for controlling pcie clkreq
L1 sub-state support and clkreq control are intermingled in the hardware, and upstream now have a tri-state property to control this. The default behaviour is now to enable clkreq control if the property is absent. Default Pi 5 PCIex1 to "safe" to avoid breaking expansion boards without the CLKREQ# line connected. Make this explicit in the pciex1-compat-pi5 overlay, and remove the obsolete CM4 property. Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
1 parent d978bac commit 36e5d83

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4.dts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -422,10 +422,6 @@
422422
// =============================================
423423
// Board specific stuff here
424424

425-
&pcie0 {
426-
brcm,enable-l1ss;
427-
};
428-
429425
&sdhost {
430426
status = "disabled";
431427
};

arch/arm/boot/dts/overlays/README

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3703,7 +3703,9 @@ Params: <None>
37033703
Name: pciex1-compat-pi5
37043704
Info: Compatibility features for pciex1 on Pi 5.
37053705
Load: dtoverlay=pciex1-compat-pi5,<param>=<val>
3706-
Params: l1ss Enable ASPM L1 sub-state support
3706+
Params: l1ss Enable RC ASPM L1 sub-state support. Requires
3707+
that the CLKREQ# pin is connected to the
3708+
endpoint.
37073709
no-l0s Disable ASPM L0s
37083710
no-mip Revert to the MSI target in the RC, instead of
37093711
the MSI-MIP peripheral. Use if a) more than 8

arch/arm/boot/dts/overlays/pciex1-compat-pi5-overlay.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
fragment@0 {
1313
target = <&pciex1>;
1414
__dormant__ {
15-
brcm,enable-l1ss;
15+
brcm,clkreq-mode = "default";
1616
};
1717
};
1818

arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,10 @@ spi10_cs_pins: &spi10_cs_gpio1 {};
713713
clock-names = "hdmi", "bvb", "audio", "cec";
714714
};
715715

716+
&pcie1 {
717+
brcm,clkreq-mode = "safe";
718+
};
719+
716720
&pcie2 {
717721
status = "okay";
718722
};

0 commit comments

Comments
 (0)