mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: barebox@lists.infradead.org,
	Rouven Czerwinski <r.czerwinski@pengutronix.de>
Subject: Re: [PATCH v3 1/5] optee: move optee_verify_header() to common
Date: Tue, 28 Jan 2020 10:23:08 +0100	[thread overview]
Message-ID: <20200128092308.27m6mljxtmx65qng@pengutronix.de> (raw)
In-Reply-To: <b550d9ba-bc7a-eabf-8c9b-418cee28e683@pengutronix.de>

On Tue, Jan 28, 2020 at 07:19:04AM +0100, Ahmad Fatoum wrote:
> Hello Rouven,
> 
> On 1/28/20 6:38 AM, Rouven Czerwinski wrote:
> > Subsequent patches will use this to verify the header in the PBL, move
> > it to common to make it potentially available for both.
> > 
> > Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> > ---
> >  arch/arm/lib32/bootm.c | 12 +++---------
> >  common/Makefile        |  1 +
> >  common/optee.c         | 19 +++++++++++++++++++
> >  include/tee/optee.h    |  5 +++++
> >  4 files changed, 28 insertions(+), 9 deletions(-)
> >  create mode 100644 common/optee.c
> > 
> > diff --git a/arch/arm/lib32/bootm.c b/arch/arm/lib32/bootm.c
> > index 180624445d..d64e705c40 100644
> > --- a/arch/arm/lib32/bootm.c
> > +++ b/arch/arm/lib32/bootm.c
> > @@ -137,16 +137,10 @@ static int get_kernel_addresses(size_t image_size,
> >  static int optee_verify_header_request_region(struct image_data *data, struct optee_header *hdr)
> >  {
> >  	int ret = 0;
> > -	if (hdr->magic != OPTEE_MAGIC) {
> > -		pr_err("Invalid header magic 0x%08x, expected 0x%08x\n",
> > -		       hdr->magic, OPTEE_MAGIC);
> > -		return -EINVAL;
> > -	}
> >  
> > -	if (hdr->arch != OPTEE_ARCH_ARM32 || hdr->init_load_addr_hi) {
> > -		pr_err("Only 32bit supported\n");
> > -		return -EINVAL;
> > -	}
> > +	ret = optee_verify_header(hdr);
> > +	if (ret < 0)
> > +		return ret;
> >  
> >  	data->tee_res = request_sdram_region("TEE", hdr->init_load_addr_lo, hdr->init_size);
> >  	if (!data->tee_res) {
> > diff --git a/common/Makefile b/common/Makefile
> > index 10960169f9..fbdd74a9fd 100644
> > --- a/common/Makefile
> > +++ b/common/Makefile
> > @@ -66,6 +66,7 @@ obj-$(CONFIG_BAREBOX_UPDATE_IMX_NAND_FCB) += imx-bbu-nand-fcb.o
> >  obj-$(CONFIG_BOOT)		+= boot.o
> >  obj-$(CONFIG_SERIAL_DEV_BUS)	+= serdev.o
> >  obj-$(CONFIG_USBGADGET_START)	+= usbgadget.o
> > +obj-$(CONFIG_BOOTM_OPTEE)	+= optee.o
> >  
> >  ifdef CONFIG_PASSWORD
> >  
> > diff --git a/common/optee.c b/common/optee.c
> > new file mode 100644
> > index 0000000000..9cbed0a520
> > --- /dev/null
> > +++ b/common/optee.c
> > @@ -0,0 +1,19 @@
> > +#include <tee/optee.h>
> > +#include <printk.h>
> > +#include <asm-generic/errno.h>
> > +
> > +int optee_verify_header (struct optee_header *hdr)
> > +{
> > +	if (hdr->magic != OPTEE_MAGIC) {
> > +		pr_err("Invalid header magic 0x%08x, expected 0x%08x\n",
> > +			   hdr->magic, OPTEE_MAGIC);
> 
> Wouldn't just print "Only 32 bit supported" without any context that this is referring
> to OP-TEE loading in particular? Adding a pr_fmt(fmt) "optee: " fmt would fix this.

Did that while applying. Also added SPDX header.

Sascha


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2020-01-28  9:23 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-28  5:38 [PATCH v3 0/5] OP-TEE early loading Rouven Czerwinski
2020-01-28  5:38 ` [PATCH v3 1/5] optee: move optee_verify_header() to common Rouven Czerwinski
2020-01-28  6:19   ` Ahmad Fatoum
2020-01-28  9:23     ` Sascha Hauer [this message]
2020-01-28  5:38 ` [PATCH v3 2/5] ARM: import setjmp implementation from U-Boot Rouven Czerwinski
2020-01-28  5:38 ` [PATCH v3 3/5] ARM: add optee early loading function Rouven Czerwinski
2020-01-28  5:38 ` [PATCH v3 4/5] ARM: mach-imx: test PL310 write access Rouven Czerwinski
2020-01-28  5:38 ` [PATCH v3 5/5] user: add documentation for OP-TEE loading Rouven Czerwinski
2020-01-28  9:23 ` [PATCH v3 0/5] OP-TEE early loading Sascha Hauer

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=20200128092308.27m6mljxtmx65qng@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=r.czerwinski@pengutronix.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