From patchwork Wed Oct 6 07:08:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 12538747 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A374EC433EF for ; Wed, 6 Oct 2021 07:11:31 +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 75B3B61372 for ; Wed, 6 Oct 2021 07:11:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 75B3B61372 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=G/46dSYBGQVkIfmnPVSTSDkzgbczemfGNEN74tuQClk=; b=gaDDCqoswHn5pP hjPAJyU4c1Z0+PYETWJyGIqdpmEA846Mfa9/SO97isUPDHZDNGltrUAI3LffW6WTA9tRxvzDSBEcS OR/DibK1sktH6SKWZ7Q9XikusHxbsVNM+TW0JiTQ43O7DxKPgDFOUty6zPdu2IquXYMQP9tH6OrT4 Nlm1loJTHwC1b9bd3TS4IwGkH3x6M+DRuUpibJuM7h0XL/Gid7+zZAdNOYXBRCaETOBDqCJcNXWTU qhQZxUkYqg3/ovIjWv0UPGq7rWm5SWmt67h4MRL/eWq1NIWT7HUWLvG2Xe1nl+YUL/e2Jnnw5dUnM D2XhZDy4XRf+LXWwQEnQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mY13O-00D8Iu-DY; Wed, 06 Oct 2021 07:09:26 +0000 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mY139-00D8Ew-2R for linux-arm-kernel@lists.infradead.org; Wed, 06 Oct 2021 07:09:12 +0000 Received: by mail-lf1-x132.google.com with SMTP id t9so6356388lfd.1 for ; Wed, 06 Oct 2021 00:09:09 -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=tHWsVDacCHE7fgjlzD98Sz7Ok2UoY5exOGKzNdgYxpU=; b=evAMNNcoyAbp+p83vXfxIaj3+zBeYiQZGr6POh08smOh6c7zEaKbIwICaQ2+yX2A9j EkBSYPmiFAfQ+qc5sGcFx7XNrVTF6S9WCXVu/hJlwOTNRTIjlbt8KyCvWEnYzLKKWmrK aD9Dj181mFu/AtU8dPClNzGJlz3cPo7/Fn/v5Qz4xP2f0tiDJSo+k8yRzcX6uGX21Nt4 GONKcmE3QkBreXjkqXDZgZ4JbtsD1cDlNiwk8Iec0tpgG2dXg7UFwkj1ddhNAx1fGHI4 cYJpdfVd7/WBg9dAHWPlkbX0TeX1OJoerVkQCVFu64lpDhFIAVMVXPa/iwPXtwW2Hjlo dLRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tHWsVDacCHE7fgjlzD98Sz7Ok2UoY5exOGKzNdgYxpU=; b=JE81uOnS2M5sTHTkmFDGfCBCBFHMDJBBxrx0V7lVuMpKuMheTLS8PnW8nxtzZmrmAp /Uvj+o7K4SjwTJ15BWZbp4RUxnrKqsOWzmPf6sc6WKEidamMZt35TA6cmFpob30JIZ5L bUF6+kVEmqDrp6p7JSososkJ6xAQk02ea9fIWGr2GbDvID3ObHcJky26j8K0LnsRUylc u2emYd4w50htlCgZZCLgsVqIZpdkJTtEzAfsKkliVay9QtLl0tbRhbT9EUMGyAX2HZob HetyoxHrF64r+l51wdOHzRyhWCvLXO2oFmDkrQHYbsdTvD19bgH0MyrIOBuCsgCbI67V 5ffw== X-Gm-Message-State: AOAM53115fOVvwTkTyWhPkaZ44xLKe/81gh76GCscKDvlraUoDMXkG8d nHN7cxeImMiV1oldCnLt2y39jH792/L8zQ== X-Google-Smtp-Source: ABdhPJwo3ibQLHf9/NhlGvXKmzR6QJS3wD20Z6aDuxjXQIqe6vXO3yPeHZz9wNUW2d/7XTHmsz5KDg== X-Received: by 2002:a05:6512:2e8:: with SMTP id m8mr7792796lfq.172.1633504148289; Wed, 06 Oct 2021 00:09:08 -0700 (PDT) Received: from jade.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id u15sm2381032lfl.20.2021.10.06.00.09.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Oct 2021 00:09:08 -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 v6 0/5] Add FF-A support in OP-TEE driver Date: Wed, 6 Oct 2021 09:08:57 +0200 Message-Id: <20211006070902.2531311-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-20211006_000911_175289_37E99A81 X-CRM114-Status: GOOD ( 26.77 ) 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. These patches are also available at https://git.linaro.org/people/jens.wiklander/linux-tee.git/log/?h=optee_ffa_v6 Note that there's three patches there not included in this patchset "tee/optee/shm_pool: fix application of sizeof to pointer", "firmware: arm_ffa: Fix __ffa_devices_unregister" and "firmware: arm_ffa: Add missing remove callback to ffa_bus_type" already have or are about to be sent to arm-soc with separate pull requests. 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_v6 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 v5->v6: - Rebased on v5.15-rc2 - Addressing comments from Sudeep Holla to work with ARM_FFA_TRANSPORT=m - Fixing a couple of warnings in "optee: isolate smc abi" reported by kernel test robot - Adding the fix from "tee/optee/shm_pool: fix application of sizeof to pointer" into "optee: isolate smc abi" since the function code has been moved to another file. 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 | 5 +- drivers/tee/optee/call.c | 445 ++-------- drivers/tee/optee/core.c | 719 ++------------- drivers/tee/optee/ffa_abi.c | 911 +++++++++++++++++++ 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 | 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, 2726 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