From patchwork Thu Jul 22 12:17:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 12394091 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 178FFC63793 for ; Thu, 22 Jul 2021 13:16:32 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D101261287 for ; Thu, 22 Jul 2021 13:16:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D101261287 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=B8Rb42BDqThjwPs38pPHrUXocSNxyM2M7WvcCAQBSFw=; b=DVV+NR3/fmeBXI rZ8ro91ssEm5R8uBdUeRl6p4z62KXLHchPQgLI4qGh9sO/zfkknrTuRuMy6xrHhaGPJCOGJXuflpN qu/txXJ9pvtky+trD+rI/s7QHJGCWBl8Drglbu7an8L9NsrqFt0Qm+GS8MysJOlsrGRRMYb+QAt4E PfT31x23mRIBz5WZ9Y5p1XzzXTT8kyRpLOQ8iTAZJcuwBqgQJbRbj02JHMn6WWwzwV3B8ATm+LZIp K6fMcz5pO4l4yd9xFEOwZvJhxXcVU4EaaWS8mIKUmg3rF2ZmOMiWQV1Vyybuwm1oKp/eoMTUON2oF 6/6FIKLD1z5cK6q13LlA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6YWF-001cB0-Mo; Thu, 22 Jul 2021 13:13:45 +0000 Received: from mail-lf1-x12d.google.com ([2a00:1450:4864:20::12d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6XeU-001T75-00 for linux-arm-kernel@lists.infradead.org; Thu, 22 Jul 2021 12:18:14 +0000 Received: by mail-lf1-x12d.google.com with SMTP id 8so8164103lfp.9 for ; Thu, 22 Jul 2021 05:18:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=UtOWa2lL7DU7+uz9y77s+2dIz9u9H/PKNPEgTCXPwT4=; b=FuFu3y+Cme1GCFNZiFBIv37H2HS/O/Cy1DUZmxv7gbVtxUxjDIVAHbyZUdWm4qmiWY a0emq6HIL6CrntNYbiOhubaM/T+3zctQRWTKBz276xz6hlclOdYRulERamlH3wGIYFOY lrglYhNTBkPmRHtcn2vIVrukXodl83js8pujNoAXpV+xenJKtV63LAIQDn8cf0PCKJx/ KGEaIHnTo8+fL8MFOeJSQaO1Ril53ef3lKNzfQD0ClgT8DA9AwGcwvlJfBd75ckalTvV pDu40cG/hevkIRyfuzIUivgcmFne1zr7DU7rHx2LLQaCKMwT0i0GovgXAI97xBlJXd4C Wlvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=UtOWa2lL7DU7+uz9y77s+2dIz9u9H/PKNPEgTCXPwT4=; b=euH5+vbxOHeaZ2tykWD3z9nJn/Mm23kcfdvndPZYVgCUauXtdJ/6WCRIX6jcRDaDph NnS9ghh8nPVykP5+scoYdlB6jXUkg/yKTAP4B0kMZl/G/VDakg3mrS1tcgiJ+j9o+NmE Cs5xDmFnuqU6ieqL+4Y3iAmtZGqgTWwvJK6NkBC97qSvPgdemFefqwhHjhezUfV11MKL GvZm17GsdlbAYi7UxMAKW268hc0CU2E0AXugEOHe4RF2TXgFbDI14SlHK1H3D8DjqD6B zv8yJJ0ufCqe2PWOU2LuR9kLPKG09y7lv92I4R8uS1R8EEeNcZp9h1m1E/7/YZ5CHYOt Kkag== X-Gm-Message-State: AOAM531SCcvEoqoeD9u8Lk8+4ragYb1PXb5Na8CkPJmNxelEdhr2tPaD K4s9VLQwNiM3HaWwqUuNf+oLwg== X-Google-Smtp-Source: ABdhPJzAuK8mnM/roxQJVP/OoPkjfnPfIN0iaMP4V5osxSOh0fVjK8sVGS6gosrD0e44IU/RBlyigQ== X-Received: by 2002:a19:a403:: with SMTP id q3mr29802876lfc.287.1626956286415; Thu, 22 Jul 2021 05:18:06 -0700 (PDT) Received: from jade.urgonet (h-94-254-48-165.A175.priv.bahnhof.se. [94.254.48.165]) by smtp.gmail.com with ESMTPSA id b41sm845090ljr.67.2021.07.22.05.18.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 05:18:06 -0700 (PDT) From: Jens Wiklander To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, op-tee@lists.trustedfirmware.org Cc: Sumit Garg , Sudeep Holla , Marc Bonnici , Jerome Forissier , sughosh.ganu@linaro.org, Jens Wiklander Subject: [PATCH v3 0/5] Add FF-A support in OP-TEE driver Date: Thu, 22 Jul 2021 14:17:52 +0200 Message-Id: <20210722121757.1944658-1-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210722_051810_117299_CB2921C3 X-CRM114-Status: GOOD ( 21.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, This adds supports for the OP-TEE driver to communicate with secure world using FF-A [1] as transport. There is one change to the TEE subsystem with "tee: add sec_world_id to struct tee_shm" to add support for holding globally unique handle assigned by the FF-A. This is a field that I believe could useful for the AMDTEE driver too. For communication the OP-TEE message protocol is still used, but with a new type of memory reference, struct optee_msg_param_fmem, to carry the information needed by FF-A. The OP-TEE driver is refactored internally with to sets of callbacks, one for the old SMC based communication and another set with FF-A as transport. The functions relating to the SMC based ABI are moved to smc_abi.c while the FF-A based ABI is added in a ffa_abi.c. There is also a difference in how the drivers are instantiated. With the SMC based transport we have a platform driver, module_platform_driver(), today which we're keeping as is for this configuration. In a FF-A system we have a FF-A driver, module_ffa_driver(), instead. The OP-TEE driver can be compiled for both targets at the same time and it's up to runtime configuration (device tree or ACPI) to decide how it's initialized. Note that it's only the old SMC based driver instance that need device tree or ACPI to initialize. The FF-A based driver relies on the FF-A bus instead. This can be tested QEMU The repo for SPMC at S-EL1 retrieved by repo init -u https://github.com/jenswi-linaro/manifest.git -m qemu_v8.xml -b ffav4_spmc repo sync # Then checkout the branch optee_ffa_v3 from # git://git.linaro.org/people/jens.wiklander/linux-tee.git # in the linux directory To build do: cd build make toolchains make all To boot: make run-only Test with xtest, perhaps only with the command "xtest 1004" in case you're not interested in too many tests. Thanks, Jens [1] https://developer.arm.com/documentation/den0077/latest v2->v3: - Rebased on 5.14-rc2 which now have the FF-A patches merged - Fixed a couple bugs in optee_shm_register() and optee_shm_unregister() which where introduced in "optee: refactor driver with internal callbacks" in previous the version. - Separated SMC ABI specifics into smc_abi.c to keep it separated from the FF-A ABI functions as requested by Sumit. - Added the FF-A specifics in ffa_abi.c - Provided an implementation for optee_ffa_remove() v1->v2: - Rebased to the FF-A v7 patch - Fixed a couple of reports from kernel test robot Jens Wiklander (5): tee: add sec_world_id to struct tee_shm optee: simplify optee_release() optee: refactor driver with internal callbacks optee: isolate smc abi optee: add FF-A support drivers/tee/optee/Makefile | 7 +- drivers/tee/optee/call.c | 415 ++------- drivers/tee/optee/core.c | 673 ++------------- drivers/tee/optee/ffa_abi.c | 910 ++++++++++++++++++++ drivers/tee/optee/optee_ffa.h | 153 ++++ drivers/tee/optee/optee_msg.h | 27 +- drivers/tee/optee/optee_private.h | 155 +++- drivers/tee/optee/rpc.c | 270 +----- drivers/tee/optee/shm_pool.c | 89 -- drivers/tee/optee/shm_pool.h | 14 - drivers/tee/optee/smc_abi.c | 1301 +++++++++++++++++++++++++++++ include/linux/tee_drv.h | 7 +- 12 files changed, 2650 insertions(+), 1371 deletions(-) create mode 100644 drivers/tee/optee/ffa_abi.c create mode 100644 drivers/tee/optee/optee_ffa.h delete mode 100644 drivers/tee/optee/shm_pool.c delete mode 100644 drivers/tee/optee/shm_pool.h create mode 100644 drivers/tee/optee/smc_abi.c Tested-by: Sumit Garg