Enable suspend/resume on Pi 5

Documentation/devicetree/bindings/net/bluetooth/brcm,bluetooth.yaml

@@ -109,6 +109,13 @@ properties:
       if the device's initial baud rate in normal mode is not supported by the
       host or if the device requires autobaud mode startup before loading FW.
 
+  brcm,power-off-in-suspend:
+    type: boolean
+    description:
+      The controller's supply is not maintained while the system is in a sleep
+      state; the controller loses its firmware and its entire configuration
+      across a suspend/resume cycle.
+
   interrupts:
     items:
       - description: Handle to the line HOST_WAKE used to wake

Documentation/devicetree/bindings/usb/snps,dwc3-common.yaml

@@ -401,6 +401,13 @@ properties:
     items:
       enum: [1, 4, 8, 16, 32, 64, 128, 256]
 
+  snps,power-off-in-s2ram:
+    description:
+      Set if the controller is powered off while the system is suspended, so
+      that all of its state is lost. When set, the host side is fully
+      reinitialised on resume instead of having its saved state restored.
+    type: boolean
+
   num-hc-interrupters:
     maximum: 8
     default: 1

arch/arm/boot/dts/overlays/README

@@ -4073,6 +4073,8 @@ Params: l1ss                    Enable RC ASPM L1 sub-state support. Requires
                                 requires DMA and MSI addresses to be 32bit.
         mmio-hi                 Move the start of outbound 32bit addresses to
                                 2GB and expand 64bit outbound space to 14GB.
+        no-pwr-ctrl             Disable the regulator on the PCIe 3v3 supply.
+                                This leaves it always enabled.
 
 
 [ The pcf2127-rtc overlay has been deleted. See i2c-rtc. ]

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

@@ -51,10 +51,22 @@
 		};
 	};
 
+	/*
+	 * Disable the regulator on the PCIe 3v3 supply.
+	 * Its is enabled by default by the firmware.
+	 */
+	fragment@4 {
+		target = <&pcie1_3v3>;
+		__dormant__ {
+			status = "disabled";
+		};
+	};
+
 	__overrides__ {
 		l1ss = <0>, "+0";
 		no-l0s = <0>, "+1";
 		no-mip = <0>, "+2";
 		mmio-hi = <0>, "+3";
+		no-pwr-ctrl = <0>, "+4";
 	};
 };

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

@@ -101,6 +101,17 @@
 		gpio = <&rp1_gpio 46 0>;  // CD1_IO0_MICCLK, to MIPI 1 connector
 	};
 
+	pcie1_3v3: pcie1_3v3 {
+		compatible = "regulator-fixed";
+		regulator-name = "pcie1-3v3";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		enable-active-high;
+		gpio = <&rp1_gpio 28 GPIO_ACTIVE_HIGH>;  // PCIE_RP1_WAKE
+		startup-delay-us = <20000>;
+	};
+
 	cam_dummy_reg: cam_dummy_reg {
 		compatible = "regulator-fixed";
 		regulator-name = "cam-dummy-reg";
@@ -125,6 +136,24 @@ rp1_target: &pcie2 {
 
 &pcie1 {
 	brcm,fifo-qos-map = /bits/ 8 <3 3 3 3>;
+
+	/*
+	 * Hack to get linux to probe this pcie after pcie2.
+	 * The pcie-brcmstb driver does not defer probe if
+	 * the regulator is not found yet. This forces pcie1
+	 * to be probed after pcie2 so that the regulator
+	 * is found.
+	 */
+	vpcie3v3-supply = <&pcie1_3v3>;
+
+	pci@0,0 {
+		device_type = "pci";
+		reg = <0 0 0 0 0>;
+		#address-cells = <3>;
+		#size-cells = <2>;
+		ranges;
+		vpcie3v3-supply = <&pcie1_3v3>;
+	};
 };
 
 // The system SPI for the bootloader EEPROM
@@ -374,6 +403,7 @@ dpi_16bit_gpio2:        &rp1_dpi_16bit_gpio2        { };
 		compatible = "brcm,bcm43438-bt";
 		max-speed = <3000000>;
 		shutdown-gpios = <&gio 29 GPIO_ACTIVE_HIGH>;
+		brcm,power-off-in-suspend;
 		local-bd-address = [ 00 00 00 00 00 00 ];
 	};
 };
@@ -426,6 +456,7 @@ dpi_16bit_gpio2:        &rp1_dpi_16bit_gpio2        { };
 	vmmc-supply = <&wl_on_reg>;
 	sd-uhs-ddr50;
 	non-removable;
+	cap-power-off-card;
 	status = "okay";
 	#address-cells = <1>;
 	#size-cells = <0>;

arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi

@@ -359,6 +359,7 @@ dpi_16bit_gpio2:        &rp1_dpi_16bit_gpio2        { };
 		compatible = "brcm,bcm43438-bt";
 		max-speed = <3000000>;
 		shutdown-gpios = <&gio 29 GPIO_ACTIVE_HIGH>;
+		brcm,power-off-in-suspend;
 		local-bd-address = [ 00 00 00 00 00 00 ];
 	};
 };
@@ -411,6 +412,7 @@ dpi_16bit_gpio2:        &rp1_dpi_16bit_gpio2        { };
 	vmmc-supply = <&wl_on_reg>;
 	sd-uhs-ddr50;
 	non-removable;
