From: Dave.Martin@arm.com (Dave Martin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 13/19] ARM: module: correctly relocate instructions in BE8
Date: Wed, 28 Aug 2013 17:46:39 +0100 [thread overview]
Message-ID: <20130828164638.GE3842@localhost.localdomain> (raw)
In-Reply-To: <1377639509-22778-14-git-send-email-ben.dooks@codethink.co.uk>
On Tue, Aug 27, 2013 at 10:38:23PM +0100, Ben Dooks wrote:
> When in BE8 mode, our instructions are not in the same ordering as the
> data, so use <asm/opcodes.h> to take this into account.
>
> Note, also requires modules to be built --be8
>
> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Reviewed-by: Dave Martin <Dave.Martin@arm.com>
> ---
> arch/arm/kernel/module.c | 57 +++++++++++++++++++++++++++-------------------
> 1 file changed, 34 insertions(+), 23 deletions(-)
>
> diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
> index 85c3fb6..a1045a7 100644
> --- a/arch/arm/kernel/module.c
> +++ b/arch/arm/kernel/module.c
> @@ -24,6 +24,7 @@
> #include <asm/sections.h>
> #include <asm/smp_plat.h>
> #include <asm/unwind.h>
> +#include <asm/opcodes.h>
>
> #ifdef CONFIG_XIP_KERNEL
> /*
> @@ -60,6 +61,7 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
> Elf32_Sym *sym;
> const char *symname;
> s32 offset;
> + u32 tmp;
> #ifdef CONFIG_THUMB2_KERNEL
> u32 upper, lower, sign, j1, j2;
> #endif
> @@ -95,7 +97,8 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
> case R_ARM_PC24:
> case R_ARM_CALL:
> case R_ARM_JUMP24:
> - offset = (*(u32 *)loc & 0x00ffffff) << 2;
> + offset = __mem_to_opcode_arm(*(u32 *)loc);
> + offset = (offset & 0x00ffffff) << 2;
> if (offset & 0x02000000)
> offset -= 0x04000000;
>
> @@ -111,9 +114,10 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
> }
>
> offset >>= 2;
> + offset &= 0x00ffffff;
>
> - *(u32 *)loc &= 0xff000000;
> - *(u32 *)loc |= offset & 0x00ffffff;
> + *(u32 *)loc &= __opcode_to_mem_arm(0xff000000);
> + *(u32 *)loc |= __opcode_to_mem_arm(offset);
> break;
>
> case R_ARM_V4BX:
> @@ -121,8 +125,8 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
> * other bits to re-code instruction as
> * MOV PC,Rm.
> */
> - *(u32 *)loc &= 0xf000000f;
> - *(u32 *)loc |= 0x01a0f000;
> + *(u32 *)loc &= __opcode_to_mem_arm(0xf000000f);
> + *(u32 *)loc |= __opcode_to_mem_arm(0x01a0f000);
> break;
>
> case R_ARM_PREL31:
> @@ -132,7 +136,7 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
>
> case R_ARM_MOVW_ABS_NC:
> case R_ARM_MOVT_ABS:
> - offset = *(u32 *)loc;
> + offset = tmp = __mem_to_opcode_arm(*(u32 *)loc);
> offset = ((offset & 0xf0000) >> 4) | (offset & 0xfff);
> offset = (offset ^ 0x8000) - 0x8000;
>
> @@ -140,16 +144,18 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
> if (ELF32_R_TYPE(rel->r_info) == R_ARM_MOVT_ABS)
> offset >>= 16;
>
> - *(u32 *)loc &= 0xfff0f000;
> - *(u32 *)loc |= ((offset & 0xf000) << 4) |
> - (offset & 0x0fff);
> + tmp &= 0xfff0f000;
> + tmp |= ((offset & 0xf000) << 4) |
> + (offset & 0x0fff);
> +
> + *(u32 *)loc = __opcode_to_mem_arm(tmp);
> break;
>
> #ifdef CONFIG_THUMB2_KERNEL
> case R_ARM_THM_CALL:
> case R_ARM_THM_JUMP24:
> - upper = *(u16 *)loc;
> - lower = *(u16 *)(loc + 2);
> + upper = __mem_to_opcode_thumb16(*(u16 *)loc);
> + lower = __mem_to_opcode_thumb16(*(u16 *)(loc + 2));
>
> /*
> * 25 bit signed address range (Thumb-2 BL and B.W
> @@ -198,17 +204,20 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
> sign = (offset >> 24) & 1;
> j1 = sign ^ (~(offset >> 23) & 1);
> j2 = sign ^ (~(offset >> 22) & 1);
> - *(u16 *)loc = (u16)((upper & 0xf800) | (sign << 10) |
> + upper = (u16)((upper & 0xf800) | (sign << 10) |
> ((offset >> 12) & 0x03ff));
> - *(u16 *)(loc + 2) = (u16)((lower & 0xd000) |
> - (j1 << 13) | (j2 << 11) |
> - ((offset >> 1) & 0x07ff));
> + lower = (u16)((lower & 0xd000) |
> + (j1 << 13) | (j2 << 11) |
> + ((offset >> 1) & 0x07ff));
> +
> + *(u16 *)loc = __opcode_to_mem_thumb16(upper);
> + *(u16 *)(loc + 2) = __opcode_to_mem_thumb16(lower);
> break;
>
> case R_ARM_THM_MOVW_ABS_NC:
> case R_ARM_THM_MOVT_ABS:
> - upper = *(u16 *)loc;
> - lower = *(u16 *)(loc + 2);
> + upper = __mem_to_opcode_thumb16(*(u16 *)loc);
> + lower = __mem_to_opcode_thumb16(*(u16 *)(loc + 2));
>
> /*
> * MOVT/MOVW instructions encoding in Thumb-2:
> @@ -229,12 +238,14 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
> if (ELF32_R_TYPE(rel->r_info) == R_ARM_THM_MOVT_ABS)
> offset >>= 16;
>
> - *(u16 *)loc = (u16)((upper & 0xfbf0) |
> - ((offset & 0xf000) >> 12) |
> - ((offset & 0x0800) >> 1));
> - *(u16 *)(loc + 2) = (u16)((lower & 0x8f00) |
> - ((offset & 0x0700) << 4) |
> - (offset & 0x00ff));
> + upper = (u16)((upper & 0xfbf0) |
> + ((offset & 0xf000) >> 12) |
> + ((offset & 0x0800) >> 1));
> + lower = (u16)((lower & 0x8f00) |
> + ((offset & 0x0700) << 4) |
> + (offset & 0x00ff));
> + *(u16 *)loc = __opcode_to_mem_thumb16(upper);
> + *(u16 *)(loc + 2) = __opcode_to_mem_thumb16(lower);
> break;
> #endif
>
> --
> 1.7.10.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2013-08-28 16:46 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-27 21:38 3.11-rc7 big-endian support Ben Dooks
2013-08-27 21:38 ` [PATCH 01/19] ARM: fix ARCH_IXP4xx usage of ARCH_SUPPORTS_BIG_ENDIAN Ben Dooks
2013-08-27 21:38 ` [PATCH 02/19] ARM: asm: Add ARM_BE8() assembly helper Ben Dooks
2013-08-27 21:38 ` [PATCH 03/19] ARM: fixup_pv_table bug when CPU_ENDIAN_BE8 Ben Dooks
2013-08-28 16:54 ` Dave Martin
2013-08-27 21:38 ` [PATCH 04/19] ARM: set BE8 if LE in head code Ben Dooks
2013-08-28 10:21 ` Thomas Petazzoni
2013-08-28 16:42 ` Dave Martin
2013-08-27 21:38 ` [PATCH 05/19] ARM: pl01x debug code endian fix Ben Dooks
2013-08-28 17:03 ` Dave Martin
2013-08-27 21:38 ` [PATCH 06/19] ARM: twd: data " Ben Dooks
2013-08-27 21:38 ` [PATCH 07/19] ARM: smp_scu: data endian fixes Ben Dooks
2013-08-27 21:38 ` [PATCH 08/19] highbank: enable big-endian Ben Dooks
2013-08-28 15:21 ` Rob Herring
2013-08-30 18:50 ` Ben Dooks
2013-08-27 21:38 ` [PATCH 09/19] mvebu: support running big-endian Ben Dooks
2013-08-27 21:38 ` [PATCH 10/19] vexpress: add big endian support Ben Dooks
2013-08-27 21:38 ` [PATCH 11/19] ARM: alignment: correctly decode instructions in BE8 mode Ben Dooks
2013-08-28 16:44 ` Dave Martin
2013-08-27 21:38 ` [PATCH 12/19] ARM: traps: use <asm/opcodes.h> to get correct instruction order Ben Dooks
2013-08-28 11:22 ` Dave Martin
2013-08-27 21:38 ` [PATCH 13/19] ARM: module: correctly relocate instructions in BE8 Ben Dooks
2013-08-28 16:46 ` Dave Martin [this message]
2013-08-27 21:38 ` [PATCH 14/19] ARM: set --be8 when linking modules Ben Dooks
2013-08-28 16:38 ` Dave Martin
2013-08-30 18:55 ` Ben Dooks
2013-08-27 21:38 ` [PATCH 15/19] ARM: hardware: fix endian-ness in <hardware/coresight.h> Ben Dooks
2013-08-27 21:38 ` [PATCH 16/19] ARM: net: fix arm instruction endian-ness in bpf_jit_32.c Ben Dooks
2013-08-28 16:47 ` Dave Martin
2013-08-27 21:38 ` [PATCH 17/19] ARM: Correct BUG() assembly to ensure it is endian-agnostic Ben Dooks
2013-08-28 16:48 ` Dave Martin
2013-08-27 21:38 ` [PATCH 18/19] ARM: kdgb: use <asm/opcodes.h> for data to be assembled as intruction Ben Dooks
2013-08-28 16:50 ` Dave Martin
2013-08-27 21:38 ` [PATCH 19/19] ARM: atomic64: fix endian-ness in atomic.h Ben Dooks
2013-08-27 22:02 ` 3.11-rc7 big-endian support Ben Dooks
2013-08-29 9:59 ` Thomas Petazzoni
2013-08-29 10:23 ` Ben Dooks
2013-08-29 10:28 ` Thomas Petazzoni
2013-08-29 15:53 ` Victor Kamensky
2013-08-29 17:17 ` Ben Dooks
2013-08-28 11:45 ` re-send patch series due to mta issues Ben Dooks
2013-08-28 11:45 ` [PATCH 01/19] ARM: fix ARCH_IXP4xx usage of ARCH_SUPPORTS_BIG_ENDIAN Ben Dooks
2013-08-28 11:45 ` [PATCH 02/19] ARM: asm: Add ARM_BE8() assembly helper Ben Dooks
2013-08-28 11:45 ` [PATCH 03/19] ARM: fixup_pv_table bug when CPU_ENDIAN_BE8 Ben Dooks
2013-08-28 11:45 ` [PATCH 04/19] ARM: set BE8 if LE in head code Ben Dooks
2013-08-28 11:45 ` [PATCH 05/19] ARM: pl01x debug code endian fix Ben Dooks
2013-08-28 11:45 ` [PATCH 06/19] ARM: twd: data " Ben Dooks
2013-08-28 11:45 ` [PATCH 07/19] ARM: smp_scu: data endian fixes Ben Dooks
2013-08-28 11:45 ` [PATCH 08/19] highbank: enable big-endian Ben Dooks
2013-08-28 11:45 ` [PATCH 09/19] mvebu: support running big-endian Ben Dooks
2013-08-28 11:45 ` [PATCH 10/19] vexpress: add big endian support Ben Dooks
2013-08-28 11:45 ` [PATCH 11/19] ARM: alignment: correctly decode instructions in BE8 mode Ben Dooks
2013-08-28 19:40 ` Sergei Shtylyov
2013-08-30 18:47 ` Ben Dooks
2013-08-28 11:45 ` [PATCH 12/19] ARM: traps: use <asm/opcodes.h> to get correct instruction order Ben Dooks
2013-08-28 11:45 ` [PATCH 13/19] ARM: module: correctly relocate instructions in BE8 Ben Dooks
2013-08-28 11:45 ` [PATCH 14/19] ARM: set --be8 when linking modules Ben Dooks
2013-08-28 11:45 ` [PATCH 15/19] ARM: hardware: fix endian-ness in <hardware/coresight.h> Ben Dooks
2013-08-28 11:45 ` [PATCH 16/19] ARM: net: fix arm instruction endian-ness in bpf_jit_32.c Ben Dooks
2013-08-28 11:45 ` [PATCH 17/19] ARM: Correct BUG() assembly to ensure it is endian-agnostic Ben Dooks
2013-08-28 11:45 ` [PATCH 18/19] ARM: kdgb: use <asm/opcodes.h> for data to be assembled as intruction Ben Dooks
2013-08-28 11:45 ` [PATCH 19/19] ARM: atomic64: fix endian-ness in atomic.h Ben Dooks
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130828164638.GE3842@localhost.localdomain \
--to=dave.martin@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).