mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-16 20:07:31 +07:00
KVM: PPC: Book3S PR: Exiting split hack mode needs to fixup both PC and LR
When an OS (currently only classic Mac OS) is running in KVM-PR and makes a linked jump from code with split hack addressing enabled into code that does not, LR is not correctly updated and reflects the previously munged PC. To fix this, this patch undoes the address munge when exiting split hack mode so that code relying on LR being a proper address will now execute. This does not affect OS X or other operating systems running on KVM-PR. Signed-off-by: Cameron Kaiser <spectre@floodgap.com> Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
This commit is contained in:
parent
dd5bd0a65f
commit
1006284c5e
@ -78,8 +78,11 @@ void kvmppc_unfixup_split_real(struct kvm_vcpu *vcpu)
|
|||||||
{
|
{
|
||||||
if (vcpu->arch.hflags & BOOK3S_HFLAG_SPLIT_HACK) {
|
if (vcpu->arch.hflags & BOOK3S_HFLAG_SPLIT_HACK) {
|
||||||
ulong pc = kvmppc_get_pc(vcpu);
|
ulong pc = kvmppc_get_pc(vcpu);
|
||||||
|
ulong lr = kvmppc_get_lr(vcpu);
|
||||||
if ((pc & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS)
|
if ((pc & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS)
|
||||||
kvmppc_set_pc(vcpu, pc & ~SPLIT_HACK_MASK);
|
kvmppc_set_pc(vcpu, pc & ~SPLIT_HACK_MASK);
|
||||||
|
if ((lr & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS)
|
||||||
|
kvmppc_set_lr(vcpu, lr & ~SPLIT_HACK_MASK);
|
||||||
vcpu->arch.hflags &= ~BOOK3S_HFLAG_SPLIT_HACK;
|
vcpu->arch.hflags &= ~BOOK3S_HFLAG_SPLIT_HACK;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user