| Message ID | 20250326113901.3308804-2-sebastianene@google.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | KVM: arm64: Separate the hyp FF-A buffers init from the host | expand |
On Wednesday 26 Mar 2025 at 11:38:59 (+0000), Sebastian Ene wrote: > Replace the definition of the hypervisor version lock > with a static initializer. > > Signed-off-by: Sebastian Ene <sebastianene@google.com> > Acked-by: Will Deacon <will@kernel.org> Reviewed-by: Quentin Perret <qperret@google.com> > --- > arch/arm64/kvm/hyp/nvhe/ffa.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c > index e433dfab882a..6df6131f1107 100644 > --- a/arch/arm64/kvm/hyp/nvhe/ffa.c > +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c > @@ -69,7 +69,7 @@ static struct kvm_ffa_buffers hyp_buffers; > static struct kvm_ffa_buffers host_buffers; > static u32 hyp_ffa_version; > static bool has_version_negotiated; > -static hyp_spinlock_t version_lock; > +static DEFINE_HYP_SPINLOCK(version_lock); > > static void ffa_to_smccc_error(struct arm_smccc_res *res, u64 ffa_errno) > { > @@ -911,6 +911,5 @@ int hyp_ffa_init(void *pages) > .lock = __HYP_SPIN_LOCK_UNLOCKED, > }; > > - version_lock = __HYP_SPIN_LOCK_UNLOCKED; > return 0; > } > -- > 2.49.0.395.g12beb8f557-goog >
diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index e433dfab882a..6df6131f1107 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -69,7 +69,7 @@ static struct kvm_ffa_buffers hyp_buffers; static struct kvm_ffa_buffers host_buffers; static u32 hyp_ffa_version; static bool has_version_negotiated; -static hyp_spinlock_t version_lock; +static DEFINE_HYP_SPINLOCK(version_lock); static void ffa_to_smccc_error(struct arm_smccc_res *res, u64 ffa_errno) { @@ -911,6 +911,5 @@ int hyp_ffa_init(void *pages) .lock = __HYP_SPIN_LOCK_UNLOCKED, }; - version_lock = __HYP_SPIN_LOCK_UNLOCKED; return 0; }