From patchwork Tue Oct 17 09:27:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 13424890 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 F2845CDB485 for ; Tue, 17 Oct 2023 09:28:16 +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=DQ0YiNkwc0vYPVS0jhWrtxlRMINlT8JC6iHy4TQ2hQ4=; b=xWiZjzW1cypIrX syCuZmmbmOBF/5HP/lVjv+8duoa8AycFo8mAB4z7bW39qddOp3hpSfIeoBhekYplrtxH15V0Ywb6z PudCiOxOboW3gMuqPn6HyrWPd5XJbQXkYr5V4L5mgjqHncefmSxbs0wZFb2zjIqH2+kK4ZWAlqtXy gDJDHVtTKsJTJzJSRVEnLPI1o+Y+kcc2zOrPvOMmB/AKFBhXdf18EOkqbG2L+AOwhTE2YkybXCMmf ScCum+ysZWLYa0L5X5vxzezAWQSqSlAHRTSz5+d53xFG0z5gRgU8NBrRL5EYIj7WnP9Mv+B1aelY8 fBYYHRD/QPK7waIPaazA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qsgMX-00BoDL-0N; Tue, 17 Oct 2023 09:27:41 +0000 Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qsgMU-00BoCG-0v for linux-arm-kernel@lists.infradead.org; Tue, 17 Oct 2023 09:27:40 +0000 Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-50308217223so6451521e87.3 for ; Tue, 17 Oct 2023 02:27:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1697534856; x=1698139656; 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=pS4a4EGcukWNDLRE2YgnhxxLWaSY26SIF3Mm3XN+DRA=; b=awPSqpgWfLrCMnE8pt4w04JvtCkDVoHWa2Oh+3m91MEUkYh92yOwOvB/T3dmNokNZx Rqak2MvqR6WdUI8M2/IFf0ZLVdiyNyGFtNE1eXQfaWlCFz/eJH1McqJWXugrxhZleKva p6QsXKWo6uEynxlCLzTlPgrhUab+CclzPdp2/ruVIXgvAa8xDuaXzFdz32bkgiGjYpsi XjYFL3FwnXYYdnA+6JJDDeIlHPXWjskoCQq/bt4SbQZxNassf/0rKuJCr8zQiqdbIZbJ EJ3uye7u6Aw7YugMo/WAxOj7pLO3HuL0u5CdD3qpDCBgVAedYjDlOtD1Nh6f9NvtwhKq 29sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697534856; x=1698139656; 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=pS4a4EGcukWNDLRE2YgnhxxLWaSY26SIF3Mm3XN+DRA=; b=cV7Kn2qPckAHGqe/+kmRQ1EEf/tOGKpEbVj9Mt4yL77YhbJnd7K5dHRQcFzPTu40b0 3+Wr++UczUNNElT9WC7RIZ+5MNe6I3KybKc/IMUAwZUSylIbWZCOhbRlXC+6+CWm61O5 8rgCoZ88TeZRU03bJQzy17hI7sWBOl6hYu9BuAwtzNgbGkj/HOwL3g09fg+a69P3LMq6 nvQns/7AahSFaturiAyycgt6njifgdJDHFPK/4XimdKv0gy0K8vMxdIbomSrG4wg+IMe IxMnl0dqJzBzLGNYfsSWTEAMwmh9FBnJp/MAxNi/y535LSuI8Oo7oec4YNl+OzxbZJu/ P+eA== X-Gm-Message-State: AOJu0Yz22ZdezBk1FP+obeg1VqEeBzcThQugldhThGNdpFUgej06fFwR z9Pj9gr+kt/OWPy54qfGU8uJ84dWU4g5HoJjerY= X-Google-Smtp-Source: AGHT+IF/egdZII4kru9SBHTW0O/r1+PG/CtRqw6z6UOEjseVewU3XFTFxOLHbhsN87p+XXRBmvQC7A== X-Received: by 2002:a05:6512:3c82:b0:507:aaa9:b080 with SMTP id h2-20020a0565123c8200b00507aaa9b080mr1671271lfv.33.1697534855976; Tue, 17 Oct 2023 02:27:35 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:f1ee:b000:ce90:ed14]) by smtp.gmail.com with ESMTPSA id j5-20020a05600c1c0500b003fe1c332810sm9460787wms.33.2023.10.17.02.27.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 02:27:35 -0700 (PDT) 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 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 v5 00/15] arm64: qcom: add and enable SHM Bridge support Date: Tue, 17 Oct 2023 11:27:17 +0200 Message-Id: <20231017092732.19983-1-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231017_022738_553554_B8F0A223 X-CRM114-Status: GOOD ( 18.90 ) 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 This is pretty much another full rewrite of the SHM Bridge support series. After more on- and off-list discussions I think this time it will be close to the final thing though. We've established the need for using separate pools for SCM and QSEECOM as well as the upcoming scminvoke driver. It's also become clear that in order to be future-proof, the new allocator must be an abstraction layer of a higher level as the SHM Bridge will not be the only memory protection mechanism that we'll see upstream. Hence the rename to TrustZone Memory rather than SCM Memory allocator. Also to that end: the new allocator is its own module now and provides a Kconfig choice menu for selecting the mode of operation (currently default and SHM Bridge). Due to a high divergence from v2, I dropped all tags except for patch 1/15 which didn't change. Tested on sm8550 and sa8775p with the Inline Crypto Engine and remoteproc. 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 (15): firmware: qcom: move Qualcomm code into its own directory firmware: qcom: scm: add a missing forward declaration for struct device firmware: qcom: scm: remove unneeded 'extern' specifiers 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 | 4 +- arch/arm64/configs/defconfig | 1 + drivers/firmware/Kconfig | 48 +-- drivers/firmware/Makefile | 5 +- drivers/firmware/qcom/Kconfig | 86 +++++ drivers/firmware/qcom/Makefile | 10 + drivers/firmware/{ => qcom}/qcom_qseecom.c | 0 .../{ => qcom}/qcom_qseecom_uefisecapp.c | 261 +++++-------- drivers/firmware/{ => qcom}/qcom_scm-legacy.c | 0 drivers/firmware/{ => qcom}/qcom_scm-smc.c | 30 +- drivers/firmware/{ => qcom}/qcom_scm.c | 179 +++++---- drivers/firmware/{ => qcom}/qcom_scm.h | 21 +- drivers/firmware/qcom/qcom_tzmem.c | 365 ++++++++++++++++++ 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 | 28 ++ 17 files changed, 746 insertions(+), 315 deletions(-) create mode 100644 drivers/firmware/qcom/Kconfig create mode 100644 drivers/firmware/qcom/Makefile rename drivers/firmware/{ => qcom}/qcom_qseecom.c (100%) rename drivers/firmware/{ => qcom}/qcom_qseecom_uefisecapp.c (84%) rename drivers/firmware/{ => qcom}/qcom_scm-legacy.c (100%) rename drivers/firmware/{ => qcom}/qcom_scm-smc.c (90%) rename drivers/firmware/{ => qcom}/qcom_scm.c (93%) rename drivers/firmware/{ => qcom}/qcom_scm.h (88%) 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