8dd06ef34b6e2f41b29fbf5fc1663780f2524285 - Merge branch 'next' into for-linus

Sat, 06 Jun 2020 19:45:37 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.8 merge window. List of files: /linux/drivers/tee/amdtee/Makefile

0fdc50dfab47d525b71a9f0d8310746cdc0c09c5 - Merge tag 'v5.6' into next

Tue, 12 May 2020 21:18:21 +0200

Merge tag 'v5.6' into nextSync up with mainline to get device tree and other changes. List of files: /linux/drivers/tee/amdtee/Makefile

c9f289701540baeef9ac7c9977d67a7259f404db - Merge branch 'for-5.7/appleir' into for-linus

Wed, 01 Apr 2020 12:26:12 +0200

Merge branch 'for-5.7/appleir' into for-linus- small code cleanups in hid-appleir from Lucas Tanure List of files: /linux/drivers/tee/amdtee/Makefile

a4654e9bde4ecedb4921e6c8fe2088114bdff1b3 - Merge branch 'x86/kdump' into locking/kcsan, to resolve conflicts

Sat, 21 Mar 2020 09:23:40 +0100

Merge branch 'x86/kdump' into locking/kcsan, to resolve conflictsConflicts: arch/x86/purgatory/MakefileSigned-off-by: Ingo Molnar List of files: /linux/drivers/tee/amdtee/Makefile

ff36e78fdb251b9fa65028554689806961e011eb - Merge drm/drm-next into drm-intel-next-queued

Tue, 25 Feb 2020 18:29:58 +0100

Merge drm/drm-next into drm-intel-next-queuedSome DSI and VBT pending patches from Hans will applycleanly and with less ugly conflicts if they are rebuilton top of other patches that recently landed on drm-next.Reference: https://patchwork.freedesktop.org/series/70952/Cc: Hans de Goede Signed-off-by: Rodrigo Vivi

546121b65f47384e11ec1fa2e55449fc9f4846b2 - Merge tag 'v5.6-rc3' into sched/core, to pick up fixes and dependent patches

Mon, 24 Feb 2020 11:36:09 +0100

Merge tag 'v5.6-rc3' into sched/core, to pick up fixes and dependent patchesSigned-off-by: Ingo Molnar List of files: /linux/drivers/tee/amdtee/Makefile

28f2aff1caa4997f58ca31179cad1b4a84a62827 - Merge v5.6-rc2 into drm-misc-next

Mon, 17 Feb 2020 10:34:34 +0100

Merge v5.6-rc2 into drm-misc-nextLyude needs some patches in 5.6-rc2 and we didn't bring drm-misc-nextforward yet, so it looks like a good occasion.Signed-off-by: Maxime Ripard List of files: /linux/drivers/tee/amdtee/Makefile

74c12ee02af109adcde36ec184fa59c0afb0edaa - Merge v5.6-rc1 into drm-misc-fixes

Wed, 12 Feb 2020 14:08:59 +0100

Merge v5.6-rc1 into drm-misc-fixesWe're based on v5.6, need v5.6-rc1 at least. :)Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/tee/amdtee/Makefile

fdff7c21ea00787e3f70a1a00b40b88eb998c6ad - Merge branch 'linus' into perf/urgent, to synchronize with upstream

Wed, 05 Feb 2020 08:44:22 +0100

Merge branch 'linus' into perf/urgent, to synchronize with upstreamSigned-off-by: Ingo Molnar List of files: /linux/drivers/tee/amdtee/Makefile

a78208e2436963d0b2c7d186277d6e1a9755029a - Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Wed, 29 Jan 2020 00:38:56 +0100

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Pull crypto updates from Herbert Xu: "API: - Removed CRYPTO_TFM_RES flags - Extended spawn grabbing to all algorithm types - Moved hash descsize verification into API code Algorithms: - Fixed recursive pcrypt dead-lock - Added new 32 and 64-bit generic versions of poly1305 - Added cryptogams implementation of x86/poly1305 Drivers: - Added support for i.MX8M Mini in caam - Added support for i.MX8M Nano in caam - Added support for i.MX8M Plus in caam - Added support for A33 variant of SS in sun4i-ss - Added TEE support for Raven Ridge in ccp - Added in-kernel API to submit TEE commands in ccp - Added AMD-TEE driver - Added support for BCM2711 in iproc-rng200 - Added support for AES256-GCM based ciphers for chtls - Added aead support on SEC2 in hisilicon"* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (244 commits) crypto: arm/chacha - fix build failured when kernel mode NEON is disabled crypto: caam - add support for i.MX8M Plus crypto: x86/poly1305 - emit does base conversion itself crypto: hisilicon - fix spelling mistake "disgest" -> "digest" crypto: chacha20poly1305 - add back missing test vectors and test chunking crypto: x86/poly1305 - fix .gitignore typo tee: fix memory allocation failure checks on drv_data and amdtee crypto: ccree - erase unneeded inline funcs crypto: ccree - make cc_pm_put_suspend() void crypto: ccree - split overloaded usage of irq field crypto: ccree - fix PM race condition crypto: ccree - fix FDE descriptor sequence crypto: ccree - cc_do_send_request() is void func crypto: ccree - fix pm wrongful error reporting crypto: ccree - turn errors to debug msgs crypto: ccree - fix AEAD decrypt auth fail crypto: ccree - fix typo in comment crypto: ccree - fix typos in error msgs crypto: atmel-{aes,sha,tdes} - Retire crypto_platform_data crypto: x86/sha - Eliminate casts on asm implementations ... List of files: /linux/drivers/tee/amdtee/Makefile

757cc3e9ff1d72d014096399d6e2bf03974d9da1 - tee: add AMD-TEE driver

Fri, 27 Dec 2019 06:24:01 +0100

tee: add AMD-TEE driverAdds AMD-TEE driver.* targets AMD APUs which has AMD Secure Processor with software-based Trusted Execution Environment (TEE) support* registers with TEE subsystem* defines tee_driver_ops function callbacks* kernel allocated memory is used as shared memory between normal world and secure world.* acts as REE (Rich Execution Environment) communication agent, which uses the services of AMD Secure Processor driver to submit commands for processing in TEE environmentCc: Ard Biesheuvel Cc: Tom Lendacky Acked-by: Jens Wiklander Co-developed-by: Devaraj Rangasamy Signed-off-by: Devaraj Rangasamy Signed-off-by: Rijo Thomas Reviewed-by: Gary R Hook Signed-off-by: Herbert Xu List of files: /linux/drivers/tee/amdtee/Makefile

Changes in Makefile