From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A17A6236453 for ; Thu, 11 Sep 2025 03:41:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757562090; cv=none; b=E1V/pvBto8hiT8aTZh8tuzPvrO5oD/pEz4FmTGkcgD6fuFHAa36Whgz84OI03Q/MiDRLGOwk7OgOq1w/s6D07U+gr+zm63f5JM8Vb44DSzCC4hpj4FKMA3oDZaf1WF7N/TmXg+1ycmRXlRSII7vBPSxnigVSmECYdHldds+9j6g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757562090; c=relaxed/simple; bh=lgp1LOhLLp/W5q+GFi1cI9hy6O6fqjuRWo/O+rRQgWY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=si9UcxlAWtSbJwZvUmNJaC8RtENF7jYQmkPWgK6fR8+ydXuDQk/s+qQxip335yJt/r5jGx0g7u2PuIKZUS+3hXyxpd6CqYUmScHFtkkWPqU2B+JfyaUfyx9ubp6IKX7h1Mbk/pBF0+Q2qpg80tsk+/NvNYEgYy4sFmiiEQIZaU4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=EIs45YAr; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="EIs45YAr" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 58B2Iel7000431 for ; Thu, 11 Sep 2025 03:41:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 30MVqau9h2AN1WxS7vqJoVCbxWXWCZTilNucOIr42c8=; b=EIs45YAro3qEwEC3 a49S8A5D3EncjdPj4pIvqAWDdUSLOmHG2HDZGjZuHSARbL6L6rSQhLJ91KRJLPg0 vVLgDbfsziahyewB62mUcRNrkrKWFPciihRSbL10ktDRqQlC1mnzL+gPOwHVtB12 dAiGsS/ItG3P2pXKFK2oRk1R6Qm2uA2ERieOcO3a0Nr4HvyWnDb9ba5XhHm6oNM3 bfgpkEOMoOK0nuYdpgPdOUSvSCmq/pdWgRjWz7ZU+FxpFXomJEQZQBjObtHys6AR uignD4nLgz5sXiwtNIAnyVDI+7DP3Goxu/MCFYLDCAPt64nDzzU2C7LkOgdIONfO zCfOww== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 493cpb1nkj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 11 Sep 2025 03:41:27 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-25bdf8126ceso4955305ad.3 for ; Wed, 10 Sep 2025 20:41:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757562086; x=1758166886; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=30MVqau9h2AN1WxS7vqJoVCbxWXWCZTilNucOIr42c8=; b=p2AP9nk/xkUfYtL4nPpP1N615b77r1C0rAkCqJNtUqH5rjZcYDI0fJQIZWKAX3hYhp mIMCCz8u5tD3WUQfmSZQXBwhaLw+qG+Vn9TShKOWVgz50DTrnpmAQ0/XWmHRxXPeRnQr m+ZeEj/EDaDEO3K7E/jf1p+PmoiiImiw1JMvMlyVo0/HgSiI9OQl3+9MIfBS1xRp3ZZW uwWSt6KlECL5vDcR6Wua18lLYU64/VFGqdbCz2dDN36qgVhIsdkheP/J0sYB3fKqQada M3R+o4CEhqIMpHuq/NuyZISxcZvzspqjdubcagFhv2kdW0cmYI8VyQeX+0qOZQHYiPQx DJGg== X-Forwarded-Encrypted: i=1; AJvYcCVf9qd3Qo1hfEvTcNhurU26IahMu2Dd6TK1ljk/ymDRS9WUOvEnMlfECPSM8mRuzgCPvzY1/d0dmow=@vger.kernel.org X-Gm-Message-State: AOJu0Yzqf2p34/O8DqFBCxkg9mFQYySOUhtxAp9rUyz8u+nNJntuWzJv 4SC+0xoQf17FMFfLsArxd0NBF6Blc50ZE2hO0Z9h2RsMNmNf813jRT166uXHl+mIPh5PpsGVHmU DG0mKCquXF2KLDrKKRKhYcwcHbGCaygfQBvz1mN4ViDxmK4JHe37/a4l+icoucw== X-Gm-Gg: ASbGnctRhWZvkQPSBtG9Ipn8vcUmj5XNfn+UHCvWPfEw3dnFk8hmYQe0QKse1MjMnkD cYXv0A9dHgUBkJWgy9oCPIS8Q02ZsEbjiUmh3qPWjMhpFbYPamwwC1sMwSHDRHgHa4Bx+3C3z7a hqyaisMdGOzoAwLUnitPpPpqdkxdL5X2h9LBROdz8z/Qs+CGfpD7+Su6be64yXQDubGnyRjkNpG L3+kTS2tUS2s9zAnlzu7LnV/1xQ4xrErHok0GkbZ6uAABjXrXEAOPACsMdw9/1/rzTlVyp3QXtS Kp16Ca44dO8lfc0PFD5jLk6K+pZBlD1JyDRGCYnh/XnaJaSjDtRXLkGnE7yN5o3LgLsqtk2RXhV j4PtqFv8LEX1xzjABQ90e2FI= X-Received: by 2002:a17:902:d2d1:b0:250:411d:fa83 with SMTP id d9443c01a7336-2516dfcccbemr289529825ad.15.1757562085894; Wed, 10 Sep 2025 20:41:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHNK+dvhXEwjPbidgExO5vSVEoN4mnn7hiDWFYTbts3RbLRlhWqysKV/H87BRXyKuni3VCG8w== X-Received: by 2002:a17:902:d2d1:b0:250:411d:fa83 with SMTP id d9443c01a7336-2516dfcccbemr289529355ad.15.1757562085362; Wed, 10 Sep 2025 20:41:25 -0700 (PDT) Received: from hu-azarrabi-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-25c3b304f76sm2962275ad.130.2025.09.10.20.41.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Sep 2025 20:41:24 -0700 (PDT) From: Amirreza Zarrabi Date: Wed, 10 Sep 2025 20:41:14 -0700 Subject: [PATCH v11 01/11] firmware: qcom: tzmem: export shm_bridge create/delete Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250910-qcom-tee-using-tee-ss-without-mem-obj-v11-1-520e867b3d74@oss.qualcomm.com> References: <20250910-qcom-tee-using-tee-ss-without-mem-obj-v11-0-520e867b3d74@oss.qualcomm.com> In-Reply-To: <20250910-qcom-tee-using-tee-ss-without-mem-obj-v11-0-520e867b3d74@oss.qualcomm.com> To: Jens Wiklander , Sumit Garg , Bjorn Andersson , Konrad Dybcio , Bartosz Golaszewski , Apurupa Pattapu , Kees Cook , "Gustavo A. R. Silva" , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= Cc: Harshal Dev , linux-arm-msm@vger.kernel.org, op-tee@lists.trustedfirmware.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-doc@vger.kernel.org, Amirreza Zarrabi , Neil Armstrong , Kuldeep Singh X-Mailer: b4 0.13.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwOTEwMDE1MCBTYWx0ZWRfXxUYg6+RpkkvY OnKiuuz3aL95jsxeH0vz+r2K1tgMoPDLnZS6CrkRhWki2URG3h6PXrZQD5zstxOxUlTQTEBB6gj fZ+HTT3Xv1SvC9Y/+XtF7/e3Rf4pAlNTvjifoaqPfBllSH3gTud2HFG8IChOgvj5YIQpTPKFU9M Rxk9l3jelZN4ZWs3NBDC1nBFyfDWXh8bAGIlUjNtyFXGboP/SQGXKPj+mk6sXjpeNU1X4noxc9T x9cDXkEd9pEuO8/NwXJKxCujFyElj6Bq+jpkidIzT0p7B5gEKU1lvw/xXIwC1wWt8Hu0iGrk8C9 5u+Tu9u1F6Pj/+Wd0MlnTwCXfKLnVx6sTqIVd8IId4zZdQg+pHxk4cEHXvrU1kXrxhzgNtumI63 KxSvhtFM X-Proofpoint-ORIG-GUID: pLBwKQTXakknSd8Po-8R4irFHgAu38Sg X-Proofpoint-GUID: pLBwKQTXakknSd8Po-8R4irFHgAu38Sg X-Authority-Analysis: v=2.4 cv=P4k6hjAu c=1 sm=1 tr=0 ts=68c244e7 cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=yJojWOMRYYMA:10 a=sWKEhP36mHoA:10 a=KKAkSRfTAAAA:8 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=5numxkeOl0lsm_bA3l4A:9 a=QEXdDO2ut3YA:10 a=1OuFwYUASf3TG4hYMiVC:22 a=cvBusfyB2V15izCimMoJ:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-09-10_04,2025-09-10_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 priorityscore=1501 clxscore=1015 impostorscore=0 suspectscore=0 spamscore=0 bulkscore=0 malwarescore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2507300000 definitions=main-2509100150 Anyone with access to contiguous physical memory should be able to share memory with QTEE using shm_bridge. Tested-by: Neil Armstrong Tested-by: Harshal Dev Reviewed-by: Kuldeep Singh Signed-off-by: Amirreza Zarrabi --- drivers/firmware/qcom/qcom_tzmem.c | 63 ++++++++++++++++++++++++++------ include/linux/firmware/qcom/qcom_tzmem.h | 15 ++++++++ 2 files changed, 67 insertions(+), 11 deletions(-) diff --git a/drivers/firmware/qcom/qcom_tzmem.c b/drivers/firmware/qcom/qcom_tzmem.c index ea0a35355657..186511ced924 100644 --- a/drivers/firmware/qcom/qcom_tzmem.c +++ b/drivers/firmware/qcom/qcom_tzmem.c @@ -109,7 +109,19 @@ static int qcom_tzmem_init(void) return 0; } -static int qcom_tzmem_init_area(struct qcom_tzmem_area *area) +/** + * qcom_tzmem_shm_bridge_create() - Create a SHM bridge. + * @paddr: Physical address of the memory to share. + * @size: Size of the memory to share. + * @handle: Handle to the SHM bridge. + * + * On platforms that support SHM bridge, this function creates a SHM bridge + * for the given memory region with QTEE. The handle returned by this function + * must be passed to qcom_tzmem_shm_bridge_delete() to free the SHM bridge. + * + * Return: On success, returns 0; on failure, returns < 0. + */ +int qcom_tzmem_shm_bridge_create(phys_addr_t paddr, size_t size, u64 *handle) { u64 pfn_and_ns_perm, ipfn_and_s_perm, size_and_flags; int ret; @@ -117,17 +129,49 @@ static int qcom_tzmem_init_area(struct qcom_tzmem_area *area) if (!qcom_tzmem_using_shm_bridge) return 0; - pfn_and_ns_perm = (u64)area->paddr | QCOM_SCM_PERM_RW; - ipfn_and_s_perm = (u64)area->paddr | QCOM_SCM_PERM_RW; - size_and_flags = area->size | (1 << QCOM_SHM_BRIDGE_NUM_VM_SHIFT); + pfn_and_ns_perm = paddr | QCOM_SCM_PERM_RW; + ipfn_and_s_perm = paddr | QCOM_SCM_PERM_RW; + size_and_flags = size | (1 << QCOM_SHM_BRIDGE_NUM_VM_SHIFT); + + ret = qcom_scm_shm_bridge_create(pfn_and_ns_perm, ipfn_and_s_perm, + size_and_flags, QCOM_SCM_VMID_HLOS, + handle); + if (ret) { + dev_err(qcom_tzmem_dev, + "SHM Bridge failed: ret %d paddr 0x%pa, size %zu\n", + ret, &paddr, size); + + return ret; + } + + return 0; +} +EXPORT_SYMBOL_GPL(qcom_tzmem_shm_bridge_create); + +/** + * qcom_tzmem_shm_bridge_delete() - Delete a SHM bridge. + * @handle: Handle to the SHM bridge. + * + * On platforms that support SHM bridge, this function deletes the SHM bridge + * for the given memory region. The handle must be the same as the one + * returned by qcom_tzmem_shm_bridge_create(). + */ +void qcom_tzmem_shm_bridge_delete(u64 handle) +{ + if (qcom_tzmem_using_shm_bridge) + qcom_scm_shm_bridge_delete(handle); +} +EXPORT_SYMBOL_GPL(qcom_tzmem_shm_bridge_delete); + +static int qcom_tzmem_init_area(struct qcom_tzmem_area *area) +{ + int ret; u64 *handle __free(kfree) = kzalloc(sizeof(*handle), GFP_KERNEL); if (!handle) return -ENOMEM; - ret = qcom_scm_shm_bridge_create(pfn_and_ns_perm, ipfn_and_s_perm, - size_and_flags, QCOM_SCM_VMID_HLOS, - handle); + ret = qcom_tzmem_shm_bridge_create(area->paddr, area->size, handle); if (ret) return ret; @@ -140,10 +184,7 @@ static void qcom_tzmem_cleanup_area(struct qcom_tzmem_area *area) { u64 *handle = area->priv; - if (!qcom_tzmem_using_shm_bridge) - return; - - qcom_scm_shm_bridge_delete(*handle); + qcom_tzmem_shm_bridge_delete(*handle); kfree(handle); } diff --git a/include/linux/firmware/qcom/qcom_tzmem.h b/include/linux/firmware/qcom/qcom_tzmem.h index b83b63a0c049..48ac0e5454c7 100644 --- a/include/linux/firmware/qcom/qcom_tzmem.h +++ b/include/linux/firmware/qcom/qcom_tzmem.h @@ -53,4 +53,19 @@ DEFINE_FREE(qcom_tzmem, void *, if (_T) qcom_tzmem_free(_T)) phys_addr_t qcom_tzmem_to_phys(void *ptr); +#if IS_ENABLED(CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE) +int qcom_tzmem_shm_bridge_create(phys_addr_t paddr, size_t size, u64 *handle); +void qcom_tzmem_shm_bridge_delete(u64 handle); +#else +static inline int qcom_tzmem_shm_bridge_create(phys_addr_t paddr, + size_t size, u64 *handle) +{ + return 0; +} + +static inline void qcom_tzmem_shm_bridge_delete(u64 handle) +{ +} +#endif + #endif /* __QCOM_TZMEM */ -- 2.34.1