From: Dave.Martin@arm.com (Dave Martin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/19] ARM: alignment: correctly decode instructions in BE8 mode.
Date: Wed, 28 Aug 2013 17:44:50 +0100 [thread overview]
Message-ID: <20130828164450.GD3842@localhost.localdomain> (raw)
In-Reply-To: <1377639509-22778-12-git-send-email-ben.dooks@codethink.co.uk>
On Tue, Aug 27, 2013 at 10:38:21PM +0100, Ben Dooks wrote:
> If we are in BE8 mode, we must deal with the instruction stream being
> in LE order when data is being loaded in BE order. Ensure the data is
> swapped before processing to avoid thre following:
>
> Change to using <asm/opcodes.h> to provide the necessary conversion
> functions to change the byte ordering.
>
> Alignment trap: not handling instruction 030091e8 at [<80333e8c>]
> Unhandled fault: alignment exception (0x001) at 0xbfa09567
Reviewed-by: Dave Martin <Dave.Martin@arm.com>
>
> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
> ---
> arch/arm/mm/alignment.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
> index 6f4585b..9240364 100644
> --- a/arch/arm/mm/alignment.c
> +++ b/arch/arm/mm/alignment.c
> @@ -25,6 +25,7 @@
> #include <asm/cp15.h>
> #include <asm/system_info.h>
> #include <asm/unaligned.h>
> +#include <asm/opcodes.h>
>
> #include "fault.h"
>
> @@ -762,21 +763,25 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
> if (thumb_mode(regs)) {
> u16 *ptr = (u16 *)(instrptr & ~1);
> fault = probe_kernel_address(ptr, tinstr);
> + tinstr = __mem_to_opcode_thumb16(tinstr);
> if (!fault) {
> if (cpu_architecture() >= CPU_ARCH_ARMv7 &&
> IS_T32(tinstr)) {
> /* Thumb-2 32-bit */
> u16 tinst2 = 0;
> fault = probe_kernel_address(ptr + 1, tinst2);
> - instr = (tinstr << 16) | tinst2;
> + tinst2 = __mem_to_opcode_thumb16(tinst2);
> + instr = __opcode_thumb32_compose(tinstr, tinst2);
> thumb2_32b = 1;
> } else {
> isize = 2;
> instr = thumb2arm(tinstr);
> }
> }
> - } else
> + } else {
> fault = probe_kernel_address(instrptr, instr);
> + instr = __mem_to_opcode_arm(instr);
> + }
>
> if (fault) {
> type = TYPE_FAULT;
> --
> 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:44 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 [this message]
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
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=20130828164450.GD3842@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).