lkml.org 
[lkml]   [2016]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/8] arm64: alternative: Add support for patching adrp instructions
    Date
    adrp uses PC-relative address offset to a page (of 4K size) of
    a symbol. If it appears in an alternative code patched in, we
    should adjust the offset to reflect the address where it will
    be run from. This patch adds support for fixing the offset
    for adrp instructions.

    Cc: Will Deacon <will.deacon@arm.com>
    Cc: Marc Zyngier <marc.zyngier@arm.com>
    Cc: Andre Przywara <andre.przywara@arm.com>
    Cc: Mark Rutland <mark.rutland@arm.com>
    Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
    ---
    arch/arm64/kernel/alternative.c | 13 +++++++++++++
    1 file changed, 13 insertions(+)

    diff --git a/arch/arm64/kernel/alternative.c b/arch/arm64/kernel/alternative.c
    index d2ee1b2..cd36950 100644
    --- a/arch/arm64/kernel/alternative.c
    +++ b/arch/arm64/kernel/alternative.c
    @@ -80,6 +80,19 @@ static u32 get_alt_insn(struct alt_instr *alt, u32 *insnptr, u32 *altinsnptr)
    offset = target - (unsigned long)insnptr;
    insn = aarch64_set_branch_offset(insn, offset);
    }
    + } else if (aarch64_insn_is_adrp(insn)) {
    + s32 orig_offset, new_offset;
    + unsigned long target;
    +
    + /*
    + * If we're replacing an adrp instruction, which uses PC-relative
    + * immediate addressing, adjust the offset to reflect the new
    + * PC. adrp operates on 4K aligned addresses.
    + */
    + orig_offset = aarch64_get_addr_offset(insn);
    + target = ((unsigned long)altinsnptr & ~0xfffUL) + orig_offset;
    + new_offset = target - ((unsigned long)insnptr & ~0xfffUL);
    + insn = aarch64_set_addr_offset(insn, new_offset);
    }

    return insn;
    --
    2.7.4
    \
     
     \ /
      Last update: 2016-07-08 14:21    [W:4.864 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site