It seems that Shippable CI does not like running QEMU with 4 virtual
cores (or maybe we have a bug), because "make check" hangs when QEMU
is started with -smp 4. Revert to 1 core by default.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

The QEMU_SMP environment variable or makefile macro may be set to
control the number of cores used during "make check".

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

Commit 37ab51de ("qemu: bios load OP-TEE image v2") has updated the run
and run-only targets, but not make check. Fix this.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

Bios loads OP-TEE image v2 binaries instead of the v1 format.

Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

New `optee_examples` git rep is used instead of `hello_world`, which
will contain different sample applications that will show usage of
specific TEE functionality (crypto examples, random data generation,
trusted storage etc.)

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org>

Fixes the following error [1]:

make -C /home/travis/default/build/../optee_benchmark HOST_CROSS_COMPILE="/usr/bin/ccache /home/travis/default/build/../toolchains/aarch32/bin/arm-linux-gnueabihf-" TEEC_EXPORT=/home/travis/default/build/../optee_client/out/export TEEC_INTERNAL_INCLUDES=/home/travis/default/build/../optee_client/libteec
make: *** /home/travis/default/build/../optee_benchmark: No such file or directory.  Stop.

[1] https://travis-ci.org/OP-TEE/build/builds/237729031

 job 216.1

Fixes: 27edfc78 ("OP-TEE Benchmark")
Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org. (HiKey)
[jf: update commit description]
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>

Enable Benchmark feature

Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org>

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>

gnome-terminal comes by default with Ubuntu and is much more advanced
than xterm, so use it when available.
While we're at it, move common definitions to common.mk.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed by: Victor Chong <victor.chong@linaro.org>

- tee-supplicant is started automatically since commit 1333db4d
("rootfs: start tee-supplicant on boot")
- Update qemu_v8 arguments so that GDB can be used like for qemu

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

Add support for configuring QEMU with VirtFS to share data
between the guest QEMU VM and host operating systems.

To specify dir, that has to be mounted inside QEMU VM, edit
QEMU_VIRTFS_HOST_DIR var in qemu.mk

To mount shared folder within QEMU ARM VM, run:
$ mount -t 9p -o trans=virtio host /tmp/shared/

If Virtfs support is enabled, libattr1-dev and libcap-dev
have to be installed before configuring QEMU.

For additional details see:
http://wiki.qemu.org/Documentation/9psetup



Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Igor Opaniuk <igor.opaniuk@linaro.org> (qemu_v7/v8)

Test 2001 is obsolete. xtest 1004 is a good candidate: load TA, invoke
and close.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (HiKey)
Tested-by: Joakim Bech <joakim.bech@linaro.org> (RPi3, MTK8173)
Tested-by: Etienne Carriere <etienne.carriere@linaro.org> (qemu_v7/v8)

Factorize embedded file list and rootfs generation for fvp, juno,
mediatek, qemu, qemu_v8 and rpi3.

busybox is madatory to all 'common' rootfs.
optee-client, xtestn helloworld are always embedded: moved to common.

Remove obsolete CFG_DEV_PATH.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (HiKey)
Tested-by: Joakim Bech <joakim.bech@linaro.org> (RPi3, MTK8173)
Tested-by: Etienne Carriere <etienne.carriere@linaro.org> (qemu_v7/v8)

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: David Brown <david.brown@linaro.org>
Tested-by: Victor Chong <victor.chong@linaro.org> (qemu)
Tested-by: Joakim Bech <joakim.bech@linaro.org> (RPi3 with mods
to build_ta_helloworld_qemu.sh for a 64-bit build)

- Adds legacy toolchain for use in older edk2 projects, this is the only
  project using the pre 5.x toolchain for now
- Removes the bare metal toolchain
- qemu: Change the path for libraries for GCC5
- fvp: compiler changes for ARM-TF and EDK2
       Update libteec path in initramfs
- mtk: Toolchain and libteec path updates
- juno: Toolchain and libteec path updates

