|
|
f731ee |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
f731ee |
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f731ee |
Date: Fri, 22 Jan 2016 19:09:37 +0100
|
|
|
f731ee |
Subject: [PATCH] arm64: Add support for relocations needed for linaro gcc
|
|
|
f731ee |
|
|
|
f731ee |
---
|
|
|
f731ee |
grub-core/kern/arm64/dl.c | 18 ++++++++++++++++++
|
|
|
f731ee |
grub-core/kern/arm64/dl_helper.c | 40 ++++++++++++++++++++++++++++++++++++++++
|
|
|
f731ee |
util/grub-mkimagexx.c | 31 +++++++++++++++++++++++++++++++
|
|
|
f731ee |
util/grub-module-verifier.c | 8 +++++++-
|
|
|
f731ee |
include/grub/arm64/reloc.h | 8 ++++++++
|
|
|
f731ee |
include/grub/elf.h | 3 +++
|
|
|
f731ee |
6 files changed, 107 insertions(+), 1 deletion(-)
|
|
|
f731ee |
|
|
|
f731ee |
diff --git a/grub-core/kern/arm64/dl.c b/grub-core/kern/arm64/dl.c
|
|
|
f731ee |
index e19ba6a0d58..cf50d7250d9 100644
|
|
|
f731ee |
--- a/grub-core/kern/arm64/dl.c
|
|
|
f731ee |
+++ b/grub-core/kern/arm64/dl.c
|
|
|
f731ee |
@@ -132,6 +132,12 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
|
|
|
f731ee |
*abs_place = (grub_uint64_t) sym_addr;
|
|
|
f731ee |
}
|
|
|
f731ee |
break;
|
|
|
f731ee |
+ case R_AARCH64_ADD_ABS_LO12_NC:
|
|
|
f731ee |
+ grub_arm64_set_abs_lo12 (place, sym_addr);
|
|
|
f731ee |
+ break;
|
|
|
f731ee |
+ case R_AARCH64_LDST64_ABS_LO12_NC:
|
|
|
f731ee |
+ grub_arm64_set_abs_lo12_ldst64 (place, sym_addr);
|
|
|
f731ee |
+ break;
|
|
|
f731ee |
case R_AARCH64_CALL26:
|
|
|
f731ee |
case R_AARCH64_JUMP26:
|
|
|
f731ee |
{
|
|
|
f731ee |
@@ -154,6 +160,18 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
|
|
|
f731ee |
grub_arm64_set_xxxx26_offset (place, offset);
|
|
|
f731ee |
}
|
|
|
f731ee |
break;
|
|
|
f731ee |
+ case R_AARCH64_ADR_PREL_PG_HI21:
|
|
|
f731ee |
+ {
|
|
|
f731ee |
+ grub_int64_t offset = (sym_addr & ~0xfffULL) - (((grub_uint64_t) place) & ~0xfffULL);
|
|
|
f731ee |
+
|
|
|
f731ee |
+ if (!grub_arm64_check_hi21_signed (offset))
|
|
|
f731ee |
+ return grub_error (GRUB_ERR_BAD_MODULE,
|
|
|
f731ee |
+ "HI21 out of range");
|
|
|
f731ee |
+
|
|
|
f731ee |
+ grub_arm64_set_hi21 (place, offset);
|
|
|
f731ee |
+ }
|
|
|
f731ee |
+ break;
|
|
|
f731ee |
+
|
|
|
f731ee |
default:
|
|
|
f731ee |
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
|
|
|
f731ee |
N_("relocation 0x%x is not implemented yet"),
|
|
|
f731ee |
diff --git a/grub-core/kern/arm64/dl_helper.c b/grub-core/kern/arm64/dl_helper.c
|
|
|
f731ee |
index d213ab93e88..f031b1ae921 100644
|
|
|
f731ee |
--- a/grub-core/kern/arm64/dl_helper.c
|
|
|
f731ee |
+++ b/grub-core/kern/arm64/dl_helper.c
|
|
|
f731ee |
@@ -53,3 +53,43 @@ grub_arm64_set_xxxx26_offset (grub_uint32_t *place, grub_int64_t offset)
|
|
|
f731ee |
*place &= insmask;
|
|
|
f731ee |
*place |= grub_cpu_to_le32 (offset >> 2) & ~insmask;
|
|
|
f731ee |
}
|
|
|
f731ee |
+
|
|
|
f731ee |
+int
|
|
|
f731ee |
+grub_arm64_check_hi21_signed (grub_int64_t offset)
|
|
|
f731ee |
+{
|
|
|
f731ee |
+ if (offset != (grub_int64_t)(grub_int32_t)offset)
|
|
|
f731ee |
+ return 0;
|
|
|
f731ee |
+ return 1;
|
|
|
f731ee |
+}
|
|
|
f731ee |
+
|
|
|
f731ee |
+void
|
|
|
f731ee |
+grub_arm64_set_hi21 (grub_uint32_t *place, grub_int64_t offset)
|
|
|
f731ee |
+{
|
|
|
f731ee |
+ const grub_uint32_t insmask = grub_cpu_to_le32_compile_time (0x9f00001f);
|
|
|
f731ee |
+ grub_uint32_t val;
|
|
|
f731ee |
+
|
|
|
f731ee |
+ offset >>= 12;
|
|
|
f731ee |
+
|
|
|
f731ee |
+ val = ((offset & 3) << 29) | (((offset >> 2) & 0x7ffff) << 5);
|
|
|
f731ee |
+
|
|
|
f731ee |
+ *place &= insmask;
|
|
|
f731ee |
+ *place |= grub_cpu_to_le32 (val) & ~insmask;
|
|
|
f731ee |
+}
|
|
|
f731ee |
+
|
|
|
f731ee |
+void
|
|
|
f731ee |
+grub_arm64_set_abs_lo12 (grub_uint32_t *place, grub_int64_t target)
|
|
|
f731ee |
+{
|
|
|
f731ee |
+ const grub_uint32_t insmask = grub_cpu_to_le32_compile_time (0xffc003ff);
|
|
|
f731ee |
+
|
|
|
f731ee |
+ *place &= insmask;
|
|
|
f731ee |
+ *place |= grub_cpu_to_le32 (target << 10) & ~insmask;
|
|
|
f731ee |
+}
|
|
|
f731ee |
+
|
|
|
f731ee |
+void
|
|
|
f731ee |
+grub_arm64_set_abs_lo12_ldst64 (grub_uint32_t *place, grub_int64_t target)
|
|
|
f731ee |
+{
|
|
|
f731ee |
+ const grub_uint32_t insmask = grub_cpu_to_le32_compile_time (0xfff803ff);
|
|
|
f731ee |
+
|
|
|
f731ee |
+ *place &= insmask;
|
|
|
f731ee |
+ *place |= grub_cpu_to_le32 (target << 7) & ~insmask;
|
|
|
f731ee |
+}
|
|
|
f731ee |
diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
|
|
|
f731ee |
index 66e8576411e..d1bc95e350d 100644
|
|
|
f731ee |
--- a/util/grub-mkimagexx.c
|
|
|
f731ee |
+++ b/util/grub-mkimagexx.c
|
|
|
f731ee |
@@ -836,6 +836,14 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
|
|
|
f731ee |
*target = grub_host_to_target64 (grub_target_to_host64 (*target) + sym_addr);
|
|
|
f731ee |
}
|
|
|
f731ee |
break;
|
|
|
f731ee |
+ case R_AARCH64_ADD_ABS_LO12_NC:
|
|
|
f731ee |
+ grub_arm64_set_abs_lo12 ((grub_uint32_t *) target,
|
|
|
f731ee |
+ sym_addr);
|
|
|
f731ee |
+ break;
|
|
|
f731ee |
+ case R_AARCH64_LDST64_ABS_LO12_NC:
|
|
|
f731ee |
+ grub_arm64_set_abs_lo12_ldst64 ((grub_uint32_t *) target,
|
|
|
f731ee |
+ sym_addr);
|
|
|
f731ee |
+ break;
|
|
|
f731ee |
case R_AARCH64_JUMP26:
|
|
|
f731ee |
case R_AARCH64_CALL26:
|
|
|
f731ee |
{
|
|
|
f731ee |
@@ -848,6 +856,17 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
|
|
|
f731ee |
sym_addr);
|
|
|
f731ee |
}
|
|
|
f731ee |
break;
|
|
|
f731ee |
+ case R_AARCH64_ADR_PREL_PG_HI21:
|
|
|
f731ee |
+ {
|
|
|
f731ee |
+ sym_addr &= ~0xfffULL;
|
|
|
f731ee |
+ sym_addr -= (offset + SUFFIX (entry_point)) & ~0xfffULL;
|
|
|
f731ee |
+ if (!grub_arm64_check_hi21_signed (sym_addr))
|
|
|
f731ee |
+ grub_util_error ("%s", "CALL26 Relocation out of range");
|
|
|
f731ee |
+
|
|
|
f731ee |
+ grub_arm64_set_hi21((grub_uint32_t *)target,
|
|
|
f731ee |
+ sym_addr);
|
|
|
f731ee |
+ }
|
|
|
f731ee |
+ break;
|
|
|
f731ee |
default:
|
|
|
f731ee |
grub_util_error (_("relocation 0x%x is not implemented yet"),
|
|
|
f731ee |
(unsigned int) ELF_R_TYPE (info));
|
|
|
f731ee |
@@ -1200,6 +1219,15 @@ SUFFIX (make_reloc_section) (Elf_Ehdr *e, void **out,
|
|
|
f731ee |
case R_AARCH64_CALL26:
|
|
|
f731ee |
case R_AARCH64_JUMP26:
|
|
|
f731ee |
break;
|
|
|
f731ee |
+ /* Page-relative relocations do not require fixup entries. */
|
|
|
f731ee |
+ case R_AARCH64_ADR_PREL_PG_HI21:
|
|
|
f731ee |
+ /* We page-align the whole kernel, so no need
|
|
|
f731ee |
+ for fixup entries.
|
|
|
f731ee |
+ */
|
|
|
f731ee |
+ case R_AARCH64_ADD_ABS_LO12_NC:
|
|
|
f731ee |
+ case R_AARCH64_LDST64_ABS_LO12_NC:
|
|
|
f731ee |
+ break;
|
|
|
f731ee |
+
|
|
|
f731ee |
default:
|
|
|
f731ee |
grub_util_error (_("relocation 0x%x is not implemented yet"),
|
|
|
f731ee |
(unsigned int) ELF_R_TYPE (info));
|
|
|
f731ee |
@@ -1343,6 +1371,9 @@ SUFFIX (locate_sections) (const char *kernel_path,
|
|
|
f731ee |
Elf_Shdr *s;
|
|
|
f731ee |
|
|
|
f731ee |
*all_align = 1;
|
|
|
f731ee |
+ /* Page-aligning simplifies relocation handling. */
|
|
|
f731ee |
+ if (image_target->elf_target == EM_AARCH64)
|
|
|
f731ee |
+ *all_align = 4096;
|
|
|
f731ee |
|
|
|
f731ee |
section_addresses = xmalloc (sizeof (*section_addresses) * num_sections);
|
|
|
f731ee |
memset (section_addresses, 0, sizeof (*section_addresses) * num_sections);
|
|
|
f731ee |
diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c
|
|
|
f731ee |
index e217dcddc07..405c9117051 100644
|
|
|
f731ee |
--- a/util/grub-module-verifier.c
|
|
|
f731ee |
+++ b/util/grub-module-verifier.c
|
|
|
f731ee |
@@ -107,7 +107,13 @@ struct grub_module_verifier_arch archs[] = {
|
|
|
f731ee |
R_AARCH64_CALL26,
|
|
|
f731ee |
R_AARCH64_JUMP26,
|
|
|
f731ee |
-1
|
|
|
f731ee |
- } },
|
|
|
f731ee |
+ }, (int[]){
|
|
|
f731ee |
+ R_AARCH64_ADR_PREL_PG_HI21,
|
|
|
f731ee |
+ R_AARCH64_ADD_ABS_LO12_NC,
|
|
|
f731ee |
+ R_AARCH64_LDST64_ABS_LO12_NC,
|
|
|
f731ee |
+ -1
|
|
|
f731ee |
+ }
|
|
|
f731ee |
+ },
|
|
|
f731ee |
};
|
|
|
f731ee |
|
|
|
f731ee |
|
|
|
f731ee |
diff --git a/include/grub/arm64/reloc.h b/include/grub/arm64/reloc.h
|
|
|
f731ee |
index 4aed3d715e0..452c148226d 100644
|
|
|
f731ee |
--- a/include/grub/arm64/reloc.h
|
|
|
f731ee |
+++ b/include/grub/arm64/reloc.h
|
|
|
f731ee |
@@ -22,5 +22,13 @@
|
|
|
f731ee |
int grub_arm_64_check_xxxx26_offset (grub_int64_t offset);
|
|
|
f731ee |
void
|
|
|
f731ee |
grub_arm64_set_xxxx26_offset (grub_uint32_t *place, grub_int64_t offset);
|
|
|
f731ee |
+int
|
|
|
f731ee |
+grub_arm64_check_hi21_signed (grub_int64_t offset);
|
|
|
f731ee |
+void
|
|
|
f731ee |
+grub_arm64_set_hi21 (grub_uint32_t *place, grub_int64_t offset);
|
|
|
f731ee |
+void
|
|
|
f731ee |
+grub_arm64_set_abs_lo12 (grub_uint32_t *place, grub_int64_t target);
|
|
|
f731ee |
+void
|
|
|
f731ee |
+grub_arm64_set_abs_lo12_ldst64 (grub_uint32_t *place, grub_int64_t target);
|
|
|
f731ee |
|
|
|
f731ee |
#endif
|
|
|
f731ee |
diff --git a/include/grub/elf.h b/include/grub/elf.h
|
|
|
f731ee |
index caa79639082..db15acecf9f 100644
|
|
|
f731ee |
--- a/include/grub/elf.h
|
|
|
f731ee |
+++ b/include/grub/elf.h
|
|
|
f731ee |
@@ -2068,6 +2068,9 @@ typedef Elf32_Addr Elf32_Conflict;
|
|
|
f731ee |
#define R_AARCH64_NONE 0 /* No relocation. */
|
|
|
f731ee |
#define R_AARCH64_ABS64 257 /* Direct 64 bit. */
|
|
|
f731ee |
#define R_AARCH64_ABS32 258 /* Direct 32 bit. */
|
|
|
f731ee |
+#define R_AARCH64_ADR_PREL_PG_HI21 275
|
|
|
f731ee |
+#define R_AARCH64_ADD_ABS_LO12_NC 277
|
|
|
f731ee |
+#define R_AARCH64_LDST64_ABS_LO12_NC 286
|
|
|
f731ee |
#define R_AARCH64_JUMP26 282 /* 26-bit relative. */
|
|
|
f731ee |
#define R_AARCH64_CALL26 283 /* 26-bit relative. */
|
|
|
f731ee |
#define R_AARCH64_COPY 1024 /* Copy symbol at runtime. */
|