diff --git a/arch/arm64/configs/vendor/genericarmv8-64_defconfig b/arch/arm64/configs/vendor/genericarmv8-64_defconfig
index 20a41e71b934..76b4164d9acf 100644
--- a/arch/arm64/configs/vendor/genericarmv8-64_defconfig
+++ b/arch/arm64/configs/vendor/genericarmv8-64_defconfig
@@ -69,6 +69,8 @@ CONFIG_COMPAT=y
 CONFIG_RANDOMIZE_BASE=y
 # CONFIG_EFI is not set
 CONFIG_HIBERNATION=y
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
 CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
 CONFIG_CPU_IDLE=y
 CONFIG_ARM_CPUIDLE=y
diff --git a/drivers/virt/haven/hh_dbl.c b/drivers/virt/haven/hh_dbl.c
index 04a108bcfac5..265c0dc6110e 100644
--- a/drivers/virt/haven/hh_dbl.c
+++ b/drivers/virt/haven/hh_dbl.c
@@ -569,6 +569,7 @@ int hh_dbl_populate_cap_info(enum hh_dbl_label label, u64 cap_id,
 			goto err;
 		}
 
+		irq_set_irq_wake(rx_irq, 1);
 		wake_up_interruptible(&cap_table_entry->cap_wq);
 
 		pr_debug("%s: label: %d; rx_cap_id: %llu; dir: %d; rx_irq: %d\n",
diff --git a/drivers/virt/haven/hh_msgq.c b/drivers/virt/haven/hh_msgq.c
index da7daf28e915..3d2b87acd961 100644
--- a/drivers/virt/haven/hh_msgq.c
+++ b/drivers/virt/haven/hh_msgq.c
@@ -462,6 +462,7 @@ int hh_msgq_populate_cap_info(enum hh_msgq_label label, u64 cap_id,
 		goto err;
 	}
 
+	irq_set_irq_wake(irq, 1);
 	spin_unlock(&cap_table_entry->cap_entry_lock);
 
 	pr_debug(