From d81875516ad862b7cb3ff5422da9cf4b443c286e Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:48:51 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: Fix size calculation of FFA memory range" This reverts commit 3d21efc81ca106c6f52cc87173df9c01c5907743. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: Ie1a4e5117d51af64d2bd2641dc68d13c13015dd5 --- arch/arm64/kvm/hyp/nvhe/ffa.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index 1fd6c6e267ba..2e5016399513 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -284,13 +284,10 @@ static u32 __ffa_host_share_ranges(struct ffa_mem_region_addr_range *ranges, for (i = 0; i < nranges; ++i) { struct ffa_mem_region_addr_range *range = &ranges[i]; - u64 sz = (u64)range->pg_cnt * FFA_PAGE_SIZE; + u64 npages = (range->pg_cnt * FFA_PAGE_SIZE) / PAGE_SIZE; u64 pfn = hyp_phys_to_pfn(range->address); - if (!PAGE_ALIGNED(sz)) - break; - - if (__pkvm_host_share_ffa(pfn, sz / PAGE_SIZE)) + if (__pkvm_host_share_ffa(pfn, npages)) break; } @@ -304,13 +301,10 @@ static u32 __ffa_host_unshare_ranges(struct ffa_mem_region_addr_range *ranges, for (i = 0; i < nranges; ++i) { struct ffa_mem_region_addr_range *range = &ranges[i]; - u64 sz = (u64)range->pg_cnt * FFA_PAGE_SIZE; + u64 npages = (range->pg_cnt * FFA_PAGE_SIZE) / PAGE_SIZE; u64 pfn = hyp_phys_to_pfn(range->address); - if (!PAGE_ALIGNED(sz)) - break; - - if (__pkvm_host_unshare_ffa(pfn, sz / PAGE_SIZE)) + if (__pkvm_host_unshare_ffa(pfn, npages)) break; }