diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2026-10-15 19:09:31 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2026-10-15 19:09:31 +0100 |
| commit | d0de3a73194a250a2e5ffbf1dc604c0bcbb16e8a (patch) | |
| tree | 423e5d8cb82aaec043b482b532ecdfdc116fb459 /kernel | |
| parent | 34fa781e25a6caa8862acd923e89d08cd9a9f37e (diff) | |
| parent | 06898e5320b5c12dd8c21d0ee8d5a68347001746 (diff) | |
| download | linux-d0de3a73194a250a2e5ffbf1dc604c0bcbb16e8a.tar.gz linux-d0de3a73194a250a2e5ffbf1dc604c0bcbb16e8a.zip | |
Merge branch 'for-next/fw-rmi' into for-next/core
* for-next/fw-rmi:
: RMM v2.0 base RMI support
firmware: arm_rmm: hotplug: Skip memory added to ZONE_MOVABLE
firmware: arm_rmm: Add wrappers for Realm related RMI commands
arm64: Block hibernate and kexec while RMM is active
PM: hibernate: Add an arch hook for preventing hibernation
firmware: arm_rmm: Ensure the RMM has GPT entries for memory
firmware: arm_rmm: Activate the RMM
firmware: arm_rmm: Add support for SRO
firmware: arm_rmm: Configure the RMM with the host's page size
firmware: arm_rmm: Check for RMI support at init
firmware: arm_rmm: Add SMC definitions for calling the RMM
arm64: mm: Handle Granule Protection Faults (GPFs)
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/hibernate.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index d2479c69d71a..9d9d53828542 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -106,11 +106,17 @@ bool hibernation_in_progress(void) return !atomic_read(&hibernate_atomic); } +__weak bool arch_hibernation_available(void) +{ + return true; +} + bool hibernation_available(void) { return nohibernate == 0 && !security_locked_down(LOCKDOWN_HIBERNATION) && - !secretmem_active() && !cxl_mem_active(); + !secretmem_active() && !cxl_mem_active() && + arch_hibernation_available(); } /** |