openrisc: Add support for more module relocations
Subsystems (3)
Stafford Horne
maintainerPATCH 1/1 openrisc: Add support for more module relocations
When testing modules in OpenRISC I found R_OR32_AHI16 (signed adjusted high 16-bit) and R_OR32_SLO16 (split low 16-bit) relocations are used in modules but not implemented yet.
This patch adds the relocations. Note, we use the old naming R_OR32_* instead or the new naming R_OR1K_* to avoid change as this header is exported as a user api.
--- arch/openrisc/include/uapi/asm/elf.h | 2 ++ arch/openrisc/kernel/module.c | 10 ++++++++++ 2 files changed, 12 insertions(+)
arch/openrisc/include/uapi/asm/elf.h +2 -0
@@ -43,6 +43,8 @@#define R_OR32_JUMPTARG 6#define R_OR32_VTINHERIT 7#define R_OR32_VTENTRY 8 +#define R_OR32_AHI16 35 +#define R_OR32_SLO16 39typedef unsigned long elf_greg_t ;
arch/openrisc/kernel/module.c +10 -0
@@ -55,6 +55,16 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, value |= *location &0xfc000000 ; *location = value;break ; +case R_OR32_AHI16 : +/* Adjust the operand to match with a signed LO16. */ + value +=0x8000 ; + *((uint16_t *)location +1 ) = value >>16 ; +break ; +case R_OR32_SLO16 : +/* Split value lower 16-bits. */ + value = ((value &0xf800 ) <<10 ) | (value &0x7ff ); + *location = (*location & ~0x3e007ff ) | value; +break ;default :pr_err ("module %s: Unknown relocation: %u\n" , me->name,ELF32_R_TYPE (rel[i].r_info));
Signature · 1 line
2.44.0
Hi Stafford,
arch/openrisc/include/uapi/asm/elf.h line 47
Quoted 12 lines · Stafford Horne
This patch adds the relocations. Note, we use the old naming R_OR32_* instead or the new naming R_OR1K_* to avoid change as this header is exported as a user api.
arch/openrisc/include/uapi/asm/elf.h +2
-0@@ -43,6 +43,8 @@#define R_OR32_JUMPTARG 6#define R_OR32_VTINHERIT 7#define R_OR32_VTENTRY 8 +#define R_OR32_AHI16 35 +#define R_OR32_SLO16 39
Would it make sense to switch to the new names, e.g.
#define R_OR1K_NONE 0
and add definitions for backwards compatibility?
#define R_OR32_NONE R_OR1K_NONE
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Stafford Horne
maintainerQuoted 18 lines · Geert Uytterhoeven
Hi Stafford,
arch/openrisc/include/uapi/asm/elf.h line 47
Quoted 12 lines · Stafford Horne
This patch adds the relocations. Note, we use the old naming R_OR32_* instead or the new naming R_OR1K_* to avoid change as this header is exported as a user api.
arch/openrisc/include/uapi/asm/elf.h +2
-0@@ -43,6 +43,8 @@#define R_OR32_JUMPTARG 6#define R_OR32_VTINHERIT 7#define R_OR32_VTENTRY 8 +#define R_OR32_AHI16 35 +#define R_OR32_SLO16 39Would it make sense to switch to the new names, e.g.
Quoted 6 lines
#define R_OR1K_NONE 0and add definitions for backwards compatibility?
#define R_OR32_NONE R_OR1K_NONE
Hi Geert,
Actually I had a patch doing this and added all 38 or so relocation definitions. But I dropped it at the last moment in favor of simplicity.
Let me rework it and add it back.
-Stafford