From 8a67202f814bbd808484ed00f93ede0531f51506 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 04 Dec 2023 07:11:12 +0000
Subject: [PATCH] 修改ip1811 driver

---
 kernel/arch/arm64/kvm/va_layout.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/kernel/arch/arm64/kvm/va_layout.c b/kernel/arch/arm64/kvm/va_layout.c
index c712a73..792da0e 100644
--- a/kernel/arch/arm64/kvm/va_layout.c
+++ b/kernel/arch/arm64/kvm/va_layout.c
@@ -33,7 +33,7 @@
 static u64 tag_val;
 static u64 va_mask;
 
-static void compute_layout(void)
+__init void kvm_compute_layout(void)
 {
 	phys_addr_t idmap_addr = __pa_symbol(__hyp_idmap_text_start);
 	u64 hyp_va_msb;
@@ -121,8 +121,6 @@
 
 	BUG_ON(nr_inst != 5);
 
-	if (!has_vhe() && !va_mask)
-		compute_layout();
 
 	for (i = 0; i < nr_inst; i++) {
 		u32 rd, rn, insn, oinsn;
@@ -166,9 +164,6 @@
 		WARN_ON_ONCE(cpus_have_const_cap(ARM64_HARDEN_EL2_VECTORS));
 		return;
 	}
-
-	if (!va_mask)
-		compute_layout();
 
 	/*
 	 * Compute HYP VA by using the same computation as kern_hyp_va()

--
Gitblit v1.6.2