[PATCH 0/2] KVM: PPC: Book3s HV: Cleanup unused function and declarations

[PATCH 0/2] KVM: PPC: Book3s HV: Cleanup unused function and declarations

[Murilo Opsfelder Araujo]

Minor cleanup to remove unused function and declarations.

Murilo Opsfelder Araujo (2):
  KVM: PPC: Book3S HV: Remove kvmhv_p9_[set,restore]_lpcr declarations
  KVM: PPC: Book3s HV: Remove unused function kvmppc_bad_interrupt

 arch/powerpc/include/asm/kvm_book3s.h |  3 ---
 arch/powerpc/kvm/book3s_hv_builtin.c  | 18 ------------------
 2 files changed, 21 deletions(-)

-- 
2.36.1

[PATCH 1/2] KVM: PPC: Book3S HV: Remove kvmhv_p9_[set,restore]_lpcr declarations

[Murilo Opsfelder Araujo]

The commit b1b1697ae0cc ("KVM: PPC: Book3S HV: Remove support for
running HPT guest on RPT host without mixed mode support") removed the
last references to these functions.

Fixes: b1b1697ae0cc ("KVM: PPC: Book3S HV: Remove support for running HPT guest on RPT host without mixed mode support")
Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
---
 arch/powerpc/include/asm/kvm_book3s.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h
index 91c9f937edcd..ff1336ab4c47 100644
--- a/arch/powerpc/include/asm/kvm_book3s.h
+++ b/arch/powerpc/include/asm/kvm_book3s.h
@@ -281,8 +281,6 @@ extern void kvmppc_copy_from_svcpu(struct kvm_vcpu *vcpu);
 
 long kvmppc_read_intr(void);
 void kvmppc_bad_interrupt(struct pt_regs *regs);
-void kvmhv_p9_set_lpcr(struct kvm_split_mode *sip);
-void kvmhv_p9_restore_lpcr(struct kvm_split_mode *sip);
 void kvmppc_set_msr_hv(struct kvm_vcpu *vcpu, u64 msr);
 void kvmppc_inject_interrupt_hv(struct kvm_vcpu *vcpu, int vec, u64 srr1_flags);
 
-- 
2.36.1

[PATCH 2/2] KVM: PPC: Book3s HV: Remove unused function kvmppc_bad_interrupt

[Murilo Opsfelder Araujo]

The commit fae5c9f3664b ("KVM: PPC: Book3S HV: remove ISA v3.0 and v3.1
support from P7/8 path") removed the last reference to the function.

Fixes: fae5c9f3664b ("KVM: PPC: Book3S HV: remove ISA v3.0 and v3.1 support from P7/8 path")
Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
---
 arch/powerpc/include/asm/kvm_book3s.h |  1 -
 arch/powerpc/kvm/book3s_hv_builtin.c  | 18 ------------------
 2 files changed, 19 deletions(-)

diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h
index ff1336ab4c47..bbf5e2c5fe09 100644
--- a/arch/powerpc/include/asm/kvm_book3s.h
+++ b/arch/powerpc/include/asm/kvm_book3s.h
@@ -280,7 +280,6 @@ extern void kvmppc_copy_to_svcpu(struct kvm_vcpu *vcpu);
 extern void kvmppc_copy_from_svcpu(struct kvm_vcpu *vcpu);
 
 long kvmppc_read_intr(void);
-void kvmppc_bad_interrupt(struct pt_regs *regs);
 void kvmppc_set_msr_hv(struct kvm_vcpu *vcpu, u64 msr);
 void kvmppc_inject_interrupt_hv(struct kvm_vcpu *vcpu, int vec, u64 srr1_flags);
 
diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s_hv_builtin.c
index 88a8f6473c4e..c15c6faedce5 100644
--- a/arch/powerpc/kvm/book3s_hv_builtin.c
+++ b/arch/powerpc/kvm/book3s_hv_builtin.c
@@ -489,24 +489,6 @@ static long kvmppc_read_one_intr(bool *again)
 	return kvmppc_check_passthru(xisr, xirr, again);
 }
 
-void kvmppc_bad_interrupt(struct pt_regs *regs)
-{
-	/*
-	 * 100 could happen at any time, 200 can happen due to invalid real
-	 * address access for example (or any time due to a hardware problem).
-	 */
-	if (TRAP(regs) == 0x100) {
-		get_paca()->in_nmi++;
-		system_reset_exception(regs);
-		get_paca()->in_nmi--;
-	} else if (TRAP(regs) == 0x200) {
-		machine_check_exception(regs);
-	} else {
-		die("Bad interrupt in KVM entry/exit code", regs, SIGABRT);
-	}
-	panic("Bad KVM trap");
-}
-
 static void kvmppc_end_cede(struct kvm_vcpu *vcpu)
 {
 	vcpu->arch.ceded = 0;
-- 
2.36.1

Re: [PATCH 0/2] KVM: PPC: Book3s HV: Cleanup unused function and declarations

[Michael Ellerman]

On Mon, 11 Jul 2022 19:36:15 -0300, Murilo Opsfelder Araujo wrote:
> Minor cleanup to remove unused function and declarations.
> 
> Murilo Opsfelder Araujo (2):
>   KVM: PPC: Book3S HV: Remove kvmhv_p9_[set,restore]_lpcr declarations
>   KVM: PPC: Book3s HV: Remove unused function kvmppc_bad_interrupt
> 
> arch/powerpc/include/asm/kvm_book3s.h |  3 ---
>  arch/powerpc/kvm/book3s_hv_builtin.c  | 18 ------------------
>  2 files changed, 21 deletions(-)
> 
> [...]

Applied to powerpc/topic/ppc-kvm.

[1/2] KVM: PPC: Book3S HV: Remove kvmhv_p9_[set,restore]_lpcr declarations
      https://git.kernel.org/powerpc/c/4c9da83011c455c0791b1f5e4e84d454d4f4ae3c
[2/2] KVM: PPC: Book3s HV: Remove unused function kvmppc_bad_interrupt
      https://git.kernel.org/powerpc/c/b8c7ee79b1a37442a910b8a313045fb9aa639911

cheers