From 5da8469f803a9890f198ec99b2d72658d8165518 Mon Sep 17 00:00:00 2001 From: Mostafa Saleh Date: Fri, 20 Dec 2024 13:58:06 +0000 Subject: [PATCH] ANDROID: KVM: arm64: scmi: Rely on donation logic Instead of using custom functions to map/unmap memory in host, that doesn't check any state, rely on the donation logic which should do the right thing. Bug: 357781595 Bug: 384432312 Change-Id: I311bbcebfb2eb94d627e85da463226e97898c9a5 Signed-off-by: Mostafa Saleh --- arch/arm64/kvm/hyp/nvhe/power/scmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/power/scmi.c b/arch/arm64/kvm/hyp/nvhe/power/scmi.c index 7de3feb2f1d9..792b8eb94107 100644 --- a/arch/arm64/kvm/hyp/nvhe/power/scmi.c +++ b/arch/arm64/kvm/hyp/nvhe/power/scmi.c @@ -180,12 +180,12 @@ bool kvm_host_scmi_handler(struct kvm_cpu_context *host_ctxt) * it's unlikely with the SMC-based transport, this too requires some * tightening in the spec. */ - if (WARN_ON(__pkvm_host_add_remove_page(scmi_channel.shmem_pfn, true))) + if (WARN_ON(__pkvm_host_donate_hyp(scmi_channel.shmem_pfn, 1))) return true; __kvm_host_scmi_handler(host_ctxt); - WARN_ON(__pkvm_host_add_remove_page(scmi_channel.shmem_pfn, false)); + WARN_ON(__pkvm_hyp_donate_host(scmi_channel.shmem_pfn, 1)); return true; /* Handled */ }