+	cap-power-off-card;
 	status = "okay";
 	#address-cells = <1>;
 	#size-cells = <0>;

arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5io.dtsi

@@ -1,5 +1,38 @@
 // SPDX-License-Identifier: GPL-2.0
 
+/ {
+	pcie1_3v3: pcie1_3v3 {
+		compatible = "regulator-fixed";
+		regulator-name = "pcie1-3v3";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		enable-active-high;
+		gpio = <&rp1_gpio 28 GPIO_ACTIVE_HIGH>;  // PCIE_PWR_EN
+		startup-delay-us = <20000>;
+	};
+};
+
+&pcie1 {
+	/*
+	 * Hack to get linux to probe this pcie after pcie2.
+	 * The pcie-brcmstb driver does not defer probe if
+	 * the regulator is not found yet. This forces pcie1
+	 * to be probed after pcie2 so that the regulator
+	 * is found.
+	 */
+	vpcie3v3-supply = <&pcie1_3v3>;
+
+	pci@0,0 {
+		device_type = "pci";
+		reg = <0 0 0 0 0>;
+		#address-cells = <3>;
+		#size-cells = <2>;
+		ranges;
+		vpcie3v3-supply = <&pcie1_3v3>;
+	};
+};
+
 i2c_csi_dsi1: &i2c0 { // Note: This is for CAM/DISP 1 connector
 	symlink = "i2c-11";
 };

arch/arm64/boot/dts/broadcom/rp1.dtsi

@@ -1127,6 +1127,7 @@
 			snps,enhanced-nak-fs-quirk;
 			snps,parkmode-disable-ss-quirk;
 			snps,parkmode-disable-fsls-quirk;
+			snps,power-off-in-s2ram;
 			snps,tx-max-burst = /bits/ 8 <8>;
 			snps,tx-thr-num-pkt = /bits/ 8 <2>;
 			interrupts = <RP1_INT_USBHOST0_0 IRQ_TYPE_EDGE_RISING>;
@@ -1143,6 +1144,7 @@
 			snps,enhanced-nak-fs-quirk;
 			snps,parkmode-disable-ss-quirk;
 			snps,parkmode-disable-fsls-quirk;
+			snps,power-off-in-s2ram;
 			snps,tx-max-burst = /bits/ 8 <8>;
 			snps,tx-thr-num-pkt = /bits/ 8 <2>;
 			interrupts = <RP1_INT_USBHOST1_0 IRQ_TYPE_EDGE_RISING>;

arch/arm64/configs/bcm2711_defconfig

@@ -49,7 +49,6 @@ CONFIG_ARM64_ERRATUM_2441009=y
 # CONFIG_CAVIUM_ERRATUM_27456 is not set
 CONFIG_ARM64_VA_BITS_39=y
 CONFIG_NR_CPUS=4
-CONFIG_HOTPLUG_CPU=y
 CONFIG_NUMA=y
 CONFIG_COMPAT=y
 CONFIG_ARMV8_DEPRECATED=y
@@ -58,9 +57,10 @@ CONFIG_CP15_BARRIER_EMULATION=y
 CONFIG_SETEND_EMULATION=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
-# CONFIG_SUSPEND is not set
-CONFIG_PM=y
 CONFIG_PM_DEBUG=y
+CONFIG_DPM_WATCHDOG=y
+CONFIG_DPM_WATCHDOG_TIMEOUT=30
+CONFIG_DPM_WATCHDOG_WARNING_TIMEOUT=5
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y

arch/arm64/configs/bcm2711_rt_defconfig

@@ -49,7 +49,6 @@ CONFIG_ARM64_ERRATUM_2441009=y
 # CONFIG_CAVIUM_ERRATUM_27456 is not set
 CONFIG_ARM64_VA_BITS_39=y
 CONFIG_NR_CPUS=4
-CONFIG_HOTPLUG_CPU=y
 CONFIG_NUMA=y
 CONFIG_COMPAT=y
 CONFIG_ARMV8_DEPRECATED=y
@@ -58,9 +57,10 @@ CONFIG_CP15_BARRIER_EMULATION=y
 CONFIG_SETEND_EMULATION=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
-# CONFIG_SUSPEND is not set
-CONFIG_PM=y
 CONFIG_PM_DEBUG=y
+CONFIG_DPM_WATCHDOG=y
+CONFIG_DPM_WATCHDOG_TIMEOUT=30
+CONFIG_DPM_WATCHDOG_WARNING_TIMEOUT=5
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y

arch/arm64/configs/bcm2712_defconfig

@@ -50,7 +50,6 @@ CONFIG_ARM64_ERRATUM_2441009=y
 CONFIG_ARM64_16K_PAGES=y
 CONFIG_ARM64_VA_BITS_47=y
 CONFIG_NR_CPUS=4
-CONFIG_HOTPLUG_CPU=y
 CONFIG_NUMA=y
 CONFIG_COMPAT=y
 CONFIG_ARMV8_DEPRECATED=y
@@ -59,9 +58,10 @@ CONFIG_CP15_BARRIER_EMULATION=y
 CONFIG_SETEND_EMULATION=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
-# CONFIG_SUSPEND is not set
-CONFIG_PM=y
 CONFIG_PM_DEBUG=y
+CONFIG_DPM_WATCHDOG=y
+CONFIG_DPM_WATCHDOG_TIMEOUT=30
+CONFIG_DPM_WATCHDOG_WARNING_TIMEOUT=5
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y