From patchwork Sun Mar 3 15:01:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 13579817 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 75C32C54E49 for ; Sun, 3 Mar 2024 15:01:44 +0000 (UTC) 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=Fm7g0C4zXxtsPFQBErBxK5jjsnZu8MT7JcoflejpXOI=; b=zSgQckkLhfdckK xobTDXbuDpCMkJ4qlqpRixL/CkxgNPfAsz8GNPf8qsX9dciC9ls/BVrk/Xrp2GYI0ETYHlfxxLC8H IdKjmz0PUQ/ijmJb6PpK2A69Pqg3xnKTEQzUrUFnh9Q8UOLvpuGD7YvrTQyTt6FjwXPJBE98l9WWK V2OYPsAlt16GTeAra43+qVg/r51Hq5Nkci9xtHQiF2hUhbc8jKSO+LsyRqiKqZMY8Gg0fOETMoKBj Y0Q8YxpaGKIKYEg4MU06yi6j7yT7jXboDFZ3/ZCgJ3SvhxwXGc0+KuHmf7Q3XBn+84EuXU98yKNc5 m1iK/UwM5LJwi1JpSKKg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rgnLE-000000068EG-3LOa; Sun, 03 Mar 2024 15:01:28 +0000 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rgnLB-000000068CC-1ohi for linux-arm-kernel@lists.infradead.org; Sun, 03 Mar 2024 15:01:27 +0000 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-5131c0691feso4500672e87.1 for ; Sun, 03 Mar 2024 07:01:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1709478083; x=1710082883; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=eYW9KQXf8V+PKlETqcpcfZNaabV0OKD9pMan6c/GyBU=; b=ZElvelvTW4zQEvnt6WXx/bqIgIUA+2FRtCeGw0dbm2fS5PEoO4zGMn3OhjLBhvI7h8 MckqWMtGMbnu7sUfevqJ8FjDidEYYu+RlXJ7KRq6gdo0BA5HMyItoIEnHH/nEhoZhh6p DjdoJxDNeS7aQgrgWSKF/OafMiwORdQCIt/SAOx7UWnMRw5W73ZduszC11II0crPLn5c OqeyBa3QLUw1xySrseNlZKzdedGjF7xI3/z8J/jT3cPJWfMA1n+l0EFCCRlBoKstYTzw Fwr1xY4YLgdfDSx/0/zc+nTAeMKpHpacS+hE6cmMmTON/1jouIqds+cWA4Dq7EGHxo9F nXtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709478083; x=1710082883; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=eYW9KQXf8V+PKlETqcpcfZNaabV0OKD9pMan6c/GyBU=; b=i72y3Nl5hE6ZqXZQNPLEpjZWpVrN6XpxNYEGFDu8ivHMjT/ti67eMhR+JyxwHkx5oc mDSX4fOkACNsvn5+naQ6vt6d6mUmZSgm1LEbNgHUEpUE4EqDSJiq6JC7doYLzCTCtX9l SN2Ch5Xpu3ZEEInGD/4w3KNjos+1dmuxpgnPI+iMasJviSfOCTX8I7YiV/JATjI9zwVU qRQ5Y6djMUGJwZ4dQLW2K4PZ9NFDwro0Y/eXm47V0REv7/iPXd+xfcRoRrdZtIy7iQ1y ylk5JpjTvkvbtXo8mRnrTp6MuoLlSk3DnyqjxKH09I2ANm0/e1zOvhfsZtZEezB3Bev9 tqHw== X-Forwarded-Encrypted: i=1; AJvYcCWCw6MZ6IBQD9t7fkGCRyzvapc3MQdgaDSYlxvkPfGBMGYlLNuYoMH7CcCKaeyTvazXSbgP78UWJWVynuovwP+Eltlla1t9yzSNNH1hY3AoaS4VopA= X-Gm-Message-State: AOJu0YyvqrHKNAsNCEz7CFBPmBKtre5Yya6eR+/M8MLlYWwLr7oysiWI YMX3n97JVghjQq0pH4XoUpl7uIlbYAbSKKSNNsgMTXd/rKIp0FoMiuB3irF33+w= X-Google-Smtp-Source: AGHT+IHhlDO5fo+sXyanwUyWP/ORnjid3vFDepYJHD6/jLbt27UMTibRuvZGPXLcCuOowXifDEMHsg== X-Received: by 2002:a05:6512:3714:b0:513:13a4:95e4 with SMTP id z20-20020a056512371400b0051313a495e4mr3786910lfr.36.1709478083134; Sun, 03 Mar 2024 07:01:23 -0800 (PST) Received: from brgl-uxlite.. ([77.241.232.10]) by smtp.gmail.com with ESMTPSA id ch14-20020a170906c2ce00b00a42ea946917sm3740293ejb.130.2024.03.03.07.01.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Mar 2024 07:01:22 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Elliot Berman , Krzysztof Kozlowski , Guru Das Srinagesh , Andrew Halaney , Maximilian Luz , Alex Elder , Srini Kandagatla , Arnd Bergmann Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@quicinc.com, Bartosz Golaszewski Subject: [PATCH v8 00/12] firmware: qcom: implement support for and enable SHM bridge Date: Sun, 3 Mar 2024 16:01:03 +0100 Message-Id: <20240303150115.133633-1-brgl@bgdev.pl> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240303_070125_755970_EAF943C4 X-CRM114-Status: GOOD ( 26.15 ) 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 From: Bartosz Golaszewski SCM calls that take memory buffers as arguments require that they be page-aligned, physically continuous and non-cachable. The same requirements apply to the buffer used to pass additional arguments to SCM calls that take more than 4. To that end drivers typically use dma_alloc_coherent() to allocate memory of suitable format which is slow and inefficient space-wise. SHM Bridge is a safety mechanism that - once enabled - will only allow passing buffers to the TrustZone that have been explicitly marked as shared. It improves the overall system safety with SCM calls and is required by the upcoming scminvoke functionality. The end goal of this series is to enable SHM bridge support for those architectures that support it but to that end we first need to unify the way memory for SCM calls is allocated. This in itself is beneficial as the current approach of using dma_alloc_coherent() in most places is quite slow. First let's add a new TZ Memory allocator that allows users to create dynamic memory pools of format suitable for sharing with the TrustZone. Make it ready for implementing multiple build-time modes. Convert all relevant drivers to using it. Add separate pools for SCM core and for qseecom. Finally add support for SHM bridge and make it the default mode of operation with the generic allocator as fallback for the platforms that don't support SHM bridge. Tested on db410c, RB5, sm8550-qrd. Previous iteration tested also on sa8775p-ride and lenovo X13s (please do retest on those platforms if you can). v7 -> v8: - make the pool size dynamic and add different policies for pool growth - improve commit messages and the cover letter: describe what the SHM bridge is and why do we need it and the new allocator, explain why it's useful to merge these changes already, independently from scminvoke - improve kerneldoc format - improve the comment on the PIL SCM calls - fix license tags, drop "or-later" for GPL v2 - add lockdep and sleeping asserts - minor tweaks and improvements v6 -> v7: - fix a Kconfig issue: TZMEM must select GENERIC_ALLOCATOR v5 -> v6: Fixed two issues reported by autobuilders: - add a fix for memory leaks in the qseecom driver as the first patch for easier backporting to the v6.6.y branch - explicitly cast the bus address stored in a variable of type dma_addr_t to phys_addr_t expected by the genpool API v4 -> v5: - fix the return value from qcom_tzmem_init() if SHM Bridge is not supported - remove a comment that's no longer useful - collect tags v3 -> v4: - include linux/sizes.h for SZ_X macros - use dedicated RCU APIs to dereference radix tree slots - fix kerneldocs - fix the comment in patch 14/15: it's the hypervisor, not the TrustZone that creates the SHM bridge v2 -> v3: - restore pool management and use separate pools for different users - don't use the new allocator in qcom_scm_pas_init_image() as the TrustZone will create an SHM bridge for us here - rewrite the entire series again for most part v1 -> v2: - too many changes to list, it's a complete rewrite as explained above Bartosz Golaszewski (12): firmware: qcom: add a dedicated TrustZone buffer allocator firmware: qcom: scm: enable the TZ mem allocator firmware: qcom: scm: smc: switch to using the SCM allocator firmware: qcom: scm: make qcom_scm_assign_mem() use the TZ allocator firmware: qcom: scm: make qcom_scm_ice_set_key() use the TZ allocator firmware: qcom: scm: make qcom_scm_lmh_dcvsh() use the TZ allocator firmware: qcom: scm: make qcom_scm_qseecom_app_get_id() use the TZ allocator firmware: qcom: qseecom: convert to using the TZ allocator firmware: qcom: scm: add support for SHM bridge operations firmware: qcom: tzmem: enable SHM Bridge support firmware: qcom: scm: clarify the comment in qcom_scm_pas_init_image() arm64: defconfig: enable SHM Bridge support for the TZ memory allocator MAINTAINERS | 8 + arch/arm64/configs/defconfig | 1 + drivers/firmware/qcom/Kconfig | 31 ++ drivers/firmware/qcom/Makefile | 1 + .../firmware/qcom/qcom_qseecom_uefisecapp.c | 288 +++++------ drivers/firmware/qcom/qcom_scm-smc.c | 30 +- drivers/firmware/qcom/qcom_scm.c | 182 ++++--- drivers/firmware/qcom/qcom_scm.h | 6 + drivers/firmware/qcom/qcom_tzmem.c | 455 ++++++++++++++++++ drivers/firmware/qcom/qcom_tzmem.h | 13 + include/linux/firmware/qcom/qcom_qseecom.h | 4 +- include/linux/firmware/qcom/qcom_scm.h | 6 + include/linux/firmware/qcom/qcom_tzmem.h | 56 +++ 13 files changed, 816 insertions(+), 265 deletions(-) create mode 100644 drivers/firmware/qcom/qcom_tzmem.c create mode 100644 drivers/firmware/qcom/qcom_tzmem.h create mode 100644 include/linux/firmware/qcom/qcom_tzmem.h