diff options
| author | Georgi Djakov <georgi.djakov@linaro.org> | 2021-02-01 13:26:57 +0100 |
|---|---|---|
| committer | Georgi Djakov <georgi.djakov@linaro.org> | 2021-02-01 13:26:57 +0100 |
| commit | 6715ea06ced45c8910c878877722ccf502301499 (patch) | |
| tree | bd784e5b8057ddd12ceb1d5db9323f5174b3dba2 /arch/arm64/kvm/va_layout.c | |
| parent | Merge branch 'icc-msm8939' into icc-next (diff) | |
| parent | interconnect: qcom: Add SDX55 interconnect provider driver (diff) | |
| download | linux-6715ea06ced45c8910c878877722ccf502301499.tar.xz linux-6715ea06ced45c8910c878877722ccf502301499.zip | |
Merge branch 'icc-sdx55' into icc-next
Add interconnect driver support for SDX55 platform for scaling the
bandwidth requirements over RPMh.
* icc-sdx55
dt-bindings: interconnect: Add Qualcomm SDX55 DT bindings
interconnect: qcom: Add SDX55 interconnect provider driver
Link: https://lore.kernel.org/r/20210121053254.8355-1-manivannan.sadhasivam@linaro.org
Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
Diffstat (limited to 'arch/arm64/kvm/va_layout.c')
| -rw-r--r-- | arch/arm64/kvm/va_layout.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm64/kvm/va_layout.c b/arch/arm64/kvm/va_layout.c index d8cc51bd60bf..70fcd6a12fe1 100644 --- a/arch/arm64/kvm/va_layout.c +++ b/arch/arm64/kvm/va_layout.c @@ -34,17 +34,16 @@ static u64 __early_kern_hyp_va(u64 addr) } /* - * Store a hyp VA <-> PA offset into a hyp-owned variable. + * Store a hyp VA <-> PA offset into a EL2-owned variable. */ static void init_hyp_physvirt_offset(void) { - extern s64 kvm_nvhe_sym(hyp_physvirt_offset); u64 kern_va, hyp_va; /* Compute the offset from the hyp VA and PA of a random symbol. */ - kern_va = (u64)kvm_ksym_ref(__hyp_text_start); + kern_va = (u64)lm_alias(__hyp_text_start); hyp_va = __early_kern_hyp_va(kern_va); - CHOOSE_NVHE_SYM(hyp_physvirt_offset) = (s64)__pa(kern_va) - (s64)hyp_va; + hyp_physvirt_offset = (s64)__pa(kern_va) - (s64)hyp_va; } /* |