lkml.org 
[lkml]   [2023]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 08/13] riscv: module: Add ADD16 and SUB16 rela types
    Date
    From: Andrew Jones <ajones@ventanamicro.com>

    To prepare for 16-bit relocation types to be emitted in alternatives
    add support for ADD16 and SUB16.

    Signed-off-by: Andrew Jones <ajones@ventanamicro.com>
    Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
    ---
    arch/riscv/kernel/module.c | 16 ++++++++++++++++
    1 file changed, 16 insertions(+)

    diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c
    index 76f4b9c2ec5b..7c651d55fcbd 100644
    --- a/arch/riscv/kernel/module.c
    +++ b/arch/riscv/kernel/module.c
    @@ -268,6 +268,13 @@ static int apply_r_riscv_align_rela(struct module *me, u32 *location,
    return -EINVAL;
    }

    +static int apply_r_riscv_add16_rela(struct module *me, u32 *location,
    + Elf_Addr v)
    +{
    + *(u16 *)location += (u16)v;
    + return 0;
    +}
    +
    static int apply_r_riscv_add32_rela(struct module *me, u32 *location,
    Elf_Addr v)
    {
    @@ -282,6 +289,13 @@ static int apply_r_riscv_add64_rela(struct module *me, u32 *location,
    return 0;
    }

    +static int apply_r_riscv_sub16_rela(struct module *me, u32 *location,
    + Elf_Addr v)
    +{
    + *(u16 *)location -= (u16)v;
    + return 0;
    +}
    +
    static int apply_r_riscv_sub32_rela(struct module *me, u32 *location,
    Elf_Addr v)
    {
    @@ -315,8 +329,10 @@ static int (*reloc_handlers_rela[]) (struct module *me, u32 *location,
    [R_RISCV_CALL] = apply_r_riscv_call_rela,
    [R_RISCV_RELAX] = apply_r_riscv_relax_rela,
    [R_RISCV_ALIGN] = apply_r_riscv_align_rela,
    + [R_RISCV_ADD16] = apply_r_riscv_add16_rela,
    [R_RISCV_ADD32] = apply_r_riscv_add32_rela,
    [R_RISCV_ADD64] = apply_r_riscv_add64_rela,
    + [R_RISCV_SUB16] = apply_r_riscv_sub16_rela,
    [R_RISCV_SUB32] = apply_r_riscv_sub32_rela,
    [R_RISCV_SUB64] = apply_r_riscv_sub64_rela,
    };
    --
    2.38.1
    \
     
     \ /
      Last update: 2023-03-27 00:00    [W:3.925 / U:0.576 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site