Signed-off-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Joakim Bech <joakim.bech@linaro.org> (QEMU, FVP, HiKey)
Tested-by: Pascal Brand <pascal.brand@linaro.org> (QEMU)
Tested-by: Pascal Brand <pascal.brand@linaro.org> (FVP)

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Tested-by: Victor Chong <victor.chong@linaro.org> (QEMU with CONFIG_OPTEE=m)
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Joakim Bech <joakim.bech@linaro.org> (QEMU)

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Pascal Brand <pascal.brand@st.com>

Build support for generic driver on QEMU.

Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Signed-off-by: Pascal Brand <pascal.brand@st.com>

This is required to move OP-TEE to upstream QEMU.

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

Update with new TA dev kit name for FVP and QEMU.

Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

- Kernel config fragments that were used by the QEMU makefile are
merged into kconfigs/qemu.conf. Now, each platform has its own file
in kconfigs/
- All platforms: CONFIG_DMA_SHARED_BUFFER cannot be enabled directly
because it is  a not a visible symbol (has no prompt in Kconfig).
CONFIG_DRM is set instead which depends on DMA.
- kconfigs/hikey.conf: keep only what is necessary

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (FVP, HiKey)
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Joakim Bech <joakim.bech@linaro.org> (QEMU, MTK8173)

We have observed random failures of "make check" when run in the
Travis environment (OP-TEE regression testing). Every time it fails,
the log file has the following errors [1]:

  Starting QEMU...send: spawn id exp7 not open
      while executing
  "send -- "\r""
      (file "qemu-check.exp" line 54)
  == /home/travis/optee_repo/build/serial0.log:
  spawn ../qemu/arm-softmmu/qemu-system-arm -nographic [...]
  Using QEMU provided DTB at 0x40000000
  [...]
  squashfs: version 4.0 (2009/01/31) Phillip Lougher
  jffs2: version 2.2. (NAND) send: spawn id exp7 not open
      while executing
  "send -- "\r""
      (file "qemu-check.exp" line 54)
  == end of /home/travis/optee_repo/build/serial0.log

It seems that QEMU exits unexpectedly as the kernel is initializing
the JFFS2 filesystem driver. Since this is something we don't need, I
thought I'd just disable this driver and see if it makes things more
stable.
Well, indeed I could not reproduce the issue with this patch applied.

[1] https://travis-ci.org/OP-TEE/optee_os/builds/90051975#L4577



Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

This will hopefully fix occasional errors observed during OP-TEE Travis
regression testing (make check):
  rcu_sched detected stalls on CPUs/tasks...

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Joakim Bech <joakim.bech@linaro.org> (QEMU)

GCC 5 and above fails to build OP-TEE project under QEMU.
Warnings are now treated as errors by default.

On line 60 --extra-cflags="-Wno-error" fixes the issue.
Please reference
[OP-TEE/optee_os#550](https://github.com/OP-TEE/optee_os/issues/550

) for
specifics.

My machine is running gcc version 5.2.1 20151010 and I can confirm this
now works with change. It affects both default.xml and default_stable.xml repo
configurations for OP-TEE.

Reviewed-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Jorden Whitefield <j.whitefield@surrey.ac.uk>

It can sometimes be useful to pass extra arguments to the QEMU that is
launched via the 'run-only' target. Support this via an environment
variable QEMU_EXTRA_ARGS, which can be used like:
 make run-only QEMU_PATH=path/to/qemu/directory QEMU_EXTRA_ARGS='args here'

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

At the moment we start several terminals, and then sleep for a second
before running a QEMU instance which will connect to processes run
in those terminals. This will fail if the terminals are displayed on
a slow remote X11 connection, because the terminals won't have
completed startup before the one second delay elapses.

Replace the delay with a loop that checks whether there's anything
listening on the relevant TCP ports yet.

Fixes https://github.com/OP-TEE/build/issues/20



Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Cedric Chaumont <cedric.chaumont@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Joakim Bech <joakim.bech@linaro.org>

- Make sure launch-terminal cannot block by adding a '&'
- Use xterm instead of gnome-terminal because it is more likely to be
installed by default.

Fixes https://github.com/OP-TEE/build/issues/18

