Merge branch 'address-masking'

[linux-2.6-microblaze.git] / arch / arm64 / kvm / hyp / nvhe / debug-sr.c

diff --git a/arch/arm64/kvm/hyp/nvhe/debug-sr.c b/arch/arm64/kvm/hyp/nvhe/debug-sr.c
index 4558c02..53efda0 100644 (file)
--- a/arch/arm64/kvm/hyp/nvhe/debug-sr.c
+++ b/arch/arm64/kvm/hyp/nvhe/debug-sr.c
@@ -31,8 +31,8 @@ static void __debug_save_spe(u64 *pmscr_el1)
                return;
 
        /* Yes; save the control register and disable data generation */
-       *pmscr_el1 = read_sysreg_s(SYS_PMSCR_EL1);
-       write_sysreg_s(0, SYS_PMSCR_EL1);
+       *pmscr_el1 = read_sysreg_el1(SYS_PMSCR);
+       write_sysreg_el1(0, SYS_PMSCR);
        isb();
 
        /* Now drain all buffered data to memory */
@@ -48,7 +48,7 @@ static void __debug_restore_spe(u64 pmscr_el1)
        isb();
 
        /* Re-enable data generation */
-       write_sysreg_s(pmscr_el1, SYS_PMSCR_EL1);
+       write_sysreg_el1(pmscr_el1, SYS_PMSCR);
 }
 
 static void __debug_save_trace(u64 *trfcr_el1)
@@ -63,8 +63,8 @@ static void __debug_save_trace(u64 *trfcr_el1)
         * Since access to TRFCR_EL1 is trapped, the guest can't
         * modify the filtering set by the host.
         */
-       *trfcr_el1 = read_sysreg_s(SYS_TRFCR_EL1);
-       write_sysreg_s(0, SYS_TRFCR_EL1);
+       *trfcr_el1 = read_sysreg_el1(SYS_TRFCR);
+       write_sysreg_el1(0, SYS_TRFCR);
        isb();
        /* Drain the trace buffer to memory */
        tsb_csync();
@@ -76,17 +76,17 @@ static void __debug_restore_trace(u64 trfcr_el1)
                return;
 
        /* Restore trace filter controls */
-       write_sysreg_s(trfcr_el1, SYS_TRFCR_EL1);
+       write_sysreg_el1(trfcr_el1, SYS_TRFCR);
 }
 
 void __debug_save_host_buffers_nvhe(struct kvm_vcpu *vcpu)
 {
        /* Disable and flush SPE data generation */
        if (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_SPE))
-               __debug_save_spe(&vcpu->arch.host_debug_state.pmscr_el1);
+               __debug_save_spe(host_data_ptr(host_debug_state.pmscr_el1));
        /* Disable and flush Self-Hosted Trace generation */
        if (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_TRBE))
-               __debug_save_trace(&vcpu->arch.host_debug_state.trfcr_el1);
+               __debug_save_trace(host_data_ptr(host_debug_state.trfcr_el1));
 }
 
 void __debug_switch_to_guest(struct kvm_vcpu *vcpu)
@@ -97,9 +97,9 @@ void __debug_switch_to_guest(struct kvm_vcpu *vcpu)
 void __debug_restore_host_buffers_nvhe(struct kvm_vcpu *vcpu)
 {
        if (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_SPE))
-               __debug_restore_spe(vcpu->arch.host_debug_state.pmscr_el1);
+               __debug_restore_spe(*host_data_ptr(host_debug_state.pmscr_el1));
        if (vcpu_get_flag(vcpu, DEBUG_STATE_SAVE_TRBE))
-               __debug_restore_trace(vcpu->arch.host_debug_state.trfcr_el1);
+               __debug_restore_trace(*host_data_ptr(host_debug_state.trfcr_el1));
 }
 
 void __debug_switch_to_host(struct kvm_vcpu *vcpu)