forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-05-11 04dd17822334871b23ea2862f7798fb0e0007777 
 kernel/arch/powerpc/kvm/book3s_32_mmu.c
....@@ -1,16 +1,5 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
2
- * This program is free software; you can redistribute it and/or modify
3
- * it under the terms of the GNU General Public License, version 2, as
4
- * published by the Free Software Foundation.
5
- *
6
- * This program is distributed in the hope that it will be useful,
7
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
8
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
9
- * GNU General Public License for more details.
10
- *
11
- * You should have received a copy of the GNU General Public License
12
- * along with this program; if not, write to the Free Software
13
- * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
143  *
154  * Copyright SUSE Linux Products GmbH 2009
165  *
....@@ -99,11 +88,6 @@
9988 
10089 	kvmppc_mmu_book3s_32_esid_to_vsid(vcpu, eaddr >> SID_SHIFT, &vsid);
10190 	return (((u64)eaddr >> 12) & 0xffff) | (vsid << 16);
102
-}
103
-
104
-static void kvmppc_mmu_book3s_32_reset_msr(struct kvm_vcpu *vcpu)
105
-{
106
-	kvmppc_set_msr(vcpu, 0);
10791 }
10892 
10993 static hva_t kvmppc_mmu_book3s_32_get_pteg(struct kvm_vcpu *vcpu,
....@@ -250,6 +234,7 @@
250234 				case 2:
251235 				case 6:
252236 					pte->may_write = true;
237
+					fallthrough;
253238 				case 3:
254239 				case 5:
255240 				case 7:
....@@ -416,7 +401,6 @@
416401 	mmu->mtsrin = kvmppc_mmu_book3s_32_mtsrin;
417402 	mmu->mfsrin = kvmppc_mmu_book3s_32_mfsrin;
418403 	mmu->xlate = kvmppc_mmu_book3s_32_xlate;
419
-	mmu->reset_msr = kvmppc_mmu_book3s_32_reset_msr;
420404 	mmu->tlbie = kvmppc_mmu_book3s_32_tlbie;
421405 	mmu->esid_to_vsid = kvmppc_mmu_book3s_32_esid_to_vsid;
422406 	mmu->ea_to_vp = kvmppc_mmu_book3s_32_ea_to_vp;
....@@ -425,6 +409,7 @@
425409 	mmu->slbmte = NULL;
426410 	mmu->slbmfee = NULL;
427411 	mmu->slbmfev = NULL;
412
+	mmu->slbfee = NULL;
428413 	mmu->slbie = NULL;
429414 	mmu->slbia = NULL;
430415 }