From: ben.dooks@codethink.co.uk (Ben Dooks)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/17] ARM: fixup_pv_table bug when CPU_ENDIAN_BE8
Date: Mon, 11 Feb 2013 19:11:58 +0000 [thread overview]
Message-ID: <5119427E.3000502@codethink.co.uk> (raw)
In-Reply-To: <alpine.LFD.2.02.1302082237590.6300@xanadu.home>
On 09/02/13 03:40, Nicolas Pitre wrote:
> On Fri, 8 Feb 2013, Ben Dooks wrote:
>
>> The fixup_pv_table assumes that the instructions are in the same
>> endian configuration as the data, but when the CPU is running in
>> BE8 the instructions stay in little-endian format.
>>
>> Make sure if CONFIG_CPU_ENDIAN_BE8 is set that we do all the
>> alterations to the instructions taking in to account the LDR/STR
>> will be swapping the data endian-ness.
>>
>> Since the code is only modifying a byte, we avoid dual-swapping
>> the data, and just change the bits we clear and ORR in.
>>
>> Note, not tested against an actual bug, it looked wrong.
>
> You are missing the CONFIG_THUMB2_KERNEL counterpart.
Sorry, I will have a look into that, although I may need
some help on that as I don't have any experience with
CONFIG_THUMB2_KERNEL or a userland to test with.
>> Signed-off-by: Ben Dooks<ben.dooks@codethink.co.uk>
>> ---
>> arch/arm/kernel/head.S | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
>> index f1ab279..aafb151 100644
>> --- a/arch/arm/kernel/head.S
>> +++ b/arch/arm/kernel/head.S
>> @@ -579,8 +579,14 @@ __fixup_a_pv_table:
>> #else
>> b 2f
>> 1: ldr ip, [r7, r3]
>> +#ifdef CONFIG_CPU_ENDIAN_BE8
>> + @ in BE8, we load data in BE, but instructions still in LE
>> + bic ip, ip, #0xff000000
>> + orr ip, ip, r6, lsl#24
>> +#else
>> bic ip, ip, #0x000000ff
>> orr ip, ip, r6 @ mask in offset bits 31-24
>> +#endif
>> str ip, [r7, r3]
>> 2: cmp r4, r5
>> ldrcc r7, [r4], #4 @ use branch for delay slot
>> --
>> 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
>>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Ben Dooks http://www.codethink.co.uk/
Senior Engineer Codethink - Providing Genius
next prev parent reply other threads:[~2013-02-11 19:11 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-08 23:17 ARM big-endian on current kernels for linux-3.8 Ben Dooks
2013-02-08 23:17 ` [PATCH 01/17] ARM: add CPU_BE8_BOOT_LE configuration Ben Dooks
2013-02-09 4:10 ` Nicolas Pitre
2013-02-09 16:46 ` Ben Dooks
2013-02-08 23:17 ` [PATCH 02/17] ARM: set BE8 if LE in head code Ben Dooks
2013-02-09 3:33 ` Nicolas Pitre
2013-02-09 16:47 ` Ben Dooks
2013-02-09 21:38 ` Rob Herring
2013-02-09 21:56 ` Ben Dooks
2013-02-11 19:35 ` Ben Dooks
2013-02-08 23:17 ` [PATCH 03/17] ARM: fix ARCH_IXP4xx usage of ARCH_SUPPORTS_BIG_ENDIAN Ben Dooks
2013-02-08 23:17 ` [PATCH 04/17] ARM: Add ARCH_SUPPORTS_BIG_ENDIAN Ben Dooks
2013-02-09 11:55 ` Russell King - ARM Linux
2013-02-09 16:55 ` Ben Dooks
2013-02-08 23:17 ` [PATCH 05/17] ARM: fixup_pv_table bug when CPU_ENDIAN_BE8 Ben Dooks
2013-02-09 3:40 ` Nicolas Pitre
2013-02-11 19:11 ` Ben Dooks [this message]
2013-02-12 21:45 ` Nicolas Pitre
2013-02-08 23:17 ` [PATCH 06/17] ARM: fixup head for atag verification Ben Dooks
2013-02-09 3:51 ` Nicolas Pitre
2013-02-09 17:09 ` Ben Dooks
2013-02-08 23:17 ` [PATCH 07/17] ARM: twd: data endian fix Ben Dooks
2013-02-08 23:17 ` [PATCH 08/17] ARM: smp_scu: data endian fixes Ben Dooks
2013-02-08 23:17 ` [PATCH 09/17] ARM: add atag32_to_cpu() function Ben Dooks
2013-02-09 3:57 ` Nicolas Pitre
2013-02-09 12:03 ` Russell King - ARM Linux
2013-02-11 19:15 ` Ben Dooks
2013-02-11 19:30 ` Russell King - ARM Linux
2013-02-12 18:46 ` Jean-Christophe PLAGNIOL-VILLARD
2013-02-12 20:34 ` Russell King - ARM Linux
2013-02-08 23:17 ` [PATCH 10/17] ARM: update atag-to-fdt code to be endian agnostic Ben Dooks
2013-02-09 3:57 ` Nicolas Pitre
2013-02-09 12:05 ` Russell King - ARM Linux
2013-02-11 19:16 ` Ben Dooks
2013-02-12 21:53 ` Nicolas Pitre
2013-02-13 11:27 ` Ben Dooks
2013-02-14 4:43 ` Nicolas Pitre
2013-02-15 11:28 ` Ben Dooks
2013-02-08 23:17 ` [PATCH 11/17] ARM: fixup atags " Ben Dooks
2013-02-09 4:03 ` Nicolas Pitre
2013-02-09 12:06 ` Russell King - ARM Linux
2013-02-08 23:17 ` [PATCH 12/17] ARM: fix magic for bootloader in BE8 Ben Dooks
2013-02-09 4:06 ` Nicolas Pitre
2013-02-09 12:08 ` Russell King - ARM Linux
2013-02-12 18:50 ` Jean-Christophe PLAGNIOL-VILLARD
2013-02-12 18:54 ` Ben Dooks
2013-02-12 19:52 ` Jean-Christophe PLAGNIOL-VILLARD
2013-02-11 19:17 ` Ben Dooks
2013-02-12 21:57 ` Nicolas Pitre
2013-02-08 23:17 ` [PATCH 13/17] ARM: pl01x debug code endian fix Ben Dooks
2013-02-09 12:09 ` Russell King - ARM Linux
2013-02-11 19:19 ` Ben Dooks
2013-02-08 23:17 ` [PATCH 14/17] highbank: enable big-endian Ben Dooks
2013-02-09 21:33 ` Rob Herring
2013-02-09 22:00 ` Ben Dooks
2013-02-08 23:17 ` [PATCH 15/17] xgmac: fix printing of hardware version Ben Dooks
2013-02-09 12:10 ` Russell King - ARM Linux
2013-02-09 17:20 ` Ben Dooks
2013-02-09 21:35 ` Rob Herring
2013-02-08 23:17 ` [PATCH 16/17] xgmac: replace __raw with relaxed IO Ben Dooks
2013-02-09 20:59 ` Rob Herring
2013-02-09 22:03 ` Ben Dooks
2013-02-08 23:17 ` [PATCH 17/17] mvebu: support running big-endian Ben Dooks
2013-02-12 17:08 ` ARM big-endian on current kernels for linux-3.8 Thomas Petazzoni
2013-02-12 17:25 ` Ben Dooks
2013-02-12 18:49 ` Thomas Petazzoni
2013-02-12 18:54 ` Ben Dooks
2013-02-13 9:48 ` Thomas Petazzoni
2013-02-12 17:13 ` Russell King - ARM Linux
2013-02-12 17:33 ` Ben Dooks
2013-02-12 22:13 ` Nicolas Pitre
2013-02-13 11:00 ` Ben Dooks
2013-02-13 10:24 ` Matthieu CASTET
2013-02-13 11:18 ` Ben Dooks
2013-02-13 15:52 ` Catalin Marinas
2013-02-13 16:02 ` Ben Dooks
2013-02-13 16:03 ` Arnd Bergmann
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=5119427E.3000502@codethink.co.uk \
--to=ben.dooks@codethink.co.uk \
--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).