From patchwork Tue Aug 31 07:24:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 12466655 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=-22.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, 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 03F79C432BE for ; Tue, 31 Aug 2021 07:30:36 +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 C692860F91 for ; Tue, 31 Aug 2021 07:30:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C692860F91 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=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=m8Di/HB56j4a9w1EOyLr6/4S9ZQCLBG96d75eQa6rCU=; b=0MvM9N5zK2RzYd C24jWOabpGHJHyYWUZt+uWIDLpHTWC9UaLDID6EeDNsh67FWLMKE4Dbo5817vwR2ywoWW1k1KVm7n Mm2IOyzyMd+JGLOzuMWmteESXZ7EJX4Luji0cIWHVKLC07uPEN3dZDu1vK1YDwipZ6csRFatAPwUT YCOuHR5jxKXkPN2RasCMU7yeyhD+mxsxV+zzIkrCXPyfdY/Ujd22uJjnJvSflXtrhY9P+D/9HarV5 ORHw2PIvxeyOzyH0OHNHeyc2UlugY43jd9VzNfnDZf7TYR5T7+fFkKN9GrCSg5j/g0Rn2VlHo6TOs ofEhU+5OalQm6u9s865g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mKyBl-001dsW-EN; Tue, 31 Aug 2021 07:28:10 +0000 Received: from mail-lj1-x22d.google.com ([2a00:1450:4864:20::22d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mKy8q-001cTt-Vq for linux-arm-kernel@lists.infradead.org; Tue, 31 Aug 2021 07:25:13 +0000 Received: by mail-lj1-x22d.google.com with SMTP id h1so30129363ljl.9 for ; Tue, 31 Aug 2021 00:25: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=Szuseb+8y4B8HnmLbCqM5t+Csn1qufFrXzTDJ0QV5ns=; b=yLItzKXS6/yclfvZWYzwnl13GcDAf444bimgcg3SoxsijtV3paACBp7Y+PFdUwK5tn wREJ81/dlbK8pNsUHuIDdNhi0eKyD6aYSCW0Npv3r2ZBk1Oick/s9vhtKqWsTjoLAA4w 0ZyGRotz5HCFnCjZ8lvLJ28pXN37f8LijIk2qtNTFeZPd+qnNCDf+GhbYEwUvcsxpRg5 2vunoXJxfb5vkuGgBJg88WLbHje0s5CWoz58ctsHHTamX4s1YKrr1cA4N1Rw90L3A7D1 ZhCth5BMdv/P3SSHGMRREY2HbM8aE1AGnl8b+HcXB1bF3E5T8ej6HRfJVuv4kOG0bzOU wcyg== 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=Szuseb+8y4B8HnmLbCqM5t+Csn1qufFrXzTDJ0QV5ns=; b=Ua0KpOAQ3GyALV7t/fUBZqNz6A7fAJnNPET+5Cu2y5tbeAwOxA6EvDFSou05/wC2or Wkw0d7NMTDJ4V+D/cEwoUZL30vtp7yhBC5ZWDqGoTL8TwC+pAitvMgCX2nVV2cCCwDt1 2QsHmYouIJOJFvHK8tQN62N/DpHIXSw7rZ5ZxtOj6SasMmw9wngM6FPq/VIawHw/UGFZ 7bF2xQS05MWEenKkpj4v4Dqg/F/lzZ5bsa/6rUvsFD4gmrQaGq9XzwxXJgsG9qPdgmeJ HBvOCDc2IKXhfvIXs0A6o32k8S4XgLnSq+HjEOA8q7e/6hGUqaZIqoWP0/7hQ6eoalR5 TSiA== X-Gm-Message-State: AOAM532YVVPvlXZkrkvbCQ4dHhbZPWtyL+NbsWX0+gMq+QHSeU5k5lZx U2Beln87WWSotey9JWzwvSrP0yZuGt+/LQ== X-Google-Smtp-Source: ABdhPJyVQ/bNmWX4fQQ/4z2UJlDx7ZfeLXkc/Aqi05MXZy749WLfsQeTw++v3Bm6pebZWR4QNblbhA== X-Received: by 2002:a2e:a234:: with SMTP id i20mr23873303ljm.38.1630394705709; Tue, 31 Aug 2021 00:25:05 -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 c10sm1642569lfv.246.2021.08.31.00.25.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Aug 2021 00:25:05 -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 v5 0/5] Add FF-A support in OP-TEE driver Date: Tue, 31 Aug 2021 09:24:07 +0200 Message-Id: <20210831072412.887565-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-20210831_002509_099554_F9C5A285 X-CRM114-Status: GOOD ( 23.62 ) 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_v5 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 v4->v5: - Rebased on v5.14, tricky conflicts primarily between "optee: isolate smc abi" and mostly 376e4199e327 "tee: Correct inappropriate usage of TEE_SHM_DMA_BUF flag" but also with the other kexec fixes that went into v5.14-rc5. - Addressing comments from Sumit and applying Reviewed-by: Sumit Garg on "optee: isolate smc abi" - Addressing comments from Sumit and applying Acked-by: Sumit Garg on "optee: add FF-A support" v3->v4: - Made a bit more RPC code common between the SMC and FF-A ABIs as requested by Sumit. - Replaced module_platform_driver() with module_init()/module_exit() as described in the commit "optee: isolate smc abi". - Applied Sumit's R-B for the commits "tee: add sec_world_id to struct tee_shm", "optee: simplify optee_release()", and "optee: refactor driver with internal callbacks" 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 | 445 ++-------- drivers/tee/optee/core.c | 719 ++------------- drivers/tee/optee/ffa_abi.c | 907 +++++++++++++++++++ drivers/tee/optee/optee_ffa.h | 153 ++++ drivers/tee/optee/optee_msg.h | 27 +- drivers/tee/optee/optee_private.h | 163 +++- drivers/tee/optee/rpc.c | 237 +---- drivers/tee/optee/shm_pool.c | 101 --- drivers/tee/optee/shm_pool.h | 14 - drivers/tee/optee/smc_abi.c | 1360 +++++++++++++++++++++++++++++ include/linux/tee_drv.h | 7 +- 12 files changed, 2732 insertions(+), 1408 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: Sudeep Holla