.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Tested-by: Pascal Brand <pascal.brand@linaro.org>
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Peter Maydell <peter.maydell@linaro.org>

Signed-off-by: SY Chiu <sy.chiu@linaro.org>
Tested-by: SY Chiu <sy.chiu@linaro.org> (QEMU)
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>

Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (HiKey)
Tested-by: SY Chiu <sy.chiu@linaro.org> (MT8173 EVB)
Tested-by: Pascal Brand <pascal.brand@linaro.org> (QEMU)
Tested-by: Pascal Brand <pascal.brand@linaro.org> (FVP)
Signed-off-by: Pascal Brand <pascal.brand@st.com>

Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Pascal Brand <pascal.brand@st.com>

The Expect timeout can be passed via make as, for instance:
  make check TIMEOUT=60

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

- If $(CROSS_COMPILE) is defined, use it to set the other cross compile
variables used in common.mk: CROSS_COMPILE_{S,NS}_{USER,KERNEL}.
The linux and qemu targets are also adjusted to use those variables,
they may be updated later when common targets are added.
- Use $(MAKE) instead of plain 'make' so that some special make flags
are handled properly (-n for instance).
- Fix filelist-tee dependencies. Since this target uses 'find' to make
a list of files built by xtest, xtest is a dependency.
- make check: add DUMP_LOGS_ON_ERROR variable. To dump serial0.log and
serial1.log when test fails, run:
    make check DUMP_LOGS_ON_ERROR=1
- Add missing + before $(MAKE). The $(bios-qemu-common) macro defines
a command that must start with a '+' character for reasons related to
the GNU make jobserver implementation [1]. Without it, the sub-make
would print the following warning and not run in parallel:
    make[1]: warning: jobserver unavailable: using -j1.  Add `+' to
    parent make rule.
  [1] http://make.mad-scientist.net/papers/jobserver-implementation/


  ("The Final Result", point 7.)
- Remove redundant dependencies

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

The code added by commits d6536da6 ("Commonlize xtest compilation
among all platforms") and 070d9559 ("common build: optee
components") introduces race conditions that break parallel build (make
-jX). This is due to manually launching a make sub-process to run the
-common targets, and can be fixed by just declaring a dependency
instead. Specific flags are appended to common flags, rather than
passed as arguments to a new "make" sub-process.

So, basically:

 foo-common:
 	$(MAKE) -C foo_dir [A=a B=B]

 foo:
 	$(MAKE) foo-common [C=c]

is turned into:

 FOO_COMMON_FLAGS ?= A=a B=b
 foo-common:
 	$(MAKE) -C foo_dir $(FOO_COMMON_FLAGS)

 FOO_COMMON_FLAGS += C=c
 foo: foo-common

At the same time this allows foo: to override flags, for instance
set A=aa in the above example (prior to this, A=a would have had a
higher priority).

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Pascal Brand <pascal.brand@st.com>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>

Signed-off-by: Pascal Brand <pascal.brand@st.com>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>

This is the first patch of a serie that show how makefile for specific
platform support may use common rules. comon.mk is introduced. It contains:
- common variable definitions, such as the compilers
- common git to use and path (typically the OP-TEE ones)
- common macros (CCACHE, and others to come).

Signed-off-by: Pascal Brand <pascal.brand@st.com>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>

Adds an Expect script to launch QEMU, run xtest and return a pass/fail
status. This makes it even easier to launch non-regression tests and
possibly integrate into a CI loop.

The script may be invoked through 'make check' or 'make check-only'.
The former considers dependencies, while the latter just runs the script.

The output of serial ports 0 and 1 are saved to serial0.log and
serial1.log, respectively.

Expect may be installed with 'sudo apt-get install expect' on Debian/
Ubuntu distributions.

Sample output:

 $ make -j9 check
 <snip>
 expect qemu-check.exp -- \
         --bios /home/jerome/work/optee_repo/out/bios-qemu/bios.bin
 Starting QEMU... done, guest is booted.
 Loading OP-TEE driver and tee-supplicant... done.
 Running: xtest...
 ##########################################<snip>
 Status: PASS (404 test cases)

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>