Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 56ea45ae authored by Zong Li's avatar Zong Li Committed by Palmer Dabbelt
Browse files

RISC-V: Support RVC_BRANCH/JUMP relocation type in kernel modulewq 



Signed-off-by: default avatarZong Li <zong@andestech.com>
Signed-off-by: default avatarPalmer Dabbelt <palmer@sifive.com>
parent e7456e69

arch/riscv/kernel/module.c

+35 −0
Original line number Diff line number Diff line
@@ -49,6 +49,39 @@ static int apply_r_riscv_jal_rela(struct module *me, u32 *location, 
	return 0;

}



static int apply_r_riscv_rcv_branch_rela(struct module *me, u32 *location,

					 Elf_Addr v)

{

	s64 offset = (void *)v - (void *)location;

	u16 imm8 = (offset & 0x100) << (12 - 8);

	u16 imm7_6 = (offset & 0xc0) >> (6 - 5);

	u16 imm5 = (offset & 0x20) >> (5 - 2);

	u16 imm4_3 = (offset & 0x18) << (12 - 5);

	u16 imm2_1 = (offset & 0x6) << (12 - 10);



	*(u16 *)location = (*(u16 *)location & 0xe383) |

		    imm8 | imm7_6 | imm5 | imm4_3 | imm2_1;

	return 0;

}



static int apply_r_riscv_rvc_jump_rela(struct module *me, u32 *location,

				       Elf_Addr v)

{

	s64 offset = (void *)v - (void *)location;

	u16 imm11 = (offset & 0x800) << (12 - 11);

	u16 imm10 = (offset & 0x400) >> (10 - 8);

	u16 imm9_8 = (offset & 0x300) << (12 - 11);

	u16 imm7 = (offset & 0x80) >> (7 - 6);

	u16 imm6 = (offset & 0x40) << (12 - 11);

	u16 imm5 = (offset & 0x20) >> (5 - 2);

	u16 imm4 = (offset & 0x10) << (12 - 5);

	u16 imm3_1 = (offset & 0xe) << (12 - 10);



	*(u16 *)location = (*(u16 *)location & 0xe003) |

		    imm11 | imm10 | imm9_8 | imm7 | imm6 | imm5 | imm4 | imm3_1;

	return 0;

}



static int apply_r_riscv_pcrel_hi20_rela(struct module *me, u32 *location,

					 Elf_Addr v)

{
@@ -212,6 +245,8 @@ static int (*reloc_handlers_rela[]) (struct module *me, u32 *location, 
	[R_RISCV_64]			= apply_r_riscv_64_rela,

	[R_RISCV_BRANCH]		= apply_r_riscv_branch_rela,

	[R_RISCV_JAL]			= apply_r_riscv_jal_rela,

	[R_RISCV_RVC_BRANCH]		= apply_r_riscv_rcv_branch_rela,

	[R_RISCV_RVC_JUMP]		= apply_r_riscv_rvc_jump_rela,

	[R_RISCV_PCREL_HI20]		= apply_r_riscv_pcrel_hi20_rela,

	[R_RISCV_PCREL_LO12_I]		= apply_r_riscv_pcrel_lo12_i_rela,

	[R_RISCV_PCREL_LO12_S]		= apply_r_riscv_pcrel_lo12_s_rela,