From: Ian Campbell <ijc@hellion.org.uk>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2] ARM: bootm: Allow booting in secure mode on hyp capable systems
Date: Wed, 22 Oct 2014 19:55:03 +0100 [thread overview]
Message-ID: <1414004103.20604.72.camel@hellion.org.uk> (raw)
In-Reply-To: <1413985502-19257-1-git-send-email-hdegoede@redhat.com>
On Wed, 2014-10-22 at 15:45 +0200, Hans de Goede wrote:
> if (!fake) {
> #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
> - armv7_init_nonsec();
> - secure_ram_addr(_do_nonsec_entry)(kernel_entry,
> - 0, machid, r2);
> -#else
> - kernel_entry(0, machid, r2);
> + if (boot_nonsec()) {
> + armv7_init_nonsec();
> + secure_ram_addr(_do_nonsec_entry)(kernel_entry,
> + 0, machid, r2);
> + }
> #endif
> + kernel_entry(0, machid, r2);
There's a subtle different here, which is that this final kernel_entry
call used to be in the #else clause, and so emitted for the NONSEC ||
VIRT case. So if the _do_nonsec_entry call were to fail (not currently
possible) and return you'd end up trying again via the sec path.
I'm not sure that's a bad thing, but it is a difference so it'd be good
to know it was a deliberate choice (or not).
Ian.
next prev parent reply other threads:[~2014-10-22 18:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-22 13:45 [U-Boot] [PATCH v2] ARM: bootm: Allow booting in secure mode on hyp capable systems Hans de Goede
2014-10-22 18:55 ` Ian Campbell [this message]
2014-10-23 8:22 ` Hans de Goede
2014-10-23 9:30 ` Ian Campbell
2014-10-23 9:37 ` Hans de Goede
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=1414004103.20604.72.camel@hellion.org.uk \
--to=ijc@hellion.org.uk \
--cc=u-boot@lists.denx.de \
/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