Always try to enable FF-A in the kernel. The kernel tries to probe for
FF-A, but only enables it if other components supports it.

Acked-by: Jerome Forissier <jerome@forissier.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Brief description of changes:
- Enable Qemu kernel configs for Trusted Keys.
- Add keyutils buildroot package.
- Enable Trusted Keys early TA in OP-TEE.
- Create a new test script (trusted-keys.exp) which is invoked as part
  of "make check" for automated Trusted Keys tests.

Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Acked-by: Jerome Forissier <jerome@forissier.org>

Since Linux commit dcb3b06d9c34 ("tee: optee: replace might_sleep with
cond_resched") in v5.11, setting CONFIG_PREEMPT=y in kconfigs/qemu.conf
is not needed anymore. It was a workaround for the missing call to
cond_resched() in the TEE driver. At that time, might_sleep() together
with preemption enabled allowed to get rid of some RCU warning messages
when running long operations in secure world such as large key generation
(test case: "xtest -l 1 4007_rsa"). With cond_resched() the preemption
settings do not matter anymore.

As a result of this change, QEMUv8 is unmodified (CONFIG_PREEMPT=y is
set by default in the kernel's arch/arm64/configs/defconfig), but 32-bit
QEMU now has CONFIG_PREEMPT disabled. Both platforms are tested and
4007_rsa runs as expected with no warning.

Signed-off-by: Jerome Forissier <jerome@forissier.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Acked-by: Etienne Carriere <etienne.carriere@linaro.org>

ION has been deprecated in the upstream Linux kernel since v5.11 [1].
Consequently, it was removed from the linaro-swg/linux branch optee
shortly after the release 3.13.0 of OP-TEE. Remove the corresponding
kernel configuration flags which are now unused.

Link: [1] https://github.com/torvalds/linux/commit/e722a295cf493388dae474745d30e91e1a2ec549


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

Commit f1ca9916 ("qemu: disable kernel CONFIG_JFFS2_FS") was a
workaround to an issue that does not seem to be reproducible anymore.
That was more than five years ago, and the root cause was never clearly
identified. Many things have changed since.
I did not meet any problem running "make check" with CONFIG_JFFS2_FS=y
on my local development machine (it is enabled by default in the Linux
kernel's arch/arm/configs/qemu_defconfig). Therefore it seems safe to
remove this CONFIG_JFFS2_FS=n.

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

Enables the kernel gdb python helper scripts to be built
that allows easier introspection of kernel data structures.
e.g. lx-dmesg extracts dmesg.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Acked-by: Jerome Forissier <jerome@forissier.org>

With 6edcf9dc2e1a ("efi/libstub: EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER
should not default to yes") (included in Linux v5.11) we need to set
EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y explicitly in order to enable
initrd support.

Acked-by: Jerome Forissier <jerome@forissier.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Adds CONFIG_HW_RANDOM_VIRTIO so the guest gets entropy from the host

Signed-off-by: Albert Schwarzkopf <githubc@quitesimple.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

ION_DUMMY is an old, deprecated configuration flag in the ION driver
that is now useless. Therefore, remove the useless CONFIG_ION_DUMMY=y.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Suggested-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Etienne Carriere <etienne.carriere@linaro.org>

Latest changes in ION requires CONFIG_ION_UNMAPPED_HEAP to configure
the support for unmapped heap.

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

The first 1Mbyte of the secure RAM is reserved to the ARM-TF on
the qemu ARMv8 setup. To support both QEMU ARMv7 and QEMU ARMv8
with the same kernel configuration that includes a static definition
of the SDP test memory pool, move the SDP pool to the end of the
QEMU secure RAM. SDP pool size is increased to 4MByte.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>

Enable Linux kernel ION, ION_DUMMY.
Statically define an 3MByte unmapped heap in ION dummy driver. This
complies with the OP-TEE layout for qemu_virt and qemu_armv8 platforms.

CONFIG_ION has dependencies on CONFIG_ANDROID. This changes enables
ION from the Android staging drivers but without enabling other
staged Android features (TIMED_OUTPUT and LOW_MEMORY_KILLER).

Signed-off-by: Etienne Carriere <etienne.carriere@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)

The line disabling CONFIG_JFFS2_FS was removed by mistake by commit
a6d968c8 ("qemu: generic driver"). Restore it to fix the Travis
tests.

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

Build support for generic driver on QEMU.

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)