Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ffa75cd authored by Marc Zyngier's avatar Marc Zyngier
Browse files

arm64: KVM: Remove weak attributes 



As we've now switched to the new world switch implementation,
remove the weak attributes, as nobody is supposed to override
it anymore.

Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 23a13465

arch/arm64/kvm/hyp/debug-sr.c

+2 −3
Original line number Diff line number Diff line
@@ -132,10 +132,9 @@ void __hyp_text __debug_cond_restore_host_state(struct kvm_vcpu *vcpu) 
		vcpu->arch.debug_flags &= ~KVM_ARM64_DEBUG_DIRTY;

}



u32 __hyp_text __debug_read_mdcr_el2(void)

static u32 __hyp_text __debug_read_mdcr_el2(void)

{

	return read_sysreg(mdcr_el2);

}



__alias(__debug_read_mdcr_el2)

u32 __weak __kvm_get_mdcr_el2(void);
 
__alias(__debug_read_mdcr_el2) u32 __kvm_get_mdcr_el2(void);

arch/arm64/kvm/hyp/hyp-entry.S

+0 −3
Original line number Diff line number Diff line
@@ -189,9 +189,7 @@ ENDPROC(\label) 


	.align 11



	.weak	__kvm_hyp_vector

ENTRY(__kvm_hyp_vector)

ENTRY(__hyp_vector)

	ventry	el2t_sync_invalid		// Synchronous EL2t

	ventry	el2t_irq_invalid		// IRQ EL2t

	ventry	el2t_fiq_invalid		// FIQ EL2t
@@ -211,5 +209,4 @@ ENTRY(__hyp_vector) 
	ventry	el1_irq				// IRQ 32-bit EL1

	ventry	el1_fiq_invalid			// FIQ 32-bit EL1

	ventry	el1_error_invalid		// Error 32-bit EL1

ENDPROC(__hyp_vector)

ENDPROC(__kvm_hyp_vector)

arch/arm64/kvm/hyp/switch.c

+2 −3
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static void __hyp_text __vgic_restore_state(struct kvm_vcpu *vcpu) 
	__vgic_call_restore_state()(vcpu);

}



int __hyp_text __guest_run(struct kvm_vcpu *vcpu)

static int __hyp_text __guest_run(struct kvm_vcpu *vcpu)

{

	struct kvm_cpu_context *host_ctxt;

	struct kvm_cpu_context *guest_ctxt;
@@ -142,8 +142,7 @@ int __hyp_text __guest_run(struct kvm_vcpu *vcpu) 
	return exit_code;

}



__alias(__guest_run)

int __weak __kvm_vcpu_run(struct kvm_vcpu *vcpu);

__alias(__guest_run) int __kvm_vcpu_run(struct kvm_vcpu *vcpu);



static const char __hyp_panic_string[] = "HYP panic:\nPS:%08llx PC:%016llx ESR:%08llx\nFAR:%016llx HPFAR:%016llx PAR:%016llx\nVCPU:%p\n";

arch/arm64/kvm/hyp/tlb.c

+7 −9
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


#include "hyp.h"



void __hyp_text __tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa)

static void __hyp_text __tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa)

{

	dsb(ishst);
@@ -48,10 +48,10 @@ void __hyp_text __tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa) 
	write_sysreg(0, vttbr_el2);

}



__alias(__tlb_flush_vmid_ipa)

void __weak __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa);

__alias(__tlb_flush_vmid_ipa) void __kvm_tlb_flush_vmid_ipa(struct kvm *kvm,

							    phys_addr_t ipa);



void __hyp_text __tlb_flush_vmid(struct kvm *kvm)

static void __hyp_text __tlb_flush_vmid(struct kvm *kvm)

{

	dsb(ishst);
@@ -67,10 +67,9 @@ void __hyp_text __tlb_flush_vmid(struct kvm *kvm) 
	write_sysreg(0, vttbr_el2);

}



__alias(__tlb_flush_vmid)

void __weak __kvm_tlb_flush_vmid(struct kvm *kvm);

__alias(__tlb_flush_vmid) void __kvm_tlb_flush_vmid(struct kvm *kvm);



void __hyp_text __tlb_flush_vm_context(void)

static void __hyp_text __tlb_flush_vm_context(void)

{

	dsb(ishst);

	asm volatile("tlbi alle1is	\n"
@@ -78,5 +77,4 @@ void __hyp_text __tlb_flush_vm_context(void) 
	dsb(ish);

}



__alias(__tlb_flush_vm_context)

void __weak __kvm_flush_vm_context(void);
 
__alias(__tlb_flush_vm_context) void __kvm_flush_vm_context(void);

arch/arm64/kvm/hyp/vgic-v3-sr.c

+2 −3
Original line number Diff line number Diff line
@@ -220,10 +220,9 @@ void __hyp_text __vgic_v3_restore_state(struct kvm_vcpu *vcpu) 
	}

}



u64 __hyp_text __vgic_v3_read_ich_vtr_el2(void)

static u64 __hyp_text __vgic_v3_read_ich_vtr_el2(void)

{

	return read_gicreg(ICH_VTR_EL2);

}



__alias(__vgic_v3_read_ich_vtr_el2)

u64 __weak __vgic_v3_get_ich_vtr_el2(void);
 
__alias(__vgic_v3_read_ich_vtr_el2) u64 __vgic_v3_get_ich_vtr_el2(void);