From patchwork Thu Aug 19 11:06:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 12446849 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=-17.5 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,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 AF70BC4338F for ; Thu, 19 Aug 2021 11:10:01 +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 73DA1610CF for ; Thu, 19 Aug 2021 11:10:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 73DA1610CF 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=0kGv/zb/OX3mcItCoeJvwhmhWmK+iw1+BgirfyvwiA4=; b=R+9KAJz0tu+Shq xrKaO5+ivgI+FfkQ5PBogdR9LNkeNwlvRGxk66wQy2AMNoGuGDRw+wBAnpqPHtC9iXnzG8uQLCNc5 6g8nDyX0XeNIgQD9xgcKJw78Jkk7TP2ohfVEHjcQoAp9rRyP4lBNd06hhxfRt4mlGrRgmgvC8niJE eKNHlGytNWdn/hTg/X9iTwInZxF9tsuBNYu+IHzMgMFLj+1mza5/ZUk9qlyoPUQuCDq0LdZjSqrlh oKCFgLyZRGAWJE5TyC2G6iicHz2ZBswifgBpAjSb2nyEhXYhYc+ozAZq81B9k8A468ESgOHqBKESC Qe88QkRtGEVZvGpGOddA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mGftU-0085N8-5L; Thu, 19 Aug 2021 11:07:32 +0000 Received: from mail-lj1-x229.google.com ([2a00:1450:4864:20::229]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mGft7-0085FG-Ap for linux-arm-kernel@lists.infradead.org; Thu, 19 Aug 2021 11:07:13 +0000 Received: by mail-lj1-x229.google.com with SMTP id h9so10841909ljq.8 for ; Thu, 19 Aug 2021 04:07: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=yie52tZg+WqxHuYvBvKGgC8iU9Gb61t4ktqHyTP1FX8=; b=ZCq6Q3wGJTZgd7jKcUT62NlOPMkQM5DvJ4Ocenu9Df6lDUsQ7xiIxo/GN7vTT0xbYk xEAG/OHt/1Jb0U+EWC+sxIJTVHBiHt3hscm75aBXS47oBDstss5g0byzKyMPtDs2m7Lb ZSRWn/pY5rH4wWLxODdSygJmlvinpr5zNuBFlDIG6dZj91k/4iWVe1L88TnMtjEgeEtP sPeKmOb/JhCYFIdZjMpkCMd8/AA/1D43BDX1aZxYIlA1Z7pcuMZL7YXGNi1BB5p9UGkt KIbPliGSgE/lYysRkvd9aamZfKSPErQbXMbSfd5L7XGdgNeOyU/Lb95y0LNTu5Wc1kkS CniA== 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=yie52tZg+WqxHuYvBvKGgC8iU9Gb61t4ktqHyTP1FX8=; b=mUpwD2n134a+1IpcZ0SrzJLH78kHYcBBKz1gJrlqtFHV8nPZ5GxwOI/bMFVdfh3eB7 HFzeMKcBZgkKsRAysoBXGRMq3HhV9ganX60DtRywUVOVpu0gB9y2UoqfFWhxT97nPzuu BuLQgr6TZJuD+gzn6BMPVlSos/An0FSc0sCVoqte163kfWnLdILqveNC0/JPukSVpB74 HKrThx8ogsi/XFffsU5pvHFDxgMYcYDQPe8U617/JCryBsxSLTO9Was0Xf8neKjgcUoM FEmut0ZCal9J7l4vxLvo1dduD2WC04QqCgdU+xsBCYqGxoO+pnZtztOZ9ou9udW5pSSe 1Zsg== X-Gm-Message-State: AOAM532S/WM3azsiA++rRW8o6e68/bgOn6J9wF/W77D0ac2q+rqGccND ivyU7lzMbKI/4RI5tsf+OXaRMA== X-Google-Smtp-Source: ABdhPJwu7laeWUKEpnEtwP3OfkEcYB1RqDLSEM45nF5toEDrqeA9cJYNPu+CBTwNvh0wbE/DwAv+lw== X-Received: by 2002:a2e:a288:: with SMTP id k8mr11447219lja.315.1629371226502; Thu, 19 Aug 2021 04:07: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 l19sm261131ljj.36.2021.08.19.04.07.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 04:07: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 v4 0/5] Add FF-A support in OP-TEE driver Date: Thu, 19 Aug 2021 13:06:50 +0200 Message-Id: <20210819110655.739318-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-20210819_040709_469656_51FDB4C4 X-CRM114-Status: GOOD ( 22.83 ) 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_v4 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 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 | 415 ++------- drivers/tee/optee/core.c | 685 ++------------- 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 | 162 +++- drivers/tee/optee/rpc.c | 236 +----- drivers/tee/optee/shm_pool.c | 89 -- drivers/tee/optee/shm_pool.h | 14 - drivers/tee/optee/smc_abi.c | 1299 +++++++++++++++++++++++++++++ include/linux/tee_drv.h | 7 +- 12 files changed, 2665 insertions(+), 1336 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