Merge tag 'loongarch-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson
Pull LoongArch updates from Huacai Chen: - Switch to relative exception tables - Add unaligned access support - Add alternative runtime patching mechanism - Add FDT booting support from efi system table - Add suspend/hibernation (ACPI S3/S4) support - Add basic STACKPROTECTOR support - Add ftrace (function tracer) support - Update the default config file * tag 'loongarch-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson: (24 commits) LoongArch: Update Loongson-3 default config file LoongArch: modules/ftrace: Initialize PLT at load time LoongArch/ftrace: Add HAVE_FUNCTION_GRAPH_RET_ADDR_PTR support LoongArch/ftrace: Add HAVE_DYNAMIC_FTRACE_WITH_ARGS support LoongArch/ftrace: Add HAVE_DYNAMIC_FTRACE_WITH_REGS support LoongArch/ftrace: Add dynamic function graph tracer support LoongArch/ftrace: Add dynamic function tracer support LoongArch/ftrace: Add recordmcount support LoongArch/ftrace: Add basic support LoongArch: module: Use got/plt section indices for relocations LoongArch: Add basic STACKPROTECTOR support LoongArch: Add hibernation (ACPI S4) support LoongArch: Add suspend (ACPI S3) support LoongArch: Add processing ISA Node in DeviceTree LoongArch: Add FDT booting support from efi system table LoongArch: Use alternative to optimize libraries LoongArch: Add alternative runtime patching mechanism LoongArch: Add unaligned access support LoongArch: BPF: Add BPF exception tables LoongArch: Remove the .fixup section usage ...
This commit is contained in:
@@ -1523,6 +1523,14 @@ static int addend_mips_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
|
||||
#define R_RISCV_SUB32 39
|
||||
#endif
|
||||
|
||||
#ifndef EM_LOONGARCH
|
||||
#define EM_LOONGARCH 258
|
||||
#endif
|
||||
|
||||
#ifndef R_LARCH_SUB32
|
||||
#define R_LARCH_SUB32 55
|
||||
#endif
|
||||
|
||||
static void section_rela(const char *modname, struct elf_info *elf,
|
||||
Elf_Shdr *sechdr)
|
||||
{
|
||||
@@ -1564,6 +1572,11 @@ static void section_rela(const char *modname, struct elf_info *elf,
|
||||
ELF_R_TYPE(r.r_info) == R_RISCV_SUB32)
|
||||
continue;
|
||||
break;
|
||||
case EM_LOONGARCH:
|
||||
if (!strcmp("__ex_table", fromsec) &&
|
||||
ELF_R_TYPE(r.r_info) == R_LARCH_SUB32)
|
||||
continue;
|
||||
break;
|
||||
}
|
||||
sym = elf->symtab_start + r_sym;
|
||||
/* Skip special sections */
|
||||
|
||||
@@ -38,6 +38,14 @@
|
||||
#define R_AARCH64_ABS64 257
|
||||
#endif
|
||||
|
||||
#ifndef EM_LOONGARCH
|
||||
#define EM_LOONGARCH 258
|
||||
#define R_LARCH_32 1
|
||||
#define R_LARCH_64 2
|
||||
#define R_LARCH_MARK_LA 20
|
||||
#define R_LARCH_SOP_PUSH_PLT_PCREL 29
|
||||
#endif
|
||||
|
||||
#define R_ARM_PC24 1
|
||||
#define R_ARM_THM_CALL 10
|
||||
#define R_ARM_CALL 28
|
||||
@@ -441,6 +449,28 @@ static int arm64_is_fake_mcount(Elf64_Rel const *rp)
|
||||
return ELF64_R_TYPE(w8(rp->r_info)) != R_AARCH64_CALL26;
|
||||
}
|
||||
|
||||
static int LARCH32_is_fake_mcount(Elf32_Rel const *rp)
|
||||
{
|
||||
switch (ELF64_R_TYPE(w(rp->r_info))) {
|
||||
case R_LARCH_MARK_LA:
|
||||
case R_LARCH_SOP_PUSH_PLT_PCREL:
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int LARCH64_is_fake_mcount(Elf64_Rel const *rp)
|
||||
{
|
||||
switch (ELF64_R_TYPE(w(rp->r_info))) {
|
||||
case R_LARCH_MARK_LA:
|
||||
case R_LARCH_SOP_PUSH_PLT_PCREL:
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 64-bit EM_MIPS has weird ELF64_Rela.r_info.
|
||||
* http://techpubs.sgi.com/library/manuals/4000/007-4658-001/pdf/007-4658-001.pdf
|
||||
* We interpret Table 29 Relocation Operation (Elf64_Rel, Elf64_Rela) [p.40]
|
||||
@@ -558,6 +588,7 @@ static int do_file(char const *const fname)
|
||||
break;
|
||||
case EM_IA_64: reltype = R_IA64_IMM64; break;
|
||||
case EM_MIPS: /* reltype: e_class */ break;
|
||||
case EM_LOONGARCH: /* reltype: e_class */ break;
|
||||
case EM_PPC: reltype = R_PPC_ADDR32; break;
|
||||
case EM_PPC64: reltype = R_PPC64_ADDR64; break;
|
||||
case EM_S390: /* reltype: e_class */ break;
|
||||
@@ -589,6 +620,10 @@ static int do_file(char const *const fname)
|
||||
reltype = R_MIPS_32;
|
||||
is_fake_mcount32 = MIPS32_is_fake_mcount;
|
||||
}
|
||||
if (w2(ehdr->e_machine) == EM_LOONGARCH) {
|
||||
reltype = R_LARCH_32;
|
||||
is_fake_mcount32 = LARCH32_is_fake_mcount;
|
||||
}
|
||||
if (do32(ehdr, fname, reltype) < 0)
|
||||
goto out;
|
||||
break;
|
||||
@@ -610,6 +645,10 @@ static int do_file(char const *const fname)
|
||||
Elf64_r_info = MIPS64_r_info;
|
||||
is_fake_mcount64 = MIPS64_is_fake_mcount;
|
||||
}
|
||||
if (w2(ghdr->e_machine) == EM_LOONGARCH) {
|
||||
reltype = R_LARCH_64;
|
||||
is_fake_mcount64 = LARCH64_is_fake_mcount;
|
||||
}
|
||||
if (do64(ghdr, fname, reltype) < 0)
|
||||
goto out;
|
||||
break;
|
||||
|
||||
@@ -304,6 +304,7 @@ static int do_file(char const *const fname, void *addr)
|
||||
switch (r2(&ehdr->e_machine)) {
|
||||
case EM_386:
|
||||
case EM_AARCH64:
|
||||
case EM_LOONGARCH:
|
||||
case EM_RISCV:
|
||||
case EM_S390:
|
||||
case EM_X86_64:
|
||||
@@ -317,7 +318,6 @@ static int do_file(char const *const fname, void *addr)
|
||||
case EM_ARCOMPACT:
|
||||
case EM_ARCV2:
|
||||
case EM_ARM:
|
||||
case EM_LOONGARCH:
|
||||
case EM_MICROBLAZE:
|
||||
case EM_MIPS:
|
||||
case EM_XTENSA:
|
||||
|
||||
Reference in New Issue
Block a user