From ca019dd2188037454d6836aa949fde85e904c9cd Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Tue, 21 Jul 2026 15:55:04 +0100 Subject: [PATCH 01/28] arm64: configs: Enable CONFIG_SUSPEND Add support for suspend to RAM on bcm2712. Signed-off-by: Peter Bailey --- arch/arm64/configs/bcm2711_defconfig | 3 --- arch/arm64/configs/bcm2711_rt_defconfig | 3 --- arch/arm64/configs/bcm2712_defconfig | 3 --- 3 files changed, 9 deletions(-) diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig index 753fcdf918b4a..f9c5b8200c84d 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/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,8 +57,6 @@ 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_CPU_IDLE=y CONFIG_CPU_FREQ=y diff --git a/arch/arm64/configs/bcm2711_rt_defconfig b/arch/arm64/configs/bcm2711_rt_defconfig index 32da405f3223e..12586c92ae32d 100644 --- a/arch/arm64/configs/bcm2711_rt_defconfig +++ b/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,8 +57,6 @@ 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_CPU_IDLE=y CONFIG_CPU_FREQ=y diff --git a/arch/arm64/configs/bcm2712_defconfig b/arch/arm64/configs/bcm2712_defconfig index 04aaa031f6b44..e5ec97e8813d2 100644 --- a/arch/arm64/configs/bcm2712_defconfig +++ b/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,8 +58,6 @@ 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_CPU_IDLE=y CONFIG_CPU_FREQ=y From ee29cfd28ac8207836f577fbe65f2767671c3798 Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Tue, 21 Jul 2026 15:56:52 +0100 Subject: [PATCH 02/28] watchdog: bcm2835: Stop watchdog during suspend/resume Stop the watchdog during suspend to that it does not reset while suspended Signed-off-by: Peter Bailey --- drivers/watchdog/bcm2835_wdt.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c index ed4ae9fdf9d22..2e7a7ce6297e5 100644 --- a/drivers/watchdog/bcm2835_wdt.c +++ b/drivers/watchdog/bcm2835_wdt.c @@ -232,11 +232,31 @@ static void bcm2835_wdt_remove(struct platform_device *pdev) pm_power_off = NULL; } +static int bcm2835_wdt_suspend(struct device *dev) +{ + if (watchdog_active(&bcm2835_wdt_wdd) || watchdog_hw_running(&bcm2835_wdt_wdd)) + bcm2835_wdt_stop(&bcm2835_wdt_wdd); + + return 0; +} + +static int bcm2835_wdt_resume(struct device *dev) +{ + if (watchdog_active(&bcm2835_wdt_wdd) || watchdog_hw_running(&bcm2835_wdt_wdd)) + bcm2835_wdt_start(&bcm2835_wdt_wdd); + + return 0; +} + +static DEFINE_SIMPLE_DEV_PM_OPS(bcm2835_wdt_pm_ops, + bcm2835_wdt_suspend, bcm2835_wdt_resume); + static struct platform_driver bcm2835_wdt_driver = { .probe = bcm2835_wdt_probe, .remove = bcm2835_wdt_remove, .driver = { .name = "bcm2835-wdt", + .pm = pm_sleep_ptr(&bcm2835_wdt_pm_ops), }, }; module_platform_driver(bcm2835_wdt_driver); From 4c09c6c3787a6110442649bf9d1b0a037edbff5e Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Tue, 21 Jul 2026 16:14:14 +0100 Subject: [PATCH 03/28] arm64: dts: bcm2712: wifi: Power off wifi during suspend/resume Add a device tree property so that wifi is powered off correctly during suspend. The wifi is powered off by the firmware during system suspend. The wifi driver does not allow runtime suspension so this will only affect system suspend. Signed-off-by: Peter Bailey --- arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 1 + arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts index c8908f6b3143b..c6ff03ba495a8 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts @@ -426,6 +426,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>; diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi index dfad85a666a8a..76ecc3d2e3582 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi @@ -411,6 +411,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>; From a7ccc4a0381612ccda96a52878ffc1708a490998 Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Thu, 23 Jul 2026 16:04:24 +0100 Subject: [PATCH 04/28] ACPI: PCI: bcm2712: Set acpi_storage_d3 to true on bcm2712 This makes the NVMe driver reset drives during suspend/resume. Signed-off-by: Peter Bailey --- include/linux/acpi.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 5ff5d99f6ead5..d038dc2996e0e 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -1182,7 +1183,7 @@ static inline int acpi_dev_pm_attach(struct device *dev, bool power_on) } static inline bool acpi_storage_d3(struct device *dev) { - return false; + return of_machine_is_compatible("brcm,bcm2712"); } static inline bool acpi_dev_state_d0(struct device *dev) { From ddd2f1bf3756e875194df9972014243910d8d491 Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Wed, 12 Aug 2026 15:49:49 +0100 Subject: [PATCH 05/28] iommu: bcm2712-iommu: Add suspend/resume support Disable the iommu on suspend and reinitialise it on resume. Move allocating top_table and default_page into another function so that they do not run again on resume. Signed-off-by: Peter Bailey --- drivers/iommu/bcm2712-iommu.c | 68 ++++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 16 deletions(-) diff --git a/drivers/iommu/bcm2712-iommu.c b/drivers/iommu/bcm2712-iommu.c index 4721a830d2aec..d7c6531dab772 100644 --- a/drivers/iommu/bcm2712-iommu.c +++ b/drivers/iommu/bcm2712-iommu.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #define MMU_WR(off, val) writel(val, mmu->reg_base + (off)) @@ -144,7 +145,24 @@ static void bcm2712_iommu_free_page(struct bcm2712_iommu *mmu, void *ptr) } } -static int bcm2712_iommu_init(struct bcm2712_iommu *mmu) +static int bcm2712_iommu_init_pages(struct bcm2712_iommu *mmu) +{ + /* + * Allocate pages for the top level table, and for the default page. + * For simplicity, both these regions are whole Linux pages. + */ + if (!bcm2712_iommu_get_page(mmu, &mmu->top_table)) + return -ENOMEM; + + if (!bcm2712_iommu_get_page(mmu, &mmu->default_page)) { + bcm2712_iommu_free_page(mmu, mmu->top_table); + return -ENOMEM; + } + + return 0; +} + +static int bcm2712_iommu_hw_init(struct bcm2712_iommu *mmu) { u32 u = MMU_RD(MMMU_DEBUG_INFO_OFFSET); @@ -205,20 +223,12 @@ static int bcm2712_iommu_init(struct bcm2712_iommu *mmu) /* * Configure the addresses of the top-level table (offset because * the aperture does not start from zero), and of the default page. - * For simplicity, both these regions are whole Linux pages. */ - u = bcm2712_iommu_get_page(mmu, &mmu->top_table); - if (!u) - return -ENOMEM; MMU_WR(MMMU_PT_PA_BASE_OFFSET, - u - ((mmu->aperture_base - mmu->dma_iova_offset) >> L1_AP_BASE_SHIFT)); - u = bcm2712_iommu_get_page(mmu, &mmu->default_page); - if (!u) { - bcm2712_iommu_free_page(mmu, mmu->top_table); - return -ENOMEM; - } - MMU_WR(MMMU_ILLEGAL_ADR_OFFSET, MMMU_ILLEGAL_ADR_ENABLE + u); - mmu->nmapped_pages = 0; + (u32)(virt_to_phys(mmu->top_table) >> IOMMU_PAGE_SHIFT) - + ((mmu->aperture_base - mmu->dma_iova_offset) >> L1_AP_BASE_SHIFT)); + MMU_WR(MMMU_ILLEGAL_ADR_OFFSET, MMMU_ILLEGAL_ADR_ENABLE + + (u32)(virt_to_phys(mmu->default_page) >> IOMMU_PAGE_SHIFT)); /* Flush (and enable) the shared TLB cache; enable this MMU. */ if (mmu->cache) @@ -713,8 +723,13 @@ static int bcm2712_iommu_probe(struct platform_device *pdev) if (ret) goto done_err; - /* Initialize hardware -- this will try to allocate 2 pages */ - ret = bcm2712_iommu_init(mmu); + /* This will try to allocate 2 pages */ + ret = bcm2712_iommu_init_pages(mmu); + if (ret) + goto done_err; + + /* Initialize hardware */ + ret = bcm2712_iommu_hw_init(mmu); if (ret) goto done_err; @@ -744,6 +759,26 @@ static void bcm2712_iommu_remove(struct platform_device *pdev) MMU_WR(MMMU_CTRL_OFFSET, 0); /* disable the MMU */ } +static int bcm2712_iommu_suspend(struct device *dev) +{ + struct bcm2712_iommu *mmu = dev_get_drvdata(dev); + + if (mmu->reg_base) + MMU_WR(MMMU_CTRL_OFFSET, 0); /* disable the MMU */ + + return 0; +} + +static int bcm2712_iommu_resume(struct device *dev) +{ + struct bcm2712_iommu *mmu = dev_get_drvdata(dev); + + return bcm2712_iommu_hw_init(mmu); +} + +static DEFINE_SIMPLE_DEV_PM_OPS(bcm2712_iommu_pm_ops, bcm2712_iommu_suspend, + bcm2712_iommu_resume); + static const struct of_device_id bcm2712_iommu_of_match[] = { { . compatible = "brcm,bcm2712-iommu" @@ -756,7 +791,8 @@ static struct platform_driver bcm2712_iommu_driver = { .remove = bcm2712_iommu_remove, .driver = { .name = "bcm2712-iommu", - .of_match_table = bcm2712_iommu_of_match + .of_match_table = bcm2712_iommu_of_match, + .pm = pm_sleep_ptr(&bcm2712_iommu_pm_ops), }, }; From 52daa318aa2c1663ff586a7d1c1ce30d96ed1e1b Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Wed, 12 Aug 2026 15:56:37 +0100 Subject: [PATCH 06/28] drm/vc4: hdmi: Add suspend/resume support Force a runtime suspend during system suspend. This prevents occasional warnings about packet RAM being off. Signed-off-by: Peter Bailey --- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 7e00e13a0de10..614daf06f7f7a 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -3456,6 +3456,8 @@ static const struct dev_pm_ops vc4_hdmi_pm_ops = { SET_RUNTIME_PM_OPS(vc4_hdmi_runtime_suspend, vc4_hdmi_runtime_resume, NULL) + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) }; struct platform_driver vc4_hdmi_driver = { From 7811f231fda751a4234265dd427850424b9b4524 Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Wed, 12 Aug 2026 15:57:58 +0100 Subject: [PATCH 07/28] drm/vc4: Add suspend/resume support Use the drm_mode_config_helper_ functions on suspend and resume. Signed-off-by: Peter Bailey --- drivers/gpu/drm/vc4/vc4_drv.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 038e551654ea8..3a72b47f7a7ff 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -494,6 +494,22 @@ static void vc4_platform_drm_shutdown(struct platform_device *pdev) drm_atomic_helper_shutdown(platform_get_drvdata(pdev)); } +static int vc4_drm_suspend(struct device *dev) +{ + struct drm_device *drm = dev_get_drvdata(dev); + + return drm_mode_config_helper_suspend(drm); +} + +static int vc4_drm_resume(struct device *dev) +{ + struct drm_device *drm = dev_get_drvdata(dev); + + return drm_mode_config_helper_resume(drm); +} + +static DEFINE_SIMPLE_DEV_PM_OPS(vc4_drm_pm_ops, vc4_drm_suspend, vc4_drm_resume); + static const struct of_device_id vc4_of_match[] = { { .compatible = "brcm,bcm2711-vc5", .data = (void *)VC4_GEN_5 }, /* NB GEN_6_C will be corrected on D0 hw to GEN_6_D via vc4_hvs_bind */ @@ -511,6 +527,7 @@ static struct platform_driver vc4_platform_driver = { .driver = { .name = "vc4-drm", .of_match_table = vc4_of_match, + .pm = pm_sleep_ptr(&vc4_drm_pm_ops), }, }; From 66382dee12c00dc3d74888152d09d650c8ccc39d Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Wed, 12 Aug 2026 15:58:29 +0100 Subject: [PATCH 08/28] drm/vc4: hvs: Add suspend/resume support Reinitialise the hardware on resume. Split vc4_hvs_upload_linear_kernel into two functions. On resume, the kernels have already been allocated. Move writing to the hardware into another function and call that on resume. Signed-off-by: Peter Bailey --- drivers/gpu/drm/vc4/vc4_hvs.c | 64 ++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c index aa51aba723a38..6af273b74bf78 100644 --- a/drivers/gpu/drm/vc4/vc4_hvs.c +++ b/drivers/gpu/drm/vc4/vc4_hvs.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -437,12 +438,28 @@ static const u32 nearest_neighbour_kernel[] = VC4_LINEAR_PHASE_KERNEL(0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 255, 255, 255, 255); +static void vc4_hvs_write_linear_kernel(struct vc4_hvs *hvs, + struct drm_mm_node *space, + const u32 *kernel) +{ + u32 __iomem *dst_kernel = hvs->dlist + space->start; + unsigned int i; + + for (i = 0; i < VC4_KERNEL_DWORDS; i++) { + if (i < VC4_LINEAR_PHASE_KERNEL_DWORDS) + writel(kernel[i], &dst_kernel[i]); + else { + writel(kernel[VC4_KERNEL_DWORDS - i - 1], + &dst_kernel[i]); + } + } +} + static int vc4_hvs_upload_linear_kernel(struct vc4_hvs *hvs, struct drm_mm_node *space, const u32 *kernel) { - int ret, i; - u32 __iomem *dst_kernel; + int ret; /* * NOTE: We don't need a call to drm_dev_enter()/drm_dev_exit() @@ -456,16 +473,7 @@ static int vc4_hvs_upload_linear_kernel(struct vc4_hvs *hvs, return ret; } - dst_kernel = hvs->dlist + space->start; - - for (i = 0; i < VC4_KERNEL_DWORDS; i++) { - if (i < VC4_LINEAR_PHASE_KERNEL_DWORDS) - writel(kernel[i], &dst_kernel[i]); - else { - writel(kernel[VC4_KERNEL_DWORDS - i - 1], - &dst_kernel[i]); - } - } + vc4_hvs_write_linear_kernel(hvs, space, kernel); return 0; } @@ -2117,6 +2125,8 @@ static int vc4_hvs_bind(struct device *dev, struct device *master, void *data) if (IS_ERR(hvs)) return PTR_ERR(hvs); + platform_set_drvdata(pdev, hvs); + hvs->regset.base = hvs->regs; if (vc4->gen == VC4_GEN_6_C) { @@ -2299,6 +2309,35 @@ static void vc4_hvs_dev_remove(struct platform_device *pdev) component_del(&pdev->dev, &vc4_hvs_ops); } +static int vc4_hvs_resume_early(struct device *dev) +{ + struct vc4_hvs *hvs = platform_get_drvdata(to_platform_device(dev)); + struct vc4_dev *vc4; + int ret; + + if (!hvs) + return 0; + + vc4 = hvs->vc4; + if (vc4->gen >= VC4_GEN_6_C) + ret = vc6_hvs_hw_init(hvs); + else + ret = vc4_hvs_hw_init(hvs); + if (ret) + return ret; + + vc4_hvs_write_linear_kernel(hvs, &hvs->mitchell_netravali_filter, + mitchell_netravali_1_3_1_3_kernel); + vc4_hvs_write_linear_kernel(hvs, &hvs->nearest_neighbour_filter, + nearest_neighbour_kernel); + + return vc4_hvs_cob_init(hvs); +} + +static const struct dev_pm_ops vc4_hvs_pm_ops = { + LATE_SYSTEM_SLEEP_PM_OPS(NULL, vc4_hvs_resume_early) +}; + static const struct of_device_id vc4_hvs_dt_match[] = { { .compatible = "brcm,bcm2711-hvs" }, { .compatible = "brcm,bcm2712-hvs" }, @@ -2312,5 +2351,6 @@ struct platform_driver vc4_hvs_driver = { .driver = { .name = "vc4_hvs", .of_match_table = vc4_hvs_dt_match, + .pm = pm_sleep_ptr(&vc4_hvs_pm_ops), }, }; From 757c787c395c1a4b36d87259b81e97b19036129e Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Fri, 14 Aug 2026 14:22:55 +0100 Subject: [PATCH 09/28] gpio-brcmstb: Enable hibernation support Use the suspend/resume methods for hibernation. Signed-off-by: Peter Bailey --- drivers/gpio/gpio-brcmstb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index 7e2e3f3829efe..e004c4b1cde38 100644 --- a/drivers/gpio/gpio-brcmstb.c +++ b/drivers/gpio/gpio-brcmstb.c @@ -10,6 +10,7 @@ #include #include #include +#include #include enum gio_reg_index { @@ -576,8 +577,7 @@ static int brcmstb_gpio_resume(struct device *dev) #endif /* CONFIG_PM_SLEEP */ static const struct dev_pm_ops brcmstb_gpio_pm_ops = { - .suspend_noirq = brcmstb_gpio_suspend, - .resume_noirq = brcmstb_gpio_resume, + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(brcmstb_gpio_suspend, brcmstb_gpio_resume) }; static int brcmstb_gpio_probe(struct platform_device *pdev) From 86ec8625ffe095b601ba0c5861c0a86e2cc06f4b Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Mon, 17 Aug 2026 08:42:25 +0100 Subject: [PATCH 10/28] bcm2385: mailbox: Add resumer handler for S3 wakeup on Pi5 In S3 deep-sleep, the entire VPU, ARM, GIC infrastructure is powered off. Re-initialise the mailbox hardware on resume otherwise, the VPU won't see mailbox requests. Signed-off-by: Tim Gover --- drivers/mailbox/bcm2835-mailbox.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/mailbox/bcm2835-mailbox.c b/drivers/mailbox/bcm2835-mailbox.c index 8c54980b4b7e1..f458d477bc8aa 100644 --- a/drivers/mailbox/bcm2835-mailbox.c +++ b/drivers/mailbox/bcm2835-mailbox.c @@ -183,6 +183,25 @@ static int bcm2835_mbox_probe(struct platform_device *pdev) return ret; } +static int bcm2835_mbox_resume_noirq(struct device *dev) +{ + struct bcm2835_mbox *mbox = dev_get_drvdata(dev); + + /* + * MAIL0_CNF is reset while the SoC is powered down in suspend-to-RAM. + * Re-enable the receive interrupt before any driver resumes, otherwise + * the replies are never signalled and every firmware transaction times + * out. + */ + writel(ARM_MC_IHAVEDATAIRQEN, mbox->regs + MAIL0_CNF); + + return 0; +} + +static const struct dev_pm_ops bcm2835_mbox_pm_ops = { + NOIRQ_SYSTEM_SLEEP_PM_OPS(NULL, bcm2835_mbox_resume_noirq) +}; + static const struct of_device_id bcm2835_mbox_of_match[] = { { .compatible = "brcm,bcm2835-mbox", }, {}, @@ -193,6 +212,7 @@ static struct platform_driver bcm2835_mbox_driver = { .driver = { .name = "bcm2835-mbox", .of_match_table = bcm2835_mbox_of_match, + .pm = pm_sleep_ptr(&bcm2835_mbox_pm_ops), }, .probe = bcm2835_mbox_probe, }; From c23830f14671d2a610fb905c402c1f2ab4b9ff97 Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Wed, 2 Sep 2026 09:51:15 +0100 Subject: [PATCH 11/28] arm64: configs: bcm2712: Enable DPM watchdog Enable the watchdog for device power management. Use a short timeout before warning. Signed-off-by: Peter Bailey --- arch/arm64/configs/bcm2711_defconfig | 3 +++ arch/arm64/configs/bcm2711_rt_defconfig | 3 +++ arch/arm64/configs/bcm2712_defconfig | 3 +++ 3 files changed, 9 insertions(+) diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig index f9c5b8200c84d..1511696fad168 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -58,6 +58,9 @@ CONFIG_SETEND_EMULATION=y CONFIG_RANDOMIZE_BASE=y CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" 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 diff --git a/arch/arm64/configs/bcm2711_rt_defconfig b/arch/arm64/configs/bcm2711_rt_defconfig index 12586c92ae32d..33f6d288635c6 100644 --- a/arch/arm64/configs/bcm2711_rt_defconfig +++ b/arch/arm64/configs/bcm2711_rt_defconfig @@ -58,6 +58,9 @@ CONFIG_SETEND_EMULATION=y CONFIG_RANDOMIZE_BASE=y CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" 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 diff --git a/arch/arm64/configs/bcm2712_defconfig b/arch/arm64/configs/bcm2712_defconfig index e5ec97e8813d2..b975d0d97305c 100644 --- a/arch/arm64/configs/bcm2712_defconfig +++ b/arch/arm64/configs/bcm2712_defconfig @@ -59,6 +59,9 @@ CONFIG_SETEND_EMULATION=y CONFIG_RANDOMIZE_BASE=y CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" 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 From 4b79a248d9e3a764ffaf65dd58e6a5a3cfb12890 Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Mon, 17 Aug 2026 17:37:30 +0100 Subject: [PATCH 12/28] pinctrl: pinctrl-brcmstb: Save pin mux and pad during suspend Save the pin mux and pad during suspend and restore it during resume. Multiple pins are stored in each register. Store the entire register for each pin. The values will not change between storing and restoring the individual pins. This uses a few extra bytes but simplifies the code. Signed-off-by: Peter Bailey --- drivers/pinctrl/bcm/pinctrl-brcmstb-bcm2712.c | 6 +++ drivers/pinctrl/bcm/pinctrl-brcmstb.c | 49 +++++++++++++++++++ drivers/pinctrl/bcm/pinctrl-brcmstb.h | 2 + 3 files changed, 57 insertions(+) diff --git a/drivers/pinctrl/bcm/pinctrl-brcmstb-bcm2712.c b/drivers/pinctrl/bcm/pinctrl-brcmstb-bcm2712.c index 752b78e2c0d8c..befd6680cd69b 100644 --- a/drivers/pinctrl/bcm/pinctrl-brcmstb-bcm2712.c +++ b/drivers/pinctrl/bcm/pinctrl-brcmstb-bcm2712.c @@ -13,6 +13,7 @@ #include #include +#include #include "pinctrl-brcmstb.h" #define BRCMSTB_FSEL_COUNT 8 @@ -729,12 +730,17 @@ static const struct of_device_id bcm2712_pinctrl_match[] = { }; MODULE_DEVICE_TABLE(of, bcm2712_pinctrl_match); +static const struct dev_pm_ops bcm2712_pinctrl_pm_ops = { + SET_LATE_SYSTEM_SLEEP_PM_OPS(brcmstb_pinctrl_suspend, brcmstb_pinctrl_resume) +}; + static struct platform_driver bcm2712_pinctrl_driver = { .probe = bcm2712_pinctrl_probe, .driver = { .name = "pinctrl-bcm2712", .of_match_table = bcm2712_pinctrl_match, .suppress_bind_attrs = true, + .pm = &bcm2712_pinctrl_pm_ops, }, }; module_platform_driver(bcm2712_pinctrl_driver); diff --git a/drivers/pinctrl/bcm/pinctrl-brcmstb.c b/drivers/pinctrl/bcm/pinctrl-brcmstb.c index f46b27155c3c4..b32822558bbc4 100644 --- a/drivers/pinctrl/bcm/pinctrl-brcmstb.c +++ b/drivers/pinctrl/bcm/pinctrl-brcmstb.c @@ -49,6 +49,8 @@ struct brcmstb_pinctrl { struct pinctrl_gpio_range gpio_range; /* Protect FSEL registers */ spinlock_t fsel_lock; + u32 *saved_mux; + u32 *saved_pad; }; static unsigned int brcmstb_pinctrl_fsel_get(struct brcmstb_pinctrl *pc, @@ -422,6 +424,13 @@ int brcmstb_pinctrl_probe(struct platform_device *pdev) pc->func_count = pdata->func_count; pc->func_names = pdata->func_names; + pc->saved_mux = devm_kcalloc(dev, num_pins, sizeof(*pc->saved_mux), + GFP_KERNEL); + pc->saved_pad = devm_kcalloc(dev, num_pins, sizeof(*pc->saved_pad), + GFP_KERNEL); + if (!pc->saved_mux || !pc->saved_pad) + return -ENOMEM; + pc->pctl_dev = devm_pinctrl_register(dev, &pc->pctl_desc, pc); if (IS_ERR(pc->pctl_dev)) return dev_err_probe(&pdev->dev, PTR_ERR(pc->pctl_dev), @@ -434,6 +443,46 @@ int brcmstb_pinctrl_probe(struct platform_device *pdev) } EXPORT_SYMBOL(brcmstb_pinctrl_probe); +int brcmstb_pinctrl_suspend(struct device *dev) +{ + struct brcmstb_pinctrl *pc = dev_get_drvdata(dev); + unsigned int i, num_pins = pc->pctl_desc.npins; + u32 bit; + + for (i = 0; i < num_pins; i++) { + bit = pc->pin_regs[i].mux_bit; + if (bit) + pc->saved_mux[i] = readl(pc->base + BIT_TO_REG(bit & ~MUX_BIT_VALID)); + + bit = pc->pin_regs[i].pad_bit; + if (bit != PAD_BIT_INVALID) + pc->saved_pad[i] = readl(pc->base + BIT_TO_REG(bit)); + } + + return 0; +} +EXPORT_SYMBOL(brcmstb_pinctrl_suspend); + +int brcmstb_pinctrl_resume(struct device *dev) +{ + struct brcmstb_pinctrl *pc = dev_get_drvdata(dev); + unsigned int i, num_pins = pc->pctl_desc.npins; + u32 bit; + + for (i = 0; i < num_pins; i++) { + bit = pc->pin_regs[i].mux_bit; + if (bit) + writel(pc->saved_mux[i], pc->base + BIT_TO_REG(bit & ~MUX_BIT_VALID)); + + bit = pc->pin_regs[i].pad_bit; + if (bit != PAD_BIT_INVALID) + writel(pc->saved_pad[i], pc->base + BIT_TO_REG(bit)); + } + + return 0; +} +EXPORT_SYMBOL(brcmstb_pinctrl_resume); + MODULE_AUTHOR("Phil Elwell"); MODULE_AUTHOR("Jonathan Bell"); MODULE_AUTHOR("Ivan T. Ivanov"); diff --git a/drivers/pinctrl/bcm/pinctrl-brcmstb.h b/drivers/pinctrl/bcm/pinctrl-brcmstb.h index c3459103e0563..e5f8049eb0e51 100644 --- a/drivers/pinctrl/bcm/pinctrl-brcmstb.h +++ b/drivers/pinctrl/bcm/pinctrl-brcmstb.h @@ -89,5 +89,7 @@ struct brcmstb_pdata { }; int brcmstb_pinctrl_probe(struct platform_device *pdev); +int brcmstb_pinctrl_suspend(struct device *dev); +int brcmstb_pinctrl_resume(struct device *dev); #endif From 486124bdcca94e0e27c63d0717f5f4dca096b7f4 Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Tue, 18 Aug 2026 15:22:44 +0100 Subject: [PATCH 13/28] serial: amba-pl011: Add start_rx to re-enable interrupts Re-enable interrupts in start_rx. This fixes the serial console ignoring input after a system suspend with no_console_suspend set. Signed-off-by: Peter Bailey --- drivers/tty/serial/amba-pl011.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 5d60c9ed01cbc..5c622f35859f8 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -1468,6 +1468,24 @@ static void pl011_stop_rx(struct uart_port *port) pl011_dma_rx_stop(uap); } +static void pl011_start_rx(struct uart_port *port) +{ + struct uart_amba_port *uap = + container_of(port, struct uart_amba_port, port); + + uap->im |= UART011_RTIM; + if (!pl011_dma_rx_running(uap)) + uap->im |= UART011_RXIM; + pl011_write(uap->im, uap, REG_IMSC); + +#ifdef CONFIG_DMA_ENGINE + if (uap->using_rx_dma) { + uap->dmacr |= UART011_RXDMAE; + pl011_write(uap->dmacr, uap, REG_DMACR); + } +#endif +} + static void pl011_throttle_rx(struct uart_port *port) { unsigned long flags; @@ -2354,6 +2372,7 @@ static const struct uart_ops amba_pl011_pops = { .stop_tx = pl011_stop_tx, .start_tx = pl011_start_tx, .stop_rx = pl011_stop_rx, + .start_rx = pl011_start_rx, .throttle = pl011_throttle_rx, .unthrottle = pl011_unthrottle_rx, .enable_ms = pl011_enable_ms, @@ -2388,6 +2407,7 @@ static const struct uart_ops sbsa_uart_pops = { .stop_tx = pl011_stop_tx, .start_tx = pl011_start_tx, .stop_rx = pl011_stop_rx, + .start_rx = pl011_start_rx, .startup = sbsa_uart_startup, .shutdown = sbsa_uart_shutdown, .set_termios = sbsa_uart_set_termios, From f7c490b68a8bbaf4e54e12f88a9b1fe15ed9ff6b Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Tue, 18 Aug 2026 18:00:47 +0100 Subject: [PATCH 14/28] irqchip: bcm2712-mip: Restore registers after suspend The registers get reset during suspend. Restore them on resume. Signed-off-by: Peter Bailey --- drivers/irqchip/irq-bcm2712-mip.c | 38 +++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/drivers/irqchip/irq-bcm2712-mip.c b/drivers/irqchip/irq-bcm2712-mip.c index 4761974ad650a..e1634aac32cca 100644 --- a/drivers/irqchip/irq-bcm2712-mip.c +++ b/drivers/irqchip/irq-bcm2712-mip.c @@ -10,6 +10,7 @@ #include #include #include +#include #include @@ -170,6 +171,19 @@ static const struct msi_parent_ops mip_msi_parent_ops = { .init_dev_msi_info = msi_lib_init_dev_msi_info, }; +static void mip_hw_init(struct mip_priv *mip) +{ + /* + * All MSI-X unmasked for the host, masked for the VPU, and edge-triggered. + */ + writel(0, mip->base + MIP_INT_MASKL_HOST); + writel(0, mip->base + MIP_INT_MASKH_HOST); + writel(~0, mip->base + MIP_INT_MASKL_VPU); + writel(~0, mip->base + MIP_INT_MASKH_VPU); + writel(~0, mip->base + MIP_INT_CFGL_HOST); + writel(~0, mip->base + MIP_INT_CFGH_HOST); +} + static int mip_init_domains(struct mip_priv *mip, struct device_node *np) { struct irq_domain_info info = { @@ -184,15 +198,7 @@ static int mip_init_domains(struct mip_priv *mip, struct device_node *np) if (!msi_create_parent_irq_domain(&info, &mip_msi_parent_ops)) return -ENOMEM; - /* - * All MSI-X unmasked for the host, masked for the VPU, and edge-triggered. - */ - writel(0, mip->base + MIP_INT_MASKL_HOST); - writel(0, mip->base + MIP_INT_MASKH_HOST); - writel(~0, mip->base + MIP_INT_MASKL_VPU); - writel(~0, mip->base + MIP_INT_MASKH_VPU); - writel(~0, mip->base + MIP_INT_CFGL_HOST); - writel(~0, mip->base + MIP_INT_CFGH_HOST); + mip_hw_init(mip); return 0; } @@ -244,6 +250,7 @@ static int mip_msi_probe(struct platform_device *pdev, struct device_node *paren spin_lock_init(&mip->lock); mip->dev = &pdev->dev; + platform_set_drvdata(pdev, mip); ret = mip_parse_dt(mip, node); if (ret) @@ -279,9 +286,20 @@ static int mip_msi_probe(struct platform_device *pdev, struct device_node *paren return ret; } +static int mip_resume(struct device *dev) +{ + struct mip_priv *mip = dev_get_drvdata(dev); + + mip_hw_init(mip); + + return 0; +} + +static DEFINE_NOIRQ_DEV_PM_OPS(mip_pm_ops, NULL, mip_resume); + IRQCHIP_PLATFORM_DRIVER_BEGIN(mip_msi) IRQCHIP_MATCH("brcm,bcm2712-mip", mip_msi_probe) -IRQCHIP_PLATFORM_DRIVER_END(mip_msi) +IRQCHIP_PLATFORM_DRIVER_END(mip_msi, .pm = pm_sleep_ptr(&mip_pm_ops)) MODULE_DESCRIPTION("Broadcom BCM2712 MSI-X interrupt controller"); MODULE_AUTHOR("Phil Elwell "); MODULE_AUTHOR("Stanimir Varbanov "); From e495c3c215c60db0cc4092b5f1d5a1b9b09b3d79 Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Wed, 19 Aug 2026 10:57:39 +0100 Subject: [PATCH 15/28] mailbox: rp1: check received event bits more carefully There are 32 individual event bits of which 4 correspond to mailbox channels. Limit the IRQ handler to signalling mailbox events on actual mailboxes, to prevent all-1s completions (such as when the link is down) or RP1 firmware bugs from causing null pointer dereferences. Signed-off-by: Jonathan Bell --- drivers/mailbox/rp1-mailbox.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/mailbox/rp1-mailbox.c b/drivers/mailbox/rp1-mailbox.c index a9a86a9ec89b9..b5044fe0f2e76 100644 --- a/drivers/mailbox/rp1-mailbox.c +++ b/drivers/mailbox/rp1-mailbox.c @@ -66,8 +66,11 @@ static irqreturn_t rp1_mbox_irq(int irq, void *dev_id) while (evs) { doorbell = __ffs(evs); + if (doorbell >= MAX_CHANS) + break; chan = &mbox->controller.chans[doorbell]; - mbox_chan_received_data(chan, NULL); + if (chan) + mbox_chan_received_data(chan, NULL); evs &= ~(1 << doorbell); } return IRQ_HANDLED; From 3ec0b577a2f07d1c6acc5e54561c9cd2fdf2cbe7 Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Wed, 19 Aug 2026 15:06:54 +0100 Subject: [PATCH 16/28] mmc: sdhci-brcmstb: Reconfigure on resume Rerun the sdhci initialisation on resume. Signed-off-by: Peter Bailey --- drivers/mmc/host/sdhci-brcmstb.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c index 0b1823ec06c11..9be2ef938efbe 100644 --- a/drivers/mmc/host/sdhci-brcmstb.c +++ b/drivers/mmc/host/sdhci-brcmstb.c @@ -52,6 +52,7 @@ struct sdhci_brcmstb_priv { void __iomem *cfg_regs; + void (*cfginit)(struct sdhci_host *host); unsigned int flags; struct clk *base_clk; u32 base_freq_hz; @@ -600,6 +601,7 @@ static int sdhci_brcmstb_probe(struct platform_device *pdev) pltfm_host->clk = clk; priv = sdhci_pltfm_priv(pltfm_host); + priv->cfginit = match_priv->cfginit; cqe = 0; device_property_read_u32(&pdev->dev, "supports-cqe", &cqe); if (cqe > 0) { @@ -681,8 +683,8 @@ static int sdhci_brcmstb_probe(struct platform_device *pdev) (priv->flags & BRCMSTB_PRIV_FLAGS_HAS_SD_EXPRESS)) host->mmc->caps2 |= MMC_CAP2_SD_EXP; - if (match_priv->cfginit) - match_priv->cfginit(host); + if (priv->cfginit) + priv->cfginit(host); /* * Supply the existing CAPS, but clear the UHS modes. This @@ -772,6 +774,9 @@ static int sdhci_brcmstb_resume(struct device *dev) struct sdhci_brcmstb_priv *priv = sdhci_pltfm_priv(pltfm_host); int ret; + if (priv->cfginit) + priv->cfginit(host); + ret = sdhci_pltfm_resume(dev); if (!ret && priv->base_freq_hz) { ret = clk_prepare_enable(priv->base_clk); From a18c20c6c07643a31294ceaaa43c14aaad32aa90 Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Fri, 21 Aug 2026 16:26:43 +0100 Subject: [PATCH 17/28] media: pisp_be: Add suspend/resume support On suspend, check if there is a current job being processed. Suspending takes longer than a pisp job so assume it will be done and cancel suspending if it is not. On resume, restore hardware registers. Signed-off-by: Peter Bailey --- .../platform/raspberrypi/pisp_be/pisp_be.c | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c b/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c index c6c73097d0402..42522485befa4 100644 --- a/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +++ b/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c @@ -5,6 +5,7 @@ * */ #include +#include #include #include #include @@ -1826,8 +1827,41 @@ static void pispbe_remove(struct platform_device *pdev) pm_runtime_disable(pispbe->dev); } +static int pispbe_suspend(struct device *dev) +{ + struct pispbe_dev *pispbe = dev_get_drvdata(dev); + bool busy; + + scoped_guard(spinlock_irqsave, &pispbe->hw_lock) { + busy = pispbe->hw_busy; + } + + if (busy) { + msleep(100); + + scoped_guard(spinlock_irqsave, &pispbe->hw_lock) { + busy = pispbe->hw_busy; + } + } + + if (busy) { + dev_err(dev, "Timed out waiting for ISP-BE to finish.\n"); + return -EBUSY; + } + + return 0; +} + +static int pispbe_resume(struct device *dev) +{ + struct pispbe_dev *pispbe = dev_get_drvdata(dev); + + return pispbe_hw_init(pispbe); +} + static const struct dev_pm_ops pispbe_pm_ops = { SET_RUNTIME_PM_OPS(pispbe_runtime_suspend, pispbe_runtime_resume, NULL) + SET_SYSTEM_SLEEP_PM_OPS(pispbe_suspend, pispbe_resume) }; static const struct of_device_id pispbe_of_match[] = { From 6541015ad7e2fb6de855b401977aaa8f218ecca2 Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Mon, 24 Aug 2026 10:56:24 +0100 Subject: [PATCH 18/28] drm/rp1: dsi: Add suspend/resume support Use the modeset helper functions and disable the clock in suspend. Signed-off-by: Peter Bailey --- drivers/gpu/drm/rp1/rp1-dsi/rp1_dsi.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/gpu/drm/rp1/rp1-dsi/rp1_dsi.c b/drivers/gpu/drm/rp1/rp1-dsi/rp1_dsi.c index d452b0b1804e6..6f38297908ddc 100644 --- a/drivers/gpu/drm/rp1/rp1-dsi/rp1_dsi.c +++ b/drivers/gpu/drm/rp1/rp1-dsi/rp1_dsi.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -522,6 +523,23 @@ static void rp1dsi_platform_shutdown(struct platform_device *pdev) rp1dsi_stopall(drm); } +static int rp1dsi_platform_suspend(struct device *dev) +{ + struct drm_device *drm = dev_get_drvdata(dev); + + return drm_mode_config_helper_suspend(drm); +} + +static int rp1dsi_platform_resume(struct device *dev) +{ + struct drm_device *drm = dev_get_drvdata(dev); + + return drm_mode_config_helper_resume(drm); +} + +static DEFINE_SIMPLE_DEV_PM_OPS(rp1dsi_pm_ops, rp1dsi_platform_suspend, + rp1dsi_platform_resume); + static const struct of_device_id rp1dsi_of_match[] = { { .compatible = "raspberrypi,rp1dsi", @@ -539,6 +557,7 @@ static struct platform_driver rp1dsi_platform_driver = { .name = DRIVER_NAME, .owner = THIS_MODULE, .of_match_table = rp1dsi_of_match, + .pm = pm_sleep_ptr(&rp1dsi_pm_ops), }, }; From fbd5deca67a9cdbdd02fd1c7ccb28df69ba65a33 Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Fri, 4 Sep 2026 14:48:40 +0100 Subject: [PATCH 19/28] dt-bindings: bluetooth: Add power-off-in-suspend property On a Raspberry Pi 5, the bluetooth is powered off in system suspend. Add a property for this behaviour. Signed-off-by: Peter Bailey --- .../devicetree/bindings/net/bluetooth/brcm,bluetooth.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/net/bluetooth/brcm,bluetooth.yaml b/Documentation/devicetree/bindings/net/bluetooth/brcm,bluetooth.yaml index 3c410cadff230..b8247da02bdf2 100644 --- a/Documentation/devicetree/bindings/net/bluetooth/brcm,bluetooth.yaml +++ b/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 From 2f48b27e3679d520ad5ac30291060cb4a4916c3c Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Fri, 4 Sep 2026 14:50:50 +0100 Subject: [PATCH 20/28] Bluetooth: hci_bcm: Add support for powering off during suspend Implement the power-off-in-suspend property so that bluetooth is handled correctly after suspend. It is powered off so reprobe the device again on resume. Signed-off-by: Peter Bailey --- drivers/bluetooth/hci_bcm.c | 83 ++++++++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c index 0a54a7cf2bdef..5862fe9a0e787 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -107,6 +108,8 @@ struct bcm_device_data { * @no_uart_clock_set: UART clock set command for >3Mbps mode is unavailable * @pcm_int_params: keep the initial PCM configuration * @use_autobaud_mode: start Bluetooth device in autobaud mode + * @power_off_in_suspend: controller loses power during a system suspend, so + * the device is reprobed on resume * @max_autobaud_speed: max baudrate supported by device in autobaud mode */ struct bcm_device { @@ -147,6 +150,7 @@ struct bcm_device { bool drive_rts_on_open; bool no_uart_clock_set; bool use_autobaud_mode; + bool power_off_in_suspend; u8 pcm_int_params[5]; u32 max_autobaud_speed; }; @@ -159,6 +163,38 @@ struct bcm_data { struct bcm_device *dev; }; +/* True when the controller will be powered off across a system suspend and + * rebuilt by a reprobe. Runtime PM is switched off for these devices, so the + * runtime callbacks cannot race the suspend path. + */ +static bool bcm_powers_off_in_suspend(const struct bcm_device *bdev) +{ + return IS_ENABLED(CONFIG_PM_SLEEP) && bdev && + bdev->power_off_in_suspend && bdev->hu && bdev->hu->serdev; +} + +#ifdef CONFIG_PM_SLEEP +struct bcm_reprobe { + struct device *dev; + struct work_struct work; +}; + +static void bcm_reprobe_worker(struct work_struct *work) +{ + struct bcm_reprobe *reprobe = + container_of(work, struct bcm_reprobe, work); + int ret; + + ret = device_reprobe(reprobe->dev); + if (ret && ret != -EPROBE_DEFER) + dev_err(reprobe->dev, "Reprobe error %d\n", ret); + + put_device(reprobe->dev); + kfree(reprobe); + module_put(THIS_MODULE); +} +#endif + /* List of BCM BT UART devices */ static DEFINE_MUTEX(bcm_device_lock); static LIST_HEAD(bcm_device_list); @@ -485,6 +521,12 @@ static int bcm_open(struct hci_uart *hu) out: if (bcm->dev) { + /* Since bcm_resume() reprobes the device, the suspend handling + * done by the hci_suspend_notifier is not necessary. + */ + if (bcm_powers_off_in_suspend(bcm->dev)) + set_bit(HCI_UART_NO_SUSPEND_NOTIFIER, &hu->flags); + if (bcm->dev->use_autobaud_mode) hci_uart_set_flow_control(hu, false); /* Assert BT_UART_CTS_N */ else if (bcm->dev->drive_rts_on_open) @@ -546,6 +588,7 @@ static int bcm_close(struct hci_uart *hu) if (bdev) { if (IS_ENABLED(CONFIG_PM) && bdev->irq_acquired) { + bdev->irq_acquired = false; devm_free_irq(bdev->dev, bdev->irq, bdev); device_init_wakeup(bdev->dev, false); pm_runtime_dont_use_autosuspend(bdev->dev); @@ -647,7 +690,7 @@ static int bcm_setup(struct hci_uart *hu) if (hci_test_quirk(hu->hdev, HCI_QUIRK_INVALID_BDADDR)) hci_set_quirk(hu->hdev, HCI_QUIRK_USE_BDADDR_PROPERTY); - if (!bcm_request_irq(bcm)) + if (!bcm_powers_off_in_suspend(bcm->dev) && !bcm_request_irq(bcm)) err = bcm_setup_sleep(hu); return err; @@ -826,6 +869,25 @@ static int bcm_suspend(struct device *dev) bt_dev_dbg(bdev, "suspend: is_suspended %d", bdev->is_suspended); + /* The controller loses power across the suspend and bcm_resume() + * reprobes it, so there is no state here worth preserving. Stop the + * UART and drive the controller off, as h5_btrtl_suspend() does. + */ + if (bcm_powers_off_in_suspend(bdev)) { + struct hci_dev *hdev = bdev->hu->hdev; + + /* Wait for power_on before suspending. bcm_setup causes + * a timeout if a suspend occurs duriung it + */ + if (hdev) + flush_work(&hdev->power_on); + + hci_uart_set_flow_control(bdev->hu, true); + bcm_gpio_set_power(bdev, false); + + return 0; + } + /* * When used with a device instantiated as platform_device, bcm_suspend * can be called at any time as long as the platform device is bound, @@ -860,6 +922,23 @@ static int bcm_resume(struct device *dev) bt_dev_dbg(bdev, "resume: is_suspended %d", bdev->is_suspended); + /* The device has lost all of its firmware and state so reprobe it. */ + if (bcm_powers_off_in_suspend(bdev)) { + struct bcm_reprobe *reprobe; + + reprobe = kzalloc(sizeof(*reprobe), GFP_KERNEL); + if (!reprobe) + return -ENOMEM; + + __module_get(THIS_MODULE); + + INIT_WORK(&reprobe->work, bcm_reprobe_worker); + reprobe->dev = get_device(bdev->dev); + queue_work(system_long_wq, &reprobe->work); + + return 0; + } + /* * When used with a device instantiated as platform_device, bcm_resume * can be called at any time as long as platform device is bound, @@ -1230,6 +1309,8 @@ static int bcm_of_probe(struct bcm_device *bdev) { bdev->use_autobaud_mode = device_property_read_bool(bdev->dev, "brcm,requires-autobaud-mode"); + bdev->power_off_in_suspend = device_property_read_bool(bdev->dev, + "brcm,power-off-in-suspend"); device_property_read_u32(bdev->dev, "max-speed", &bdev->oper_speed); device_property_read_u8_array(bdev->dev, "brcm,bt-pcm-int-params", bdev->pcm_int_params, 5); From 4be50fc843b199039c773781973035f5c7369c17 Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Tue, 25 Aug 2026 10:04:54 +0100 Subject: [PATCH 21/28] arm64: dts: broadcom: bcm2712: Power off bluetooth in suspend Add a device tree property so that bluetooth is handled correctly after suspend. It is powered off so the device is registered again on resume. Signed-off-by: Peter Bailey --- arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 1 + arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts index c6ff03ba495a8..c549fd8057e08 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts @@ -374,6 +374,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 ]; }; }; diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi index 76ecc3d2e3582..a3fba8181113b 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi +++ b/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 ]; }; }; From 6329894c6000da3b4b9042ad776b057056a432dd Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Tue, 25 Aug 2026 15:25:13 +0100 Subject: [PATCH 22/28] arm64: dts: bcm2712: Add a regulator for pcie 3v3 This adds a regulator for pcie1 using a pin on the RP1. It needs a hack to order pcie2 before pcie1 so that the regulator is found by the pcie-brcmstb driver. Signed-off-by: Peter Bailey --- arch/arm/boot/dts/overlays/README | 2 ++ .../overlays/pciex1-compat-pi5-overlay.dts | 12 +++++++ .../boot/dts/broadcom/bcm2712-rpi-5-b.dts | 29 ++++++++++++++++ .../boot/dts/broadcom/bcm2712-rpi-cm5io.dtsi | 33 +++++++++++++++++++ 4 files changed, 76 insertions(+) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README index 64aab639e4984..15d0c82fec85e 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/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. ] diff --git a/arch/arm/boot/dts/overlays/pciex1-compat-pi5-overlay.dts b/arch/arm/boot/dts/overlays/pciex1-compat-pi5-overlay.dts index 1f5adfc4add10..e7ca5bf1a08a3 100644 --- a/arch/arm/boot/dts/overlays/pciex1-compat-pi5-overlay.dts +++ b/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"; }; }; diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts index c549fd8057e08..aec70c4e78088 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts +++ b/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 diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5io.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5io.dtsi index 4c616a21dc76b..6eb15ef06bfe0 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5io.dtsi +++ b/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"; }; From 355ba8f10ccd018f60c14c0260b650bf0115b598 Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Tue, 25 Aug 2026 16:13:32 +0100 Subject: [PATCH 23/28] drivers: rtc-rpi: Clear a pending alarm on resume and when setting another alarm This clears the pending alarm when resuming from system suspend and when setting another alarm. Previously, If the rtc was used to wake from suspend more than one time in a row, It would fail. If the alarm is set and the system is suspended, resumed and suspended before the alarm occurs, the alarm will still wake the system. Signed-off-by: Peter Bailey --- drivers/rtc/rtc-rpi.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/rtc/rtc-rpi.c b/drivers/rtc/rtc-rpi.c index 006012333e789..2d0b6773d916b 100644 --- a/drivers/rtc/rtc-rpi.c +++ b/drivers/rtc/rtc-rpi.c @@ -108,6 +108,8 @@ static int rpi_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) u32 data[2] = {RTC_ALARM, rtc_tm_to_time64(&alarm->time)}; int err; + rpi_rtc_alarm_clear_pending(dev); + err = rpi_firmware_property(vrtc->fw, RPI_FIRMWARE_SET_RTC_REG, &data, sizeof(data)); @@ -257,6 +259,19 @@ static int rpi_rtc_probe(struct platform_device *pdev) return devm_rtc_register_device(vrtc->rtc); } +static int rpi_rtc_resume(struct device *dev) +{ + struct rpi_rtc_data *vrtc = dev_get_drvdata(dev); + + rpi_rtc_alarm_clear_pending(dev); + + rtc_update_irq(vrtc->rtc, 1, RTC_AF); + + return 0; +} + +static DEFINE_SIMPLE_DEV_PM_OPS(rpi_rtc_pm_ops, NULL, rpi_rtc_resume); + static const struct of_device_id rpi_rtc_dt_match[] = { { .compatible = "raspberrypi,rpi-rtc"}, {}, @@ -268,6 +283,7 @@ static struct platform_driver rpi_rtc_driver = { .driver = { .name = "rpi-rtc", .of_match_table = rpi_rtc_dt_match, + .pm = pm_sleep_ptr(&rpi_rtc_pm_ops), }, }; From 10170b0a931d4f9f8f52b83a088a78be8d24c7da Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Fri, 28 Aug 2026 11:42:10 +0100 Subject: [PATCH 24/28] media: imx500: Stop streaming during system suspend. This prevents the camera from sometimes freezing when using rpicam-hello -t 0 Signed-off-by: Peter Bailey --- drivers/media/i2c/imx500.c | 50 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/imx500.c b/drivers/media/i2c/imx500.c index 5fc593340e958..1e44c54b47778 100644 --- a/drivers/media/i2c/imx500.c +++ b/drivers/media/i2c/imx500.c @@ -3250,6 +3250,50 @@ static int imx500_set_stream(struct v4l2_subdev *sd, int enable) return ret; } +static int __maybe_unused imx500_suspend(struct device *dev) +{ + struct i2c_client *client = to_i2c_client(dev); + struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct imx500 *imx500 = to_imx500(sd); + + mutex_lock(&imx500->mutex); + + if (imx500->streaming) + imx500_stop_streaming(imx500); + + mutex_unlock(&imx500->mutex); + + return 0; +} + +static int __maybe_unused imx500_resume(struct device *dev) +{ + struct i2c_client *client = to_i2c_client(dev); + struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct imx500 *imx500 = to_imx500(sd); + int ret; + + mutex_lock(&imx500->mutex); + + if (imx500->streaming) { + ret = imx500_start_streaming(imx500); + if (ret) + goto error; + } + + mutex_unlock(&imx500->mutex); + + return 0; + +error: + imx500_stop_streaming(imx500); + imx500->streaming = false; + + mutex_unlock(&imx500->mutex); + + return ret; +} + static int imx500_get_regulators(struct imx500 *imx500) { struct i2c_client *client = v4l2_get_subdevdata(&imx500->sd); @@ -3734,8 +3778,10 @@ static const struct of_device_id imx500_dt_ids[] = { MODULE_DEVICE_TABLE(of, imx500_dt_ids); -static const struct dev_pm_ops imx500_pm_ops = { SET_RUNTIME_PM_OPS( - imx500_power_off, imx500_power_on, NULL) }; +static const struct dev_pm_ops imx500_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(imx500_suspend, imx500_resume) + SET_RUNTIME_PM_OPS(imx500_power_off, imx500_power_on, NULL) +}; static struct i2c_driver imx500_i2c_driver = { .driver = { From 1acf4d65606a4c1494a3b642dd405abaaf9922e4 Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Mon, 7 Sep 2026 17:33:47 +0100 Subject: [PATCH 25/28] drm/rp1: vec: Add suspend/resume support Use the modeset helper functions and poweroff the DAC in suspend. Signed-off-by: Peter Bailey --- drivers/gpu/drm/rp1/rp1-vec/rp1_vec.c | 33 +++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/drivers/gpu/drm/rp1/rp1-vec/rp1_vec.c b/drivers/gpu/drm/rp1/rp1-vec/rp1_vec.c index d2e5cd57e936a..b8c5eefe20201 100644 --- a/drivers/gpu/drm/rp1/rp1-vec/rp1_vec.c +++ b/drivers/gpu/drm/rp1/rp1-vec/rp1_vec.c @@ -579,6 +579,38 @@ static void rp1vec_platform_shutdown(struct platform_device *pdev) rp1vec_stopall(drm); } +static int rp1vec_platform_suspend(struct device *dev) +{ + struct drm_device *drm = dev_get_drvdata(dev); + struct rp1_vec *vec = drm->dev_private; + int ret; + + ret = drm_mode_config_helper_suspend(drm); + if (ret) + return ret; + + rp1vec_vidout_poweroff(vec); + clk_disable_unprepare(vec->vec_clock); + + return 0; +} + +static int rp1vec_platform_resume(struct device *dev) +{ + struct drm_device *drm = dev_get_drvdata(dev); + struct rp1_vec *vec = drm->dev_private; + int ret; + + clk_prepare_enable(vec->vec_clock); + + ret = drm_mode_config_helper_resume(drm); + + return ret; +} + +static DEFINE_SIMPLE_DEV_PM_OPS(rp1vec_pm_ops, rp1vec_platform_suspend, + rp1vec_platform_resume); + static const struct of_device_id rp1vec_of_match[] = { { .compatible = "raspberrypi,rp1vec", @@ -596,6 +628,7 @@ static struct platform_driver rp1vec_platform_driver = { .name = DRIVER_NAME, .owner = THIS_MODULE, .of_match_table = rp1vec_of_match, + .pm = pm_sleep_ptr(&rp1vec_pm_ops), }, }; From 3aee46d84a78b1d2c0680bcecd0bac774f674920 Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Tue, 8 Sep 2026 09:36:12 +0100 Subject: [PATCH 26/28] dt-bindings: usb: snps,dwc3: Add snps,power-off-in-s2ram Add a device tree property to indicate that the xHCI controller will be reset over suspend. Signed-off-by: Peter Bailey --- .../devicetree/bindings/usb/snps,dwc3-common.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/usb/snps,dwc3-common.yaml b/Documentation/devicetree/bindings/usb/snps,dwc3-common.yaml index f44f16abb5389..1b587c2643b67 100644 --- a/Documentation/devicetree/bindings/usb/snps,dwc3-common.yaml +++ b/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 From ca04163d21cf5135f2ed674915331832e5bb1fd7 Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Tue, 8 Sep 2026 09:38:20 +0100 Subject: [PATCH 27/28] usb: dwc3: Add a DT property for losing power in suspend Use the snps,power-off-in-s2ram property to set power_lost in xhci-plat Signed-off-by: Peter Bailey --- drivers/usb/dwc3/core.c | 3 +++ drivers/usb/dwc3/core.h | 3 +++ drivers/usb/dwc3/host.c | 6 ++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index fcbbb04fdeed1..c67f23620230e 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1925,6 +1925,9 @@ static void dwc3_get_properties(struct dwc3 *dwc) dwc->dis_split_quirk = device_property_read_bool(dev, "snps,dis-split-quirk"); + dwc->power_off_in_suspend = device_property_read_bool(dev, + "snps,power-off-in-s2ram"); + device_property_read_u8(dev, "snps,axi-pipe-limit", &axi_pipe_limit); diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index a6536f12406fe..4cb3ca9ca2326 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1175,6 +1175,8 @@ struct dwc3_glue_ops { * @dis_split_quirk: set to disable split boundary. * @enable_usb2_transceiver_delay: Set to insert a delay before the * assertion of the TxValid signal during a HS Chirp. + * @power_off_in_suspend: set if the controller is powered off during system + * suspend, so all of its state is lost. * @sys_wakeup: set if the device may do system wakeup. * @wakeup_configured: set if the device is configured for remote wakeup. * @suspended: set to track suspend event due to U3/L2. @@ -1422,6 +1424,7 @@ struct dwc3 { unsigned dis_split_quirk:1; unsigned enable_usb2_transceiver_delay:1; + unsigned power_off_in_suspend:1; unsigned async_callbacks:1; unsigned sys_wakeup:1; unsigned wakeup_configured:1; diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c index cd59aba1fac0e..52e0a18528181 100644 --- a/drivers/usb/dwc3/host.c +++ b/drivers/usb/dwc3/host.c @@ -130,6 +130,7 @@ static int dwc3_host_get_irq(struct dwc3 *dwc) int dwc3_host_init(struct dwc3 *dwc) { struct platform_device *pdev = to_platform_device(dwc->dev); + struct xhci_plat_priv xhci_priv = dwc3_xhci_plat_quirk; struct property_entry props[6]; struct platform_device *xhci; int ret, irq; @@ -203,8 +204,9 @@ int dwc3_host_init(struct dwc3 *dwc) } } - ret = platform_device_add_data(xhci, &dwc3_xhci_plat_quirk, - sizeof(struct xhci_plat_priv)); + xhci_priv.power_lost = dwc->power_off_in_suspend; + + ret = platform_device_add_data(xhci, &xhci_priv, sizeof(xhci_priv)); if (ret) goto err; From 8e9ba6265a4fecd0f796c1c7175004f46a25bb00 Mon Sep 17 00:00:00 2001 From: Peter Bailey Date: Tue, 8 Sep 2026 09:52:14 +0100 Subject: [PATCH 28/28] arm64: dts: rp1: Mark the USB controllers as powered off in suspend The RP1 will reset the USB controllers over suspend. Add snps,power-off-in-suspend to its device tree. Signed-off-by: Peter Bailey --- arch/arm64/boot/dts/broadcom/rp1.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/broadcom/rp1.dtsi b/arch/arm64/boot/dts/broadcom/rp1.dtsi index 7141dfcff4e70..d07573cb7dc07 100644 --- a/arch/arm64/boot/dts/broadcom/rp1.dtsi +++ b/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 = ; @@ -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 = ;