From: afzal mohammed <afzal.mohd.ma@gmail.com>
To: Vladimir Murzin <vladimir.murzin@arm.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Russell King <linux@armlinux.org.uk>,
linux-arm-kernel@lists.infradead.org,
Alexandre Torgue <alexandre.torgue@st.com>
Subject: Re: Regression: Cortex-M w/ XIP not booting
Date: Thu, 3 Oct 2019 05:34:59 +0530 [thread overview]
Message-ID: <20191003000459.GA5467@afzalpc> (raw)
In-Reply-To: <c9a8d667-0dfb-2dd7-3537-8683cfc3914d@arm.com>
Hi Vladimir,
On Wed, Oct 02, 2019 at 12:55:55PM +0100, Vladimir Murzin wrote:
> Can you try diff bellow? I do not have XIP target, but non-XIP seems to
> stay happy...
Thanks, it fixes the issue.
Regards
afzal
>
>
> diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
> index a7810be..4a39828 100644
> --- a/arch/arm/kernel/head-common.S
> +++ b/arch/arm/kernel/head-common.S
> @@ -68,7 +68,7 @@ ENDPROC(__vet_atags)
> * The following fragment of code is executed with the MMU on in MMU mode,
> * and uses absolute addresses; this is not position independent.
> *
> - * r0 = cp#15 control register
> + * r0 = cp#15 control register (exc_ret for M-class)
> * r1 = machine ID
> * r2 = atags/dtb pointer
> * r9 = processor ID
> @@ -137,7 +137,8 @@ __mmap_switched_data:
> #ifdef CONFIG_CPU_CP15
> .long cr_alignment @ r3
> #else
> - .long 0 @ r3
> +M_CLASS(.long exc_ret) @ r3
> +AR_CLASS(.long 0) @ r3
> #endif
> .size __mmap_switched_data, . - __mmap_switched_data
>
> diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S
> index afa350f..0fc814b 100644
> --- a/arch/arm/kernel/head-nommu.S
> +++ b/arch/arm/kernel/head-nommu.S
> @@ -201,6 +201,8 @@ M_CLASS(streq r3, [r12, #PMSAv8_MAIR1])
> bic r0, r0, #V7M_SCB_CCR_IC
> #endif
> str r0, [r12, V7M_SCB_CCR]
> + /* Pass exc_ret to __mmap_switched */
> + mov r0, r10
> #endif /* CONFIG_CPU_CP15 elif CONFIG_CPU_V7M */
> ret lr
> ENDPROC(__after_proc_init)
> diff --git a/arch/arm/mm/proc-v7m.S b/arch/arm/mm/proc-v7m.S
> index 1448f14..efebf41 100644
> --- a/arch/arm/mm/proc-v7m.S
> +++ b/arch/arm/mm/proc-v7m.S
> @@ -136,9 +136,8 @@ __v7m_setup_cont:
> cpsie i
> svc #0
> 1: cpsid i
> - ldr r0, =exc_ret
> - orr lr, lr, #EXC_RET_THREADMODE_PROCESSSTACK
> - str lr, [r0]
> + /* Calculate exc_ret */
> + orr r10, lr, #EXC_RET_THREADMODE_PROCESSSTACK
> ldmia sp, {r0-r3, r12}
> str r5, [r12, #11 * 4] @ restore the original SVC vector entry
> mov lr, r6 @ restore LR
>
> Cheers
> Vladimir
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-10-03 0:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-02 6:16 Regression: Cortex-M w/ XIP not booting afzal mohammed
2019-10-02 11:55 ` Vladimir Murzin
2019-10-03 0:04 ` afzal mohammed [this message]
2019-10-03 11:43 ` Vladimir Murzin
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=20191003000459.GA5467@afzalpc \
--to=afzal.mohd.ma@gmail.com \
--cc=alexandre.torgue@st.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=mcoquelin.stm32@gmail.com \
--cc=vladimir.murzin@arm.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.