KVM: PPC: Book3S HV: Branch inside feature section

Web:        https://git.kernel.org/torvalds/c/d20fe50a7b3c8f936f7347e9cab2e9dd89c1199d
Commit:     d20fe50a7b3c8f936f7347e9cab2e9dd89c1199d
Parent:     790a9df5fbef982f2a6992194fe497dd2b794a3d
Refname:    refs/heads/master
Author:     Alexander Graf <[email protected]>
AuthorDate: Thu Feb 8 18:38:53 2018 +0100
Committer:  Paul Mackerras <[email protected]>
CommitDate: Fri Feb 9 15:39:41 2018 +1100

    KVM: PPC: Book3S HV: Branch inside feature section
    
    We ended up with code that did a conditional branch inside a feature
    section to code outside of the feature section. Depending on how the
    object file gets organized, that might mean we exceed the 14bit
    relocation limit for conditional branches:
    
      arch/powerpc/kvm/built-in.o:arch/powerpc/kvm/book3s_hv_rmhandlers.S:416:(__ftr_alt_97+0x8): relocation truncated to fit: R_PPC64_REL14 against `.text'+1ca4
    
    So instead of doing a conditional branch outside of the feature section,
    let's just jump at the end of the same, making the branch very short.
    
    Signed-off-by: Alexander Graf <[email protected]>
    Signed-off-by: Paul Mackerras <[email protected]>
---
 arch/powerpc/kvm/book3s_hv_rmhandlers.S | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index a7a20b85d8eb..7d1459e77de2 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -413,10 +413,11 @@ FTR_SECTION_ELSE
 	/* On P9 we use the split_info for coordinating LPCR changes */
 	lwz	r4, KVM_SPLIT_DO_SET(r6)
 	cmpwi	r4, 0
-	beq	63f
+	beq	1f
 	mr	r3, r6
 	bl	kvmhv_p9_set_lpcr
 	nop
+1:
 ALT_FTR_SECTION_END_IFCLR(CPU_FTR_ARCH_300)
 63:
 	/* Order load of vcpu after load of vcore */
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html