xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: PPC: Clean up redundant kvm_run parameters in assembly

Browse Source 
In the current kvm version, 'kvm_run' has been included in the 'kvm_vcpu'
structure. For historical reasons, many kvm-related function parameters
retain the 'kvm_run' and 'kvm_vcpu' parameters at the same time. This
patch does a unified cleanup of these remaining redundant parameters.

[paulus@ozlabs.org - Fixed places that were missed in book3s_interrupts.S]

Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
This commit is contained in:
Tianjia Zhang
2020-06-23 21:14:16 +08:00
committed by Paul Mackerras
parent 1508c22f11
commit 7ec21d9da5
6 changed files with 45 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/powerpc/kvm/bookehv_interrupts.S
View File

@@ -434,9 +434,10 @@ _GLOBAL(kvmppc_resume_host)
#endif
/* Switch to kernel stack and jump to handler. */
PPC_LL r3, HOST_RUN(r1)
mr r3, r4
mr r5, r14 /* intno */
mr r14, r4 /* Save vcpu pointer. */
mr r4, r5
bl kvmppc_handle_exit
/* Restore vcpu pointer and the nonvolatiles we used. */
@@ -525,15 +526,14 @@ heavyweight_exit:
blr
/* Registers:
* r3: kvm_run pointer
* r4: vcpu pointer
* r3: vcpu pointer
*/
_GLOBAL(__kvmppc_vcpu_run)
stwu r1, -HOST_STACK_SIZE(r1)
PPC_STL r1, VCPU_HOST_STACK(r4) /* Save stack pointer to vcpu. */
PPC_STL r1, VCPU_HOST_STACK(r3) /* Save stack pointer to vcpu. */
/* Save host state to stack. */
PPC_STL r3, HOST_RUN(r1)
mr r4, r3
mflr r3
mfcr r5
PPC_STL r3, HOST_STACK_LR(r1)