From patchwork Mon Nov 20 13:21:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 167127 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp2195798vqn; Mon, 20 Nov 2023 05:25:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IEVwlNX1LAHcMlMh2o0osIb2V5FR1aEwu5H5hl9LJqp65onHDktkPtj6dkcKwdE8zcWt9vf X-Received: by 2002:a17:902:e843:b0:1cc:4559:ff with SMTP id t3-20020a170902e84300b001cc455900ffmr10214082plg.13.1700486701617; Mon, 20 Nov 2023 05:25:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700486701; cv=none; d=google.com; s=arc-20160816; b=YfWnt9y5Aom19P+yIov0+D0ExZdxKBK++j1wIXnBnrxiwqP0dPDl3fsliog8NwGbfu aU+GM3IBADmri/5h1eFbK/huc7bKCc8G4qJoqNTuXOSBaTsOEGv/SqJ05yX0M0DIaVFm Pm7spU5/N8CSj3Dzv8XDACGTXIi4z2q8o8OzN3Wm3FDzlACq51DTbfrAMRyDqJxWyqJn fJMjTw4mCWMk3fRE4KToxrdhnb/29WWRbVayr59BPIsSpUqHYivuKidBz1PiaebnaDEz EZfrf+JAgw+8W9X2ToCmcrHIoBs2kzPtD4X6ThnrqladsVyq89lQxGTSyf28WYpVmDnB bjiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Lgka31W3qpZw9qmD0Tl3+W8wAOSMxMGHO0Pnf3Jfow4=; fh=lirm1ccAeXZZB1cIo+N1DqklpgcFmD/vJ7PCWNIL0HU=; b=O5qZ+NeMUZHUkQAKPUEECdJVrtlO7e61wvb9J9ERP/hPSTxyrzTgCIdqKlzLBftQNH v+1UoZDzx5nUoogi7Jiqoou7ZwvEDAWrd9ANeRLL+KbXxyaBUC9Dft2u08/+h5/iYnST k9r6hakCHT+KLlqkL13lgBZMj7iYJaNAP5TfYPaiRiW9g9wZGoOMi7Qj34WKBkVAsEgg NoQEYeKBFpTMnFxvPqVnY+6jl+6qMfPrO4apf2torEOkbEspTEODzotCTbjdvQqkVIlf ON+D0YX8XP6dhkUETm1F45I1ln0HRcGKQmOAhMUsxQ55oXuw94e3HNqsiLD+CIDvOVcZ mz0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=Ob7A1j+Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id z3-20020a1709028f8300b001cf5cf1ca6asi2425480plo.511.2023.11.20.05.25.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 05:25:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=Ob7A1j+Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 30CFC80293A1; Mon, 20 Nov 2023 05:22:25 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232135AbjKTNV7 (ORCPT + 27 others); Mon, 20 Nov 2023 08:21:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232909AbjKTNVk (ORCPT ); Mon, 20 Nov 2023 08:21:40 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B9FCD52 for ; Mon, 20 Nov 2023 05:21:36 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4094301d505so14265785e9.2 for ; Mon, 20 Nov 2023 05:21:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1700486494; x=1701091294; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Lgka31W3qpZw9qmD0Tl3+W8wAOSMxMGHO0Pnf3Jfow4=; b=Ob7A1j+ZZ5KI3N8qcESLldc7P3G2pt5KxQo+st4aGoaEuAgGdr/SDu1U6JnlLGthnq mKDrO5rty37PoNhF3sbeZ+b03NO407EDv7KQdYoHpfIORWS4YjOcX+XbhJrEoGXT3PtO JgLqhIlReGGHM3XQ/JVoMUp5wOmJGLoJ4O9xwDXfqA/sMWIYCyqo+Dnq/L2R8tOyxPVZ BDiFTVTpcm9cKGwhj4xqFJLaBqf9Slz+2K/XNCfnisN/4BeHUJXaeODeLigVvFyNSH65 /U+ER8ZczGAnTnFHxqbwzuwXcqGcjxbJ3/StHpdiaVIv/bV+p990vash3hWOIzEwlFq7 HO3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700486494; x=1701091294; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Lgka31W3qpZw9qmD0Tl3+W8wAOSMxMGHO0Pnf3Jfow4=; b=mDXF+LokIqruA9+dB0F7xs5TD1BuTfrfVru4sw4L03RKj2FDMQCE0Yv0lpte5YtHAj UJLOoSKHA1Bejt4F5NeStlPd+TEMadM5XMfx1xF1/RTgXsI52YntQntpr0p5s32fL2V2 jrqTGA/+aecJXzyqCLbBRR+4bzBpQ4gIRHnqoxIFj96rCgdhSCVa2e+vv6w2OgvVD/xS EEKnb5j+M71SxX/Rof/EEXaV69DI4BmstohFcbaClU4snWEni+MsM07rkiEYyEqfloAU nIib93IsxGH1UWEBe33IXgpsAqkRt8oKbRplOGJequPFk0xIjUtVJYidyyMI+NpHwJKP ADAQ== X-Gm-Message-State: AOJu0Yy3ThlH0EiFeIhHG1GQ1OKkkYuaWxATD/VctHRvt8RYh7jcp46d L+B9b4B3DQDzUTgNPsvuWQNi4Q== X-Received: by 2002:a05:600c:1c8b:b0:3fe:f667:4e4c with SMTP id k11-20020a05600c1c8b00b003fef6674e4cmr6416175wms.12.1700486494283; Mon, 20 Nov 2023 05:21:34 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:c590:a7ce:883:eba3]) by smtp.gmail.com with ESMTPSA id k18-20020a05600c0b5200b004065e235417sm17329192wmr.21.2023.11.20.05.21.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 05:21:33 -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 Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@quicinc.com, Bartosz Golaszewski Subject: [RESEND PATCH v5 10/12] firmware: qcom: tzmem: enable SHM Bridge support Date: Mon, 20 Nov 2023 14:21:16 +0100 Message-Id: <20231120132118.30473-11-brgl@bgdev.pl> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231120132118.30473-1-brgl@bgdev.pl> References: <20231120132118.30473-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 20 Nov 2023 05:22:25 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783089543728621439 X-GMAIL-MSGID: 1783089543728621439 From: Bartosz Golaszewski Add a new Kconfig option for selecting the SHM Bridge mode of operation for the TrustZone memory allocator. If enabled at build-time, it will still be checked for availability at run-time. If the architecture doesn't support SHM Bridge, the allocator will work just like in the default mode. Signed-off-by: Bartosz Golaszewski Tested-by: Andrew Halaney # sc8280xp-lenovo-thinkpad-x13s --- drivers/firmware/qcom/Kconfig | 10 +++++ drivers/firmware/qcom/qcom_tzmem.c | 65 +++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/qcom/Kconfig b/drivers/firmware/qcom/Kconfig index 237da40de832..e01407e31ae4 100644 --- a/drivers/firmware/qcom/Kconfig +++ b/drivers/firmware/qcom/Kconfig @@ -27,6 +27,16 @@ config QCOM_TZMEM_MODE_DEFAULT Use the default allocator mode. The memory is page-aligned, non-cachable and contiguous. +config QCOM_TZMEM_MODE_SHMBRIDGE + bool "SHM Bridge" + help + Use Qualcomm Shared Memory Bridge. The memory has the same alignment as + in the 'Default' allocator but is also explicitly marked as an SHM Bridge + buffer. + + With this selected, all buffers passed to the TrustZone must be allocated + using the TZMem allocator or else the TrustZone will refuse to use them. + endchoice config QCOM_SCM_DOWNLOAD_MODE_DEFAULT diff --git a/drivers/firmware/qcom/qcom_tzmem.c b/drivers/firmware/qcom/qcom_tzmem.c index 68ca59c5598e..8010af80fd59 100644 --- a/drivers/firmware/qcom/qcom_tzmem.c +++ b/drivers/firmware/qcom/qcom_tzmem.c @@ -55,7 +55,70 @@ static void qcom_tzmem_cleanup_pool(struct qcom_tzmem_pool *pool) } -#endif /* CONFIG_QCOM_TZMEM_MODE_DEFAULT */ +#elif IS_ENABLED(CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE) + +#include + +#define QCOM_SHM_BRIDGE_NUM_VM_SHIFT 9 + +static bool qcom_tzmem_using_shm_bridge; + +static int qcom_tzmem_init(void) +{ + int ret; + + ret = qcom_scm_shm_bridge_enable(); + if (ret == -EOPNOTSUPP) { + dev_info(qcom_tzmem_dev, "SHM Bridge not supported\n"); + return 0; + } + + if (!ret) + qcom_tzmem_using_shm_bridge = true; + + return ret; +} + +static int qcom_tzmem_init_pool(struct qcom_tzmem_pool *pool) +{ + u64 pfn_and_ns_perm, ipfn_and_s_perm, size_and_flags, ns_perms; + int ret; + + if (!qcom_tzmem_using_shm_bridge) + return 0; + + ns_perms = (QCOM_SCM_PERM_WRITE | QCOM_SCM_PERM_READ); + pfn_and_ns_perm = (u64)pool->pbase | ns_perms; + ipfn_and_s_perm = (u64)pool->pbase | ns_perms; + size_and_flags = pool->size | (1 << QCOM_SHM_BRIDGE_NUM_VM_SHIFT); + + u64 *handle __free(kfree) = kzalloc(sizeof(*handle), GFP_KERNEL); + if (!handle) + return -ENOMEM; + + ret = qcom_scm_shm_bridge_create(qcom_tzmem_dev, pfn_and_ns_perm, + ipfn_and_s_perm, size_and_flags, + QCOM_SCM_VMID_HLOS, handle); + if (ret) + return ret; + + pool->priv = no_free_ptr(handle); + + return 0; +} + +static void qcom_tzmem_cleanup_pool(struct qcom_tzmem_pool *pool) +{ + u64 *handle = pool->priv; + + if (!qcom_tzmem_using_shm_bridge) + return; + + qcom_scm_shm_bridge_delete(qcom_tzmem_dev, *handle); + kfree(handle); +} + +#endif /* CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE */ /** * qcom_tzmem_pool_new() - Create a new TZ memory pool.